mirror of
https://github.com/zealdocs/zeal.git
synced 2026-08-29 16:40:51 +08:00
Respect Settings::changed signal in main window (fixes #326)
This commit is contained in:
+13
-10
@@ -59,6 +59,8 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) :
|
||||
m_settingsDialog(new SettingsDialog(app, m_zealListModel, this)),
|
||||
m_globalShortcut(new QxtGlobalShortcut(m_settings->showShortcut, this))
|
||||
{
|
||||
connect(m_settings, &Core::Settings::updated, this, &MainWindow::applySettings);
|
||||
|
||||
m_tabBar = new QTabBar(this);
|
||||
|
||||
setWindowIcon(QIcon::fromTheme(QStringLiteral("zeal"), QIcon(QStringLiteral(":/zeal.ico"))));
|
||||
@@ -120,16 +122,7 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) :
|
||||
|
||||
connect(ui->actionOptions, &QAction::triggered, [=]() {
|
||||
m_globalShortcut->setEnabled(false);
|
||||
|
||||
if (m_settingsDialog->exec()) {
|
||||
m_globalShortcut->setShortcut(m_settings->showShortcut);
|
||||
|
||||
if (m_settings->showSystrayIcon)
|
||||
createTrayIcon();
|
||||
else
|
||||
removeTrayIcon();
|
||||
}
|
||||
|
||||
m_settingsDialog->exec();
|
||||
m_globalShortcut->setEnabled(true);
|
||||
});
|
||||
|
||||
@@ -764,3 +757,13 @@ void MainWindow::keyPressEvent(QKeyEvent *keyEvent)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::applySettings()
|
||||
{
|
||||
m_globalShortcut->setShortcut(m_settings->showShortcut);
|
||||
|
||||
if (m_settings->showSystrayIcon)
|
||||
createTrayIcon();
|
||||
else
|
||||
removeTrayIcon();
|
||||
}
|
||||
|
||||
@@ -82,6 +82,7 @@ protected:
|
||||
void keyPressEvent(QKeyEvent *keyEvent) override;
|
||||
|
||||
private slots:
|
||||
void applySettings();
|
||||
void back();
|
||||
void forward();
|
||||
void onSearchComplete();
|
||||
|
||||
Reference in New Issue
Block a user