Qt: no popup menu over the status bar and menu bar

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index b2c088e5208934be3b10af518fdebc00572d1860..3fd00aecb27510e9ce3a600b808b05e607b1da5e 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MAIN_INTERFACE_H_
-#define _MAIN_INTERFACE_H_
+#ifndef QVLC_MAIN_INTERFACE_H_
+#define QVLC_MAIN_INTERFACE_H_
 
 #include "qt4.hpp"
 
@@ -49,6 +49,7 @@ class FullscreenControllerWidget;
 class SpeedControlWidget;
 class QMenu;
 class QSize;
+class DialogHandler;
 
 enum {
     CONTROLS_VISIBLE = 0x1,
@@ -67,7 +68,6 @@ class MainInterface : public QVLCMW
 {
     Q_OBJECT;
 
-    friend class InteractionDialog;
     friend class PlaylistWidget;
 
 public:
@@ -107,6 +107,7 @@ private:
     ControlsWidget      *controls;
     InputControlsWidget *inputC;
     FullscreenControllerWidget *fullscreenControls;
+    DialogHandler       *dialogHandler;
 
     void handleMainUi( QSettings* );
     void askForPrivacy();
@@ -141,9 +142,7 @@ private:
 
     /* Status Bar */
     QLabel              *nameLabel;
-#if 0
     QLabel              *cryptedLabel;
-#endif
 
     virtual void customEvent( QEvent *);
     virtual void keyPressEvent( QKeyEvent *);
@@ -159,6 +158,7 @@ public slots:
     void toggleAdvanced();
     void toggleFullScreen();
     void toggleFSC();
+    void popupMenu( const QPoint& );
 
     /* Manage the Video Functions from the vout threads */
     void releaseVideoSlot( void );
@@ -175,9 +175,7 @@ private slots:
     void updateSystrayTooltipName( QString );
     void updateSystrayTooltipStatus( int );
 
-#if 0
     void showCryptedLabel( bool );
-#endif
 signals:
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );
@@ -186,6 +184,7 @@ signals:
     void askBgWidgetToToggle();
     void askUpdate();
     void minimalViewToggled( bool );
+    void fullscreenInterfaceToggled( bool );
 };
 
 #endif