diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml index ea9277b..4aa9354 100644 --- a/qml/pages/SettingsPage.qml +++ b/qml/pages/SettingsPage.qml @@ -153,6 +153,12 @@ Page { mastodon: "molan@fosstodon.org" mail: "" } + ListElement { + name: "poetaster" + desc: qsTr("Development") + mastodon: "postaster@mastodon.gamedev.place" + mail: "blueprint@poetaster.de" + } ListElement { name: "Miodrag Nikolić" diff --git a/qml/pages/components/MediaBlock.qml b/qml/pages/components/MediaBlock.qml index aacc34e..94cd21c 100644 --- a/qml/pages/components/MediaBlock.qml +++ b/qml/pages/components/MediaBlock.qml @@ -10,11 +10,12 @@ Item { property double wRatio : 16/9 property double hRatio : 9/16 - property bool debug: true + property bool debug: false width: width height: height Component.onCompleted: { - console.log("MB: " + JSON.stringify(model.get(0))) + if(debug) console.log("MB: " + JSON.stringify(model.get(0))) + if (model && model.count && model.get(0).type === "video") { //console.log("Mediablock") //console.log(JSON.stringify(model.get(0).type)) diff --git a/qml/pages/components/MediaFullScreen.qml b/qml/pages/components/MediaFullScreen.qml index 027c45d..4b2525d 100644 --- a/qml/pages/components/MediaFullScreen.qml +++ b/qml/pages/components/MediaFullScreen.qml @@ -10,12 +10,15 @@ FullscreenContentPage { property string previewURL: "" property string mediaURL: "" property string url: "" + property bool debug: false allowedOrientations: Orientation.All Component.onCompleted: function() { - console.log(type) - console.log(previewURL) - console.log(mediaURL) + if (debug) { + console.log(type) + console.log(previewURL) + console.log(mediaURL) + } if (type != 'gifv' && type != 'video') { imagePreview.source = mediaURL imageFlickable.visible = true @@ -58,18 +61,18 @@ FullscreenContentPage { videoError.visible = true } onStatusChanged: { - console.log(status) + if(debug) console.log(status) switch (status) { case MediaPlayer.Loading: - console.log("loading") + if(debug) console.log("loading") return; case MediaPlayer.EndOfMedia: - console.log("EndOfMedia") + if (debug) console.log("EndOfMedia") return; } } onPlaybackStateChanged: { - console.log(playbackState) + if (debug) console.log(playbackState) switch (playbackState) { case MediaPlayer.PlayingState: playerIcon.icon.source = "image://theme/icon-m-pause" diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml index 5b6fe3d..f1885a8 100644 --- a/qml/pages/components/MyList.qml +++ b/qml/pages/components/MyList.qml @@ -7,7 +7,7 @@ import "." SilicaListView { id: myList - property bool debug:false + property bool debug: false property string type property string title property string description @@ -164,7 +164,7 @@ SilicaListView { source: "../../lib/Worker.js" onMessage: { if (messageObject.error){ - console.log(JSON.stringify(messageObject)) + if (debug) console.log(JSON.stringify(messageObject)) } if (messageObject.fireNotification && notifier){ Logic.notifier(messageObject.data) diff --git a/qml/pages/components/MyMedia.qml b/qml/pages/components/MyMedia.qml index aa459d7..80c8f0d 100644 --- a/qml/pages/components/MyMedia.qml +++ b/qml/pages/components/MyMedia.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 -import QtMultimedia 5.0 +import QtMultimedia 5.6 Item { @@ -32,7 +32,8 @@ Item { source: "image://theme/icon-m-file-video?" anchors.centerIn: parent } - Text { + + /*Text { anchors{ topMargin: 10 } @@ -40,28 +41,29 @@ Item { visible: type == 'audio' text: "" + 'Audio file' + '' font.pixelSize: Theme.fontSizeLarge - } + }*/ - //Image { MediaItem { id: audioContent visible: type == 'audio' opacity: img.status === Image.Ready ? 0.0 : 1.0 Behavior on opacity { FadeAnimator {} } mimeType: 'audio/mp3' - url: url + url: mediaURL + mediaUrl: mediaURL //source: "image://theme/icon-m-file-audio?" anchors.centerIn: parent /*MouseArea { anchors.fill: parent onClicked: { - pageStack.push(Qt.resolvedUrl("./MediaFullScreen.qml"), { + pageStack.push(Qt.resolvedUrl("./MediaItem.qml"), { "url": url, - "type": type + "type": type, + "mimeType": type }) } - }*/ + } */ } Rectangle { @@ -91,6 +93,7 @@ Item { MouseArea { anchors.fill: parent + visible: type != 'audio' onClicked: { pageStack.push(Qt.resolvedUrl("./MediaFullScreen.qml"), { "previewURL": previewURL, @@ -133,7 +136,7 @@ Item { onClicked: parent.visible = false } } - IconButton { + /*IconButton { id: mediaDlBtn icon.source: "image://theme/icon-m-cloud-download" anchors { @@ -146,6 +149,6 @@ Item { var filename = url.split("/") FileDownloader.downloadFile(url, filename[filename.length-1]) } - } + }*/ } } diff --git a/rpm/harbour-tooterb.spec b/rpm/harbour-tooterb.spec index ff1b5c7..bdd3e8a 100644 --- a/rpm/harbour-tooterb.spec +++ b/rpm/harbour-tooterb.spec @@ -13,8 +13,8 @@ Name: harbour-tooterb %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter β -Version: 1.0.9 -Release: 2 +Version: 1.1.0 +Release: 1 Group: Qt/Qt License: GPLv3 URL: https://github.com/poetaster/harbour-tooter#readme