- Fixed "UTiledata" spelling in ULandscape.pas

- Added ISerializable and IInvalidate interfaces - Implemented a TConfig class and XML storage - Added some more detailed messages when a login fails to the server console - Removed obsolete IStream interface references - Readded lbHue in TfrmHueSettings
2008-03-06 22:55:49 +01:00
parent 04a459b524
commit 12773fd63e
18 changed files with 2346 additions and 2525 deletions
--- a/Client/Tools/UfrmHueSettings.lfm
+++ b/Client/Tools/UfrmHueSettings.lfm
@@ -5,7 +5,6 @@ object frmHueSettings: TfrmHueSettings
  Width = 217
  HorzScrollBar.Page = 216
  VertScrollBar.Page = 206
-  ActiveControl = lbHue
  BorderIcons = []
  BorderStyle = bsToolWindow
  Caption = 'Hue Settings'
@@ -15,14 +14,23 @@ object frmHueSettings: TfrmHueSettings
  OnClose = FormClose
  OnCreate = FormCreate
  OnDeactivate = FormDeactivate
+  LCLVersion = '0.9.25'
  object lblHue: TLabel
    Left = 8
-    Height = 16
+    Height = 12
    Top = 12
-    Width = 26
+    Width = 27
    Caption = 'Hue:'
    ParentColor = False
  end
+  object edHue: TEdit
+    Left = 48
+    Height = 23
+    Top = 10
+    Width = 80
+    OnEditingDone = edHueEditingDone
+    TabOrder = 0
+  end
  object lbHue: TListBox
    Left = 8
    Height = 160
@@ -32,14 +40,7 @@ object frmHueSettings: TfrmHueSettings
    OnDrawItem = lbHueDrawItem
    OnSelectionChange = lbHueSelectionChange
    Style = lbOwnerDrawFixed
-    TabOrder = 0
-  end
-  object edHue: TEdit
-    Left = 48
-    Height = 23
-    Top = 10
-    Width = 80
-    OnEditingDone = edHueEditingDone
    TabOrder = 1
+    TopIndex = -1
  end
 end
--- a/Client/Tools/UfrmHueSettings.pas
+++ b/Client/Tools/UfrmHueSettings.pas
@@ -1,156 +1,156 @@
-(*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * http://www.opensource.org/licenses/cddl1.php.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * http://www.opensource.org/licenses/cddl1.php.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Portions Copyright 2007 Andreas Schneider
- *)
-unit UfrmHueSettings;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  LMessages, LCLIntf, UHue;
-
-type
-
-  { TfrmHueSettings }
-
-  TfrmHueSettings = class(TForm)
-    edHue: TEdit;
-    lblHue: TLabel;
-    lbHue: TListBox;
-    procedure edHueEditingDone(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
-    procedure FormCreate(Sender: TObject);
-    procedure FormDeactivate(Sender: TObject);
-    procedure lbHueDrawItem(Control: TWinControl; Index: Integer; ARect: TRect;
-      State: TOwnerDrawState);
-    procedure lbHueSelectionChange(Sender: TObject; User: boolean);
-  protected
-    procedure MouseLeave(var msg: TLMessage); message CM_MouseLeave;
-  public
-    class procedure DrawHue(AHue: THue; ACanvas: TCanvas; ARect: TRect;
-      ACaption: string);
-  end; 
-
-var
-  frmHueSettings: TfrmHueSettings;
-
-implementation
-
-uses
-  UGameResources, UGraphicHelper;
-
-{ TfrmHueSettings }
-
-procedure TfrmHueSettings.FormClose(Sender: TObject;
-  var CloseAction: TCloseAction);
-begin
-  CloseAction := caHide;
-end;
-
-procedure TfrmHueSettings.edHueEditingDone(Sender: TObject);
-var
-  hueID: Integer;
-begin
-  if (not TryStrToInt(edHue.Text, hueID)) or (hueID >= lbHue.Items.Count) then
-  begin
-    edHue.Text := Format('$%x', [lbHue.ItemIndex]);
-    MessageDlg('Invalid Hue', 'The hue you''ve entered is invalid.', mtWarning, [mbOK], 0);
-  end else
-    lbHue.ItemIndex := hueID;
-end;
-
-procedure TfrmHueSettings.FormCreate(Sender: TObject);
-var
-  i: Integer;
-  hue: THue;
-begin
-  lbHue.Clear;
-  lbHue.Items.Add('$0 (no hue)');
-  for i := 1 to ResMan.Hue.Count do
-  begin
-    hue := ResMan.Hue.Hues[i-1];
-    lbHue.Items.AddObject(Format('$%x (%s)', [i, hue.Name]), hue);
-  end;
-  lbHue.ItemIndex := 0;
-end;
-
-procedure TfrmHueSettings.FormDeactivate(Sender: TObject);
-begin
-  Close;
-end;
-
-procedure TfrmHueSettings.lbHueDrawItem(Control: TWinControl; Index: Integer;
-  ARect: TRect; State: TOwnerDrawState);
-var
-  hue: THue;
-begin
-  if Index > 0 then
-    hue := ResMan.Hue.Hues[Index-1]
-  else
-    hue := nil;
-  DrawHue(hue, lbHue.Canvas, ARect, lbHue.Items.Strings[Index]);
-end;
-
-procedure TfrmHueSettings.lbHueSelectionChange(Sender: TObject; User: boolean);
-begin
-  edHue.Text := Format('$%x', [lbHue.ItemIndex]);
-end;
-
-procedure TfrmHueSettings.MouseLeave(var msg: TLMessage);
-begin
-  try
-    if not PtInRect(ClientRect, ScreenToClient(Mouse.CursorPos)) then
-      Close;
-  except
-    Close;
-  end;
-end;
-
-class procedure TfrmHueSettings.DrawHue(AHue: THue; ACanvas: TCanvas; ARect: TRect;
-  ACaption: string);
-var
-  hueColor: TColor;
-  i: Integer;
-begin
-  ACanvas.Pen.Color := clWhite;
-  ACanvas.Rectangle(ARect);
-  if AHue <> nil then
-    for i := 0 to 31 do
-    begin
-      hueColor := ARGB2RGB(AHue.ColorTable[i]);
-      ACanvas.Pen.Color := hueColor;
-      ACanvas.MoveTo(ARect.Left + 2 + i, ARect.Top + 1);
-      ACanvas.LineTo(ARect.Left + 2 + i, ARect.Bottom - 1);
-    end;
-  ACanvas.TextOut(ARect.Left + 36, ARect.Top, ACaption);
-end;
-
-initialization
-  {$I UfrmHueSettings.lrs}
-
-end.
-
+(*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at
+ * http://www.opensource.org/licenses/cddl1.php.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at
+ * http://www.opensource.org/licenses/cddl1.php.  If applicable,
+ * add the following below this CDDL HEADER, with the fields enclosed
+ * by brackets "[]" replaced with your own identifying * information:
+ *      Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ *      Portions Copyright 2007 Andreas Schneider
+ *)
+unit UfrmHueSettings;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  LMessages, LCLIntf, UHue;
+
+type
+
+  { TfrmHueSettings }
+
+  TfrmHueSettings = class(TForm)
+    edHue: TEdit;
+    lblHue: TLabel;
+    lbHue: TListBox;
+    procedure edHueEditingDone(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDeactivate(Sender: TObject);
+    procedure lbHueDrawItem(Control: TWinControl; Index: Integer; ARect: TRect;
+      State: TOwnerDrawState);
+    procedure lbHueSelectionChange(Sender: TObject; User: boolean);
+  protected
+    procedure MouseLeave(var msg: TLMessage); message CM_MouseLeave;
+  public
+    class procedure DrawHue(AHue: THue; ACanvas: TCanvas; ARect: TRect;
+      ACaption: string);
+  end; 
+
+var
+  frmHueSettings: TfrmHueSettings;
+
+implementation
+
+uses
+  UGameResources, UGraphicHelper;
+
+{ TfrmHueSettings }
+
+procedure TfrmHueSettings.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+  CloseAction := caHide;
+end;
+
+procedure TfrmHueSettings.edHueEditingDone(Sender: TObject);
+var
+  hueID: Integer;
+begin
+  if (not TryStrToInt(edHue.Text, hueID)) or (hueID >= lbHue.Items.Count) then
+  begin
+    edHue.Text := Format('$%x', [lbHue.ItemIndex]);
+    MessageDlg('Invalid Hue', 'The hue you''ve entered is invalid.', mtWarning, [mbOK], 0);
+  end else
+    lbHue.ItemIndex := hueID;
+end;
+
+procedure TfrmHueSettings.FormCreate(Sender: TObject);
+var
+  i: Integer;
+  hue: THue;
+begin
+  lbHue.Clear;
+  lbHue.Items.Add('$0 (no hue)');
+  for i := 1 to ResMan.Hue.Count do
+  begin
+    hue := ResMan.Hue.Hues[i-1];
+    lbHue.Items.AddObject(Format('$%x (%s)', [i, hue.Name]), hue);
+  end;
+  lbHue.ItemIndex := 0;
+end;
+
+procedure TfrmHueSettings.FormDeactivate(Sender: TObject);
+begin
+  Close;
+end;
+
+procedure TfrmHueSettings.lbHueDrawItem(Control: TWinControl; Index: Integer;
+  ARect: TRect; State: TOwnerDrawState);
+var
+  hue: THue;
+begin
+  if Index > 0 then
+    hue := ResMan.Hue.Hues[Index-1]
+  else
+    hue := nil;
+  DrawHue(hue, lbHue.Canvas, ARect, lbHue.Items.Strings[Index]);
+end;
+
+procedure TfrmHueSettings.lbHueSelectionChange(Sender: TObject; User: boolean);
+begin
+  edHue.Text := Format('$%x', [lbHue.ItemIndex]);
+end;
+
+procedure TfrmHueSettings.MouseLeave(var msg: TLMessage);
+begin
+  try
+    if not PtInRect(ClientRect, ScreenToClient(Mouse.CursorPos)) then
+      Close;
+  except
+    Close;
+  end;
+end;
+
+class procedure TfrmHueSettings.DrawHue(AHue: THue; ACanvas: TCanvas; ARect: TRect;
+  ACaption: string);
+var
+  hueColor: TColor;
+  i: Integer;
+begin
+  ACanvas.Pen.Color := clWhite;
+  ACanvas.Rectangle(ARect);
+  if AHue <> nil then
+    for i := 0 to 31 do
+    begin
+      hueColor := ARGB2RGB(AHue.ColorTable[i]);
+      ACanvas.Pen.Color := hueColor;
+      ACanvas.MoveTo(ARect.Left + 2 + i, ARect.Top + 1);
+      ACanvas.LineTo(ARect.Left + 2 + i, ARect.Bottom - 1);
+    end;
+  ACanvas.TextOut(ARect.Left + 36, ARect.Top, ACaption);
+end;
+
+initialization
+  {$I UfrmHueSettings.lrs}
+
+end.
+
--- a/Client/ULandscape.pas
+++ b/Client/ULandscape.pas
@@ -32,7 +32,7 @@ interface
 uses
  SysUtils, Classes, math, contnrs, LCLIntf, GL, GLU, ImagingOpenGL,
  Imaging, ImagingClasses, ImagingTypes, ImagingUtility,
-  UGenericIndex, UMap, UStatics, UArt, UTexture, UTileData, UHue, UWorldItem,
+  UGenericIndex, UMap, UStatics, UArt, UTexture, UTiledata, UHue, UWorldItem,
  UMulBlock,
  UListSort, UVector, UEnhancedMemoryStream,
  UCacheManager, ULinkedList;
--- a/Client/UfrmLogin.lfm
+++ b/Client/UfrmLogin.lfm
@@ -16,8 +16,8 @@ object frmLogin: TfrmLogin
  Position = poScreenCenter
  ShowInTaskBar = stAlways
  object lblCopyright: TLabel
-    Height = 17
-    Top = 248
+    Height = 19
+    Top = 246
    Width = 489
    Align = alBottom
    Alignment = taCenter
@@ -146,6 +146,7 @@ object frmLogin: TfrmLogin
        233023312332233323342335517451745174222C0A2251745174517451745174
        51745174517451745174517451745174517451745174227D3B0A
      }
+      Transparent = False
    end
    object imgUsername: TImage
      Left = 6
@@ -237,6 +238,7 @@ object frmLogin: TfrmLogin
        233123322333233423355174517451745174222C0A2251745174517451745174
        51745174517451745174517451745174517451745174227D3B0A
      }
+      Transparent = False
    end
    object imgPassword: TImage
      Left = 6
@@ -318,6 +320,7 @@ object frmLogin: TfrmLogin
        5174222C0A2251742349234A236E234B51745174517451745174517451745174
        517451745174227D3B0A
      }
+      Transparent = False
    end
    object edHost: TEdit
      Left = 101
@@ -433,103 +436,40 @@ object frmLogin: TfrmLogin
      Width = 23
      Color = clBtnFace
      Glyph.Data = {
-        010C00002F2A2058504D202A2F0A7374617469632063686172202A6772617068
-        69635B5D203D207B0A223136203136203135332032222C0A222E2E2063204E6F
-        6E65222C0A222E2C20632023333636424243222C0A222E2D2063202333363642
-        4242222C0A222E2A20632023333636414242222C0A222E612063202333393643
-        4243222C0A222E6220632023334236454244222C0A222E632063202333413644
-        4242222C0A222E6420632023333836424242222C0A222E652063202333453730
-        4242222C0A222E6620632023443145304636222C0A222E672063202344314530
-        4637222C0A222E6820632023463846424645222C0A222E692063202346374642
-        4645222C0A222E6A20632023463646394644222C0A222E6B2063202346304635
-        4643222C0A222E6C20632023454146304641222C0A222E6D2063202345444632
-        4642222C0A222E6E20632023463746414644222C0A222E6F2063202345424631
-        4642222C0A222E7020632023444645394638222C0A222E712063202342444430
-        4543222C0A222E7220632023354538394339222C0A222E732063202344314446
-        4636222C0A222E7420632023383041414539222C0A222E752063202346364641
-        4645222C0A222E7620632023463646414644222C0A222E772063202336343843
-        4338222C0A222E7820632023454546334642222C0A222E792063202345414631
-        4642222C0A222E7A20632023463246364643222C0A222E412063202346314636
-        4643222C0A222E4220632023453245434639222C0A222E432063202344424537
-        4638222C0A222E4420632023424144304545222C0A222E452063202344304446
-        4636222C0A222E4620632023374541384538222C0A222E472063202345394631
-        4641222C0A222E4820632023454546344642222C0A222E492063202345384630
-        4641222C0A222E4A20632023444445384638222C0A222E4B2063202344424536
-        4637222C0A222E4C20632023374141334531222C0A222E4D2063202343334435
-        4546222C0A222E4E20632023333536394237222C0A222E4F2063202343434444
-        4635222C0A222E5020632023374541384537222C0A222E512063202336363844
-        4339222C0A222E5220632023453946304641222C0A222E532063202346334638
-        4644222C0A222E5420632023463846414645222C0A222E552063202345464634
-        4643222C0A222E5620632023444645394639222C0A222E572063202344424537
-        4637222C0A222E5820632023443945354637222C0A222E592063202337384132
-        4530222C0A222E5A20632023413943324537222C0A222E302063202333353638
-        4236222C0A222E3120632023433944434634222C0A222E322063202337444137
-        4537222C0A222E3320632023453145434639222C0A222E342063202345334544
-        4639222C0A222E3520632023454546344643222C0A222E362063202346334637
-        4644222C0A222E3720632023453545444641222C0A222E382063202344384535
-        4636222C0A222E3920632023373741304445222C0A222E402063202341344245
-        4534222C0A222E2320632023333436374234222C0A222E3B2063202343374439
-        4634222C0A222E3A20632023374441364536222C0A222E3D2063202336353844
-        4339222C0A222E2B20632023363738454339222C0A222E252063202336433932
-        4342222C0A222E2420632023364439324342222C0A222E282063202336393930
-        4341222C0A222E2920632023363538434338222C0A222E5B2063202337343943
-        4441222C0A222E5D20632023394642414531222C0A222C2E2063202333343636
-        4233222C0A222C2C20632023433544384632222C0A222C2D2063202337424134
-        4533222C0A222C2A20632023374141334533222C0A222C612063202337414134
-        4533222C0A222C6220632023374241344532222C0A222C632063202337424133
-        4532222C0A222C6420632023374241334531222C0A222C652063202337394132
-        4531222C0A222C6620632023373741304446222C0A222C672063202337363946
-        4445222C0A222C6820632023373439454444222C0A222C692063202337323943
-        4442222C0A222C6A20632023373439444443222C0A222C6B2063202339414235
-        4444222C0A222C6C20632023333436354231222C0A222C6D2063202343324435
-        4632222C0A222C6E20632023373841314530222C0A222C6F2063202337353945
-        4445222C0A222C7020632023373339424441222C0A222C712063202337333942
-        4439222C0A222C7220632023393542304441222C0A222C732063202333333634
-        4146222C0A222C7420632023424544324630222C0A222C752063202337414133
-        4532222C0A222C7620632023373739464445222C0A222C772063202337363946
-        4444222C0A222C7820632023373239424439222C0A222C792063202337313939
-        4438222C0A222C7A20632023373039394436222C0A222C412063202338454142
-        4435222C0A222C4220632023333336334144222C0A222C432063202333363641
-        4241222C0A222C4420632023424244304546222C0A222C452063202337414132
-        4532222C0A222C4620632023364439364433222C0A222C472063202338414137
-        4432222C0A222C4820632023333236324142222C0A222C492063202342384345
-        4546222C0A222C4A20632023463746414645222C0A222C4B2063202338384330
-        3632222C0A222C4C20632023364139334346222C0A222C4D2063202338344133
-        4345222C0A222C4E20632023333236314141222C0A222C4F2063202333383643
-        4242222C0A222C5020632023423643434545222C0A222C512063202337414132
-        4531222C0A222C5220632023433244434246222C0A222C532063202336383930
-        4344222C0A222C5420632023383139454343222C0A222C552063202333323631
-        4138222C0A222C5620632023333736424241222C0A222C572063202342334341
-        4544222C0A222C5820632023374141324530222C0A222C592063202336353844
-        4341222C0A222C5A20632023374339424339222C0A222C302063202333313630
-        4137222C0A222C3120632023333536414241222C0A222C322063202341444336
-        4542222C0A222C3320632023414443354541222C0A222C342063202337433941
-        4338222C0A222C3520632023373939384337222C0A222C362063202333353639
-        4239222C0A222C3720632023333536394238222C0A222C382063202333353638
-        4237222C0A222C3920632023333536384235222C0A222C402063202333343636
-        4232222C0A222C2320632023333336354230222C0A222C3B2063202333333634
-        4145222C0A222C3A20632023333236334143222C0A222C3D2063202333323632
-        4141222C0A222C2B20632023333236314139222C0A222C252063202333313630
-        4138222C0A222C2420632023333136304136222C0A222C282063202333313631
-        4138222C0A222E2E2E2C2E2C2E2C2E2C2E2D2E2D2E2A2E2A2E612E622E632E64
-        2E652E2E2E2E222C0A222E2C2E662E672E682E692E6A2E6B2E6C2E6D2E6A2E6E
-        2E6F2E702E712E722E2E222C0A222E2C2E732E742E752E762E772E782E792E7A
-        2E682E412E422E432E442E712E65222C0A222E2C2E452E462E412E412E772E47
-        2E482E6E2E6A2E492E4A2E4B2E4C2E4D2E4E222C0A222E2C2E4F2E502E492E49
-        2E512E522E532E542E552E562E572E582E592E5A2E30222C0A222E2D2E312E32
-        2E332E332E342E352E6E2E362E372E572E582E382E392E402E23222C0A222E2D
-        2E3B2E3A2E772E3D2E2B2E252E242E282E292E772E772E772E5B2E5D2C2E222C
-        0A222E2A2C2C2C2D2C2A2C612C622C632C642C652C662C672C682C692C6A2C6B
-        2C6C222C0A222E2A2C6D2C2A2C2A2C632C632C622C652C6E2E392C6F2C6A2C70
-        2C712C722C73222C0A222E2A2C742C752C752E4C2C632C642C6E2C762C772C6A
-        2C782C792C7A2C412C42222C0A222C432C442C452E682E682E682E682E682E68
-        2E682E682E682E682C462C472C48222C0A222E642C492C652C4A2C4B2C4B2C4B
-        2C4B2C4B2C4B2C4B2C4B2E6A2C4C2C4D2C4E222C0A222C4F2C502C512C4A2C52
-        2C522C522C522C522C522C522C522E6A2C532C542C55222C0A222C562C572C58
-        2C4A2C4B2C4B2C4B2C4B2C4B2C4B2C4B2C4B2E6A2C592C5A2C30222C0A222C31
-        2C322C332E682E682E682E682E682E682E682E682E682E682C342C352C30222C
-        0A222C432C362C372C382C392E232C402C232C3B2C3A2C3D2C2B2C252C302C24
-        2C28227D0A
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000064000000640000000000000000000000BA6A36FFB969
+        35FFB86935FFB76835FFB56835FFB46734FFB26634FFB06533FFAE6433FFAC63
+        32FFAA6232FFA96132FFA86031FFA76031FFA66031FFA86131FFBA6A35FFEBC6
+        ADFFEAC5ADFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB
+        F8FFFEFBF8FFFEFBF8FFFEFBF8FFC89A7CFFC79879FFA76031FFBA6B37FFEDCA
+        B3FFE0A27AFFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0
+        88FF62C088FF62C088FFFDF9F6FFCA8D65FFC99B7CFFA76031FFBB6C38FFEECC
+        B6FFE1A27AFFFEFAF7FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDCC2FFBFDC
+        C2FFBFDCC2FFBFDCC2FFFDF9F6FFCD9068FFCC9E81FFA86132FFBB6B38FFEFCE
+        B8FFE1A279FFFEFAF7FF62C088FF62C088FF62C088FF62C088FF62C088FF62C0
+        88FF62C088FF62C088FFFDF9F6FFCF936AFFCEA384FFAA6132FFBA6A36FFEFD0
+        BBFFE2A27AFFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFBF8FFFEFB
+        F8FFFEFBF8FFFEFBF8FFFEFBF8FFD3966DFFD2A78AFFAB6232FFBB6A36FFF0D2
+        BEFFE2A37AFFE2A37AFFE1A37AFFE2A37BFFE1A37BFFE0A178FFDE9F77FFDD9F
+        76FFDC9D74FFD99B72FFD89971FFD69970FFD5AB8EFFAD6333FFBB6A36FFF2D5
+        C2FFE3A37AFFE3A37AFFE2A37BFFE2A37BFFE2A47BFFE1A279FFE0A178FFDEA0
+        77FFDE9E75FFDC9D74FFDA9B73FFD99B73FFDAB095FFAF6433FFBB6A36FFF2D8
+        C5FFE3A47BFFE3A37AFFE3A47AFFE2A47BFFE2A37BFFE1A37BFFE1A279FFDFA0
+        77FFDE9F76FFDD9E74FFDB9C72FFDC9D74FFDDB59AFFB16534FFBB6B36FFF4D9
+        C7FFE6A67DFFC88C64FFC98D65FFC98E67FFCB926CFFCB926DFFCA9069FFC88C
+        65FFC88C64FFC88C64FFC88C64FFDA9C74FFE1BA9FFFB36634FFBB6B36FFF4DC
+        C9FFE7A77DFFF9ECE1FFF9ECE1FFF9EDE3FFFCF4EEFFFDFAF7FFFDF7F3FFFAED
+        E5FFF7E7DBFFF7E5D9FFF6E5D8FFDEA077FFE4BEA4FFB46734FFBC6B36FFF5DD
+        CCFFE7A87EFFFAF0E8FFFAF0E8FFC98D66FFFAF0E9FFFDF8F3FFFEFAF8FFFCF4
+        EFFFF9E9DFFFF7E7DBFFF7E5D9FFE0A278FFE7C2A9FFB66835FFBC6B36FFF6DF
+        D0FFE8A87EFFFCF6F1FFFCF6F1FFC88C64FFFAF1E9FFFBF4EEFFFDFAF7FFFDF9
+        F6FFFAF0E8FFF8E8DDFFF7E6DBFFE1A37AFFEFD5C3FFB76935FFBC6B36FFF6DF
+        D1FFE9AA80FFFEFAF6FFFDFAF6FFC88C64FFFBF3EEFFFBF1EAFFFCF6F2FFFEFB
+        F8FFFCF6F1FFF9ECE2FFF8E7DBFFEED0BAFFECD0BDFFBB703EFFBC6B36FFF6E0
+        D1FFF7E0D1FFFEFBF8FFFEFBF7FFFDF9F6FFFCF5F0FFFAF0EAFFFBF2EDFFFDF9
+        F6FFFDFAF7FFFBF1EBFFF8E9DFFFECD0BDFFC9895EFF0000000000000000BC6B
+        36FFBC6B36FFBC6B36FFBC6B36FFBB6B36FFBB6B36FFBB6A36FFBB6A36FFBC6C
+        39FFBD6E3BFFBB6D3AFFBB6B38FFBB703EFF0000000000000000
      }
      NumGlyphs = 0
      OnClick = btnSaveProfileClick
@@ -545,71 +485,40 @@ object frmLogin: TfrmLogin
      Width = 23
      Color = clBtnFace
      Glyph.Data = {
-        100800002F2A2058504D202A2F0A7374617469632063686172202A6772617068
-        69635B5D203D207B0A2231362031362039302032222C0A222E2E2063204E6F6E
-        65222C0A222E2C20632023464637373741222C0A222E2D206320234645373637
-        39222C0A222E2A20632023463836313634222C0A222E61206320234639363836
-        41222C0A222E6220632023463335313534222C0A222E63206320234646374538
-        31222C0A222E6420632023464537453831222C0A222E65206320234644373137
-        34222C0A222E6620632023463835463632222C0A222E67206320234642364436
-        46222C0A222E6820632023464637433745222C0A222E69206320234645373137
-        34222C0A222E6A20632023464537413744222C0A222E6B206320234646383738
-        41222C0A222E6C20632023464437393743222C0A222E6D206320234642363936
-        43222C0A222E6E20632023463835453631222C0A222E6F206320234641364336
-        45222C0A222E7020632023464637413744222C0A222E71206320234637354636
-        31222C0A222E7220632023463034363439222C0A222E73206320234643364236
-        45222C0A222E7420632023464437343737222C0A222E75206320234646383238
-        36222C0A222E7620632023464337333736222C0A222E77206320234638363236
-        34222C0A222E7820632023463735443630222C0A222E79206320234641364136
-        44222C0A222E7A20632023464637393742222C0A222E41206320234546343534
-        38222C0A222E4220632023463936333636222C0A222E43206320234642364437
-        30222C0A222E4420632023464637453830222C0A222E45206320234646374237
-        45222C0A222E4620632023464637393743222C0A222E47206320234646373737
-        39222C0A222E4820632023463735433545222C0A222E49206320234546343434
-        37222C0A222E4A20632023463635413544222C0A222E4B206320234646373937
-        44222C0A222E4C20632023464635423545222C0A222E4D206320234646353835
-        42222C0A222E4E20632023464637343736222C0A222E4F206320234546343334
-        36222C0A222E5020632023463735423544222C0A222E51206320234646373637
-        39222C0A222E5220632023464635363539222C0A222E53206320234646353435
-        37222C0A222E5420632023464637303732222C0A222E55206320234630343634
-        38222C0A222E5620632023463635413543222C0A222E57206320234641363436
-        37222C0A222E5820632023464637323734222C0A222E59206320234646373037
-        33222C0A222E5A20632023464636453730222C0A222E30206320234646364336
-        45222C0A222E3120632023463735353537222C0A222E32206320234545334433
-        46222C0A222E3320632023463635393542222C0A222E34206320234641363336
-        36222C0A222E3520632023464637313734222C0A222E36206320234636353835
-        41222C0A222E3720632023454534313433222C0A222E38206320234543334333
-        45222C0A222E3920632023463434443530222C0A222E40206320234646363736
-        38222C0A222E2320632023463534453530222C0A222E3B206320234542333433
-        36222C0A222E3A20632023463635383542222C0A222E3D206320234641363236
-        35222C0A222E2B20632023464637303731222C0A222E25206320234636353635
-        39222C0A222E2420632023454534303432222C0A222E28206320234539333233
-        35222C0A222E2920632023463234353437222C0A222E5B206320234646363236
-        33222C0A222E5D20632023463434383441222C0A222C2E206320234539324432
-        46222C0A222C2C20632023463535363538222C0A222C2D206320234641363136
-        33222C0A222C2A20632023463635353538222C0A222C61206320234544334634
-        31222C0A222C6220632023453632413243222C0A222C63206320234631334634
-        31222C0A222C6420632023463634413443222C0A222C65206320234541324633
-        31222C0A222C6620632023463234433446222C0A222C67206320234544334534
-        30222C0A222C6820632023453432323234222C0A222E2E2E2E2E2E2E2E2E2E2E
-        2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E
-        2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E
-        2E2E2E2E2C2E2D2E2E2E2E2E2E2E2E2E2E2E2E2E2A2E612E622E2E2E2E222C0A
-        222E2E2E2E2E2C2E632E642E652E2E2E2E2E2E2E2E2E662E672E682E662E2E2E
-        2E222C0A222E2E2E2E2E692E6A2E6B2E6C2E6D2E2E2E2E2E6E2E6F2E702E712E
-        722E2E2E2E222C0A222E2E2E2E2E2E2E732E742E752E762E772E782E792E7A2E
-        782E412E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E422E432E442E452E462E
-        472E482E492E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E4A2E4B2E
-        4C2E4D2E4E2E4F2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E
-        502E512E522E532E542E552E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E
-        2E2E562E572E582E592E5A2E302E312E322E2E2E2E2E2E2E2E222C0A222E2E2E
-        2E2E2E2E332E342E352E362E372E382E392E402E232E3B2E2E2E2E2E2E222C0A
-        222E2E2E2E2E3A2E3D2E2B2E252E242E2E2E2E2E282E292E5B2E5D2C2E2E2E2E
-        2E222C0A222E2E2E2E2C2C2C2D2C2A2C612E2E2E2E2E2E2E2E2C622C632C642C
-        652E2E2E2E222C0A222E2E2E2E2E2E2C662C672E2E2E2E2E2E2E2E2E2E2E2E2C
-        682C652E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-        2E2E2E2E2E2E2E2E2E2E2E2E2E222C0A222E2E2E2E2E2E2E2E2E2E2E2E2E2E2E
-        2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E227D0A
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000064000000640000000000000000000000000000000000
+        0000000000000000000000000000000000000000000000000000000000000000
+        0000000000000000000000000000000000000000000000000000000000000000
+        0000000000000000000000000000000000000000000000000000000000000000
+        0000000000000000000000000000000000000000000000000000000000000000
+        0000000000004F4CF2FF403EEDFF000000000000000000000000000000000000
+        0000000000002422E4FF312FEAFF000000000000000000000000000000000000
+        00005856F5FF6361FAFF5855F6FF413FEDFF0000000000000000000000000000
+        00002C2AE6FF413FF1FF4C4AF6FF312FEAFF0000000000000000000000000000
+        00005B58F6FF6562FAFF7170FFFF5956F6FF4240EEFF00000000000000003532
+        E9FF4745F2FF6362FFFF4A48F4FF2F2DE9FF0000000000000000000000000000
+        0000000000005B59F6FF6663FAFF7471FFFF5A58F6FF4341EEFF3E3CECFF504D
+        F4FF6867FFFF504EF5FF3634EBFF000000000000000000000000000000000000
+        000000000000000000005C5AF6FF6764FAFF7472FFFF7370FFFF706EFFFF6E6C
+        FFFF5755F7FF3F3DEEFF00000000000000000000000000000000000000000000
+        00000000000000000000000000005D5BF7FF7976FFFF5956FFFF5754FFFF7270
+        FFFF4846F0FF0000000000000000000000000000000000000000000000000000
+        00000000000000000000000000005D5AF6FF7D79FFFF5E5BFFFF5B58FFFF7674
+        FFFF4643EFFF0000000000000000000000000000000000000000000000000000
+        000000000000000000006663F9FF706DFBFF807EFFFF7E7BFFFF7C79FFFF7977
+        FFFF5E5CF7FF4744EFFF00000000000000000000000000000000000000000000
+        0000000000006E6BFCFF7774FDFF8682FFFF7673FCFF6462F8FF605DF7FF6D6A
+        FAFF7B79FFFF605DF7FF4845EFFF000000000000000000000000000000000000
+        00007471FEFF7D7AFEFF8A87FFFF7C79FDFF6C69FBFF0000000000000000615E
+        F8FF6E6CFAFF7D7AFFFF615FF7FF4946F0FF0000000000000000000000000000
+        00007A77FFFF817EFFFF817EFEFF7471FDFF0000000000000000000000000000
+        0000625FF8FF6F6DFBFF7E7CFFFF625FF8FF0000000000000000000000000000
+        0000000000007A77FFFF7976FEFF000000000000000000000000000000000000
+        0000000000006461F8FF6A68F9FF5451F3FF0000000000000000000000000000
+        0000000000000000000000000000000000000000000000000000000000000000
+        0000000000000000000000000000000000000000000000000000000000000000
+        0000000000000000000000000000000000000000000000000000000000000000
+        0000000000000000000000000000000000000000000000000000
      }
      NumGlyphs = 0
      OnClick = btnDeleteProfileClick
--- a/Client/UfrmMain.lfm
+++ b/Client/UfrmMain.lfm