Upgrade to 0.4.3 base on merge from mainstream branch

[keepassx] / src / dialogs / SettingsDlg.cpp

diff --git a/src/dialogs/SettingsDlg.cpp b/src/dialogs/SettingsDlg.cpp
index f63284f..55334d7 100644 (file)
--- a/src/dialogs/SettingsDlg.cpp
+++ b/src/dialogs/SettingsDlg.cpp
@@ -34,6 +34,7 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
        connect(DialogButtons, SIGNAL( rejected() ), this, SLOT( OnCancel() ) );
        connect(DialogButtons, SIGNAL( clicked(QAbstractButton*)), this, SLOT(OnOtherButton(QAbstractButton*)));
        
+       connect(CheckBox_ShowSysTrayIcon, SIGNAL( toggled(bool) ), CheckBox_CloseToTray, SLOT( setEnabled(bool) ) );
        connect(CheckBox_ShowSysTrayIcon, SIGNAL( toggled(bool) ), CheckBox_MinimizeTray, SLOT( setEnabled(bool) ) );
        connect(CheckBox_OpenLast, SIGNAL( toggled(bool) ), CheckBox_RememberLastKey, SLOT( setEnabled(bool) ) );
        connect(CheckBox_OpenLast, SIGNAL( toggled(bool) ), CheckBox_StartMinimized, SLOT( setEnabled(bool) ) );
@@ -84,6 +85,7 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
        CheckBox_OpenLast->setChecked(config->openLastFile());
        CheckBox_RememberLastKey->setChecked(config->rememberLastKey());
        CheckBox_ShowSysTrayIcon->setChecked(config->showSysTrayIcon());
+       CheckBox_CloseToTray->setChecked(config->minimizeToTray());
        CheckBox_MinimizeTray->setChecked(config->minimizeTray());
        CheckBox_StartMinimized->setChecked(config->startMinimized());
        CheckBox_StartLocked->setChecked(config->startLocked());
@@ -237,6 +239,7 @@ void CSettingsDlg::apply(){
        
        //General (1)
        config->setShowSysTrayIcon(CheckBox_ShowSysTrayIcon->isChecked());
+       config->setMinimizeToTray(CheckBox_CloseToTray->isChecked());
        config->setMinimizeTray(CheckBox_MinimizeTray->isChecked());
        config->setStartMinimized(CheckBox_StartMinimized->isChecked());
        config->setStartLocked(CheckBox_StartLocked->isChecked());