diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index ea2ab913c3b6d746cdc13a246dcbe346f7c735b8..b24d99431da0d6cc0cbb094f597f40351a3f8928 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 bd363f2c992411f6f3d1a88125450667951cea00..033f4bd8a5167fe3a534941b38586eb50c5a53e3 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">