Update

取消了命名空间，增加了图标(cmake宏定义命名空间和图标有冲突)
supine0703 · Mar 18, 2024 · 52ef47a · 52ef47a
1 parent 8062f3b
commit 52ef47a
Show file tree

Hide file tree

Showing 43 changed files with 73 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,4 +63,5 @@ dkms.conf
 !/proj/proteus/*.pdsprj
 !/proj/hex/*.hex
 /qt/build*/
-/qt/Release
+/qt/Release
+*.7z
diff --git a/qt/Release.7z b/qt/Release.7z
diff --git a/qt/power_carrier/CMakeLists.txt b/qt/power_carrier/CMakeLists.txt
@@ -27,14 +27,6 @@ set(GLOBAL_DEFINED
     DB_PATH="${FILES_PATH}/db"
 )
 
-string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPERCASE)
-set(PROJECT_NAMESPACE_DEFINED
-    PROJECT_NAMESPACE_NAME=${PROJECT_NAME}
-    PROJECT_BEGIN_NAMESPACE=namespace\ ${PROJECT_NAME}\ \{
-    PROJECT_USING_NAMESPACE=using\ namespace\ ${PROJECT_NAME}
-    PROJECT_END_NAMESPACE=\}
-)
-
 set(INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/include")
 set(SRC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set(UI_PATH "${CMAKE_CURRENT_SOURCE_DIR}/ui")
@@ -44,7 +36,6 @@ list(APPEND CMAKE_AUTOUIC_SEARCH_PATHS
 )
 
 include_directories(
-    "${CMAKE_CURRENT_SOURCE_DIR}"
     "${INCLUDE_PATH}"
     "${INCLUDE_PATH}/dialog"
     "${INCLUDE_PATH}/widget"
@@ -63,18 +54,15 @@ file(GLOB_RECURSE ISU_FILES
 # file(GLOB UI_FILES "${UI_PATH}/*.ui")
 
 set(PROJECT_SOURCES
-        ${ISU_FILES}
-        _res.qrc
+    ${ISU_FILES}
+    res/_res.qrc
+    res/_app.rc
 )
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     qt_add_executable(${PROJECT_NAME}
         MANUAL_FINALIZATION
         ${PROJECT_SOURCES}
-
-        # safetools.h safetools.cpp
-        # testruntime.hpp
-
     )
 # Define target properties for Android with Qt 6 as:
 #    set_property(TARGET power_carrier APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
@@ -96,7 +84,6 @@ endif()
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE
     ${GLOBAL_DEFINED}
-    ${PROJECT_NAMESPACE_DEFINED}
 )
 target_link_libraries(${PROJECT_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::Widgets

diff --git a/qt/power_carrier/_res.qrc b/qt/power_carrier/_res.qrc
diff --git a/qt/power_carrier/abandon/communication.cpp b/qt/power_carrier/abandon/communication.cpp
@@ -1,6 +1,6 @@
 #include "communication.h"
 
-PROJECT_USING_NAMESPACE;
+
 
 Communication::Communication(quint8 pc_address)
     : addr(pc_address)

diff --git a/qt/power_carrier/abandon/communication.h b/qt/power_carrier/abandon/communication.h
@@ -3,7 +3,7 @@
 
 #include <QtTypes>
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class Communication
 {
@@ -16,6 +16,6 @@ class Communication
     quint8 addr;
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // COMMUNICATION_H
diff --git a/qt/power_carrier/abandon/mainwindow_2.cpp b/qt/power_carrier/abandon/mainwindow_2.cpp
@@ -13,7 +13,7 @@
 #include <QFrame>
 #include <QTableView>
 
-PROJECT_USING_NAMESPACE;
+
 
 MainWindow_2::MainWindow_2(QWidget* parent)
     : QMainWindow{parent}

diff --git a/qt/power_carrier/abandon/mainwindow_2.h b/qt/power_carrier/abandon/mainwindow_2.h
@@ -3,7 +3,7 @@
 
 #include <QMainWindow>
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class SerialPortWidget;
 
@@ -33,6 +33,6 @@ class MainWindow_2 : public QMainWindow
 signals:
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // MAINWINDOW_2_H
diff --git a/qt/power_carrier/abandon/serialport.cpp b/qt/power_carrier/abandon/serialport.cpp
@@ -4,7 +4,7 @@
 #include <QMessageBox>
 #include <QMetaEnum>
 
-PROJECT_USING_NAMESPACE;
+
 
 SerialPort::SerialPort(QObject* parent) : QObject {parent}
 {

diff --git a/qt/power_carrier/abandon/serialport.h b/qt/power_carrier/abandon/serialport.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include <QSerialPort>
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class SerialPort : public QObject
 {
@@ -46,6 +46,6 @@ public slots:
     void receiveStr(QString);
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // SERIALPORT_H
diff --git a/qt/power_carrier/testruntime.hpp → qt/power_carrier/abandon/testruntime.hpp b/qt/power_carrier/testruntime.hpp → qt/power_carrier/abandon/testruntime.hpp
diff --git a/qt/power_carrier/include/dialog/addslavedialog.h b/qt/power_carrier/include/dialog/addslavedialog.h
@@ -9,7 +9,7 @@ class AddSlaveDialog;
 
 class QTableWidgetItem;
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class AddSlaveDialog : public QDialog
 {
@@ -70,6 +70,6 @@ private slots:
     void updateInfo(QStringList, QStringList, QStringList);
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // ADDSLAVEDIALOG_H
diff --git a/qt/power_carrier/include/dialog/comrangedialog.h b/qt/power_carrier/include/dialog/comrangedialog.h
@@ -7,7 +7,7 @@ namespace Ui {
 class ComRangeDialog;
 }
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class ComRangeDialog : public QDialog
 {
@@ -37,6 +37,6 @@ private slots:
 signals:
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // COMRANGEDIALOG_H
diff --git a/qt/power_carrier/include/dialog/newdbfiledialog.h b/qt/power_carrier/include/dialog/newdbfiledialog.h
@@ -7,7 +7,7 @@ namespace Ui {
 class NewDBFileDialog;
 }
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class NewDBFileDialog : public QDialog
 {
@@ -43,6 +43,6 @@ private slots:
     QString f;
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // NEWDBFILEDIALOG_H
diff --git a/qt/power_carrier/include/model/sqltablemodel.h b/qt/power_carrier/include/model/sqltablemodel.h
@@ -3,7 +3,7 @@
 
 #include <QSqlQueryModel>
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class SqlTableModel : public QSqlQueryModel
 {
@@ -15,6 +15,6 @@ class SqlTableModel : public QSqlQueryModel
     QVariant data(const QModelIndex& index, int role) const override;
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // SQLTABLEMODEL_H
diff --git a/qt/power_carrier/include/object/comlist.h b/qt/power_carrier/include/object/comlist.h
@@ -8,7 +8,7 @@ class QThread;
 class QComboBox;
 
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class SerialPortManager;
 
@@ -49,6 +49,6 @@ private slots:
     void currentComChanged();
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // COMLIST_H
diff --git a/qt/power_carrier/include/object/configurations.h b/qt/power_carrier/include/object/configurations.h
@@ -9,7 +9,7 @@
 
 #define ICON_FONT Configurations::LoadIconFont
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class Configurations
 {
@@ -56,6 +56,6 @@ class Configurations
 
 #define _MAIN_WIDGET_WIDTH_   "/widget/width"
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // CONFIGURATIONS_H
diff --git a/qt/power_carrier/include/object/crc16.h b/qt/power_carrier/include/object/crc16.h
@@ -3,7 +3,7 @@
 
 #include <QByteArray>
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class CRC16
 {
@@ -19,6 +19,6 @@ class CRC16
     static quint16* t1021;
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // CRC16_H
diff --git a/qt/power_carrier/include/object/serialportmanager.h b/qt/power_carrier/include/object/serialportmanager.h
@@ -7,7 +7,7 @@ class QMutex;
 class QTimer;
 
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class SerialPortManager : public QObject
 {
@@ -47,6 +47,6 @@ public slots:
     void availablePortsChanged();
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // SERIALPORTMANAGER_H
diff --git a/qt/power_carrier/include/object/serialportworker.h b/qt/power_carrier/include/object/serialportworker.h
@@ -6,7 +6,7 @@
 class QSerialPort;
 class QMutex;
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class SerialPortWorker : public QObject
 {
@@ -73,6 +73,6 @@ private slots:
     void errorLog(QString);
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // SERIALPORTWORKER_H
diff --git a/qt/power_carrier/include/widget/mainwidget.h b/qt/power_carrier/include/widget/mainwidget.h
@@ -10,7 +10,7 @@ class MainWidget;
 class QStatusBar;
 
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class SerialPortWidget;
 class SQLiteWidget;
@@ -49,6 +49,6 @@ class MainWidget : public QWidget
     SQLiteWidget* sqlWidget;
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // MAINWIDGET_H
diff --git a/qt/power_carrier/include/widget/serialportwidget.h b/qt/power_carrier/include/widget/serialportwidget.h
@@ -12,7 +12,7 @@ class SerialPortWidget;
 class QMessageBox;
 
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class ComList;
 class ComRangeDialog;
@@ -136,6 +136,6 @@ private slots:
     void slaveStateUpdate(quint8, quint8);
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // SERIALPORTWIDGET_H
diff --git a/qt/power_carrier/include/widget/sqlitewidget.h b/qt/power_carrier/include/widget/sqlitewidget.h
@@ -13,7 +13,7 @@ class QDataWidgetMapper;
 class QItemSelectionModel;
 class QSortFilterProxyModel;
 
-PROJECT_BEGIN_NAMESPACE
+ 
 
 class NewDBFileDialog;
 class AddSlaveDialog;
@@ -85,6 +85,6 @@ private slots:
     void slaveStateChange(quint8 ,quint8);
 };
 
-PROJECT_END_NAMESPACE
+ 
 
 #endif // SQLITEWIDGET_H
diff --git a/qt/power_carrier/res/_res.qrc b/qt/power_carrier/res/_res.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/icon">
+        <file>iconfont/iconfont.ttf</file>
+        <file>img/AppIcon.ico</file>
+    </qresource>
+    <qresource prefix="/font">
+        <file>font_family/JetBrainsMono-Medium.ttf</file>
+        <file>font_family/YouSheYuFeiTeJianKangTi-2.ttf</file>
+    </qresource>
+</RCC>
diff --git a/...arrier/res/fonts/JetBrainsMono-Medium.ttf → .../res/font_family/JetBrainsMono-Medium.ttf b/...arrier/res/fonts/JetBrainsMono-Medium.ttf → .../res/font_family/JetBrainsMono-Medium.ttf
diff --git a/...r/res/fonts/YouSheYuFeiTeJianKangTi-2.ttf → ...font_family/YouSheYuFeiTeJianKangTi-2.ttf b/...r/res/fonts/YouSheYuFeiTeJianKangTi-2.ttf → ...font_family/YouSheYuFeiTeJianKangTi-2.ttf
diff --git a/qt/power_carrier/res/fonts/README.md b/qt/power_carrier/res/fonts/README.md
diff --git a/qt/power_carrier/res/img/AppIcon.ico b/qt/power_carrier/res/img/AppIcon.ico
diff --git a/qt/power_carrier/res/img/PowerCarrier.png b/qt/power_carrier/res/img/PowerCarrier.png
diff --git a/qt/power_carrier/share/config.ini b/qt/power_carrier/share/config.ini
@@ -13,20 +13,20 @@ parity_index=3
 [log_settings]
 log1_selector=true
 log2_selector=false
-log1_eyes_state=true
+log1_eyes_state=false
 log2_eyes_state=false
 
 [group_settings]
 group1_hidden=true
-group2_hidden=false
-group3_hidden=false
+group2_hidden=true
+group3_hidden=true
 log_splitter_state=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\xff\xff\xff\xff\xff\xff\xff\xff\0\xff\xff\xff\xff\x1\0\0\0\x2\x1)
 
 [left_tool]
 sp_assistant_hidden=false
 
 [widget]
-left_tool_index=0
+left_tool_index=-1
 size=@Size(815 708)
 width=815
 

diff --git a/qt/power_carrier/src/dialog/addslavedialog.cpp b/qt/power_carrier/src/dialog/addslavedialog.cpp
@@ -3,7 +3,7 @@
 
 #include <QMessageBox>
 
-PROJECT_USING_NAMESPACE;
+
 
 
 AddSlaveDialog::AddSlaveDialog(QWidget* parent)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,7 +3,7 @@

		#include <QMessageBox>

		PROJECT_USING_NAMESPACE;



		AddSlaveDialog::AddSlaveDialog(QWidget* parent)
Expand Down