X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=3148a9b346e176c129d7e96a49eb4031e54b60b5;hb=7910ae7a2d03d6b380f617cd744ba61f9802129f;hp=2a63696dab7c4c281dc4930fe0c8c0b1f6e1bcad;hpb=3b6a320b107921cee152bc0c514ea87cb93c9420;p=vlc diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 2a63696dab..3148a9b346 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include "qt4.hpp" #include @@ -32,7 +33,12 @@ #include "input_manager.hpp" #include "main_interface.hpp" +#ifdef HAVE_X11_XLIB_H +#include +#endif + #include "../../../share/vlc32x32.xpm" +#include "../../../share/vlc32x32-christmas.xpm" /***************************************************************************** * Local prototypes. @@ -47,55 +53,67 @@ 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 " \ - "dialog.") +#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 SYSTRAY_TEXT N_("Systray icon") -#define SYSTRAY_LONGTEXT N_("Show an icon in the systray " \ - "allowing you to control VLC media player " \ - "for basic actions") +#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 " \ + "dialog." ) -#define MINIMIZED_TEXT N_("Start VLC with only a systray icon") -#define MINIMIZED_LONGTEXT N_("When you launch VLC with that option, " \ - "VLC will start with just an icon in" \ - "your taskbar") +#define SYSTRAY_TEXT N_( "Systray icon" ) +#define SYSTRAY_LONGTEXT N_( "Show an icon in the systray " \ + "allowing you to control VLC media player " \ + "for basic actions" ) -#define TITLE_TEXT N_("Show playing item name in window title") -#define TITLE_LONGTEXT N_("Show the name of the song or video in the " \ - "controler window title") +#define MINIMIZED_TEXT N_( "Start VLC with only a systray icon" ) +#define MINIMIZED_LONGTEXT N_( "When you launch VLC with that option, " \ + "VLC will start with just an icon in" \ + "your taskbar" ) -#define FILEDIALOG_PATH_TEXT N_("Path to use in openfile dialog") +#define TITLE_TEXT N_( "Show playing item name in window title" ) +#define TITLE_LONGTEXT N_( "Show the name of the song or video in the " \ + "controler window title" ) -#define DISCDIALOG_PATH_TEXT N_("Path to device to use in open disc dialog") +#define FILEDIALOG_PATH_TEXT N_( "Path to use in openfile dialog" ) -#define NOTIFICATION_TEXT N_("Show notification popup on track change") +#define NOTIFICATION_TEXT N_( "Show notification popup on track change" ) #define NOTIFICATION_LONGTEXT N_( \ "Show a notification popup with the artist and track name when " \ "the current playlist item changes, when VLC is minimized or hidden." ) -#define ADVANCED_OPTIONS_TEXT N_("Advanced options") -#define ADVANCED_OPTIONS_LONGTEXT N_("Show all the advanced options " \ - "in the dialogs") +#define ADVANCED_OPTIONS_TEXT N_( "Advanced options" ) +#define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \ + "in the dialogs" ) + +#define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1." ) +#define OPACITY_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \ + "for main interface, playlist and extended panel." \ + " 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 OPACITY_TEXT N_("Windows opacity between 0.1 and 1.") -#define OPACITY_LONGTEXT N_("Sets the windows opacity between 0.1 and 1 " \ - "for main interface, playlist and extended panel." \ - " This option only works with Windows and " \ - "X11 with composite extensions.") +#define UPDATER_TEXT N_( "Activate the new updates notification" ) +#define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \ + "versions of the software. It runs once a week." ) -#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 COMPLETEVOL_TEXT N_( "Allow the volume to be set to 400%" ) +#define COMPLETEVOL_LONGTEXT N_( "Allow the volume to have range from 0% to " \ + "400%, instead of 0% to 200%. This option " \ + "can distort the audio, since it uses " \ + "software amplification." ) -#define ERROR_TEXT N_("Show unimportant error and warnings dialogs" ) -#define MINIMAL_TEXT N_("Start in minimal view (menus hidden)." ) +#define BLING_TEXT N_( "Use non native buttons and volume slider" ) + +#define PRIVACY_TEXT N_( "Ask for network policy at start" ) vlc_module_begin(); set_shortname( (char *)"Qt" ); @@ -105,13 +123,17 @@ vlc_module_begin(); set_capability( "interface", 151 ); set_callbacks( Open, Close ); - set_program( "qvlc" ); add_shortcut("qt"); add_submodule(); set_description( "Dialogs provider" ); set_capability( "dialogs provider", 51 ); + add_bool( "qt-notification", VLC_TRUE, NULL, NOTIFICATION_TEXT, + NOTIFICATION_LONGTEXT, VLC_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, @@ -123,32 +145,32 @@ vlc_module_begin(); 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 ); add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT, - FILEDIALOG_PATH_TEXT, VLC_TRUE); - change_autosave(); - change_internal(); - add_string( "qt-discdialog-path", NULL, NULL, DISCDIALOG_PATH_TEXT, - DISCDIALOG_PATH_TEXT, VLC_TRUE); + FILEDIALOG_PATH_TEXT, VLC_TRUE ); change_autosave(); change_internal(); - add_bool( "qt-notification", VLC_TRUE, NULL, NOTIFICATION_TEXT, - NOTIFICATION_LONGTEXT, VLC_FALSE ); - add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT, - OPACITY_LONGTEXT, VLC_FALSE ); - 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 ); set_callbacks( OpenDialogs, Close ); vlc_module_end(); @@ -159,17 +181,21 @@ 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 HAVE_GETENV && defined Q_WS_X11 - if( !getenv( "DISPLAY" ) ) +#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 */ + Display *p_display = XOpenDisplay( NULL ); + if( !p_display ) { - msg_Err(p_intf, "no X server"); + msg_Err( p_intf, "Could not connect to X server" ); return VLC_EGENERIC; } + XCloseDisplay( p_display ); #endif - p_intf->p_sys = (intf_sys_t *)malloc(sizeof( intf_sys_t ) ); + p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) ); if( !p_intf->p_sys ) { - msg_Err(p_intf, "Out of memory"); + msg_Err( p_intf, "Out of memory" ); return VLC_ENOMEM; } memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) ); @@ -233,12 +259,15 @@ static void Init( intf_thread_t *p_intf ) * 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); + QApplication::setDesktopSettingsAware( false ); #endif /* Start the QApplication here */ QApplication *app = new QApplication( argc, argv , true ); - app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) ); + if( QDate::currentDate().dayOfYear() >= 354 ) + app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) ); + else + app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) ); p_intf->p_sys->p_app = app; // Initialize timers and the Dialog Provider @@ -254,13 +283,14 @@ static void Init( intf_thread_t *p_intf ) else /*if( p_intf->pf_show_dialog )*/ vlc_thread_ready( p_intf ); +#ifdef ENABLE_NLS // Translation - get locale - QLocale ql = QLocale::system (); + QLocale ql = QLocale::system(); // Translations for qt's own dialogs QTranslator qtTranslator( 0 ); // Let's find the right path for the translation file #if !defined( WIN32 ) - QString path = QString(QT4LOCALEDIR); + QString path = QString( QT4LOCALEDIR ); #else QString path = QString( QString(system_VLCPath()) + DIR_SEP + "locale" + DIR_SEP ); @@ -268,9 +298,9 @@ static void Init( intf_thread_t *p_intf ) // files depending on locale bool b_loaded = qtTranslator.load( path + "qt_" + ql.name()); if (!b_loaded) - msg_Dbg(p_intf, "Error while initializing qt-specific localization"); - app->installTranslator(&qtTranslator); - + 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 ) {