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

small changes and the beginning of a TextBackground.qml

Browse source
This commit is contained in:
Chris Cochrun 2023-09-28 15:17:35 -05:00
parent 9f4d426a8f
commit 7e6e8c71e0
4 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/qml/presenter/SongEditor.qml
View file

@ -120,7 +120,7 @@ Item {
Layout.fillHeight: true Layout.fillHeight: true
text: "Image" text: "Image"
icon.name: "folder-pictures-symbolic" icon.name: "folder-pictures-symbolic"
onClicked: imageFileDialog.open() & backgroundTypePopup.close() onClicked: updateBackground("image") & backgroundTypePopup.close()
} }
} }
} }
@ -499,10 +499,11 @@ Item {
songProxyModel.songModel.updateAudio(songIndex, file); songProxyModel.songModel.updateAudio(songIndex, file);
} }
function updateBackground(background, backgroundType) { function updateBackground(backgroundType) {
song.backgroundType = backgroundType; song.backgroundType = backgroundType;
song.background = background; const file = fileHelper.loadFile("Pick Background");
songProxyModel.songModel.updateBackground(songIndex, background); song.background = file;
songProxyModel.songModel.updateBackground(songIndex, file);
songProxyModel.songModel.updateBackgroundType(songIndex, backgroundType); songProxyModel.songModel.updateBackgroundType(songIndex, backgroundType);
console.log("changed background"); console.log("changed background");
/* if (backgroundType === "image") { */ /* if (backgroundType === "image") { */

20
src/qml/presenter/TextBackground.qml Normal file
View file

@ -0,0 +1,20 @@
import QtQuick 2.13
Rectangle {
// Used for
property var control
property bool errorCondition
color: Kirigami.Theme.backgroundColor
implicitWidth: parent.width
implicitHeight: parent.height
radius: 10
border.color: {
if (control.enabled)
return Kirigami.Theme.highlightColor
else if (errorCondition)
return Kirigami.Theme.negativeTextColor
else
return Kirigami.Theme.positiveColor
}
}

6
src/rust/songs/song_model.rs
View file

@ -535,7 +535,11 @@ pub mod song_model {
{ {
song.background = song.background =
updated_background.to_string(); updated_background.to_string();
println!("change: updated_background: {:?} model_index: {:?} roles: {:?}", updated_background, model_index, vector_roles.get(0)); debug!(
background = updated_background,
model_index = model_index,
roles = vector_roles.get(0)
);
self.as_mut().emit_data_changed( self.as_mut().emit_data_changed(
model_index, model_index,
model_index, model_index,