Changeset 170 for smplayer/trunk/src/skingui

Timestamp:

Oct 9, 2014, 2:54:21 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: updated trunk to 14.9.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/skingui/mediabarpanel.cpp (modified) (1 diff)
• src/skingui/mediapanel.cpp (modified) (2 diffs)
• src/skingui/mediapanel.h (modified) (2 diffs)
• src/skingui/panelseeker.cpp (modified) (2 diffs)
• src/skingui/panelseeker.h (modified) (1 diff)
• src/skingui/skingui.cpp (modified) (1 diff)

smplayer/trunk/src/skingui/mediabarpanel.cpp

@@ -102 +102 @@
     connect(core, SIGNAL(mediaInfoChanged()), this, SLOT(updateMediaInfo()));
     connect(core, SIGNAL(buffering()), this, SLOT(setBuffering()));
+        connect(mediaPanel, SIGNAL(seekerWheelUp()), core, SLOT(wheelUp()));
+        connect(mediaPanel, SIGNAL(seekerWheelDown()), core, SLOT(wheelDown()));
 }
 

smplayer/trunk/src/skingui/mediapanel.cpp

@@ -55 +55 @@
         repeatButton = new MyButton(this);
         shuffleButton = new MyButton(this);
-        seeker = new PanelSeeker;
+        seeker = new PanelTimeSeeker;
         seeker->setObjectName("panel-seeker");
         seeker->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Ignored);
@@ -98 +98 @@
         connect(timer, SIGNAL(timeout()), this, SLOT(reverseStatus()));
         connect(seeker, SIGNAL(valueChanged(int)), this, SIGNAL(seekerChanged(int)));
+        connect(seeker, SIGNAL(wheelUp()), this, SIGNAL(seekerWheelUp()));
+        connect(seeker, SIGNAL(wheelDown()), this, SIGNAL(seekerWheelDown()));
 }
 

smplayer/trunk/src/skingui/mediapanel.h

@@ -104 +104 @@
     ScrollingLabel* mediaLabel;
     QLabel *resolutionLabel;
-    PanelSeeker* seeker;
+    PanelTimeSeeker* seeker;
     MyButton* repeatButton;
     MyButton* shuffleButton;
@@ -124 +124 @@
 signals:
         void seekerChanged(int);
+        void seekerWheelUp();
+        void seekerWheelDown();
 
 public:

smplayer/trunk/src/skingui/panelseeker.cpp

@@ -305 +305 @@
 void PanelSeeker::timerEvent(QTimerEvent *t)
 {
+    if (bufferingPix.width() < 1) return;
+
     if(!state.testFlag(Buffering))
     {
@@ -354 +356 @@
 }
 
+void PanelTimeSeeker::wheelEvent(QWheelEvent *e) {
+        qDebug("PanelTimeSeeker::wheelEvent: delta: %d", e->delta());
+        e->accept();
+
+        if (e->orientation() == Qt::Vertical) {
+                if (e->delta() >= 0)
+                        emit wheelUp();
+                else
+                        emit wheelDown();
+        } else {
+                qDebug("PanelTimeSeeker::wheelEvent: horizontal event received, doing nothing");
+        }
+}
+
 #include "moc_panelseeker.cpp"

smplayer/trunk/src/skingui/panelseeker.h

@@ -129 +129 @@
 Q_DECLARE_OPERATORS_FOR_FLAGS(PanelSeeker::States)
 
+
+class PanelTimeSeeker : public PanelSeeker {
+        Q_OBJECT
+
+signals:
+        void wheelUp();
+        void wheelDown();
+
+protected:
+    void wheelEvent(QWheelEvent *e);
+};
+
 #endif // PANELSEEKER_H

smplayer/trunk/src/skingui/skingui.cpp

@@ -102 +102 @@
         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 relativePath = current.relativeFilePath(td);
+                QString path = current.relativeFilePath(td);
+#endif
                 qss.replace(QRegExp("url\\s*\\(\\s*([^\\);]+)\\s*\\)", Qt::CaseSensitive, QRegExp::RegExp2),
-                                                        QString("url(%1\\1)").arg(relativePath + "/"));
-                //qDebug("qss: %s", qss.toLatin1().constData());
+                                                        QString("url(%1\\1)").arg(path + "/"));
+                //qDebug("SkinGui::changeStyleSheet: qss: %s", qss.toLatin1().constData());
                 qApp->setStyleSheet(qss);
         }