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 016c53b45ef48970d2212133b1da980342ef2d5b..a675d87cfd5132c022894e79b7119428bd5a52b9 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * main_interface.hpp : Main Interface
  ****************************************************************************
- * Copyright (C) 2006-2008 the VideoLAN team
+ * Copyright (C) 2006-2010 VideoLAN and AUTHORS
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -64,7 +64,7 @@ enum {
 
 class MainInterface : public QVLCMW
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     friend class PlaylistWidget;
 
@@ -86,6 +86,7 @@ public:
 #endif
     int getControlsVisibilityStatus();
     bool isPlDocked() { return ( b_plDocked != false ); }
+    bool isInterfaceFullScreen() { return b_interfaceFullScreen; }
 
 protected:
     void dropEventPlay( QDropEvent *, bool);
@@ -97,10 +98,8 @@ protected:
     virtual void dragMoveEvent( QDragMoveEvent * );
     virtual void dragLeaveEvent( QDragLeaveEvent * );
     virtual void closeEvent( QCloseEvent *);
-    virtual void customEvent( QEvent *);
     virtual void keyPressEvent( QKeyEvent *);
     virtual void wheelEvent( QWheelEvent * );
-    virtual void resizeEvent( QResizeEvent * event );
 
 private:
     /* Main Widgets Creation */
@@ -116,9 +115,13 @@ private:
     /* Central StackWidget Management */
     void showTab( QWidget *);
     void showVideo();
-    void showBg();
     void restoreStackOldWidget();
 
+    /* */
+    void setMinimalView( bool );
+    void setInterfaceFullScreen( bool );
+    void computeMinimumSize();
+
     /* */
     QSettings           *settings;
 #ifndef HAVE_MAEMO
@@ -147,21 +150,24 @@ private:
     /* Status and flags */
     QWidget             *stackCentralOldWidget;
 
+    QMap<QWidget *, QSize> stackWidgetsSizes;
+
     /* Flags */
     bool                 b_notificationEnabled; /// Systray Notifications
-    bool                 b_keep_size;         ///< persistent resizeable window
-    bool                 b_videoEmbedded;   ///< Want an external Video 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 ?
+    bool                 playlistVisible;       ///< Is the playlist visible ?
 //    bool                 videoIsActive;       ///< Having a video now / THEMIM->hasV
 //    bool                 b_visualSelectorEnabled;
-    bool                 b_plDocked;          ///< Is the playlist docked ?
+    bool                 b_plDocked;            ///< Is the playlist docked ?
 
-    QSize                mainBasedSize;       ///< based Wnd (normal mode only)
-    QSize                mainVideoSize;       ///< Wnd with video (all modes)
 
 #ifdef WIN32
     HIMAGELIST himl;
@@ -178,7 +184,7 @@ public slots:
     void toggleUpdateSystrayMenu();
 #endif
     void toggleAdvancedButtons();
-    void toggleFullScreen();
+    void toggleInterfaceFullScreen();
     void toggleFSC();
 
     void popupMenu( const QPoint& );
@@ -209,10 +215,23 @@ private slots:
 
     void showBuffering( float );
 
-    void resizeStack( int w, int h ) {
-        resize( size() - stackCentralW->size() + QSize( w, h ) );
-        debug(); }
-
+    void resizeStack( int w, int h )
+    {
+        if( !isFullScreen() && !isMaximized() )
+        {
+            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();
+    }
+
+    void setVideoSize( unsigned int, unsigned int );
+    void setVideoFullScreen( bool );
+    void setVideoOnTop( bool );
 
 signals:
     void askGetVideo( WId *p_id, int *pi_x, int *pi_y,
@@ -220,6 +239,7 @@ signals:
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );
     void askVideoSetFullScreen( bool );
+    void askVideoOnTop( bool );
     void minimalViewToggled( bool );
     void fullscreenInterfaceToggled( bool );