From 0b1760587384cb8dd17def7565e90df2ee7f2882 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Sun, 4 Dec 2022 20:53:46 -0500 Subject: [PATCH] formatting cleanup --- example/sACN Explorer/adduniversedialog.h | 1 - example/sACN Explorer/lineeditdialog.h | 1 - example/sACN Explorer/multiversewindow.cpp | 41 ++++++++++------------ example/sACN Explorer/multiversewindow.h | 1 - 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/example/sACN Explorer/adduniversedialog.h b/example/sACN Explorer/adduniversedialog.h index fa2ab1a..aab49bf 100644 --- a/example/sACN Explorer/adduniversedialog.h +++ b/example/sACN Explorer/adduniversedialog.h @@ -11,7 +11,6 @@ QT_END_NAMESPACE class AddUniverseDialog : public QDialog { Q_OBJECT - public: explicit AddUniverseDialog(QWidget *parent = nullptr, uint16_t universe = 1); virtual ~AddUniverseDialog(); diff --git a/example/sACN Explorer/lineeditdialog.h b/example/sACN Explorer/lineeditdialog.h index 242690e..e84df02 100644 --- a/example/sACN Explorer/lineeditdialog.h +++ b/example/sACN Explorer/lineeditdialog.h @@ -10,7 +10,6 @@ class LineEditDialog; class LineEditDialog : public QDialog { Q_OBJECT - public: explicit LineEditDialog(QWidget *parent = nullptr, QString label = "line", int length = 0, diff --git a/example/sACN Explorer/multiversewindow.cpp b/example/sACN Explorer/multiversewindow.cpp index 3945e28..2ee7980 100644 --- a/example/sACN Explorer/multiversewindow.cpp +++ b/example/sACN Explorer/multiversewindow.cpp @@ -17,15 +17,22 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node) , model(new MultiverseModel(this, node)) , sortProxy(new QSortFilterProxyModel(this)) { + // build the UI ui->setupUi(this); + ui->menubar->setNativeMenuBar(false); + auto mergeMode = new QActionGroup(this); + mergeMode->addAction(ui->actionMergeModeHTP); + mergeMode->addAction(ui->actionMergeModeLTP); + + // initial states ui->actionTerminate->setEnabled(false); ui->actionUnsubscribe->setEnabled(false); ui->actionInspect->setEnabled(false); ui->actionIPv4->setChecked(node->isEnabledIPv4()); ui->actionIPv6->setChecked(node->isEnabledIPv6()); ui->actionDiscovery->setChecked(node->discoveryEnabled()); - ui->menubar->setNativeMenuBar(false); + // setup the model sortProxy->setSourceModel(model); ui->multiverseView->setModel(sortProxy); ui->multiverseView->setSortingEnabled(true); @@ -36,34 +43,25 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node) for (int i = 0; i < ui->multiverseView->model()->rowCount(); i++) ui->multiverseView->setFirstColumnSpanned(i, QModelIndex(), true); - auto mergeMode = new QActionGroup(this); - mergeMode->addAction(ui->actionMergeModeHTP); - mergeMode->addAction(ui->actionMergeModeLTP); - + // model connections connect(ui->multiverseView->selectionModel(), &QItemSelectionModel::currentChanged, this, &MultiverseWindow::selectionChanged); - connect(ui->multiverseView, &QTreeView::customContextMenuRequested, this, &MultiverseWindow::openContextMenu); - connect(ui->multiverseView, &QTreeView::doubleClicked, this, &MultiverseWindow::openUniverseEditor); + // action connections connect(ui->actionUACN, &QAction::triggered, this, &MultiverseWindow::openUacnEditor); - connect(ui->actionIPv4, &QAction::toggled, node, &QSacnNode::setIPv4); - connect(ui->actionIPv6, &QAction::toggled, node, &QSacnNode::setIPv6); - - connect(ui->actionInspect, &QAction::triggered, - this, [this]() { - auto selected = ui->multiverseView->currentIndex(); - openUniverseEditor(selected); - }); - + connect(ui->actionDiscovery, &QAction::toggled, + node, [&, node](bool checked) { + checked ? node->discoveryStart() : node->discoveryStop(); + }); connect(ui->actionCreate, &QAction::triggered, this, [this, node]() { auto dialog = new AddUniverseDialog(this, 1); @@ -73,7 +71,6 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node) dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->open(); }); - connect(ui->actionTerminate, &QAction::triggered, this, [&, node]() { auto index = ui->multiverseView->currentIndex(); @@ -85,7 +82,6 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node) node->terminate(univ->number()); } }); - connect(ui->actionSubscribe, &QAction::triggered, this, [this, node]() { auto val = QVariant(1); @@ -103,7 +99,6 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node) dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->open(); }); - connect(ui->actionUnsubscribe, &QAction::triggered, this, [&, node]() { auto index = ui->multiverseView->currentIndex(); @@ -115,10 +110,10 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node) node->unsubscribe(univ->number()); } }); - - connect(ui->actionDiscovery, &QAction::toggled, - node, [&, node](bool checked) { - checked ? node->discoveryStart() : node->discoveryStop(); + connect(ui->actionInspect, &QAction::triggered, + this, [this]() { + auto selected = ui->multiverseView->currentIndex(); + openUniverseEditor(selected); }); } diff --git a/example/sACN Explorer/multiversewindow.h b/example/sACN Explorer/multiversewindow.h index 7e04804..1a3b600 100644 --- a/example/sACN Explorer/multiversewindow.h +++ b/example/sACN Explorer/multiversewindow.h @@ -45,7 +45,6 @@ class MultiverseWindow : public QMainWindow { Q_OBJECT - public: explicit MultiverseWindow(QWidget *parent = nullptr, QSacnNode* node = nullptr);