Add accounts info of each key in Wallet Keys

src/gui-classic/UFRMOperation.dfm

@@ -66,7 +66,6 @@ object FRMOperation: TFRMOperation
     Width = 130
     Height = 31
     Caption = 'Execute (F12)'
-    DoubleBuffered = True
     Glyph.Data = {
       DE010000424DDE01000000000000760000002800000024000000120000000100
       0400000000006801000000000000000000001000000000000000000000000000
@@ -85,7 +84,6 @@ object FRMOperation: TFRMOperation
       333A333333333333333338330000333333333333333333333333333333333333
       0000}
     NumGlyphs = 2
-    ParentDoubleBuffered = False
     TabOrder = 2
     OnClick = actExecuteExecute
   end
@@ -94,9 +92,8 @@ object FRMOperation: TFRMOperation
     Top = 445
     Width = 116
     Height = 31
-    DoubleBuffered = True
     Kind = bkCancel
-    ParentDoubleBuffered = False
+    NumGlyphs = 2
     TabOrder = 3
   end
   object PageControlLocked: TPageControl
@@ -229,6 +226,7 @@ object FRMOperation: TFRMOperation
           Height = 19
           Caption = 'Encrypted with password'
           TabOrder = 2
+          TabStop = True
           OnClick = memoPayloadClick
         end
         object rbNotEncrypted: TRadioButton
@@ -238,6 +236,7 @@ object FRMOperation: TFRMOperation
           Height = 19
           Caption = 'Dont encrypt (Public payload)'
           TabOrder = 4
+          TabStop = True
           OnClick = memoPayloadClick
         end
         object ebEncryptPassword: TEdit
@@ -272,6 +271,7 @@ object FRMOperation: TFRMOperation
           Height = 19
           Caption = 'Encrypted with old public key'
           TabOrder = 0
+          TabStop = True
           OnClick = memoPayloadClick
         end
       end
@@ -292,10 +292,6 @@ object FRMOperation: TFRMOperation
         OnChange = PageControlOpTypeChange
         object tsTransaction: TTabSheet
           Caption = 'Transaction'
-          ExplicitLeft = 0
-          ExplicitTop = 0
-          ExplicitWidth = 0
-          ExplicitHeight = 0
           object lblDestAccount: TLabel
             Left = 13
             Top = 32
@@ -382,10 +378,6 @@ object FRMOperation: TFRMOperation
         object tsChangePrivateKey: TTabSheet
           Caption = 'Change key'
           ImageIndex = 1
-          ExplicitLeft = 0
-          ExplicitTop = 0
-          ExplicitWidth = 0
-          ExplicitHeight = 0
           object gbChangeKey: TGroupBox
             Left = 7
             Top = 6
@@ -474,7 +466,6 @@ object FRMOperation: TFRMOperation
               Top = 36
               Width = 31
               Height = 22
-              DoubleBuffered = True
               Glyph.Data = {
                 36050000424D3605000000000000360400002800000010000000100000000100
                 0800000000000001000000000000000000000001000000010000FF00FF008C6B
@@ -518,7 +509,6 @@ object FRMOperation: TFRMOperation
                 6247446E7336000000000B552C25263C3E4B4E483636000000000F55542F3057
                 523331020000000000000B77766D5F5C5C5C2F08000000000000001476726C5C
                 5A58100000000000000000000F0F0B0F0F0F0000000000000000}
-              ParentDoubleBuffered = False
               TabOrder = 2
               OnClick = bbChangePrivateKeyKeysClick
             end
@@ -535,10 +525,6 @@ object FRMOperation: TFRMOperation
         object tsListForSale: TTabSheet
           Caption = 'List account for sale'
           ImageIndex = 3
-          ExplicitLeft = 0
-          ExplicitTop = 0
-          ExplicitWidth = 0
-          ExplicitHeight = 0
           object gbSaleType: TGroupBox
             Left = 7
             Top = 5
@@ -682,10 +668,6 @@ object FRMOperation: TFRMOperation
         object tsDelist: TTabSheet
           Caption = 'Delist account'
           ImageIndex = 3
-          ExplicitLeft = 0
-          ExplicitTop = 0
-          ExplicitWidth = 0
-          ExplicitHeight = 0
           object lblDelistErrors: TLabel
             Left = 13
             Top = 10
@@ -706,10 +688,6 @@ object FRMOperation: TFRMOperation
         object tsBuyAccount: TTabSheet
           Caption = 'Buy account'
           ImageIndex = 4
-          ExplicitLeft = 0
-          ExplicitTop = 0
-          ExplicitWidth = 0
-          ExplicitHeight = 0
           object lblAccountToBuy: TLabel
             Left = 13
             Top = 32
@@ -836,7 +814,6 @@ object FRMOperation: TFRMOperation
             Top = 84
             Width = 31
             Height = 22
-            DoubleBuffered = True
             Glyph.Data = {
               36050000424D3605000000000000360400002800000010000000100000000100
               0800000000000001000000000000000000000001000000010000FF00FF008C6B
@@ -880,7 +857,6 @@ object FRMOperation: TFRMOperation
               6247446E7336000000000B552C25263C3E4B4E483636000000000F55542F3057
               523331020000000000000B77766D5F5C5C5C2F08000000000000001476726C5C
               5A58100000000000000000000F0F0B0F0F0F0000000000000000}
-            ParentDoubleBuffered = False
             TabOrder = 3
             OnClick = bbBuyNewKeyClick
           end
@@ -952,10 +928,6 @@ object FRMOperation: TFRMOperation
     object tsGlobalError: TTabSheet
       ImageIndex = 1
       TabVisible = False
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object lblGlobalErrors: TLabel
         Left = 40
         Top = 50
@@ -980,7 +952,6 @@ object FRMOperation: TFRMOperation
         Width = 159
         Height = 38
         Caption = 'Password'
-        DoubleBuffered = True
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
         Font.Height = -13
@@ -1039,7 +1010,6 @@ object FRMOperation: TFRMOperation
           9191EFF6E1C9C8CDD9CC91919191919191919191919191919191C9EDF9F3F3EB
           DC91919191919191919191919191919191919191CBE0E1CF9191919191919191
           9191919191919191919191919191919191919191919191919191}
-        ParentDoubleBuffered = False
         ParentFont = False
         TabOrder = 0
         OnClick = bbPasswordClick

src/gui-classic/UFRMWallet.pas

@@ -2321,8 +2321,8 @@ begin
         s := wk.Name;
       end;
       if Not Assigned(wk.PrivateKey) then begin
-        if Length(wk.CryptedKey)>0 then s:=s+' (Encrypted, need password)';
-        s:=s+' (* without key)';
+        if Length(wk.CryptedKey)>0 then s:=s+' (**NEED PASSWORD**)'
+        else s:=s+' (**PUBLIC KEY ONLY**)';
       end;
       cbMyPrivateKeys.Items.AddObject(s,TObject(i));
     end;

src/gui-classic/UFRMWalletKeys.pas

@@ -535,7 +535,7 @@ begin
 end;
 
 procedure TFRMWalletKeys.UpdateWalletKeys;
-Var lasti,i : Integer;
+Var lasti,i,j : Integer;
   selected_wk,wk : TWalletKey;
   s : AnsiString;
 begin
@@ -563,9 +563,15 @@ begin
       end else begin
         s := wk.Name;
       end;
+      if (WalletKeys is TWalletKeysExt) then begin
+        j := TWalletKeysExt(WalletKeys).AccountsKeyList.IndexOfAccountKey(wk.AccountKey);
+        if (j>=0) then begin
+          s := s+' ('+IntToStr(TWalletKeysExt(WalletKeys).AccountsKeyList.AccountKeyList[j].Count)+' Accounts)';
+        end;
+      end;
       if Not Assigned(wk.PrivateKey) then begin
-        if Length(wk.CryptedKey)>0 then s:=s+' (Encrypted, need password)';
-        s:=s+' (* without key)';
+        if Length(wk.CryptedKey)>0 then s:=s+' (**NEED PASSWORD**)'
+        else s:=s+' (**PUBLIC KEY ONLY**)';
       end;
       lbWalletKeys.Items.AddObject(s,TObject(i));
     end;