git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1523 8e941d3f-bd1b-0410-a28a-d453659cc2b4

This commit is contained in:
yangjixian
2011-03-09 01:14:06 +00:00
parent c54cc35102
commit 9908f63d5a
12 changed files with 334 additions and 410 deletions

View File

@@ -1,56 +1,59 @@
object AboutDialogForm: TAboutDialogForm
Left = 139
Height = 423
Top = 185
Width = 425
HorzScrollBar.Page = 399
VertScrollBar.Page = 265
ActiveControl = ButtonClose
BorderIcons = [biSystemMenu]
BorderStyle = bsDialog
Caption = 'About Lazarus Icon Editor'
Caption = 'About Lazarus Image Editor'
ClientHeight = 423
ClientWidth = 425
Font.CharSet = GB2312_CHARSET
Font.Height = -13
Font.Name = '微软雅黑'
Font.Pitch = fpVariable
Font.Quality = fqDraft
OnCreate = FormCreate
PixelsPerInch = 96
Position = poMainFormCenter
HorzScrollBar.Page = 399
VertScrollBar.Page = 265
Left = 301
Height = 423
Top = 155
Width = 425
LCLVersion = '0.9.31'
object LabelVersion: TLabel
Left = 12
Height = 20
Top = 366
Width = 73
Anchors = [akLeft, akBottom]
Caption = 'Version: 0.1'
Color = clNone
ParentColor = False
Left = 12
Height = 14
Top = 372
Width = 59
end
object LabelAuthor: TLabel
Left = 12
Height = 20
Top = 391
Width = 150
Anchors = [akLeft, akBottom]
Caption = 'Author: Tom Gregorovic'
Color = clNone
ParentColor = False
Left = 12
Height = 14
Top = 397
Width = 116
end
object Image: TImage
AutoSize = True
Left = 12
Height = 347
Top = 12
Width = 400
AutoSize = True
end
object ButtonClose: TButton
Left = 342
Height = 25
Top = 390
Width = 75
Anchors = [akRight, akBottom]
BorderSpacing.InnerBorder = 4
Cancel = True
Caption = 'Close'
ModalResult = 1
TabOrder = 0
Left = 342
Height = 25
Top = 390
Width = 75
end
end

View File

@@ -1,20 +1,22 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TAboutDialogForm','FORMDATA',[
'TPF0'#16'TAboutDialogForm'#15'AboutDialogForm'#13'ActiveControl'#7#11'Button'
+'Close'#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7
+'Caption'#6#25'About Lazarus Icon Editor'#12'ClientHeight'#3#167#1#11'Client'
+'Width'#3#169#1#8'OnCreate'#7#10'FormCreate'#13'PixelsPerInch'#2'`'#8'Positi'
+'on'#7#16'poMainFormCenter'#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.'
+'Page'#3#9#1#4'Left'#3'-'#1#6'Height'#3#167#1#3'Top'#3#155#0#5'Width'#3#169#1
+#0#6'TLabel'#12'LabelVersion'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Captio'
+'n'#6#12'Version: 0.1'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#12#6
+'Height'#2#14#3'Top'#3't'#1#5'Width'#2';'#0#0#6'TLabel'#11'LabelAuthor'#7'An'
+'chors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#22'Author: Tom Gregorovic'#5
+'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#12#6'Height'#2#14#3'Top'#3
+#141#1#5'Width'#2't'#0#0#6'TImage'#5'Image'#8'AutoSize'#9#4'Left'#2#12#6'Hei'
+'ght'#3'['#1#3'Top'#2#12#5'Width'#3#144#1#0#0#7'TButton'#11'ButtonClose'#7'A'
+'nchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#6'Can'
+'cel'#9#7'Caption'#6#5'Close'#11'ModalResult'#2#1#8'TabOrder'#2#0#4'Left'#3
+'V'#1#6'Height'#2#25#3'Top'#3#134#1#5'Width'#2'K'#0#0#0
'TPF0'#16'TAboutDialogForm'#15'AboutDialogForm'#4'Left'#3#139#0#6'Height'#3
+#167#1#3'Top'#3#185#0#5'Width'#3#169#1#18'HorzScrollBar.Page'#3#143#1#18'Ver'
+'tScrollBar.Page'#3#9#1#13'ActiveControl'#7#11'ButtonClose'#11'BorderIcons'
+#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#26'About L'
+'azarus Image Editor'#12'ClientHeight'#3#167#1#11'ClientWidth'#3#169#1#12'Fo'
+'nt.CharSet'#7#14'GB2312_CHARSET'#11'Font.Height'#2#243#9'Font.Name'#6#12#229
+#190#174#232#189#175#233#155#133#233#187#145#10'Font.Pitch'#7#10'fpVariable'
+#12'Font.Quality'#7#7'fqDraft'#8'OnCreate'#7#10'FormCreate'#8'Position'#7#16
+'poMainFormCenter'#10'LCLVersion'#6#6'0.9.31'#0#6'TLabel'#12'LabelVersion'#4
+'Left'#2#12#6'Height'#2#20#3'Top'#3'n'#1#5'Width'#2'I'#7'Anchors'#11#6'akLef'
+'t'#8'akBottom'#0#7'Caption'#6#12'Version: 0.1'#11'ParentColor'#8#0#0#6'TLab'
+'el'#11'LabelAuthor'#4'Left'#2#12#6'Height'#2#20#3'Top'#3#135#1#5'Width'#3
+#150#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#22'Author: Tom Gre'
+'gorovic'#11'ParentColor'#8#0#0#6'TImage'#5'Image'#4'Left'#2#12#6'Height'#3
+'['#1#3'Top'#2#12#5'Width'#3#144#1#8'AutoSize'#9#0#0#7'TButton'#11'ButtonClo'
+'se'#4'Left'#3'V'#1#6'Height'#2#25#3'Top'#3#134#1#5'Width'#2'K'#7'Anchors'#11
+#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Ca'
+'ption'#6#5'Close'#11'ModalResult'#2#1#8'TabOrder'#2#0#0#0#0
]);

View File

@@ -53,12 +53,13 @@ var
AboutDialogForm: TAboutDialogForm;
implementation
uses IconStrConsts;
{ TAboutDialogForm }
procedure TAboutDialogForm.FormCreate(Sender: TObject);
begin
Image.Picture.LoadFromFile('..\..\Images\icon.png');
Image.Picture.LoadFromFile('.\Images\icon.png');
Caption:=lieAbouDialog;
LabelVersion.Caption:=lieLabelVersion;
LabelAuthor.Caption:=lieLabelAuthor;
@@ -66,6 +67,7 @@ begin
end;
initialization
{$I aboutdialog.lrs}
end.

View File

@@ -23,7 +23,7 @@
Abstract:
This unit contains all resource strings.
Note: All resource strings should be prefixed with 'lie' (Lazarus Icon Editor)
Note: All resource strings should be prefixed with 'lie' (Lazarus Image Editor)
}
unit IconStrConsts;
@@ -49,7 +49,7 @@ resourcestring
lieResourceName = 'Resource name: ';
// Main Form
lieMain = 'Lazarus Icon Editor';
lieMain = 'Lazarus Image Editor';
// main bar menu
lieMenuFile = '&File';
@@ -66,9 +66,9 @@ resourcestring
lieFileSaveAs = 'Save &As...';
lieFileExportAsLRS = '&Export As *.lrs...';
lieFileClose = '&Close';
lieRotate90 = '90Clockwise';
lieRotate180 = '180Clockwise';
lieRotate270 = '270Clockwise';
lieRotate90 = '90?Clockwise';
lieRotate180 = '180?Clockwise';
lieRotate270 = '270?Clockwise';
lieRotateCustom = 'Custom...';
lieFlipVertically = 'Vertically';
lieFlipHorizontally = 'Horizontally';
@@ -97,9 +97,9 @@ resourcestring
lieHintFileSaveAs = 'Save As';
lieHintFileExportAsLRS = 'Export As *.lrs';
lieHintFileClose = 'Close';
lieHintRotate90 = '90Clockwise';
lieHintRotate180 = '180Clockwise';
lieHintRotate270 = '270Clockwise';
lieHintRotate90 = '90?Clockwise';
lieHintRotate180 = '180?Clockwise';
lieHintRotate270 = '270?Clockwise';
lieHintRotateCustom = 'Custom';
lieHintFlipVertically = 'Vertically';
lieHintFlipHorizontally = 'Horizontally';
@@ -147,7 +147,7 @@ resourcestring
lieLabelTolerance = 'Tolerance:';
// Dialog About
lieAbouDialog = 'About Lazarus Icon Editor';
lieAbouDialog = 'About Lazarus Image Editor';
lieLabelVersion = 'Version: 0.1';
lieLabelAuthor = 'Author: Tom Gregorovic';

View File

@@ -1,30 +1,35 @@
object MainForm: TMainForm
Left = 301
Height = 569
Top = 155
Width = 640
Caption = 'Lazarus Icon Editor'
ClientHeight = 549
ClientWidth = 640
object MainForm: TMainForm
Left = 209
Height = 631
Top = 146
Width = 897
Caption = 'Lazarus Image Editor'
ClientHeight = 609
ClientWidth = 897
Font.CharSet = GB2312_CHARSET
Font.Height = -13
Font.Name = '微软雅黑'
Font.Pitch = fpVariable
Font.Quality = fqDraft
Menu = MainMenu
OnCloseQuery = FormCloseQuery
OnCreate = FormCreate
OnShow = FormShow
LCLVersion = '0.9.29'
LCLVersion = '0.9.31'
object PanelTools: TPanel
Left = 0
Height = 421
Height = 482
Top = 105
Width = 40
Align = alLeft
BevelOuter = bvNone
ClientHeight = 421
ClientHeight = 482
ClientWidth = 40
ParentColor = False
TabOrder = 0
object ToolBarTools: TToolBar
Left = 0
Height = 421
Height = 482
Top = 0
Width = 40
Align = alLeft
@@ -150,9 +155,9 @@ object MainForm: TMainForm
end
object StatusBar: TStatusBar
Left = 0
Height = 23
Top = 526
Width = 640
Height = 22
Top = 587
Width = 897
Panels = <
item
Width = 250
@@ -177,19 +182,19 @@ object MainForm: TMainForm
SimplePanel = False
end
object PanelPallete: TPanel
Left = 565
Height = 421
Left = 822
Height = 482
Top = 105
Width = 75
Align = alRight
AutoSize = True
BevelOuter = bvNone
ClientHeight = 421
ClientHeight = 482
ClientWidth = 75
TabOrder = 1
object Palette: TColorPalette
Left = 0
Height = 421
Height = 482
Top = 0
Width = 75
Align = alClient
@@ -201,17 +206,17 @@ object MainForm: TMainForm
Left = 0
Height = 105
Top = 0
Width = 640
Width = 897
Align = alTop
BevelOuter = bvNone
ClientHeight = 105
ClientWidth = 640
ClientWidth = 897
TabOrder = 2
object Bevel1: TBevel
Left = 0
Height = 2
Top = 69
Width = 640
Width = 897
Align = alTop
Shape = bsBottomLine
end
@@ -219,7 +224,7 @@ object MainForm: TMainForm
Left = 0
Height = 2
Top = 33
Width = 640
Width = 897
Align = alTop
Shape = bsBottomLine
end
@@ -227,7 +232,7 @@ object MainForm: TMainForm
Left = 0
Height = 33
Top = 0
Width = 640
Width = 897
ButtonHeight = 32
ButtonWidth = 36
Color = clBtnFace
@@ -239,7 +244,7 @@ object MainForm: TMainForm
Left = 385
Height = 32
Top = 0
Width = 31
Width = 40
Caption = 'Zoom:'
Constraints.MinHeight = 32
Layout = tlCenter
@@ -337,7 +342,7 @@ object MainForm: TMainForm
ShowHint = True
end
object PanelZoom: TPanel
Left = 416
Left = 425
Height = 32
Top = 0
Width = 77
@@ -347,11 +352,11 @@ object MainForm: TMainForm
TabOrder = 0
object ComboBoxZoom: TComboBox
Left = 4
Height = 21
Top = 5
Height = 27
Top = 2
Width = 70
Anchors = [akLeft]
ItemHeight = 13
ItemHeight = 19
ItemIndex = 2
Items.Strings = (
'25 %'
@@ -374,19 +379,19 @@ object MainForm: TMainForm
Left = 0
Height = 34
Top = 35
Width = 640
Width = 897
Align = alTop
BorderSpacing.InnerBorder = 4
BorderSpacing.CellAlignVertical = ccaCenter
BevelOuter = bvNone
ClientHeight = 34
ClientWidth = 640
ClientWidth = 897
TabOrder = 1
object LabelFillOutline: TLabel
Left = 96
Left = 103
Height = 34
Top = 0
Width = 58
Width = 72
Align = alLeft
Caption = 'Fill, Outline:'
Constraints.MinHeight = 32
@@ -397,7 +402,7 @@ object MainForm: TMainForm
Left = 0
Height = 34
Top = 0
Width = 35
Width = 42
Align = alLeft
Caption = 'Shape:'
Constraints.MinHeight = 32
@@ -405,10 +410,10 @@ object MainForm: TMainForm
ParentColor = False
end
object LabelMaskTool: TLabel
Left = 237
Left = 258
Height = 34
Top = 0
Width = 52
Width = 67
Align = alLeft
Caption = 'Mask Tool:'
Constraints.MinHeight = 32
@@ -416,10 +421,10 @@ object MainForm: TMainForm
ParentColor = False
end
object PanelColors: TPanel
Left = 447
Left = 685
Height = 34
Top = 0
Width = 193
Width = 212
Align = alRight
AutoSize = True
BorderSpacing.InnerBorder = 4
@@ -427,40 +432,40 @@ object MainForm: TMainForm
BorderSpacing.CellAlignVertical = ccaCenter
BevelOuter = bvNone
ClientHeight = 34
ClientWidth = 193
ClientWidth = 212
TabOrder = 0
object LabelOutline: TLabel
Left = 8
Height = 34
Top = 0
Width = 39
Width = 49
Align = alRight
Caption = 'Outline:'
Layout = tlCenter
ParentColor = False
end
object LabelFill: TLabel
Left = 79
Left = 89
Height = 34
Top = 0
Width = 17
Width = 20
Align = alRight
Caption = 'Fill:'
Layout = tlCenter
ParentColor = False
end
object LabelPaper: TLabel
Left = 128
Left = 141
Height = 34
Top = 0
Width = 33
Width = 39
Align = alRight
Caption = 'Paper:'
Layout = tlCenter
ParentColor = False
end
object PanelOutline: TPanel
Left = 53
Left = 63
Height = 22
Top = 6
Width = 20
@@ -473,7 +478,7 @@ object MainForm: TMainForm
OnDblClick = PanelOutlineDblClick
end
object PanelFill: TPanel
Left = 102
Left = 115
Height = 22
Top = 6
Width = 20
@@ -486,7 +491,7 @@ object MainForm: TMainForm
OnDblClick = PanelFillDblClick
end
object PanelPaper: TPanel
Left = 167
Left = 186
Height = 22
Top = 6
Width = 20
@@ -500,7 +505,7 @@ object MainForm: TMainForm
end
end
object PanelFillOutline: TPanel
Left = 154
Left = 175
Height = 34
Top = 0
Width = 83
@@ -515,7 +520,6 @@ object MainForm: TMainForm
Top = 5
Width = 25
Anchors = [akLeft]
Color = clBtnFace
Down = True
Glyph.Data = {
E6040000424DE604000000000000360000002800000014000000140000000100
@@ -569,7 +573,6 @@ object MainForm: TMainForm
Top = 5
Width = 25
Anchors = [akLeft]
Color = clBtnFace
Glyph.Data = {
76060000424D7606000000000000360000002800000014000000140000000100
2000000000004006000064000000640000000000000000000000000000FF0000
@@ -634,7 +637,6 @@ object MainForm: TMainForm
Top = 5
Width = 25
Anchors = [akLeft]
Color = clBtnFace
Glyph.Data = {
E6040000424DE604000000000000360000002800000014000000140000000100
180000000000B004000064000000640000000000000000000000FFFFFFFFFFFF
@@ -683,7 +685,7 @@ object MainForm: TMainForm
end
end
object PanelShape: TPanel
Left = 35
Left = 42
Height = 34
Top = 0
Width = 61
@@ -698,7 +700,6 @@ object MainForm: TMainForm
Top = 5
Width = 25
Anchors = [akLeft]
Color = clBtnFace
Down = True
Glyph.Data = {
E6040000424DE604000000000000360000002800000014000000140000000100
@@ -752,7 +753,6 @@ object MainForm: TMainForm
Top = 5
Width = 25
Anchors = [akLeft]
Color = clBtnFace
Glyph.Data = {
76060000424D7606000000000000360000002800000014000000140000000100
2000000000004006000064000000640000000000000000000000FFFFFF00FFFF
@@ -813,7 +813,7 @@ object MainForm: TMainForm
end
end
object PanelMaskTool: TPanel
Left = 289
Left = 325
Height = 34
Top = 0
Width = 86
@@ -828,7 +828,6 @@ object MainForm: TMainForm
Top = 5
Width = 25
Anchors = [akLeft]
Color = clBtnFace
Down = True
Glyph.Data = {
E6040000424DE604000000000000360000002800000014000000140000000100
@@ -882,7 +881,6 @@ object MainForm: TMainForm
Top = 5
Width = 25
Anchors = [akLeft]
Color = clBtnFace
Glyph.Data = {
76060000424D7606000000000000360000002800000014000000140000000100
2000000000004006000064000000640000000000000000000000FFFFFF00FFFF
@@ -947,7 +945,6 @@ object MainForm: TMainForm
Top = 5
Width = 25
Anchors = [akLeft]
Color = clBtnFace
Glyph.Data = {
76060000424D7606000000000000360000002800000014000000140000000100
2000000000004006000064000000640000000000000000000000FFFFFF00FFFF
@@ -1012,17 +1009,17 @@ object MainForm: TMainForm
Left = 0
Height = 34
Top = 71
Width = 640
Width = 897
Align = alTop
BevelOuter = bvNone
ClientHeight = 34
ClientWidth = 640
ClientWidth = 897
TabOrder = 2
object LabelSize: TLabel
Left = 0
Height = 34
Top = 0
Width = 24
Width = 28
Align = alLeft
Caption = 'Size:'
Constraints.MinHeight = 32
@@ -1030,10 +1027,10 @@ object MainForm: TMainForm
ParentColor = False
end
object LabelDensity: TLabel
Left = 217
Left = 234
Height = 34
Top = 0
Width = 41
Width = 50
Align = alLeft
Caption = 'Density:'
Constraints.MinHeight = 32
@@ -1041,10 +1038,10 @@ object MainForm: TMainForm
ParentColor = False
end
object LabelRoundness: TLabel
Left = 91
Left = 95
Height = 34
Top = 0
Width = 58
Width = 71
Align = alLeft
Caption = 'Roundness:'
Constraints.MinHeight = 32
@@ -1052,10 +1049,10 @@ object MainForm: TMainForm
ParentColor = False
end
object LabelTolerance: TLabel
Left = 327
Left = 353
Height = 34
Top = 0
Width = 52
Width = 63
Align = alLeft
Caption = 'Tolerance:'
Constraints.MinHeight = 32
@@ -1063,7 +1060,7 @@ object MainForm: TMainForm
ParentColor = False
end
object PanelSize: TPanel
Left = 24
Left = 28
Height = 34
Top = 0
Width = 67
@@ -1074,8 +1071,8 @@ object MainForm: TMainForm
TabOrder = 0
object EditSize: TEdit
Left = 3
Height = 21
Top = 6
Height = 27
Top = 3
Width = 43
Anchors = [akLeft]
OnChange = EditSizeChange
@@ -1084,8 +1081,8 @@ object MainForm: TMainForm
end
object UpDownSize: TUpDown
Left = 46
Height = 21
Top = 6
Height = 27
Top = 3
Width = 17
Associate = EditSize
Min = 1
@@ -1097,7 +1094,7 @@ object MainForm: TMainForm
end
end
object PanelDensity: TPanel
Left = 258
Left = 284
Height = 34
Top = 0
Width = 69
@@ -1108,8 +1105,8 @@ object MainForm: TMainForm
TabOrder = 1
object EditDensity: TEdit
Left = 3
Height = 21
Top = 6
Height = 27
Top = 3
Width = 42
Anchors = [akLeft]
OnChange = EditDensityChange
@@ -1118,8 +1115,8 @@ object MainForm: TMainForm
end
object UpDownDensity: TUpDown
Left = 45
Height = 21
Top = 6
Height = 27
Top = 3
Width = 17
Associate = EditDensity
Min = 0
@@ -1130,7 +1127,7 @@ object MainForm: TMainForm
end
end
object PanelRoundness: TPanel
Left = 149
Left = 166
Height = 34
Top = 0
Width = 68
@@ -1141,8 +1138,8 @@ object MainForm: TMainForm
TabOrder = 2
object EditRoundness: TEdit
Left = 4
Height = 21
Top = 6
Height = 27
Top = 3
Width = 42
Anchors = [akLeft]
OnChange = EditRoundnessChange
@@ -1151,8 +1148,8 @@ object MainForm: TMainForm
end
object UpDownRoundness: TUpDown
Left = 46
Height = 21
Top = 6
Height = 27
Top = 3
Width = 17
Associate = EditRoundness
Min = 0
@@ -1164,7 +1161,7 @@ object MainForm: TMainForm
end
end
object PanelTolerance: TPanel
Left = 379
Left = 416
Height = 34
Top = 0
Width = 68
@@ -1175,8 +1172,8 @@ object MainForm: TMainForm
TabOrder = 3
object EditTolerance: TEdit
Left = 2
Height = 21
Top = 6
Height = 27
Top = 3
Width = 42
Anchors = [akLeft]
OnChange = EditToleranceChange
@@ -1185,8 +1182,8 @@ object MainForm: TMainForm
end
object UpDownTolerance: TUpDown
Left = 44
Height = 21
Top = 6
Height = 27
Top = 3
Width = 17
Associate = EditTolerance
Min = 0
@@ -1197,10 +1194,10 @@ object MainForm: TMainForm
end
end
object LabelTolerance1: TLabel
Left = 447
Left = 484
Height = 34
Top = 0
Width = 47
Width = 59
Align = alLeft
Caption = 'Fill Alpha:'
Constraints.MinHeight = 32
@@ -1208,7 +1205,7 @@ object MainForm: TMainForm
ParentColor = False
end
object PanelTolerance1: TPanel
Left = 494
Left = 543
Height = 34
Top = 0
Width = 68
@@ -1219,7 +1216,7 @@ object MainForm: TMainForm
TabOrder = 4
object spinFillAlpha: TSpinEdit
Left = 10
Height = 21
Height = 27
Top = 5
Width = 51
OnChange = spinFillAlphaChange
@@ -1228,18 +1225,18 @@ object MainForm: TMainForm
end
end
object LabelTolerance2: TLabel
Left = 562
Left = 611
Height = 34
Top = 0
Width = 34
Width = 35
Align = alLeft
Caption = 'Fuzzy?'
Caption = 'Fuzzy'
Constraints.MinHeight = 32
Layout = tlCenter
ParentColor = False
end
object PanelTolerance2: TPanel
Left = 596
Left = 646
Height = 34
Top = 0
Width = 30
@@ -1250,9 +1247,9 @@ object MainForm: TMainForm
TabOrder = 5
object checkFuzzy: TCheckBox
Left = 4
Height = 17
Height = 19
Top = 9
Width = 18
Width = 20
OnChange = checkFuzzyChange
TabOrder = 0
end
@@ -1261,9 +1258,9 @@ object MainForm: TMainForm
end
object PanelPictures: TPanel
Left = 40
Height = 421
Height = 482
Top = 105
Width = 525
Width = 782
Align = alClient
BevelOuter = bvLowered
TabOrder = 3
@@ -1965,8 +1962,9 @@ object MainForm: TMainForm
OnClick = ViewShowMaskExecute
end
object MenuItemShowPreview: TMenuItem
Action = ViewShowPreview
AutoCheck = True
Caption = 'Show Preview'
Checked = True
OnClick = ViewShowPreviewExecute
end
end
@@ -1979,7 +1977,7 @@ object MainForm: TMainForm
Caption = '-'
end
object MenuItemAbout: TMenuItem
Caption = 'About Lazarus Icon Editor...'
Caption = 'About Lazarus Image Editor...'
OnClick = MenuItemAboutClick
end
end
@@ -2106,17 +2104,17 @@ object MainForm: TMainForm
end
object Rotate90: TAction
Category = 'PictureRotate'
Caption = '90Clockwise'
Caption = '90Clockwise'
OnExecute = Rotate90Execute
end
object Rotate180: TAction
Category = 'PictureRotate'
Caption = '180Clockwise'
Caption = '180Clockwise'
OnExecute = Rotate180Execute
end
object Rotate270: TAction
Category = 'PictureRotate'
Caption = '270Clockwise'
Caption = '270Clockwise'
OnExecute = Rotate270Execute
end
object RotateCustom: TAction
@@ -2172,13 +2170,6 @@ object MainForm: TMainForm
Checked = True
OnExecute = ViewShowMaskExecute
end
object ViewShowPreview: TAction
Category = 'View'
AutoCheck = True
Caption = 'Show Preview'
Checked = True
OnExecute = ViewShowPreviewExecute
end
end
object ImageListTools: TImageList
Height = 32

View File

@@ -21,7 +21,7 @@
Author: Tom Gregorovic
Abstract:
Icon Editor main unit.
Image Editor main unit.
}
unit Main;
@@ -32,9 +32,8 @@ interface
uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Menus,
ExtCtrls, ComCtrls, ActnList, StdActns, ExtDlgs, Buttons, StdCtrls, Spin,
NewDialog, ResizeDialog, ResizePaperDialog, AboutDialog, Preview,
PictureManager, RGBGraphics, PictureCtrls, ColorPalette;
NewDialog, ResizeDialog, ResizePaperDialog, AboutDialog,
PictureManager, PictureCtrls, ColorPalette;
type
@@ -50,7 +49,6 @@ type
PanelTolerance1: TPanel;
PanelTolerance2: TPanel;
spinFillAlpha: TSpinEdit;
ViewShowPreview: TAction;
ViewShowMask: TAction;
ViewShowGrid: TAction;
MenuItemShowMask: TMenuItem;
@@ -293,7 +291,6 @@ type
procedure SelectTool(Tool: TPictureEditTool);
procedure ChangeTool(Tool: TPictureEditTool);
procedure UpdatePictureToolsEnabled;
procedure UpdatePreview;
procedure UpdateAll;
public
property ActivePicture: TPictureBitmap read GetActivePicture;
@@ -356,8 +353,7 @@ end;
procedure TMainForm.PicturePageChange(Sender: TObject);
begin
UpdatePictureToolsEnabled;
UpdatePreview;
if not Pictures.CanEdit then Exit;
with ActivePictureEdit do
begin
@@ -373,11 +369,11 @@ begin
psCircle: ToolCircleShape.Down := True;
end;
case FillAndOutline of
{ case FillAndOutline of
dmFillAndOutline: ToolFillOutline.Down := True;
dmOutline: ToolOutline.Down := True;
dmFill: ToolFill.Down := True;
end;
end; }
case MaskTool of
mtRectangle: ToolMaskRectangle.Down := True;
@@ -392,8 +388,7 @@ begin
ViewShowGrid.Checked := poShowGrid in ActivePictureEdit.Options;
ViewShowMask.Checked := poShowMask in ActivePictureEdit.Options;
ViewShowPreview.Checked := ActivePicturePage.ShowPreview;
SelectTool(Tool);
PictureSizeChange(nil);
@@ -476,13 +471,13 @@ end;
procedure TMainForm.ToolFillClick(Sender: TObject);
begin
if not Pictures.CanEdit then Exit;
ActivePictureEdit.FillAndOutline := dmFill;
// ActivePictureEdit.FillAndOutline := dmFill;
end;
procedure TMainForm.ToolFillOutlineClick(Sender: TObject);
begin
if not Pictures.CanEdit then Exit;
ActivePictureEdit.FillAndOutline := dmFillAndOutline;
// ActivePictureEdit.FillAndOutline := dmFillAndOutline;
end;
procedure TMainForm.ToolFloodFillClick(Sender: TObject);
@@ -524,7 +519,7 @@ end;
procedure TMainForm.ToolOutlineClick(Sender: TObject);
begin
if not Pictures.CanEdit then Exit;
ActivePictureEdit.FillAndOutline := dmOutline;
// ActivePictureEdit.FillAndOutline := dmOutline;
end;
procedure TMainForm.ToolPenClick(Sender: TObject);
@@ -580,7 +575,7 @@ begin
StatusBar.Panels[3].Text := Format('%3.d x %3.d', [DX, DY]);
StatusBar.Panels[4].Text :=
ColorToString(ActivePicture.Canvas.GetColor(X, Y));
ColorToString(ActivePicture.GetColor(X, Y));
end;
procedure TMainForm.PictureColorChange(Sender: TObject);
@@ -633,9 +628,6 @@ end;
procedure TMainForm.ViewShowPreviewExecute(Sender: TObject);
begin
if not Pictures.CanEdit then Exit;
ActivePicturePage.ShowPreview := ViewShowPreview.Checked;
UpdatePreview;
end;
procedure TMainForm.PaletteColorPick(Sender: TObject; AColor: TColor;
@@ -753,25 +745,13 @@ begin
ViewShowGrid.Enabled := AValue;
ViewShowMask.Enabled := AValue;
ViewShowPreview.Enabled := AValue;
ToolBar.Invalidate;
ToolBarTools.Invalidate;
end;
procedure TMainForm.UpdatePreview;
begin
if Pictures.CanEdit and ActivePicturePage.ShowPreview then
begin
PreviewForm.Preview(ActivePicture);
PreviewForm.Show;
end
else PreviewForm.Hide;
end;
procedure TMainForm.UpdateAll;
begin
UpdatePreview;
UpdatePictureToolsEnabled;
UpdateToolSettings;
end;
@@ -877,7 +857,6 @@ begin
ColorsGrayscale.Caption:=lieColorsGrayscale;
ColorsInvert.Caption:=lieColorsInvert;
ColorsDisable.Caption:=lieColorsDisable;
ViewShowPreview.Caption:=lieViewShowPreview;
ViewShowMask.Caption:=lieViewShowMask;
ViewShowGrid.Caption:=lieViewShowGrid;
MaskInvert.Caption:=lieMaskInvert;
@@ -908,7 +887,6 @@ begin
ColorsGrayscale.Hint:=lieHintColorsGrayscale;
ColorsInvert.Hint:=lieHintColorsInvert;
ColorsDisable.Hint:=lieHintColorsDisable;
ViewShowPreview.Hint:=lieHintViewShowPreview;
ViewShowMask.Hint:=lieHintViewShowMask;
ViewShowGrid.Hint:=lieHintViewShowGrid;
MaskInvert.Hint:=lieHintMaskInvert;
@@ -1162,6 +1140,7 @@ end;
initialization
{$I main.lrs}
end.

View File

@@ -2,31 +2,31 @@ object NewDialogForm: TNewDialogForm
Left = 478
Height = 185
Top = 79
Width = 249
Width = 291
HorzScrollBar.Page = 248
VertScrollBar.Page = 184
ActiveControl = EditWidth
BorderIcons = [biSystemMenu]
BorderStyle = bsDialog
Caption = 'New picture'
ClientHeight = 185
ClientWidth = 249
ClientWidth = 291
Position = poMainFormCenter
LCLVersion = '0.9.29'
object GroupBoxProperties: TGroupBox
Left = 6
Left = 8
Height = 136
Top = 6
Width = 236
Width = 275
Anchors = [akTop, akLeft, akRight, akBottom]
Caption = 'Properties'
ClientHeight = 118
ClientWidth = 232
ClientWidth = 271
TabOrder = 0
object LabelWidth: TLabel
Left = 16
Height = 14
Top = 14
Width = 33
Width = 43
Caption = 'Width:'
ParentColor = False
end
@@ -34,7 +34,7 @@ object NewDialogForm: TNewDialogForm
Left = 16
Height = 14
Top = 50
Width = 36
Width = 50
Caption = 'Height:'
ParentColor = False
end
@@ -42,7 +42,7 @@ object NewDialogForm: TNewDialogForm
Left = 16
Height = 14
Top = 86
Width = 59
Width = 85
Caption = 'Paper color:'
ParentColor = False
end
@@ -50,56 +50,57 @@ object NewDialogForm: TNewDialogForm
Left = 118
Height = 25
Top = 82
Width = 80
Width = 129
BorderWidth = 2
ButtonColorSize = 16
ButtonColor = clWhite
Caption = 'Change...'
Color = clBtnFace
end
object EditWidth: TEdit
Left = 118
Height = 23
Height = 21
Top = 8
Width = 80
OnKeyDown = nil
Width = 112
TabOrder = 0
Text = '512'
end
object EditHeight: TEdit
Left = 118
Height = 23
Height = 21
Top = 44
Width = 80
OnKeyDown = nil
Width = 112
TabOrder = 1
Text = '512'
end
object UpDownWidth: TUpDown
Left = 198
Height = 23
Top = 8
Left = 230
Height = 17
Top = 10
Width = 17
Associate = EditWidth
Min = 1
Max = 4096
Position = 512
TabOrder = 2
Thousands = False
Wrap = False
end
object UpDownHeight: TUpDown
Left = 198
Height = 23
Top = 44
Left = 230
Height = 17
Top = 46
Width = 17
Associate = EditHeight
Min = 1
Max = 4096
Position = 512
TabOrder = 3
Thousands = False
Wrap = False
end
end
object ButtonCancel: TButton
Left = 167
Left = 208
Height = 25
Top = 149
Width = 75
@@ -111,7 +112,7 @@ object NewDialogForm: TNewDialogForm
TabOrder = 1
end
object ButtonOK: TButton
Left = 85
Left = 126
Height = 25
Top = 149
Width = 75

View File

@@ -2,34 +2,34 @@
LazarusResources.Add('TNewDialogForm','FORMDATA',[
'TPF0'#14'TNewDialogForm'#13'NewDialogForm'#4'Left'#3#222#1#6'Height'#3#185#0
+#3'Top'#2'O'#5'Width'#3#249#0#18'HorzScrollBar.Page'#3#248#0#18'VertScrollBa'
+'r.Page'#3#184#0#13'ActiveControl'#7#9'EditWidth'#11'BorderIcons'#11#12'biSy'
+'stemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#11'New picture'#12'C'
+'lientHeight'#3#185#0#11'ClientWidth'#3#249#0#8'Position'#7#16'poMainFormCen'
+'ter'#0#9'TGroupBox'#18'GroupBoxProperties'#4'Left'#2#6#6'Height'#3#136#0#3
+'Top'#2#6#5'Width'#3#236#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akB'
+'ottom'#0#7'Caption'#6#10'Properties'#12'ClientHeight'#2'v'#11'ClientWidth'#3
+#232#0#8'TabOrder'#2#0#0#6'TLabel'#10'LabelWidth'#4'Left'#2#16#6'Height'#2#14
+#3'Top'#2#14#5'Width'#2'!'#7'Caption'#6#6'Width:'#11'ParentColor'#8#0#0#6'TL'
+'abel'#11'LabelHeight'#4'Left'#2#16#6'Height'#2#14#3'Top'#2'2'#5'Width'#2'$'
+#7'Caption'#6#7'Height:'#11'ParentColor'#8#0#0#6'TLabel'#15'LabelPaperColor'
+#4'Left'#2#16#6'Height'#2#14#3'Top'#2'V'#5'Width'#2';'#7'Caption'#6#12'Paper'
+' color:'#11'ParentColor'#8#0#0#12'TColorButton'#16'ColorButtonPaper'#4'Left'
+#2'v'#6'Height'#2#25#3'Top'#2'R'#5'Width'#2'P'#11'BorderWidth'#2#2#15'Button'
+'ColorSize'#2#16#11'ButtonColor'#7#7'clWhite'#7'Caption'#6#9'Change...'#5'Co'
+'lor'#7#9'clBtnFace'#0#0#5'TEdit'#9'EditWidth'#4'Left'#2'v'#6'Height'#2#23#3
+'Top'#2#8#5'Width'#2'P'#9'OnKeyDown'#13#8'TabOrder'#2#0#4'Text'#6#3'512'#0#0
+#5'TEdit'#10'EditHeight'#4'Left'#2'v'#6'Height'#2#23#3'Top'#2','#5'Width'#2
+'P'#9'OnKeyDown'#13#8'TabOrder'#2#1#4'Text'#6#3'512'#0#0#7'TUpDown'#11'UpDow'
+'nWidth'#4'Left'#3#198#0#6'Height'#2#23#3'Top'#2#8#5'Width'#2#17#9'Associate'
+#7#9'EditWidth'#3'Min'#2#1#3'Max'#3#0#16#8'Position'#3#0#2#9'Thousands'#8#0#0
+#7'TUpDown'#12'UpDownHeight'#4'Left'#3#198#0#6'Height'#2#23#3'Top'#2','#5'Wi'
+'dth'#2#17#9'Associate'#7#10'EditHeight'#3'Min'#2#1#3'Max'#3#0#16#8'Position'
+#3#0#2#9'Thousands'#8#0#0#0#7'TButton'#12'ButtonCancel'#4'Left'#3#167#0#6'He'
+'ight'#2#25#3'Top'#3#149#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'
+#0#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'M'
+'odalResult'#2#2#8'TabOrder'#2#1#0#0#7'TButton'#8'ButtonOK'#4'Left'#2'U'#6'H'
+'eight'#2#25#3'Top'#3#149#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBotto'
+'m'#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#2'OK'#7'Default'#9#11'M'
+'odalResult'#2#1#8'TabOrder'#2#2#0#0#0
+#3'Top'#2'O'#5'Width'#3'#'#1#18'HorzScrollBar.Page'#3#248#0#18'VertScrollBar'
+'.Page'#3#184#0#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bs'
+'Dialog'#7'Caption'#6#11'New picture'#12'ClientHeight'#3#185#0#11'ClientWidt'
+'h'#3'#'#1#8'Position'#7#16'poMainFormCenter'#10'LCLVersion'#6#6'0.9.29'#0#9
+'TGroupBox'#18'GroupBoxProperties'#4'Left'#2#8#6'Height'#3#136#0#3'Top'#2#6#5
+'Width'#3#19#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'C'
+'aption'#6#10'Properties'#12'ClientHeight'#2'v'#11'ClientWidth'#3#15#1#8'Tab'
+'Order'#2#0#0#6'TLabel'#10'LabelWidth'#4'Left'#2#16#6'Height'#2#14#3'Top'#2
+#14#5'Width'#2'+'#7'Caption'#6#6'Width:'#11'ParentColor'#8#0#0#6'TLabel'#11
+'LabelHeight'#4'Left'#2#16#6'Height'#2#14#3'Top'#2'2'#5'Width'#2'2'#7'Captio'
+'n'#6#7'Height:'#11'ParentColor'#8#0#0#6'TLabel'#15'LabelPaperColor'#4'Left'
+#2#16#6'Height'#2#14#3'Top'#2'V'#5'Width'#2'U'#7'Caption'#6#12'Paper color:'
+#11'ParentColor'#8#0#0#12'TColorButton'#16'ColorButtonPaper'#4'Left'#2'v'#6
+'Height'#2#25#3'Top'#2'R'#5'Width'#3#129#0#11'BorderWidth'#2#2#15'ButtonColo'
+'rSize'#2#16#11'ButtonColor'#7#7'clWhite'#7'Caption'#6#9'Change...'#0#0#5'TE'
+'dit'#9'EditWidth'#4'Left'#2'v'#6'Height'#2#21#3'Top'#2#8#5'Width'#2'p'#8'Ta'
+'bOrder'#2#0#4'Text'#6#3'512'#0#0#5'TEdit'#10'EditHeight'#4'Left'#2'v'#6'Hei'
+'ght'#2#21#3'Top'#2','#5'Width'#2'p'#8'TabOrder'#2#1#4'Text'#6#3'512'#0#0#7
+'TUpDown'#11'UpDownWidth'#4'Left'#3#230#0#6'Height'#2#17#3'Top'#2#10#5'Width'
+#2#17#9'Associate'#7#9'EditWidth'#3'Min'#2#1#3'Max'#3#0#16#8'Position'#3#0#2
+#8'TabOrder'#2#2#9'Thousands'#8#4'Wrap'#8#0#0#7'TUpDown'#12'UpDownHeight'#4
+'Left'#3#230#0#6'Height'#2#17#3'Top'#2'.'#5'Width'#2#17#9'Associate'#7#10'Ed'
+'itHeight'#3'Min'#2#1#3'Max'#3#0#16#8'Position'#3#0#2#8'TabOrder'#2#3#9'Thou'
+'sands'#8#4'Wrap'#8#0#0#0#7'TButton'#12'ButtonCancel'#4'Left'#3#208#0#6'Heig'
+'ht'#2#25#3'Top'#3#149#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0
+#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'Mod'
+'alResult'#2#2#8'TabOrder'#2#1#0#0#7'TButton'#8'ButtonOK'#4'Left'#2'~'#6'Hei'
+'ght'#2#25#3'Top'#3#149#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'
+#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#2'OK'#7'Default'#9#11'Moda'
+'lResult'#2#1#8'TabOrder'#2#2#0#0#0
]);

View File

@@ -31,7 +31,7 @@ interface
uses
Classes, SysUtils, LCLType, LCLIntf, Controls, Forms, ExtCtrls, Graphics, Math,
RGBGraphics, RGBUtils, RGBTypes;
ImgEditorGraphics, ImgEditorUtils, ImgEditorTypes;
type
TPictureViewOption = (poShowGrid, poShowMask);
@@ -409,8 +409,8 @@ begin
if Assigned(FPicture) then
begin
FPicture.Canvas.StretchDrawTo(Canvas, FPictureRect.Left, FPictureRect.Top,
FPictureRect.Right - FPictureRect.Left, FPictureRect.Bottom - FPictureRect.Top);
FPicture.StretchDrawTo(Canvas, FPictureRect.Left, FPictureRect.Top,
FPictureRect.Right, FPictureRect.Bottom);
if (poShowGrid in Options) and (Zoom > 2.0) then
begin
@@ -701,7 +701,7 @@ begin
Picture.Free;
Picture := TPictureBitmap.Create(AWidth, AHeight);
PaperColor := APaperColor;
Picture.Canvas.Fill(PaperColor);
Picture.Fill(PaperColor);
FModified := False;
Change;
end;
@@ -735,7 +735,7 @@ begin
BeginDraw;
try
C := Picture.Canvas.GetColor(X, Y);
C := Picture.GetColor(X, Y);
finally
EndDraw;
end;
@@ -751,11 +751,11 @@ procedure TCustomPictureEdit.FloodFill(X, Y: Integer; Shift: TShiftState);
begin
if Picture = nil then Exit;
BeginDraw;
if not (ssLeft in Shift) then Picture.Canvas.EraseMode := ermErase;
if not (ssLeft in Shift) then Picture.EraseMode := ermErase;
try
Picture.Canvas.FloodFill(X, Y);
Picture.Canvas.FloodFill(X, Y, Picture.Canvas.Brush.Color, fsSurface);
finally
Picture.Canvas.EraseMode := ermNone;
Picture.EraseMode := ermNone;
EndDraw;
end;
Invalidate;
@@ -771,7 +771,7 @@ begin
if ssLeft in Shift then Picture.Mask.FillMode := mfAdd;
if ssRight in Shift then Picture.Mask.FillMode := mfRemove;
Picture.Canvas.MaskFloodFill(X, Y);
Picture.MaskFloodFill(X, Y);
finally
Picture.Mask.FillMode := mfAdd;
EndDraw;
@@ -786,16 +786,16 @@ begin
if Picture = nil then Exit;
BeginDraw;
if ssLeft in Shift then Picture.Canvas.EraseMode := ermErase;
if ssRight in Shift then Picture.Canvas.EraseMode := ermReplace;
if ssLeft in Shift then Picture.EraseMode := ermErase;
if ssRight in Shift then Picture.EraseMode := ermReplace;
try
R := Bounds(X - FSize div 2, Y - FSize div 2, FSize, FSize);
case Shape of
psRect: Picture.Canvas.FillRect(R.Left, R.Top, R.Right, R.Bottom);
psCircle: Picture.Canvas.FillEllipse(R.Left, R.Top, R.Right, R.Bottom);
psCircle: Picture.FillEllipse(R.Left, R.Top, R.Right, R.Bottom);
end;
finally
Picture.Canvas.EraseMode := ermNone;
Picture.EraseMode := ermNone;
EndDraw;
end;
InvalidatePictureRect(R);
@@ -808,17 +808,17 @@ begin
if Picture = nil then Exit;
BeginDraw;
if not (ssLeft in Shift) then Picture.Canvas.EraseMode := ermErase;
Picture.Canvas.RandomEnabled := True;
if not (ssLeft in Shift) then Picture.EraseMode := ermErase;
Picture.RandomEnabled := True;
try
R := Bounds(X - FSize div 2, Y - FSize div 2, FSize, FSize);
case Shape of
psRect: Picture.Canvas.FillRect(R.Left, R.Top, R.Right, R.Bottom);
psCircle: Picture.Canvas.FillEllipse(R.Left, R.Top, R.Right, R.Bottom);
psCircle: Picture.FillEllipse(R.Left, R.Top, R.Right, R.Bottom);
end;
finally
Picture.Canvas.EraseMode := ermNone;
Picture.Canvas.RandomEnabled := False;
Picture.EraseMode := ermNone;
Picture.RandomEnabled := False;
EndDraw;
end;
InvalidatePictureRect(R);
@@ -829,11 +829,11 @@ begin
if Picture = nil then Exit;
BeginDraw;
if not (ssLeft in Shift) then Picture.Canvas.EraseMode := ermErase;
if not (ssLeft in Shift) then Picture.EraseMode := ermErase;
try
Picture.Canvas.Line(X1, Y1, X2, Y2);
finally
Picture.Canvas.EraseMode := ermNone;
Picture.EraseMode := ermNone;
EndDraw;
end;
InvalidatePictureRect(Rect(X1, Y1, X2, Y2));
@@ -845,21 +845,21 @@ begin
if Picture = nil then Exit;
BeginDraw;
if not (ssLeft in Shift) then Picture.Canvas.EraseMode := ermErase;
if not (ssLeft in Shift) then Picture.EraseMode := ermErase;
try
if FFuzzy then
begin
Picture.Canvas.FuzzyRectangle(X1, Y1, X2, Y2);
Picture.FuzzyRectangle(X1, Y1, X2, Y2);
end
else
begin
if FFillAlpha = 100 then
Picture.Canvas.Rectangle(X1, Y1, X2, Y2)
else
Picture.Canvas.AlphaRectangle(X1, Y1, X2, Y2, FFillAlpha);
Picture.AlphaRectangle(X1, Y1, X2, Y2, FFillAlpha);
end;
finally
Picture.Canvas.EraseMode := ermNone;
Picture.EraseMode := ermNone;
EndDraw;
end;
InvalidatePictureRect(Rect(X1, Y1, X2, Y2));
@@ -870,12 +870,12 @@ begin
if Picture = nil then Exit;
BeginDraw;
if not (ssLeft in Shift) then Picture.Canvas.EraseMode := ermErase;
if not (ssLeft in Shift) then Picture.EraseMode := ermErase;
try
Picture.Canvas.Ellipse(X1, Y1, X2, Y2);
finally
Picture.Canvas.EraseMode := ermNone;
Picture.EraseMode := ermNone;
EndDraw;
end;
InvalidatePictureRect(Rect(X1, Y1, X2, Y2));
@@ -998,8 +998,8 @@ begin
try
New := TPictureBitmap.Create(AWidth, AHeight);
try
New.Canvas.PaperColor := ColorToRGB32Pixel(PaperColor);
New.Canvas.Fill(PaperColor);
New.PaperColor := PaperColor;
New.Fill(PaperColor);
case PicturePos of
ppTopLeft, ppCenterLeft, ppBottomLeft: X := 0;
@@ -1031,7 +1031,7 @@ var
R: TRect;
begin
if Picture = nil then Exit;
R := Picture.Mask.GetMaskedRect;
// R := Picture.Mask.GetMaskedRect;
if (Picture.Width = (R.Right - R.Left)) and
(Picture.Height = (R.Bottom - R.Top)) then Exit;
@@ -1170,13 +1170,13 @@ procedure TCustomPictureEdit.BeginDraw;
begin
if Picture = nil then Exit;
Picture.Canvas.OutlineColor := OutlineColor;
Picture.Canvas.FillColor := FillColor;
Picture.Canvas.PaperColor := PaperColor;
Picture.Canvas.RandomDensity := Round(RandomDensity * MAXRANDOMDENSITY);
Picture.Canvas.RectangleRoundness := RectangleRoundness;
Picture.Canvas.FloodFillTolerance := Round(FloodFillTolerance * MAXDIFFERENCE);
Picture.Canvas.DrawMode := FillAndOutline;
Picture.OutlineColor := OutlineColor;
Picture.FillColor := FillColor;
Picture.PaperColor := PaperColor;
Picture.RandomDensity := Round(RandomDensity * MAXRANDOMDENSITY);
Picture.RectangleRoundness := RectangleRoundness;
Picture.FloodFillTolerance := Round(FloodFillTolerance * MAXDIFFERENCE);
Picture.DrawMode := FillAndOutline;
end;
procedure TCustomPictureEdit.EndDraw;

View File

@@ -1,17 +1,16 @@
inherited ResizePaperDialogForm: TResizePaperDialogForm
Height = 507
Width = 276
ActiveControl = GroupBoxProperties
Width = 362
Caption = 'Resize paper'
ClientHeight = 507
ClientWidth = 276
ClientWidth = 362
OnCreate = FormCreate
OnDestroy = FormDestroy
object PanelPreview: TPanel[0]
Left = 6
Height = 264
Top = 6
Width = 264
Width = 350
Anchors = [akTop, akLeft, akRight, akBottom]
BevelOuter = bvNone
Color = clBlack
@@ -20,20 +19,20 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
TabOrder = 0
end
object GroupBoxProperties: TGroupBox[1]
Left = 12
Left = 8
Height = 186
Top = 276
Width = 264
Width = 346
Anchors = [akLeft, akRight, akBottom]
Caption = 'Properties'
ClientHeight = 168
ClientWidth = 260
ClientWidth = 342
TabOrder = 1
object LabelWidth: TLabel
Left = 16
Height = 14
Top = 44
Width = 62
Width = 85
Caption = 'Paper width:'
ParentColor = False
end
@@ -41,7 +40,7 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
Left = 16
Height = 14
Top = 80
Width = 66
Width = 92
Caption = 'Paper height:'
ParentColor = False
end
@@ -49,7 +48,7 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
Left = 16
Height = 14
Top = 140
Width = 59
Width = 85
Caption = 'Paper color:'
ParentColor = False
end
@@ -57,7 +56,7 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
Left = 16
Height = 14
Top = 13
Width = 78
Width = 120
Caption = 'Picture position:'
ParentColor = False
end
@@ -65,28 +64,26 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
Left = 148
Height = 25
Top = 135
Width = 80
Width = 163
BorderWidth = 2
ButtonColorSize = 16
ButtonColor = clWhite
Caption = 'Change...'
Color = clBtnFace
OnColorChanged = ColorButtonPaperColorChanged
end
object EditHeight: TEdit
Left = 148
Height = 23
Height = 21
Top = 74
Width = 80
Width = 146
OnChange = EditHeightChange
OnKeyDown = nil
TabOrder = 0
Text = '512'
end
object UpDownWidth: TUpDown
Left = 228
Height = 23
Top = 38
Left = 294
Height = 21
Top = 40
Width = 17
Associate = EditWidth
Min = 1
@@ -94,10 +91,11 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
Position = 512
TabOrder = 4
Thousands = False
Wrap = False
end
object UpDownHeight: TUpDown
Left = 228
Height = 23
Left = 294
Height = 21
Top = 74
Width = 17
Associate = EditHeight
@@ -106,12 +104,13 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
Position = 512
TabOrder = 5
Thousands = False
Wrap = False
end
object CheckBoxAspectRatio: TCheckBox
Left = 16
Height = 19
Top = 110
Width = 126
Width = 167
Caption = 'Preserve aspect ratio'
Checked = True
OnChange = CheckBoxAspectRatioChange
@@ -122,8 +121,7 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
Left = 148
Height = 21
Top = 8
Width = 96
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
Width = 176
ItemHeight = 13
ItemIndex = 0
Items.Strings = (
@@ -137,7 +135,6 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
'Bottom Center'
'Bottom Right'
)
MaxLength = 0
OnChange = ComboBoxPicturePositionChange
Style = csDropDownList
TabOrder = 2
@@ -145,17 +142,16 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
end
object EditWidth: TEdit
Left = 148
Height = 23
Top = 38
Width = 80
Height = 21
Top = 40
Width = 146
OnChange = EditWidthChange
OnKeyDown = nil
TabOrder = 3
Text = '512'
end
end
object ButtonOK: TButton[2]
Left = 112
Left = 198
Height = 25
Top = 474
Width = 75
@@ -167,7 +163,7 @@ inherited ResizePaperDialogForm: TResizePaperDialogForm
TabOrder = 2
end
object ButtonCancel: TButton[3]
Left = 193
Left = 279
Height = 25
Top = 474
Width = 75

View File

@@ -2,98 +2,48 @@
LazarusResources.Add('TResizePaperDialogForm','FORMDATA',[
'TPF0'#241#22'TResizePaperDialogForm'#21'ResizePaperDialogForm'#6'Height'#3
+#251#1#5'Width'#3#20#1#13'ActiveControl'#7#18'GroupBoxProperties'#7'Caption'
+#6#12'Resize paper'#12'ClientHeight'#3#251#1#11'ClientWidth'#3#20#1#8'OnCrea'
+'te'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#0#242#2#0#6'TPanel'#12
+'PanelPreview'#4'Left'#2#6#6'Height'#3#8#1#3'Top'#2#6#5'Width'#3#8#1#7'Ancho'
+'rs'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'BevelOuter'#7#6'bvNon'
+'e'#5'Color'#7#7'clBlack'#11'FullRepaint'#8#11'ParentColor'#8#8'TabOrder'#2#0
+#0#0#242#2#1#9'TGroupBox'#18'GroupBoxProperties'#4'Left'#2#12#6'Height'#3#186
+#0#3'Top'#3#20#1#5'Width'#3#8#1#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBotto'
+'m'#0#7'Caption'#6#10'Properties'#12'ClientHeight'#3#168#0#11'ClientWidth'#3
+#4#1#8'TabOrder'#2#1#0#6'TLabel'#10'LabelWidth'#4'Left'#2#16#6'Height'#2#14#3
+'Top'#2','#5'Width'#2'>'#7'Caption'#6#12'Paper width:'#11'ParentColor'#8#0#0
+#6'TLabel'#11'LabelHeight'#4'Left'#2#16#6'Height'#2#14#3'Top'#2'P'#5'Width'#2
+'B'#7'Caption'#6#13'Paper height:'#11'ParentColor'#8#0#0#6'TLabel'#15'LabelP'
+'aperColor'#4'Left'#2#16#6'Height'#2#14#3'Top'#3#140#0#5'Width'#2';'#7'Capti'
+'on'#6#12'Paper color:'#11'ParentColor'#8#0#0#6'TLabel'#20'LabelPicturePosit'
+'ion'#4'Left'#2#16#6'Height'#2#14#3'Top'#2#13#5'Width'#2'N'#7'Caption'#6#17
+'Picture position:'#11'ParentColor'#8#0#0#12'TColorButton'#16'ColorButtonPap'
+'er'#4'Left'#3#148#0#6'Height'#2#25#3'Top'#3#135#0#5'Width'#2'P'#11'BorderWi'
+'dth'#2#2#15'ButtonColorSize'#2#16#11'ButtonColor'#7#7'clWhite'#7'Caption'#6
+#9'Change...'#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#28'ColorButtonPap'
+'erColorChanged'#0#0#5'TEdit'#10'EditHeight'#4'Left'#3#148#0#6'Height'#2#23#3
+'Top'#2'J'#5'Width'#2'P'#8'OnChange'#7#16'EditHeightChange'#9'OnKeyDown'#13#8
+'TabOrder'#2#0#4'Text'#6#3'512'#0#0#7'TUpDown'#11'UpDownWidth'#4'Left'#3#228
+#0#6'Height'#2#23#3'Top'#2'&'#5'Width'#2#17#9'Associate'#7#9'EditWidth'#3'Mi'
+'n'#2#1#3'Max'#3#0#16#8'Position'#3#0#2#8'TabOrder'#2#4#9'Thousands'#8#0#0#7
+'TUpDown'#12'UpDownHeight'#4'Left'#3#228#0#6'Height'#2#23#3'Top'#2'J'#5'Widt'
+'h'#2#17#9'Associate'#7#10'EditHeight'#3'Min'#2#1#3'Max'#3#0#16#8'Position'#3
+#0#2#8'TabOrder'#2#5#9'Thousands'#8#0#0#9'TCheckBox'#19'CheckBoxAspectRatio'
+#4'Left'#2#16#6'Height'#2#19#3'Top'#2'n'#5'Width'#2'~'#7'Caption'#6#21'Prese'
+'rve aspect ratio'#7'Checked'#9#8'OnChange'#7#25'CheckBoxAspectRatioChange'#5
+'State'#7#9'cbChecked'#8'TabOrder'#2#1#0#0#9'TComboBox'#23'ComboBoxPicturePo'
+'sition'#4'Left'#3#148#0#6'Height'#2#21#3'Top'#2#8#5'Width'#2'`'#16'AutoComp'
+'leteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemH'
+'eight'#2#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#8'Top Left'#6#10'Top Cen'
+'ter'#6#9'Top Right'#6#11'Center Left'#6#8'Centered'#6#12'Center Right'#6#11
+'Bottom Left'#6#13'Bottom Center'#6#12'Bottom Right'#0#9'MaxLength'#2#0#8'On'
+'Change'#7#29'ComboBoxPicturePositionChange'#5'Style'#7#14'csDropDownList'#8
+'TabOrder'#2#2#4'Text'#6#8'Top Left'#0#0#5'TEdit'#9'EditWidth'#4'Left'#3#148
+#0#6'Height'#2#23#3'Top'#2'&'#5'Width'#2'P'#8'OnChange'#7#15'EditWidthChange'
+#9'OnKeyDown'#13#8'TabOrder'#2#3#4'Text'#6#3'512'#0#0#0#242#2#2#7'TButton'#8
+'ButtonOK'#4'Left'#2'p'#6'Height'#2#25#3'Top'#3#218#1#5'Width'#2'K'#7'Anchor'
+'s'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
+#6#2'OK'#7'Default'#9#11'ModalResult'#2#1#8'TabOrder'#2#2#0#0#242#2#3#7'TBut'
+'ton'#12'ButtonCancel'#4'Left'#3#193#0#6'Height'#2#25#3'Top'#3#218#1#5'Width'
+#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2
+#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2#3#0#0
+#0#241#22'TResizePaperDialogForm'#21'ResizePaperDialogForm'#6'Height'#3#251#1
+#5'Width'#3#20#1#13'ActiveControl'#7#18'GroupBoxProperties'#7'Caption'#6#12
+'Resize paper'#12'ClientHeight'#3#251#1#11'ClientWidth'#3#20#1#8'OnCreate'#7
+#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#0#242#2#0#6'TPanel'#12'PanelP'
+'review'#4'Left'#2#6#6'Height'#3#8#1#3'Top'#2#6#5'Width'#3#8#1#7'Anchors'#11
+#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'BevelOuter'#7#6'bvNone'#5'Co'
+'lor'#7#7'clBlack'#11'FullRepaint'#8#11'ParentColor'#8#8'TabOrder'#2#0#0#0
+#242#2#1#9'TGroupBox'#18'GroupBoxProperties'#4'Left'#2#12#6'Height'#3#186#0#3
+'Top'#3#20#1#5'Width'#3#8#1#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0
+#7'Caption'#6#10'Properties'#12'ClientHeight'#3#168#0#11'ClientWidth'#3#4#1#8
+'TabOrder'#2#1#0#6'TLabel'#10'LabelWidth'#4'Left'#2#16#6'Height'#2#14#3'Top'
+#2','#5'Width'#2'>'#7'Caption'#6#12'Paper width:'#11'ParentColor'#8#0#0#6'TL'
+'abel'#11'LabelHeight'#4'Left'#2#16#6'Height'#2#14#3'Top'#2'P'#5'Width'#2'B'
+#7'Caption'#6#13'Paper height:'#11'ParentColor'#8#0#0#6'TLabel'#15'LabelPape'
+'rColor'#4'Left'#2#16#6'Height'#2#14#3'Top'#3#140#0#5'Width'#2';'#7'Caption'
+#6#12'Paper color:'#11'ParentColor'#8#0#0#6'TLabel'#20'LabelPicturePosition'
+#4'Left'#2#16#6'Height'#2#14#3'Top'#2#13#5'Width'#2'N'#7'Caption'#6#17'Pictu'
,'re position:'#11'ParentColor'#8#0#0#12'TColorButton'#16'ColorButtonPaper'#4
+'Left'#3#148#0#6'Height'#2#25#3'Top'#3#135#0#5'Width'#2'P'#11'BorderWidth'#2
+#2#15'ButtonColorSize'#2#16#11'ButtonColor'#7#7'clWhite'#7'Caption'#6#9'Chan'
+'ge...'#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#28'ColorButtonPaperColo'
+'rChanged'#0#0#5'TEdit'#10'EditHeight'#4'Left'#3#148#0#6'Height'#2#23#3'Top'
+#2'J'#5'Width'#2'P'#8'OnChange'#7#16'EditHeightChange'#9'OnKeyDown'#13#8'Tab'
+'Order'#2#0#4'Text'#6#3'512'#0#0#7'TUpDown'#11'UpDownWidth'#4'Left'#3#228#0#6
+'Height'#2#23#3'Top'#2'&'#5'Width'#2#17#9'Associate'#7#9'EditWidth'#3'Min'#2
+#1#3'Max'#3#0#16#8'Position'#3#0#2#8'TabOrder'#2#4#9'Thousands'#8#0#0#7'TUpD'
+'own'#12'UpDownHeight'#4'Left'#3#228#0#6'Height'#2#23#3'Top'#2'J'#5'Width'#2
+#17#9'Associate'#7#10'EditHeight'#3'Min'#2#1#3'Max'#3#0#16#8'Position'#3#0#2
+#8'TabOrder'#2#5#9'Thousands'#8#0#0#9'TCheckBox'#19'CheckBoxAspectRatio'#4'L'
+'eft'#2#16#6'Height'#2#19#3'Top'#2'n'#5'Width'#2'~'#7'Caption'#6#21'Preserve'
+' aspect ratio'#7'Checked'#9#8'OnChange'#7#25'CheckBoxAspectRatioChange'#5'S'
+'tate'#7#9'cbChecked'#8'TabOrder'#2#1#0#0#9'TComboBox'#23'ComboBoxPicturePos'
+'ition'#4'Left'#3#148#0#6'Height'#2#21#3'Top'#2#8#5'Width'#2'`'#16'AutoCompl'
+'eteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHe'
+'ight'#2#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#8'Top Left'#6#10'Top Cent'
+'er'#6#9'Top Right'#6#11'Center Left'#6#8'Centered'#6#12'Center Right'#6#11
+'Bottom Left'#6#13'Bottom Center'#6#12'Bottom Right'#0#9'MaxLength'#2#0#8'On'
+'Change'#7#29'ComboBoxPicturePositionChange'#5'Style'#7#14'csDropDownList'#8
+'TabOrder'#2#2#4'Text'#6#8'Top Left'#0#0#5'TEdit'#9'EditWidth'#4'Left'#3#148
+#0#6'Height'#2#23#3'Top'#2'&'#5'Width'#2'P'#8'OnChange'#7#15'EditWidthChange'
+#9'OnKeyDown'#13#8'TabOrder'#2#3#4'Text'#6#3'512'#0#0#0#242#2#2#7'TButton'#8
+'ButtonOK'#4'Left'#2'p'#6'Height'#2#25#3'Top'#3#218#1#5'Width'#2'K'#7'Anchor'
+'s'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
+#6#2'OK'#7'Default'#9#11'ModalResult'#2#1#8'TabOrder'#2#2#0#0#242#2#3#7'TBut'
+'ton'#12'ButtonCancel'#4'Left'#3#193#0#6'Height'#2#25#3'Top'#3#218#1#5'Width'
+#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2
+#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2#3#0#0
+#0
+#251#1#5'Width'#3'j'#1#7'Caption'#6#12'Resize paper'#12'ClientHeight'#3#251#1
+#11'ClientWidth'#3'j'#1#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormD'
+'estroy'#0#242#2#0#6'TPanel'#12'PanelPreview'#4'Left'#2#6#6'Height'#3#8#1#3
+'Top'#2#6#5'Width'#3'^'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBo'
+'ttom'#0#10'BevelOuter'#7#6'bvNone'#5'Color'#7#7'clBlack'#11'FullRepaint'#8
+#11'ParentColor'#8#8'TabOrder'#2#0#0#0#242#2#1#9'TGroupBox'#18'GroupBoxPrope'
+'rties'#4'Left'#2#8#6'Height'#3#186#0#3'Top'#3#20#1#5'Width'#3'Z'#1#7'Anchor'
+'s'#11#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#10'Properties'#12'Cli'
+'entHeight'#3#168#0#11'ClientWidth'#3'V'#1#8'TabOrder'#2#1#0#6'TLabel'#10'La'
+'belWidth'#4'Left'#2#16#6'Height'#2#14#3'Top'#2','#5'Width'#2'U'#7'Caption'#6
+#12'Paper width:'#11'ParentColor'#8#0#0#6'TLabel'#11'LabelHeight'#4'Left'#2
+#16#6'Height'#2#14#3'Top'#2'P'#5'Width'#2'\'#7'Caption'#6#13'Paper height:'
+#11'ParentColor'#8#0#0#6'TLabel'#15'LabelPaperColor'#4'Left'#2#16#6'Height'#2
+#14#3'Top'#3#140#0#5'Width'#2'U'#7'Caption'#6#12'Paper color:'#11'ParentColo'
+'r'#8#0#0#6'TLabel'#20'LabelPicturePosition'#4'Left'#2#16#6'Height'#2#14#3'T'
+'op'#2#13#5'Width'#2'x'#7'Caption'#6#17'Picture position:'#11'ParentColor'#8
+#0#0#12'TColorButton'#16'ColorButtonPaper'#4'Left'#3#148#0#6'Height'#2#25#3
+'Top'#3#135#0#5'Width'#3#163#0#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16
+#11'ButtonColor'#7#7'clWhite'#7'Caption'#6#9'Change...'#14'OnColorChanged'#7
+#28'ColorButtonPaperColorChanged'#0#0#5'TEdit'#10'EditHeight'#4'Left'#3#148#0
+#6'Height'#2#21#3'Top'#2'J'#5'Width'#3#146#0#8'OnChange'#7#16'EditHeightChan'
+'ge'#8'TabOrder'#2#0#4'Text'#6#3'512'#0#0#7'TUpDown'#11'UpDownWidth'#4'Left'
+#3'&'#1#6'Height'#2#21#3'Top'#2'('#5'Width'#2#17#9'Associate'#7#9'EditWidth'
+#3'Min'#2#1#3'Max'#3#0#16#8'Position'#3#0#2#8'TabOrder'#2#4#9'Thousands'#8#4
+'Wrap'#8#0#0#7'TUpDown'#12'UpDownHeight'#4'Left'#3'&'#1#6'Height'#2#21#3'Top'
+#2'J'#5'Width'#2#17#9'Associate'#7#10'EditHeight'#3'Min'#2#1#3'Max'#3#0#16#8
+'Position'#3#0#2#8'TabOrder'#2#5#9'Thousands'#8#4'Wrap'#8#0#0#9'TCheckBox'#19
+'CheckBoxAspectRatio'#4'Left'#2#16#6'Height'#2#19#3'Top'#2'n'#5'Width'#3#167
+#0#7'Caption'#6#21'Preserve aspect ratio'#7'Checked'#9#8'OnChange'#7#25'Chec'
+'kBoxAspectRatioChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2#1#0#0#9'TCombo'
+'Box'#23'ComboBoxPicturePosition'#4'Left'#3#148#0#6'Height'#2#21#3'Top'#2#8#5
+'Width'#3#176#0#10'ItemHeight'#2#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#8
+'Top Left'#6#10'Top Center'#6#9'Top Right'#6#11'Center Left'#6#8'Centered'#6
+#12'Center Right'#6#11'Bottom Left'#6#13'Bottom Center'#6#12'Bottom Right'#0
+#8'OnChange'#7#29'ComboBoxPicturePositionChange'#5'Style'#7#14'csDropDownLis'
+'t'#8'TabOrder'#2#2#4'Text'#6#8'Top Left'#0#0#5'TEdit'#9'EditWidth'#4'Left'#3
+#148#0#6'Height'#2#21#3'Top'#2'('#5'Width'#3#146#0#8'OnChange'#7#15'EditWidt'
+'hChange'#8'TabOrder'#2#3#4'Text'#6#3'512'#0#0#0#242#2#2#7'TButton'#8'Button'
+'OK'#4'Left'#3#198#0#6'Height'#2#25#3'Top'#3#218#1#5'Width'#2'K'#7'Anchors'
+#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#2
+'OK'#7'Default'#9#11'ModalResult'#2#1#8'TabOrder'#2#2#0#0#242#2#3#7'TButton'
+#12'ButtonCancel'#4'Left'#3#23#1#6'Height'#2#25#3'Top'#3#218#1#5'Width'#2'K'
+#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#6
+'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2#3#0#0#0
]);

View File

@@ -31,7 +31,7 @@ interface
uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
Buttons, StdCtrls, ComCtrls, PictureCtrls, Math, RGBGraphics, PictureDialog;
Buttons, StdCtrls, ComCtrls, PictureCtrls, Math, ImgEditorGraphics, PictureDialog;
type