1
0
Fork 0

formatting cleanup

This commit is contained in:
Kevin Matz 2022-12-04 20:53:46 -05:00
parent a24a6e8b38
commit 0b17605873
4 changed files with 18 additions and 26 deletions

View File

@ -11,7 +11,6 @@ QT_END_NAMESPACE
class AddUniverseDialog : public QDialog class AddUniverseDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit AddUniverseDialog(QWidget *parent = nullptr, uint16_t universe = 1); explicit AddUniverseDialog(QWidget *parent = nullptr, uint16_t universe = 1);
virtual ~AddUniverseDialog(); virtual ~AddUniverseDialog();

View File

@ -10,7 +10,6 @@ class LineEditDialog;
class LineEditDialog : public QDialog class LineEditDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit LineEditDialog(QWidget *parent = nullptr, explicit LineEditDialog(QWidget *parent = nullptr,
QString label = "line", int length = 0, QString label = "line", int length = 0,

View File

@ -17,15 +17,22 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node)
, model(new MultiverseModel(this, node)) , model(new MultiverseModel(this, node))
, sortProxy(new QSortFilterProxyModel(this)) , sortProxy(new QSortFilterProxyModel(this))
{ {
// build the UI
ui->setupUi(this); 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->actionTerminate->setEnabled(false);
ui->actionUnsubscribe->setEnabled(false); ui->actionUnsubscribe->setEnabled(false);
ui->actionInspect->setEnabled(false); ui->actionInspect->setEnabled(false);
ui->actionIPv4->setChecked(node->isEnabledIPv4()); ui->actionIPv4->setChecked(node->isEnabledIPv4());
ui->actionIPv6->setChecked(node->isEnabledIPv6()); ui->actionIPv6->setChecked(node->isEnabledIPv6());
ui->actionDiscovery->setChecked(node->discoveryEnabled()); ui->actionDiscovery->setChecked(node->discoveryEnabled());
ui->menubar->setNativeMenuBar(false);
// setup the model
sortProxy->setSourceModel(model); sortProxy->setSourceModel(model);
ui->multiverseView->setModel(sortProxy); ui->multiverseView->setModel(sortProxy);
ui->multiverseView->setSortingEnabled(true); ui->multiverseView->setSortingEnabled(true);
@ -36,34 +43,25 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node)
for (int i = 0; i < ui->multiverseView->model()->rowCount(); i++) for (int i = 0; i < ui->multiverseView->model()->rowCount(); i++)
ui->multiverseView->setFirstColumnSpanned(i, QModelIndex(), true); ui->multiverseView->setFirstColumnSpanned(i, QModelIndex(), true);
auto mergeMode = new QActionGroup(this); // model connections
mergeMode->addAction(ui->actionMergeModeHTP);
mergeMode->addAction(ui->actionMergeModeLTP);
connect(ui->multiverseView->selectionModel(), &QItemSelectionModel::currentChanged, connect(ui->multiverseView->selectionModel(), &QItemSelectionModel::currentChanged,
this, &MultiverseWindow::selectionChanged); this, &MultiverseWindow::selectionChanged);
connect(ui->multiverseView, &QTreeView::customContextMenuRequested, connect(ui->multiverseView, &QTreeView::customContextMenuRequested,
this, &MultiverseWindow::openContextMenu); this, &MultiverseWindow::openContextMenu);
connect(ui->multiverseView, &QTreeView::doubleClicked, connect(ui->multiverseView, &QTreeView::doubleClicked,
this, &MultiverseWindow::openUniverseEditor); this, &MultiverseWindow::openUniverseEditor);
// action connections
connect(ui->actionUACN, &QAction::triggered, connect(ui->actionUACN, &QAction::triggered,
this, &MultiverseWindow::openUacnEditor); this, &MultiverseWindow::openUacnEditor);
connect(ui->actionIPv4, &QAction::toggled, connect(ui->actionIPv4, &QAction::toggled,
node, &QSacnNode::setIPv4); node, &QSacnNode::setIPv4);
connect(ui->actionIPv6, &QAction::toggled, connect(ui->actionIPv6, &QAction::toggled,
node, &QSacnNode::setIPv6); node, &QSacnNode::setIPv6);
connect(ui->actionDiscovery, &QAction::toggled,
connect(ui->actionInspect, &QAction::triggered, node, [&, node](bool checked) {
this, [this]() { checked ? node->discoveryStart() : node->discoveryStop();
auto selected = ui->multiverseView->currentIndex(); });
openUniverseEditor(selected);
});
connect(ui->actionCreate, &QAction::triggered, connect(ui->actionCreate, &QAction::triggered,
this, [this, node]() { this, [this, node]() {
auto dialog = new AddUniverseDialog(this, 1); auto dialog = new AddUniverseDialog(this, 1);
@ -73,7 +71,6 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node)
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->open(); dialog->open();
}); });
connect(ui->actionTerminate, &QAction::triggered, connect(ui->actionTerminate, &QAction::triggered,
this, [&, node]() { this, [&, node]() {
auto index = ui->multiverseView->currentIndex(); auto index = ui->multiverseView->currentIndex();
@ -85,7 +82,6 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node)
node->terminate(univ->number()); node->terminate(univ->number());
} }
}); });
connect(ui->actionSubscribe, &QAction::triggered, connect(ui->actionSubscribe, &QAction::triggered,
this, [this, node]() { this, [this, node]() {
auto val = QVariant(1); auto val = QVariant(1);
@ -103,7 +99,6 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node)
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->open(); dialog->open();
}); });
connect(ui->actionUnsubscribe, &QAction::triggered, connect(ui->actionUnsubscribe, &QAction::triggered,
this, [&, node]() { this, [&, node]() {
auto index = ui->multiverseView->currentIndex(); auto index = ui->multiverseView->currentIndex();
@ -115,10 +110,10 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node)
node->unsubscribe(univ->number()); node->unsubscribe(univ->number());
} }
}); });
connect(ui->actionInspect, &QAction::triggered,
connect(ui->actionDiscovery, &QAction::toggled, this, [this]() {
node, [&, node](bool checked) { auto selected = ui->multiverseView->currentIndex();
checked ? node->discoveryStart() : node->discoveryStop(); openUniverseEditor(selected);
}); });
} }

View File

@ -45,7 +45,6 @@ class MultiverseWindow
: public QMainWindow : public QMainWindow
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit MultiverseWindow(QWidget *parent = nullptr, explicit MultiverseWindow(QWidget *parent = nullptr,
QSacnNode* node = nullptr); QSacnNode* node = nullptr);