#include "main_interface.hpp"
#include "input_manager.hpp"
#include "actions_manager.hpp"
+#include "extensions_manager.hpp" // killInstance
#include "util/customwidgets.hpp"
#include "util/qt_dirs.hpp"
#include "components/controller.hpp"
#include "components/playlist/playlist.hpp"
#include "dialogs/external.hpp"
+#include "dialogs/firstrun.hpp"
#include "menus.hpp"
#include "recents.hpp"
#include <vlc_keys.h> /* Wheel event */
#include <vlc_vout_window.h>
-#include <vlc_vout.h>
+#include <vlc_vout_display.h>
+// #define DEBUG_INTF
/* Callback prototypes */
static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param );
playlistVisible = false; // FIXME remove
input_name = "";
- stackCentralOldState = HIDDEN_TAB;
i_bg_height = 0;
- /* Ask for privacy */
- askForPrivacy();
+ /* Ask for Privacy */
+ FirstRun::CheckAndRun( this, p_intf );
/**
* Configuration and settings
setAcceptDrops( true );
setWindowRole( "vlc-main" );
setWindowIcon( QApplication::windowIcon() );
- setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
+ setWindowOpacity( var_InheritFloat( p_intf, "qt-opacity" ) );
/* Set The Video In emebedded Mode or not */
- videoEmbeddedFlag = config_GetInt( p_intf, "embedded-video" );
+ videoEmbeddedFlag = var_InheritBool( p_intf, "embedded-video" );
/* Does the interface resize to video size or the opposite */
- b_keep_size = !config_GetInt( p_intf, "qt-video-autoresize" );
+ b_keep_size = !var_InheritBool( p_intf, "qt-video-autoresize" );
/* Are we in the enhanced always-video mode or not ? */
- i_visualmode = config_GetInt( p_intf, "qt-display-mode" );
+ i_visualmode = var_InheritInteger( p_intf, "qt-display-mode" );
- /* Do we want anoying popups or not */
- notificationEnabled = (bool)config_GetInt( p_intf, "qt-notification" );
+ /* Do we want anoying popups or not */
+ notificationEnabled = (bool)var_InheritBool( p_intf, "qt-notification" );
/* Set the other interface settings */
settings = getSettings();
mainBasedSize = settings->value( "mainBasedSize", QSize( 350, 120 ) ).toSize();
mainVideoSize = settings->value( "mainVideoSize", QSize( 400, 300 ) ).toSize();
+
/**************
* Status Bar *
**************/
CONNECT( THEMIM->getIM(), voutListChanged( vout_thread_t **, int ),
this, destroyPopupMenu() );
-#if 0
- /* Create a Dock to get the playlist */
- dockPL = new QDockWidget( qtr( "Playlist" ), this );
- dockPL->setSizePolicy( QSizePolicy::Preferred,
- QSizePolicy::Expanding );
- dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures );
- dockPL->setAllowedAreas( Qt::LeftDockWidgetArea
- | Qt::RightDockWidgetArea
- | Qt::BottomDockWidgetArea );
- dockPL->hide();
-#endif
-
/*********************************
* Create the Systray Management *
*********************************/
********************/
MainInputManager::getInstance( p_intf );
+#ifdef WIN32
+ himl = NULL;
+ p_taskbl = NULL;
+ taskbar_wmsg = RegisterWindowMessage("TaskbarButtonCreated");
+#endif
+
/************************************************************
* Connect the input manager to the GUI elements it manages *
************************************************************/
}
#endif
/* and title of the Main Interface*/
- if( config_GetInt( p_intf, "qt-name-in-title" ) )
+ if( var_InheritBool( p_intf, "qt-name-in-title" ) )
{
CONNECT( THEMIM->getIM(), nameChanged( const QString& ),
this, setVLCWindowsTitle( const QString& ) );
CONNECT( this, askUpdate(), this, doComponentsUpdate() );
CONNECT( THEDP, toolBarConfUpdated(), this, recreateToolbars() );
- /* Size and placement of interface */
+ /* Enable the popup menu in the MI */
+ setContextMenuPolicy( Qt::CustomContextMenu );
+ CONNECT( this, customContextMenuRequested( const QPoint& ),
+ this, popupMenu( const QPoint& ) );
+
+ /** END of CONNECTS**/
+
+
+ /**** FINAL SIZING and placement of interface */
settings->beginGroup( "MainWindow" );
QVLCTools::restoreWidgetPosition( settings, this, QSize(380, 60) );
}
}
- bool b_pl_visible = settings->value( "playlist-visible", 0 ).toInt();
- settings->endGroup();
+ msg_Dbg( p_intf, "%i", stackCentralOldState );
/* Playlist */
- if( b_pl_visible ) togglePlaylist();
+ int i_plVis = settings->value( "playlist-visible", 0 ).toInt();
- /* Enable the popup menu in the MI */
- setContextMenuPolicy( Qt::CustomContextMenu );
- CONNECT( this, customContextMenuRequested( const QPoint& ),
- this, popupMenu( const QPoint& ) );
+ settings->endGroup();
- debug();
+ if( i_plVis ) togglePlaylist();
/* Final sizing and showing */
setVisible( !b_hideAfterCreation );
//setMinimumSize( QSize( 0, 0 ) );
-// setMinimumWidth( __MAX( controls->sizeHint().width(),
- // menuBar()->sizeHint().width() ) );
+ // setMinimumWidth( __MAX( controls->sizeHint().width(),
+ // menuBar()->sizeHint().width() ) );
debug();
/* And switch to minimal view if needed
qt-display-modes */
updateGeometry();
resize( sizeHint() );
-
-#ifdef WIN32
- createTaskBarButtons();
-#endif
}
MainInterface::~MainInterface()
/* Be sure to kill the actionsManager... FIXME */
ActionsManager::killInstance();
+ /* Idem, FIXME */
+ ExtensionsManager::killInstance();
+
/* Delete the FSC controller */
delete fullscreenControls;
*****************************/
void MainInterface::recreateToolbars()
{
- msg_Dbg( p_intf, "Recreating the toolbars" );
+ //msg_Dbg( p_intf, "Recreating the toolbars" );
settings->beginGroup( "MainWindow" );
delete controls;
delete inputC;
+
controls = new ControlsWidget( p_intf, false, this ); /* FIXME */
CONNECT( controls, advancedControlsToggled( bool ),
this, doComponentsUpdate() );
CONNECT( controls, sizeChanged(),
this, doComponentsUpdate() );
+
inputC = new InputControlsWidget( p_intf, this );
mainLayout->insertWidget( 2, inputC );
/* Margins, spacing */
main->setContentsMargins( 0, 0, 0, 0 );
- mainLayout->setSpacing( 0 );
- mainLayout->setMargin( 0 );
+ mainLayout->setSpacing( 0 ); mainLayout->setMargin( 0 );
/* */
stackCentralW = new QStackedWidget( main );
bgWidget->updateGeometry();
stackCentralW->insertWidget( BACKG_TAB, bgWidget );
- if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
- i_visualmode != QT_MINIMAL_MODE )
- {
- stackCentralW->hide();
- }
/* And video Outputs */
if( videoEmbeddedFlag )
stackCentralW->insertWidget( VIDEO_TAB, videoWidget );
}
mainLayout->insertWidget( 1, stackCentralW, 100 );
+
+
/* Create the CONTROLS Widget */
controls = new ControlsWidget( p_intf,
settings->value( "adv-controls", false ).toBool(), this );
this, doComponentsUpdate() );
inputC = new InputControlsWidget( p_intf, this );
+ if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
+ i_visualmode != QT_MINIMAL_MODE )
+ {
+ hideStackWidget();
+ stackCentralOldState = HIDDEN_TAB;
+ }
+ else
+ {
+ showTab( BACKG_TAB );
+ stackCentralOldState = BACKG_TAB;
+ }
+
+
//mainLayout->setRowStretch( 1, 10 );
mainLayout->insertWidget( 2, inputC );
mainLayout->insertWidget( settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3,
if ( depth() > 8 )
#endif
/* Create the FULLSCREEN CONTROLS Widget */
- if( config_GetInt( p_intf, "qt-fs-controller" ) )
+ if( var_InheritBool( p_intf, "qt-fs-controller" ) )
{
fullscreenControls = new FullscreenControllerWidget( p_intf, this );
CONNECT( fullscreenControls, keyPressed( QKeyEvent * ),
}
}
+inline void MainInterface::initSystray()
+{
+#ifndef HAVE_MAEMO
+ bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
+ bool b_systrayWanted = var_InheritBool( p_intf, "qt-system-tray" );
+
+ if( var_InheritBool( p_intf, "qt-start-minimized") )
+ {
+ if( b_systrayAvailable )
+ {
+ b_systrayWanted = true;
+ b_hideAfterCreation = true;
+ }
+ else
+ msg_Err( p_intf, "cannot start minimized without system tray bar" );
+ }
+
+ if( b_systrayAvailable && b_systrayWanted )
+ createSystray();
+#endif
+}
+
inline void MainInterface::createStatusBar()
{
/****************
#ifdef WIN32
void MainInterface::createTaskBarButtons()
{
+ taskbar_wmsg = WM_NULL;
/*Here is the code for the taskbar thumb buttons
FIXME:We need pretty buttons in 16x16 px that are handled correctly by masks in Qt
FIXME:the play button's picture doesn't changed to pause when clicked
*/
- OSVERSIONINFO winVer;
- winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 )
+
+ CoInitialize( 0 );
+
+ if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
+ NULL, CLSCTX_INPROC_SERVER,
+ &IID_ITaskbarList3,
+ (void **)&p_taskbl) )
{
+ p_taskbl->vt->HrInit(p_taskbl);
+
if(himl = ImageList_Create( 15, //cx
- 18, //cy
- ILC_COLOR,//flags
- 4,//initial nb of images
- 0//nb of images that can be added
- ))
+ 18, //cy
+ ILC_COLOR,//flags
+ 4,//initial nb of images
+ 0//nb of images that can be added
+ ))
{
QPixmap img = QPixmap(":/toolbar/previous_b");
QPixmap img2 = QPixmap(":/toolbar/pause_b");
msg_Err( p_intf, "ImageList_Add failed" );
}
- CoInitialize( 0 );
-
- if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
- NULL, CLSCTX_INPROC_SERVER,
- &IID_ITaskbarList3,
- (void **)&p_taskbl) )
+ // Define an array of two buttons. These buttons provide images through an
+ // image list and also provide tooltips.
+ DWORD dwMask = THB_BITMAP | THB_FLAGS;
+
+ THUMBBUTTON thbButtons[3];
+ thbButtons[0].dwMask = dwMask;
+ thbButtons[0].iId = 0;
+ thbButtons[0].iBitmap = 0;
+ thbButtons[0].dwFlags = THBF_HIDDEN;
+
+ thbButtons[1].dwMask = dwMask;
+ thbButtons[1].iId = 1;
+ thbButtons[1].iBitmap = 2;
+ thbButtons[1].dwFlags = THBF_HIDDEN;
+
+ thbButtons[2].dwMask = dwMask;
+ thbButtons[2].iId = 2;
+ thbButtons[2].iBitmap = 3;
+ thbButtons[2].dwFlags = THBF_HIDDEN;
+
+ HRESULT hr = p_taskbl->vt->ThumbBarSetImageList(p_taskbl, winId(), himl );
+ if(S_OK != hr)
+ msg_Err( p_intf, "ThumbBarSetImageList failed with error %08x", hr );
+ else
{
- p_taskbl->vt->HrInit(p_taskbl);
-
- int msg_value = RegisterWindowMessage("TaskbarButtonCreated");
- //msg_Info( p_intf, "msg value: %04x", msg_value );
-
- // Define an array of two buttons. These buttons provide images through an
- // image list and also provide tooltips.
- DWORD dwMask = THB_BITMAP | THB_FLAGS;
-
- THUMBBUTTON thbButtons[2];
- thbButtons[0].dwMask = dwMask;
- thbButtons[0].iId = 0;
- thbButtons[0].iBitmap = 0;
- thbButtons[0].dwFlags = THBF_HIDDEN;
-
- thbButtons[1].dwMask = dwMask;
- thbButtons[1].iId = 1;
- thbButtons[1].iBitmap = 2;
- thbButtons[1].dwFlags = THBF_HIDDEN;
-
- thbButtons[2].dwMask = dwMask;
- thbButtons[2].iId = 2;
- thbButtons[2].iBitmap = 3;
- thbButtons[2].dwFlags = THBF_HIDDEN;
-
- HRESULT hr = p_taskbl->vt->ThumbBarSetImageList(p_taskbl, GetForegroundWindow(), himl );
+ hr = p_taskbl->vt->ThumbBarAddButtons(p_taskbl, winId(), 3, thbButtons);
if(S_OK != hr)
- msg_Err( p_intf, "ThumbBarSetImageList failed with error %08x", hr );
- if(S_OK != p_taskbl->vt->ThumbBarAddButtons(p_taskbl, GetForegroundWindow(), 3, thbButtons))
- msg_Err( p_intf, "ThumbBarAddButtons failed with error %08x", GetLastError() );
-
- CONNECT( THEMIM->getIM(), statusChanged( int ), this, changeThumbbarButtons( int ) );
+ msg_Err( p_intf, "ThumbBarAddButtons failed with error %08x", hr );
}
+ CONNECT( THEMIM->getIM(), statusChanged( int ), this, changeThumbbarButtons( int ) );
}
else
{
himl = NULL;
p_taskbl = NULL;
}
-}
-#endif
+}
-inline void MainInterface::initSystray()
+bool MainInterface::winEvent ( MSG * msg, long * result )
{
-#ifndef HAVE_MAEMO
- bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
- bool b_systrayWanted = config_GetInt( p_intf, "qt-system-tray" );
-
- if( config_GetInt( p_intf, "qt-start-minimized") > 0 )
+ if (msg->message == taskbar_wmsg)
{
- if( b_systrayAvailable )
- {
- b_systrayWanted = true;
- b_hideAfterCreation = true;
- }
- else
- msg_Err( p_intf, "cannot start minimized without system tray bar" );
+ //We received the taskbarbuttoncreated, now we can really create th buttons
+ createTaskBarButtons();
}
- if( b_systrayAvailable && b_systrayWanted )
- createSystray();
-#endif
-}
-
-inline void MainInterface::askForPrivacy()
-{
-#ifndef HAVE_MAEMO
- /**
- * Ask for the network policy on FIRST STARTUP
- **/
- if( config_GetInt( p_intf, "qt-privacy-ask") )
+ short cmd;
+ switch( msg->message )
{
- QList<ConfigControl *> controls;
- if( privacyDialog( &controls ) == QDialog::Accepted )
- {
- QList<ConfigControl *>::Iterator i;
- for( i = controls.begin() ; i != controls.end() ; i++ )
+ case WM_COMMAND:
+ if (HIWORD(msg->wParam) == THBN_CLICKED)
{
- ConfigControl *c = qobject_cast<ConfigControl *>(*i);
- c->doApply( p_intf );
+ switch(LOWORD(msg->wParam))
+ {
+ case 0:
+ THEMIM->prev();
+ break;
+ case 1:
+ THEMIM->togglePlayPause();
+ break;
+ case 2:
+ THEMIM->next();
+ break;
+ }
}
-
- config_PutInt( p_intf, "qt-privacy-ask" , 0 );
- /* We have to save here because the user may not launch Prefs */
- config_SaveConfigFile( p_intf, NULL );
- }
+ break;
+ case WM_APPCOMMAND:
+ cmd = GET_APPCOMMAND_LPARAM(msg->lParam);
+ switch(cmd)
+ {
+ case APPCOMMAND_MEDIA_PLAY_PAUSE:
+ THEMIM->togglePlayPause();
+ break;
+ case APPCOMMAND_MEDIA_PLAY:
+ THEMIM->play();
+ break;
+ case APPCOMMAND_MEDIA_PAUSE:
+ THEMIM->pause();
+ break;
+ case APPCOMMAND_MEDIA_PREVIOUSTRACK:
+ THEMIM->prev();
+ break;
+ case APPCOMMAND_MEDIA_NEXTTRACK:
+ THEMIM->next();
+ break;
+ case APPCOMMAND_MEDIA_STOP:
+ THEMIM->stop();
+ break;
+ case APPCOMMAND_VOLUME_DOWN:
+ THEAM->AudioDown();
+ break;
+ case APPCOMMAND_VOLUME_UP:
+ THEAM->AudioUp();
+ break;
+ case APPCOMMAND_VOLUME_MUTE:
+ THEAM->toggleMuteAudio();
+ break;
+ default:
+ msg_Dbg( p_intf, "unknown APPCOMMAND = %d", cmd);
+ break;
+ }
+ break;
}
-#endif
+ return false;
}
-
-int MainInterface::privacyDialog( QList<ConfigControl *> *controls )
-{
- QDialog *privacy = new QDialog( this );
-
- privacy->setWindowTitle( qtr( "Privacy and Network Policies" ) );
- privacy->setWindowRole( "vlc-privacy" );
-
- QGridLayout *gLayout = new QGridLayout( privacy );
-
- QGroupBox *blabla = new QGroupBox( qtr( "Privacy and Network Warning" ) );
- QGridLayout *blablaLayout = new QGridLayout( blabla );
- QLabel *text = new QLabel( qtr(
- "<p>The <i>VideoLAN Team</i> doesn't like when an application goes "
- "online without authorization.</p>\n "
- "<p><i>VLC media player</i> can retreive limited information from "
- "the Internet in order to get CD covers or to check "
- "for available updates.</p>\n"
- "<p><i>VLC media player</i> <b>DOES NOT</b> send or collect <b>ANY</b> "
- "information, even anonymously, about your usage.</p>\n"
- "<p>Therefore please select from the following options, the default being "
- "almost no access to the web.</p>\n") );
- text->setWordWrap( true );
- text->setTextFormat( Qt::RichText );
-
- blablaLayout->addWidget( text, 0, 0 ) ;
-
- QGroupBox *options = new QGroupBox;
- QGridLayout *optionsLayout = new QGridLayout( options );
-
- gLayout->addWidget( blabla, 0, 0, 1, 3 );
- gLayout->addWidget( options, 1, 0, 1, 3 );
- module_config_t *p_config;
- ConfigControl *control;
- int line = 0;
-
-#define CONFIG_GENERIC( option, type ) \
- p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
- if( p_config ) \
- { \
- control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
- p_config, options, false, optionsLayout, line ); \
- controls->append( control ); \
- }
-
-#define CONFIG_GENERIC_NOBOOL( option, type ) \
- p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
- if( p_config ) \
- { \
- control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
- p_config, options, optionsLayout, line ); \
- controls->append( control ); \
- }
-
- CONFIG_GENERIC( "album-art", IntegerList ); line++;
-#ifdef UPDATE_CHECK
- CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++;
#endif
- QPushButton *ok = new QPushButton( qtr( "OK" ) );
-
- gLayout->addWidget( ok, 2, 2 );
-
- CONNECT( ok, clicked(), privacy, accept() );
- return privacy->exec();
-}
-
-
/**********************************************************************
* Handling of sizing of the components
**********************************************************************/
{
if( isFullScreen() || isMaximized() ) return;
- msg_Warn( p_intf, "Updating the geometry" );
+// msg_Warn( p_intf, "Updating the geometry" );
/* Here we resize to sizeHint() and not adjustsize because we want
the videoWidget to be exactly the correctSize */
{
#ifndef NDEBUG
msg_Dbg( p_intf, "Stack Size: %i - %i", stackCentralW->size().height(), size().width() );
- msg_Dbg( p_intf, "Stack Size: %i - %i", stackCentralW->widget( VIDEO_TAB )->size().height(), stackCentralW->widget( VIDEO_TAB )->size().width() );
+ if( videoEmbeddedFlag )
+ msg_Dbg( p_intf, "Stack Size: %i - %i",
+ stackCentralW->widget( VIDEO_TAB )->size().height(),
+ stackCentralW->widget( VIDEO_TAB )->size().width() );
+ else
+ msg_Dbg( p_intf, "no embedded video" );
msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() );
msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() );
#endif
}
+inline void MainInterface::showTab( int i_tab )
+{
+#ifdef DEBUG_INTF
+ msg_Err( p_intf, "showTab %i", i_tab );
+ msg_Warn( p_intf, "Old stackCentralOldState %i", stackCentralOldState );
+#endif
+ stackCentralOldState = stackCentralW->isVisible() ? stackCentralW->currentIndex()
+ : HIDDEN_TAB;
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "State change %i %i", stackCentralW->currentIndex(), i_tab );
+#endif
+
+ if( i_visualmode == QT_NORMAL_MODE )
+ {
+ stackCentralW->setVisible( i_tab != HIDDEN_TAB );
+ doComponentsUpdate(); // resize the player
+ }
+ else
+ if( i_tab == HIDDEN_TAB ) i_tab == BACKG_TAB;
+
+ stackCentralW->setCurrentIndex( i_tab );
+
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "New stackCentralOldState %i", stackCentralOldState );
+#endif
+}
+
+inline void MainInterface::restoreStackOldWidget()
+{
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "Old stackCentralOldState %i", stackCentralOldState );
+#endif
+ int temp = stackCentralW->isVisible() ? stackCentralW->currentIndex()
+ : HIDDEN_TAB;
+ stackCentralW->setCurrentIndex( stackCentralOldState );
+ if( i_visualmode == QT_NORMAL_MODE )
+ {
+ stackCentralW->setVisible( stackCentralOldState != HIDDEN_TAB );
+ doComponentsUpdate(); // resize the player
+ }
+
+ stackCentralOldState = temp;
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "Debug %i %i", temp, stackCentralW->currentIndex() );
+#endif
+}
+
void MainInterface::destroyPopupMenu()
{
QVLCMenu::PopupMenu( p_intf, false );
}
}
-inline void MainInterface::showTab( int i_tab )
-{
- stackCentralOldState = stackCentralW->currentIndex();
- stackCentralW->setCurrentIndex( i_tab );
- if( stackCentralW->isHidden() ) stackCentralW->show();
-}
/* Asynchronous call from the WindowClose function */
void MainInterface::releaseVideo( void )
{
videoWidget->release( );
- /* Restore the previous State */
- if( stackCentralOldState == BACKG_TAB )
- {
- showBg();
- }
- else
- {
- stackCentralW->hide();
- stackCentralOldState == -1;
- }
+ restoreStackOldWidget();
/* Try to resize, except when you are in Fullscreen mode */
- doComponentsUpdate();
+// doComponentsUpdate();
}
/* Asynchronous call from WindowControl function */
unsigned int i_height = va_arg( args, unsigned int );
emit askVideoToResize( i_width, i_height );
emit askUpdate();
- return VLC_SUCCESS;
+ return VLC_EGENERIC;
}
- case VOUT_WINDOW_SET_ON_TOP:
+ case VOUT_WINDOW_SET_STATE:
{
- int i_arg = va_arg( args, int );
- QApplication::postEvent( this, new SetVideoOnTopQtEvent( i_arg ) );
+ unsigned i_arg = va_arg( args, unsigned );
+ unsigned on_top = i_arg & VOUT_WINDOW_STATE_ABOVE;
+ QApplication::postEvent( this, new SetVideoOnTopQtEvent( on_top ) );
return VLC_SUCCESS;
}
case VOUT_WINDOW_SET_FULLSCREEN:
/**
* Toggle the playlist widget or dialog
**/
-void MainInterface::togglePlaylist()
+void MainInterface::createPlaylist( bool b_show )
{
- /* CREATION
- If no playlist exist, then create one and attach it to the DockPL*/
- if( !playlistWidget )
- {
- playlistWidget = new PlaylistWidget( p_intf );
+ playlistWidget = new PlaylistWidget( p_intf, this );
- i_pl_dock = PL_BOTTOM;
- /*i_pl_dock = (pl_dock_e)getSettings()
- ->value( "pl-dock-status", PL_UNDOCKED ).toInt();*/
+ i_pl_dock = PL_BOTTOM;
+ /* i_pl_dock = (pl_dock_e)getSettings()
+ ->value( "pl-dock-status", PL_UNDOCKED ).toInt(); */
- if( i_pl_dock == PL_UNDOCKED )
- {
- playlistWidget->setWindowFlags( Qt::Window );
+ if( i_pl_dock == PL_UNDOCKED )
+ {
+ playlistWidget->setWindowFlags( Qt::Window );
- /* This will restore the geometry but will not work for position,
- because of parenting */
- QVLCTools::restoreWidgetPosition( p_intf, "Playlist",
- playlistWidget, QSize( 600, 300 ) );
- }
- else
- {
- stackCentralW->insertWidget(PLAYL_TAB, playlistWidget );
- stackCentralW->setCurrentWidget( playlistWidget );
- stackCentralW->show();
- }
+ /* This will restore the geometry but will not work for position,
+ because of parenting */
+ QVLCTools::restoreWidgetPosition( p_intf, "Playlist",
+ playlistWidget, QSize( 600, 300 ) );
+ }
+ else
+ {
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "Here %i", stackCentralW->currentIndex() );
+#endif
+ stackCentralW->insertWidget( PLAYL_TAB, playlistWidget );
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "Here %i", stackCentralW->currentIndex() );
+#endif
+ }
+
+ if( b_show )
+ {
playlistVisible = true;
+ stackCentralW->show();
+ }
+}
- playlistWidget->show();
+void MainInterface::togglePlaylist()
+{
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "Here toggling %i %i", stackCentralW->currentIndex(), stackCentralOldState );
+#endif
+ if( !playlistWidget )
+ {
+ createPlaylist( true );
}
- else
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "Here toggling %i %i", stackCentralW->currentIndex(), stackCentralOldState );
+
+#endif
+ if( i_pl_dock != PL_UNDOCKED )
{
- /* toggle the visibility of the playlist */
+ /* Playlist not visible */
if( stackCentralW->currentIndex() != PLAYL_TAB )
{
- stackCentralW->insertWidget(PLAYL_TAB, playlistWidget );
- stackCentralW->setCurrentWidget( playlistWidget );
+ showTab( PLAYL_TAB );
stackCentralW->show();
}
else
- stackCentralW->setCurrentIndex( VIDEO_TAB );
- playlistVisible = !playlistVisible;
- //doComponentsUpdate(); //resize( sizeHint() );
+ {
+ restoreStackOldWidget();
+ }
+ playlistVisible = ( stackCentralW->currentIndex() == PLAYL_TAB );
+ //doComponentsUpdate(); //resize( sizeHint() );
}
}
void MainInterface::changeThumbbarButtons( int i_status)
{
#ifdef WIN32
- // Define an array of two buttons. These buttons provide images through an
+ // Define an array of three buttons. These buttons provide images through an
// image list and also provide tooltips.
DWORD dwMask = THB_BITMAP | THB_FLAGS;
switch( i_status )
{
- case 0:
- case END_S:
- {
- thbButtons[0].dwFlags = THBF_HIDDEN;
- thbButtons[1].dwFlags = THBF_HIDDEN;
- thbButtons[2].dwFlags = THBF_HIDDEN;
- break;
- }
case PLAYING_S:
{
thbButtons[0].dwFlags = THBF_ENABLED;
}
case PAUSE_S:
{
- //thbButtons[0].dwFlags = THBF_ENABLED;
- //thbButtons[1].dwFlags = THBF_ENABLED;
- //thbButtons[2].dwFlags = THBF_ENABLED;
+ thbButtons[0].dwFlags = THBF_ENABLED;
+ thbButtons[1].dwFlags = THBF_ENABLED;
+ thbButtons[2].dwFlags = THBF_ENABLED;
thbButtons[1].iBitmap = 2;
break;
}
+ default:
+ return;
}
-
- HRESULT hr = p_taskbl->vt->ThumbBarUpdateButtons(p_taskbl, GetForegroundWindow(), 3, thbButtons);
+ HRESULT hr = p_taskbl->vt->ThumbBarUpdateButtons(p_taskbl, this->winId(), 3, thbButtons);
if(S_OK != hr)
msg_Err( p_intf, "ThumbBarUpdateButtons failed with error %08x", hr );
#else