Update the queue length metric after trimming, not before.

[nageru] / ui_mainwindow.ui

diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui
index 67bf75cee31f517d60258f381a0ae47adc4e73b8..19858aa1de2f1e8e68ba899926e3928dd75d016c 100644 (file)
--- a/ui_mainwindow.ui
+++ b/ui_mainwindow.ui
@@ -383,7 +383,7 @@
                </layout>
               </item>
               <item>
-               <widget class="QLabel" name="peak_display">
+               <widget class="ClickableLabel" name="peak_display">
                 <property name="minimumSize">
                  <size>
                   <width>30</width>
@@ -617,7 +617,7 @@
            </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="audiostrip" stretch="0,1,0">
+           <layout class="QHBoxLayout" name="audiostrip" stretch="0,0">
             <property name="spacing">
              <number>6</number>
             </property>
@@ -625,24 +625,64 @@
              <number>0</number>
             </property>
             <item>
-             <layout class="QHBoxLayout" name="faders">
-              <property name="sizeConstraint">
-               <enum>QLayout::SetFixedSize</enum>
+             <widget class="QScrollArea" name="fader_scroll">
+              <property name="frameShape">
+               <enum>QFrame::NoFrame</enum>
               </property>
-             </layout>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+              <property name="verticalScrollBarPolicy">
+               <enum>Qt::ScrollBarAlwaysOff</enum>
               </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
+              <property name="widgetResizable">
+               <bool>true</bool>
               </property>
-             </spacer>
+              <widget class="QWidget" name="fader_scroll_contents">
+               <property name="geometry">
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+                 <width>505</width>
+                 <height>238</height>
+                </rect>
+               </property>
+               <layout class="QHBoxLayout" name="horizontalLayout_4">
+                <property name="spacing">
+                 <number>0</number>
+                </property>
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>0</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QHBoxLayout" name="faders">
+                  <property name="sizeConstraint">
+                   <enum>QLayout::SetFixedSize</enum>
+                  </property>
+                 </layout>
+                </item>
+                <item>
+                 <spacer name="fader_spacer">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </widget>
+             </widget>
             </item>
             <item>
              <layout class="QGridLayout" name="master_audio_strip" columnstretch="0,0,0,0,0,0">
@@ -907,13 +947,13 @@
                  </size>
                 </property>
                 <property name="minimum">
-                 <number>-300</number>
+                 <number>-150</number>
                 </property>
                 <property name="maximum">
-                 <number>300</number>
+                 <number>150</number>
                 </property>
                 <property name="notchTarget">
-                 <double>60.000000000000000</double>
+                 <double>30.000000000000000</double>
                 </property>
                 <property name="notchesVisible">
                  <bool>true</bool>
@@ -1067,7 +1107,7 @@
            </layout>
           </item>
           <item>
-           <layout class="QHBoxLayout" name="audiostrip_2" stretch="0,1,0">
+           <layout class="QHBoxLayout" name="audiostrip_2" stretch="0,0">
             <property name="spacing">
              <number>6</number>
             </property>
@@ -1075,24 +1115,64 @@
              <number>0</number>
             </property>
             <item>
-             <layout class="QHBoxLayout" name="buses">
-              <property name="sizeConstraint">
-               <enum>QLayout::SetFixedSize</enum>
+             <widget class="QScrollArea" name="bus_scroll">
+              <property name="frameShape">
+               <enum>QFrame::NoFrame</enum>
               </property>
-             </layout>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_4">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+              <property name="verticalScrollBarPolicy">
+               <enum>Qt::ScrollBarAlwaysOff</enum>
               </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
+              <property name="widgetResizable">
+               <bool>true</bool>
               </property>
-             </spacer>
+              <widget class="QWidget" name="bus_scroll_contents">
+               <property name="geometry">
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+                 <width>46</width>
+                 <height>20</height>
+                </rect>
+               </property>
+               <layout class="QHBoxLayout" name="horizontalLayout_5">
+                <property name="spacing">
+                 <number>0</number>
+                </property>
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>0</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <layout class="QHBoxLayout" name="buses">
+                  <property name="sizeConstraint">
+                   <enum>QLayout::SetFixedSize</enum>
+                  </property>
+                 </layout>
+                </item>
+                <item>
+                 <spacer name="buses_spacer">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>723</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </widget>
+             </widget>
             </item>
             <item>
              <layout class="QGridLayout" name="master_audio_strip_2" columnstretch="0,0,0,0">
@@ -1259,13 +1339,13 @@
                  </size>
                 </property>
                 <property name="minimum">
-                 <number>-300</number>
+                 <number>-150</number>
                 </property>
                 <property name="maximum">
-                 <number>300</number>
+                 <number>150</number>
                 </property>
                 <property name="notchTarget">
-                 <double>60.000000000000000</double>
+                 <double>30.000000000000000</double>
                 </property>
                 <property name="notchesVisible">
                  <bool>true</bool>
@@ -1310,21 +1390,45 @@
      <x>0</x>
      <y>0</y>
      <width>1089</width>
-     <height>23</height>
+     <height>20</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuWhat">
+   <widget class="QMenu" name="video_menu">
     <property name="title">
      <string>&amp;Video</string>
     </property>
+    <widget class="QMenu" name="display_timecode_menu">
+     <property name="title">
+      <string>Display &amp;time code</string>
+     </property>
+     <addaction name="timecode_stream_action"/>
+     <addaction name="timecode_stdout_action"/>
+    </widget>
+    <widget class="QMenu" name="hdmi_sdi_output_device_menu">
+     <property name="title">
+      <string>HDMI/SDI output device</string>
+     </property>
+     <addaction name="separator"/>
+    </widget>
+    <widget class="QMenu" name="hdmi_sdi_output_resolution_menu">
+     <property name="title">
+      <string>HDMI/SDI output resolution</string>
+     </property>
+     <addaction name="separator"/>
+    </widget>
     <addaction name="cut_action"/>
+    <addaction name="open_analyzer_action"/>
     <addaction name="x264_bitrate_action"/>
+    <addaction name="hdmi_sdi_output_device_menu"/>
+    <addaction name="hdmi_sdi_output_resolution_menu"/>
+    <addaction name="display_timecode_menu"/>
     <addaction name="exit_action"/>
    </widget>
    <widget class="QMenu" name="menu_Help">
     <property name="title">
      <string>&amp;Help</string>
     </property>
+    <addaction name="manual_action"/>
     <addaction name="about_action"/>
    </widget>
    <widget class="QMenu" name="menu_Audio">
@@ -1335,8 +1439,9 @@
     <addaction name="multichannel_audio_mode"/>
     <addaction name="separator"/>
     <addaction name="input_mapping_action"/>
+    <addaction name="midi_mapping_action"/>
    </widget>
-   <addaction name="menuWhat"/>
+   <addaction name="video_menu"/>
    <addaction name="menu_Audio"/>
    <addaction name="menu_Help"/>
   </widget>
@@ -1384,6 +1489,37 @@
     <string>Multichannel</string>
    </property>
   </action>
+  <action name="midi_mapping_action">
+   <property name="text">
+    <string>Setup MIDI controller…</string>
+   </property>
+  </action>
+  <action name="manual_action">
+   <property name="text">
+    <string>Online &amp;manual…</string>
+   </property>
+  </action>
+  <action name="timecode_stream_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>In &amp;stream</string>
+   </property>
+  </action>
+  <action name="timecode_stdout_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>On standard &amp;output</string>
+   </property>
+  </action>
+  <action name="open_analyzer_action">
+   <property name="text">
+    <string>Open frame &amp;analyzer…</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -1393,6 +1529,11 @@
    <header>vumeter.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>clickable_label.h</header>
+  </customwidget>
   <customwidget>
    <class>GLWidget</class>
    <extends>QWidget</extends>