Display warning when opening a database that is already opened
Improve tab order in many dialogs (closes #2130397) git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@222 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
@@ -61,30 +61,36 @@ PasswordDialog::PasswordDialog(QWidget* parent,DlgMode mode,DlgFlags flags,const
|
||||
Check_Password->setChecked(true);
|
||||
Check_KeyFile->setChecked(false);
|
||||
Combo_KeyFile->setEditText("");
|
||||
Edit_Password->setFocus(Qt::OtherFocusReason);
|
||||
break;
|
||||
|
||||
case KEYFILE:
|
||||
Check_Password->setChecked(false);
|
||||
Check_KeyFile->setChecked(true);
|
||||
Combo_KeyFile->setEditText(QDir::cleanPath(QDir::current().absoluteFilePath(config->lastKeyLocation())));
|
||||
Combo_KeyFile->setFocus(Qt::OtherFocusReason);
|
||||
break;
|
||||
|
||||
case BOTH:
|
||||
Check_Password->setChecked(true);
|
||||
Check_KeyFile->setChecked(true);
|
||||
Combo_KeyFile->setEditText(QDir::cleanPath(QDir::current().absoluteFilePath(config->lastKeyLocation())));
|
||||
Edit_Password->setFocus(Qt::OtherFocusReason);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else{
|
||||
Edit_Password->setFocus(Qt::OtherFocusReason);
|
||||
}
|
||||
|
||||
if(Mode!=Mode_Set && Mode!=Mode_Change){
|
||||
Button_GenKeyFile->hide();
|
||||
}
|
||||
if(flags & Flag_Auto){
|
||||
/*
|
||||
/*if(flags & Flag_Auto){
|
||||
/ *
|
||||
QPushButton* Button_Quit = buttonBox->addButton(tr("Quit"),QDialogButtonBox::DestructiveRole);
|
||||
connect(Button_Quit,SIGNAL(clicked()),this,SLOT(OnButtonQuit()));
|
||||
*/
|
||||
* /
|
||||
if(config->rememberLastKey()){
|
||||
switch(config->lastKeyType()){
|
||||
case PASSWORD:
|
||||
@@ -100,10 +106,10 @@ PasswordDialog::PasswordDialog(QWidget* parent,DlgMode mode,DlgFlags flags,const
|
||||
Check_Password->setChecked(true);
|
||||
Check_KeyFile->setChecked(true);
|
||||
Combo_KeyFile->setEditText(config->lastKeyLocation());
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
// Setting up the bookmark button
|
||||
if(Mode==Mode_Ask && config->featureBookmarks()){
|
||||
|
||||
Reference in New Issue
Block a user