aboutsummaryrefslogtreecommitdiff
path: root/ui.qt
diff options
context:
space:
mode:
Diffstat (limited to 'ui.qt')
-rw-r--r--ui.qt/CMakeLists.txt23
-rw-r--r--ui.qt/qml/Document.qml (renamed from ui.qt/source/qml/Document.qml)0
-rw-r--r--ui.qt/qml/GoToKnowledge.qml (renamed from ui.qt/source/qml/GoToKnowledge.qml)0
-rw-r--r--ui.qt/qml/MainWindow.qml (renamed from ui.qt/source/qml/MainWindow.qml)0
-rw-r--r--ui.qt/qml/Navigator.qml (renamed from ui.qt/source/qml/Navigator.qml)0
-rw-r--r--ui.qt/src/DatabaseClient.cpp (renamed from ui.qt/source/DatabaseClient.cpp)0
-rw-r--r--ui.qt/src/DatabaseClient.hpp (renamed from ui.qt/source/DatabaseClient.hpp)0
-rw-r--r--ui.qt/src/DatabaseServer.cpp (renamed from ui.qt/source/DatabaseServer.cpp)0
-rw-r--r--ui.qt/src/DatabaseServer.hpp (renamed from ui.qt/source/DatabaseServer.hpp)0
-rw-r--r--ui.qt/src/Document.cpp (renamed from ui.qt/source/Document.cpp)0
-rw-r--r--ui.qt/src/Document.hpp (renamed from ui.qt/source/Document.hpp)0
-rw-r--r--ui.qt/src/Keyword.cpp (renamed from ui.qt/source/Keyword.cpp)0
-rw-r--r--ui.qt/src/Keyword.hpp (renamed from ui.qt/source/Keyword.hpp)0
-rw-r--r--ui.qt/src/KnowledgeFragment.cpp (renamed from ui.qt/source/KnowledgeFragment.cpp)0
-rw-r--r--ui.qt/src/KnowledgeFragment.hpp (renamed from ui.qt/source/KnowledgeFragment.hpp)0
-rw-r--r--ui.qt/src/fwd.hpp (renamed from ui.qt/source/fwd.hpp)0
-rw-r--r--ui.qt/src/main.cpp (renamed from ui.qt/source/main.cpp)4
17 files changed, 10 insertions, 17 deletions
diff --git a/ui.qt/CMakeLists.txt b/ui.qt/CMakeLists.txt
index c235133..f59962f 100644
--- a/ui.qt/CMakeLists.txt
+++ b/ui.qt/CMakeLists.txt
@@ -5,27 +5,20 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-find_package(Qt6 6.2 COMPONENTS Network Widgets Quick REQUIRED)
+find_package(Qt6 6.3 COMPONENTS Network Widgets Quick REQUIRED)
+file(GLOB_RECURSE appEpistmoolUI_SRC_HPP_FILES src/*.hpp)
+file(GLOB_RECURSE appEpistmoolUI_SRC_CPP_FILES src/*.cpp)
qt_add_executable(appEpistmoolUI
- source/main.cpp
- source/fwd.hpp
- source/DatabaseClient.hpp source/DatabaseClient.cpp
- source/DatabaseServer.hpp source/DatabaseServer.cpp
- source/KnowledgeFragment.hpp source/KnowledgeFragment.cpp
- source/Keyword.hpp source/Keyword.cpp
+ ${appEpistmoolUI_SRC_HPP_FILES}
+ ${appEpistmoolUI_SRC_CPP_FILES}
)
+file(GLOB_RECURSE appEpistmoolUI_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} qml/*.qml)
qt_add_qml_module(appEpistmoolUI
URI EpistmoolUI
VERSION 1.0
- SOURCES
- source/Document.hpp source/Document.cpp
- QML_FILES
- source/qml/MainWindow.qml
- source/qml/Navigator.qml
- source/qml/Document.qml
- source/qml/GoToKnowledge.qml
+ QML_FILES ${appEpistmoolUI_QML_FILES}
)
set_target_properties(appEpistmoolUI PROPERTIES
@@ -36,7 +29,7 @@ set_target_properties(appEpistmoolUI PROPERTIES
WIN32_EXECUTABLE TRUE
)
-target_include_directories(appEpistmoolUI PUBLIC source)
+target_include_directories(appEpistmoolUI PUBLIC src)
target_compile_definitions(appEpistmoolUI PRIVATE
$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>
)
diff --git a/ui.qt/source/qml/Document.qml b/ui.qt/qml/Document.qml
index a3d4075..a3d4075 100644
--- a/ui.qt/source/qml/Document.qml
+++ b/ui.qt/qml/Document.qml
diff --git a/ui.qt/source/qml/GoToKnowledge.qml b/ui.qt/qml/GoToKnowledge.qml
index f97cbcf..f97cbcf 100644
--- a/ui.qt/source/qml/GoToKnowledge.qml
+++ b/ui.qt/qml/GoToKnowledge.qml
diff --git a/ui.qt/source/qml/MainWindow.qml b/ui.qt/qml/MainWindow.qml
index d81fb4f..d81fb4f 100644
--- a/ui.qt/source/qml/MainWindow.qml
+++ b/ui.qt/qml/MainWindow.qml
diff --git a/ui.qt/source/qml/Navigator.qml b/ui.qt/qml/Navigator.qml
index 40c66e4..40c66e4 100644
--- a/ui.qt/source/qml/Navigator.qml
+++ b/ui.qt/qml/Navigator.qml
diff --git a/ui.qt/source/DatabaseClient.cpp b/ui.qt/src/DatabaseClient.cpp
index 430fe79..430fe79 100644
--- a/ui.qt/source/DatabaseClient.cpp
+++ b/ui.qt/src/DatabaseClient.cpp
diff --git a/ui.qt/source/DatabaseClient.hpp b/ui.qt/src/DatabaseClient.hpp
index 17c6ed7..17c6ed7 100644
--- a/ui.qt/source/DatabaseClient.hpp
+++ b/ui.qt/src/DatabaseClient.hpp
diff --git a/ui.qt/source/DatabaseServer.cpp b/ui.qt/src/DatabaseServer.cpp
index a850e63..a850e63 100644
--- a/ui.qt/source/DatabaseServer.cpp
+++ b/ui.qt/src/DatabaseServer.cpp
diff --git a/ui.qt/source/DatabaseServer.hpp b/ui.qt/src/DatabaseServer.hpp
index 0cd5039..0cd5039 100644
--- a/ui.qt/source/DatabaseServer.hpp
+++ b/ui.qt/src/DatabaseServer.hpp
diff --git a/ui.qt/source/Document.cpp b/ui.qt/src/Document.cpp
index 272ac4c..272ac4c 100644
--- a/ui.qt/source/Document.cpp
+++ b/ui.qt/src/Document.cpp
diff --git a/ui.qt/source/Document.hpp b/ui.qt/src/Document.hpp
index 5ef1bba..5ef1bba 100644
--- a/ui.qt/source/Document.hpp
+++ b/ui.qt/src/Document.hpp
diff --git a/ui.qt/source/Keyword.cpp b/ui.qt/src/Keyword.cpp
index f6c18be..f6c18be 100644
--- a/ui.qt/source/Keyword.cpp
+++ b/ui.qt/src/Keyword.cpp
diff --git a/ui.qt/source/Keyword.hpp b/ui.qt/src/Keyword.hpp
index 481b5bb..481b5bb 100644
--- a/ui.qt/source/Keyword.hpp
+++ b/ui.qt/src/Keyword.hpp
diff --git a/ui.qt/source/KnowledgeFragment.cpp b/ui.qt/src/KnowledgeFragment.cpp
index 3d08f6e..3d08f6e 100644
--- a/ui.qt/source/KnowledgeFragment.cpp
+++ b/ui.qt/src/KnowledgeFragment.cpp
diff --git a/ui.qt/source/KnowledgeFragment.hpp b/ui.qt/src/KnowledgeFragment.hpp
index 9f4912d..9f4912d 100644
--- a/ui.qt/source/KnowledgeFragment.hpp
+++ b/ui.qt/src/KnowledgeFragment.hpp
diff --git a/ui.qt/source/fwd.hpp b/ui.qt/src/fwd.hpp
index 14e0033..14e0033 100644
--- a/ui.qt/source/fwd.hpp
+++ b/ui.qt/src/fwd.hpp
diff --git a/ui.qt/source/main.cpp b/ui.qt/src/main.cpp
index 863ee20..e8af4aa 100644
--- a/ui.qt/source/main.cpp
+++ b/ui.qt/src/main.cpp
@@ -8,7 +8,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QTranslator translator;
- const QStringList uiLanguages = QLocale::system().uiLanguages();
+ QStringList uiLanguages = QLocale::system().uiLanguages();
for (const QString& locale : uiLanguages) {
const QString baseName = "EpistmoolUI_" + QLocale(locale).name();
if (translator.load(":/i18n/" + baseName)) {
@@ -18,7 +18,7 @@ int main(int argc, char *argv[])
}
QQmlApplicationEngine engine;
- const QUrl url(u"qrc:/EpistmoolUI/source/qml/MainWindow.qml"_qs);
+ QUrl url(u"qrc:/EpistmoolUI/qml/MainWindow.qml"_qs);
QObject::connect(
&engine,
&QQmlApplicationEngine::objectCreated,