Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 20 additions & 8 deletions OpenSpeedy_en_US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -549,13 +549,13 @@ Origin</translation>
<location filename="mainwindow.ui" line="822"/>
<location filename="build/Qt5_15_static_64bit-Release/OpenSpeedy_autogen/include/ui_mainwindow.h" line="514"/>
<source>中文(简体)</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="mainwindow.ui" line="844"/>
<location filename="build/Qt5_15_static_64bit-Release/OpenSpeedy_autogen/include/ui_mainwindow.h" line="516"/>
<source>中文(繁體)</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="build/CMAKE-32bit-Release/OpenSpeedy_autogen/include/ui_mainwindow.h" line="508"/>
Expand Down Expand Up @@ -642,16 +642,28 @@ Origin</translation>
<translation>🪟 Operate System</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="373"/>
<location filename="mainwindow.cpp" line="387"/>
<location filename="mainwindow.cpp" line="401"/>
<location filename="mainwindow.cpp" line="83"/>
<location filename="mainwindow.cpp" line="88"/>
<source>%1倍</source>
<translation>%1 times</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="84"/>
<location filename="mainwindow.cpp" line="89"/>
<source>✖️%1倍</source>
<translation>✖️%1 times</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="368"/>
<location filename="mainwindow.cpp" line="382"/>
<location filename="mainwindow.cpp" line="396"/>
<source>提示</source>
<translation>Tips</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="374"/>
<location filename="mainwindow.cpp" line="388"/>
<location filename="mainwindow.cpp" line="402"/>
<location filename="mainwindow.cpp" line="369"/>
<location filename="mainwindow.cpp" line="383"/>
<location filename="mainwindow.cpp" line="397"/>
<source>直到重启应用后,界面的语言才会生效</source>
<translation>The UI language will only take effect after restarting the application.</translation>
</message>
Expand Down
24 changes: 18 additions & 6 deletions OpenSpeedy_zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -625,16 +625,28 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="373"/>
<location filename="mainwindow.cpp" line="387"/>
<location filename="mainwindow.cpp" line="401"/>
<location filename="mainwindow.cpp" line="83"/>
<location filename="mainwindow.cpp" line="88"/>
<source>%1倍</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="84"/>
<location filename="mainwindow.cpp" line="89"/>
<source>✖️%1倍</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="368"/>
<location filename="mainwindow.cpp" line="382"/>
<location filename="mainwindow.cpp" line="396"/>
<source>提示</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="374"/>
<location filename="mainwindow.cpp" line="388"/>
<location filename="mainwindow.cpp" line="402"/>
<location filename="mainwindow.cpp" line="369"/>
<location filename="mainwindow.cpp" line="383"/>
<location filename="mainwindow.cpp" line="397"/>
<source>直到重启应用后,界面的语言才会生效</source>
<translation type="unfinished"></translation>
</message>
Expand Down
24 changes: 18 additions & 6 deletions OpenSpeedy_zh_TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -626,16 +626,28 @@
<translation>🪟 操作系統</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="373"/>
<location filename="mainwindow.cpp" line="387"/>
<location filename="mainwindow.cpp" line="401"/>
<location filename="mainwindow.cpp" line="83"/>
<location filename="mainwindow.cpp" line="88"/>
<source>%1倍</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="84"/>
<location filename="mainwindow.cpp" line="89"/>
<source>✖️%1倍</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="mainwindow.cpp" line="368"/>
<location filename="mainwindow.cpp" line="382"/>
<location filename="mainwindow.cpp" line="396"/>
<source>提示</source>
<translation>提示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="374"/>
<location filename="mainwindow.cpp" line="388"/>
<location filename="mainwindow.cpp" line="402"/>
<location filename="mainwindow.cpp" line="369"/>
<location filename="mainwindow.cpp" line="383"/>
<location filename="mainwindow.cpp" line="397"/>
<source>直到重启应用后,界面的语言才会生效</source>
<translation>直到重啟應用後,界面的語言才會生效</translation>
</message>
Expand Down
5 changes: 0 additions & 5 deletions aboutdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,4 @@ AboutDialog::recreate()
layout()->activate();

adjustSize();
if (isVisible())
{
hide();
show();
}
}
2 changes: 2 additions & 0 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
#include <QLocalSocket>
#include <QLocale>
#include <QTranslator>
#include <ShellScalingApi.h>
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);
Expand Down
15 changes: 5 additions & 10 deletions mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,7 @@ MainWindow::recreate()
layout()->invalidate();
layout()->activate();
adjustSize();
update();
if (isVisible())
{
hide();
show();
}

recreateTray();
}

Expand Down Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ QSlider::handle:horizontal:pressed {
</property>
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
<width>70</width>
<height>20</height>
</size>
</property>
Expand Down Expand Up @@ -256,7 +256,7 @@ QSlider::handle:horizontal:pressed {
</property>
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
<width>70</width>
<height>20</height>
</size>
</property>
Expand Down Expand Up @@ -784,7 +784,7 @@ QTreeWidget {
</rect>
</property>
<property name="mouseTracking">
<bool>false</bool>
<bool>true</bool>
</property>
<widget class="QMenu" name="menuAbout">
<property name="tearOffEnabled">
Expand Down
5 changes: 0 additions & 5 deletions preferencedialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,4 @@ PreferenceDialog::recreate()
layout()->invalidate();
layout()->activate();
adjustSize();
if (isVisible())
{
hide();
show();
}
}
Binary file modified translations/OpenSpeedy_en_US.qm
Binary file not shown.