Changeset 176 for smplayer/trunk/src/skingui/skingui.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/skingui/skingui.cpp (modified) (16 diffs)

smplayer/trunk/src/skingui/skingui.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
@@ -88 +88 @@
         statusBar()->hide();
 
-        changeStyleSheet(pref->iconset);
+        applyStyles();
         mediaBarPanel->setVolume(50);
 }
@@ -94 +94 @@
 SkinGui::~SkinGui() {
         saveConfig();
-}
-
-void SkinGui::changeStyleSheet(QString style) {
-        if (style.isEmpty())  {
-                qApp->setStyleSheet("");
-        } 
-        else {
-                QString qss = Images::styleSheet();
-#ifdef USE_RESOURCES
-                Images::setTheme(pref->iconset);
-                QString path = ":/" + pref->iconset;
-#else
-                QDir current = QDir::current();
-                QString td = Images::themesDirectory();
-                QString path = current.relativeFilePath(td);
-#endif
-                qss.replace(QRegExp("url\\s*\\(\\s*([^\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2),
-                                                        QString("url(%1\\1)").arg(path + "/"));
-                //qDebug("SkinGui::changeStyleSheet: qss: %s", qss.toLatin1().constData());
-                qApp->setStyleSheet(qss);
-        }
 }
 
@@ -153 +132 @@
         viewVideoInfoAct = new MyAction(this, "toggle_video_info_skingui" );
         viewVideoInfoAct->setCheckable(true);
+
+        scrollTitleAct = new MyAction(this, "toggle_scroll_title_skingui" );
+        scrollTitleAct->setCheckable(true);
 }
 
@@ -171 +153 @@
         volumeslider_action->disable();
 }
+#endif // AUTODISABLE_ACTIONS
 
 void SkinGui::togglePlayAction(Core::State state) {
@@ -183 +166 @@
         }
 }
-#endif // AUTODISABLE_ACTIONS
 
 void SkinGui::createMenus() {
@@ -206 +188 @@
         statusbar_menu = new QMenu(this);
         statusbar_menu->addAction(viewVideoInfoAct);
+        statusbar_menu->addAction(scrollTitleAct);
         optionsMenu->addMenu(statusbar_menu);
 }
@@ -226 +209 @@
         toolbar1->setObjectName("toolbar");
         toolbar1->setMovable(false);
-        toolbar1->setFixedHeight(35);
+        //toolbar1->setFixedHeight(35);
         addToolBar(Qt::TopToolBarArea, toolbar1);
 #if USE_CONFIGURABLE_TOOLBARS
@@ -317 +300 @@
              mediaBarPanel, SLOT(setResolutionVisible(bool)) );
 
+        connect( scrollTitleAct, SIGNAL(toggled(bool)),
+             mediaBarPanel, SLOT(setScrollingEnabled(bool)) );
+
         mediaBarPanelAction = controlwidget->addWidget(mediaBarPanel);
 }
@@ -420 +406 @@
 
         viewVideoInfoAct->change(Images::icon("view_video_info"), tr("&Video info") );
+        scrollTitleAct->change(Images::icon("scroll_title"), tr("&Scroll title") );
 }
 
@@ -430 +417 @@
 
         switch (state) {
-                case Core::Playing:             mediaBarPanel->displayMessage( tr("Playing %1").arg(core->mdat.filename)); break;
+                //case Core::Playing:           mediaBarPanel->displayMessage( tr("Playing %1").arg(core->mdat.filename)); break;
+                case Core::Playing:             mediaBarPanel->displayMessage( tr("Playing") ); break;
                 case Core::Paused:              mediaBarPanel->displayMessage( tr("Pause") ); break;
                 case Core::Stopped:             mediaBarPanel->displayMessage( tr("Stop") ); break;
+                case Core::Buffering:   /* mediaBarPanel->displayMessage( tr("Buffering...") ); */ break;
         }
 }
@@ -480 +469 @@
         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()));
 
 
@@ -540 +529 @@
 
         set->setValue("video_info", viewVideoInfoAct->isChecked());
+        set->setValue("scroll_title", scrollTitleAct->isChecked());
 
         set->setValue("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible);
@@ -562 +552 @@
         set->setValue("toolbar1_version", TOOLBAR_VERSION);
         set->endGroup();
+
+        set->beginGroup("toolbars_icon_size");
+        set->setValue("toolbar1", toolbar1->iconSize());
+        #if defined(SKIN_EDITABLE_CONTROL)
+        set->setValue("floating_control", iw->iconSize());
+        #endif
+        set->endGroup();
 #endif
 
@@ -575 +572 @@
 
         viewVideoInfoAct->setChecked(set->value("video_info", false).toBool());
+        scrollTitleAct->setChecked(set->value("scroll_title", false).toBool());
 
         fullscreen_toolbar1_was_visible = set->value("fullscreen_toolbar1_was_visible", fullscreen_toolbar1_was_visible).toBool();
@@ -613 +611 @@
         #endif
         set->endGroup();
+
+        set->beginGroup("toolbars_icon_size");
+        toolbar1->setIconSize(set->value("toolbar1", toolbar1->iconSize()).toSize());
+        #if defined(SKIN_EDITABLE_CONTROL)
+        iw->setIconSize(set->value("floating_control", iw->iconSize()).toSize());
+        #endif
+        set->endGroup();
 #endif