Changeset 181 for smplayer/trunk/src/widgetactions.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/widgetactions.cpp (modified) (5 diffs)

smplayer/trunk/src/widgetactions.cpp

@@ -19 +19 @@
 #include "widgetactions.h"
 #include "colorutils.h"
+#include "helper.h"
 #include <QLabel>
 #include <QDebug>
@@ -47 +48 @@
         QList<QWidget *> l = createdWidgets();
         for (int n=0; n < l.count(); n++) {
-                TimeSlider *s = (TimeSlider*) l[n];
-                s->setEnabled(b);;
+                l[n]->setEnabled(b);
         }
         setEnabled(b);
@@ -204 +204 @@
 
 
-TimeLabelAction::TimeLabelAction( QWidget * parent )
+TimeLabelAction::TimeLabelAction(TimeLabelType type, QWidget * parent )
         : MyWidgetAction(parent)
 {
+        label_type = type;
+        current_time = 0;
+        total_time = 0;
+        updateText();
 }
 
@@ -212 +216 @@
 }
 
+void TimeLabelAction::setCurrentTime(double t) {
+        current_time = t;
+        updateText();
+}
+
+void TimeLabelAction::setTotalTime(double t) {
+        total_time = t;
+        updateText();
+}
+
+void TimeLabelAction::updateText() {
+        QString ct = Helper::formatTime(current_time);
+        QString tt = Helper::formatTime(total_time);
+        QString rt;
+        if (total_time < 1) rt = "00:00:00"; else rt = "-" + Helper::formatTime(total_time - current_time);
+
+        switch (label_type) {
+                case CurrentTime: setText(ct); break;
+                case TotalTime: setText(tt); break;
+                case CurrentAndTotalTime: setText(ct + " / " + tt); break;
+                case RemainingTime: setText(rt); break;
+        }
+}
+
 void TimeLabelAction::setText(QString s) {
-        _text = s;
+        current_text = s;
         emit newText(s);
 }
@@ -220 +248 @@
         QLabel * time_label = new QLabel(parent);
         time_label->setObjectName("time_label");
-    time_label->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
-    time_label->setAutoFillBackground(true);
-
-    ColorUtils::setBackgroundColor( time_label, QColor(0,0,0) );
-    ColorUtils::setForegroundColor( time_label, QColor(255,255,255) );
-    time_label->setText( "00:00:00 / 00:00:00" );
-    time_label->setFrameShape( QFrame::Panel );
-    time_label->setFrameShadow( QFrame::Sunken );
+        time_label->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+        //time_label->setAutoFillBackground(true);
+
+        //ColorUtils::setBackgroundColor( time_label, QColor(0,0,0) );
+        //ColorUtils::setForegroundColor( time_label, QColor(255,255,255) );
+
+        if (current_text.isEmpty()) current_text = "00:00:00 / 00:00:00";
+        time_label->setText(current_text);
+
+        //time_label->setFrameShape( QFrame::Panel );
+        //time_label->setFrameShadow( QFrame::Sunken );
 
         connect( this, SIGNAL(newText(QString)),