diff --git a/icons/arrow/arrow_down.png b/icons/arrow/arrow_down.png
new file mode 100644
index 00000000..b9e7ce2a
Binary files /dev/null and b/icons/arrow/arrow_down.png differ
diff --git a/icons/arrow/arrow_down24.png b/icons/arrow/arrow_down24.png
new file mode 100644
index 00000000..be68151f
Binary files /dev/null and b/icons/arrow/arrow_down24.png differ
diff --git a/icons/arrow/arrow_down32.png b/icons/arrow/arrow_down32.png
new file mode 100644
index 00000000..56e9a63d
Binary files /dev/null and b/icons/arrow/arrow_down32.png differ
diff --git a/icons/arrow/arrow_up.png b/icons/arrow/arrow_up.png
new file mode 100644
index 00000000..630cb3cd
Binary files /dev/null and b/icons/arrow/arrow_up.png differ
diff --git a/icons/arrow/arrow_up24.png b/icons/arrow/arrow_up24.png
new file mode 100644
index 00000000..857ddb41
Binary files /dev/null and b/icons/arrow/arrow_up24.png differ
diff --git a/icons/arrow/arrow_up32.png b/icons/arrow/arrow_up32.png
new file mode 100644
index 00000000..f62345e4
Binary files /dev/null and b/icons/arrow/arrow_up32.png differ
diff --git a/icons/other/balloon.png b/icons/other/balloon.png
new file mode 100644
index 00000000..773df833
Binary files /dev/null and b/icons/other/balloon.png differ
diff --git a/icons/other/balloon24.png b/icons/other/balloon24.png
new file mode 100644
index 00000000..377399e2
Binary files /dev/null and b/icons/other/balloon24.png differ
diff --git a/icons/other/balloon32.png b/icons/other/balloon32.png
new file mode 100644
index 00000000..c4e2ada6
Binary files /dev/null and b/icons/other/balloon32.png differ
diff --git a/icons/other/exclamation.png b/icons/other/exclamation.png
new file mode 100644
index 00000000..aa65aadf
Binary files /dev/null and b/icons/other/exclamation.png differ
diff --git a/icons/other/exclamation24.png b/icons/other/exclamation24.png
new file mode 100644
index 00000000..a739f016
Binary files /dev/null and b/icons/other/exclamation24.png differ
diff --git a/icons/other/exclamation32.png b/icons/other/exclamation32.png
new file mode 100644
index 00000000..caec54f9
Binary files /dev/null and b/icons/other/exclamation32.png differ
diff --git a/icons/other/json_array.png b/icons/other/json_array.png
new file mode 100644
index 00000000..c5287ecf
Binary files /dev/null and b/icons/other/json_array.png differ
diff --git a/icons/other/json_array24.png b/icons/other/json_array24.png
new file mode 100644
index 00000000..93bd660c
Binary files /dev/null and b/icons/other/json_array24.png differ
diff --git a/icons/other/json_array32.png b/icons/other/json_array32.png
new file mode 100644
index 00000000..3e0de67d
Binary files /dev/null and b/icons/other/json_array32.png differ
diff --git a/icons/other/json_object.png b/icons/other/json_object.png
new file mode 100644
index 00000000..cf5fa0f0
Binary files /dev/null and b/icons/other/json_object.png differ
diff --git a/icons/other/json_object24.png b/icons/other/json_object24.png
new file mode 100644
index 00000000..aacdab5f
Binary files /dev/null and b/icons/other/json_object24.png differ
diff --git a/icons/other/json_object32.png b/icons/other/json_object32.png
new file mode 100644
index 00000000..17a4e577
Binary files /dev/null and b/icons/other/json_object32.png differ
diff --git a/icons/other/json_value.png b/icons/other/json_value.png
new file mode 100644
index 00000000..e5582802
Binary files /dev/null and b/icons/other/json_value.png differ
diff --git a/icons/other/json_value24.png b/icons/other/json_value24.png
new file mode 100644
index 00000000..ea6b1cff
Binary files /dev/null and b/icons/other/json_value24.png differ
diff --git a/icons/other/json_value32.png b/icons/other/json_value32.png
new file mode 100644
index 00000000..b2711cc9
Binary files /dev/null and b/icons/other/json_value32.png differ
diff --git a/icons/other/lightbulb_off.png b/icons/other/lightbulb_off.png
new file mode 100644
index 00000000..a3d54fc2
Binary files /dev/null and b/icons/other/lightbulb_off.png differ
diff --git a/icons/other/lightbulb_off24.png b/icons/other/lightbulb_off24.png
new file mode 100644
index 00000000..4512f720
Binary files /dev/null and b/icons/other/lightbulb_off24.png differ
diff --git a/icons/other/lightbulb_off32.png b/icons/other/lightbulb_off32.png
new file mode 100644
index 00000000..9516ef36
Binary files /dev/null and b/icons/other/lightbulb_off32.png differ
diff --git a/icons/other/warn_red.png b/icons/other/warn_red.png
index 45b64a79..158f75ad 100644
Binary files a/icons/other/warn_red.png and b/icons/other/warn_red.png differ
diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi
index dd800954..de200fb1 100644
--- a/lazproj/coedit.lpi
+++ b/lazproj/coedit.lpi
@@ -13,316 +13,340 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ce_d2synpresets.pas b/src/ce_d2synpresets.pas
index 998294bb..64089ea2 100644
--- a/src/ce_d2synpresets.pas
+++ b/src/ce_d2synpresets.pas
@@ -4,8 +4,8 @@ unit ce_d2synpresets;
interface
uses
- Classes, SysUtils, SynEditMiscClasses, Graphics, Controls, StdCtrls, ExtCtrls,
- SynEditHighlighter, SynEditTypes, SynEdit, RTTIGrids, Buttons,
+ Classes, SysUtils, SynEditMiscClasses, Graphics, Forms, Controls, StdCtrls,
+ ExtCtrls, SynEditHighlighter, SynEditTypes, SynEdit, RTTIGrids, Buttons,
ce_interfaces, ce_common, ce_writableComponent, ce_d2syn, ce_observer,
ce_editoroptions, ce_sharedres, ce_txtsyn;
@@ -299,6 +299,7 @@ var
fname: string;
pnl: TPanel;
btn: TBitBtn;
+ isc: TIconScaledSize;
begin
inherited;
fBackup:= TCED2SynPreset.Create(nil);
@@ -509,10 +510,10 @@ begin
selection.Foreground := clNone;
end;
end;
- //
+
fEditor := TSynEdit.Create(self);
fEditor.Parent:= self;
- fEditor.Height:= 200;
+ fEditor.Height:= ScaleY(200,96);
fEditor.Align:= alTop;
fEditor.ReadOnly:=true;
fEditor.Font.Assign(EditorOptions.font);
@@ -543,7 +544,7 @@ begin
pnl.Align:=alTop;
pnl.BorderSpacing.Around:= 2;
pnl.Height:=30;
- //
+
fList := TComboBox.Create(self);
fList.Align:= alClient;
fList.BorderSpacing.Around:= 2;
@@ -552,34 +553,49 @@ begin
fList.OnSelect:= @lstBoxSelChange;
fList.AutoSize := true;
updateList;
- //
+
+ //TODO-cbugfix: always iss16 is returned at this point (order of init problem ?)
+ isc := GetIconScaledSize;
+
btn := TBitBtn.Create(self);
btn.Parent := pnl;
btn.AutoSize := true;
- btn.Width:= 28;
+ btn.Width:= ScaleX(28,96);
btn.Align:= alRight;
btn.OnClick:=@btnAddClick;
btn.Hint:='add preset';
- AssignPng(btn, 'DOCUMENT_ADD');
- //
+ case isc of
+ iss16: AssignPng(btn, 'DOCUMENT_ADD');
+ iss24: AssignPng(btn, 'DOCUMENT_ADD24');
+ iss32: AssignPng(btn, 'DOCUMENT_ADD32');
+ end;
+
btn := TBitBtn.Create(self);
btn.Parent := pnl;
btn.AutoSize := true;
- btn.Width:= 28;
+ btn.Width:= ScaleX(28,96);
btn.Align:= alRight;
btn.OnClick:=@btnDelClick;
btn.Hint:='delete preset';
- AssignPng(btn, 'DOCUMENT_DELETE');
- //
+ case isc of
+ iss16: AssignPng(btn, 'DOCUMENT_DELETE');
+ iss24: AssignPng(btn, 'DOCUMENT_DELETE24');
+ iss32: AssignPng(btn, 'DOCUMENT_DELETE32');
+ end;
+
btn := TBitBtn.Create(self);
btn.Parent := pnl;
btn.AutoSize := true;
- btn.Width:= 28;
+ btn.Width:= ScaleX(28,96);
btn.Align:= alRight;
btn.OnClick:=@btnCloneClick;
btn.Hint:='clone preset';
- AssignPng(btn, 'DOCUMENT_PLUS');
- //
+ case isc of
+ iss16: AssignPng(btn, 'DOCUMENT_PLUS');
+ iss24: AssignPng(btn, 'DOCUMENT_PLUS24');
+ iss32: AssignPng(btn, 'DOCUMENT_PLUS32');
+ end;
+
fPropEd := TTIPropertyGrid.Create(self);
fPropEd.Parent := self;
fPropEd.Align:= alClient;
@@ -587,7 +603,8 @@ begin
fPropEd.OnModified:=@propEdModified;
fPropEd.CheckboxForBoolean:=true;
fPropEd.PropertyEditorHook.AddHandlerModified(@propEdModified);
- //
+ fPropEd.DefaultItemHeight:=ScaleY(22, 96);
+
fList.ItemIndex := 0;
EntitiesConnector.addObserver(self);
end;
diff --git a/src/ce_dubprojeditor.lfm b/src/ce_dubprojeditor.lfm
index 6c8564ab..a37b03ff 100644
--- a/src/ce_dubprojeditor.lfm
+++ b/src/ce_dubprojeditor.lfm
@@ -20,13 +20,12 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget
ClientWidth = 407
object propTree: TTreeView[0]
Left = 4
- Height = 351
+ Height = 353
Top = 4
Width = 399
Align = alClient
BorderSpacing.Around = 4
HideSelection = False
- Images = imgList
ReadOnly = True
ScrollBars = ssAutoBoth
TabOrder = 0
@@ -37,19 +36,19 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget
end
object Panel1: TPanel[1]
Left = 2
- Height = 29
- Top = 359
+ Height = 27
+ Top = 361
Width = 403
Align = alBottom
AutoSize = True
BorderSpacing.Around = 2
BevelOuter = bvNone
- ClientHeight = 29
+ ClientHeight = 27
ClientWidth = 403
TabOrder = 1
object edProp: TEdit
Left = 2
- Height = 25
+ Height = 23
Top = 2
Width = 395
Align = alClient
@@ -58,7 +57,7 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget
end
object btnAcceptProp: TSpeedButton
Left = 399
- Height = 29
+ Height = 27
Hint = 'accept property value'
Top = 0
Width = 4
@@ -147,363 +146,4 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget
OnClick = MenuItem1Click
end
end
- object imgList: TImageList[2]
- left = 208
- top = 8
- Bitmap = {
- 4C690B0000001000000010000000B3B3B1EFB0B0ADFFAEAEACFFAEAEACFFAEAE
- ACFFAFAFACFFAFAFADFFB1B1AFD5B4B4B100B5B5B300B5B5B300B5B5B300B5B5
- B300B5B5B300B5B5B300B5B5B300AFAFADFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFEDEDEEFFB3B3B0A4B5B5B300B5B5B300B5B5B300B5B5
- B300B5B5B300B5B5B300B5B5B300AEAEACFFFFFFFFFFE3E3E2FFBEBEBCFFA8A8
- A6FFA8A8A6FFACACAAFFB0B0ADFFB2B2B0FFB3B3B1FFB4B4B2A8B4B4B200B4B4
- B200B4B4B200B5B5B300B5B5B300AEAEABFFFFFFFFFFE9E8E7FFA8A8A6FFFFFF
- FFFFFFFFFFFFD1D1D0FFADADABFFADADABFFAEAEABFFADADABFFAEAEABFFAFAF
- ADFFB0B0AEACB3B3B100B5B5B300ADADABFFFFFFFFFFEDECECFFA8A8A5FFFFFF
- FFFFE4E4E3FFA9A9A6FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFE9E9E9FFAFAFADA7B3B3B100ADADABFFFFFFFFFFF1F1F0FFA7A7A5FFFFFF
- FFFFEAE8E7FFA8A8A6FFFFFFFFFFE0E0DFFFE0E0DFFFE0E0DFFFFFFFFFFFA4A4
- A2FFFFFFFFFFE9E9E9FFB0B0AEACADADABFFFFFFFFFFF5F5F4FFA7A7A5FFFFFF
- FFFFEDECECFFA8A8A5FFFFFFFFFFE5E4E3FFE6E5E4FFE5E4E3FFFFFFFFFFCACA
- C9FFA4A4A2FFFFFFFFFFAFAFADFFADADABFFFFFFFFFFF9F8F8FFA7A7A5FFFFFF
- FFFFF1F1F0FFA7A7A5FFFFFFFFFFE9E8E8FFEAE8E9FFE9E8E8FFF3F2F2FFFFFF
- FFFFFFFFFFFFFFFFFFFFAEAEABFFADADABFFFFFFFFFFFDFCFCFFA6A7A4FFFFFF
- FFFFF5F5F4FFA7A7A5FFFFFFFFFFECECEBFFEDEDECFFEDEDECFFECECEBFFEBEB
- EAFFEBEBEAFFFFFFFFFFADADABFFAEAEABFFFFFFFFFFFFFFFFFFA7A7A4FFFFFF
- FFFFF9F8F8FFA7A7A4FFFFFFFFFFF0F0EFFFF0F0EFFFF0F0EFFFF0F0EFFFEFEF
- EEFFEFEFEEFFFFFFFFFFADADABFFB0B0ADFFFFFFFFFFFFFFFFFFA8A8A6FFFFFF
- FFFFFDFCFCFFA6A7A4FFFFFFFFFFF4F3F3FFF4F3F3FFF4F3F3FFF4F3F3FFF4F3
- F3FFF4F3F3FFFFFFFFFFADADABFFB0B0AEF1B0B0AEFFAFAFADFFACACA9FFFFFF
- FFFFFFFFFFFFA6A7A4FFFFFFFFFFF7F6F6FFF7F6F6FFF7F6F6FFF7F6F6FFF7F6
- F6FFF7F6F6FFFFFFFFFFADADABFF0000002F6666655D54545351AFAFADFFFFFF
- FFFFFFFFFFFFA8A8A6FFFFFFFFFFFCFCFCFFFBFBFCFFFBFBFCFFFBFBFCFFFBFB
- FCFFFCFCFCFFFFFFFFFFAEAEABFFB5B5B3000000000B00000008A4A4A2BDB0B0
- AEFFAFAFADFFADADABFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
- FFFFFFFFFFFFFFFFFFFFB0B0ADFFB5B5B300B5B5B300B5B5B300000000230000
- 003300000033AFAFADECAFAFADFFAEAEABFFADADABFFADADABFFADADABFFADAD
- ABFFAEAEABFFAFAFADFFB1B1AFF2000000000000000000000000000000000000
- 0000000000000000002E00000033000000330000003300000033000000330000
- 0033000000330000003300000030FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF009E9E9E709C9C9CD69B9B9BFB9999
- 99FBFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF009D9D9D709B9B9BF5E4E4E4FFEEEEEEFF9696
- 96FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF009B9B9BD6E2E2E2FFE7E7E7FFB9B9B9FF9393
- 93FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00989898FBE4E4E4FFCFCFCFFF929292C2FFFF
- FF008E8E8EFF8C8C8CFF8A8A8AFBFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00969696FCDDDDDDFFC5C5C5FF8F8F8FC18D8D
- 8DC3ACACACFFD7D7D7FF878787FBFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF0095959548939393FED4D4D4FFC8C8C8FFBCBCBCFFBABA
- BAFFC2C2C2FFC4C4C4FF858585D6FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00E3AD8B92DAA788CF929292FBC7C7C7FFCCCCCCFFC7C7C7FFC6C6C6FFC3C3
- C3FFC0C0C0FF848484F582828270FFFFFF00FFFFFF00FFFFFF00FFFFFF00E1A9
- 8992E7B99CFFE6B698FFD8A98CFFD2D2D2FFB5B5B5FF898989FE878787FB8585
- 85FB838383D681818170FFFFFF00FFFFFF00FFFFFF00FFFFFF00E1A98792E6B7
- 9CFFEFCFBCFFEECEBAFFE2AE8CFFD29B7BFF888888F786868623FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E1A78592E6B799FFEECE
- BBFFE9C0A7FFE8BDA3FFECC8B3FFDFA481FFD2895DC9FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DFA58392E6B498FFEECDBAFFE9BF
- A5FFE5B496FFE7B99DFFEBC6AEFFDE9F79FFD58351AAFFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00DFA57F92E6B394FFEECCB8FFE9BEA5FFE5B3
- 94FFE6B79BFFEAC4ADFFDE9E78FFD3814FACFFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00DD9F79FFEDCCB7FFE8BDA3FFE4B192FFE6B6
- 9AFFEAC3ACFFDE9C74FFD37F4DACFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00DB976FFFEDC8B3FFE7B89BFFE6B498FFEAC3
- ABFFDE9C73FFD17D49AFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00D99165CCDFA481FFEAC2ABFFEAC0A8FFDC99
- 71FFD17B47AFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D58757D5D58351FFD17D4BFFD179
- 45AFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000001C00000033000000360000
- 0036000000360000003600000036000000360000003600000036000000200000
- 0002FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000033F8F8F8F0FBFBFBFDFCFC
- FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFF8F8F8FF949494910000
- 002000000002FFFFFF00FFFFFF00FFFFFF0000000036FBFBFBFDF4F4F4FFF5F5
- F5FFF5F5F5FFF5F5F5FFF1F1F1FFEFEFEFFFE9E9E9FFFCFCFCFFE7E7E7FF9595
- 95910000002000000002FFFFFF000000000100000036FCFCFCFFF7F7F7FFF9F9
- F9FFF7F7F7FFF7F7F7FFF3F3F3FFF0F0F0FFEAEAEAFFFCFCFCFFF6F6F6FFF4F4
- F4FF9999999100000020FFFFFF000000000100000036FCFCFCFFF9F9F9FFC0C0
- C0FFBABABAFFB4B4B4FFAFAFAFFFAAAAAAFFA5A5A5FFFCFCFCFFFCFCFCFFFCFC
- FCFFFCFCFCFF00000036000000010000000100000036FCFCFCFFFBFBFBFFFCFC
- FCFFFCFCFCFFFBFBFBFFF8F8F8FFF5F5F5FFF1F1F1FFECECECFFEAEAEAFFE6E6
- E6FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFC7C7
- C7FFC2C2C2FFBEBEBEFFB8B8B8FFB4B4B4FFB1B1B1FFAEAEAEFFACACACFFEDED
- EDFFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFFCFC
- FCFFFCFCFCFFFCFCFCFFFCFCFCFFFBFBFBFFF8F8F8FFF6F6F6FFF3F3F3FFF2F2
- F2FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFCECE
- CEFFCACACAFFC6C6C6FFC3C3C3FFC0C0C0FFBDBDBDFFBCBCBCFFBABABAFFF6F6
- F6FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFFCFC
- FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFBFBFBFFF9F9F9FFF9F9F9FFF8F8
- F8FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFD6D6
- D6FFD3D3D3FFCFCFCFFFCDCDCDFFCBCBCBFFC8C8C8FFC8C8C8FFC6C6C6FFF8F8
- F8FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFFCFC
- FCFFFCFCFCFFFBFBFBFFFBFBFBFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA
- FAFFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFDDDD
- DDFFDBDBDBFFD9D9D9FFD7D7D7FFD5D5D5FFD4D4D4FFD4D4D4FFD4D4D4FFFBFB
- FBFFFCFCFCFF00000036000000010000000100000036FCFCFCFEFCFCFCFFFCFC
- FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFC
- FCFFFCFCFCFD00000036FFFFFF00FFFFFF0000000034F9F9F9F5FCFCFCFDFCFC
- FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFC
- FCFDF9F9F9F300000033FFFFFF00FFFFFF000000001D00000034000000360000
- 0036000000360000003600000036000000360000003600000036000000360000
- 0036000000330000001DFFFFFF00000000000000000000000000000000000000
- 000000000000908E8CFF8F8D8BFF908E8CFF0000000000000000000000000000
- 00000000000000000000FFFFFF0000000000000000008D8B89B28D8B89AF0000
- 0000000000008B8987FFE9E7E7FF8B8987FF00000000000000008C8A88ED8D8B
- 89B00000000000000000FFFFFF00000000008B8987B2B2B1AFFFAFAEACFF8583
- 81EB868482FF9A9897FFBCBAB7FF9A9897FF868482FF858381FEAFAEACFFB2B1
- AFFF8B8987B200000000FFFFFF000000000082807EBAA4A2A0FFDAD8D7FFC6C4
- C2FFE4E3E1FFDBD9D7FFC2BFBEFFD7D5D4FFE4E3E1FFC5C4C2FFDAD8D7FFA4A2
- A0FF82807EBA00000000FFFFFF000000000000000023827F7DEFACAAA8FFC7C5
- C3FFBBB8B7FFBAB7B6FFBBB8B7FFBBB8B7FFBBB8B7FFC7C5C3FFACAAA8FF817F
- 7DEF0000002300000000FFFFFF000000000000000000807E7CFFDAD9D8FFBEBB
- B9FFBCB9B7FF94918EFF928F8DFF94918FFFB3B2B0FFBEBBB9FFDBD9D8FF807E
- 7CFF0000000000000000FFFFFF00848280FF807E7CFF949492FFD0CECCFFC3C0
- BFFF93918FFF72716FAD3A39384E72716FAD939290FFC3C0BFFFD0CECCFF9494
- 92FF807E7CFF848280FFFFFFFF00817F7DFFE3E1DFFFDCDAD8FFC6C5C2FFC8C6
- C4FF8F8D8BFF4847463D000000074847463D8F8D8BFFC8C6C4FFC6C5C2FFDCDA
- D8FFE3E1DFFF817F7DFFFFFFFF00817F7DFF7C7A78FF9D9B99FFCCC9C8FFCCC9
- C8FF93918FFF7A78769C7E7C7A227A78769C93918FFFCCC9C8FFCCC9C8FF9D9B
- 99FF7C7A78FF817F7DFFFFFFFF000000003300000033787674FFD2D0CEFFCECC
- CAFFBEBCBAFF92908EFF8D8B89FF92908EFFBEBCBAFFCECCCAFFD2D0CEFF7876
- 74FF0000003300000033FFFFFF000000000000000000767572FEB7B3B3FFD2D0
- CFFFD1CFCFFFD3D1D0FFD3D1D0FFD3D1D0FFD1CFCFFFD2D0CFFFB7B3B3FF7573
- 71EF0000000000000000FFFFFF00000000007A7876ED9F9D9BFFDFDDDBFFB8B6
- B4FFDBD9D7FFD8D6D4FFD6D4D2FFD8D6D4FFDBD9D7FFB8B6B4FFDFDDDBFF9F9D
- 9BFF7A7876AF00000000FFFFFF00000000006F6D6BBFA19F9DFF9E9C9AFF706E
- 6CEF716F6DFF898785FFE1DFDEFF898785FF716F6DFF72706EFE9F9D9BFFA19F
- 9DFF716F6DBD00000000FFFFFF0000000000000000236D6B69C16C6A69BF0000
- 002F00000033716F6DFFEEECEBFF716F6DFF0000003300000033747270F16C6A
- 69C00000002400000000FFFFFF00000000000000000000000024000000230000
- 000000000000757371FF73716FFF757371FF00000000000000000000002F0000
- 00230000000000000000FFFFFF00000000000000000000000000000000000000
- 0000000000000000003300000033000000330000000000000000000000000000
- 00000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00EAC39DFFE6BF96FFE4BB92FFE4BB92FFD1A06CF5D09E6DF6CC96
- 5FDAC479427EB2673C09FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00E5BE96FFFFFFFEFFFDF3E9FFFDF3EAFFFCF2E8FFFAEFE3FFFAF2
- E7FFEABB88FFCF8555B3B4693D0CFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00E4BB93FFFEF5EDFFFCDEC5FFFBE0C7FFF9DCC2FFF5D3B4FFFEF9
- F3FFFAE2C4FFECC193FFC37D4893FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00E4BB92FFFEF6F0FFFCE2CDFFFCE3CDFFFADFC8FFF7D9BCFFF5E9
- DDFFFAF3EBFFFBF8F3FFCA8353FEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00E4BB92FFFEF7F1FFFCE5D2FFFCE4D1FFFBE2CCFFF9DDC4FFF6D7
- BBFFF3D1AFFFFAEFE4FFCC8758FE34B4D9D05EC2E1FA60C3E2FA60C3E2FA60C3
- E2FA5FC3E2FAE4BB91FFFFF7F2FFFEE7D5FFFEE7D5FFFDE5D1FFFAE0CAFFF9DE
- C4FFF7D9BCFFFDF2E7FFCC8757FE36B3DAF8FDFEFEFFFEFFFFFFFEFEFFFFFDFE
- FFFFFEFFFFFFE4BA91FFFFF7F0FFFFE7D5FFFDE7D6FFFDE6D4FFFCE4D0FFFBE3
- CBFFFADCC2FFFEF3E8FFCC8656FE35AFDAF0F7FCFEFF8EE4F8FF91DEF5FF9FE0
- F5FFACE1F6FFCA8452FFFFF7F1FFFFE9D9FFFFEADBFFFFE9D9FFFFE7D7FFFFE5
- D2FFFFE2CBFFFFF7F1FFCB8555FE36AADAF2F1FAFDFF94DEF5FF93DCF4FF64BC
- E9FF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594
- DAFF3594DAFFFBF6EFFFCC8355FE35ABDAFAE8F6FBFF70BCE7FF55AAE2FF4DA5
- E0FF91C9EBFFFAF3EFFFFDFEFDFFFFFDFCFFFFFDFCFFFEFDFCFFFEFCFBFFFEFE
- FDFF3594DAFFEFF2E8FFCE8156FF37A6DAFAFEFFFFFFF8FDFFFFF6FDFFFFF5FC
- FFFFF3FCFEFF9AE4F4FF9AE6F7FF9BE6F6FF9DE5F5FF9EE5F5FF9FE5F4FFDAF3
- F8FF3594DAFFFDF4EEFFCA8054F936A1DAF9F6FCFEFF94E5F8FF93E5F8FF93E5
- F8FF91E5F8FF93DBE9FF93D7E3FF93D2DCFF90CED7FF8CC8CFFF86C1C6FFC9D8
- D6FF3594DAFFC57444E8CA7F53F1369ADAF8F2FAFDFF94E6F8FF92E5F8FF90E5
- F8FF8BE3F8FF86E2F7FF7FE1F7FF77DEF6FF6CDCF6FF5ED9F4FF4FD5F3FFCCF2
- FBFF3594DAFFFFFFFF00FFFFFF003594DAF7EFFAFEFF93E5F8FF8FE4F8FF89E3
- F8FF82E1F7FF7ADFF7FF71DEF6FF67DBF5FF5BD8F4FF4DD4F3FF40D1F2FFCAF2
- FBFF3594DAFFFFFFFF00FFFFFF00338ED9FBDCF0FAFF98E1F6FF95E0F6FF92DF
- F6FF8EDEF5FF89DCF5FF85DAF4FF80D9F4FF7AD7F3FF74D5F3FF70D3F2FFC2EA
- F8FF3594DAFFFFFFFF00FFFFFF002C86D8002D88D8F72D87D8F72D88D8F72D88
- D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D87D8F72D88
- D8F72C86D800FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF004398D2B03D94D0FF3A92CFFF3A92CFFF3D94
- D0FF4197D1D24398D2004498D2004498D2004498D2004498D2004499D2004499
- D300459AD300469AD300469AD3003D94D0FFDCFCFFFFD8F7FFFFD8F7FFFFDBFA
- FFFF358ECDFF3991CEFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3B92CFFF3D94
- D0FF4398D2D7469AD300469AD3003B92CFFFD5F7FFFF60D1F9FF61D0F8FFB4EB
- FDFFD9F6FFFFDAF8FFFFDAF8FFFFDBF9FFFFDCFAFFFFDCFAFFFFDCFBFFFFE0FF
- FFFF3E95D0FF4599D333469AD3003B92CFFFCAF6FFFF69D5F9FF6CD5F9FF6BD5
- F9FF69D5F9FF69D5FAFF6AD7FBFF68D4FAFF5EC7F1FF5EC7F2FF5DC8F2FFB4E3
- F8FF3D94D0FF3F8FC669469AD3003C92CFFFC0F3FFFF71DAFBFF74DBFBFF75DB
- FCFF75DBFCFF76DCFCFF73DAFAFF449CD4FF378CCBFF368CCBFF358CCCFF348D
- CCFF3890CEFF3D94D0FF4398D2EB3D92CFFFB9F4FFFF73DBFBFF6BCCF2FF6CCD
- F3FF6CCEF3FF6DCEF3FF479CD4FF56BAE9FFDAF8FFFFD7F6FFFFD6F6FFFFD5F6
- FFFFD5F7FFFFDBFCFFFF3E94D0FF3E94D0FFABF0FFFF449DD6FF368CCBFF368C
- CBFF368CCBFF378BCBFF5CBEEAFF6FD9FBFF6AD6FAFF68D5F9FF67D4F9FF66D4
- F9FF82DEFCFFAAE0F6FF3885BCB94095D0FF8AD7F5FF44A1D8FFDDFDFFFFDAFA
- FFFFDBFAFFFFDEFAFFFF74DCFCFF76DBFAFF75DAFAFF74DAFAFF74DAFAFF72D9
- FAFFA1E8FFFF7CBFE6FF306F9C5E4296D1FF6BBEE8FF6DBDE6FFBBF2FFFF75DE
- FDFF77DEFCFF78DEFCFF7BDFFCFF7DDFFCFF7DDFFCFF7DDFFCFF7CDFFCFF80E0
- FDFFADF0FFFF4D9DD3FF0000000E4398D2FF4FA6D9FF8EDAF5FFA2EEFFFF82E5
- FEFF84E5FEFF84E5FEFF85E6FEFF85E6FEFF85E6FEFF85E6FEFF84E6FEFF96EB
- FFFF8CD8F5FF3985BCB84499D2004499D2FF3F94D0FFABFBFFFF9BF3FFFF92F1
- FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFFA6F8
- FFFF65B8E3FF31709D5F469AD3004598D1F24398D2FF4094D0FF3E92CFFF3E92
- CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F93
- CFFF4194CEF00000000E469AD300000000300000003300000033000000330000
- 0033000000330000003300000033000000330000003300000033000000330000
- 00330000002F0000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00C5C5C504A9A9A9199E9E9E29BFBFBFF1B1B1B1FFB1B1B1FFBEBE
- BEF19999992AAAAAAA19C5C5C504FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00B7B7B776D5D5D5FFCDCDCDFFC3C3C3FFE0E0E0FFDEDEDEFFC3C3
- C3FFCECECEFFD6D6D6FFB4B4B476FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00ACACACE4E5E5E5FFFFFFFFFFC8C8C8FFB3B3B3FFB3B3B3FFC8C8
- C8FFFFFFFFFFE5E5E5FFA0A0A0EDFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00A8A8A8FFDBDBDBFFD0D0D0FFC6C6C6FFFFFFFFFFFFFFFFFFC8C8
- C8FFCACACAFFBFBFBFFFACACACFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00AAAAAAFFF6F6F6FFE6E6E6FFCCCCCCFFD6D6D6FFD4D4D4FFBCBC
- BCFFBFBFBFFFC3C3C3FFAFAFAFFF34B4D9D05EC2E1FA60C3E2FA60C3E2FA60C3
- E2FA5FC3E2FAABABABFFF6F6F6FFE8E8E8FFE1E1E1FFD7D7D7FFC0C0C0FFBFBF
- BFFFC2C2C2FFC3C3C3FFACACACFF36B3DAF8FDFEFEFFFEFFFFFFFEFEFFFFFDFE
- FFFFFEFFFFFFB1B2B2FFCCCCCCFFE9E9E9FFE0E0E0FFD5D5D5FFBDBDBDFFC3C3
- C3FFC2C2C2FFB2B2B2FF9D9D9DED35AFDAF0F7FCFEFF8EE4F8FF91DEF5FF9FE0
- F5FFACE1F6FFE7F2F4FFBEC2C2FFAEAFAFFFCDCDCDFFE1E1E1FFC6C6C6FFB9B9
- B9FF9FA2A3FE959595A59393931E36AADAF2F1FAFDFF94DEF5FF93DCF4FF81D5
- F2FF60C0E9FF4FAEE1FF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594
- DAFF3594DAFFFFFFFF00FFFFFF0035ABDAFAE8F6FBFF7EC5EAFF5BAEE3FF51A8
- E1FF60AFE4FFEBFAFDFFECFAFEFFE5F5FCFFE5F6FCFFE3F4FBFFE4F5FCFFFEFF
- FFFF3594DAFFFFFFFF00FFFFFF0037A6DAFAFEFFFFFFF8FDFFFFF6FDFFFFF5FC
- FFFFE8FAFEFFAFECFAFF8EE4F8FF87E3F8FF7DE0F7FF72DDF6FF68DBF5FFE9F9
- FDFF3594DAFFFFFFFF00FFFFFF0036A1DAF9F6FCFEFFC8F2FCFFB9EFFBFFACEC
- FAFF8CE4F8FF8AE3F8FF82E1F7FF79DFF7FF6DDDF6FF61DAF5FF57D7F4FFE7F8
- FDFF3594DAFFFFFFFF00FFFFFF00369ADAF8F2FAFDFFB3EDFAFFA4E9F9FF95E6
- F8FF85E2F7FF81E1F7FF7AE0F7FF6FDDF6FF62DAF5FF54D6F3FF47D3F2FFE8F9
- FDFF3594DAFFFFFFFF00FFFFFF003594DAF7EFFAFEFFA1E9F9FF91E5F8FF81E1
- F7FF72DEF6FF63DAF5FF54D7F4FF47D3F3FF39D0F2FF2ECDF1FF26CBF0FFCAF2
- FBFF3594DAF7FFFFFF00FFFFFF00338ED9E6DCF0FAF0A7DDF4FD9EDBF4FF96DA
- F3FF8ED8F3FF86D7F3FF7FD4F2FF79D3F2FF72D2F1FF6CD0F1FF69CFF1FFC2EA
- F8FE338ED9F0FFFFFF00FFFFFF002C86D8002D88D8A62D87D8EA2D88D8F72D88
- D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D87D8F72D88
- D8F12C86D893FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000010000
- 00080000002E000000250000000700000003000000200000001C000000080000
- 00060000000300000001FFFFFF00FFFFFF00FFFFFF0000000001000000340000
- 00E4000000FF00000095000000190000000B0000008C000000FD000000C90000
- 0048000000110000000500000001FFFFFF00FFFFFF0000000003000000B50000
- 00ED000000690000004600000026000000100000001700000051000000EE0000
- 00C40000002B0000001000000003FFFFFF00FFFFFF0000000005000000DB0000
- 00C0000000520000003B0000001C0000000A0000000A0000001C000000BB0000
- 00E5000000420000001C00000005FFFFFF000000000100000007000000E20000
- 00BE0000004D000000290000000D00000003000000030000000D000000AC0000
- 00EB0000004B0000002400000007FFFFFF00000000030000001C000000F70000
- 00AF000000460000001F00000006FFFFFF00FFFFFF0000000006000000830000
- 00FE000000650000002C0000000DFFFFFF0000000091000000F3000000D70000
- 006B0000003F0000001800000004FFFFFF00FFFFFF00000000040000002D0000
- 00CC000000FC000000A70000001DFFFFFF000000005E000000CD000000F30000
- 007D000000390000001300000003FFFFFF00FFFFFF0000000003000000570000
- 00FC000000C9000000880000002FFFFFFF000000000F00000033000000F70000
- 00B20000003A0000001400000003FFFFFF00FFFFFF0000000003000000A00000
- 00F00000005A0000004D0000002AFFFFFF000000000700000018000000E40000
- 00C1000000410000001900000004FFFFFF00FFFFFF0000000005000000A90000
- 00E8000000530000003700000016FFFFFF00000000020000000B000000E00000
- 00C1000000460000001E00000006FFFFFF00FFFFFF0000000006000000AC0000
- 00E70000004E000000290000000BFFFFFF000000000100000008000000C90000
- 00E200000050000000250000000A000000020000000200000011000000DC0000
- 00D50000004C0000002400000008FFFFFF000000000100000006000000670000
- 00F8000000F200000089000000170000000800000072000000EE000000FD0000
- 008D000000460000001E00000006FFFFFF00FFFFFF0000000003000000130000
- 0039000000840000006C000000240000000F0000004A0000007E000000620000
- 004A000000340000001400000003FFFFFF00FFFFFF0000000001000000080000
- 001500000025000000290000001C0000000C0000000D0000001E0000002D0000
- 002A000000180000000800000001FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000010000001E0000003F0000
- 004300000044000000110000000500000001000000040000003C000000410000
- 00440000002800000009FFFFFF00FFFFFF000000000200000085000000FF0000
- 00FF000000FF0000003A000000110000000500000015000000FF000000FF0000
- 00FF000000950000001DFFFFFF00FFFFFF000000000400000089000000FF0000
- 00670000005F000000390000001900000007000000070000002E0000004F0000
- 00FF000000A700000037FFFFFF00FFFFFF00000000050000008C000000FF0000
- 005F00000045000000270000000F00000004000000040000000F0000002E0000
- 00FF000000AC00000043FFFFFF00FFFFFF00000000050000008D000000FF0000
- 00590000003200000012000000050000000100000001000000050000001A0000
- 00FF000000A800000044FFFFFF00FFFFFF00000000050000008D000000FF0000
- 00560000002C0000000B00000001FFFFFF00FFFFFF0000000001000000140000
- 00FF000000A700000044FFFFFF00FFFFFF00000000050000008D000000FF0000
- 00560000002B0000000A00000001FFFFFF00FFFFFF0000000001000000130000
- 00FF000000A700000044FFFFFF00FFFFFF00000000050000008D000000FF0000
- 00560000002B0000000A00000001FFFFFF00FFFFFF0000000001000000130000
- 00FF000000A700000044FFFFFF00FFFFFF00000000050000008D000000FF0000
- 00560000002B0000000A00000001FFFFFF00FFFFFF0000000001000000130000
- 00FF000000A700000044FFFFFF00FFFFFF00000000050000008D000000FF0000
- 00560000002B0000000A00000001FFFFFF00FFFFFF0000000001000000130000
- 00FF000000A700000044FFFFFF00FFFFFF00000000050000008D000000FF0000
- 00560000002B0000000A00000001FFFFFF00FFFFFF0000000001000000130000
- 00FF000000A700000044FFFFFF00FFFFFF00000000050000008D000000FF0000
- 0058000000300000000F00000003000000010000000100000003000000170000
- 00FF000000A800000044FFFFFF00FFFFFF00000000050000008C000000FF0000
- 00E6000000E2000000320000000D0000000300000011000000DA000000DE0000
- 00FF000000AB00000044FFFFFF00FFFFFF00000000040000004C000000970000
- 00A6000000A20000003F00000018000000060000000E00000084000000940000
- 00A20000007D0000003BFFFFFF00FFFFFF00000000020000000D000000240000
- 00390000003B0000002C000000140000000500000005000000140000002C0000
- 003B0000003900000024FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
- 000100000014000000170000000B00000007000000150000001700000009FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
- 0013000000FF000000FF0000004C00000043000000FF000000FF0000002FFFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
- 0016000000FF000000FF0000006B00000057000000FF000000FF00000051FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
- 000B0000005A00000077000000560000003D000000670000007A0000004DFFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF008D8B89008D8B89008F8D8B008F8D8B008C8A
- 880092908E00908E8CFF8F8D8BFF908E8CFF92908E008F8D8B008F8D8B008F8D
- 8B008D8B89008D8B89008D8B89008D8B89008C8A88008D8B89B28D8B89AF8B89
- 87008B8987008B8987FFE9E7E7FF8B8987FF8B8987008D8B89008C8A88ED8D8B
- 89B08C8A88008D8B89008D8B89008D8B89008B8987B2B2B1AFFFAFAEACFF8583
- 81EB868482FF9A9897FFBCBAB7FF9A9897FF868482FF858381FEAFAEACFFB2B1
- AFFF8B8987B28D8B89008D8B89008C8A880082807EBAA4A2A0FFDAD8D7FFC6C4
- C2FFE4E3E1FFDBD9D7FFC2BFBEFFD7D5D4FFE4E3E1FFC5C4C2FFDAD8D7FFA4A2
- A0FF82807EBA8C8A88008C8A88008583810000000023827F7DEFACAAA8FFC7C5
- C3FFBBB8B7FFBAB7B6FFBBB8B7FFBBB8B7FFBCB8B8FFC9C5C4FFAFABAAFF8380
- 7EEF0000002385838100858381008684820085838100807E7CFFDAD9D8FFBEBB
- B9FFBCB9B7FF94908FFF938F8DFF959190FFB9B3B3FFCCBEC0FFEBDBDFFF8B80
- 81FF888281008684820086848200848280FF807E7CFF949492FFD0CECCFFC3C0
- BFFF949190FF757070AD3A36364D777070ADA49598FF00873AFF00A87AFF2584
- 55FF918083FF8A8383FF88848300817F7DFFE3E1DFFFDCDAD8FFC6C5C2FFC8C6
- C4FF948D8DFF483F4236000000064A3E4135AD9199FF00873EFF73E3D5FF00A9
- 79FF52AD7FFF947E83FF92818500817F7DFF7C7A78FF9D9B99FFCCC9C8FFCDC9
- C9FF9C9092FF148552E5008A41FF00883FFF00863EFF008239FF81E4D5FF56D9
- C3FF00AD7AFF318359FF008F47000000003300000033787674FFD2D0CEFFD0CD
- CBFFCDBDC1FF00853AFF94EFE2FF4DE9D4FF4FE8D3FF4DE6D1FF93E8D8FF00C3
- 97FF5EE0C6FF00B37FFF008B48A97E7C7A007C7A7800767572FEB7B3B3FFD5D1
- D1FFE3D3D8FF008239FF6CE8CEFF00C899FF00C899FF00C899FF00C797FF00C8
- 98FF00CA9AFF63E6CDFF008A47FF7D7B79007A7876ED9F9D9BFFDFDDDBFFBBB7
- B5FFEDDDE0FF00863CFF3DE8BFFF00D79FFF00D7A0FF00D59FFF00D09CFF00D0
- 9CFF00D39FFF00B981FF007E43BD7B7977006F6D6BBFA19F9DFF9E9C9AFF716E
- 6DEF7C7172FF208254FF00893FFF008842FF008845FF008341FF00D9A1FF00D8
- A0FF00BC80FF007C41B9000000227B797700000000236D6B69C16C6A69BF0000
- 002F000000337C7173FFFFEEF4FF8B6E77FF00000033008847FF00E4A6FF00BE
- 80FF007C41B900000021008F4F007B7977007B79770000000024000000237B79
- 770078757300777472FF787171FF847176FF00904A00008A4AFF00C684FF007C
- 41BD00000021008F4F00008F4F00000000000000000000000000000000000000
- 0000000000000000003300000033000000330000000000000033000000330000
- 0022000000000000000000000000
- }
- end
end
diff --git a/src/ce_dubprojeditor.pas b/src/ce_dubprojeditor.pas
index 94e48900..1e3f2962 100644
--- a/src/ce_dubprojeditor.pas
+++ b/src/ce_dubprojeditor.pas
@@ -45,7 +45,6 @@ type
btnUpdate: TCEToolButton;
edProp: TEdit;
fltEdit: TTreeFilterEdit;
- imgList: TImageList;
MenuItem1: TMenuItem;
Panel1: TPanel;
propTree: TTreeView;
@@ -59,6 +58,7 @@ type
private
fSelectedNode: TTreeNode;
fProj: TCEDubProject;
+ fImages: TImageList;
procedure updateEditor;
procedure updateValueEditor;
procedure setJsonValueFromEditor;
@@ -137,13 +137,13 @@ var
begin
inherited create(nil);
fJson := json;
- width := 280;
- height := 130;
+ width := ScaleX(280,96);
+ height := ScaleY(130,96);
fEvent := event;
caption := 'add a DUB property';
Position := poMainFormCenter;
ShowHint:=true;
- //
+
fSelType := TRadioGroup.Create(self);
fSelType.Parent := self;
fSelType.Items.AddStrings(['array', 'object', 'value']);
@@ -153,13 +153,14 @@ begin
fSelType.ItemIndex:=2;
fSelType.Hint:= 'type of the property to add';
fSelType.OnSelectionChanged:= @selTypeChanged;
- //
+ fSelType.AutoSize:= true;
+
layout := TPanel.Create(self);
layout.Parent := self;
layout.Align := alBottom;
- layout.Height := 32;
+ layout.Height := ScaleY(32,96);
layout.BevelOuter:= bvNone;
- //
+
fEdName := TComboBox.Create(self);
fEdName.Parent := layout;
fEdName.Align:=alClient;
@@ -171,16 +172,23 @@ begin
fEdName.AutoComplete := true;
fEdName.OnChange := @setSelFromProposal;
fEdName.OnSelect:= @setSelFromProposal;
- //
+ fEdName.AutoSize:= true;
+
fBtnValidate := TBitBtn.Create(self);
fBtnValidate.Parent := layout;
fBtnValidate.Align:=alRight;
fBtnValidate.BorderSpacing.Around:=4;
- fBtnValidate.Width:= 26;
+ fBtnValidate.Width:= ScaleX(26,96);
fBtnValidate.OnClick:=@doValidate;
fBtnValidate.Hint:='accept and add a property';
- AssignPng(fBtnValidate, 'ACCEPT');
- //
+ fBtnValidate.AutoSize:=true;
+
+ case GetIconScaledSize of
+ iss16: AssignPng(fBtnValidate, 'ACCEPT');
+ iss24: AssignPng(fBtnValidate, 'ACCEPT24');
+ iss32:AssignPng(fBtnValidate, 'ACCEPT32');
+ end;
+
selTypeChanged(nil);
end;
@@ -237,7 +245,42 @@ constructor TCEDubProjectEditorWidget.create(aOwner: TComponent);
begin
inherited;
setToolBarVisible(true);
- AssignPng(btnAcceptProp, 'ACCEPT');
+
+ fImages := TImageList.Create(self);
+ case GetIconScaledSize of
+ iss16:
+ begin
+ fImages.height := 16;
+ fImages.width := 16;
+ fImages.AddResourceName(HINSTANCE, 'JSON_OBJECT');
+ fImages.AddResourceName(HINSTANCE, 'JSON_ARRAY');
+ fImages.AddResourceName(HINSTANCE, 'JSON_VALUE');
+ AssignPng(btnAcceptProp, 'ACCEPT');
+ AssignPng(fltEdit.Glyph, 'FILTER_CLEAR');
+ end;
+ iss24:
+ begin
+ fImages.height := 24;
+ fImages.width := 24;
+ fImages.AddResourceName(HINSTANCE, 'JSON_OBJECT24');
+ fImages.AddResourceName(HINSTANCE, 'JSON_ARRAY24');
+ fImages.AddResourceName(HINSTANCE, 'JSON_VALUE24');
+ AssignPng(btnAcceptProp, 'ACCEPT24');
+ AssignPng(fltEdit.Glyph, 'FILTER_CLEAR24');
+ end;
+ iss32:
+ begin
+ fImages.height := 32;
+ fImages.width := 32;
+ fImages.AddResourceName(HINSTANCE, 'JSON_OBJECT32');
+ fImages.AddResourceName(HINSTANCE, 'JSON_ARRAY32');
+ fImages.AddResourceName(HINSTANCE, 'JSON_VALUE32');
+ AssignPng(btnAcceptProp, 'ACCEPT32');
+ AssignPng(fltEdit.Glyph, 'FILTER_CLEAR32');
+ end;
+ end;
+
+ propTree.Images := fImages;
end;
procedure TCEDubProjectEditorWidget.SetVisible(value: boolean);
@@ -563,34 +606,34 @@ procedure TCEDubProjectEditorWidget.updateEditor;
node.Data:= data;
if data.JSONType = jtObject then for i := 0 to data.Count-1 do
begin
- node.ImageIndex:=7;
- node.SelectedIndex:=7;
- node.StateIndex:=7;
+ node.ImageIndex:=0;
+ node.SelectedIndex:=0;
+ node.StateIndex:=0;
c := node.TreeNodes.AddChildObject(node, TJSONObject(data).Names[i],
TJSONObject(data).Items[i]);
case TJSONObject(data).Items[i].JSONType of
jtObject, jtArray:
addPropsFrom(c, TJSONObject(data).Items[i]);
else begin
- c.ImageIndex:=9;
- c.SelectedIndex:=9;
- c.StateIndex:=9;
+ c.ImageIndex:=2;
+ c.SelectedIndex:=2;
+ c.StateIndex:=2;
end;
end;
end else if data.JSONType = jtArray then for i := 0 to data.Count-1 do
begin
- node.ImageIndex:=8;
- node.SelectedIndex:=8;
- node.StateIndex:=8;
+ node.ImageIndex:=1;
+ node.SelectedIndex:=1;
+ node.StateIndex:=1;
c := node.TreeNodes.AddChildObject(node, format('item %d',[i]),
TJSONArray(data).Items[i]);
case TJSONArray(data).Items[i].JSONType of
jtObject, jtArray:
addPropsFrom(c, TJSONArray(data).Items[i]);
else begin
- c.ImageIndex:=9;
- c.SelectedIndex:=9;
- c.StateIndex:=9;
+ c.ImageIndex:=2;
+ c.SelectedIndex:=2;
+ c.StateIndex:=2;
end;
end;
end;
diff --git a/src/ce_infos.pas b/src/ce_infos.pas
index 3a81414f..9ab7a646 100644
--- a/src/ce_infos.pas
+++ b/src/ce_infos.pas
@@ -5,7 +5,7 @@ unit ce_infos;
interface
uses
- Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, strutils,
+ Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs,
{$IFDEF WINDOWS}Windows,{$ENDIF}
StdCtrls, ExtCtrls, Buttons, Menus,ce_widget, ce_common, ce_sharedres,
ce_interfaces;
diff --git a/src/ce_libmaneditor.lfm b/src/ce_libmaneditor.lfm
index de50d448..8c360008 100644
--- a/src/ce_libmaneditor.lfm
+++ b/src/ce_libmaneditor.lfm
@@ -166,7 +166,7 @@ inherited CELibManEditorWidget: TCELibManEditorWidget
AutoSize = True
Caption = 'btnMoveUp'
OnClick = btnMoveUpClick
- resourceName = 'GO_UP'
+ resourceName = 'ARROW_UP'
scaledSeparator = False
end
object btnMoveDown: TCEToolButton[11]
@@ -176,7 +176,7 @@ inherited CELibManEditorWidget: TCELibManEditorWidget
AutoSize = True
Caption = 'btnMoveDown'
OnClick = btnMoveDownClick
- resourceName = 'GO_DOWN'
+ resourceName = 'ARROW_DOWN'
scaledSeparator = False
end
object btnRemLib: TCEToolButton[12]
diff --git a/src/ce_messages.lfm b/src/ce_messages.lfm
index d36b9823..3d4ccb41 100644
--- a/src/ce_messages.lfm
+++ b/src/ce_messages.lfm
@@ -28,7 +28,6 @@ inherited CEMessagesWidget: TCEMessagesWidget
BorderSpacing.Around = 2
Font.Style = [fsBold]
HideSelection = False
- Images = imgList
MultiSelect = True
ParentFont = False
ParentShowHint = False
@@ -171,171 +170,4 @@ inherited CEMessagesWidget: TCEMessagesWidget
left = 32
top = 40
end
- object imgList: TImageList[2]
- left = 72
- top = 40
- Bitmap = {
- 4C69050000001000000010000000CF986200D1996200D1996234D0965DBCCF94
- 5BFFCE945AFFCE935AFFCE935AFFCE935AFFCE935AFFCE945AFFCF945BFFD096
- 5DBCD1996234D1996200CF986200CF976100CF975E5AD09861FFF0D3B5FFFFF4
- E4FFFFFBEDFFFFFAEDFFFFFAEDFFFFFAEDFFFFFAEDFFFFFBEDFFFFF4E4FFF0D3
- B5FFD09861FFCF975E5ACF976100CE955F34CE9760FFFAE6D0FFFFF4E3FFFFE6
- C4FFFFE2BDFFFFE2BDFFFFE2BDFFFFE2BDFFFFE2BDFFFFE2BDFFFFE6C4FFFFF4
- E3FFFAE6D0FFCE9760FFCE955F34C78F57BFEED1B1FFFFF4E1FFFFE1B9FFFFDF
- B6FFFFDFB7FFFFDFB7FFFFDFB7FFFFDFB7FFFFDFB7FFFFDFB7FFFFDFB6FFFFE1
- B9FFFFF4E1FFEED1B1FFC78F57BFC68E54FFFFF9E8FFFFE9CAFFFFE3BCFFFFE3
- BEFFFFE3BEFFFFE3BEFFFFE3BEFFFFE3BEFFFFE3BEFFFFE3BEFFFFE3BEFFFFE3
- BCFFFFE9CAFFFFF9E8FFC68E54FFC38B50FFFFF7E4FFFFE8C9FFFFE5C2FFFFE5
- C3FFFFE5C3FFFFE5C3FFFFE5C3FFFFE5C3FFFFE5C3FFFFE5C3FFFFE5C3FFFFE5
- C2FFFFE8C9FFFFF7E4FFC38B50FFC18A4FFFFFF8E4FFFFEACCFFFFE8C8FFFFE8
- C8FFFFE8C8FFFFE8C8FFFFE8C8FFFFE8C8FFFFE8C8FFFFE8C8FFFFE8C8FFFFE8
- C8FFFFEACCFFFFF8E4FFC18A4FFFC0884FFFFFFCE6FFFFEED3FFFFEBCDFFFFEB
- CDFFFFEBCDFFFFEBCDFFFFEBCDFFFFEBCDFFFFEBCDFFFFEBCDFFFFEBCDFFFFEB
- CDFFFFEED3FFFFFCE6FFC0884FFFB3814CC9EBD1AEFFFFF7E1FFFFF0D4FFFFEE
- D2FFFFEED2FFFFEED2FFFFEED2FFFFEED2FFFFEED2FFFFEED2FFFFEED2FFFFF0
- D4FFFFF7E1FFEBD1AEFFB3814CC97A593552C08C54FFF8E8CBFFFFF8E3FFFFF4
- DAFFFFF2D8FFFFF1D7FFFFF2D9FFFFF3D9FFFFF3D9FFFFF3DAFFFFF4DDFFFFF8
- E3FFF8E8CBFFC08C54FF7A5935520000000A8B643B7BBE8A53FFEAD0AEFFFFF5
- DEFFFFF7E1FFFFF6E1FFFFFAE5FFFFFDEAFFFFFEEBFFFFFFECFFFFF9E4FFEAD1
- AFFFBE8A53FF8B643B7B0000000AC28F570000000012664B2B5AA87741C1BC8A
- 51FFFFFFEFFFFFFFF1FFCEA576FFB57E43FFB68046FFB68046FFB78247FFAC7C
- 46C9694D2C5D00000012C28F5700C3905800C18D57000000000A66492845D2B0
- 87FFFFFFFFFFD1B085FF9B6E3BA6000000330000003300000033000000330000
- 00260000000AC08D5600C28F5700B7864E00B7874E00B7864D00B07E4698FFFB
- E8FFD4B48CFF966B3A9A0000001DBD8B5400BD8B5400BD8B5400BD8B5400BD8B
- 5400BE8C5400C08D5600C28F5700B7864E00B7864E00B7864D00B5834BFFB482
- 48FF7756306C0000001AB8874F00BD8B5400BD8B5400BD8B5400BD8B5400BD8B
- 5400BE8C5400C08D5600C28F5700000000000000000000000000000000330000
- 00330000000E0000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D898
- 5223D4964D7DD2924CDBCD8C45F3CB8B41F3C98B40DBC78B407DC5873D23FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D6974F53D191
- 49E6D0A06AFFE0BFA0FFE3C5AEFFE3C5AEFFDFBC9FFFC89762FFBD7D35E6BC7E
- 3553FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D4964D53CF8D47F4D9B2
- 8CFFE6CDB8FFE0BA9DFFD7AB85FFD6A982FFD9B391FFE1C2ABFFD4AE86FFB16B
- 35F4B16F3553FFFFFF00FFFFFF00FFFFFF00D2934C22CE8E47E5D9B28CFFE6CA
- B3FFD6A97DFFD1A579FFE2C4A8FFE1C3A8FFD0A276FFD1A477FFDDBDA2FFD0AC
- 85FFAB6635E5A9653522FFFFFF00FFFFFF00CE91477ECD9C68FFE7CBB4FFD4A5
- 7AFFD0A077FFCF9E74FFFBF8F5FFFBF8F5FFCB9E71FFCB9D71FFCDA177FFDFC0
- A5FFB98A5BFFA45C347EFFFFFF00FFFFFF00CB8E41DBE0BC9FFFDBB393FFCFA0
- 75FFCD9E72FFCB9C71FFDDBFA3FFDDBFA2FFC5996BFFC5996BFFC4986BFFD1AB
- 85FFD8BA97FF9E5635DBFFFFFF00FFFFFF00C5853BF6E4C9B0FFD0A37AFFCC9D
- 71FFC79A6CFFC5986BFFFFFFFFFFFFFFFEFFC39669FFC19468FFC29468FFC398
- 6DFFDFC5ABFF955334F6FFFFFF00FFFFFF00BF7E35F6E3C7AFFFD0A276FFC599
- 6BFFC4976AFFC49669FFEEE0D4FFFBF7F4FFBF9066FFBE8F65FFBE8F64FFBE92
- 69FFDFC6AAFF925034F6FFFFFF00FFFFFF00BC7E35DBDBBC9CFFD5AD89FFC798
- 6CFFC39569FFC19367FFEDDFD3FFFAF7F4FFBB8B63FFB98A63FFB88A62FFC59D
- 78FFD2B893FF905135DBFFFFFF00FFFFFF00B878357EBF915EFFE0C2A8FFC596
- 6CFFC29169FFE1CBB8FFFEFDFCFFFFFFFEFFEADCD0FFB4855EFFB3855EFFD4B5
- 99FFAE7B56FF8F51357EFFFFFF00FFFFFF00AF703522AB6935E5CFAA81FFDABC
- A2FFBE9166FFBA8C62FFB7895FFFB3845EFFB1835DFFB0835CFFCDAA8DFFC6A5
- 79FF895034E589503522FFFFFF00FFFFFF00FFFFFF00A76234539F5533F4CBA7
- 7DFFD8BB9FFFC39C77FFB68A62FFB48660FFBE9672FFD1B397FFC5A377FF844F
- 35F489503553FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF009F5634539955
- 34E6B28057FFD5B793FFDBC3A6FFDAC3A6FFD2B490FFAB7A52FF864F34E68850
- 3553FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF009754
- 35239453347D925234DB8A5034F3884F34F3895035DB8950357D84503623FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00EBE2
- D25CE9DFCDB5E7DCC8E2E3D7C0F7DFD1B7F8DCCCB0EDDAC9ABD1DCCCB080FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00EBE2D219EAE1D0B7EDE5
- D6FFF2ECE1FFF5F1E9FFF8F5EFFFF8F5F0FFF5F1E9FFEDE5D6FFD9C8A9FFD4C1
- 9DDEDCCCAF2CFFFFFF00FFFFFF00FFFFFF00EBE2D20BE7DCC9CAF0EADEFFF8F5
- EFFFF7F3EDFFF5F1E9FFF3EEE5FFF2ECE2FFF2ECE1FFF5F1E9FFFAF8F4FFE3D7
- C0FFCEB890EDDBCBAE17FFFFFF00FFFFFF00E5DAC589EDE5D6FFF9F7F2FFF6F2
- ECFFF9F7F2FFFBFAF7FFFEFEFDFFFEFEFDFFFBF9F6FFF4EFE6FFEDE5D6FFFBF9
- F6FFD9C8A8FFD3BF9BB6FFFFFF00FFFFFF00E0D3BAE4F3EEE5FFF6F2ECFFF7F3
- EDFFFBF9F6FFFBF9F6FFFBF9F6FFFBF9F6FFFAF8F4FFF8F5EFFFEEE7D9FFEAE1
- D0FFF2ECE1FFCAB287F7FFFFFF00FFFFFF00DDCEB2F9F7F3EDFFF2ECE2FFF3EE
- E4FFF5F1E9FFF4EFE6FFF3EEE5FFF2ECE2FFF1EBE0FFEFE8DAFFE5DAC5FFDDCE
- B2FFF8F5EFFFC7AE81FEFFFFFF00FFFFFF00DAC9ABE3F2ECE1FFF5F0E8FFDFD1
- B7FFE2D5BEFFA7BDC3FFACC0C5FFA9BFC4FF9CB4BBFFE0D3BAFFD7C5A5FFE4D8
- C1FFF2ECE1FFC8AF82F7FFFFFF00FFFFFF00DCCCB088E1D4BBFFFBF9F6FFDFD1
- B6FF8DA9B0FFDDCEB3FFDDCEB3FFDACAACFFDDCEB2FF7799A1FFD2BE9AFFF7F3
- EDFFD9C8A8FFCFB992BFFFFFFF00FFFFFF00DFD1B604D8C7A7D8E8DECBFFF7F3
- EDFF91AEB3FFDDCEB3FFDBCBAEFFD8C7A7FFDDCEB2FF7FA1A7FFF0EADEFFE9DF
- CDFFC4AA7AF8D8C7A725FFFFFF00FFFFFF00FFFFFF00DCCCAF2FD4C19EEBE8DE
- CBFFD9C8A8FFDDCEB3FFDDCEB2FFDDCEB2FFDDCEB2FFD2BE9AFFE5D9C4FFC5AB
- 7BFBD6C3A15AFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DBCBAE34D4C1
- 9DE7CFBA93FFD4C19EFFD5C2A0FFD4C19DFFD7C5A4FFC3A876FFC6AD7EF2D6C4
- A246FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D5C2
- A04B638195FA98A19AFF699186FF64887BFF817F71FF2D4357FED3BF9B40FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF0068777DE2A6A5A2FFA8A2A2FF9D9998FF948F8BFF434B53EBFFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF005F6E77C6BCBCBBFFEBEAEAFFCDCCCCFFA3A19FFF3F4C55DBFFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF0088A7BB5D485055F5444545FE3F4141FE3F474AF67D9CB16AFFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF003B85CC003B85CC003B85CC003B85CC003B85
- CC003B85CC003983CA213384CDFF3384CDFF3983CA213B85CC003B85CC003B85
- CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85
- CC003983CB00337EC7CF84C3F1FF84C3F1FF337EC7CF3983CB003B85CC003B85
- CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003A84
- CB003580CA6D5398D7FFC1F0FFFFC1F0FFFF5398D7FF3580CA6D3A84CB003B85
- CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003882
- CA0A3A83CBFFB2E5FFFF9EC8DEFF9EC8DEFFB2E5FFFF3A83CBFF3882CA0A3B85
- CC003B85CC003B85CC003B85CC003B85CC003B85CC003B85CC003983CB00337E
- C8CF86BEEAFFA4ECFFFF6C5D53FF6C5D53FFA4ECFFFF86BEEAFF337EC8CF3983
- CB003B85CC003B85CC003B85CC003B85CC003B85CC003A84CC003580C9585797
- D5FFC6F3FFFF3ACAFFFF6C5B54FF6C5B54FF3ACAFFFFC6F3FFFF5797D5FF3580
- C9583A84CC003B85CC003B85CC003B85CC003B85CC003882CA003C82C9FFC1E8
- FDFF50CCFFFF27C5FFFF69554CFF69554CFF27C5FFFF50CCFFFFC1E8FDFF3C82
- C9FF3882CA003B85CC003B85CC003B85CC003983CB00337EC8BB90BFE6FF6FD7
- FFFF32C3FFFF34CBFFFF644B3FFF644B3FFF34CBFFFF32C3FFFF6FD7FFFF90BF
- E6FF337EC8BB3983CB003B85CC003A84CC003680C9445B97D4FF9EE8FFFF38C7
- FFFF3DC8FFFF3DCFFFFF4BBCE9FF4BBCE9FF3DCFFFFF3DC8FFFF38C7FFFF9EE8
- FFFF5B97D4FF3680C9443A84CC003982CB003F82C9FFA3E0FAFF40CFFFFF44CE
- FFFF46CFFFFF44D6FFFF775C50FF775C50FF44D6FFFF46CFFFFF44CEFFFF40CF
- FFFFA3E0FAFF3F82C9FF3982CB003880C9947AB8E4FF52DBFFFF4BD5FFFF4DD5
- FFFF4DD6FFFF4BDCFFFF67493FFF67493FFF4BDCFFFF4DD6FFFF4DD5FFFF4BD5
- FFFF52DBFFFF7AB8E4FF3880C9943B86CDFF55E3FFFF55E3FFFF56E1FFFF56E1
- FFFF56E2FFFF56E5FFFF55E9FFFF55E9FFFF56E5FFFF56E2FFFF56E1FFFF56E1
- FFFF55E3FFFF55E3FFFF3B86CDFF3A82CAFF397FC8FF387DC7FF387CC7FF397C
- C7FF397CC7FF387DC7FF387EC9FF387EC9FF387DC7FF397CC7FF397CC7FF387C
- C7FF387DC7FF397FC8FF3A82CAFF000000330000003300000033000000330000
- 0033000000330000003300000033000000330000003300000033000000330000
- 0033000000330000003300000033FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF006A85
- FC236984FA7D6782F9DB6580F7F3637EF5F3617CF3DB5F7AF17D5D77EF23FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF006984FA536882
- F9E66E83EEFF92A6F4FFA0B4F8FFA0B4F8FF91A6F3FF687DE9FF5973EBE65671
- E953FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF006883F9536681F8F48497
- F1FFA9BDFBFF8AA3F8FF6B89F6FF6B89F6FF89A2F8FFA8BCFAFF7F92ECFF526C
- E4F44F69E253FFFFFF00FFFFFF00FFFFFF006781F822657FF6E58397F0FFA9BD
- FBFF6382F5FF6382F5FFFFFFFFFFFFFFFFFF617EF3FF607CF3FFA6B9F9FF7B8D
- EAFF4A64DEE54862DB22FFFFFF00FFFFFF00637EF57E6C81ECFFA9BDFBFF6382
- F5FF6281F5FF6280F4FFFFFFFFFFFFFFFFFF5F7AF1FF5F78F0FF5D76EFFFA5B5
- F8FF5D70DDFF435DD77EFFFFFF00FFFFFF005F7AF1DB91A6F3FF88A1F8FF6280
- F4FF617EF3FF607CF3FFFFFFFFFFFFFFFFFF5D76EFFF5C73EEFF5B70ECFF8293
- F1FF8998ECFF3E58D2DBFFFFFF00FFFFFF005B76EDF6A1B6F8FF6784F4FF607C
- F3FF5F7AF1FF5F78F0FFFFFFFFFFFFFFFFFF5B70ECFF5A6EEBFF596CEAFF5F6F
- E9FF9BA8F1FF3A53CEF6FFFFFF00FFFFFF005771E9F6A0B3F7FF6580F2FF5F78
- F0FF5D76EFFF5C73EEFFD3D9FAFFFFFFFFFF596CEAFF5869E8FF5767E7FF5D6C
- E7FF99A5F1FF354FCAF6FFFFFF00FFFFFF00526DE5DB8E9FF0FF8499F4FF5C73
- EEFF5B70ECFF5A6EEBFF909DF1FFA6AFF3FF5767E7FF5665E6FF5562E5FF7D89
- EBFF8591E7FF314AC6DBFFFFFF00FFFFFF004E68E17E6073E0FFA4B3F7FF5A6E
- EBFF596CEAFF5869E8FFFFFFFFFFFFFFFFFF5562E5FF5461E3FF535FE2FF9FA9
- F2FF5061D1FF2D46C27EFFFFFF00FFFFFF004963DC224660DAE57888E6FFA3B0
- F5FF5767E7FF5665E6FF8992EDFF8892ECFF535FE2FF525DE1FF9FA9F2FF6F7D
- DDFF2B44C0E52942BE22FFFFFF00FFFFFF00FFFFFF00425CD5533F59D3F47584
- E3FFA1ACF4FF7F8BECFF5C67E4FF5B66E3FF7D87EAFF9FA8F1FF6F7CDDFF2943
- BFF42741BD53FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF003A54CF533852
- CCE65264D4FF8490E7FF95A0EEFF959FEDFF838EE5FF4C5DCEFF2841BDE6263F
- BB53FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00334D
- C823314BC67D2F48C4DB2C46C2F32A44C0F32842BEDB2640BC7D243EBA23FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
- FF00FFFFFF00FFFFFF00FFFFFF00
- }
- end
end
diff --git a/src/ce_messages.pas b/src/ce_messages.pas
index 03a5657d..9c1514a3 100644
--- a/src/ce_messages.pas
+++ b/src/ce_messages.pas
@@ -74,7 +74,6 @@ type
button4: TCEToolButton;
button6: TCEToolButton;
button8: TCEToolButton;
- imgList: TImageList;
List: TTreeView;
TreeFilterEdit1: TTreeFilterEdit;
procedure ListCustomDrawItem(Sender: TCustomTreeView; Node: TTreeNode;
@@ -83,6 +82,7 @@ type
procedure TreeFilterEdit1AfterFilter(Sender: TObject);
procedure TreeFilterEdit1ButtonClick(Sender: TObject);
private
+ fImages: TImageList;
fEditorMessagePos: TCEEditorMessagePos;
fMsgColors: array[TCEAppMessageKind] of TColor;
fProjCompile: boolean;
@@ -259,6 +259,7 @@ begin
{$IFDEF WINDOWS}
fFont.name := 'Consolas';
{$ENDIF}
+ fFont.Size := ScaleY(11,96);
fAutoSelect :=true;
fMaxCount := 1000;
fMsgColors[amkBub] := $FCE7D2;
@@ -371,11 +372,44 @@ begin
inherited;
+ fImages:= TImageList.Create(self);
Case GetIconScaledSize of
- iss16: AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR');
- iss24: AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR24');
- iss32: AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR32');
+ iss16:
+ begin
+ fImages.Width:=16;
+ fImages.Height:=16;
+ AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR');
+ fImages.AddResourceName(HINSTANCE, 'BALLOON');
+ fImages.AddResourceName(HINSTANCE, 'INFORMATION');
+ fImages.AddResourceName(HINSTANCE, 'LIGHTBULB_OFF');
+ fImages.AddResourceName(HINSTANCE, 'WARNING');
+ fImages.AddResourceName(HINSTANCE, 'EXCLAMATION');
+ end;
+ iss24:
+ begin
+ fImages.Width:=24;
+ fImages.Height:=24;
+ AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR24');
+ fImages.AddResourceName(HINSTANCE, 'BALLOON24');
+ fImages.AddResourceName(HINSTANCE, 'INFORMATION24');
+ fImages.AddResourceName(HINSTANCE, 'LIGHTBULB_OFF24');
+ fImages.AddResourceName(HINSTANCE, 'WARNING24');
+ fImages.AddResourceName(HINSTANCE, 'EXCLAMATION24');
+ end;
+ iss32:
+ begin
+ fImages.Width:=32;
+ fImages.Height:=32;
+ AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR32');
+ fImages.AddResourceName(HINSTANCE, 'BALLOON32');
+ fImages.AddResourceName(HINSTANCE, 'INFORMATION32');
+ fImages.AddResourceName(HINSTANCE, 'LIGHTBULB_OFF32');
+ fImages.AddResourceName(HINSTANCE, 'WARNING32');
+ fImages.AddResourceName(HINSTANCE, 'EXCLAMATION32');
+ end;
end;
+ List.Images := fImages;
+ List.DefaultItemHeight:= ScaleY(22,96);
fMsgColors[amkBub] := $FCE7D2;
fMsgColors[amkWarn] := $B3FFFF;
diff --git a/src/ce_symlist.pas b/src/ce_symlist.pas
index 9ab67326..c72fed39 100644
--- a/src/ce_symlist.pas
+++ b/src/ce_symlist.pas
@@ -323,7 +323,6 @@ end;
constructor TCESymbolListWidget.create(aOwner: TComponent);
var
fname: string;
- i: integer;
begin
fAutoRefresh := false;
fRefreshOnFocus := true;
@@ -376,7 +375,7 @@ begin
fImages.AddResourceName(HINSTANCE, 'BULLET_RED');
fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW');
fImages.AddResourceName(HINSTANCE, 'WARNING');
- fImages.AddResourceName(HINSTANCE, 'WARN_RED');
+ fImages.AddResourceName(HINSTANCE, 'EXCLAMATION');
AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR');
end;
iss24:
@@ -393,7 +392,7 @@ begin
fImages.AddResourceName(HINSTANCE, 'BULLET_RED24');
fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW24');
fImages.AddResourceName(HINSTANCE, 'WARNING24');
- fImages.AddResourceName(HINSTANCE, 'WARN_RED24');
+ fImages.AddResourceName(HINSTANCE, 'EXCLAMATION24');
AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR24');
end;
iss32:
@@ -410,7 +409,7 @@ begin
fImages.AddResourceName(HINSTANCE, 'BULLET_RED32');
fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW32');
fImages.AddResourceName(HINSTANCE, 'WARNING32');
- fImages.AddResourceName(HINSTANCE, 'WARN_RED32');
+ fImages.AddResourceName(HINSTANCE, 'EXCLAMATION32');
AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR32');
end;
end;
diff --git a/src/ce_toolseditor.lfm b/src/ce_toolseditor.lfm
index 8b74f53f..47a10dd8 100644
--- a/src/ce_toolseditor.lfm
+++ b/src/ce_toolseditor.lfm
@@ -41,7 +41,6 @@ inherited CEToolsEditorWidget: TCEToolsEditorWidget
OnSelectionChange = lstToolsSelectionChange
ScrollWidth = 158
TabOrder = 0
- TopIndex = -1
end
object Splitter1: TSplitter
Left = 160
@@ -107,7 +106,7 @@ inherited CEToolsEditorWidget: TCEToolsEditorWidget
AutoSize = True
Caption = 'btnMoveUp'
OnClick = btnMoveUpClick
- resourceName = 'GO_UP'
+ resourceName = 'ARROW_UP'
scaledSeparator = False
end
object btnMoveDown: TCEToolButton[4]
@@ -117,7 +116,7 @@ inherited CEToolsEditorWidget: TCEToolsEditorWidget
AutoSize = True
Caption = 'btnMoveDown'
OnClick = btnMoveDownClick
- resourceName = 'GO_DOWN'
+ resourceName = 'ARROW_DOWN'
scaledSeparator = False
end
object btnRemTool: TCEToolButton[5]