Added self to credits.

Added MediaItem display for audio and
Integrated MediaItem into MediaBlock/MyMedia elements.
Bump release.
This commit is contained in:
Mark Washeim 2022-12-01 10:40:37 +01:00
parent e46e53da16
commit 8d8abed078
6 changed files with 36 additions and 23 deletions

View file

@ -153,6 +153,12 @@ Page {
mastodon: "molan@fosstodon.org" mastodon: "molan@fosstodon.org"
mail: "" mail: ""
} }
ListElement {
name: "poetaster"
desc: qsTr("Development")
mastodon: "postaster@mastodon.gamedev.place"
mail: "blueprint@poetaster.de"
}
ListElement { ListElement {
name: "Miodrag Nikolić" name: "Miodrag Nikolić"

View file

@ -10,11 +10,12 @@ Item {
property double wRatio : 16/9 property double wRatio : 16/9
property double hRatio : 9/16 property double hRatio : 9/16
property bool debug: true property bool debug: false
width: width width: width
height: height height: height
Component.onCompleted: { 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") { if (model && model.count && model.get(0).type === "video") {
//console.log("Mediablock") //console.log("Mediablock")
//console.log(JSON.stringify(model.get(0).type)) //console.log(JSON.stringify(model.get(0).type))

View file

@ -10,12 +10,15 @@ FullscreenContentPage {
property string previewURL: "" property string previewURL: ""
property string mediaURL: "" property string mediaURL: ""
property string url: "" property string url: ""
property bool debug: false
allowedOrientations: Orientation.All allowedOrientations: Orientation.All
Component.onCompleted: function() { Component.onCompleted: function() {
if (debug) {
console.log(type) console.log(type)
console.log(previewURL) console.log(previewURL)
console.log(mediaURL) console.log(mediaURL)
}
if (type != 'gifv' && type != 'video') { if (type != 'gifv' && type != 'video') {
imagePreview.source = mediaURL imagePreview.source = mediaURL
imageFlickable.visible = true imageFlickable.visible = true
@ -58,18 +61,18 @@ FullscreenContentPage {
videoError.visible = true videoError.visible = true
} }
onStatusChanged: { onStatusChanged: {
console.log(status) if(debug) console.log(status)
switch (status) { switch (status) {
case MediaPlayer.Loading: case MediaPlayer.Loading:
console.log("loading") if(debug) console.log("loading")
return; return;
case MediaPlayer.EndOfMedia: case MediaPlayer.EndOfMedia:
console.log("EndOfMedia") if (debug) console.log("EndOfMedia")
return; return;
} }
} }
onPlaybackStateChanged: { onPlaybackStateChanged: {
console.log(playbackState) if (debug) console.log(playbackState)
switch (playbackState) { switch (playbackState) {
case MediaPlayer.PlayingState: case MediaPlayer.PlayingState:
playerIcon.icon.source = "image://theme/icon-m-pause" playerIcon.icon.source = "image://theme/icon-m-pause"

View file

@ -164,7 +164,7 @@ SilicaListView {
source: "../../lib/Worker.js" source: "../../lib/Worker.js"
onMessage: { onMessage: {
if (messageObject.error){ if (messageObject.error){
console.log(JSON.stringify(messageObject)) if (debug) console.log(JSON.stringify(messageObject))
} }
if (messageObject.fireNotification && notifier){ if (messageObject.fireNotification && notifier){
Logic.notifier(messageObject.data) Logic.notifier(messageObject.data)

View file

@ -1,6 +1,6 @@
import QtQuick 2.0 import QtQuick 2.0
import Sailfish.Silica 1.0 import Sailfish.Silica 1.0
import QtMultimedia 5.0 import QtMultimedia 5.6
Item { Item {
@ -32,7 +32,8 @@ Item {
source: "image://theme/icon-m-file-video?" source: "image://theme/icon-m-file-video?"
anchors.centerIn: parent anchors.centerIn: parent
} }
Text {
/*Text {
anchors{ anchors{
topMargin: 10 topMargin: 10
} }
@ -40,25 +41,26 @@ Item {
visible: type == 'audio' visible: type == 'audio'
text: "<a href='" + url + "'>" + 'Audio file' + '</a>' text: "<a href='" + url + "'>" + 'Audio file' + '</a>'
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeLarge
} }*/
//Image {
MediaItem { MediaItem {
id: audioContent id: audioContent
visible: type == 'audio' visible: type == 'audio'
opacity: img.status === Image.Ready ? 0.0 : 1.0 opacity: img.status === Image.Ready ? 0.0 : 1.0
Behavior on opacity { FadeAnimator {} } Behavior on opacity { FadeAnimator {} }
mimeType: 'audio/mp3' mimeType: 'audio/mp3'
url: url url: mediaURL
mediaUrl: mediaURL
//source: "image://theme/icon-m-file-audio?" //source: "image://theme/icon-m-file-audio?"
anchors.centerIn: parent anchors.centerIn: parent
/*MouseArea { /*MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
pageStack.push(Qt.resolvedUrl("./MediaFullScreen.qml"), { pageStack.push(Qt.resolvedUrl("./MediaItem.qml"), {
"url": url, "url": url,
"type": type "type": type,
"mimeType": type
}) })
} }
} */ } */
@ -91,6 +93,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
visible: type != 'audio'
onClicked: { onClicked: {
pageStack.push(Qt.resolvedUrl("./MediaFullScreen.qml"), { pageStack.push(Qt.resolvedUrl("./MediaFullScreen.qml"), {
"previewURL": previewURL, "previewURL": previewURL,
@ -133,7 +136,7 @@ Item {
onClicked: parent.visible = false onClicked: parent.visible = false
} }
} }
IconButton { /*IconButton {
id: mediaDlBtn id: mediaDlBtn
icon.source: "image://theme/icon-m-cloud-download" icon.source: "image://theme/icon-m-cloud-download"
anchors { anchors {
@ -146,6 +149,6 @@ Item {
var filename = url.split("/") var filename = url.split("/")
FileDownloader.downloadFile(url, filename[filename.length-1]) FileDownloader.downloadFile(url, filename[filename.length-1])
} }
} }*/
} }
} }

View file

@ -13,8 +13,8 @@ Name: harbour-tooterb
%{!?qtc_make:%define qtc_make make} %{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir} %{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Tooter β Summary: Tooter β
Version: 1.0.9 Version: 1.1.0
Release: 2 Release: 1
Group: Qt/Qt Group: Qt/Qt
License: GPLv3 License: GPLv3
URL: https://github.com/poetaster/harbour-tooter#readme URL: https://github.com/poetaster/harbour-tooter#readme