Merge pull request #13 from BreeDurbin/ui-files-2

split ui file inti multiple ui files

.vscode/settings.json

@@ -79,7 +79,9 @@
         "qlistview": "cpp",
         "qgroupbox": "cpp",
         "qlabel": "cpp",
-        "qtabwidget": "cpp"
+        "qtabwidget": "cpp",
+        "qdialog": "cpp",
+        "qwidget": "cpp"
     },
     "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools"
 }

CMakeLists.txt

@@ -12,5 +12,4 @@ if(CMAKE_VERSION VERSION_LESS "3.7.0")
     set(CMAKE_INCLUDE_CURRENT_DIR ON)
 endif()
 
-add_subdirectory(lib)
 add_subdirectory(src)

src/CMakeLists.txt

@@ -1,66 +1,5 @@
 
-set(Boost_USE_STATIC_LIBS OFF) 
-set(Boost_USE_MULTITHREADED ON)  
-set(Boost_USE_STATIC_RUNTIME OFF) 
-
-find_package(Boost 1.83.0 COMPONENTS filesystem) 
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-find_package(Qt6 COMPONENTS Core Widgets Gui REQUIRED)
-qt_standard_project_setup()
-
-set(HEADER_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/mainwindow.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/model/include/creaturemodel.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.ui
-)
-
-set(SOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/model/creaturemodel.cpp
-)
-
-set(RESOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/graphics.qrc
-    ${CMAKE_CURRENT_SOURCE_DIR}/resources.qrc
-)
-
-
-add_executable(
-    ${PROJECT_NAME}
-    #headers
-    ${HEADER_FILES}
-    #sources
-    ${SOURCE_FILES}
-    #resources
-    ${RESOURCE_FILES}
-)
-
-target_include_directories(
-    ${PROJECT_NAME} 
-    PRIVATE 
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/component/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/model/include
-)
-
-target_link_libraries(
-    ${PROJECT_NAME} 
-    PRIVATE 
-    styleLib
-    Qt6::Core
-    Qt6::Widgets 
-    Qt6::Gui
-    ${Boost_LIBRARIES}
-)
-
-set_target_properties(
-    ${PROJECT_NAME}
-    PROPERTIES
-    WIN32_EXECUTABLE ON
-    MACOSX_BUNDLE ON
-)
+add_subdirectory(style)
+add_subdirectory(model)
+add_subdirectory(qt)
+add_subdirectory(cyrus)

src/cyrus/CMakeLists.txt

@@ -0,0 +1,34 @@
+
+set(Boost_USE_STATIC_LIBS OFF) 
+set(Boost_USE_MULTITHREADED ON)  
+set(Boost_USE_STATIC_RUNTIME OFF) 
+
+find_package(Boost 1.83.0 COMPONENTS filesystem) 
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt6 COMPONENTS Core Widgets Gui REQUIRED)
+qt_standard_project_setup()
+
+add_executable(
+    ${PROJECT_NAME}
+    #sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+)
+
+target_link_libraries(
+    ${PROJECT_NAME} 
+    PRIVATE
+    styleLib
+    qtLib
+    modelLib
+)
+
+set_target_properties(
+    ${PROJECT_NAME}
+    PROPERTIES
+    WIN32_EXECUTABLE ON
+    MACOSX_BUNDLE ON
+)

src/main.cpp → src/cyrus/main.cpp

@@ -6,13 +6,14 @@
 #include <QDebug>
 #include <QPalette>
 
-#include <mainwindow.hpp>
+#include <CyrusDialog.h>
 
 int main(int argc, char* argv[])
-{      
+{    
     QApplication *a = new QApplication(argc, argv);
+    QGuiApplication::setDesktopFileName("org.cyrus.Cyrus");
 
-    MainWindow w;
+    CyrusDialog w;
     w.show();
 
     return a->exec();

src/model/CMakeLists.txt

@@ -0,0 +1,36 @@
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt6 COMPONENTS Core Widgets Gui REQUIRED)
+qt_standard_project_setup()
+
+set(HEADER_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/CreatureModel/CreatureModel.h
+)
+
+set(SOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/CreatureModel/CreatureModel.cpp
+)
+
+add_library(
+    modelLib
+    #sources
+    ${SOURCE_FILES}
+)
+
+target_link_libraries(
+    modelLib
+    PRIVATE
+    styleLib
+    Qt6::Core
+    Qt6::Widgets 
+    Qt6::Gui
+)
+
+target_include_directories(
+    modelLib
+    INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/CreatureModel
+)

src/model/creaturemodel.cpp → src/model/CreatureModel/CreatureModel.cpp

@@ -1,9 +1,9 @@
-#include "include/creaturemodel.hpp"
+#include "CreatureModel.h"
 #include <QBrush>
 #include <QColor>
 #include <QFont>
 #include <QIcon>
-#include "colorrepository.hpp"
+#include "colorrepository.h"
 
 
 CreatureModel::CreatureModel(QObject *parent){

src/qt/CMakeLists.txt

@@ -0,0 +1,74 @@
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt6 COMPONENTS Core Widgets Gui REQUIRED)
+qt_standard_project_setup()
+
+set(HEADER_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/CyrusDialog/CyrusDialog.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/CombatPage/CombatPage.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/CreaturePage/CreaturePage.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/WorldPage/WorldPage.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/CampaignPage/CampaignPage.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/SettingsPage/SettingsPage.h
+)
+
+set(SOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/CyrusDialog/CyrusDialog.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/CombatPage/CombatPage.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/CreaturePage/CreaturePage.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/WorldPage/WorldPage.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/CampaignPage/CampaignPage.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/SettingsPage/SettingsPage.cpp
+)
+
+set(UI_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/CyrusDialog/CyrusDialog.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/CombatPage/CombatPage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/CreaturePage/CreaturePage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/WorldPage/WorldPage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/CampaignPage/CampaignPage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/SettingsPage/SettingsPage.ui
+)
+
+set(RESOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/asset/graphics.qrc
+    ${CMAKE_CURRENT_SOURCE_DIR}/asset/resources.qrc
+)
+
+add_library(
+    qtLib
+    STATIC
+    #headers
+    ${HEADER_FILES}
+    #ui
+    ${UI_FILES}
+    #sources
+    ${SOURCE_FILES}
+    #resources
+    ${RESOURCE_FILES}
+)
+
+target_link_libraries(
+    qtLib
+    PUBLIC
+    styleLib
+    modelLib
+    Qt6::Core
+    Qt6::Widgets 
+    Qt6::Gui
+)
+
+target_include_directories(
+    qtLib
+    PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/CyrusDialog
+    INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/CampaignPage
+    ${CMAKE_CURRENT_SOURCE_DIR}/CombatPage
+    ${CMAKE_CURRENT_SOURCE_DIR}/CreaturePage
+    ${CMAKE_CURRENT_SOURCE_DIR}/SettingsPage
+    ${CMAKE_CURRENT_SOURCE_DIR}/WorldPage
+)

src/qt/CampaignPage/CampaignPage.cpp

@@ -0,0 +1,16 @@
+#include "CampaignPage.h"
+#include "ui_CampaignPage.h"
+
+CampaignPage::CampaignPage(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::CampaignPage)
+{
+    ui->setupUi(this);
+}
+
+CampaignPage::~CampaignPage()
+{
+    delete ui;
+}
+
+

src/qt/CampaignPage/CampaignPage.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <QWidget>
+
+QT_BEGIN_NAMESPACE
+namespace Ui{ class CampaignPage; }
+QT_END_NAMESPACE
+
+class CampaignPage : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit CampaignPage(QWidget *parent = nullptr);
+    ~CampaignPage();
+
+private:
+    Ui::CampaignPage *ui;
+};