/*****************************************************************************
* 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"
"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") )
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 )
add_string( "qt-recentplay-filter", "", NULL,
UPDATER_DAYS_TEXT, false )
#endif
add_string( "qt-slider-colours",
- "255;255;255;20;226;20;255;176;15;235;30;20",
+ "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,
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;
#ifdef Q_WS_X11
- /* 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 );
+ 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" );
return VLC_EGENERIC;
}
+ 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;
-#ifdef Q_WS_X11
- p_sys->display = p_display;
-#endif
+ 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);
-#ifdef Q_WS_X11
- XCloseDisplay ((Display *)p_sys->display);
-#endif
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 );
-#endif
-
/* Start the QApplication here */
#ifdef Q_WS_X11
- QVLCApp app( (Display *)p_intf->p_sys->display, argc, argv );
-#else
- QVLCApp app( argc, argv );
+ 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;
+
+ /* 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 )
+ if( QDate::currentDate().dayOfYear() >= 352 ) /* One Week before Xmas */
app.setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
else
app.setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
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();
/* 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;
}
projects / vlc / blobdiff