Showing currently playing episode again in cover

badvoltage · Jun 15, 2014 · 5f06040 · 5f06040
1 parent 08ac711
commit 5f06040
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 14 deletions.
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
@@ -31,25 +31,54 @@ CoverBackground {
         icon.source: "BadVoltageW.png"
     }
 
+    Timer {
+        id: updatingTimer
+        interval: 1500
+    }
+
+    Connections {
+        target: updatingLabel
+        onVisibleChanged: if (updatingLabel.visible === false) updatingTimer.restart()
+    }
+
     Column {
         y: 175
-        width: parent.width
+        x: Theme.paddingSmall
+        width: parent.width - Theme.paddingSmall
         spacing: Theme.paddingSmall
 
         Label {
             id: updatingLabel
-            //opacity: feedModel.progress !== 1 ? 1 : 0
+            visible: feedModel.progress !== 1
             anchors.horizontalCenter: parent.horizontalCenter
+            truncationMode: TruncationMode.Fade
             //: While updating feed
-            text: feedModel.progress !== 1 ? qsTr("Updating...") :
-                                             //: Number of unseen episodes
-                                             (nUnSeen === 0 ? qsTr("No") : nUnSeen) + " " + qsTr("new Episode") + (nUnSeen > 1 ? qsTr("s") : qsTr(""))
+            text: qsTr("Updating...")
+        }
+
+        Label {
+            id: playingLabel
+            visible: !updatingLabel.visible && !player.stopped && !updatingTimer.running
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: parent.width
+            truncationMode: TruncationMode.Fade
+            text: getPrettyNumber(player.season, player.episode) + ": " + settings.value("content/" + player.season + "/" + player.episode + "/title")
+        }
+
+        Label {
+            id: newEpisodesLabel
+            visible: !updatingLabel.visible && !playingLabel.visible
+            anchors.horizontalCenter: parent.horizontalCenter
+            truncationMode: TruncationMode.Fade
+            //: Number of unseen episodes
+            text: (nUnSeen === 0 ? qsTr("No") : nUnSeen) + " " + qsTr("unseen Episode") + (nUnSeen > 1 ? qsTr("s") : qsTr(""))
         }
 
         Label {
             id: audioPositionLabel
-            opacity: !player.stopped ? 1 : 0
+            visible: !player.stopped
             anchors.horizontalCenter: parent.horizontalCenter
+            truncationMode: TruncationMode.Fade
             text: getTimeFromMs(player.position) + "/" + getTimeFromMs(player.duration)
         }
     }

diff --git a/rpm/harbour-badvoltage.changes b/rpm/harbour-badvoltage.changes
@@ -8,6 +8,9 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes
 
+* Sun Jun 15 2014 Scharel Clemens <scharelc@gmail.com> 0.2-3
+- Showing currently playing episode again in cover
+
 * Sat Jun 14 2014 Scharel Clemens <scharelc@gmail.com> 0.2-2
 - New design for cover
 

diff --git a/rpm/harbour-badvoltage.spec b/rpm/harbour-badvoltage.spec
@@ -15,7 +15,7 @@ Name:       harbour-badvoltage
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Bad Voltage
 Version:    0.2
-Release:    2
+Release:    3
 Group:      Applications/Internet
 License:    GNU General Public License
 URL:        https://github.com/scharel/harbour-badvoltage

diff --git a/rpm/harbour-badvoltage.yaml b/rpm/harbour-badvoltage.yaml
@@ -1,7 +1,7 @@
 Name: harbour-badvoltage
 Summary: Bad Voltage
 Version: 0.2
-Release: 2
+Release: 3
 # The contents of the Group field must be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
 Group: Applications/Internet

diff --git a/src/Settings.h b/src/Settings.h
@@ -51,7 +51,7 @@ class Settings : public QObject {
         _settings->beginGroup("app");
         _settings->setValue("url", "http://scharel.github.io/harbour-badvoltage");
         _settings->setValue("gitUrl", "https://github.com/scharel/harbour-badvoltage");
-        _settings->setValue("version", "0.2-2");
+        _settings->setValue("version", "0.2-3");
         _settings->setValue("agent", QString("Bad Voltage for SailfishOS - ").append(_settings->value("version").toString()));
         _settings->endGroup();
     }

diff --git a/translations/harbour-badvoltage-de.ts b/translations/harbour-badvoltage-de.ts
@@ -38,7 +38,7 @@
     </message>
     <message>
         <source>new Episode</source>
-        <translation>neue Folge</translation>
+        <translation type="obsolete">neue Folge</translation>
     </message>
     <message>
         <source>s</source>
@@ -48,6 +48,10 @@
         <source></source>
         <translation></translation>
     </message>
+    <message>
+        <source>unseen Episode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EpisodePage</name>

diff --git a/translations/harbour-badvoltage.ts b/translations/harbour-badvoltage.ts
@@ -34,10 +34,6 @@
         <extracomment>Number of unseen episodes</extracomment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>new Episode</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
@@ -46,6 +42,10 @@
         <source></source>
         <translation></translation>
     </message>
+    <message>
+        <source>unseen Episode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EpisodePage</name>