cleanup up wizards uses clauses.

src/gui-experimental/UUserInterface.pas

@@ -216,8 +216,8 @@ implementation
 
 uses
   UFRMAbout, UFRMNodesIp, UFRMPascalCoinWalletConfig, UFRMPayloadDecoder, UFRMMemoText,
-  UOpenSSL, UFileStorage, UTime, USettings, UCoreUtils, UCoreObjects, UMemory,
-  UWIZOperation, UWIZSendPASC, UWIZChangeKey, UWIZEnlistAccountForSale;
+  UOpenSSL, UFileStorage, UTime, USettings, UCoreUtils, UMemory,
+  UWIZOperation, UWIZSendPASC, UWIZChangeKey, UWIZEnlistAccountForSale, UCoreObjects;
 
 {%region UI Lifecyle}
 
@@ -739,6 +739,7 @@ begin
     try
       Caption := ATitle;
       Memo.Append(text);
+      Position := poMainFormCenter;
       ShowModal;
     finally
       Free;
@@ -752,6 +753,7 @@ begin
     try
       Caption := ATitle;
       Memo.Lines.Assign(text);
+      Position := poMainFormCenter;
       ShowModal;
     finally
       Free;

src/gui-experimental/UUserInterface.pas.rej

@@ -1,5 +0,0 @@
-diff a/src/gui/UUserInterface.pas b/src/gui/UUserInterface.pas	(rejected hunks)
-@@ -239,3 +239,2 @@
-     // Create root form and dependent components
--    FMainForm := mainForm as TFRMMainForm;
-     FMainForm.CloseAction := caNone;     // wallet is destroyed on ExitApplication

src/gui-experimental/core.utils/UCoreObjects.pas

@@ -18,8 +18,7 @@ unit UCoreObjects;
 interface
 
 uses
-  Classes, SysUtils, UCrypto, UAccounts, UBlockChain, UWallet, UCommon, UBaseTypes,
-  Generics.Collections, Generics.Defaults;
+  UBaseTypes;
 
 type
 

src/gui-experimental/core.utils/UCoreUtils.pas

@@ -22,10 +22,8 @@ unit UCoreUtils;
 interface
 
 uses
-  Classes, SysUtils, UCrypto, UAccounts, UBlockChain, UOpTransaction, UNode,
-  UBaseTypes, UCommon, UNetProtocol, UCoreObjects,UCommon.Collections,
-  Generics.Collections, Generics.Defaults,
-  Forms, Dialogs, LCLType, UCellRenderers;
+  Classes, SysUtils, Forms, Dialogs, LCLType, UAccounts, UBlockChain, UNode,
+  UBaseTypes, UCommon, UCoreObjects, UCommon.Collections, Generics.Defaults;
 
 type
 
@@ -122,10 +120,21 @@ type
     class function ExecuteEnlistAccountForSale(const ASelectedAccounts: TArray<TAccount>; const ASignerAccount, ASellerAccount: TAccount; const APublicKey: TAccountKey; AFee, ASalePrice: int64; ALockedUntilBlock: UInt32; const AAccountSaleMode: TAccountSaleMode; const APayloadEncryptionMode: TPayloadEncryptionMode; const APayloadContent, APayloadEncryptionPassword: string; var AErrorMessage: string): boolean; static;
   end;
 
+
 implementation
 
 uses
-  UMemory, UConst, UWallet, UUserInterface, UECIES, UAES, ULog;
+  ULog,
+  UAES,
+  UConst,
+  UECIES,
+  UCrypto,
+  UMemory,
+  UWallet,
+  UNetProtocol,
+  UUserInterface,
+  UOpTransaction,
+  Generics.Collections;
 
 { TCoreTool }
 
@@ -263,6 +272,7 @@ begin
   Result := LAccs.ToArray;
 end;
 
+
 { TNodeHelper }
 
 function TNodeHelper.HasBestKnownBlockchainTip: boolean;

src/gui-experimental/wizards/operations/UWIZChangeKey.pas

@@ -33,7 +33,8 @@ type
 implementation
 
 uses
-  UWallet, UCoreUtils,
+  UWallet,
+  UCoreUtils,
   UWIZOperationSelected,
   UWIZChangeKey_SelectOption,
   UWIZOperationConfirmation;

src/gui-experimental/wizards/operations/UWIZChangeKey_EnterKey.pas

@@ -23,10 +23,7 @@ unit UWIZChangeKey_EnterKey;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections, UWallet,
-  UFRMAccountSelect, UNode, UCoreObjects, UWizard,
-  UWIZOperation, UWIZOperationFee_Custom, UWIZOperationPayload_Encryption, UWIZOperationSigner_Select;
+  SysUtils, StdCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -51,7 +48,12 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UUserInterface, USettings;
+  UAccounts,
+  USettings,
+  UCoreObjects,
+  UWIZOperationFee_Custom,
+  UWIZOperationSigner_Select,
+  UWIZOperationPayload_Encryption;
 
 { TWIZChangeKey_EnterKey }
 

src/gui-experimental/wizards/operations/UWIZChangeKey_SelectKey.pas

@@ -23,10 +23,7 @@ unit UWIZChangeKey_SelectKey;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections, UWallet,
-  UFRMAccountSelect, UNode, UWizard, UCoreObjects,
-  UWIZOperation, UWIZOperationFee_Custom, UWIZOperationSigner_Select, UWIZOperationPayload_Encryption;
+  SysUtils, StdCtrls, Graphics, UWizard, UWIZOperation;
 
 type
 
@@ -54,7 +51,15 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UCrypto, UUserInterface, USettings;
+  UWallet,
+  UCommon,
+  UCrypto,
+  UAccounts,
+  USettings,
+  UCoreObjects,
+  UWIZOperationFee_Custom,
+  UWIZOperationSigner_Select,
+  UWIZOperationPayload_Encryption;
 
 { TWIZChangeKey_SelectKey }
 

src/gui-experimental/wizards/operations/UWIZChangeKey_SelectOption.pas

@@ -23,9 +23,7 @@ unit UWIZChangeKey_SelectOption;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, UCoreObjects,
-  UWizard, UWIZOperation, UWIZChangeKey_EnterKey, UWIZChangeKey_SelectKey;
+  StdCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -48,7 +46,10 @@ implementation
 
 {$R *.lfm}
 
-uses UAccounts, USettings, UDataSources, UCommon, UCommon.UI, Generics.Collections;
+uses
+  UCoreObjects,
+  UWIZChangeKey_EnterKey,
+  UWIZChangeKey_SelectKey;
 
 { TWIZChangeKey_SelectOption }
 

src/gui-experimental/wizards/operations/UWIZEnlistAccountForSale.pas

@@ -22,8 +22,7 @@ unit UWIZEnlistAccountForSale;
 interface
 
 uses
-  Classes, SysUtils, Forms, Dialogs, UCrypto, UCommon,
-  UWizard, UWIZOperation, UAccounts, UCoreObjects, LCLType;
+  Classes, StdCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -41,7 +40,12 @@ type
 implementation
 
 uses
-  UWallet, UCoreUtils,
+  UCommon,
+  UCrypto,
+  UWallet,
+  UAccounts,
+  UCoreUtils,
+  UCoreObjects,
   UWIZOperationSelected,
   UWIZEnlistAccountForSale_SelectOption,
   UWIZEnlistAccountForSale_EnterSeller,

src/gui-experimental/wizards/operations/UWIZEnlistAccountForSale_EnterLockingBlock.pas

@@ -23,9 +23,7 @@ unit UWIZEnlistAccountForSale_EnterLockingBlock;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons,
-  UWizard, UWIZOperation, UCoreObjects, UWIZEnlistAccountForSale_EnterSeller;
+  SysUtils, StdCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -45,9 +43,6 @@ implementation
 
 {$R *.lfm}
 
-uses
-  UAccounts;
-
 { TWIZEnlistAccountForSale_EnterLockingBlock }
 
 procedure TWIZEnlistAccountForSale_EnterLockingBlock.OnPresent;
@@ -64,7 +59,7 @@ begin
   LLockedUntilBlock := StrToIntDef(edtBlockLock.Text, 0);
   if LLockedUntilBlock = 0 then
   begin
-    message := 'You Didn''t Insert a Locking Block.';
+    message := 'You Didn''t Insert a Valid Locking Block.';
     Result := False;
     Exit;
   end;

src/gui-experimental/wizards/operations/UWIZEnlistAccountForSale_EnterPublicKey.pas

@@ -23,9 +23,7 @@ unit UWIZEnlistAccountForSale_EnterPublicKey;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCoreObjects,
-  UWizard, UWIZOperation, UWIZEnlistAccountForSale_EnterLockingBlock;
+  SysUtils, StdCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -48,7 +46,8 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts;
+  UAccounts,
+  UWIZEnlistAccountForSale_EnterLockingBlock;
 
 { TWIZEnlistAccountForSale_EnterPublicKey }
 

src/gui-experimental/wizards/operations/UWIZEnlistAccountForSale_EnterSaleAmount.pas

@@ -23,10 +23,7 @@ unit UWIZEnlistAccountForSale_EnterSaleAmount;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections, UWallet, UCoreObjects,
-  UFRMAccountSelect, UNode,
-  UWizard, UWIZOperation, UWIZOperationFee_Custom, UWIZOperationPayload_Encryption, UWIZOperationSigner_Select;
+  SysUtils, StdCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -54,7 +51,12 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UUserInterface, USettings;
+  UAccounts,
+  USettings,
+  UCoreObjects,
+  UWIZOperationFee_Custom,
+  UWIZOperationSigner_Select,
+  UWIZOperationPayload_Encryption;
 
 { TWIZEnlistAccountForSale_EnterSaleAmount }
 

src/gui-experimental/wizards/operations/UWIZEnlistAccountForSale_EnterSeller.pas

@@ -23,9 +23,7 @@ unit UWIZEnlistAccountForSale_EnterSeller;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections, UWallet,
-  UFRMAccountSelect, UNode, UWizard, UCoreObjects, UWIZOperation;
+  SysUtils, Forms, StdCtrls, Buttons, Controls, Graphics, UWizard, UWIZOperation;
 
 type
 
@@ -53,7 +51,11 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UUserInterface, USettings, UCoreUtils;
+  UNode,
+  UWallet,
+  UAccounts,
+  UCoreUtils,
+  UFRMAccountSelect;
 
 { TWIZEnlistAccountForSale_EnterSeller }
 

src/gui-experimental/wizards/operations/UWIZEnlistAccountForSale_SelectOption.pas

@@ -23,8 +23,7 @@ unit UWIZEnlistAccountForSale_SelectOption;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, UWizard, UCoreObjects, UWIZOperation, UWIZEnlistAccountForSale_EnterPublicKey;
+  StdCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -47,7 +46,9 @@ implementation
 
 {$R *.lfm}
 
-uses UAccounts, USettings, UDataSources, UCommon, UCommon.UI, Generics.Collections;
+uses
+  UCoreObjects,
+  UWIZEnlistAccountForSale_EnterPublicKey;
 
 { TWIZEnlistAccountForSale_SelectOption }
 

src/gui-experimental/wizards/operations/UWIZOperation.pas

@@ -22,14 +22,13 @@ unit UWIZOperation;
 interface
 
 uses
-  Classes, SysUtils, Forms, Dialogs, UBaseTypes, UCommon, UWizard, UAccounts, UBlockChain, UNode, UWallet, UCoreObjects, LCLType;
+  Classes, SysUtils, UAccounts, UWallet, UBaseTypes, UCoreObjects;
 
 type
 
   { TWIZOperationsModel }
 
   TWIZOperationsModel = class(TComponent)
-
     public type
 
       { TOperationExecuteResultHandler }
@@ -142,9 +141,6 @@ type
 
 implementation
 
-uses
-  UCrypto, UECIES, UAES, UConst, UCoreUtils, UOpTransaction, UUserInterface;
-
 { TWIZOperationsModel }
 
 constructor TWIZOperationsModel.Create(AOwner: TComponent; AType: TExecuteOperationType);

src/gui-experimental/wizards/operations/UWIZOperationConfirmation.pas

@@ -23,8 +23,7 @@ unit UWIZOperationConfirmation;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, UVisualGrid, UCellRenderers, UCommon.Data, UWizard, UWIZOperation, UCoreObjects;
+  Classes, SysUtils, StdCtrls, ExtCtrls, Graphics, UVisualGrid, UCellRenderers, UWizard, UWIZOperation;
 
 type
 
@@ -54,7 +53,19 @@ implementation
 
 {$R *.lfm}
 
-uses UAccounts, UCrypto, UConst, UWallet, UUserInterface, UDataSources, UCommon, UCommon.UI, Generics.Collections, UCoreUtils;
+uses
+  UConst,
+  UCrypto,
+  UWallet,
+  UCommon,
+  UAccounts,
+  UCoreUtils,
+  UCoreObjects,
+  UCommon.UI,
+  UCommon.Data,
+  UDataSources,
+  UUserInterface,
+  Generics.Collections;
 
 type
 

src/gui-experimental/wizards/operations/UWIZOperationFee_Custom.pas

@@ -23,9 +23,7 @@ unit UWIZOperationFee_Custom;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, Spin, UCommon, UWallet, UCoreObjects,
-  UNode, UWizard, UWIZOperation, UWIZOperationPayload_Encryption, UWIZOperationSigner_Select;
+  SysUtils, StdCtrls, Spin, UWizard, UWIZOperation;
 
 type
 
@@ -58,7 +56,12 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UCoreUtils, UUserInterface, USettings;
+  UAccounts,
+  USettings,
+  UCoreUtils,
+  UCoreObjects,
+  UWIZOperationSigner_Select,
+  UWIZOperationPayload_Encryption;
 
 { TWIZOperationFee_Custom }
 

src/gui-experimental/wizards/operations/UWIZOperationPayload_Content.pas

@@ -23,9 +23,7 @@ unit UWIZOperationPayload_Content;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections,
-  UWizard, UWIZOperation, UWIZOperationSigner_Select, UCoreObjects;
+  SysUtils, StdCtrls, ExtCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -48,7 +46,9 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UConst, UUserInterface;
+  UConst,
+  UCoreObjects,
+  UWIZOperationSigner_Select;
 
 { TWIZOperationPayload_Content }
 

src/gui-experimental/wizards/operations/UWIZOperationPayload_Encryption.pas

@@ -23,9 +23,7 @@ unit UWIZOperationPayload_Encryption;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections,
-  UWizard, UWIZOperation, UWIZOperationPayload_Content, UWIZOperationPayload_Password, UCoreObjects;
+  StdCtrls, ExtCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -54,7 +52,10 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UUserInterface;
+  UAccounts,
+  UCoreObjects,
+  UWIZOperationPayload_Content,
+  UWIZOperationPayload_Password;
 
 { TWIZOperationPayload_Encryption }
 

src/gui-experimental/wizards/operations/UWIZOperationPayload_Password.pas

@@ -23,9 +23,7 @@ unit UWIZOperationPayload_Password;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections,
-  UWizard, UWIZOperation, UWIZOperationSigner_Select, UWIZOperationPayload_Content, UCoreObjects;
+  SysUtils, StdCtrls, ExtCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -49,7 +47,7 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UUserInterface;
+  UWIZOperationPayload_Content;
 
 { TWIZOperationPayload_Password }
 

src/gui-experimental/wizards/operations/UWIZOperationSelected.pas

@@ -22,9 +22,7 @@ unit UWIZOperationSelected;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, UVisualGrid, UCommon.Data, UCellRenderers,
-  UWizard, UWIZOperation, UCoreObjects;
+  Classes, SysUtils, StdCtrls, ExtCtrls, Graphics, UVisualGrid, UCellRenderers, UWizard, UWIZOperation;
 
 type
 
@@ -48,7 +46,15 @@ implementation
 
 {$R *.lfm}
 
-uses UAccounts, UCoreUtils, UDataSources, UCommon, UCommon.UI, Generics.Collections;
+uses
+  UCommon,
+  UAccounts,
+  UCommon.UI,
+  UCoreUtils,
+  UCoreObjects,
+  UCommon.Data,
+  UDataSources,
+  Generics.Collections;
 
 type
 

src/gui-experimental/wizards/operations/UWIZOperationSigner_Select.pas

@@ -23,9 +23,7 @@ unit UWIZOperationSigner_Select;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections, UWallet,
-  UFRMAccountSelect, UNode, UWizard, UCoreObjects, UWIZOperation;
+  SysUtils, Graphics, StdCtrls, ExtCtrls, UWizard, UWIZOperation;
 
 type
 
@@ -52,7 +50,8 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts, UUserInterface, USettings;
+  UAccounts,
+  UCoreObjects;
 
 { TWIZOperationSigner_Select }
 

src/gui-experimental/wizards/operations/UWIZSendPASC.pas

@@ -22,7 +22,7 @@ unit UWIZSendPASC;
 interface
 
 uses
-  Classes, SysUtils, Forms, Dialogs, UWizard, UCommon, UCoreObjects, UWIZOperation;
+  Classes, UWizard, UWIZOperation;
 
 type
 
@@ -41,10 +41,11 @@ implementation
 
 uses
   UWallet,
+  UCommon,
+  UCoreUtils,
   UWIZOperationSelected,
   UWIZSendPASC_Details,
-  UWIZOperationConfirmation,
-  UCoreUtils;
+  UWIZOperationConfirmation;
 
 { TWIZSendPASCWizard }
 

src/gui-experimental/wizards/operations/UWIZSendPASC_Details.pas

@@ -23,9 +23,7 @@ unit UWIZSendPASC_Details;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, Buttons, UCommon, UCommon.Collections, UWallet, UCoreObjects,
-  UFRMAccountSelect, UNode, UWizard, UWIZOperation, UWIZSendPASC, UCoreUtils;
+  Classes, SysUtils, Forms, Dialogs, Controls, StdCtrls, ExtCtrls, Buttons, UWizard, UWIZOperation;
 
 type
 
@@ -63,9 +61,20 @@ implementation
 {$R *.lfm}
 
 uses
-  Generics.Collections, UMemory,
-  UAccounts, UUserInterface, USettings,
-  UWIZOperationFee_Custom, UWIZOperationPayload_Encryption, UWIZOperationSigner_Select;
+  UNode,
+  UWallet,
+  UCommon,
+  UMemory,
+  UAccounts,
+  USettings,
+  UCoreUtils,
+  UCoreObjects,
+  UFRMAccountSelect,
+  UCommon.Collections,
+  Generics.Collections,
+  UWIZOperationFee_Custom,
+  UWIZOperationSigner_Select,
+  UWIZOperationPayload_Encryption;
 
 { TWIZSendPASC_Details }
 

src/gui-experimental/wizards/wallet/UWIZAddKey.pas

@@ -18,7 +18,7 @@ unit UWIZAddKey;
 interface
 
 uses
-  Classes, SysUtils, Forms, UWizard, UCoreObjects;
+  Classes, SysUtils, UWizard;
 
 type
 

src/gui-experimental/wizards/wallet/UWIZAddKey_EnterName.pas

@@ -18,8 +18,7 @@ unit UWIZAddKey_EnterName;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, UWizard, UWIZAddKey, UCoreObjects;
+  SysUtils, StdCtrls, UWizard, UWIZAddKey;
 
 type
 

src/gui-experimental/wizards/wallet/UWIZAddKey_GenerateOrImport.pas

@@ -18,8 +18,7 @@ unit UWIZAddKey_GenerateOrImport;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  UWizard, UWIZAddKey, UCoreObjects;
+  StdCtrls, UWizard, UWIZAddKey;
 
 type
 
@@ -39,7 +38,10 @@ implementation
 
 {$R *.lfm}
 
-uses UWIZAddKey_ImportPrivKey, UWIZAddKey_SelectEncryption, UWIZAddKey_EnterName;
+uses
+  UWIZAddKey_ImportPrivKey,
+  UWIZAddKey_SelectEncryption,
+  UWIZAddKey_EnterName;
 
 procedure TWIZAddKey_GenerateOrImport.OnNext;
 begin

src/gui-experimental/wizards/wallet/UWIZAddKey_ImportPrivKey.pas

@@ -18,8 +18,7 @@ unit UWIZAddKey_ImportPrivKey;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  UWizard, UWIZAddKey, UCoreObjects;
+  StdCtrls, UWizard, UWIZAddKey;
 
 type
 
@@ -40,7 +39,9 @@ implementation
 
 {$R *.lfm}
 
-uses UCrypto, UWallet;
+uses
+  UCrypto,
+  UWallet;
 
 { TWIZAddKey_ImportPrivKey }
 

src/gui-experimental/wizards/wallet/UWIZAddKey_ImportPubKey.pas

@@ -18,8 +18,7 @@ unit UWIZAddKey_ImportPubKey;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  UWizard, UWIZAddKey, UCoreObjects;
+  StdCtrls, UWizard, UWIZAddKey;
 
 type
 
@@ -39,7 +38,8 @@ implementation
 
 {$R *.lfm}
 
-uses UAccounts;
+uses
+  UAccounts;
 
 { TWIZAddKey_ImportPubKey }
 

src/gui-experimental/wizards/wallet/UWIZAddKey_SelectEncryption.pas

@@ -18,7 +18,7 @@ unit UWIZAddKey_SelectEncryption;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, UWizard, UWIZAddKey, UCoreObjects;
+  Classes, SysUtils, StdCtrls, ExtCtrls, UWizard, UWIZAddKey;
 
 type
 
@@ -37,7 +37,10 @@ implementation
 
 {$R *.lfm}
 
-uses UAccounts, UConst, UMemory;
+uses
+  UAccounts,
+  UConst,
+  UMemory;
 
 { TWIZAddKey_SelectEncryption }
 
@@ -46,7 +49,6 @@ var
   i : Integer;
   GC : TDisposables;
   availableEncryptionTypes : TList;
-  name, desc : UTF8String;
 begin
   rgKeyType.Items.Clear;
   availableEncryptionTypes := GC.AddObject( TList.Create ) as TList;
@@ -86,7 +88,7 @@ begin
     CT_NID_secp521r1 : begin
       Result := 'SECP521R1 - Quantum-resistant (largest key)';
     end
-    else Result := '(Unknown ID:'+inttostr(EC_OpenSSL_NID)+')';
+    else Result := '(Unknown ID:'+ IntToStr(EC_OpenSSL_NID)+')';
   end;
 end;
 

src/gui-experimental/wizards/wallet/UWIZAddKey_Start.pas

@@ -18,8 +18,7 @@ unit UWIZAddKey_Start;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  UWizard, UWIZAddKey, UCoreObjects;
+  StdCtrls, UWizard, UWIZAddKey;
 
 type
 
@@ -43,7 +42,10 @@ implementation
 {$R *.lfm}
 
 uses
-   UWIZAddKey_GenerateOrImport, UWIZAddKey_ImportPrivKey, UWIZAddKey_ImportPubKey, UWIZAddKey_EnterName;
+  UWIZAddKey_EnterName,
+  UWIZAddKey_ImportPubKey,
+  UWIZAddKey_ImportPrivKey,
+  UWIZAddKey_GenerateOrImport;
 
 { TWIZAddKey_Start }
 
@@ -54,7 +56,7 @@ begin
     Model.Action := akaImportPublicKey;
     UpdatePath(ptReplaceAllNext, [TWIZAddKey_ImportPubKey, TWIZAddKey_EnterName]);
   end else begin
-    UpdatePath(ptReplaceAllNext, [TWIZAddKey_GenerateOrImport, TWIZAddKey_ImportPrivKey]);//, TWIZAddKey_ImportPrivKey, TWIZAddKey_Finish]);
+    UpdatePath(ptReplaceAllNext, [TWIZAddKey_GenerateOrImport, TWIZAddKey_ImportPrivKey]);
   end;
 end;
 

src/pascalcoin_wallet_experimental.lpi

@@ -82,7 +82,7 @@
         <PackageName Value="LCL"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="97">
+    <Units Count="98">
       <Unit0>
         <Filename Value="pascalcoin_wallet_experimental.dpr"/>
         <IsPartOfProject Value="True"/>
@@ -610,6 +610,10 @@
         <Filename Value="gui-experimental\UFRMMemoText.lfm"/>
         <IsPartOfProject Value="True"/>
       </Unit96>
+      <Unit97>
+        <Filename Value="gui-experimental\wizards\operations\UWIZChangeKey.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit97>
     </Units>
   </ProjectOptions>
   <CompilerOptions>