#include "../../../share/vlc32x32.xpm"
#include "../../../share/vlc32x32-christmas.xpm"
+#include <vlc_plugin.h>
/*****************************************************************************
* Local prototypes.
#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" )
set_capability( "dialogs provider", 51 );
add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL,
- QT_MODE_TEXT, QT_MODE_LONGTEXT, VLC_FALSE );
+ QT_MODE_TEXT, QT_MODE_LONGTEXT, false );
change_integer_list( i_mode_list, psz_mode_list_text, 0 );
- add_bool( "qt-notification", VLC_TRUE, NULL, NOTIFICATION_TEXT,
- NOTIFICATION_LONGTEXT, VLC_FALSE );
+ 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-blingbling", VLC_TRUE, NULL, BLING_TEXT,
- BLING_TEXT, VLC_FALSE );
-
- 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-name-in-title", VLC_TRUE, NULL, TITLE_TEXT,
- TITLE_LONGTEXT, VLC_FALSE );
-
- add_bool( "qt-volume-complete", VLC_FALSE, NULL, COMPLETEVOL_TEXT,
- COMPLETEVOL_LONGTEXT, VLC_TRUE );
- add_bool( "qt-autosave-volume", VLC_FALSE, NULL, SAVEVOL_TEXT,
- SAVEVOL_TEXT, 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-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", VLC_TRUE, NULL, UPDATER_TEXT,
- UPDATER_LONGTEXT, VLC_FALSE );
+ 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, VLC_FALSE );
+ 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", VLC_FALSE, NULL, VIEWDETAIL_TEXT,
- VIEWDETAIL_TEXT, VLC_FALSE );
+ add_bool( "qt-open-detail", false, NULL, VIEWDETAIL_TEXT,
+ VIEWDETAIL_TEXT, false );
- add_bool( "qt-privacy-ask", VLC_TRUE, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
- VLC_FALSE );
+ add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
+ false );
set_callbacks( OpenDialogs, Close );
vlc_module_end();
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 );
/* We support play on start */
- p_intf->b_play = VLC_TRUE;
+ p_intf->b_play = true;
return VLC_SUCCESS;
}
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 )
{
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
Q_INIT_RESOURCE( vlc );
-#if !defined(WIN32) && !defined(__APPLE__) && QT_VERSION < 0x040400
- /* KLUDGE for QT4 < 4.4.0 (which use libgconf to avoid that)
+#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 */
/* If you don't have a gconftool-2 binary, you should comment this line */
- QApplication::setDesktopSettingsAware( false );
+ if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */
+ QApplication::setDesktopSettingsAware( false );
#endif
/* Start the QApplication here */
/* 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 */
: p_intf->p_libvlc->psz_homedir;
#ifdef UPDATE_CHECK
+ /* Checking for VLC updates */
if( config_GetInt( p_intf, "qt-updates-notif" ) )
{
int interval = config_GetInt( p_intf, "qt-updates-days" );
if( QDate::currentDate() >
settings.value( "updatedate" ).toDate().addDays( interval ) )
{
- msg_Dbg( p_intf, "Someone said I need to check updates" );
/* The constructor of the update Dialog will do the 1st request */
UpdateDialog::getInstance( p_intf );
settings.setValue( "updatedate", QDate::currentDate() );
/* Destroy first the main interface because it is connected to some slots
in the MainInputManager */
- if( p_intf->p_sys->p_mi ) delete p_intf->p_sys->p_mi;
+ delete p_intf->p_sys->p_mi;
/* Destroy then other windows, because some are connected to some slots
in the MainInputManager */
projects / vlc / blobdiff