Merge pull request #15 from gpodder/master

Updated from original project
gpodder · Dec 10, 2019 · e862287 · e862287
2 parents e710afa + 41b021d
commit e862287
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/gpodder-core b/gpodder-core
diff --git a/gpodder-sailfish.pro b/gpodder-sailfish.pro
@@ -50,6 +50,7 @@ TRANSLATIONS += \
     translations/harbour-org.gpodder.sailfish-it.ts \
     translations/harbour-org.gpodder.sailfish-zh_CN.ts \
     translations/harbour-org.gpodder.sailfish-sv.ts \
+    translations/harbour-org.gpodder.sailfish-pl.ts \
     translations/harbour-org.gpodder.sailfish.ts
 
 TRANSLATION_SOURCES += /$$_PRO_FILE_PWD_/gpodder-ui-qml/common/

diff --git a/gpodder-ui-qml b/gpodder-ui-qml
diff --git a/qml/EpisodeItem.qml b/qml/EpisodeItem.qml
@@ -177,14 +177,14 @@ ListItem {
         }
 
         Label {
-            text: subtitle
+            text: total_time > 0 ? Util.formatDuration(total_time) + ' | ' + subtitle : subtitle
             anchors {
                 left: titleItem.left
                 right: titleItem.right
             }
             truncationMode: TruncationMode.Fade
             opacity: titleItem.opacity
-            visible: subtitle !== ''
+            visible: this.text !== ''
             font.pixelSize: Theme.fontSizeExtraSmall
         }
     }

diff --git a/qml/PodcastDetail.qml b/qml/PodcastDetail.qml
@@ -187,10 +187,12 @@ Page {
         id: editPodcastPage
 
         Dialog {
+            id: sectionDialog
             canAccept: sectionFieldInput.text != podcastDetail.section
             onAccepted: {
                 py.call('main.change_section', [podcast_id, sectionFieldInput.text])
-                sectionField.text = sectionFieldInput.text
+                podcastDetail.section = sectionFieldInput.text
+                pageStack.pop()
             }
 
             Column {
@@ -208,6 +210,8 @@ Page {
                        left: parent.left
                        right: parent.right
                    }
+                   EnterKey.enabled: text.length > 0 && text != podcastDetail.section
+                   EnterKey.onClicked: sectionDialog.accept()
                 }
             }
         }

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.8.1
+Version:    4.9.0
 Release:    1
 Group:      System/GUI/Other
 License:    ISC / GPLv3

diff --git a/translations/harbour-org.gpodder.sailfish-bg.ts b/translations/harbour-org.gpodder.sailfish-bg.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="bg_BG">
+<TS version="2.1" language="bg_BG">
 <context>
     <name>AboutPage</name>
     <message>
+3 −3		src/gpodder/__init__.py
+29 −9		src/gpodder/plugins/soundcloud.py