diff --git a/example/sACN Explorer/multiverseview.cpp b/example/sACN Explorer/multiverseview.cpp index a60393a..7e80e33 100644 --- a/example/sACN Explorer/multiverseview.cpp +++ b/example/sACN Explorer/multiverseview.cpp @@ -4,6 +4,7 @@ #include "multiversemodel.h" #include "ui_multiverseview.h" #include "universeview.h" +#include /** * @brief MultiverseView::MultiverseView @@ -21,9 +22,14 @@ MultiverseView::MultiverseView(QWidget *parent, QSacnNode *node) ui->actionUnsubscribe->setEnabled(false); ui->actionInspect->setEnabled(false); ui->actionDiscovery->setChecked(node->discoveryEnabled()); + ui->menubar->setNativeMenuBar(false); sortProxy->setSourceModel(model); + auto mergeMode = new QActionGroup(this); + mergeMode->addAction(ui->actionMergeModeHTP); + mergeMode->addAction(ui->actionMergeModeLTP); + ui->multiverseView->setModel(sortProxy); ui->multiverseView->setSortingEnabled(true); ui->multiverseView->sortByColumn(MultiverseModel::Column::Universe, diff --git a/example/sACN Explorer/multiverseview.ui b/example/sACN Explorer/multiverseview.ui index 8a36320..9403d3c 100644 --- a/example/sACN Explorer/multiverseview.ui +++ b/example/sACN Explorer/multiverseview.ui @@ -58,9 +58,19 @@ Receiver + + + Merge Mode + + + + + + + @@ -108,7 +118,8 @@ - + + .. Subscribe @@ -125,7 +136,8 @@ false - + + .. Unsubscribe @@ -139,7 +151,8 @@ - + + .. Create @@ -156,7 +169,8 @@ false - + + .. Terminate @@ -170,7 +184,8 @@ - + + .. User Assigned Component Name @@ -184,7 +199,8 @@ false - + + .. Inspect @@ -221,7 +237,7 @@ true - false + true false @@ -284,6 +300,37 @@ Retain at least 1 inacitve source on this universe. + + + true + + + true + + + false + + + LTP + + + Latest Takes Precedence + + + + + true + + + false + + + HTP + + + Highest Takes Precedence + +