Qt, selector: cleanup

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index e629c516748e997bf0c98396b5efd093fcc5e5e7..a675d87cfd5132c022894e79b7119428bd5a52b9 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -86,6 +86,7 @@ public:
 #endif
     int getControlsVisibilityStatus();
     bool isPlDocked() { return ( b_plDocked != false ); }
+    bool isInterfaceFullScreen() { return b_interfaceFullScreen; }
 
 protected:
     void dropEventPlay( QDropEvent *, bool);
@@ -116,6 +117,11 @@ private:
     void showVideo();
     void restoreStackOldWidget();
 
+    /* */
+    void setMinimalView( bool );
+    void setInterfaceFullScreen( bool );
+    void computeMinimumSize();
+
     /* */
     QSettings           *settings;
 #ifndef HAVE_MAEMO
@@ -148,10 +154,13 @@ private:
 
     /* Flags */
     bool                 b_notificationEnabled; /// Systray Notifications
-    bool                 b_autoresize;          ///< persistent resizeable window
+    bool                 b_autoresize;          ///< persistent resizable window
     bool                 b_videoEmbedded;       ///< Want an external Video Window
+    bool                 b_videoFullScreen;     ///< --fullscreen
+    bool                 b_videoOnTop;          ///< --video-on-top
     bool                 b_hideAfterCreation;
-    int                  i_visualmode;          ///< Visual Mode
+    bool                 b_minimalView;         ///< Minimal video
+    bool                 b_interfaceFullScreen;
 
     /* States */
     bool                 playlistVisible;       ///< Is the playlist visible ?
@@ -175,7 +184,7 @@ public slots:
     void toggleUpdateSystrayMenu();
 #endif
     void toggleAdvancedButtons();
-    void toggleFullScreen();
+    void toggleInterfaceFullScreen();
     void toggleFSC();
 
     void popupMenu( const QPoint& );
@@ -206,15 +215,22 @@ private slots:
 
     void showBuffering( float );
 
-    void resizeStack( int w, int h ) {
+    void resizeStack( int w, int h )
+    {
         if( !isFullScreen() && !isMaximized() )
-            if( i_visualmode == 1 ) resize( w, h ); /* Oh yes, it shouldn't
+        {
+            if( b_minimalView )
+                resize( w, h ); /* Oh yes, it shouldn't
                                    be possible that size() - stackCentralW->size() < 0
                                    since stackCentralW is contained in the QMW... */
-            else resize( size() - stackCentralW->size() + QSize( w, h ) );
-        debug(); }
+            else
+                resize( size() - stackCentralW->size() + QSize( w, h ) );
+        }
+        debug();
+    }
 
     void setVideoSize( unsigned int, unsigned int );
+    void setVideoFullScreen( bool );
     void setVideoOnTop( bool );
 
 signals: