X-Git-Url: http://git.maemo.org/git/?p=keepassx;a=blobdiff_plain;f=src%2Fdialogs%2FEditGroupDlg.cpp;fp=src%2Fdialogs%2FEditGroupDlg.cpp;h=42f5ab1732db3d4eb13d6ad0f718d10388780818;hp=31f0c0e0a95ac1dc886b364615c64d9c25061b58;hb=a5359e3664df4cbbafa128ae38ce243afeafa482;hpb=87c9641f355953cd47b86c465aff503f2f7b1b86

diff --git a/src/dialogs/EditGroupDlg.cpp b/src/dialogs/EditGroupDlg.cpp
index 31f0c0e..42f5ab1 100644
--- a/src/dialogs/EditGroupDlg.cpp
+++ b/src/dialogs/EditGroupDlg.cpp
@@ -25,46 +25,49 @@
 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)
 {
-	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() ));
+	db = database;
+	handle = NULL;
+	group = Group;
+	
+	init();
 }
 
 CEditGroupDialog::~CEditGroupDialog(){
 }
 
-void CEditGroupDialog::showEvent(QShowEvent *event){
-	if(event->spontaneous()==false){
-		EditTitle->setText(group->Title);
-		for(int i=0;i<db->numIcons();i++){
-			ComboIconPicker->insertItem(i,db->icon(i),"");
-		}
-		ComboIconPicker->setCurrentIndex(group->Image);
+void CEditGroupDialog::init() {
+	setupUi(this);
+	
+	connect( ButtonBox, SIGNAL( accepted() ), this, SLOT( OnOK() ) );
+	connect( ButtonBox, SIGNAL( rejected() ), this, SLOT( OnCancel() ) );
+	connect( Button_Icon, SIGNAL( clicked() ), this, SLOT( OnIconDlg() ));
+	
+	EditTitle->setText(group->Title);
+	
+	for(int i=0;i<db->numIcons();i++){
+		ComboIconPicker->insertItem(i,db->icon(i),"");
 	}
+	ComboIconPicker->setCurrentIndex(group->Image);
+	
+	adjustSize();
+	setMaximumSize(size());
+	setMinimumSize(size());
 }
 
+
 void CEditGroupDialog::OnOK()
 {
 	int r=1;