From d7ece2f45c6d656889fa02b718eb6eb46439a5e7 Mon Sep 17 00:00:00 2001
From: DreamSourceLab <support@dreamsourcelab.com>
Date: Tue, 12 Nov 2019 06:57:36 -0800
Subject: [PATCH] Fix some lanuage issue

---
 DSView/pv/dialogs/deviceoptions.cpp |  2 +-
 DSView/pv/dialogs/waitingdialog.cpp | 26 +++++++++++++++++---------
 DSView/pv/toolbars/samplingbar.cpp  |  2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp
index 4ffd8080..8d5800dd 100755
--- a/DSView/pv/dialogs/deviceoptions.cpp
+++ b/DSView/pv/dialogs/deviceoptions.cpp
@@ -307,7 +307,7 @@ void DeviceOptions::zero_adj()
 
     dialogs::DSMessageBox msg(this);
     msg.mBox()->setText(tr("Information"));
-    msg.mBox()->setInformativeText(tr("Auto Calibration program will be started. Please keep all channels out of singal input. It can take a while!"));
+    msg.mBox()->setInformativeText(tr("Auto Calibration program will be started. Don't connect any probes. It can take a while!"));
     msg.mBox()->addButton(tr("Ok"), QMessageBox::AcceptRole);
     msg.mBox()->addButton(tr("Cancel"), QMessageBox::RejectRole);
     msg.mBox()->setIcon(QMessageBox::Information);
diff --git a/DSView/pv/dialogs/waitingdialog.cpp b/DSView/pv/dialogs/waitingdialog.cpp
index f3d77fca..45898399 100755
--- a/DSView/pv/dialogs/waitingdialog.cpp
+++ b/DSView/pv/dialogs/waitingdialog.cpp
@@ -38,8 +38,8 @@ using namespace std;
 namespace pv {
 namespace dialogs {
 
-const QString WaitingDialog::TIPS_WAIT = QT_TR_NOOP("Waiting");
-const QString WaitingDialog::TIPS_FINISHED = QT_TR_NOOP("Finished!");
+const QString WaitingDialog::TIPS_WAIT = "Waiting";
+const QString WaitingDialog::TIPS_FINISHED = "Finished!";
 
 WaitingDialog::WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevInst> dev_inst, int key) :
     DSDialog(parent),
@@ -48,9 +48,19 @@ WaitingDialog::WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevI
     _button_box(QDialogButtonBox::Abort,
         Qt::Horizontal, this)
 {
-    this->setFixedSize((GIF_WIDTH+TIP_WIDTH)*1.2, (GIF_HEIGHT+TIP_HEIGHT)*4);
+    _dev_inst = _session.get_device();
+    this->setFixedSize((GIF_WIDTH+2*TIP_WIDTH)*1.2, (GIF_HEIGHT+2*TIP_HEIGHT)*4);
     this->setWindowOpacity(0.7);
 
+    QFont font;
+    font.setPointSize(10);
+    font.setBold(true);
+
+    QLabel *warning_tips = new QLabel(this);
+    warning_tips->setText(tr("Don't connect any probes!"));
+    warning_tips->setFont(font);
+    warning_tips->setAlignment(Qt::AlignCenter);
+
     QString iconPath = ":/icons/" + qApp->property("Style").toString();
     label = new QLabel(this);
     movie = new QMovie(iconPath+"/wait.gif");
@@ -58,10 +68,7 @@ WaitingDialog::WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevI
     label->setAlignment(Qt::AlignCenter);
 
     tips = new QLabel(this);
-    tips->setText(TIPS_WAIT);
-    QFont font;
-    font.setPointSize(10);
-    font.setBold(true);
+    tips->setText(tr("Waiting"));
     tips->setFont(font);
     tips->setAlignment(Qt::AlignCenter);
 
@@ -74,6 +81,7 @@ WaitingDialog::WaitingDialog(QWidget *parent, boost::shared_ptr<pv::device::DevI
 
 
     QVBoxLayout *mlayout = new QVBoxLayout();
+    mlayout->addWidget(warning_tips, Qt::AlignHCenter);
     mlayout->addWidget(label, Qt::AlignHCenter);
     mlayout->addWidget(tips, Qt::AlignHCenter);
     mlayout->addWidget(&_button_box);
@@ -159,7 +167,7 @@ void WaitingDialog::changeText()
     index++;
     if(index == WPOINTS_NUM + 1)
     {
-        tips->setText(TIPS_WAIT);
+        tips->setText(tr("Waiting"));
         index = 0;
 
         GVariant* gvar = _dev_inst->get_config(NULL, NULL, _key);
@@ -171,7 +179,7 @@ void WaitingDialog::changeText()
                 movie->jumpToFrame(0);
                 timer->stop();
                 tips->setAlignment(Qt::AlignHCenter);
-                tips->setText(TIPS_FINISHED);
+                tips->setText(tr("Finished!"));
                 _button_box.addButton(QDialogButtonBox::Save);
             }
         }
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 68e57e4c..abe951b4 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -896,7 +896,7 @@ void SamplingBar::on_instant_stop()
                 if (zero) {
                     dialogs::DSMessageBox msg(this);
                     msg.mBox()->setText(tr("Auto Calibration"));
-                    msg.mBox()->setInformativeText(tr("Auto Calibration program will be started. Please keep all channels out of singal input. It can take a while!"));
+                    msg.mBox()->setInformativeText(tr("Auto Calibration program will be started. Don't connect any probes. It can take a while!"));
                     //msg.mBox()->setStandardButtons(QMessageBox::Ok);
                     msg.mBox()->addButton(tr("Ok"), QMessageBox::AcceptRole);
                     msg.mBox()->addButton(tr("Skip"), QMessageBox::RejectRole);