|
[-]
[+]
|
Added |
_service:tar_git:harbour-squeeze-remote.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/PawelSpoon/harbour-squeeze-remote.git</param>
<param name="branch">master</param>
- <param name="revision">v3.0.5</param>
+ <param name="revision">v3.1.0</param>
</service>
</services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/harbour-squeeze-remote.pro
^
|
| @@ -27,6 +27,7 @@
qml/common/PlayerRemoteJavascript.qml \
qml/common/PlayerRemotePython.qml \
qml/common/PlayerRemoteWorkerscript.qml \
+ qml/sailfishos/component/SqueezeItemDelegate.qml \
qml/sailfishos/cover/CoverPage.qml \
qml/sailfishos/pages/LibraryPage.qml \
qml/sailfishos/pages/PlayerPage.qml \
@@ -62,4 +63,4 @@
translations/harbour-squeeze-remote-es.ts \
translations/harbour-squeeze-remote-nl.ts \
translations/harbour-squeeze-remote-pl.ts \
- translations/harbour-squeeze-remote-zh_CN.ts
\ No newline at end of file
+ translations/harbour-squeeze-remote-zh_CN.ts
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/qml/common/AudioPlayerJavascript.qml
^
|
| @@ -32,6 +32,7 @@
Rectangle {
property bool started: false
+ property alias seekable: audio.seekable
Connections {
target: shared
|
|
[-]
[+]
|
Added |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/qml/sailfishos/component/SqueezeItemDelegate.qml
^
|
| @@ -0,0 +1,59 @@
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+ListItem {
+ property string thumbnail: ""
+ property string fullTitle: ""
+ property string _title: fullTitle.split("\n", 2)[0]
+ property string _description: fullTitle.split("\n", 2)[1] || ""
+
+ openMenuOnPressAndHold: false
+
+ width: parent.width
+ contentHeight: Theme.itemSizeMedium
+
+ Row {
+ spacing: Theme.paddingMedium
+ anchors {
+ fill: parent
+ leftMargin: Theme.horizontalPageMargin
+ rightMargin: Theme.horizontalPageMargin
+ }
+
+ Image {
+ id: image
+ source: thumbnail
+
+ smooth: true
+ fillMode: Image.PreserveAspectFit
+ cache: true
+
+ sourceSize.width: Theme.iconSizeLarge
+ sourceSize.height: Theme.iconSizeLarge
+ height: parent.height
+ width: height
+ }
+
+ Column {
+ height: parent.height
+ width: parent.width - x - parent.leftPadding
+
+ Label {
+ width: parent.width
+ truncationMode: TruncationMode.Fade
+ text: _title
+ }
+
+ Label {
+ width: parent.width
+ font.pixelSize: Theme.fontSizeExtraSmall
+ wrapMode: Label.WordWrap
+ maximumLineCount: 2
+ truncationMode: TruncationMode.Elide
+ color: Theme.secondaryColor
+ text: _description
+ visible: _description
+ }
+ }
+ }
+}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/qml/sailfishos/pages/LibraryPage.qml
^
|
| @@ -1,3 +1,5 @@
+
+
/* Squeezeui - Graphical user interface for Squeezebox players.
#
# Copyright (C) 2014 Frode Holmer <fholmer+squeezeui@gmail.com>
@@ -15,10 +17,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
import QtQuick 2.0
import Sailfish.Silica 1.0
-
+import "../component"
Page {
id: page
@@ -30,6 +31,7 @@
property bool jumpToHiglightLine: false
property bool isPlaylist: false
+
/*RemorsePopup { id: remorse }
Connections {
target: player
@@ -37,7 +39,6 @@
remorse.execute(player.popup);
}
}*/
-
ListModel {
id: menuModel
property bool menuReady: player.menuReady
@@ -65,17 +66,16 @@
if (windowtype === "grandparent") {
pageStack.pop();
}
- }
- else if (windowtype === "nowPlaying") {
+ } else if (windowtype === "nowPlaying") {
if (pageStack.depth === 2) {
pageStack.pop();
- }
- else {
+ } else {
pageStack.push(Qt.resolvedUrl("PlayerPage.qml"));
}
- }
- else if (windowtype === "refresh") {
- pageStack.replace(Qt.resolvedUrl("LibraryPage.qml"), { selectedMedia: player.media_go(selectedMedia, "go", "") });
+ } else if (windowtype === "refresh") {
+ pageStack.replace(Qt.resolvedUrl("LibraryPage.qml"), {
+ "selectedMedia": player.media_go(selectedMedia, "go", "")
+ });
}
}
@@ -85,15 +85,21 @@
model: menuModel
anchors {
fill: parent
- bottomMargin: 67
+ bottomMargin: playerName.height
}
+ spacing: Theme.paddingMedium
visible: ((parent.status === PageStatus.Active) && menuModel.menuReady)
header: PageHeader {
title: selectedMedia.name
}
+ ViewPlaceholder {
+ enabled: menuModel.menuReady && listView.count === 0
+ text: qsTr("No items found")
+ }
+
PullDownMenu {
MenuItem {
text: qsTr("Go back home")
@@ -102,20 +108,17 @@
pageStack.replaceAbove(null, Qt.resolvedUrl("PlayerPage.qml"));
}
}
- /*MenuItem {
- text: qsTr("Back")
- visible: (isPlaylist)
- onClicked: {
- pageStack.pop();
- }
- }*/
+
MenuItem {
text: qsTr("Select another player")
//visible: (!isPlaylist)
onClicked: {
- pageStack.push(Qt.resolvedUrl("LibraryPage.qml"), { selectedMedia: player.get_media_menu_settings() });
+ pageStack.push(Qt.resolvedUrl("LibraryPage.qml"), {
+ "selectedMedia": player.get_media_menu_settings()
+ });
}
}
+
MenuItem {
text: qsTr("Now playing")
//visible: (!isPlaylist)
@@ -123,49 +126,45 @@
pageStack.push(Qt.resolvedUrl("PlayerPage.qml"));
}
}
+
MenuItem {
text: qsTr("Playlist")
visible: (!isPlaylist)
onClicked: {
- pageStack.push(Qt.resolvedUrl("PlaylistPage.qml"), { selectedMedia: player.get_media_menu_playlist() });
+ pageStack.push(Qt.resolvedUrl("PlaylistPage.qml"), {
+ "selectedMedia": player.get_media_menu_playlist()
+ });
}
}
}
- delegate: ListItem {
+ delegate: SqueezeItemDelegate {
id: myDelegate
menu: contextMenu
- showMenuOnPressAndHold: false
- contentHeight: (model.media.name.indexOf("\n")>0)?(Theme.itemSizeMedium):(Theme.itemSizeSmall)
+ thumbnail: model.media.thumb
+ fullTitle: model.media.name
- Label {
- x: Theme.paddingLarge
- text: model.media.name
- anchors.verticalCenter: parent.verticalCenter
- color: ( (index === higlightLine) ? Theme.highlightColor : Theme.primaryColor)
- }
onPressAndHold: {
- myDelegate.showMenu({ newMedia: media });
+ myDelegate.openMenu({"newMedia": media});
}
+
onClicked: {
if (model.media.window === "") {
if (model.media.input !== "") {
- myDelegate.showMenu({ newMedia: media });
- // This is available in all editors.
- }
- else {
+ myDelegate.showMenu({"newMedia": media});
+ } else {
pageStack.push(Qt.resolvedUrl("LibraryPage.qml"), {
- selectedMedia: player.media_go(model.media, "go", "")});
+ "selectedMedia": player.media_go(model.media, "go", "")
+ });
}
- }
- else {
- player.media_go(model.media, "go", "")
+ } else {
+ player.media_go(model.media, "go", "");
goToWindow(model.media.window);
}
}
- }
+ }
- Component {
+ Component {
id: contextMenu
ContextMenu {
property var newMedia
@@ -175,22 +174,23 @@
}
TextField {
visible: newMedia.input !== ""
- id:inputtext
+ id: inputtext
width: parent.width
focus: true
placeholderText: qsTr("Type here...")
- Keys.onReturnPressed: pageStack.push(
- Qt.resolvedUrl("LibraryPage.qml"), {
- selectedMedia: player.media_go(newMedia, "go", text),
- selectedInputText: text});
+ Keys.onReturnPressed: pageStack.push(
+ Qt.resolvedUrl("LibraryPage.qml"), {
+ "selectedMedia": player.media_go(newMedia, "go", text),
+ "selectedInputText": text
+ });
}
MenuItem {
visible: newMedia.input !== ""
text: qsTr("OK")
- onClicked: pageStack.push(
- Qt.resolvedUrl("LibraryPage.qml"), {
- selectedMedia: player.media_go(newMedia, "go", inputtext.text),
- selectedInputText: inputtext.text});
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/translations/harbour-squeeze-remote-cs.ts
^
|
| @@ -4,7 +4,12 @@
<context>
<name>LibraryPage</name>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="99"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="100"/>
+ <source>No items found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="105"/>
<source>Go back home</source>
<translation>Jdi domu</translation>
</message>
@@ -14,22 +19,22 @@
<translation type="unfinished">Vyber jiny player</translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="120"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="123"/>
<source>Now playing</source>
<translation>Hraju</translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="127"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="131"/>
<source>Playlist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="174"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="173"/>
<source>Input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="181"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="180"/>
<source>Type here...</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/translations/harbour-squeeze-remote-de.ts
^
|
| @@ -4,7 +4,12 @@
<context>
<name>LibraryPage</name>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="99"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="100"/>
+ <source>No items found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="105"/>
<source>Go back home</source>
<translation>Geh haam</translation>
</message>
@@ -14,22 +19,22 @@
<translation>Player wechseln</translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="120"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="123"/>
<source>Now playing</source>
<translation>Player</translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="127"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="131"/>
<source>Playlist</source>
<translation>Wiedergabeliste</translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="174"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="173"/>
<source>Input</source>
<translation>Eingabe</translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="181"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="180"/>
<source>Type here...</source>
<translation>Hier tippen</translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/translations/harbour-squeeze-remote-es.ts
^
|
| @@ -4,7 +4,12 @@
<context>
<name>LibraryPage</name>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="99"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="100"/>
+ <source>No items found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="105"/>
<source>Go back home</source>
<translation type="unfinished"></translation>
</message>
@@ -14,22 +19,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="120"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="123"/>
<source>Now playing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="127"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="131"/>
<source>Playlist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="174"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="173"/>
<source>Input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="181"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="180"/>
<source>Type here...</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/translations/harbour-squeeze-remote-nl.ts
^
|
| @@ -4,7 +4,12 @@
<context>
<name>LibraryPage</name>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="99"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="100"/>
+ <source>No items found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="105"/>
<source>Go back home</source>
<translation type="unfinished"></translation>
</message>
@@ -14,22 +19,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="120"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="123"/>
<source>Now playing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="127"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="131"/>
<source>Playlist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="174"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="173"/>
<source>Input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="181"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="180"/>
<source>Type here...</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/translations/harbour-squeeze-remote-pl.ts
^
|
| @@ -4,7 +4,12 @@
<context>
<name>LibraryPage</name>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="99"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="100"/>
+ <source>No items found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="105"/>
<source>Go back home</source>
<translation type="unfinished"></translation>
</message>
@@ -14,22 +19,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="120"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="123"/>
<source>Now playing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="127"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="131"/>
<source>Playlist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="174"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="173"/>
<source>Input</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="181"/>
+ <location filename="../qml/sailfishos/pages/LibraryPage.qml" line="180"/>
<source>Type here...</source>
<translation type="unfinished"></translation>
</message>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/translations/harbour-squeeze-remote-zh_CN.ts
^
|
| @@ -43,6 +43,10 @@
<source>OK</source>
<translation>好的</translation>
</message>
+ <message>
+ <source>No items found</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PlayerPage</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote-3.1.0.tar.bz2/translations/harbour-squeeze-remote.ts
^
|
| @@ -43,6 +43,10 @@
<source>OK</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>No items found</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PlayerPage</name>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote.changes.in
^
|
| @@ -6,6 +6,9 @@
# * date Author's Name <author's email> version-release
# - Summary of changes
+* Thu Jan 06 2023 Pawel Spoon <jack.tar@example.com> 3.1.0-0
+- merged thumbnails support implemented by ZefQ
+
* Thu Jan 06 2022 Pawel Spoon <jack.tar@example.com> 3.0.5-0
- fix translations on obs
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-squeeze-remote.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-squeeze-remote
Summary: Squeeze Remote
-Version: 3.0.5
+Version: 3.1.0
Release: 0
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
|
