Merge pull request #114 from Keeper-of-the-Keys/ui-bugfixes

Ui bugfixes
gpodder · Mar 4, 2020 · 9e0c71b · 9e0c71b
2 parents 5bb084b + de172c7
commit 9e0c71b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/gpodder-core b/gpodder-core
diff --git a/gpodder-ui-qml b/gpodder-ui-qml
diff --git a/qml/AboutPage.qml b/qml/AboutPage.qml
@@ -73,7 +73,7 @@ Page {
                     width: parent.width
                     wrapMode: Text.WordWrap
                     text: [
-                        '© 2005-2019 '+ qsTr("Thomas Perl and the gPodder Team"),
+                        '© 2005-2020 '+ qsTr("Thomas Perl and the gPodder Team"),
                         qsTr("License: ISC / GPLv3 or later"),
                         qsTr("Website: ") + 'http://gpodder.org/',
                         '',

diff --git a/qml/EpisodeItem.qml b/qml/EpisodeItem.qml
@@ -177,7 +177,7 @@ ListItem {
         }
 
         Label {
-            text: total_time > 0 ? Util.formatDuration(total_time) + ' | ' + subtitle : subtitle
+            text: total_time > 0 ? (subtitle != '' ? Util.formatDuration(total_time) + ' | ' + subtitle : Util.formatDuration(total_time)) : subtitle
             anchors {
                 left: titleItem.left
                 right: titleItem.right

diff --git a/qml/PodcastsPage.qml b/qml/PodcastsPage.qml
@@ -88,7 +88,7 @@ Page {
         }
 
         ViewPlaceholder {
-            enabled: podcastListModel.count == 0 && py.ready
+            enabled: podcastListModel.count === 0 && podcastListModel.firstRun
             text: qsTr("No subscriptions")
         }
     }

diff --git a/rpm/harbour-org.gpodder.sailfish.spec b/rpm/harbour-org.gpodder.sailfish.spec
@@ -8,7 +8,7 @@
 
 Summary:    Media and podcast aggregator
 Name:       harbour-org.gpodder.sailfish
-Version:    4.9.0
+Version:    4.10.0
 Release:    1
 Group:      System/GUI/Other
 License:    ISC / GPLv3
+1 −1		LICENSE.ISC
+1 −1		README
+1 −1		bin/gpo
+1 −1		makefile
+1 −1		setup.py
+1 −1		share/man/man1/gpo.1
+5 −5		src/gpodder/__init__.py
+1 −1		src/gpodder/config.py
+1 −1		src/gpodder/download.py
+1 −1		src/gpodder/model.py
+1 −1		src/gpodder/plugins/itunes.py
+14 −3		src/gpodder/plugins/soundcloud.py
+1 −1		src/gpodder/plugins/youtube.py
+1 −1		src/gpodder/util.py
+4 −0		common/GPodderPodcastListModel.qml
+1 −1		main.py
+1 −1		makefile