#include "components/controller.hpp"
#include "components/playlist/playlist.hpp"
#include "dialogs/external.hpp"
+#include "dialogs/firstrun.hpp"
#include "menus.hpp"
#include "recents.hpp"
#include <QLabel>
#include <QGroupBox>
#include <QPushButton>
+#include <QStackedWidget>
#ifdef WIN32
#include <vlc_windows_interfaces.h>
#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 );
#ifndef HAVE_MAEMO
sysTray = NULL;
#endif
- videoIsActive = false;
- playlistVisible = false;
- input_name = "";
fullscreenControls = NULL;
cryptedLabel = NULL;
controls = NULL;
inputC = NULL;
- b_shouldHide = false;
- bgWasVisible = false;
+ b_hideAfterCreation = false;
+ playlistVisible = false; // FIXME remove
+ input_name = "";
+
i_bg_height = 0;
- /* Ask for privacy */
- askForPrivacy();
+ /* Ask for Privacy */
+ FirstRun::CheckAndRun( this, p_intf );
/**
* Configuration and settings
/* Are we in the enhanced always-video mode or not ? */
i_visualmode = config_GetInt( p_intf, "qt-display-mode" );
- /* Do we want anoying popups or not */
+ /* Do we want anoying popups or not */
notificationEnabled = (bool)config_GetInt( p_intf, "qt-notification" );
/* Set the other interface settings */
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
+ taskbar_wmsg = RegisterWindowMessage("TaskbarButtonCreated");
+#endif
+
/************************************************************
* Connect the input manager to the GUI elements it manages *
************************************************************/
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();
-
- /* Enable the popup menu in the MI */
- setContextMenuPolicy( Qt::CustomContextMenu );
- CONNECT( this, customContextMenuRequested( const QPoint& ),
- this, popupMenu( const QPoint& ) );
+ if( settings->value( "playlist-visible", 0 ).toInt() )
+ togglePlaylist();
+ settings->endGroup();
/* Final sizing and showing */
- setMinimumWidth( __MAX( controls->sizeHint().width(),
- menuBar()->sizeHint().width() ) );
- setVisible( !b_shouldHide );
+ setVisible( !b_hideAfterCreation );
+ //setMinimumSize( QSize( 0, 0 ) );
+ // setMinimumWidth( __MAX( controls->sizeHint().width(),
+ // menuBar()->sizeHint().width() ) );
+ debug();
/* And switch to minimal view if needed
Must be called after the show() */
if( i_visualmode == QT_MINIMAL_MODE )
qt-display-modes */
updateGeometry();
resize( sizeHint() );
-
-#ifdef WIN32
- createTaskBarButtons();
-#endif
}
MainInterface::~MainInterface()
msg_Dbg( p_intf, "Destroying the main interface" );
/* Unsure we hide the videoWidget before destroying it */
- if( videoIsActive ) videoWidget->hide();
+ if( stackCentralOldState == VIDEO_TAB )
+ showBg();
/* Save playlist state */
if( playlistWidget )
QVLCTools::saveWidgetPosition(settings, this);
settings->endGroup();
-
/* Unregister callbacks */
var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
*****************************/
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->addWidget( inputC, 2, 0, 1, -1, Qt::AlignBottom );
- mainLayout->addWidget( controls, settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3,
- 0, 1, -1, Qt::AlignBottom );
+ mainLayout->insertWidget( 2, inputC );
+ mainLayout->insertWidget( settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3,
+ controls );
settings->endGroup();
}
/* Create the main Widget and the mainLayout */
QWidget *main = new QWidget;
setCentralWidget( main );
- mainLayout = new QGridLayout( main );
+ mainLayout = new QVBoxLayout( main );
/* Margins, spacing */
main->setContentsMargins( 0, 0, 0, 0 );
- main->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
- mainLayout->setSpacing( 0 );
- mainLayout->setMargin( 0 );
+ mainLayout->setSpacing( 0 ); mainLayout->setMargin( 0 );
- /* Visualisation */
- /* Disabled for now, they SUCK */
- #if 0
- visualSelector = new VisualSelector( p_intf );
- mainLayout->insertWidget( 0, visualSelector );
- visualSelector->hide();
- #endif
+ /* */
+ stackCentralW = new QStackedWidget( main );
/* Bg Cone */
bgWidget = new BackgroundWidget( p_intf );
bgWidget->resize(
settings->value( "backgroundSize", QSize( 300, 200 ) ).toSize() );
bgWidget->updateGeometry();
+ stackCentralW->insertWidget( BACKG_TAB, bgWidget );
- if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
- i_visualmode != QT_MINIMAL_MODE )
- {
- bgWidget->hide();
- }
/* And video Outputs */
if( videoEmbeddedFlag )
+ {
videoWidget = new VideoWidget( p_intf );
+ stackCentralW->insertWidget( VIDEO_TAB, videoWidget );
+ }
+ mainLayout->insertWidget( 1, stackCentralW, 100 );
+
/* Create the CONTROLS Widget */
controls = new ControlsWidget( p_intf,
this, doComponentsUpdate() );
inputC = new InputControlsWidget( p_intf, this );
-
- /* Add the controls Widget to the main Widget */
- if( videoWidget ){
- mainLayout->addWidget( videoWidget, 0, 0, 1, -1 );
- mainLayout->setRowStretch( 0, 10 );
+ if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
+ i_visualmode != QT_MINIMAL_MODE )
+ {
+ hideStackWidget();
+ stackCentralOldState = HIDDEN_TAB;
+ }
+ else
+ {
+ showTab( BACKG_TAB );
+ stackCentralOldState = BACKG_TAB;
}
- mainLayout->addWidget( bgWidget, 1, 0, 1, -1 );
+
+
//mainLayout->setRowStretch( 1, 10 );
- mainLayout->addWidget( inputC, 2, 0, 1, -1, Qt::AlignBottom );
- mainLayout->addWidget( controls, settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3,
- 0, 1, -1, Qt::AlignBottom );
+ mainLayout->insertWidget( 2, inputC );
+ mainLayout->insertWidget( settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3,
+ controls );
+
+ /* Visualisation */
+ /* Disabled for now, they SUCK */
+ #if 0
+ visualSelector = new VisualSelector( p_intf );
+ mainLayout->insertWidget( 0, visualSelector );
+ visualSelector->hide();
+ #endif
/* Finish the sizing */
main->updateGeometry();
}
}
+inline void MainInterface::initSystray()
+{
+#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( 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
{
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];
+ THUMBBUTTON thbButtons[3];
thbButtons[0].dwMask = dwMask;
thbButtons[0].iId = 0;
thbButtons[0].iBitmap = 0;
thbButtons[2].iBitmap = 3;
thbButtons[2].dwFlags = THBF_HIDDEN;
- HRESULT hr = p_taskbl->vt->ThumbBarSetImageList(p_taskbl, GetForegroundWindow(), himl );
+ HRESULT hr = p_taskbl->vt->ThumbBarSetImageList(p_taskbl, winId(), himl );
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() );
-
+ else
+ {
+ hr = p_taskbl->vt->ThumbBarAddButtons(p_taskbl, winId(), 3, thbButtons);
+ if(S_OK != hr)
+ msg_Err( p_intf, "ThumbBarAddButtons failed with error %08x", hr );
+ }
CONNECT( THEMIM->getIM(), statusChanged( int ), this, changeThumbbarButtons( int ) );
+ CONNECT( this, playPauseSignal(), THEMIM, togglePlayPause() );
+ CONNECT( this, prevSignal(), THEMIM, prev() );
+ CONNECT( this, nextSignal(), THEMIM, next() );
}
}
else
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_shouldHide = 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()
-{
- /**
- * Ask for the network policy on FIRST STARTUP
- **/
- if( config_GetInt( p_intf, "qt-privacy-ask") )
+ 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:
+ emit prevSignal();
+ break;
+ case 1:
+ emit playPauseSignal();
+ break;
+ case 2:
+ emit nextSignal();
+ 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;
}
+ 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
**********************************************************************/
QSize MainInterface::sizeHint() const
{
+#if 0
if( b_keep_size )
{
if( i_visualmode == QT_ALWAYS_VIDEO_MODE ||
return mainBasedSize;
}
}
+#endif
+
+ int nwidth = __MAX( controls->sizeHint().width(),
+ menuBar()->sizeHint().width() );
- int nwidth = controls->sizeHint().width();
int nheight = controls->isVisible() ?
controls->size().height()
+ inputC->size().height()
+ statusBar()->size().height()
: 0 ;
- if( VISIBLE( bgWidget ) )
+ if( stackCentralW->isVisible() )
+ nheight += stackCentralW->height();
+ nwidth = __MAX( nwidth, stackCentralW->width() );
+
+/* if( VISIBLE( bgWidget ) )
{
+ msg_Warn( p_intf, "Hello here" );
if( i_bg_height )
nheight += i_bg_height;
else
}
else if( videoIsActive && videoWidget->isVisible() )
{
+ msg_Warn( p_intf, "Hello there" );
nheight += videoWidget->sizeHint().height();
nwidth = __MAX( nwidth, videoWidget->sizeHint().width() );
- }
+ }*/
#if 0
if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() )
{
return QSize( nwidth, nheight );
}
+
/* Video widget cannot do this synchronously as it runs in another thread */
/* Well, could it, actually ? Probably dangerous ... */
{
if( isFullScreen() || isMaximized() ) return;
- msg_Dbg( 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 */
- resize( sizeHint() );
- // adjustSize() ;
+
#ifndef NDEBUG
debug();
#endif
+ /* This is WRONG, but I believe there is a Qt bug here */
+ setMinimumSize( 0, 0 );
+ resize( sizeHint() );
+
+ //adjustSize() ; /* This is not needed, but might help in the future */
}
void MainInterface::debug()
{
#ifndef NDEBUG
+ msg_Dbg( p_intf, "Stack Size: %i - %i", stackCentralW->size().height(), 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() );
- if( videoWidget && videoWidget->isVisible() )
+ //msg_Dbg( p_intf, "maximumsize: %i - %i", maximumSize().height(), maximumSize().width() );
+
+ msg_Dbg( p_intf, "Stack minimumsize: %i - %i", stackCentralW->minimumSize().height(), stackCentralW->minimumSize().width() );
+ msg_Dbg( p_intf, "Controls minimumsize: %i - %i", controls->minimumSize().height(), controls->minimumSize().width() );
+ msg_Dbg( p_intf, "Central minimumsize: %i - %i", centralWidget()->minimumSize().height(), centralWidget()->minimumSize().width() );
+ msg_Dbg( p_intf, "Menu minimumsize: %i - %i", menuBar()->minimumSize().height(), menuBar()->minimumSize().width() );
+ msg_Dbg( p_intf, "Input minimuSize: %i - %i", inputC->minimumSize().height(), inputC->minimumSize().width() );
+ msg_Dbg( p_intf, "Status minimumsize: %i - %i", statusBar()->minimumSize().height(), statusBar()->minimumSize().width() );
+ msg_Dbg( p_intf, "minimumsize: %i - %i", minimumSize().height(), minimumSize().width() );
+
+ /*if( videoWidget && videoWidget->isVisible() )
{
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
}
-void MainInterface::destroyPopupMenu()
+inline void MainInterface::restoreStackOldWidget()
{
- QVLCMenu::PopupMenu(p_intf, false );
+#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 );
+}
void MainInterface::toggleFSC()
{
*p_id = ret;
if( ret ) /* The videoWidget is available */
{
- /* Did we have a bg ? Hide it! */
- if( VISIBLE( bgWidget) )
- {
- bgWasVisible = true;
- bgWidget->toggle();
- }
- else
- bgWasVisible = false;
-
/* ask videoWidget to show */
videoWidget->SetSizing( *pi_width, *pi_height );
/* Consider the video active now */
- videoIsActive = true;
+ showVideo();
+
+ stackCentralW->resize( *pi_width, *pi_height );
emit askUpdate();
}
}
+
+
/* Asynchronous call from the WindowClose function */
void MainInterface::releaseVideo( void )
{
{
videoWidget->release( );
- if( bgWasVisible )
- {
- /* Reset the bg state */
- bgWasVisible = false;
- bgWidget->show();
- }
-
- videoIsActive = false;
+ restoreStackOldWidget();
/* Try to resize, except when you are in Fullscreen mode */
- doComponentsUpdate();
+// doComponentsUpdate();
}
/* Asynchronous call from WindowControl function */
int MainInterface::controlVideo( int i_query, va_list args )
{
+ /* Debug to check if VOUT_WINDOW_SET_SIZE is called, because this is broken now */
+ msg_Warn( p_intf, "Control Video: %i", i_query );
switch( i_query )
{
case VOUT_WINDOW_SET_SIZE:
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::createPlaylist( bool b_show )
+{
+ 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(); */
+
+ 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
+ {
+#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();
+ }
+}
+
void MainInterface::togglePlaylist()
{
- /* CREATION
- If no playlist exist, then create one and attach it to the DockPL*/
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "Here toggling %i %i", stackCentralW->currentIndex(), stackCentralOldState );
+#endif
if( !playlistWidget )
{
- playlistWidget = new PlaylistWidget( p_intf );
-
- i_pl_dock = PL_UNDOCKED;
-/* i_pl_dock = (pl_dock_e)getSettings()
- ->value( "pl-dock-status", PL_UNDOCKED ).toInt(); */
+ createPlaylist( true );
+ }
+#ifdef DEBUG_INTF
+ msg_Warn( p_intf, "Here toggling %i %i", stackCentralW->currentIndex(), stackCentralOldState );
- if( i_pl_dock == PL_UNDOCKED )
+#endif
+ if( i_pl_dock != PL_UNDOCKED )
+ {
+ /* Playlist not visible */
+ if( stackCentralW->currentIndex() != PLAYL_TAB )
{
- 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 ) );
+ showTab( PLAYL_TAB );
+ stackCentralW->show();
}
else
{
- // mainLayout->insertWidget( 4, playlistWidget );
+ restoreStackOldWidget();
}
- playlistVisible = true;
-
- playlistWidget->show();
- }
- else
- {
- /* toggle the visibility of the playlist */
- TOGGLEV( playlistWidget );
- playlistVisible = !playlistVisible;
- //doComponentsUpdate(); //resize( sizeHint() );
+ playlistVisible = ( stackCentralW->currentIndex() == PLAYL_TAB );
+ //doComponentsUpdate(); //resize( sizeHint() );
}
}
if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
i_visualmode != QT_MINIMAL_MODE )
{ /* NORMAL MODE then */
- if( !videoWidget || videoWidget->isHidden() )
+ stackCentralW->show();
+ if( !videoWidget || stackCentralW->currentIndex() != VIDEO_TAB )
{
- bgWidget->toggle();
+ showBg();
}
else
{
/* If video is visible, then toggle the status of bgWidget */
- bgWasVisible = !bgWasVisible;
+ //bgWasVisible = !bgWasVisible;
+ if( stackCentralOldState == BACKG_TAB )
+ stackCentralOldState = HIDDEN_TAB;
+ else
+ stackCentralOldState = BACKG_TAB;
}
}
- i_bg_height = bgWidget->height();
+ i_bg_height = stackCentralW->height();
menuBar()->setVisible( !b_switch );
controls->setVisible( !b_switch );
{
QIcon iconVLC;
if( QDate::currentDate().dayOfYear() >= 354 )
- iconVLC = QIcon( QPixmap( ":/logo/vlc128-christmas.png" ) );
+ iconVLC = QIcon( ":/logo/vlc128-christmas.png" );
else
- iconVLC = QIcon( QPixmap( ":/logo/vlc128.png" ) );
+ iconVLC = QIcon( ":/logo/vlc128.png" );
sysTray = new QSystemTrayIcon( iconVLC, this );
sysTray->setToolTip( qtr( "VLC media player" ));
void MainInterface::resizeEvent( QResizeEvent * event )
{
+#if 0
if( b_keep_size )
{
if( i_visualmode == QT_ALWAYS_VIDEO_MODE ||
mainBasedSize = size();
}
}
+#endif
+ QVLCMW::resizeEvent( event );
+ msg_Dbg( p_intf, "Resize Event, height: %i", size().height() );
}
void MainInterface::wheelEvent( QWheelEvent *e )
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
/* Show event */
return VLC_SUCCESS;
}
-
projects / vlc / blobdiff