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

rename SlideEditor.qml to SongEditorSlideList.qml

Browse source
This commit is contained in:
Chris Cochrun 2023-09-22 15:56:50 -05:00
parent cd8801af51
commit 61ed155903
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -335,8 +335,8 @@ Item {
Controls.SplitView.preferredWidth: 700 Controls.SplitView.preferredWidth: 700
Controls.SplitView.minimumWidth: 300 Controls.SplitView.minimumWidth: 300
Presenter.SlideEditor { Presenter.SongEditorSlideList {
id: slideEditor id: songList
imageBackground: song.backgroundType === "image" ? song.background : "" imageBackground: song.backgroundType === "image" ? song.background : ""
videoBackground: song.backgroundType === "video" ? song.background : "" videoBackground: song.backgroundType === "video" ? song.background : ""
Layout.preferredWidth: 500 Layout.preferredWidth: 500
@ -420,7 +420,7 @@ Item {
changeSlideFont("Noto Sans", true); changeSlideFont("Noto Sans", true);
changeSlideFontSize(50, true) changeSlideFontSize(50, true)
changeSlideText(songProxyModel.modelIndex(index).row); changeSlideText(songProxyModel.modelIndex(index).row);
slideEditor.loadVideo(); songList.loadVideo();
console.log("New song with ID: " + song.id); console.log("New song with ID: " + song.id);
} }
@ -434,7 +434,7 @@ Item {
changeSlideFont(song.font, true); changeSlideFont(song.font, true);
changeSlideFontSize(song.fontSize, true) changeSlideFontSize(song.fontSize, true)
changeSlideText(songProxyModel.modelIndex(index).row); changeSlideText(songProxyModel.modelIndex(index).row);
slideEditor.loadVideo(); songList.loadVideo();
console.log("Changing to song: " + song.title + " with ID: " + song.id); console.log("Changing to song: " + song.title + " with ID: " + song.id);
} }
@ -477,13 +477,13 @@ Item {
console.log("changed background"); console.log("changed background");
/* if (backgroundType === "image") { */ /* if (backgroundType === "image") { */
/* //todo */ /* //todo */
/* slideEditor.videoBackground = ""; */ /* songList.videoBackground = ""; */
/* slideEditor.imageBackground = background; */ /* songList.imageBackground = background; */
/* } else { */ /* } else { */
/* //todo */ /* //todo */
/* slideEditor.imageBackground = ""; */ /* songList.imageBackground = ""; */
/* slideEditor.videoBackground = background; */ /* songList.videoBackground = background; */
/* slideEditor.loadVideo(); */ /* songList.loadVideo(); */
/* } */ /* } */
} }
@ -514,19 +514,19 @@ Item {
switch (alignment) { switch (alignment) {
case "left" : case "left" :
hAlignmentBox.currentIndex = 0; hAlignmentBox.currentIndex = 0;
slideEditor.hTextAlignment = Text.AlignLeft; songList.hTextAlignment = Text.AlignLeft;
break; break;
case "center" : case "center" :
hAlignmentBox.currentIndex = 1; hAlignmentBox.currentIndex = 1;
slideEditor.hTextAlignment = Text.AlignHCenter; songList.hTextAlignment = Text.AlignHCenter;
break; break;
case "right" : case "right" :
hAlignmentBox.currentIndex = 2; hAlignmentBox.currentIndex = 2;
slideEditor.hTextAlignment = Text.AlignRight; songList.hTextAlignment = Text.AlignRight;
break; break;
case "justify" : case "justify" :
hAlignmentBox.currentIndex = 3; hAlignmentBox.currentIndex = 3;
slideEditor.hTextAlignment = Text.AlignJustify; songList.hTextAlignment = Text.AlignJustify;
break; break;
} }
} }
@ -535,15 +535,15 @@ Item {
switch (alignment) { switch (alignment) {
case "top" : case "top" :
vAlignmentBox.currentIndex = 0; vAlignmentBox.currentIndex = 0;
slideEditor.vTextAlignment = Text.AlignTop; songList.vTextAlignment = Text.AlignTop;
break; break;
case "center" : case "center" :
vAlignmentBox.currentIndex = 1; vAlignmentBox.currentIndex = 1;
slideEditor.vTextAlignment = Text.AlignVCenter; songList.vTextAlignment = Text.AlignVCenter;
break; break;
case "bottom" : case "bottom" :
vAlignmentBox.currentIndex = 2; vAlignmentBox.currentIndex = 2;
slideEditor.vTextAlignment = Text.AlignBottom; songList.vTextAlignment = Text.AlignBottom;
break; break;
} }
} }
@ -552,23 +552,23 @@ Item {
const fontIndex = fontBox.find(font); const fontIndex = fontBox.find(font);
if (updateBox) if (updateBox)
fontBox.currentIndex = fontIndex; fontBox.currentIndex = fontIndex;
slideEditor.font = font; songList.font = font;
} }
function changeSlideFontSize(fontSize, updateBox) { function changeSlideFontSize(fontSize, updateBox) {
if (updateBox) if (updateBox)
fontSizeBox.value = fontSize; fontSizeBox.value = fontSize;
slideEditor.fontSize = fontSize; songList.fontSize = fontSize;
} }
function changeSlideText(id) { function changeSlideText(id) {
/* console.log("Here are the verses: " + verses); */ /* console.log("Here are the verses: " + verses); */
const verses = songProxyModel.getLyricList(id); const verses = songProxyModel.getLyricList(id);
verses.forEach(slideEditor.appendVerse); verses.forEach(songList.appendVerse);
/* slideEditor.loadVideo(); */ /* songList.loadVideo(); */
} }
function clearSlides() { function clearSlides() {
slideEditor.clear() songList.clear()
} }
} }

0
src/qml/presenter/SlideEditor.qml → src/qml/presenter/SongEditorSlideList.qml
View file

2
src/resources.qrc
View file

@ -15,7 +15,7 @@
<file>qml/presenter/ImageEditor.qml</file> <file>qml/presenter/ImageEditor.qml</file>
<file>qml/presenter/PresentationEditor.qml</file> <file>qml/presenter/PresentationEditor.qml</file>
<file>qml/presenter/Slide.qml</file> <file>qml/presenter/Slide.qml</file>
<file>qml/presenter/SlideEditor.qml</file> <file>qml/presenter/SongEditorSlideList.qml</file>
<file>qml/presenter/DragHandle.qml</file> <file>qml/presenter/DragHandle.qml</file>
<file>qml/presenter/Presentation.qml</file> <file>qml/presenter/Presentation.qml</file>
<file>qml/presenter/PresentationWindow.qml</file> <file>qml/presenter/PresentationWindow.qml</file>