Changeset 128 for smplayer/trunk/src/minigui.cpp

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.cpp (modified) (11 diffs)

smplayer/trunk/src/minigui.cpp

@@ -24 +24 @@
 #include "global.h"
 #include "helper.h"
-#include "toolbareditor.h"
 #include "desktopinfo.h"
-
-#include <QToolBar>
+#include "editabletoolbar.h"
 #include <QStatusBar>
+#include <QMenu>
 
 using namespace Global;
 
-MiniGui::MiniGui( bool use_server, QWidget * parent, Qt::WindowFlags flags )
-        : BaseGuiPlus( use_server, parent, flags )
+MiniGui::MiniGui( QWidget * parent, Qt::WindowFlags flags )
+        : BaseGuiPlus( parent, flags )
 {
         createActions();
@@ -39 +38 @@
         createFloatingControl();
 
+#if USE_CONFIGURABLE_TOOLBARS
+        connect( editControlAct, SIGNAL(triggered()),
+             controlwidget, SLOT(edit()) );
+        floating_control->toolbar()->takeAvailableActionsFrom(this);
+        connect( editFloatingControlAct, SIGNAL(triggered()),
+             floating_control->toolbar(), SLOT(edit()) );
+#endif
+
         connect( this, SIGNAL(cursorNearBottom(QPoint)),
              this, SLOT(showFloatingControl(QPoint)) );
@@ -59 +66 @@
         saveConfig();
 }
+
+#if USE_CONFIGURABLE_TOOLBARS
+QMenu * MiniGui::createPopupMenu() {
+        QMenu * m = new QMenu(this);
+        m->addAction(editControlAct);
+        m->addAction(editFloatingControlAct);
+        return m;
+}
+#endif
 
 void MiniGui::createActions() {
@@ -74 +90 @@
         connect( this, SIGNAL(timeChanged(QString)),
              time_label_action, SLOT(setText(QString)) );
+
+#if USE_CONFIGURABLE_TOOLBARS
+        editControlAct = new MyAction( this, "edit_control_minigui" );
+        editFloatingControlAct = new MyAction( this, "edit_floating_control_minigui" );
+#endif
 }
 
 
 void MiniGui::createControlWidget() {
-        controlwidget = new QToolBar( this );
+        controlwidget = new EditableToolbar( this );
         controlwidget->setObjectName("controlwidget");
         controlwidget->setMovable(true);
@@ -84 +105 @@
         addToolBar(Qt::BottomToolBarArea, controlwidget);
 
-#if !USE_CONFIGURABLE_TOOLBARS
+#if USE_CONFIGURABLE_TOOLBARS
+        QStringList controlwidget_actions;
+        controlwidget_actions << "play_or_pause" << "stop" << "separator" << "timeslider_action" << "separator"
+                          << "fullscreen" << "mute" << "volumeslider_action";
+        controlwidget->setDefaultActions(controlwidget_actions);
+#else
         controlwidget->addAction(playOrPauseAct);
         controlwidget->addAction(stopAct);
@@ -92 +118 @@
         controlwidget->addAction(fullscreenAct);
         controlwidget->addAction(muteAct);
-
-#if USE_VOLUME_BAR
+        #if USE_VOLUME_BAR
         controlwidget->addAction(volumeslider_action);
-#endif
-
+        #endif
 #endif // USE_CONFIGURABLE_TOOLBARS
 }
@@ -104 +128 @@
         floating_control = new FloatingWidget(this);
 
-#if !USE_CONFIGURABLE_TOOLBARS
+#if USE_CONFIGURABLE_TOOLBARS
+        QStringList floatingcontrol_actions;
+        floatingcontrol_actions << "play_or_pause" << "stop" << "separator" << "timeslider_action" << "separator"
+                            << "fullscreen" << "mute";
+        #if USE_VOLUME_BAR
+        floatingcontrol_actions << "volumeslider_action";
+        #endif
+        floatingcontrol_actions << "separator" << "timelabel_action";
+        floating_control->toolbar()->setDefaultActions(floatingcontrol_actions);
+#else
         floating_control->toolbar()->addAction(playOrPauseAct);
         floating_control->toolbar()->addAction(stopAct);
@@ -112 +145 @@
         floating_control->toolbar()->addAction(fullscreenAct);
         floating_control->toolbar()->addAction(muteAct);
-#if USE_VOLUME_BAR
+        #if USE_VOLUME_BAR
         floating_control->toolbar()->addAction(volumeslider_action);
-#endif
-
+        #endif
         floating_control->adjustSize();
 #endif // USE_CONFIGURABLE_TOOLBARS
@@ -124 +156 @@
 
         controlwidget->setWindowTitle( tr("Control bar") );
+
+#if USE_CONFIGURABLE_TOOLBARS
+        editControlAct->change( tr("Edit &control bar") );
+        editFloatingControlAct->change( tr("Edit &floating control") );
+#endif
 }
 
@@ -216 +253 @@
 #if USE_CONFIGURABLE_TOOLBARS
         set->beginGroup( "actions" );
-        set->setValue("controlwidget", ToolbarEditor::save(controlwidget) );
-        set->setValue("floating_control", ToolbarEditor::save(floating_control->toolbar()) );
+        set->setValue("controlwidget", controlwidget->actionsToStringList() );
+        set->setValue("floating_control", floating_control->toolbar()->actionsToStringList() );
         set->endGroup();
 #endif
@@ -247 +284 @@
 
 #if USE_CONFIGURABLE_TOOLBARS
-        QList<QAction *> actions_list = findChildren<QAction *>();
-        QStringList controlwidget_actions;
-        controlwidget_actions << "play_or_pause" << "stop" << "separator" << "timeslider_action" << "separator"
-                          << "fullscreen" << "mute" << "volumeslider_action";
-
-        QStringList floatingcontrol_actions;
-        floatingcontrol_actions << "play_or_pause" << "stop" << "separator" << "timeslider_action" << "separator"
-                            << "fullscreen" << "mute";
-#if USE_VOLUME_BAR
-        floatingcontrol_actions << "volumeslider_action";
-#endif
-
-        floatingcontrol_actions << "separator" << "timelabel_action";
-
         set->beginGroup( "actions" );
-        ToolbarEditor::load(controlwidget, set->value("controlwidget", controlwidget_actions).toStringList(), actions_list );
-        ToolbarEditor::load(floating_control->toolbar(), set->value("floating_control", floatingcontrol_actions).toStringList(), actions_list );
+        controlwidget->setActionsFromStringList( set->value("controlwidget", controlwidget->defaultActions()).toStringList() );
+        floating_control->toolbar()->setActionsFromStringList( set->value("floating_control", floating_control->toolbar()->defaultActions()).toStringList() );
         floating_control->adjustSize();
         set->endGroup();