/*****************************************************************************
* qt4.cpp : QT4 interface
****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
- * $Id: wxwidgets.cpp 15731 2006-05-25 14:43:53Z zorglub $
+ * Copyright (C) 2006-2007 the VideoLAN team
+ * $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
#include <QApplication>
+
#include "qt4.hpp"
#include "dialogs_provider.hpp"
+#include "input_manager.hpp"
#include "main_interface.hpp"
+#include "../../../share/vlc32x32.xpm"
+
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+#define ADVANCED_PREFS_TEXT N_("Show advanced prefs over simple")
+#define ADVANCED_PREFS_LONGTEXT N_("Show advanced preferences and not simple" \
+ "preferences when opening the preferences " \
+ "dialog.")
+
+#define SYSTRAY_TEXT N_("Show a systray icon to control VLC")
+#define SYSTRAY_LONGTEXT N_("Show in the taskbar, a systray icon" \
+ "in order to control VLC media player" \
+ "for basic actions")
+
+#define MINIMIZED_TEXT N_("Start VLC only with a systray icon")
+#define MINIMIZED_LONGTEXT N_("When you launch VLC with that option" \
+ "VLC will start just with 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")
+
+#define FILEDIALOG_PATH_TEXT N_("path to use in file dialog")
+#define FILEDIALOG_PATH_LONGTEXT N_("path to use in file dialog")
+
+#define ADVANCED_OPTIONS_TEXT N_("Advanced options")
+#define ADVANCED_OPTIONS_LONGTEXT N_("Activate by default all the" \
+ "Advanced options for geeks")
+
vlc_module_begin();
- set_shortname( (char*)"QT" );
- set_description( (char*)_("QT interface") );
- set_category( CAT_INTERFACE) ;
+ set_shortname( (char *)"Qt" );
+ set_description( (char*)_("Qt interface") );
+ set_category( CAT_INTERFACE ) ;
set_subcategory( SUBCAT_INTERFACE_MAIN );
- set_capability( "interface", 100 );
+ set_capability( "interface", 151 );
set_callbacks( Open, Close );
set_program( "qvlc" );
+ add_shortcut("qt");
add_submodule();
set_description( "Dialogs provider" );
set_capability( "dialogs provider", 51 );
+ add_bool( "qt-always-video", VLC_FALSE, NULL, "FIXME", "FIXME",
+ VLC_TRUE );
+ add_bool( "qt-advanced-pref", VLC_FALSE, NULL, ADVANCED_PREFS_TEXT,
+ ADVANCED_PREFS_LONGTEXT, VLC_FALSE );
+ add_bool( "qt-system-tray", VLC_TRUE, NULL, SYSTRAY_TEXT,
+ SYSTRAY_LONGTEXT, VLC_FALSE);
+ add_bool( "qt-start-mininimized", VLC_FALSE, NULL, MINIMIZED_TEXT,
+ MINIMIZED_LONGTEXT, VLC_TRUE);
+ add_bool( "qt-name-in-title", VLC_TRUE, NULL, TITLE_TEXT,
+ TITLE_LONGTEXT, VLC_FALSE );
+ add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
+ FILEDIALOG_PATH_LONGTEXT, VLC_TRUE);
+ change_autosave();
+ change_internal();
+ add_bool( "qt-adv-options", VLC_FALSE, NULL, ADVANCED_OPTIONS_TEXT,
+ ADVANCED_OPTIONS_LONGTEXT, VLC_TRUE );
set_callbacks( OpenDialogs, Close );
vlc_module_end();
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
p_intf->pf_run = Run;
+#if defined HAVE_GETENV && defined Q_WS_X11
+ if( !getenv( "DISPLAY" ) )
+ {
+ msg_Err(p_intf, "no X server");
+ return VLC_EGENERIC;
+ }
+#endif
p_intf->p_sys = (intf_sys_t *)malloc(sizeof( intf_sys_t ) );
+ if( !p_intf->p_sys )
+ {
+ msg_Err(p_intf, "Out of memory");
+ return VLC_ENOMEM;
+ }
memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
+ p_intf->p_sys->p_playlist = pl_Yield( p_intf );
p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
+ p_intf->b_play = VLC_TRUE;
+
return VLC_SUCCESS;
}
p_intf->b_dead = VLC_TRUE;
vlc_mutex_unlock( &p_intf->object_lock );
+ 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_intf->pf_show_dialog )
{
- if( vlc_thread_create( p_intf, "QT dialogs", Init, 0, VLC_TRUE ) )
- {
- msg_Err( p_intf, "failed to create QT dialogs thread" );
- }
+ if( vlc_thread_create( p_intf, "Qt dialogs", Init, 0, VLC_TRUE ) )
+ msg_Err( p_intf, "failed to create Qt dialogs thread" );
}
else
- {
Init( p_intf );
- }
}
static void Init( intf_thread_t *p_intf )
{
- char *argv[] = { "" };
+ char dummy[] = "";
+ char *argv[] = { dummy };
int argc = 1;
+ Q_INIT_RESOURCE( vlc );
QApplication *app = new QApplication( argc, argv , true );
+ app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
p_intf->p_sys->p_app = app;
- /* Normal interface */
+ // Initialize timers
+ DialogsProvider::getInstance( p_intf );
+
+ // Normal interface
if( !p_intf->pf_show_dialog )
{
MainInterface *p_mi = new MainInterface( p_intf );
p_mi->show();
}
- DialogsProvider::getInstance( p_intf );
-
if( p_intf->pf_show_dialog )
vlc_thread_ready( p_intf );
+ /* Start playing if needed */
+ if( !p_intf->pf_show_dialog && p_intf->b_play )
+ {
+ playlist_Control( THEPL, PLAYLIST_AUTOPLAY, VLC_FALSE );
+ }
+
+ p_intf->pf_show_dialog = ShowDialog;
+
app->setQuitOnLastWindowClosed( false );
app->exec();
+ MainInputManager::killInstance();
+ DialogsProvider::killInstance();
+ delete p_intf->p_sys->p_mi;
}
/*****************************************************************************
intf_dialog_args_t *p_arg )
{
DialogEvent *event = new DialogEvent( i_dialog_event, i_arg, p_arg );
- QApplication::postEvent( DialogsProvider::getInstance( p_intf ),
- static_cast<QEvent*>(event) );
+ QApplication::postEvent( THEDP, static_cast<QEvent*>(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 )
+{
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+ ShowDialog( p_intf, INTF_DIALOG_POPUPMENU, new_val.b_bool, 0 );
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff