|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/black-sheep-dev/harbour-audiothek.git</param>
<param name="branch"></param>
- <param name="revision">0.1.0-2</param>
+ <param name="revision">0.1.1-1</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek-0.1.1.tar.bz2/qml/global.qml
^
|
| @@ -2,7 +2,8 @@
import QtQuick 2.0
Item {
- readonly property string appVersion: "0.1.0"
+ readonly property string appId: "harbour-audiothek"
+ readonly property string appVersion: "0.1.1"
function applyDataToImageLink(link, ratio, width) {
if (link === undefined) return ""
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek-0.1.1.tar.bz2/qml/harbour-audiothek.qml
^
|
| @@ -17,6 +17,7 @@
property int keptItemsCount: 5
property int paginationCount: 20
property int playbackMode: 0
+ property int shareMode: 0
// property string lastPlaylist
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek-0.1.1.tar.bz2/qml/pages/AboutPage.qml
^
|
| @@ -4,8 +4,6 @@
import "../."
Page {
- readonly property string appId: "harbour-audiothek"
-
id: page
allowedOrientations: Orientation.All
@@ -26,7 +24,7 @@
Image {
id: logo
- source: "/usr/share/" + appId + "/icons/" + appId + ".svg"
+ source: "/usr/share/" + Global.appId + "/icons/" + Global.appId + ".svg"
smooth: true
sourceSize.width: parent.width / 2
sourceSize.height: parent.width / 2
@@ -80,7 +78,7 @@
anchors.verticalCenter: parent.verticalCenter
width: parent.height * 0.8
height: width
- source: "/usr/share/" + appId + "/icons/mastodon.svg"
+ source: "/usr/share/" + Global.appId + "/icons/mastodon.svg"
}
Label{
@@ -115,7 +113,7 @@
anchors.verticalCenter: parent.verticalCenter
width: parent.height * 0.8
height: width
- source: "/usr/share/" + appId + "/icons/mastodon.svg"
+ source: "/usr/share/" + Global.appId + "/icons/mastodon.svg"
}
Label{
@@ -154,7 +152,7 @@
anchors.verticalCenter: parent.verticalCenter
width: parent.height * 0.8
height: width
- source: "/usr/share/" + appId + "/icons/github.svg"
+ source: "/usr/share/" + Global.appId + "/icons/github.svg"
}
Label{
@@ -163,12 +161,12 @@
wrapMode: Text.WrapAnywhere
font.pixelSize: Theme.fontSizeSmall
- text: "https://github.com/black-sheep-dev/" + appId
+ text: "https://github.com/black-sheep-dev/" + Global.appId
color: parent.parent.pressed ? Theme.highlightColor : Theme.primaryColor
}
}
- onClicked: Qt.openUrlExternally("https://github.com/black-sheep-dev/" + appId)
+ onClicked: Qt.openUrlExternally("https://github.com/black-sheep-dev/" + Global.appId)
}
SectionHeader{
@@ -202,7 +200,7 @@
width: parent.height * 0.8
height: width
fillMode: Image.PreserveAspectFit
- source: "/usr/share/" + appId + "/icons/paypal.svg"
+ source: "/usr/share/" + Global.appId + "/icons/paypal.svg"
}
Label{
width: parent.width - parent.height - parent.spacing
@@ -233,7 +231,7 @@
width: parent.height * 0.8
height: width
fillMode: Image.PreserveAspectFit
- source: "/usr/share/" + appId + "/icons/liberpay.svg"
+ source: "/usr/share/" + Global.appId + "/icons/liberpay.svg"
}
Label{
width: parent.width - parent.height - parent.spacing
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek-0.1.1.tar.bz2/qml/pages/CollectionDetailsPage.qml
^
|
| @@ -46,7 +46,7 @@
//% "Share"
text: qsTrId("id-share")
onClicked: {
- Clipboard.text = playlistModel.content["shareUrl"]
+ Clipboard.text = playlistModel.content["sharingUrl"]
//% "Link copied to clipboard"
notification.show(qsTrId("id-copied-to-clipboard"))
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek-0.1.1.tar.bz2/qml/pages/PodcastDetailsPage.qml
^
|
| @@ -65,9 +65,14 @@
//% "Share"
text: qsTrId("id-share")
onClicked: {
- Clipboard.text = content["shareUrl"]
+ if (settings.shareMode === 0) {
+ Clipboard.text = content["sharingUrl"]
+ } else {
+ Clipboard.text = content["audios"][0]["url"]
+ }
//% "Link copied to clipboard"
notification.show(qsTrId("id-copied-to-clipboard"))
+
}
}
MenuItem {
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek-0.1.1.tar.bz2/qml/pages/SettingsPage.qml
^
|
| @@ -47,6 +47,36 @@
onClicked: remorse.execute(qsTrId("id-reset-database"), DB.reset())
}
+ SectionHeader {
+ //% "Share"
+ text: qsTrId("Share")
+ }
+
+ Label {
+ x: Theme.horizontalPageMargin
+ width: parent.width - 2*x
+ color: Theme.highlightColor
+ wrapMode: Text.Wrap
+ //% "You can decide whether you want to share the page or the actual podcast url."
+ text: qsTrId("id-settings-share-desc")
+ }
+
+ ComboBox {
+ //% "Share mode"
+ label: qsTrId("id-share-mode")
+
+ menu: ContextMenu {
+ //% "Page"
+ MenuItem { text: qsTrId("id-page") }
+ //% "Podcast"
+ MenuItem { text: qsTrId("id-podcast") }
+ }
+
+ onCurrentIndexChanged: settings.shareMode = currentIndex
+
+ Component.onCompleted: currentIndex = settings.shareMode
+ }
+
// SectionHeader {
// //% "Player"
// text: qsTrId("id-player")
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek-0.1.1.tar.bz2/translations/harbour-audiothek-de.ts
^
|
| @@ -220,6 +220,26 @@
<source>Type in a search pattern to find content</source>
<translation>Gib einen Suchbegriff ein um Inhalte zu finden</translation>
</message>
+ <message id="Share">
+ <source>Share</source>
+ <translation>Teilen</translation>
+ </message>
+ <message id="id-settings-share-desc">
+ <source>You can decide whether you want to share the page or the actual podcast url.</source>
+ <translation>Du kannst entscheiden, ob du die Seite oder den eigentlichen Podcast teilen möchstes.</translation>
+ </message>
+ <message id="id-share-mode">
+ <source>Share mode</source>
+ <translation>Tielen Modus</translation>
+ </message>
+ <message id="id-page">
+ <source>Page</source>
+ <translation>Seite</translation>
+ </message>
+ <message id="id-podcast">
+ <source>Podcast</source>
+ <translation>Podcast</translation>
+ </message>
</context>
<context>
<name>CoverPage</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek-0.1.1.tar.bz2/translations/harbour-audiothek.ts
^
|
| @@ -278,6 +278,26 @@
<source>Type in a search pattern to find content</source>
<translation>Type in a search pattern to find content</translation>
</message>
+ <message id="Share">
+ <source>Share</source>
+ <translation>Share</translation>
+ </message>
+ <message id="id-settings-share-desc">
+ <source>You can decide whether you want to share the page or the actual podcast url.</source>
+ <translation>You can decide whether you want to share the page or the actual podcast url.</translation>
+ </message>
+ <message id="id-share-mode">
+ <source>Share mode</source>
+ <translation>Share mode</translation>
+ </message>
+ <message id="id-page">
+ <source>Page</source>
+ <translation>Page</translation>
+ </message>
+ <message id="id-podcast">
+ <source>Podcast</source>
+ <translation>Podcast</translation>
+ </message>
</context>
<context>
<name>SearchPage</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-audiothek.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-audiothek
Summary: Audiothek
-Version: 0.1.0
+Version: 0.1.1
Release: 1
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
|
