diff --git a/build/CMakeCache.txt b/build/CMakeCache.txt index 9cc341d..98c6816 100644 --- a/build/CMakeCache.txt +++ b/build/CMakeCache.txt @@ -615,11 +615,11 @@ CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 //Details about finding Gettext FIND_PACKAGE_MESSAGE_DETAILS_Gettext:INTERNAL=[/usr/bin/msgmerge][/usr/bin/msgfmt][v0.21()] //Details about finding KF5 -FIND_PACKAGE_MESSAGE_DETAILS_KF5:INTERNAL=[success][cfound components: Kirigami2 I18n CoreAddons ][v5.87.0(5.68.0)] +FIND_PACKAGE_MESSAGE_DETAILS_KF5:INTERNAL=[success][cfound components: Kirigami2 I18n CoreAddons ][v5.90.0(5.68.0)] //Details about finding KF5CoreAddons FIND_PACKAGE_MESSAGE_DETAILS_KF5CoreAddons:INTERNAL=[/usr/lib64/cmake/KF5CoreAddons/KF5CoreAddonsConfig.cmake][v5.90.0()] //Details about finding KF5I18n -FIND_PACKAGE_MESSAGE_DETAILS_KF5I18n:INTERNAL=[/usr/lib64/cmake/KF5I18n/KF5I18nConfig.cmake][v5.87.0()] +FIND_PACKAGE_MESSAGE_DETAILS_KF5I18n:INTERNAL=[/usr/lib64/cmake/KF5I18n/KF5I18nConfig.cmake][v5.90.0()] //Details about finding KF5Kirigami2 FIND_PACKAGE_MESSAGE_DETAILS_KF5Kirigami2:INTERNAL=[/usr/lib64/cmake/KF5Kirigami2/KF5Kirigami2Config.cmake][v5.90.0()] //Test HAVE_DATE_TIME diff --git a/build/CMakeFiles/Makefile.cmake b/build/CMakeFiles/Makefile.cmake index cac60cb..2ff999d 100644 --- a/build/CMakeFiles/Makefile.cmake +++ b/build/CMakeFiles/Makefile.cmake @@ -25,7 +25,7 @@ set(CMAKE_MAKEFILE_DEPENDS "/usr/lib64/cmake/KF5I18n/KF5I18nConfigVersion.cmake" "/usr/lib64/cmake/KF5I18n/KF5I18nMacros.cmake" "/usr/lib64/cmake/KF5I18n/KF5I18nQchTargets.cmake" - "/usr/lib64/cmake/KF5I18n/KF5I18nTargets-debug.cmake" + "/usr/lib64/cmake/KF5I18n/KF5I18nTargets-noconfig.cmake" "/usr/lib64/cmake/KF5I18n/KF5I18nTargets.cmake" "/usr/lib64/cmake/KF5Kirigami2/KF5Kirigami2Config.cmake" "/usr/lib64/cmake/KF5Kirigami2/KF5Kirigami2ConfigVersion.cmake" @@ -54,25 +54,35 @@ set(CMAKE_MAKEFILE_DEPENDS "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QGtk3ThemePlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QICNSPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QJp2Plugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QLibInputPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QMngPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QPdfPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QSvgIconPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QSvgPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QTgaPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QTiffPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QTsLibPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QVirtualKeyboardPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QVncIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QWaylandEglPlatformIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QWaylandIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QWaylandXCompositeEglPlatformIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QWaylandXCompositeGlxPlatformIntegrationPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QWbmpPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QWebGLIntegrationPlugin.cmake" + "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QWebpPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake" "/usr/lib64/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake" @@ -109,6 +119,11 @@ set(CMAKE_MAKEFILE_DEPENDS "/usr/lib64/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake" "/usr/lib64/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake" "/usr/lib64/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake" + "/usr/lib64/cmake/Qt5Widgets/Qt5Widgets_QBB10StylePlugin.cmake" + "/usr/lib64/cmake/Qt5Widgets/Qt5Widgets_QCleanlooksStylePlugin.cmake" + "/usr/lib64/cmake/Qt5Widgets/Qt5Widgets_QGtk2StylePlugin.cmake" + "/usr/lib64/cmake/Qt5Widgets/Qt5Widgets_QMotifStylePlugin.cmake" + "/usr/lib64/cmake/Qt5Widgets/Qt5Widgets_QPlastiqueStylePlugin.cmake" "/usr/share/ECM/cmake/ECMConfig.cmake" "/usr/share/ECM/cmake/ECMConfigVersion.cmake" "/usr/share/ECM/find-modules/ECMFindModuleHelpersStub.cmake" diff --git a/src/qml/presenter/Library.qml b/src/qml/presenter/Library.qml index 04a3e5c..b92aa66 100644 --- a/src/qml/presenter/Library.qml +++ b/src/qml/presenter/Library.qml @@ -29,6 +29,7 @@ Item { ListView.view.currentIndex = index songTitle = title songLyrics = lyrics + songAuthor = author showPassiveNotification(songLyrics, 3000) } } diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml index e643995..10f2e71 100644 --- a/src/qml/presenter/MainWindow.qml +++ b/src/qml/presenter/MainWindow.qml @@ -15,6 +15,7 @@ Controls.Page { property url imageBackground: "" property string songTitle: "" property string songLyrics: "" + property string songAuthor: "" Item { id: mainItem diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml index e1b057c..147e884 100644 --- a/src/qml/presenter/SongEditor.qml +++ b/src/qml/presenter/SongEditor.qml @@ -13,11 +13,13 @@ Item { GridLayout { id: mainLayout + anchors.fill: parent columns: 2 rowSpacing: 5 columnSpacing: 20 Controls.ToolBar { + Layout.fillWidth: true Layout.columnSpan: 2 id: toolbar RowLayout { @@ -45,6 +47,8 @@ Item { text: "U" } Controls.ToolSeparator {} + Item { Layout.fillWidth: true } + Controls.ToolSeparator {} Controls.ToolButton { text: "Effects" } @@ -60,36 +64,63 @@ Item { } Controls.TextField { - implicitWidth: 300 + id: songTitleField + + Layout.preferredWidth: 300 + Layout.fillWidth: true Layout.leftMargin: 20 + placeholderText: "Song Title..." text: songTitle + padding: 10 } Rectangle { - color: "red" - implicitWidth: 400 - implicitHeight: 10 + id: slideBar + color: Kirigami.Theme.highlightColor + + Layout.preferredWidth: 400 + Layout.preferredHeight: songTitleField.height + Layout.fillWidth: true Layout.rightMargin: 20 } Controls.TextArea { - implicitWidth: 300 - implicitHeight: 500 - Layout.bottomMargin: 30 + id: songLyricsField + + Layout.preferredHeight: 500 + Layout.fillWidth: true + Layout.fillHeight: true Layout.leftMargin: 20 + placeholderText: "Put lyrics here..." persistentSelection: true text: songLyrics textFormat: TextEdit.MarkdownText + padding: 10 } Rectangle { + id: slideEditor color: "red" - implicitWidth: 400 - implicitHeight: 500 + Layout.preferredHeight: 800 + Layout.fillWidth: true + Layout.fillHeight: true Layout.bottomMargin: 30 Layout.rightMargin: 20 + Layout.rowSpan: 15 + } + + Controls.TextField { + id: songAuthorField + + Layout.fillWidth: true + Layout.preferredWidth: 300 + Layout.leftMargin: 20 + + placeholderText: "Author..." + text: songAuthor + padding: 10 } } }