removed some unused files,
made file dialog wrapper use native dialogs again, fixed password dialog not remembering last key location/type, disabled precompiled headers when buidling universal binaries, updated changelog, fixed size problems of some dialogs git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@179 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
@@ -27,6 +27,9 @@ CDbSettingsDlg::CDbSettingsDlg(QWidget* parent,IDatabase* db, bool modal, Qt::W
|
||||
{
|
||||
setupUi(this);
|
||||
database=dynamic_cast<IKdbSettings*>(db);
|
||||
adjustSize();
|
||||
setMaximumSize(size());
|
||||
setMinimumSize(size());
|
||||
createBanner(&BannerPixmap,getPixmap("appsettings"),tr("Settings"),width());
|
||||
ComboAlgo->insertItem(0,tr("AES(Rijndael): 256 Bit (default)"));
|
||||
ComboAlgo->insertItem(1,tr("Twofish: 256 Bit"));
|
||||
|
||||
@@ -34,6 +34,9 @@ CEditGroupDialog::CEditGroupDialog(IDatabase* database,IGroupHandle* Handle,QWid
|
||||
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());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -265,6 +265,21 @@ void PasswordDialog::OnOK(){
|
||||
return;
|
||||
}
|
||||
|
||||
if((Mode==Mode_Ask || Mode==Mode_Set) && config->rememberLastKey()){
|
||||
if(Check_Password->isChecked() && Check_KeyFile->isChecked()){
|
||||
config->setLastKeyType(BOTH);
|
||||
config->setLastKeyLocation(Combo_KeyFile->currentText());
|
||||
}
|
||||
else if(Check_Password->isChecked()){
|
||||
config->setLastKeyType(PASSWORD);
|
||||
config->setLastKeyLocation(QString());
|
||||
}
|
||||
else if(Check_KeyFile->isChecked()){
|
||||
config->setLastKeyType(PASSWORD);
|
||||
config->setLastKeyLocation(Combo_KeyFile->currentText());
|
||||
}
|
||||
}
|
||||
|
||||
done(Exit_Ok);
|
||||
}
|
||||
|
||||
|
||||
@@ -29,9 +29,6 @@ CGenPwDialog::CGenPwDialog(QWidget* parent, bool StandAloneMode,Qt::WFlags fl)
|
||||
: QDialog(parent,fl)
|
||||
{
|
||||
setupUi(this);
|
||||
setMinimumSize(size());
|
||||
setMaximumSize(size());
|
||||
createBanner(&BannerPixmap,getPixmap("dice"),tr("Password Generator"),width());
|
||||
connect(ButtonGenerate,SIGNAL(clicked()),this,SLOT(OnGeneratePw()));
|
||||
connect(Radio_1,SIGNAL(toggled(bool)),this,SLOT(OnRadio1StateChanged(bool)));
|
||||
connect(Radio_2,SIGNAL(toggled(bool)),this,SLOT(OnRadio2StateChanged(bool)));
|
||||
@@ -74,6 +71,10 @@ CGenPwDialog::CGenPwDialog(QWidget* parent, bool StandAloneMode,Qt::WFlags fl)
|
||||
OnRadio1StateChanged(pwGenOptions.at(0));
|
||||
OnRadio2StateChanged(!pwGenOptions.at(0));
|
||||
Spin_Num->setValue(config->pwGenLength());
|
||||
adjustSize();
|
||||
setMaximumSize(size());
|
||||
setMinimumSize(size());
|
||||
createBanner(&BannerPixmap,getPixmap("dice"),tr("Password Generator"),width());
|
||||
}
|
||||
|
||||
CGenPwDialog::~CGenPwDialog(){
|
||||
|
||||
@@ -30,7 +30,6 @@ SearchDialog::SearchDialog(IDatabase* database,IGroupHandle* Group,QWidget* pare
|
||||
connect( ButtonBox, SIGNAL( rejected() ), this, SLOT( OnClose() ) );
|
||||
db=database;
|
||||
group=Group;
|
||||
createBanner(&BannerPixmap,getPixmap("search"),tr("Search"),width());
|
||||
QBitArray searchOptions=config->searchOptions();
|
||||
checkBox_Cs->setChecked(searchOptions.at(0));
|
||||
checkBox_regExp->setChecked(searchOptions.at(1));
|
||||
@@ -46,6 +45,10 @@ SearchDialog::SearchDialog(IDatabase* database,IGroupHandle* Group,QWidget* pare
|
||||
checkBox_Recursive->setChecked(false);
|
||||
checkBox_Recursive->setEnabled(false);
|
||||
}
|
||||
adjustSize();
|
||||
setMaximumSize(size());
|
||||
setMinimumSize(size());
|
||||
createBanner(&BannerPixmap,getPixmap("search"),tr("Search"),width());
|
||||
}
|
||||
|
||||
SearchDialog::~SearchDialog()
|
||||
|
||||
Reference in New Issue
Block a user