diff --git a/CMakeLists.txt b/CMakeLists.txt index 416a187..11af669 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,8 +59,6 @@ else() icons.rc config.h windbg.h - docs/README_en.md - docs/README_ja.md aboutdialog.ui aboutdialog.h aboutdialog.cpp aboutdialog.ui preferencedialog.h preferencedialog.cpp preferencedialog.ui diff --git a/OpenSpeedy_en_US.ts b/OpenSpeedy_en_US.ts index a7b8510..f3bc967 100644 --- a/OpenSpeedy_en_US.ts +++ b/OpenSpeedy_en_US.ts @@ -549,13 +549,13 @@ Origin 中文(简体) - + 中文(繁體) - + @@ -642,16 +642,28 @@ Origin 🪟 Operate System - - - + + + %1倍 + %1 times + + + + + ✖️%1倍 + ✖️%1 times + + + + + 提示 Tips - - - + + + 直到重启应用后,界面的语言才会生效 The UI language will only take effect after restarting the application. diff --git a/OpenSpeedy_zh_CN.ts b/OpenSpeedy_zh_CN.ts index 5b2c2be..370e88d 100644 --- a/OpenSpeedy_zh_CN.ts +++ b/OpenSpeedy_zh_CN.ts @@ -625,16 +625,28 @@ - - - + + + %1倍 + + + + + + ✖️%1倍 + + + + + + 提示 - - - + + + 直到重启应用后,界面的语言才会生效 diff --git a/OpenSpeedy_zh_TW.ts b/OpenSpeedy_zh_TW.ts index 1de6d69..503547d 100644 --- a/OpenSpeedy_zh_TW.ts +++ b/OpenSpeedy_zh_TW.ts @@ -626,16 +626,28 @@ 🪟 操作系統 - - - + + + %1倍 + + + + + + ✖️%1倍 + + + + + + 提示 提示 - - - + + + 直到重启应用后,界面的语言才会生效 直到重啟應用後,界面的語言才會生效 diff --git a/aboutdialog.cpp b/aboutdialog.cpp index be614fe..04bb15b 100644 --- a/aboutdialog.cpp +++ b/aboutdialog.cpp @@ -45,9 +45,4 @@ AboutDialog::recreate() layout()->activate(); adjustSize(); - if (isVisible()) - { - hide(); - show(); - } } diff --git a/main.cpp b/main.cpp index 40f0831..0cc1ce1 100644 --- a/main.cpp +++ b/main.cpp @@ -23,10 +23,12 @@ #include #include #include +#include int main(int argc, char* argv[]) { SetUnhandledExceptionFilter(createMiniDump); + SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication a(argc, argv); diff --git a/mainwindow.cpp b/mainwindow.cpp index 102611d..6574594 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -52,12 +52,7 @@ MainWindow::recreate() layout()->invalidate(); layout()->activate(); adjustSize(); - update(); - if (isVisible()) - { - hide(); - show(); - } + recreateTray(); } @@ -85,13 +80,13 @@ MainWindow::on_sliderCtrl_valueChanged(int value) if (factor >= 1.0) { - ui->sliderCtrl->setToolTip(QString("%1倍").arg(factor, 0, 'f', 2)); - ui->sliderLabel->setText(QString("✖️%1倍").arg(factor, 0, 'f', 2)); + ui->sliderCtrl->setToolTip(QString(tr("%1倍")).arg(factor, 0, 'f', 2)); + ui->sliderLabel->setText(QString(tr("✖️%1倍")).arg(factor, 0, 'f', 2)); } else { - ui->sliderCtrl->setToolTip(QString("%1倍").arg(factor, 0, 'f')); - ui->sliderLabel->setText(QString("✖️%1倍").arg(factor, 0, 'f')); + ui->sliderCtrl->setToolTip(QString(tr("%1倍")).arg(factor, 0, 'f')); + ui->sliderLabel->setText(QString(tr("✖️%1倍")).arg(factor, 0, 'f')); } m_settings->setValue(CONFIG_SLIDERVALUE_KEY, value); m_settings->sync(); diff --git a/mainwindow.ui b/mainwindow.ui index 7d96616..81901c7 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -200,7 +200,7 @@ QSlider::handle:horizontal:pressed { - 100 + 70 20 @@ -256,7 +256,7 @@ QSlider::handle:horizontal:pressed { - 100 + 70 20 @@ -784,7 +784,7 @@ QTreeWidget { - false + true diff --git a/preferencedialog.cpp b/preferencedialog.cpp index c2fa707..e5fc5c0 100644 --- a/preferencedialog.cpp +++ b/preferencedialog.cpp @@ -308,9 +308,4 @@ PreferenceDialog::recreate() layout()->invalidate(); layout()->activate(); adjustSize(); - if (isVisible()) - { - hide(); - show(); - } } diff --git a/translations/OpenSpeedy_en_US.qm b/translations/OpenSpeedy_en_US.qm index b72c108..5e06a40 100644 Binary files a/translations/OpenSpeedy_en_US.qm and b/translations/OpenSpeedy_en_US.qm differ