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

small ui tweaks and fixes

Browse source
This commit is contained in:
Chris Cochrun 2023-10-06 08:34:02 -05:00
parent cec9a93b72
commit 19e3c71ff2
4 changed files with 51 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,12 +34,47 @@ Item {
text: image.title
padding: 10
onEditingFinished: updateTitle(text);
background: Presenter.TextBackground {
control: imageTitleField
}
}
Controls.ComboBox {
id: layoutBox
model: ["Fill", "Crop", "Height", "Width"]
implicitWidth: 100
hoverEnabled: true
background: Presenter.TextBackground {
control: layoutBox
}
indicator: Kirigami.Icon {
anchors {right: parent.right
verticalCenter: parent.verticalCenter
rightMargin: 2}
source: "arrow-down"
rotation: layoutBox.down ? 180 : 0
color: layoutBox.pressed ? Kirigami.Theme.focusColor : Kirigami.Theme.textColor
Behavior on rotation {
NumberAnimation {
easing.type: Easing.OutCubic
duration: 300
}
}
}
contentItem: Text {
leftPadding: 0
rightPadding: layoutBox.indicator.width + layoutBox.spacing
text: layoutBox.displayText
font: layoutBox.font
color: layoutBox.pressed ? Kirigami.Theme.focusColor : Kirigami.Theme.textColor;
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
}
Controls.ToolSeparator {}
@ -123,6 +158,8 @@ Item {
let img = imageProxyModel.getImage(index);
root.image = img;
console.log(img.filePath.toString());
footerFirstText = "File path: ";
footerSecondText = image.filePath;
}
function updateTitle(text) {

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

@ -259,7 +259,8 @@ Controls.Page {
currentWindow = presentation;
editMode = false;
refocusPresentation();
/* footerLeftString = presenting ? "Presenting..." : "Presentation Preview" */
footerFirstText = presenting ? "Presenting..." : "Presentation Preview";
footerSecondText = "";
}
} else {
videoEditor.visible = false;
@ -271,7 +272,8 @@ Controls.Page {
currentWindow = presentation;
editMode = false;
refocusPresentation();
/* footerLeftString = presenting ? "Presenting..." : "Presentation Preview" */
footerFirstText = presenting ? "Presenting..." : "Presentation Preview"
footerSecondText = "";
}
}

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

@ -225,14 +225,14 @@ Item {
height: parent.height
anchors.horizontalCenter: parent.horizontalCenter
width: 1
color: Controls.SplitHandle.hovered ? Kirigami.Theme.hoverColor : Kirigami.Theme.backgroundColor
color: parent.Controls.SplitHandle.hovered ? Kirigami.Theme.hoverColor : Kirigami.Theme.backgroundColor
}
}
ColumnLayout {
Controls.SplitView.fillHeight: true
Controls.SplitView.preferredWidth: 500
Controls.SplitView.minimumWidth: 500
Controls.SplitView.minimumWidth: 300
Controls.Label {
id: songTitleLabel
@ -542,8 +542,10 @@ Item {
changeSlideFont(song.font, true);
changeSlideFontSize(song.fontSize, true)
changeSlideText(songProxyModel.modelIndex(index).row);
songList.loadVideo();
console.log("Changing to song: " + song.title + " with ID: " + song.id);
footerFirstText = "Song: ";
footerSecondText = song.title;
songList.loadVideo();
}
function updateLyrics(lyrics) {

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

@ -56,6 +56,9 @@ Item {
padding: 10
checked: video.loop
onToggled: updateLoop(!video.loop)
background: Presenter.TextBackground {
control: loopCheckBox
}
}
Controls.ToolSeparator {}
@ -200,7 +203,7 @@ Item {
Layout.preferredWidth: parent.width
Layout.alignment: Qt.AlignLeft
RowLayout {
ColumnLayout {
Layout.alignment: Qt.AlignLeft
Controls.Label {
text: "Start Time:"
@ -216,7 +219,7 @@ Item {
}
}
RowLayout {
ColumnLayout {
Layout.alignment: Qt.AlignRight
Controls.Label {
text: "End Time:"