X-Git-Url: http://git.maemo.org/git/?p=keepassx;a=blobdiff_plain;f=src%2Fdialogs%2FSettingsDlg.cpp;fp=src%2Fdialogs%2FSettingsDlg.cpp;h=55334d7c6b7806e2eb277f2010645a59d191b04d;hp=f63284fa7a4b0bf8b1b087a90f6d6d95e4946e1b;hb=e41ebe7b414aaeafbc55d2f6efd234c40a76d01d;hpb=1ff14ef20fdf26438c289e9b96ed5b9e1f699a6a

diff --git a/src/dialogs/SettingsDlg.cpp b/src/dialogs/SettingsDlg.cpp
index f63284f..55334d7 100644
--- 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());