Fix: cosmetic and minor bugs

Units/Forms/UFRMAccountExplorer.lfm

@@ -1,14 +1,16 @@
 object FRMAccountExplorer: TFRMAccountExplorer
-  Left = 135
+  Left = 205
   Height = 471
-  Top = 14
+  Top = 107
   Width = 868
   Caption = 'Accounts Explorer'
   ClientHeight = 451
   ClientWidth = 868
+  FormStyle = fsMDIChild
   Menu = meAccountExplorerMenu
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  Position = poOwnerFormCenter
   LCLVersion = '1.6.4.0'
   object Splitter1: TSplitter
     Left = 380

Units/Forms/UFRMAccountInfo.lfm

@@ -8,7 +8,6 @@ object FRMAccountInfo: TFRMAccountInfo
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
   Font.Name = 'Tahoma'
   Font.Style = []
   OldCreateOrder = False

Units/Forms/UFRMBlockExplorer.lfm

@@ -9,6 +9,7 @@ object FRMBlockExplorer: TFRMBlockExplorer
   Menu = BlockExplorerMenu
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  Position = poOwnerFormCenter
   LCLVersion = '1.6.4.0'
   object Panel2: TPanel
     Left = 0

Units/Forms/UFRMLogs.lfm

@@ -1,13 +1,14 @@
 object FRMLogs: TFRMLogs
-  Left = 973
+  Left = 0
   Height = 466
-  Top = 333
+  Top = 0
   Width = 868
   Caption = 'Logs'
   ClientHeight = 466
   ClientWidth = 868
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  Position = poOwnerFormCenter
   LCLVersion = '1.6.4.0'
   object pnlTopLogs: TPanel
     Left = 0

Units/Forms/UFRMMainForm.lfm

@@ -13,13 +13,14 @@ object FRMMainForm: TFRMMainForm
   Font.Color = clWindowText
   Font.Height = -11
   Font.Name = 'Tahoma'
+  FormStyle = fsMDIForm
   Menu = meMainMenu
   OnClose = FormClose
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnResize = FormResize
-  Position = poDefault
+  Position = poScreenCenter
   ShowHint = True
   LCLVersion = '1.6.4.0'
   object paLogoPanel: TPanel

Units/Forms/UFRMMessages.lfm

@@ -7,6 +7,7 @@ object FRMMessages: TFRMMessages
   ClientHeight = 441
   ClientWidth = 874
   OnActivate = FormActivate
+  Position = poOwnerFormCenter    
   LCLVersion = '1.6.4.0'
   object Label11: TLabel
     Left = 15

Units/Forms/UFRMNodes.lfm

@@ -7,6 +7,7 @@ object FRMNodes: TFRMNodes
   ClientHeight = 444
   ClientWidth = 861
   OnCreate = FormCreate
+  Position = poOwnerFormCenter  
   LCLVersion = '1.6.4.0'
   object Label3: TLabel
     Left = 15

Units/Forms/UFRMOperation.pas

@@ -1029,7 +1029,7 @@ begin
         end;
         wk := WalletKeys.Key[iWallet];
         if not assigned(wk.PrivateKey) then begin
-          if wk.CryptedKey<>'' then begin
+          if wk.HasPrivateKey then begin
             errors := 'Wallet is password protected. Need password';
             bbPassword.Visible := true;
             bbPassword.Enabled := true;

Units/Forms/UFRMWalletKeys.pas

@@ -140,8 +140,8 @@ begin
 
   if (TSettings.MinerPrivateKeyType = mpk_Selected) AND (TSettings.MinerSelectedPrivateKey = TAccountComp.AccountKey2RawString(wk.AccountKey)) then begin
     TUserInterface.ShowError(Self, 'Delete Key Faied',
-    'This key is used for mining and cannot be deleted.' + #10 + #10 +
-    'De-select this key from options and try again.');
+    'This key is currently being used for mining and cannot be deleted.' + #10 + #10 +
+    'Remove this key from the Options dialog and try again.');
     exit;
   end;
 

Units/Forms/UUserInterface.pas

@@ -260,11 +260,6 @@ begin
     // open the sync dialog
     FMainForm.SyncControl.UpdateBlockChainState;   //TODO fix this work-flow
     RefreshConnectionStatusDisplay;
-
-    // Setup tray icon
-
-    // Disable wallet form
-    FMainForm.Enabled:=false;
     FStarted := true;
   Except
     On E:Exception do begin
@@ -275,7 +270,7 @@ begin
   end;
 
 
-  // Notify accounts again?
+  // Notify accounts changed
   OnAccountsChanged(FMainForm);
 
   // Refresh status bar since may not have been displayed
@@ -476,7 +471,6 @@ Var FRM : TFRMWalletKeys;
 begin
   FRM := TFRMWalletKeys.Create(parentForm);
   try
-    //FRM.WalletKeys := FWalletKeys;
     FRM.ShowModal;
   finally
     FRM.Free;
@@ -498,20 +492,20 @@ end;
 
 class procedure TUserInterface.ChangeWalletPassword(parentForm: TForm);
 var
-  s,s2 : String;
+  pwd1,pwd2 : String;
   locked : boolean;
 begin
-  s := ''; s2 := '';
+  pwd1 := ''; pwd2 := '';
   locked := (NOT TWallet.Keys.HasPassword) OR (NOT TWallet.Keys.IsValidPassword);
-  if Not AskEnterProtectedString(parentForm, 'Change password','Enter new password',s)
+  if Not AskEnterProtectedString(parentForm, 'Change password','Enter new password',pwd1)
     then exit;
-  if trim(s)<>s then
+  if trim(pwd1)<>pwd1 then
     raise Exception.Create('Password cannot start or end with a space character');
-  if Not AskEnterProtectedString(parentForm, 'Change password', 'Enter new password again',s2)
+  if Not AskEnterProtectedString(parentForm, 'Change password', 'Enter new password again',pwd2)
     then exit;
-  if s<>s2 then
+  if pwd1<>pwd2 then
     raise Exception.Create('Two passwords are different!');
-  TWallet.Keys.WalletPassword := s;
+  TWallet.Keys.WalletPassword := pwd1;
   if locked then
     TWallet.Keys.LockWallet;
 
@@ -523,12 +517,12 @@ begin
 end;
 
 class procedure TUserInterface.UnlockWallet(parentForm: TForm);
-Var s : String;
+Var pwd : String;
 begin
-  s := '';
+  pwd := '';
   Repeat
-    if Not AskEnterProtectedString(parentForm, 'Wallet password','Enter wallet password',s) then exit;
-    TWallet.Keys.WalletPassword := s;
+    if Not AskEnterProtectedString(parentForm, 'Wallet password','Enter wallet password',pwd) then exit;
+    TWallet.Keys.WalletPassword := pwd;
     if Not TWallet.Keys.IsValidPassword then
       ShowError(parentForm, 'Invalid Password', 'The password you have entered is incorrect.');
   Until TWallet.Keys.IsValidPassword;
@@ -591,7 +585,6 @@ begin
        FAccountExplorer := TFRMAccountExplorer.Create(FMainForm);
        FAccountExplorer.CloseAction:= caFree;
        FAccountExplorer.OnDestroyed:= Self.OnSubFormDestroyed;
-       FAccountExplorer.SetSubFormCoordinate(FAccountExplorer);
     end else
       FAccountExplorer.Refresh;
     FAccountExplorer.Show;
@@ -608,7 +601,6 @@ begin
        FBlockExplorerForm := TFRMBlockExplorer.Create(FMainForm);
        FBlockExplorerForm.CloseAction:= caFree;
        FBlockExplorerForm.OnDestroyed:= Self.OnSubFormDestroyed;
-       FMainForm.SetSubFormCoordinate(FBlockExplorerForm);
     end;
     FBlockExplorerForm.Show;
   finally
@@ -624,7 +616,6 @@ begin
       FOperationsExplorerForm := TFRMOperationExplorer.Create(FMainForm);
       FOperationsExplorerForm.CloseAction:= caFree;
       FOperationsExplorerForm.OnDestroyed:= Self.OnSubFormDestroyed;
-      FMainForm.SetSubFormCoordinate(FOperationsExplorerForm);
     end;
     FOperationsExplorerForm.Show;
   finally
@@ -640,7 +631,6 @@ begin
       FPendingOperationForm := TFRMPendingOperations.Create(FMainForm);
       FPendingOperationForm.CloseAction:= caFree;
       FPendingOperationForm.OnDestroyed:= Self.OnSubFormDestroyed;
-      FMainForm.SetSubFormCoordinate(FPendingOperationForm);
     end;
     FPendingOperationForm.Show;
   finally
@@ -656,7 +646,6 @@ begin
        FMessagesForm := TFRMMessages.Create(FMainForm);
        FMessagesForm.CloseAction:= caFree;
        FMessagesForm.OnDestroyed:= Self.OnSubFormDestroyed;
-       FMainForm.SetSubFormCoordinate(FMessagesForm);
     end;
     FMessagesForm.Show;
   finally
@@ -672,7 +661,6 @@ begin
        FNodesForm := TFRMNodes.Create(FMainForm);
        FNodesForm.CloseAction:= caFree;
        FNodesForm.OnDestroyed:= Self.OnSubFormDestroyed;
-       FMainForm.SetSubFormCoordinate(FNodesForm);
     end;
     FNodesForm.Show;
   finally
@@ -688,7 +676,6 @@ begin
        FLogsForm := TFRMLogs.Create(FMainForm);
        FLogsForm.CloseAction:= caFree;
        FLogsForm.OnDestroyed:= Self.OnSubFormDestroyed;
-       FMainForm.SetSubFormCoordinate(FLogsForm);
     end;
     FLogsForm.Show;
   finally

Units/PascalCoin/UCrypto.pas

@@ -128,7 +128,7 @@ Const
 implementation
 
 uses
-  UAES, ULog, UConst, UAccounts;
+  UAES, ULog, UConst, UAccounts, UCommon;
 
 Var _initialized : Boolean = false;
 
@@ -146,8 +146,8 @@ class operator TECDSA_Public.= (const a,b : TECDSA_Public) : boolean;
 begin
   Result :=
     (a.EC_OpenSSL_NID = b.EC_OpenSSL_NID) AND
-    (a.x = b.x) AND
-    (a.y = b.y);
+    (BinStrComp(a.x, b.x) = 0) AND
+    (BinStrComp(a.y, b.y) = 0);
 end;
 
 { TECPrivateKey }

Units/Utils/UCommon.pas

@@ -209,7 +209,7 @@ begin
      Result := 1
    else begin
      Result := 0;
-     For i:= 1 to Str1Len do begin
+     for i:= Low(Str1) to High(Str1) do begin
        if Str1[i] < Str2[i] then begin
          Result := -1;
          break;
@@ -300,7 +300,6 @@ begin
     Result := AValue
 end;
 
-
 { DateTime functions }
 function TimeStamp : AnsiString;
 begin

Units/Utils/UCommonUI.pas

@@ -17,7 +17,7 @@ unit UCommonUI;
 interface
 
 uses
-  Classes, SysUtils, Forms, Controls,ExtCtrls,  FGL, Graphics, Generics.Collections, Generics.Defaults, syncobjs;
+  Classes, SysUtils, Forms, Controls,ExtCtrls,  Graphics, Generics.Collections, Generics.Defaults, syncobjs;
 
 type
   TApplicationForm = class(TForm)
@@ -29,7 +29,7 @@ type
       procedure NotifyActivateFirstTime;
       procedure NotifyDestroyed;
     protected
-      FUILock : TCriticalSection;
+      FUILock : syncobjs.TCriticalSection;
       procedure DoCreate; override;
       procedure Activate; override;
       procedure ActivateFirstTime; virtual;
@@ -54,7 +54,6 @@ type
   { TFormHelper }
 
   TFormHelper = class helper for TForm
-    procedure SetSubFormCoordinate(SubForm: TForm);
   end;
 
   { TImageHelper }
@@ -66,12 +65,15 @@ type
 
 implementation
 
+uses
+  lcl, FGL;
+
 {%region TApplicationForm}
 
 procedure TApplicationForm.DoCreate;
 begin
   inherited;
-  FUILock := TCriticalSection.Create;
+  FUILock := syncobjs.TCriticalSection.Create;
   FActivatedCount := 0;
   FCloseAction:=caHide;
 end;
@@ -159,21 +161,6 @@ end;
 
 {%region TFormHelper}
 
-//Form is shown centered over parent form
-//Show the position of the subform
-procedure TFormHelper.SetSubFormCoordinate(SubForm: TForm);
-var TopLeft:TPoint;
-begin
-  // TODO this needs to be changed
-//  Subform.Position:=poOwnerFormCenter; - test for only use center of from
-// On Linux ClientToScreen work only if window show as resut need call from OnAcivate from linux correct show.
-// on window shows correct in OnShow
-  TopLeft:= Self.ClientToScreen(Point(Self.Left,Self.Top));
-  Subform.Top   :=TopLeft.y;
-  Subform.Left  :=TopLeft.x;
-  Subform.Height:= Self.Height-27;
-  Subform.Width := Self.Width-9;
-end;
 
 {%endregion}