aksdb
/
CentrED
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

⬆️ Convert to Lazarus 2.2.2

This commit is contained in:
Andreas Schneider 2023-01-15 16:37:33 +01:00
parent 2b8eb45ccf
commit 38e0d404db
25 changed files with 541 additions and 582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Client/CentrED.lpi
View File

@ -249,8 +249,7 @@
<MinVersion Minor="5" Release="3" Valid="True"/> <MinVersion Minor="5" Release="3" Valid="True"/>
</Item5> </Item5>
<Item6> <Item6>
<PackageName Value="virtualtreeview_package"/> <PackageName Value="laz.virtualtreeview_package"/>
<MinVersion Major="4" Minor="5" Release="1" Valid="True"/>
</Item6> </Item6>
</RequiredPackages> </RequiredPackages>
<Units Count="60"> <Units Count="60">

14
Client/GUI/VirtualList.pas
View File

@ -4,7 +4,7 @@ unit VirtualList;
interface interface
uses uses
Forms, Controls, StdCtrls, Graphics, Classes, SysUtils, VirtualTrees, Forms, Controls, StdCtrls, Graphics, Classes, SysUtils, laz.VirtualTrees,
Logging, LMessages, LCLIntf, Math; Logging, LMessages, LCLIntf, Math;
type type
@ -30,7 +30,7 @@ type
{ TVirtualList } { TVirtualList }
TVirtualList = class(TVirtualDrawTree) TVirtualList = class(TLazVirtualDrawTree)
private private
HintCanvas: TCanvas; HintCanvas: TCanvas;
@ -91,19 +91,19 @@ Implementation
constructor TVirtualList.Create(AOwner: TComponent); constructor TVirtualList.Create(AOwner: TComponent);
var var
Pvdt: TVirtualDrawTree; Pvdt: TLazVirtualDrawTree;
column: TVirtualTreeColumn; column: TVirtualTreeColumn;
c: Integer; c: Integer;
begin begin
//Logger.Send([lcClient, lcDebug], 'TVirtualTree.Create START'); //Logger.Send([lcClient, lcDebug], 'TVirtualTree.Create START');
if not (AOwner is TVirtualDrawTree) then begin if not (AOwner is TLazVirtualDrawTree) then begin
Logger.Send([lcClient, lcDebug], 'TVirtualTree.Create(AOwner: TVirtualDrawTree) must get argument TVirtualDrawTree'); Logger.Send([lcClient, lcDebug], 'TVirtualTree.Create(AOwner: TLazVirtualDrawTree) must get argument TLazVirtualDrawTree');
Assert(not (AOwner is TVirtualDrawTree), 'TVirtualTree.Create(AOwner: TVirtualDrawTree) must get argument TVirtualDrawTree'); Assert(not (AOwner is TLazVirtualDrawTree), 'TVirtualTree.Create(AOwner: TLazVirtualDrawTree) must get argument TLazVirtualDrawTree');
Abort; Abort;
Halt; Halt;
end; end;
inherited Create(AOwner.Owner); inherited Create(AOwner.Owner);
Pvdt := TVirtualDrawTree(AOwner); Pvdt := TLazVirtualDrawTree(AOwner);
Self.Parent := Pvdt.Parent; Self.Parent := Pvdt.Parent;
FSelectionCount := 0; FSelectionCount := 0;

2
Client/Tools/UfrmDrawSettings.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Spin, ExtCtrls, LMessages, VirtualTrees, VirtualList, UfrmToolWindow, UfrmMain; Spin, ExtCtrls, LMessages, laz.VirtualTrees, VirtualList, UfrmToolWindow, UfrmMain;
type type

4
Client/Tools/UfrmFillSettings.lfm
View File

@ -8,7 +8,7 @@ inherited frmFillSettings: TfrmFillSettings
ClientWidth = 469 ClientWidth = 469
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
object vdtLastPreview: TVirtualDrawTree[0] object vdtLastPreview: TLazVirtualDrawTree[0]
Tag = -1 Tag = -1
AnchorSideLeft.Control = cbCategory AnchorSideLeft.Control = cbCategory
AnchorSideTop.Control = gbHue AnchorSideTop.Control = gbHue
@ -62,7 +62,7 @@ inherited frmFillSettings: TfrmFillSettings
Visible = False Visible = False
OnDrawNode = vdtPreviewDrawNode OnDrawNode = vdtPreviewDrawNode
end end
object vdtEntryPreview: TVirtualDrawTree[1] object vdtEntryPreview: TLazVirtualDrawTree[1]
Tag = -1 Tag = -1
AnchorSideLeft.Control = vdtLastPreview AnchorSideLeft.Control = vdtLastPreview
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom

6
Client/Tools/UfrmFillSettings.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Spin, ExtCtrls, LMessages, VirtualTrees, VirtualList, UfrmToolWindow, UfrmMain; Spin, ExtCtrls, LMessages, laz.VirtualTrees, VirtualList, UfrmToolWindow, UfrmMain;
type type
@ -44,8 +44,8 @@ type
gbHue: TGroupBox; gbHue: TGroupBox;
lblFillType: TLabel; lblFillType: TLabel;
pbHue: TPaintBox; pbHue: TPaintBox;
vdtLastPreview: TVirtualDrawTree; vdtLastPreview: TLazVirtualDrawTree;
vdtEntryPreview: TVirtualDrawTree; vdtEntryPreview: TLazVirtualDrawTree;
procedure cbUseSurfaceAltitudeChange(Sender: TObject); procedure cbUseSurfaceAltitudeChange(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);

4
Client/Tools/UfrmFilter.lfm
View File

@ -188,7 +188,7 @@ object frmFilter: TfrmFilter
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
end end
object vdtFilter: TVirtualDrawTree object vdtFilter: TLazVirtualDrawTree
Tag = -1 Tag = -1
AnchorSideLeft.Control = GroupBox1 AnchorSideLeft.Control = GroupBox1
AnchorSideTop.Control = cbTileFilter AnchorSideTop.Control = cbTileFilter
@ -350,7 +350,7 @@ object frmFilter: TfrmFilter
OnMouseUp = FormMouseUp OnMouseUp = FormMouseUp
TabOrder = 0 TabOrder = 0
end end
object vdtHues: TVirtualDrawTree object vdtHues: TLazVirtualDrawTree
Cursor = 63 Cursor = 63
Left = 4 Left = 4
Height = 119 Height = 119

6
Client/Tools/UfrmFilter.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
ExtCtrls, VirtualTrees, VirtualList, LCLIntf, LCLType, LMessages, Buttons, ExtCtrls, laz.VirtualTrees, VirtualList, LCLIntf, LCLType, LMessages, Buttons,
UPlatformTypes, UStatics, Menus, Logging; UPlatformTypes, UStatics, Menus, Logging;
type type
@ -57,7 +57,7 @@ type
Splitter1: TSplitter; Splitter1: TSplitter;
tFormClose: TTimer; tFormClose: TTimer;
vdtFilter: TVirtualList; vdtFilter: TVirtualList;
vdtHues: TVirtualDrawTree; vdtHues: TLazVirtualDrawTree;
procedure btnClearClick(Sender: TObject); procedure btnClearClick(Sender: TObject);
procedure btnDeleteClick(Sender: TObject); procedure btnDeleteClick(Sender: TObject);
procedure cbHueFilterChange(Sender: TObject); procedure cbHueFilterChange(Sender: TObject);
@ -202,7 +202,7 @@ procedure TfrmFilter.vdtFilterDragOver(Sender: TBaseVirtualTree;
Source: TObject; Shift: TShiftState; State: TDragState; Pt: TPoint; Source: TObject; Shift: TShiftState; State: TDragState; Pt: TPoint;
Mode: TDropMode; var Effect: Integer; var Accept: Boolean); Mode: TDropMode; var Effect: Integer; var Accept: Boolean);
begin begin
if (Source <> Sender) and (Source is TVirtualDrawTree) then if (Source <> Sender) and (Source is TLazVirtualDrawTree) then
begin begin
Accept := True; Accept := True;
end; end;

24
Client/Tools/UfrmHueSettings.lfm
View File

@ -83,8 +83,8 @@ inherited frmHueSettings: TfrmHueSettings
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
Caption = 'Набор случайных цветов' Caption = 'Набор случайных цветов'
ClientHeight = 232 ClientHeight = 226
ClientWidth = 183 ClientWidth = 185
TabOrder = 3 TabOrder = 3
Visible = False Visible = False
object btnAddRandom: TSpeedButton object btnAddRandom: TSpeedButton
@ -132,7 +132,6 @@ inherited frmHueSettings: TfrmHueSettings
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = btnAddRandomClick OnClick = btnAddRandomClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
@ -183,7 +182,6 @@ inherited frmHueSettings: TfrmHueSettings
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = btnDeleteRandomClick OnClick = btnDeleteRandomClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
@ -234,7 +232,6 @@ inherited frmHueSettings: TfrmHueSettings
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = btnClearRandomClick OnClick = btnClearRandomClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
@ -285,7 +282,6 @@ inherited frmHueSettings: TfrmHueSettings
4DFFC88C4FFFC88C4FFFC88C4FFFC88D4FFFC98C4FFFC78B4FFFC5894BFFC476 4DFFC88C4FFFC88C4FFFC88C4FFFC88D4FFFC98C4FFFC78B4FFFC5894BFFC476
3BFF000000000000000000000000000000000000000000000000 3BFF000000000000000000000000000000000000000000000000
} }
NumGlyphs = 0
OnClick = btnRandomPresetSaveClick OnClick = btnRandomPresetSaveClick
ShowCaption = False ShowCaption = False
ShowHint = True ShowHint = True
@ -338,7 +334,6 @@ inherited frmHueSettings: TfrmHueSettings
0000C88B4DFFC88C4FFFC88C4FFFC88C4FFFC88C4FFFC88D4FFFC98C4FFFC78B 0000C88B4DFFC88C4FFFC88C4FFFC88C4FFFC88C4FFFC88D4FFFC98C4FFFC78B
4FFFC5894BFFC4763BFF00000000000000000000000000000000 4FFFC5894BFFC4763BFF00000000000000000000000000000000
} }
NumGlyphs = 0
OnClick = btnRandomPresetDeleteClick OnClick = btnRandomPresetDeleteClick
ShowCaption = False ShowCaption = False
ShowHint = True ShowHint = True
@ -404,8 +399,8 @@ inherited frmHueSettings: TfrmHueSettings
BorderSpacing.Right = 4 BorderSpacing.Right = 4
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 4
Caption = 'Предпросмотр цвета на тайле' Caption = 'Предпросмотр цвета на тайле'
ClientHeight = 75 ClientHeight = 69
ClientWidth = 183 ClientWidth = 185
TabOrder = 4 TabOrder = 4
object ImagePreviewItem: TImage object ImagePreviewItem: TImage
AnchorSideLeft.Control = gbPreview AnchorSideLeft.Control = gbPreview
@ -486,7 +481,7 @@ inherited frmHueSettings: TfrmHueSettings
OnChange = cbRandomChange OnChange = cbRandomChange
TabOrder = 5 TabOrder = 5
end end
object vdtHuePreview: TVirtualDrawTree[6] object vdtHuePreview: TLazVirtualDrawTree[6]
Tag = -1 Tag = -1
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
@ -519,6 +514,7 @@ inherited frmHueSettings: TfrmHueSettings
Header.AutoSizeIndex = -1 Header.AutoSizeIndex = -1
Header.Columns = <> Header.Columns = <>
Header.DefaultHeight = 17 Header.DefaultHeight = 17
Header.Height = 17
Header.MainColumn = -1 Header.MainColumn = -1
Header.Options = [hoShowHint] Header.Options = [hoShowHint]
Header.ParentFont = True Header.ParentFont = True
@ -554,8 +550,8 @@ inherited frmHueSettings: TfrmHueSettings
BorderSpacing.Top = 4 BorderSpacing.Top = 4
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
Caption = 'Последние выбранные цвета' Caption = 'Последние выбранные цвета'
ClientHeight = 82 ClientHeight = 76
ClientWidth = 183 ClientWidth = 185
TabOrder = 6 TabOrder = 6
Visible = False Visible = False
object lbLastUsed: TListBox object lbLastUsed: TListBox
@ -582,7 +578,7 @@ inherited frmHueSettings: TfrmHueSettings
end end
end end
inherited tmClose: TTimer[8] inherited tmClose: TTimer[8]
left = 24 Left = 24
top = 16 Top = 16
end end
end end

14
Client/Tools/UfrmHueSettings.pas
View File

@ -32,7 +32,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
ExtCtrls, Buttons, UfrmToolWindow, XMLRead, XMLWrite, DOM, VirtualTrees, ExtCtrls, Buttons, UfrmToolWindow, XMLRead, XMLWrite, DOM, laz.VirtualTrees,
VirtualList, Math, UHue, UArt, UTiledata, UfrmMain, ImagingComponents, VirtualList, Math, UHue, UArt, UTiledata, UfrmMain, ImagingComponents,
LConvEncoding, ComCtrls, Logging, LCLIntf, LCLType, ULandscape; LConvEncoding, ComCtrls, Logging, LCLIntf, LCLType, ULandscape;
@ -60,7 +60,7 @@ type
lbHue: TListBox; lbHue: TListBox;
lblTileId: TLabel; lblTileId: TLabel;
lbRandom: TListBox; lbRandom: TListBox;
vdtHuePreview: TVirtualDrawTree; vdtHuePreview: TLazVirtualDrawTree;
procedure btnAddRandomClick(Sender: TObject); procedure btnAddRandomClick(Sender: TObject);
procedure btnClearRandomClick(Sender: TObject); procedure btnClearRandomClick(Sender: TObject);
procedure btnDeleteRandomClick(Sender: TObject); procedure btnDeleteRandomClick(Sender: TObject);
@ -82,8 +82,6 @@ type
procedure lbRandomDragDrop(Sender, Source: TObject; X, Y: Integer); procedure lbRandomDragDrop(Sender, Source: TObject; X, Y: Integer);
procedure lbRandomDragOver(Sender, Source: TObject; X, Y: Integer; procedure lbRandomDragOver(Sender, Source: TObject; X, Y: Integer;
State: TDragState; var Accept: Boolean); State: TDragState; var Accept: Boolean);
procedure lvHueCustomDrawItem(Sender: TCustomListView; Item: TListItem;
State: TCustomDrawState; var DefaultDraw: Boolean);
procedure ShowAllClick(Sender: TObject); procedure ShowAllClick(Sender: TObject);
procedure UpdateItemPreview(ID : Integer; Hue: Integer); procedure UpdateItemPreview(ID : Integer; Hue: Integer);
procedure vdtHuePreviewClick(Sender: TObject); procedure vdtHuePreviewClick(Sender: TObject);
@ -472,12 +470,6 @@ begin
if Source = lbHue then Accept := True; if Source = lbHue then Accept := True;
end; end;
procedure TfrmHueSettings.lvHueCustomDrawItem(Sender: TCustomListView;
Item: TListItem; State: TCustomDrawState; var DefaultDraw: Boolean);
begin
end;
function TfrmHueSettings.FindRandomPreset(AName: String): TDOMElement; function TfrmHueSettings.FindRandomPreset(AName: String): TDOMElement;
begin begin
Result := TDOMElement(FRandomHuePresetsDoc.DocumentElement.FirstChild); Result := TDOMElement(FRandomHuePresetsDoc.DocumentElement.FirstChild);
@ -662,7 +654,7 @@ var
mpos: TPoint; mpos: TPoint;
rect: TRect; rect: TRect;
begin begin
id := TVirtualDrawTree(Sender).Tag; id := TLazVirtualDrawTree(Sender).Tag;
info:= Sender.GetNodeData(PaintInfo.Node); info:= Sender.GetNodeData(PaintInfo.Node);
if info^.ID[PaintInfo.Column] <= 0 then begin if info^.ID[PaintInfo.Column] <= 0 then begin
hue := nil; hue := nil;

2
Client/Tools/UfrmSelectionSettings.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Spin, ExtCtrls, LMessages, VirtualTrees, UfrmToolWindow, UfrmMain; Spin, ExtCtrls, LMessages, laz.VirtualTrees, UfrmToolWindow, UfrmMain;
type type

2
Client/Tools/UfrmSurfElevateSettings.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Spin, ExtCtrls, LMessages, VirtualTrees, UfrmToolWindow, UfrmMain; Spin, ExtCtrls, LMessages, laz.VirtualTrees, UfrmToolWindow, UfrmMain;
type type

2
Client/Tools/UfrmSurfSmoothSettings.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Spin, ExtCtrls, LMessages, VirtualTrees, UfrmToolWindow, UfrmMain; Spin, ExtCtrls, LMessages, laz.VirtualTrees, UfrmToolWindow, UfrmMain;
type type

2
Client/Tools/UfrmSurfStretchSettings.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Spin, ExtCtrls, LMessages, VirtualTrees, UfrmToolWindow, UfrmMain; Spin, ExtCtrls, LMessages, laz.VirtualTrees, UfrmToolWindow, UfrmMain;
type type

4
Client/UPlatformTypes.pas
View File

@ -31,10 +31,10 @@ interface
uses uses
Classes, SysUtils, Classes, SysUtils,
{$IFDEF WINDOWS}ActiveX{$ELSE}fakeactivex{$ENDIF}; {$IFDEF WINDOWS}ActiveX{$ELSE}laz.FakeActiveX{$ENDIF};
type type
IDataObject = {$IFDEF WINDOWS}ActiveX{$ELSE}fakeactivex{$ENDIF}.IDataObject; IDataObject = {$IFDEF WINDOWS}ActiveX{$ELSE}laz.FakeActiveX{$ENDIF}.IDataObject;
implementation implementation

2
Client/UfrmAccountControl.lfm
View File

@ -73,7 +73,7 @@ object frmAccountControl: TfrmAccountControl
Style = tbsDivider Style = tbsDivider
end end
end end
object vstAccounts: TVirtualStringTree object vstAccounts: TLazVirtualStringTree
Left = 0 Left = 0
Height = 352 Height = 352
Top = 26 Top = 26

4
Client/UfrmAccountControl.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ComCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ComCtrls,
StdCtrls, ExtCtrls, VirtualTrees, Math, UEnhancedMemoryStream, UEnums; StdCtrls, ExtCtrls, laz.VirtualTrees, Math, UEnhancedMemoryStream, UEnums;
type type
@ -46,7 +46,7 @@ type
tbEditUser: TToolButton; tbEditUser: TToolButton;
tbDeleteUser: TToolButton; tbDeleteUser: TToolButton;
tbSeparator1: TToolButton; tbSeparator1: TToolButton;
vstAccounts: TVirtualStringTree; vstAccounts: TLazVirtualStringTree;
procedure tbEditUserClick(Sender: TObject); procedure tbEditUserClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);

101
Client/UfrmEditAccount.lfm
View File

@ -1,19 +1,20 @@
object frmEditAccount: TfrmEditAccount object frmEditAccount: TfrmEditAccount
Left = 1146 Left = 1146
Height = 214 Height = 268
Top = 205 Top = 205
Width = 261 Width = 326
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Редактирование аккаунта' Caption = 'Редактирование аккаунта'
ClientHeight = 214 ClientHeight = 268
ClientWidth = 261 ClientWidth = 326
Font.Height = -11 DesignTimePPI = 120
Font.Height = -14
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
Position = poOwnerFormCenter Position = poOwnerFormCenter
LCLVersion = '0.9.30.2' LCLVersion = '2.2.2.0'
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0 Left = 0
Height = 173 Height = 173
@ -25,13 +26,13 @@ object frmEditAccount: TfrmEditAccount
TabOrder = 0 TabOrder = 0
object tsGeneral: TTabSheet object tsGeneral: TTabSheet
Caption = 'Общие' Caption = 'Общие'
ClientHeight = 147 ClientHeight = 135
ClientWidth = 253 ClientWidth = 251
object lblPasswordHint: TLabel object lblPasswordHint: TLabel
Left = 86 Left = 108
Height = 28 Height = 35
Top = 64 Top = 80
Width = 160 Width = 200
AutoSize = False AutoSize = False
Caption = 'Не заполнять поле, если не хотите изменить пароль.' Caption = 'Не заполнять поле, если не хотите изменить пароль.'
Enabled = False Enabled = False
@ -39,52 +40,52 @@ object frmEditAccount: TfrmEditAccount
WordWrap = True WordWrap = True
end end
object lblUsername: TLabel object lblUsername: TLabel
Left = 6 Left = 8
Height = 14 Height = 14
Top = 12 Top = 15
Width = 46 Width = 46
Caption = 'Аккаунт:' Caption = 'Аккаунт:'
ParentColor = False ParentColor = False
end end
object lblPassword: TLabel object lblPassword: TLabel
Left = 6 Left = 8
Height = 14 Height = 14
Top = 44 Top = 55
Width = 44 Width = 44
Caption = 'Пароль:' Caption = 'Пароль:'
ParentColor = False ParentColor = False
end end
object lblAccessLevel: TLabel object lblAccessLevel: TLabel
Left = 6 Left = 8
Height = 14 Height = 14
Top = 108 Top = 135
Width = 37 Width = 37
Caption = 'Права:' Caption = 'Права:'
ParentColor = False ParentColor = False
end end
object edUsername: TEdit object edUsername: TEdit
Left = 86 Left = 108
Height = 21 Height = 21
Top = 8 Top = 10
Width = 160 Width = 200
Color = clBtnFace Color = clBtnFace
ReadOnly = True ReadOnly = True
TabOrder = 0 TabOrder = 0
end end
object edPassword: TEdit object edPassword: TEdit
Left = 86 Left = 108
Height = 21 Height = 21
Top = 40 Top = 50
Width = 160 Width = 200
EchoMode = emPassword EchoMode = emPassword
PasswordChar = '*' PasswordChar = '*'
TabOrder = 1 TabOrder = 1
end end
object cbAccessLevel: TComboBox object cbAccessLevel: TComboBox
Left = 86 Left = 108
Height = 21 Height = 21
Top = 104 Top = 130
Width = 160 Width = 200
ItemHeight = 13 ItemHeight = 13
Items.Strings = ( Items.Strings = (
'None' 'None'
@ -99,18 +100,18 @@ object frmEditAccount: TfrmEditAccount
end end
object tsRegions: TTabSheet object tsRegions: TTabSheet
Caption = 'Регионы' Caption = 'Регионы'
ClientHeight = 147 ClientHeight = 135
ClientWidth = 253 ClientWidth = 251
object Label1: TLabel object Label1: TLabel
Left = 8 Left = 8
Height = 14 Height = 14
Top = 8 Top = 8
Width = 237 Width = 237
Align = alTop Align = alTop
BorderSpacing.Left = 8 BorderSpacing.Left = 10
BorderSpacing.Top = 8 BorderSpacing.Top = 10
BorderSpacing.Right = 8 BorderSpacing.Right = 10
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 5
Caption = 'Разрешенные регионы:' Caption = 'Разрешенные регионы:'
ParentColor = False ParentColor = False
end end
@ -120,47 +121,47 @@ object frmEditAccount: TfrmEditAccount
Top = 26 Top = 26
Width = 237 Width = 237
Align = alClient Align = alClient
BorderSpacing.Left = 8 BorderSpacing.Left = 10
BorderSpacing.Top = 4 BorderSpacing.Top = 5
BorderSpacing.Right = 8 BorderSpacing.Right = 10
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 10
ItemHeight = 0 ItemHeight = 20
TabOrder = 0 TabOrder = 0
end end
end end
end end
object Panel1: TPanel object Panel1: TPanel
Left = 8 Left = 8
Height = 25 Height = 31
Top = 181 Top = 175
Width = 245 Width = 245
Align = alBottom Align = alBottom
BorderSpacing.Around = 8 BorderSpacing.Around = 10
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 25 ClientHeight = 31
ClientWidth = 245 ClientWidth = 245
TabOrder = 1 TabOrder = 1
object btnCancel: TButton object btnCancel: TButton
Left = 170 Left = 151
Height = 25 Height = 25
Top = 0 Top = 0
Width = 75 Width = 94
Align = alRight Align = alRight
BorderSpacing.Left = 4 BorderSpacing.Left = 5
BorderSpacing.InnerBorder = 4 BorderSpacing.InnerBorder = 5
Cancel = True Cancel = True
Caption = 'Отмена' Caption = 'Отмена'
ModalResult = 2 ModalResult = 2
TabOrder = 0 TabOrder = 0
end end
object btnOK: TButton object btnOK: TButton
Left = 91 Left = 72
Height = 25 Height = 25
Top = 0 Top = 0
Width = 75 Width = 94
Align = alRight Align = alRight
BorderSpacing.Right = 4 BorderSpacing.Right = 5
BorderSpacing.InnerBorder = 4 BorderSpacing.InnerBorder = 5
Caption = 'OK' Caption = 'OK'
Default = True Default = True
ModalResult = 1 ModalResult = 1

2
Client/UfrmEditAccount.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
UEnums, ComCtrls, ExtCtrls, CheckLst, UfrmRegionControl, VirtualTrees; UEnums, ComCtrls, ExtCtrls, CheckLst, UfrmRegionControl, laz.VirtualTrees;
function GetAccessLevel(AAccessLevel: TAccessLevel): string; function GetAccessLevel(AAccessLevel: TAccessLevel): string;

661
Client/UfrmLargeScaleCommand.lfm
View File

File diff suppressed because it is too large Load Diff

14
Client/UfrmLargeScaleCommand.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Math, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Math,
VirtualTrees, VirtualList, ExtCtrls, ImagingComponents, StdCtrls, Buttons, Spin, laz.VirtualTrees, VirtualList, ExtCtrls, ImagingComponents, StdCtrls, Buttons, Spin,
LCLIntf, Menus, UPlatformTypes, UEnhancedMemoryStream, UWorldItem; LCLIntf, Menus, UPlatformTypes, UEnhancedMemoryStream, UWorldItem;
type type
@ -112,14 +112,14 @@ type
btnGrab1: TSpeedButton; btnGrab1: TSpeedButton;
btnGrab2: TSpeedButton; btnGrab2: TSpeedButton;
btnGrabOffset: TSpeedButton; btnGrabOffset: TSpeedButton;
vdtTerrainTiles: TVirtualDrawTree; vdtTerrainTiles: TLazVirtualDrawTree;
vdlTerrainTiles: TVirtualList; vdlTerrainTiles: TVirtualList;
vdtInsertStaticsTiles: TVirtualDrawTree; vdtInsertStaticsTiles: TLazVirtualDrawTree;
vdlInsertStaticsTiles: TVirtualList; vdlInsertStaticsTiles: TVirtualList;
vdtDeleteStaticsTiles: TVirtualDrawTree; vdtDeleteStaticsTiles: TLazVirtualDrawTree;
vdlDeleteStaticsTiles: TVirtualList; vdlDeleteStaticsTiles: TVirtualList;
vstActions: TVirtualStringTree; vstActions: TLazVirtualStringTree;
vstArea: TVirtualStringTree; vstArea: TLazVirtualStringTree;
procedure btnGrab1Click(Sender: TObject); procedure btnGrab1Click(Sender: TObject);
procedure btnGrabOffsetClick(Sender: TObject); procedure btnGrabOffsetClick(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
@ -612,7 +612,7 @@ procedure TfrmLargeScaleCommand.vdtTerrainTilesDragOver(Sender: TBaseVirtualTree
Source: TObject; Shift: TShiftState; State: TDragState; Pt: TPoint; Source: TObject; Shift: TShiftState; State: TDragState; Pt: TPoint;
Mode: TDropMode; var Effect: Integer; var Accept: Boolean); Mode: TDropMode; var Effect: Integer; var Accept: Boolean);
begin begin
if (Source <> Sender) and (Source is TVirtualDrawTree) then if (Source <> Sender) and (Source is TLazVirtualDrawTree) then
begin begin
Accept := True; Accept := True;
end; end;

12
Client/UfrmMain.lfm
View File

@ -35,7 +35,7 @@ object frmMain: TfrmMain
Caption = ' Тайлы ' Caption = ' Тайлы '
ClientHeight = 632 ClientHeight = 632
ClientWidth = 220 ClientWidth = 220
object vdtTiles: TVirtualDrawTree object vdtTiles: TLazVirtualDrawTree
Tag = -1 Tag = -1
AnchorSideLeft.Control = tsTiles AnchorSideLeft.Control = tsTiles
AnchorSideTop.Control = spGroupList AnchorSideTop.Control = spGroupList
@ -497,7 +497,7 @@ object frmMain: TfrmMain
ParentBidiMode = False ParentBidiMode = False
ParentShowHint = False ParentShowHint = False
end end
object vdtRandom: TVirtualDrawTree object vdtRandom: TLazVirtualDrawTree
Tag = -1 Tag = -1
AnchorSideLeft.Control = gbRandom AnchorSideLeft.Control = gbRandom
AnchorSideTop.Control = btnAddRandom AnchorSideTop.Control = btnAddRandom
@ -733,7 +733,7 @@ object frmMain: TfrmMain
TabOrder = 2 TabOrder = 2
Visible = False Visible = False
end end
object tvGroups: TVirtualStringTree object tvGroups: TLazVirtualStringTree
AnchorSideLeft.Control = tsTiles AnchorSideLeft.Control = tsTiles
AnchorSideTop.Control = cbStatics AnchorSideTop.Control = cbStatics
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
@ -1051,7 +1051,7 @@ object frmMain: TfrmMain
ParentShowHint = False ParentShowHint = False
end end
end end
object vstLocations: TVirtualStringTree object vstLocations: TLazVirtualStringTree
AnchorSideLeft.Control = tsNavigation AnchorSideLeft.Control = tsNavigation
AnchorSideTop.Control = spGroupList1 AnchorSideTop.Control = spGroupList1
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
@ -1138,7 +1138,7 @@ object frmMain: TfrmMain
OnMoved = spGroupListMoved OnMoved = spGroupListMoved
ResizeAnchor = akTop ResizeAnchor = akTop
end end
object vstClients: TVirtualStringTree object vstClients: TLazVirtualStringTree
AnchorSideLeft.Control = vstLocations AnchorSideLeft.Control = vstLocations
AnchorSideTop.Control = pbRadar AnchorSideTop.Control = pbRadar
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
@ -1914,7 +1914,7 @@ object frmMain: TfrmMain
ClientWidth = 758 ClientWidth = 758
TabOrder = 3 TabOrder = 3
Visible = False Visible = False
object vstChat: TVirtualStringTree object vstChat: TLazVirtualStringTree
Cursor = 63 Cursor = 63
Left = 0 Left = 0
Height = 121 Height = 121

18
Client/UfrmMain.pas
View File

@ -32,7 +32,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Menus, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Menus,
ComCtrls, OpenGLContext, GL, GLu, UGameResources, ULandscape, ExtCtrls, ComCtrls, OpenGLContext, GL, GLu, UGameResources, ULandscape, ExtCtrls,
StdCtrls, Spin, UEnums, VirtualTrees, VirtualList, Buttons, math, UMulBlock, StdCtrls, Spin, UEnums, laz.VirtualTrees, VirtualList, Buttons, math, UMulBlock,
UWorldItem, LCLIntf, UOverlayUI, UStatics, UEnhancedMemoryStream, ActnList, UWorldItem, LCLIntf, UOverlayUI, UStatics, UEnhancedMemoryStream, ActnList,
XMLPropStorage, LazHelpHTML, fgl, ImagingClasses, dateutils, UPlatformTypes, XMLPropStorage, LazHelpHTML, fgl, ImagingClasses, dateutils, UPlatformTypes,
UMap, UPacket, UGLFont, DOM, XMLRead, XMLWrite, strutils, ULightManager, UMap, UPacket, UGLFont, DOM, XMLRead, XMLWrite, strutils, ULightManager,
@ -440,13 +440,13 @@ type
tbTerrain: TToolButton; tbTerrain: TToolButton;
tbStatics: TToolButton; tbStatics: TToolButton;
tsTiles: TTabSheet; tsTiles: TTabSheet;
tvGroups: TVirtualStringTree; tvGroups: TLazVirtualStringTree;
vdtTiles: TVirtualList; vdtTiles: TVirtualList;
vdtRandom: TVirtualDrawTree; vdtRandom: TLazVirtualDrawTree;
vdlRandom: TVirtualList; vdlRandom: TVirtualList;
vstChat: TVirtualStringTree; vstChat: TLazVirtualStringTree;
vstLocations: TVirtualStringTree; vstLocations: TLazVirtualStringTree;
vstClients: TVirtualStringTree; vstClients: TLazVirtualStringTree;
XMLPropStorage1: TXMLPropStorage; XMLPropStorage1: TXMLPropStorage;
procedure acBoundariesExecute(Sender: TObject); procedure acBoundariesExecute(Sender: TObject);
procedure acDeleteExecute(Sender: TObject); procedure acDeleteExecute(Sender: TObject);
@ -1595,7 +1595,7 @@ var
begin begin
Logger.EnterMethod([lcLandscape, lcDebug], 'TfrmMain.FormCreate(Sender: TObject)'); Logger.EnterMethod([lcLandscape, lcDebug], 'TfrmMain.FormCreate(Sender: TObject)');
// Подменяем TVirtualDrawTree на его перегруженный аналог TVirtualList // Подменяем TLazVirtualDrawTree на его перегруженный аналог TVirtualList
vdtTiles := TVirtualList.Create(vdtTiles); vdtTiles := TVirtualList.Create(vdtTiles);
vdtRandom := TVirtualList.Create(vdtRandom); vdtRandom := TVirtualList.Create(vdtRandom);
vdlRandom := TVirtualList(vdtRandom); // Лазареусу пчмуто не нравиться если поменять тип у vdtRandom vdlRandom := TVirtualList(vdtRandom); // Лазареусу пчмуто не нравиться если поменять тип у vdtRandom
@ -2719,10 +2719,10 @@ var
procedure UpdateHeight(TVList: TVirtualList; height: integer); procedure UpdateHeight(TVList: TVirtualList; height: integer);
var var
TVTree: TVirtualDrawTree; TVTree: TLazVirtualDrawTree;
node: PVirtualNode; node: PVirtualNode;
begin begin
TVTree := TVirtualDrawTree(TVList); TVTree := TLazVirtualDrawTree(TVList);
TVList.BeginUpdate; TVList.BeginUpdate;
TVList.DefaultNodeHeight := TVList.DefaultNodeHeight + height; TVList.DefaultNodeHeight := TVList.DefaultNodeHeight + height;
node := TVTree.GetFirst(); node := TVTree.GetFirst();

212
Client/UfrmRegionControl.lfm
View File

@ -1,14 +1,15 @@
object frmRegionControl: TfrmRegionControl object frmRegionControl: TfrmRegionControl
Left = 1069 Left = 1069
Height = 390 Height = 488
Top = 110 Top = 110
Width = 620 Width = 775
Caption = 'Управление Регионами' Caption = 'Управление Регионами'
ClientHeight = 390 ClientHeight = 488
ClientWidth = 620 ClientWidth = 775
Constraints.MinHeight = 390 Constraints.MinHeight = 488
Constraints.MinWidth = 620 Constraints.MinWidth = 775
Font.Height = -11 DesignTimePPI = 120
Font.Height = -14
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
@ -16,7 +17,7 @@ object frmRegionControl: TfrmRegionControl
OnShow = FormShow OnShow = FormShow
Position = poOwnerFormCenter Position = poOwnerFormCenter
ShowInTaskBar = stAlways ShowInTaskBar = stAlways
LCLVersion = '0.9.30.2' LCLVersion = '2.2.2.0'
object sbArea: TScrollBox object sbArea: TScrollBox
AnchorSideLeft.Control = vstRegions AnchorSideLeft.Control = vstRegions
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
@ -24,7 +25,7 @@ object frmRegionControl: TfrmRegionControl
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = btnClose AnchorSideBottom.Control = btnClose
Left = 160 Left = 200
Height = 349 Height = 349
Top = 0 Top = 0
Width = 460 Width = 460
@ -34,9 +35,9 @@ object frmRegionControl: TfrmRegionControl
TabOrder = 0 TabOrder = 0
object pbArea: TPaintBox object pbArea: TPaintBox
Left = 0 Left = 0
Height = 105 Height = 131
Top = 0 Top = 0
Width = 105 Width = 131
OnMouseDown = pbAreaMouseDown OnMouseDown = pbAreaMouseDown
OnMouseMove = pbAreaMouseMove OnMouseMove = pbAreaMouseMove
OnPaint = pbAreaPaint OnPaint = pbAreaPaint
@ -47,12 +48,12 @@ object frmRegionControl: TfrmRegionControl
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 548 Left = 532
Height = 25 Height = 31
Top = 357 Top = 351
Width = 64 Width = 80
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
BorderSpacing.Around = 8 BorderSpacing.Around = 10
Caption = 'Закрыть' Caption = 'Закрыть'
OnClick = btnCloseClick OnClick = btnCloseClick
TabOrder = 1 TabOrder = 1
@ -61,25 +62,25 @@ object frmRegionControl: TfrmRegionControl
AnchorSideRight.Control = btnClose AnchorSideRight.Control = btnClose
AnchorSideBottom.Control = btnClose AnchorSideBottom.Control = btnClose
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 476 Left = 460
Height = 25 Height = 31
Top = 357 Top = 351
Width = 64 Width = 80
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
BorderSpacing.Right = 4 BorderSpacing.Right = 5
Caption = 'Сохранить' Caption = 'Сохранить'
Enabled = False Enabled = False
OnClick = btnSaveClick OnClick = btnSaveClick
TabOrder = 2 TabOrder = 2
end end
object vstRegions: TVirtualStringTree object vstRegions: TLazVirtualStringTree
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
AnchorSideBottom.Control = btnAddRegion AnchorSideBottom.Control = btnAddRegion
Left = 0 Left = 0
Height = 130 Height = 130
Top = 0 Top = 0
Width = 160 Width = 200
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
DefaultText = 'Node' DefaultText = 'Node'
Header.AutoSizeIndex = 0 Header.AutoSizeIndex = 0
@ -87,9 +88,10 @@ object frmRegionControl: TfrmRegionControl
item item
Position = 0 Position = 0
Text = 'Регионы' Text = 'Регионы'
Width = 156 Width = 200
end> end>
Header.DefaultHeight = 17 Header.DefaultHeight = 21
Header.Height = 36
Header.Options = [hoAutoResize, hoVisible] Header.Options = [hoAutoResize, hoVisible]
Header.ParentFont = True Header.ParentFont = True
Header.Style = hsFlatButtons Header.Style = hsFlatButtons
@ -105,13 +107,13 @@ object frmRegionControl: TfrmRegionControl
object btnAddRegion: TSpeedButton object btnAddRegion: TSpeedButton
AnchorSideLeft.Control = vstRegions AnchorSideLeft.Control = vstRegions
AnchorSideBottom.Control = spRegionsArea AnchorSideBottom.Control = spRegionsArea
Left = 4 Left = 5
Height = 22 Height = 28
Hint = 'Добавить регион' Hint = 'Добавить регион'
Top = 134 Top = 128
Width = 22 Width = 28
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Around = 4 BorderSpacing.Around = 5
Glyph.Data = { Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100 36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000FFFFFF00FFFF 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
@ -148,7 +150,6 @@ object frmRegionControl: TfrmRegionControl
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = mnuAddRegionClick OnClick = mnuAddRegionClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
@ -158,13 +159,13 @@ object frmRegionControl: TfrmRegionControl
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideBottom.Control = btnAddRegion AnchorSideBottom.Control = btnAddRegion
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 30 Left = 38
Height = 22 Height = 28
Hint = 'Удалить регион' Hint = 'Удалить регион'
Top = 134 Top = 128
Width = 22 Width = 28
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Left = 4 BorderSpacing.Left = 5
Enabled = False Enabled = False
Glyph.Data = { Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100 36040000424D3604000000000000360000002800000010000000100000000100
@ -202,30 +203,30 @@ object frmRegionControl: TfrmRegionControl
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = mnuDeleteRegionClick OnClick = mnuDeleteRegionClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
end end
object vstArea: TVirtualStringTree object vstArea: TLazVirtualStringTree
AnchorSideLeft.Control = spRegionsArea AnchorSideLeft.Control = spRegionsArea
AnchorSideTop.Control = Label1 AnchorSideTop.Control = Label1
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = spRegionsArea AnchorSideRight.Control = spRegionsArea
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = btnDeleteArea AnchorSideBottom.Control = btnDeleteArea
Left = 4 Left = 5
Height = 97 Height = 97
Top = 179 Top = 224
Width = 152 Width = 152
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Left = 4 BorderSpacing.Left = 5
BorderSpacing.Right = 4 BorderSpacing.Right = 5
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 5
DefaultText = 'Node' DefaultText = 'Node'
Header.AutoSizeIndex = 0 Header.AutoSizeIndex = 0
Header.Columns = <> Header.Columns = <>
Header.DefaultHeight = 17 Header.DefaultHeight = 21
Header.Height = 29
Header.MainColumn = -1 Header.MainColumn = -1
Header.Options = [hoColumnResize, hoDrag] Header.Options = [hoColumnResize, hoDrag]
TabOrder = 4 TabOrder = 4
@ -240,13 +241,13 @@ object frmRegionControl: TfrmRegionControl
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = spRegionsArea AnchorSideRight.Control = spRegionsArea
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 4 Left = 5
Height = 14 Height = 14
Top = 165 Top = 206
Width = 152 Width = 152
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 4 BorderSpacing.Left = 5
BorderSpacing.Right = 4 BorderSpacing.Right = 5
Caption = 'Область:' Caption = 'Область:'
ParentColor = False ParentColor = False
end end
@ -256,8 +257,8 @@ object frmRegionControl: TfrmRegionControl
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 5 Height = 6
Top = 160 Top = 200
Width = 160 Width = 160
Align = alNone Align = alNone
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
@ -267,11 +268,11 @@ object frmRegionControl: TfrmRegionControl
object btnAddArea: TSpeedButton object btnAddArea: TSpeedButton
AnchorSideTop.Control = btnDeleteArea AnchorSideTop.Control = btnDeleteArea
AnchorSideRight.Control = btnDeleteArea AnchorSideRight.Control = btnDeleteArea
Left = 43 Left = 37
Height = 22 Height = 28
Hint = 'Добавить область' Hint = 'Добавить область'
Top = 280 Top = 350
Width = 22 Width = 28
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Enabled = False Enabled = False
Glyph.Data = { Glyph.Data = {
@ -310,7 +311,6 @@ object frmRegionControl: TfrmRegionControl
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = btnAddAreaClick OnClick = btnAddAreaClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
@ -319,14 +319,14 @@ object frmRegionControl: TfrmRegionControl
AnchorSideLeft.Control = vstArea AnchorSideLeft.Control = vstArea
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
AnchorSideBottom.Control = seX1 AnchorSideBottom.Control = seX1
Left = 69 Left = 86
Height = 22 Height = 28
Hint = 'Удалить область' Hint = 'Удалить область'
Top = 280 Top = 274
Width = 22 Width = 28
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Bottom = 4 BorderSpacing.Bottom = 5
BorderSpacing.Around = 4 BorderSpacing.Around = 5
Enabled = False Enabled = False
Glyph.Data = { Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100 36040000424D3604000000000000360000002800000010000000100000000100
@ -364,7 +364,6 @@ object frmRegionControl: TfrmRegionControl
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = btnDeleteAreaClick OnClick = btnDeleteAreaClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
@ -373,11 +372,11 @@ object frmRegionControl: TfrmRegionControl
AnchorSideLeft.Control = btnDeleteArea AnchorSideLeft.Control = btnDeleteArea
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = btnDeleteArea AnchorSideTop.Control = btnDeleteArea
Left = 95 Left = 119
Height = 22 Height = 28
Hint = 'Удалить все области' Hint = 'Удалить все области'
Top = 280 Top = 350
Width = 22 Width = 28
Enabled = False Enabled = False
Glyph.Data = { Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100 36040000424D3604000000000000360000002800000010000000100000000100
@ -415,7 +414,6 @@ object frmRegionControl: TfrmRegionControl
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = btnClearAreaClick OnClick = btnClearAreaClick
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
@ -424,12 +422,12 @@ object frmRegionControl: TfrmRegionControl
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = seX1 AnchorSideTop.Control = seX1
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 4 Left = 5
Height = 14 Height = 18
Top = 313 Top = 391
Width = 7 Width = 9
AutoSize = False AutoSize = False
BorderSpacing.Left = 4 BorderSpacing.Left = 5
Caption = 'X' Caption = 'X'
Enabled = False Enabled = False
ParentColor = False ParentColor = False
@ -437,13 +435,13 @@ object frmRegionControl: TfrmRegionControl
object seX1: TSpinEdit object seX1: TSpinEdit
AnchorSideLeft.Control = seY1 AnchorSideLeft.Control = seY1
AnchorSideBottom.Control = seY1 AnchorSideBottom.Control = seY1
Left = 18 Left = 22
Height = 21 Height = 26
Top = 310 Top = 305
Width = 50 Width = 62
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
AutoSize = False AutoSize = False
BorderSpacing.Bottom = 8 BorderSpacing.Bottom = 10
Enabled = False Enabled = False
OnChange = seX1Change OnChange = seX1Change
TabOrder = 6 TabOrder = 6
@ -453,12 +451,12 @@ object frmRegionControl: TfrmRegionControl
AnchorSideLeft.Control = seX1 AnchorSideLeft.Control = seX1
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = seX1 AnchorSideTop.Control = seX1
Left = 76 Left = 95
Height = 21 Height = 26
Top = 310 Top = 388
Width = 50 Width = 62
AutoSize = False AutoSize = False
BorderSpacing.Left = 8 BorderSpacing.Left = 10
Enabled = False Enabled = False
OnChange = seX1Change OnChange = seX1Change
TabOrder = 7 TabOrder = 7
@ -468,10 +466,10 @@ object frmRegionControl: TfrmRegionControl
AnchorSideLeft.Control = lblX AnchorSideLeft.Control = lblX
AnchorSideTop.Control = seY1 AnchorSideTop.Control = seY1
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 4 Left = 5
Height = 14 Height = 18
Top = 342 Top = 428
Width = 6 Width = 8
AutoSize = False AutoSize = False
Caption = 'Y' Caption = 'Y'
Enabled = False Enabled = False
@ -483,13 +481,13 @@ object frmRegionControl: TfrmRegionControl
AnchorSideRight.Control = seX1 AnchorSideRight.Control = seX1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = btnGrab1 AnchorSideBottom.Control = btnGrab1
Left = 18 Left = 22
Height = 21 Height = 26
Top = 339 Top = 334
Width = 50 Width = 62
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
AutoSize = False AutoSize = False
BorderSpacing.Left = 8 BorderSpacing.Left = 10
Enabled = False Enabled = False
OnChange = seX1Change OnChange = seX1Change
TabOrder = 8 TabOrder = 8
@ -501,13 +499,13 @@ object frmRegionControl: TfrmRegionControl
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = seX2 AnchorSideRight.Control = seX2
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 76 Left = 95
Height = 21 Height = 26
Top = 339 Top = 424
Width = 50 Width = 50
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = False AutoSize = False
BorderSpacing.Top = 8 BorderSpacing.Top = 10
Enabled = False Enabled = False
OnChange = seX1Change OnChange = seX1Change
TabOrder = 9 TabOrder = 9
@ -518,13 +516,13 @@ object frmRegionControl: TfrmRegionControl
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 32 Left = 40
Height = 22 Height = 28
Hint = 'Выбрать тайл в главном окне и взять его координаты.' Hint = 'Выбрать тайл в главном окне и взять его координаты.'
Top = 364 Top = 358
Width = 22 Width = 28
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Around = 4 BorderSpacing.Around = 5
Enabled = False Enabled = False
Glyph.Data = { Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100 36040000424D3604000000000000360000002800000010000000100000000100
@ -562,7 +560,6 @@ object frmRegionControl: TfrmRegionControl
FF00FFFFFF00FFFFFF00CBCBCB7EFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00CBCBCB7EFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = btnGrab1Click OnClick = btnGrab1Click
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
@ -572,11 +569,11 @@ object frmRegionControl: TfrmRegionControl
AnchorSideLeft.Side = asrCenter AnchorSideLeft.Side = asrCenter
AnchorSideBottom.Control = btnGrab1 AnchorSideBottom.Control = btnGrab1
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 90 Left = 112
Height = 22 Height = 28
Hint = 'Выбрать тайл в главном окне и взять его координаты.' Hint = 'Выбрать тайл в главном окне и взять его координаты.'
Top = 364 Top = 358
Width = 22 Width = 28
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Enabled = False Enabled = False
Glyph.Data = { Glyph.Data = {
@ -615,14 +612,13 @@ object frmRegionControl: TfrmRegionControl
FF00FFFFFF00FFFFFF00CBCBCB7EFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00CBCBCB7EFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
} }
NumGlyphs = 0
OnClick = btnGrab1Click OnClick = btnGrab1Click
ShowHint = True ShowHint = True
ParentShowHint = False ParentShowHint = False
end end
object pmRegions: TPopupMenu object pmRegions: TPopupMenu
left = 48 Left = 60
top = 43 Top = 54
object mnuAddRegion: TMenuItem object mnuAddRegion: TMenuItem
Caption = 'Добавить' Caption = 'Добавить'
OnClick = mnuAddRegionClick OnClick = mnuAddRegionClick

6
Client/UfrmRegionControl.pas
View File

@ -31,7 +31,7 @@ interface
uses uses
Classes, SysUtils, math, LResources, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, math, LResources, Forms, Controls, Graphics, Dialogs,
VirtualTrees, ExtCtrls, ImagingComponents, StdCtrls, Buttons, Spin, LCLIntf, laz.VirtualTrees, ExtCtrls, ImagingComponents, StdCtrls, Buttons, Spin, LCLIntf,
UEnhancedMemoryStream, Menus, URectList, UEnums, UWorldItem; UEnhancedMemoryStream, Menus, URectList, UEnums, UWorldItem;
type type
@ -73,8 +73,8 @@ type
btnGrab1: TSpeedButton; btnGrab1: TSpeedButton;
btnGrab2: TSpeedButton; btnGrab2: TSpeedButton;
spRegionsArea: TSplitter; spRegionsArea: TSplitter;
vstArea: TVirtualStringTree; vstArea: TLazVirtualStringTree;
vstRegions: TVirtualStringTree; vstRegions: TLazVirtualStringTree;
procedure btnGrab1Click(Sender: TObject); procedure btnGrab1Click(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormResize(Sender: TObject); procedure FormResize(Sender: TObject);

2
Client/UndoRedoCmd.pas
View File

@ -2,7 +2,7 @@ unit UndoRedoCmd;
interface interface
uses uses
Classes, SysUtils, VirtualTrees; Classes, SysUtils, laz.VirtualTrees;
type type
IUndoRedoCommand = interface (IUnknown) IUndoRedoCommand = interface (IUnknown)