Hook up a third input, the SBS mix. Required hooking up ResizeEffect.

[nageru] / ui_mainwindow.ui

diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui
index 485904ef8af51bb08c7a376aed2910a75b216e2e..8b143d8c25fe6f97e89c4fc90da8957705a163b7 100644 (file)
--- a/ui_mainwindow.ui
+++ b/ui_mainwindow.ui
@@ -25,7 +25,7 @@
    </property>
    <layout class="QGridLayout" name="gridLayout">
     <item row="0" column="0">
-     <layout class="QVBoxLayout" name="verticalLayout" stretch="3,0,1,0">
+     <layout class="QVBoxLayout" name="verticalLayout" stretch="2,0,1">
       <item>
        <layout class="QHBoxLayout" name="me_displays" stretch="0,0,0">
         <item>
@@ -34,7 +34,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="QOpenGLWidget" name="me_preview">
+           <widget class="GLWidget" name="me_preview">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>1</horstretch>
@@ -58,21 +58,21 @@
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <widget class="QPushButton" name="pushButton_4">
+           <widget class="QPushButton" name="cut_btn">
             <property name="text">
              <string>Cut</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="pushButton_6">
+           <widget class="QPushButton" name="fade_btn">
             <property name="text">
              <string>Fade</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="pushButton_5">
+           <widget class="QPushButton" name="wipe_btn">
             <property name="text">
              <string>Wipe</string>
             </property>
@@ -140,7 +140,7 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="QOpenGLWidget" name="preview2">
+         <widget class="GLWidget" name="preview1">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>1</horstretch>
@@ -150,7 +150,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QOpenGLWidget" name="preview1">
+         <widget class="GLWidget" name="preview2">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>1</horstretch>
@@ -160,7 +160,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QOpenGLWidget" name="preview3">
+         <widget class="GLWidget" name="preview3">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>1</horstretch>
@@ -170,7 +170,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QOpenGLWidget" name="preview4">
+         <widget class="QGLWidget" name="preview4">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>1</horstretch>
@@ -194,18 +194,9 @@
         </item>
        </layout>
       </item>
-      <item>
-       <widget class="QPushButton" name="pushButton_2">
-        <property name="text">
-         <string>PushButton</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </item>
    </layout>
-   <zorder>verticalLayoutWidget</zorder>
-   <zorder>me_preview</zorder>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
@@ -220,11 +211,11 @@
     <property name="title">
      <string>Video</string>
     </property>
-    <addaction name="actionExit"/>
+    <addaction name="exit_action"/>
    </widget>
    <addaction name="menuWhat"/>
   </widget>
-  <action name="actionExit">
+  <action name="exit_action">
    <property name="text">
     <string>Exit</string>
    </property>
@@ -234,7 +225,7 @@
  <customwidgets>
   <customwidget>
    <class>GLWidget</class>
-   <extends>QOpenGLWidget</extends>
+   <extends>QGLWidget</extends>
    <header>glwidget.h</header>
   </customwidget>
  </customwidgets>