Changeset 128 for smplayer/trunk/src/minigui.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/minigui.h (modified) (5 diffs)

smplayer/trunk/src/minigui.h

@@ -29 +29 @@
 class TimeLabelAction;
 class FloatingWidget;
-class QToolBar;
+class EditableToolbar;
 
 class MiniGui : public BaseGuiPlus
@@ -36 +36 @@
 
 public:
-        MiniGui( bool use_server, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+        MiniGui( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
         ~MiniGui();
 
@@ -55 +55 @@
 protected:
         virtual void retranslateStrings();
+#if USE_CONFIGURABLE_TOOLBARS
+        virtual QMenu * createPopupMenu();
+#endif
 
         void createActions();
@@ -70 +73 @@
 
 protected:
-        QToolBar * controlwidget;
+        EditableToolbar * controlwidget;
 
         FloatingWidget * floating_control;
@@ -79 +82 @@
 #endif
         TimeLabelAction * time_label_action;
+
+#if USE_CONFIGURABLE_TOOLBARS
+        MyAction * editControlAct;
+        MyAction * editFloatingControlAct;
+#endif
 };