From 3fb6744eba34c960d2cbdd58e0b2bb7fa73ede0b Mon Sep 17 00:00:00 2001 From: zueuk Date: Sat, 15 Apr 2006 15:50:26 +0000 Subject: [PATCH] new doubleclick actions, modes and toolbar buttons in editor --- 2.10/Source/Editor.dfm | 1042 +++++++++++++++++++-------------------- 2.10/Source/Editor.pas | 215 +++++--- 2.10/Source/Global.pas | 2 +- 2.10/Source/Options.dfm | 16 +- 2.10/Source/Options.pas | 9 +- 2.10/Source/Regstry.pas | 21 +- 6 files changed, 674 insertions(+), 631 deletions(-) diff --git a/2.10/Source/Editor.dfm b/2.10/Source/Editor.dfm index 63657ab..a8e5e1f 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 = 432 + Width = 552 Height = 22 Align = alLeft ButtonWidth = 25 @@ -179,24 +179,12 @@ object EditForm: TEditForm ShowHint = True OnClick = tbSelectClick end - object tbAutoEditMode: TToolButton - Left = 191 - Top = 0 - Hint = 'Extended edit mode' - Caption = 'Auto' - Down = True - Grouped = True - ImageIndex = 19 - ParentShowHint = False - ShowHint = True - Style = tbsCheck - OnClick = tbEditModeClick - end object tbMove: TToolButton - Left = 216 + Left = 191 Top = 0 Hint = 'Move triangle' Caption = 'Move' + Down = True Grouped = True ImageIndex = 7 ParentShowHint = False @@ -205,7 +193,7 @@ object EditForm: TEditForm OnClick = tbEditModeClick end object tbRotate: TToolButton - Left = 241 + Left = 216 Top = 0 Hint = 'Rotate triangle' Caption = 'Rotate' @@ -217,7 +205,7 @@ object EditForm: TEditForm OnClick = tbEditModeClick end object tbScale: TToolButton - Left = 266 + Left = 241 Top = 0 Hint = 'Scale triangle' Caption = 'Scale' @@ -228,16 +216,75 @@ object EditForm: TEditForm Style = tbsCheck OnClick = tbEditModeClick end - object ToolButton5: TToolButton + object tbExtendedEdit: TToolButton + Left = 266 + Top = 0 + Hint = 'Extended edit mode' + Caption = 'Auto' + Down = True + ImageIndex = 25 + ParentShowHint = False + ShowHint = True + Style = tbsCheck + OnClick = tbExtendedEditClick + end + object ToolButton6: TToolButton Left = 291 Top = 0 Width = 8 + Caption = 'ToolButton6' + ImageIndex = 16 + Style = tbsSeparator + end + object tbAxisLock: TToolButton + Left = 299 + Top = 0 + Hint = 'Lock transform axis' + Caption = 'tbAxisLock' + Down = True + ImageIndex = 16 + ParentShowHint = False + ShowHint = True + Style = tbsCheck + Visible = False + OnClick = tbAxisLockClick + end + object tbPivotMode: TToolButton + Left = 324 + Top = 0 + Hint = 'Toggle world pivot mode' + Caption = 'tbPivotMode' + ImageIndex = 15 + Style = tbsCheck + OnClick = btnPivotModeClick + end + object ToolButton5: TToolButton + Left = 349 + Top = 0 + Width = 8 Caption = 'ToolButton5' ImageIndex = 7 Style = tbsSeparator + Visible = False + end + object tbRotate90CCW: TToolButton + Left = 357 + Top = 0 + Hint = 'Rotate triangle 90'#176' counter-clockwise' + Caption = 'tbRotate90CCW' + ImageIndex = 17 + OnClick = btTrgRotateLeft90Click + end + object tbRotate90CW: TToolButton + Left = 382 + Top = 0 + Hint = 'Rotate triangle 90'#176' clockwise' + Caption = 'tbRotate90CW' + ImageIndex = 18 + OnClick = btTrgRotateRight90Click end object tbFlipHorz: TToolButton - Left = 299 + Left = 407 Top = 0 Hint = 'Flip triangle horizontal' Caption = 'Flip Horizontal' @@ -247,7 +294,7 @@ object EditForm: TEditForm OnClick = mnuFlipHorizontalClick end object tbFlipVert: TToolButton - Left = 324 + Left = 432 Top = 0 Hint = 'Flip triangle vertical' Caption = 'Flip Vertical' @@ -257,7 +304,7 @@ object EditForm: TEditForm OnClick = mnuFlipVerticalClick end object ToolButton2: TToolButton - Left = 349 + Left = 457 Top = 0 Width = 8 Caption = 'ToolButton2' @@ -265,7 +312,7 @@ object EditForm: TEditForm Style = tbsSeparator end object tbVarPreview: TToolButton - Left = 357 + Left = 465 Top = 0 Hint = 'Show/hide variation preview' Caption = 'Variation Preview' @@ -276,7 +323,7 @@ object EditForm: TEditForm OnClick = tbVarPreviewClick end object ToolButton3: TToolButton - Left = 382 + Left = 490 Top = 0 Width = 8 Caption = 'ToolButton3' @@ -284,11 +331,11 @@ object EditForm: TEditForm Style = tbsSeparator end object tbEnableFinalXform: TToolButton - Left = 390 + Left = 498 Top = 0 Hint = 'Enable final transform' Caption = 'Show Final Xform' - ImageIndex = 15 + ImageIndex = 24 ParentShowHint = False ShowHint = True Style = tbsCheck @@ -510,10 +557,10 @@ object EditForm: TEditForm OnClick = btTrgRotateLeftClick end object btTrgMoveUp: TSpeedButton - Left = 68 - Top = 105 - Width = 25 - Height = 25 + Left = 8 + Top = 106 + Width = 23 + Height = 24 Hint = 'Move triangle up' Flat = True Glyph.Data = { @@ -548,10 +595,10 @@ object EditForm: TEditForm OnClick = btTrgMoveUpClick end object btTrgMoveRight: TSpeedButton - Left = 106 - Top = 130 - Width = 25 - Height = 25 + Left = 130 + Top = 106 + Width = 23 + Height = 24 Hint = 'Move triangle right' Flat = True Glyph.Data = { @@ -586,10 +633,10 @@ object EditForm: TEditForm OnClick = btTrgMoveRightClick end object btTrgMoveLeft: TSpeedButton - Left = 30 - Top = 130 - Width = 25 - Height = 25 + Left = 106 + Top = 106 + Width = 23 + Height = 24 Hint = 'Move triangle left' Flat = True Glyph.Data = { @@ -624,10 +671,10 @@ object EditForm: TEditForm OnClick = btTrgMoveLeftClick end object btTrgMoveDown: TSpeedButton - Left = 68 - Top = 155 - Width = 25 - Height = 25 + Left = 32 + Top = 106 + Width = 23 + Height = 24 Hint = 'Move triangle down' Flat = True Glyph.Data = { @@ -663,10 +710,10 @@ object EditForm: TEditForm end object btTrgScaleUp: TSpeedButton Left = 106 - Top = 182 + Top = 134 Width = 23 Height = 24 - Hint = 'Scale triangle up' + Hint = 'Scale triangle' Flat = True Glyph.Data = { F6000000424DF600000000000000760000002800000010000000100000000100 @@ -683,10 +730,10 @@ object EditForm: TEditForm end object btTrgScaleDown: TSpeedButton Left = 32 - Top = 182 + Top = 134 Width = 23 Height = 24 - Hint = 'Scale triangle down' + Hint = 'UnScale triangle' Flat = True Glyph.Data = { F6000000424DF600000000000000760000002800000010000000100000000100 @@ -706,7 +753,7 @@ object EditForm: TEditForm Top = 78 Width = 23 Height = 24 - Hint = 'Rotate triangle clockwise 90'#176 + Hint = 'Rotate triangle 90'#176' clockwise' Flat = True Glyph.Data = { 36050000424D3605000000000000360400002800000010000000100000000100 @@ -760,7 +807,7 @@ object EditForm: TEditForm Top = 78 Width = 23 Height = 24 - Hint = 'Rotate triangle counter clockwise 90'#176 + Hint = 'Rotate triangle 90'#176' counter-clockwise' Flat = True Glyph.Data = { 36050000424D3605000000000000360400002800000010000000100000000100 @@ -809,158 +856,6 @@ object EditForm: TEditForm ShowHint = True OnClick = btTrgRotateLeft90Click end - object btTrgMoveLU: TSpeedButton - Left = 42 - Top = 105 - Width = 25 - Height = 25 - Hint = 'Move triangle left-up' - Flat = True - Glyph.Data = { - 36030000424D3603000000000000360000002800000010000000100000000100 - 18000000000000030000120B0000120B00000000000000000000FFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000 - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFF000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFF686868FFFFFFFFFFFFFFFFFFFFFFFF0000000000000E0E - 0EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF030303686868FF - FFFFFFFFFF000000000000161616FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFF000000000000686868000000000000000000FFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2B2B2B00000000000000 - 0000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFF040404000000000000030303000000686868FFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF68686800000000000000000000 - 0000000000000000686868FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFF2828280000000000000000000000000000000F0F0F000000686868FFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000016 - 1616404040FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - 686868161616070707303030FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000005A5A5AFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF} - ParentShowHint = False - ShowHint = True - OnClick = btTrgMoveLUClick - end - object btTrgMoveLD: TSpeedButton - Left = 42 - Top = 155 - Width = 25 - Height = 25 - Hint = 'Move triangle left-down' - Flat = True - Glyph.Data = { - 36030000424D3603000000000000360000002800000010000000100000000100 - 18000000000000030000120B0000120B00000000000000000000FFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - 0000005A5A5AFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF686868161616070707303030FFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFF000000000000000000000000161616404040FFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF28282800000000000000000000 - 00000000000F0F0F000000686868FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFF686868000000000000000000000000000000000000686868FFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF04040400000000000003 - 0303000000686868FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFF2B2B2B000000000000000000000000000000FFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000068 - 6868000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFF030303686868FFFFFFFFFFFF000000000000161616FFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF686868FFFFFFFF - FFFFFFFFFFFFFFFF0000000000000E0E0EFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000 - 00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF} - ParentShowHint = False - ShowHint = True - OnClick = btTrgMoveLDClick - end - object btTrgMoveRU: TSpeedButton - Left = 94 - Top = 105 - Width = 25 - Height = 25 - Hint = 'Move triangle right-up' - Flat = True - Glyph.Data = { - 36030000424D3603000000000000360000002800000010000000100000000100 - 18000000000000030000120B0000120B00000000000000000000FFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000FFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFF0E0E0E000000000000FFFFFFFFFFFFFFFFFFFFFFFF686868FFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF161616000000000000FF - FFFFFFFFFF686868030303FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFF000000000000000000686868000000000000FFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000 - 00000000000000000000002B2B2BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFF686868000000030303000000000000040404FFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF68686800000000 - 0000000000000000000000000000686868FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFF6868680000000F0F0F0000000000000000000000000000002828 - 28FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF40 - 4040161616000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3030300707071616 - 16686868FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFF5A5A5A000000FFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF} - ParentShowHint = False - ShowHint = True - OnClick = btTrgMoveRUClick - end - object btTrgMoveRD: TSpeedButton - Left = 94 - Top = 155 - Width = 25 - Height = 25 - Hint = 'Move triangle right-down' - Flat = True - Glyph.Data = { - 36030000424D3603000000000000360000002800000010000000100000000100 - 18000000000000030000120B0000120B00000000000000000000FFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5A5A - 5A000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFF303030070707161616686868FFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4040401616160000000000000000000000 - 00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6868680000000F0F0F00 - 0000000000000000000000000000282828FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFF6868680000000000000000000000000000000000006868 - 68FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF68686800 - 0000030303000000000000040404FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000002B2B2BFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000 - 0000686868000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFF161616000000000000FFFFFFFFFFFF686868030303FFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0E0E0E000000000000FFFFFFFF - FFFFFFFFFFFFFFFF686868FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - 000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF} - ParentShowHint = False - ShowHint = True - OnClick = btTrgMoveRDClick - end object txtCy: TEdit Left = 88 Top = 28 @@ -1029,7 +924,7 @@ object EditForm: TEditForm end object txtTrgMoveValue: TComboBox Left = 56 - Top = 132 + Top = 108 Width = 49 Height = 21 AutoComplete = False @@ -1073,7 +968,7 @@ object EditForm: TEditForm end object txtTrgScaleValue: TComboBox Left = 56 - Top = 184 + Top = 136 Width = 49 Height = 21 AutoComplete = False @@ -1091,10 +986,22 @@ object EditForm: TEditForm '175' '200') end + object chkAxisLock: TCheckBox + Left = 24 + Top = 162 + Width = 113 + Height = 17 + Hint = 'Lock transform axis rotation' + Caption = 'Lock transform axis' + Checked = True + State = cbChecked + TabOrder = 9 + OnClick = tbAxisLockClick + end end object GroupBox3: TGroupBox Left = 8 - Top = 208 + Top = 184 Width = 146 Height = 65 Caption = 'Pivot Point' @@ -1700,7 +1607,6 @@ object EditForm: TEditForm end end object EditPopup: TPopupMenu - AutoPopup = False Images = EditorTB Left = 352 Top = 40 @@ -1726,7 +1632,7 @@ object EditForm: TEditForm object mnuAutoZoom: TMenuItem Caption = 'Auto Zoom' Hint = 'Zoom to fit all triangles' - ImageIndex = 21 + ImageIndex = 19 OnClick = mnuAutoZoomClick end object mnuShowVarPreview: TMenuItem @@ -1735,11 +1641,30 @@ object EditForm: TEditForm ImageIndex = 14 OnClick = tbVarPreviewClick end + object N8: TMenuItem + Caption = '-' + end + object mnuSelectmode: TMenuItem + Caption = 'Select mode' + ImageIndex = 6 + OnClick = tbSelectClick + end + object mnuExtendedEdit: TMenuItem + Caption = 'Extended edit mode' + Hint = 'Toggle extended edit mode' + ImageIndex = 24 + OnClick = tbExtendedEditClick + end + object mnuAxisLock: TMenuItem + Caption = 'Lock transform axis' + ImageIndex = 16 + OnClick = tbAxisLockClick + end object N4: TMenuItem Caption = '-' end object mnuAdd: TMenuItem - Caption = 'Add' + Caption = 'Add transform' Hint = 'Add new triangle' ImageIndex = 1 OnClick = mnuAddClick @@ -1925,20 +1850,144 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000600000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000FFFFFF000000 + 00000000000000000000000000000000000000000000FFFFFF00000000000000 + 000000000000FFFFFF0000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000FFFFFF000000 + 00000000000000000000000000000000000000000000FFFFFF00000000000000 + 000000000000FFFFFF0000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000FFFFFF000000 + 0000000000000000000000000000000000000000000000000000FFFFFF000000 + 0000FFFFFF000000000000000000000000000000000000000000000000000000 + 0000000000000000000040606000000000004060600000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF + FF00FFFFFF00000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000FFFFFF000000 + 0000000000000000000000000000000000000000000000000000FFFFFF000000 + 0000FFFFFF000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000FFFFFF000000 + 00000000000000000000000000000000000000000000FFFFFF00000000000000 + 000000000000FFFFFF0000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00000000000000000000000000FFFFFF00000000000000 + 000000000000FFFFFF0000000000000000000000000000000000406060000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000406060000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000406060000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000406060000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000008000000080000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000008000000080000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000080000000800000008000000080000000800000008000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000080000000800000008000000080000000800000008000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000040606000000000004060600000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000008000000080000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000008000000080000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000600000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000600000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000600000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000600000000000000000000000000000000000000000000000000000000000 @@ -1946,7 +1995,7 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000600000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000600000000000000000000000000000000000000000000000000000000000 @@ -1954,15 +2003,23 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000006000000000000000600000000000000060000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000600000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000060000000600000006000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000600000000000 0000600000000000000060000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 0000000000000000000000000000600000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000006000 0000600000006000000000000000000000000000000000000000000000000000 @@ -1970,47 +2027,47 @@ object EditForm: TEditForm 0000000000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000600000000000000060000000600000006000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000600000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000060000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000006000000060000000600000006000 + 0000600000006000000060000000FFFFFF006000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000600000006000000060000000600000006000 0000600000006000000060000000600000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000005454 + 5400000000000000000000000000000000000000000000000000000000000000 + 0000600000000000000060000000600000006000000000000000000000005454 + 5400000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000005454 5400000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000600000000000000000000000000000005454 5400000000000000000060000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000545454000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 0000000000000000000000000000000000000000000000000000545454000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000545454000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000600000000000000000000000545454000000 0000000000006000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000054545400000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000054545400000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000600000000000000000000000000000000000000054545400000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000600000000000000054545400000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000005454540000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000005454540000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000006000000000000000000000005454540000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2055,248 +2112,116 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000600000000000000000000000000000000000 - 000000000000000000000000000000000000000000005C5C5C00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000005C5C5C0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000600000000000000000000000000000000000 - 0000000000000000000000000000000000005C5C5C0000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000005C5C5C00000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000600000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000005C5C5C00000000005C5C5C0000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000006000000000000000600000000000000060000000000000000000 + 0000000000000000000000000000000000000000000060000000600000006000 + 0000600000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000060000000600000006000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000060000000FFFFFF00FFFF + FF00FFFFFF006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000006000 - 0000000000000000000000000000600000000000000000000000000000000000 + 0000600000006000000000000000000000000000000000000000600000006000 + 0000600000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000060000000FFFFFF00FFFF + FF00FFFFFF0060000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 0000000000006000000000000000000000000000000000000000600000000000 + 0000600000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000060000000FFFFFF00FFFF + FF00FFFFFF006000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 0000000000006000000000000000000000000000000000000000600000000000 + 0000600000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000060000000600000006000 + 0000600000006000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 0000000000006000000000000000000000000000000000000000600000000000 + 0000600000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000006000000000000000000000000000000000000000000000006000 + 0000000000006000000000000000000000000000000000000000600000000000 + 0000600000000000000000000000000000000000000000000000600000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000054545400000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000600000006000000000000000000000000000000000000000000000006000 + 0000000000006000000000000000000000000000000000000000600000000000 + 0000600000000000000000000000000000000000000000000000600000006000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00006000000000000000FFFFFF00FFFFFF00FFFFFF0000000000000000000000 - 00000000000000000000000000000000000000000000000000005C5C5C000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00005C5C5C000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000005454540000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000006000000060000000600000006000 - 00006000000060000000FFFFFF0000000000FFFFFF0000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000006000 + 0000000000006000000000000000000000000000000000000000000000006000 + 0000000000006000000000000000000000000000000000000000600000000000 + 0000600000000000000000000000000000000000000000000000600000000000 + 0000600000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000545454000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000005454 - 5400000000000000000000000000000000000000000000000000000000000000 - 00006000000000000000FFFFFF00FFFFFF00FFFFFF0000000000000000005454 - 54000000000000000000000000000000000000000000000000005C5C5C000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00005C5C5C000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000600000000000 + 0000000000006000000060000000600000006000000060000000600000006000 + 0000000000006000000000000000000000000000000000000000600000000000 + 0000600000006000000060000000600000006000000060000000600000000000 + 0000000000006000000000000000000000000000000000000000000000000000 0000000000000000000054545400000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000060000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000545454000000 + 0000000000006000000000000000000000000000000000000000600000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000060000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000600000000000 + 0000000000006000000060000000600000006000000060000000600000006000 + 0000600000006000000000000000000000000000000000000000600000006000 + 0000600000006000000060000000600000006000000060000000600000000000 + 0000000000006000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000006000 - 0000000000000000000000000000000000000000000000000000545454000000 + 0000000000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000600000000000 + 0000600000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000054545400000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000054545400000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000005454540000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000005454540000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000005C5C5C00000000005C5C5C0000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000005C5C5C0000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000005C5C5C00000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000005C5C5C00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000005C5C5C0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 00000000000000000000000000000000000000000000FFFFFF00000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000002424 - 2400242424002424240000000000000000000000000000000000242424002424 - 2400242424000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 00000000000000000000000000000000000000000000FFFFFF00000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000002424 - 2400000000002424240000000000000000000000000000000000242424000000 - 0000242424000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 0000FFFFFF000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000002424 - 2400000000002424240000000000000000000000000000000000242424000000 - 0000242424000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000040606000000000004060600000000000000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF - FF00FFFFFF00000000000000000000000000000000000000000000000000FFFF + 000000000000000000000000000000000000000000000000000000000000FFFF FF00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000024242400000000000000000000000000000000002424 - 2400000000002424240000000000000000000000000000000000242424000000 - 0000242424000000000000000000000000000000000024242400000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000600000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 0000FFFFFF000000000000000000000000000000000000000000000000000000 - 0000000000002424240024242400000000000000000000000000000000002424 - 2400000000002424240000000000000000000000000000000000242424000000 - 0000242424000000000000000000000000000000000024242400242424000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 00000000000000000000000000000000000000000000FFFFFF00000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 - 0000242424002424240024242400000000000000000000000000000000002424 - 2400000000002424240000000000000000000000000000000000242424000000 - 0000242424000000000000000000000000000000000024242400242424002424 - 2400000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00000000000000000000000000FFFFFF00000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000002424 - 2400242424000000000024242400000000000000000000000000000000002424 - 2400000000002424240000000000000000000000000000000000242424000000 - 0000242424000000000000000000000000000000000024242400000000002424 - 2400242424000000000000000000000000000000000000000000406060000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000406060000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000242424002424 - 2400000000000000000024242400242424002424240024242400242424002424 - 2400000000002424240000000000000000000000000000000000242424000000 - 0000242424002424240024242400242424002424240024242400000000000000 - 0000242424002424240000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000600000006000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000024242400242424000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000002424240000000000000000000000000000000000242424000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000002424240024242400000000000000000000000000406060000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000406060000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000242424002424 - 2400000000000000000024242400242424002424240024242400242424002424 - 2400242424002424240000000000000000000000000000000000242424002424 - 2400242424002424240024242400242424002424240024242400000000000000 - 0000242424002424240000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000FFFFFF00C0C0C000C0C0C000FFFFFF00000000000000 - 0000000000000000000000000000000000000000000000000000000000002424 - 2400242424000000000024242400000000000000000000000000000000000000 + 0000000000006000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000024242400000000002424 - 2400242424000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000FFFFFF00FFFFFF00FFFFFF000000000000000000FFFFFF00FFFFFF00FFFF - FF00000000000000000000000000000000000000000000000000000000000000 - 0000242424002424240024242400000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000024242400242424002424 - 2400000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000FFFFFF00FFFFFF00FFFFFF000000000000000000FFFFFF00FFFFFF00FFFF - FF00000000000000000000000000000000000000000000000000000000000000 - 0000000000002424240024242400000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000024242400242424000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000040606000000000004060600000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000FFFFFF00C0C0C000C0C0C000FFFFFF00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000024242400000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000024242400000000000000 + 0000000000000000000000000000000000000000000000000000600000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2321,96 +2246,8 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000049004B00000000000000000049004B00000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 00000000000000000000000000000000000000000000FFFFFF00000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000004900 - 4B00000000000000000000000000000000000000000000000000000000000000 - 000049004B000000000000000000000000000000000000000000FFFFFF000000 - 00000000000000000000000000000000000000000000FFFFFF00000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000049004B0000000000000000000000 - 0000000000000000000049004B00000000000000000049004B00000000000000 - 000000000000000000000000000049004B000000000000000000FFFFFF000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 0000FFFFFF000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000049004B000000000000000000000000000000000000000000000000004900 - 4B00000000000000000000000000000000000000000000000000FFFFFF00FFFF - FF00FFFFFF00000000000000000000000000000000000000000000000000FFFF - FF00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000049004B000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000049004B0000000000000000000000000000000000FFFFFF000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 0000FFFFFF000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000049004B0000000000000000000000 - 00000000000000000000EBEBEB00A0A0A000A0A0A000EBEBEB00000000000000 - 000000000000000000000000000049004B000000000000000000FFFFFF000000 - 00000000000000000000000000000000000000000000FFFFFF00000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000EBEBEB00EBEBEB00EBEBEB000000000000000000EBEBEB00EBEBEB00EBEB - EB00000000000000000000000000000000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00000000000000000000000000FFFFFF00000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000008000800080008000800080008000 - 8000000000000000000080008000800080008000800080008000800080008000 - 8000800080008000800080008000800080000000000000000000000000000000 - 0000EBEBEB00EBEBEB00EBEBEB000000000000000000EBEBEB00EBEBEB00EBEB - EB00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000049004B0000000000000000000000 - 00000000000000000000EBEBEB00A0A0A000A0A0A000EBEBEB00000000000000 - 000000000000000000000000000049004B000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000049004B000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000049004B0000000000000000000000000000000000000000000000 - 0000000000000000000000000000008000000080000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000049004B000000000000000000000000000000000000000000000000004900 - 4B00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000008000000080000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000008000800000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000049004B0000000000000000000000 - 0000000000000000000049004B00000000000000000049004B00000000000000 - 000000000000000000000000000049004B000000000000000000000000000000 - 0000000000000080000000800000008000000080000000800000008000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000800000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2418,7 +2255,95 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000004900 4B00000000000000000000000000000000000000000000000000000000000000 000049004B000000000000000000000000000000000000000000000000000000 - 0000000000000080000000800000008000000080000000800000008000000000 + 0000000000000000000000000000FFFFFF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000049004B0000000000000000000000 + 0000000000000000000049004B00000000000000000049004B00000000000000 + 000000000000000000000000000049004B000000000000000000000000000000 + 0000000000000000000000000000FFFFFF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000049004B000000000000000000000000000000000000000000000000004900 + 4B00000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000FFFFFF00FFFFFF0000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000049004B000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000049004B0000000000000000000000000000000000000000000000 + 0000FFFFFF000000000000000000FFFFFF00FFFFFF0000000000FFFFFF000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000049004B0000000000000000000000 + 00000000000000000000EBEBEB00A0A0A000A0A0A000EBEBEB00000000000000 + 000000000000000000000000000049004B000000000000000000000000000000 + 000000000000FFFFFF0000000000FFFFFF00FFFFFF00FFFFFF00000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000EBEBEB00EBEBEB00EBEBEB000000000000000000EBEBEB00EBEBEB00EBEB + EB0000000000000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF00FFFFFF0000000000FFFFFF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000008000800080008000800080008000 + 8000000000000000000080008000800080008000800080008000800080008000 + 8000800080008000800080008000800080000000000000000000000000000000 + 0000EBEBEB00EBEBEB00EBEBEB000000000000000000EBEBEB00EBEBEB00EBEB + EB000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000049004B0000000000000000000000 + 00000000000000000000EBEBEB00A0A0A000A0A0A000EBEBEB00000000000000 + 000000000000000000000000000049004B000000000000000000000000000000 + 0000000000000000000000000000FFFFFF0000000000FFFFFF00FFFFFF00FFFF + FF00000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000049004B000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000049004B0000000000000000000000000000000000000000000000 + 000000000000FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000049004B000000000000000000000000000000000000000000000000004900 + 4B00000000000000000000000000000000000000000000000000000000000000 + 0000FFFFFF0000000000FFFFFF00FFFFFF000000000000000000FFFFFF000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000049004B0000000000000000000000 + 0000000000000000000049004B00000000000000000049004B00000000000000 + 000000000000000000000000000049004B000000000000000000000000000000 + 00000000000000000000FFFFFF00FFFFFF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000008000800000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000004900 + 4B00000000000000000000000000000000000000000000000000000000000000 + 000049004B000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000FFFFFF000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000800000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2426,7 +2351,7 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000049004B00000000000000000049004B00000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000008000000080000000000000000000000000 + 0000000000000000000000000000FFFFFF000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000008000800000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2434,7 +2359,7 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000008000000080000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -2825,23 +2750,23 @@ object EditForm: TEditForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000FFF7FFFF00000000FEF7FEFF00000000 - FFF7FFFF00000000FEF7FEFF00000000FFD5FFFF00000000FEE3FEFB00000000 - FFF7FFFD00000000AA02AA0000000000FEE7FEE500000000FECFFECB00000000 - F69FFE9F00000000FA3FFE3F00000000007FFE7F00000000FAFFFABF00000000 - F7FFFC7F00000000FEFFFEFF00000000FFFFFFFFFFFFFEFF8EE3AAABFEFFFEFF - 3C79FFFDFFFFFEFF783DBFFFFEFFFABF7EFDFFFDFFFFFC7FFEFFB80FFEFFEEFF - DEF7FB9DFFFFF47F9EF3BB3FAA0200020001FA7DFEE7F4679EF3B8FFFECFEECF - DEF7F9FDFE9FFE9FFEFFBBFFFE3FFE3F7EFDFFFDFE7FFE7F783DBFFFFEFFFEFF - 3C79D555FFFFFFFF8EE3FFFFFEFFFEFF8F11FFFFFFFFFFFF8F11FFE3C7FF0EE1 - 8F11FFE3C7FF7C7D8383FFE3C7FF783D83C7FDE3C7BF7EFD8383F9E3C79FFEFF - 8111F1E3C78FDEF78111E1E3C7879EF38111C003C0030001FFFF8003C0019EF3 - FC3FC003C003DEF7F00FE1FFFF87FEFFE007F1FFFF8F7EFDE007F9FFFF9F783D - F00FFDFFFFBF7C7DFC3FFFFFFFFF0EE1FF7FFFFFFFFF8F11FF7FFFFFFDBF8F11 - FF7FFFFFEFF78F11E00FF3E77DBE8383E007E1E7F7EF83C7FF63C0E7DC3B8383 - FF73F3E7700E8111FF73F3E7E0078111FB730000E0078111F363F3E7700EFFFF - E007F3E7DC3BFE7FE00FF1C7F7EFFE7FF37FF80F7DBEF81FFB7FFC1FEFF7F81F - FF7FFFFFFDBFFE7FFF7FFFFFFFFFFE7FFFFFFFFFFFFFFFFFF0070001FEFF8003 + 000000000000000000000000000000008F11FFFF000000008F110EE100000000 + 8F117C7D000000008383783D0000000083C77EFD000000008383FEFF00000000 + 8111DEF70000000081119EF3000000008111000100000000FFFF9EF300000000 + FE7FDEF700000000FE7FFEFF00000000F81F7EFD00000000F81F783D00000000 + FE7F7C7D00000000FE7F0EE100000000FFFFFEFFFFF7FFFFFEFFFEFFFEF7FEFF + FFFFFEFFFFF7FFFFFEFFFABFFEF7FEFFFFFFFC7FFFD5FFFFFEFFEEFFFEE3FEFB + FFFFF47FFFF7FFFDAA020002AA02AA00FEE7F467FEE7FEE5FECFEECFFECFFECB + FE9FFE9FF69FFE9FFE3FFE3FFA3FFE3FFE7FFE7F007FFE7FFEFFFEFFFAFFFABF + FFFFFFFFF7FFFC7FFEFFFEFFFEFFFEFFFFFFFFFFFFFFFFFF83FFFFFFFFFFAAAB + 8001FFE3C7FFFFFD8001FFE3C7FFBFFF8001FFE3C7FFFFFD83FBFFE3C7FFB80F + C7F7FBE3C7DFFB9DC7EFF3E3C7CFBB3FC7DFE3E3C7C7FA7DC7BFC003C003B8FF + C77F8003C001F9FDC6FFC003C003BBFFC5FFE3FFFFC7FFFDC3FFF3FFFFCFBFFF + C7FFFBFFFFDFD555FFFFFFFFFFFFFFFFFF7FFFFFFFFFFFFFFF7FFFFFFDBFFEFF + FF7FFFFFEFF7FC7FE00FF3E77DBEFC7FE007E1E7F7EFE82FFF63C0E7DC3BF01F + FF73F3E7700EE00FFF73F3E7E0078003FB730000E0070001F363F3E7700E8003 + E007F3E7DC3BE00FE00FF1C7F7EFF01FF37FF80F7DBEE82FFB7FFC1FEFF7FC7F + FF7FFFFFFDBFFC7FFF7FFFFFFFFFFEFFFFFFFFFFFFFFFFFFF0070001FEFF8003 F9F79FFD7FFDCFE7FCF7C8053EF9E7CFF277E4F51FF1F39FEF37F2754EE5F93F EF97F93567CDFC7FDFC7FC95729DFEFFDFE7FE45793D5555DFF7FF25729DFEFF DFFFFF9567CDFC7FEFC3FFCD4EE5F93FEFF3FFE51FF1F39FF3CBFFF13EF9E7CF @@ -2864,7 +2789,7 @@ object EditForm: TEditForm object mnuReset: TMenuItem Caption = 'Reset triangle' Hint = 'Reset triangle' - ImageIndex = 22 + ImageIndex = 20 OnClick = mnuResetClick end object N6: TMenuItem @@ -2918,18 +2843,39 @@ object EditForm: TEditForm end object mnuResetTrgPosition: TMenuItem Caption = 'Reset position' - ImageIndex = 23 + ImageIndex = 21 OnClick = btnOcoefsClick end object mnuResetTrgRotation: TMenuItem Caption = 'Reset rotation' - ImageIndex = 24 + ImageIndex = 22 OnClick = mnuResetTrgRotationClick end object mnuResetTrgScale: TMenuItem Caption = 'Reset scale' - ImageIndex = 25 + ImageIndex = 23 OnClick = mnuResetTrgScaleClick end end + object ExtendedEditPopup: TPopupMenu + Images = EditorTB + Left = 217 + Top = 33 + object mnuExtEditMove: TMenuItem + Caption = 'Move' + end + object mnuExtEditRotate: TMenuItem + Caption = 'Rotate' + end + object mnuExtEditScale: TMenuItem + Caption = 'Scale' + end + object N9: TMenuItem + Caption = '-' + end + object mnuExtEditOff: TMenuItem + Caption = 'Off' + RadioItem = True + end + end end diff --git a/2.10/Source/Editor.pas b/2.10/Source/Editor.pas index 288c01d..b59162b 100644 --- a/2.10/Source/Editor.pas +++ b/2.10/Source/Editor.pas @@ -28,13 +28,14 @@ uses Types, XForm; const -// PixelCountMax = 32768; -// WM_PTHREAD_COMPLETE = WM_APP + 5438; - - crEditArrow = 20; - crEditMove = 21; + crEditArrow = 20; + crEditMove = 21; crEditRotate = 22; - crEditScale = 23; + crEditScale = 23; + + imgExtMove = 24; + imgExtRotate = 25; + imgExtScale = 26; type TEditForm = class(TForm) @@ -120,10 +121,6 @@ type tbFlipHorz: TToolButton; tbFlipVert: TToolButton; tbSelect: TToolButton; - btTrgMoveLU: TSpeedButton; - btTrgMoveLD: TSpeedButton; - btTrgMoveRU: TSpeedButton; - btTrgMoveRD: TSpeedButton; EditorTB: TImageList; TabSheet4: TTabSheet; vleVariables: TValueListEditor; @@ -174,11 +171,27 @@ type txtSymmetry: TEdit; pnlWeight: TPanel; pnlSymmetry: TPanel; - tbAutoEditMode: TToolButton; + tbExtendedEdit: TToolButton; mnuResetTrgRotation: TMenuItem; mnuResetTrgPosition: TMenuItem; mnuResetTrgScale: TMenuItem; N7: TMenuItem; + mnuExtendedEdit: TMenuItem; + N8: TMenuItem; + mnuAxisLock: TMenuItem; + tbAxisLock: TToolButton; + mnuSelectmode: TMenuItem; + ToolButton6: TToolButton; + ExtendedEditPopup: TPopupMenu; + mnuExtEditOff: TMenuItem; + mnuExtEditMove: TMenuItem; + mnuExtEditRotate: TMenuItem; + mnuExtEditScale: TMenuItem; + N9: TMenuItem; + tbPivotMode: TToolButton; + tbRotate90CCW: TToolButton; + tbRotate90CW: TToolButton; + chkAxisLock: TCheckBox; procedure ValidateVariable; procedure vleVariablesValidate(Sender: TObject; ACol, ARow: Integer; const KeyName, KeyValue: string); procedure vleVariablesKeyPress(Sender: TObject; var Key: Char); @@ -317,8 +330,10 @@ type procedure DragPanelDblClick(Sender: TObject); procedure mnuResetTrgRotationClick(Sender: TObject); procedure mnuResetTrgScaleClick(Sender: TObject); - procedure ResetEdgeRotation(n: integer); - procedure ResetEdgeScale(n: integer); + procedure ResetAxisRotation(n: integer); + procedure ResetAxisScale(n: integer); + procedure tbExtendedEditClick(Sender: TObject); + procedure tbAxisLockClick(Sender: TObject); private TriangleView: TCustomDrawControl; @@ -326,7 +341,7 @@ type PreviewDensity: double; viewDragMode, viewDragged: boolean; - editMode, oldMode: (modeNone, modeMove, modeRotate, modeScale, modePick); + editMode, oldMode, widgetMode: (modeNone, modeMove, modeRotate, modeScale, modePick); modeHack: boolean; // for mouseOverEdge... modeKey: word; key_handled: boolean; @@ -345,6 +360,7 @@ type varDragPos, varDragOld: integer; varMM: boolean; //hack? + SelectMode, ExtendedEdit, AxisLock: boolean; showVarPreview: boolean; // --Z-- variables moved from outside @@ -354,12 +370,11 @@ type // SelectedTriangle: integer; // outside only for scripting (??) oldSelected: integer; SelectedCorner: integer; - SelectMode: boolean; HasChanged: boolean; oldx, oldy, olddist: double; Pivot, LocalPivot, WorldPivot: TSPoint; - PivotMode: (pivotLocal, pivotWorld); + PivotMode: (pivotLocal, pivotWorld); VarsCache: array[0..64] of double; // hack: to prevent slow valuelist redraw pnlDragMode: boolean; @@ -1191,7 +1206,7 @@ end; end; UpdateWidgets; - if AutoEditMode then begin + if ExtendedEdit then begin n := GetTriangleColor(SelectedTriangle);// shr 1 and $7f7f7f; if mouseOverTriangle <> SelectedTriangle then n := n shr 1 and $7f7f7f; Pen.Color := n; @@ -1410,7 +1425,6 @@ end; end; end; end; - end; // if EdgeCaught then if (mouseOverEdge >= 0) then // highlight edge under cursor @@ -1428,6 +1442,7 @@ end; pen.Mode:=pmCopy; pen.Width:=1; end; + end; // draw pivot point a := ToScreen(GetPivot.x, GetPivot.y); @@ -1528,6 +1543,12 @@ begin SelectMode := true; editMode := modeMove; + AxisLock := TransformAxisLock; + tbAxisLock.Down := AxisLock; + ExtendedEdit := ExtEditEnabled; +// tbExtendedEdit.Down := ExtendedEdit; + widgetMode := modeRotate; +// tbExtendedEdit.ImageIndex := imgExtMove; EdgeCaught := false; CornerCaught := false; @@ -1605,7 +1626,7 @@ begin // -- from MouseDown -- for highlighting: // TODO: optimize... - if (j = 1) then //and ((rgPivot.ItemIndex = 1) or (rgPivot.ItemIndex = 4)) then + if (j = 1) then begin if PivotMode = pivotLocal then begin Pivot.x := 0; @@ -1636,7 +1657,7 @@ begin end; end; - if AutoEditMode then //and (oldMode = modeNone) then + if ExtendedEdit then //and (oldMode = modeNone) then begin for i := 0 to 3 do // -- detect 'widget' hit for j := 0 to 1 do begin @@ -1813,6 +1834,13 @@ Skip1: vx := fx; vy := fy; end; + if (SelectedCorner = 1) and AxisLock then with MainTriangles[SelectedTriangle] do + begin + x[0] := OldTriangle.x[0] + (vx - OldTriangle.x[1]); + y[0] := OldTriangle.y[0] + (vy - OldTriangle.y[1]); + x[2] := OldTriangle.x[2] + (vx - OldTriangle.x[1]); + y[2] := OldTriangle.y[2] + (vy - OldTriangle.y[1]); + end; MainTriangles[SelectedTriangle].x[SelectedCorner] := vx; MainTriangles[SelectedTriangle].y[SelectedCorner] := vy; StatusBar.Panels[2].Text := Format('Move: %3.3f ; %3.3f', [vx-(Pivot.X+oldx), vy-(Pivot.Y+oldy)]); @@ -1857,7 +1885,7 @@ Skip2: else if (editMode = modeScale) then // scale begin if olddist<>0 then begin - vy := (oldx*(fx-Pivot.X) + oldy*(fy-Pivot.Y))/(olddist*olddist); + vy := (oldx*(fx-Pivot.X) + oldy*(fy-Pivot.Y))/sqr(olddist); if ssShift in Shift then // 'snapped' scale begin @@ -2014,14 +2042,14 @@ begin end; end; - if AutoEditMode then //and (oldMode = modeNone) then + if ExtendedEdit then //and (oldMode = modeNone) then begin for i := 0 to 3 do // -- detect 'widget' hit for j := 0 to 1 do begin if abs(line_dist(fx, fy, Widgets[i][j].x, Widgets[i][j].y, Widgets[i][j+1].x, Widgets[i][j+1].y) - ) * GraphZoom * 50 < 3 then + ) * GraphZoom * 50 < 3 then begin // modeHack := true; if (oldMode = modeNone) then @@ -2052,7 +2080,8 @@ begin if j = 2 then editMode := modeScale else -// editMode := modeRotate; + if AxisLock then editMode := modeRotate + else begin // hacky... CornerCaught := True; @@ -2225,7 +2254,7 @@ begin Registry.Free; end; chkUseXFormColor.checked := UseTransformColors; - if AutoEditMode then tbAutoEditMode.Down := true + if ExtendedEdit then tbExtendedEdit.Down := true else tbMove.Down := true; UpdateDisplay; end; @@ -3534,20 +3563,30 @@ begin begin if mouseOverCorner >= 0 then begin case mouseOverCorner of - 0: ResetEdgeScale(0); //btnXcoefsClick(Sender); - 1: btnOcoefsClick(Sender); - 2: ResetEdgeScale(2); //btnYcoefsClick(Sender); + 0: if editMode = modeRotate then ResetAxisRotation(0) else ResetAxisScale(0); + 1: if editMode = modeRotate then ResetAxisRotation(1) + else if editMode = modeScale then ResetAxisScale(1) else btnOcoefsClick(Sender); + 2: if editMode = modeRotate then ResetAxisRotation(2) else ResetAxisScale(2); end; end else if mouseOverEdge >= 0 then begin - case mouseOverEdge of - 0: if editMode = modeScale then ResetEdgeScale(0) else ResetEdgeRotation(0); - 1: if editMode = modeScale then ResetEdgeScale(2) else ResetEdgeRotation(2); + if AxisLock then begin + if (editMode = modeScale) or (mouseOverEdge = 2)then + mnuResetTrgScaleClick(Sender) + else + mnuResetTrgRotationClick(Sender); + end + else case mouseOverEdge of + 0: if editMode = modeScale then ResetAxisScale(0) else ResetAxisRotation(0); + 1: if editMode = modeScale then ResetAxisScale(2) else ResetAxisRotation(2); 2: mnuResetTrgScaleClick(Sender); end; end else if mouseOverWidget >= 0 then begin - mnuResetTrgRotationClick(Sender); + case editMode of + modeScale: mnuResetTrgScaleClick(Sender); + else mnuResetTrgRotationClick(Sender); + end; end else case editMode of //modeMove: Do Nothing @@ -3565,7 +3604,7 @@ end; procedure TEditForm.tbEditModeClick(Sender: TObject); begin - AutoEditMode := (Sender = tbAutoEditMode); +// ExtendedEdit := (Sender = tbExtendedEdit); if Sender = tbRotate then begin editMode := modeRotate; @@ -3584,6 +3623,21 @@ begin TriangleView.Invalidate; end; +procedure TEditForm.tbExtendedEditClick(Sender: TObject); +begin + ExtendedEdit := not ExtendedEdit; + tbExtendedEdit.Down := ExtendedEdit; + TriangleView.Invalidate; +end; + +procedure TEditForm.tbAxisLockClick(Sender: TObject); +begin + if Sender = chkAxisLock then AxisLock := chkAxisLock.Checked + else AxisLock := not AxisLock; + tbAxisLock.Down := AxisLock; + chkAxisLock.Checked := AxisLock; +end; + procedure TEditForm.tbFullViewClick(Sender: TObject); begin MainForm.mnuFullScreenClick(Sender); @@ -3903,11 +3957,13 @@ begin with MainTriangles[SelectedTriangle] do begin PivotMode := pivotLocal; btnPivotMode.Caption := 'Local Pivot'; + tbPivotMode.Down := false; end else with MainTriangles[SelectedTriangle] do begin PivotMode := pivotWorld; btnPivotMode.Caption := 'World Pivot'; + tbPivotMode.Down := true; end; TriangleView.Invalidate; @@ -4270,7 +4326,7 @@ begin end; end; -procedure TEditForm.ResetEdgeRotation(n: integer); +procedure TEditForm.ResetAxisRotation(n: integer); var dx, dy, d: double; a: integer; @@ -4278,47 +4334,80 @@ var begin with MainTriangles[SelectedTriangle] do begin - dx := x[n] - x[1]; - dy := y[n] - y[1]; - a := round( arctan2(dy, dx) / (pi/2) ); - d := Hypot(dx, dy); -// if xx*yy - yx*xy >= 0 then da := 1 else da := -1; -// if ax = ay then ay := ay + da -// else if abs(ax-ay) = 2 then ay := ay - da; - - nx := x[1] + d*cos(a*pi/2); - ny := y[1] + d*sin(a*pi/2); - if (x[n] = nx) and (y[n] = ny) then exit; - MainForm.UpdateUndo; - x[n] := nx; - y[n] := ny; - UpdateFlame(True); + if n = 1 then + begin + d := Hypot(x[1], y[1]); + if d = 0 then exit; + a := round( arctan2(y[1], x[1]) / (pi/2) ); + nx := d*cos(a*pi/2); + ny := d*sin(a*pi/2); + if (x[1] = nx) and (y[1] = ny) then exit; + MainForm.UpdateUndo; + x[1] := nx; + y[1] := ny; + x[0] := x[1] + xx; + y[0] := y[1] + xy; + x[2] := x[1] + yx; + y[2] := y[1] + yy; + UpdateFlame(True); + end + else begin + dx := x[n] - x[1]; + dy := y[n] - y[1]; + a := round( arctan2(dy, dx) / (pi/2) ); + d := Hypot(dx, dy); + nx := x[1] + d*cos(a*pi/2); + ny := y[1] + d*sin(a*pi/2); + if (x[n] = nx) and (y[n] = ny) then exit; + MainForm.UpdateUndo; + x[n] := nx; + y[n] := ny; + UpdateFlame(True); + end; end; end; -procedure TEditForm.ResetEdgeScale(n: integer); +procedure TEditForm.ResetAxisScale(n: integer); var dx, dy, d: double; nx, ny: double; begin with MainTriangles[SelectedTriangle] do begin - dx := x[n] - x[1]; - dy := y[n] - y[1]; - d := Hypot(dx, dy); - if d <> 0 then begin - nx := x[1] + dx / d; - ny := y[1] + dy / d; + if n = 1 then + begin + d := Hypot(x[1], y[1]); + if d = 0 then exit; + nx := x[1]/d; + ny := y[1]/d; + if (x[1] = nx) and (y[1] = ny) then exit; + MainForm.UpdateUndo; + x[1] := nx; + y[1] := ny; + x[0] := x[1] + xx; + y[0] := y[1] + xy; + x[2] := x[1] + yx; + y[2] := y[1] + yy; + UpdateFlame(True); end else begin - nx := x[1] + ifthen(n=0, 1, 0); - ny := y[1] + ifthen(n=2, 1, 0); + dx := x[n] - x[1]; + dy := y[n] - y[1]; + d := Hypot(dx, dy); + if d <> 0 then begin + nx := x[1] + dx / d; + ny := y[1] + dy / d; + end + else begin + nx := x[1] + ifthen(n=0, 1, 0); + ny := y[1] + ifthen(n=2, 1, 0); + end; + if (x[n] = nx) and (y[n] = ny) then exit; + MainForm.UpdateUndo; + x[n] := nx; + y[n] := ny; + UpdateFlame(True); end; - if (x[n] = nx) and (y[n] = ny) then exit; - MainForm.UpdateUndo; - x[n] := nx; - y[n] := ny; - UpdateFlame(True); end; end; diff --git a/2.10/Source/Global.pas b/2.10/Source/Global.pas index 846cd58..e582dbc 100644 --- a/2.10/Source/Global.pas +++ b/2.10/Source/Global.pas @@ -85,7 +85,7 @@ var UseFlameBackground, UseTransformColors: boolean; EditorBkgColor, ReferenceTriangleColor: integer; GridColor1, GridColor2, HelpersColor: integer; - AutoEditMode: boolean; + ExtEditEnabled, TransformAxisLock: boolean; { Display } defSampleDensity, defPreviewDensity: Double; defGamma, defBrightness, defVibrancy, defFilterRadius: Double; diff --git a/2.10/Source/Options.dfm b/2.10/Source/Options.dfm index dad435d..2f29a2f 100644 --- a/2.10/Source/Options.dfm +++ b/2.10/Source/Options.dfm @@ -356,16 +356,26 @@ object OptionsForm: TOptionsForm 'Wandering (old-style)') TabOrder = 1 end - object chkAutoEditMode: TCheckBox + object chkExtendedEdit: TCheckBox Left = 160 Top = 80 - Width = 161 + Width = 145 Height = 17 - Caption = 'Prefer "Extended" edit mode' + Caption = 'Extended edit mode' Checked = True State = cbChecked TabOrder = 2 end + object chkAxisLock: TCheckBox + Left = 160 + Top = 100 + Width = 145 + Height = 17 + Caption = 'Lock transform axis' + Checked = True + State = cbChecked + TabOrder = 3 + end end object DisplayPage: TTabSheet Caption = 'Display' diff --git a/2.10/Source/Options.pas b/2.10/Source/Options.pas index 0b21e10..2a60fdd 100644 --- a/2.10/Source/Options.pas +++ b/2.10/Source/Options.pas @@ -201,10 +201,11 @@ type pnlGridColor2: TPanel; pnlHelpersColor: TPanel; rgReferenceMode: TRadioGroup; - chkAutoEditMode: TCheckBox; + chkExtendedEdit: TCheckBox; chkPlaysound: TCheckBox; btnPlay: TSpeedButton; Label44: TLabel; + chkAxisLock: TCheckBox; procedure btnCancelClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure btnOKClick(Sender: TObject); @@ -295,7 +296,8 @@ begin cbNrTheads.ItemIndex := 0 else cbNrTheads.text := intTostr(NrTreads); - chkAutoEditMode.Checked := AutoEditMode; + chkExtendedEdit.Checked := ExtEditEnabled; + chkAxisLock.Checked := TransformAxisLock; chkPlaySound.Checked := PlaySoundOnRenderComplete; txtSoundFile.Text := RenderCompleteSoundFile; @@ -413,7 +415,8 @@ begin // Editor ReferenceMode := rgReferenceMode.ItemIndex; - AutoEditMode := chkAutoEditMode.Checked; + ExtEditEnabled := chkExtendedEdit.Checked; + TransformAxisLock := chkAxisLock.Checked; { Display tab } defSampleDensity := StrToFloat(txtSampleDensity.Text); diff --git a/2.10/Source/Regstry.pas b/2.10/Source/Regstry.pas index 88b66de..dcab769 100644 --- a/2.10/Source/Regstry.pas +++ b/2.10/Source/Regstry.pas @@ -285,14 +285,6 @@ begin SymmetryNVars := 12; end; -// --- tmp fix for pre-d4 problem --- - -if Registry.ValueExists('VariationOptions') then - if Registry.GetDataType('VariationOptions') <> rdInteger then - Registry.WriteInteger('VariationOptions', 262143); - -// --- tmp fix for pre-d4 problem --- - if Registry.ValueExists('VariationOptions') then begin VariationOptions := Registry.ReadInteger('VariationOptions'); @@ -638,10 +630,12 @@ if Registry.ValueExists('VariationOptions') then ReferenceTriangleColor := Registry.ReadInteger('ReferenceTriangleColor') else ReferenceTriangleColor := $7f7f7f; - if Registry.ValueExists('AutoEditMode') then - AutoEditMode := Registry.ReadBool('AutoEditMode') - else AutoEditMode := true; - + if Registry.ValueExists('ExtendedEdit') then + ExtEditEnabled := Registry.ReadBool('ExtendedEdit') + else ExtEditEnabled := true; + if Registry.ValueExists('LockTransformAxis') then + TransformAxisLock := Registry.ReadBool('LockTransformAxis') + else TransformAxisLock := true; end else begin EditorBkgColor := $000000; @@ -1007,7 +1001,8 @@ begin Registry.WriteInteger('GridColor2', GridColor2); Registry.WriteInteger('HelpersColor', HelpersColor); Registry.WriteInteger('ReferenceTriangleColor', ReferenceTriangleColor); - Registry.WriteBool('AutoEditMode', AutoEditMode); + Registry.WriteBool('ExtendedEdit', ExtEditEnabled); + Registry.WriteBool('LockTransformAxis', TransformAxisLock); end; { Display } if Registry.OpenKey('\Software\' + APP_NAME + '\Display', True) then