Qt4 - Main Interface: Advanced buttons are correctly integrated, cosmetic,

      cleanup and fixes.

modules/gui/qt4/components/interface_widgets.hpp

@@ -114,12 +114,14 @@ public:
     void enableVideo( bool );
 private:
     intf_thread_t *p_intf;
-    QPushButton *normalButton;
-    QPushButton *snapshotButton;
+    QPushButton *normalButton, *recordButton, *ABButton;
+    QPushButton *snapshotButton, *frameButton;
 private slots:
     void normal();
     void snapshot();
     void fullscreen();
+    void frame();
+    void record();
 };
 
 class InputSlider;
@@ -130,7 +132,7 @@ class ControlsWidget : public QFrame
 {
     Q_OBJECT
 public:
-    ControlsWidget( intf_thread_t *);
+    ControlsWidget( intf_thread_t *, bool );
     virtual ~ControlsWidget();
 
     QPushButton *playlistButton;
@@ -145,13 +147,16 @@ protected:
     friend class MainInterface;
     friend class VolumeClickHandler;
 private:
-    intf_thread_t *p_intf;
-    QFrame *discFrame;
-    QGridLayout *controlLayout;
+    intf_thread_t       *p_intf;
+    QFrame              *discFrame;
+    QGridLayout         *controlLayout;
     InputSlider         *slider;
-    QPushButton *prevSectionButton, *nextSectionButton, *menuButton;
-    QPushButton *playButton, *fullscreenButton;
-    QPushButton *slowerButton, *fasterButton;
+    QPushButton         *prevSectionButton, *nextSectionButton, *menuButton;
+    QPushButton         *playButton, *fullscreenButton;
+    QPushButton         *slowerButton, *fasterButton;
+    AdvControlsWidget   *advControls;
+
+    bool                 b_advancedVisible;
 private slots:
     void play();
     void stop();
@@ -163,6 +168,9 @@ private slots:
     void prefs();
     void faster();
     void slower();
+    void toggleAdvanced();
+signals:
+    void advancedControlsShowed( bool );
 };
 
 class VolumeClickHandler : public QObject

modules/gui/qt4/main_interface.hpp

@@ -25,7 +25,6 @@
 #ifndef _MAIN_INTERFACE_H_
 #define _MAIN_INTERFACE_H_
 
-
 #include "qt4.hpp"
 #include "util/qvlcframe.hpp"
 
@@ -54,14 +53,16 @@ class MainInterface : public QVLCMW
 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 *);
+    void releaseVideo( void * );
     int controlVideo( void *p_window, int i_query, va_list args );
 
     QSystemTrayIcon *getSysTray() { return sysTray; };
     QMenu *getSysTrayMenu() { return systrayMenu; };
+    bool isAdvancedVisible();
 protected:
     void resizeEvent( QResizeEvent * );
     void dropEvent( QDropEvent *);
@@ -69,18 +70,18 @@ protected:
     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;
+    QSettings           *settings;
+    QSize                mainSize, addSize;
+    QSystemTrayIcon     *sysTray;
+    QMenu               *systrayMenu;
+    QString              input_name;
+    QVBoxLayout         *mainLayout;
+    ControlsWidget      *controls;
+
+    bool                 need_components_update;
+
     void calculateInterfaceSize();
     void handleMainUi( QSettings* );
     void handleSystray();
@@ -92,20 +93,17 @@ private:
     virtual void keyPressEvent( QKeyEvent *);
     virtual void wheelEvent( QWheelEvent * );
 
-    bool embeddedPlaylistWasActive;
-    bool videoIsActive;
-    QSize savedVideoSize;
-
+    bool                 embeddedPlaylistWasActive;
+    bool                 videoIsActive;
+    QSize                savedVideoSize;
 
     BackgroundWidget    *bgWidget;
     VisualSelector      *visualSelector;
-    AdvControlsWidget      *advControls;
     PlaylistWidget      *playlistWidget;
 
     bool                 playlistEmbeddedFlag;
     bool                 videoEmbeddedFlag;
     bool                 alwaysVideoFlag;
-    bool                 advControlsEnabled;
     bool                 visualSelectorEnabled;
 
     InputManager        *main_input_manager;
@@ -119,17 +117,19 @@ private:
 public slots:
     void undockPlaylist();
     void toggleMenus();
-    void playlist();
+    void togglePlaylist();
     void toggleUpdateSystrayMenu();
+    void toggleAdvanced();
 private slots:
+    void updateOnTimer();
     void setStatus( int );
     void setName( QString );
     void setVLCWindowsTitle( QString title = "" );
     void setDisplay( float, int, int );
-    void updateOnTimer();
+#if 0
     void visual();
-    void advanced();
-    void handleSystrayClick(  QSystemTrayIcon::ActivationReason );
+#endif
+    void handleSystrayClick( QSystemTrayIcon::ActivationReason );
     void updateSystrayMenu( int );
     void updateSystrayTooltipName( QString );
     void updateSystrayTooltipStatus( int );