Changeset 128 for smplayer/trunk/src/defaultgui.h

Timestamp:

Mar 29, 2012, 4:53:15 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: trunk update to latest svn

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/defaultgui.h (modified) (4 diffs)

smplayer/trunk/src/defaultgui.h

@@ -25 +25 @@
 
 class QToolBar;
+class EditableToolbar;
 class QPushButton;
 class QResizeEvent;
@@ -44 +45 @@
 
 public:
-        DefaultGui( bool use_server, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+        DefaultGui( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
         ~DefaultGui();
 
@@ -100 +101 @@
         QLabel * video_info_display;
 
-        QToolBar * controlwidget;
-        QToolBar * controlwidget_mini;
+        EditableToolbar * controlwidget;
+        EditableToolbar * controlwidget_mini;
 
-        QToolBar * toolbar1;
+        EditableToolbar * toolbar1;
         QToolBar * toolbar2;
 
@@ -123 +124 @@
         MyAction * viewVideoInfoAct;
 
+#if USE_CONFIGURABLE_TOOLBARS
+        MyAction * editToolbar1Act;
+        MyAction * editControl1Act;
+        MyAction * editControl2Act;
+        MyAction * editFloatingControlAct;
+#endif
+
         QMenu * toolbar_menu;
         QMenu * statusbar_menu;