chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

making future proof refactor of image and video get system

Browse source
This commit is contained in:
Chris Cochrun 2022-04-11 14:04:03 -05:00
parent 8d07c7355d
commit f1378cc1ff
8 changed files with 72 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/qml/presenter/ImageEditor.qml
View file

@ -43,18 +43,6 @@ Item {
implicitWidth: 100
hoverEnabled: true
}
Controls.ToolButton {
text: "B"
hoverEnabled: true
}
Controls.ToolButton {
text: "I"
hoverEnabled: true
}
Controls.ToolButton {
text: "U"
hoverEnabled: true
}
Controls.ToolSeparator {}
Item { Layout.fillWidth: true }
Controls.ToolSeparator {}
@ -66,7 +54,7 @@ Item {
}
Controls.ToolButton {
id: backgroundButton
text: "Background"
text: "Select Image"
icon.name: "fileopen"
hoverEnabled: true
onClicked: backgroundType.open()
@ -175,7 +163,7 @@ Item {
}
function changeImage(image) {
root.image = image;
print(image.toString());
root.image = image.filePath;
print(image.filePath.toString());
}
}

2
src/qml/presenter/Library.qml
View file

@ -820,7 +820,7 @@ Item {
videoLibraryList.currentIndex = videosqlmodel.rowCount();
print(videosqlmodel.getVideo(videoLibraryList.currentIndex));
const video = videosqlmodel.getVideo(videoLibraryList.currentIndex);
showPassiveNotification("newest video: " + video);
showPassiveNotification("newest video: " + video.title);
if (!editMode)
editMode = true;
editSwitch("video", video);

6
src/qml/presenter/VideoEditor.qml
View file

@ -138,7 +138,7 @@ Item {
Layout.rightMargin: 20
placeholderText: "Song Title..."
text: video[0]
text: video.title
padding: 10
/* onEditingFinished: updateTitle(text); */
}
@ -170,7 +170,7 @@ Item {
Component.onCompleted: mpvLoadingTimer.start()
onPositionChanged: videoSlider.value = position
onFileLoaded: {
showPassiveNotification(video[0] + " has been loaded");
showPassiveNotification(video.title + " has been loaded");
videoPreview.pause();
}
}
@ -220,7 +220,7 @@ Item {
id: mpvLoadingTimer
interval: 100
onTriggered: {
videoPreview.loadFile(video[1].toString());
videoPreview.loadFile(video.filePath.toString());
/* showPassiveNotification(video[0]); */
}
}