official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

merge mode is a property of the universe not the receiver

This commit is contained in:
Kevin Matz 2022-12-11 10:00:24 -05:00
parent 628459840d
commit b48c90bfee
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
example/sACN Explorer/multiversewindow.ui
View File

@ -54,13 +54,6 @@
<property name="title">
<string>Universe</string>
</property>
<addaction name="actionInspect"/>
<addaction name="actionUniverseHoldLastLook"/>
</widget>
<widget class="QMenu" name="menuReceiver">
<property name="title">
<string>Receiver</string>
</property>
<widget class="QMenu" name="menuMerge_Mode">
<property name="title">
<string>Merge Mode</string>
@ -68,6 +61,14 @@
<addaction name="actionMergeModeHTP"/>
<addaction name="actionMergeModeLTP"/>
</widget>
<addaction name="actionInspect"/>
<addaction name="actionUniverseHoldLastLook"/>
<addaction name="menuMerge_Mode"/>
</widget>
<widget class="QMenu" name="menuReceiver">
<property name="title">
<string>Receiver</string>
</property>
<property name="icon">
<iconset theme="network-receive"/>
</property>
@ -75,8 +76,6 @@
<addaction name="actionUnsubscribe"/>
<addaction name="separator"/>
<addaction name="actionDiscovery"/>
<addaction name="separator"/>
<addaction name="menuMerge_Mode"/>
</widget>
<widget class="QMenu" name="menuSource">
<property name="title">