Added self to credits.
Added MediaItem display for audio and Integrated MediaItem into MediaBlock/MyMedia elements. Bump release.
This commit is contained in:
parent
e46e53da16
commit
8d8abed078
6 changed files with 36 additions and 23 deletions
|
@ -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ć"
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -10,12 +10,15 @@ FullscreenContentPage {
|
|||
property string previewURL: ""
|
||||
property string mediaURL: ""
|
||||
property string url: ""
|
||||
property bool debug: false
|
||||
|
||||
allowedOrientations: Orientation.All
|
||||
Component.onCompleted: function() {
|
||||
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"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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: "<a href='" + url + "'>" + 'Audio file' + '</a>'
|
||||
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])
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue