X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=futatabi%2Fmainwindow.ui;h=addfbe2856c5beb5c2f93cdd61832c87e996efe1;hp=288da89691fcc54ae97d296f4bb7f44ebe5e4e4b;hb=55bc1e47c47dfdeeec06c55de9a53b95bdbbd326;hpb=94e776c2048ce5da187b605552cd15280b2c4275

diff --git a/futatabi/mainwindow.ui b/futatabi/mainwindow.ui
index 288da89..addfbe2 100644
--- a/futatabi/mainwindow.ui
+++ b/futatabi/mainwindow.ui
@@ -141,17 +141,53 @@
            </widget>
           </item>
           <item>
-           <spacer name="horizontalSpacer">
+           <widget class="QSlider" name="speed_slider">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimum">
+             <number>10</number>
+            </property>
+            <property name="maximum">
+             <number>200</number>
+            </property>
+            <property name="value">
+             <number>100</number>
+            </property>
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" stdset="0">
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="speed_lock_btn">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
              <size>
-              <width>40</width>
-              <height>20</height>
+              <width>72</width>
+              <height>0</height>
              </size>
             </property>
-           </spacer>
+            <property name="text">
+             <string> 100%</string>
+            </property>
+            <property name="icon">
+             <iconset>
+              <normalon>:/lock.svg</normalon>
+             </iconset>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
           <item>
            <widget class="QPushButton" name="stop_btn">
@@ -159,7 +195,8 @@
              <string>Stop</string>
             </property>
             <property name="icon">
-             <iconset theme="media-playback-stop"/>
+             <iconset theme="media-playback-stop">
+              <normaloff>.</normaloff>.</iconset>
             </property>
            </widget>
           </item>
@@ -182,124 +219,18 @@
        <layout class="QVBoxLayout" name="video_displays" stretch="1,2">
         <item>
          <layout class="QHBoxLayout" name="preview_and_live_panes">
+          <property name="spacing">
+           <number>3</number>
+          </property>
           <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>
+             <widget class="QFrame" name="preview_frame">
+              <property name="autoFillBackground">
+               <bool>true</bool>
               </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="input_pane" stretch="1,0">
-          <item>
-           <layout class="QGridLayout" name="input_displays">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item row="0" column="0">
-             <widget class="QFrame" name="input1_frame">
               <property name="frameShape">
-               <enum>QFrame::Box</enum>
+               <enum>QFrame::NoFrame</enum>
               </property>
               <property name="frameShadow">
                <enum>QFrame::Plain</enum>
@@ -307,7 +238,7 @@
               <property name="lineWidth">
                <number>0</number>
               </property>
-              <layout class="QGridLayout" name="gridLayout_2">
+              <layout class="QGridLayout" name="gridLayout_3">
                <property name="leftMargin">
                 <number>3</number>
                </property>
@@ -321,49 +252,36 @@
                 <number>3</number>
                </property>
                <item row="0" column="0">
-                <widget class="JPEGFrameView" name="input1_display" native="true">
-                 <property name="autoFillBackground">
-                  <bool>true</bool>
-                 </property>
-                </widget>
+                <widget class="JPEGFrameView" name="preview_display" native="true"/>
                </item>
               </layout>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QFrame" name="input3_frame">
-              <property name="frameShape">
-               <enum>QFrame::Box</enum>
-              </property>
-              <property name="frameShadow">
-               <enum>QFrame::Plain</enum>
-              </property>
-              <property name="lineWidth">
-               <number>0</number>
-              </property>
-              <layout class="QGridLayout" name="gridLayout_4">
-               <property name="leftMargin">
-                <number>3</number>
-               </property>
-               <property name="topMargin">
-                <number>3</number>
-               </property>
-               <property name="rightMargin">
-                <number>3</number>
-               </property>
-               <property name="bottomMargin">
-                <number>3</number>
-               </property>
-               <item row="0" column="0">
-                <widget class="JPEGFrameView" name="input3_display" native="true"/>
-               </item>
-              </layout>
-             </widget>
+            <item>
+             <layout class="QHBoxLayout" name="preview_layout" stretch="0">
+              <item>
+               <widget class="QLabel" name="preview_label">
+                <property name="text">
+                 <string>Preview output</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </item>
-            <item row="0" column="1">
-             <widget class="QFrame" name="input2_frame">
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="live_pane" stretch="1,0">
+            <item>
+             <widget class="QFrame" name="live_frame">
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
               <property name="frameShape">
-               <enum>QFrame::Box</enum>
+               <enum>QFrame::NoFrame</enum>
               </property>
               <property name="frameShadow">
                <enum>QFrame::Plain</enum>
@@ -371,7 +289,7 @@
               <property name="lineWidth">
                <number>0</number>
               </property>
-              <layout class="QGridLayout" name="gridLayout_3">
+              <layout class="QGridLayout" name="gridLayout_2">
                <property name="leftMargin">
                 <number>3</number>
                </property>
@@ -385,50 +303,34 @@
                 <number>3</number>
                </property>
                <item row="0" column="0">
-                <widget class="JPEGFrameView" name="input2_display" native="true">
-                 <property name="autoFillBackground">
-                  <bool>true</bool>
-                 </property>
-                </widget>
+                <widget class="JPEGFrameView" name="live_display" native="true"/>
                </item>
               </layout>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QFrame" name="input4_frame">
-              <property name="autoFillBackground">
-               <bool>true</bool>
-              </property>
-              <property name="frameShape">
-               <enum>QFrame::Box</enum>
-              </property>
-              <property name="frameShadow">
-               <enum>QFrame::Plain</enum>
+            <item>
+             <widget class="QLabel" name="live_label">
+              <property name="text">
+               <string>Current output (paused)</string>
               </property>
-              <property name="lineWidth">
-               <number>0</number>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
               </property>
-              <layout class="QGridLayout" name="gridLayout_5">
-               <property name="leftMargin">
-                <number>3</number>
-               </property>
-               <property name="topMargin">
-                <number>3</number>
-               </property>
-               <property name="rightMargin">
-                <number>3</number>
-               </property>
-               <property name="bottomMargin">
-                <number>3</number>
-               </property>
-               <item row="0" column="0">
-                <widget class="JPEGFrameView" name="input4_display" native="true"/>
-               </item>
-              </layout>
              </widget>
             </item>
            </layout>
           </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="input_pane" stretch="1,0">
+          <item>
+           <layout class="QGridLayout" name="input_displays">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+           </layout>
+          </item>
           <item>
            <widget class="QLabel" name="label">
             <property name="text">
@@ -477,9 +379,21 @@
      <addaction name="quality_3_action"/>
      <addaction name="quality_4_action"/>
     </widget>
+    <widget class="QMenu" name="padding_menu">
+     <property name="title">
+      <string>Cue point &amp;padding</string>
+     </property>
+     <addaction name="padding_0_action"/>
+     <addaction name="padding_1_action"/>
+     <addaction name="padding_2_action"/>
+     <addaction name="padding_5_action"/>
+    </widget>
     <addaction name="interpolation_menu"/>
+    <addaction name="padding_menu"/>
     <addaction name="menu_Export"/>
+    <addaction name="midi_mapping_action"/>
     <addaction name="exit_action"/>
+    <addaction name="separator"/>
    </widget>
    <widget class="QMenu" name="menu_Help">
     <property name="title">
@@ -580,6 +494,43 @@
     <string>Best (&amp;4) (not realtime on any current GPU)</string>
    </property>
   </action>
+  <action name="padding_0_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;0 seconds</string>
+   </property>
+  </action>
+  <action name="padding_1_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;1 second</string>
+   </property>
+  </action>
+  <action name="padding_2_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;2 seconds</string>
+   </property>
+  </action>
+  <action name="padding_5_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;5 seconds</string>
+   </property>
+  </action>
+  <action name="midi_mapping_action">
+   <property name="text">
+    <string>Setup MIDI controller…</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
@@ -588,6 +539,8 @@
    <header>jpeg_frame_view.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="mainwindow.qrc"/>
+ </resources>
  <connections/>
 </ui>