提交: da1a7433001ec9902ff09e7892e46d75b591fd03 - QtUSBRH_Logger_win32 (git)

Commit MetaInfo

• 修訂: da1a7433001ec9902ff09e7892e46d75b591fd03 (tree)
• 時間: 2013-02-06 15:40:23
• 作者: alucky4416 <alucky4416@user...>
• Commiter: alucky4416

Log Message

change: change to UTF-8, MainWinodow Display Text, IniFormat.

Change Summary

• modified: mainwindow.cpp

差異

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,6 +1,7 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
+#include <QTextCodec>
 #include <QDir>
 #include <QSettings>
 
@@ -16,6 +17,9 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
+    // set Codec
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); // source codec is UTF-8
+
     QCoreApplication::setApplicationName("QtUSBRH-Logger-win32");
     QCoreApplication::setApplicationVersion("0.1");
 
@@ -73,6 +77,7 @@ MainWindow::~MainWindow()
 void MainWindow::LoadSaveSetting(QString filepath, bool store)
 {
     QSettings settings(filepath, QSettings::IniFormat);
+    settings.setIniCodec("UTF-8");
     if (store) { // Store(Save)
         settings.setValue("SETTING/SAVEPATH", logpath);
     } else { // Load
@@ -95,25 +100,25 @@ void MainWindow::slotGetData(QDateTime timestamp, double tmpr, double humid)
         tmpr_min = tmpr;
         time_min = timestamp;
     }
-    ui->label_Max->setText(QString("Max: %1 'C at ").arg(tmpr_max) + time_max.toString("yyyy/MM/dd hh:mm:ss"));
-    ui->label_Min->setText(QString("Min: %1 'C at ").arg(tmpr_min) + time_min.toString("yyyy/MM/dd hh:mm:ss"));
+    ui->label_Max->setText(QString(tr("Max: %1 'C at ")).arg(tmpr_max) + time_max.toString("yyyy/MM/dd hh:mm:ss"));
+    ui->label_Min->setText(QString(tr("Min: %1 'C at ")).arg(tmpr_min) + time_min.toString("yyyy/MM/dd hh:mm:ss"));
 
     if (logging) {
         int lapsed_time = (QDateTime::currentMSecsSinceEpoch() - logstart_time.toMSecsSinceEpoch()) / 1000;
         if (lapsed_time < 60) { // 1 minute
-            ui->label_LogLapsedTime->setText(QString("Lapsed Time: %1 sec").arg(lapsed_time));
+            ui->label_LogLapsedTime->setText(QString(tr("Lapsed Time: %1 sec")).arg(lapsed_time));
         } else if (lapsed_time < 3600) { // 1 hour
-            ui->label_LogLapsedTime->setText(QString("Lapsed Time: %1 min").arg(lapsed_time/60));
+            ui->label_LogLapsedTime->setText(QString(tr("Lapsed Time: %1 min")).arg(lapsed_time/60));
         } else if (lapsed_time < 86400) { // 1 day
-            ui->label_LogLapsedTime->setText(QString("Lapsed Time: %1 hour").arg(lapsed_time/3600));
+            ui->label_LogLapsedTime->setText(QString(tr("Lapsed Time: %1 hour")).arg(lapsed_time/3600));
         } else { // over 1 day
-            ui->label_LogLapsedTime->setText(QString("Lapsed Time: %1 day").arg(lapsed_time/86400));
+            ui->label_LogLapsedTime->setText(QString(tr("Lapsed Time: %1 day")).arg(lapsed_time/86400));
         }
     }
 }
 void MainWindow::slotChangeLogFilename(QString filename)
 {
-    ui->statusBar->showMessage(QString("logfile: %1").arg(filename));
+    ui->statusBar->showMessage(QString(tr("logfile: %1")).arg(filename));
 }
 
 void MainWindow::slotLogStarted()
@@ -124,9 +129,9 @@ void MainWindow::slotLogStarted()
 void MainWindow::slotLogEnded(int status)
 {
     logging = false;
-    ui->pushButton_LogStart->setText("Log Start");
+    ui->pushButton_LogStart->setText(tr("Log Start"));
 
-    ui->label_LogState->setText("LogEnded: " + QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss"));
+    ui->label_LogState->setText(tr("LogEnded: ") + QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss"));
 }
 
 
@@ -143,8 +148,8 @@ void MainWindow::on_pushButton_LogStart_clicked()
         emit LogStop();
 
         logging = false;
-        ui->pushButton_LogStart->setText("Log Start");
-        ui->label_LogState->setText("LogEnded: " + QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss"));
+        ui->pushButton_LogStart->setText(tr("Log Start"));
+        ui->label_LogState->setText(tr("LogEnded: ") + QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss"));
         ui->label_LogLapsedTime->setText("");
     } else {
         // now idle..
@@ -156,9 +161,9 @@ void MainWindow::on_pushButton_LogStart_clicked()
             qDebug() << "logpath is " << logpath;
 
             logging = true;
-            ui->pushButton_LogStart->setText("Log Stop");
+            ui->pushButton_LogStart->setText(tr("Log Stop"));
             logstart_time = QDateTime::currentDateTime();
-            ui->label_LogState->setText("LogStarted: " + logstart_time.toString("yyyy/MM/dd hh:mm:ss"));
+            ui->label_LogState->setText(tr("LogStarted: ") + logstart_time.toString("yyyy/MM/dd hh:mm:ss"));
 
             // reset Max/Min
             tmpr_max = -1000.0;