Edit is normally to the left of View, so fix Futatabi.

[nageru] / futatabi / mainwindow.ui

diff --git a/futatabi/mainwindow.ui b/futatabi/mainwindow.ui
index 36d8a5ec9ffb0340b843591d15fa8ce655a6461a..0c77edb219d7847226746ce8749b1be2b4e827b1 100644 (file)
--- a/futatabi/mainwindow.ui
+++ b/futatabi/mainwindow.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1038</width>
+    <width>1061</width>
     <height>600</height>
    </rect>
   </property>
@@ -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">
@@ -175,6 +211,17 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QPushButton" name="next_btn">
+            <property name="text">
+             <string>Next (N)</string>
+            </property>
+            <property name="icon">
+             <iconset theme="media-skip-forward">
+              <normaloff>.</normaloff>.</iconset>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>
@@ -318,7 +365,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1038</width>
+     <width>1061</width>
      <height>22</height>
     </rect>
    </property>
@@ -343,18 +390,29 @@
      <addaction name="quality_3_action"/>
      <addaction name="quality_4_action"/>
     </widget>
-    <widget class="QMenu" name="padding_menu">
+    <widget class="QMenu" name="in_padding_menu">
      <property name="title">
-      <string>Cue point &amp;padding</string>
+      <string>Cue &amp;in point padding</string>
      </property>
-     <addaction name="padding_0_action"/>
-     <addaction name="padding_1_action"/>
-     <addaction name="padding_2_action"/>
-     <addaction name="padding_5_action"/>
+     <addaction name="in_padding_0_action"/>
+     <addaction name="in_padding_1_action"/>
+     <addaction name="in_padding_2_action"/>
+     <addaction name="in_padding_5_action"/>
+    </widget>
+    <widget class="QMenu" name="out_padding_menu">
+     <property name="title">
+      <string>Cue &amp;out point padding</string>
+     </property>
+     <addaction name="out_padding_0_action"/>
+     <addaction name="out_padding_1_action"/>
+     <addaction name="out_padding_2_action"/>
+     <addaction name="out_padding_5_action"/>
     </widget>
     <addaction name="interpolation_menu"/>
-    <addaction name="padding_menu"/>
+    <addaction name="in_padding_menu"/>
+    <addaction name="out_padding_menu"/>
     <addaction name="menu_Export"/>
+    <addaction name="midi_mapping_action"/>
     <addaction name="exit_action"/>
     <addaction name="separator"/>
    </widget>
@@ -372,8 +430,20 @@
     <addaction name="undo_action"/>
     <addaction name="redo_action"/>
    </widget>
+   <widget class="QMenu" name="view_menu">
+    <property name="title">
+     <string>V&amp;iew</string>
+    </property>
+    <widget class="QMenu" name="hide_camera_menu">
+     <property name="title">
+      <string>&amp;Hide camera</string>
+     </property>
+    </widget>
+    <addaction name="hide_camera_menu"/>
+   </widget>
    <addaction name="menuFile"/>
    <addaction name="menu_Edit"/>
+   <addaction name="view_menu"/>
    <addaction name="menu_Help"/>
   </widget>
   <action name="exit_action">
@@ -457,7 +527,7 @@
     <string>Best (&amp;4) (not realtime on any current GPU)</string>
    </property>
   </action>
-  <action name="padding_0_action">
+  <action name="in_padding_0_action">
    <property name="checkable">
     <bool>true</bool>
    </property>
@@ -465,7 +535,7 @@
     <string>&amp;0 seconds</string>
    </property>
   </action>
-  <action name="padding_1_action">
+  <action name="in_padding_1_action">
    <property name="checkable">
     <bool>true</bool>
    </property>
@@ -473,7 +543,44 @@
     <string>&amp;1 second</string>
    </property>
   </action>
-  <action name="padding_2_action">
+  <action name="in_padding_2_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;2 seconds</string>
+   </property>
+  </action>
+  <action name="in_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>
+  <action name="out_padding_0_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;0 seconds</string>
+   </property>
+  </action>
+  <action name="out_padding_1_action">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;1 seconds</string>
+   </property>
+  </action>
+  <action name="out_padding_2_action">
    <property name="checkable">
     <bool>true</bool>
    </property>
@@ -481,7 +588,7 @@
     <string>&amp;2 seconds</string>
    </property>
   </action>
-  <action name="padding_5_action">
+  <action name="out_padding_5_action">
    <property name="checkable">
     <bool>true</bool>
    </property>
@@ -497,6 +604,8 @@
    <header>jpeg_frame_view.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="mainwindow.qrc"/>
+ </resources>
  <connections/>
 </ui>