Browse Source

Merge pull request #162 from Techworker/feature/resize-account-column

Increased account no. column size
Herman Schoenfeld 6 years ago
parent
commit
08fc1d068f
2 changed files with 80 additions and 80 deletions
  1. 78 78
      src/gui-classic/UFRMWallet.lfm
  2. 2 2
      src/gui-classic/UGridUtils.pas

+ 78 - 78
src/gui-classic/UFRMWallet.lfm

@@ -16,7 +16,6 @@ object FRMWallet: TFRMWallet
   OnCreate = FormCreate
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnDestroy = FormDestroy
   Position = poOwnerFormCenter
   Position = poOwnerFormCenter
-  LCLVersion = '1.8.4.0'
   Visible = False
   Visible = False
   object pnlTop: TPanel
   object pnlTop: TPanel
     Left = 0
     Left = 0
@@ -169,7 +168,7 @@ object FRMWallet: TFRMWallet
       Left = 90
       Left = 90
       Height = 13
       Height = 13
       Top = 11
       Top = 11
-      Width = 60
+      Width = 70
       Caption = 'Total Blocks:'
       Caption = 'Total Blocks:'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -177,7 +176,7 @@ object FRMWallet: TFRMWallet
       Left = 166
       Left = 166
       Height = 13
       Height = 13
       Top = 11
       Top = 11
-      Width = 18
+      Width = 21
       Caption = '000'
       Caption = '000'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -185,7 +184,7 @@ object FRMWallet: TFRMWallet
       Left = 90
       Left = 90
       Height = 13
       Height = 13
       Top = 26
       Top = 26
-      Width = 90
+      Width = 107
       Caption = 'Current Block Age:'
       Caption = 'Current Block Age:'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -193,7 +192,7 @@ object FRMWallet: TFRMWallet
       Left = 198
       Left = 198
       Height = 13
       Height = 13
       Top = 26
       Top = 26
-      Width = 81
+      Width = 96
       Caption = '000 seconds ago'
       Caption = '000 seconds ago'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -201,7 +200,7 @@ object FRMWallet: TFRMWallet
       Left = 90
       Left = 90
       Height = 13
       Height = 13
       Top = 41
       Top = 41
-      Width = 98
+      Width = 115
       Caption = 'Pending Operations:'
       Caption = 'Pending Operations:'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -209,7 +208,7 @@ object FRMWallet: TFRMWallet
       Left = 207
       Left = 207
       Height = 13
       Height = 13
       Top = 41
       Top = 41
-      Width = 18
+      Width = 21
       Caption = '000'
       Caption = '000'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -217,7 +216,7 @@ object FRMWallet: TFRMWallet
       Left = 90
       Left = 90
       Height = 13
       Height = 13
       Top = 56
       Top = 56
-      Width = 65
+      Width = 77
       Caption = 'Miner Clients:'
       Caption = 'Miner Clients:'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -225,7 +224,7 @@ object FRMWallet: TFRMWallet
       Left = 177
       Left = 177
       Height = 13
       Height = 13
       Top = 56
       Top = 56
-      Width = 18
+      Width = 21
       Caption = '000'
       Caption = '000'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -233,7 +232,7 @@ object FRMWallet: TFRMWallet
       Left = 429
       Left = 429
       Height = 13
       Height = 13
       Top = 11
       Top = 11
-      Width = 76
+      Width = 86
       Caption = 'Current Target:'
       Caption = 'Current Target:'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -241,7 +240,7 @@ object FRMWallet: TFRMWallet
       Left = 518
       Left = 518
       Height = 13
       Height = 13
       Top = 11
       Top = 11
-      Width = 18
+      Width = 21
       Caption = '000'
       Caption = '000'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -249,7 +248,7 @@ object FRMWallet: TFRMWallet
       Left = 370
       Left = 370
       Height = 13
       Height = 13
       Top = 26
       Top = 26
-      Width = 18
+      Width = 21
       Caption = '000'
       Caption = '000'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -257,7 +256,7 @@ object FRMWallet: TFRMWallet
       Left = 285
       Left = 285
       Height = 13
       Height = 13
       Top = 26
       Top = 26
-      Width = 69
+      Width = 83
       Caption = 'Time average:'
       Caption = 'Time average:'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -265,7 +264,7 @@ object FRMWallet: TFRMWallet
       Left = 90
       Left = 90
       Height = 13
       Height = 13
       Top = 70
       Top = 70
-      Width = 63
+      Width = 72
       Caption = 'Node Status:'
       Caption = 'Node Status:'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -273,7 +272,7 @@ object FRMWallet: TFRMWallet
       Left = 168
       Left = 168
       Height = 13
       Height = 13
       Top = 70
       Top = 70
-      Width = 15
+      Width = 18
       Caption = '???'
       Caption = '???'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -281,7 +280,7 @@ object FRMWallet: TFRMWallet
       Left = 285
       Left = 285
       Height = 13
       Height = 13
       Top = 11
       Top = 11
-      Width = 48
+      Width = 55
       Caption = 'Accounts:'
       Caption = 'Accounts:'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -289,7 +288,7 @@ object FRMWallet: TFRMWallet
       Left = 344
       Left = 344
       Height = 13
       Height = 13
       Top = 11
       Top = 11
-      Width = 18
+      Width = 21
       Caption = '000'
       Caption = '000'
       ParentColor = False
       ParentColor = False
     end
     end
@@ -297,7 +296,7 @@ object FRMWallet: TFRMWallet
       Left = 370
       Left = 370
       Height = 13
       Height = 13
       Top = 41
       Top = 41
-      Width = 18
+      Width = 21
       Caption = '000'
       Caption = '000'
       Font.Color = clGray
       Font.Color = clGray
       Font.Height = -11
       Font.Height = -11
@@ -309,7 +308,7 @@ object FRMWallet: TFRMWallet
       Left = 360
       Left = 360
       Height = 13
       Height = 13
       Top = 56
       Top = 56
-      Width = 76
+      Width = 89
       Caption = 'Blocks Found:'
       Caption = 'Blocks Found:'
       Font.Color = clWindowText
       Font.Color = clWindowText
       Font.Height = -11
       Font.Height = -11
@@ -323,7 +322,7 @@ object FRMWallet: TFRMWallet
       Height = 13
       Height = 13
       Hint = 'Blocks found while Miner is running...'
       Hint = 'Blocks found while Miner is running...'
       Top = 56
       Top = 56
-      Width = 21
+      Width = 24
       Caption = '000'
       Caption = '000'
       Font.Color = clWindowText
       Font.Color = clWindowText
       Font.Height = -11
       Font.Height = -11
@@ -337,9 +336,9 @@ object FRMWallet: TFRMWallet
     object lblReceivedMessages: TLabel
     object lblReceivedMessages: TLabel
       Cursor = crHandPoint
       Cursor = crHandPoint
       Left = 360
       Left = 360
-      Height = 23
+      Height = 22
       Top = 66
       Top = 66
-      Width = 184
+      Width = 210
       Caption = 'Received Messages'
       Caption = 'Received Messages'
       Font.Color = clRed
       Font.Color = clRed
       Font.Height = -19
       Font.Height = -19
@@ -351,9 +350,9 @@ object FRMWallet: TFRMWallet
     end
     end
     object lblBuild: TLabel
     object lblBuild: TLabel
       Left = 586
       Left = 586
-      Height = 23
+      Height = 22
       Top = 3
       Top = 3
-      Width = 49
+      Width = 56
       Caption = 'Build'
       Caption = 'Build'
       Font.Color = clWindowText
       Font.Color = clWindowText
       Font.Height = -19
       Font.Height = -19
@@ -365,8 +364,8 @@ object FRMWallet: TFRMWallet
   end
   end
   object StatusBar: TStatusBar
   object StatusBar: TStatusBar
     Left = 0
     Left = 0
-    Height = 23
-    Top = 537
+    Height = 21
+    Top = 559
     Width = 865
     Width = 865
     Panels = <    
     Panels = <    
       item
       item
@@ -386,7 +385,7 @@ object FRMWallet: TFRMWallet
   end
   end
   object PageControl: TPageControl
   object PageControl: TPageControl
     Left = 0
     Left = 0
-    Height = 446
+    Height = 468
     Top = 91
     Top = 91
     Width = 865
     Width = 865
     ActivePage = tsMyAccounts
     ActivePage = tsMyAccounts
@@ -396,11 +395,11 @@ object FRMWallet: TFRMWallet
     OnChange = PageControlChange
     OnChange = PageControlChange
     object tsMyAccounts: TTabSheet
     object tsMyAccounts: TTabSheet
       Caption = 'Account Explorer'
       Caption = 'Account Explorer'
-      ClientHeight = 420
-      ClientWidth = 857
+      ClientHeight = 441
+      ClientWidth = 861
       object Splitter1: TSplitter
       object Splitter1: TSplitter
-        Left = 400
-        Height = 354
+        Left = 410
+        Height = 375
         Top = 66
         Top = 66
         Width = 5
         Width = 5
       end
       end
@@ -408,42 +407,42 @@ object FRMWallet: TFRMWallet
         Left = 0
         Left = 0
         Height = 66
         Height = 66
         Top = 0
         Top = 0
-        Width = 857
+        Width = 861
         Align = alTop
         Align = alTop
         BevelOuter = bvNone
         BevelOuter = bvNone
         ClientHeight = 66
         ClientHeight = 66
-        ClientWidth = 857
+        ClientWidth = 861
         TabOrder = 0
         TabOrder = 0
         object Label18: TLabel
         object Label18: TLabel
           Left = 11
           Left = 11
           Height = 13
           Height = 13
           Top = 35
           Top = 35
-          Width = 61
+          Width = 70
           Caption = 'Find account'
           Caption = 'Find account'
           ParentColor = False
           ParentColor = False
         end
         end
         object cbMyPrivateKeys: TComboBox
         object cbMyPrivateKeys: TComboBox
           Left = 260
           Left = 260
-          Height = 21
+          Height = 31
           Top = 7
           Top = 7
           Width = 411
           Width = 411
-          ItemHeight = 13
+          ItemHeight = 0
           OnChange = cbMyPrivateKeysChange
           OnChange = cbMyPrivateKeysChange
           Style = csDropDownList
           Style = csDropDownList
           TabOrder = 0
           TabOrder = 0
         end
         end
         object cbExploreMyAccounts: TCheckBox
         object cbExploreMyAccounts: TCheckBox
           Left = 11
           Left = 11
-          Height = 19
+          Height = 24
           Top = 10
           Top = 10
-          Width = 235
+          Width = 329
           Caption = 'Explore accounts with one of my Wallet Keys'
           Caption = 'Explore accounts with one of my Wallet Keys'
           OnClick = cbExploreMyAccountsClick
           OnClick = cbExploreMyAccountsClick
           TabOrder = 1
           TabOrder = 1
         end
         end
         object ebFindAccountNumber: TEdit
         object ebFindAccountNumber: TEdit
           Left = 87
           Left = 87
-          Height = 21
+          Height = 23
           Top = 33
           Top = 33
           Width = 83
           Width = 83
           OnChange = ebFindAccountNumberChange
           OnChange = ebFindAccountNumberChange
@@ -461,16 +460,16 @@ object FRMWallet: TFRMWallet
         end
         end
         object cbFilterAccounts: TCheckBox
         object cbFilterAccounts: TCheckBox
           Left = 260
           Left = 260
-          Height = 19
+          Height = 24
           Top = 35
           Top = 35
-          Width = 145
+          Width = 202
           Caption = 'Filter accounts by balance'
           Caption = 'Filter accounts by balance'
           OnClick = cbFilterAccountsClick
           OnClick = cbFilterAccountsClick
           TabOrder = 4
           TabOrder = 4
         end
         end
         object ebFilterAccountByBalanceMin: TEdit
         object ebFilterAccountByBalanceMin: TEdit
           Left = 412
           Left = 412
-          Height = 21
+          Height = 23
           Hint = 'Min balance'
           Hint = 'Min balance'
           Top = 33
           Top = 33
           Width = 83
           Width = 83
@@ -480,7 +479,7 @@ object FRMWallet: TFRMWallet
         end
         end
         object ebFilterAccountByBalanceMax: TEdit
         object ebFilterAccountByBalanceMax: TEdit
           Left = 503
           Left = 503
-          Height = 21
+          Height = 23
           Hint = 'Max balance'
           Hint = 'Max balance'
           Top = 33
           Top = 33
           Width = 83
           Width = 83
@@ -526,19 +525,19 @@ object FRMWallet: TFRMWallet
       end
       end
       object pnlAccounts: TPanel
       object pnlAccounts: TPanel
         Left = 0
         Left = 0
-        Height = 354
+        Height = 375
         Top = 66
         Top = 66
-        Width = 400
+        Width = 410
         Align = alLeft
         Align = alLeft
         BevelOuter = bvNone
         BevelOuter = bvNone
-        ClientHeight = 354
-        ClientWidth = 400
+        ClientHeight = 375
+        ClientWidth = 410
         TabOrder = 1
         TabOrder = 1
         object dgAccounts: TDrawGrid
         object dgAccounts: TDrawGrid
           Left = 0
           Left = 0
-          Height = 320
+          Height = 341
           Top = 0
           Top = 0
-          Width = 400
+          Width = 410
           Align = alClient
           Align = alClient
           ExtendedSelect = False
           ExtendedSelect = False
           TabOrder = 0
           TabOrder = 0
@@ -550,18 +549,18 @@ object FRMWallet: TFRMWallet
         object pnlAccountsInfo: TPanel
         object pnlAccountsInfo: TPanel
           Left = 0
           Left = 0
           Height = 34
           Height = 34
-          Top = 320
-          Width = 400
+          Top = 341
+          Width = 410
           Align = alBottom
           Align = alBottom
           BevelOuter = bvNone
           BevelOuter = bvNone
           ClientHeight = 34
           ClientHeight = 34
-          ClientWidth = 400
+          ClientWidth = 410
           TabOrder = 1
           TabOrder = 1
           object Label17: TLabel
           object Label17: TLabel
             Left = 5
             Left = 5
             Height = 13
             Height = 13
             Top = 10
             Top = 10
-            Width = 48
+            Width = 55
             Caption = 'Accounts:'
             Caption = 'Accounts:'
             ParentColor = False
             ParentColor = False
           end
           end
@@ -569,7 +568,7 @@ object FRMWallet: TFRMWallet
             Left = 136
             Left = 136
             Height = 13
             Height = 13
             Top = 10
             Top = 10
-            Width = 41
+            Width = 49
             Caption = 'Balance:'
             Caption = 'Balance:'
             ParentColor = False
             ParentColor = False
           end
           end
@@ -577,7 +576,7 @@ object FRMWallet: TFRMWallet
             Left = 60
             Left = 60
             Height = 13
             Height = 13
             Top = 10
             Top = 10
-            Width = 18
+            Width = 21
             Caption = '000'
             Caption = '000'
             ParentColor = False
             ParentColor = False
           end
           end
@@ -585,12 +584,12 @@ object FRMWallet: TFRMWallet
             Left = 200
             Left = 200
             Height = 13
             Height = 13
             Top = 10
             Top = 10
-            Width = 18
+            Width = 21
             Caption = '000'
             Caption = '000'
             ParentColor = False
             ParentColor = False
           end
           end
           object bbAccountsRefresh: TBitBtn
           object bbAccountsRefresh: TBitBtn
-            Left = 322
+            Left = 332
             Height = 25
             Height = 25
             Top = 6
             Top = 6
             Width = 75
             Width = 75
@@ -630,23 +629,23 @@ object FRMWallet: TFRMWallet
         end
         end
       end
       end
       object pcAccountsOptions: TPageControl
       object pcAccountsOptions: TPageControl
-        Left = 405
-        Height = 354
+        Left = 415
+        Height = 375
         Top = 66
         Top = 66
-        Width = 452
+        Width = 446
         ActivePage = tsAccountOperations
         ActivePage = tsAccountOperations
         Align = alClient
         Align = alClient
         TabIndex = 0
         TabIndex = 0
         TabOrder = 2
         TabOrder = 2
         object tsAccountOperations: TTabSheet
         object tsAccountOperations: TTabSheet
           Caption = 'Operations of selected Account'
           Caption = 'Operations of selected Account'
-          ClientHeight = 328
-          ClientWidth = 444
+          ClientHeight = 348
+          ClientWidth = 442
           object dgAccountOperations: TDrawGrid
           object dgAccountOperations: TDrawGrid
             Left = 0
             Left = 0
-            Height = 328
+            Height = 348
             Top = 0
             Top = 0
-            Width = 444
+            Width = 442
             Align = alClient
             Align = alClient
             ExtendedSelect = False
             ExtendedSelect = False
             TabOrder = 0
             TabOrder = 0
@@ -659,7 +658,7 @@ object FRMWallet: TFRMWallet
         object tsMultiSelectAccounts: TTabSheet
         object tsMultiSelectAccounts: TTabSheet
           Caption = 'Selected accounts for massive operations'
           Caption = 'Selected accounts for massive operations'
           ClientHeight = 348
           ClientHeight = 348
-          ClientWidth = 444
+          ClientWidth = 442
           ImageIndex = 1
           ImageIndex = 1
           object dgSelectedAccounts: TDrawGrid
           object dgSelectedAccounts: TDrawGrid
             Left = 41
             Left = 41
@@ -856,8 +855,8 @@ object FRMWallet: TFRMWallet
     end
     end
     object tsPendingOperations: TTabSheet
     object tsPendingOperations: TTabSheet
       Caption = 'Pending Operations'
       Caption = 'Pending Operations'
-      ClientHeight = 440
-      ClientWidth = 857
+      ClientHeight = 441
+      ClientWidth = 861
       ImageIndex = 5
       ImageIndex = 5
       object dgPendingOperations: TDrawGrid
       object dgPendingOperations: TDrawGrid
         Left = 0
         Left = 0
@@ -902,8 +901,8 @@ object FRMWallet: TFRMWallet
     end
     end
     object tsBlockChain: TTabSheet
     object tsBlockChain: TTabSheet
       Caption = 'Block Explorer'
       Caption = 'Block Explorer'
-      ClientHeight = 440
-      ClientWidth = 857
+      ClientHeight = 441
+      ClientWidth = 861
       ImageIndex = 1
       ImageIndex = 1
       object Panel2: TPanel
       object Panel2: TPanel
         Left = 0
         Left = 0
@@ -971,7 +970,7 @@ object FRMWallet: TFRMWallet
           Height = 21
           Height = 21
           Top = 7
           Top = 7
           Width = 56
           Width = 56
-          ItemHeight = 13
+          ItemHeight = 0
           ItemIndex = 1
           ItemIndex = 1
           Items.Strings = (
           Items.Strings = (
             'Kh/s'
             'Kh/s'
@@ -1001,8 +1000,8 @@ object FRMWallet: TFRMWallet
     end
     end
     object tsOperations: TTabSheet
     object tsOperations: TTabSheet
       Caption = 'Operations Explorer'
       Caption = 'Operations Explorer'
-      ClientHeight = 440
-      ClientWidth = 857
+      ClientHeight = 441
+      ClientWidth = 861
       ImageIndex = 1
       ImageIndex = 1
       object Panel1: TPanel
       object Panel1: TPanel
         Left = 0
         Left = 0
@@ -1056,8 +1055,8 @@ object FRMWallet: TFRMWallet
     end
     end
     object tsLogs: TTabSheet
     object tsLogs: TTabSheet
       Caption = 'Logs'
       Caption = 'Logs'
-      ClientHeight = 440
-      ClientWidth = 857
+      ClientHeight = 441
+      ClientWidth = 861
       ImageIndex = 2
       ImageIndex = 2
       object pnlTopLogs: TPanel
       object pnlTopLogs: TPanel
         Left = 0
         Left = 0
@@ -1091,8 +1090,8 @@ object FRMWallet: TFRMWallet
     end
     end
     object tsNodeStats: TTabSheet
     object tsNodeStats: TTabSheet
       Caption = 'Node Stats'
       Caption = 'Node Stats'
-      ClientHeight = 440
-      ClientWidth = 857
+      ClientHeight = 441
+      ClientWidth = 861
       ImageIndex = 3
       ImageIndex = 3
       object Label3: TLabel
       object Label3: TLabel
         Left = 15
         Left = 15
@@ -1156,8 +1155,8 @@ object FRMWallet: TFRMWallet
     end
     end
     object tsMessages: TTabSheet
     object tsMessages: TTabSheet
       Caption = 'Messages'
       Caption = 'Messages'
-      ClientHeight = 440
-      ClientWidth = 857
+      ClientHeight = 441
+      ClientWidth = 861
       ImageIndex = 6
       ImageIndex = 6
       object Label11: TLabel
       object Label11: TLabel
         Left = 15
         Left = 15
@@ -1204,6 +1203,7 @@ object FRMWallet: TFRMWallet
         MultiSelect = True
         MultiSelect = True
         ScrollWidth = 273
         ScrollWidth = 273
         TabOrder = 0
         TabOrder = 0
+        TopIndex = -1
       end
       end
       object bbSendAMessage: TButton
       object bbSendAMessage: TButton
         Left = 315
         Left = 315

+ 2 - 2
src/gui-classic/UGridUtils.pas

@@ -210,7 +210,7 @@ uses
 { TAccountsGrid }
 { TAccountsGrid }
 
 
 Const CT_ColumnHeader : Array[TAccountColumnType] Of String =
 Const CT_ColumnHeader : Array[TAccountColumnType] Of String =
-  ('Account N.','Key','Balance','Updated','N Op.','S','Name','Type','Price');
+  ('Account No','Key','Balance','Updated','N Op.','S','Name','Type','Price');
 
 
 function TAccountsGrid.AccountNumber(GridRow: Integer): Int64;
 function TAccountsGrid.AccountNumber(GridRow: Integer): Int64;
 begin
 begin
@@ -237,7 +237,7 @@ begin
   FDrawGrid := Nil;
   FDrawGrid := Nil;
   SetLength(FColumns,7);
   SetLength(FColumns,7);
   FColumns[0].ColumnType := act_account_number;
   FColumns[0].ColumnType := act_account_number;
-  FColumns[0].width := 65;
+  FColumns[0].width := 75;
   FColumns[1].ColumnType := act_name;
   FColumns[1].ColumnType := act_name;
   FColumns[1].width := 80;
   FColumns[1].width := 80;
   FColumns[2].ColumnType := act_balance;
   FColumns[2].ColumnType := act_balance;