diff --git a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas index 7d2aa9527b..8d6429ead7 100644 --- a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas +++ b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas @@ -77,6 +77,28 @@ resourcestring lisSpacesSpacesForTab = 'Spaces for tab'; lisSpacesMaxSpacesInCode = '&Max spaces in code'; + //Indentation tab + lisIndentIndentation = 'Indentation'; + lisIndentBlockIndentationSpaces = 'Block indentation spaces'; + lisIndentOptions = 'Options'; + lisIndentExtraIndentForBeginEnd = 'Extra indent for begin/end inside ' + +'procedures'; + lisIndentDifferentIndentForFirstLevel = 'Different indent for first level'; + lisIndentKeepSingleLineCommentsWithCodeInProcs = 'Keep single-line comments ' + +'with code in procedures'; + lisIndentKeepSingleLineCommentsWithCodeInGlobals = 'Keep single-line ' + +'comments with code in globals'; + lisIndentKeepSingleLineCommentsWithCodeInClassDefs = 'Keep single-line ' + +'comments with code in class definitions'; + lisIndentKeepSingleLineCommentsWithCodeElsewhere = 'Keep single-line ' + +'comments with code elsewhere'; + lisIndentExtraIndentForIfElseBlocks = 'Extra Indent for If...Else blocks'; + lisIndentExtraIndentForCaseElseBlocks = 'Extra Indent for Case...Else blocks'; + lisIndentIndentForProceduresInLibrary = 'Indent for procedures in library'; + lisIndentIndentForProcedureBody = 'Indent for procedure body'; + lisIndentIndentNestedTypes = 'Indent nested types'; + lisIndentIndentVarAndConstInClass = 'Indent var and const in class'; + implementation end. diff --git a/components/jcf2/Ui/Settings/frClarifyIndent.pas b/components/jcf2/Ui/Settings/frClarifyIndent.pas index 2a20939bc4..dc73e19fc4 100644 --- a/components/jcf2/Ui/Settings/frClarifyIndent.pas +++ b/components/jcf2/Ui/Settings/frClarifyIndent.pas @@ -73,7 +73,7 @@ implementation {$R *.lfm} uses - JcfHelp, JcfSettings, SetIndent; + JcfHelp, JcfSettings, SetIndent, jcfuiconsts; constructor TfClarifyIndent.Create(AOwner: TComponent); begin @@ -83,12 +83,28 @@ end; function TfClarifyIndent.GetTitle: String; begin - Result := 'Indentation'; + Result := lisIndentIndentation; end; procedure TfClarifyIndent.Setup(ADialog: TAbstractOptionsEditorDialog); begin - //; + Label2.Caption := lisIndentBlockIndentationSpaces; + gbOptions.Caption := lisIndentOptions; + cbIndentBeginEnd.Caption := lisIndentExtraIndentForBeginEnd; + cbHasFirstLevelIndent.Caption := lisIndentDifferentIndentForFirstLevel; + cbKeepWithInProc.Caption := lisIndentKeepSingleLineCommentsWithCodeInProcs; + cbKeepWithInGlobals.Caption := + lisIndentKeepSingleLineCommentsWithCodeInGlobals; + cbKeepWithInClassDef.Caption := + lisIndentKeepSingleLineCommentsWithCodeInClassDefs; + cbKeepWithElsewhere.Caption := + lisIndentKeepSingleLineCommentsWithCodeElsewhere; + cbIndentIfElse.Caption := lisIndentExtraIndentForIfElseBlocks; + cbIndentCaseElse.Caption := lisIndentExtraIndentForCaseElseBlocks; + cbIndentLibraryProcs.Caption := lisIndentIndentForProceduresInLibrary; + cbIndentProcedureBody.Caption := lisIndentIndentForProcedureBody; + cbIndentNestedTypes.Caption := lisIndentIndentNestedTypes; + cbIndentVarAndConstInClass.Caption := lisIndentIndentVarAndConstInClass; end; {-------------------------------------------------------------------------------