Merge pull request #1 from gpodder/master

update
gpodder · Oct 30, 2019 · c23ee1b · c23ee1b
2 parents 40d32c4 + ec7fc02
commit c23ee1b
Show file tree

Hide file tree

Showing 23 changed files with 1,292 additions and 180 deletions.
diff --git a/gpodder-core b/gpodder-core
diff --git a/gpodder-sailfish.pro b/gpodder-sailfish.pro
@@ -47,7 +47,9 @@ TRANSLATIONS += \
     translations/harbour-org.gpodder.sailfish-es.ts \
     translations/harbour-org.gpodder.sailfish-de.ts \
     translations/harbour-org.gpodder.sailfish-bg.ts \
-    translations/harbour-org.gpodder.sailfish.ts \
+    translations/harbour-org.gpodder.sailfish-it.ts \
+    translations/harbour-org.gpodder.sailfish-zh_CN.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/icons/172x172/apps/harbour-org.gpodder.sailfish.png b/icons/172x172/apps/harbour-org.gpodder.sailfish.png
diff --git a/qml/AboutPage.qml b/qml/AboutPage.qml
@@ -73,7 +73,7 @@ Page {
                     width: parent.width
                     wrapMode: Text.WordWrap
                     text: [
-                        '© 2005-2014 '+ qsTr("Thomas Perl and the gPodder Team"),
+                        '© 2005-2019 '+ qsTr("Thomas Perl and the gPodder Team"),
                         qsTr("License: ISC / GPLv3 or later"),
                         qsTr("Website: ") + 'http://gpodder.org/',
                         '',

diff --git a/qml/CoverContainer.qml b/qml/CoverContainer.qml
@@ -65,7 +65,20 @@ CoverBackground {
         }
 
         CoverAction {
-            iconSource: 'image://theme/icon-cover-refresh'
+            iconSource: 'image://theme/icon-cover-sync'
+            onTriggered: {
+                if (!py.refreshing) {
+                    py.call('main.check_for_episodes');
+                }
+            }
+        }
+    }
+
+    CoverActionList {
+        enabled: player.episode == 0 && !player.isPlaying
+
+        CoverAction {
+            iconSource: 'image://theme/icon-cover-sync'
             onTriggered: {
                 if (!py.refreshing) {
                     py.call('main.check_for_episodes');

diff --git a/qml/DirectoryDialog.qml b/qml/DirectoryDialog.qml
@@ -42,7 +42,7 @@ Dialog {
 
         DialogHeader {
             title: directory.provider
-            acceptText: 'Search'
+            acceptText: qsTr("Search")
         }
 
         TextField {

diff --git a/qml/EpisodeItem.qml b/qml/EpisodeItem.qml
@@ -62,7 +62,7 @@ ListItem {
         opacity: .5
     }
 
-    onClicked: showMenu()
+    onClicked: openMenu()
 
     menu: Component {
         IconContextMenu {
@@ -83,7 +83,7 @@ ListItem {
                 icon.source: 'image://theme/icon-m-download'
                 visible: downloadState != Constants.state.downloaded
                 onClicked: {
-                    episodeItem.hideMenu();
+                    episodeItem.closeMenu();
                     py.call('main.download_episode', [id]);
                 }
             }
@@ -97,7 +97,7 @@ ListItem {
 								player.jumpToQueueIndex(0);
 						}
 					});
-					episodeItem.hideMenu();
+                    episodeItem.closeMenu();
                 }
 			}
 
@@ -106,7 +106,7 @@ ListItem {
                 icon.source: 'image://theme/icon-m-delete'
                 visible: downloadState != Constants.state.deleted
                 onClicked: {
-                    episodeItem.hideMenu();
+                    episodeItem.closeMenu();
                     var ctx = { py: py, id: id };
                     episodeItem.remorseAction(qsTr("Deleting"), function () {
                         ctx.py.call('main.delete_episode', [ctx.id]);
@@ -123,9 +123,9 @@ ListItem {
 
             IconMenuItem {
                 text: qsTr("Shownotes")
-                icon.source: 'image://theme/icon-m-message'
+                icon.source: 'image://theme/icon-m-about'
                 onClicked: {
-                    episodeItem.hideMenu();
+                    episodeItem.closeMenu();
                     pgst.loadPage('EpisodeDetail.qml', {episode_id: id, title: title});
                 }
             }

diff --git a/qml/EpisodesPage.qml b/qml/EpisodesPage.qml
@@ -73,6 +73,18 @@ Page {
         GPodderEpisodeListModelConnections {}
 
         PullDownMenu {
+            MenuItem {
+                text: qsTr("Unsubscribe")
+                onClicked: {
+                    remorse.execute("Unsubscribing", function() {
+                        py.call('main.unsubscribe', [episodesPage.podcast_id]);
+                        if (pageStack.currentPage == episodesPage) {
+                            pageStack.pop();
+                        }
+                    })
+                }
+            }
+
             MenuItem {
                 text: qsTr("Mark episodes as old")
                 onClicked: {
@@ -95,18 +107,6 @@ Page {
                 }
             }
 
-            MenuItem {
-                text: qsTr("Unsubscribe")
-                onClicked: {
-                    remorse.execute("Unsubscribing", function() {
-                        py.call('main.unsubscribe', [episodesPage.podcast_id]);
-                        if (pageStack.currentPage == episodesPage) {
-                            pageStack.pop();
-                        }
-                    })
-                }
-            }
-
             EpisodeListFilterItem { model: episodeListModel }
         }
 

diff --git a/qml/ImportOPML.qml b/qml/ImportOPML.qml
@@ -0,0 +1,88 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import Sailfish.Pickers 1.0
+
+import 'common'
+
+Dialog {
+    id: importOPML
+    allowedOrientations: Orientation.All
+
+    property string selectedFile: "None"
+    property string opmlAction: "Import"
+
+    canAccept: {
+        (opmlAction == 'Import' && selectedFile != "None") || (opmlAction == 'Export' && exportFile.text != '')
+    }
+    onAccepted: {
+        focus = false
+        if (opmlAction == 'Import') {
+            py.call('main.import_opml', [importOPML.selectedFile])
+        } else {
+            if(exportFile.text.charAt(0) != '/') {
+                exportFile.text = StandardPaths.home + '/' + exportFile.text
+            }
+
+            py.call('main.export_opml', [exportFile.text])
+        }
+    }
+
+    Column {
+        anchors.fill: parent
+
+        DialogHeader {
+            title: opmlAction == "Import" ? qsTr("Import OPML File") : qsTr('Export OPML File')
+            acceptText: opmlAction == "Import" ? qsTr("Import") : qsTr('Export')
+        }
+
+        ComboBox {
+            label: "OPML"
+
+            menu: ContextMenu {
+                MenuItem {
+                    text: qsTr("Import")
+                    onClicked: opmlAction = "Import"
+                }
+                MenuItem {
+                    text: qsTr("Export")
+                    onClicked: opmlAction = "Export"
+                }
+            }
+        }
+
+
+        ValueButton {
+            id: importFile
+            label: qsTr("Import File")
+            value: selectedFile
+            onClicked: pageStack.push(filePickerPage)
+            visible: opmlAction == "Import" ? true : false
+        }
+
+        TextField {
+            id: exportFile
+            label: 'Filename'
+            placeholderText: qsTr('Enter filname')
+            visible: opmlAction == 'Export' ? true : false
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            EnterKey.enabled: text.length > 0
+            EnterKey.iconSource: "image://theme/icon-m-enter-close"
+            EnterKey.onClicked: importOPML.accept()
+        }
+    }
+
+    Component {
+        id: filePickerPage
+        FilePickerPage {
+            nameFilters: [ '*.opml' , '*.opml' ]
+            onSelectedContentPropertiesChanged: {
+                importOPML.selectedFile = selectedContentProperties.filePath
+            }
+        }
+    }
+}
+
diff --git a/qml/MprisPlayer.qml b/qml/MprisPlayer.qml
@@ -9,16 +9,22 @@ MprisPlayer {
 
     serviceName: "gpodder"
 
-    property string title: streamTitle
+    property string artist
+    property string song
 
-    onTitleChanged: {
-        if (title != "") {
-            var metadata = mprisPlayer.metadata
-            metadata[Mpris.metadataToString(Mpris.Title)] = title
-            mprisPlayer.metadata = metadata
-        }
+    onArtistChanged: {
+        var metadata = mprisPlayer.metadata
+        metadata[Mpris.metadataToString(Mpris.Artist)] = artist // Podcast Title
+        mprisPlayer.metadata = metadata
     }
 
+    onSongChanged: {
+        var metadata = mprisPlayer.metadata
+        metadata[Mpris.metadataToString(Mpris.Title)] = song // Episode Title
+        mprisPlayer.metadata = metadata
+    }
+
+
     // Mpris2 Root Interface
     identity: "Mpris gpodder-sailfish"
 
@@ -40,8 +46,10 @@ MprisPlayer {
         else if (player.playbackState == MediaPlayer.PausedState) return Mpris.Paused
         else return Mpris.Stopped
     }
+
     onPlaybackStatusChanged: {
-        title = player.episode_title
+        song = player.episode_title
+        artist = player.podcast_title
     }
 
     onPauseRequested: {
@@ -64,4 +72,4 @@ MprisPlayer {
         player.seekAndSync(player.position - 1000 * 10)
     }
 
-}
+}
+1 −2		.travis.yml
+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
+56 −28		src/gpodder/plugins/soundcloud.py
+1 −1		src/gpodder/plugins/youtube.py
+1 −1		src/gpodder/util.py
+2 −0		common/GPodderPlayback.qml
+11 −1		main.py
+1 −1		makefile