new config page for sdl settings

svn path=/branches/KDE4/; revision=2353

diff --git a/src/widgets/configdisplay_ui.ui b/src/widgets/configdisplay_ui.ui
index 8adc83a0dedaeb2a86378af10f5dbcc22cae4ebc..dce590848f6455be6c8a421a77d14ea8cb71568a 100644 (file)
--- a/src/widgets/configdisplay_ui.ui
+++ b/src/widgets/configdisplay_ui.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>353</width>
-    <height>255</height>
+    <height>197</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2" >
@@ -53,17 +53,31 @@
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" >
+   <item row="1" column="0" colspan="2" >
+    <widget class="QCheckBox" name="kcfg_showmarkers" >
+     <property name="text" >
+      <string>Display clip markers comments</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3" >
+    <widget class="QCheckBox" name="kcfg_autoscroll" >
+     <property name="text" >
+      <string>Autoscroll while playing</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
     <widget class="QLabel" name="label" >
      <property name="text" >
       <string>Track height</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" >
+   <item row="3" column="1" >
     <widget class="QSpinBox" name="kcfg_trackheight" />
    </item>
-   <item row="4" column="2" >
+   <item row="3" column="2" >
     <spacer name="horizontalSpacer_2" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
@@ -84,25 +98,11 @@
      <property name="sizeHint" stdset="0" >
       <size>
        <width>20</width>
-       <height>56</height>
+       <height>23</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QCheckBox" name="kcfg_showmarkers" >
-     <property name="text" >
-      <string>Display clip markers comments</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="3" >
-    <widget class="QCheckBox" name="kcfg_autoscroll" >
-     <property name="text" >
-      <string>Autoscroll while playing</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/src/widgets/configsdl_ui.ui b/src/widgets/configsdl_ui.ui
new file mode 100644 (file)
index 0000000..feac02c
--- /dev/null
+++ b/src/widgets/configsdl_ui.ui
@@ -0,0 +1,101 @@
+<ui version="4.0" >
+ <class>ConfigSdl_UI</class>
+ <widget class="QWidget" name="ConfigSdl_UI" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>325</width>
+    <height>146</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" colspan="2" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Warning: changes to the drivers and devices can make Kdenlive unstable. Change only if you know what you do.</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="textLabel1_2_2" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Video driver:</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="KComboBox" name="kcfg_video_driver" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="textLabel1_2" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Audio driver:</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="KComboBox" name="kcfg_audio_driver" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="textLabel1" >
+     <property name="text" >
+      <string>Audio device:</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="KComboBox" name="kcfg_audio_device" />
+   </item>
+   <item row="4" column="1" >
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>