refactor directories

SZXC-WG · Dec 7, 2024 · 9b5d1b7 · 9b5d1b7
1 parent 2e049a3
commit 9b5d1b7
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,11 +13,11 @@ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
 
 set(PROJECT_SOURCES
-        main.cpp
-        mainwindow.cpp
-        mainwindow.h
-        mainwindow.ui
-        res.qrc
+        src/main.cpp
+        src/mainWindow/mainWindow.cpp
+        src/mainWindow/mainWindow.h
+        src/mainWindow/mainWindow.ui
+        res/res.qrc
 )
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)

diff --git a/main.cpp b/main.cpp
diff --git a/mainwindow.cpp b/mainwindow.cpp
diff --git a/img/README.md → res/img/README.md b/img/README.md → res/img/README.md
diff --git a/img/city.png → res/img/city.png b/img/city.png → res/img/city.png
diff --git a/img/crown.png → res/img/crown.png b/img/crown.png → res/img/crown.png
diff --git a/img/currentOn.png → res/img/currentOn.png b/img/currentOn.png → res/img/currentOn.png
diff --git a/img/donate_alipay.png → res/img/donate_alipay.png b/img/donate_alipay.png → res/img/donate_alipay.png
diff --git a/img/donate_wechat.png → res/img/donate_wechat.png b/img/donate_wechat.png → res/img/donate_wechat.png
diff --git a/img/erase.png → res/img/erase.png b/img/erase.png → res/img/erase.png
diff --git a/img/favicon.png → res/img/favicon.png b/img/favicon.png → res/img/favicon.png
diff --git a/img/github.png → res/img/github.png b/img/github.png → res/img/github.png
diff --git a/img/light.png → res/img/light.png b/img/light.png → res/img/light.png
diff --git a/img/mountain.png → res/img/mountain.png b/img/mountain.png → res/img/mountain.png
diff --git a/img/obstacle.png → res/img/obstacle.png b/img/obstacle.png → res/img/obstacle.png
diff --git a/img/options.png → res/img/options.png b/img/options.png → res/img/options.png
diff --git a/img/swamp.png → res/img/swamp.png b/img/swamp.png → res/img/swamp.png
diff --git a/res.qrc → res/res.qrc b/res.qrc → res/res.qrc
diff --git a/src/main.cpp b/src/main.cpp
@@ -0,0 +1,10 @@
+#include "mainWindow/mainWindow.h"
+
+#include <QApplication>
+
+int main(int argc, char* argv[]) {
+    QApplication a(argc, argv);
+    MainWindow w;
+    w.show();
+    return a.exec();
+}
diff --git a/src/mainWindow/mainWindow.cpp b/src/mainWindow/mainWindow.cpp
@@ -0,0 +1,11 @@
+#include "mainWindow.h"
+#include "./ui_mainWindow.h"
+
+MainWindow::MainWindow(QWidget* parent) :
+    QMainWindow(parent), ui(new Ui::MainWindow) {
+    ui->setupUi(this);
+}
+
+MainWindow::~MainWindow() {
+    delete ui;
+}
diff --git a/mainwindow.h → src/mainWindow/mainWindow.h b/mainwindow.h → src/mainWindow/mainWindow.h
diff --git a/mainwindow.ui → src/mainWindow/mainWindow.ui b/mainwindow.ui → src/mainWindow/mainWindow.ui
@@ -19,7 +19,7 @@
    <string>LocalGen 6.0.0</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="res.qrc">
+   <iconset resource="../../res/res.qrc">
     <normaloff>:/images/img/favicon.png</normaloff>:/images/img/favicon.png</iconset>
   </property>
   <property name="styleSheet">
@@ -58,7 +58,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="res.qrc">:/images/img/favicon.png</pixmap>
+         <pixmap resource="../../res/res.qrc">:/images/img/favicon.png</pixmap>
         </property>
         <property name="alignment">
          <set>Qt::AlignmentFlag::AlignCenter</set>
@@ -293,7 +293,8 @@
   </widget>
  </widget>
  <resources>
-  <include location="res.qrc"/>
+  <include location="../../res/res.qrc"/>
+  <include location="../../res/res.qrc"/>
  </resources>
  <connections/>
 </ui>