bgWidget fix. Close #1743

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 7f84f5ebf2f116eafbd07213d8ff8f33f867e5a9..b4d25f3ebbeaa92ebc28d1a61d013cd2290dff31 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>
 
@@ -44,10 +45,12 @@ class PlaylistWidget;
 class VisualSelector;
 class AdvControlsWidget;
 class ControlsWidget;
+class FullscreenControllerWidget;
 class SpeedControlWidget;
 class QMenu;
 class QSize;
-class QDockWidet;
+//class QDockWidet;
+class QProgressBar;
 
 enum{
     CONTROLS_HIDDEN = 0x0,
@@ -58,67 +61,80 @@ enum{
 class MainInterface : public QVLCMW
 {
     Q_OBJECT;
+
+    friend class VolumeClickHandler;
+    friend class InteractionDialog;
+
 public:
     MainInterface( intf_thread_t *);
     virtual ~MainInterface();
 
+    /* Video requests from core */
     void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
                         int *pi_y, unsigned int *pi_width,
                         unsigned int *pi_height );
-    void releaseVideo( void * );
+    void releaseVideo( vout_thread_t *, void * );
     int controlVideo( void *p_window, int i_query, va_list args );
 
+    void requestLayoutUpdate();
+
+    /* Getters */
     QSystemTrayIcon *getSysTray() { return sysTray; };
     QMenu *getSysTrayMenu() { return systrayMenu; };
     int getControlsVisibilityStatus();
+
+#if 0    /* Sizehint() */
+    QSize sizeHint() const;
+#endif
 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;
-    QSize                mainSize, addSize;
     QSystemTrayIcon     *sysTray;
     QMenu               *systrayMenu;
     QString              input_name;
     QVBoxLayout         *mainLayout;
     ControlsWidget      *controls;
-    QMenu                *speedControlMenu;
+    FullscreenControllerWidget *fullscreenControls;
+    QMenu               *speedControlMenu;
     SpeedControlWidget  *speedControl;
+    QProgressBar        *pgBar;
 
-    bool                 need_components_update;
-
-    void calculateInterfaceSize();
     void handleMainUi( QSettings* );
+    void askForPrivacy();
+    int  privacyDialog( QList<ConfigControl *> controls );
+
+    /* Systray */
     void handleSystray();
-    void doComponentsUpdate();
     void createSystray();
 
+    void createStatusBar();
+    void initSystray();
+
     /* Video */
     VideoWidget         *videoWidget;
-    virtual void keyPressEvent( QKeyEvent *);
-    virtual void wheelEvent( QWheelEvent * );
-
-    bool                 embeddedPlaylistWasActive;
-    bool                 videoIsActive;
-    QSize                savedVideoSize;
+    //    QSize                savedVideoSize;
 
     BackgroundWidget    *bgWidget;
     VisualSelector      *visualSelector;
     PlaylistWidget      *playlistWidget;
-    QDockWidget         *dockPL;
+//    QDockWidget         *dockPL;
 
-    bool                 videoEmbeddedFlag;
-    bool                 alwaysVideoFlag;
+    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;
+    bool                 notificationEnabled; /// Systray Notifications
+    bool                 b_remainingTime; /* Show elapsed or remaining time */
+    bool                 bgWasVisible;
+    int                  i_visualmode; ///< Visual Mode
 
-    InputManager        *main_input_manager;
     input_thread_t      *p_input;    ///< Main input associated to the playlist
 
     /* Status Bar */
@@ -126,15 +142,17 @@ private:
     QLabel              *speedLabel;
     QLabel              *nameLabel;
 
-    bool                 b_remainingTime; /* showing elapsed or remaining time */
+    virtual void customEvent( QEvent *);
+    virtual void keyPressEvent( QKeyEvent *);
+    virtual void wheelEvent( QWheelEvent * );
 
-    void customEvent( QEvent *);
 public slots:
     void undockPlaylist();
-    void toggleMenus();
+    void toggleMinimalView();
     void togglePlaylist();
     void toggleUpdateSystrayMenu();
     void toggleAdvanced();
+    void toggleFullScreen();
 
     /* Manage the Video Functions from the vout threads */
     void releaseVideoSlot( void * );
@@ -142,7 +160,7 @@ public slots:
 private slots:
     void debug();
     void updateOnTimer();
-
+    void doComponentsUpdate();
     void setStatus( int );
     void setRate( int );
     void setName( QString );
@@ -158,8 +176,10 @@ private slots:
     void showSpeedMenu( QPoint );
 signals:
     void askReleaseVideo( void * );
+    void askVideoToResize( unsigned int, unsigned int );
     void askVideoToToggle();
     void askBgWidgetToToggle();
+    void askUpdate();
 };
 
 #endif