/*****************************************************************************
* qt4.cpp : QT4 interface
****************************************************************************
- * Copyright © 2006-2008 the VideoLAN team
+ * Copyright © 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
#include <QWaitCondition>
#include "qt4.hpp"
+
#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"
+#include "util/qvlcapp.hpp" /* QVLCApplication definition */
#ifdef HAVE_X11_XLIB_H
-#include <X11/Xlib.h>
+ #include <X11/Xlib.h>
#endif
#include "../../../share/vlc32x32.xpm"
#define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \
"your taskbar" )
-#define KEEPSIZE_TEXT N_( "Confine video to a persistent resizable window" )
-#define KEEPSIZE_LONGTEXT N_( "You can choose to confine a video to a " \
- "persistent resizeable window or let it freely " \
- "expand to match the original size. " \
- "By default, videos are expanded to original size." )
+#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 " \
"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" )
+#define QT_NORMAL_MODE_TEXT N_( "Classic" )
+#define QT_ALWAYS_VIDEO_MODE_TEXT N_( "Complete (with information area)" )
+#define QT_MINIMAL_MODE_TEXT N_( "Minimal (without menu)" )
#define QT_FULLSCREEN_TEXT N_( "Show a controller in fullscreen mode" )
+#define QT_NATIVEOPEN_TEXT N_( "Embed the file browser in open dialog" )
+/* Various modes definition */
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( "Qt" )
set_description( N_("Qt interface") )
add_shortcut("qt")
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, NULL );
+ QT_MODE_TEXT, QT_MODE_LONGTEXT, false )
+ change_integer_list( i_mode_list, psz_mode_list_text, NULL )
add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT,
- NOTIFICATION_LONGTEXT, false );
+ NOTIFICATION_LONGTEXT, false )
add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
- OPACITY_LONGTEXT, false );
+ OPACITY_LONGTEXT, false )
add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT,
- SYSTRAY_LONGTEXT, false);
+ SYSTRAY_LONGTEXT, false)
add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT,
- MINIMIZED_LONGTEXT, true);
- add_bool( "qt-keep-size", false, NULL, KEEPSIZE_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 );
+ TITLE_LONGTEXT, false )
add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT,
- QT_FULLSCREEN_TEXT, false );
+ QT_FULLSCREEN_TEXT, false )
add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT,
- COMPLETEVOL_LONGTEXT, true );
+ COMPLETEVOL_LONGTEXT, true )
add_bool( "qt-autosave-volume", false, NULL, SAVEVOL_TEXT,
- SAVEVOL_TEXT, true );
+ SAVEVOL_TEXT, true )
add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
- FILEDIALOG_PATH_TEXT, true );
+ FILEDIALOG_PATH_TEXT, true )
change_autosave ()
change_internal ()
+ 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 );
+ RECENTPLAY_TEXT, false )
add_string( "qt-recentplay-filter", "", NULL,
- RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false );
+ RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false )
add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT,
- ADVANCED_OPTIONS_LONGTEXT, true );
+ ADVANCED_OPTIONS_LONGTEXT, true )
add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT,
- ADVANCED_PREFS_LONGTEXT, false );
+ ADVANCED_PREFS_LONGTEXT, false )
add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT,
- ERROR_TEXT, false );
+ ERROR_TEXT, false )
#ifdef UPDATE_CHECK
add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
- UPDATER_LONGTEXT, false );
+ UPDATER_LONGTEXT, false )
add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
- UPDATER_DAYS_TEXT, 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 );
+ "255;255;255;20;210;20;255;199;15;245;39;29",
+ NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false )
add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
- false );
+ false )
change_internal ()
add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */
set_callbacks( OpenDialogs, Close )
+#if defined (Q_WS_X11)
+# define WID_CAPABILITY "xwindow"
+#elif defined (WIN32)
+# define WID_CAPABILITY "hwnd"
+#endif
+#ifdef WID_CAPABILITY
add_submodule ()
- set_capability( "vout_window", 50 )
+ set_capability( WID_CAPABILITY, 50 )
set_callbacks( WindowOpen, WindowClose )
+#endif
vlc_module_end ()
+/*****************************************/
+
/* Ugly, but the Qt4 interface assumes single instance anyway */
static struct
{
/*****************************************************************************
* Module callbacks
*****************************************************************************/
+
+/* Open Interface */
static int Open( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- intf_sys_t *p_sys;
-#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
+ char *psz_display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+ Display *p_display = XOpenDisplay( psz_display );
+ free( psz_display );
if( !p_display )
{
msg_Err( p_intf, "Could not connect to X server" );
XCloseDisplay( p_display );
#endif
- /* Allocations */
- p_sys = p_intf->p_sys = new intf_sys_t;
+ /* Allocations of p_sys */
+ intf_sys_t *p_sys = p_intf->p_sys = new intf_sys_t;
p_sys->b_isDialogProvider = false;
- p_sys->p_popup_menu = NULL; /* ??? */
- p_sys->p_playlist = pl_Hold( p_intf );
+ p_sys->p_popup_menu = NULL;
p_sys->p_mi = NULL;
+ p_sys->p_playlist = pl_Hold( p_intf );
+ /* */
if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
pl_Release (p_sys->p_playlist);
while( p_sys->p_mi == NULL && !p_sys->b_isDialogProvider )
iface.ready.wait( &iface.lock );
- var_Create (p_this->p_libvlc, "qt4-iface", VLC_VAR_ADDRESS);
- val.p_address = p_this;
- var_Set (p_this->p_libvlc, "qt4-iface", val);
+ if( !p_sys->b_isDialogProvider )
+ {
+ var_Create (p_this->p_libvlc, "qt4-iface", VLC_VAR_ADDRESS);
+ val.p_address = p_this;
+ var_Set (p_this->p_libvlc, "qt4-iface", val);
+ }
return VLC_SUCCESS;
}
+/* Open Dialog Provider */
static int OpenDialogs( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
var_Destroy (p_this->p_libvlc, "qt4-iface");
- QApplication::quit();
+ QVLCApp::triggerQuit();
vlc_join (p_sys->thread, NULL);
pl_Release (p_this);
delete p_sys;
}
-
-
static QMutex windowLock;
static QWaitCondition windowWait;
{
intf_thread_t *p_intf = (intf_thread_t *)obj;
MainInterface *p_mi;
- char dummy[] = "";
- char *argv[] = { dummy };
+ char dummy[] = "vlc"; /* for WM_CLASS */
+ char *argv[] = { 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 );
+ /* Start the QApplication here */
+#ifdef Q_WS_X11
+ char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
+ if( display )
+ {
+ argv[argc++] = const_cast<char *>("-display");
+ argv[argc++] = display;
+ argv[argc] = NULL;
+ }
#endif
+ QVLCApp app( argc, argv );
+ p_intf->p_sys->p_app = &app;
- /* Start the QApplication here */
- QVLCApp *app = new QVLCApp( argc, argv , true );
- p_intf->p_sys->p_app = app;
+ /* All the settings are in the .conf/.ini style */
p_intf->p_sys->mainSettings = new QSettings(
#ifdef WIN32
QSettings::IniFormat,
QSettings::UserScope, "vlc", "vlc-qt-interface" );
/* Icon setting */
- if( QDate::currentDate().dayOfYear() >= 354 )
- app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
+ if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */
+ app.setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
else
- app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
+ app.setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
/* Initialize timers and the Dialog Provider */
DialogsProvider::getInstance( p_intf );
/* Detect screensize for small screens like TV or EEEpc*/
p_intf->p_sys->i_screenHeight =
- app->QApplication::desktop()->availableGeometry().height();
+ app.QApplication::desktop()->availableGeometry().height();
#ifdef UPDATE_CHECK
/* Checking for VLC updates */
bool b_loaded = qtTranslator.load( path + "qt_" + lang );
if (!b_loaded)
msg_Dbg( p_intf, "Error while initializing qt-specific localization" );
- app->installTranslator( &qtTranslator );
+ app.installTranslator( &qtTranslator );
#endif //ENABLE_NLS
/* Last settings */
- app->setQuitOnLastWindowClosed( false );
+ 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 ) ? config_GetHomeDir()
- : psz_path;
+ {
+ char *psz_path = config_GetPsz( p_intf, "qt-filedialog-path" );
+ p_intf->p_sys->filepath =
+ EMPTY_STR(psz_path) ? config_GetHomeDir() : qfu(psz_path);
+ free( psz_path );
+ }
/* Launch */
- app->exec();
+ app.exec();
/* And quit */
msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
/* Destroy the MainInputManager */
MainInputManager::killInstance();
- /* Delete the application */
- delete app;
/* Save the path */
- config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
- free( psz_path );
+ config_PutPsz( p_intf, "qt-filedialog-path",
+ qtu(p_intf->p_sys->filepath) );
+
+ /* Delete the application automatically */
+#ifdef Q_WS_X11
+ free( display );
+#endif
return NULL;
}
{
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 );
}
/**
MainInterface *p_mi = intf->p_sys->p_mi;
msg_Dbg (obj, "requesting video...");
- wnd->handle = p_mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
- &wnd->width, &wnd->height);
- if (!wnd->handle)
+#if defined (Q_WS_X11)
+ wnd->handle.xid = p_mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
+ &wnd->width, &wnd->height);
+ if (!wnd->handle.xid)
+ return VLC_EGENERIC;
+
+#elif defined (WIN32)
+ wnd->handle.hwnd = p_mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
+ &wnd->width, &wnd->height);
+ if (!wnd->handle.hwnd)
return VLC_EGENERIC;
+#else
+ return VLC_EGENERIC;
+
+#endif
+
wnd->control = WindowControl;
wnd->p_private = p_mi;
return VLC_SUCCESS;
MainInterface *p_mi = (MainInterface *)wnd->p_private;
QMutexLocker locker (&iface.lock);
- return p_mi->controlVideo (wnd->handle, query, args);
+ return p_mi->controlVideo (query, args);
}
static void WindowClose (vlc_object_t *obj)