From 0d71e53ec62cc87da84c0adbe97aeadcd56ce06e Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 12 Feb 2022 07:31:19 -0600 Subject: [PATCH] Adding sql import and some minor ui stuff --- CMakeLists.txt | 2 +- build/CMakeCache.txt | 19 +++++++++++++++++-- build/CMakeFiles/Makefile.cmake | 25 +++++++++---------------- src/CMakeLists.txt | 1 + src/main.cpp | 1 + src/qml/presenter/SongEditor.qml | 10 ++++++++++ 6 files changed, 39 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33deddb..33a356f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include(FeatureSummary) kde_enable_exceptions() -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui QuickControls2 Widgets) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui QuickControls2 Widgets Sql) find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons) set(CMAKE_CXX_STANDARD 17) diff --git a/build/CMakeCache.txt b/build/CMakeCache.txt index 98c6816..86c4944 100644 --- a/build/CMakeCache.txt +++ b/build/CMakeCache.txt @@ -421,6 +421,9 @@ KI18N_PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 //Location of the Qt5 qmake executable QMAKE_EXECUTABLE:FILEPATH=/usr/bin/qmake +//The directory containing a CMake configuration file for QSql. +QSql_DIR:PATH=QSql_DIR-NOTFOUND + //The directory containing a CMake configuration file for Qt5Core. Qt5Core_DIR:PATH=/usr/lib64/cmake/Qt5Core @@ -442,6 +445,12 @@ Qt5QuickControls2_DIR:PATH=/usr/lib64/cmake/Qt5QuickControls2 //The directory containing a CMake configuration file for Qt5Quick. Qt5Quick_DIR:PATH=/usr/lib64/cmake/Qt5Quick +//The directory containing a CMake configuration file for Qt5SQL. +Qt5SQL_DIR:PATH=Qt5SQL_DIR-NOTFOUND + +//The directory containing a CMake configuration file for Qt5Sql. +Qt5Sql_DIR:PATH=/usr/lib64/cmake/Qt5Sql + //The directory containing a CMake configuration file for Qt5Test. Qt5Test_DIR:PATH=/usr/lib64/cmake/Qt5Test @@ -451,6 +460,12 @@ Qt5Widgets_DIR:PATH=/usr/lib64/cmake/Qt5Widgets //The directory containing a CMake configuration file for Qt5. Qt5_DIR:PATH=/usr/lib64/cmake/Qt5 +//The directory containing a CMake configuration file for QtSql. +QtSql_DIR:PATH=QtSql_DIR-NOTFOUND + +//The directory containing a CMake configuration file for Qt. +Qt_DIR:PATH=Qt_DIR-NOTFOUND + //Value Computed by CMake presenter_BINARY_DIR:STATIC=/home/chris/dev/church-presenter/build @@ -615,11 +630,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.90.0(5.68.0)] +FIND_PACKAGE_MESSAGE_DETAILS_KF5:INTERNAL=[success][cfound components: Kirigami2 I18n CoreAddons ][v5.87.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.90.0()] +FIND_PACKAGE_MESSAGE_DETAILS_KF5I18n:INTERNAL=[/usr/lib64/cmake/KF5I18n/KF5I18nConfig.cmake][v5.87.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 2ff999d..5d9e5ac 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-noconfig.cmake" + "/usr/lib64/cmake/KF5I18n/KF5I18nTargets-debug.cmake" "/usr/lib64/cmake/KF5I18n/KF5I18nTargets.cmake" "/usr/lib64/cmake/KF5Kirigami2/KF5Kirigami2Config.cmake" "/usr/lib64/cmake/KF5Kirigami2/KF5Kirigami2ConfigVersion.cmake" @@ -54,35 +54,25 @@ 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" @@ -112,6 +102,14 @@ set(CMAKE_MAKEFILE_DEPENDS "/usr/lib64/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake" "/usr/lib64/cmake/Qt5QuickControls2/Qt5QuickControls2Config.cmake" "/usr/lib64/cmake/Qt5QuickControls2/Qt5QuickControls2ConfigVersion.cmake" + "/usr/lib64/cmake/Qt5Sql/Qt5SqlConfig.cmake" + "/usr/lib64/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake" + "/usr/lib64/cmake/Qt5Sql/Qt5Sql_QIBaseDriverPlugin.cmake" + "/usr/lib64/cmake/Qt5Sql/Qt5Sql_QMYSQLDriverPlugin.cmake" + "/usr/lib64/cmake/Qt5Sql/Qt5Sql_QODBCDriverPlugin.cmake" + "/usr/lib64/cmake/Qt5Sql/Qt5Sql_QPSQLDriverPlugin.cmake" + "/usr/lib64/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake" + "/usr/lib64/cmake/Qt5Sql/Qt5Sql_QTDSDriverPlugin.cmake" "/usr/lib64/cmake/Qt5Test/Qt5TestConfig.cmake" "/usr/lib64/cmake/Qt5Test/Qt5TestConfigExtras.cmake" "/usr/lib64/cmake/Qt5Test/Qt5TestConfigVersion.cmake" @@ -119,11 +117,6 @@ 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/CMakeLists.txt b/src/CMakeLists.txt index ca28ab9..3b6433a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,6 +12,7 @@ target_link_libraries(presenter Qt5::Gui Qt5::QuickControls2 Qt5::Widgets + Qt5::Sql KF5::Kirigami2 KF5::I18n ) diff --git a/src/main.cpp b/src/main.cpp index 68452a3..188f178 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml index d63e45d..926799f 100644 --- a/src/qml/presenter/SongEditor.qml +++ b/src/qml/presenter/SongEditor.qml @@ -106,6 +106,8 @@ Item { text: songLyrics textFormat: TextEdit.MarkdownText padding: 10 + onEditingFinished: showPassiveNotification("updated...", 2000) + onPressed: editorTimer.running = true } } @@ -133,4 +135,12 @@ Item { padding: 10 } } + + Timer { + id: editorTimer + interval: 1000 + repeat: true + running: false + onTriggered: showPassiveNotification("updating song...") + } }