Qt: do not resize if we were in fullscreen or maximized

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index e1bac327c23df2bc69961950ac768621ae4b5819..e26bfa473352f0510bd46ea736eadd386f750201 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>
@@ -28,12 +28,13 @@
 #include "qt4.hpp"
 
 #include "util/qvlcframe.hpp"
-#include "components/preferences_widgets.hpp" /* First Start */
+
 #ifdef WIN32
  #include <vlc_windows_interfaces.h>
 #endif
 
 #include <QSystemTrayIcon>
+#include <QStackedWidget>
 
 class QSettings;
 class QCloseEvent;
@@ -53,7 +54,6 @@ class SpeedControlWidget;
 class QVBoxLayout;
 class QMenu;
 class QSize;
-class QStackedWidget;
 
 enum {
     CONTROLS_VISIBLE  = 0x1,
@@ -62,13 +62,6 @@ enum {
 };
 
 
-typedef enum pl_dock_e {
-    PL_UNDOCKED,
-    PL_BOTTOM,
-    PL_RIGHT,
-    PL_LEFT
-} pl_dock_e;
-
 class MainInterface : public QVLCMW
 {
     Q_OBJECT;
@@ -76,14 +69,15 @@ class MainInterface : public QVLCMW
     friend class PlaylistWidget;
 
 public:
+    /* tors */
     MainInterface( intf_thread_t *);
     virtual ~MainInterface();
 
     /* Video requests from core */
-    WId getVideo( int *pi_x, int *pi_y,
+    WId  getVideo( int *pi_x, int *pi_y,
                   unsigned int *pi_width, unsigned int *pi_height );
-    void releaseVideo( void  );
-    int controlVideo( int i_query, va_list args );
+    void releaseVideo( void );
+    int  controlVideo( int i_query, va_list args );
 
     /* Getters */
 #ifndef HAVE_MAEMO
@@ -91,12 +85,13 @@ public:
     QMenu *getSysTrayMenu() { return systrayMenu; }
 #endif
     int getControlsVisibilityStatus();
-
-    /* Sizehint() */
-    virtual QSize sizeHint() const;
+    bool isPlDocked() { return ( b_plDocked != false ); }
 
 protected:
     void dropEventPlay( QDropEvent *, bool);
+#ifdef WIN32
+    virtual bool winEvent( MSG *, long * );
+#endif
     virtual void dropEvent( QDropEvent *);
     virtual void dragEnterEvent( QDragEnterEvent * );
     virtual void dragMoveEvent( QDragMoveEvent * );
@@ -105,87 +100,85 @@ protected:
     virtual void customEvent( QEvent *);
     virtual void keyPressEvent( QKeyEvent *);
     virtual void wheelEvent( QWheelEvent * );
-    virtual void resizeEvent( QResizeEvent * event );
 
 private:
+    /* Main Widgets Creation */
     void createMainWidget( QSettings* );
     void createStatusBar();
-
-    void askForPrivacy();
-    int  privacyDialog( QList<ConfigControl *> *controls );
+    void createPlaylist();
 
     /* Systray */
-    void handleSystray();
     void createSystray();
     void initSystray();
-    bool isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
+    void handleSystray();
 
-    void showTab( int i_tab );
-    void showVideo() { showTab( VIDEO_TAB ); }
-    void showBg() { showTab( BACKG_TAB ); }
+    /* Central StackWidget Management */
+    void showTab( QWidget *);
+    void showVideo();
+    void restoreStackOldWidget();
 
+    /* */
     QSettings           *settings;
 #ifndef HAVE_MAEMO
     QSystemTrayIcon     *sysTray;
     QMenu               *systrayMenu;
 #endif
+
     QString              input_name;
     QVBoxLayout         *mainLayout;
     ControlsWidget      *controls;
     InputControlsWidget *inputC;
     FullscreenControllerWidget *fullscreenControls;
+
+    /* Widgets */
     QStackedWidget      *stackCentralW;
-    /* Video */
-    VideoWidget         *videoWidget;
 
+    VideoWidget         *videoWidget;
     BackgroundWidget    *bgWidget;
-    VisualSelector      *visualSelector;
     PlaylistWidget      *playlistWidget;
+    //VisualSelector      *visualSelector;
 
     /* Status Bar */
     QLabel              *nameLabel;
     QLabel              *cryptedLabel;
 
     /* Status and flags */
-    enum {
-        HIDDEN_TAB = -1,
-        BACKG_TAB  =  0,
-        VIDEO_TAB,
-        PLAYL_TAB,
-    };
-    int                  stackCentralOldState;
+    QWidget             *stackCentralOldWidget;
+
+    QMap<QWidget *, QSize> stackWidgetsSizes;
 
+    /* Flags */
+    bool                 b_notificationEnabled; /// Systray Notifications
+    bool                 b_autoresize;          ///< persistent resizeable window
+    bool                 b_videoEmbedded;       ///< Want an external Video Window
+    bool                 b_hideAfterCreation;
+    int                  i_visualmode;          ///< Visual Mode
+
+    /* States */
+    bool                 playlistVisible;       ///< Is the playlist visible ?
 //    bool                 videoIsActive;       ///< Having a video now / THEMIM->hasV
-    bool                 videoEmbeddedFlag;   ///< Want an external Video Window
-    bool                 playlistVisible;     ///< Is the playlist visible ?
-    bool                 visualSelectorEnabled;
-    bool                 notificationEnabled; /// Systray Notifications
-
-    bool                 b_keep_size;         ///< persistent resizeable window
-    QSize                mainBasedSize;       ///< based Wnd (normal mode only)
-    QSize                mainVideoSize;       ///< Wnd with video (all modes)
-    int                  i_visualmode;        ///< Visual Mode
-    pl_dock_e            i_pl_dock;
-    int                  i_bg_height;         ///< Save height of bgWidget
-    bool                 b_shouldHide;
+//    bool                 b_visualSelectorEnabled;
+    bool                 b_plDocked;            ///< Is the playlist docked ?
+
 
 #ifdef WIN32
     HIMAGELIST himl;
     LPTASKBARLIST3 p_taskbl;
+    UINT taskbar_wmsg;
     void createTaskBarButtons();
 #endif
 
 public slots:
-    void undockPlaylist();
-    void dockPlaylist( pl_dock_e i_pos = PL_BOTTOM );
+    void dockPlaylist( bool b_docked = true );
     void toggleMinimalView( bool );
     void togglePlaylist();
 #ifndef HAVE_MAEMO
     void toggleUpdateSystrayMenu();
 #endif
-    void toggleAdvanced();
+    void toggleAdvancedButtons();
     void toggleFullScreen();
     void toggleFSC();
+
     void popupMenu( const QPoint& );
     void changeThumbbarButtons( int );
 
@@ -198,7 +191,6 @@ private slots:
     void debug();
     void destroyPopupMenu();
     void recreateToolbars();
-    void doComponentsUpdate();
     void setName( const QString& );
     void setVLCWindowsTitle( const QString& title = "" );
 #if 0
@@ -213,15 +205,23 @@ private slots:
 
     void handleKeyPress( QKeyEvent * );
 
+    void showBuffering( float );
+
+    void resizeStack( int w, int h ) {
+        if( !isFullScreen() && !isMaximized() )
+            resize( size() - stackCentralW->size() + QSize( w, h ) );
+        debug(); }
+
+
 signals:
     void askGetVideo( WId *p_id, int *pi_x, int *pi_y,
                       unsigned *pi_width, unsigned *pi_height );
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );
     void askVideoSetFullScreen( bool );
-    void askUpdate();
     void minimalViewToggled( bool );
     void fullscreenInterfaceToggled( bool );
+
 };
 
 #endif