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

some adjustments to cmake and more layout of window

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -4,12 +4,15 @@ project(presenter)
set(KF_MIN_VERSION "5.68.0") set(KF_MIN_VERSION "5.68.0")
set(QT_MIN_VERSION "5.12.0") set(QT_MIN_VERSION "5.12.0")
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
set(CMAKE_AUTOMOC ON)
include(KDEInstallDirs) include(KDEInstallDirs)
include(KDECMakeSettings) include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECompilerSettings NO_POLICY_SCOPE)

35
CMakeLists.txt.user
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.2, 2022-02-10T12:57:19. --> <!-- Written by QtCreator 4.11.2, 2022-02-11T16:37:44. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@ -8,7 +8,7 @@
</data> </data>
<data> <data>
<variable>ProjectExplorer.Project.ActiveTarget</variable> <variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value> <value type="int">1</value>
</data> </data>
<data> <data>
<variable>ProjectExplorer.Project.EditorSettings</variable> <variable>ProjectExplorer.Project.EditorSettings</variable>
@ -313,19 +313,20 @@
</valuelist> </valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value> <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">presenter</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.presenter</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value> <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">presenter</value>
<value type="QString" key="RunConfiguration.Arguments"></value> <value type="QString" key="RunConfiguration.Arguments"></value>
<value type="bool" key="RunConfiguration.Arguments.multi">false</value> <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
<value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value> <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value> <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value> <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value> <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/chris/dev/build-church-presenter-Desktop-Debug/bin</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>
@ -584,19 +585,20 @@
</valuelist> </valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value> <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">presenter</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.presenter</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value> <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">presenter</value>
<value type="QString" key="RunConfiguration.Arguments"></value> <value type="QString" key="RunConfiguration.Arguments"></value>
<value type="bool" key="RunConfiguration.Arguments.multi">false</value> <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
<value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value> <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value> <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value> <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value> <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/chris/dev/build-church-presenter-Felgo_Desktop_Qt_5_15_2_GCC-Debug/bin</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>
@ -604,8 +606,8 @@
<data> <data>
<variable>ProjectExplorer.Project.Target.2</variable> <variable>ProjectExplorer.Project.Target.2</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Unnamed</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Local</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Unnamed</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Local</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ead1f619-db1e-418c-b0eb-2111d1bf7fd0}</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ead1f619-db1e-418c-b0eb-2111d1bf7fd0}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
@ -726,19 +728,20 @@
</valuelist> </valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value> <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">presenter</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.presenter</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value> <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">presenter</value>
<value type="QString" key="RunConfiguration.Arguments"></value> <value type="QString" key="RunConfiguration.Arguments"></value>
<value type="bool" key="RunConfiguration.Arguments.multi">false</value> <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
<value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value> <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value> <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory"></value> <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default"></value> <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/chris/dev/church-presenter/build/bin</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>

2700
build/CMakeFiles/CMakeOutput.log
View file

File diff suppressed because it is too large Load diff

2
build/CTestTestfile.cmake
View file

@ -5,5 +5,5 @@
# This file includes the relevant testing commands required for # This file includes the relevant testing commands required for
# testing this directory and lists subdirectories to be tested as well. # testing this directory and lists subdirectories to be tested as well.
add_test(appstreamtest "/usr/bin/cmake" "-DAPPSTREAMCLI=/usr/bin/appstreamcli" "-DINSTALL_FILES=/home/chris/dev/church-presenter/build/install_manifest.txt" "-P" "/usr/share/ECM/kde-modules/appstreamtest.cmake") add_test(appstreamtest "/usr/bin/cmake" "-DAPPSTREAMCLI=/usr/bin/appstreamcli" "-DINSTALL_FILES=/home/chris/dev/church-presenter/build/install_manifest.txt" "-P" "/usr/share/ECM/kde-modules/appstreamtest.cmake")
set_tests_properties(appstreamtest PROPERTIES _BACKTRACE_TRIPLES "/usr/share/ECM/kde-modules/KDECMakeSettings.cmake;161;add_test;/usr/share/ECM/kde-modules/KDECMakeSettings.cmake;179;appstreamtest;/usr/share/ECM/kde-modules/KDECMakeSettings.cmake;0;;/home/chris/dev/church-presenter/CMakeLists.txt;14;include;/home/chris/dev/church-presenter/CMakeLists.txt;0;") set_tests_properties(appstreamtest PROPERTIES _BACKTRACE_TRIPLES "/usr/share/ECM/kde-modules/KDECMakeSettings.cmake;161;add_test;/usr/share/ECM/kde-modules/KDECMakeSettings.cmake;179;appstreamtest;/usr/share/ECM/kde-modules/KDECMakeSettings.cmake;0;;/home/chris/dev/church-presenter/CMakeLists.txt;17;include;/home/chris/dev/church-presenter/CMakeLists.txt;0;")
subdirs("src") subdirs("src")

8
src/qml/main.qml
View file

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

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

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

10
src/qml/presenter/Slide.qml
View file

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

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

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