Skip to content

Commit 2b09ee2

Browse files
authored
Merge pull request #119 from game1024/release/v1.7
Release/v1.7
2 parents 8b8cf81 + d3e2cf7 commit 2b09ee2

14 files changed

+638
-485
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ else()
6565
qsinglekeysequenceedit.h qsinglekeysequenceedit.cpp
6666
${QM_FILES}
6767

68+
6869
)
6970

7071
add_library(winutils

OpenSpeedy_en_US.ts

Lines changed: 108 additions & 104 deletions
Large diffs are not rendered by default.

OpenSpeedy_zh_CN.ts

Lines changed: 108 additions & 104 deletions
Large diffs are not rendered by default.

OpenSpeedy_zh_TW.ts

Lines changed: 110 additions & 106 deletions
Large diffs are not rendered by default.

aboutdialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,5 @@ AboutDialog::recreate()
4343
{
4444
layout()->invalidate();
4545
layout()->activate();
46-
4746
adjustSize();
4847
}

main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ main(int argc, char* argv[])
7575
parser.process(a);
7676

7777
MainWindow w;
78-
w.resize(800, 768);
78+
w.resize(1024, 768);
7979

8080
if (parser.isSet(minimizeOption))
8181
{

mainwindow.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,20 @@ MainWindow::on_sliderCtrl_valueChanged(int value)
8888
ui->sliderCtrl->setToolTip(QString(tr("%1倍")).arg(factor, 0, 'f'));
8989
ui->sliderLabel->setText(QString(tr("✖️%1倍")).arg(factor, 0, 'f'));
9090
}
91+
92+
ui->sliderInputSpinBox->setValue(factor);
9193
m_settings->setValue(CONFIG_SLIDERVALUE_KEY, value);
9294
m_settings->sync();
9395
}
9496

97+
void
98+
MainWindow::on_sliderInputSpinBox_editingFinished()
99+
{
100+
double factor = ui->sliderInputSpinBox->value();
101+
ui->sliderInputSpinBox->clearFocus();
102+
ui->sliderCtrl->setValue(sliderValue(factor));
103+
}
104+
95105
void
96106
MainWindow::on_processNameFilter_textChanged(const QString& text)
97107
{

mainwindow.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ class MainWindow
5555

5656
void on_sliderCtrl_valueChanged(int value);
5757

58+
void on_sliderInputSpinBox_editingFinished();
59+
5860
void on_processNameFilter_textChanged(const QString& text);
5961

6062
void iconActivated(QSystemTrayIcon::ActivationReason reason);

0 commit comments

Comments
 (0)