Fixes the tool buttons in the icon editor and makes it work from it's main directory

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1305 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2010-08-31 15:18:21 +00:00
parent 2f073e45f3
commit c5465cfa33
4 changed files with 2976 additions and 6873 deletions

File diff suppressed because it is too large Load Diff

View File

@ -3,27 +3,29 @@ object MainForm: TMainForm
Height = 569 Height = 569
Top = 155 Top = 155
Width = 640 Width = 640
ActiveControl = ComboBoxZoom
Caption = 'Lazarus Icon Editor' Caption = 'Lazarus Icon Editor'
ClientHeight = 550 ClientHeight = 549
ClientWidth = 640 ClientWidth = 640
Menu = MainMenu Menu = MainMenu
OnCloseQuery = FormCloseQuery OnCloseQuery = FormCloseQuery
OnCreate = FormCreate OnCreate = FormCreate
OnShow = FormShow OnShow = FormShow
LCLVersion = '0.9.25' LCLVersion = '0.9.29'
object PanelTools: TPanel object PanelTools: TPanel
Height = 425 Left = 0
Height = 421
Top = 105 Top = 105
Width = 40 Width = 40
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 425 ClientHeight = 421
ClientWidth = 40 ClientWidth = 40
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object ToolBarTools: TToolBar object ToolBarTools: TToolBar
Height = 425 Left = 0
Height = 421
Top = 0
Width = 40 Width = 40
Align = alLeft Align = alLeft
ButtonHeight = 40 ButtonHeight = 40
@ -34,111 +36,122 @@ object MainForm: TMainForm
Indent = 0 Indent = 0
TabOrder = 0 TabOrder = 0
object ToolSpray: TToolButton object ToolSpray: TToolButton
Left = 0
Hint = 'Spray' Hint = 'Spray'
Top = 362 Top = 362
Grouped = True Grouped = True
ImageIndex = 9 ImageIndex = 9
OnClick = ToolSprayClick
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck Style = tbsCheck
OnClick = ToolSprayClick
end end
object ToolFloodFill: TToolButton object ToolFloodFill: TToolButton
Left = 0
Hint = 'Flood Fill' Hint = 'Flood Fill'
Top = 322 Top = 322
Grouped = True Grouped = True
ImageIndex = 8 ImageIndex = 8
OnClick = ToolFloodFillClick
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck Style = tbsCheck
OnClick = ToolFloodFillClick
end end
object ToolEraser: TToolButton object ToolEraser: TToolButton
Left = 0
Hint = 'Eraser/Replacer' Hint = 'Eraser/Replacer'
Top = 122 Top = 122
Grouped = True Grouped = True
ImageIndex = 3 ImageIndex = 3
OnClick = ToolEraserClick
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck Style = tbsCheck
OnClick = ToolEraserClick
end end
object ToolPen: TToolButton object ToolPen: TToolButton
Left = 0
Hint = 'Pen' Hint = 'Pen'
Top = 82 Top = 82
Grouped = True Grouped = True
ImageIndex = 2 ImageIndex = 2
OnClick = ToolPenClick
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck Style = tbsCheck
OnClick = ToolPenClick
end end
object ToolColorPick: TToolButton object ToolColorPick: TToolButton
Left = 0
Hint = 'Color Pick' Hint = 'Color Pick'
Top = 42 Top = 42
Grouped = True Grouped = True
ImageIndex = 1 ImageIndex = 1
OnClick = ToolColorPickClick
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck Style = tbsCheck
OnClick = ToolColorPickClick
end end
object ToolMask: TToolButton object ToolMask: TToolButton
Left = 0
Hint = 'Mask' Hint = 'Mask'
Top = 2 Top = 2
Grouped = True Grouped = True
ImageIndex = 0 ImageIndex = 0
OnClick = ToolMaskClick
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck Style = tbsCheck
OnClick = ToolMaskClick
end end
object ToolLine: TToolButton object ToolLine: TToolButton
Left = 0
Hint = 'Line' Hint = 'Line'
Top = 162 Top = 162
Down = True Down = True
Grouped = True Grouped = True
ImageIndex = 4 ImageIndex = 4
ParentShowHint = False
ShowHint = True
Style = tbsCheck
OnClick = ToolLineClick OnClick = ToolLineClick
end
object ToolPolygon: TToolButton
Hint = 'Polygon'
Top = 282
Grouped = True
ImageIndex = 5
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck Style = tbsCheck
OnClick = ToolPolygonClick
end
object ToolEllipse: TToolButton
Hint = 'Ellipse'
Top = 242
Grouped = True
ImageIndex = 7
ParentShowHint = False
ShowHint = True
Style = tbsCheck
OnClick = ToolEllipseClick
end end
object ToolRectangle: TToolButton object ToolRectangle: TToolButton
Hint = 'Rectangle/Round rectangle' Left = 0
Hint = 'Polygon'
Top = 202 Top = 202
Grouped = True Grouped = True
ImageIndex = 6 ImageIndex = 5
OnClick = ToolRectangleClick
ParentShowHint = False
ShowHint = True
Style = tbsCheck
end
object ToolPolygon: TToolButton
Left = 0
Hint = 'Ellipse'
Top = 282
Grouped = True
ImageIndex = 7
OnClick = ToolPolygonClick
ParentShowHint = False
ShowHint = True
Style = tbsCheck
end
object ToolEllipse: TToolButton
Left = 0
Hint = 'Rectangle/Round rectangle'
Top = 242
Grouped = True
ImageIndex = 6
OnClick = ToolEllClick
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck Style = tbsCheck
OnClick = ToolRectangleClick
end end
end end
end end
object StatusBar: TStatusBar object StatusBar: TStatusBar
Height = 20 Left = 0
Top = 530 Height = 23
Top = 526
Width = 640 Width = 640
Panels = < Panels = <
item item
@ -164,26 +177,30 @@ object MainForm: TMainForm
SimplePanel = False SimplePanel = False
end end
object PanelPallete: TPanel object PanelPallete: TPanel
Left = 543 Left = 565
Height = 425 Height = 421
Top = 105 Top = 105
Width = 97 Width = 75
Align = alRight Align = alRight
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 425 ClientHeight = 421
ClientWidth = 97 ClientWidth = 75
TabOrder = 1 TabOrder = 1
object Palette: TColorPalette object Palette: TColorPalette
Height = 425 Left = 0
Width = 97 Height = 421
Top = 0
Width = 75
Align = alClient Align = alClient
ButtonWidth = 12 ButtonWidth = 12
ButtonHeight = 12 ButtonHeight = 12
end end
end end
object PanelToolBar: TPanel object PanelToolBar: TPanel
Left = 0
Height = 105 Height = 105
Top = 0
Width = 640 Width = 640
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
@ -191,6 +208,7 @@ object MainForm: TMainForm
ClientWidth = 640 ClientWidth = 640
TabOrder = 2 TabOrder = 2
object Bevel1: TBevel object Bevel1: TBevel
Left = 0
Height = 2 Height = 2
Top = 69 Top = 69
Width = 640 Width = 640
@ -198,6 +216,7 @@ object MainForm: TMainForm
Shape = bsBottomLine Shape = bsBottomLine
end end
object Bevel2: TBevel object Bevel2: TBevel
Left = 0
Height = 2 Height = 2
Top = 33 Top = 33
Width = 640 Width = 640
@ -205,7 +224,9 @@ object MainForm: TMainForm
Shape = bsBottomLine Shape = bsBottomLine
end end
object ToolBar: TToolBar object ToolBar: TToolBar
Left = 0
Height = 33 Height = 33
Top = 0
Width = 640 Width = 640
ButtonHeight = 32 ButtonHeight = 32
ButtonWidth = 36 ButtonWidth = 36
@ -215,8 +236,9 @@ object MainForm: TMainForm
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object LabelZoom: TLabel object LabelZoom: TLabel
Left = 379 Left = 385
Height = 32 Height = 32
Top = 0
Width = 31 Width = 31
Caption = 'Zoom:' Caption = 'Zoom:'
Constraints.MinHeight = 32 Constraints.MinHeight = 32
@ -225,95 +247,99 @@ object MainForm: TMainForm
end end
object ToolClose: TToolButton object ToolClose: TToolButton
Left = 109 Left = 109
Hint = 'Close' Top = 0
Action = FileClose Action = FileClose
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolSave: TToolButton object ToolSave: TToolButton
Left = 73 Left = 73
Hint = 'Save' Top = 0
Action = FileSave Action = FileSave
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolOpen: TToolButton object ToolOpen: TToolButton
Left = 37 Left = 37
Hint = 'Open' Top = 0
Action = FileOpen Action = FileOpen
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolNew: TToolButton object ToolNew: TToolButton
Left = 1 Left = 1
Hint = 'New' Top = 0
Action = FileNew Action = FileNew
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 145 Left = 145
Width = 6 Top = 0
Width = 8
Caption = 'ToolButton6' Caption = 'ToolButton6'
Style = tbsSeparator Style = tbsSeparator
end end
object ToolCut: TToolButton object ToolCut: TToolButton
Left = 229 Left = 233
Hint = 'Cut' Top = 0
Action = EditCut Action = EditCut
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 265 Left = 269
Hint = 'Copy' Top = 0
Action = EditCopy Action = EditCopy
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolButton9: TToolButton object ToolButton9: TToolButton
Left = 301 Left = 305
Hint = 'Paste' Top = 0
Action = EditPaste Action = EditPaste
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolButton10: TToolButton object ToolButton10: TToolButton
Left = 373 Left = 377
Width = 6 Top = 0
Width = 8
Caption = 'ToolButton10' Caption = 'ToolButton10'
Style = tbsSeparator Style = tbsSeparator
end end
object ToolButton11: TToolButton object ToolButton11: TToolButton
Left = 337 Left = 341
Hint = 'Delete' Top = 0
Action = EditDelete Action = EditDelete
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolUndo: TToolButton object ToolUndo: TToolButton
Left = 151 Left = 153
Hint = 'Undo' Top = 0
Action = EditUndo Action = EditUndo
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolButton2: TToolButton object ToolButton2: TToolButton
Left = 223 Left = 225
Width = 6 Top = 0
Width = 8
Caption = 'ToolButton2' Caption = 'ToolButton2'
Style = tbsSeparator Style = tbsSeparator
end end
object ToolRedo: TToolButton object ToolRedo: TToolButton
Left = 187 Left = 189
Hint = 'Redo' Top = 0
Action = EditRedo Action = EditRedo
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object PanelZoom: TPanel object PanelZoom: TPanel
Left = 410 Left = 416
Height = 32 Height = 32
Top = 0
Width = 77 Width = 77
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 32 ClientHeight = 32
@ -325,7 +351,6 @@ object MainForm: TMainForm
Top = 5 Top = 5
Width = 70 Width = 70
Anchors = [akLeft] Anchors = [akLeft]
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13 ItemHeight = 13
ItemIndex = 2 ItemIndex = 2
Items.Strings = ( Items.Strings = (
@ -337,7 +362,6 @@ object MainForm: TMainForm
'800 %' '800 %'
'1000 %' '1000 %'
) )
MaxLength = 0
OnChange = ComboBoxZoomChange OnChange = ComboBoxZoomChange
OnEditingDone = ComboBoxZoomEditingDone OnEditingDone = ComboBoxZoomEditingDone
ParentShowHint = False ParentShowHint = False
@ -347,6 +371,7 @@ object MainForm: TMainForm
end end
end end
object PanelOptions: TPanel object PanelOptions: TPanel
Left = 0
Height = 34 Height = 34
Top = 35 Top = 35
Width = 640 Width = 640
@ -360,6 +385,7 @@ object MainForm: TMainForm
object LabelFillOutline: TLabel object LabelFillOutline: TLabel
Left = 96 Left = 96
Height = 34 Height = 34
Top = 0
Width = 58 Width = 58
Align = alLeft Align = alLeft
Caption = 'Fill, Outline:' Caption = 'Fill, Outline:'
@ -368,7 +394,9 @@ object MainForm: TMainForm
ParentColor = False ParentColor = False
end end
object LabelShape: TLabel object LabelShape: TLabel
Left = 0
Height = 34 Height = 34
Top = 0
Width = 35 Width = 35
Align = alLeft Align = alLeft
Caption = 'Shape:' Caption = 'Shape:'
@ -379,6 +407,7 @@ object MainForm: TMainForm
object LabelMaskTool: TLabel object LabelMaskTool: TLabel
Left = 237 Left = 237
Height = 34 Height = 34
Top = 0
Width = 52 Width = 52
Align = alLeft Align = alLeft
Caption = 'Mask Tool:' Caption = 'Mask Tool:'
@ -387,9 +416,10 @@ object MainForm: TMainForm
ParentColor = False ParentColor = False
end end
object PanelColors: TPanel object PanelColors: TPanel
Left = 455 Left = 447
Height = 34 Height = 34
Width = 185 Top = 0
Width = 193
Align = alRight Align = alRight
AutoSize = True AutoSize = True
BorderSpacing.InnerBorder = 4 BorderSpacing.InnerBorder = 4
@ -397,10 +427,12 @@ object MainForm: TMainForm
BorderSpacing.CellAlignVertical = ccaCenter BorderSpacing.CellAlignVertical = ccaCenter
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 34 ClientHeight = 34
ClientWidth = 185 ClientWidth = 193
TabOrder = 0 TabOrder = 0
object LabelOutline: TLabel object LabelOutline: TLabel
Left = 8
Height = 34 Height = 34
Top = 0
Width = 39 Width = 39
Align = alRight Align = alRight
Caption = 'Outline:' Caption = 'Outline:'
@ -408,8 +440,9 @@ object MainForm: TMainForm
ParentColor = False ParentColor = False
end end
object LabelFill: TLabel object LabelFill: TLabel
Left = 71 Left = 79
Height = 34 Height = 34
Top = 0
Width = 17 Width = 17
Align = alRight Align = alRight
Caption = 'Fill:' Caption = 'Fill:'
@ -417,8 +450,9 @@ object MainForm: TMainForm
ParentColor = False ParentColor = False
end end
object LabelPaper: TLabel object LabelPaper: TLabel
Left = 120 Left = 128
Height = 34 Height = 34
Top = 0
Width = 33 Width = 33
Align = alRight Align = alRight
Caption = 'Paper:' Caption = 'Paper:'
@ -426,7 +460,7 @@ object MainForm: TMainForm
ParentColor = False ParentColor = False
end end
object PanelOutline: TPanel object PanelOutline: TPanel
Left = 45 Left = 53
Height = 22 Height = 22
Top = 6 Top = 6
Width = 20 Width = 20
@ -439,7 +473,7 @@ object MainForm: TMainForm
OnDblClick = PanelOutlineDblClick OnDblClick = PanelOutlineDblClick
end end
object PanelFill: TPanel object PanelFill: TPanel
Left = 94 Left = 102
Height = 22 Height = 22
Top = 6 Top = 6
Width = 20 Width = 20
@ -452,7 +486,7 @@ object MainForm: TMainForm
OnDblClick = PanelFillDblClick OnDblClick = PanelFillDblClick
end end
object PanelPaper: TPanel object PanelPaper: TPanel
Left = 159 Left = 167
Height = 22 Height = 22
Top = 6 Top = 6
Width = 20 Width = 20
@ -468,6 +502,7 @@ object MainForm: TMainForm
object PanelFillOutline: TPanel object PanelFillOutline: TPanel
Left = 154 Left = 154
Height = 34 Height = 34
Top = 0
Width = 83 Width = 83
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
@ -650,6 +685,7 @@ object MainForm: TMainForm
object PanelShape: TPanel object PanelShape: TPanel
Left = 35 Left = 35
Height = 34 Height = 34
Top = 0
Width = 61 Width = 61
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
@ -779,6 +815,7 @@ object MainForm: TMainForm
object PanelMaskTool: TPanel object PanelMaskTool: TPanel
Left = 289 Left = 289
Height = 34 Height = 34
Top = 0
Width = 86 Width = 86
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
@ -972,6 +1009,7 @@ object MainForm: TMainForm
end end
end end
object PanelToolOptions: TPanel object PanelToolOptions: TPanel
Left = 0
Height = 34 Height = 34
Top = 71 Top = 71
Width = 640 Width = 640
@ -981,7 +1019,9 @@ object MainForm: TMainForm
ClientWidth = 640 ClientWidth = 640
TabOrder = 2 TabOrder = 2
object LabelSize: TLabel object LabelSize: TLabel
Left = 0
Height = 34 Height = 34
Top = 0
Width = 24 Width = 24
Align = alLeft Align = alLeft
Caption = 'Size:' Caption = 'Size:'
@ -992,6 +1032,7 @@ object MainForm: TMainForm
object LabelDensity: TLabel object LabelDensity: TLabel
Left = 217 Left = 217
Height = 34 Height = 34
Top = 0
Width = 41 Width = 41
Align = alLeft Align = alLeft
Caption = 'Density:' Caption = 'Density:'
@ -1002,6 +1043,7 @@ object MainForm: TMainForm
object LabelRoundness: TLabel object LabelRoundness: TLabel
Left = 91 Left = 91
Height = 34 Height = 34
Top = 0
Width = 58 Width = 58
Align = alLeft Align = alLeft
Caption = 'Roundness:' Caption = 'Roundness:'
@ -1012,6 +1054,7 @@ object MainForm: TMainForm
object LabelTolerance: TLabel object LabelTolerance: TLabel
Left = 327 Left = 327
Height = 34 Height = 34
Top = 0
Width = 52 Width = 52
Align = alLeft Align = alLeft
Caption = 'Tolerance:' Caption = 'Tolerance:'
@ -1022,6 +1065,7 @@ object MainForm: TMainForm
object PanelSize: TPanel object PanelSize: TPanel
Left = 24 Left = 24
Height = 34 Height = 34
Top = 0
Width = 67 Width = 67
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
@ -1030,19 +1074,18 @@ object MainForm: TMainForm
TabOrder = 0 TabOrder = 0
object EditSize: TEdit object EditSize: TEdit
Left = 3 Left = 3
Height = 23 Height = 21
Top = 5 Top = 6
Width = 43 Width = 43
Anchors = [akLeft] Anchors = [akLeft]
OnChange = EditSizeChange OnChange = EditSizeChange
OnKeyDown = nil
TabOrder = 0 TabOrder = 0
Text = '10' Text = '10'
end end
object UpDownSize: TUpDown object UpDownSize: TUpDown
Left = 46 Left = 46
Height = 23 Height = 21
Top = 5 Top = 6
Width = 17 Width = 17
Associate = EditSize Associate = EditSize
Min = 1 Min = 1
@ -1050,11 +1093,13 @@ object MainForm: TMainForm
Position = 10 Position = 10
TabOrder = 1 TabOrder = 1
Thousands = False Thousands = False
Wrap = False
end end
end end
object PanelDensity: TPanel object PanelDensity: TPanel
Left = 258 Left = 258
Height = 34 Height = 34
Top = 0
Width = 69 Width = 69
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
@ -1063,29 +1108,31 @@ object MainForm: TMainForm
TabOrder = 1 TabOrder = 1
object EditDensity: TEdit object EditDensity: TEdit
Left = 3 Left = 3
Height = 23 Height = 21
Top = 5 Top = 6
Width = 42 Width = 42
Anchors = [akLeft] Anchors = [akLeft]
OnChange = EditDensityChange OnChange = EditDensityChange
OnKeyDown = nil
TabOrder = 0 TabOrder = 0
Text = '100' Text = '100'
end end
object UpDownDensity: TUpDown object UpDownDensity: TUpDown
Left = 45 Left = 45
Height = 23 Height = 21
Top = 5 Top = 6
Width = 17 Width = 17
Associate = EditDensity Associate = EditDensity
Min = 0
Position = 100 Position = 100
TabOrder = 1 TabOrder = 1
Thousands = False Thousands = False
Wrap = False
end end
end end
object PanelRoundness: TPanel object PanelRoundness: TPanel
Left = 149 Left = 149
Height = 34 Height = 34
Top = 0
Width = 68 Width = 68
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
@ -1094,29 +1141,32 @@ object MainForm: TMainForm
TabOrder = 2 TabOrder = 2
object EditRoundness: TEdit object EditRoundness: TEdit
Left = 4 Left = 4
Height = 23 Height = 21
Top = 5 Top = 6
Width = 42 Width = 42
Anchors = [akLeft] Anchors = [akLeft]
OnChange = EditRoundnessChange OnChange = EditRoundnessChange
OnKeyDown = nil
TabOrder = 0 TabOrder = 0
Text = '0' Text = '0'
end end
object UpDownRoundness: TUpDown object UpDownRoundness: TUpDown
Left = 46 Left = 46
Height = 23 Height = 21
Top = 5 Top = 6
Width = 17 Width = 17
Associate = EditRoundness Associate = EditRoundness
Min = 0
Max = 4096 Max = 4096
Position = 0
TabOrder = 1 TabOrder = 1
Thousands = False Thousands = False
Wrap = False
end end
end end
object PanelTolerance: TPanel object PanelTolerance: TPanel
Left = 379 Left = 379
Height = 34 Height = 34
Top = 0
Width = 68 Width = 68
Align = alLeft Align = alLeft
BevelOuter = bvNone BevelOuter = bvNone
@ -1125,32 +1175,34 @@ object MainForm: TMainForm
TabOrder = 3 TabOrder = 3
object EditTolerance: TEdit object EditTolerance: TEdit
Left = 2 Left = 2
Height = 23 Height = 21
Top = 5 Top = 6
Width = 42 Width = 42
Anchors = [akLeft] Anchors = [akLeft]
OnChange = EditToleranceChange OnChange = EditToleranceChange
OnKeyDown = nil
TabOrder = 0 TabOrder = 0
Text = '0' Text = '0'
end end
object UpDownTolerance: TUpDown object UpDownTolerance: TUpDown
Left = 44 Left = 44
Height = 23 Height = 21
Top = 5 Top = 6
Width = 17 Width = 17
Associate = EditTolerance Associate = EditTolerance
Min = 0
Position = 0
TabOrder = 1 TabOrder = 1
Thousands = False Thousands = False
Wrap = False
end end
end end
end end
end end
object PanelPictures: TPanel object PanelPictures: TPanel
Left = 40 Left = 40
Height = 425 Height = 421
Top = 105 Top = 105
Width = 503 Width = 525
Align = alClient Align = alClient
BevelOuter = bvLowered BevelOuter = bvLowered
TabOrder = 3 TabOrder = 3
@ -1878,7 +1930,6 @@ object MainForm: TMainForm
object FileNew: TAction object FileNew: TAction
Category = 'File' Category = 'File'
Caption = '&New...' Caption = '&New...'
DisableIfNoHandler = True
Hint = 'New' Hint = 'New'
ImageIndex = 0 ImageIndex = 0
OnExecute = FileNewExecute OnExecute = FileNewExecute
@ -1887,7 +1938,6 @@ object MainForm: TMainForm
object FileOpen: TAction object FileOpen: TAction
Category = 'File' Category = 'File'
Caption = '&Open...' Caption = '&Open...'
DisableIfNoHandler = True
Hint = 'Open' Hint = 'Open'
ImageIndex = 1 ImageIndex = 1
OnExecute = FileOpenExecute OnExecute = FileOpenExecute
@ -1896,7 +1946,6 @@ object MainForm: TMainForm
object FileSave: TAction object FileSave: TAction
Category = 'File' Category = 'File'
Caption = '&Save' Caption = '&Save'
DisableIfNoHandler = True
Hint = 'Save' Hint = 'Save'
ImageIndex = 2 ImageIndex = 2
OnExecute = FileSaveExecute OnExecute = FileSaveExecute
@ -1905,14 +1954,12 @@ object MainForm: TMainForm
object FileSaveAs: TAction object FileSaveAs: TAction
Category = 'File' Category = 'File'
Caption = 'Save &As...' Caption = 'Save &As...'
DisableIfNoHandler = True
Hint = 'Save As' Hint = 'Save As'
OnExecute = FileSaveAsExecute OnExecute = FileSaveAsExecute
end end
object FileClose: TAction object FileClose: TAction
Category = 'File' Category = 'File'
Caption = '&Close' Caption = '&Close'
DisableIfNoHandler = True
Hint = 'Close' Hint = 'Close'
ImageIndex = 3 ImageIndex = 3
OnExecute = FileCloseExecute OnExecute = FileCloseExecute
@ -1921,7 +1968,6 @@ object MainForm: TMainForm
object EditUndo: TEditUndo object EditUndo: TEditUndo
Category = 'Edit' Category = 'Edit'
Caption = '&Undo' Caption = '&Undo'
DisableIfNoHandler = True
Enabled = False Enabled = False
Hint = 'Undo' Hint = 'Undo'
ImageIndex = 4 ImageIndex = 4
@ -1930,7 +1976,6 @@ object MainForm: TMainForm
object EditRedo: TAction object EditRedo: TAction
Category = 'Edit' Category = 'Edit'
Caption = '&Redo' Caption = '&Redo'
DisableIfNoHandler = True
Enabled = False Enabled = False
Hint = 'Redo' Hint = 'Redo'
ImageIndex = 5 ImageIndex = 5
@ -1939,7 +1984,6 @@ object MainForm: TMainForm
object EditCut: TEditCut object EditCut: TEditCut
Category = 'Edit' Category = 'Edit'
Caption = 'Cu&t' Caption = 'Cu&t'
DisableIfNoHandler = True
Enabled = False Enabled = False
Hint = 'Cut' Hint = 'Cut'
ImageIndex = 6 ImageIndex = 6
@ -1949,7 +1993,6 @@ object MainForm: TMainForm
object EditCopy: TEditCopy object EditCopy: TEditCopy
Category = 'Edit' Category = 'Edit'
Caption = '&Copy' Caption = '&Copy'
DisableIfNoHandler = True
Enabled = False Enabled = False
Hint = 'Copy' Hint = 'Copy'
ImageIndex = 7 ImageIndex = 7
@ -1959,7 +2002,6 @@ object MainForm: TMainForm
object EditPaste: TEditPaste object EditPaste: TEditPaste
Category = 'Edit' Category = 'Edit'
Caption = '&Paste' Caption = '&Paste'
DisableIfNoHandler = True
Enabled = False Enabled = False
Hint = 'Paste' Hint = 'Paste'
ImageIndex = 8 ImageIndex = 8
@ -1969,7 +2011,6 @@ object MainForm: TMainForm
object EditDelete: TEditDelete object EditDelete: TEditDelete
Category = 'Edit' Category = 'Edit'
Caption = '&Delete' Caption = '&Delete'
DisableIfNoHandler = True
Enabled = False Enabled = False
Hint = 'Delete' Hint = 'Delete'
ImageIndex = 9 ImageIndex = 9
@ -1979,7 +2020,6 @@ object MainForm: TMainForm
object EditSelectAll: TEditSelectAll object EditSelectAll: TEditSelectAll
Category = 'Edit' Category = 'Edit'
Caption = 'Select &All' Caption = 'Select &All'
DisableIfNoHandler = True
Enabled = False Enabled = False
Hint = 'Select All' Hint = 'Select All'
OnExecute = EditSelectAllExecute OnExecute = EditSelectAllExecute
@ -1988,96 +2028,80 @@ object MainForm: TMainForm
object PictureResize: TAction object PictureResize: TAction
Category = 'Picture' Category = 'Picture'
Caption = 'Resize...' Caption = 'Resize...'
DisableIfNoHandler = True
end end
object PictureResizePaper: TAction object PictureResizePaper: TAction
Category = 'Picture' Category = 'Picture'
Caption = 'Resize Paper...' Caption = 'Resize Paper...'
DisableIfNoHandler = True
end end
object FlipHorizontally: TAction object FlipHorizontally: TAction
Category = 'PictureFlip' Category = 'PictureFlip'
Caption = 'Horizontally' Caption = 'Horizontally'
DisableIfNoHandler = True
OnExecute = FlipHorizontallyExecute OnExecute = FlipHorizontallyExecute
end end
object FlipVertically: TAction object FlipVertically: TAction
Category = 'PictureFlip' Category = 'PictureFlip'
Caption = 'Vertically' Caption = 'Vertically'
DisableIfNoHandler = True
OnExecute = FlipVerticallyExecute OnExecute = FlipVerticallyExecute
end end
object Rotate90: TAction object Rotate90: TAction
Category = 'PictureRotate' Category = 'PictureRotate'
Caption = '90� Clockwise' Caption = '90� Clockwise'
DisableIfNoHandler = True
OnExecute = Rotate90Execute OnExecute = Rotate90Execute
end end
object Rotate180: TAction object Rotate180: TAction
Category = 'PictureRotate' Category = 'PictureRotate'
Caption = '180� Clockwise' Caption = '180� Clockwise'
DisableIfNoHandler = True
OnExecute = Rotate180Execute OnExecute = Rotate180Execute
end end
object Rotate270: TAction object Rotate270: TAction
Category = 'PictureRotate' Category = 'PictureRotate'
Caption = '270� Clockwise' Caption = '270� Clockwise'
DisableIfNoHandler = True
OnExecute = Rotate270Execute OnExecute = Rotate270Execute
end end
object RotateCustom: TAction object RotateCustom: TAction
Category = 'PictureRotate' Category = 'PictureRotate'
Caption = 'Custom...' Caption = 'Custom...'
DisableIfNoHandler = True
Enabled = False Enabled = False
end end
object ColorsInvert: TAction object ColorsInvert: TAction
Category = 'PictureColors' Category = 'PictureColors'
Caption = 'Invert' Caption = 'Invert'
DisableIfNoHandler = True
OnExecute = ColorsInvertExecute OnExecute = ColorsInvertExecute
end end
object ColorsGrayscale: TAction object ColorsGrayscale: TAction
Category = 'PictureColors' Category = 'PictureColors'
Caption = 'Grayscale' Caption = 'Grayscale'
DisableIfNoHandler = True
OnExecute = ColorsGrayscaleExecute OnExecute = ColorsGrayscaleExecute
end end
object ColorsDisable: TAction object ColorsDisable: TAction
Category = 'PictureColors' Category = 'PictureColors'
Caption = 'Disable' Caption = 'Disable'
DisableIfNoHandler = True
OnExecute = ColorsDisableExecute OnExecute = ColorsDisableExecute
end end
object FileExportAsLRS: TAction object FileExportAsLRS: TAction
Category = 'File' Category = 'File'
Caption = '&Export As *.lrs...' Caption = '&Export As *.lrs...'
DisableIfNoHandler = True
OnExecute = FileExportAsLRSExecute OnExecute = FileExportAsLRSExecute
end end
object MaskRemove: TAction object MaskRemove: TAction
Category = 'Mask' Category = 'Mask'
Caption = 'Remove' Caption = 'Remove'
DisableIfNoHandler = True
OnExecute = MaskRemoveExecute OnExecute = MaskRemoveExecute
end end
object MaskInvert: TAction object MaskInvert: TAction
Category = 'Mask' Category = 'Mask'
Caption = 'Invert' Caption = 'Invert'
DisableIfNoHandler = True
OnExecute = MaskInvertExecute OnExecute = MaskInvertExecute
end end
object PictureClipPaperToMask: TAction object PictureClipPaperToMask: TAction
Category = 'Picture' Category = 'Picture'
Caption = 'Clip Paper To Mask' Caption = 'Clip Paper To Mask'
DisableIfNoHandler = True
end end
object ViewShowGrid: TAction object ViewShowGrid: TAction
Category = 'View' Category = 'View'
AutoCheck = True AutoCheck = True
Caption = 'Show Grid' Caption = 'Show Grid'
Checked = True Checked = True
DisableIfNoHandler = True
OnExecute = ViewShowGridExecute OnExecute = ViewShowGridExecute
end end
object ViewShowMask: TAction object ViewShowMask: TAction
@ -2085,7 +2109,6 @@ object MainForm: TMainForm
AutoCheck = True AutoCheck = True
Caption = 'Show Mask' Caption = 'Show Mask'
Checked = True Checked = True
DisableIfNoHandler = True
OnExecute = ViewShowMaskExecute OnExecute = ViewShowMaskExecute
end end
object ViewShowPreview: TAction object ViewShowPreview: TAction
@ -2093,7 +2116,6 @@ object MainForm: TMainForm
AutoCheck = True AutoCheck = True
Caption = 'Show Preview' Caption = 'Show Preview'
Checked = True Checked = True
DisableIfNoHandler = True
OnExecute = ViewShowPreviewExecute OnExecute = ViewShowPreviewExecute
end end
end end
@ -3903,6 +3925,29 @@ object MainForm: TMainForm
top = 90 top = 90
end end
object ColorDialog: TColorDialog object ColorDialog: TColorDialog
Color = clBlack
CustomColors.Strings = (
'ColorA=000000'
'ColorB=000080'
'ColorC=008000'
'ColorD=008080'
'ColorE=800000'
'ColorF=800080'
'ColorG=808000'
'ColorH=808080'
'ColorI=C0C0C0'
'ColorJ=0000FF'
'ColorK=00FF00'
'ColorL=00FFFF'
'ColorM=FF0000'
'ColorN=FF00FF'
'ColorO=FFFF00'
'ColorP=FFFFFF'
'ColorQ=C0DCC0'
'ColorR=F0CAA6'
'ColorS=F0FBFF'
'ColorT=A4A0A0'
)
left = 186 left = 186
top = 90 top = 90
end end

File diff suppressed because it is too large Load Diff

View File

@ -189,10 +189,10 @@ type
ToolCut: TToolButton; ToolCut: TToolButton;
ToolButton8: TToolButton; ToolButton8: TToolButton;
ToolButton9: TToolButton; ToolButton9: TToolButton;
ToolEllipse: TToolButton;
ToolRectangle: TToolButton;
ToolLine: TToolButton;
ToolPolygon: TToolButton; ToolPolygon: TToolButton;
ToolEllipse: TToolButton;
ToolLine: TToolButton;
ToolRectangle: TToolButton;
ToolSpray: TToolButton; ToolSpray: TToolButton;
ToolFloodFill: TToolButton; ToolFloodFill: TToolButton;
ToolEraser: TToolButton; ToolEraser: TToolButton;
@ -252,7 +252,7 @@ type
procedure Rotate90Execute(Sender: TObject); procedure Rotate90Execute(Sender: TObject);
procedure ToolCircleShapeClick(Sender: TObject); procedure ToolCircleShapeClick(Sender: TObject);
procedure ToolColorPickClick(Sender: TObject); procedure ToolColorPickClick(Sender: TObject);
procedure ToolEllipseClick(Sender: TObject); procedure ToolEllClick(Sender: TObject);
procedure ToolFillClick(Sender: TObject); procedure ToolFillClick(Sender: TObject);
procedure ToolFillOutlineClick(Sender: TObject); procedure ToolFillOutlineClick(Sender: TObject);
procedure ToolFloodFillClick(Sender: TObject); procedure ToolFloodFillClick(Sender: TObject);
@ -453,7 +453,7 @@ begin
ChangeTool(ptColorPick); ChangeTool(ptColorPick);
end; end;
procedure TMainForm.ToolEllipseClick(Sender: TObject); procedure TMainForm.ToolEllClick(Sender: TObject);
begin begin
if not Pictures.CanEdit then Exit; if not Pictures.CanEdit then Exit;
ChangeTool(ptEllipse); ChangeTool(ptEllipse);
@ -681,9 +681,9 @@ begin
ptFloodFill: ToolFloodFill.Down := True; ptFloodFill: ToolFloodFill.Down := True;
ptSpray: ToolSpray.Down := True; ptSpray: ToolSpray.Down := True;
ptLine: ToolLine.Down := True; ptLine: ToolLine.Down := True;
ptPolygon: ToolPolygon.Down := True; ptPolygon: ToolRectangle.Down := True;
ptRectangle: ToolRectangle.Down := True; ptRectangle: ToolEllipse.Down := True;
ptEllipse: ToolEllipse.Down := True; ptEllipse: ToolPolygon.Down := True;
end; end;
ChangeTool(Tool); ChangeTool(Tool);
end; end;
@ -832,7 +832,7 @@ begin
UpdatePictureToolsEnabled; UpdatePictureToolsEnabled;
UpdateToolSettings; UpdateToolSettings;
Palette.LoadPalette('../../default.pal'); Palette.LoadPalette('default.pal');
// Main Form // Main Form
Caption:=lieMain; Caption:=lieMain;
@ -928,9 +928,9 @@ begin
ToolColorPick.Hint:=lieHintToolColorPick; ToolColorPick.Hint:=lieHintToolColorPick;
ToolMask.Hint:=lieHintToolMask; ToolMask.Hint:=lieHintToolMask;
ToolLine.Hint:=lieHintToolLine; ToolLine.Hint:=lieHintToolLine;
ToolPolygon.Hint:=lieHintToolPolygon; ToolRectangle.Hint:=lieHintToolPolygon;
ToolEllipse.Hint:=lieHintToolEllipse; ToolPolygon.Hint:=lieHintToolEllipse;
ToolRectangle.Hint:=lieHintToolRectangle; ToolEllipse.Hint:=lieHintToolRectangle;
//File Dialogs //File Dialogs
ColorDialog.Title:=lieColorDialog; ColorDialog.Title:=lieColorDialog;