Drop trailing semicolons

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index b2f561eb713a32f5073cedc3c34496fbcf21c699..689da2b457f1ba30dd0ec09827569f7941d913b9 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>
@@ -34,6 +34,7 @@
 #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,
@@ -64,19 +64,20 @@ enum {
 
 class MainInterface : public QVLCMW
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     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
@@ -86,9 +87,6 @@ public:
     int getControlsVisibilityStatus();
     bool isPlDocked() { return ( b_plDocked != false ); }
 
-    /* Sizehint() */
-//    virtual QSize sizeHint() const;
-
 protected:
     void dropEventPlay( QDropEvent *, bool);
 #ifdef WIN32
@@ -102,7 +100,6 @@ protected:
     virtual void customEvent( QEvent *);
     virtual void keyPressEvent( QKeyEvent *);
     virtual void wheelEvent( QWheelEvent * );
-    virtual void resizeEvent( QResizeEvent * event );
 
 private:
     /* Main Widgets Creation */
@@ -112,13 +109,12 @@ private:
 
     /* Systray */
     void createSystray();
-    void handleSystray();
     void initSystray();
+    void handleSystray();
 
-    /* Mess about stackWidget */
+    /* Central StackWidget Management */
     void showTab( QWidget *);
     void showVideo();
-    void showBg();
     void restoreStackOldWidget();
 
     /* */
@@ -127,6 +123,7 @@ private:
     QSystemTrayIcon     *sysTray;
     QMenu               *systrayMenu;
 #endif
+
     QString              input_name;
     QVBoxLayout         *mainLayout;
     ControlsWidget      *controls;
@@ -148,22 +145,21 @@ 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 resizeable window
+    bool                 b_videoEmbedded;       ///< Want an external Video Window
     bool                 b_hideAfterCreation;
-    int                  i_visualmode;        ///< Visual Mode
+    int                  i_visualmode;          ///< Visual Mode
 
     /* 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)
-    int                  i_bg_height;         ///< Save height of bgWidget
 
 #ifdef WIN32
     HIMAGELIST himl;
@@ -179,9 +175,10 @@ public slots:
 #ifndef HAVE_MAEMO
     void toggleUpdateSystrayMenu();
 #endif
-    void toggleAdvanced();
+    void toggleAdvancedButtons();
     void toggleFullScreen();
     void toggleFSC();
+
     void popupMenu( const QPoint& );
     void changeThumbbarButtons( int );
 
@@ -194,7 +191,6 @@ private slots:
     void debug();
     void destroyPopupMenu();
     void recreateToolbars();
-    void doComponentsUpdate();
     void setName( const QString& );
     void setVLCWindowsTitle( const QString& title = "" );
 #if 0
@@ -211,13 +207,18 @@ private slots:
 
     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 );