thooge
/
keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Icons could be shown multiple times in Group dialog 

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@374 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer 2010-03-02 22:10:00 +00:00
parent f60c395595
commit fdd226a510
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dialogs/EditGroupDlg.cpp
View File

@ -50,21 +50,18 @@ CEditGroupDialog::CEditGroupDialog(IDatabase* database,CGroup* Group,QWidget* pa
connect( ButtonBox, SIGNAL( accepted() ), this, SLOT( OnOK() ) ); connect( ButtonBox, SIGNAL( accepted() ), this, SLOT( OnOK() ) );
connect( ButtonBox, SIGNAL( rejected() ), this, SLOT( OnCancel() ) ); connect( ButtonBox, SIGNAL( rejected() ), this, SLOT( OnCancel() ) );
connect( Button_Icon, SIGNAL( clicked() ), this, SLOT( OnIconDlg() )); 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);
} }
CEditGroupDialog::~CEditGroupDialog(){ 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::OnOK() void CEditGroupDialog::OnOK()
{ {
int r=1; int r=1;

2
src/dialogs/EditGroupDlg.h
View File

@ -30,7 +30,7 @@ class CEditGroupDialog : public QDialog, private Ui_EditGroupDialog
CEditGroupDialog(IDatabase*,IGroupHandle*,QWidget* parent = 0, Qt::WFlags fl = 0 ); CEditGroupDialog(IDatabase*,IGroupHandle*,QWidget* parent = 0, Qt::WFlags fl = 0 );
CEditGroupDialog(IDatabase*,CGroup*,QWidget* parent = 0, Qt::WFlags fl = 0 ); CEditGroupDialog(IDatabase*,CGroup*,QWidget* parent = 0, Qt::WFlags fl = 0 );
~CEditGroupDialog(); ~CEditGroupDialog();
virtual void showEvent(QShowEvent *event);
private: private:
IDatabase* db; IDatabase* db;
IGroupHandle* handle; IGroupHandle* handle;