Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev
This commit is contained in:
commit
3e0b144bb2
|
@ -3467,50 +3467,50 @@ void MainWindow::on_act_about_triggered()
|
|||
QString appLang = getCfgValue("global", "language", QString("chinese"));
|
||||
if (appLang == "chinese")
|
||||
{
|
||||
content += tr("<p>Vendor: %1</p>").arg(QString::fromLocal8Bit(COMPANY_NAME));
|
||||
content += tr("<p>Company address: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS));
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL));
|
||||
content += tr("<p>Company website: <a href=\"%1\">%1</a></p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL));
|
||||
content += tr("<p>Copyright: %1</p>").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT));
|
||||
content += tr("<p>Vendor: %1</p>").arg(QString::fromStdWString(COMPANY_NAME));
|
||||
content += tr("<p>Company address: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS));
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_TEL));
|
||||
content += tr("<p>Company website: <a href=\"%1\">%1</a></p>").arg(QString::fromStdWString(BRAND_COMPANY_URL));
|
||||
content += tr("<p>Copyright: %1</p>").arg(QString::fromStdWString(BRAND_COPYRIGHT));
|
||||
}
|
||||
else if(appLang == "english")
|
||||
{
|
||||
content += tr("<p>Vendor: %1</p>").arg(QString::fromLocal8Bit(COMPANY_NAME_EN));
|
||||
content += tr("<p>Company address: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS_EN));
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL_EN));
|
||||
content += tr("<p>Company website: <a href=\"%1\">%1</a></p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL_EN));
|
||||
content += tr("<p>Copyright: %1</p>").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT_EN));
|
||||
content += tr("<p>Vendor: %1</p>").arg(QString::fromStdWString(COMPANY_NAME_EN));
|
||||
content += tr("<p>Company address: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS_EN));
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_TEL_EN));
|
||||
content += tr("<p>Company website: <a href=\"%1\">%1</a></p>").arg(QString::fromStdWString(BRAND_COMPANY_URL_EN));
|
||||
content += tr("<p>Copyright: %1</p>").arg(QString::fromStdWString(BRAND_COPYRIGHT_EN));
|
||||
}
|
||||
else if (appLang == "chinese-trad")
|
||||
{
|
||||
content += tr("<p>Vendor: %1</p>").arg(QString::fromLocal8Bit(COMPANY_NAME_TRADCN));
|
||||
content += tr("<p>Company address: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS_TRADCN));
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL_TRADCN));
|
||||
content += tr("<p>Company website: <a href=\"%1\">%1</a></p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL_EN));
|
||||
content += tr("<p>Copyright: %1</p>").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT_TRADCN));
|
||||
content += tr("<p>Vendor: %1</p>").arg(QString::fromStdWString(COMPANY_NAME_TRADCN));
|
||||
content += tr("<p>Company address: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS_TRADCN));
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_TEL_TRADCN));
|
||||
content += tr("<p>Company website: <a href=\"%1\">%1</a></p>").arg(QString::fromStdWString(BRAND_COMPANY_URL_EN));
|
||||
content += tr("<p>Copyright: %1</p>").arg(QString::fromStdWString(BRAND_COPYRIGHT_TRADCN));
|
||||
}
|
||||
#else
|
||||
content += tr("<p>Vendor: %1</p>").arg(QString::fromLocal8Bit(COMPANY_NAME));
|
||||
content += tr("<p>Copyright: %1</p>").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT));
|
||||
content += tr("<p>Company website: <a href=\"%1\">%1</a></p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL));
|
||||
content += tr("<p>Company address: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS));
|
||||
content += tr("<p>Vendor: %1</p>").arg(QString::fromStdWString(COMPANY_NAME));
|
||||
content += tr("<p>Copyright: %1</p>").arg(QString::fromStdWString(BRAND_COPYRIGHT));
|
||||
content += tr("<p>Company website: <a href=\"%1\">%1</a></p>").arg(QString::fromStdWString(BRAND_COMPANY_URL));
|
||||
content += tr("<p>Company address: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS));
|
||||
#endif
|
||||
|
||||
#if defined (OEM_DELI)
|
||||
content += tr("<p>After-sale telephone: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL));
|
||||
content += tr("<p>After-sale telephone: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_TEL));
|
||||
#else
|
||||
#if !defined(OEM_ZHONGJING)
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL));
|
||||
content += tr("<p>Company telephone: %1</p>").arg(QString::fromStdWString(BRAND_COMPANY_TEL));
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined (OEM_ZHONGJING)
|
||||
if (appLang == "chinese-trad" || appLang == "english")
|
||||
content += tr("<p>Company GPS: <a href=\"%1\">%2</a></p>").arg(QString::fromLocal8Bit(BRAND_URL_GPS_TRADCN)).arg(tr("Baidu map access"));
|
||||
content += tr("<p>Company GPS: <a href=\"%1\">%2</a></p>").arg(QString::fromStdWString(BRAND_URL_GPS_TRADCN)).arg(tr("Baidu map access"));
|
||||
else
|
||||
content += tr("<p>Company GPS: <a href=\"%1\">%2</a></p>").arg(QString::fromLocal8Bit(BRAND_URL_GPS)).arg(tr("Baidu map access"));
|
||||
content += tr("<p>Company GPS: <a href=\"%1\">%2</a></p>").arg(QString::fromStdWString(BRAND_URL_GPS)).arg(tr("Baidu map access"));
|
||||
#else
|
||||
content += tr("<p>Company GPS: <a href=\"%1\">%2</a></p>").arg(QString::fromLocal8Bit(BRAND_URL_GPS)).arg(tr("Baidu map access"));
|
||||
content += tr("<p>Company GPS: <a href=\"%1\">%2</a></p>").arg(QString::fromStdWString(BRAND_URL_GPS)).arg(tr("Baidu map access"));
|
||||
#endif
|
||||
|
||||
QMessageBox::about(this, title, content);
|
||||
|
|
|
@ -471,23 +471,23 @@ HGCapValue MainWindow::getHGCapValue()
|
|||
}
|
||||
else if (capType == "TWTY_STR32")
|
||||
{
|
||||
value.type = HGCAPVALUE_TYPE_BYTE;
|
||||
strcpy(value.valueStr32, ui->lineEdit_setCapContent->text().toStdString().c_str());
|
||||
value.type = HGCAPVALUE_TYPE_STR32;
|
||||
strcpy(value.valueStr32, ui->lineEdit_setCapContent->text().toLocal8Bit().toStdString().c_str());
|
||||
}
|
||||
else if (capType == "TWTY_STR64")
|
||||
{
|
||||
value.type = HGCAPVALUE_TYPE_BYTE;
|
||||
strcpy(value.valueStr64, ui->lineEdit_setCapContent->text().toStdString().c_str());
|
||||
value.type = HGCAPVALUE_TYPE_STR64;
|
||||
strcpy(value.valueStr64, ui->lineEdit_setCapContent->text().toLocal8Bit().toStdString().c_str());
|
||||
}
|
||||
else if (capType == "TWTY_STR128")
|
||||
{
|
||||
value.type = HGCAPVALUE_TYPE_BYTE;
|
||||
strcpy(value.valueStr128, ui->lineEdit_setCapContent->text().toStdString().c_str());
|
||||
value.type = HGCAPVALUE_TYPE_STR128;
|
||||
strcpy(value.valueStr128, ui->lineEdit_setCapContent->text().toLocal8Bit().toStdString().c_str());
|
||||
}
|
||||
else if (capType == "TWTY_STR255")
|
||||
{
|
||||
value.type = HGCAPVALUE_TYPE_BYTE;
|
||||
strcpy(value.valueStr255, ui->lineEdit_setCapContent->text().toStdString().c_str());
|
||||
value.type = HGCAPVALUE_TYPE_STR255;
|
||||
strcpy(value.valueStr255, ui->lineEdit_setCapContent->text().toLocal8Bit().toStdString().c_str());
|
||||
}
|
||||
|
||||
return value;
|
||||
|
|
Loading…
Reference in New Issue