From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sat, 29 Oct 2011 22:43:48 +0000 (+0200)
Subject: Qt, sprefs: use the Color Selector
X-Git-Tag: 1.2.0-pre1~54
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6c3405e7274f9b9f5079d89d8a1f0c223c8b4bd5;p=vlc

Qt, sprefs: use the Color Selector
---

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index ea2ab913c3..b24d99431d 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -636,7 +636,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "sub-language", String, ui.subLangLabel,
                             preferredLanguage );
             CONFIG_GENERIC_NO_BOOL( "freetype-font", Font, ui.fontLabel, font );
-            CONFIG_GENERIC( "freetype-color", IntegerList, ui.fontColorLabel,
+            CONFIG_GENERIC_NO_BOOL( "freetype-color", Color, ui.fontColorLabel,
                             fontColor );
             CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList,
                             ui.fontSizeLabel, fontSize );
diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index bd363f2c99..033f4bd8a5 100644
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -153,13 +153,7 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QComboBox" name="fontColor">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+       <widget class="QPushButton" name="fontColor">
        </widget>
       </item>
       <item row="2" column="0">