Qt4: rework HTTP sout box

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 4a53a8909d46d60e28496e0aa511e1d841fa4d75..2a441d0c246d9ca05088a66ca1358135284669ab 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -60,11 +60,7 @@ enum {
     CONTROLS_HIDDEN   = 0x2,
     CONTROLS_ADVANCED = 0x4,
 };
-enum {
-    BACKG_TAB,
-    VIDEO_TAB,
-    PLAYL_TAB,
-};
+
 
 typedef enum pl_dock_e {
     PL_UNDOCKED,
@@ -115,9 +111,6 @@ private:
     void createMainWidget( QSettings* );
     void createStatusBar();
 
-    void askForPrivacy();
-    int  privacyDialog( QList<ConfigControl *> *controls );
-
     /* Systray */
     void handleSystray();
     void createSystray();
@@ -125,8 +118,10 @@ private:
     bool isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
 
     void showTab( int i_tab );
+    void restoreStackOldWidget();
     void showVideo() { showTab( VIDEO_TAB ); }
     void showBg() { showTab( BACKG_TAB ); }
+    void hideStackWidget() { showTab( HIDDEN_TAB ); }
 
     QSettings           *settings;
 #ifndef HAVE_MAEMO
@@ -151,25 +146,34 @@ private:
     QLabel              *cryptedLabel;
 
     /* Status and flags */
-    bool                 videoIsActive;       ///< Having a video now / THEMIM->hasV
+    enum {
+        HIDDEN_TAB = -1,
+        BACKG_TAB  =  0,
+        VIDEO_TAB  = 1,
+        PLAYL_TAB  = 2,
+    };
+    int                  stackCentralOldState;
+
+//    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                 bgWasVisible;
+
     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_hideAfterCreation;
 
 #ifdef WIN32
     HIMAGELIST himl;
     LPTASKBARLIST3 p_taskbl;
     void createTaskBarButtons();
 #endif
+    void createPlaylist( bool );
 
 public slots:
     void undockPlaylist();