diff options
| author | Maia Kozheva <sikon@ubuntu.com> | 2012-04-09 13:30:23 +0700 |
|---|---|---|
| committer | Maia Kozheva <sikon@ubuntu.com> | 2012-04-09 13:30:23 +0700 |
| commit | 69d32924ffbfe2bb05d881a23af13b6070b9a9bd (patch) | |
| tree | 15d9f808ef672e21bcf2da9b6c9fc8e48e157eff /src/defaultgui.h | |
| parent | 65a64d260e05c7bf8d3bdf82e796637dc820e574 (diff) | |
Imported Upstream version 0.8.0
Diffstat (limited to 'src/defaultgui.h')
| -rw-r--r-- | src/defaultgui.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/defaultgui.h b/src/defaultgui.h index 65bc6af..a0bf00f 100644 --- a/src/defaultgui.h +++ b/src/defaultgui.h @@ -24,6 +24,7 @@ #include <QPoint> class QToolBar; +class EditableToolbar; class QPushButton; class QResizeEvent; class MyAction; @@ -43,7 +44,7 @@ class DefaultGui : public BaseGuiPlus Q_OBJECT public: - DefaultGui( bool use_server, QWidget* parent = 0, Qt::WindowFlags flags = 0 ); + DefaultGui( QWidget* parent = 0, Qt::WindowFlags flags = 0 ); ~DefaultGui(); #if USE_MINIMUMSIZE @@ -99,10 +100,10 @@ protected: QLabel * ab_section_display; QLabel * video_info_display; - QToolBar * controlwidget; - QToolBar * controlwidget_mini; + EditableToolbar * controlwidget; + EditableToolbar * controlwidget_mini; - QToolBar * toolbar1; + EditableToolbar * toolbar1; QToolBar * toolbar2; QPushButton * select_audio; @@ -122,6 +123,13 @@ protected: MyAction * viewFrameCounterAct; MyAction * viewVideoInfoAct; +#if USE_CONFIGURABLE_TOOLBARS + MyAction * editToolbar1Act; + MyAction * editControl1Act; + MyAction * editControl2Act; + MyAction * editFloatingControlAct; +#endif + QMenu * toolbar_menu; QMenu * statusbar_menu; |