Put the video displays on the right side, making them generally larger.

diff --git a/mainwindow.cpp b/mainwindow.cpp
index d6353844b95dd7589f3c1a0c53b08d99b9417d69..656ff1e3467d9ddea16ff83987cca9430033e256 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -310,7 +310,8 @@ void MainWindow::resizeEvent(QResizeEvent *event)
 
 void MainWindow::relayout()
 {
-       ui->live_display->setMinimumHeight(ui->live_display->width() * 9 / 16);
+       ui->live_display->setMinimumWidth(ui->live_display->height() * 16 / 9);
+       ui->preview_display->setMinimumWidth(ui->preview_display->height() * 16 / 9);
 }
 
 bool MainWindow::eventFilter(QObject *watched, QEvent *event)

diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui
index f00e67c3db0cad018dfcdb168e884500a9b1b525..27986aae8c07a5e8a7f0bf18c4773200ef968bfd 100644 (file)
--- a/ui_mainwindow.ui
+++ b/ui_mainwindow.ui
@@ -18,148 +18,9 @@
     <item row="0" column="0">
      <widget class="QSplitter" name="splitter">
       <property name="orientation">
-       <enum>Qt::Vertical</enum>
+       <enum>Qt::Horizontal</enum>
       </property>
       <widget class="QWidget" name="horizontalLayoutWidget">
-       <layout class="QHBoxLayout" name="video_displays">
-        <item>
-         <layout class="QVBoxLayout" name="input_pane" stretch="1,0">
-          <item>
-           <layout class="QGridLayout" name="input_displays">
-            <item row="1" column="0">
-             <widget class="JPEGFrameView" name="input3_display" native="true"/>
-            </item>
-            <item row="0" column="1">
-             <widget class="JPEGFrameView" name="input2_display" native="true"/>
-            </item>
-            <item row="1" column="1">
-             <widget class="JPEGFrameView" name="input4_display" native="true"/>
-            </item>
-            <item row="0" column="0">
-             <widget class="JPEGFrameView" name="input1_display" native="true"/>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Current inputs</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="preview_pane" stretch="1,0">
-          <item>
-           <widget class="JPEGFrameView" name="preview_display" native="true"/>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="label_2">
-              <property name="text">
-               <string>Preview output</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="preview_1_btn">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>17</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>1</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="preview_2_btn">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>17</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>2</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="preview_3_btn">
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>17</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>3</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="preview_4_btn">
-              <property name="maximumSize">
-               <size>
-                <width>20</width>
-                <height>17</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>4</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="live_pane" stretch="1,0">
-          <item>
-           <widget class="JPEGFrameView" name="live_display" native="true"/>
-          </item>
-          <item>
-           <widget class="QLabel" name="live_label">
-            <property name="text">
-             <string>Current output (paused)</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="verticalLayoutWidget_4">
        <layout class="QVBoxLayout" name="clip_and_play_lists">
         <item>
          <widget class="QTableView" name="clip_list"/>
@@ -307,6 +168,149 @@
         </item>
        </layout>
       </widget>
+      <widget class="QWidget" name="verticalLayoutWidget_4">
+       <layout class="QVBoxLayout" name="video_displays" stretch="1,2">
+        <item>
+         <layout class="QHBoxLayout" name="preview_and_live_panes">
+          <item>
+           <layout class="QVBoxLayout" name="preview_pane" stretch="1,0">
+            <item>
+             <widget class="JPEGFrameView" name="preview_display" native="true"/>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_3">
+              <property name="spacing">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QLabel" name="label_2">
+                <property name="text">
+                 <string>Preview output</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="preview_1_btn">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>20</width>
+                  <height>17</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>1</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="preview_2_btn">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>20</width>
+                  <height>17</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>2</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="preview_3_btn">
+                <property name="maximumSize">
+                 <size>
+                  <width>20</width>
+                  <height>17</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>3</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="preview_4_btn">
+                <property name="maximumSize">
+                 <size>
+                  <width>20</width>
+                  <height>17</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>4</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="live_pane" stretch="1,0">
+            <item>
+             <widget class="JPEGFrameView" name="live_display" native="true"/>
+            </item>
+            <item>
+             <widget class="QLabel" name="live_label">
+              <property name="text">
+               <string>Current output (paused)</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="input_pane" stretch="1,0">
+          <item>
+           <layout class="QGridLayout" name="input_displays">
+            <item row="1" column="0">
+             <widget class="JPEGFrameView" name="input3_display" native="true"/>
+            </item>
+            <item row="0" column="0">
+             <widget class="JPEGFrameView" name="input1_display" native="true"/>
+            </item>
+            <item row="0" column="1">
+             <widget class="JPEGFrameView" name="input2_display" native="true"/>
+            </item>
+            <item row="1" column="1">
+             <widget class="JPEGFrameView" name="input4_display" native="true"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Current inputs</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
      </widget>
     </item>
    </layout>