Fix a bug in encoding settings

wh201906 · Aug 20, 2022 · 665a4f2 · 665a4f2
1 parent c0997dc
commit 665a4f2
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 6 deletions.
diff --git a/src/datatab.cpp b/src/datatab.cpp
@@ -122,11 +122,10 @@ void DataTab::on_data_encodingSetButton_clicked()
     newCodec = QTextCodec::codecForName(box->currentText().toLatin1());
     if(newCodec != nullptr)
     {
-        if(box->itemText(box->currentIndex()) == box->currentText()) // existing text
-            dataEncodingId = box->currentIndex();
         if(RxDecoder != nullptr)
             delete RxDecoder;
         dataCodec = newCodec;
+        box->setCurrentText(dataCodec->name());
         emit setDataCodec(dataCodec);
         RxDecoder = dataCodec->makeDecoder(); // clear state machine
         emit setPlotDecoder(dataCodec->makeDecoder());// clear state machine, standalone decoder for DataTab/PlotTab
@@ -137,7 +136,13 @@ void DataTab::on_data_encodingSetButton_clicked()
     else
     {
         QMessageBox::information(this, tr("Info"), ui->data_encodingNameBox->currentText() + " " + tr("is not a valid encoding."));
-        box->setCurrentIndex(dataEncodingId);
+        if(dataCodec != nullptr)
+            box->setCurrentText(dataCodec->name());
+        else
+        {
+            box->setCurrentText("UTF-8");
+            on_data_encodingSetButton_clicked();
+        }
     }
 }
 

diff --git a/src/datatab.h b/src/datatab.h
@@ -79,8 +79,6 @@ private slots:
     MySettings* settings;
     QTimer* repeatTimer;
 
-    int dataEncodingId = 0;
-
     QScrollBar* RxSlider;
     int currRxSliderPos = 0;
     int userRequiredRxSliderPos = 0;

diff --git a/src/ui/datatab.ui b/src/ui/datatab.ui
@@ -510,14 +510,54 @@ margin-right:3em;
             <string>UTF-8</string>
            </property>
           </item>
+          <item>
+           <property name="text">
+            <string>GB2312</string>
+           </property>
+          </item>
           <item>
            <property name="text">
             <string>GB18030</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>BIG5</string>
+            <string>Big5</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>windows-1252</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>UTF-16LE</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>UTF-16BE</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>UTF-32LE</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>UTF-32BE</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Shift_JIS</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>EUC-KR</string>
            </property>
           </item>
          </widget>