diff --git a/app/scanner2/mainwindow.cpp b/app/scanner2/mainwindow.cpp index 781a2afe..460215a6 100644 --- a/app/scanner2/mainwindow.cpp +++ b/app/scanner2/mainwindow.cpp @@ -201,7 +201,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) ui->toolBar->addSeparator(); ui->toolBar->addAction(ui->act_help); -#if defined (OEM_ZHONGJING) || defined (OEM_NEUTRAL) +#if defined (OEM_ZHONGJING) || defined (OEM_NEUTRAL) || defined (OEM_CANGTIAN) m_menu_language = new QMenu(tr("menu_language")); m_act_simpCN = new QAction(tr("act_simpCN"),nullptr); m_act_tradCN = new QAction(tr("act_traCN"),nullptr); @@ -3321,6 +3321,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/LanxumScan_App_Help_manual.pdf"; #elif defined(OEM_CANGTIAN) filename = QApplication::applicationDirPath() + "/CumtennScan_App_Help_manual.pdf"; + if (m_currLang == "english") + filename = QApplication::applicationDirPath() + "/CumtennScan_App_Help_manual_EN.pdf"; #elif defined(OEM_ZHONGJING) filename = QApplication::applicationDirPath() + "/MicrotekScan_App_Help_manual.pdf"; if (m_currLang == "english") @@ -3350,6 +3352,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/../../entries/help/LanxumScan_App_Help_manual.pdf"; #elif defined(OEM_CANGTIAN) filename = QApplication::applicationDirPath() + "/../../entries/help/CumtennScan_App_Help_manual.pdf"; + if (m_currLang == "english") + filename = QApplication::applicationDirPath() + "/../../entries/help/CumtennScan_App_Help_manual_EN.pdf"; #elif defined(OEM_ZHONGJING) filename = QApplication::applicationDirPath() + "/../../entries/help/MicrotekScan_App_Help_manual.pdf"; if (m_currLang == "english") @@ -3378,6 +3382,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/../doc/LanxumScan_App_Help_manual.pdf"; #elif defined(OEM_CANGTIAN) filename = QApplication::applicationDirPath() + "/../doc/CumtennScan_App_Help_manual.pdf"; + if (m_currLang == "english") + filename = QApplication::applicationDirPath() + "/../doc/CumtennScan_App_Help_manual_EN.pdf"; #elif defined(OEM_ZHONGJING) filename = QApplication::applicationDirPath() + "/../doc/MicrotekScan_App_Help_manual.pdf"; if (m_currLang == "english") @@ -3525,13 +3531,13 @@ void MainWindow::on_act_about_triggered() QString title = tr("about %1").arg(windowTitle()); QString content; content += tr("

DriverVer: %1

").arg(QString::fromLocal8Bit(version)); + QString appLang = getCfgValue("global", "language", QString("chinese")); #if defined(OEM_NEUTRAL) QMessageBox::about(this, title, content); #else #if defined(OEM_ZHONGJING) - QString appLang = getCfgValue("global", "language", QString("chinese")); if (appLang == "chinese") { content += tr("

Vendor: %1

").arg(QString::fromStdWString(COMPANY_NAME)); @@ -3555,6 +3561,21 @@ void MainWindow::on_act_about_triggered() content += tr("

Company telephone: %1

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

Company website: %1

").arg(QString::fromStdWString(BRAND_COMPANY_URL_EN)); } + #elif defined (OEM_CANGTIAN) + if (appLang == "chinese") + { + 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)); + } + else if (appLang == "english") + { + content += tr("

Vendor: %1

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

Copyright: %1

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

Company website: %1

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

Company address: %1

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

Vendor: %1

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

Copyright: %1

").arg(QString::fromStdWString(BRAND_COPYRIGHT));