Qt4 - MainInterface cleaning, FIXME labelling, Simplification, put the delay of statu...

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 103e383bdad389f993f02b0dd5866399573c3027..00887a6e2f51aed0ff0661cd422ff499db8f7274 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -27,6 +27,7 @@
 
 #include "qt4.hpp"
 #include "util/qvlcframe.hpp"
+#include "components/preferences_widgets.hpp"
 
 #include <vlc_aout.h>
 
@@ -71,14 +72,15 @@ public:
     QSystemTrayIcon *getSysTray() { return sysTray; };
     QMenu *getSysTrayMenu() { return systrayMenu; };
     int getControlsVisibilityStatus();
+    QSize sizeHint() const;
 protected:
-    void resizeEvent( QResizeEvent * );
+//    void resizeEvent( QResizeEvent * );
     void dropEvent( QDropEvent *);
     void dragEnterEvent( QDragEnterEvent * );
     void dragMoveEvent( QDragMoveEvent * );
     void dragLeaveEvent( QDragLeaveEvent * );
     void closeEvent( QCloseEvent *);
- 
+
     friend class VolumeClickHandler;
 private:
     QSettings           *settings;
@@ -93,18 +95,17 @@ private:
 
     bool                 need_components_update;
 
-    void calculateInterfaceSize();
     void handleMainUi( QSettings* );
     void handleSystray();
-    void doComponentsUpdate();
+
     void createSystray();
+    int privacyDialog( QList<ConfigControl *> controls );
 
     /* Video */
     VideoWidget         *videoWidget;
     virtual void keyPressEvent( QKeyEvent *);
     virtual void wheelEvent( QWheelEvent * );
 
-    bool                 embeddedPlaylistWasActive;
     bool                 videoIsActive;
     QSize                savedVideoSize;
 
@@ -131,14 +132,18 @@ private:
     void customEvent( QEvent *);
 public slots:
     void undockPlaylist();
-    void toggleMenus();
+    void toggleMinimalView();
     void togglePlaylist();
     void toggleUpdateSystrayMenu();
     void toggleAdvanced();
+
+    /* Manage the Video Functions from the vout threads */
+    void releaseVideoSlot( void * );
+
 private slots:
     void debug();
     void updateOnTimer();
-
+    void doComponentsUpdate();
     void setStatus( int );
     void setRate( int );
     void setName( QString );
@@ -153,7 +158,9 @@ private slots:
     void updateSystrayTooltipStatus( int );
     void showSpeedMenu( QPoint );
 signals:
-    void askVideoToHide();
+    void askReleaseVideo( void * );
+    void askVideoToToggle();
+    void askBgWidgetToToggle();
 };
 
 #endif