Commit 5aebc3b8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

      cleanup and fixes.
parent ac443292
...@@ -114,12 +114,14 @@ public: ...@@ -114,12 +114,14 @@ public:
void enableVideo( bool ); void enableVideo( bool );
private: private:
intf_thread_t *p_intf; intf_thread_t *p_intf;
QPushButton *normalButton; QPushButton *normalButton, *recordButton, *ABButton;
QPushButton *snapshotButton; QPushButton *snapshotButton, *frameButton;
private slots: private slots:
void normal(); void normal();
void snapshot(); void snapshot();
void fullscreen(); void fullscreen();
void frame();
void record();
}; };
class InputSlider; class InputSlider;
...@@ -130,7 +132,7 @@ class ControlsWidget : public QFrame ...@@ -130,7 +132,7 @@ class ControlsWidget : public QFrame
{ {
Q_OBJECT Q_OBJECT
public: public:
ControlsWidget( intf_thread_t *); ControlsWidget( intf_thread_t *, bool );
virtual ~ControlsWidget(); virtual ~ControlsWidget();
QPushButton *playlistButton; QPushButton *playlistButton;
...@@ -152,6 +154,9 @@ private: ...@@ -152,6 +154,9 @@ private:
QPushButton *prevSectionButton, *nextSectionButton, *menuButton; QPushButton *prevSectionButton, *nextSectionButton, *menuButton;
QPushButton *playButton, *fullscreenButton; QPushButton *playButton, *fullscreenButton;
QPushButton *slowerButton, *fasterButton; QPushButton *slowerButton, *fasterButton;
AdvControlsWidget *advControls;
bool b_advancedVisible;
private slots: private slots:
void play(); void play();
void stop(); void stop();
...@@ -163,6 +168,9 @@ private slots: ...@@ -163,6 +168,9 @@ private slots:
void prefs(); void prefs();
void faster(); void faster();
void slower(); void slower();
void toggleAdvanced();
signals:
void advancedControlsShowed( bool );
}; };
class VolumeClickHandler : public QObject class VolumeClickHandler : public QObject
......
This diff is collapsed.
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#ifndef _MAIN_INTERFACE_H_ #ifndef _MAIN_INTERFACE_H_
#define _MAIN_INTERFACE_H_ #define _MAIN_INTERFACE_H_
#include "qt4.hpp" #include "qt4.hpp"
#include "util/qvlcframe.hpp" #include "util/qvlcframe.hpp"
...@@ -54,14 +53,16 @@ class MainInterface : public QVLCMW ...@@ -54,14 +53,16 @@ class MainInterface : public QVLCMW
public: public:
MainInterface( intf_thread_t *); MainInterface( intf_thread_t *);
virtual ~MainInterface(); virtual ~MainInterface();
void *requestVideo( vout_thread_t *p_nvout, int *pi_x, void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
int *pi_y, unsigned int *pi_width, int *pi_y, unsigned int *pi_width,
unsigned int *pi_height ); unsigned int *pi_height );
void releaseVideo( void *); void releaseVideo( void * );
int controlVideo( void *p_window, int i_query, va_list args ); int controlVideo( void *p_window, int i_query, va_list args );
QSystemTrayIcon *getSysTray() { return sysTray; }; QSystemTrayIcon *getSysTray() { return sysTray; };
QMenu *getSysTrayMenu() { return systrayMenu; }; QMenu *getSysTrayMenu() { return systrayMenu; };
bool isAdvancedVisible();
protected: protected:
void resizeEvent( QResizeEvent * ); void resizeEvent( QResizeEvent * );
void dropEvent( QDropEvent *); void dropEvent( QDropEvent *);
...@@ -69,7 +70,6 @@ protected: ...@@ -69,7 +70,6 @@ protected:
void dragMoveEvent( QDragMoveEvent * ); void dragMoveEvent( QDragMoveEvent * );
void dragLeaveEvent( QDragLeaveEvent * ); void dragLeaveEvent( QDragLeaveEvent * );
void closeEvent( QCloseEvent *); void closeEvent( QCloseEvent *);
//Ui::MainInterfaceUI ui;
friend class VolumeClickHandler; friend class VolumeClickHandler;
private: private:
QSettings *settings; QSettings *settings;
...@@ -81,6 +81,7 @@ private: ...@@ -81,6 +81,7 @@ private:
ControlsWidget *controls; ControlsWidget *controls;
bool need_components_update; bool need_components_update;
void calculateInterfaceSize(); void calculateInterfaceSize();
void handleMainUi( QSettings* ); void handleMainUi( QSettings* );
void handleSystray(); void handleSystray();
...@@ -96,16 +97,13 @@ private: ...@@ -96,16 +97,13 @@ private:
bool videoIsActive; bool videoIsActive;
QSize savedVideoSize; QSize savedVideoSize;
BackgroundWidget *bgWidget; BackgroundWidget *bgWidget;
VisualSelector *visualSelector; VisualSelector *visualSelector;
AdvControlsWidget *advControls;
PlaylistWidget *playlistWidget; PlaylistWidget *playlistWidget;
bool playlistEmbeddedFlag; bool playlistEmbeddedFlag;
bool videoEmbeddedFlag; bool videoEmbeddedFlag;
bool alwaysVideoFlag; bool alwaysVideoFlag;
bool advControlsEnabled;
bool visualSelectorEnabled; bool visualSelectorEnabled;
InputManager *main_input_manager; InputManager *main_input_manager;
...@@ -119,16 +117,18 @@ private: ...@@ -119,16 +117,18 @@ private:
public slots: public slots:
void undockPlaylist(); void undockPlaylist();
void toggleMenus(); void toggleMenus();
void playlist(); void togglePlaylist();
void toggleUpdateSystrayMenu(); void toggleUpdateSystrayMenu();
void toggleAdvanced();
private slots: private slots:
void updateOnTimer();
void setStatus( int ); void setStatus( int );
void setName( QString ); void setName( QString );
void setVLCWindowsTitle( QString title = "" ); void setVLCWindowsTitle( QString title = "" );
void setDisplay( float, int, int ); void setDisplay( float, int, int );
void updateOnTimer(); #if 0
void visual(); void visual();
void advanced(); #endif
void handleSystrayClick( QSystemTrayIcon::ActivationReason ); void handleSystrayClick( QSystemTrayIcon::ActivationReason );
void updateSystrayMenu( int ); void updateSystrayMenu( int );
void updateSystrayTooltipName( QString ); void updateSystrayTooltipName( QString );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment