fixed bug #1634718,
applied patch #1626541, added czech translation, lupdate for all translations git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@122 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
#include <qmessagebox.h>
|
||||
#include <qtoolbutton.h>
|
||||
#include <QShowEvent>
|
||||
#include <QResizeEvent>
|
||||
|
||||
#include "SelectIconDlg.h"
|
||||
#include "PasswordGenDlg.h"
|
||||
@@ -51,7 +52,9 @@ CEditEntryDlg::CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* paren
|
||||
entry=_entry;
|
||||
db=_db;
|
||||
setupUi(this);
|
||||
//not sure if this createBanner is still needed
|
||||
createBanner(&BannerPixmap,Icon_Key32x32,tr("Edit Entry"),width());
|
||||
//end
|
||||
ModFlag=false;
|
||||
connect(Edit_Password_w, SIGNAL(editingFinished()), this, SLOT(OnPasswordwLostFocus()));
|
||||
connect(Edit_Password_w, SIGNAL(textChanged(const QString&)), this, SLOT( OnPasswordwTextChanged(const QString&)));
|
||||
@@ -133,6 +136,13 @@ if(event->spontaneous()==false){
|
||||
}
|
||||
}
|
||||
|
||||
//Added resize event
|
||||
void CEditEntryDlg::resizeEvent(QResizeEvent *event){
|
||||
createBanner(&BannerPixmap,Icon_Key32x32,tr("Test 2"),width());
|
||||
}
|
||||
|
||||
|
||||
|
||||
void CEditEntryDlg::paintEvent(QPaintEvent *event){
|
||||
QDialog::paintEvent(event);
|
||||
QPainter painter(this);
|
||||
|
||||
@@ -60,6 +60,8 @@ class CEditEntryDlg : public QDialog, public Ui_EditEntryDialog
|
||||
private:
|
||||
virtual void showEvent(QShowEvent *);
|
||||
virtual void paintEvent(QPaintEvent*);
|
||||
// Added resizeEvent
|
||||
virtual void resizeEvent(QResizeEvent *);
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ CPasswordDialog::CPasswordDialog(QWidget* parent,IDatabase* DB,bool ShowExitButt
|
||||
connect( ButtonCancel, SIGNAL( clicked() ), this, SLOT( OnCancel() ) );
|
||||
connect( Edit_Password, SIGNAL( textChanged(const QString&) ), this, SLOT( OnPasswordChanged(const QString&) ) );
|
||||
connect( CheckBox_Both, SIGNAL( stateChanged(int) ), this, SLOT( OnCheckBox_BothChanged(int) ) );
|
||||
connect( ButtonChangeEchoMode, SIGNAL( clicked() ), this, SLOT( ChangeEchoMode() ) );
|
||||
connect( ButtonChangeEchoMode, SIGNAL( clicked() ), this, SLOT( ChangeEchoModeDatabaseKey() ) );
|
||||
connect( Edit_Password, SIGNAL( returnPressed() ), this, SLOT( OnOK() ) );
|
||||
connect( Edit_PasswordRep, SIGNAL( returnPressed() ), this, SLOT( OnOK() ) );
|
||||
connect( ButtonExit, SIGNAL( clicked()),this,SLOT(OnButtonExit()));
|
||||
@@ -82,7 +82,7 @@ CPasswordDialog::CPasswordDialog(QWidget* parent,IDatabase* DB,bool ShowExitButt
|
||||
connect( ButtonBrowse, SIGNAL( clicked() ), this, SLOT( OnButtonBrowse_Set() ) );
|
||||
}
|
||||
|
||||
if(!config.ShowPasswords)ChangeEchoMode();
|
||||
if(!config.ShowPasswordsPasswordDlg)ChangeEchoModeDatabaseKey();
|
||||
}
|
||||
|
||||
|
||||
@@ -322,7 +322,7 @@ if(state==Qt::Unchecked){
|
||||
|
||||
}
|
||||
|
||||
void CPasswordDialog::ChangeEchoMode(){
|
||||
void CPasswordDialog::ChangeEchoModeDatabaseKey(){
|
||||
if(Edit_Password->echoMode()==QLineEdit::Normal){
|
||||
Edit_Password->setEchoMode(QLineEdit::Password);
|
||||
Edit_PasswordRep->setEchoMode(QLineEdit::Password);}
|
||||
|
||||
@@ -53,7 +53,7 @@ class CPasswordDialog : public QDialog, public Ui_PasswordDlg
|
||||
void OnButtonExit();
|
||||
void OnPasswordChanged(const QString &txt);
|
||||
void OnCheckBox_BothChanged(int state);
|
||||
void ChangeEchoMode();
|
||||
void ChangeEchoModeDatabaseKey();
|
||||
void OnComboTextChanged(const QString&);
|
||||
};
|
||||
|
||||
|
||||
@@ -74,6 +74,7 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
|
||||
color2=config.BannerColor2;
|
||||
textcolor=config.BannerTextColor;
|
||||
CheckBox_ShowPasswords->setChecked(config.ShowPasswords);
|
||||
CheckBox_ShowPasswords_PasswordDlg->setChecked(config.ShowPasswordsPasswordDlg);
|
||||
checkBox_ShowSysTrayIcon->setChecked(config.ShowSysTrayIcon);
|
||||
checkBox_MinimizeToTray->setChecked(config.MinimizeToTray);
|
||||
checkBox_SaveFileDlgHistory->setChecked(config.SaveFileDlgHistory);
|
||||
@@ -146,6 +147,7 @@ void CSettingsDlg::apply(){
|
||||
config.BannerColor2=color2;
|
||||
config.BannerTextColor=textcolor;
|
||||
config.ShowPasswords=CheckBox_ShowPasswords->isChecked();
|
||||
config.ShowPasswordsPasswordDlg=CheckBox_ShowPasswords_PasswordDlg->isChecked();
|
||||
config.OpenUrlCommand=Edit_BrowserCmd->text();
|
||||
config.AlternatingRowColors=CheckBox_AlternatingRowColors->isChecked();
|
||||
config.MountDir=Edit_MountDir->text();
|
||||
@@ -234,4 +236,4 @@ void CSettingsDlg::OnIntPluginGnome(bool toggled){
|
||||
|
||||
void CSettingsDlg::OnIntPluginKde(bool toggled){
|
||||
Label_IntPlugin_Info->show();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user