From bee4d4172184d3d88806ada3886ecac5a15a3491 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sun, 29 Apr 2007 21:50:34 +0000 Subject: [PATCH] Qt4 - Simple Prefs: little adjustements. --- .../gui/qt4/components/simple_preferences.cpp | 33 +++++++++---------- modules/gui/qt4/ui/sprefs_audio.ui | 25 +++----------- modules/gui/qt4/ui/sprefs_subtitles.ui | 18 +++++++++- 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index dd4c019445..8e306c91a1 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -177,7 +177,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #ifdef WIN32 CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode ); - CONFIG_GENERIC( "directx-device", StringList, NULL, + CONFIG_GENERIC( "directx-device", StringList, NULL, dXdisplayDevice ); #else ui.directXBox->setVisible( false ); @@ -206,13 +206,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #endif CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); - CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, + CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, defaultVolume ); - CONFIG_GENERIC( "audio-language" , StringList , NULL, - preferredAudioLanguage ); //FIXME + CONFIG_GENERIC( "audio-language" , String , NULL, + preferredAudioLanguage ); CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox ); - CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, + CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, detectionDolby ); CONFIG_GENERIC( "aout" , Module , NULL, outputModule ); @@ -220,15 +220,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice ); CONFIG_GENERIC_FILE( "dspdev" , File , NULL, OSSDevice, OSSBrowse ); #else - CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, + CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, DirectXDevice ); #endif - CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName, + CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName, fileBrowseButton ); CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); // CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME - CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, + CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, volNormalizer ); CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation); END_SPREFS_CAT; @@ -259,27 +259,24 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.skinsLabel->setFont( italicFont ); #if defined( WIN32 ) || defined (__APPLE__) - CONFIG_GENERIC( "language", StringList, NULL, language );//FIXME + CONFIG_GENERIC( "language", StringList, NULL, language ); #else ui.language->hide(); ui.languageLabel->hide(); #endif /* interface */ -/* p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" ); + p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" ); if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" )) { ui.qt4->setChecked( true ); - control = new StringConfigControl( VLC_OBJECT(p_intf), - p_config, NULL, ui.qt4 ); - controls.append( control ); } if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" )) { ui.skins->setChecked( true ); - }*/ -// CONFIG_GENERIC( "intf", Module, NULL, Interface ); + } //FIXME interface choice + CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo ); CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, skinBrowse ); @@ -296,9 +293,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "osd", Bool, NULL, OSDBox); CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); - CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );//FIXME - CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, - fontBrowse ); + CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage ); + CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, + fontBrowse ); CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor ); CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL, fontSize ); diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui index 058f61b2a9..d628420571 100644 --- a/modules/gui/qt4/ui/sprefs_audio.ui +++ b/modules/gui/qt4/ui/sprefs_audio.ui @@ -6,8 +6,8 @@ 0 0 - 418 - 539 + 461 + 554 @@ -77,24 +77,6 @@ - - - - - 1 - 0 - 0 - 0 - - - - - 300 - 16777215 - - - - @@ -130,6 +112,9 @@ + + + diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui index 93793f4041..4061b29673 100644 --- a/modules/gui/qt4/ui/sprefs_subtitles.ui +++ b/modules/gui/qt4/ui/sprefs_subtitles.ui @@ -6,7 +6,7 @@ 0 0 427 - 359 + 365 @@ -49,6 +49,14 @@ + + + 5 + 5 + 0 + 0 + + Subtitles languages @@ -68,6 +76,14 @@ + + + 5 + 0 + 0 + 0 + + 12 -- 2.39.2