some adjustments to cmake and more layout of window

This commit is contained in:
Chris Cochrun 2022-02-11 16:41:36 -06:00
parent 640eeb7349
commit 3bcd9af77a
8 changed files with 2691 additions and 109 deletions

View file

@ -9,14 +9,16 @@ import org.kde.kirigami 2.13 as Kirigami
import "./presenter" as Presenter
Kirigami.ApplicationWindow {
id: root
id: rootApp
property bool libraryOpen: true
property bool presenting: false
property var secondScreen: null
pageStack.initialPage: mainPage
header: Presenter.Header {}
width: 1280
width: 1800
height: 900
Presenter.MainWindow {
id: mainPage
@ -26,4 +28,6 @@ Kirigami.ApplicationWindow {
libraryOpen = !libraryOpen
}
Component.onCompleted: secondScreen = Qt.application.screens[1]
}

View file

@ -16,6 +16,7 @@ Controls.Page {
property string songTitle: ""
property string songLyrics: ""
property string songAuthor: ""
property int blurRadius: 0
Item {
id: mainItem
@ -41,6 +42,7 @@ Controls.Page {
id: leftDock
Controls.SplitView.fillHeight: true
Controls.SplitView.preferredWidth: 200
Controls.SplitView.maximumWidth: 300
}
Presenter.SongEditor {
@ -59,6 +61,7 @@ Controls.Page {
}
}
}
Loader {
@ -69,10 +72,11 @@ Controls.Page {
title: "presentation-window"
height: maximumHeight
width: maximumWidth
screen: Qt.application.screens[1]
screen: secondScreen
onClosing: presenting = false
Component.onCompleted: {
presentationWindow.showFullScreen();
print(Qt.application.screens[1])
}
Presenter.Slide {
id: presentationSlide
@ -83,9 +87,11 @@ Controls.Page {
FileDialog {
id: fileDialog
title: "Please choose a video"
title: "Please choose a background"
folder: shortcuts.home
selectMultiple: false
nameFilters: ["Video files (*.mp4 *.mkv *.mov *.wmv *.avi *.MP4 *.MOV *.MKV)",
"Image files (*.jpg *.jpeg *.png *.JPG *.JPEG *.PNG)"]
onAccepted: {
print("You chose: " + fileDialog.fileUrls)
background = fileDialog.fileUrls
@ -97,5 +103,7 @@ Controls.Page {
print("Canceled")
/* Qt.quit() */
}
}
}

View file

@ -12,6 +12,7 @@ Item {
anchors.fill: parent
property real textSize: 50
property bool editMode: false
property bool dropShadow: false
property url imageSource: ""
property url videoSource: ""
@ -48,6 +49,14 @@ Item {
fillMode: Image.PreserveAspectCrop
clip: true
}
FastBlur {
id: imageBlue
anchors.fill: parent
source: backgroundImage
radius: blurRadius
Controls.Label {
id: lyrics
text: "This is some test lyrics" // change to song lyrics of current verse
@ -68,6 +77,7 @@ Item {
color: "#80000000"
visible: true
}
}
}
}

View file

@ -16,7 +16,7 @@ Item {
anchors.fill: parent
columns: 2
rowSpacing: 5
columnSpacing: 20
columnSpacing: 0
Controls.ToolBar {
Layout.fillWidth: true
@ -51,6 +51,8 @@ Item {
Controls.ToolSeparator {}
Controls.ToolButton {
text: "Effects"
icon.name: "image-auto-adjust"
onClicked: {}
}
Controls.ToolButton {
text: "Background"
@ -69,6 +71,7 @@ Item {
Layout.preferredWidth: 300
Layout.fillWidth: true
Layout.leftMargin: 20
Layout.rightMargin: 20
placeholderText: "Song Title..."
text: songTitle
@ -85,19 +88,25 @@ Item {
Layout.rightMargin: 20
}
Controls.TextArea {
Controls.ScrollView {
id: songLyricsField
Layout.preferredHeight: 500
Layout.preferredHeight: 3000
Layout.fillWidth: true
Layout.fillHeight: true
Layout.leftMargin: 20
placeholderText: "Put lyrics here..."
persistentSelection: true
text: songLyrics
textFormat: TextEdit.MarkdownText
padding: 10
rightPadding: 20
Controls.TextArea {
width: parent.width
placeholderText: "Put lyrics here..."
persistentSelection: true
text: songLyrics
textFormat: TextEdit.MarkdownText
padding: 10
}
}
Rectangle {
@ -117,6 +126,7 @@ Item {
Layout.fillWidth: true
Layout.preferredWidth: 300
Layout.leftMargin: 20
Layout.rightMargin: 20
placeholderText: "Author..."
text: songAuthor