#include "components/interface_widgets.hpp"
#include "components/controller.hpp"
#include "components/playlist/playlist.hpp"
+#include "dialogs/external.hpp"
#include "menus.hpp"
#include "recents.hpp"
vlc_value_t old_val, vlc_value_t new_val, void *param );
static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param );
-static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
- vlc_value_t, void *);
MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
{
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();
-
/* Do we want anoying popups or not */
notificationEnabled = (bool)config_GetInt( p_intf, "qt-notification" );
/************
* Menu Bar *
************/
- QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
+ QVLCMenu::createMenuBar( this, p_intf );
#if 0
/* Create a Dock to get the playlist */
/* END CONNECTS ON IM */
+ dialogHandler = new DialogHandler (p_intf);
/************
* Callbacks
************/
- var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
- var_AddCallback( p_intf, "interaction", InteractCallback, this );
- interaction_Register( p_intf );
-
var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
/* Playlist */
if( b_visible ) togglePlaylist();
+ /* Enable the popup menu in the MI */
+ setContextMenuPolicy( Qt::CustomContextMenu );
+ CONNECT( this, customContextMenuRequested( const QPoint& ),
+ this, popupMenu( const QPoint& ) );
+
/* Final sizing and showing */
setMinimumWidth( __MAX( controls->sizeHint().width(),
menuBar()->sizeHint().width() ) );
/* And switch to minimal view if needed
Must be called after the show() */
if( i_visualmode == QT_MINIMAL_MODE )
- toggleMinimalView();
+ toggleMinimalView( true );
/* Update the geometry : It is useful if you switch between
qt-display-modes ?*/
{
msg_Dbg( p_intf, "Destroying the main interface" );
+ delete dialogHandler;
+
+ /* Unsure we hide the videoWidget before destroying it */
if( videoIsActive ) videoWidget->hide();
+ /* Save playlist state */
if( playlistWidget )
{
if( !isDocked() )
delete playlistWidget;
}
+ /* Be sure to kill the actionsManager... FIXME */
ActionsManager::killInstance();
- if( fullscreenControls ) delete fullscreenControls;
+ /* Delete the FSC controller */
+ delete fullscreenControls;
+ /* Save states */
settings->beginGroup( "MainWindow" );
-
settings->setValue( "pl-dock-status", (int)i_pl_dock );
settings->setValue( "playlist-visible", (int)playlistVisible );
settings->setValue( "adv-controls",
if( bgWidget )
settings->setValue( "backgroundSize", bgWidget->size() );
+ /* Save this size */
QVLCTools::saveWidgetPosition(settings, this);
settings->endGroup();
- var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
- /* Unregister callback for the intf-popupmenu variable */
+ /* Unregister callbacks */
+ var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
- interaction_Unregister( p_intf );
- var_DelCallback( p_intf, "interaction", InteractCallback, this );
-
p_intf->p_sys->p_mi = NULL;
}
CONNECT( THEMIM->getIM(), encryptionChanged( bool ) , this, showCryptedLabel( bool ) );
}
-void MainInterface::showCryptedLabel( bool )
+void MainInterface::showCryptedLabel( bool b_show )
{
if( cryptedLabel == NULL )
{
cryptedLabel = new QLabel;
- cryptedLabel->setPixmap( QPixmap( ":/eject" ) );
+ // The lock icon is not the right one for DRM protection/scrambled.
+ //cryptedLabel->setPixmap( QPixmap( ":/lock" ) );
+ cryptedLabel->setText( "DRM" );
statusBar()->addWidget( cryptedLabel );
}
- cryptedLabel->show();
+ cryptedLabel->setVisible( b_show );
}
inline void MainInterface::initSystray()
settings->value( "adv-controls", false ).toBool(), this );
CONNECT( controls, advancedControlsToggled( bool ),
this, doComponentsUpdate() );
+ CONNECT( controls, sizeChanged(),
+ this, doComponentsUpdate() );
inputC = new InputControlsWidget( p_intf, this );
/* Visualisation */
CONFIG_GENERIC( "album-art", IntegerList ); line++;
#ifdef UPDATE_CHECK
CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++;
- CONFIG_GENERIC_NOBOOL( "qt-updates-days", Integer ); line++;
#endif
QPushButton *ok = new QPushButton( qtr( "OK" ) );
QApplication::postEvent( fullscreenControls, eShow );
}
+void MainInterface::popupMenu( const QPoint &p )
+{
+ /* Ow, that's ugly: don't show the popup menu if cursor over
+ * the main menu bar or the status bar */
+ if( !childAt( p ) || ( ( childAt( p ) != menuBar() )
+ && ( childAt( p )->parentWidget() != statusBar() ) ) )
+ QVLCMenu::PopupMenu( p_intf, true );
+}
+
void MainInterface::debug()
{
#ifndef NDEBUG
{
}
-void MainInterface::toggleMinimalView()
+void MainInterface::toggleMinimalView( bool b_switch )
{
if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
i_visualmode != QT_MINIMAL_MODE )
}
}
- TOGGLEV( menuBar() );
- TOGGLEV( controls );
- TOGGLEV( statusBar() );
- TOGGLEV( inputC );
+ menuBar()->setVisible( !b_switch );
+ controls->setVisible( !b_switch );
+ statusBar()->setVisible( !b_switch );
+ inputC->setVisible( !b_switch );
doComponentsUpdate();
- QVLCMenu::minimalViewAction->setChecked( bgWasVisible );
+ emit minimalViewToggled( b_switch );
}
/* Video widget cannot do this synchronously as it runs in another thread */
toggleUpdateSystrayMenu();
break;
case QSystemTrayIcon::MiddleClick:
- case QSystemTrayIcon::Context:
sysTray->showMessage( qtr( "VLC media player" ),
qtr( "Control menu for the player" ),
QSystemTrayIcon::Information, 3000 );
void MainInterface::keyPressEvent( QKeyEvent *e )
{
if( ( e->modifiers() & Qt::ControlModifier ) && ( e->key() == Qt::Key_H )
- && menuBar()->isHidden() )
+ && !menuBar()->isVisible() )
{
- toggleMinimalView();
+ toggleMinimalView( false );
e->accept();
}
{
showNormal();
emit askUpdate(); // Needed if video was launched after the F11
- QVLCMenu::fullscreenViewAction->setChecked( false );
+ emit fullscreenInterfaceToggled( false );
}
else
{
showFullScreen();
- QVLCMenu::fullscreenViewAction->setChecked( true );
+ emit fullscreenInterfaceToggled( true );
}
}
-/*****************************************************************************
- * Callbacks
- *****************************************************************************/
-static int InteractCallback( vlc_object_t *p_this,
- const char *psz_var, vlc_value_t old_val,
- vlc_value_t new_val, void *param )
-{
- intf_dialog_args_t *p_arg = new intf_dialog_args_t;
- p_arg->p_dialog = (interaction_dialog_t *)(new_val.p_address);
- DialogEvent *event = new DialogEvent( INTF_DIALOG_INTERACTION, 0, p_arg );
- QApplication::postEvent( THEDP, event );
- return VLC_SUCCESS;
-}
-
/*****************************************************************************
* PopupMenuCB: callback triggered by the intf-popupmenu playlist variable.
* We don't show the menu directly here because we don't want the
projects / vlc / blobdiff