qt4: cleaning the singletons implementation.

[vlc] / modules / gui / qt4 / main_interface.cpp

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 0af76201d2f66904f12210d5fef92cb44fe156f6..6a8947939208472c93ddb0a7b037d9a2003a48f9 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -39,6 +39,7 @@
 #include "components/interface_widgets.hpp"
 #include "components/controller.hpp"
 #include "components/playlist/playlist.hpp"
+#include "dialogs/external.hpp"
 
 #include "menus.hpp"
 #include "recents.hpp"
@@ -67,8 +68,6 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
                         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 )
 {
@@ -82,9 +81,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     playlistVisible      = false;
     input_name           = "";
     fullscreenControls   = NULL;
-#if 0
     cryptedLabel         = NULL;
-#endif
 
     /* Ask for privacy */
     askForPrivacy();
@@ -195,14 +192,11 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
 
     /* 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 */
@@ -249,6 +243,11 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     /* Playlist */
     if( b_visible ) togglePlaylist();
 
+    /* Enable the popup menu in the MI */
+    setContextMenuPolicy( Qt::CustomContextMenu );
+    CONNECT( this, customContextMenuRequested( const QPoint& ),
+             this, popupMenu() );
+
     /* Final sizing and showing */
     setMinimumWidth( __MAX( controls->sizeHint().width(),
                             menuBar()->sizeHint().width() ) );
@@ -274,8 +273,12 @@ MainInterface::~MainInterface()
 {
     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() )
@@ -284,12 +287,14 @@ MainInterface::~MainInterface()
         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",
@@ -301,17 +306,15 @@ MainInterface::~MainInterface()
     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;
 }
 
@@ -348,24 +351,23 @@ inline void MainInterface::createStatusBar()
        - right-clicking and clicking just toggle between remaining and
          elapsed time.*/
     CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
-#if 0
+
     CONNECT( THEMIM->getIM(), encryptionChanged( bool ) , this, showCryptedLabel( bool ) );
-#endif
 }
 
-#if 0
-void MainInterface::showCryptedLabel( bool )
+void MainInterface::showCryptedLabel( bool b_show )
 {
     if( cryptedLabel == NULL )
     {
         cryptedLabel = new QLabel;
-        cryptedLabel->setPixmap( QPixmap( ":/lock" ) );
+        // 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 );
 }
-#endif
 
 inline void MainInterface::initSystray()
 {
@@ -421,6 +423,8 @@ void MainInterface::handleMainUi( QSettings *settings )
                    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 */
@@ -548,7 +552,6 @@ int MainInterface::privacyDialog( QList<ConfigControl *> *controls )
     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" ) );
@@ -630,6 +633,11 @@ void MainInterface::toggleFSC()
    QApplication::postEvent( fullscreenControls, eShow );
 }
 
+void MainInterface::popupMenu()
+{
+    QVLCMenu::PopupMenu( p_intf, true );
+}
+
 void MainInterface::debug()
 {
 #ifndef NDEBUG
@@ -855,8 +863,6 @@ void MainInterface::toggleAdvanced()
 /* Get the visibility status of the controls (hidden or not, advanced or not) */
 int MainInterface::getControlsVisibilityStatus()
 {
-    msg_Warn( p_intf, "%i", (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
-                            + CONTROLS_ADVANCED * controls->b_advancedVisible );
     return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
                 + CONTROLS_ADVANCED * controls->b_advancedVisible );
 }
@@ -1126,7 +1132,7 @@ void MainInterface::customEvent( QEvent *event )
 void MainInterface::keyPressEvent( QKeyEvent *e )
 {
     if( ( e->modifiers() &  Qt::ControlModifier ) && ( e->key() == Qt::Key_H )
-          && menuBar()->isHidden() )
+          && !menuBar()->isVisible() )
     {
         toggleMinimalView( false );
         e->accept();
@@ -1183,30 +1189,16 @@ void MainInterface::toggleFullScreen( void )
     {
         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