Changeset 175 for smplayer/vendor/current/src/minigui.cpp

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/minigui.cpp (modified) (11 diffs)

smplayer/vendor/current/src/minigui.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -26 +26 @@
 #include "desktopinfo.h"
 #include "editabletoolbar.h"
+#include "images.h"
 #include <QStatusBar>
 #include <QMenu>
@@ -54 +55 @@
                 controlwidget->hide();
         }
+
+        applyStyles();
 }
 
@@ -71 +74 @@
 void MiniGui::createActions() {
         timeslider_action = createTimeSliderAction(this);
-        timeslider_action->disable();
 
 #if USE_VOLUME_BAR
         volumeslider_action = createVolumeSliderAction(this);
+#endif
+
+#if AUTODISABLE_ACTIONS
+        timeslider_action->disable();
+        #if USE_VOLUME_BAR
         volumeslider_action->disable();
+        #endif
 #endif
 
@@ -125 +133 @@
         EditableToolbar * iw = new EditableToolbar(floating_control);
         iw->setObjectName("floating_control");
+        connect(iw, SIGNAL(iconSizeChanged(const QSize &)), this, SLOT(adjustFloatingControlSize()));
 
 #if USE_CONFIGURABLE_TOOLBARS
@@ -160 +169 @@
         BaseGuiPlus::retranslateStrings();
 
+        // Change the icon of the play/pause action
+        playOrPauseAct->setIcon(Images::icon("play"));
+
         controlwidget->setWindowTitle( tr("Control bar") );
 
@@ -187 +199 @@
 }
 #endif // AUTODISABLE_ACTIONS
+
+void MiniGui::togglePlayAction(Core::State state) {
+        qDebug("MiniGui::togglePlayAction");
+        BaseGui::togglePlayAction(state);
+
+        if (state == Core::Playing) {
+                playOrPauseAct->setIcon(Images::icon("pause"));
+        } else {
+                playOrPauseAct->setIcon(Images::icon("play"));
+        }
+}
 
 void MiniGui::aboutToEnterFullscreen() {
@@ -196 +219 @@
         floating_control->setActivationArea( (AutohideWidget::Activation) pref->floating_activation_area);
         floating_control->setHideDelay(pref->floating_hide_delay);
-        QTimer::singleShot(500, floating_control, SLOT(activate()));
+        QTimer::singleShot(100, floating_control, SLOT(activate()));
 
         if (!pref->compact_mode) {
@@ -235 +258 @@
 #endif
 
+void MiniGui::adjustFloatingControlSize() {
+        qDebug("MiniGui::adjustFloatingControlSize");
+        //floating_control->adjustSize();
+        QWidget *iw = floating_control->internalWidget();
+        QSize iws = iw->size();
+        QMargins m = floating_control->contentsMargins();
+        int new_height = iws.height() + m.top() + m.bottom();
+        if (new_height < 32) new_height = 32;
+        floating_control->resize(floating_control->width(), new_height);
+}
 
 void MiniGui::saveConfig() {
@@ -256 +289 @@
         set->setValue("floating_control", iw->actionsToStringList() );
         set->endGroup();
+
+        set->beginGroup("toolbars_icon_size");
+        set->setValue("controlwidget", controlwidget->iconSize());
+        set->setValue("floating_control", iw->iconSize());
+        set->endGroup();
 #endif
 
@@ -290 +328 @@
         EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget());
         iw->setActionsFromStringList( set->value("floating_control", iw->defaultActions()).toStringList() );
+        set->endGroup();
+
+        set->beginGroup("toolbars_icon_size");
+        controlwidget->setIconSize(set->value("controlwidget", controlwidget->iconSize()).toSize());
+        iw->setIconSize(set->value("floating_control", iw->iconSize()).toSize());
+        set->endGroup();
+
         floating_control->adjustSize();
-        set->endGroup();
 #endif