#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" )
-
#define NOTIFICATION_TEXT N_( "Show notification popup on track change" )
#define NOTIFICATION_LONGTEXT N_( \
"Show a notification popup with the artist and track name when " \
" This option only works with Windows and " \
"X11 with composite extensions." )
+#define OPACITY_FS_TEXT N_( "Fullscreen controller opacity 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" )
"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" )
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)
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-embedded-open", false, NULL, QT_NATIVEOPEN_TEXT,
QT_NATIVEOPEN_TEXT, false )
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,
set_callbacks( OpenDialogs, Close )
-#if defined (Q_WS_X11)
-# define WID_CAPABILITY "xwindow"
-#elif defined (WIN32)
-# define WID_CAPABILITY "hwnd"
-#endif
-#ifdef WID_CAPABILITY
+#if defined(Q_WS_X11) || defined(WIN32)
add_submodule ()
- set_capability( WID_CAPABILITY, 50 )
+ set_capability( "vout window", 50 )
set_callbacks( WindowOpen, WindowClose )
#endif
delete p_sys;
}
-static QMutex windowLock;
-static QWaitCondition windowWait;
-
static void *Thread( void *obj )
{
intf_thread_t *p_intf = (intf_thread_t *)obj;
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
char *display = var_CreateGetNonEmptyString( p_intf, "x11-display" );
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;
+ p_intf->p_sys->filepath =
+ getSettings()->value( "filedialog-path", config_GetHomeDir() ).toString();
/* Launch */
app.exec();
/* 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;
MainInputManager::killInstance();
- /* Save the path */
- config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
- free( psz_path );
/* Delete the application automatically */
+#ifdef Q_WS_X11
free( display );
+#endif
return NULL;
}
/**
* Video output window provider
+ *
+ * TODO move it out of here ?
*/
-#include <vlc_window.h>
+#include <vlc_vout_window.h>
-static int WindowControl (vout_window_t *, int, va_list);
+static int WindowControl( vout_window_t *, int i_query, va_list );
-static int WindowOpen (vlc_object_t *obj)
+static int WindowOpen( vlc_object_t *p_obj )
{
- vout_window_t *wnd = (vout_window_t *)obj;
- intf_thread_t *intf = NULL;
- vlc_value_t val;
+ vout_window_t *p_wnd = (vout_window_t*)p_obj;
+
+ /* Check compatibility */
+#if defined (Q_WS_X11)
+ if( p_wnd->cfg->type != VOUT_WINDOW_TYPE_XWINDOW )
+#elif defined (WIN32)
+ if( p_wnd->cfg->type != VOUT_WINDOW_TYPE_HWND )
+#endif
+ return VLC_EGENERIC;
- if (config_GetInt (obj, "embedded-video") <= 0)
+ /* */
+ if( p_wnd->cfg->is_standalone )
return VLC_EGENERIC;
- QMutexLocker (&iface.lock);
- if (var_Get (obj->p_libvlc, "qt4-iface", &val) == 0)
- intf = (intf_thread_t *)val.p_address;
- if (intf == NULL)
+ QMutexLocker( &iface.lock );
+
+ vlc_value_t val;
+
+ if( var_Get( p_obj->p_libvlc, "qt4-iface", &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 (obj, "Qt4 interface not found");
+ msg_Dbg( p_obj, "Qt4 interface not found" );
return VLC_EGENERIC;
}
- MainInterface *p_mi = intf->p_sys->p_mi;
- msg_Dbg (obj, "requesting video...");
+ 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)
- wnd->handle.xid = p_mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
- &wnd->width, &wnd->height);
- if (!wnd->handle.xid)
+ p_wnd->handle.xid = p_mi->requestVideo( &i_x, &i_y, &i_width, &i_height );
+ if( !p_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)
+ p_wnd->handle.hwnd = p_mi->requestVideo( &i_x, &i_y, &i_width, &i_height );
+ if( !p_wnd->handle.hwnd )
return VLC_EGENERIC;
-
-#else
- return VLC_EGENERIC;
-
#endif
- wnd->control = WindowControl;
- wnd->p_private = p_mi;
+ p_wnd->control = WindowControl;
+ p_wnd->sys = (vout_window_sys_t*)p_mi;
return VLC_SUCCESS;
}
-static int WindowControl (vout_window_t *wnd, int query, va_list args)
+static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args )
{
- MainInterface *p_mi = (MainInterface *)wnd->p_private;
- QMutexLocker locker (&iface.lock);
+ MainInterface *p_mi = (MainInterface *)p_wnd->sys;
+ QMutexLocker locker(&iface.lock);
- return p_mi->controlVideo (query, args);
+ return p_mi->controlVideo( i_query, args );
}
-static void WindowClose (vlc_object_t *obj)
+static void WindowClose( vlc_object_t *p_obj )
{
- vout_window_t *wnd = (vout_window_t *)obj;
- MainInterface *p_mi = (MainInterface *)wnd->p_private;
- QMutexLocker locker (&iface.lock);
+ vout_window_t *p_wnd = (vout_window_t*)p_obj;
+ MainInterface *p_mi = (MainInterface *)p_wnd->sys;
+
+ QMutexLocker locker( &iface.lock );
- msg_Dbg (obj, "releasing video...");
- p_mi->releaseVideo ();
+ msg_Dbg( p_obj, "releasing video..." );
+ p_mi->releaseVideo();
}