From 9342842526ff99edf485809ba02121db32cb8649 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Thu, 13 Mar 2025 14:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.cpp                      |  4 ++--
 micro_climate_config.pro      |  2 ++
 micro_climate_config.pro.user |  2 +-
 widget.cpp                    |  5 +++++
 widget.ui                     | 21 +++++++++------------
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/main.cpp b/main.cpp
index fee3180..98b01a2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,13 +2,13 @@
 
 #include <QApplication>
 #include <QLineEdit>
-#include <QSystemTrayIcon>
 
 int main(int argc, char *argv[])
 {
+    QTextCodec *codec = QTextCodec::codecForName("UTF-8");
+    QTextCodec::setCodecForLocale(codec);
     QApplication a(argc, argv);
     Widget w;
-    QSystemTrayIcon sysTray(QIcon(":/icon/icon.ico"),&w);
     w.show();
     return a.exec();
 }
diff --git a/micro_climate_config.pro b/micro_climate_config.pro
index 7ad1294..390821e 100644
--- a/micro_climate_config.pro
+++ b/micro_climate_config.pro
@@ -32,3 +32,5 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 RESOURCES += \
     res.qrc
+
+RC_ICONS = icon.ico
diff --git a/micro_climate_config.pro.user b/micro_climate_config.pro.user
index 27eba02..a452009 100644
--- a/micro_climate_config.pro.user
+++ b/micro_climate_config.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.12.2, 2025-03-12T17:14:41. -->
+<!-- Written by QtCreator 4.12.2, 2025-03-13T11:19:27. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/widget.cpp b/widget.cpp
index e175dff..67c9b5a 100644
--- a/widget.cpp
+++ b/widget.cpp
@@ -915,6 +915,7 @@ void Widget::on_read_config_file_pushButton_clicked()
 
     //创建QSetting对象，指定INI文件的路径和格式
     QSettings settings("config/config.ini", QSettings::IniFormat);
+    settings.setIniCodec(QTextCodec::codecForName("utf8"));
 
     //获取所有节名
     QStringList sections = settings.childGroups();
@@ -945,6 +946,7 @@ void Widget::on_configFile_comboBox_highlighted(const QString &arg1)
     }
     //创建QSetting对象，指定INI文件的路径和格式
     QSettings settings("config/config.ini", QSettings::IniFormat);
+//    settings.setIniCodec(QTextCodec::codecForName("utf8"));
 
     //读取配置
     config_1R5_value  = settings.value(arg1 + "/value1R5").toInt();
@@ -955,6 +957,7 @@ void Widget::on_configFile_comboBox_highlighted(const QString &arg1)
     distance_NS_value = settings.value(arg1 + "/diatanceNS").toInt();
     distance_WE_value = settings.value(arg1 + "/diatanceWE").toInt();
     delay_value       = settings.value(arg1 + "/delayUsValue").toInt();
+    QString note      = settings.value(arg1 + "/notes").toString();
 
     qDebug() << config_1R5_value;
     qDebug() << config_4R5_value;
@@ -974,6 +977,8 @@ void Widget::on_configFile_comboBox_highlighted(const QString &arg1)
     ui -> write_distance_NS_lineEdit_2  -> setText(QString::number(float(distance_NS_value)/500) + " mm");
     ui -> write_distance_WE_lineEdit_2  -> setText(QString::number(float(distance_WE_value)/500) + " mm");
     ui -> write_delay_time_lineEdit_2   -> setText(QString::number(delay_value) + " us");
+
+    ui -> label_14                      -> setText(note);
 }
 
 void Widget::on_pushButton_10_clicked()
diff --git a/widget.ui b/widget.ui
index 5c21f0e..92eaef1 100644
--- a/widget.ui
+++ b/widget.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>Widget</class>
  <widget class="QWidget" name="Widget">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -45,7 +48,7 @@
       </font>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="serial_config_tab">
       <attribute name="title">
@@ -1966,18 +1969,12 @@ border-radius: 10px;       			/* 圆角半径 */
            </property>
           </spacer>
          </item>
-         <item row="3" column="2">
-          <spacer name="horizontalSpacer_4">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
+         <item row="4" column="2" rowspan="3">
+          <widget class="QLabel" name="label_14">
+           <property name="text">
+            <string/>
            </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
+          </widget>
          </item>
         </layout>
        </item>