Browse Source

BUG: account explorer now correctly opens operations dialog

Herman Schoenfeld 7 years ago
parent
commit
9aca12bc21

+ 14 - 13
Units/Forms/UFRMAccountExplorer.lfm

@@ -1,6 +1,6 @@
 object FRMAccountExplorer: TFRMAccountExplorer
 object FRMAccountExplorer: TFRMAccountExplorer
   Left = 207
   Left = 207
-  Height = 471
+  Height = 451
   Top = 94
   Top = 94
   Width = 868
   Width = 868
   Caption = 'Accounts Explorer'
   Caption = 'Accounts Explorer'
@@ -11,10 +11,11 @@ object FRMAccountExplorer: TFRMAccountExplorer
   OnCreate = FormCreate
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnDestroy = FormDestroy
   Position = poOwnerFormCenter
   Position = poOwnerFormCenter
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.8.0.6'
+  Visible = False
   object Splitter1: TSplitter
   object Splitter1: TSplitter
     Left = 380
     Left = 380
-    Height = 385
+    Height = 365
     Top = 66
     Top = 66
     Width = 5
     Width = 5
   end
   end
@@ -140,17 +141,17 @@ object FRMAccountExplorer: TFRMAccountExplorer
   end
   end
   object pnlAccounts: TPanel
   object pnlAccounts: TPanel
     Left = 0
     Left = 0
-    Height = 385
+    Height = 365
     Top = 66
     Top = 66
     Width = 380
     Width = 380
     Align = alLeft
     Align = alLeft
     BevelOuter = bvNone
     BevelOuter = bvNone
-    ClientHeight = 385
+    ClientHeight = 365
     ClientWidth = 380
     ClientWidth = 380
     TabOrder = 1
     TabOrder = 1
     object dgAccounts: TDrawGrid
     object dgAccounts: TDrawGrid
       Left = 0
       Left = 0
-      Height = 351
+      Height = 331
       Top = 0
       Top = 0
       Width = 380
       Width = 380
       Align = alClient
       Align = alClient
@@ -164,7 +165,7 @@ object FRMAccountExplorer: TFRMAccountExplorer
     object pnlAccountsInfo: TPanel
     object pnlAccountsInfo: TPanel
       Left = 0
       Left = 0
       Height = 34
       Height = 34
-      Top = 351
+      Top = 331
       Width = 380
       Width = 380
       Align = alBottom
       Align = alBottom
       BevelOuter = bvNone
       BevelOuter = bvNone
@@ -245,7 +246,7 @@ object FRMAccountExplorer: TFRMAccountExplorer
   end
   end
   object pcAccountsOptions: TPageControl
   object pcAccountsOptions: TPageControl
     Left = 385
     Left = 385
-    Height = 385
+    Height = 365
     Top = 66
     Top = 66
     Width = 483
     Width = 483
     ActivePage = tsMultiSelectAccounts
     ActivePage = tsMultiSelectAccounts
@@ -273,12 +274,12 @@ object FRMAccountExplorer: TFRMAccountExplorer
     end
     end
     object tsMultiSelectAccounts: TTabSheet
     object tsMultiSelectAccounts: TTabSheet
       Caption = 'Selected accounts for massive operations'
       Caption = 'Selected accounts for massive operations'
-      ClientHeight = 357
+      ClientHeight = 337
       ClientWidth = 475
       ClientWidth = 475
       ImageIndex = 1
       ImageIndex = 1
       object dgSelectedAccounts: TDrawGrid
       object dgSelectedAccounts: TDrawGrid
         Left = 41
         Left = 41
-        Height = 300
+        Height = 280
         Top = 31
         Top = 31
         Width = 325
         Width = 325
         Align = alLeft
         Align = alLeft
@@ -316,7 +317,7 @@ object FRMAccountExplorer: TFRMAccountExplorer
       object pnlSelectedAccountsBottom: TPanel
       object pnlSelectedAccountsBottom: TPanel
         Left = 0
         Left = 0
         Height = 26
         Height = 26
-        Top = 331
+        Top = 311
         Width = 475
         Width = 475
         Align = alBottom
         Align = alBottom
         BevelOuter = bvNone
         BevelOuter = bvNone
@@ -358,12 +359,12 @@ object FRMAccountExplorer: TFRMAccountExplorer
       end
       end
       object pnlSelectedAccountsLeft: TPanel
       object pnlSelectedAccountsLeft: TPanel
         Left = 0
         Left = 0
-        Height = 300
+        Height = 280
         Top = 31
         Top = 31
         Width = 41
         Width = 41
         Align = alLeft
         Align = alLeft
         BevelOuter = bvNone
         BevelOuter = bvNone
-        ClientHeight = 300
+        ClientHeight = 280
         ClientWidth = 41
         ClientWidth = 41
         TabOrder = 3
         TabOrder = 3
         object sbSelectedAccountsAdd: TSpeedButton
         object sbSelectedAccountsAdd: TSpeedButton

+ 5 - 13
Units/Forms/UFRMAccountExplorer.pas

@@ -601,20 +601,12 @@ var l : TOrderedCardinalList;
 begin
 begin
   TUserInterface.CheckNodeIsReady;
   TUserInterface.CheckNodeIsReady;
   if FAccountsSelectedGrid.AccountsCount<=0 then raise Exception.Create('Must select at least 1 account');
   if FAccountsSelectedGrid.AccountsCount<=0 then raise Exception.Create('Must select at least 1 account');
-  With TFRMOperation.Create(Self) do
-  Try
+  try
     l := FAccountsSelectedGrid.LockAccountsList;
     l := FAccountsSelectedGrid.LockAccountsList;
-    try
-      SenderAccounts.CopyFrom(l);
-    finally
-      FAccountsSelectedGrid.UnlockAccountsList;
-    end;
-    DefaultFee := TSettings.DefaultFee;
-    WalletKeys := TWallet.Keys;
-    ShowModal;
-  Finally
-    Free;
-  End;
+    TUserInterface.ShowNewOperationDialog(Self, l, TSettings.DefaultFee);
+  finally
+    FAccountsSelectedGrid.UnlockAccountsList;
+  end;
 end;
 end;
 
 
 procedure TFRMAccountExplorer.sbSearchAccountClick(Sender: TObject);
 procedure TFRMAccountExplorer.sbSearchAccountClick(Sender: TObject);

+ 1 - 0
Units/Forms/UUserInterface.pas

@@ -449,6 +449,7 @@ begin
   Try
   Try
     SenderAccounts.CopyFrom(accounts);
     SenderAccounts.CopyFrom(accounts);
     DefaultFee := defaultFee;
     DefaultFee := defaultFee;
+    WalletKeys := TWallet.Keys;
     ShowModal;
     ShowModal;
   Finally
   Finally
     Free;
     Free;