Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-13 13:32:53 +08:00
Code Issues Projects Releases Wiki Activity

Fix some lanuage issue

Browse Source
This commit is contained in:
DreamSourceLab 2019-11-12 06:57:36 -08:00
parent 5b3b676c0d
commit d7ece2f45c
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DSView/pv/dialogs/deviceoptions.cpp
View File

@ -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);

26
DSView/pv/dialogs/waitingdialog.cpp
View File

@ -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);
}
}

2
DSView/pv/toolbars/samplingbar.cpp
View File

@ -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);