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 66ac8a9e0675d183690af481e261f98e853be94b..b4d25f3ebbeaa92ebc28d1a61d013cd2290dff31 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -25,10 +25,9 @@
 #ifndef _MAIN_INTERFACE_H_
 #define _MAIN_INTERFACE_H_
 
-
 #include "qt4.hpp"
-#include "ui/main_interface.h"
 #include "util/qvlcframe.hpp"
+#include "components/preferences_widgets.hpp"
 
 #include <vlc_aout.h>
 
@@ -46,96 +45,141 @@ class PlaylistWidget;
 class VisualSelector;
 class AdvControlsWidget;
 class ControlsWidget;
+class FullscreenControllerWidget;
+class SpeedControlWidget;
 class QMenu;
 class QSize;
+//class QDockWidet;
+class QProgressBar;
+
+enum{
+    CONTROLS_HIDDEN = 0x0,
+    CONTROLS_VISIBLE = 0x1,
+    CONTROLS_ADVANCED = 0x2
+};
 
 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 *);
-    //Ui::MainInterfaceUI ui;
-    friend class VolumeClickHandler;
+
 private:
-    QSettings *settings;
-    QSize mainSize, addSize;
-    QSystemTrayIcon *sysTray;
-    QMenu *systrayMenu;
-    QString input_name;
-    QVBoxLayout *mainLayout;
-    ControlsWidget *controls;
-
-    bool need_components_update;
-    void calculateInterfaceSize();
+    QSettings           *settings;
+    QSystemTrayIcon     *sysTray;
+    QMenu               *systrayMenu;
+    QString              input_name;
+    QVBoxLayout         *mainLayout;
+    ControlsWidget      *controls;
+    FullscreenControllerWidget *fullscreenControls;
+    QMenu               *speedControlMenu;
+    SpeedControlWidget  *speedControl;
+    QProgressBar        *pgBar;
+
     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;
-    AdvControlsWidget      *advControls;
     PlaylistWidget      *playlistWidget;
+//    QDockWidget         *dockPL;
 
-    bool                 playlistEmbeddedFlag;
-    bool                 videoEmbeddedFlag;
-    bool                 alwaysVideoFlag;
-    bool                 advControlsEnabled;
+    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                 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 */
     QLabel              *timeLabel;
     QLabel              *speedLabel;
     QLabel              *nameLabel;
 
-    void customEvent( QEvent *);
+    virtual void customEvent( QEvent *);
+    virtual void keyPressEvent( QKeyEvent *);
+    virtual void wheelEvent( QWheelEvent * );
+
 public slots:
     void undockPlaylist();
-    void toggleMenus();
-    void playlist();
+    void toggleMinimalView();
+    void togglePlaylist();
     void toggleUpdateSystrayMenu();
+    void toggleAdvanced();
+    void toggleFullScreen();
+
+    /* 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 );
     void setVLCWindowsTitle( QString title = "" );
-    void setDisplay( float, int, int );
-    void updateOnTimer();
+    void setDisplayPosition( float, int, int );
+    void toggleTimeDisplay();
+#if 0
     void visual();
-    void advanced();
-    void handleSystrayClick(  QSystemTrayIcon::ActivationReason );
-    void updateSystrayMenu( int );
+#endif
+    void handleSystrayClick( QSystemTrayIcon::ActivationReason );
     void updateSystrayTooltipName( QString );
     void updateSystrayTooltipStatus( int );
     void showSpeedMenu( QPoint );
-    void showTimeMenu( QPoint );
+signals:
+    void askReleaseVideo( void * );
+    void askVideoToResize( unsigned int, unsigned int );
+    void askVideoToToggle();
+    void askBgWidgetToToggle();
+    void askUpdate();
 };
 
 #endif