X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmain_interface.hpp;h=48aed59e481819c3a408128f288cf1adc7e170ce;hb=b42755d7fd2a64ad8c9d4c881388685abee9c463;hp=321534006847f8e6e3ad340cdf38eca39062813e;hpb=230b1c05a02de93fc22f4b6915380f22d621d6ec;p=vlc

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 3215340068..48aed59e48 100644
--- 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-2007 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -22,13 +22,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MAIN_INTERFACE_H_
-#define _MAIN_INTERFACE_H_
+#ifndef QVLC_MAIN_INTERFACE_H_
+#define QVLC_MAIN_INTERFACE_H_
 
 #include "qt4.hpp"
-#include "util/qvlcframe.hpp"
 
-#include <vlc_aout.h>
+#include "util/qvlcframe.hpp"
+#include "components/preferences_widgets.hpp" /* First Start */
 
 #include <QSystemTrayIcon>
 
@@ -44,109 +44,147 @@ class PlaylistWidget;
 class VisualSelector;
 class AdvControlsWidget;
 class ControlsWidget;
+class InputControlsWidget;
+class FullscreenControllerWidget;
 class SpeedControlWidget;
 class QMenu;
 class QSize;
+class DialogHandler;
+
+enum {
+    CONTROLS_VISIBLE = 0x1,
+    CONTROLS_HIDDEN = 0x2,
+    CONTROLS_ADVANCED = 0x4,
+};
+
+typedef enum pl_dock_e {
+    PL_UNDOCKED,
+    PL_BOTTOM,
+    PL_RIGHT,
+    PL_LEFT
+} pl_dock_e;
 
 class MainInterface : public QVLCMW
 {
     Q_OBJECT;
+
+    friend class PlaylistWidget;
+
 public:
     MainInterface( intf_thread_t *);
     virtual ~MainInterface();
 
-    void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
-                        int *pi_y, unsigned int *pi_width,
-                        unsigned int *pi_height );
-    void releaseVideo( void * );
-    int controlVideo( void *p_window, int i_query, va_list args );
+    /* Video requests from core */
+    WId requestVideo( vout_thread_t *p_nvout, int *pi_x,
+                      int *pi_y, unsigned int *pi_width,
+                      unsigned int *pi_height );
+    void releaseVideo( void  );
+    int controlVideo( int i_query, va_list args );
 
+    /* Getters */
     QSystemTrayIcon *getSysTray() { return sysTray; };
     QMenu *getSysTrayMenu() { return systrayMenu; };
     int getControlsVisibilityStatus();
+
+    /* Sizehint() */
+    virtual QSize sizeHint() const;
+
 protected:
-    void resizeEvent( QResizeEvent * );
+//    void resizeEvent( QResizeEvent * );
     void dropEvent( QDropEvent *);
+    void dropEventPlay( QDropEvent *, bool);
     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;
-    SpeedControlWidget  *speedControl;
-
-    bool                 need_components_update;
+    InputControlsWidget *inputC;
+    FullscreenControllerWidget *fullscreenControls;
+    DialogHandler       *dialogHandler;
 
-    void calculateInterfaceSize();
     void handleMainUi( QSettings* );
+    void askForPrivacy();
+    int  privacyDialog( QList<ConfigControl *> *controls );
+
+    /* Systray */
     void handleSystray();
-    void doComponentsUpdate();
     void createSystray();
+    void initSystray();
+
+    void createStatusBar();
 
     /* Video */
     VideoWidget         *videoWidget;
-    virtual void keyPressEvent( QKeyEvent *);
-    virtual void wheelEvent( QWheelEvent * );
-
-    bool                 embeddedPlaylistWasActive;
-    bool                 videoIsActive;
-    QSize                savedVideoSize;
 
     BackgroundWidget    *bgWidget;
     VisualSelector      *visualSelector;
     PlaylistWidget      *playlistWidget;
 
-    bool                 playlistEmbeddedFlag;
-    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;
-
-    InputManager        *main_input_manager;
-    input_thread_t      *p_input;    ///< Main input associated to the playlist
-
-    QLabel              *timeLabel;
-    QLabel              *speedLabel;
+    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;
+    bool                 isDocked() { return ( i_pl_dock != PL_UNDOCKED ); }
+
+    /* Status Bar */
     QLabel              *nameLabel;
-    
-    bool                 b_remainingTime;
+    QLabel              *cryptedLabel;
+
+    virtual void customEvent( QEvent *);
+    virtual void keyPressEvent( QKeyEvent *);
+    virtual void wheelEvent( QWheelEvent * );
+    virtual void resizeEvent( QResizeEvent * event );
 
-    void customEvent( QEvent *);
 public slots:
     void undockPlaylist();
-    void toggleMenus();
+    void dockPlaylist( pl_dock_e i_pos = PL_BOTTOM );
+    void toggleMinimalView( bool );
     void togglePlaylist();
     void toggleUpdateSystrayMenu();
     void toggleAdvanced();
-private slots:
-    void updateOnTimer();
+    void toggleFullScreen();
+    void toggleFSC();
+    void popupMenu();
+
+    /* Manage the Video Functions from the vout threads */
+    void releaseVideoSlot( void );
 
-    void setStatus( int );
-    void setRate( int );
+private slots:
+    void debug();
+    void doComponentsUpdate();
     void setName( QString );
     void setVLCWindowsTitle( QString title = "" );
-    void setDisplayPosition( float, int, int );
-    void toggleTimeDisplay();
-    void setElapsedTime();
-    void setRemainTime();
 #if 0
     void visual();
 #endif
     void handleSystrayClick( QSystemTrayIcon::ActivationReason );
-    void updateSystrayMenu( int );
     void updateSystrayTooltipName( QString );
     void updateSystrayTooltipStatus( int );
-    void showSpeedMenu( QPoint );
-    void showTimeMenu( QPoint );
+
+    void showCryptedLabel( bool );
+signals:
+    void askReleaseVideo( );
+    void askVideoToResize( unsigned int, unsigned int );
+    void askVideoToShow( unsigned int, unsigned int );
+    void askVideoToToggle();
+    void askBgWidgetToToggle();
+    void askUpdate();
+    void minimalViewToggled( bool );
+    void fullscreenInterfaceToggled( bool );
 };
 
 #endif