From b2625698125d4ad952d4dd660f7ecb6ec77a5a12 Mon Sep 17 00:00:00 2001 From: Massimo Melina Date: Tue, 5 May 2020 14:09:25 +0200 Subject: [PATCH] fix: account password field not working workarounded by changing method --- optionsDlg.dfm | 51 +++++++++----------------------------------------- optionsDlg.pas | 12 ++++++------ 2 files changed, 15 insertions(+), 48 deletions(-) diff --git a/optionsDlg.dfm b/optionsDlg.dfm index 7f834cf..25a5e2b 100644 --- a/optionsDlg.dfm +++ b/optionsDlg.dfm @@ -32,10 +32,6 @@ object optionsFrm: ToptionsFrm object bansPage: TTabSheet Caption = 'Bans' ImageIndex = 25 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object Panel1: TPanel Left = 0 Top = 0 @@ -119,10 +115,6 @@ object optionsFrm: ToptionsFrm object accountsPage: TTabSheet Caption = 'Accounts' ImageIndex = 29 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 DesignSize = ( 797 385) @@ -156,7 +148,6 @@ object optionsFrm: ToptionsFrm Anchors = [akLeft, akTop, akRight, akBottom] Caption = 'Account properties' TabOrder = 7 - ExplicitHeight = 318 DesignSize = ( 619 317) @@ -202,7 +193,6 @@ object optionsFrm: ToptionsFrm TabOrder = 7 OnContextPopup = accountAccessBoxContextPopup OnDblClick = accountAccessBoxDblClick - ExplicitHeight = 117 end object ignoreLimitsChk: TCheckBox Left = 226 @@ -213,23 +203,25 @@ object optionsFrm: ToptionsFrm TabOrder = 2 end object pwdBox: TLabeledEdit - Left = 11 + Left = 13 Top = 63 Width = 198 - Height = 21 + Height = 22 EditLabel.Width = 50 EditLabel.Height = 14 EditLabel.Caption = '&Password' + ParentShowHint = False PasswordChar = '*' + ShowHint = True TabOrder = 3 - OnEnter = pwdBoxEnter - OnExit = pwdBoxExit + OnChange = pwdBoxChange + OnMouseEnter = pwdBoxMouseEnter end object redirBox: TLabeledEdit Left = 11 Top = 106 Width = 198 - Height = 21 + Height = 22 EditLabel.Width = 111 EditLabel.Height = 14 EditLabel.Caption = 'After ~login, redirect to' @@ -240,7 +232,7 @@ object optionsFrm: ToptionsFrm Left = 11 Top = 146 Width = 198 - Height = 21 + Height = 22 EditLabel.Width = 51 EditLabel.Height = 14 EditLabel.Caption = 'Member of' @@ -275,7 +267,6 @@ object optionsFrm: ToptionsFrm ScrollBars = ssVertical ShowHint = False TabOrder = 8 - ExplicitHeight = 270 end object notesWrapChk: TCheckBox Left = 502 @@ -306,7 +297,6 @@ object optionsFrm: ToptionsFrm ParentFont = False TabOrder = 2 OnClick = deleteaccountBtnClick - ExplicitTop = 352 end object renaccountBtn: TButton Left = 53 @@ -324,7 +314,6 @@ object optionsFrm: ToptionsFrm ParentFont = False TabOrder = 3 OnClick = renaccountBtnClick - ExplicitTop = 329 end object addaccountBtn: TButton Left = 3 @@ -341,7 +330,6 @@ object optionsFrm: ToptionsFrm ParentFont = False TabOrder = 1 OnClick = addaccountBtnClick - ExplicitTop = 329 end object upBtn: TButton Left = 107 @@ -359,7 +347,6 @@ object optionsFrm: ToptionsFrm TabOrder = 5 OnClick = upBtnClick OnMouseUp = upBtnMouseUp - ExplicitTop = 329 end object downBtn: TButton Left = 107 @@ -377,7 +364,6 @@ object optionsFrm: ToptionsFrm TabOrder = 6 OnClick = upBtnClick OnMouseUp = upBtnMouseUp - ExplicitTop = 352 end object sortBtn: TButton Left = 53 @@ -395,7 +381,6 @@ object optionsFrm: ToptionsFrm TabOrder = 4 OnClick = sortBtnClick OnMouseUp = upBtnMouseUp - ExplicitTop = 352 end object accountsBox: TListView Left = 3 @@ -423,16 +408,11 @@ object optionsFrm: ToptionsFrm OnDragOver = accountsBoxDragOver OnKeyDown = accountsBoxKeyDown OnKeyPress = accountsBoxKeyPress - ExplicitHeight = 288 end end object mimePage: TTabSheet Caption = 'MIME types' ImageIndex = 7 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object mimeBox: TValueListEditor Left = 0 Top = 30 @@ -489,10 +469,6 @@ object optionsFrm: ToptionsFrm object trayPage: TTabSheet Caption = 'Tray Message' ImageIndex = 10 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object Label2: TLabel Left = 8 Top = 16 @@ -538,10 +514,6 @@ object optionsFrm: ToptionsFrm object a2nPage: TTabSheet Caption = 'Address2name' ImageIndex = -1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object Panel4: TPanel Left = 0 Top = 0 @@ -601,10 +573,6 @@ object optionsFrm: ToptionsFrm object iconsPage: TTabSheet Caption = 'Icon masks' ImageIndex = -1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 DesignSize = ( 797 385) @@ -631,7 +599,6 @@ object optionsFrm: ToptionsFrm Anchors = [akLeft, akTop, akBottom] TabOrder = 0 OnChange = iconMasksBoxChange - ExplicitHeight = 246 end object iconsBox: TComboBox Left = 272 @@ -668,7 +635,7 @@ object optionsFrm: ToptionsFrm OnClick = okBtnClick end object applyBtn: TButton - Left = 725 + Left = 724 Top = 6 Width = 75 Height = 25 diff --git a/optionsDlg.pas b/optionsDlg.pas index 4fd203e..4183a08 100644 --- a/optionsDlg.pas +++ b/optionsDlg.pas @@ -100,8 +100,6 @@ type procedure addBtnClick(Sender: TObject); procedure Button1Click(Sender: TObject); procedure deleteBtnClick(Sender: TObject); - procedure pwdBoxEnter(Sender: TObject); - procedure pwdBoxExit(Sender: TObject); procedure addMimeBtnClick(Sender: TObject); procedure deleteMimeBtnClick(Sender: TObject); procedure addA2NbtnClick(Sender: TObject); @@ -140,6 +138,8 @@ type procedure accountsBoxKeyPress(Sender: TObject; var Key: Char); procedure accountsBoxEditing(Sender: TObject; Item: TListItem; var AllowEdit: Boolean); + procedure pwdBoxMouseEnter(Sender: TObject); + procedure pwdBoxChange(Sender: TObject); public procedure checkRedir(); procedure loadAccountProperties(); @@ -860,11 +860,11 @@ try finally groups.free end; end; -procedure ToptionsFrm.pwdBoxEnter(Sender: TObject); -begin if pwdBox.Text > '' then pwdBox.passwordChar:=#0 end; +procedure ToptionsFrm.pwdBoxChange(Sender: TObject); +begin pwdBox.hint:=pwdBox.text end; -procedure ToptionsFrm.pwdBoxExit(Sender: TObject); -begin pwdBox.passwordChar:='*' end; +procedure ToptionsFrm.pwdBoxMouseEnter(Sender: TObject); +begin pwdBox.hint:=pwdBox.text end; procedure ToptionsFrm.addBtnClick(Sender: TObject); begin bansBox.InsertRow('','',TRUE) end;