diff --git a/2.10/Source/Editor.dfm b/2.10/Source/Editor.dfm index e91a61d..393c361 100644 --- a/2.10/Source/Editor.dfm +++ b/2.10/Source/Editor.dfm @@ -81,7 +81,7 @@ object EditForm: TEditForm object EditorToolBar: TToolBar Left = 1 Top = 1 - Width = 352 + Width = 376 Height = 22 Align = alLeft ButtonWidth = 25 @@ -92,66 +92,76 @@ object EditForm: TEditForm Images = EditorTB ParentColor = False TabOrder = 0 - object tbUndo: TToolButton + object tbResetAll: TToolButton Left = 0 Top = 0 - Hint = 'Undo (Ctrl+Z)' - Caption = 'Undo' + Hint = 'Reset all triangles to reference position' + Caption = 'Reset All' + ImageIndex = 0 + ParentShowHint = False + ShowHint = True + OnClick = mnuResetAllClick + end + object tbAdd: TToolButton + Left = 25 + Top = 0 + Hint = 'Adds a new triangle' + Caption = 'Add' + ImageIndex = 1 + ParentShowHint = False + ShowHint = True + OnClick = mnuAddClick + end + object tbDuplicate: TToolButton + Left = 50 + Top = 0 + Hint = 'Duplicates the selected triangle' + Caption = 'Duplicate' + ImageIndex = 2 + ParentShowHint = False + ShowHint = True + OnClick = mnuDupClick + end + object tbDelete: TToolButton + Left = 75 + Top = 0 + Hint = 'Deletes the selected triangle' + Caption = 'Delete' ImageIndex = 3 ParentShowHint = False ShowHint = True - OnClick = mnuUndoClick - end - object tbRedo: TToolButton - Left = 25 - Top = 0 - Hint = 'Redo (Ctrl+Y)' - Caption = 'Redo' - ImageIndex = 4 - ParentShowHint = False - ShowHint = True - OnClick = mnuRedoClick + OnClick = mnuDeleteClick end object ToolButton4: TToolButton - Left = 50 + Left = 100 Top = 0 Width = 8 Caption = 'ToolButton4' ImageIndex = 3 Style = tbsSeparator end - object tbAdd: TToolButton - Left = 58 - Top = 0 - Hint = 'Adds a new triangle' - Caption = 'Add' - ImageIndex = 0 - ParentShowHint = False - ShowHint = True - OnClick = mnuAddClick - end - object tbDuplicate: TToolButton - Left = 83 - Top = 0 - Hint = 'Duplicates the selected triangle' - Caption = 'Duplicate' - ImageIndex = 1 - ParentShowHint = False - ShowHint = True - OnClick = mnuDupClick - end - object tbDelete: TToolButton + object tbUndo: TToolButton Left = 108 Top = 0 - Hint = 'Deletes the selected triangle' - Caption = 'Delete' - ImageIndex = 2 + Hint = 'Undo (Ctrl+Z)' + Caption = 'Undo' + ImageIndex = 4 ParentShowHint = False ShowHint = True - OnClick = mnuDeleteClick + OnClick = mnuUndoClick + end + object tbRedo: TToolButton + Left = 133 + Top = 0 + Hint = 'Redo (Ctrl+Y)' + Caption = 'Redo' + ImageIndex = 5 + ParentShowHint = False + ShowHint = True + OnClick = mnuRedoClick end object ToolButton1: TToolButton - Left = 133 + Left = 158 Top = 0 Width = 8 Caption = 'ToolButton1' @@ -159,46 +169,34 @@ object EditForm: TEditForm Style = tbsSeparator end object tbSelect: TToolButton - Left = 141 + Left = 166 Top = 0 Hint = 'Select triangle' Caption = 'Select' Down = True - ImageIndex = 5 + ImageIndex = 6 ParentShowHint = False ShowHint = True OnClick = tbSelectClick end object tbMove: TToolButton - Left = 166 + Left = 191 Top = 0 Hint = 'Move Triangle' Caption = 'Move' Down = True Grouped = True - ImageIndex = 6 - ParentShowHint = False - ShowHint = True - Style = tbsCheck - OnClick = tbEditModeClick - end - object tbRotate: TToolButton - Left = 191 - Top = 0 - Hint = 'Rotate triangle' - Caption = 'Rotate' - Grouped = True ImageIndex = 7 ParentShowHint = False ShowHint = True Style = tbsCheck OnClick = tbEditModeClick end - object tbScale: TToolButton + object tbRotate: TToolButton Left = 216 Top = 0 - Hint = 'Scale triangle' - Caption = 'Scale' + Hint = 'Rotate triangle' + Caption = 'Rotate' Grouped = True ImageIndex = 8 ParentShowHint = False @@ -206,50 +204,62 @@ object EditForm: TEditForm Style = tbsCheck OnClick = tbEditModeClick end - object ToolButton5: TToolButton + object tbScale: TToolButton Left = 241 Top = 0 + Hint = 'Scale triangle' + Caption = 'Scale' + Grouped = True + ImageIndex = 9 + ParentShowHint = False + ShowHint = True + Style = tbsCheck + OnClick = tbEditModeClick + end + object ToolButton5: TToolButton + Left = 266 + Top = 0 Width = 8 Caption = 'ToolButton5' ImageIndex = 7 Style = tbsSeparator end object tbFlipHorz: TToolButton - Left = 249 + Left = 274 Top = 0 Hint = 'Flip triangle horizontal' Caption = 'Flip Horizontal' - ImageIndex = 9 + ImageIndex = 10 ParentShowHint = False ShowHint = True OnClick = mnuFlipHorizontalClick end object tbFlipVert: TToolButton - Left = 274 + Left = 299 Top = 0 Hint = 'Flip triangle vertical' Caption = 'Flip Vertical' - ImageIndex = 10 + ImageIndex = 11 ParentShowHint = False ShowHint = True OnClick = mnuFlipVerticalClick end object tbFlipAllHorz: TToolButton - Left = 299 + Left = 324 Top = 0 Hint = 'Flip all triangles horizontal' Caption = 'Flip All Horizontal' - ImageIndex = 11 + ImageIndex = 12 MenuItem = mnuHorizintalFlipAll ParentShowHint = False ShowHint = True end object tbFlipAllVert: TToolButton - Left = 324 + Left = 349 Top = 0 Hint = 'Flip all triangles vertical' Caption = 'Flip All Vertical ' - ImageIndex = 12 + ImageIndex = 13 MenuItem = mnuVerticalFlipAll ParentShowHint = False ShowHint = True @@ -1097,6 +1107,7 @@ object EditForm: TEditForm Top = 156 Width = 49 Height = 21 + AutoComplete = False ItemHeight = 13 ItemIndex = 3 TabOrder = 9 @@ -1117,6 +1128,7 @@ object EditForm: TEditForm Top = 104 Width = 49 Height = 21 + AutoComplete = False ItemHeight = 13 ItemIndex = 1 TabOrder = 8 @@ -1136,6 +1148,7 @@ object EditForm: TEditForm Top = 208 Width = 49 Height = 21 + AutoComplete = False ItemHeight = 13 ItemIndex = 1 TabOrder = 10 @@ -1507,7 +1520,7 @@ object EditForm: TEditForm Top = 40 object mnuAutoZoom: TMenuItem Caption = 'Auto Zoom' - Hint = 'Zooms the triangle display to the best fit' + Hint = 'Zoom to fit all triangles' OnClick = mnuAutoZoomClick end object N1: TMenuItem @@ -1515,24 +1528,35 @@ object EditForm: TEditForm end object mnuDelete: TMenuItem Caption = 'Delete' - Hint = 'Deletes the selected triangle' - ImageIndex = 2 + Hint = 'Delete selected triangle' + ImageIndex = 3 OnClick = mnuDeleteClick end object mnuDuplicate: TMenuItem Caption = 'Duplicate' - Hint = 'Duplicates the selected triangle' - ImageIndex = 1 + Hint = 'Duplicate selected triangle' + ImageIndex = 2 OnClick = mnuDupClick end + object mnuAdd: TMenuItem + Caption = 'Add' + Hint = 'Add new triangle' + ImageIndex = 1 + OnClick = mnuAddClick + end object MenuItem2: TMenuItem Caption = '-' end - object mnuAdd: TMenuItem - Caption = 'Add' - Hint = 'Adds a new triangle' + object mnuReset: TMenuItem + Caption = 'Reset Triangle' + Hint = 'Reset triangle to reference position' + OnClick = mnuResetClick + end + object mnuResetAll: TMenuItem + Caption = 'Reset All' + Hint = 'Reset all triangles to reference position' ImageIndex = 0 - OnClick = mnuAddClick + OnClick = mnuResetAllClick end object N4: TMenuItem Caption = '-' @@ -1540,13 +1564,13 @@ object EditForm: TEditForm object mnuFlipVertical: TMenuItem Caption = 'Flip Vertical' Hint = 'Flip triangle vertical' - ImageIndex = 10 + ImageIndex = 11 OnClick = mnuFlipVerticalClick end object mnuFlipHorizontal: TMenuItem Caption = 'Flip Horizontal' Hint = 'Flip triangle horizontal' - ImageIndex = 9 + ImageIndex = 10 OnClick = mnuFlipHorizontalClick end object N5: TMenuItem @@ -1555,13 +1579,13 @@ object EditForm: TEditForm object mnuVerticalFlipAll: TMenuItem Caption = 'Flip All Vertical ' Hint = 'Flip all triangles vertical' - ImageIndex = 12 + ImageIndex = 13 OnClick = mnuVerticalFlipAllClick end object mnuHorizintalFlipAll: TMenuItem Caption = 'Flip All Horizontal' Hint = 'Flip all triangles horizontal' - ImageIndex = 11 + ImageIndex = 12 OnClick = mnuHorizintalFlipAllClick end object MenuItem1: TMenuItem @@ -1571,7 +1595,7 @@ object EditForm: TEditForm Caption = 'Undo' Enabled = False Hint = 'Undo' - ImageIndex = 3 + ImageIndex = 4 ShortCut = 16474 OnClick = mnuUndoClick end @@ -1579,7 +1603,7 @@ object EditForm: TEditForm Caption = 'Redo' Enabled = False Hint = 'Redo' - ImageIndex = 4 + ImageIndex = 5 ShortCut = 16473 OnClick = mnuRedoClick end @@ -1617,8 +1641,8 @@ object EditForm: TEditForm Left = 353 Top = 80 Bitmap = { - 494C01010D000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600 - 0000000000003600000028000000400000004000000001002000000000000040 + 494C01010E001300040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600 + 0000000000003600000028000000400000005000000001002000000000000050 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -1683,6 +1707,136 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 0000000000000000000000000000000000008000800080008000800080008000 8000000000000000000080008000800080008000800080008000800080008000 8000800080008000800080008000800080000000000000000000000000000000 @@ -1690,47 +1844,7 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -1758,11 +1872,51 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000800080000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 + 000000000000000000005C5C5C00000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000000000000000000000000000 @@ -1770,7 +1924,7 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000005C5C 5C00000000000000000000000000000000000000000000000000000000005C5C 5C00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 + 00000000000000000000000000005C5C5C000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 00005C5C5C000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000000080000000000000000000 @@ -1778,95 +1932,95 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 00005C5C5C0000000000000000000000000000000000000000005C5C5C000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 + 0000600000006000000000000000000000005C5C5C0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000005C5C5C0000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000000080606000800000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000005C5C5C0000000000000000000000000000000000000000000000 0000000000005C5C5C000000000000000000000000005C5C5C00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 000000000000000000000000000000000000000000005C5C5C00000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000005C5C5C00000000000000000000000000000000000000 0000000000000000000000000000000000008000000000000000806060008000 0000000000000000000000000000800080000000000000000000000000000000 00005C5C5C000000000000000000000000000000000000000000000000000000 000000000000000000005C5C5C00000000005C5C5C0000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 00000000000000000000000000000000000000000000000000005C5C5C000000 0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000005C5C5C000000000000000000000000000000 0000000000000000000000000000000000008000000000000000000000008060 6000800000000000000000000000000000000000000000000000000000005C5C 5C00000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000005C5C5C000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000600000000000 + 0000000000000000000000000000000000000000000000000000000000005C5C + 5C00000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000005C5C5C0000000000000000000000 0000000000000000000000000000000000008000000000000000000000000000 00008060600080000000000000008000800000000000000000005C5C5C000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000600000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000005C5C5C00000000000000 0000000000000000000000000000000000008000000000000000000000000000 000000000000806060008000000000000000000000005C5C5C00000000000000 0000000000000000000000000000000000008000800000000000800080000000 0000800080000000000080008000000000008000800000000000800080000000 - 0000800080000000000080008000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 + 0000800080000000000080008000000000000000000000000000600000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000005C5C5C000000 0000000000000000000000000000000000008000000000000000000000000000 00008060600080000000000000008000800000000000000000005C5C5C000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000800000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000600000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000005C5C 5C00000000000000000000000000000000008000000000000000000000008060 6000800000000000000000000000000000000000000000000000000000005C5C 5C00000000000000000000000000000000000000000000000000000000000000 0000000000000000000080000000806060008000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 0000000000000000000000000000000000000000000000000000600000006000 + 0000600000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 00005C5C5C000000000000000000000000008000000000000000806060008000 0000000000000000000000000000800080000000000000000000000000000000 00005C5C5C000000000000000000000000000000000000000000000000000000 0000000000008000000080606000000000008060600080000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000600000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000000080606000800000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000005C5C5C0000000000000000000000000000000000000000000000 0000800000008060600000000000000000000000000080606000800000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000600000006000000000000000000000000000000000000000600000006000 + 0000000000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000000080000000000000000000 0000000000000000000000000000800080000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000008000 0000806060000000000000000000000000000000000000000000806060008000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000060000000600000006000000060000000000000000000 + 0000000000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000800000008060 6000000000000000000000000000000000000000000000000000000000008060 6000800000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -1874,7 +2028,7 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000080000000800000008000 0000800000008000000080000000800000008000000080000000800000008000 0000800000008000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -1898,7 +2052,7 @@ object EditForm: TEditForm FF00000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000005C5C5C00000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -1906,62 +2060,62 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000005C5C5C00000000005C5C5C0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000005C5C5C000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000800000000000000000000000000000000000000000000000000000008000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000FFFFFF00000000000000000000000000FFFFFF00FFFFFF000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000600000006000000000000000000000005C5C5C0000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008000 + 0000000000000000000000000000000000000000000000000000800000008000 + 0000800000008000000080000000000000000000000000000000000000000000 + 0000800000000000000000000000000000000000000000000000000000008000 0000000000000000000000000000000000000000000080000000800000008000 0000800000008000000000000000000000000000000000000000000000000000 000000000000FFFFFF00FFFFFF0000000000FFFFFF00FFFFFF00000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000006000 - 000000000000000000000000000000000000000000005C5C5C00000000000000 - 0000000000000000000000000000000000000000000000000000800000000000 + 0000000000000000000000000000000000000000000000000000800000008000 + 0000800000008000000000000000000000000000000000000000000000000000 + 0000000000008000000000000000000000000000000000000000800000000000 0000000000000000000000000000000000000000000000000000800000008000 0000800000008000000000000000000000000000000000000000000000000000 000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000006000 - 00000000000000000000000000000000000000000000000000005C5C5C000000 - 0000000000000000000000000000000000000000000000000000800000000000 + 0000000000000000000000000000000000000000000000000000800000008000 + 0000800000000000000000000000000000000000000000000000000000000000 + 0000000000008000000000000000000000000000000000000000800000000000 0000000000000000000000000000000000000000000000000000000000008000 0000800000008000000000000000000000000000000000000000000000000000 000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF000000000000000000000000000000000000000000000000005C5C5C000000 0000000000000000000000000000000000000000000000000000000000000000 - 00005C5C5C000000000000000000000000000000000000000000600000000000 - 0000000000000000000000000000000000000000000000000000000000005C5C - 5C00000000000000000000000000000000000000000000000000800000000000 + 00005C5C5C000000000000000000000000000000000000000000800000008000 + 0000000000008000000000000000000000000000000000000000000000000000 + 0000000000008000000000000000000000000000000000000000800000000000 0000000000000000000000000000000000000000000000000000800000000000 0000800000008000000000000000000000000000000000000000000000000000 000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000600000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008000 + 0000000000000000000000000000000000000000000000000000800000000000 + 0000000000000000000080000000800000000000000000000000000000000000 + 0000800000000000000000000000000000000000000000000000000000008000 0000000000000000000000000000000000008000000080000000000000000000 0000000000008000000000000000000000000000000000000000000000000000 000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000 00000000000000000000000000000000000000000000000000005C5C5C000000 0000000000000000000000000000000000000000000000000000000000000000 - 00005C5C5C000000000000000000000000000000000000000000600000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 00005C5C5C000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000000080000000800000008000 0000000000000000000000000000000000000000000000000000000000000000 0000800000008000000080000000800000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000600000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -1969,33 +2123,23 @@ object EditForm: TEditForm 000000000000FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000006000 - 0000000000000000000000000000000000000000000000000000600000006000 - 0000600000006000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000FFFFFF00FFFFFF00000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000006000 0000000000000000000000000000000000000000000000000000000000000000 - 0000600000006000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000FFFFFF0000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000005C5C5C00000000005C5C5C0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000600000006000000000000000000000000000000000000000600000006000 - 0000000000006000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000060000000600000006000000060000000000000000000 - 0000000000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2027,86 +2171,96 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF000000000000000000000000000000000000000000000000000000 000000000000000000005C5C5C00000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000005C5C5C00000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000005C5C5C00000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF00FFFDFB00FFFDFB00FFFDFB00FFFDFB00FFFDFB00FFFFFF00FFFF + FF00FFFFFF000000000000000000000000000000000000000000000000000000 00000000000000000000000000005C5C5C000000000000000000000000000000 0000000000000000000000000000000000008000000080000000800000008000 0000800000008000000080000000800000008000000080000000800000008000 00000000000000000000000000000000000000000000000000000000C0000000 00000000000000000000000000005C5C5C0000000000000000000000C0000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000800000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFDFB008080800080808000808080008080800080808000808080008080 + 8000FFFFFF000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000005C5C5C0000000000000000000000 0000000000000000000000000000000000000000000080000000800000008000 0000800000008000000080000000800000008000000080000000800000008000 000000000000000000000000000000000000000000000000C0000000C0000000 C000000000000000000000000000000000005C5C5C000000C0000000C0000000 - C000000000000000000000000000000000000000000000000000800000008000 - 0000800000008000000080000000000000000000000000000000000000000000 - 0000800000000000000000000000000000000000000000000000000000000000 + C00000000000000000000000000000000000000000000000000000000000FFFD + FB00FFFDFB0080808000FFFDFB00FFFDFB00FFFDFB00BFBFBF0080808000FFFF + FF00FFFFFF000000000000000000000000000000000000000000000000000000 000000800000008000000000000000000000000000005C5C5C00000000000000 0000000000000000000000000000000000000000000000000000800000008000 000080000000000000000000000000000000000000005C5C5C00800000008000 00000000000000000000000000000000000000000000000000000000C0000000 C0000000C0000000000000000000000000000000C0000000C0000000C0000000 - 0000000000000000000000000000000000000000000000000000800000008000 - 0000800000008000000000000000000000000000000000000000000000000000 - 0000000000008000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFD + FB00FFFFFF0080808000FFFFFF00FFFFFF00BFBFBF0080808000FFFDFB00FFFF + FF00FFFFFF000000000000000000000000000000000000000000000000000000 00000080000000800000000000000000000000000000000000005C5C5C000000 0000000000000000000000000000000000000000000000000000000000008000 0000800000008000000000000000000000000000000000000000800000008000 0000000000000000000000000000000000000000000000000000000000000000 C0000000C0000000C000000000000000C0000000C0000000C0005C5C5C000000 - 0000000000000000000000000000000000000000000000000000800000008000 - 0000800000000000000000000000000000000000000000000000000000000000 - 0000000000008000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF0080808000FFFFFF00BFBFBF0080808000FFFFFF00FFFFFF00FFFF + FF00FFFFFF000000000000000000000000000000000000000000000000000000 0000008000000080000000000000000000000000000000000000000000005C5C 5C00000000000000000000000000000000000000000000000000000000000000 0000800000008000000080000000000000000000000000000000800000008000 0000000000000000000000000000000000000000000000000000000000000000 00000000C0000000C0000000C0000000C0000000C00000000000000000005C5C - 5C00000000000000000000000000000000000000000000000000800000008000 - 0000000000008000000000000000000000000000000000000000000000000000 - 0000000000008000000000000000000000000000000000000000000000000000 + 5C0000000000000000000000000000000000000000000000000000000000FFFD + FB00FFFFFF0080808000BFBFBF0080808000FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF000000000000000000000000000000000000000000000000000000 0000008000000080000000000000000000000000000000000000000000000000 00005C5C5C000000000000000000000000000000000000000000000000000000 0000000000008000000080000000800000000000000000000000800000008000 00005C5C5C000000000000000000000000000000000000000000000000000000 0000000000000000C0000000C0000000C0000000000000000000000000000000 - 00005C5C5C000000000000000000000000000000000000000000800000000000 - 0000000000000000000080000000800000000000000000000000000000000000 - 0000800000000000000000000000000000000080000000800000008000000080 + 00005C5C5C00000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF008080800080808000FFFFFF00FFFFFF0000000000000000000000 + 0000000000000000000000000000000000000080000000800000008000000080 0000008000000080000000800000008000000080000000800000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000080000000800000008000000000000000800000008000 0000000000000000000000000000000000000000000000000000000000000000 00000000C0000000C0000000C0000000C0000000C00000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000000080000000800000008000 - 0000000000000000000000000000000000000080000000800000008000000080 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF0080808000FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFF + FF00000000000000000000000000000000000080000000800000008000000080 0000008000000080000000800000008000000080000000800000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000800000008000000080000000800000008000 0000000000000000000000000000000000000000000000000000000000000000 C0000000C0000000C000000000000000C0000000C0000000C000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF000000 0000000000000000000000000000000000000000000000000000000000000000 0000008000000080000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000000080000000800000008000 00000000000000000000000000000000000000000000000000000000C0000000 C0000000C0000000000000000000000000000000C0000000C0000000C0000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000008000000080000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2129,27 +2283,29 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000008000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000424D3E000000000000003E000000 - 2800000040000000400000000100010000000000000200000000000000000000 - 000000000000000000000000FFFFFF00FFFF000000000000FFFF000000000000 - FFFF000000000000F3E7000000000000E1E7000000000000C0E7000000000000 - F3E7000000000000F3E70000000000000000000000000000F3E7000000000000 - F3E7000000000000F1C7000000000000F80F000000000000FC1F000000000000 - FFFF000000000000FFFF000000000000FFFFFFFFFFFFFF7F0001FEFF8003FF7F - 80017FFDCFE7FF7FC7F93EF9E7CFE00FE3F91FF1F39FE007F1F94EE5F93FFF63 - F8F967CDFC7FFF73FC79729DFEFFFF73FE39793D5555FB73FF19729DFEFFF363 - FF8967CDFC7FE007FFC14EE5F93FE00FFFE11FF1F39FF37FFFF13EF9E7CFFB7F - FFF97FFDCFE7FF7FFFFDFEFF8003FF7FFFFFFFCFFFFFFFFFFFFFFF87FEFFF007 - FFFFF787FC7FF9F7FFFFF30FF83FFCF7EFFFF00FFEFFF277EF83F01FFEFFEF37 - DFC3F003DEF7EF97DFE3F0079EF3DFC7DFD3F00F0001DFE7EF3BF01F9EF3DFF7 - F0FFF03FDEF7DFFFFFFFF07FFEFFEFC3FFFFF0FFFEFFEFF3FFFFF1FFF83FF3CB - FFFFF3FFFC7FFC3BFFFFF7FFFEFFFFFFFFFFFFFFFFFFFFFFC001C001C001FFFF - E001E001E001FFFFF1F9F1F9F1F9FFFFF8F90009D8D9FFF7FC7980098C09C1F7 - F239C609C619C3FBF319E309E219C7FBF389F189F009CBFBF3C1F8C1F8C1DCF7 - 0021FC41F061FF0F0031FE01E231FFFFF3F9FF09C719FFFFF3FDFF8D8F8DFFFF - F3FFFFCFDFDFFFFFF3FFFFEFFFFFFFFF00000000000000000000000000000000 + 2800000040000000500000000100010000000000800200000000000000000000 + 000000000000000000000000FFFFFF0000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000FF7FFFFF00000000FF7FFFFF00000000 + FF7FFFFF00000000E00FF3E700000000E007E1E700000000FF63C0E700000000 + FF73F3E700000000FF73F3E700000000FB73000000000000F363F3E700000000 + E007F3E700000000E00FF1C700000000F37FF80F00000000FB7FFC1F00000000 + FF7FFFFF00000000FF7FFFFF00000000FFFFFFFFFFFFFFFFF0070001FEFF8003 + F9F780017FFDCFE7FCF7C7F93EF9E7CFF277E3F91FF1F39FEF37F1F94EE5F93F + EF97F8F967CDFC7FDFC7FC79729DFEFFDFE7FE39793D5555DFF7FF19729DFEFF + DFFFFF8967CDFC7FEFC3FFC14EE5F93FEFF3FFE11FF1F39FF3CBFFF13EF9E7CF + FC3BFFF97FFDCFE7FFFFFFFDFEFF8003FFFFFFFFFFCFFFFFFFFFFFFFFF87FEFF + FFFFFFFFF787FC7FFFFFFFFFF30FF83FFFF7EFFFF00FFEFFC1F7EF83F01FFEFF + C3FBDFC3F003DEF7C7FBDFE3F0079EF3CBFBDFD3F00F0001DCF7EF3BF01F9EF3 + FF0FF0FFF03FDEF7FFFFFFFFF07FFEFFFFFFFFFFF0FFFEFFFFFFFFFFF1FFF83F + FFFFFFFFF3FFFC7FFFFFFFFFF7FFFEFFFFFFFFFFFFFFFFFFC003C001C001C001 + C003E001E001E001C003F1F9F1F9F1F9C003F8F90009D8D9C003FC7980098C09 + C003F239C609C619C003F319E309E219C003F389F189F009C003F3C1F8C1F8C1 + C0030021FC41F061C0070031FE01E231C00FF3F9FF09C719C01FF3FDFF8D8F8D + C03FF3FFFFCFDFDFFFFFF3FFFFEFFFFF00000000000000000000000000000000 000000000000} end end diff --git a/2.10/Source/Editor.pas b/2.10/Source/Editor.pas index d019cd7..7cd1db3 100644 --- a/2.10/Source/Editor.pas +++ b/2.10/Source/Editor.pas @@ -29,6 +29,11 @@ const // PixelCountMax = 32768; WM_PTHREAD_COMPLETE = WM_APP + 5438; + crEditArrow = 20; + crEditMove = 21; + crEditRotate = 22; + crEditScale = 23; + type TEditForm = class(TForm) GrphPnl: TPanel; @@ -155,6 +160,9 @@ type ColorImage: TImage; TabSheet4: TTabSheet; vleVariables: TValueListEditor; + mnuReset: TMenuItem; + mnuResetAll: TMenuItem; + tbResetAll: TToolButton; procedure ValidateVariable; procedure vleVariablesValidate(Sender: TObject; ACol, ARow: Integer; const KeyName, KeyValue: string); procedure vleVariablesKeyPress(Sender: TObject; var Key: Char); @@ -272,6 +280,8 @@ type Shift: TShiftState); procedure txtValidateValue(Sender: TObject); procedure txtValKeyPress(Sender: TObject; var Key: Char); + procedure mnuResetClick(Sender: TObject); + procedure mnuResetAllClick(Sender: TObject); private TriangleView: TCustomDrawControl; @@ -752,7 +762,7 @@ begin end; EditForm.StatusBar.Panels[2].Text := Format('Zoom: %f', [GraphZoom]); - TriangleView.Refresh; + TriangleView.Invalidate;//Refresh; end; procedure TEditForm.UpdateFlameX; @@ -1063,7 +1073,9 @@ begin a := ToScreen(Pivot.x - dy, Pivot.y + dx); b := ToScreen(Pivot.x + dy, Pivot.y - dx); + c := ToScreen(Pivot.x, Pivot.y); MoveTo(a.x, a.y); + LineTo(c.X, c.y); // not necessary but it looks better with it... LineTo(b.X, b.y); end; @@ -1188,7 +1200,12 @@ procedure TEditForm.FormCreate(Sender: TObject); var i: integer; begin -// Custom control setup + Screen.Cursors[crEditArrow] := LoadCursor(HInstance, 'CUR_ARROW'); + Screen.Cursors[crEditMove] := LoadCursor(HInstance, 'CUR_MOVE'); + Screen.Cursors[crEditRotate] := LoadCursor(HInstance, 'CUR_ROTATE'); + Screen.Cursors[crEditScale] := LoadCursor(HInstance, 'CUR_SCALE'); + + // Custom control setup TriangleView := TCustomDrawControl.Create(self); TriangleView.TabStop := True; TriangleView.TabOrder := 0; @@ -1313,11 +1330,17 @@ begin FoundCorner: end; - if (mouseOverTriangle >= 0) and - (SelectMode or (mouseOverTriangle = SelectedTriangle)) then - TriangleView.Cursor := crHandPoint + if (mouseOverTriangle >= 0) or (SelectMode = false) or (oldMode <> modeNone) then + case editMode of + modeMove: + TriangleView.Cursor := crEditMove; + modeRotate: + TriangleView.Cursor := crEditRotate; + modeScale: + TriangleView.Cursor := crEditScale; + end else - TriangleView.Cursor := crArrow; + TriangleView.Cursor := crEditArrow; //crDefault; Shift := Shift - [ssLeft]; @@ -2445,34 +2468,22 @@ end; procedure TEditForm.ValidateVariation; var - Allow: boolean; i: integer; NewVal, OldVal: double; begin - Allow := True; - i := VEVars.Row - 1; - OldVal := Round6(cp.xform[SelectedTriangle].vars[i]); -{ Test that it's a valid floating point number } try - StrToFloat(VEVars.Values[VarNames(i)]); - except on Exception do - begin - { It's not, so we restore the old value } + NewVal := Round6(StrToFloat(VEVars.Values[VarNames(i)])); + except VEVars.Values[VarNames(i)] := Format('%.6g', [OldVal]); - Allow := False; - end; + exit; end; - NewVal := Round6(StrToFloat(VEVars.Values[VarNames(i)])); - VEVars.Values[VarNames(i)] := Format('%.6g', [NewVal]); - -{ If it's not the same as the old value and it was valid } - if (NewVal <> OldVal) and Allow then + if (NewVal <> OldVal) then begin MainForm.UpdateUndo; cp.xform[SelectedTriangle].vars[i] := NewVal; - VEVars.Values[VarNames(i)] := Format('%.6g', [cp.xform[SelectedTriangle].vars[i]]); + VEVars.Values[VarNames(i)] := Format('%.6g', [NewVal]); ShowSelectedInfo; UpdateFlame(True); end; @@ -2517,7 +2528,7 @@ begin begin MainForm.UpdateUndo; values^[i] := NewVal; - Sender.Values[VarNames(i)] := Format('%.6g', [values^[i]]); + Sender.Values[VarNames(i)] := Format('%.6g', [NewVal]); EditForm.ShowSelectedInfo; EditForm.UpdateFlame(True); end; @@ -2877,17 +2888,23 @@ begin VK_MENU: begin editMode := modeRotate; - tbRotate.Down := true; +// tbRotate.Down := true; +// if (mouseOverTriangle >= 0) or (SelectMode = false) then + TriangleView.Cursor := crEditRotate; end; VK_CONTROL: begin editMode := modeScale; - tbScale.Down := true; +// tbScale.Down := true; +// if (mouseOverTriangle >= 0) or (SelectMode = false) then + TriangleView.Cursor := crEditScale; end; else //VK_SHIFT: begin editMode := modeMove; - tbMove.Down := true; +// tbMove.Down := true; +// if (mouseOverTriangle >= 0) or (SelectMode = false) then + TriangleView.Cursor := crEditMove; end; end; EditorToolBar.Refresh; @@ -2927,9 +2944,13 @@ begin begin editMode := oldMode; oldMode := modeNone; - tbMove.Down := (editMode = modeMove); - tbRotate.Down := (editMode = modeRotate); - tbScale.Down := (editMode = modeScale); +// tbMove.Down := (editMode = modeMove); +// tbRotate.Down := (editMode = modeRotate); +// tbScale.Down := (editMode = modeScale); + + // hack: to generate MouseMove event + GetCursorPos(MousePos); + SetCursorPos(MousePos.x, MousePos.y); end; end; @@ -2939,9 +2960,9 @@ begin begin editMode := oldMode; oldMode := modeNone; - tbMove.Down := (editMode = modeMove); - tbRotate.Down := (editMode = modeRotate); - tbScale.Down := (editMode = modeScale); +// tbMove.Down := (editMode = modeMove); +// tbRotate.Down := (editMode = modeRotate); +// tbScale.Down := (editMode = modeScale); end; mouseOverTriangle := -1; @@ -3091,9 +3112,9 @@ procedure TEditForm.ColorImageMouseDown(Sender: TObject; begin if Button = mbLeft then begin - colorDragX:=x; + SetCaptureControl(ColorImage); + colorDragX:=0; colorOldX:=x; -// BackupPal:=Palette; colorDrag:=true; colorChanged:=false; end; @@ -3104,10 +3125,9 @@ procedure TEditForm.ColorImageMouseMove(Sender: TObject; var i, offset: integer; begin -{ - if colorDrag and (oldX<>x) then + if colorDrag and (OldX<>x) then begin - oldX:=x; +{ oldX:=x; offset := ( ((x - colorDragX) shl 8) div ColorImage.Width ) mod 256; colorChanged := true; @@ -3122,14 +3142,13 @@ begin cp.cmap := Palette; colorImage.Refresh; - end; -} +} end; end; procedure TEditForm.ColorImageMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); begin - if colorDrag then + if (Button = mbLeft) and colorDrag then begin colorDrag := false; @@ -3138,6 +3157,7 @@ begin // cp.xxx := xxx; // MainCP.copy(cp); // UpdateXXXX; + SetCaptureControl(nil); end; end; end; @@ -3152,31 +3172,22 @@ end; procedure TEditForm.ValidateVariable; var - Allow: boolean; i: integer; NewVal, OldVal: double; begin - Allow := True; - i := vleVariables.Row; cp.xform[SelectedTriangle].GetVariable(vleVariables.Keys[i], OldVal); { Test that it's a valid floating point number } try - StrToFloat(vleVariables.Values[vleVariables.Keys[i]]); - except on Exception do - begin + NewVal := Round6(StrToFloat(vleVariables.Values[vleVariables.Keys[i]])); + except { It's not, so we restore the old value } - vleVariables.Values[vleVariables.Keys[i]] := Format('%.6g', [OldVal]); - Allow := False; - end; + vleVariables.Values[vleVariables.Keys[i]] := Format('%.6g', [OldVal]); + exit; end; - - NewVal := Round6(StrToFloat(vleVariables.Values[vleVariables.Keys[i]])); - vleVariables.Values[vleVariables.Keys[i]] := Format('%.6g', [NewVal]); - { If it's not the same as the old value and it was valid } - if (NewVal <> OldVal) and Allow then + if (NewVal <> OldVal) then begin MainForm.UpdateUndo; cp.xform[SelectedTriangle].SetVariable(vleVariables.Keys[i], NewVal); @@ -3211,14 +3222,51 @@ begin try t := StrToFloat(TComboBox(Sender).Text); if t <> 0 then exit; - finally + except TComboBox(Sender).ItemIndex := 1; end; end; procedure TEditForm.txtValKeyPress(Sender: TObject; var Key: Char); begin - if key = #13 then txtValidateValue(Sender); + if key <> #13 then exit; + key := #0; + txtValidateValue(Sender); +end; + +procedure TEditForm.mnuResetClick(Sender: TObject); +begin + MainForm.UpdateUndo; + MainTriangles[SelectedTriangle] := MainTriangles[-1]; + UpdateFlame(True); +end; + +procedure TEditForm.mnuResetAllClick(Sender: TObject); +var + i: integer; +begin + MainForm.UpdateUndo; + for i := 2 to Transforms-1 do cp.xform[i].density := 0; + + Transforms := 2; + SelectedTriangle := 1; + MainTriangles[0] := MainTriangles[-1]; + cp.xform[0].density := 0.5; + cp.xform[0].vars[0] := 1; + MainTriangles[1] := MainTriangles[-1]; + cp.xform[1].density := 0.5; + cp.xform[1].vars[0] := 1; + for i := 1 to NRVAR - 1 do + begin + cp.xform[0].vars[i] := 0; + cp.xform[1].vars[i] := 0; + end; + + cbTransforms.clear; + cbTransforms.Items.Add('1'); + cbTransforms.Items.Add('2'); + AutoZoom; + UpdateFlame(True); end; end. diff --git a/2.10/Source/Main.dfm b/2.10/Source/Main.dfm index a28540d..34c703b 100644 --- a/2.10/Source/Main.dfm +++ b/2.10/Source/Main.dfm @@ -27,7 +27,7 @@ object MainForm: TMainForm Left = 160 Top = 28 Width = 4 - Height = 494 + Height = 498 end object ToolBar: TToolBar Left = 0 @@ -112,6 +112,7 @@ object MainForm: TMainForm Width = 40 Height = 21 Hint = 'Rendering quality|Rendering quality of the main window' + AutoComplete = False ItemHeight = 13 ItemIndex = 0 TabOrder = 0 @@ -283,7 +284,7 @@ object MainForm: TMainForm Left = 0 Top = 28 Width = 160 - Height = 494 + Height = 498 Align = alLeft Columns = < item @@ -302,7 +303,7 @@ object MainForm: TMainForm Left = 164 Top = 28 Width = 433 - Height = 494 + Height = 498 Align = alClient BevelInner = bvLowered BevelOuter = bvNone @@ -313,7 +314,7 @@ object MainForm: TMainForm Left = 1 Top = 1 Width = 431 - Height = 492 + Height = 496 Align = alClient AutoSize = True PopupMenu = DisplayPopup @@ -326,7 +327,7 @@ object MainForm: TMainForm end object StatusBar: TStatusBar Left = 0 - Top = 522 + Top = 526 Width = 597 Height = 19 Panels = <