From f015278bb93dd3e0e2708ff76d4d9401551f1c96 Mon Sep 17 00:00:00 2001
From: sniperbeamer <sniperbeamer@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Fri, 5 Mar 2010 16:27:34 +0000
Subject: [PATCH] Fix: Editing groups doesn't work (Bug #2964295)

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@379 b624d157-de02-0410-bad0-e51aec6abb33
---
 src/dialogs/EditGroupDlg.cpp | 40 +++++++++++++++++++++---------------
 src/dialogs/EditGroupDlg.h   |  1 +
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/dialogs/EditGroupDlg.cpp b/src/dialogs/EditGroupDlg.cpp
index 8504a35..42f5ab1 100644
--- a/src/dialogs/EditGroupDlg.cpp
+++ b/src/dialogs/EditGroupDlg.cpp
@@ -25,28 +25,32 @@
 CEditGroupDialog::CEditGroupDialog(IDatabase* database,IGroupHandle* Handle,QWidget* parent, Qt::WFlags fl)
 : QDialog(parent,fl)
 {
-	setupUi(this);
-	db=database;
-	handle=Handle;
-	group=new CGroup();
-	group->Title=handle->title();
-	group->Image=handle->image();
-	connect( ButtonBox, SIGNAL( accepted() ), this, SLOT( OnOK() ) );
-	connect( ButtonBox, SIGNAL( rejected() ), this, SLOT( OnCancel() ) );
-	connect( Button_Icon, SIGNAL( clicked() ), this, SLOT( OnIconDlg() ));
-	adjustSize();
-	setMaximumSize(size());
-	setMinimumSize(size());
+	db = database;
+	handle = Handle;
+	group = new CGroup();
+	group->Title = handle->title();
+	group->Image = handle->image();
+	
+	init();
 }
 
 
 CEditGroupDialog::CEditGroupDialog(IDatabase* database,CGroup* Group,QWidget* parent, Qt::WFlags fl)
 	: QDialog(parent,fl)
 {
+	db = database;
+	handle = NULL;
+	group = Group;
+	
+	init();
+}
+
+CEditGroupDialog::~CEditGroupDialog(){
+}
+
+void CEditGroupDialog::init() {
 	setupUi(this);
-	db=database;
-	group=Group;
-	handle=NULL;
+	
 	connect( ButtonBox, SIGNAL( accepted() ), this, SLOT( OnOK() ) );
 	connect( ButtonBox, SIGNAL( rejected() ), this, SLOT( OnCancel() ) );
 	connect( Button_Icon, SIGNAL( clicked() ), this, SLOT( OnIconDlg() ));
@@ -57,10 +61,12 @@ CEditGroupDialog::CEditGroupDialog(IDatabase* database,CGroup* Group,QWidget* pa
 		ComboIconPicker->insertItem(i,db->icon(i),"");
 	}
 	ComboIconPicker->setCurrentIndex(group->Image);
+	
+	adjustSize();
+	setMaximumSize(size());
+	setMinimumSize(size());
 }
 
-CEditGroupDialog::~CEditGroupDialog(){
-}
 
 void CEditGroupDialog::OnOK()
 {
diff --git a/src/dialogs/EditGroupDlg.h b/src/dialogs/EditGroupDlg.h
index ee0247e..53a5ecc 100644
--- a/src/dialogs/EditGroupDlg.h
+++ b/src/dialogs/EditGroupDlg.h
@@ -32,6 +32,7 @@ class CEditGroupDialog : public QDialog, private Ui_EditGroupDialog
 		~CEditGroupDialog();
 	
 	private:
+		void init();
 		IDatabase* db;
 		IGroupHandle* handle; 
 		CGroup* group;