Merge branch 'master' into audioAlign

[kdenlive] / src / widgets / dvdwizardmenu_ui.ui

diff --git a/src/widgets/dvdwizardmenu_ui.ui b/src/widgets/dvdwizardmenu_ui.ui
index 346cd663db2df79224a6c6b2f946330aaf671664..f7b3fe9b5101d57d5db93560626a3a13eeba57c5 100644 (file)
--- a/src/widgets/dvdwizardmenu_ui.ui
+++ b/src/widgets/dvdwizardmenu_ui.ui
@@ -6,11 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>549</width>
-    <height>451</height>
+    <width>335</width>
+    <height>371</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_5">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item row="0" column="0">
     <widget class="QCheckBox" name="create_menu">
      <property name="text">
@@ -18,63 +21,19 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="KComboBox" name="menu_profile"/>
-   </item>
    <item row="1" column="0" colspan="2">
     <widget class="QGroupBox" name="menu_box">
      <property name="title">
       <string/>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="1" column="0">
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <widget class="QToolButton" name="add_button">
-          <property name="text">
-           <string>A</string>
-          </property>
-          <property name="popupMode">
-           <enum>QToolButton::InstantPopup</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QToolButton" name="delete_button">
-          <property name="text">
-           <string>D</string>
-          </property>
-          <property name="popupMode">
-           <enum>QToolButton::InstantPopup</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="1" rowspan="3">
-         <widget class="QGraphicsView" name="menu_preview">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="0">
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0" colspan="2">
        <widget class="QTabWidget" name="tabWidget">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -208,7 +167,7 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="0" column="1" colspan="2">
            <widget class="KComboBox" name="background_list">
             <item>
              <property name="text">
@@ -227,16 +186,83 @@
             </item>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="1" column="1" colspan="2">
            <widget class="KColorButton" name="background_color"/>
           </item>
           <item row="2" column="1">
            <widget class="KUrlRequester" name="background_image"/>
           </item>
+          <item row="2" column="2">
+           <widget class="QCheckBox" name="loop_movie">
+            <property name="text">
+             <string>Loop</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QToolButton" name="add_button">
+        <property name="text">
+         <string>A</string>
+        </property>
+        <property name="popupMode">
+         <enum>QToolButton::InstantPopup</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" rowspan="5">
+       <widget class="QGraphicsView" name="menu_preview">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QToolButton" name="delete_button">
+        <property name="text">
+         <string>D</string>
+        </property>
+        <property name="popupMode">
+         <enum>QToolButton::InstantPopup</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QToolButton" name="zoom_button">
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QToolButton" name="unzoom_button">
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>135</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="6" column="0" colspan="2">
+       <widget class="QLabel" name="error_message"/>
+      </item>
      </layout>
     </widget>
    </item>