Changeset 456

Timestamp:

May 30, 2023, 11:31:10 AM (11 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.

Location:

trunk

Files:

• Brain.pas (moved) (moved from trunk/UBrain.pas ) (1 diff)
• Direct.lfm (modified) (2 diffs)
• Direct.pas (modified) (3 diffs)
• GameServer.pas (modified) (1 diff)
• Install/snap/snapcraft.yaml (modified) (2 diffs)
• Integrated.lpi (modified) (5 diffs)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/Enhance.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (2 diffs)
• LocalPlayer/IsoEngine.pas (modified) (3 diffs)
• LocalPlayer/KeyBindings.pas (moved) (moved from trunk/LocalPlayer/UKeyBindings.pas ) (1 diff)
• LocalPlayer/MessgEx.lfm (modified) (3 diffs)
• LocalPlayer/MessgEx.pas (modified) (3 diffs)
• LocalPlayer/Select.lfm (modified) (7 diffs)
• LocalPlayer/Select.pas (modified) (1 diff)
• LocalPlayer/Term.lfm (modified) (2 diffs)
• LocalPlayer/Term.pas (modified) (5 diffs)
• LocalPlayer/Tribes.pas (modified) (1 diff)
• LocalPlayer/UnitStat.pas (modified) (1 diff)
• LocalPlayer/Wonders.pas (modified) (3 diffs)
• MiniMap.pas (moved) (moved from trunk/UMiniMap.pas ) (5 diffs)
• Network/NetworkClient.pas (moved) (moved from trunk/Network/UNetworkClient.pas ) (2 diffs)
• Network/NetworkCommon.pas (moved) (moved from trunk/Network/UNetworkCommon.pas ) (1 diff)
• Network/NetworkServer.pas (moved) (moved from trunk/Network/UNetworkServer.pas ) (2 diffs)
• Packages/CevoComponents/CevoComponents.lpk (modified) (2 diffs)
• Packages/CevoComponents/CevoComponents.pas (modified) (2 diffs)
• Packages/CevoComponents/GraphicSet.pas (moved) (moved from trunk/Packages/CevoComponents/UGraphicSet.pas ) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (47 diffs)
• Packages/CevoComponents/Texture.pas (moved) (moved from trunk/Packages/CevoComponents/UTexture.pas ) (1 diff)
• Packages/Common/AboutDialog.pas (moved) (moved from trunk/Packages/Common/UAboutDialog.pas ) (3 diffs)
• Packages/Common/ApplicationInfo.pas (moved) (moved from trunk/Packages/Common/UApplicationInfo.pas ) (1 diff)
• Packages/Common/Common.Delay.pas (moved) (moved from trunk/Packages/Common/UDelay.pas ) (2 diffs)
• Packages/Common/Common.lpk (modified) (2 diffs)
• Packages/Common/Common.pas (moved) (moved from trunk/Packages/Common/UCommon.pas ) (9 diffs)
• Packages/Common/CommonPackage.pas (copied) (copied from trunk/Packages/Common/Common.pas ) (4 diffs)
• Packages/Common/DataFile.pas (added)
• Packages/Common/DebugLog.pas (moved) (moved from trunk/Packages/Common/UDebugLog.pas ) (2 diffs)
• Packages/Common/FindFile.pas (moved) (moved from trunk/Packages/Common/UFindFile.pas ) (9 diffs)
• Packages/Common/FormAbout.lfm (moved) (moved from trunk/Packages/Common/UFormAbout.lfm ) (6 diffs)
• Packages/Common/FormAbout.lrj (moved) (moved from trunk/Packages/Common/UFormAbout.lrj )
• Packages/Common/FormAbout.pas (moved) (moved from trunk/Packages/Common/UFormAbout.pas ) (5 diffs)
• Packages/Common/Generics.pas (added)
• Packages/Common/Geometric.pas (moved) (moved from trunk/Packages/Common/UGeometric.pas ) (7 diffs)
• Packages/Common/JobProgressView.lfm (moved) (moved from trunk/Packages/Common/UJobProgressView.lfm )
• Packages/Common/JobProgressView.lrj (moved) (moved from trunk/Packages/Common/UJobProgressView.lrj )
• Packages/Common/JobProgressView.pas (moved) (moved from trunk/Packages/Common/UJobProgressView.pas ) (6 diffs)
• Packages/Common/Languages.pas (moved) (moved from trunk/Packages/Common/ULanguages.pas ) (2 diffs)
• Packages/Common/Languages/DataFile.cs.po (added)
• Packages/Common/Languages/DataFile.pot (added)
• Packages/Common/Languages/DebugLog.cs.po (moved) (moved from trunk/Packages/Common/Languages/UDebugLog.cs.po ) (1 diff)
• Packages/Common/Languages/DebugLog.pot (moved) (moved from trunk/Packages/Common/Languages/UDebugLog.pot ) (1 diff)
• Packages/Common/Languages/FindFile.cs.po (moved) (moved from trunk/Packages/Common/Languages/UFindFile.cs.po ) (1 diff)
• Packages/Common/Languages/FindFile.pot (moved) (moved from trunk/Packages/Common/Languages/UFindFile.pot ) (1 diff)
• Packages/Common/Languages/FormAbout.cs.po (moved) (moved from trunk/Packages/Common/Languages/UFormAbout.cs.po ) (1 diff)
• Packages/Common/Languages/FormAbout.pot (moved) (moved from trunk/Packages/Common/Languages/UFormAbout.pot ) (1 diff)
• Packages/Common/Languages/JobProgressView.cs.po (moved) (moved from trunk/Packages/Common/Languages/UJobProgressView.cs.po ) (1 diff)
• Packages/Common/Languages/JobProgressView.pot (moved) (moved from trunk/Packages/Common/Languages/UJobProgressView.pot ) (1 diff)
• Packages/Common/Languages/Languages.cs.po (moved) (moved from trunk/Packages/Common/Languages/ULanguages.cs.po ) (1 diff)
• Packages/Common/Languages/Languages.pot (moved) (moved from trunk/Packages/Common/Languages/ULanguages.pot ) (1 diff)
• Packages/Common/Languages/Pool.cs.po (moved) (moved from trunk/Packages/Common/Languages/UPool.cs.po ) (1 diff)
• Packages/Common/Languages/Pool.pot (moved) (moved from trunk/Packages/Common/Languages/UPool.pot ) (1 diff)
• Packages/Common/Languages/ResetableThread.cs.po (moved) (moved from trunk/Packages/Common/Languages/UResetableThread.cs.po ) (1 diff)
• Packages/Common/Languages/ResetableThread.pot (moved) (moved from trunk/Packages/Common/Languages/UResetableThread.pot ) (1 diff)
• Packages/Common/Languages/ScaleDPI.cs.po (moved) (moved from trunk/Packages/Common/Languages/UScaleDPI.cs.po ) (1 diff)
• Packages/Common/Languages/ScaleDPI.pot (moved) (moved from trunk/Packages/Common/Languages/UScaleDPI.pot ) (1 diff)
• Packages/Common/Languages/TestCase.cs.po (added)
• Packages/Common/Languages/TestCase.pot (added)
• Packages/Common/Languages/Threading.cs.po (moved) (moved from trunk/Packages/Common/Languages/UThreading.cs.po ) (1 diff)
• Packages/Common/Languages/Threading.pot (moved) (moved from trunk/Packages/Common/Languages/UThreading.pot ) (1 diff)
• Packages/Common/LastOpenedList.pas (moved) (moved from trunk/Packages/Common/ULastOpenedList.pas ) (2 diffs)
• Packages/Common/ListViewSort.pas (moved) (moved from trunk/Packages/Common/UListViewSort.pas ) (2 diffs)
• Packages/Common/Memory.pas (moved) (moved from trunk/Packages/Common/UMemory.pas ) (4 diffs)
• Packages/Common/MetaCanvas.pas (moved) (moved from trunk/Packages/Common/UMetaCanvas.pas ) (11 diffs)
• Packages/Common/PersistentForm.pas (moved) (moved from trunk/Packages/Common/UPersistentForm.pas ) (12 diffs)
• Packages/Common/PixelPointer.pas (moved) (moved from trunk/Packages/Common/UPixelPointer.pas ) (12 diffs)
• Packages/Common/Pool.pas (moved) (moved from trunk/Packages/Common/UPool.pas ) (4 diffs)
• Packages/Common/PrefixMultiplier.pas (moved) (moved from trunk/Packages/Common/UPrefixMultiplier.pas ) (4 diffs)
• Packages/Common/RegistryEx.pas (moved) (moved from trunk/Packages/Common/URegistry.pas ) (1 diff)
• Packages/Common/ResetableThread.pas (moved) (moved from trunk/Packages/Common/UResetableThread.pas ) (4 diffs)
• Packages/Common/ScaleDPI.pas (moved) (moved from trunk/Packages/Common/UScaleDPI.pas ) (2 diffs)
• Packages/Common/StopWatch.pas (modified) (3 diffs)
• Packages/Common/StringTable.pas (moved) (moved from trunk/Packages/Common/UStringTable.pas ) (3 diffs)
• Packages/Common/SyncCounter.pas (moved) (moved from trunk/Packages/Common/USyncCounter.pas ) (3 diffs)
• Packages/Common/TestCase.pas (added)
• Packages/Common/Theme.pas (moved) (moved from trunk/Packages/Common/UTheme.pas ) (2 diffs)
• Packages/Common/Threading.pas (moved) (moved from trunk/Packages/Common/UThreading.pas ) (3 diffs)
• Packages/Common/Translator.pas (moved) (moved from trunk/Packages/Common/UTranslator.pas ) (12 diffs)
• Packages/Common/URI.pas (moved) (moved from trunk/Packages/Common/UURI.pas ) (6 diffs)
• Packages/Common/XML.pas (moved) (moved from trunk/Packages/Common/UXMLUtils.pas ) (5 diffs)
• Settings.pas (modified) (3 diffs)
• Start.pas (modified) (4 diffs)

trunk/Brain.pas

@@ -1 @@
-unit UBrain;
+unit Brain;
 
 interface

trunk/Direct.lfm

@@ -8 +8 @@
   Caption = 'C-evo'
   Color = clBtnFace
-  DesignTimePPI = 125
+  DesignTimePPI = 144
   Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
   FormStyle = fsStayOnTop
@@ -18 +18 @@
   OnShow = FormShow
   ShowInTaskBar = stNever
-  PixelsPerInch = 96
+  LCLVersion = '2.2.6.0'
   Scaled = False
 end

trunk/Direct.pas

@@ -43 +43 @@
 
 uses
-  ScreenTools, Protocol, Start, LocalPlayer, NoTerm, Back, Global, UNetworkServer,
-  UNetworkClient;
+  ScreenTools, Protocol, Start, LocalPlayer, NoTerm, Back, Global, NetworkServer,
+  NetworkClient;
 
 {$R *.lfm}
@@ -183 +183 @@
   BrainTerm.Name := Phrases.Lookup('HUMAN');
   if NetworkEnabled then begin
-    BrainNetworkServer.Client := UNetworkServer.Client;
+    BrainNetworkServer.Client := NetworkServer.Client;
     BrainNetworkServer.Name := Phrases.Lookup('NETWORK_SERVER');
-    BrainNetworkClient.Client := UNetworkClient.Client;
+    BrainNetworkClient.Client := NetworkClient.Client;
     BrainNetworkClient.Name := Phrases.Lookup('NETWORK_CLIENT');
   end;
@@ -280 +280 @@
 procedure TDirectDlg.FormPaint(Sender: TObject);
 begin
-  PaintBackground(self, 3, 3, ClientWidth - 6, ClientHeight - 6);
+  PaintBackground(Self, 3, 3, ClientWidth - 6, ClientHeight - 6);
   Frame(Canvas, 0, 0, ClientWidth - 1, ClientHeight - 1, 0, 0);
   Frame(Canvas, 1, 1, ClientWidth - 2, ClientHeight - 2,

trunk/GameServer.pas

@@ -8 +8 @@
 uses
   Protocol, Database, dynlibs, Platform, dateutils, LazFileUtils, Graphics,
-  UBrain, Global;
+  Brain, Global;
 
 const

trunk/Install/snap/snapcraft.yaml

@@ -11 +11 @@
   * Support for user defined key mapping
   * Many other small improvements
-confinement: strict
+confinement: devmode
 base: core22
 grade: stable
@@ -69 +69 @@
     override-build: |
       snapcraftctl build
-      (cd AI/StdAI &&lazbuild --build-mode=Release StdAI.lpi)
+      (cd AI/StdAI &&lazbuild --build-mode=Debug StdAI.lpi)
       mv AI/StdAI/libstdai.so AI/StdAI/libstdai-amd64.so
-      lazbuild --build-mode=Release Integrated.lpi
+      lazbuild --build-mode=Debug Integrated.lpi
       install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
       install -s -m 755 c-evo $SNAPCRAFT_PART_INSTALL/usr/share/c-evo

trunk/Integrated.lpi

@@ -36 +36 @@
           <SearchPaths>
             <IncludeFiles Value="LocalPlayer;$(ProjOutDir)"/>
-            <OtherUnitFiles Value="LocalPlayer;Network"/>
+            <OtherUnitFiles Value="LocalPlayer;Network;Packages\CevoComponents"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
           </SearchPaths>
@@ -56 +56 @@
             <Debugging>
               <GenerateDebugInfo Value="False"/>
+              <DebugInfoType Value="dsDwarf2Set"/>
             </Debugging>
             <LinkSmart Value="True"/>
@@ -337 +338 @@
       </Unit40>
       <Unit41>
-        <Filename Value="LocalPlayer\UKeyBindings.pas"/>
+        <Filename Value="LocalPlayer\KeyBindings.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit41>
       <Unit42>
-        <Filename Value="UMiniMap.pas"/>
+        <Filename Value="MiniMap.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit42>
       <Unit43>
-        <Filename Value="UBrain.pas"/>
+        <Filename Value="Brain.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit43>
       <Unit44>
-        <Filename Value="Network\UNetworkServer.pas"/>
+        <Filename Value="Network\NetworkServer.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit44>
       <Unit45>
-        <Filename Value="Network\UNetworkClient.pas"/>
+        <Filename Value="Network\NetworkClient.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit45>
       <Unit46>
-        <Filename Value="Network\UNetworkCommon.pas"/>
+        <Filename Value="Network\NetworkCommon.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit46>
@@ -370 +371 @@
     <SearchPaths>
       <IncludeFiles Value="LocalPlayer;$(ProjOutDir)"/>
-      <OtherUnitFiles Value="LocalPlayer;Network"/>
+      <OtherUnitFiles Value="LocalPlayer;Network;Packages\CevoComponents"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
     </SearchPaths>
@@ -393 +394 @@
     <Linking>
       <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
         <UseHeaptrc Value="True"/>
         <UseExternalDbgSyms Value="True"/>

trunk/LocalPlayer/CityScreen.pas

@@ -8 +8 @@
   Protocol, ClientTools, Term, ScreenTools, IsoEngine, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls,
-  ButtonA, ButtonC, Area, GraphType, UTexture;
+  ButtonA, ButtonC, Area, GraphType, Texture;
 
 const

trunk/LocalPlayer/Enhance.pas

@@ -50 +50 @@
 
 uses
-  Help, UKeyBindings;
+  Help, KeyBindings;
 
 {$R *.lfm}

trunk/LocalPlayer/Help.pas

@@ -128 +128 @@
 
 uses
-  Directories, ClientTools, Term, Tribes, Inp, Messg, UPixelPointer, Global,
-  UKeyBindings;
+  Directories, ClientTools, Term, Tribes, Inp, Messg, PixelPointer, Global,
+  KeyBindings;
 
 {$R *.lfm}
@@ -467 +467 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  PaintPtr := PixelPointer(OffScreen, ScaleToNative(x0), ScaleToNative(y0));
-  CoalPtr := PixelPointer(Templates.Data, ScaleToNative(xCoal), ScaleToNative(yCoal));
+  PaintPtr := TPixelPointer.Create(OffScreen, ScaleToNative(x0), ScaleToNative(y0));
+  CoalPtr := TPixelPointer.Create(Templates.Data, ScaleToNative(xCoal), ScaleToNative(yCoal));
   for dy := -1 to 1 do
-    ImpPtr[dy] := PixelPointer(BigImp, ScaleToNative(xSrc), ScaleToNative(ySrc));
+    ImpPtr[dy] := TPixelPointer.Create(BigImp, ScaleToNative(xSrc), ScaleToNative(ySrc));
   for Y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do begin
     if ((ScaleToNative(y0) + Y) >= 0) and ((ScaleToNative(y0) + Y) < ScaleToNative(InnerHeight)) then begin

trunk/LocalPlayer/IsoEngine.pas

@@ -6 +6 @@
 uses
   Protocol, ClientTools, ScreenTools, Tribes, LCLIntf, LCLType, SysUtils,
-  Classes, Graphics, UPixelPointer, UGraphicSet;
+  Classes, Graphics, PixelPointer, GraphicSet;
 
 const
@@ -255 +255 @@
   for ySrc := 0 to TerrainIconLines - 1 do begin
     for I := 0 to yyt * 3 - 1 do
-      MaskLine[I] := PixelPointer(Mask24, ScaleToNative(0),
+      MaskLine[I] := TPixelPointer.Create(Mask24, ScaleToNative(0),
         ScaleToNative(1 + ySrc * (yyt * 3 + 1) + I));
     for xSrc := 0 to TerrainIconCols - 1 do begin
@@ -1424 +1424 @@
 begin
   FOutput.BeginUpdate;
-  Line := PixelPointer(FOutput, ScaleToNative(x0), ScaleToNative(y0));
+  Line := TPixelPointer.Create(FOutput, ScaleToNative(x0), ScaleToNative(y0));
   for Y := 0 to ScaleToNative(Height) - 1 do begin
     y_n := (ScaleFromNative(Y) + y0 - ym) / yyt;

trunk/LocalPlayer/KeyBindings.pas

@@ -1 @@
-unit UKeyBindings;
+unit KeyBindings;
 
 interface

trunk/LocalPlayer/MessgEx.lfm

@@ -12 +12 @@
   DesignTimePPI = 144
   Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
   FormStyle = fsStayOnTop
@@ -20 +20 @@
   OnPaint = FormPaint
   OnShow = FormShow
-  LCLVersion = '2.0.12.0'
+  LCLVersion = '2.2.2.0'
   Scaled = False
   object Button1: TButtonA
@@ -61 +61 @@
   object EInput: TEdit
     Left = 125
-    Height = 26
+    Height = 27
     Top = 64
     Width = 168

trunk/LocalPlayer/MessgEx.pas

@@ -63 +63 @@
 
 uses
-  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, UPixelPointer,
+  ClientTools, BaseWin, Term, Help, UnitStat, Tribes, PixelPointer,
   Diagram, Sound;
 
@@ -211 +211 @@
   else
     Result := inherited;
-  Gtk2Fix;
+  //Gtk2Fix;
 end;
 
@@ -244 +244 @@
     Screwed := Default(TScrewed);
     BigImp.BeginUpdate;
-    SrcPtr := PixelPointer(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
+    SrcPtr := TPixelPointer.Create(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
     for iy := 0 to ScaleToNative(Height) - 1 do begin
       for ix := 0 to ScaleToNative(Width) - 1 do begin

trunk/LocalPlayer/Select.lfm

@@ -1 +1 @@
 object ListDlg: TListDlg
   Left = 290
+  Height = 262
   Top = 145
+  Width = 381
   BorderIcons = []
   BorderStyle = bsNone
@@ -7 +9 @@
   ClientWidth = 381
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
+  DesignTimePPI = 144
   Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
-  Font.Style = []
   FormStyle = fsStayOnTop
   OnCloseQuery = FormCloseQuery
@@ -17 +18 @@
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
-  OnMouseWheel = FormMouseWheel
   OnMouseDown = PaintBox1MouseDown
   OnMouseMove = PaintBox1MouseMove
+  OnMouseWheel = FormMouseWheel
   OnPaint = FormPaint
   OnShow = FormShow
-  PixelsPerInch = 96
+  LCLVersion = '2.2.2.0'
   Scaled = False
   object CloseBtn: TButtonB
     Left = 343
+    Height = 25
     Top = 6
     Width = 25
-    Height = 25
     Down = False
     Permanent = False
@@ -37 +38 @@
     Tag = 2
     Left = 344
+    Height = 25
     Top = 224
     Width = 25
-    Height = 25
     Down = False
     Permanent = True
@@ -48 +49 @@
     Tag = 1
     Left = 312
+    Height = 25
     Top = 224
     Width = 25
-    Height = 25
     Down = False
     Permanent = True
@@ -58 +59 @@
   object Layer0Btn: TButtonB
     Left = 280
+    Height = 25
     Top = 224
     Width = 25
-    Height = 25
     Down = False
     Permanent = True
@@ -68 +69 @@
   object ToggleBtn: TButtonB
     Left = 13
+    Height = 25
     Top = 6
     Width = 25
-    Height = 25
     Down = False
     Permanent = False

trunk/LocalPlayer/Select.pas

@@ -850 +850 @@
 procedure TListDlg.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Gtk2Fix;
+  //Gtk2Fix;
 end;
 

trunk/LocalPlayer/Term.lfm

@@ -12 +12 @@
   Constraints.MinHeight = 480
   Constraints.MinWidth = 800
-  DesignTimePPI = 120
+  DesignTimePPI = 144
   Font.Color = clWindowText
-  Font.Height = -13
+  Font.Height = -20
   Font.Name = 'MS Sans Serif'
   KeyPreview = True
@@ -31 +31 @@
   OnShow = FormShow
   Position = poDefault
-  LCLVersion = '2.0.12.0'
+  LCLVersion = '2.2.0.4'
   Scaled = False
   WindowState = wsMaximized

trunk/LocalPlayer/Term.pas

@@ -14 +14 @@
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
   Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
-  UGraphicSet, UMiniMap, IsoEngine;
+  GraphicSet, MiniMap, IsoEngine;
 
 const
@@ -591 +591 @@
 uses
   Directories, CityScreen, Draft, MessgEx, Select, CityType, Help,
-  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
-  Battle, Rates, TechTree, Registry, Global, UKeyBindings, CmdList;
+  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, PixelPointer, Sound,
+  Battle, Rates, TechTree, Registry, Global, KeyBindings, CmdList;
 
 {$R *.lfm}
@@ -680 +680 @@
   for ix := 0 to BigImp.Width div xSizeBig - 1 do
     for iy := 0 to BigImp.Height div ySizeBig - 1 do begin
-      PixelPtr := PixelPointer(BigImp, ScaleToNative(ix * xSizeBig),
+      PixelPtr := TPixelPointer.Create(BigImp, ScaleToNative(ix * xSizeBig),
         ScaleToNative(Cut + iy * ySizeBig));
       for Y := 0 to ScaleToNative(ySizeBig - 2 * Cut) - 1 do begin
@@ -718 +718 @@
   SmallImp.SetSize(nx, ny);
   SmallImp.BeginUpdate;
-  PixelPtr := PixelPointer(SmallImp);
+  PixelPtr := TPixelPointer.Create(SmallImp);
   for Y := 0 to ScaleToNative(ny) - 1 do begin
     for X := 0 to ScaleToNative(nx) - 1 do begin
@@ -6877 +6877 @@
         begin
           BrushType := trix[I];
-          PanelPaint
+          PanelPaint;
         end
         else if (TroopLoc >= 0) then

trunk/LocalPlayer/Tribes.pas

@@ -6 +6 @@
 uses
   Protocol, ScreenTools, LazFileUtils, Classes, Graphics, SysUtils, Global,
-  UGraphicSet;
+  GraphicSet;
 
 type

trunk/LocalPlayer/UnitStat.pas

@@ -52 +52 @@
 
 uses
-  Tribes, Help, Directories, UTexture;
+  Tribes, Help, Directories, Texture;
 
 {$R *.lfm}

trunk/LocalPlayer/Wonders.pas

@@ -38 +38 @@
 
 uses
-  Term, ClientTools, Help, Tribes, UPixelPointer;
+  Term, ClientTools, Help, Tribes, PixelPointer;
 
 {$R *.lfm}
@@ -110 +110 @@
   Height := ScaleToNative(128);
   Offscreen.BeginUpdate;
-  Line[0] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
-  Line[1] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
-  Line[2] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
-  Line[3] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
+  Line[0] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
+  Line[1] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
+  Line[2] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
+  Line[3] := TPixelPointer.Create(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
   for Y := 0 to Height - 1 do begin
     for X := 0 to Width - 1 do begin
@@ -160 +160 @@
   x0Src := (I mod 7) * xSizeBig;
   y0Src := (I div 7 + SystemIconLines) * ySizeBig;
-  Src := PixelPointer(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
-  Dst := PixelPointer(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
+  Src := TPixelPointer.Create(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
+  Dst := TPixelPointer.Create(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
   for Y := 0 to ScaleToNative(ySizeBig) - 1 do begin
     for X := 0 to ScaleToNative(xSizeBig) - 1 do begin

trunk/MiniMap.pas

@@ -1 +1 @@
 {$INCLUDE Switches.inc}
-unit UMiniMap;
+unit MiniMap;
 
 interface
@@ -37 +37 @@
 
 uses
-  ScreenTools, UPixelPointer, Global, GameServer, IsoEngine, Tribes;
+  ScreenTools, PixelPointer, Global, GameServer, IsoEngine, Tribes;
 
 const
@@ -172 +172 @@
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;
-  MiniPixel := PixelPointer(Bitmap);
+  MiniPixel := TPixelPointer.Create(Bitmap);
   for y := 0 to ScaleToNative(Size.Y) - 1 do begin
     for x := 0 to ScaleToNative(Size.X) - 1 do begin
@@ -203 +203 @@
   if Mode = mmPicture then begin
     Bitmap.BeginUpdate;
-    MiniPixel := PixelPointer(Bitmap);
-    PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
+    MiniPixel := TPixelPointer.Create(Bitmap);
+    PrevMiniPixel := TPixelPointer.Create(Bitmap, 0, -1);
     for y := 0 to ScaleToNative(Size.Y) - 1 do begin
       for x := 0 to ScaleToNative(Size.X) - 1 do begin
@@ -264 +264 @@
   Bitmap.SetSize(Size.X * 2, Size.Y);
   Bitmap.BeginUpdate;
-  MiniPixel := PixelPointer(Bitmap);
-  PrevMiniPixel := PixelPointer(Bitmap, 0, -1);
+  MiniPixel := TPixelPointer.Create(Bitmap);
+  PrevMiniPixel := TPixelPointer.Create(Bitmap, 0, -1);
   for y := 0 to ScaleToNative(Size.Y) - 1 do begin
     for x := 0 to ScaleToNative(Size.X) - 1 do begin

trunk/Network/NetworkClient.pas

@@ -1 @@
-unit UNetworkClient;
+unit NetworkClient;
 
 interface
@@ -46 +46 @@
 
 uses
-  LocalPlayer{$IFDEF UNIX}, Global, UNetworkCommon{$ENDIF};
+  LocalPlayer{$IFDEF UNIX}, Global, NetworkCommon{$ENDIF};
 
 procedure Client(Command, Player: Integer; var Data);

trunk/Network/NetworkCommon.pas

@@ -1 @@
-unit UNetworkCommon;
+unit NetworkCommon;
 
 interface

trunk/Network/NetworkServer.pas

@@ -1 @@
-unit UNetworkServer;
+unit NetworkServer;
 
 interface
@@ -88 +88 @@
 {$IFDEF UNIX}
 uses
-  Global, UNetworkCommon;
+  Global, NetworkCommon;
 {$ENDIF}
 

trunk/Packages/CevoComponents/CevoComponents.lpk

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="CevoComponents"/>
@@ -103 +103 @@
       </Item14>
       <Item15>
-        <Filename Value="UGraphicSet.pas"/>
-        <UnitName Value="UGraphicSet"/>
+        <Filename Value="GraphicSet.pas"/>
+        <UnitName Value="GraphicSet"/>
       </Item15>
       <Item16>
-        <Filename Value="UTexture.pas"/>
-        <UnitName Value="UTexture"/>
+        <Filename Value="Texture.pas"/>
+        <UnitName Value="Texture"/>
       </Item16>
     </Files>
+    <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="3">
       <Item1>

trunk/Packages/CevoComponents/CevoComponents.pas

@@ -10 +10 @@
 uses
   Area, ButtonA, ButtonB, ButtonC, ButtonN, EOTButton, ButtonBase, DrawDlg, 
-  Sound, BaseWin, AsyncProcess2, UGraphicSet, UTexture, LazarusPackageIntf;
+  Sound, BaseWin, AsyncProcess2, GraphicSet, Texture, LazarusPackageIntf;
 
 implementation
@@ -29 +29 @@
   RegisterPackage('CevoComponents', @Register);
 end.
-

trunk/Packages/CevoComponents/GraphicSet.pas

@@ -1 @@
-unit UGraphicSet;
+unit GraphicSet;
 
 interface
 
 uses
-  Classes, SysUtils, Graphics, Generics.Collections, LCLType, UPixelPointer, DOM,
-  XMLRead, XMLWrite, UXMLUtils;
+  Classes, SysUtils, Graphics, Generics.Collections, LCLType, DOM,
+  XMLRead, XMLWrite, XML;
 
 type

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -8 +8 @@
   {$ENDIF}
   StringTables, LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Math,
-  Forms, Menus, GraphType, UGraphicSet, LazFileUtils, UTexture;
+  Forms, Menus, GraphType, GraphicSet, LazFileUtils, Texture;
 
 type
@@ -24 +24 @@
 function TurnToString(Turn: Integer): string;
 function MovementToString(Movement: Integer): string;
-procedure BtnFrame(ca: TCanvas; P: TRect; T: TTexture);
-procedure EditFrame(ca: TCanvas; P: TRect; T: TTexture);
+procedure BtnFrame(Canvas: TCanvas; P: TRect; T: TTexture);
+procedure EditFrame(Canvas: TCanvas; P: TRect; T: TTexture);
 function HexStringToColor(S: string): Integer;
 function ExtractFileNameWithoutExt(const Filename: string): string;
@@ -54 +54 @@
 function BitBltBitmap(Dest: TBitmap; DestRect: TRect;
   Src: TBitmap; SrcPos: TPoint; Rop: DWORD = SRCCOPY): Boolean; overload;
-procedure SLine(ca: TCanvas; x0, x1, Y: Integer; cl: TColor);
-procedure DLine(ca: TCanvas; x0, x1, Y: Integer; cl0, cl1: TColor);
-procedure Frame(ca: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
-procedure RFrame(ca: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
-procedure CFrame(ca: TCanvas; x0, y0, x1, y1, Corner: Integer; cl: TColor);
-procedure FrameImage(ca: TCanvas; Src: TBitmap;
+procedure SLine(Canvas: TCanvas; x0, x1, Y: Integer; cl: TColor);
+procedure DLine(Canvas: TCanvas; x0, x1, Y: Integer; cl0, cl1: TColor);
+procedure Frame(Canvas: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
+procedure RFrame(Canvas: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
+procedure CFrame(Canvas: TCanvas; x0, y0, x1, y1, Corner: Integer; cl: TColor);
+procedure FrameImage(Canvas: TCanvas; Src: TBitmap;
   X, Y, Width, Height, xSrc, ySrc: Integer; IsControl: Boolean = False);
 procedure GlowFrame(Dst: TBitmap; x0, y0, Width, Height: Integer; cl: TColor);
 procedure InitOrnament;
-procedure InitCityMark(T: TTexture);
-procedure Fill(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer); overload;
+procedure InitCityMark(Texture: TTexture);
+procedure Fill(Canvas: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer); overload;
 procedure Fill(Canvas: TCanvas; Rect: TRect; Offset: TPoint); overload;
-procedure FillLarge(ca: TCanvas; x0, y0, x1, y1, xm: Integer);
-procedure FillSeamless(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer;
+procedure FillLarge(Canvas: TCanvas; x0, y0, x1, y1, xm: Integer);
+procedure FillSeamless(Canvas: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer;
   const Texture: TBitmap);
-procedure FillRectSeamless(ca: TCanvas; x0, y0, x1, y1, xOffset, yOffset: Integer;
+procedure FillRectSeamless(Canvas: TCanvas; x0, y0, x1, y1, xOffset, yOffset: Integer;
   const Texture: TBitmap);
 procedure PaintBackground(Form: TForm; Left, Top, Width, Height: Integer);
-procedure Corner(ca: TCanvas; X, Y, Kind: Integer; T: TTexture);
-procedure BiColorTextOut(ca: TCanvas; clMain, clBack: TColor; X, Y: Integer; S: string);
-procedure LoweredTextOut(ca: TCanvas; cl: TColor; T: TTexture;
+procedure Corner(Canvas: TCanvas; X, Y, Kind: Integer; T: TTexture);
+procedure BiColorTextOut(Canvas: TCanvas; clMain, clBack: TColor; X, Y: Integer; S: string);
+procedure LoweredTextOut(Canvas: TCanvas; cl: TColor; T: TTexture;
   X, Y: Integer; S: string);
-function BiColorTextWidth(ca: TCanvas; S: string): Integer;
-procedure RisedTextOut(ca: TCanvas; X, Y: Integer; S: string);
-procedure LightGradient(ca: TCanvas; X, Y, Width, Color: Integer);
-procedure DarkGradient(ca: TCanvas; X, Y, Width, Kind: Integer);
-procedure VLightGradient(ca: TCanvas; X, Y, Height, Color: Integer);
-procedure VDarkGradient(ca: TCanvas; X, Y, Height, Kind: Integer);
+function BiColorTextWidth(Canvas: TCanvas; S: string): Integer;
+procedure RisedTextOut(Canvas: TCanvas; X, Y: Integer; S: string);
+procedure LightGradient(Canvas: TCanvas; X, Y, Width, Color: Integer);
+procedure DarkGradient(Canvas: TCanvas; X, Y, Width, Kind: Integer);
+procedure VLightGradient(Canvas: TCanvas; X, Y, Height, Color: Integer);
+procedure VDarkGradient(Canvas: TCanvas; X, Y, Height, Kind: Integer);
 procedure UnderlinedTitleValue(Canvas: TCanvas; Title, Value: string; X, Y, Width: Integer);
 procedure NumberBar(dst: TBitmap; X, Y: Integer; Cap: string; val: Integer;
@@ -87 +87 @@
 procedure CountBar(dst: TBitmap; X, Y, W: Integer; Kind: Integer;
   Cap: string; val: Integer; T: TTexture);
-procedure PaintProgressBar(ca: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
+procedure PaintProgressBar(Canvas: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
   T: TTexture);
-procedure PaintRelativeProgressBar(ca: TCanvas;
+procedure PaintRelativeProgressBar(Canvas: TCanvas;
   Kind, X, Y, size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
   T: TTexture);
@@ -199 +199 @@
 
 uses
-  Directories, Sound, UPixelPointer;
+  Directories, Sound, PixelPointer;
 
 var
@@ -318 +318 @@
 end;
 
-procedure BtnFrame(ca: TCanvas; P: TRect; T: TTexture);
-begin
-  RFrame(ca, P.Left - 1, P.Top - 1, P.Right, P.Bottom, T.ColorBevelShade,
+procedure BtnFrame(Canvas: TCanvas; P: TRect; T: TTexture);
+begin
+  RFrame(Canvas, P.Left - 1, P.Top - 1, P.Right, P.Bottom, T.ColorBevelShade,
     T.ColorBevelLight);
 end;
 
-procedure EditFrame(ca: TCanvas; P: TRect; T: TTexture);
-begin
-  Frame(ca, P.Left - 1, P.Top - 1, P.Right, P.Bottom, $000000, $000000);
-  Frame(ca, P.Left - 2, P.Top - 2, P.Right + 1, P.Bottom + 1, $000000, $000000);
-  Frame(ca, P.Left - 3, P.Top - 3, P.Right + 2, P.Bottom + 1, $000000, $000000);
-  RFrame(ca, P.Left - 4, P.Top - 4, P.Right + 3, P.Bottom + 2, T.ColorBevelShade,
+procedure EditFrame(Canvas: TCanvas; P: TRect; T: TTexture);
+begin
+  Frame(Canvas, P.Left - 1, P.Top - 1, P.Right, P.Bottom, $000000, $000000);
+  Frame(Canvas, P.Left - 2, P.Top - 2, P.Right + 1, P.Bottom + 1, $000000, $000000);
+  Frame(Canvas, P.Left - 3, P.Top - 3, P.Right + 2, P.Bottom + 1, $000000, $000000);
+  RFrame(Canvas, P.Left - 4, P.Top - 4, P.Right + 3, P.Bottom + 2, T.ColorBevelShade,
     T.ColorBevelLight);
 end;
@@ -371 +371 @@
 begin
   Bitmap.BeginUpdate;
-  PixelPtr := PixelPointer(Bitmap);
+  PixelPtr := TPixelPointer.Create(Bitmap);
   for Y := 0 to ScaleToNative(Bitmap.Height) - 1 do begin
     for X := 0 to ScaleToNative(Bitmap.Width) - 1 do begin
@@ -388 +388 @@
 begin
   //Dst.SetSize(Src.Width, Src.Height);
-  SrcPtr := PixelPointer(Src);
-  DstPtr := PixelPointer(Dst);
+  SrcPtr := TPixelPointer.Create(Src);
+  DstPtr := TPixelPointer.Create(Dst);
   for Y := 0 to ScaleToNative(Src.Height - 1) do begin
     for X := 0 to ScaleToNative(Src.Width - 1) do begin
@@ -520 +520 @@
       Result.Data.BeginUpdate;
       Result.Mask.BeginUpdate;
-      DataPixel := PixelPointer(Result.Data);
-      MaskPixel := PixelPointer(Result.Mask);
+      DataPixel := TPixelPointer.Create(Result.Data);
+      MaskPixel := TPixelPointer.Create(Result.Mask);
       for Y := 0 to ScaleToNative(Result.Data.Height) - 1 do begin
         for X := 0 to ScaleToNative(Result.Data.Width) - 1 do begin
@@ -564 +564 @@
 begin
   Dst.BeginUpdate;
-  PixelPtr := PixelPointer(Dst, ScaleToNative(X), ScaleToNative(Y));
+  PixelPtr := TPixelPointer.Create(Dst, ScaleToNative(X), ScaleToNative(Y));
   for YY := 0 to ScaleToNative(Height) - 1 do begin
     for XX := 0 to ScaleToNative(Width) - 1 do begin
@@ -583 +583 @@
 begin
   Dst.BeginUpdate;
-  PixelPtr := PixelPointer(Dst, ScaleToNative(X), ScaleToNative(Y));
+  PixelPtr := TPixelPointer.Create(Dst, ScaleToNative(X), ScaleToNative(Y));
   for yy := 0 to ScaleToNative(Height) - 1 do begin
     for xx := 0 to ScaleToNative(Width) - 1 do begin
@@ -603 +603 @@
 begin
   Dst.BeginUpdate;
-  PixelPtr := PixelPointer(Dst, ScaleToNative(X), ScaleToNative(Y));
+  PixelPtr := TPixelPointer.Create(Dst, ScaleToNative(X), ScaleToNative(Y));
   for YY := 0 to ScaleToNative(Height) - 1 do begin
     for XX := 0 to ScaleToNative(Width) - 1 do begin
@@ -654 +654 @@
   dst.BeginUpdate;
   Src.BeginUpdate;
-  PixelDst := PixelPointer(Dst, xDst, yDst);
-  PixelSrc := PixelPointer(Src, xSrc, ySrc);
+  PixelDst := TPixelPointer.Create(Dst, xDst, yDst);
+  PixelSrc := TPixelPointer.Create(Src, xSrc, ySrc);
   for Y := 0 to Height - 1 do begin
     for X := 0 to Width - 1 do  begin
@@ -720 +720 @@
   Src.BeginUpdate;
   dst.BeginUpdate;
-  SrcPixel := PixelPointer(Src, xSrc, ySrc);
-  DstPixel := PixelPointer(Dst, xDst, yDst);
+  SrcPixel := TPixelPointer.Create(Src, xSrc, ySrc);
+  DstPixel := TPixelPointer.Create(Dst, xDst, yDst);
   for iy := 0 to Height - 1 do begin
     for ix := 0 to Width - 1 do begin
@@ -777 +777 @@
   Src.BeginUpdate;
   Dst.BeginUpdate;
-  SrcPixel := PixelPointer(Src, xSrc, ySrc);
-  DstPixel := PixelPointer(Dst, xDst, yDst);
+  SrcPixel := TPixelPointer.Create(Src, xSrc, ySrc);
+  DstPixel := TPixelPointer.Create(Dst, xDst, yDst);
   for iy := 0 to Height - 1 do begin
     for ix := 0 to Width - 1 do begin
@@ -823 +823 @@
   Assert(bmp.PixelFormat = pf24bit);
   Height := Y + Height;
-  PixelPtr := PixelPointer(Bmp, X, Y);
+  PixelPtr := TPixelPointer.Create(Bmp, X, Y);
   while Y < Height do begin
     for I := 0 to Width - 1 do begin
@@ -890 +890 @@
 end;
 
-procedure SLine(ca: TCanvas; x0, x1, Y: Integer; cl: TColor);
-begin
-  with ca do begin
+procedure SLine(Canvas: TCanvas; x0, x1, Y: Integer; cl: TColor);
+begin
+  with Canvas do begin
     Pen.Color := cl;
     MoveTo(x0, Y);
@@ -899 +899 @@
 end;
 
-procedure DLine(ca: TCanvas; x0, x1, Y: Integer; cl0, cl1: TColor);
-begin
-  with ca do begin
+procedure DLine(Canvas: TCanvas; x0, x1, Y: Integer; cl0, cl1: TColor);
+begin
+  with Canvas do begin
     Pen.Color := cl0;
     MoveTo(x0, Y);
@@ -913 +913 @@
 end;
 
-procedure Frame(ca: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
-begin
-  with ca do begin
+procedure Frame(Canvas: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
+begin
+  with Canvas do begin
     MoveTo(x0, y1);
     Pen.Color := cl0;
@@ -926 +926 @@
 end;
 
-procedure RFrame(ca: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
-begin
-  with ca do begin
+procedure RFrame(Canvas: TCanvas; x0, y0, x1, y1: Integer; cl0, cl1: TColor);
+begin
+  with Canvas do begin
     Pen.Color := cl0;
     MoveTo(x0, y0 + 1);
@@ -942 +942 @@
 end;
 
-procedure CFrame(ca: TCanvas; x0, y0, x1, y1, Corner: Integer; cl: TColor);
-begin
-  with ca do begin
+procedure CFrame(Canvas: TCanvas; x0, y0, x1, y1, Corner: Integer; cl: TColor);
+begin
+  with Canvas do begin
     Pen.Color := cl;
     MoveTo(x0, y0 + Corner - 1);
@@ -961 +961 @@
 end;
 
-procedure FrameImage(ca: TCanvas; Src: TBitmap;
+procedure FrameImage(Canvas: TCanvas; Src: TBitmap;
   X, Y, Width, Height, xSrc, ySrc: Integer; IsControl: Boolean = False);
 begin
   if IsControl then begin
-    Frame(ca, X - 1, Y - 1, X + Width, Y + Height, $B0B0B0, $FFFFFF);
-    RFrame(ca, X - 2, Y - 2, X + Width + 1, Y + Height + 1, $FFFFFF, $B0B0B0);
+    Frame(Canvas, X - 1, Y - 1, X + Width, Y + Height, $B0B0B0, $FFFFFF);
+    RFrame(Canvas, X - 2, Y - 2, X + Width + 1, Y + Height + 1, $FFFFFF, $B0B0B0);
   end else
-    Frame(ca, X - 1, Y - 1, X + Width, Y + Height, $000000, $000000);
-  BitBltCanvas(ca, X, Y, Width, Height, Src.Canvas, xSrc, ySrc);
+    Frame(Canvas, X - 1, Y - 1, X + Width, Y + Height, $000000, $000000);
+  BitBltCanvas(Canvas, X, Y, Width, Height, Src.Canvas, xSrc, ySrc);
 end;
 
@@ -984 +984 @@
   Height := ScaleToNative(Height);
   Dst.BeginUpdate;
-  DstPtr := PixelPointer(Dst, x0 - DpiGlowRange + 1, y0 - DpiGlowRange + 1);
+  DstPtr := TPixelPointer.Create(Dst, x0 - DpiGlowRange + 1, y0 - DpiGlowRange + 1);
   for Y := -DpiGlowRange + 1 to Height - 1 + DpiGlowRange - 1 do begin
     for X := -DpiGlowRange + 1 to Width - 1 + DpiGlowRange - 1 do begin
@@ -1036 +1036 @@
     MainTexture.ColorBevelLight and $FCFCFC shr 2);
   HGrSystem2.Data.BeginUpdate;
-  PixelPtr := PixelPointer(HGrSystem2.Data, ScaleToNative(Ornament.Left),
+  PixelPtr := TPixelPointer.Create(HGrSystem2.Data, ScaleToNative(Ornament.Left),
     ScaleToNative(Ornament.Top));
   if PixelPtr.BytesPerPixel = 3 then begin
@@ -1063 +1063 @@
 end;
 
-procedure InitCityMark(T: TTexture);
+procedure InitCityMark(Texture: TTexture);
 var
   X: Integer;
@@ -1076 +1076 @@
           X, CityMark1.Top + Y] and $FF;
         HGrSystem.Data.Canvas.Pixels[CityMark2.Left + X, CityMark2.Top + Y] :=
-          T.ColorMark and $FF * Intensity div $FF + T.ColorMark shr 8 and
-          $FF * Intensity div $FF shl 8 + T.ColorMark shr 16 and
+          Texture.ColorMark and $FF * Intensity div $FF + Texture.ColorMark shr 8 and
+          $FF * Intensity div $FF shl 8 + Texture.ColorMark shr 16 and
           $FF * Intensity div $FF shl 16;
       end;
@@ -1086 +1086 @@
 end;
 
-procedure Fill(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer);
-begin
-  Assert((Left + xOffset >= 0) and (Left + xOffset + Width <= MainTexture.Width) and
-    (Top + yOffset >= 0) and (Top + yOffset + Height <= MainTexture.Height));
-  BitBltCanvas(ca, Left, Top, Width, Height, MainTexture.Image.Canvas,
+procedure Fill(Canvas: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer);
+begin
+  //Assert((Left + xOffset >= 0) and (Left + xOffset + Width <= MainTexture.Width) and
+  //  (Top + yOffset >= 0) and (Top + yOffset + Height <= MainTexture.Height));
+  BitBltCanvas(Canvas, Left, Top, Width, Height, MainTexture.Image.Canvas,
     Left + xOffset, Top + yOffset);
 end;
@@ -1099 +1099 @@
 end;
 
-procedure FillLarge(ca: TCanvas; x0, y0, x1, y1, xm: Integer);
+procedure FillLarge(Canvas: TCanvas; x0, y0, x1, y1, xm: Integer);
 
   function Band(I: Integer): Integer;
@@ -1117 +1117 @@
 begin
   for I := 0 to (x1 - xm) div MainTexture.Width - 1 do
-    BitBltCanvas(ca, xm + I * MainTexture.Width, y0, MainTexture.Width, y1 - y0,
+    BitBltCanvas(Canvas, xm + I * MainTexture.Width, y0, MainTexture.Width, y1 - y0,
       MainTexture.Image.Canvas, 0, MainTexture.Height div 2 + Band(I) *
       (y1 - y0));
-  BitBltCanvas(ca, xm + ((x1 - xm) div MainTexture.Width) * MainTexture.Width, y0,
+  BitBltCanvas(Canvas, xm + ((x1 - xm) div MainTexture.Width) * MainTexture.Width, y0,
     x1 - (xm + ((x1 - xm) div MainTexture.Width) * MainTexture.Width), y1 - y0,
     MainTexture.Image.Canvas, 0, MainTexture.Height div 2 + Band(
     (x1 - xm) div MainTexture.Width) * (y1 - y0));
   for I := 0 to (xm - x0) div MainTexture.Width - 1 do
-    BitBltCanvas(ca, xm - (I + 1) * MainTexture.Width, y0, MainTexture.Width, y1 - y0,
+    BitBltCanvas(Canvas, xm - (I + 1) * MainTexture.Width, y0, MainTexture.Width, y1 - y0,
       MainTexture.Image.Canvas, 0, MainTexture.Height div 2 +
       Band(-I - 1) * (y1 - y0));
-  BitBltCanvas(ca, x0, y0, xm - ((xm - x0) div MainTexture.Width) *
+  BitBltCanvas(Canvas, x0, y0, xm - ((xm - x0) div MainTexture.Width) *
     MainTexture.Width - x0, y1 - y0, MainTexture.Image.Canvas,
     ((xm - x0) div MainTexture.Width + 1) * MainTexture.Width - (xm - x0),
@@ -1134 +1134 @@
 end;
 
-procedure FillSeamless(ca: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer;
+procedure FillSeamless(Canvas: TCanvas; Left, Top, Width, Height, xOffset, yOffset: Integer;
   const Texture: TBitmap);
 var
@@ -1161 +1161 @@
       if x1cut < 0 then
         x1cut := 0;
-      BitBltCanvas(ca, X * Texture.Width + x0cut - xOffset,
+      BitBltCanvas(Canvas, X * Texture.Width + x0cut - xOffset,
         Y * Texture.Height + y0cut - yOffset, Texture.Width - x0cut - x1cut,
         Texture.Height - y0cut - y1cut, Texture.Canvas, x0cut, y0cut);
@@ -1168 +1168 @@
 end;
 
-procedure FillRectSeamless(ca: TCanvas; x0, y0, x1, y1, xOffset, yOffset: Integer;
+procedure FillRectSeamless(Canvas: TCanvas; x0, y0, x1, y1, xOffset, yOffset: Integer;
   const Texture: TBitmap);
 begin
-  FillSeamless(ca, x0, y0, x1 - x0, y1 - y0, xOffset, yOffset, Texture);
+  FillSeamless(Canvas, x0, y0, x1 - x0, y1 - y0, xOffset, yOffset, Texture);
 end;
 
@@ -1180 +1180 @@
 end;
 
-procedure Corner(ca: TCanvas; X, Y, Kind: Integer; T: TTexture);
-begin
-  { BitBltCanvas(ca,x,y,8,8,T.HGr.Mask.Canvas,
+procedure Corner(Canvas: TCanvas; X, Y, Kind: Integer; T: TTexture);
+begin
+  { BitBltCanvas(Canvas,x,y,8,8,T.HGr.Mask.Canvas,
     T.xGr+29+Kind*9,T.yGr+89,SRCAND);
-    BitBltCanvas(ca,X,Y,8,8,T.HGr.Data.Canvas,
+    BitBltCanvas(Canvas,X,Y,8,8,T.HGr.Data.Canvas,
     T.xGr+29+Kind*9,T.yGr+89,SRCPAINT); }
 end;
 
-procedure BiColorTextOut(ca: TCanvas; clMain, clBack: TColor; X, Y: Integer; S: string);
+procedure BiColorTextOut(Canvas: TCanvas; clMain, clBack: TColor; X, Y: Integer; S: string);
 
   procedure PaintIcon(X, Y, Kind: Integer);
   begin
-    BitBltCanvas(ca, X, Y + 6, 10, 10, HGrSystem.Mask.Canvas,
+    BitBltCanvas(Canvas, X, Y + 6, 10, 10, HGrSystem.Mask.Canvas,
       66 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCAND);
-    BitBltCanvas(ca, X, Y + 6, 10, 10, HGrSystem.Data.Canvas,
+    BitBltCanvas(Canvas, X, Y + 6, 10, 10, HGrSystem.Data.Canvas,
       66 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCPAINT);
   end;
@@ -1207 +1207 @@
   Inc(Y);
   for shadow := True downto False do
-    with ca do
+    with Canvas do
       if not shadow or (clBack <> $7F007F) then
       begin
@@ -1221 +1221 @@
             (sp[P + 1] in ['c', 'f', 'l', 'm', 'n', 'o', 'p', 'r', 't', 'w']) then
           begin
-            ca.Textout(xp, Y, sp);
+            Canvas.Textout(xp, Y, sp);
             Break;
           end
@@ -1228 +1228 @@
             Text := Copy(sp, 1, P - 1);
             Textout(xp, Y, Text);
-            Inc(xp, ca.TextWidth(Text));
+            Inc(xp, Canvas.TextWidth(Text));
             if not shadow then
               case sp[P + 1] of
@@ -1251 +1251 @@
 end;
 
-function BiColorTextWidth(ca: TCanvas; S: string): Integer;
+function BiColorTextWidth(Canvas: TCanvas; S: string): Integer;
 var
   P: Integer;
@@ -1260 +1260 @@
     if (P = 0) or (P = Length(S)) then
     begin
-      Inc(Result, ca.TextWidth(S));
+      Inc(Result, Canvas.TextWidth(S));
       Break;
     end
@@ -1267 +1267 @@
       if not (S[P + 1] in ['c', 'f', 'l', 'm', 'n', 'o', 'p', 'r', 't', 'w'])
       then
-        Inc(Result, ca.TextWidth(Copy(S, 1, P + 1)))
+        Inc(Result, Canvas.TextWidth(Copy(S, 1, P + 1)))
       else
-        Inc(Result, ca.TextWidth(Copy(S, 1, P - 1)) + 10);
+        Inc(Result, Canvas.TextWidth(Copy(S, 1, P - 1)) + 10);
       Delete(S, 1, P + 1);
     end;
@@ -1275 +1275 @@
 end;
 
-procedure LoweredTextOut(ca: TCanvas; cl: TColor; T: TTexture;
+procedure LoweredTextOut(Canvas: TCanvas; cl: TColor; T: TTexture;
   X, Y: Integer; S: string);
 begin
   if cl = -2 then
-    BiColorTextOut(ca, (T.ColorBevelShade and $FEFEFE) shr 1,
+    BiColorTextOut(Canvas, (T.ColorBevelShade and $FEFEFE) shr 1,
       T.ColorBevelLight, X, Y, S)
   else if cl < 0 then
-    BiColorTextOut(ca, T.ColorTextShade, T.ColorTextLight, X, Y, S)
+    BiColorTextOut(Canvas, T.ColorTextShade, T.ColorTextLight, X, Y, S)
   else
-    BiColorTextOut(ca, cl, T.ColorTextLight, X, Y, S);
-end;
-
-procedure RisedTextOut(ca: TCanvas; X, Y: Integer; S: string);
-begin
-  BiColorTextOut(ca, $FFFFFF, $000000, X, Y, S);
-end;
-
-procedure Gradient(ca: TCanvas; X, Y, dx, dy, Width, Height, Color: Integer;
+    BiColorTextOut(Canvas, cl, T.ColorTextLight, X, Y, S);
+end;
+
+procedure RisedTextOut(Canvas: TCanvas; X, Y: Integer; S: string);
+begin
+  BiColorTextOut(Canvas, $FFFFFF, $000000, X, Y, S);
+end;
+
+procedure Gradient(Canvas: TCanvas; X, Y, dx, dy, Width, Height, Color: Integer;
   Brightness: array of Integer);
 var
@@ -1313 +1313 @@
     else if B >= 256 then
       B := 255;
-    ca.Pen.Color := R + G shl 8 + B shl 16;
-    ca.MoveTo(X + dx * I, Y + dy * I);
-    ca.LineTo(X + dx * I + Width, Y + dy * I + Height);
-  end;
-  ca.Pen.Color := $000000;
-  ca.MoveTo(X + 1, Y + 16 * dy + Height);
-  ca.LineTo(X + 16 * dx + Width, Y + 16 * dy + Height);
-  ca.LineTo(X + 16 * dx + Width, Y);
-end;
-
-procedure LightGradient(ca: TCanvas; X, Y, Width, Color: Integer);
+    Canvas.Pen.Color := R + G shl 8 + B shl 16;
+    Canvas.MoveTo(X + dx * I, Y + dy * I);
+    Canvas.LineTo(X + dx * I + Width, Y + dy * I + Height);
+  end;
+  Canvas.Pen.Color := $000000;
+  Canvas.MoveTo(X + 1, Y + 16 * dy + Height);
+  Canvas.LineTo(X + 16 * dx + Width, Y + 16 * dy + Height);
+  Canvas.LineTo(X + 16 * dx + Width, Y);
+end;
+
+procedure LightGradient(Canvas: TCanvas; X, Y, Width, Color: Integer);
 const
   Brightness: array [0 .. 15] of Integer =
     (16, 12, 8, 4, 0, -4, -8, -12, -16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, X, Y, 0, 1, Width, 0, Color, Brightness);
-end;
-
-procedure DarkGradient(ca: TCanvas; X, Y, Width, Kind: Integer);
+  Gradient(Canvas, X, Y, 0, 1, Width, 0, Color, Brightness);
+end;
+
+procedure DarkGradient(Canvas: TCanvas; X, Y, Width, Kind: Integer);
 const
   Brightness: array [0 .. 15] of Integer =
     (16, 12, 8, 4, 0, -4, -8, -12 - 24, -16 + 16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, X, Y, 0, 1, Width, 0, HGrSystem.Data.Canvas.Pixels
+  Gradient(Canvas, X, Y, 0, 1, Width, 0, HGrSystem.Data.Canvas.Pixels
     [187, 137 + Kind], Brightness);
 end;
 
-procedure VLightGradient(ca: TCanvas; X, Y, Height, Color: Integer);
+procedure VLightGradient(Canvas: TCanvas; X, Y, Height, Color: Integer);
 const
   Brightness: array [0 .. 15] of Integer =
     (16, 12, 8, 4, 0, -4, -8, -12, -16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, X, Y, 1, 0, 0, Height, Color, Brightness);
-end;
-
-procedure VDarkGradient(ca: TCanvas; X, Y, Height, Kind: Integer);
+  Gradient(Canvas, X, Y, 1, 0, 0, Height, Color, Brightness);
+end;
+
+procedure VDarkGradient(Canvas: TCanvas; X, Y, Height, Kind: Integer);
 const
   Brightness: array [0 .. 15] of Integer =
     (16, 12, 8, 4, 0, -4, -8, -12 - 24, -16 + 16, -20, -24, -28, -32, -36, -40, -44);
 begin
-  Gradient(ca, X, Y, 1, 0, 0, Height,
+  Gradient(Canvas, X, Y, 1, 0, 0, Height,
     HGrSystem.Data.Canvas.Pixels[187, 137 + Kind], Brightness);
 end;
@@ -1476 +1476 @@
 end;
 
-procedure PaintProgressBar(ca: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
+procedure PaintProgressBar(Canvas: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
   T: TTexture);
 var
@@ -1494 +1494 @@
   else if Pos + Growth > Max then
     Growth := Max - Pos;
-  Frame(ca, X - 1, Y - 1, X + Max, Y + 7, $000000, $000000);
-  RFrame(ca, X - 2, Y - 2, X + Max + 1, Y + 8, T.ColorBevelShade,
+  Frame(Canvas, X - 1, Y - 1, X + Max, Y + 7, $000000, $000000);
+  RFrame(Canvas, X - 2, Y - 2, X + Max + 1, Y + 8, T.ColorBevelShade,
     T.ColorBevelLight);
-  with ca do
+  with Canvas do
   begin
     for I := 0 to Pos div 8 - 1 do
-      BitBltCanvas(ca, X + I * 8, Y, 8, 7,
+      BitBltCanvas(Canvas, X + I * 8, Y, 8, 7,
         HGrSystem.Data.Canvas, 104, 9 + 8 * Kind);
-    BitBltCanvas(ca, X + 8 * (Pos div 8), Y, Pos - 8 * (Pos div 8), 7,
+    BitBltCanvas(Canvas, X + 8 * (Pos div 8), Y, Pos - 8 * (Pos div 8), 7,
       HGrSystem.Data.Canvas, 104, 9 + 8 * Kind);
     if Growth > 0 then
     begin
       for I := 0 to Growth div 8 - 1 do
-        BitBltCanvas(ca, X + Pos + I * 8, Y, 8, 7,
+        BitBltCanvas(Canvas, X + Pos + I * 8, Y, 8, 7,
           HGrSystem.Data.Canvas, 112, 9 + 8 * Kind);
-      BitBltCanvas(ca, X + Pos + 8 * (Growth div 8), Y,
+      BitBltCanvas(Canvas, X + Pos + 8 * (Growth div 8), Y,
         Growth - 8 * (Growth div 8), 7, HGrSystem.Data.Canvas,
         112, 9 + 8 * Kind);
@@ -1516 +1516 @@
     begin
       for I := 0 to -Growth div 8 - 1 do
-        BitBltCanvas(ca, X + Pos + I * 8, Y, 8, 7,
+        BitBltCanvas(Canvas, X + Pos + I * 8, Y, 8, 7,
           HGrSystem.Data.Canvas, 104, 1);
-      BitBltCanvas(ca, X + Pos + 8 * (-Growth div 8), Y, -Growth -
+      BitBltCanvas(Canvas, X + Pos + 8 * (-Growth div 8), Y, -Growth -
         8 * (-Growth div 8), 7,
         HGrSystem.Data.Canvas, 104, 1);
@@ -1529 +1529 @@
 
 // pos and growth are relative to max, set size independent
-procedure PaintRelativeProgressBar(ca: TCanvas;
+procedure PaintRelativeProgressBar(Canvas: TCanvas;
   Kind, X, Y, size, Pos, Growth, Max: Integer; IndicateComplete: Boolean;
   T: TTexture);
 begin
   if Growth > 0 then
-    PaintProgressBar(ca, Kind, X, Y, Pos * size div Max,
+    PaintProgressBar(Canvas, Kind, X, Y, Pos * size div Max,
       (Growth * size + Max div 2) div Max, size, T)
   else
-    PaintProgressBar(ca, Kind, X, Y, Pos * size div Max,
+    PaintProgressBar(Canvas, Kind, X, Y, Pos * size div Max,
       (Growth * size - Max div 2) div Max, size, T);
   if IndicateComplete and (Pos + Growth >= Max) then
-    Sprite(ca, HGrSystem, X + size - 10, Y - 7, 23, 16, 1, 129);
+    Sprite(Canvas, HGrSystem, X + size - 10, Y - 7, 23, 16, 1, 129);
 end;
 
@@ -1591 +1591 @@
   TexWidth := Texture.Width;
   TexHeight := Texture.Height;
-  DstPixel := PixelPointer(Dest);
-  SrcPixel := PixelPointer(Texture);
+  DstPixel := TPixelPointer.Create(Dest);
+  SrcPixel := TPixelPointer.Create(Texture);
   for Y := 0 to ScaleToNative(Dest.Height) - 1 do begin
     for X := 0 to ScaleToNative(Dest.Width) - 1 do begin
@@ -1614 +1614 @@
 begin
   Bitmap.BeginUpdate;
-  PicturePixel := PixelPointer(Bitmap);
+  PicturePixel := TPixelPointer.Create(Bitmap);
   for Y := 0 to ScaleToNative(Bitmap.Height) - 1 do begin
     for X := 0 to ScaleToNative(Bitmap.Width) - 1 do begin

trunk/Packages/CevoComponents/Texture.pas

@@ -1 @@
-unit UTexture;
-
-{$mode objfpc}{$H+}
+unit Texture;
 
 interface

trunk/Packages/Common/AboutDialog.pas

@@ -1 @@
-unit UAboutDialog;
+unit AboutDialog;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ExtCtrls, UApplicationInfo, UCommon, UTranslator, UTheme, UFormAbout;
+  ExtCtrls, ApplicationInfo, Common, Translator, Theme, FormAbout;
 
 type
@@ -50 +50 @@
 
 end.
-
-

trunk/Packages/Common/ApplicationInfo.pas

@@ -1 @@
-unit UApplicationInfo;
+unit ApplicationInfo;
 
 interface
 
 uses
-  SysUtils, Classes, Forms, URegistry, Controls, Graphics, LCLType;
+  SysUtils, Classes, Forms, RegistryEx, Controls, Graphics, LCLType;
 
 type

trunk/Packages/Common/Common.Delay.pas

@@ -1 @@
-unit UDelay;
+unit Common.Delay;
 
 interface
@@ -71 +71 @@
 
 end.
-

trunk/Packages/Common/Common.lpk

@@ -41 +41 @@
 Source: https://svn.zdechov.net/PascalClassLibrary/Common/"/>
     <License Value="Copy left."/>
-    <Version Minor="10"/>
-    <Files Count="29">
+    <Version Minor="11"/>
+    <Files Count="33">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -48 +48 @@
       </Item1>
       <Item2>
-        <Filename Value="UCommon.pas"/>
-        <UnitName Value="UCommon"/>
+        <Filename Value="Common.pas"/>
+        <UnitName Value="Common"/>
       </Item2>
       <Item3>
-        <Filename Value="UDebugLog.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UDebugLog"/>
+        <Filename Value="DebugLog.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="DebugLog"/>
       </Item3>
       <Item4>
-        <Filename Value="UDelay.pas"/>
-        <UnitName Value="UDelay"/>
+        <Filename Value="Common.Delay.pas"/>
+        <UnitName Value="Common.Delay"/>
       </Item4>
       <Item5>
-        <Filename Value="UPrefixMultiplier.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UPrefixMultiplier"/>
+        <Filename Value="PrefixMultiplier.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="PrefixMultiplier"/>
       </Item5>
       <Item6>
-        <Filename Value="UURI.pas"/>
-        <UnitName Value="UURI"/>
+        <Filename Value="URI.pas"/>
+        <UnitName Value="URI"/>
       </Item6>
       <Item7>
-        <Filename Value="UThreading.pas"/>
-        <UnitName Value="UThreading"/>
+        <Filename Value="Threading.pas"/>
+        <UnitName Value="Threading"/>
       </Item7>
       <Item8>
-        <Filename Value="UMemory.pas"/>
-        <UnitName Value="UMemory"/>
+        <Filename Value="Memory.pas"/>
+        <UnitName Value="Memory"/>
       </Item8>
       <Item9>
-        <Filename Value="UResetableThread.pas"/>
-        <UnitName Value="UResetableThread"/>
+        <Filename Value="ResetableThread.pas"/>
+        <UnitName Value="ResetableThread"/>
       </Item9>
       <Item10>
-        <Filename Value="UPool.pas"/>
-        <UnitName Value="UPool"/>
+        <Filename Value="Pool.pas"/>
+        <UnitName Value="Pool"/>
       </Item10>
       <Item11>
-        <Filename Value="ULastOpenedList.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="ULastOpenedList"/>
+        <Filename Value="LastOpenedList.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="LastOpenedList"/>
       </Item11>
       <Item12>
-        <Filename Value="URegistry.pas"/>
-        <UnitName Value="URegistry"/>
+        <Filename Value="RegistryEx.pas"/>
+        <UnitName Value="RegistryEx"/>
       </Item12>
       <Item13>
-        <Filename Value="UJobProgressView.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UJobProgressView"/>
+        <Filename Value="JobProgressView.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="JobProgressView"/>
       </Item13>
       <Item14>
-        <Filename Value="UXMLUtils.pas"/>
-        <UnitName Value="UXMLUtils"/>
+        <Filename Value="XML.pas"/>
+        <UnitName Value="XML"/>
       </Item14>
       <Item15>
-        <Filename Value="UApplicationInfo.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UApplicationInfo"/>
+        <Filename Value="ApplicationInfo.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="ApplicationInfo"/>
       </Item15>
       <Item16>
-        <Filename Value="USyncCounter.pas"/>
-        <UnitName Value="USyncCounter"/>
+        <Filename Value="SyncCounter.pas"/>
+        <UnitName Value="SyncCounter"/>
       </Item16>
       <Item17>
-        <Filename Value="UListViewSort.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UListViewSort"/>
+        <Filename Value="ListViewSort.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="ListViewSort"/>
       </Item17>
       <Item18>
-        <Filename Value="UPersistentForm.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UPersistentForm"/>
+        <Filename Value="PersistentForm.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="PersistentForm"/>
       </Item18>
       <Item19>
-        <Filename Value="UFindFile.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UFindFile"/>
+        <Filename Value="FindFile.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="FindFile"/>
       </Item19>
       <Item20>
-        <Filename Value="UScaleDPI.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UScaleDPI"/>
+        <Filename Value="ScaleDPI.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="ScaleDPI"/>
       </Item20>
       <Item21>
-        <Filename Value="UTheme.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UTheme"/>
+        <Filename Value="Theme.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="Theme"/>
       </Item21>
       <Item22>
-        <Filename Value="UStringTable.pas"/>
-        <UnitName Value="UStringTable"/>
+        <Filename Value="StringTable.pas"/>
+        <UnitName Value="StringTable"/>
       </Item22>
       <Item23>
-        <Filename Value="UMetaCanvas.pas"/>
-        <UnitName Value="UMetaCanvas"/>
+        <Filename Value="MetaCanvas.pas"/>
+        <UnitName Value="MetaCanvas"/>
       </Item23>
       <Item24>
-        <Filename Value="UGeometric.pas"/>
-        <UnitName Value="UGeometric"/>
+        <Filename Value="Geometric.pas"/>
+        <UnitName Value="Geometric"/>
       </Item24>
       <Item25>
-        <Filename Value="UTranslator.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UTranslator"/>
+        <Filename Value="Translator.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="Translator"/>
       </Item25>
       <Item26>
-        <Filename Value="ULanguages.pas"/>
-        <UnitName Value="ULanguages"/>
+        <Filename Value="Languages.pas"/>
+        <UnitName Value="Languages"/>
       </Item26>
       <Item27>
-        <Filename Value="UFormAbout.pas"/>
-        <UnitName Value="UFormAbout"/>
+        <Filename Value="FormAbout.pas"/>
+        <UnitName Value="FormAbout"/>
       </Item27>
       <Item28>
-        <Filename Value="UAboutDialog.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="UAboutDialog"/>
+        <Filename Value="AboutDialog.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="AboutDialog"/>
       </Item28>
       <Item29>
-        <Filename Value="UPixelPointer.pas"/>
-        <UnitName Value="UPixelPointer"/>
+        <Filename Value="PixelPointer.pas"/>
+        <UnitName Value="PixelPointer"/>
       </Item29>
+      <Item30>
+        <Filename Value="DataFile.pas"/>
+        <UnitName Value="DataFile"/>
+      </Item30>
+      <Item31>
+        <Filename Value="TestCase.pas"/>
+        <UnitName Value="TestCase"/>
+      </Item31>
+      <Item32>
+        <Filename Value="Generics.pas"/>
+        <UnitName Value="Generics"/>
+      </Item32>
+      <Item33>
+        <Filename Value="CommonPackage.pas"/>
+        <Type Value="Main Unit"/>
+        <UnitName Value="CommonPackage"/>
+      </Item33>
     </Files>
     <CompatibilityMode Value="True"/>

trunk/Packages/Common/Common.pas

@@ -1 @@
-unit UCommon;
+unit Common;
 
 interface
@@ -7 +7 @@
   {$IFDEF UNIX}baseunix,{$ENDIF}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf, Graphics,
-  FileUtil; //, ShFolder, ShellAPI;
+  FileUtil, Generics.Collections; //, ShFolder, ShellAPI;
 
 type
@@ -42 +42 @@
   clLightRed = TColor($8080FF);
 
-function AddLeadingZeroes(const aNumber, Length : Integer) : string;
+function AddLeadingZeroes(const aNumber, Length : integer) : string;
 function BinToInt(BinStr: string): Int64;
 function BinToHexString(Source: AnsiString): string;
@@ -65 +65 @@
 function GetFileFilterItemExt(Filter: string; Index: Integer): string;
 function IntToBin(Data: Int64; Count: Byte): string;
+function Implode(Separator: Char; List: TList<string>): string;
 function LastPos(const SubStr: String; const S: String): Integer;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
@@ -96 +97 @@
 function BinToInt(BinStr : string) : Int64;
 var
-  I : Byte;
+  i : byte;
   RetVar : Int64;
 begin
   BinStr := UpperCase(BinStr);
-  if BinStr[Length(BinStr)] = 'B' then Delete(BinStr,Length(BinStr),1);
+  if BinStr[length(BinStr)] = 'B' then Delete(BinStr,length(BinStr),1);
   RetVar := 0;
-  for I := 1 to Length(BinStr) do begin
-    if not (BinStr[I] in ['0','1']) then begin
+  for i := 1 to length(BinStr) do begin
+    if not (BinStr[i] in ['0','1']) then begin
       RetVar := 0;
       Break;
     end;
-    RetVar := (RetVar shl 1) + (Byte(BinStr[I]) and 1) ;
+    RetVar := (RetVar shl 1) + (byte(BinStr[i]) and 1) ;
   end;
 
@@ -313 +314 @@
 end;
 
+function Implode(Separator: Char; List: TList<string>): string;
+var
+  I: Integer;
+begin
+  Result := '';
+  for I := 0 to List.Count - 1 do begin
+    Result := Result + List[I];
+    if I < List.Count - 1 then Result := Result + Separator;
+  end;
+end;
+
 {$IFDEF WINDOWS}
 function GetUserName: string;
@@ -435 +447 @@
 end;
 
-function AddLeadingZeroes(const aNumber, Length : Integer) : string;
+function AddLeadingZeroes(const aNumber, Length : integer) : string;
 begin
   Result := SysUtils.Format('%.*d', [Length, aNumber]) ;
@@ -614 +626 @@
   begin
     for J := ReadFrom to Len do
-      if (S[J] = C) then
+      if (S[j] = C) then
       begin
         Result := J;
@@ -631 +643 @@
     Inc(I);
     APos := ReadUntil(I, '<');
-    Result := Result + Copy(S, I, APos - I);
+    Result := Result + Copy(S, I, APos - i);
     I := ReadUntil(APos + 1, '>');
   end;

trunk/Packages/Common/CommonPackage.pas

@@ -3 +3 @@
  }
 
-unit Common;
+unit CommonPackage;
 
 {$warn 5023 off : no warning about unused units}
@@ -9 +9 @@
 
 uses
-  StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading, 
-  UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
-  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
-  UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, UMetaCanvas, 
-  UGeometric, UTranslator, ULanguages, UFormAbout, UAboutDialog, 
-  UPixelPointer, LazarusPackageIntf;
+  StopWatch, Common, DebugLog, Common.Delay, PrefixMultiplier, URI, Threading,
+  Memory, ResetableThread, Pool, LastOpenedList, RegistryEx, JobProgressView, 
+  XML, ApplicationInfo, SyncCounter, ListViewSort, PersistentForm, FindFile, 
+  ScaleDPI, Theme, StringTable, MetaCanvas, Geometric, Translator, Languages, 
+  FormAbout, AboutDialog, PixelPointer, DataFile, TestCase, Generics, 
+  LazarusPackageIntf;
 
 implementation
@@ -20 +20 @@
 procedure Register;
 begin
-  RegisterUnit('UDebugLog', @UDebugLog.Register);
-  RegisterUnit('UPrefixMultiplier', @UPrefixMultiplier.Register);
-  RegisterUnit('ULastOpenedList', @ULastOpenedList.Register);
-  RegisterUnit('UJobProgressView', @UJobProgressView.Register);
-  RegisterUnit('UApplicationInfo', @UApplicationInfo.Register);
-  RegisterUnit('UListViewSort', @UListViewSort.Register);
-  RegisterUnit('UPersistentForm', @UPersistentForm.Register);
-  RegisterUnit('UFindFile', @UFindFile.Register);
-  RegisterUnit('UScaleDPI', @UScaleDPI.Register);
-  RegisterUnit('UTheme', @UTheme.Register);
-  RegisterUnit('UTranslator', @UTranslator.Register);
-  RegisterUnit('UAboutDialog', @UAboutDialog.Register);
+  RegisterUnit('DebugLog', @DebugLog.Register);
+  RegisterUnit('PrefixMultiplier', @PrefixMultiplier.Register);
+  RegisterUnit('LastOpenedList', @LastOpenedList.Register);
+  RegisterUnit('JobProgressView', @JobProgressView.Register);
+  RegisterUnit('ApplicationInfo', @ApplicationInfo.Register);
+  RegisterUnit('ListViewSort', @ListViewSort.Register);
+  RegisterUnit('PersistentForm', @PersistentForm.Register);
+  RegisterUnit('FindFile', @FindFile.Register);
+  RegisterUnit('ScaleDPI', @ScaleDPI.Register);
+  RegisterUnit('Theme', @Theme.Register);
+  RegisterUnit('Translator', @Translator.Register);
+  RegisterUnit('AboutDialog', @AboutDialog.Register);
 end;
 
@@ -37 +37 @@
   RegisterPackage('Common', @Register);
 end.
-

trunk/Packages/Common/DebugLog.pas

@@ -1 @@
-unit UDebugLog; 
+unit DebugLog;
 
 interface
@@ -134 +134 @@
 
 end.
-

trunk/Packages/Common/FindFile.pas

@@ -6 +6 @@
 Tired of using FindFirst, Next and Close?
 Come see how to encapsulate all those functions
-in A Single "find-files-recursively" component.
+in a single "find-files-recursively" component.
 It's easy to use, free and with code.
 
@@ -19 +19 @@
 }
 
-unit UFindFile;
+unit FindFile;
 
 interface
@@ -34 +34 @@
   TFindFile = class(TComponent)
   private
-    S : TStringList;
-    fSubFolder : Boolean;
+    s : TStringList;
+    fSubFolder : boolean;
     fAttr: TFileAttrib;
     fPath : string;
@@ -47 +47 @@
   published
     property FileAttr: TFileAttrib read fAttr write fAttr;
-    property InSubFolders : Boolean read fSubFolder write fSubFolder;
+    property InSubFolders : boolean read fSubFolder write fSubFolder;
     property Path : string read fPath write SetPath;
     property FileMask : string read fFileMask write fFileMask ;
@@ -79 +79 @@
   FileMask := FilterAll;
   FileAttr := [ffaAnyFile];
-  S := TStringList.Create;
+  s := TStringList.Create;
 end;
 
 destructor TFindFile.Destroy;
 begin
-  S.Free;
-  inherited Destroy;
+  s.Free;
+  inherited;
 end;
 
@@ -101 +101 @@
 function TFindFile.SearchForFiles: TStringList;
 begin
-  S.Clear;
+  s.Clear;
   try
     FileSearch(Path);
   finally
-    Result := S;
+    Result := s;
   end;
 end;
@@ -111 +111 @@
 procedure TFindFile.FileSearch(const InPath : string);
 var Rec  : TSearchRec;
-    Attr : Integer;
+    Attr : integer;
 begin
   Attr := 0;
@@ -125 +125 @@
   try
     repeat
-      S.Add(inPath + Rec.Name);
+      s.Add(inPath + Rec.Name);
     until SysUtils.FindNext(Rec) <> 0;
   finally
@@ -143 +143 @@
     SysUtils.FindClose(Rec);
   end;
-end; 
+end;
 
 end.
-

trunk/Packages/Common/FormAbout.lfm

@@ -1 +1 @@
 object FormAbout: TFormAbout
   Left = 1014
-  Height = 402
+  Height = 349
   Top = 577
-  Width = 702
+  Width = 609
   Caption = 'About'
-  ClientHeight = 402
-  ClientWidth = 702
-  DesignTimePPI = 144
-  OnCreate = FormCreate
+  ClientHeight = 349
+  ClientWidth = 609
+  DesignTimePPI = 125
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '2.0.10.0'
+  LCLVersion = '2.2.4.0'
   object LabelDescription: TLabel
-    Left = 30
-    Height = 24
-    Top = 135
-    Width = 642
+    Left = 26
+    Height = 22
+    Top = 117
+    Width = 557
     Align = alTop
-    BorderSpacing.Left = 30
-    BorderSpacing.Right = 30
-    BorderSpacing.Bottom = 30
+    BorderSpacing.Left = 26
+    BorderSpacing.Right = 26
+    BorderSpacing.Bottom = 26
     Caption = 'Description'
     ParentColor = False
@@ -27 +26 @@
   end
   object LabelContent: TLabel
-    Left = 30
-    Height = 24
-    Top = 189
-    Width = 642
+    Left = 26
+    Height = 22
+    Top = 165
+    Width = 557
     Align = alTop
-    BorderSpacing.Around = 30
+    BorderSpacing.Around = 26
     Caption = '   '
     ParentColor = False
@@ -39 +38 @@
   object PanelTop: TPanel
     Left = 0
-    Height = 135
+    Height = 117
     Top = 0
-    Width = 702
+    Width = 609
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 135
-    ClientWidth = 702
+    ClientHeight = 117
+    ClientWidth = 609
     FullRepaint = False
     ParentFont = False
     TabOrder = 0
     object LabelAppName: TLabel
-      Left = 108
-      Height = 84
-      Top = 20
-      Width = 564
+      Left = 94
+      Height = 73
+      Top = 17
+      Width = 489
       Anchors = [akTop, akLeft, akRight]
       AutoSize = False
-      BorderSpacing.Around = 30
+      BorderSpacing.Around = 26
       Caption = 'Title'
-      Font.Height = -60
+      Font.Height = -52
       ParentColor = False
       ParentFont = False
@@ -64 +63 @@
     end
     object ImageLogo: TImage
-      Left = 24
-      Height = 74
-      Top = 30
-      Width = 72
+      Left = 21
+      Height = 64
+      Top = 26
+      Width = 62
       Proportional = True
       Stretch = True
@@ -74 +73 @@
   object PanelButtons: TPanel
     Left = 0
-    Height = 75
-    Top = 327
-    Width = 702
+    Height = 65
+    Top = 284
+    Width = 609
     Align = alBottom
     BevelOuter = bvNone
-    ClientHeight = 75
-    ClientWidth = 702
+    ClientHeight = 65
+    ClientWidth = 609
     TabOrder = 1
     object ButtonHomePage: TButton
-      Left = 24
-      Height = 38
-      Top = 24
-      Width = 264
+      Left = 21
+      Height = 33
+      Top = 21
+      Width = 229
       Anchors = [akLeft, akBottom]
       Caption = 'Home page'
@@ -94 +93 @@
     end
     object ButtonClose: TButton
-      Left = 532
-      Height = 38
-      Top = 24
-      Width = 140
+      Left = 461
+      Height = 33
+      Top = 21
+      Width = 122
       Anchors = [akRight, akBottom]
       Caption = 'Close'

trunk/Packages/Common/FormAbout.pas

@@ -1 @@
-unit UFormAbout;
+unit FormAbout;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  StdCtrls, ExtCtrls, UApplicationInfo, UCommon, UTranslator, UTheme;
+  StdCtrls, ExtCtrls, ApplicationInfo, Common, Translator, Theme;
 
 type
@@ -20 +20 @@
     PanelButtons: TPanel;
     procedure ButtonHomePageClick(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
     AboutDialog: TObject; //TAboutDialog
@@ -35 +32 @@
 
 uses
-  UAboutDialog;
+  AboutDialog;
 
 resourcestring
@@ -77 +74 @@
 end;
 
-procedure TFormAbout.FormCreate(Sender: TObject);
-begin
-end;
-
 end.
-
-

trunk/Packages/Common/Geometric.pas

@@ -1 @@
-unit UGeometric;
+unit Geometric;
 
 interface
@@ -8 +8 @@
 type
   TPointArray = array of TPoint;
+
+  { TVector }
+
+  TVector = record
+    Position: TPoint;
+    Direction: TPoint;
+    function GetLength: Double;
+    function GetAngle: Double;
+    procedure SetLength(Value: Double);
+    class function Create(P1, P2: TPoint): TVector; static;
+  end;
 
 function Distance(P1, P2: TPoint): Integer;
@@ -13 +24 @@
 function AddPoint(const P1, P2: TPoint): TPoint;
 function SubPoint(const P1, P2: TPoint): TPoint;
-function PointToLineDistance(const P, V, W: TPoint): Integer;
+function PointToLineDistance(const P, V, W: TPoint; out Intersect: TPoint): Integer;
 function ComparePoint(P1, P2: TPoint): Boolean;
 function RotatePoint(Center, P: TPoint; Angle: Double): TPoint;
@@ -50 +61 @@
 end;
 
-function PointToLineDistance(const P, V, W: TPoint): Integer;
+function PointToLineDistance(const P, V, W: TPoint; out Intersect: TPoint): Integer;
 var
-  l2, T: Double;
+  l2, t: Double;
   tt: TPoint;
 begin
@@ -68 +79 @@
   if T < 0 then begin
     Result := Distance(P, V);       // Beyond the 'v' end of the segment
-    exit;
+    Intersect := V;
+    Exit;
   end
   else if T > 1 then begin
     Result := Distance(P, W);  // Beyond the 'w' end of the segment
+    Intersect := W;
     Exit;
   end;
@@ -77 +90 @@
   TT.Y := Trunc(V.Y + T * (W.Y - V.Y));
   Result := Distance(P, TT);
+  Intersect := TT;
 end;
 
@@ -162 +176 @@
 end;
 
+{ TVector }
+
+function TVector.GetLength: Double;
+begin
+  Result := Sqrt(Sqr(Direction.X) + Sqr(Direction.Y));
+end;
+
+function TVector.GetAngle: Double;
+begin
+  Result := ArcTan2(Direction.Y, Direction.X);
+end;
+
+procedure TVector.SetLength(Value: Double);
+var
+  Angle: Double;
+begin
+  Angle := GetAngle;
+  Direction := Point(Round(Cos(Angle) * Value),
+    Round(Sin(Angle) * Value));
+end;
+
+class function TVector.Create(P1, P2: TPoint): TVector;
+begin
+  Result.Position := P1;
+  Result.Direction := Point(P2.X - P1.X, P2.Y - P1.Y);
+end;
 
 end.
-
-

trunk/Packages/Common/JobProgressView.pas

@@ -1 @@
-unit UJobProgressView;
+unit JobProgressView;
 
 interface
@@ -5 +5 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms, Syncobjs,
-  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Generics.Collections, UThreading, Math,
+  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Generics.Collections, Threading, Math,
   DateUtils;
 
@@ -154 +154 @@
   end;
 
-  //var
-  //  FormJobProgressView: TFormJobProgressView;
-
 procedure Register;
 
@@ -185 +182 @@
   try
     try
-      //raise Exception.Create('Exception in job');
       ProgressView.CurrentJob.Method(Job);
     except
@@ -221 +217 @@
       for I := 0 to ListViewJobs.Items.Count - 1 do
       begin
-        ItemRect := ListViewJobs.Items[I].DisplayRect(drBounds);
+        ItemRect := ListViewJobs.Items[i].DisplayRect(drBounds);
         Maxh := Max(Maxh, ItemRect.Top + (ItemRect.Bottom - ItemRect.Top));
       end;
@@ -641 +637 @@
 begin
   FLock.Free;
-  inherited Destroy;
+  inherited;
 end;
 

trunk/Packages/Common/Languages.pas

@@ -1 @@
-unit ULanguages;
+unit Languages;
 
 interface
@@ -443 +443 @@
 
 end.
-

trunk/Packages/Common/Languages/DebugLog.cs.po

@@ -10 +10 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: udebuglog.sfilenamenotdefined
+#: debuglog.sfilenamenotdefined
+#, fuzzy
+msgctxt "debuglog.sfilenamenotdefined"
 msgid "Filename not defined"
 msgstr "Neurčen soubor"

trunk/Packages/Common/Languages/DebugLog.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: udebuglog.sfilenamenotdefined
+#: debuglog.sfilenamenotdefined
 msgid "Filename not defined"
 msgstr ""

trunk/Packages/Common/Languages/FindFile.cs.po

@@ -12 +12 @@
 "X-Generator: Poedit 1.8.9\n"
 
-#: ufindfile.sdirnotfound
+#: findfile.sdirnotfound
+#, fuzzy
+msgctxt "findfile.sdirnotfound"
 msgid "Directory not found"
 msgstr "Adresář nenalezen"

trunk/Packages/Common/Languages/FindFile.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: ufindfile.sdirnotfound
+#: findfile.sdirnotfound
 msgid "Directory not found"
 msgstr ""

trunk/Packages/Common/Languages/FormAbout.cs.po

@@ -12 +12 @@
 "X-Generator: Poedit 2.4.1\n"
 
-#: uformabout.slicense
+#: formabout.slicense
+#, fuzzy
+msgctxt "formabout.slicense"
 msgid "License"
 msgstr "Licence"
 
-#: uformabout.sreleasedate
+#: formabout.sreleasedate
+#, fuzzy
+msgctxt "formabout.sreleasedate"
 msgid "Release date"
 msgstr "Datum uvolnění"
 
-#: uformabout.sversion
+#: formabout.sversion
+#, fuzzy
+msgctxt "formabout.sversion"
 msgid "Version"
 msgstr "Verze"

trunk/Packages/Common/Languages/FormAbout.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: uformabout.slicense
+#: formabout.slicense
 msgid "License"
 msgstr ""
 
-#: uformabout.sreleasedate
+#: formabout.sreleasedate
 msgid "Release date"
 msgstr ""
 
-#: uformabout.sversion
+#: formabout.sversion
 msgid "Version"
 msgstr ""

trunk/Packages/Common/Languages/JobProgressView.cs.po

@@ -12 +12 @@
 "X-Generator: Poedit 2.2\n"
 
-#: ujobprogressview.sestimatedtime
-#, object-pascal-format
+#: jobprogressview.sestimatedtime
+#, object-pascal-format, fuzzy
+msgctxt "jobprogressview.sestimatedtime"
 msgid "Estimated time: %s"
 msgstr "Odhadovaný čas: %s"
 
-#: ujobprogressview.sexecuted
+#: jobprogressview.sexecuted
+#, fuzzy
+msgctxt "jobprogressview.sexecuted"
 msgid "Executed"
 msgstr "Vykonané"
 
-#: ujobprogressview.sfinished
+#: jobprogressview.sfinished
+#, fuzzy
+msgctxt "jobprogressview.sfinished"
 msgid "Finished"
 msgstr "Dokončené"
 
-#: ujobprogressview.spleasewait
+#: jobprogressview.spleasewait
+#, fuzzy
+msgctxt "jobprogressview.spleasewait"
 msgid "Please wait..."
 msgstr "Prosím čekejte..."
 
-#: ujobprogressview.sterminate
+#: jobprogressview.sterminate
+#, fuzzy
+msgctxt "jobprogressview.sterminate"
 msgid "Termination"
 msgstr "Přerušení"
 
-#: ujobprogressview.stotalestimatedtime
-#, object-pascal-format
+#: jobprogressview.stotalestimatedtime
+#, object-pascal-format, fuzzy
+msgctxt "jobprogressview.stotalestimatedtime"
 msgid "Total estimated time: %s"
 msgstr "Celkový odhadovaný čas: %s"

trunk/Packages/Common/Languages/JobProgressView.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: ujobprogressview.sestimatedtime
+#: jobprogressview.sestimatedtime
 #, object-pascal-format
 msgid "Estimated time: %s"
 msgstr ""
 
-#: ujobprogressview.sexecuted
+#: jobprogressview.sexecuted
 msgid "Executed"
 msgstr ""
 
-#: ujobprogressview.sfinished
+#: jobprogressview.sfinished
 msgid "Finished"
 msgstr ""
 
-#: ujobprogressview.spleasewait
+#: jobprogressview.spleasewait
 msgid "Please wait..."
 msgstr ""
 
-#: ujobprogressview.sterminate
+#: jobprogressview.sterminate
 msgid "Termination"
 msgstr ""
 
-#: ujobprogressview.stotalestimatedtime
+#: jobprogressview.stotalestimatedtime
 #, object-pascal-format
 msgid "Total estimated time: %s"

trunk/Packages/Common/Languages/Languages.cs.po

@@ -10 +10 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ulanguages.slangauto
+#: languages.slangauto
+#, fuzzy
+msgctxt "languages.slangauto"
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ulanguages.slang_aa
+#: languages.slang_aa
+msgctxt "languages.slang_aa"
 msgid "Afar"
 msgstr ""
 
-#: ulanguages.slang_ab
+#: languages.slang_ab
+#, fuzzy
+msgctxt "languages.slang_ab"
 msgid "Abkhazian"
 msgstr "Abcházština"
 
-#: ulanguages.slang_ae
+#: languages.slang_ae
+msgctxt "languages.slang_ae"
 msgid "Avestan"
 msgstr ""
 
-#: ulanguages.slang_af
+#: languages.slang_af
+#, fuzzy
+msgctxt "languages.slang_af"
 msgid "Afrikaans"
 msgstr "Afrikánština"
 
-#: ulanguages.slang_ak
+#: languages.slang_ak
+msgctxt "languages.slang_ak"
 msgid "Akan"
 msgstr ""
 
-#: ulanguages.slang_am
+#: languages.slang_am
+msgctxt "languages.slang_am"
 msgid "Amharic"
 msgstr ""
 
-#: ulanguages.slang_an
+#: languages.slang_an
+msgctxt "languages.slang_an"
 msgid "Aragonese"
 msgstr ""
 
-#: ulanguages.slang_ar
+#: languages.slang_ar
+#, fuzzy
+msgctxt "languages.slang_ar"
 msgid "Arabic"
 msgstr "Arabština"
 
-#: ulanguages.slang_as
+#: languages.slang_as
+msgctxt "languages.slang_as"
 msgid "Assamese"
 msgstr ""
 
-#: ulanguages.slang_av
+#: languages.slang_av
+msgctxt "languages.slang_av"
 msgid "Avaric"
 msgstr ""
 
-#: ulanguages.slang_ay
+#: languages.slang_ay
+msgctxt "languages.slang_ay"
 msgid "Aymara"
 msgstr ""
 
-#: ulanguages.slang_az
+#: languages.slang_az
+msgctxt "languages.slang_az"
 msgid "Azerbaijani"
 msgstr ""
 
-#: ulanguages.slang_ba
+#: languages.slang_ba
+msgctxt "languages.slang_ba"
 msgid "Bashkir"
 msgstr ""
 
-#: ulanguages.slang_be
+#: languages.slang_be
+msgctxt "languages.slang_be"
 msgid "Belarusian"
 msgstr ""
 
-#: ulanguages.slang_bg
+#: languages.slang_bg
+#, fuzzy
+msgctxt "languages.slang_bg"
 msgid "Bulgarian"
 msgstr "Maďarština"
 
-#: ulanguages.slang_bh
+#: languages.slang_bh
+msgctxt "languages.slang_bh"
 msgid "Bihari"
 msgstr ""
 
-#: ulanguages.slang_bi
+#: languages.slang_bi
+msgctxt "languages.slang_bi"
 msgid "Bislama"
 msgstr ""
 
-#: ulanguages.slang_bm
+#: languages.slang_bm
+msgctxt "languages.slang_bm"
 msgid "Bambara"
 msgstr ""
 
-#: ulanguages.slang_bn
+#: languages.slang_bn
+msgctxt "languages.slang_bn"
 msgid "Bengali"
 msgstr ""
 
-#: ulanguages.slang_bo
+#: languages.slang_bo
+#, fuzzy
+msgctxt "languages.slang_bo"
 msgid "Tibetan"
 msgstr "Tibetština"
 
-#: ulanguages.slang_br
+#: languages.slang_br
+msgctxt "languages.slang_br"
 msgid "Breton"
 msgstr ""
 
-#: ulanguages.slang_bs
+#: languages.slang_bs
+msgctxt "languages.slang_bs"
 msgid "Bosnian"
 msgstr ""
 
-#: ulanguages.slang_ca
+#: languages.slang_ca
+#, fuzzy
+msgctxt "languages.slang_ca"
 msgid "Catalan"
 msgstr "Katalánština"
 
-#: ulanguages.slang_ce
+#: languages.slang_ce
+msgctxt "languages.slang_ce"
 msgid "Chechen"
 msgstr ""
 
-#: ulanguages.slang_ch
+#: languages.slang_ch
+msgctxt "languages.slang_ch"
 msgid "Chamorro"
 msgstr ""
 
-#: ulanguages.slang_co
+#: languages.slang_co
+msgctxt "languages.slang_co"
 msgid "Corsican"
 msgstr ""
 
-#: ulanguages.slang_cr
+#: languages.slang_cr
+#, fuzzy
+msgctxt "languages.slang_cr"
 msgid "Cree"
 msgstr "Kríjština"
 
-#: ulanguages.slang_cs
+#: languages.slang_cs
+#, fuzzy
+msgctxt "languages.slang_cs"
 msgid "Czech"
 msgstr "Čeština"
 
-#: ulanguages.slang_cv
+#: languages.slang_cv
+msgctxt "languages.slang_cv"
 msgid "Chuvash"
 msgstr ""
 
-#: ulanguages.slang_cy
+#: languages.slang_cy
+msgctxt "languages.slang_cy"
 msgid "Welsh"
 msgstr ""
 
-#: ulanguages.slang_da
+#: languages.slang_da
+#, fuzzy
+msgctxt "languages.slang_da"
 msgid "Danish"
 msgstr "Dánština"
 
-#: ulanguages.slang_de
+#: languages.slang_de
+#, fuzzy
+msgctxt "languages.slang_de"
 msgid "German"
 msgstr "Němčina"
 
-#: ulanguages.slang_de_at
+#: languages.slang_de_at
+#, fuzzy
+msgctxt "languages.slang_de_at"
 msgid "Austrian German"
 msgstr "Australská němčina"
 
-#: ulanguages.slang_de_ch
+#: languages.slang_de_ch
+#, fuzzy
+msgctxt "languages.slang_de_ch"
 msgid "Swiss German"
 msgstr "Švédská němčina"
 
-#: ulanguages.slang_dv
+#: languages.slang_dv
+msgctxt "languages.slang_dv"
 msgid "Divehi"
 msgstr ""
 
-#: ulanguages.slang_dz
+#: languages.slang_dz
+msgctxt "languages.slang_dz"
 msgid "Dzongkha"
 msgstr ""
 
-#: ulanguages.slang_ee
+#: languages.slang_ee
+msgctxt "languages.slang_ee"
 msgid "Ewe"
 msgstr ""
 
-#: ulanguages.slang_el
+#: languages.slang_el
+#, fuzzy
+msgctxt "languages.slang_el"
 msgid "Greek"
 msgstr "Řečtina"
 
-#: ulanguages.slang_en
+#: languages.slang_en
+#, fuzzy
+msgctxt "languages.slang_en"
 msgid "English"
 msgstr "Angličtina"
 
-#: ulanguages.slang_en_au
+#: languages.slang_en_au
+#, fuzzy
+msgctxt "languages.slang_en_au"
 msgid "Australian English"
 msgstr "Australská angličtina"
 
-#: ulanguages.slang_en_ca
+#: languages.slang_en_ca
+#, fuzzy
+msgctxt "languages.slang_en_ca"
 msgid "Canadian English"
 msgstr "Kanadská angličtina"
 
-#: ulanguages.slang_en_gb
+#: languages.slang_en_gb
+#, fuzzy
+msgctxt "languages.slang_en_gb"
 msgid "British English"
 msgstr "Britská angličtina"
 
-#: ulanguages.slang_en_us
+#: languages.slang_en_us
+#, fuzzy
+msgctxt "languages.slang_en_us"
 msgid "American English"
 msgstr "Americká angličtina"
 
-#: ulanguages.slang_eo
+#: languages.slang_eo
+#, fuzzy
+msgctxt "languages.slang_eo"
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ulanguages.slang_es
+#: languages.slang_es
+#, fuzzy
+msgctxt "languages.slang_es"
 msgid "Spanish"
 msgstr "Španělština"
 
-#: ulanguages.slang_et
+#: languages.slang_et
+#, fuzzy
+msgctxt "languages.slang_et"
 msgid "Estonian"
 msgstr "Estonština"
 
-#: ulanguages.slang_eu
+#: languages.slang_eu
+msgctxt "languages.slang_eu"
 msgid "Basque"
 msgstr ""
 
-#: ulanguages.slang_fa
+#: languages.slang_fa
+#, fuzzy
+msgctxt "languages.slang_fa"
 msgid "Persian"
 msgstr "Perština"
 
-#: ulanguages.slang_ff
+#: languages.slang_ff
+msgctxt "languages.slang_ff"
 msgid "Fulah"
 msgstr ""
 
-#: ulanguages.slang_fi
+#: languages.slang_fi
+#, fuzzy
+msgctxt "languages.slang_fi"
 msgid "Finnish"
 msgstr "Finština"
 
-#: ulanguages.slang_fj
+#: languages.slang_fj
+msgctxt "languages.slang_fj"
 msgid "Fijian"
 msgstr ""
 
-#: ulanguages.slang_fo
+#: languages.slang_fo
+msgctxt "languages.slang_fo"
 msgid "Faroese"
 msgstr ""
 
-#: ulanguages.slang_fr
+#: languages.slang_fr
+#, fuzzy
+msgctxt "languages.slang_fr"
 msgid "French"
 msgstr "Francouzština"
 
-#: ulanguages.slang_fr_be
-msgctxt "ulanguages.slang_fr_be"
+#: languages.slang_fr_be
+msgctxt "languages.slang_fr_be"
 msgid "Walloon"
 msgstr ""
 
-#: ulanguages.slang_fy
+#: languages.slang_fy
+msgctxt "languages.slang_fy"
 msgid "Frisian"
 msgstr ""
 
-#: ulanguages.slang_ga
+#: languages.slang_ga
+#, fuzzy
+msgctxt "languages.slang_ga"
 msgid "Irish"
 msgstr "Irština"
 
-#: ulanguages.slang_gd
+#: languages.slang_gd
+msgctxt "languages.slang_gd"
 msgid "Gaelic"
 msgstr ""
 
-#: ulanguages.slang_gl
+#: languages.slang_gl
+msgctxt "languages.slang_gl"
 msgid "Gallegan"
 msgstr ""
 
-#: ulanguages.slang_gn
+#: languages.slang_gn
+msgctxt "languages.slang_gn"
 msgid "Guarani"
 msgstr ""
 
-#: ulanguages.slang_gu
+#: languages.slang_gu
+msgctxt "languages.slang_gu"
 msgid "Gujarati"
 msgstr ""
 
-#: ulanguages.slang_gv
+#: languages.slang_gv
+msgctxt "languages.slang_gv"
 msgid "Manx"
 msgstr ""
 
-#: ulanguages.slang_ha
+#: languages.slang_ha
+msgctxt "languages.slang_ha"
 msgid "Hausa"
 msgstr ""
 
-#: ulanguages.slang_he
+#: languages.slang_he
+#, fuzzy
+msgctxt "languages.slang_he"
 msgid "Hebrew"
 msgstr "Hebrejština"
 
-#: ulanguages.slang_hi
+#: languages.slang_hi
+msgctxt "languages.slang_hi"
 msgid "Hindi"
 msgstr ""
 
-#: ulanguages.slang_ho
+#: languages.slang_ho
+msgctxt "languages.slang_ho"
 msgid "Hiri Motu"
 msgstr ""
 
-#: ulanguages.slang_hr
+#: languages.slang_hr
+#, fuzzy
+msgctxt "languages.slang_hr"
 msgid "Croatian"
 msgstr "Chorvatština"
 
-#: ulanguages.slang_ht
+#: languages.slang_ht
+msgctxt "languages.slang_ht"
 msgid "Haitian"
 msgstr ""
 
-#: ulanguages.slang_hu
+#: languages.slang_hu
+#, fuzzy
+msgctxt "languages.slang_hu"
 msgid "Hungarian"
 msgstr "Maďarština"
 
-#: ulanguages.slang_hy
+#: languages.slang_hy
+#, fuzzy
+msgctxt "languages.slang_hy"
 msgid "Armenian"
 msgstr "Arménština"
 
-#: ulanguages.slang_hz
+#: languages.slang_hz
+msgctxt "languages.slang_hz"
 msgid "Herero"
 msgstr ""
 
-#: ulanguages.slang_ia
+#: languages.slang_ia
+msgctxt "languages.slang_ia"
 msgid "Interlingua"
 msgstr ""
 
-#: ulanguages.slang_id
+#: languages.slang_id
+msgctxt "languages.slang_id"
 msgid "Indonesian"
 msgstr ""
 
-#: ulanguages.slang_ie
+#: languages.slang_ie
+msgctxt "languages.slang_ie"
 msgid "Interlingue"
 msgstr ""
 
-#: ulanguages.slang_ig
+#: languages.slang_ig
+msgctxt "languages.slang_ig"
 msgid "Igbo"
 msgstr ""
 
-#: ulanguages.slang_ii
+#: languages.slang_ii
+msgctxt "languages.slang_ii"
 msgid "Sichuan Yi"
 msgstr ""
 
-#: ulanguages.slang_ik
+#: languages.slang_ik
+msgctxt "languages.slang_ik"
 msgid "Inupiaq"
 msgstr ""
 
-#: ulanguages.slang_io
+#: languages.slang_io
+msgctxt "languages.slang_io"
 msgid "Ido"
 msgstr ""
 
-#: ulanguages.slang_is
+#: languages.slang_is
+#, fuzzy
+msgctxt "languages.slang_is"
 msgid "Icelandic"
 msgstr "Islandština"
 
-#: ulanguages.slang_it
+#: languages.slang_it
+#, fuzzy
+msgctxt "languages.slang_it"
 msgid "Italian"
 msgstr "Italština"
 
-#: ulanguages.slang_iu
+#: languages.slang_iu
+msgctxt "languages.slang_iu"
 msgid "Inuktitut"
 msgstr ""
 
-#: ulanguages.slang_ja
+#: languages.slang_ja
+#, fuzzy
+msgctxt "languages.slang_ja"
 msgid "Japanese"
 msgstr "Japonština"
 
-#: ulanguages.slang_jv
+#: languages.slang_jv
+msgctxt "languages.slang_jv"
 msgid "Javanese"
 msgstr ""
 
-#: ulanguages.slang_ka
+#: languages.slang_ka
+#, fuzzy
+msgctxt "languages.slang_ka"
 msgid "Georgian"
 msgstr "Gruzínština"
 
-#: ulanguages.slang_kg
+#: languages.slang_kg
+#, fuzzy
+msgctxt "languages.slang_kg"
 msgid "Kongo"
 msgstr "Konžština"
 
-#: ulanguages.slang_ki
+#: languages.slang_ki
+msgctxt "languages.slang_ki"
 msgid "Kikuyu"
 msgstr ""
 
-#: ulanguages.slang_kj
+#: languages.slang_kj
+msgctxt "languages.slang_kj"
 msgid "Kuanyama"
 msgstr ""
 
-#: ulanguages.slang_kk
+#: languages.slang_kk
+msgctxt "languages.slang_kk"
 msgid "Kazakh"
 msgstr ""
 
-#: ulanguages.slang_kl
+#: languages.slang_kl
+#, fuzzy
+msgctxt "languages.slang_kl"
 msgid "Greenlandic"
 msgstr "Grónština"
 
-#: ulanguages.slang_km
+#: languages.slang_km
+msgctxt "languages.slang_km"
 msgid "Khmer"
 msgstr ""
 
-#: ulanguages.slang_kn
+#: languages.slang_kn
+#, fuzzy
+msgctxt "languages.slang_kn"
 msgid "Kannada"
 msgstr "Kannadština"
 
-#: ulanguages.slang_ko
+#: languages.slang_ko
+#, fuzzy
+msgctxt "languages.slang_ko"
 msgid "Korean"
 msgstr "Korejština"
 
-#: ulanguages.slang_kr
+#: languages.slang_kr
+msgctxt "languages.slang_kr"
 msgid "Kanuri"
 msgstr ""
 
-#: ulanguages.slang_ks
+#: languages.slang_ks
+msgctxt "languages.slang_ks"
 msgid "Kashmiri"
 msgstr ""
 
-#: ulanguages.slang_ku
+#: languages.slang_ku
+msgctxt "languages.slang_ku"
 msgid "Kurdish"
 msgstr ""
 
-#: ulanguages.slang_kv
+#: languages.slang_kv
+msgctxt "languages.slang_kv"
 msgid "Komi"
 msgstr ""
 
-#: ulanguages.slang_kw
+#: languages.slang_kw
+#, fuzzy
+msgctxt "languages.slang_kw"
 msgid "Cornish"
 msgstr "Kornština"
 
-#: ulanguages.slang_ky
+#: languages.slang_ky
+msgctxt "languages.slang_ky"
 msgid "Kirghiz"
 msgstr ""
 
-#: ulanguages.slang_la
+#: languages.slang_la
+#, fuzzy
+msgctxt "languages.slang_la"
 msgid "Latin"
 msgstr "Latina"
 
-#: ulanguages.slang_lb
+#: languages.slang_lb
+#, fuzzy
+msgctxt "languages.slang_lb"
 msgid "Luxembourgish"
 msgstr "Lucemburština"
 
-#: ulanguages.slang_lg
+#: languages.slang_lg
+msgctxt "languages.slang_lg"
 msgid "Ganda"
 msgstr ""
 
-#: ulanguages.slang_li
+#: languages.slang_li
+msgctxt "languages.slang_li"
 msgid "Limburgan"
 msgstr ""
 
-#: ulanguages.slang_ln
+#: languages.slang_ln
+msgctxt "languages.slang_ln"
 msgid "Lingala"
 msgstr ""
 
-#: ulanguages.slang_lo
+#: languages.slang_lo
+#, fuzzy
+msgctxt "languages.slang_lo"
 msgid "Lao"
 msgstr "Laoština"
 
-#: ulanguages.slang_lt
+#: languages.slang_lt
+#, fuzzy
+msgctxt "languages.slang_lt"
 msgid "Lithuanian"
 msgstr "Litevština"
 
-#: ulanguages.slang_lu
+#: languages.slang_lu
+msgctxt "languages.slang_lu"
 msgid "Luba-Katanga"
 msgstr ""
 
-#: ulanguages.slang_lv
+#: languages.slang_lv
+#, fuzzy
+msgctxt "languages.slang_lv"
 msgid "Latvian"
 msgstr "Lotyština"
 
-#: ulanguages.slang_mg
+#: languages.slang_mg
+msgctxt "languages.slang_mg"
 msgid "Malagasy"
 msgstr ""
 
-#: ulanguages.slang_mh
+#: languages.slang_mh
+msgctxt "languages.slang_mh"
 msgid "Marshallese"
 msgstr ""
 
-#: ulanguages.slang_mi
+#: languages.slang_mi
+msgctxt "languages.slang_mi"
 msgid "Maori"
 msgstr ""
 
-#: ulanguages.slang_mk
+#: languages.slang_mk
+#, fuzzy
+msgctxt "languages.slang_mk"
 msgid "Macedonian"
 msgstr "Makedonština"
 
-#: ulanguages.slang_ml
+#: languages.slang_ml
+msgctxt "languages.slang_ml"
 msgid "Malayalam"
 msgstr ""
 
-#: ulanguages.slang_mn
+#: languages.slang_mn
+#, fuzzy
+msgctxt "languages.slang_mn"
 msgid "Mongolian"
 msgstr "Mongolština"
 
-#: ulanguages.slang_mo
+#: languages.slang_mo
+#, fuzzy
+msgctxt "languages.slang_mo"
 msgid "Moldavian"
 msgstr "Moldavština"
 
-#: ulanguages.slang_mr
+#: languages.slang_mr
+msgctxt "languages.slang_mr"
 msgid "Marathi"
 msgstr ""
 
-#: ulanguages.slang_ms
+#: languages.slang_ms
+msgctxt "languages.slang_ms"
 msgid "Malay"
 msgstr ""
 
-#: ulanguages.slang_mt
+#: languages.slang_mt
+msgctxt "languages.slang_mt"
 msgid "Maltese"
 msgstr ""
 
-#: ulanguages.slang_my
+#: languages.slang_my
+msgctxt "languages.slang_my"
 msgid "Burmese"
 msgstr ""
 
-#: ulanguages.slang_na
+#: languages.slang_na
+msgctxt "languages.slang_na"
 msgid "Nauru"
 msgstr ""
 
-#: ulanguages.slang_nb
+#: languages.slang_nb
+msgctxt "languages.slang_nb"
 msgid "Norwegian Bokmaal"
 msgstr ""
 
-#: ulanguages.slang_nd
+#: languages.slang_nd
+msgctxt "languages.slang_nd"
 msgid "Ndebele, North"
 msgstr ""
 
-#: ulanguages.slang_ne
+#: languages.slang_ne
+msgctxt "languages.slang_ne"
 msgid "Nepali"
 msgstr ""
 
-#: ulanguages.slang_ng
+#: languages.slang_ng
+msgctxt "languages.slang_ng"
 msgid "Ndonga"
 msgstr ""
 
-#: ulanguages.slang_nl
+#: languages.slang_nl
+#, fuzzy
+msgctxt "languages.slang_nl"
 msgid "Dutch"
 msgstr "Němčina"
 
-#: ulanguages.slang_nl_be
+#: languages.slang_nl_be
+msgctxt "languages.slang_nl_be"
 msgid "Flemish"
 msgstr ""
 
-#: ulanguages.slang_nn
+#: languages.slang_nn
+msgctxt "languages.slang_nn"
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#: ulanguages.slang_no
+#: languages.slang_no
+#, fuzzy
+msgctxt "languages.slang_no"
 msgid "Norwegian"
 msgstr "Norština"
 
-#: ulanguages.slang_nr
+#: languages.slang_nr
+msgctxt "languages.slang_nr"
 msgid "Ndebele, South"
 msgstr ""
 
-#: ulanguages.slang_nv
+#: languages.slang_nv
+#, fuzzy
+msgctxt "languages.slang_nv"
 msgid "Navajo"
 msgstr "Navažština"
 
-#: ulanguages.slang_ny
+#: languages.slang_ny
+msgctxt "languages.slang_ny"
 msgid "Chichewa"
 msgstr ""
 
-#: ulanguages.slang_oc
+#: languages.slang_oc
+msgctxt "languages.slang_oc"
 msgid "Occitan"
 msgstr ""
 
-#: ulanguages.slang_oj
+#: languages.slang_oj
+msgctxt "languages.slang_oj"
 msgid "Ojibwa"
 msgstr ""
 
-#: ulanguages.slang_om
+#: languages.slang_om
+msgctxt "languages.slang_om"
 msgid "Oromo"
 msgstr ""
 
-#: ulanguages.slang_or
+#: languages.slang_or
+msgctxt "languages.slang_or"
 msgid "Oriya"
 msgstr ""
 
-#: ulanguages.slang_os
+#: languages.slang_os
+msgctxt "languages.slang_os"
 msgid "Ossetian"
 msgstr ""
 
-#: ulanguages.slang_pa
+#: languages.slang_pa
+msgctxt "languages.slang_pa"
 msgid "Panjabi"
 msgstr ""
 
-#: ulanguages.slang_pi
+#: languages.slang_pi
+msgctxt "languages.slang_pi"
 msgid "Pali"
 msgstr ""
 
-#: ulanguages.slang_pl
+#: languages.slang_pl
+#, fuzzy
+msgctxt "languages.slang_pl"
 msgid "Polish"
 msgstr "Polština"
 
-#: ulanguages.slang_ps
+#: languages.slang_ps
+msgctxt "languages.slang_ps"
 msgid "Pushto"
 msgstr ""
 
-#: ulanguages.slang_pt
+#: languages.slang_pt
+#, fuzzy
+msgctxt "languages.slang_pt"
 msgid "Portuguese"
 msgstr "Portugalština"
 
-#: ulanguages.slang_pt_br
+#: languages.slang_pt_br
+#, fuzzy
+msgctxt "languages.slang_pt_br"
 msgid "Brazilian Portuguese"
 msgstr "Brazislká portugalština"
 
-#: ulanguages.slang_qu
+#: languages.slang_qu
+msgctxt "languages.slang_qu"
 msgid "Quechua"
 msgstr ""
 
-#: ulanguages.slang_rm
+#: languages.slang_rm
+msgctxt "languages.slang_rm"
 msgid "Raeto-Romance"
 msgstr ""
 
-#: ulanguages.slang_rn
+#: languages.slang_rn
+msgctxt "languages.slang_rn"
 msgid "Rundi"
 msgstr ""
 
-#: ulanguages.slang_ro
+#: languages.slang_ro
+#, fuzzy
+msgctxt "languages.slang_ro"
 msgid "Romanian"
 msgstr "Romština"
 
-#: ulanguages.slang_ru
+#: languages.slang_ru
+#, fuzzy
+msgctxt "languages.slang_ru"
 msgid "Russian"
 msgstr "Ruština"
 
-#: ulanguages.slang_rw
+#: languages.slang_rw
+msgctxt "languages.slang_rw"
 msgid "Kinyarwanda"
 msgstr ""
 
-#: ulanguages.slang_sa
+#: languages.slang_sa
+msgctxt "languages.slang_sa"
 msgid "Sanskrit"
 msgstr ""
 
-#: ulanguages.slang_sc
+#: languages.slang_sc
+msgctxt "languages.slang_sc"
 msgid "Sardinian"
 msgstr ""
 
-#: ulanguages.slang_sd
+#: languages.slang_sd
+msgctxt "languages.slang_sd"
 msgid "Sindhi"
 msgstr ""
 
-#: ulanguages.slang_se
+#: languages.slang_se
+msgctxt "languages.slang_se"
 msgid "Northern Sami"
 msgstr ""
 
-#: ulanguages.slang_sg
+#: languages.slang_sg
+msgctxt "languages.slang_sg"
 msgid "Sango"
 msgstr ""
 
-#: ulanguages.slang_si
+#: languages.slang_si
+msgctxt "languages.slang_si"
 msgid "Sinhalese"
 msgstr ""
 
-#: ulanguages.slang_sk
+#: languages.slang_sk
+#, fuzzy
+msgctxt "languages.slang_sk"
 msgid "Slovak"
 msgstr "Slovenština"
 
-#: ulanguages.slang_sl
+#: languages.slang_sl
+#, fuzzy
+msgctxt "languages.slang_sl"
 msgid "Slovenian"
 msgstr "Slovinština"
 
-#: ulanguages.slang_sm
+#: languages.slang_sm
+msgctxt "languages.slang_sm"
 msgid "Samoan"
 msgstr ""
 
-#: ulanguages.slang_sn
+#: languages.slang_sn
+msgctxt "languages.slang_sn"
 msgid "Shona"
 msgstr ""
 
-#: ulanguages.slang_so
+#: languages.slang_so
+msgctxt "languages.slang_so"
 msgid "Somali"
 msgstr ""
 
-#: ulanguages.slang_sq
+#: languages.slang_sq
+#, fuzzy
+msgctxt "languages.slang_sq"
 msgid "Albanian"
 msgstr "Albánština"
 
-#: ulanguages.slang_sr
+#: languages.slang_sr
+msgctxt "languages.slang_sr"
 msgid "Serbian"
 msgstr ""
 
-#: ulanguages.slang_ss
+#: languages.slang_ss
+msgctxt "languages.slang_ss"
 msgid "Swati"
 msgstr ""
 
-#: ulanguages.slang_st
+#: languages.slang_st
+msgctxt "languages.slang_st"
 msgid "Sotho, Southern"
 msgstr ""
 
-#: ulanguages.slang_su
+#: languages.slang_su
+#, fuzzy
+msgctxt "languages.slang_su"
 msgid "Sundanese"
 msgstr "Sundština"
 
-#: ulanguages.slang_sv
+#: languages.slang_sv
+#, fuzzy
+msgctxt "languages.slang_sv"
 msgid "Swedish"
 msgstr "Švédština"
 
-#: ulanguages.slang_sw
+#: languages.slang_sw
+msgctxt "languages.slang_sw"
 msgid "Swahili"
 msgstr ""
 
-#: ulanguages.slang_ta
+#: languages.slang_ta
+msgctxt "languages.slang_ta"
 msgid "Tamil"
 msgstr ""
 
-#: ulanguages.slang_te
+#: languages.slang_te
+msgctxt "languages.slang_te"
 msgid "Telugu"
 msgstr ""
 
-#: ulanguages.slang_tg
+#: languages.slang_tg
+msgctxt "languages.slang_tg"
 msgid "Tajik"
 msgstr ""
 
-#: ulanguages.slang_th
+#: languages.slang_th
+msgctxt "languages.slang_th"
 msgid "Thai"
 msgstr ""
 
-#: ulanguages.slang_ti
+#: languages.slang_ti
+msgctxt "languages.slang_ti"
 msgid "Tigrinya"
 msgstr ""
 
-#: ulanguages.slang_tk
+#: languages.slang_tk
+msgctxt "languages.slang_tk"
 msgid "Turkmen"
 msgstr ""
 
-#: ulanguages.slang_tl
+#: languages.slang_tl
+msgctxt "languages.slang_tl"
 msgid "Tagalog"
 msgstr ""
 
-#: ulanguages.slang_tn
+#: languages.slang_tn
+msgctxt "languages.slang_tn"
 msgid "Tswana"
 msgstr ""
 
-#: ulanguages.slang_to
+#: languages.slang_to
+msgctxt "languages.slang_to"
 msgid "Tonga"
 msgstr ""
 
-#: ulanguages.slang_tr
+#: languages.slang_tr
+#, fuzzy
+msgctxt "languages.slang_tr"
 msgid "Turkish"
 msgstr "Turečtina"
 
-#: ulanguages.slang_ts
+#: languages.slang_ts
+msgctxt "languages.slang_ts"
 msgid "Tsonga"
 msgstr ""
 
-#: ulanguages.slang_tt
+#: languages.slang_tt
+#, fuzzy
+msgctxt "languages.slang_tt"
 msgid "Tatar"
 msgstr "Tatarština"
 
-#: ulanguages.slang_tw
+#: languages.slang_tw
+msgctxt "languages.slang_tw"
 msgid "Twi"
 msgstr ""
 
-#: ulanguages.slang_ty
+#: languages.slang_ty
+msgctxt "languages.slang_ty"
 msgid "Tahitian"
 msgstr ""
 
-#: ulanguages.slang_ug
+#: languages.slang_ug
+msgctxt "languages.slang_ug"
 msgid "Uighur"
 msgstr ""
 
-#: ulanguages.slang_uk
+#: languages.slang_uk
+#, fuzzy
+msgctxt "languages.slang_uk"
 msgid "Ukrainian"
 msgstr "Ukrajinština"
 
-#: ulanguages.slang_ur
+#: languages.slang_ur
+msgctxt "languages.slang_ur"
 msgid "Urdu"
 msgstr ""
 
-#: ulanguages.slang_uz
+#: languages.slang_uz
+msgctxt "languages.slang_uz"
 msgid "Uzbek"
 msgstr ""
 
-#: ulanguages.slang_ve
+#: languages.slang_ve
+msgctxt "languages.slang_ve"
 msgid "Venda"
 msgstr ""
 
-#: ulanguages.slang_vi
+#: languages.slang_vi
+#, fuzzy
+msgctxt "languages.slang_vi"
 msgid "Vietnamese"
 msgstr "Vietnamština"
 
-#: ulanguages.slang_vo
+#: languages.slang_vo
+msgctxt "languages.slang_vo"
 msgid "Volapuk"
 msgstr ""
 
-#: ulanguages.slang_wa
-msgctxt "ulanguages.slang_wa"
+#: languages.slang_wa
+msgctxt "languages.slang_wa"
 msgid "Walloon"
 msgstr ""
 
-#: ulanguages.slang_wo
+#: languages.slang_wo
+msgctxt "languages.slang_wo"
 msgid "Wolof"
 msgstr ""
 
-#: ulanguages.slang_xh
+#: languages.slang_xh
+msgctxt "languages.slang_xh"
 msgid "Xhosa"
 msgstr ""
 
-#: ulanguages.slang_yi
+#: languages.slang_yi
+msgctxt "languages.slang_yi"
 msgid "Yiddish"
 msgstr ""
 
-#: ulanguages.slang_yo
+#: languages.slang_yo
+msgctxt "languages.slang_yo"
 msgid "Yoruba"
 msgstr ""
 
-#: ulanguages.slang_za
+#: languages.slang_za
+msgctxt "languages.slang_za"
 msgid "Zhuang"
 msgstr ""
 
-#: ulanguages.slang_zh
+#: languages.slang_zh
+#, fuzzy
+msgctxt "languages.slang_zh"
 msgid "Chinese"
 msgstr "Čínština"
 
-#: ulanguages.slang_zu
+#: languages.slang_zu
+#, fuzzy
+msgctxt "languages.slang_zu"
 msgid "Zulu"
 msgstr "Zuluština"

trunk/Packages/Common/Languages/Languages.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: ulanguages.slangauto
+#: languages.slangauto
 msgid "Automatic"
 msgstr ""
 
-#: ulanguages.slang_aa
+#: languages.slang_aa
 msgid "Afar"
 msgstr ""
 
-#: ulanguages.slang_ab
+#: languages.slang_ab
 msgid "Abkhazian"
 msgstr ""
 
-#: ulanguages.slang_ae
+#: languages.slang_ae
 msgid "Avestan"
 msgstr ""
 
-#: ulanguages.slang_af
+#: languages.slang_af
 msgid "Afrikaans"
 msgstr ""
 
-#: ulanguages.slang_ak
+#: languages.slang_ak
 msgid "Akan"
 msgstr ""
 
-#: ulanguages.slang_am
+#: languages.slang_am
 msgid "Amharic"
 msgstr ""
 
-#: ulanguages.slang_an
+#: languages.slang_an
 msgid "Aragonese"
 msgstr ""
 
-#: ulanguages.slang_ar
+#: languages.slang_ar
 msgid "Arabic"
 msgstr ""
 
-#: ulanguages.slang_as
+#: languages.slang_as
 msgid "Assamese"
 msgstr ""
 
-#: ulanguages.slang_av
+#: languages.slang_av
 msgid "Avaric"
 msgstr ""
 
-#: ulanguages.slang_ay
+#: languages.slang_ay
 msgid "Aymara"
 msgstr ""
 
-#: ulanguages.slang_az
+#: languages.slang_az
 msgid "Azerbaijani"
 msgstr ""
 
-#: ulanguages.slang_ba
+#: languages.slang_ba
 msgid "Bashkir"
 msgstr ""
 
-#: ulanguages.slang_be
+#: languages.slang_be
 msgid "Belarusian"
 msgstr ""
 
-#: ulanguages.slang_bg
+#: languages.slang_bg
 msgid "Bulgarian"
 msgstr ""
 
-#: ulanguages.slang_bh
+#: languages.slang_bh
 msgid "Bihari"
 msgstr ""
 
-#: ulanguages.slang_bi
+#: languages.slang_bi
 msgid "Bislama"
 msgstr ""
 
-#: ulanguages.slang_bm
+#: languages.slang_bm
 msgid "Bambara"
 msgstr ""
 
-#: ulanguages.slang_bn
+#: languages.slang_bn
 msgid "Bengali"
 msgstr ""
 
-#: ulanguages.slang_bo
+#: languages.slang_bo
 msgid "Tibetan"
 msgstr ""
 
-#: ulanguages.slang_br
+#: languages.slang_br
 msgid "Breton"
 msgstr ""
 
-#: ulanguages.slang_bs
+#: languages.slang_bs
 msgid "Bosnian"
 msgstr ""
 
-#: ulanguages.slang_ca
+#: languages.slang_ca
 msgid "Catalan"
 msgstr ""
 
-#: ulanguages.slang_ce
+#: languages.slang_ce
 msgid "Chechen"
 msgstr ""
 
-#: ulanguages.slang_ch
+#: languages.slang_ch
 msgid "Chamorro"
 msgstr ""
 
-#: ulanguages.slang_co
+#: languages.slang_co
 msgid "Corsican"
 msgstr ""
 
-#: ulanguages.slang_cr
+#: languages.slang_cr
 msgid "Cree"
 msgstr ""
 
-#: ulanguages.slang_cs
+#: languages.slang_cs
 msgid "Czech"
 msgstr ""
 
-#: ulanguages.slang_cv
+#: languages.slang_cv
 msgid "Chuvash"
 msgstr ""
 
-#: ulanguages.slang_cy
+#: languages.slang_cy
 msgid "Welsh"
 msgstr ""
 
-#: ulanguages.slang_da
+#: languages.slang_da
 msgid "Danish"
 msgstr ""
 
-#: ulanguages.slang_de
+#: languages.slang_de
 msgid "German"
 msgstr ""
 
-#: ulanguages.slang_de_at
+#: languages.slang_de_at
 msgid "Austrian German"
 msgstr ""
 
-#: ulanguages.slang_de_ch
+#: languages.slang_de_ch
 msgid "Swiss German"
 msgstr ""
 
-#: ulanguages.slang_dv
+#: languages.slang_dv
 msgid "Divehi"
 msgstr ""
 
-#: ulanguages.slang_dz
+#: languages.slang_dz
 msgid "Dzongkha"
 msgstr ""
 
-#: ulanguages.slang_ee
+#: languages.slang_ee
 msgid "Ewe"
 msgstr ""
 
-#: ulanguages.slang_el
+#: languages.slang_el
 msgid "Greek"
 msgstr ""
 
-#: ulanguages.slang_en
+#: languages.slang_en
 msgid "English"
 msgstr ""
 
-#: ulanguages.slang_en_au
+#: languages.slang_en_au
 msgid "Australian English"
 msgstr ""
 
-#: ulanguages.slang_en_ca
+#: languages.slang_en_ca
 msgid "Canadian English"
 msgstr ""
 
-#: ulanguages.slang_en_gb
+#: languages.slang_en_gb
 msgid "British English"
 msgstr ""
 
-#: ulanguages.slang_en_us
+#: languages.slang_en_us
 msgid "American English"
 msgstr ""
 
-#: ulanguages.slang_eo
+#: languages.slang_eo
 msgid "Esperanto"
 msgstr ""
 
-#: ulanguages.slang_es
+#: languages.slang_es
 msgid "Spanish"
 msgstr ""
 
-#: ulanguages.slang_et
+#: languages.slang_et
 msgid "Estonian"
 msgstr ""
 
-#: ulanguages.slang_eu
+#: languages.slang_eu
 msgid "Basque"
 msgstr ""
 
-#: ulanguages.slang_fa
+#: languages.slang_fa
 msgid "Persian"
 msgstr ""
 
-#: ulanguages.slang_ff
+#: languages.slang_ff
 msgid "Fulah"
 msgstr ""
 
-#: ulanguages.slang_fi
+#: languages.slang_fi
 msgid "Finnish"
 msgstr ""
 
-#: ulanguages.slang_fj
+#: languages.slang_fj
 msgid "Fijian"
 msgstr ""
 
-#: ulanguages.slang_fo
+#: languages.slang_fo
 msgid "Faroese"
 msgstr ""
 
-#: ulanguages.slang_fr
+#: languages.slang_fr
 msgid "French"
 msgstr ""
 
-#: ulanguages.slang_fr_be
-msgctxt "ulanguages.slang_fr_be"
+#: languages.slang_fr_be
+msgctxt "languages.slang_fr_be"
 msgid "Walloon"
 msgstr ""
 
-#: ulanguages.slang_fy
+#: languages.slang_fy
 msgid "Frisian"
 msgstr ""
 
-#: ulanguages.slang_ga
+#: languages.slang_ga
 msgid "Irish"
 msgstr ""
 
-#: ulanguages.slang_gd
+#: languages.slang_gd
 msgid "Gaelic"
 msgstr ""
 
-#: ulanguages.slang_gl
+#: languages.slang_gl
 msgid "Gallegan"
 msgstr ""
 
-#: ulanguages.slang_gn
+#: languages.slang_gn
 msgid "Guarani"
 msgstr ""
 
-#: ulanguages.slang_gu
+#: languages.slang_gu
 msgid "Gujarati"
 msgstr ""
 
-#: ulanguages.slang_gv
+#: languages.slang_gv
 msgid "Manx"
 msgstr ""
 
-#: ulanguages.slang_ha
+#: languages.slang_ha
 msgid "Hausa"
 msgstr ""
 
-#: ulanguages.slang_he
+#: languages.slang_he
 msgid "Hebrew"
 msgstr ""
 
-#: ulanguages.slang_hi
+#: languages.slang_hi
 msgid "Hindi"
 msgstr ""
 
-#: ulanguages.slang_ho
+#: languages.slang_ho
 msgid "Hiri Motu"
 msgstr ""
 
-#: ulanguages.slang_hr
+#: languages.slang_hr
 msgid "Croatian"
 msgstr ""
 
-#: ulanguages.slang_ht
+#: languages.slang_ht
 msgid "Haitian"
 msgstr ""
 
-#: ulanguages.slang_hu
+#: languages.slang_hu
 msgid "Hungarian"
 msgstr ""
 
-#: ulanguages.slang_hy
+#: languages.slang_hy
 msgid "Armenian"
 msgstr ""
 
-#: ulanguages.slang_hz
+#: languages.slang_hz
 msgid "Herero"
 msgstr ""
 
-#: ulanguages.slang_ia
+#: languages.slang_ia
 msgid "Interlingua"
 msgstr ""
 
-#: ulanguages.slang_id
+#: languages.slang_id
 msgid "Indonesian"
 msgstr ""
 
-#: ulanguages.slang_ie
+#: languages.slang_ie
 msgid "Interlingue"
 msgstr ""
 
-#: ulanguages.slang_ig
+#: languages.slang_ig
 msgid "Igbo"
 msgstr ""
 
-#: ulanguages.slang_ii
+#: languages.slang_ii
 msgid "Sichuan Yi"
 msgstr ""
 
-#: ulanguages.slang_ik
+#: languages.slang_ik
 msgid "Inupiaq"
 msgstr ""
 
-#: ulanguages.slang_io
+#: languages.slang_io
 msgid "Ido"
 msgstr ""
 
-#: ulanguages.slang_is
+#: languages.slang_is
 msgid "Icelandic"
 msgstr ""
 
-#: ulanguages.slang_it
+#: languages.slang_it
 msgid "Italian"
 msgstr ""
 
-#: ulanguages.slang_iu
+#: languages.slang_iu
 msgid "Inuktitut"
 msgstr ""
 
-#: ulanguages.slang_ja
+#: languages.slang_ja
 msgid "Japanese"
 msgstr ""
 
-#: ulanguages.slang_jv
+#: languages.slang_jv
 msgid "Javanese"
 msgstr ""
 
-#: ulanguages.slang_ka
+#: languages.slang_ka
 msgid "Georgian"
 msgstr ""
 
-#: ulanguages.slang_kg
+#: languages.slang_kg
 msgid "Kongo"
 msgstr ""
 
-#: ulanguages.slang_ki
+#: languages.slang_ki
 msgid "Kikuyu"
 msgstr ""
 
-#: ulanguages.slang_kj
+#: languages.slang_kj
 msgid "Kuanyama"
 msgstr ""
 
-#: ulanguages.slang_kk
+#: languages.slang_kk
 msgid "Kazakh"
 msgstr ""
 
-#: ulanguages.slang_kl
+#: languages.slang_kl
 msgid "Greenlandic"
 msgstr ""
 
-#: ulanguages.slang_km
+#: languages.slang_km
 msgid "Khmer"
 msgstr ""
 
-#: ulanguages.slang_kn
+#: languages.slang_kn
 msgid "Kannada"
 msgstr ""
 
-#: ulanguages.slang_ko
+#: languages.slang_ko
 msgid "Korean"
 msgstr ""
 
-#: ulanguages.slang_kr
+#: languages.slang_kr
 msgid "Kanuri"
 msgstr ""
 
-#: ulanguages.slang_ks
+#: languages.slang_ks
 msgid "Kashmiri"
 msgstr ""
 
-#: ulanguages.slang_ku
+#: languages.slang_ku
 msgid "Kurdish"
 msgstr ""
 
-#: ulanguages.slang_kv
+#: languages.slang_kv
 msgid "Komi"
 msgstr ""
 
-#: ulanguages.slang_kw
+#: languages.slang_kw
 msgid "Cornish"
 msgstr ""
 
-#: ulanguages.slang_ky
+#: languages.slang_ky
 msgid "Kirghiz"
 msgstr ""
 
-#: ulanguages.slang_la
+#: languages.slang_la
 msgid "Latin"
 msgstr ""
 
-#: ulanguages.slang_lb
+#: languages.slang_lb
 msgid "Luxembourgish"
 msgstr ""
 
-#: ulanguages.slang_lg
+#: languages.slang_lg
 msgid "Ganda"
 msgstr ""
 
-#: ulanguages.slang_li
+#: languages.slang_li
 msgid "Limburgan"
 msgstr ""
 
-#: ulanguages.slang_ln
+#: languages.slang_ln
 msgid "Lingala"
 msgstr ""
 
-#: ulanguages.slang_lo
+#: languages.slang_lo
 msgid "Lao"
 msgstr ""
 
-#: ulanguages.slang_lt
+#: languages.slang_lt
 msgid "Lithuanian"
 msgstr ""
 
-#: ulanguages.slang_lu
+#: languages.slang_lu
 msgid "Luba-Katanga"
 msgstr ""
 
-#: ulanguages.slang_lv
+#: languages.slang_lv
 msgid "Latvian"
 msgstr ""
 
-#: ulanguages.slang_mg
+#: languages.slang_mg
 msgid "Malagasy"
 msgstr ""
 
-#: ulanguages.slang_mh
+#: languages.slang_mh
 msgid "Marshallese"
 msgstr ""
 
-#: ulanguages.slang_mi
+#: languages.slang_mi
 msgid "Maori"
 msgstr ""
 
-#: ulanguages.slang_mk
+#: languages.slang_mk
 msgid "Macedonian"
 msgstr ""
 
-#: ulanguages.slang_ml
+#: languages.slang_ml
 msgid "Malayalam"
 msgstr ""
 
-#: ulanguages.slang_mn
+#: languages.slang_mn
 msgid "Mongolian"
 msgstr ""
 
-#: ulanguages.slang_mo
+#: languages.slang_mo
 msgid "Moldavian"
 msgstr ""
 
-#: ulanguages.slang_mr
+#: languages.slang_mr
 msgid "Marathi"
 msgstr ""
 
-#: ulanguages.slang_ms
+#: languages.slang_ms
 msgid "Malay"
 msgstr ""
 
-#: ulanguages.slang_mt
+#: languages.slang_mt
 msgid "Maltese"
 msgstr ""
 
-#: ulanguages.slang_my
+#: languages.slang_my
 msgid "Burmese"
 msgstr ""
 
-#: ulanguages.slang_na
+#: languages.slang_na
 msgid "Nauru"
 msgstr ""
 
-#: ulanguages.slang_nb
+#: languages.slang_nb
 msgid "Norwegian Bokmaal"
 msgstr ""
 
-#: ulanguages.slang_nd
+#: languages.slang_nd
 msgid "Ndebele, North"
 msgstr ""
 
-#: ulanguages.slang_ne
+#: languages.slang_ne
 msgid "Nepali"
 msgstr ""
 
-#: ulanguages.slang_ng
+#: languages.slang_ng
 msgid "Ndonga"
 msgstr ""
 
-#: ulanguages.slang_nl
+#: languages.slang_nl
 msgid "Dutch"
 msgstr ""
 
-#: ulanguages.slang_nl_be
+#: languages.slang_nl_be
 msgid "Flemish"
 msgstr ""
 
-#: ulanguages.slang_nn
+#: languages.slang_nn
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#: ulanguages.slang_no
+#: languages.slang_no
 msgid "Norwegian"
 msgstr ""
 
-#: ulanguages.slang_nr
+#: languages.slang_nr
 msgid "Ndebele, South"
 msgstr ""
 
-#: ulanguages.slang_nv
+#: languages.slang_nv
 msgid "Navajo"
 msgstr ""
 
-#: ulanguages.slang_ny
+#: languages.slang_ny
 msgid "Chichewa"
 msgstr ""
 
-#: ulanguages.slang_oc
+#: languages.slang_oc
 msgid "Occitan"
 msgstr ""
 
-#: ulanguages.slang_oj
+#: languages.slang_oj
 msgid "Ojibwa"
 msgstr ""
 
-#: ulanguages.slang_om
+#: languages.slang_om
 msgid "Oromo"
 msgstr ""
 
-#: ulanguages.slang_or
+#: languages.slang_or
 msgid "Oriya"
 msgstr ""
 
-#: ulanguages.slang_os
+#: languages.slang_os
 msgid "Ossetian"
 msgstr ""
 
-#: ulanguages.slang_pa
+#: languages.slang_pa
 msgid "Panjabi"
 msgstr ""
 
-#: ulanguages.slang_pi
+#: languages.slang_pi
 msgid "Pali"
 msgstr ""
 
-#: ulanguages.slang_pl
+#: languages.slang_pl
 msgid "Polish"
 msgstr ""
 
-#: ulanguages.slang_ps
+#: languages.slang_ps
 msgid "Pushto"
 msgstr ""
 
-#: ulanguages.slang_pt
+#: languages.slang_pt
 msgid "Portuguese"
 msgstr ""
 
-#: ulanguages.slang_pt_br
+#: languages.slang_pt_br
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ulanguages.slang_qu
+#: languages.slang_qu
 msgid "Quechua"
 msgstr ""
 
-#: ulanguages.slang_rm
+#: languages.slang_rm
 msgid "Raeto-Romance"
 msgstr ""
 
-#: ulanguages.slang_rn
+#: languages.slang_rn
 msgid "Rundi"
 msgstr ""
 
-#: ulanguages.slang_ro
+#: languages.slang_ro
 msgid "Romanian"
 msgstr ""
 
-#: ulanguages.slang_ru
+#: languages.slang_ru
 msgid "Russian"
 msgstr ""
 
-#: ulanguages.slang_rw
+#: languages.slang_rw
 msgid "Kinyarwanda"
 msgstr ""
 
-#: ulanguages.slang_sa
+#: languages.slang_sa
 msgid "Sanskrit"
 msgstr ""
 
-#: ulanguages.slang_sc
+#: languages.slang_sc
 msgid "Sardinian"
 msgstr ""
 
-#: ulanguages.slang_sd
+#: languages.slang_sd
 msgid "Sindhi"
 msgstr ""
 
-#: ulanguages.slang_se
+#: languages.slang_se
 msgid "Northern Sami"
 msgstr ""
 
-#: ulanguages.slang_sg
+#: languages.slang_sg
 msgid "Sango"
 msgstr ""
 
-#: ulanguages.slang_si
+#: languages.slang_si
 msgid "Sinhalese"
 msgstr ""
 
-#: ulanguages.slang_sk
+#: languages.slang_sk
 msgid "Slovak"
 msgstr ""
 
-#: ulanguages.slang_sl
+#: languages.slang_sl
 msgid "Slovenian"
 msgstr ""
 
-#: ulanguages.slang_sm
+#: languages.slang_sm
 msgid "Samoan"
 msgstr ""
 
-#: ulanguages.slang_sn
+#: languages.slang_sn
 msgid "Shona"
 msgstr ""
 
-#: ulanguages.slang_so
+#: languages.slang_so
 msgid "Somali"
 msgstr ""
 
-#: ulanguages.slang_sq
+#: languages.slang_sq
 msgid "Albanian"
 msgstr ""
 
-#: ulanguages.slang_sr
+#: languages.slang_sr
 msgid "Serbian"
 msgstr ""
 
-#: ulanguages.slang_ss
+#: languages.slang_ss
 msgid "Swati"
 msgstr ""
 
-#: ulanguages.slang_st
+#: languages.slang_st
 msgid "Sotho, Southern"
 msgstr ""
 
-#: ulanguages.slang_su
+#: languages.slang_su
 msgid "Sundanese"
 msgstr ""
 
-#: ulanguages.slang_sv
+#: languages.slang_sv
 msgid "Swedish"
 msgstr ""
 
-#: ulanguages.slang_sw
+#: languages.slang_sw
 msgid "Swahili"
 msgstr ""
 
-#: ulanguages.slang_ta
+#: languages.slang_ta
 msgid "Tamil"
 msgstr ""
 
-#: ulanguages.slang_te
+#: languages.slang_te
 msgid "Telugu"
 msgstr ""
 
-#: ulanguages.slang_tg
+#: languages.slang_tg
 msgid "Tajik"
 msgstr ""
 
-#: ulanguages.slang_th
+#: languages.slang_th
 msgid "Thai"
 msgstr ""
 
-#: ulanguages.slang_ti
+#: languages.slang_ti
 msgid "Tigrinya"
 msgstr ""
 
-#: ulanguages.slang_tk
+#: languages.slang_tk
 msgid "Turkmen"
 msgstr ""
 
-#: ulanguages.slang_tl
+#: languages.slang_tl
 msgid "Tagalog"
 msgstr ""
 
-#: ulanguages.slang_tn
+#: languages.slang_tn
 msgid "Tswana"
 msgstr ""
 
-#: ulanguages.slang_to
+#: languages.slang_to
 msgid "Tonga"
 msgstr ""
 
-#: ulanguages.slang_tr
+#: languages.slang_tr
 msgid "Turkish"
 msgstr ""
 
-#: ulanguages.slang_ts
+#: languages.slang_ts
 msgid "Tsonga"
 msgstr ""
 
-#: ulanguages.slang_tt
+#: languages.slang_tt
 msgid "Tatar"
 msgstr ""
 
-#: ulanguages.slang_tw
+#: languages.slang_tw
 msgid "Twi"
 msgstr ""
 
-#: ulanguages.slang_ty
+#: languages.slang_ty
 msgid "Tahitian"
 msgstr ""
 
-#: ulanguages.slang_ug
+#: languages.slang_ug
 msgid "Uighur"
 msgstr ""
 
-#: ulanguages.slang_uk
+#: languages.slang_uk
 msgid "Ukrainian"
 msgstr ""
 
-#: ulanguages.slang_ur
+#: languages.slang_ur
 msgid "Urdu"
 msgstr ""
 
-#: ulanguages.slang_uz
+#: languages.slang_uz
 msgid "Uzbek"
 msgstr ""
 
-#: ulanguages.slang_ve
+#: languages.slang_ve
 msgid "Venda"
 msgstr ""
 
-#: ulanguages.slang_vi
+#: languages.slang_vi
 msgid "Vietnamese"
 msgstr ""
 
-#: ulanguages.slang_vo
+#: languages.slang_vo
 msgid "Volapuk"
 msgstr ""
 
-#: ulanguages.slang_wa
-msgctxt "ulanguages.slang_wa"
+#: languages.slang_wa
+msgctxt "languages.slang_wa"
 msgid "Walloon"
 msgstr ""
 
-#: ulanguages.slang_wo
+#: languages.slang_wo
 msgid "Wolof"
 msgstr ""
 
-#: ulanguages.slang_xh
+#: languages.slang_xh
 msgid "Xhosa"
 msgstr ""
 
-#: ulanguages.slang_yi
+#: languages.slang_yi
 msgid "Yiddish"
 msgstr ""
 
-#: ulanguages.slang_yo
+#: languages.slang_yo
 msgid "Yoruba"
 msgstr ""
 
-#: ulanguages.slang_za
+#: languages.slang_za
 msgid "Zhuang"
 msgstr ""
 
-#: ulanguages.slang_zh
+#: languages.slang_zh
 msgid "Chinese"
 msgstr ""
 
-#: ulanguages.slang_zu
+#: languages.slang_zu
 msgid "Zulu"
 msgstr ""

trunk/Packages/Common/Languages/Pool.cs.po

@@ -10 +10 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: upool.sobjectpoolempty
+#: pool.sobjectpoolempty
+#, fuzzy
+msgctxt "pool.sobjectpoolempty"
 msgid "Object pool is empty"
 msgstr "Zásobník objektů je prázdný"
 
-#: upool.sreleaseerror
+#: pool.sreleaseerror
+#, fuzzy
+msgctxt "pool.sreleaseerror"
 msgid "Unknown object for release from pool"
 msgstr "Neznýmý objekt pro uvolnění ze zásobníku"

trunk/Packages/Common/Languages/Pool.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: upool.sobjectpoolempty
+#: pool.sobjectpoolempty
 msgid "Object pool is empty"
 msgstr ""
 
-#: upool.sreleaseerror
+#: pool.sreleaseerror
 msgid "Unknown object for release from pool"
 msgstr ""

trunk/Packages/Common/Languages/ResetableThread.cs.po

@@ -10 +10 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: uresetablethread.swaiterror
+#: resetablethread.swaiterror
+#, fuzzy
+msgctxt "resetablethread.swaiterror"
 msgid "WaitFor error"
 msgstr "Chyba WaitFor"

trunk/Packages/Common/Languages/ResetableThread.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: uresetablethread.swaiterror
+#: resetablethread.swaiterror
 msgid "WaitFor error"
 msgstr ""

trunk/Packages/Common/Languages/ScaleDPI.cs.po

@@ -12 +12 @@
 "X-Generator: Poedit 1.8.9\n"
 
-#: uscaledpi.swrongdpi
-#, object-pascal-format
+#: scaledpi.swrongdpi
+#, object-pascal-format, fuzzy
+msgctxt "scaledpi.swrongdpi"
 msgid "Wrong DPI [%d,%d]"
 msgstr "Chybné DPI [%d,%d]"

trunk/Packages/Common/Languages/ScaleDPI.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: uscaledpi.swrongdpi
+#: scaledpi.swrongdpi
 #, object-pascal-format
 msgid "Wrong DPI [%d,%d]"

trunk/Packages/Common/Languages/Threading.cs.po

@@ -10 +10 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: uthreading.scurrentthreadnotfound
-#, object-pascal-format
+#: threading.scurrentthreadnotfound
+#, object-pascal-format, fuzzy
+msgctxt "threading.scurrentthreadnotfound"
 msgid "Current thread ID %d not found in virtual thread list."
 msgstr "Aktuální vlákno ID %d nenalezeno v seznamu virtuálních vláken."

trunk/Packages/Common/Languages/Threading.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: uthreading.scurrentthreadnotfound
+#: threading.scurrentthreadnotfound
 #, object-pascal-format
 msgid "Current thread ID %d not found in virtual thread list."

trunk/Packages/Common/LastOpenedList.pas

@@ -1 @@
-unit ULastOpenedList;
+unit LastOpenedList;
 
 interface
 
 uses
-  Classes, SysUtils, Registry, URegistry, Menus, XMLConf, DOM;
+  Classes, SysUtils, Registry, RegistryEx, Menus, XMLConf, DOM;
 
 type
@@ -194 +194 @@
 
 end.
-

trunk/Packages/Common/ListViewSort.pas

@@ -1 @@
-unit UListViewSort;
+unit ListViewSort;
 
 // Date: 2019-05-17
@@ -149 +149 @@
 destructor TListViewEx.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 

trunk/Packages/Common/Memory.pas

@@ -1 @@
-unit UMemory;
+unit Memory;
 
 interface
@@ -49 +49 @@
 procedure TPositionMemory.SetSize(AValue: Integer);
 begin
-  inherited SetSize(AValue);
+  inherited;
   if FPosition > FSize then FPosition := FSize;
 end;
@@ -106 +106 @@
 begin
   Size := 0;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -120 +120 @@
 
 end.
-

trunk/Packages/Common/MetaCanvas.pas

@@ -1 @@
-unit UMetaCanvas;
+unit MetaCanvas;
 
 interface
@@ -63 +63 @@
 
   TCanvasPolygon = class(TCanvasObject)
+    Pen: TPen;
+    Brush: TBrush;
+    Points: array of TPoint;
+    procedure Paint(Canvas: TCanvas); override;
+    procedure Zoom(Factor: Double); override;
+    procedure Move(Delta: TPoint); override;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { TCanvasPolyline }
+
+  TCanvasPolyline = class(TCanvasObject)
+    Pen: TPen;
+    Brush: TBrush;
+    Points: array of TPoint;
+    procedure Paint(Canvas: TCanvas); override;
+    procedure Zoom(Factor: Double); override;
+    procedure Move(Delta: TPoint); override;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { TCanvasPolyBezier }
+
+  TCanvasPolyBezier = class(TCanvasObject)
     Pen: TPen;
     Brush: TBrush;
@@ -124 +150 @@
     procedure SetWidth(AValue: Integer); override;
     function GetWidth: Integer; override;
-    procedure DoLine (x1,y1,x2,y2:Integer); override;
+    procedure DoLine (x1,y1,x2,y2:integer); override;
     procedure DoTextOut(X, Y: Integer; Text: string); override;
     procedure DoRectangle(const Bounds: TRect); override;
@@ -133 +159 @@
     procedure DoMoveTo(X, Y: Integer); override;
     procedure DoLineTo(X, Y: Integer); override;
+    procedure DoPolyline(const Points: array of TPoint); override;
+    procedure DoPolyBezier(Points: PPoint; NumPts: Integer;
+      Filled: Boolean = False; Continuous: Boolean = False); override;
   public
     Objects: TCanvasObjects;
@@ -141 +170 @@
     procedure TextOut(X,Y: Integer; const Text: String); override;
     procedure Polygon(Points: PPoint; NumPts: Integer; Winding: Boolean = False); override;
+    procedure Polyline(Points: PPoint; NumPts: Integer); override;
+    procedure PolyBezier(Points: PPoint; NumPts: Integer;
+      Filled: Boolean = False; Continuous: Boolean = True); override;
     procedure Ellipse(x1, y1, x2, y2: Integer); override;
     procedure StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic); override;
@@ -159 +191 @@
 
 uses
-  UGeometric, LCLIntf;
+  Geometric, LCLIntf;
+
+{ TCanvasPolyBezier }
+
+procedure TCanvasPolyBezier.Paint(Canvas: TCanvas);
+begin
+  Canvas.Pen.Assign(Pen);
+  Canvas.Brush.Assign(Brush);
+  Canvas.PolyBezier(Points);
+end;
+
+procedure TCanvasPolyBezier.Zoom(Factor: Double);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Points) do
+    Points[I] := Point(Trunc(Points[I].X * Factor),
+      Trunc(Points[I].Y * Factor));
+  Pen.Width := Trunc(Pen.Width * Factor);
+end;
+
+procedure TCanvasPolyBezier.Move(Delta: TPoint);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Points) do
+    Points[I] := AddPoint(Points[I], Delta);
+end;
+
+constructor TCanvasPolyBezier.Create;
+begin
+  Pen := TPen.Create;
+  Brush := TBrush.Create;
+end;
+
+destructor TCanvasPolyBezier.Destroy;
+begin
+  FreeAndNil(Brush);
+  FreeAndNil(Pen);
+  inherited;
+end;
+
+{ TCanvasPolyline }
+
+procedure TCanvasPolyline.Paint(Canvas: TCanvas);
+begin
+  Canvas.Pen.Assign(Pen);
+  Canvas.Brush.Assign(Brush);
+  Canvas.Polyline(Points);
+end;
+
+procedure TCanvasPolyline.Zoom(Factor: Double);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Points) do
+    Points[I] := Point(Trunc(Points[I].X * Factor),
+      Trunc(Points[I].Y * Factor));
+  Pen.Width := Trunc(Pen.Width * Factor);
+end;
+
+procedure TCanvasPolyline.Move(Delta: TPoint);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Points) do
+    Points[I] := AddPoint(Points[I], Delta);
+end;
+
+constructor TCanvasPolyline.Create;
+begin
+  Pen := TPen.Create;
+  Brush := TBrush.Create;
+end;
+
+destructor TCanvasPolyline.Destroy;
+begin
+  FreeAndNil(Brush);
+  FreeAndNil(Pen);
+  inherited;
+end;
 
 { TCanvasPie }
@@ -304 +416 @@
 destructor TCanvasPolygon.Destroy;
 begin
-  Brush.Free;
-  Pen.Free;
+  FreeAndNil(Brush);
+  FreeAndNil(Pen);
   inherited;
 end;
@@ -451 +563 @@
 end;
 
-procedure TMetaCanvas.DoLine(x1, y1, x2, y2: Integer);
+procedure TMetaCanvas.DoLine(x1, y1, x2, y2: integer);
 var
   NewObj: TCanvasLine;
@@ -511 +623 @@
     APoints[I] := Points[I];
   DoPolygon(APoints);
+end;
+
+procedure TMetaCanvas.Polyline(Points: PPoint; NumPts: Integer);
+var
+  APoints: array of TPoint;
+  I: Integer;
+begin
+  APoints := nil;
+  SetLength(APoints, NumPts);
+  for I := 0 to High(APoints) do
+    APoints[I] := Points[I];
+  DoPolyline(APoints);
+end;
+
+procedure TMetaCanvas.PolyBezier(Points: PPoint; NumPts: Integer;
+  Filled: Boolean; Continuous: Boolean);
+begin
+  DoPolyBezier(Points, NumPts, Filled, Continuous);
 end;
 
@@ -580 +710 @@
 end;
 
+procedure TMetaCanvas.DoPolyline(const Points: array of TPoint);
+var
+  NewObj: TCanvasPolyline;
+  I: Integer;
+begin
+  NewObj := TCanvasPolyline.Create;
+  NewObj.Brush.Assign(Brush);
+  NewObj.Pen.Assign(Pen);
+  SetLength(NewObj.Points, Length(Points));
+  for I := 0 to High(Points) do
+    NewObj.Points[I] := Points[I];
+  Objects.Add(NewObj);
+end;
+
+procedure TMetaCanvas.DoPolyBezier(Points: PPoint; NumPts: Integer;
+  Filled: Boolean; Continuous: Boolean);
+var
+  NewObj: TCanvasPolyBezier;
+  I: Integer;
+begin
+  NewObj := TCanvasPolyBezier.Create;
+  NewObj.Brush.Assign(Brush);
+  NewObj.Pen.Assign(Pen);
+  SetLength(NewObj.Points, NumPts);
+  for I := 0 to High(NewObj.Points) do
+    NewObj.Points[I] := Points[I];
+  Objects.Add(NewObj);
+end;
+
 procedure TMetaCanvas.FillRect(const ARect: TRect);
 begin
@@ -664 +823 @@
 
 end.
-
-

trunk/Packages/Common/PersistentForm.pas

@@ -1 @@
-unit UPersistentForm;
-
-// Date: 2020-11-26
+unit PersistentForm;
 
 interface
 
 uses
-  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls,
+  Classes, SysUtils, Forms, RegistryEx, LCLIntf, Registry, Controls, ComCtrls,
   ExtCtrls, LCLType;
 
@@ -21 +19 @@
     procedure SaveControl(Control: TControl);
   public
-    FormNormalSize: TRect;
     FormRestoredSize: TRect;
     FormWindowState: TWindowState;
@@ -155 +152 @@
     RootKey := RegistryContext.RootKey;
     OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
-    // Normal size
-    FormNormalSize.Left := ReadIntegerWithDefault('NormalLeft', FormNormalSize.Left);
-    FormNormalSize.Top := ReadIntegerWithDefault('NormalTop', FormNormalSize.Top);
-    FormNormalSize.Right := ReadIntegerWithDefault('NormalWidth', FormNormalSize.Right - FormNormalSize.Left)
-      + FormNormalSize.Left;
-    FormNormalSize.Bottom := ReadIntegerWithDefault('NormalHeight', FormNormalSize.Bottom - FormNormalSize.Top)
-      + FormNormalSize.Top;
+
     // Restored size
     FormRestoredSize.Left := ReadIntegerWithDefault('RestoredLeft', FormRestoredSize.Left);
@@ -169 +160 @@
     FormRestoredSize.Bottom := ReadIntegerWithDefault('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top)
       + FormRestoredSize.Top;
+
     // Other state
     FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(FormWindowState)));
@@ -183 +175 @@
     RootKey := RegistryContext.RootKey;
     OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
-    // Normal state
-    WriteInteger('NormalWidth', FormNormalSize.Right - FormNormalSize.Left);
-    WriteInteger('NormalHeight', FormNormalSize.Bottom - FormNormalSize.Top);
-    WriteInteger('NormalTop', FormNormalSize.Top);
-    WriteInteger('NormalLeft', FormNormalSize.Left);
-    // Restored state
+
+    // Restored size
     WriteInteger('RestoredWidth', FormRestoredSize.Right - FormRestoredSize.Left);
     WriteInteger('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top);
     WriteInteger('RestoredTop', FormRestoredSize.Top);
     WriteInteger('RestoredLeft', FormRestoredSize.Left);
+
     // Other state
     WriteInteger('WindowState', Integer(FormWindowState));
@@ -257 +246 @@
 begin
   Self.Form := Form;
+
   // Set default
-  FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
-    (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
   FormRestoredSize := Bounds((Screen.Width - Form.Width) div 2,
     (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
@@ -267 +255 @@
   LoadFromRegistry(RegistryContext);
 
-  if not EqualRect(FormNormalSize, FormRestoredSize) or
-    DefaultMaximized then begin
+  if (FormWindowState = wsMaximized) or DefaultMaximized then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;
@@ -277 +264 @@
     // Restore to normal state
     Form.WindowState := wsNormal;
-    if FEntireVisible then FormNormalSize := CheckEntireVisible(FormNormalSize)
+    if FEntireVisible then FormRestoredSize := CheckEntireVisible(FormRestoredSize)
       else if FMinVisiblePart > 0 then
-    FormNormalSize := CheckPartVisible(FormNormalSize, FMinVisiblePart);
-    if not EqualRect(FormNormalSize, Form.BoundsRect) then
-      Form.BoundsRect := FormNormalSize;
+        FormRestoredSize := CheckPartVisible(FormRestoredSize, FMinVisiblePart);
+    if not EqualRect(FormRestoredSize, Form.BoundsRect) then
+      Form.BoundsRect := FormRestoredSize;
   end;
   if FormFullScreen then SetFullScreen(True);
@@ -290 +277 @@
 begin
   Self.Form := Form;
-  FormNormalSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
-  if not FormFullScreen then
-    FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
-      Form.RestoredHeight);
-  FormWindowState := Form.WindowState;
+  if not FormFullScreen then begin
+    FormWindowState := Form.WindowState;
+    if FormWindowState = wsMaximized then begin
+      FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+        Form.RestoredHeight);
+    end else
+    if FormWindowState = wsNormal then begin
+      FormRestoredSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
+    end;
+  end;
   SaveToRegistry(RegistryContext);
   SaveControl(Form);
@@ -312 +304 @@
   if State then begin
     FormFullScreen := True;
-    FormNormalSize := Form.BoundsRect;
-    FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
-      Form.RestoredHeight);
+    if Form.WindowState = wsMaximized then begin
+      FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+        Form.RestoredHeight);
+    end else
+    if Form.WindowState = wsNormal then begin
+      FormRestoredSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
+    end;
     FormWindowState := Form.WindowState;
+    Form.WindowState := wsMaximized;
+    Form.WindowState := wsNormal;
     ShowWindow(Form.Handle, SW_SHOWFULLSCREEN);
     {$IFDEF WINDOWS}
@@ -327 +325 @@
     ShowWindow(Form.Handle, SW_SHOWNORMAL);
     if FormWindowState = wsNormal then begin
-      Form.BoundsRect := FormNormalSize;
+      Form.WindowState := wsNormal;
+      Form.BoundsRect := FormRestoredSize;
     end else
     if FormWindowState = wsMaximized then begin
@@ -337 +336 @@
 
 end.
-

trunk/Packages/Common/PixelPointer.pas

@@ -1 @@
-unit UPixelPointer;
+unit PixelPointer;
 
 interface
@@ -15 +15 @@
   private
     procedure SetRGB(AValue: Cardinal);
-    function GetRGB: Cardinal;    
+    function GetRGB: Cardinal;
   public
     property RGB: Cardinal read GetRGB write SetRGB;
@@ -41 +41 @@
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
+    class function Create(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline; static;
   end;
   PPixelPointer = ^TPixelPointer;
 
-  function PixelPointer(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline;
   function SwapRedBlue(Color: TColor32): TColor32;
   procedure BitmapCopyRect(DstBitmap: TRasterImage; DstRect: TRect; SrcBitmap: TRasterImage; SrcPos: TPoint);
@@ -120 +120 @@
   SrcBitmap.BeginUpdate(True);
   DstBitmap.BeginUpdate(True);
-  SrcPtr := PixelPointer(SrcBitmap, SrcPos.X, SrcPos.Y);
-  DstPtr := PixelPointer(DstBitmap, DstRect.Left, DstRect.Top);
+  SrcPtr := TPixelPointer.Create(SrcBitmap, SrcPos.X, SrcPos.Y);
+  DstPtr := TPixelPointer.Create(DstBitmap, DstRect.Left, DstRect.Top);
   for Y := 0 to DstRect.Height - 1 do begin
     for X := 0 to DstRect.Width - 1 do begin
@@ -150 +150 @@
   SrcBitmap.BeginUpdate(True);
   DstBitmap.BeginUpdate(True);
-  SrcPtr := PixelPointer(SrcBitmap, SrcRect.Left, SrcRect.Top);
-  DstPtr := PixelPointer(DstBitmap, DstRect.Left, DstRect.Top);
+  SrcPtr := TPixelPointer.Create(SrcBitmap, SrcRect.Left, SrcRect.Top);
+  DstPtr := TPixelPointer.Create(DstBitmap, DstRect.Left, DstRect.Top);
   for Y := 0 to DstRect.Height - 1 do begin
     for X := 0 to DstRect.Width - 1 do begin
@@ -181 +181 @@
 begin
   Bitmap.BeginUpdate(True);
-  Ptr := PixelPointer(Bitmap);
+  Ptr := TPixelPointer.Create(Bitmap);
   for Y := 0 to Bitmap.Height - 1 do begin
     for X := 0 to Bitmap.Width - 1 do begin
@@ -198 +198 @@
 begin
   Bitmap.BeginUpdate(True);
-  Ptr := PixelPointer(Bitmap, Rect.Left, Rect.Top);
+  Ptr := TPixelPointer.Create(Bitmap, Rect.Left, Rect.Top);
   for Y := 0 to Rect.Height - 1 do begin
     for X := 0 to Rect.Width - 1 do begin
@@ -215 +215 @@
 begin
   Bitmap.BeginUpdate(True);
-  Ptr := PixelPointer(Bitmap);
+  Ptr := TPixelPointer.Create(Bitmap);
   for Y := 0 to Bitmap.Height - 1 do begin
     for X := 0 to Bitmap.Width - 1 do begin
@@ -232 +232 @@
 begin
   Bitmap.BeginUpdate(True);
-  Ptr := PixelPointer(Bitmap);
+  Ptr := TPixelPointer.Create(Bitmap);
   for Y := 0 to Bitmap.Height - 1 do begin
     for X := 0 to Bitmap.Width - 1 do begin
@@ -252 +252 @@
   Pixel := Color32ToPixel32(Color);
   Bitmap.BeginUpdate(True);
-  Ptr := PixelPointer(Bitmap);
+  Ptr := TPixelPointer.Create(Bitmap);
   for Y := 0 to Bitmap.Height - 1 do begin
     for X := 0 to Bitmap.Width - 1 do begin
@@ -295 +295 @@
 end;
 
-function PixelPointer(Bitmap: TRasterImage; BaseX: Integer;
+class function TPixelPointer.Create(Bitmap: TRasterImage; BaseX: Integer;
   BaseY: Integer): TPixelPointer;
 begin
@@ -310 +310 @@
 end;
 
-
 end.
-

trunk/Packages/Common/Pool.pas

@@ -1 @@
-unit UPool;
+unit Pool;
 
 interface
 
 uses
-  Classes, SysUtils, syncobjs, Generics.Collections, UThreading;
+  Classes, SysUtils, syncobjs, Generics.Collections, Threading;
 
 type
@@ -106 +106 @@
 constructor TThreadedPool.Create;
 begin
-  inherited Create;
+  inherited;
   Lock := TCriticalSection.Create;
 end;
@@ -114 +114 @@
   TotalCount := 0;
   Lock.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -199 +199 @@
 
 end.
-

trunk/Packages/Common/PrefixMultiplier.pas

@@ -1 @@
-unit UPrefixMultiplier;
+unit PrefixMultiplier;
 
 // Date: 2010-06-01
@@ -30 +30 @@
   BasePrefixMultipliers: TPrefixMultiplierDef =
   (
-    (ShortText: 'y'; FullText: 'yocto'; Value: 1E-24),
-          (ShortText: 'z'; FullText: 'zepto'; Value: 1E-21),
-    (ShortText: 'a'; FullText: 'atto'; Value: 1E-18),
-    (ShortText: 'f'; FullText: 'femto'; Value: 1E-15),
-    (ShortText: 'p'; FullText: 'piko'; Value: 1E-12),
-    (ShortText: 'n'; FullText: 'nano'; Value: 1E-9),
-    (ShortText: 'u'; FullText: 'mikro'; Value: 1E-6),
-    (ShortText: 'm'; FullText: 'mili'; Value: 1E-3),
+    (ShortText: 'y'; FullText: 'yocto'; Value: 1e-24),
+      (ShortText: 'z'; FullText: 'zepto'; Value: 1e-21),
+    (ShortText: 'a'; FullText: 'atto'; Value: 1e-18),
+    (ShortText: 'f'; FullText: 'femto'; Value: 1e-15),
+    (ShortText: 'p'; FullText: 'piko'; Value: 1e-12),
+    (ShortText: 'n'; FullText: 'nano'; Value: 1e-9),
+    (ShortText: 'u'; FullText: 'mikro'; Value: 1e-6),
+    (ShortText: 'm'; FullText: 'mili'; Value: 1e-3),
     (ShortText: ''; FullText: ''; Value: 1e0),
     (ShortText: 'k'; FullText: 'kilo'; Value: 1e3),
@@ -51 +51 @@
   TimePrefixMultipliers: TPrefixMultiplierDef =
   (
-    (ShortText: 'ys'; FullText: 'yocto'; Value: 1E-24),
-          (ShortText: 'zs'; FullText: 'zepto'; Value: 1E-21),
-    (ShortText: 'as'; FullText: 'atto'; Value: 1E-18),
-    (ShortText: 'fs'; FullText: 'femto'; Value: 1E-15),
-    (ShortText: 'ps'; FullText: 'piko'; Value: 1E-12),
-    (ShortText: 'ns'; FullText: 'nano'; Value: 1E-9),
-    (ShortText: 'us'; FullText: 'mikro'; Value: 1E-6),
-    (ShortText: 'ms'; FullText: 'mili'; Value: 1E-3),
+    (ShortText: 'ys'; FullText: 'yocto'; Value: 1e-24),
+      (ShortText: 'zs'; FullText: 'zepto'; Value: 1e-21),
+    (ShortText: 'as'; FullText: 'atto'; Value: 1e-18),
+    (ShortText: 'fs'; FullText: 'femto'; Value: 1e-15),
+    (ShortText: 'ps'; FullText: 'piko'; Value: 1e-12),
+    (ShortText: 'ns'; FullText: 'nano'; Value: 1e-9),
+    (ShortText: 'us'; FullText: 'mikro'; Value: 1e-6),
+    (ShortText: 'ms'; FullText: 'mili'; Value: 1e-3),
     (ShortText: 's'; FullText: 'sekunda'; Value: 1),
     (ShortText: 'min'; FullText: 'minuta'; Value: 60),
@@ -124 +124 @@
 
 end.
-

trunk/Packages/Common/RegistryEx.pas

@@ -1 @@
-unit URegistry;
+unit RegistryEx;
 
 interface

trunk/Packages/Common/ResetableThread.pas

@@ -1 @@
-unit UResetableThread;
+unit ResetableThread;
 
 interface
 
 uses
-  Classes, SysUtils, syncobjs, UThreading, UPool;
+  Classes, SysUtils, syncobjs, Threading, Pool;
 
 type
@@ -165 +165 @@
   FreeAndNil(FStopEvent);
   FreeAndNil(FLock);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -284 +284 @@
 constructor TThreadPool.Create;
 begin
-  inherited Create;
+  inherited;
 end;
 
@@ -291 +291 @@
   TotalCount := 0;
   WaitForEmpty;
-  inherited Destroy;
+  inherited;
 end;
 
 end.
-
-

trunk/Packages/Common/ScaleDPI.pas

@@ -1 @@
-unit UScaleDPI;
+unit ScaleDPI;
 
 { See: http://wiki.lazarus.freepascal.org/High_DPI }
@@ -259 +259 @@
     begin
       ImgList.Add(Temp[I], nil);
-      Temp[I].Free;
+      Temp[i].Free;
     end;
   finally

trunk/Packages/Common/StopWatch.pas

@@ -35 +35 @@
 implementation
 
-constructor TStopWatch.Create(const startOnCreate : Boolean = False) ;
+constructor TStopWatch.Create(const startOnCreate : boolean = false) ;
 begin
   inherited Create;
@@ -72 +72 @@
 begin
   dt := ElapsedMiliseconds / MSecsPerSec / SecsPerDay;
-  Result := Format('%d days, %s', [Trunc(dt), FormatDateTime('hh:nn:ss.z', Frac(dt))]) ;
+  result := Format('%d days, %s', [Trunc(dt), FormatDateTime('hh:nn:ss.z', Frac(dt))]) ;
 end;
 
@@ -93 +93 @@
 
 end.
-

trunk/Packages/Common/StringTable.pas

@@ -1 @@
-unit UStringTable;
+unit StringTable;
 
 interface
@@ -39 +39 @@
 function TStringTable.GetColCount: Integer;
 begin
-  Result := Size.X;
+  Result := Size.x;
 end;
 
@@ -69 +69 @@
 end;
 
-
 end.
-

trunk/Packages/Common/SyncCounter.pas

@@ -1 @@
-unit USyncCounter;
+unit SyncCounter;
 
 interface
@@ -68 +68 @@
 begin
   Lock.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -78 +78 @@
 
 end.
-

trunk/Packages/Common/Theme.pas

@@ -1 @@
-unit UTheme;
+unit Theme;
 
 interface
@@ -186 +186 @@
 end;
 
-
 end.
-

trunk/Packages/Common/Threading.pas

@@ -1 @@
-unit UThreading;
+unit Threading;
 
 interface
@@ -292 +292 @@
   end;
   FThread.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -366 +366 @@
 
 end.
-

trunk/Packages/Common/Translator.pas

@@ -1 @@
-unit UTranslator;
+unit Translator;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, Forms, ExtCtrls, Controls, LazFileUtils, LazUTF8,
-  Translations, TypInfo, Dialogs, FileUtil, LCLProc, ULanguages, LCLType,
+  Translations, TypInfo, Dialogs, FileUtil, LCLProc, Languages, LCLType,
   LCLVersion, Generics.Collections;
 
@@ -420 +420 @@
 
   if Lang = '' then begin
-    for I := 1 to Paramcount - 1 do
-      if (ParamStr(I) = '--LANG') or (ParamStr(I) = '-l') or
-        (ParamStr(I) = '--lang') then
-        Lang := ParamStr(I + 1);
+    for i := 1 to Paramcount - 1 do
+      if (ParamStr(i) = '--LANG') or (ParamStr(i) = '-l') or
+        (ParamStr(i) = '--lang') then
+        Lang := ParamStr(i + 1);
   end;
   if Lang = '' then begin
@@ -473 +473 @@
       DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'languages' + DirectorySeparator + LangID +
       DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator
       + LangID + DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator
@@ -489 +489 @@
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     {$IFDEF UNIX}
@@ -496 +496 @@
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
     {$ENDIF}
     // Let us search for reducted files
-    LangShortID := Copy(LangID, 1, 2);
+    LangShortID := copy(LangID, 1, 2);
     // At first, check all was checked
     Result := ExtractFilePath(ParamStrUTF8(0)) + LangShortID +
       DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'languages' + DirectorySeparator +
@@ -510 +510 @@
       ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator
@@ -516 +516 @@
       ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator
@@ -522 +522 @@
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     // Full language in file name - this will be default for the project
@@ -529 +529 @@
       Result := ExtractFilePath(ParamStrUTF8(0)) + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangID])) + LCExt;
       if FileExistsUTF8(Result) then
-        Exit;
+        exit;
       // Common location (like in Lazarus)
       Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator +
         ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangID])) + LCExt;
       if FileExistsUTF8(Result) then
-        Exit;
+        exit;
 
       Result := ExtractFilePath(ParamStrUTF8(0)) + 'languages' +
         DirectorySeparator + ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangID])) + LCExt;
       if FileExistsUTF8(Result) then
-        Exit;
+        exit;
     except
       Result := ''; // Or do something else (useless)
@@ -548 +548 @@
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), LCExt);
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
     {$ENDIF}
     Result := ExtractFilePath(ParamStrUTF8(0)) + ChangeFileExt(
       ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangShortID])) + LCExt;
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'locale' + DirectorySeparator +
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangShortID])) + LCExt;
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
 
     Result := ExtractFilePath(ParamStrUTF8(0)) + 'languages' + DirectorySeparator +
       ChangeFileExt(ExtractFileName(ParamStrUTF8(0)), Format(FormatLang, [LangShortID])) + LCExt;
     if FileExistsUTF8(Result) then
-      Exit;
+      exit;
   end;
 
@@ -569 +569 @@
 end;
 
-
 end.
-

trunk/Packages/Common/URI.pas

@@ -1 @@
-unit UURI;
+unit URI;
 
 // Date: 2011-04-04
@@ -182 +182 @@
 begin
   Items.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -231 +231 @@
 begin
   Path.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -242 +242 @@
     Fragment := TURI(Source).Fragment;
     Query := TURI(Source).Query;
-  end else inherited Assign(Source);
+  end else inherited;
 end;
 
@@ -290 +290 @@
 destructor TURL.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -343 +343 @@
 begin
   Directory.Free;
-  inherited Destroy;
-end;
-
+  inherited;
+end;
 
 end.
-

trunk/Packages/Common/XML.pas

@@ -1 @@
-unit UXMLUtils;
+unit XML;
 
 interface
@@ -14 +14 @@
 procedure WriteString(Node: TDOMNode; Name: string; Value: string);
 procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
+procedure WriteDouble(Node: TDOMNode; Name: string; Value: Double);
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
@@ -19 +20 @@
 function ReadString(Node: TDOMNode; Name: string; DefaultValue: string): string;
 function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime): TDateTime;
+function ReadDouble(Node: TDOMNode; Name: string; DefaultValue: Double): Double;
 procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
 
 
 implementation
+
+function ReadDouble(Node: TDOMNode; Name: string; DefaultValue: Double): Double;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToFloat(string(NewNode.TextContent));
+end;
 
 procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
@@ -200 +212 @@
 end;
 
+procedure WriteDouble(Node: TDOMNode; Name: string; Value: Double);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(FloatToStr(Value));
+  Node.AppendChild(NewNode);
+end;
+
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 var
@@ -252 +273 @@
 
 end.
-

trunk/Settings.pas

@@ -6 +6 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   LCLProc, ScreenTools, Messg, ButtonA, Directories, DrawDlg, ButtonC,
-  UKeyBindings, ULanguages;
+  KeyBindings, Languages;
 
 type
@@ -270 +270 @@
     else ButtonFullscreen.ButtonIndex := 2;
   LocalGamma := Gamma;
-  LocalKeyBindings.Assign(KeyBindings);
+  LocalKeyBindings.Assign(KeyBindings.KeyBindings);
 end;
 
@@ -288 +288 @@
   Gamma := LocalGamma;
   if NeedRestart then SimpleMessage(SRestartMsg);
-  KeyBindings.Assign(LocalKeyBindings);
+  KeyBindings.KeyBindings.Assign(LocalKeyBindings);
 end;
 

trunk/Start.pas

@@ -7 +7 @@
   GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls,
-  Menus, Registry, DrawDlg, Generics.Collections, Protocol, UMiniMap, UBrain,
-  UTranslator;
+  Menus, Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain,
+  Translator;
 
 type
@@ -151 +151 @@
 
 uses
-  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, UKeyBindings,
-  ULanguages;
+  Global, Directories, Direct, ScreenTools, Inp, Back, Settings, KeyBindings,
+  Languages;
 
 {$R *.lfm}
@@ -435 +435 @@
   end;
 
-  KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
+  KeyBindings.KeyBindings.LoadFromRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
 end;
 
@@ -459 +459 @@
   end;
 
-  KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
+  KeyBindings.KeyBindings.SaveToRegistry(HKEY_CURRENT_USER, AppRegistryKey + '\KeyBindings');
 end;