Merge remote-tracking branch 'origin/dev'

sanny32 · Dec 9, 2024 · a739668 · a739668
2 parents de1fce9 + f5a9094
commit a739668
Show file tree

Hide file tree

Showing 9 changed files with 2,589 additions and 84 deletions.
diff --git a/omodscan/mainwindow.cpp b/omodscan/mainwindow.cpp
@@ -204,6 +204,7 @@ void MainWindow::on_awake()
     ui->actionDisplayBar->setChecked(ui->toolBarDisplay->isVisible());
     ui->actionEnglish->setChecked(_lang == "en");
     ui->actionRussian->setChecked(_lang == "ru");
+    ui->actionChinese->setChecked(_lang == "cn");
 
     if(frm != nullptr)
     {
@@ -954,6 +955,14 @@ void MainWindow::on_actionRussian_triggered()
    setLanguage("ru");
 }
 
+///
+/// \brief MainWindow::on_actionChinese_triggered
+///
+void MainWindow::on_actionChinese_triggered()
+{
+    setLanguage("cn");
+}
+
 ///
 /// \brief MainWindow::on_actionCascade_triggered
 ///

diff --git a/omodscan/mainwindow.h b/omodscan/mainwindow.h
@@ -98,6 +98,7 @@ private slots:
     /* Language menu slots */
     void on_actionEnglish_triggered();
     void on_actionRussian_triggered();
+    void on_actionChinese_triggered();
 
     /* Window menu slots */
     void on_actionCascade_triggered();

diff --git a/omodscan/mainwindow.ui b/omodscan/mainwindow.ui
@@ -168,6 +168,7 @@
      </property>
      <addaction name="actionEnglish"/>
      <addaction name="actionRussian"/>
+     <addaction name="actionChinese"/>
     </widget>
     <addaction name="actionToolbar"/>
     <addaction name="actionStatusBar"/>
@@ -670,6 +671,9 @@
    <property name="text">
     <string>English</string>
    </property>
+   <property name="iconText">
+    <string notr="true">English</string>
+   </property>
   </action>
   <action name="actionRussian">
    <property name="checkable">
@@ -678,6 +682,9 @@
    <property name="text">
     <string>Русский</string>
    </property>
+   <property name="iconText">
+    <string notr="true">Русский</string>
+   </property>
   </action>
   <action name="actionAddressScan">
    <property name="text">
@@ -856,6 +863,17 @@
     <string notr="true">Ctrl+Alt+8</string>
    </property>
   </action>
+  <action name="actionChinese">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>中文</string>
+   </property>
+   <property name="iconText">
+    <string notr="true">中文</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="resources.qrc"/>

diff --git a/omodscan/omodscan.pro b/omodscan/omodscan.pro
@@ -4,7 +4,7 @@ CONFIG += c++17
 CONFIG -= debug_and_release
 CONFIG -= debug_and_release_target
 
-VERSION = 1.8.1
+VERSION = 1.8.2
 
 QMAKE_TARGET_PRODUCT = "Open ModScan"
 QMAKE_TARGET_DESCRIPTION = "An Open Source Modbus Master (Client) Utility"
@@ -210,4 +210,5 @@ RESOURCES += \
     resources.qrc
 
 TRANSLATIONS += \
-    translations/omodscan_ru.ts
+    translations/omodscan_ru.ts \
+    translations/omodscan_cn.ts
diff --git a/omodscan/resources.qrc b/omodscan/resources.qrc
@@ -39,5 +39,6 @@
         <file>res/actionUInt64.png</file>
         <file>res/actionSwappedInt64.png</file>
         <file>res/actionSwappedUInt64.png</file>
+        <file>translations/omodscan_cn.qm</file>
     </qresource>
 </RCC>
diff --git a/omodscan/translations/omodscan_cn.qm b/omodscan/translations/omodscan_cn.qm