Merge branch 'master' into feature/pkey

[kdenlive] / src / widgets / dvdwizardmenu_ui.ui

diff --git a/src/widgets/dvdwizardmenu_ui.ui b/src/widgets/dvdwizardmenu_ui.ui
index f7b3fe9b5101d57d5db93560626a3a13eeba57c5..ba524d852e00d26aa84707fc6f09781096298f2f 100644 (file)
--- a/src/widgets/dvdwizardmenu_ui.ui
+++ b/src/widgets/dvdwizardmenu_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>335</width>
-    <height>371</height>
+    <width>439</width>
+    <height>368</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_5">
@@ -56,17 +56,17 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="2">
+          <item row="0" column="1">
            <widget class="KLineEdit" name="play_text"/>
           </item>
-          <item row="0" column="3">
+          <item row="0" column="2">
            <widget class="QLabel" name="label_6">
             <property name="text">
              <string>Target</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="4">
+          <item row="0" column="3">
            <widget class="KComboBox" name="target_list">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -76,6 +76,13 @@
             </property>
            </widget>
           </item>
+          <item row="0" column="4" colspan="3">
+           <widget class="QCheckBox" name="back_to_menu">
+            <property name="text">
+             <string>Back to menu</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_4">
             <property name="text">
@@ -96,28 +103,49 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="2" colspan="4">
+          <item row="1" column="2" colspan="3">
            <widget class="QFontComboBox" name="font_family"/>
           </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QLabel" name="label_5">
+          <item row="1" column="5">
+           <widget class="KColorButton" name="text_color">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="color">
+             <color>
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+             </color>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="6">
+           <widget class="QCheckBox" name="use_shadow">
             <property name="text">
-             <string>Button colors</string>
+             <string>Shadow</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="2" column="2" colspan="4">
+          <item row="2" column="0" colspan="7">
            <layout class="QHBoxLayout" name="horizontalLayout">
             <item>
-             <widget class="KColorButton" name="text_color">
+             <widget class="QLabel" name="label_2">
               <property name="text">
-               <string/>
+               <string>Underline</string>
               </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="KColorButton" name="highlighted_color">
               <property name="color">
                <color>
                 <red>255</red>
-                <green>255</green>
-                <blue>255</blue>
+                <green>85</green>
+                <blue>0</blue>
                </color>
               </property>
              </widget>
@@ -134,25 +162,20 @@
              </widget>
             </item>
             <item>
-             <widget class="KColorButton" name="highlighted_color">
-              <property name="color">
-               <color>
-                <red>255</red>
-                <green>85</green>
-                <blue>0</blue>
-               </color>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
               </property>
-             </widget>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
             </item>
            </layout>
           </item>
-          <item row="0" column="5">
-           <widget class="QCheckBox" name="back_to_menu">
-            <property name="text">
-             <string>Back to menu</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="tab_2">
@@ -270,14 +293,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KIntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>knuminput.h</header>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>KUrlRequester</class>
-   <extends>QFrame</extends>
-   <header>kurlrequester.h</header>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KLineEdit</class>
@@ -285,14 +308,14 @@
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
+   <class>KIntSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>knuminput.h</header>
   </customwidget>
   <customwidget>
-   <class>KColorButton</class>
-   <extends>QPushButton</extends>
-   <header>kcolorbutton.h</header>
+   <class>KUrlRequester</class>
+   <extends>QFrame</extends>
+   <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>
  <resources/>