diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index 3896a066..9ea49107 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -3467,50 +3467,50 @@ void MainWindow::on_act_about_triggered() QString appLang = getCfgValue("global", "language", QString("chinese")); if (appLang == "chinese") { - content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME)); - content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS)); - content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL)); - content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); - content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT)); + content += tr("

Vendor: %1

").arg(QString::fromStdWString(COMPANY_NAME)); + content += tr("

Company address: %1

").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS)); + content += tr("

Company telephone: %1

").arg(QString::fromStdWString(BRAND_COMPANY_TEL)); + content += tr("

Company website: %1

").arg(QString::fromStdWString(BRAND_COMPANY_URL)); + content += tr("

Copyright: %1

").arg(QString::fromStdWString(BRAND_COPYRIGHT)); } else if(appLang == "english") { - content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME_EN)); - content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS_EN)); - content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL_EN)); - content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL_EN)); - content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT_EN)); + content += tr("

Vendor: %1

").arg(QString::fromStdWString(COMPANY_NAME_EN)); + content += tr("

Company address: %1

").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS_EN)); + content += tr("

Company telephone: %1

").arg(QString::fromStdWString(BRAND_COMPANY_TEL_EN)); + content += tr("

Company website: %1

").arg(QString::fromStdWString(BRAND_COMPANY_URL_EN)); + content += tr("

Copyright: %1

").arg(QString::fromStdWString(BRAND_COPYRIGHT_EN)); } else if (appLang == "chinese-trad") { - content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME_TRADCN)); - content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS_TRADCN)); - content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL_TRADCN)); - content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL_EN)); - content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT_TRADCN)); + content += tr("

Vendor: %1

").arg(QString::fromStdWString(COMPANY_NAME_TRADCN)); + content += tr("

Company address: %1

").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS_TRADCN)); + content += tr("

Company telephone: %1

").arg(QString::fromStdWString(BRAND_COMPANY_TEL_TRADCN)); + content += tr("

Company website: %1

").arg(QString::fromStdWString(BRAND_COMPANY_URL_EN)); + content += tr("

Copyright: %1

").arg(QString::fromStdWString(BRAND_COPYRIGHT_TRADCN)); } #else - content += tr("

Vendor: %1

").arg(QString::fromLocal8Bit(COMPANY_NAME)); - content += tr("

Copyright: %1

").arg(QString::fromLocal8Bit(BRAND_COPYRIGHT)); - content += tr("

Company website: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_URL)); - content += tr("

Company address: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_ADDRESS)); + content += tr("

Vendor: %1

").arg(QString::fromStdWString(COMPANY_NAME)); + content += tr("

Copyright: %1

").arg(QString::fromStdWString(BRAND_COPYRIGHT)); + content += tr("

Company website: %1

").arg(QString::fromStdWString(BRAND_COMPANY_URL)); + content += tr("

Company address: %1

").arg(QString::fromStdWString(BRAND_COMPANY_ADDRESS)); #endif #if defined (OEM_DELI) - content += tr("

After-sale telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL)); + content += tr("

After-sale telephone: %1

").arg(QString::fromStdWString(BRAND_COMPANY_TEL)); #else #if !defined(OEM_ZHONGJING) - content += tr("

Company telephone: %1

").arg(QString::fromLocal8Bit(BRAND_COMPANY_TEL)); + content += tr("

Company telephone: %1

").arg(QString::fromStdWString(BRAND_COMPANY_TEL)); #endif #endif #if defined (OEM_ZHONGJING) if (appLang == "chinese-trad" || appLang == "english") - content += tr("

Company GPS: %2

").arg(QString::fromLocal8Bit(BRAND_URL_GPS_TRADCN)).arg(tr("Baidu map access")); + content += tr("

Company GPS: %2

").arg(QString::fromStdWString(BRAND_URL_GPS_TRADCN)).arg(tr("Baidu map access")); else - content += tr("

Company GPS: %2

").arg(QString::fromLocal8Bit(BRAND_URL_GPS)).arg(tr("Baidu map access")); + content += tr("

Company GPS: %2

").arg(QString::fromStdWString(BRAND_URL_GPS)).arg(tr("Baidu map access")); #else - content += tr("

Company GPS: %2

").arg(QString::fromLocal8Bit(BRAND_URL_GPS)).arg(tr("Baidu map access")); + content += tr("

Company GPS: %2

").arg(QString::fromStdWString(BRAND_URL_GPS)).arg(tr("Baidu map access")); #endif QMessageBox::about(this, title, content); diff --git a/app/twaintest/mainwindow.cpp b/app/twaintest/mainwindow.cpp index 86d08ede..05e9ec07 100644 --- a/app/twaintest/mainwindow.cpp +++ b/app/twaintest/mainwindow.cpp @@ -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;