Qt: use QString iso std::string

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index dc8d45b70c5e9267d660534fda86efc5e56a02b1..d96d6cb9baedc25bb5b028d0d794401ac4702c18 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,21 +86,21 @@ public:
 #endif
     int getControlsVisibilityStatus();
     bool isPlDocked() { return ( b_plDocked != false ); }
+    bool isInterfaceFullScreen() { return b_interfaceFullScreen; }
 
 protected:
     void dropEventPlay( QDropEvent *, bool);
 #ifdef WIN32
     virtual bool winEvent( MSG *, long * );
 #endif
+    virtual void changeEvent( QEvent * );
     virtual void dropEvent( QDropEvent *);
     virtual void dragEnterEvent( QDragEnterEvent * );
     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 */
@@ -114,13 +114,14 @@ private:
     void handleSystray();
 
     /* Central StackWidget Management */
-    enum StackTab
-    {
-        PLAYLIST_TAB,
-        VIDEO_TAB,
-        CURRENT_TAB
-    };
-    void showTab( StackTab = CURRENT_TAB );
+    void showTab( QWidget *);
+    void showVideo();
+    void restoreStackOldWidget();
+
+    /* */
+    void setMinimalView( bool );
+    void setInterfaceFullScreen( bool );
+    void computeMinimumSize();
 
     /* */
     QSettings           *settings;
@@ -141,29 +142,34 @@ private:
     VideoWidget         *videoWidget;
     BackgroundWidget    *bgWidget;
     PlaylistWidget      *playlistWidget;
-    QWidget             *videoRoleWidget;
     //VisualSelector      *visualSelector;
-    QWidget             *minWidthHolder;
 
     /* Status Bar */
     QLabel              *nameLabel;
     QLabel              *cryptedLabel;
 
+    /* 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_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)
+    bool                 b_hasPausedWhenMinimized;
+    bool                 b_statusbarVisible;
 
 #ifdef WIN32
     HIMAGELIST himl;
@@ -178,13 +184,19 @@ public slots:
     void togglePlaylist();
 #ifndef HAVE_MAEMO
     void toggleUpdateSystrayMenu();
+    void showUpdateSystrayMenu();
+    void hideUpdateSystrayMenu();
 #endif
     void toggleAdvancedButtons();
-    void toggleFullScreen();
+    void toggleInterfaceFullScreen();
     void toggleFSC();
 
+    void setStatusBarVisibility(bool b_visible);
+
     void popupMenu( const QPoint& );
+#ifdef WIN32
     void changeThumbbarButtons( int );
+#endif
 
     /* Manage the Video Functions from the vout threads */
     void getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
@@ -195,7 +207,6 @@ private slots:
     void debug();
     void destroyPopupMenu();
     void recreateToolbars();
-    void adaptGeometry();
     void setName( const QString& );
     void setVLCWindowsTitle( const QString& title = "" );
 #if 0
@@ -212,10 +223,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,
@@ -223,19 +247,11 @@ signals:
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );
     void askVideoSetFullScreen( bool );
+    void askVideoOnTop( bool );
     void minimalViewToggled( bool );
     void fullscreenInterfaceToggled( bool );
+    void askToQuit();
 
 };
 
-class QVLCStackedWidget : public QStackedWidget
-{
-  public:
-      QVLCStackedWidget( QWidget *parent ) : QStackedWidget( parent ) { }
-      virtual QSize minimumSizeHint () const
-      {
-          return currentWidget() ? currentWidget()->minimumSizeHint() : QSize();
-      }
-};
-
 #endif