#include "input_manager.hpp"
#include "main_interface.hpp"
#include "dialogs/help.hpp" /* update */
+#include "recents.hpp"
#ifdef HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#include "../../../share/vlc32x32-christmas.xpm"
#include <vlc_plugin.h>
+#ifdef WIN32
+ #include <QtPlugin>
+ Q_IMPORT_PLUGIN(qjpeg)
+#endif
+
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
static int WindowOpen ( vlc_object_t * );
static void WindowClose ( vlc_object_t * );
static void Run ( intf_thread_t * );
-static void Init ( intf_thread_t * );
+static void *Init ( vlc_object_t * );
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 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" )
+ "controler window title." )
#define FILEDIALOG_PATH_TEXT N_( "Path to use in openfile dialog" )
#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_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \
#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 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 RECENTPLAY_FILTER_TEXT N_( "List of words separated by | to filter" )
-#define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" )
+#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_ALWAYS_VIDEO_MODE_TEXT N_( "Complete look with information area" )
#define QT_MINIMAL_MODE_TEXT N_( "Minimal look with no menus" )
+#define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" )
+
static const int i_mode_list[] =
{ QT_NORMAL_MODE, QT_ALWAYS_VIDEO_MODE, QT_MINIMAL_MODE };
static const char *const psz_mode_list_text[] =
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 );
+ change_integer_list( i_mode_list, psz_mode_list_text, NULL );
add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
NOTIFICATION_LONGTEXT, false );
MINIMIZED_LONGTEXT, true);
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 );
#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,
+ 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_bool( "qt-open-detail", false, NULL, VIEWDETAIL_TEXT,
- VIEWDETAIL_TEXT, false );
-
add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
false );
+ add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
+ RECENTPLAY_TEXT, false );
+ add_string( "qt-recentplay-filter", NULL, NULL,
+ RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_TEXT, false );
+ change_internal();
set_callbacks( OpenDialogs, Close );
+#if !defined (Q_WS_X11) || HAS_QT43
add_submodule();
set_capability( "vout window", 50 );
set_callbacks( WindowOpen, WindowClose );
+#endif
vlc_module_end();
+#if defined(Q_WS_WIN)
+bool WinQtApp::winEventFilter( MSG *msg, long *result )
+{
+ switch( msg->message )
+ {
+ case 0x0319: /* WM_APPCOMMAND 0x0319 */
+ DefWindowProc( msg->hwnd, msg->message, msg->wParam, msg->lParam );
+ break;
+ }
+ return false;
+}
+#endif /* Q_WS_WIN */
+
/*****************************************************************************
* Module callbacks
*****************************************************************************/
memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
p_intf->pf_run = Run;
+ p_intf->p_sys->p_mi = NULL;
/* Access to the playlist */
- p_intf->p_sys->p_playlist = pl_Yield( p_intf );
- /* Listen to the messages */
- p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+ p_intf->p_sys->p_playlist = pl_Hold( p_intf );
+ /* one settings to rule them all */
var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
return VLC_SUCCESS;
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- vlc_object_lock( p_intf );
- p_intf->b_dead = true;
- vlc_object_unlock( p_intf );
-
if( p_intf->p_sys->b_isDialogProvider )
{
- DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL );
- QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
-
+ if( DialogsProvider::isAlive() )
+ {
+ msg_Dbg( p_intf, "Asking the DP to quit nicely" );
+ 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 );
}
msg_Err( p_intf, "failed to create Qt dialogs thread" );
}
else
- Init( p_intf );
+ {
+ Init( VLC_OBJECT(p_intf) );
+ }
}
static QMutex windowLock;
static QWaitCondition windowWait;
-static void Init( intf_thread_t *p_intf )
+static void ThreadCleanup( void *param)
{
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+ QCloseEvent *event = new QCloseEvent();
+ QApplication::postEvent( p_intf->p_sys->p_mi, event );
+}
+
+static void *Init( vlc_object_t *obj )
+{
+ intf_thread_t *p_intf = (intf_thread_t *)obj;
vlc_value_t val;
char dummy[] = "";
char *argv[] = { dummy };
int argc = 1;
+ int canc = vlc_savecancel ();
+ msg_Dbg( p_intf, "Setting ThreadCleanup");
+ vlc_cleanup_push( ThreadCleanup, (void*)p_intf );
Q_INIT_RESOURCE( vlc );
#if !defined(WIN32) && !defined(__APPLE__)
#endif
/* Start the QApplication here */
+#ifdef WIN32
+ WinQtApp *app = new WinQtApp( argc, argv , true );
+#else
QApplication *app = new QApplication( argc, argv , true );
+#endif
p_intf->p_sys->p_app = app;
- /* Icon setting
- FIXME: use a bigger icon ? */
+ p_intf->p_sys->mainSettings = new QSettings(
+#ifdef WIN32
+ QSettings::IniFormat,
+#else
+ QSettings::NativeFormat,
+#endif
+ QSettings::UserScope, "vlc", "vlc-qt-interface" );
+
+ /* Icon setting */
if( QDate::currentDate().dayOfYear() >= 354 )
app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
else
QPointer<MainInterface> *miP = NULL;
+#ifdef UPDATE_CHECK
+ /* Checking for VLC updates */
+ if( config_GetInt( p_intf, "qt-updates-notif" ) &&
+ !config_GetInt( p_intf, "qt-privacy-ask" ) )
+ {
+ int interval = config_GetInt( p_intf, "qt-updates-days" );
+ if( QDate::currentDate() >
+ getSettings()->value( "updatedate" ).toDate().addDays( interval ) )
+ {
+ /* The constructor of the update Dialog will do the 1st request */
+ UpdateDialog::getInstance( p_intf );
+ getSettings()->setValue( "updatedate", QDate::currentDate() );
+ }
+ }
+#endif
+
/* Create the normal interface in non-DP mode */
if( !p_intf->pf_show_dialog )
{
#ifdef ENABLE_NLS
// Translation - get locale
- QLocale ql = QLocale::system();
+# if defined (WIN32) || defined (__APPLE__)
+ char* psz_tmp = config_GetPsz( p_intf, "language" );
+ QString lang = qfu( psz_tmp );
+ free( psz_tmp);
+ if (lang == "auto")
+ lang = QLocale::system().name();
+# else
+ QString lang = QLocale::system().name();
+# endif
// Translations for qt's own dialogs
QTranslator qtTranslator( 0 );
// Let's find the right path for the translation file
QString path = QString( QT4LOCALEDIR );
#else
QString path = QString( QString(config_GetDataDir()) + DIR_SEP +
- "locale" + DIR_SEP );
+ "locale" + DIR_SEP + "qt4" + DIR_SEP );
#endif
// files depending on locale
- bool b_loaded = qtTranslator.load( path + "qt_" + ql.name());
+ bool b_loaded = qtTranslator.load( path + "qt_" + lang );
if (!b_loaded)
msg_Dbg( p_intf, "Error while initializing qt-specific localization" );
app->installTranslator( &qtTranslator );
/* 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
+ p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? config_GetHomeDir()
+ : psz_path;
+ vlc_restorecancel (canc);
/* Launch */
app->exec();
/* And quit */
+ canc = vlc_savecancel ();
+ msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
if (miP)
{
QMutexLocker locker (&windowLock);
+
+ /* We need to warn to detach from any vout before
+ * deleting miP (WindowClose will not be called after it) */
+ p_intf->p_sys->p_mi->releaseVideo( NULL );
+
val.p_address = NULL;
var_Set (p_intf, "window_widget", val);
delete miP;
in the MainInputManager */
delete p_intf->p_sys->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();
+
+ /* Delete the configuration. Application has to be deleted after that. */
+ delete p_intf->p_sys->mainSettings;
+
/* Destroy the MainInputManager */
MainInputManager::killInstance();
/* Save the path */
config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
free( psz_path );
+ vlc_restorecancel (canc);
+ vlc_cleanup_pop();
+ return NULL;
}
/*****************************************************************************
{
vout_window_t *wnd = (vout_window_t *)obj;
+ if (config_GetInt (obj, "embedded-video") <= 0)
+ return VLC_EGENERIC;
+
intf_thread_t *intf = (intf_thread_t *)
vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
if (intf == NULL)
if (miP->isNull ())
return VLC_EGENERIC;
- if (config_GetInt (obj, "embedded-video") <= 0)
- {
- (*miP)->requestNotEmbeddedVideo (wnd->vout);
- return VLC_EGENERIC;
- }
-
wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
&wnd->width, &wnd->height);
windowLock.unlock ();
+
+ if (!wnd->handle)
+ return VLC_EGENERIC;
+
wnd->control = WindowControl;
wnd->p_private = miP;
return VLC_SUCCESS;
QMutexLocker locker (&windowLock);
if (!miP->isNull ())
- (*miP)->releaseVideo (wnd->handle);
+ (*miP)->releaseVideo( wnd->handle );
delete miP;
}
projects / vlc / blobdiff