Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 08:49:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #707 from weslly/fix/settings-apply

Browse Source 
Fix apply button on settings window (repost)
This commit is contained in:
Janek Bevendorff 2017-06-28 22:22:46 +02:00 committed by GitHub
commit 3799833cfa
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View File

@ -240,8 +240,10 @@ MainWindow::MainWindow()
SLOT(databaseStatusChanged(DatabaseWidget*))); SLOT(databaseStatusChanged(DatabaseWidget*)));
connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(setMenuActionState())); connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(setMenuActionState()));
connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(updateWindowTitle())); connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(updateWindowTitle()));
connect(m_ui->settingsWidget, SIGNAL(editFinished(bool)), SLOT(switchToDatabases()));
connect(m_ui->settingsWidget, SIGNAL(accepted()), SLOT(applySettingsChanges())); connect(m_ui->settingsWidget, SIGNAL(accepted()), SLOT(applySettingsChanges()));
connect(m_ui->settingsWidget, SIGNAL(apply()), SLOT(applySettingsChanges()));
connect(m_ui->settingsWidget, SIGNAL(accepted()), SLOT(switchToDatabases()));
connect(m_ui->settingsWidget, SIGNAL(rejected()), SLOT(switchToDatabases()));
connect(m_ui->actionDatabaseNew, SIGNAL(triggered()), m_ui->tabWidget, connect(m_ui->actionDatabaseNew, SIGNAL(triggered()), m_ui->tabWidget,
SLOT(newDatabase())); SLOT(newDatabase()));

4
src/gui/SettingsWidget.cpp
View File

@ -68,6 +68,7 @@ SettingsWidget::SettingsWidget(QWidget* parent)
} }
connect(this, SIGNAL(accepted()), SLOT(saveSettings())); connect(this, SIGNAL(accepted()), SLOT(saveSettings()));
connect(this, SIGNAL(apply()), SLOT(saveSettings()));
connect(this, SIGNAL(rejected()), SLOT(reject())); connect(this, SIGNAL(rejected()), SLOT(reject()));
connect(m_generalUi->autoSaveAfterEveryChangeCheckBox, SIGNAL(toggled(bool)), connect(m_generalUi->autoSaveAfterEveryChangeCheckBox, SIGNAL(toggled(bool)),
@ -213,8 +214,6 @@ void SettingsWidget::saveSettings()
for (const ExtraPage& page: asConst(m_extraPages)) { for (const ExtraPage& page: asConst(m_extraPages)) {
page.saveSettings(); page.saveSettings();
} }
emit editFinished(true);
} }
void SettingsWidget::reject() void SettingsWidget::reject()
@ -224,7 +223,6 @@ void SettingsWidget::reject()
autoType()->registerGlobalShortcut(m_globalAutoTypeKey, m_globalAutoTypeModifiers); autoType()->registerGlobalShortcut(m_globalAutoTypeKey, m_globalAutoTypeModifiers);
} }
emit editFinished(false);
} }
void SettingsWidget::enableAutoSaveOnExit(bool checked) void SettingsWidget::enableAutoSaveOnExit(bool checked)

3
src/gui/SettingsWidget.h
View File

@ -46,9 +46,6 @@ public:
void addSettingsPage(ISettingsPage * page); void addSettingsPage(ISettingsPage * page);
void loadSettings(); void loadSettings();
signals:
void editFinished(bool accepted);
private slots: private slots:
void saveSettings(); void saveSettings();
void reject(); void reject();