From c09b30456567e2acc9973947f8c78045222da492 Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Thu, 22 Feb 2024 17:07:21 +0800 Subject: [PATCH] =?UTF-8?q?app=E7=95=8C=E9=9D=A2=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=85=A8=E9=83=A8=E6=94=B9=E4=B8=BA=E5=AE=BD?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=B9=81=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=B5=E8=84=91=E8=AF=86=E5=88=AB=E4=B8=BA?= =?UTF-8?q?=E4=B9=B1=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner2/mainwindow.cpp | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index c1cd1fa3..6f6cb40c 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -3465,50 +3465,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);