diff --git a/ide/keymapping.pp b/ide/keymapping.pp index cef1698dad..56c1f183c1 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -42,6 +42,7 @@ type kmsClassic, kmsMacOSXApple, kmsMacOSXLaz, + kmsDefaultToMac, kmsCustom ); @@ -51,6 +52,7 @@ const 'Classic', 'MacOSXApple', 'MacOSXLaz', + 'WindowsToMacOSX', 'Custom' ); @@ -94,7 +96,7 @@ type NewKey1B: word; NewShift1B: TShiftState); procedure MapShortcut(AScheme: TKeyMapScheme); procedure GetDefaultKeyForCommand; - procedure GetDefaultKeyForWindowsScheme; + procedure GetDefaultKeyForWindowsScheme(AUseMetaKey: boolean=false); procedure GetDefaultKeyForClassicScheme; procedure GetDefaultKeyForMacOSXScheme; procedure GetDefaultKeyForMacOSXLazScheme; @@ -916,6 +918,7 @@ begin kmsClassic: GetDefaultKeyForClassicScheme; kmsMacOSXApple: GetDefaultKeyForMacOSXScheme; kmsMacOSXLaz: GetDefaultKeyForMacOSXLazScheme; + kmsDefaultToMac: GetDefaultKeyForWindowsScheme(true); kmsCustom: ; end; end; @@ -939,28 +942,35 @@ begin {$ENDIF} end; -procedure TKeyCommandRelation.GetDefaultKeyForWindowsScheme; +procedure TKeyCommandRelation.GetDefaultKeyForWindowsScheme(AUseMetaKey: boolean=false); +var + XCtrl: TShiftStateEnum; begin + if AUseMetaKey then + XCtrl:=ssMeta + else + XCtrl:=ssCtrl; + case Command of // moving ecLeft: SetSingle(VK_LEFT,[]); ecRight: SetSingle(VK_RIGHT,[]); ecUp: SetSingle(VK_UP,[]); ecDown: SetSingle(VK_DOWN,[]); - ecWordLeft: SetSingle(VK_LEFT,[ssCtrl]); - ecWordRight: SetSingle(VK_RIGHT,[ssCtrl]); // WS c + ecWordLeft: SetSingle(VK_LEFT,[XCtrl]); + ecWordRight: SetSingle(VK_RIGHT,[XCtrl]); // WS c ecLineStart: SetSingle(VK_HOME,[]); ecLineEnd: SetSingle(VK_END,[]); - ecPageUp: SetSingle(VK_PRIOR,[]); // ,VK_R,[SSCtrl],VK_UNKNOWN,[]); - ecPageDown: SetSingle(VK_NEXT,[]); // ,VK_W,[SSCtrl],VK_UNKNOWN,[]); + ecPageUp: SetSingle(VK_PRIOR,[]); // ,VK_R,[XCtrl],VK_UNKNOWN,[]); + ecPageDown: SetSingle(VK_NEXT,[]); // ,VK_W,[XCtrl],VK_UNKNOWN,[]); ecPageLeft: SetSingle(VK_UNKNOWN,[]); ecPageRight: SetSingle(VK_UNKNOWN,[]); - ecPageTop: SetSingle(VK_PRIOR,[ssCtrl]); - ecPageBottom: SetSingle(VK_NEXT,[ssCtrl]); - ecEditorTop: SetSingle(VK_HOME,[ssCtrl]); - ecEditorBottom: SetSingle(VK_END,[ssCtrl]); - ecScrollUp: SetSingle(VK_UP,[ssCtrl]); - ecScrollDown: SetSingle(VK_DOWN,[ssCtrl]); + ecPageTop: SetSingle(VK_PRIOR,[XCtrl]); + ecPageBottom: SetSingle(VK_NEXT,[XCtrl]); + ecEditorTop: SetSingle(VK_HOME,[XCtrl]); + ecEditorBottom: SetSingle(VK_END,[XCtrl]); + ecScrollUp: SetSingle(VK_UP,[XCtrl]); + ecScrollDown: SetSingle(VK_DOWN,[XCtrl]); ecScrollLeft: SetSingle(VK_UNKNOWN,[]); ecScrollRight: SetSingle(VK_UNKNOWN,[]); @@ -969,52 +979,52 @@ begin ecSelRight: SetSingle(VK_RIGHT,[ssShift]); ecSelUp: SetSingle(VK_UP,[ssShift]); ecSelDown: SetSingle(VK_DOWN,[ssShift]); - ecCopy: SetSingle(VK_C,[ssCtrl], VK_Insert,[ssCtrl]); - ecCut: SetSingle(VK_X,[ssCtrl], VK_Delete,[ssShift]); - ecPaste: SetSingle(VK_V,[ssCtrl], VK_Insert,[ssShift]); + ecCopy: SetSingle(VK_C,[XCtrl], VK_Insert,[XCtrl]); + ecCut: SetSingle(VK_X,[XCtrl], VK_Delete,[ssShift]); + ecPaste: SetSingle(VK_V,[XCtrl], VK_Insert,[ssShift]); ecNormalSelect: SetSingle(VK_UNKNOWN,[]); ecColumnSelect: SetSingle(VK_UNKNOWN,[]); ecLineSelect: SetSingle(VK_UNKNOWN,[]); - ecSelWordLeft: SetSingle(VK_LEFT,[ssCtrl,ssShift]); - ecSelWordRight: SetSingle(VK_RIGHT,[ssCtrl,ssShift]); + ecSelWordLeft: SetSingle(VK_LEFT,[XCtrl,ssShift]); + ecSelWordRight: SetSingle(VK_RIGHT,[XCtrl,ssShift]); ecSelLineStart: SetSingle(VK_HOME,[ssShift]); ecSelLineEnd: SetSingle(VK_END,[ssShift]); - ecSelPageTop: SetSingle(VK_PRIOR,[ssShift,ssCtrl]); - ecSelPageBottom: SetSingle(VK_NEXT,[ssShift,ssCtrl]); - ecSelEditorTop: SetSingle(VK_HOME,[ssShift,ssCtrl]); - ecSelEditorBottom: SetSingle(VK_END,[ssShift,ssCtrl]); - ecSelectAll: SetSingle(VK_A,[ssCtrl]); + ecSelPageTop: SetSingle(VK_PRIOR,[ssShift,XCtrl]); + ecSelPageBottom: SetSingle(VK_NEXT,[ssShift,XCtrl]); + ecSelEditorTop: SetSingle(VK_HOME,[ssShift,XCtrl]); + ecSelEditorBottom: SetSingle(VK_END,[ssShift,XCtrl]); + ecSelectAll: SetSingle(VK_A,[XCtrl]); ecSelectToBrace: SetSingle(VK_UNKNOWN,[]); ecSelectCodeBlock: SetSingle(VK_UNKNOWN,[]); - ecSelectWord: SetCombo(VK_K,[SSCtrl],VK_T,[]); - ecSelectLine: SetCombo(VK_K,[SSCtrl],VK_L,[]); + ecSelectWord: SetCombo(VK_K,[XCtrl],VK_T,[]); + ecSelectLine: SetCombo(VK_K,[XCtrl],VK_L,[]); ecSelectParagraph: SetSingle(VK_UNKNOWN,[]); - ecSelectionUpperCase: SetCombo(VK_K,[SSCtrl],VK_N,[]); - ecSelectionLowerCase: SetCombo(VK_K,[SSCtrl],VK_O,[]); - ecSelectionSwapCase: SetCombo(VK_K,[SSCtrl],VK_P,[]); + ecSelectionUpperCase: SetCombo(VK_K,[XCtrl],VK_N,[]); + ecSelectionLowerCase: SetCombo(VK_K,[XCtrl],VK_O,[]); + ecSelectionSwapCase: SetCombo(VK_K,[XCtrl],VK_P,[]); ecSelectionTabs2Spaces:SetSingle(VK_UNKNOWN,[]); - ecSelectionEnclose: SetSingle(VK_N,[ssShift,ssCtrl]); - ecSelectionComment: SetSingle(VK_V,[ssShift,ssCtrl]); - ecSelectionUncomment: SetSingle(VK_U,[ssShift,ssCtrl]); - ecToggleComment: SetSingle(VK_OEM_2,[ssCtrl]); - ecSelectionEncloseIFDEF:SetSingle(VK_D,[ssShift,ssCtrl]); + ecSelectionEnclose: SetSingle(VK_N,[ssShift,XCtrl]); + ecSelectionComment: SetSingle(VK_V,[ssShift,XCtrl]); + ecSelectionUncomment: SetSingle(VK_U,[ssShift,XCtrl]); + ecToggleComment: SetSingle(VK_OEM_2,[XCtrl]); + ecSelectionEncloseIFDEF:SetSingle(VK_D,[ssShift,XCtrl]); ecSelectionSort: SetSingle(VK_UNKNOWN,[]); ecSelectionBreakLines: SetSingle(VK_UNKNOWN,[]); - ecStickySelection: SetCombo(VK_K,[ssCtrl],VK_S,[]); - ecStickySelectionCol: SetCombo(VK_K,[ssCtrl],VK_S,[ssAlt]); - ecStickySelectionStop: SetCombo(VK_K,[ssCtrl],VK_E,[]); + ecStickySelection: SetCombo(VK_K,[XCtrl],VK_S,[]); + ecStickySelectionCol: SetCombo(VK_K,[XCtrl],VK_S,[ssAlt]); + ecStickySelectionStop: SetCombo(VK_K,[XCtrl],VK_E,[]); - ecBlockSetBegin: SetCombo(VK_K,[ssCtrl],VK_B,[]); - ecBlockSetEnd: SetCombo(VK_K,[ssCtrl],VK_K,[]); - ecBlockToggleHide: SetCombo(VK_K,[ssCtrl],VK_H,[]); + ecBlockSetBegin: SetCombo(VK_K,[XCtrl],VK_B,[]); + ecBlockSetEnd: SetCombo(VK_K,[XCtrl],VK_K,[]); + ecBlockToggleHide: SetCombo(VK_K,[XCtrl],VK_H,[]); ecBlockHide: SetCombo(VK_UNKNOWN,[],VK_UNKNOWN,[]); ecBlockShow: SetCombo(VK_UNKNOWN,[],VK_UNKNOWN,[]); - ecBlockMove: SetCombo(VK_K,[ssCtrl],VK_V,[]); - ecBlockCopy: SetCombo(VK_K,[ssCtrl],VK_C,[]); - ecBlockDelete: SetCombo(VK_K,[ssCtrl],VK_Y,[]); - ecBlockGotoBegin: SetCombo(VK_Q,[ssCtrl],VK_B,[]); - ecBlockGotoEnd: SetCombo(VK_Q,[ssCtrl],VK_K,[]); + ecBlockMove: SetCombo(VK_K,[XCtrl],VK_V,[]); + ecBlockCopy: SetCombo(VK_K,[XCtrl],VK_C,[]); + ecBlockDelete: SetCombo(VK_K,[XCtrl],VK_Y,[]); + ecBlockGotoBegin: SetCombo(VK_Q,[XCtrl],VK_B,[]); + ecBlockGotoEnd: SetCombo(VK_Q,[XCtrl],VK_K,[]); // column mode selection ecColSelUp: SetSingle(VK_UP,[ssAlt,ssShift]); @@ -1022,37 +1032,37 @@ begin ecColSelLeft: SetSingle(VK_LEFT,[ssAlt,ssShift]); ecColSelRight: SetSingle(VK_RIGHT,[ssAlt,ssShift]); ecColSelPageDown: SetSingle(VK_NEXT,[ssAlt,ssShift]); - ecColSelPageBottom: SetSingle(VK_NEXT,[ssAlt,ssShift,ssCtrl]); + ecColSelPageBottom: SetSingle(VK_NEXT,[ssAlt,ssShift,XCtrl]); ecColSelPageUp: SetSingle(VK_PRIOR,[ssAlt,ssShift]); - ecColSelPageTop: SetSingle(VK_PRIOR,[ssAlt,ssShift,ssCtrl]); + ecColSelPageTop: SetSingle(VK_PRIOR,[ssAlt,ssShift,XCtrl]); ecColSelLineStart: SetSingle(VK_HOME,[ssAlt,ssShift]); ecColSelLineEnd: SetSingle(VK_END,[ssAlt,ssShift]); - ecColSelEditorTop: SetSingle(VK_HOME,[ssAlt,ssShift,ssCtrl]); - ecColSelEditorBottom: SetSingle(VK_END,[ssAlt,ssShift,ssCtrl]); + ecColSelEditorTop: SetSingle(VK_HOME,[ssAlt,ssShift,XCtrl]); + ecColSelEditorBottom: SetSingle(VK_END,[ssAlt,ssShift,XCtrl]); // multi caret - ecPluginMultiCaretSetCaret: SetSingle(VK_INSERT,[ssShift, ssCtrl]); - ecPluginMultiCaretUnsetCaret: SetSingle(VK_DELETE,[ssShift, ssCtrl]); - //ecPluginMultiCaretToggleCaret: SetSingle(VK_INSERT,[ssShift, ssCtrl]); - ecPluginMultiCaretClearAll: SetSingle(VK_ESCAPE,[ssShift, ssCtrl]); + ecPluginMultiCaretSetCaret: SetSingle(VK_INSERT,[ssShift, XCtrl]); + ecPluginMultiCaretUnsetCaret: SetSingle(VK_DELETE,[ssShift, XCtrl]); + //ecPluginMultiCaretToggleCaret: SetSingle(VK_INSERT,[ssShift, XCtrl]); + ecPluginMultiCaretClearAll: SetSingle(VK_ESCAPE,[ssShift, XCtrl]); - ecPluginMultiCaretModeCancelOnMove: SetCombo(VK_Q,[ssShift, ssCtrl], VK_X,[ssShift, ssCtrl]); - ecPluginMultiCaretModeMoveAll: SetCombo(VK_Q,[ssShift, ssCtrl], VK_M,[ssShift, ssCtrl]); + ecPluginMultiCaretModeCancelOnMove: SetCombo(VK_Q,[ssShift, XCtrl], VK_X,[ssShift, XCtrl]); + ecPluginMultiCaretModeMoveAll: SetCombo(VK_Q,[ssShift, XCtrl], VK_M,[ssShift, XCtrl]); // editing - ecBlockIndent: SetCombo(VK_I,[ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_I,[]); - ecBlockUnindent: SetCombo(VK_U,[ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_U,[]); + ecBlockIndent: SetCombo(VK_I,[XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_I,[]); + ecBlockUnindent: SetCombo(VK_U,[XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_U,[]); ecDeleteLastChar: SetSingle(VK_BACK,[], VK_BACK,[ssShift]); // ctrl H used for scroll window. ecDeleteChar: SetSingle(VK_DELETE,[]); // ctrl G conflicts with GO - ecDeleteWord: SetSingle(VK_T,[ssCtrl], VK_DELETE,[ssCtrl]); - ecDeleteLastWord: SetSingle(VK_BACK,[ssCtrl]); + ecDeleteWord: SetSingle(VK_T,[XCtrl], VK_DELETE,[XCtrl]); + ecDeleteLastWord: SetSingle(VK_BACK,[XCtrl]); ecDeleteBOL: SetSingle(VK_UNKNOWN,[]); - ecDeleteEOL: SetCombo(VK_Y,[ssCtrl,ssShift],VK_UNKNOWN,[], VK_Q,[ssCtrl],VK_Y,[]); - ecDeleteLine: SetSingle(VK_Y,[ssCtrl]); + ecDeleteEOL: SetCombo(VK_Y,[XCtrl,ssShift],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_Y,[]); + ecDeleteLine: SetSingle(VK_Y,[XCtrl]); ecClearAll: SetSingle(VK_UNKNOWN,[]); ecLineBreak: SetSingle(VK_RETURN,[]); - ecInsertLine: SetSingle(VK_N,[ssCtrl]); - ecInsertCharacter: SetSingle(VK_M,[ssShift,ssCtrl]); + ecInsertLine: SetSingle(VK_N,[XCtrl]); + ecInsertCharacter: SetSingle(VK_M,[ssShift,XCtrl]); ecInsertGPLNotice: SetSingle(VK_UNKNOWN,[]); ecInsertLGPLNotice: SetSingle(VK_UNKNOWN,[]); ecInsertModifiedLGPLNotice:SetSingle(VK_UNKNOWN,[]); @@ -1068,30 +1078,30 @@ begin ecInsertCVSName: SetSingle(VK_UNKNOWN,[]); ecInsertCVSRevision: SetSingle(VK_UNKNOWN,[]); ecInsertCVSSource: SetSingle(VK_UNKNOWN,[]); - ecInsertGUID: SetSingle(VK_G,[ssCtrl,ssShift]); + ecInsertGUID: SetSingle(VK_G,[XCtrl,ssShift]); ecInsertFilename: SetSingle(VK_UNKNOWN,[]); // command commands - ecUndo: SetSingle(VK_Z,[ssCtrl]); - ecRedo: SetSingle(VK_Z,[ssCtrl,ssShift]); + ecUndo: SetSingle(VK_Z,[XCtrl]); + ecRedo: SetSingle(VK_Z,[XCtrl,ssShift]); // search & replace ecMatchBracket: SetSingle(VK_UNKNOWN,[]); - ecFind: SetCombo(VK_F,[SSCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_F,[]); - ecFindNext: SetSingle(VK_F3,[], VK_L,[SSCtrl]); + ecFind: SetCombo(VK_F,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_F,[]); + ecFindNext: SetSingle(VK_F3,[], VK_L,[XCtrl]); ecFindPrevious: SetSingle(VK_F3,[ssShift]); - ecFindInFiles: SetSingle(VK_F,[ssCtrl,ssShift]); - ecReplace: SetCombo(VK_R,[SSCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_A,[]); - ecIncrementalFind: SetSingle(VK_E,[SSCtrl]); - ecGotoLineNumber: SetCombo(VK_G,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_G,[]); + ecFindInFiles: SetSingle(VK_F,[XCtrl,ssShift]); + ecReplace: SetCombo(VK_R,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_A,[]); + ecIncrementalFind: SetSingle(VK_E,[XCtrl]); + ecGotoLineNumber: SetCombo(VK_G,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_G,[]); ecFindNextWordOccurrence:SetSingle(VK_UNKNOWN,[]); ecFindPrevWordOccurrence:SetSingle(VK_UNKNOWN,[]); - ecJumpBack: SetSingle(VK_H,[ssCtrl],VK_LEFT,[ssAlt]); - ecJumpForward: SetSingle(VK_H,[ssCtrl,ssShift],VK_RIGHT,[ssAlt]); + ecJumpBack: SetSingle(VK_H,[XCtrl],VK_LEFT,[ssAlt]); + ecJumpForward: SetSingle(VK_H,[XCtrl,ssShift],VK_RIGHT,[ssAlt]); ecAddJumpPoint: SetSingle(VK_UNKNOWN,[]); - ecJumpToPrevError: SetSingle(VK_F8,[ssCtrl, ssShift]); - ecJumpToNextError: SetSingle(VK_F8,[ssCtrl]); - ecOpenFileAtCursor: SetSingle(VK_RETURN,[ssCtrl]); + ecJumpToPrevError: SetSingle(VK_F8,[XCtrl, ssShift]); + ecJumpToNextError: SetSingle(VK_F8,[XCtrl]); + ecOpenFileAtCursor: SetSingle(VK_RETURN,[XCtrl]); ecProcedureList: SetSingle(VK_G,[ssAlt]); // marker @@ -1100,26 +1110,26 @@ begin ecClearAllBookmark: SetSingle(VK_UNKNOWN,[]); ecPrevBookmark: SetSingle(VK_UNKNOWN,[]); ecNextBookmark: SetSingle(VK_UNKNOWN,[]); - ecGotoMarker0: SetCombo(VK_0,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_0,[]); - ecGotoMarker1: SetCombo(VK_1,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_1,[]); - ecGotoMarker2: SetCombo(VK_2,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_2,[]); - ecGotoMarker3: SetCombo(VK_3,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_3,[]); - ecGotoMarker4: SetCombo(VK_4,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_4,[]); - ecGotoMarker5: SetCombo(VK_5,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_5,[]); - ecGotoMarker6: SetCombo(VK_6,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_6,[]); - ecGotoMarker7: SetCombo(VK_7,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_7,[]); - ecGotoMarker8: SetCombo(VK_8,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_8,[]); - ecGotoMarker9: SetCombo(VK_9,[ssCtrl],VK_UNKNOWN,[], VK_Q,[SSCtrl],VK_9,[]); - ecToggleMarker0: SetCombo(VK_0,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_0,[]); - ecToggleMarker1: SetCombo(VK_1,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_1,[]); - ecToggleMarker2: SetCombo(VK_2,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_2,[]); - ecToggleMarker3: SetCombo(VK_3,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_3,[]); - ecToggleMarker4: SetCombo(VK_4,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_4,[]); - ecToggleMarker5: SetCombo(VK_5,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_5,[]); - ecToggleMarker6: SetCombo(VK_6,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_6,[]); - ecToggleMarker7: SetCombo(VK_7,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_7,[]); - ecToggleMarker8: SetCombo(VK_8,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_8,[]); - ecToggleMarker9: SetCombo(VK_9,[ssShift,ssCtrl],VK_UNKNOWN,[], VK_K,[SSCtrl],VK_9,[]); + ecGotoMarker0: SetCombo(VK_0,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_0,[]); + ecGotoMarker1: SetCombo(VK_1,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_1,[]); + ecGotoMarker2: SetCombo(VK_2,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_2,[]); + ecGotoMarker3: SetCombo(VK_3,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_3,[]); + ecGotoMarker4: SetCombo(VK_4,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_4,[]); + ecGotoMarker5: SetCombo(VK_5,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_5,[]); + ecGotoMarker6: SetCombo(VK_6,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_6,[]); + ecGotoMarker7: SetCombo(VK_7,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_7,[]); + ecGotoMarker8: SetCombo(VK_8,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_8,[]); + ecGotoMarker9: SetCombo(VK_9,[XCtrl],VK_UNKNOWN,[], VK_Q,[XCtrl],VK_9,[]); + ecToggleMarker0: SetCombo(VK_0,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_0,[]); + ecToggleMarker1: SetCombo(VK_1,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_1,[]); + ecToggleMarker2: SetCombo(VK_2,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_2,[]); + ecToggleMarker3: SetCombo(VK_3,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_3,[]); + ecToggleMarker4: SetCombo(VK_4,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_4,[]); + ecToggleMarker5: SetCombo(VK_5,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_5,[]); + ecToggleMarker6: SetCombo(VK_6,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_6,[]); + ecToggleMarker7: SetCombo(VK_7,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_7,[]); + ecToggleMarker8: SetCombo(VK_8,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_8,[]); + ecToggleMarker9: SetCombo(VK_9,[ssShift,XCtrl],VK_UNKNOWN,[], VK_K,[XCtrl],VK_9,[]); ecSetMarker0: SetSingle(VK_UNKNOWN,[]); ecSetMarker1: SetSingle(VK_UNKNOWN,[]); ecSetMarker2: SetSingle(VK_UNKNOWN,[]); @@ -1132,16 +1142,16 @@ begin ecSetMarker9: SetSingle(VK_UNKNOWN,[]); // codetools - ecAutoCompletion: SetSingle(VK_J,[ssCtrl]); - ecWordCompletion: SetSingle(VK_W,[ssCtrl]); - ecCompleteCode: SetSingle(VK_C,[ssCtrl,ssShift]); - ecCompleteCodeInteractive: SetSingle(VK_X,[ssCtrl,ssShift]); - ecIdentCompletion: SetSingle(VK_SPACE,[ssCtrl]); - ecShowCodeContext: SetSingle(VK_SPACE,[ssCtrl,ssShift]); + ecAutoCompletion: SetSingle(VK_J,[XCtrl]); + ecWordCompletion: SetSingle(VK_W,[XCtrl]); + ecCompleteCode: SetSingle(VK_C,[XCtrl,ssShift]); + ecCompleteCodeInteractive: SetSingle(VK_X,[XCtrl,ssShift]); + ecIdentCompletion: SetSingle(VK_SPACE,[XCtrl]); + ecShowCodeContext: SetSingle(VK_SPACE,[XCtrl,ssShift]); ecExtractProc: SetSingle(VK_UNKNOWN,[]); - ecFindIdentifierRefs: SetSingle(VK_I,[ssCtrl,ssShift]); + ecFindIdentifierRefs: SetSingle(VK_I,[XCtrl,ssShift]); ecFindUsedUnitRefs: SetSingle(VK_UNKNOWN,[]); - ecRenameIdentifier: SetSingle(VK_F2,[], VK_E,[ssShift,ssCtrl]); + ecRenameIdentifier: SetSingle(VK_F2,[], VK_E,[ssShift,XCtrl]); ecInvertAssignment: SetSingle(VK_UNKNOWN,[]); ecSyntaxCheck: SetSingle(VK_UNKNOWN,[]); ecGuessUnclosedBlock: SetSingle(VK_UNKNOWN,[]); @@ -1152,11 +1162,11 @@ begin ecConvertDelphiProject:SetSingle(VK_UNKNOWN,[]); ecConvertDelphiPackage:SetSingle(VK_UNKNOWN,[]); ecConvertEncoding: SetSingle(VK_UNKNOWN,[]); - ecFindProcedureDefinition:SetSingle(VK_UP,[ssShift,SSCtrl]); - ecFindProcedureMethod: SetSingle(VK_DOWN,[ssShift,SSCtrl]); + ecFindProcedureDefinition:SetSingle(VK_UP,[ssShift,XCtrl]); + ecFindProcedureMethod: SetSingle(VK_DOWN,[ssShift,XCtrl]); ecFindDeclaration: SetSingle(VK_UP,[ssAlt]); - ecFindBlockOtherEnd: SetCombo(VK_Q,[ssCtrl],VK_O,[]); - ecFindBlockStart: SetCombo(VK_Q,[ssCtrl],VK_M,[]); + ecFindBlockOtherEnd: SetCombo(VK_Q,[XCtrl],VK_O,[]); + ecFindBlockStart: SetCombo(VK_Q,[XCtrl],VK_M,[]); ecGotoIncludeDirective:SetSingle(VK_UNKNOWN,[]); ecShowAbstractMethods: SetSingle(VK_UNKNOWN,[]); ecRemoveEmptyMethods: SetSingle(VK_UNKNOWN,[]); @@ -1165,10 +1175,10 @@ begin ecFindOverloads: SetSingle(VK_UNKNOWN,[]); // source notebook - ecNextEditor: SetSingle(VK_TAB,[ssCtrl]); - ecPrevEditor: SetSingle(VK_TAB,[ssShift,ssCtrl]); - ecPrevEditorInHistory: SetSingle(VK_OEM_3,[ssCtrl]);//~ - ecNextEditorInHistory: SetSingle(VK_OEM_3,[ssShift,ssCtrl]);//~ + ecNextEditor: SetSingle(VK_TAB,[XCtrl]); + ecPrevEditor: SetSingle(VK_TAB,[ssShift,XCtrl]); + ecPrevEditorInHistory: SetSingle(VK_OEM_3,[XCtrl]);//~ + ecNextEditorInHistory: SetSingle(VK_OEM_3,[ssShift,XCtrl]);//~ ecResetDebugger: SetSingle(VK_UNKNOWN,[]); ecToggleBreakPoint: SetSingle(VK_F5,[]); ecMoveEditorLeft: SetSingle(VK_UNKNOWN,[]); @@ -1218,12 +1228,12 @@ begin ecNew: SetSingle(VK_UNKNOWN,[]); ecNewUnit: SetSingle(VK_UNKNOWN,[]); ecNewForm: SetSingle(VK_UNKNOWN,[]); - ecOpen: SetSingle(VK_O,[ssCtrl]); + ecOpen: SetSingle(VK_O,[XCtrl]); ecRevert: SetSingle(VK_UNKNOWN,[]); - ecSave: SetSingle(VK_S,[ssCtrl]); + ecSave: SetSingle(VK_S,[XCtrl]); ecSaveAs: SetSingle(VK_UNKNOWN,[]); - ecSaveAll: SetSingle(VK_S,[ssCtrl,ssShift]); - ecClose: SetSingle(VK_F4,[ssCtrl]); + ecSaveAll: SetSingle(VK_S,[XCtrl,ssShift]); + ecClose: SetSingle(VK_F4,[XCtrl]); ecCloseAll: SetSingle(VK_UNKNOWN,[]); ecCleanDirectory: SetSingle(VK_UNKNOWN,[]); ecRestart: SetSingle(VK_UNKNOWN,[]); @@ -1235,20 +1245,20 @@ begin ecToggleCodeExpl: SetSingle(VK_UNKNOWN,[]); ecToggleFPDocEditor: SetSingle(VK_UNKNOWN,[]); ecToggleMessages: SetSingle(VK_UNKNOWN,[]); - ecViewComponents: SetSingle(VK_P,[ssCtrl,ssAlt]); - ecViewJumpHistory: SetSingle(VK_J,[ssCtrl,ssAlt]); - ecToggleSearchResults: SetSingle(VK_F,[ssCtrl,ssAlt]); - ecToggleWatches: SetSingle(VK_W,[ssCtrl,ssAlt]); - ecToggleBreakPoints: SetSingle(VK_B,[ssCtrl,ssAlt]); - ecToggleLocals: SetSingle(VK_L,[ssCtrl,ssAlt], VK_L,[ssCtrl,ssShift]); - ecViewPseudoTerminal: if HasConsoleSupport then SetSingle(VK_O,[ssCtrl,ssAlt]); - ecViewThreads: SetSingle(VK_T,[ssCtrl,ssAlt]); - ecToggleCallStack: SetSingle(VK_S,[ssCtrl,ssAlt]); - ecToggleRegisters: SetSingle(VK_R,[ssCtrl,ssAlt]); - ecToggleAssembler: SetSingle(VK_D,[ssCtrl,ssAlt]); - ecToggleDebugEvents: SetSingle(VK_V,[ssCtrl,ssAlt]); + ecViewComponents: SetSingle(VK_P,[XCtrl,ssAlt]); + ecViewJumpHistory: SetSingle(VK_J,[XCtrl,ssAlt]); + ecToggleSearchResults: SetSingle(VK_F,[XCtrl,ssAlt]); + ecToggleWatches: SetSingle(VK_W,[XCtrl,ssAlt]); + ecToggleBreakPoints: SetSingle(VK_B,[XCtrl,ssAlt]); + ecToggleLocals: SetSingle(VK_L,[XCtrl,ssAlt], VK_L,[XCtrl,ssShift]); + ecViewPseudoTerminal: if HasConsoleSupport then SetSingle(VK_O,[XCtrl,ssAlt]); + ecViewThreads: SetSingle(VK_T,[XCtrl,ssAlt]); + ecToggleCallStack: SetSingle(VK_S,[XCtrl,ssAlt]); + ecToggleRegisters: SetSingle(VK_R,[XCtrl,ssAlt]); + ecToggleAssembler: SetSingle(VK_D,[XCtrl,ssAlt]); + ecToggleDebugEvents: SetSingle(VK_V,[XCtrl,ssAlt]); ecToggleDebuggerOut: SetSingle(VK_UNKNOWN,[]); - ecViewHistory: SetSingle(VK_H,[ssCtrl,ssAlt]); + ecViewHistory: SetSingle(VK_H,[XCtrl,ssAlt]); ecViewUnitDependencies:SetSingle(VK_UNKNOWN,[]); ecViewUnitInfo: SetSingle(VK_UNKNOWN,[]); ecToggleFormUnit: SetSingle(VK_F12,[]); @@ -1261,7 +1271,7 @@ begin // project menu ecNewProject: SetSingle(VK_UNKNOWN,[]); ecNewProjectFromFile: SetSingle(VK_UNKNOWN,[]); - ecOpenProject: SetSingle(VK_F11,[ssCtrl]); + ecOpenProject: SetSingle(VK_F11,[XCtrl]); ecCloseProject: SetSingle(VK_UNKNOWN,[]); ecSaveProject: SetSingle(VK_UNKNOWN,[]); ecSaveProjectAs: SetSingle(VK_UNKNOWN,[]); @@ -1269,20 +1279,20 @@ begin ecProjectInspector: SetSingle(VK_UNKNOWN,[]); ecAddCurUnitToProj: SetSingle(VK_F11,[ssShift]); ecRemoveFromProj: SetSingle(VK_UNKNOWN,[]); - ecViewProjectUnits: SetSingle(VK_F12,[ssCtrl]); + ecViewProjectUnits: SetSingle(VK_F12,[XCtrl]); ecViewProjectForms: SetSingle(VK_F12,[ssShift]); ecViewProjectSource: SetSingle(VK_UNKNOWN,[]); - ecProjectOptions: SetSingle(VK_F11,[ssShift,ssCtrl]); + ecProjectOptions: SetSingle(VK_F11,[ssShift,XCtrl]); ecProjectChangeBuildMode:SetSingle(VK_UNKNOWN,[]); // run menu - ecCompile: SetSingle(VK_F9,[ssCtrl]); + ecCompile: SetSingle(VK_F9,[XCtrl]); ecBuild: SetSingle(VK_F9,[ssShift]); ecQuickCompile: SetSingle(VK_UNKNOWN,[]); ecCleanUpAndBuild: SetSingle(VK_UNKNOWN,[]); ecBuildManyModes: SetSingle(VK_UNKNOWN,[]); ecAbortBuild: SetSingle(VK_UNKNOWN,[]); - ecRunWithoutDebugging: SetSingle(VK_F9, [ssCtrl, ssShift]); + ecRunWithoutDebugging: SetSingle(VK_F9, [XCtrl, ssShift]); ecRun: SetSingle(VK_F9,[]); ecPause: SetSingle(VK_UNKNOWN,[]); ecShowExecutionPoint: SetSingle(VK_UNKNOWN,[]); @@ -1292,15 +1302,15 @@ begin ecStepOverInstr: SetSingle(VK_F8,[ssAlt]); ecStepOut: SetSingle(VK_F8,[ssShift]); ecRunToCursor: SetSingle(VK_F4,[]); - ecStopProgram: SetSingle(VK_F2,[SSCtrl]); + ecStopProgram: SetSingle(VK_F2,[XCtrl]); ecRemoveBreakPoint: SetSingle(VK_UNKNOWN,[]); ecRunParameters: SetSingle(VK_UNKNOWN,[]); ecBuildFile: SetSingle(VK_UNKNOWN,[]); ecRunFile: SetSingle(VK_UNKNOWN,[]); ecConfigBuildFile: SetSingle(VK_UNKNOWN,[]); ecInspect: SetSingle(VK_F5,[ssAlt]); - ecEvaluate: SetSingle(VK_F7,[ssCtrl]); - ecAddWatch: SetSingle(VK_F5,[ssCtrl]); + ecEvaluate: SetSingle(VK_F7,[XCtrl]); + ecAddWatch: SetSingle(VK_F5,[XCtrl]); ecAddBpSource: SetSingle(VK_UNKNOWN,[]); ecAddBpAddress: SetSingle(VK_UNKNOWN,[]); ecAddBpDataWatch: SetSingle(VK_F5,[ssShift]); @@ -1318,7 +1328,7 @@ begin ecConfigCustomComps: SetSingle(VK_UNKNOWN,[]); // tools menu - ecEnvironmentOptions: SetSingle(VK_O,[ssShift,ssCtrl]); + ecEnvironmentOptions: SetSingle(VK_O,[ssShift,XCtrl]); ecRescanFPCSrcDir: SetSingle(VK_UNKNOWN,[]); ecEditCodeTemplates: SetSingle(VK_UNKNOWN,[]); ecCodeToolsDefinesEd: SetSingle(VK_UNKNOWN,[]); @@ -1331,47 +1341,47 @@ begin ecDiff: SetSingle(VK_UNKNOWN,[]); // window menu - ecManageSourceEditors: SetSingle(VK_W,[ssShift,ssCtrl]); + ecManageSourceEditors: SetSingle(VK_W,[ssShift,XCtrl]); // help menu ecAboutLazarus: SetSingle(VK_UNKNOWN,[]); ecOnlineHelp: SetSingle(VK_UNKNOWN,[]); ecContextHelp: SetSingle(VK_F1,[]); - ecEditContextHelp: SetSingle(VK_F1,[ssShift,ssCtrl]); + ecEditContextHelp: SetSingle(VK_F1,[ssShift,XCtrl]); ecReportingBug: SetSingle(VK_UNKNOWN,[]); ecFocusHint: SetSingle(VK_UNKNOWN,[]); // designer - ecDesignerCopy: SetSingle(VK_C,[ssCtrl], VK_Insert,[ssCtrl]); - ecDesignerCut: SetSingle(VK_X,[ssCtrl], VK_Delete,[ssShift]); - ecDesignerPaste: SetSingle(VK_V,[ssCtrl], VK_Insert,[ssShift]); + ecDesignerCopy: SetSingle(VK_C,[XCtrl], VK_Insert,[XCtrl]); + ecDesignerCut: SetSingle(VK_X,[XCtrl], VK_Delete,[ssShift]); + ecDesignerPaste: SetSingle(VK_V,[XCtrl], VK_Insert,[ssShift]); ecDesignerSelectParent:SetSingle(VK_ESCAPE,[]); ecDesignerMoveToFront: SetSingle(VK_PRIOR,[ssShift]); ecDesignerMoveToBack: SetSingle(VK_NEXT,[ssShift]); - ecDesignerForwardOne: SetSingle(VK_PRIOR,[ssCtrl]); - ecDesignerBackOne: SetSingle(VK_NEXT,[ssCtrl]); + ecDesignerForwardOne: SetSingle(VK_PRIOR,[XCtrl]); + ecDesignerBackOne: SetSingle(VK_NEXT,[XCtrl]); // macro - ecSynMacroRecord: SetSingle(VK_R,[ssShift, ssCtrl]); - ecSynMacroPlay: SetSingle(VK_P,[ssShift, ssCtrl]); + ecSynMacroRecord: SetSingle(VK_R,[ssShift, XCtrl]); + ecSynMacroPlay: SetSingle(VK_P,[ssShift, XCtrl]); - ecIdePTmplEdNextCell: SetSingle(VK_RIGHT,[ssCtrl]); + ecIdePTmplEdNextCell: SetSingle(VK_RIGHT,[XCtrl]); ecIdePTmplEdNextCellSel: SetSingle(VK_TAB,[]); ecIdePTmplEdNextCellRotate: SetSingle(VK_UNKNOWN,[]); ecIdePTmplEdNextCellSelRotate:SetSingle(VK_UNKNOWN,[]); - ecIdePTmplEdPrevCell: SetSingle(VK_LEFT,[ssCtrl]); + ecIdePTmplEdPrevCell: SetSingle(VK_LEFT,[XCtrl]); ecIdePTmplEdPrevCellSel: SetSingle(VK_TAB,[ssShift]); ecIdePTmplEdCellHome: SetSingle(VK_HOME,[]); ecIdePTmplEdCellEnd: SetSingle(VK_END,[]); - ecIdePTmplEdCellSelect: SetSingle(VK_A,[ssCtrl]); + ecIdePTmplEdCellSelect: SetSingle(VK_A,[XCtrl]); ecIdePTmplEdFinish: SetSingle(VK_RETURN,[]); ecIdePTmplEdEscape: SetSingle(VK_ESCAPE,[]); // Edit template - ecIdePTmplEdOutNextCell: SetSingle(VK_RIGHT,[ssCtrl]); + ecIdePTmplEdOutNextCell: SetSingle(VK_RIGHT,[XCtrl]); ecIdePTmplEdOutNextCellSel: SetSingle(VK_TAB,[]); ecIdePTmplEdOutNextCellRotate: SetSingle(VK_UNKNOWN,[]); ecIdePTmplEdOutNextCellSelRotate:SetSingle(VK_UNKNOWN,[]); - ecIdePTmplEdOutPrevCell: SetSingle(VK_LEFT,[ssCtrl]); + ecIdePTmplEdOutPrevCell: SetSingle(VK_LEFT,[XCtrl]); ecIdePTmplEdOutPrevCellSel: SetSingle(VK_TAB,[ssShift]); ecIdePTmplEdOutCellHome: SetSingle(VK_UNKNOWN,[]); ecIdePTmplEdOutCellEnd: SetSingle(VK_UNKNOWN,[]); @@ -1379,25 +1389,25 @@ begin ecIdePTmplEdOutFinish: SetSingle(VK_RETURN,[]); ecIdePTmplEdOutEscape: SetSingle(VK_ESCAPE,[]); // SyncroEdit - ecIdePSyncroEdNextCell: SetSingle(VK_RIGHT,[ssCtrl]); + ecIdePSyncroEdNextCell: SetSingle(VK_RIGHT,[XCtrl]); ecIdePSyncroEdNextCellSel: SetSingle(VK_TAB,[]); - ecIdePSyncroEdPrevCell: SetSingle(VK_LEFT,[ssCtrl]); + ecIdePSyncroEdPrevCell: SetSingle(VK_LEFT,[XCtrl]); ecIdePSyncroEdPrevCellSel: SetSingle(VK_TAB,[ssShift]); ecIdePSyncroEdCellHome: SetSingle(VK_HOME,[]); ecIdePSyncroEdCellEnd: SetSingle(VK_END,[]); - ecIdePSyncroEdCellSelect: SetSingle(VK_A,[ssCtrl]); + ecIdePSyncroEdCellSelect: SetSingle(VK_A,[XCtrl]); ecIdePSyncroEdEscape: SetSingle(VK_ESCAPE,[]); // SyncroEdit - ecIdePSyncroEdOutNextCell: SetSingle(VK_RIGHT,[ssCtrl]); + ecIdePSyncroEdOutNextCell: SetSingle(VK_RIGHT,[XCtrl]); ecIdePSyncroEdOutNextCellSel: SetSingle(VK_TAB,[]); - ecIdePSyncroEdOutPrevCell: SetSingle(VK_LEFT,[ssCtrl]); + ecIdePSyncroEdOutPrevCell: SetSingle(VK_LEFT,[XCtrl]); ecIdePSyncroEdOutPrevCellSel: SetSingle(VK_TAB,[ssShift]); ecIdePSyncroEdOutCellHome: SetSingle(VK_UNKNOWN,[]); ecIdePSyncroEdOutCellEnd: SetSingle(VK_UNKNOWN,[]); ecIdePSyncroEdOutCellSelect: SetSingle(VK_UNKNOWN,[]); ecIdePSyncroEdOutEscape: SetSingle(VK_ESCAPE,[]); // SyncroEdit, during selection - ecIdePSyncroEdSelStart: SetSingle(VK_J,[ssCtrl]); + ecIdePSyncroEdSelStart: SetSingle(VK_J,[XCtrl]); else begin diff --git a/ide/keymapschemedlg.lfm b/ide/keymapschemedlg.lfm index eaa256bb09..395055cad0 100644 --- a/ide/keymapschemedlg.lfm +++ b/ide/keymapschemedlg.lfm @@ -1,19 +1,18 @@ object ChooseKeySchemeDlg: TChooseKeySchemeDlg Left = 406 - Height = 233 + Height = 226 Top = 307 Width = 433 - ActiveControl = SchemeRadiogroup.RadioButton0 BorderStyle = bsDialog Caption = 'ChooseKeySchemeDlg' - ClientHeight = 233 + ClientHeight = 226 ClientWidth = 433 OnCreate = ChooseKeySchemeDlgCREATE Position = poScreenCenter - LCLVersion = '0.9.27' + LCLVersion = '1.7' object NoteLabel: TLabel Left = 6 - Height = 14 + Height = 17 Top = 6 Width = 421 Align = alTop @@ -24,8 +23,8 @@ object ChooseKeySchemeDlg: TChooseKeySchemeDlg end object SchemeRadiogroup: TRadioGroup Left = 6 - Height = 169 - Top = 26 + Height = 149 + Top = 29 Width = 421 Align = alClient AutoFill = True @@ -39,23 +38,32 @@ object ChooseKeySchemeDlg: TChooseKeySchemeDlg ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 151 - ClientWidth = 417 + ClientHeight = 131 + ClientWidth = 413 ItemIndex = 0 Items.Strings = ( 'Default (Lazarus)' 'Classic (TP)' 'Mac OS X (Apple style)' 'Mac OS X (Lazarus style)' + 'Default to OSX' ) TabOrder = 0 TabStop = True end object ButtonPanel: TButtonPanel Left = 6 - Height = 26 - Top = 201 + Height = 36 + Top = 184 Width = 421 + OKButton.Name = 'OKButton' + OKButton.DefaultCaption = True + HelpButton.Name = 'HelpButton' + HelpButton.DefaultCaption = True + CloseButton.Name = 'CloseButton' + CloseButton.DefaultCaption = True + CancelButton.Name = 'CancelButton' + CancelButton.DefaultCaption = True TabOrder = 1 ShowButtons = [pbOK, pbCancel, pbHelp] ShowBevel = False diff --git a/ide/keymapschemedlg.pas b/ide/keymapschemedlg.pas index 2bb9aac2d2..8cb92a6661 100644 --- a/ide/keymapschemedlg.pas +++ b/ide/keymapschemedlg.pas @@ -86,6 +86,7 @@ begin Add(lisKMClassic); Add(lisKMMacOSXApple); Add(lisKMMacOSXLaz); + Add(lisKMDefaultToOSX); // do not add custom end; end; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 54fc21cb6e..fd704481a6 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -1238,6 +1238,7 @@ resourcestring lisKMLazarusDefault = 'Lazarus (default)'; lisKMMacOSXApple = 'Mac OS X (Apple style)'; lisKMMacOSXLaz = 'Mac OS X (Lazarus style)'; + lisKMDefaultToOSX = 'Default adapted to OS X'; lisPEFilename = 'Filename:'; lisPEUnitname = 'Unitname:'; lisPVUTheUnitnameIsUsedWhenTheIDEExtendsUsesClauses = 'The unitname is used '