/*****************************************************************************
* qt4.cpp : QT4 interface
****************************************************************************
- * Copyright © 2006-2008 the VideoLAN team
+ * Copyright © 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* 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 <QApplication>
-#include <QLocale>
-#include <QTranslator>
#include <QDate>
#include "qt4.hpp"
-#include "dialogs_provider.hpp"
-#include "input_manager.hpp"
-#include "main_interface.hpp"
-#include "dialogs/help.hpp" /* update */
-#ifdef HAVE_X11_XLIB_H
-#include <X11/Xlib.h>
+#include "input_manager.hpp" /* THEMIM creation */
+#include "dialogs_provider.hpp" /* THEDP creation */
+#include "main_interface.hpp" /* MainInterface creation */
+#include "dialogs/help.hpp" /* Launch Update */
+#include "recents.hpp" /* Recents Item destruction */
+#include "util/qvlcapp.hpp" /* QVLCApplication definition */
+
+#ifdef Q_WS_X11
+ #include <X11/Xlib.h>
#endif
#include "../../../share/vlc32x32.xpm"
#include "../../../share/vlc32x32-christmas.xpm"
+#include <vlc_plugin.h>
+
+#ifdef WIN32 /* For static builds */
+ #include <QtPlugin>
+ Q_IMPORT_PLUGIN(qjpeg)
+ Q_IMPORT_PLUGIN(qtaccessiblewidgets)
+#endif
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
+static int OpenIntf ( vlc_object_t * );
static int OpenDialogs ( vlc_object_t * );
-static void Run ( intf_thread_t * );
-static void Init ( intf_thread_t * );
+static int Open ( vlc_object_t *, bool );
+static void Close ( vlc_object_t * );
+static int WindowOpen ( vlc_object_t * );
+static void WindowClose ( vlc_object_t * );
+static void *Thread ( void * );
static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define ADVANCED_PREFS_TEXT N_( "Show advanced prefs over simple ones" )
+#define ADVANCED_PREFS_TEXT N_( "Show advanced preferences over simple ones" )
#define ADVANCED_PREFS_LONGTEXT N_( "Show advanced preferences and not simple "\
"preferences when opening the preferences "\
"dialog." )
#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" )
+ "for basic actions." )
#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" \
+#define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \
"your taskbar" )
+#define KEEPSIZE_TEXT N_( "Resize interface to the native video size" )
+#define KEEPSIZE_LONGTEXT N_( "You have two choices:\n" \
+ " - The interface will resize to the native video size\n" \
+ " - The video will fit to the interface size\n " \
+ "By default, interface resize to the native video size." )
+
#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 FILEDIALOG_PATH_TEXT N_( "Path to use in openfile dialog" )
+ "controler window title." )
#define NOTIFICATION_TEXT N_( "Show notification popup on track change" )
#define NOTIFICATION_LONGTEXT N_( \
#define ADVANCED_OPTIONS_TEXT N_( "Advanced options" )
#define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \
- "in the dialogs" )
+ "in the dialogs." )
-#define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1." )
+#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." \
+ "for main interface, playlist and extended panel."\
" This option only works with Windows and " \
"X11 with composite extensions." )
+#define OPACITY_FS_TEXT N_( "Fullscreen controller opacity between 0.1 and 1" )
+#define OPACITY_FS_LONGTEXT N_( "Sets the fullscreen controller 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 ERROR_TEXT N_( "Show unimportant error and warnings dialogs" )
#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." )
+ "versions of the software. It runs once every " \
+ "two weeks." )
#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 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 RECENTPLAY_TEXT N_( "Save the recently played items in the menu" )
-#define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" )
+#define RECENTPLAY_FILTER_TEXT N_( "List of words separated by | to filter" )
+#define RECENTPLAY_FILTER_LONGTEXT N_( "Regular expression used to filter " \
+ "the recent items played in the player" )
+
+#define SLIDERCOL_TEXT N_( "Define the colors of the volume slider " )
+#define SLIDERCOL_LONGTEXT N_( "Define the colors 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 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" \
+ " - 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 int i_mode_list[] =
- { QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE };
-static const char *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_category( CAT_INTERFACE ) ;
- set_subcategory( SUBCAT_INTERFACE_MAIN );
- set_capability( "interface", 151 );
- set_callbacks( Open, Close );
-
- add_shortcut("qt");
-
- add_submodule();
- set_description( "Dialogs provider" );
- set_capability( "dialogs provider", 51 );
-
- 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, 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, true );
- change_autosave();
- change_internal();
-
- 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 );
+#define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" )
+#define QT_NATIVEOPEN_TEXT N_( "Embed the file browser in open dialog" )
+
+#define FULLSCREEN_NUMBER_TEXT N_( "Define which screen fullscreen goes" )
+#define FULLSCREEN_NUMBER_LONGTEXT N_( "Screennumber of fullscreen, instead of" \
+ "same screen where interface is" )
+
+#define QT_AUTOLOAD_EXTENSIONS_TEXT N_( "Load extensions on startup" )
+#define QT_AUTOLOAD_EXTENSIONS_LONGTEXT N_( "Automatically load the "\
+ "extensions module on startup" )
+
+#define QT_MINIMAL_MODE_TEXT N_("Start in minimal view (without menus)" )
+
+/**********************************************************************/
+vlc_module_begin ()
+ set_shortname( "Qt" )
+ set_description( N_("Qt interface") )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_MAIN )
+ set_capability( "interface", 151 )
+ set_callbacks( OpenIntf, Close )
+
+ add_shortcut("qt")
+
+ add_bool( "qt-minimal-view", false, NULL, QT_MINIMAL_MODE_TEXT,
+ QT_MINIMAL_MODE_TEXT, 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, false )
+ add_float_with_range( "qt-fs-opacity", 0.8, 0.1, 1., NULL, OPACITY_FS_TEXT,
+ OPACITY_FS_LONGTEXT, 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-video-autoresize", true, NULL, KEEPSIZE_TEXT,
+ KEEPSIZE_LONGTEXT, false )
+ add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
+ TITLE_LONGTEXT, false )
+ add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
+ QT_FULLSCREEN_TEXT, 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_bool( "qt-embedded-open", false, NULL, QT_NATIVEOPEN_TEXT,
+ QT_NATIVEOPEN_TEXT, false )
+ add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
+ RECENTPLAY_TEXT, false )
+ add_string( "qt-recentplay-filter", "", NULL,
+ RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, 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 );
+ add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
+ UPDATER_LONGTEXT, false )
+ add_integer( "qt-updates-days", 7, 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_string( "qt-slider-colours",
+ "255;255;255;20;210;20;255;199;15;245;39;29",
+ 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 )
+ change_private ()
- add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
- false );
+ add_integer( "qt-fullscreen-screennumber", -1, NULL, FULLSCREEN_NUMBER_TEXT,
+ FULLSCREEN_NUMBER_LONGTEXT, false );
- set_callbacks( OpenDialogs, Close );
-vlc_module_end();
+ add_bool( "qt-autoload-extensions", true, NULL,
+ QT_AUTOLOAD_EXTENSIONS_TEXT, QT_AUTOLOAD_EXTENSIONS_LONGTEXT,
+ false )
+
+ add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */
+ add_obsolete_integer( "qt-display-mode" ) /* Suppressed since 1.1.0 */
+
+#ifdef WIN32
+ cannot_unload_broken_library()
+#endif
+
+ add_submodule ()
+ set_description( "Dialogs provider" )
+ set_capability( "dialogs provider", 51 )
+
+ set_callbacks( OpenDialogs, Close )
+
+#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+ add_submodule ()
+#if defined(Q_WS_X11)
+ set_capability( "vout window xid", 50 )
+#elif defined(Q_WS_WIN)
+ set_capability( "vout window hwnd", 50 )
+#endif
+ set_callbacks( WindowOpen, WindowClose )
+#endif
+
+vlc_module_end ()
+
+/*****************************************/
+
+/* Ugly, but the Qt4 interface assumes single instance anyway */
+static vlc_sem_t ready;
+#ifdef Q_WS_X11
+static char *x11_display = NULL;
+#endif
+static struct
+{
+ vlc_mutex_t lock;
+ bool busy;
+} one = { VLC_STATIC_MUTEX, false };
/*****************************************************************************
* Module callbacks
*****************************************************************************/
-static int Open( vlc_object_t *p_this )
+
+/* Open Interface */
+static int Open( vlc_object_t *p_this, bool isDialogProvider )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
-#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 );
+#ifdef Q_WS_X11
+ if( !XInitThreads() )
+ return VLC_EGENERIC;
+
+ char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+ Display *p_display = XOpenDisplay( x11_display );
if( !p_display )
{
msg_Err( p_intf, "Could not connect to X server" );
+ free (display);
return VLC_EGENERIC;
}
XCloseDisplay( p_display );
+#else
+ char *display = NULL;
#endif
- p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
- if( !p_intf->p_sys )
+ bool busy;
+ vlc_mutex_lock (&one.lock);
+ busy = one.busy;
+ one.busy = true;
+ vlc_mutex_unlock (&one.lock);
+ if (busy)
{
- msg_Err( p_intf, "Out of memory" );
- return VLC_ENOMEM;
+ msg_Err (p_this, "cannot start Qt4 multiple times");
+ free (display);
+ return VLC_EGENERIC;
}
- memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
- p_intf->pf_run = Run;
+ /* Allocations of p_sys */
+ intf_sys_t *p_sys = p_intf->p_sys = new intf_sys_t;
+ p_intf->p_sys->b_isDialogProvider = isDialogProvider;
+ p_sys->p_mi = NULL;
+ p_sys->p_playlist = pl_Get( p_intf );
- p_intf->p_sys->p_playlist = pl_Yield( p_intf );
- p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
+ /* */
+#ifdef Q_WS_X11
+ x11_display = display;
+#endif
+ vlc_sem_init (&ready, 0);
+ if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
+ {
+ delete p_sys;
+ free (display);
+ vlc_mutex_lock (&one.lock);
+ one.busy = false;
+ vlc_mutex_unlock (&one.lock);
+ return VLC_ENOMEM;
+ }
- /* We support play on start */
- p_intf->b_play = true;
+ /* */
+ vlc_sem_wait (&ready);
+ vlc_sem_destroy (&ready);
+ if( !p_sys->b_isDialogProvider )
+ {
+ playlist_t *pl = pl_Get(p_this);
+ var_Create (pl, "qt4-iface", VLC_VAR_ADDRESS);
+ var_SetAddress (pl, "qt4-iface", p_this);
+ }
return VLC_SUCCESS;
}
-static int OpenDialogs( vlc_object_t *p_this )
+/* Open qt4 interface */
+static int OpenIntf( vlc_object_t *p_this )
{
- intf_thread_t *p_intf = (intf_thread_t *)p_this;
- int val = Open( p_this );
- if( val )
- return val;
+ return Open( p_this, false );
+}
- p_intf->pf_show_dialog = ShowDialog;
- return VLC_SUCCESS;
+/* Open Dialog Provider */
+static int OpenDialogs( vlc_object_t *p_this )
+{
+ return Open( p_this, true );
}
static void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ intf_sys_t *p_sys = p_intf->p_sys;
- vlc_mutex_lock( &p_intf->object_lock );
- 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<QEvent*>(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 );
-}
+ if( !p_sys->b_isDialogProvider )
+ var_Destroy (pl_Get(p_this), "qt4-iface");
+ QVLCApp::triggerQuit();
-/*****************************************************************************
- * Initialize the interface or the dialogs provider
- *****************************************************************************/
-static void Run( intf_thread_t *p_intf )
-{
- if( p_intf->pf_show_dialog )
- {
- if( vlc_thread_create( p_intf, "Qt dialogs", Init, 0, true ) )
- msg_Err( p_intf, "failed to create Qt dialogs thread" );
- }
- else
- Init( p_intf );
+ vlc_join (p_sys->thread, NULL);
+#ifdef Q_WS_X11
+ free (x11_display);
+ x11_display = NULL;
+#endif
+ delete p_sys;
+ vlc_mutex_lock (&one.lock);
+ one.busy = false;
+ vlc_mutex_unlock (&one.lock);
}
-static void Init( intf_thread_t *p_intf )
+static void *Thread( void *obj )
{
- char dummy[] = "";
- char *argv[] = { dummy };
+ intf_thread_t *p_intf = (intf_thread_t *)obj;
+ MainInterface *p_mi;
+ char dummy[] = "vlc"; /* for WM_CLASS */
+ char *argv[4] = { dummy, NULL, };
int argc = 1;
Q_INIT_RESOURCE( vlc );
-#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 */
- if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */
- QApplication::setDesktopSettingsAware( false );
-#endif
-
/* Start the QApplication here */
- QApplication *app = new QApplication( argc, argv , true );
- 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
- DialogsProvider::getInstance( p_intf );
-
- // Create the normal interface
- if( !p_intf->pf_show_dialog )
- {
- MainInterface *p_mi = new MainInterface( p_intf );
- p_intf->p_sys->p_mi = p_mi;
- /* We don't show it because it is done in the MainInterface constructor
- p_mi->show(); */
- p_intf->p_sys->b_isDialogProvider = false;
- }
- else
+#ifdef Q_WS_X11
+ if( x11_display != NULL )
{
- vlc_thread_ready( p_intf );
- p_intf->p_sys->b_isDialogProvider = true;
+ argv[argc++] = const_cast<char *>("-display");
+ argv[argc++] = x11_display;
+ argv[argc] = NULL;
}
+#endif
+
+ QVLCApp app( argc, argv );
+ p_intf->p_sys->p_app = &app;
-#ifdef ENABLE_NLS
- // Translation - get locale
- 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 );
+
+ /* All the settings are in the .conf/.ini style */
+ p_intf->p_sys->mainSettings = new QSettings(
+#ifdef WIN32
+ QSettings::IniFormat,
#else
- QString path = QString( QString(config_GetDataDir()) + DIR_SEP +
- "locale" + DIR_SEP );
+ QSettings::NativeFormat,
#endif
- // 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 );
-#endif //ENABLE_NLS
-
- /* Start playing if needed */
- if( !p_intf->pf_show_dialog && p_intf->b_play )
- {
- playlist_Control( THEPL, PLAYLIST_PLAY, false );
- }
+ QSettings::UserScope, "vlc", "vlc-qt-interface" );
- /* Explain to the core how to show a dialog :D */
- p_intf->pf_show_dialog = ShowDialog;
+ /* Icon setting */
+ if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */
+ app.setWindowIcon( QIcon(vlc_christmas_xpm) );
+ else
+ app.setWindowIcon( QIcon(vlc_xpm) );
- /* Last settings */
- app->setQuitOnLastWindowClosed( false );
+ /* Initialize timers and the Dialog Provider */
+ DialogsProvider::getInstance( p_intf );
- /* 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
- : p_intf->p_libvlc->psz_homedir;
+ /* Detect screensize for small screens like TV or EEEpc*/
+ p_intf->p_sys->i_screenHeight =
+ app.QApplication::desktop()->availableGeometry().height();
#ifdef UPDATE_CHECK
/* Checking for VLC updates */
- if( config_GetInt( p_intf, "qt-updates-notif" ) )
+ if( var_InheritBool( p_intf, "qt-updates-notif" ) &&
+ !var_InheritBool( p_intf, "qt-privacy-ask" ) )
{
- int interval = config_GetInt( p_intf, "qt-updates-days" );
- QSettings settings( "vlc", "vlc-qt-interface" );
+ int interval = var_InheritInteger( p_intf, "qt-updates-days" );
if( QDate::currentDate() >
- settings.value( "updatedate" ).toDate().addDays( interval ) )
+ getSettings()->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() );
+ getSettings()->setValue( "updatedate", QDate::currentDate() );
}
}
#endif
+ /* Create the normal interface in non-DP mode */
+ if( !p_intf->p_sys->b_isDialogProvider )
+ p_mi = new MainInterface( p_intf );
+ else
+ p_mi = NULL;
+ p_intf->p_sys->p_mi = p_mi;
+
+ /* Explain how to show a dialog :D */
+ p_intf->pf_show_dialog = ShowDialog;
+
+ /* */
+ vlc_sem_post (&ready);
+
+ /* Last settings */
+ app.setQuitOnLastWindowClosed( false );
+
+ /* Retrieve last known path used in file browsing */
+ p_intf->p_sys->filepath =
+ getSettings()->value( "filedialog-path", QVLCUserDir( VLC_HOME_DIR ) ).toString();
+
+ /* Loads and tries to apply the preferred QStyle */
+ QString s_style = getSettings()->value( "MainWindow/QtStyle", "" ).toString();
+ if( s_style.compare("") != 0 )
+ QApplication::setStyle( s_style );
+
/* Launch */
- app->exec();
+ app.exec();
/* And quit */
+ QApplication::closeAllWindows();
- /* Destroy first the main interface because it is connected to some slots
- in the MainInputManager */
- delete p_intf->p_sys->p_mi;
+ if (p_mi != NULL)
+ {
+#warning BUG!
+ /* FIXME: the video window may still be registerd at this point */
+ /* See LP#448082 as an example. */
+
+ p_intf->p_sys->p_mi = NULL;
+ /* Destroy first the main interface because it is connected to some
+ slots in the MainInputManager */
+ delete p_mi;
+ }
- /* Destroy then other windows, because some are connected to some slots
- in the MainInputManager */
+ /* Destroy all remaining windows,
+ because some are connected to some slots
+ in the MainInputManager
+ Settings must be destroyed after that.
+ */
DialogsProvider::killInstance();
+ /* Delete the recentsMRL object before the configuration */
+ RecentsMRL::killInstance();
+
+ /* Save the path */
+ getSettings()->setValue( "filedialog-path", p_intf->p_sys->filepath );
+
+ /* Delete the configuration. Application has to be deleted after that. */
+ delete p_intf->p_sys->mainSettings;
+
/* Destroy the MainInputManager */
MainInputManager::killInstance();
- delete app;
-
- config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
- free( psz_path );
+ /* Delete the application automatically */
+ return NULL;
}
/*****************************************************************************
static void ShowDialog( intf_thread_t *p_intf, int i_dialog_event, int i_arg,
intf_dialog_args_t *p_arg )
{
+ VLC_UNUSED( p_intf );
DialogEvent *event = new DialogEvent( i_dialog_event, i_arg, p_arg );
- QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
+ QApplication::postEvent( THEDP, event );
}
-/*****************************************************************************
- * PopupMenuCB: callback to show the popupmenu.
- * We don't show the menu directly here because we don't want the
- * caller to block for a too long time.
- *****************************************************************************/
-static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t old_val, vlc_value_t new_val, void *param )
+/**
+ * Video output window provider
+ *
+ * TODO move it out of here ?
+ */
+#include <vlc_vout_window.h>
+
+static int WindowControl( vout_window_t *, int i_query, va_list );
+
+static int WindowOpen( vlc_object_t *p_obj )
{
- intf_thread_t *p_intf = (intf_thread_t *)param;
- ShowDialog( p_intf, INTF_DIALOG_POPUPMENU, new_val.b_bool, 0 );
+ vout_window_t *p_wnd = (vout_window_t*)p_obj;
+
+ /* */
+ if( p_wnd->cfg->is_standalone )
+ return VLC_EGENERIC;
+#if defined (Q_WS_X11)
+ if( var_InheritBool( p_obj, "video-wallpaper" ) )
+ return VLC_EGENERIC;
+#endif
+
+ vlc_value_t val;
+ if( var_Inherit( p_obj, "qt4-iface", VLC_VAR_ADDRESS, &val ) )
+ val.p_address = NULL;
+
+ intf_thread_t *p_intf = (intf_thread_t *)val.p_address;
+
+ if( !p_intf )
+ { /* If another interface is used, this plugin cannot work */
+ msg_Dbg( p_obj, "Qt4 interface not found" );
+ return VLC_EGENERIC;
+ }
+
+ MainInterface *p_mi = p_intf->p_sys->p_mi;
+ msg_Dbg( p_obj, "requesting video..." );
+
+ int i_x = p_wnd->cfg->x;
+ int i_y = p_wnd->cfg->y;
+ unsigned i_width = p_wnd->cfg->width;
+ unsigned i_height = p_wnd->cfg->height;
+
+#if defined (Q_WS_X11)
+ p_wnd->handle.xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
+ if( !p_wnd->handle.xid )
+ return VLC_EGENERIC;
+ p_wnd->display.x11 = x11_display;
+
+#elif defined (Q_WS_WIN)
+ p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
+ if( !p_wnd->handle.hwnd )
+ return VLC_EGENERIC;
+#else
+# error FIXME
+#endif
+
+ p_wnd->control = WindowControl;
+ p_wnd->sys = (vout_window_sys_t*)p_mi;
return VLC_SUCCESS;
}
+
+static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args )
+{
+ MainInterface *p_mi = (MainInterface *)p_wnd->sys;
+ return p_mi->controlVideo( i_query, args );
+}
+
+static void WindowClose( vlc_object_t *p_obj )
+{
+ vout_window_t *p_wnd = (vout_window_t*)p_obj;
+ MainInterface *p_mi = (MainInterface *)p_wnd->sys;
+
+ msg_Dbg( p_obj, "releasing video..." );
+ p_mi->releaseVideo();
+}
+
projects / vlc / blobdiff