#endif
#include "qt4.hpp"
+
#include "main_interface.hpp"
#include "input_manager.hpp"
-#include "util/qvlcframe.hpp"
+#include "actions_manager.hpp"
+
#include "util/customwidgets.hpp"
-#include "dialogs_provider.hpp"
+#include "util/qt_dirs.hpp"
+
#include "components/interface_widgets.hpp"
+#include "components/controller.hpp"
#include "components/playlist/playlist.hpp"
-#include "dialogs/extended.hpp"
-#include "dialogs/playlist.hpp"
+
#include "menus.hpp"
+#include "recents.hpp"
-#include <QMenuBar>
#include <QCloseEvent>
-#include <QPushButton>
-#include <QStatusBar>
#include <QKeyEvent>
+
#include <QUrl>
-#include <QSystemTrayIcon>
#include <QSize>
+#include <QDate>
+
#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
#include <QLabel>
-#include <QSlider>
-#include <QWidgetAction>
-#include <QToolBar>
#include <QGroupBox>
-#include <QDate>
+#include <QPushButton>
#include <assert.h>
-#include <vlc_keys.h>
+
+#include <vlc_keys.h> /* Wheel event */
#include <vlc_vout.h>
/* Callback prototypes */
/* Set The Video In emebedded Mode or not */
videoEmbeddedFlag = config_GetInt( p_intf, "embedded-video" );
+ /* Do we confine videos within a persistent resizeable window */
+ b_keep_size = config_GetInt( p_intf, "qt-keep-size" );
+
/* Are we in the enhanced always-video mode or not ? */
i_visualmode = config_GetInt( p_intf, "qt-display-mode" );
settings = getSettings();
settings->beginGroup( "MainWindow" );
+ /**
+ * Retrieve saved sizes for main window
+ * mainBasedSize = based window size for normal mode
+ * (no video, no background)
+ * mainVideoSize = window size with video (all modes)
+ **/
+ mainBasedSize = settings->value( "mainBasedSize", QSize( 350, 120 ) ).toSize();
+ mainVideoSize = settings->value( "mainVideoSize", QSize( 400, 300 ) ).toSize();
+
/* Visualisation, not really used yet */
visualSelectorEnabled = settings->value( "visual-selector", false).toBool();
* Menu Bar and Status Bar
**************************/
QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
+
/* StatusBar Creation */
createStatusBar();
-
/********************
* Input Manager *
********************/
**************************/
/* Connect the input manager to the GUI elements it manages */
- /* It is also connected to the control->slider, see the ControlsWidget */
- /* Change the SpeedRate in the Status */
- CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
-
/**
* Connects on nameChanged()
* Those connects are not merged because different options can trigger
* them down.
*/
/* Naming in the controller statusbar */
- CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
- setName( QString ) );
+ CONNECT( THEMIM->getIM(), nameChanged( QString ),
+ this, setName( QString ) );
/* and in the systray */
if( sysTray )
{
/**
* CONNECTS on PLAY_STATUS
**/
- /* Status on the main controller */
- CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
- /* and in the systray */
+ /* Status on the systray */
if( sysTray )
{
- CONNECT( THEMIM->getIM(), statusChanged( int ), this,
- updateSystrayTooltipStatus( int ) );
+ CONNECT( THEMIM->getIM(), statusChanged( int ),
+ this, updateSystrayTooltipStatus( int ) );
}
/* END CONNECTS ON IM */
- /** OnTimeOut **/
- /* TODO Remove this function, but so far, there is no choice because there
- is no intf-should-die variable #1365 */
- ON_TIMEOUT( updateOnTimer() );
-
/************
* Callbacks
************/
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, this );
- p_intf->b_interaction = true;
+ interaction_Register( p_intf );
var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* VideoWidget connects to avoid different threads speaking to each other */
- CONNECT( this, askReleaseVideo( void * ),
- this, releaseVideoSlot( void * ) );
+ connect( this, SIGNAL(askReleaseVideo( void )),
+ this, SLOT(releaseVideoSlot( void )), Qt::BlockingQueuedConnection );
+
if( videoWidget )
CONNECT( this, askVideoToResize( unsigned int, unsigned int ),
videoWidget, SetSizing( unsigned int, unsigned int ) );
settings->beginGroup( "MainWindow" );
QVLCTools::restoreWidgetPosition( settings, this, QSize(380, 60) );
+ /* resize to previously saved main window size if appicable */
+ if( b_keep_size )
+ {
+ if( i_visualmode == QT_ALWAYS_VIDEO_MODE ||
+ i_visualmode == QT_MINIMAL_MODE )
+ {
+ resize( mainVideoSize );
+ }
+ else
+ {
+ resize( mainBasedSize );
+ }
+ }
+
bool b_visible = settings->value( "playlist-visible", 0 ).toInt();
settings->endGroup();
{
if( !isDocked() )
QVLCTools::saveWidgetPosition( p_intf, "Playlist", playlistWidget );
+
+ delete playlistWidget;
}
+ ActionsManager::killInstance();
+
settings->beginGroup( "MainWindow" );
settings->setValue( "pl-dock-status", (int)i_pl_dock );
settings->setValue( "adv-controls",
getControlsVisibilityStatus() & CONTROLS_ADVANCED );
+ settings->setValue( "mainBasedSize", mainBasedSize );
+ settings->setValue( "mainVideoSize", mainVideoSize );
+
if( bgWidget )
settings->setValue( "backgroundSize", bgWidget->size() );
/* Unregister callback for the intf-popupmenu variable */
var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
- p_intf->b_interaction = false;
+ interaction_Unregister( p_intf );
var_DelCallback( p_intf, "interaction", InteractCallback, this );
p_intf->p_sys->p_mi = NULL;
* Status Bar *
****************/
/* Widgets Creation*/
- timeLabel = new TimeLabel( p_intf );
+ TimeLabel *timeLabel = new TimeLabel( p_intf );
nameLabel = new QLabel;
nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
| Qt::TextSelectableByKeyboard );
- speedLabel = new SpeedLabel( p_intf, "1.00x" );
- speedLabel->setToolTip(
- qtr( "Current playback speed.\nRight click to adjust" ) );
- speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
+ SpeedLabel *speedLabel = new SpeedLabel( p_intf, "1.00x" );
/* Styling those labels */
timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );
- right-clicking and clicking just toggle between remaining and
elapsed time.*/
CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
-
- /* Speed Label behaviour:
- - right click gives the vertical speed slider */
- CONNECT( speedLabel, customContextMenuRequested( QPoint ),
- this, showSpeedMenu( QPoint ) );
}
inline void MainInterface::initSystray()
{
- bool b_createSystray = false;
bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
- if( config_GetInt( p_intf, "qt-start-minimized") )
+ bool b_systrayWanted = config_GetInt( p_intf, "qt-system-tray" );
+
+ if( config_GetInt( p_intf, "qt-start-minimized") > 0 )
{
if( b_systrayAvailable )
{
- b_createSystray = true;
+ b_systrayWanted = true;
hide();
}
- else msg_Err( p_intf, "You can't minimize if you haven't a system "
- "tray bar" );
+ else
+ msg_Err( p_intf, "cannot start minimized without system tray bar" );
}
- if( config_GetInt( p_intf, "qt-system-tray") )
- b_createSystray = true;
- if( b_systrayAvailable && b_createSystray )
+ if( b_systrayAvailable && b_systrayWanted )
createSystray();
}
mainLayout->setMargin( 0 );
/* Create the CONTROLS Widget */
- bool b_shiny = config_GetInt( p_intf, "qt-blingbling" );
- controls = new ControlsWidget( p_intf, this,
- settings->value( "adv-controls", false ).toBool(),
- b_shiny );
+ controls = new ControlsWidget( p_intf,
+ settings->value( "adv-controls", false ).toBool(), this );
CONNECT( controls, advancedControlsToggled( bool ),
this, doComponentsUpdate() );
+ inputC = new InputControlsWidget( p_intf, this );
- /* Add the controls Widget to the main Widget */
- mainLayout->insertWidget( 0, controls, 0, Qt::AlignBottom );
-
- /* Create the Speed Control Widget */
- speedControl = new SpeedControlWidget( p_intf );
- speedControlMenu = new QMenu( this );
-
- QWidgetAction *widgetAction = new QWidgetAction( speedControl );
- widgetAction->setDefaultWidget( speedControl );
- speedControlMenu->addAction( widgetAction );
-
- /* Visualisation */
+ /* Visualisation */
/* Disabled for now, they SUCK */
#if 0
visualSelector = new VisualSelector( p_intf );
bgWidget->resize(
settings->value( "backgroundSize", QSize( 300, 200 ) ).toSize() );
bgWidget->updateGeometry();
- mainLayout->insertWidget( 0, bgWidget );
CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
/* And video Outputs */
if( videoEmbeddedFlag )
- {
videoWidget = new VideoWidget( p_intf );
- mainLayout->insertWidget( 0, videoWidget, 10 );
- }
+
+ /* Add the controls Widget to the main Widget */
+ mainLayout->insertWidget( 0, bgWidget );
+ if( videoWidget ) mainLayout->insertWidget( 0, videoWidget, 10 );
+ mainLayout->insertWidget( 2, inputC, 0, Qt::AlignBottom );
+ mainLayout->insertWidget( settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3,
+ controls, 0, Qt::AlignBottom );
/* Finish the sizing */
main->updateGeometry();
/* Create the FULLSCREEN CONTROLS Widget */
if( config_GetInt( p_intf, "qt-fs-controller" ) )
{
- fullscreenControls = new FullscreenControllerWidget( p_intf, this,
- settings->value( "adv-controls", false ).toBool(),
- b_shiny );
- CONNECT( fullscreenControls, advancedControlsToggled( bool ),
- this, doComponentsUpdate() );
+ fullscreenControls = new FullscreenControllerWidget( p_intf );
}
}
QSize MainInterface::sizeHint() const
{
+ if( b_keep_size )
+ {
+ if( i_visualmode == QT_ALWAYS_VIDEO_MODE ||
+ i_visualmode == QT_MINIMAL_MODE )
+ {
+ return mainVideoSize;
+ }
+ else
+ {
+ if( VISIBLE( bgWidget) ||
+ ( videoIsActive && videoWidget->isVisible() )
+ )
+ return mainVideoSize;
+ else
+ return mainBasedSize;
+ }
+ }
+
int nwidth = controls->sizeHint().width();
int nheight = controls->isVisible() ?
controls->size().height()
#endif
}
-/****************************************************************************
- * Small right-click menu for rate control
- ****************************************************************************/
-void MainInterface::showSpeedMenu( QPoint pos )
-{
- speedControlMenu->exec( QCursor::pos() - pos
- + QPoint( 0, speedLabel->height() ) );
-}
-
/****************************************************************************
* Video Handling
****************************************************************************/
unsigned int *pi_height )
{
/* Request the videoWidget */
- void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height );
+ void *ret = videoWidget->request( p_nvout,pi_x, pi_y,
+ pi_width, pi_height, b_keep_size );
if( ret ) /* The videoWidget is available */
{
/* Did we have a bg ? Hide it! */
videoIsActive = true;
emit askUpdate();
-
- if( fullscreenControls ) fullscreenControls->attachVout( p_nvout );
}
return ret;
}
/* Call from the WindowClose function */
-void MainInterface::releaseVideo( void *p_win )
+void MainInterface::releaseVideo( void )
{
- if( fullscreenControls ) fullscreenControls->detachVout();
- if( p_win )
- emit askReleaseVideo( p_win );
+ emit askReleaseVideo( );
}
/* Function that is CONNECTED to the previous emit */
-void MainInterface::releaseVideoSlot( void *p_win )
+void MainInterface::releaseVideoSlot( void )
{
- videoWidget->release( p_win );
+ videoWidget->release( );
if( bgWasVisible )
{
/* Call from WindowControl function */
int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
{
+ VLC_UNUSED( p_window ); //FIXME remove this param
int i_ret = VLC_SUCCESS;
switch( i_query )
{
If no playlist exist, then create one and attach it to the DockPL*/
if( !playlistWidget )
{
- playlistWidget = new PlaylistWidget( p_intf, this );
+ playlistWidget = new PlaylistWidget( p_intf );
i_pl_dock = PL_UNDOCKED;
/* i_pl_dock = (pl_dock_e)getSettings()
if( i_pl_dock == PL_UNDOCKED )
{
- playlistWidget->setParent( this, Qt::Window );
+ 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 ) );
- /* Move it correctly then */
- playlistWidget->move(
- getSettings()->value( "Playlist/GlobalPos" ).toPoint() );
}
else
{
if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
i_visualmode != QT_MINIMAL_MODE )
{ /* NORMAL MODE then */
- if( videoWidget->isHidden() ) emit askBgWidgetToToggle();
+ if( !videoWidget || videoWidget->isHidden() ) emit askBgWidgetToToggle();
else
{
/* If video is visible, then toggle the status of bgWidget */
TOGGLEV( menuBar() );
TOGGLEV( controls );
TOGGLEV( statusBar() );
+ TOGGLEV( inputC );
doComponentsUpdate();
}
void MainInterface::toggleAdvanced()
{
controls->toggleAdvanced();
- if( fullscreenControls ) fullscreenControls->toggleAdvanced();
+// if( fullscreenControls ) fullscreenControls->toggleAdvanced();
}
/* Get the visibility status of the controls (hidden or not, advanced or not) */
nameLabel->setToolTip( " " + name +" " );
}
-void MainInterface::setStatus( int status )
-{
- msg_Dbg( p_intf, "Updating the stream status: %i", status );
-
- /* Forward the status to the controls to toggle Play/Pause */
- controls->setStatus( status );
- controls->updateInput();
-
- if( fullscreenControls )
- {
- fullscreenControls->setStatus( status );
- fullscreenControls->updateInput();
- }
-
- speedControl->setEnable( THEMIM->getIM()->hasInput() );
-
- /* And in the systray for the menu */
- if( sysTray )
- QVLCMenu::updateSystrayMenu( this, p_intf );
-}
-
-void MainInterface::setRate( int rate )
-{
- QString str;
- str.setNum( ( 1000 / (double)rate ), 'f', 2 );
- str.append( "x" );
- speedLabel->setText( str );
- speedLabel->setToolTip( str );
- speedControl->updateControls( rate );
-}
-
-void MainInterface::updateOnTimer()
-{
- /* No event for dying */
- if( !vlc_object_alive( p_intf ) )
- {
- QApplication::closeAllWindows();
- QApplication::quit();
- }
-}
-
/*****************************************************************************
* Systray Icon and Systray Menu
*****************************************************************************/
}
else
{
- /* Visible */
+ /* Visible (possibly under other windows) */
#ifdef WIN32
/* check if any visible window is above vlc in the z-order,
- * but ignore the ones always on top */
+ * but ignore the ones always on top
+ * and the ones which can't be activated */
WINDOWINFO wi;
HWND hwnd;
wi.cbSize = sizeof( WINDOWINFO );
for( hwnd = GetNextWindow( internalWinId(), GW_HWNDPREV );
- hwnd && !IsWindowVisible( hwnd );
+ hwnd && ( !IsWindowVisible( hwnd ) ||
+ ( GetWindowInfo( hwnd, &wi ) &&
+ (wi.dwExStyle&WS_EX_NOACTIVATE) ) );
hwnd = GetNextWindow( hwnd, GW_HWNDPREV ) );
- if( !hwnd || !GetWindowInfo( hwnd, &wi ) ||
+ if( !hwnd || !GetWindowInfo( hwnd, &wi ) ||
(wi.dwExStyle&WS_EX_TOPMOST) )
+ {
+ hide();
+ }
+ else
+ {
+ activateWindow();
+ }
#else
- if( isActiveWindow() )
+ hide();
#endif
- {
- hide();
- }
- else
- {
- activateWindow();
- }
}
QVLCMenu::updateSystrayMenu( this, p_intf );
}
switch( reason )
{
case QSystemTrayIcon::Trigger:
+ case QSystemTrayIcon::DoubleClick:
toggleUpdateSystrayMenu();
break;
case QSystemTrayIcon::MiddleClick:
+ case QSystemTrayIcon::Context:
sysTray->showMessage( qtr( "VLC media player" ),
qtr( "Control menu for the player" ),
QSystemTrayIcon::Information, 3000 );
break;
+ default:
+ break;
}
}
QSystemTrayIcon::NoIcon, 3000 );
}
}
+
+ QVLCMenu::updateSystrayMenu( this, p_intf );
}
/**
{
if( THEMIM->getIM()->hasInput() )
{
- if( input_AddSubtitles( THEMIM->getInput(),
+ if( !input_AddSubtitle( THEMIM->getInput(),
qtu( toNativeSeparators(
mimeData->urls()[0].toLocalFile() ) ),
true ) )
}
}
bool first = b_play;
- foreach( QUrl url, mimeData->urls() )
+ foreach( const QUrl &url, mimeData->urls() )
{
QString s = toNativeSeparators( url.toLocalFile() );
PLAYLIST_APPEND | (first ? PLAYLIST_GO: 0),
PLAYLIST_END, true, false );
first = false;
+ RecentsMRL::getInstance( p_intf )->addRecent( s );
}
}
event->acceptProposedAction();
}
#endif
/*else */
- if ( event->type() == SetVideoOnTopEvent_Type )
+ if ( event->type() == (int)SetVideoOnTopEvent_Type )
{
SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
if( p_event->OnTop() )
e->ignore();
}
+void MainInterface::resizeEvent( QResizeEvent * event )
+{
+ if( b_keep_size )
+ {
+ if( i_visualmode == QT_ALWAYS_VIDEO_MODE ||
+ i_visualmode == QT_MINIMAL_MODE )
+ {
+ mainVideoSize = size();
+ }
+ else
+ {
+ if( VISIBLE( bgWidget) ||
+ ( videoIsActive && videoWidget->isVisible() )
+ )
+ mainVideoSize = size();
+ else
+ mainBasedSize = size();
+ }
+ }
+}
+
void MainInterface::wheelEvent( QWheelEvent *e )
{
int i_vlckey = qtWheelEventToVLCKey( e );
void MainInterface::closeEvent( QCloseEvent *e )
{
+ e->accept();
hide();
THEDP->quit();
}
if( p_intf->pf_show_dialog )
{
p_intf->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU,
- new_val.b_bool, 0 );
+ new_val.b_bool, NULL );
}
return VLC_SUCCESS;
/* Show event */
return VLC_SUCCESS;
}
+
projects / vlc / blobdiff