X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=97ea6266bd8901fde3f6c1b261cece1abf0f4363;hb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;hp=a6a9930c23601911eb0a6c57d0521d5d47cca2ed;hpb=8ecdcd6cc4c2c91af53c10edca4ac15ebc4397b2;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index a6a9930c23..97ea6266bd 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * qt4.cpp : QT4 interface **************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright © 2006-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -21,6 +21,9 @@ * 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 #include #include @@ -28,10 +31,10 @@ #include #include "qt4.hpp" -#include #include "dialogs_provider.hpp" #include "input_manager.hpp" #include "main_interface.hpp" +#include "dialogs/help.hpp" /* update */ #ifdef HAVE_X11_XLIB_H #include @@ -39,6 +42,7 @@ #include "../../../share/vlc32x32.xpm" #include "../../../share/vlc32x32-christmas.xpm" +#include /***************************************************************************** * Local prototypes. @@ -53,13 +57,9 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -#define ALWAYS_VIDEO_TEXT N_( "Always show video area" ) -#define ALWAYS_VIDEO_LONGTEXT N_( "Start VLC with a cone image, and display it" \ - " when there is no video track." ) - #define ADVANCED_PREFS_TEXT N_( "Show advanced prefs over simple ones" ) -#define ADVANCED_PREFS_LONGTEXT N_( "Show advanced preferences and not simple " \ - "preferences when opening the preferences " \ +#define ADVANCED_PREFS_LONGTEXT N_( "Show advanced preferences and not simple "\ + "preferences when opening the preferences "\ "dialog." ) #define SYSTRAY_TEXT N_( "Systray icon" ) @@ -93,17 +93,12 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); " This option only works with Windows and " \ "X11 with composite extensions." ) -#define SHOWFLAGS_TEXT N_( "Define what columns to show in playlist window" ) -#define SHOWFLAGS_LONGTEXT N_( "Enter the sum of the options that you want: \n" \ - "Title: 1; Duration: 2; Artist: 4; Genre: 8; " \ - "Copyright: 16; Collection/album: 32; Rating: 256." ) - #define ERROR_TEXT N_( "Show unimportant error and warnings dialogs" ) -#define MINIMAL_TEXT N_( "Start in minimal view (menus hidden)." ) -#define UPDATER_TEXT N_( "Activate the new updates notification" ) +#define UPDATER_TEXT N_( "Activate the updates availability notification" ) #define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \ "versions of the software. It runs once a week." ) +#define UPDATER_DAYS_TEXT N_("Number of days between two update checks") #define COMPLETEVOL_TEXT N_( "Allow the volume to be set to 400%" ) #define COMPLETEVOL_LONGTEXT N_( "Allow the volume to have range from 0% to " \ @@ -111,13 +106,39 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); "can distort the audio, since it uses " \ "software amplification." ) +#define SAVEVOL_TEXT N_( "Automatically save the volume on exit" ) + #define BLING_TEXT N_( "Use non native buttons and volume slider" ) #define PRIVACY_TEXT N_( "Ask for network policy at start" ) +#define SLIDERCOL_TEXT N_( "Define the colours of the volume slider " ) +#define SLIDERCOL_LONGTEXT N_( "Define the colours of the volume slider\n " \ + "By specifying the 12 numbers separated by a ';'\n " \ + "Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n " \ + "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255' ") + +#define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" ) + +#define QT_MODE_TEXT N_( "Selection of the starting mode and look " ) +#define QT_MODE_LONGTEXT N_( "Start VLC with:\n" \ + " - normal mode\n" \ + " - a zone always present to show information" \ + "as lyrics, album arts...\n" \ + " - minimal mode with limited controls" ) + +#define QT_NORMAL_MODE_TEXT N_( "Classic look" ) +#define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete look with information area" ) +#define QT_MINIMAL_MODE_TEXT N_( "Minimal look with no menus" ) + +static const int i_mode_list[] = + { QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE }; +static const char *const psz_mode_list_text[] = + { QT_NORMAL_MODE_TEXT, QT_ALWAYS_VIDEO_MODE_TEXT, QT_MINIMAL_MODE_TEXT }; + vlc_module_begin(); - set_shortname( (char *)"Qt" ); - set_description( (char*)_("Qt interface") ); + set_shortname( "Qt" ); + set_description( N_("Qt interface") ); set_category( CAT_INTERFACE ) ; set_subcategory( SUBCAT_INTERFACE_MAIN ); set_capability( "interface", 151 ); @@ -129,48 +150,56 @@ vlc_module_begin(); set_description( "Dialogs provider" ); set_capability( "dialogs provider", 51 ); - add_bool( "qt-notification", VLC_TRUE, NULL, NOTIFICATION_TEXT, - NOTIFICATION_LONGTEXT, VLC_FALSE ); + add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL, + QT_MODE_TEXT, QT_MODE_LONGTEXT, false ); + change_integer_list( i_mode_list, psz_mode_list_text, 0 ); + + add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT, + NOTIFICATION_LONGTEXT, false ); + add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT, - OPACITY_LONGTEXT, VLC_FALSE ); - - add_bool( "qt-always-video", VLC_FALSE, NULL, ALWAYS_VIDEO_TEXT, - ALWAYS_VIDEO_LONGTEXT, VLC_TRUE ); - add_bool( "qt-system-tray", VLC_TRUE, NULL, SYSTRAY_TEXT, - SYSTRAY_LONGTEXT, VLC_FALSE); - add_bool( "qt-start-minimized", VLC_FALSE, NULL, MINIMIZED_TEXT, - MINIMIZED_LONGTEXT, VLC_TRUE); - add_bool( "qt-minimal-view", VLC_FALSE, NULL, MINIMAL_TEXT, - MINIMAL_TEXT, VLC_TRUE ); - - add_bool( "qt-name-in-title", VLC_TRUE, NULL, TITLE_TEXT, - TITLE_LONGTEXT, VLC_FALSE ); - add_bool( "qt-blingbling", VLC_TRUE, NULL, BLING_TEXT, - BLING_TEXT, VLC_FALSE ); - - add_bool( "qt-volume-complete", VLC_FALSE, NULL, COMPLETEVOL_TEXT, - COMPLETEVOL_LONGTEXT, VLC_TRUE ); + OPACITY_LONGTEXT, false ); + add_bool( "qt-blingbling", true, NULL, BLING_TEXT, + BLING_TEXT, false ); + + add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT, + SYSTRAY_LONGTEXT, false); + add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT, + MINIMIZED_LONGTEXT, true); + add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT, + TITLE_LONGTEXT, false ); + + add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT, + COMPLETEVOL_LONGTEXT, true ); + add_bool( "qt-autosave-volume", false, NULL, SAVEVOL_TEXT, + SAVEVOL_TEXT, true ); add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT, - FILEDIALOG_PATH_TEXT, VLC_TRUE ); + FILEDIALOG_PATH_TEXT, true ); change_autosave(); change_internal(); - add_bool( "qt-adv-options", VLC_FALSE, NULL, ADVANCED_OPTIONS_TEXT, - ADVANCED_OPTIONS_LONGTEXT, VLC_TRUE ); - add_bool( "qt-advanced-pref", VLC_FALSE, NULL, ADVANCED_PREFS_TEXT, - ADVANCED_PREFS_LONGTEXT, VLC_FALSE ); - add_bool( "qt-error-dialogs", VLC_TRUE, NULL, ERROR_TEXT, - ERROR_TEXT, VLC_FALSE ); - add_bool( "qt-updates-notif", VLC_TRUE, NULL, UPDATER_TEXT, - UPDATER_LONGTEXT, VLC_FALSE ); - - add_integer( "qt-pl-showflags", - VLC_META_ENGINE_ARTIST|VLC_META_ENGINE_TITLE| - VLC_META_ENGINE_DURATION|VLC_META_ENGINE_COLLECTION, - NULL, SHOWFLAGS_TEXT, - SHOWFLAGS_LONGTEXT, VLC_TRUE ); - add_bool( "privacy-ask", VLC_TRUE, NULL, PRIVACY_TEXT, PRIVACY_TEXT, - VLC_FALSE ); + add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT, + ADVANCED_OPTIONS_LONGTEXT, true ); + add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT, + ADVANCED_PREFS_LONGTEXT, false ); + add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT, + ERROR_TEXT, false ); +#ifdef UPDATE_CHECK + add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT, + UPDATER_LONGTEXT, false ); + add_integer( "qt-updates-days", 14, NULL, UPDATER_DAYS_TEXT, + UPDATER_DAYS_TEXT, false ); +#endif + add_string( "qt-slider-colours", + "255;255;255;20;226;20;255;176;15;235;30;20", + NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false ); + + add_bool( "qt-open-detail", false, NULL, VIEWDETAIL_TEXT, + VIEWDETAIL_TEXT, false ); + + add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT, + false ); + set_callbacks( OpenDialogs, Close ); vlc_module_end(); @@ -180,7 +209,7 @@ vlc_module_end(); static int Open( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; - p_intf->pf_run = Run; + #if defined Q_WS_X11 && defined HAVE_X11_XLIB_H /* Thanks for libqt4 calling exit() in QApplication::QApplication() * instead of returning an error, we have to check the X11 display */ @@ -192,6 +221,7 @@ static int Open( vlc_object_t *p_this ) } XCloseDisplay( p_display ); #endif + p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) ); if( !p_intf->p_sys ) { @@ -200,10 +230,13 @@ static int Open( vlc_object_t *p_this ) } memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) ); + p_intf->pf_run = Run; + p_intf->p_sys->p_playlist = pl_Yield( p_intf ); - p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); + p_intf->p_sys->p_sub = msg_Subscribe( p_intf ); - p_intf->b_play = VLC_TRUE; + /* We support play on start */ + p_intf->b_play = true; return VLC_SUCCESS; } @@ -222,10 +255,19 @@ static int OpenDialogs( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t *)p_this; + vlc_mutex_lock( &p_intf->object_lock ); - p_intf->b_dead = VLC_TRUE; + p_intf->b_dead = true; vlc_mutex_unlock( &p_intf->object_lock ); + if( p_intf->p_sys->b_isDialogProvider ) + { + DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL ); + QApplication::postEvent( THEDP, static_cast(event) ); + + vlc_thread_join( p_intf ); + } + vlc_object_release( p_intf->p_sys->p_playlist ); msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); free( p_intf->p_sys ); @@ -239,7 +281,7 @@ static void Run( intf_thread_t *p_intf ) { if( p_intf->pf_show_dialog ) { - if( vlc_thread_create( p_intf, "Qt dialogs", Init, 0, VLC_TRUE ) ) + if( vlc_thread_create( p_intf, "Qt dialogs", Init, 0, true ) ) msg_Err( p_intf, "failed to create Qt dialogs thread" ); } else @@ -254,12 +296,15 @@ static void Init( intf_thread_t *p_intf ) Q_INIT_RESOURCE( vlc ); -#ifndef WIN32 +#if !defined(WIN32) && !defined(__APPLE__) /* KLUDGE: * disables icon theme use because that makes Cleanlooks style bug * because it asks gconf for some settings that timeout because of threads * see commits 21610 21622 21654 for reference */ - QApplication::setDesktopSettingsAware( false ); + + /* If you don't have a gconftool-2 binary, you should comment this line */ + if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */ + QApplication::setDesktopSettingsAware( false ); #endif /* Start the QApplication here */ @@ -278,11 +323,16 @@ static void Init( intf_thread_t *p_intf ) { MainInterface *p_mi = new MainInterface( p_intf ); p_intf->p_sys->p_mi = p_mi; - p_mi->show(); + /* We don't show it because it is done in the MainInterface constructor + p_mi->show(); */ + p_intf->p_sys->b_isDialogProvider = false; } else - /*if( p_intf->pf_show_dialog )*/ + { vlc_thread_ready( p_intf ); + p_intf->p_sys->b_isDialogProvider = true; + } + #ifdef ENABLE_NLS // Translation - get locale @@ -293,7 +343,7 @@ static void Init( intf_thread_t *p_intf ) #if !defined( WIN32 ) QString path = QString( QT4LOCALEDIR ); #else - QString path = QString( QString(system_VLCPath()) + DIR_SEP + + QString path = QString( QString(config_GetDataDir()) + DIR_SEP + "locale" + DIR_SEP ); #endif // files depending on locale @@ -302,10 +352,11 @@ static void Init( intf_thread_t *p_intf ) msg_Dbg( p_intf, "Error while initializing qt-specific localization" ); app->installTranslator( &qtTranslator ); #endif //ENABLE_NLS + /* Start playing if needed */ if( !p_intf->pf_show_dialog && p_intf->b_play ) { - playlist_Control( THEPL, PLAYLIST_AUTOPLAY, VLC_FALSE ); + playlist_Control( THEPL, PLAYLIST_PLAY, false ); } /* Explain to the core how to show a dialog :D */ @@ -314,15 +365,47 @@ static void Init( intf_thread_t *p_intf ) /* Last settings */ app->setQuitOnLastWindowClosed( false ); + /* retrieve last known path used in file browsing */ + char *psz_path = config_GetPsz( p_intf, "qt-filedialog-path" ); + p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? psz_path + : config_GetHomeDir(); + +#ifdef UPDATE_CHECK + /* Checking for VLC updates */ + if( config_GetInt( p_intf, "qt-updates-notif" ) ) + { + int interval = config_GetInt( p_intf, "qt-updates-days" ); + QSettings settings( "vlc", "vlc-qt-interface" ); + if( QDate::currentDate() > + settings.value( "updatedate" ).toDate().addDays( interval ) ) + { + /* The constructor of the update Dialog will do the 1st request */ + UpdateDialog::getInstance( p_intf ); + settings.setValue( "updatedate", QDate::currentDate() ); + } + } +#endif + /* Launch */ app->exec(); /* And quit */ - MainInputManager::killInstance(); + + /* Destroy first the main interface because it is connected to some slots + in the MainInputManager */ + delete p_intf->p_sys->p_mi; + + /* Destroy then other windows, because some are connected to some slots + in the MainInputManager */ DialogsProvider::killInstance(); - // This can occasion double free. to check - //delete p_intf->p_sys->p_mi; + + /* Destroy the MainInputManager */ + MainInputManager::killInstance(); + delete app; + + config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath ); + free( psz_path ); } /*****************************************************************************