X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ui_mainwindow.ui;h=d727155c1d3a557d229a4602070c49da67a7e559;hb=327534a3031a332423411c9599c741f2f81657df;hp=256390aa543a5d4b4efdd87f3f70974bd210a9cc;hpb=8db504e0abc3d6b5d64f2fc790c4f751c5e0e778;p=nageru

diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui
index 256390a..d727155 100644
--- 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>
@@ -539,65 +539,85 @@
            <number>0</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" name="compact_header">
-            <property name="spacing">
-             <number>0</number>
+           <widget class="QWidget" name="compact_header" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>8</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <item>
-             <widget class="QLabel" name="compact_label">
-              <property name="text">
-               <string>Compact audio view  </string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QToolButton" name="compact_prev_page">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>15</width>
-                <height>15</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>...</string>
-              </property>
-              <property name="autoRaise">
-               <bool>true</bool>
-              </property>
-              <property name="arrowType">
-               <enum>Qt::LeftArrow</enum>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QToolButton" name="compact_next_page">
-              <property name="maximumSize">
-               <size>
-                <width>15</width>
-                <height>15</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>...</string>
-              </property>
-              <property name="autoRaise">
-               <bool>true</bool>
-              </property>
-              <property name="arrowType">
-               <enum>Qt::RightArrow</enum>
-              </property>
-             </widget>
-            </item>
-           </layout>
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
+             <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>
+              <widget class="QLabel" name="compact_label">
+               <property name="text">
+                <string>Compact audio view (1/3)  </string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="compact_prev_page">
+               <property name="enabled">
+                <bool>true</bool>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>15</width>
+                 <height>15</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="autoRaise">
+                <bool>true</bool>
+               </property>
+               <property name="arrowType">
+                <enum>Qt::LeftArrow</enum>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QToolButton" name="compact_next_page">
+               <property name="maximumSize">
+                <size>
+                 <width>15</width>
+                 <height>15</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>...</string>
+               </property>
+               <property name="autoRaise">
+                <bool>true</bool>
+               </property>
+               <property name="arrowType">
+                <enum>Qt::RightArrow</enum>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </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>
@@ -605,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>497</width>
+                 <height>235</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">
@@ -887,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>
@@ -996,7 +1056,7 @@
             <item>
              <widget class="QLabel" name="full_label">
               <property name="text">
-               <string>Full audio view  </string>
+               <string>Full audio view (2/3)  </string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -1047,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>
@@ -1055,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>722</width>
+                 <height>281</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">
@@ -1239,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>
@@ -1278,6 +1378,83 @@
           </item>
          </layout>
         </widget>
+        <widget class="QWidget" name="video_grid_view">
+         <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,1">
+          <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="video_grid_header" stretch="0,0,0">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="video_grid_label">
+              <property name="text">
+               <string>Video grid display (3/3)  </string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="video_grid_prev_page">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>15</width>
+                <height>15</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="autoRaise">
+               <bool>true</bool>
+              </property>
+              <property name="arrowType">
+               <enum>Qt::LeftArrow</enum>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="video_grid_next_page">
+              <property name="maximumSize">
+               <size>
+                <width>15</width>
+                <height>15</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="autoRaise">
+               <bool>true</bool>
+              </property>
+              <property name="arrowType">
+               <enum>Qt::RightArrow</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QWidget" name="preview_displays_grid" native="true"/>
+          </item>
+         </layout>
+        </widget>
        </widget>
       </item>
      </layout>
@@ -1290,30 +1467,59 @@
      <x>0</x>
      <y>0</y>
      <width>1089</width>
-     <height>23</height>
+     <height>22</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="quick_cut_enable_action"/>
     <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">
     <property name="title">
      <string>&amp;Audio</string>
     </property>
+    <addaction name="simple_audio_mode"/>
+    <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>
@@ -1342,6 +1548,64 @@
     <string>&amp;Input mapping…</string>
    </property>
   </action>
+  <action name="simple_audio_mode">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Simple</string>
+   </property>
+  </action>
+  <action name="multichannel_audio_mode">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <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>
+  <action name="quick_cut_enable_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Enable &amp;quick-cut keys (Q, W, E, etc.)</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -1351,6 +1615,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>