Get ready for the configurable background color of monitor display (MLT patch to...

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

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index b49ce190dbe27c0ebd649e3d9dfbef1823bb7efb..abe9cacbe65905e3d8b3b8917e7c31fbdbb9e0fa 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -113,6 +113,11 @@
       <default></default>
     </entry>
 
+    <entry name="window_background" type="Color">
+      <label>Background color for SDL monitor.</label>
+      <default>#999999</default>
+    </entry>
+
     <entry name="dropbframes" type="Bool">
       <label>Drop B Frames on H.264 clips for faster playback (For monitor preview only).</label>
       <default>false</default>

diff --git a/src/renderer.cpp b/src/renderer.cpp
index dce3d0329b9d7a08c67fcf676e911bceb4f71785..5c3d5e427332d777dc203715be603582e82c2b1b 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -114,6 +114,7 @@ void Render::buildConsumer() {
     m_mltConsumer->set("resize", 1);
     m_mltConsumer->set("window_id", m_winid);
     m_mltConsumer->set("terminate_on_pause", 1);
+    m_mltConsumer->set("window_background", (int) KdenliveSettings::window_background().rgb ());
 
     m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
     m_mltConsumer->set("rescale", "nearest");

diff --git a/src/widgets/configsdl_ui.ui b/src/widgets/configsdl_ui.ui
index 5163b81765e1242bf305be060531bd14a4244019..3473ad29aeaaf912e3a32249feb8f0157750be77 100644 (file)
--- a/src/widgets/configsdl_ui.ui
+++ b/src/widgets/configsdl_ui.ui
@@ -5,12 +5,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>228</height>
+    <width>358</width>
+    <height>217</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2" >
-   <item row="0" column="0" colspan="2" >
+   <item row="0" column="0" colspan="3" >
     <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>
@@ -36,7 +36,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
+   <item row="1" column="1" colspan="2" >
     <widget class="KComboBox" name="kcfg_video_driver" />
    </item>
    <item row="2" column="0" >
@@ -55,7 +55,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1" >
+   <item row="2" column="1" colspan="2" >
     <widget class="KComboBox" name="kcfg_audio_driver" />
    </item>
    <item row="3" column="0" >
@@ -68,10 +68,28 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1" >
+   <item row="3" column="1" colspan="2" >
     <widget class="KComboBox" name="kcfg_audio_device" />
    </item>
    <item row="4" column="0" colspan="2" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Monitor background color (requires restart)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2" >
+    <widget class="KColorButton" name="kcfg_window_background" >
+     <property name="defaultColor" >
+      <color>
+       <red>180</red>
+       <green>180</green>
+       <blue>180</blue>
+      </color>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="3" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Monitor Preview Speedup Settings</string>
@@ -87,7 +105,7 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="1" >
+   <item row="6" column="1" colspan="2" >
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -103,6 +121,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
+  </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>