Imported Upstream version 14.9.0.6887~ds0

1 files changed, 48 insertions, 2 deletions

diff --git a/src/minigui.cpp b/src/minigui.cpp
index c763715..0837d57 100644
--- a/src/minigui.cpp
+++ b/src/minigui.cpp
@@ -25,6 +25,7 @@
 #include "helper.h"
 #include "desktopinfo.h"
 #include "editabletoolbar.h"
+#include "images.h"
 #include <QStatusBar>
 #include <QMenu>
 
@@ -53,6 +54,10 @@ MiniGui::MiniGui( QWidget * parent, Qt::WindowFlags flags )
 	if (pref->compact_mode) {
 		controlwidget->hide();
 	}
+
+#if ALLOW_CHANGE_STYLESHEET
+	changeStyleSheet(pref->iconset);
+#endif
 }
 
 MiniGui::~MiniGui() {
@@ -70,11 +75,16 @@ QMenu * MiniGui::createPopupMenu() {
 
 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
 
 	time_label_action = new TimeLabelAction(this);
@@ -124,6 +134,7 @@ void MiniGui::createFloatingControl() {
 
 	EditableToolbar * iw = new EditableToolbar(floating_control);
 	iw->setObjectName("floating_control");
+	connect(iw, SIGNAL(iconSizeChanged(const QSize &)), this, SLOT(adjustFloatingControlSize()));
 
 #if USE_CONFIGURABLE_TOOLBARS
 	QStringList floatingcontrol_actions;
@@ -159,6 +170,9 @@ void MiniGui::createFloatingControl() {
 void MiniGui::retranslateStrings() {
 	BaseGuiPlus::retranslateStrings();
 
+	// Change the icon of the play/pause action
+	playOrPauseAct->setIcon(Images::icon("play"));
+
 	controlwidget->setWindowTitle( tr("Control bar") );
 
 #if USE_CONFIGURABLE_TOOLBARS
@@ -187,6 +201,17 @@ void MiniGui::disableActionsOnStop() {
 }
 #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() {
 	BaseGuiPlus::aboutToEnterFullscreen();
 
@@ -234,6 +259,16 @@ QSize MiniGui::minimumSizeHint() const {
 }
 #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() {
 	QSettings * set = settings;
@@ -255,6 +290,11 @@ void MiniGui::saveConfig() {
 	EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget());
 	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
 
 	set->endGroup();
@@ -289,8 +329,14 @@ void MiniGui::loadConfig() {
 	controlwidget->setActionsFromStringList( set->value("controlwidget", controlwidget->defaultActions()).toStringList() );
 	EditableToolbar * iw = static_cast<EditableToolbar *>(floating_control->internalWidget());
 	iw->setActionsFromStringList( set->value("floating_control", iw->defaultActions()).toStringList() );
-	floating_control->adjustSize();
 	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();
 #endif
 
 	restoreState( set->value( "toolbars_state" ).toByteArray(), Helper::qtVersion() );