X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=dd6ea8d5724e56bd7e7938067194c4b588a14789;hb=5d313c65e44d8963262fdbc5d5d52f5169f3f787;hp=b8de3dfac0d47d98117ce7be2cb18eb9ea5f94a7;hpb=62126df626d8eca871073cf207ed445c31587c77;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index b8de3dfac0..dd6ea8d572 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * simple_preferences.cpp : "Simple preferences" **************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright (C) 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -22,6 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -39,6 +40,8 @@ #include #include +#include + #include #define ICON_HEIGHT 64 @@ -59,7 +62,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) : #define ADD_CATEGORY( button, label, icon, numb ) \ QToolButton * button = new QToolButton( this ); \ - button->setIcon( QIcon( ":/pixmaps/" #icon ) ); \ + button->setIcon( QIcon( ":/pixmaps/prefs/" #icon ) ); \ button->setIconSize( QSize( ICON_HEIGHT , ICON_HEIGHT ) ); \ button->setText( label ); \ button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \ @@ -74,9 +77,9 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) : spref_cone_Interface_64.png, 0 ); ADD_CATEGORY( SPrefsAudio, qtr("Audio"), spref_cone_Audio_64.png, 1 ); ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png, 2 ); - ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles & OSD"), + ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles && OSD"), spref_cone_Subtitles_64.png, 3 ); - ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"), + ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input && Codecs"), spref_cone_Input_64.png, 4 ); ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 ); @@ -177,7 +180,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, /****************************** * VIDEO Panel Implementation * ******************************/ - START_SPREFS_CAT( Video , qtr("General video settings") ); + START_SPREFS_CAT( Video , qtr("General Video Settings") ); CONFIG_GENERIC( "video", Bool, NULL, enableVideo ); CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen ); @@ -207,7 +210,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, /****************************** * AUDIO Panel Implementation * ******************************/ - START_SPREFS_CAT( Audio, qtr("General audio settings") ); + START_SPREFS_CAT( Audio, qtr("General Audio Settings") ); CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); @@ -297,7 +300,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONNECT( ui.outputModule, currentIndexChanged( int ), this, updateAudioOptions( int ) ); - // File exists everywhere + /* File output exists on all platforms */ CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel, ui.fileName, ui.fileBrowseButton ); @@ -333,7 +336,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin, setEnabled( bool ) ); - qs_filter = qfu( config_GetPsz( p_intf, "audio-filter" ) ); + char* psz = config_GetPsz( p_intf, "audio-filter" ); + qs_filter = qfu( psz ); + free( psz ); bool b_normalizer = ( qs_filter.contains( "volnorm" ) ); { ui.volNormBox->setChecked( b_normalizer ); @@ -346,16 +351,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, END_SPREFS_CAT; /* Input and Codecs Panel Implementation */ - START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") ); + START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs Settings") ); /* Disk Devices */ { ui.DVDDevice->setToolTip( - //TODO: make this sentence understandable - qtr( "If this property is blank, then you have\n" - "values for DVD, VCD, and CDDA.\n" - "You can define a unique one or set that in" - "the advanced preferences" ) ); + qtr( "If this property is blank, different values\n" + "for DVD, VCD, and CDDA are set.\n" + "You can define a unique one or configure them \n" + "individually in the advanced preferences." ) ); char *psz_dvddiscpath = config_GetPsz( p_intf, "dvd" ); char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" ); char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" ); @@ -365,8 +369,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, { ui.DVDDevice->setText( qfu( psz_dvddiscpath ) ); } - delete psz_cddadiscpath; delete psz_dvddiscpath; - delete psz_vcddiscpath; + free( psz_cddadiscpath ); + free( psz_dvddiscpath ); + free( psz_vcddiscpath ); } CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); @@ -380,7 +385,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.systemCodecBox->hide(); #endif /* Access Filters */ - qs_filter = qfu( config_GetPsz( p_intf, "access-filter" ) ); + char* psz = config_GetPsz( p_intf, "access-filter" ); + qs_filter = qfu( psz ); + free( psz ); ui.timeshiftBox->setChecked( qs_filter.contains( "timeshift" ) ); ui.dumpBox->setChecked( qs_filter.contains( "dump" ) ); ui.recordBox->setChecked( qs_filter.contains( "record" ) ); @@ -447,7 +454,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, /******************* * Interface Panel * *******************/ - START_SPREFS_CAT( Interface, qtr("Interface settings") ); + START_SPREFS_CAT( Interface, qtr("Interface Settings") ); ui.defaultLabel->setFont( italicFont ); ui.skinsLabel->setFont( italicFont ); @@ -470,7 +477,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, else if( strstr( psz_intf, "qt" ) ) ui.qt4->setChecked( true ); } - delete psz_intf; + free( psz_intf ); optionWidgets.append( ui.skins ); optionWidgets.append( ui.qt4 ); @@ -478,12 +485,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "qt-display-mode", IntegerList, NULL, displayModeBox ); CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo ); + CONFIG_GENERIC( "qt-fs-controller", Bool, NULL, fsController ); CONFIG_GENERIC_FILE( "skins2-last", File, NULL, ui.fileSkin, ui.skinBrowse ); CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher ); - CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher ); /* UPDATE options */ #ifdef UPDATE_CHECK @@ -497,7 +504,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.updatesDays->hide(); #endif /* ONE INSTANCE options */ -#if defined( WIN32 ) || defined( HAVE_DBUS_3 ) || defined(__APPLE__) +#if defined( WIN32 ) || defined( HAVE_DBUS ) || defined(__APPLE__) CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode ); CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, EnqueueOneInterfaceMode ); @@ -506,7 +513,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #endif END_SPREFS_CAT; - START_SPREFS_CAT( Subtitles, qtr("Subtitles & OSD settings") ); + START_SPREFS_CAT( Subtitles, qtr("Subtitles & On Screen Display Settings") ); CONFIG_GENERIC( "osd", Bool, NULL, OSDBox); CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); @@ -563,6 +570,12 @@ void SPrefsPanel::updateAudioOptions( int number) optionWidgets[fileW]->setVisible( ( value == "aout_file" ) ); } + +SPrefsPanel::~SPrefsPanel() +{ + qDeleteAll( controls ); controls.clear(); +} + void SPrefsPanel::updateAudioVolume( int volume ) { qobject_cast(optionWidgets[volLW]) @@ -761,8 +774,8 @@ void SPrefsPanel::assoDialog() aTa( ".a52" ); aTa( ".aac" ); aTa( ".ac3" ); aTa( ".dts" ); aTa( ".flac" ); aTa( ".m4a" ); aTa( ".m4p" ); aTa( ".mka" ); aTa( ".mod" ); aTa( ".mp1" ); - aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".ogg" ); aTa( ".spx" ); aTa( ".wav" ); - aTa( ".wma" ); aTa( ".xm" ); + aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".oma" ); aTa( ".ogg" ); aTa( ".spx" ); + aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" ); audioType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ? Qt::Checked : Qt::PartiallyChecked ) @@ -770,10 +783,10 @@ void SPrefsPanel::assoDialog() i_temp = 0; aTv( ".asf" ); aTv( ".avi" ); aTv( ".divx" ); aTv( ".dv" ); aTv( ".flv" ); - aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m4v" ); aTv( ".mkv" ); - aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" ); + aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m2ts" ); aTv( ".m4v" ); + aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" ); aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" ); - aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ps" ); aTv( ".ts" ); + aTv( ".mts" ); aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ps" ); aTv( ".ts" ); aTv( ".vob" ); aTv( ".wmv" ); videoType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ?