[vlc-commits] Qt, sprefs: use the Color Selector

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Oct 30 00:43:48 2011 +0200| [6c3405e7274f9b9f5079d89d8a1f0c223c8b4bd5] | committer: Jean-Baptiste Kempf

Qt, sprefs: use the Color Selector

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c3405e7274f9b9f5079d89d8a1f0c223c8b4bd5
---

 modules/gui/qt4/components/simple_preferences.cpp |    2 +-
 modules/gui/qt4/ui/sprefs_subtitles.ui            |    8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index ea2ab91..b24d994 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 bd363f2..033f4bd 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">