fix diverse mistakes

jacquetc · Jan 20, 2024 · 6a241d0 · 6a241d0
1 parent 570f225
commit 6a241d0
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,7 @@ option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 option(QLEANY_BUILD_WITH_QT_GUI "Build with Qt GUI" ON)
 
 if(QLEANY_BUILD_WITH_QT_GUI)
-    add_compile_definitions(QLEANY_BUILD_WITH_QT_GUI=1)
+    add_compile_definitions(QLEANY_BUILD_WITH_QT_GUI=true)
 endif()
 
 if(BUILD_SHARED_LIBS)

diff --git a/tools/qleany/generator/qleany_generator_gui.py b/tools/qleany/generator/qleany_generator_gui.py
@@ -662,6 +662,12 @@ def generate_all(self):
                 self.file_list_view.fetch_file_states(),
                 self.uncrustify_config_file,
             )
+            presenter_generator.generate_presenter_files(
+                self.root_path,
+                self.temp_manifest_file,
+                self.file_list_view.fetch_file_states(),
+                self.uncrustify_config_file,
+            )
             application_generator.generate_application_files(
                 self.root_path,
                 self.temp_manifest_file,

diff --git a/tools/qleany/generator/templates/controller/cmakelists_template.jinja2 b/tools/qleany/generator/templates/controller/cmakelists_template.jinja2
@@ -1,7 +1,7 @@
 # This file was generated automatically by Qleany's generator, edit at your own risk! 
 # If you do, be careful to not overwrite it when you run the generator again.
 
-find_package(Qt6 COMPONENTS Core REQUIRED)
+find_package(Qt6 COMPONENTS Core Gui REQUIRED)
 find_package(QCoro6 REQUIRED COMPONENTS Core)
 find_package(qleany CONFIG REQUIRED) 
 
@@ -40,7 +40,7 @@ target_link_libraries(${LIBRARY_NAME} PUBLIC {{ application_spinalcase_name }}-a
 {% endfor -%}
 
 target_link_libraries(${LIBRARY_NAME} PRIVATE
-    Qt6::Core Qt::Gui)
+    Qt6::Core Qt6::Gui)
 target_link_libraries(${LIBRARY_NAME} PRIVATE QCoro::Core)
 target_link_libraries(${LIBRARY_NAME} PRIVATE qleany)
 

diff --git a/tools/qleany/generator/templates/controller/controller.cpp.jinja2 b/tools/qleany/generator/templates/controller/controller.cpp.jinja2
@@ -1,5 +1,6 @@
 // This file was generated automatically by Qleany's generator, edit at your own risk! 
 // If you do, be careful to not overwrite it when you run the generator again.
+
 #include "{{ feature_name_snake }}_controller.h"
 
 {% if feature.crud.enabled -%}
@@ -9,7 +10,7 @@
     {%if feature.crud.get_with_details -%}
 #include "{{ feature_name_snake }}/queries/get_{{ entity_name_snake }}_with_details_query_handler.h"
     {% endif -%}
-    {%if feature.crud.create -%}
+    {%if feature.crud.get_all -%}
 #include "{{ feature_name_snake }}/queries/get_all_{{ entity_name_snake }}_query_handler.h"
     {% endif -%}
     {%if feature.crud.create -%}

diff --git a/tools/qleany/generator/templates/controller/controller_registration.cpp.jinja2 b/tools/qleany/generator/templates/controller/controller_registration.cpp.jinja2
@@ -1,3 +1,6 @@
+// This file was generated automatically by Qleany's generator, edit at your own risk! 
+// If you do, be careful to not overwrite it when you run the generator again.
+
 #include "controller_registration.h"
 #include "event_dispatcher.h"
 {% for feature in features -%}

diff --git a/tools/qleany/generator/templates/controller/controller_registration.h.jinja2 b/tools/qleany/generator/templates/controller/controller_registration.h.jinja2
@@ -1,3 +1,6 @@
+// This file was generated automatically by Qleany's generator, edit at your own risk! 
+// If you do, be careful to not overwrite it when you run the generator again.
+
 #pragma once
 
 #include "{{ export_header_file }}"

diff --git a/tools/qleany/generator/templates/controller/undo_redo_controller.h.jinja2 b/tools/qleany/generator/templates/controller/undo_redo_controller.h.jinja2
@@ -5,6 +5,7 @@
 #include "{{ export_header_file }}"
 #include "event_dispatcher.h"
 
+#include <QAction>
 #include <QObject>
 #include <QPointer>
 #include <QSharedPointer>