IDE: Make resourcestring: fixed prefix

git-svn-id: trunk@30438 -
This commit is contained in:
mattias 2011-04-23 15:30:08 +00:00
parent 7461ab9b58
commit 04e3416580
5 changed files with 47 additions and 3 deletions

View File

@ -3746,7 +3746,7 @@ end;
procedure TCompilationToolOptions.LoadFromXMLConfig(XMLConfig: TXMLConfig;
const Path: string; DoSwitchPathDelims: boolean);
begin
//debugln(['TCompilationToolOptions.LoadFromXMLConfig ',Command,' Path=',Path]);
//debugln(['TCompilationToolOptions.LoadFromXMLConfig ',Command,' Path=',Path,' DoSwitchPathDelims=',DoSwitchPathDelims]);
Command:=SwitchPathDelims(XMLConfig.GetValue(Path+'Command/Value',''),
DoSwitchPathDelims);
ScanForFPCMessages:=XMLConfig.GetValue(Path+'ScanForFPCMsgs/Value',false);

View File

@ -159,4 +159,44 @@ inherited ProjectMiscOptionsFrame: TProjectMiscOptionsFrame
Caption = 'UseDesignTimePkgsCheckBox'
TabOrder = 8
end
object PathDelimLabel: TLabel[10]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = PathDelimComboBox
AnchorSideTop.Side = asrCenter
Left = 0
Height = 18
Top = 330
Width = 110
Caption = 'PathDelimLabel'
ParentColor = False
end
object Bevel2: TBevel[11]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ResourceGroupBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 0
Height = 3
Top = 317
Width = 536
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
end
object PathDelimComboBox: TComboBox[12]
AnchorSideLeft.Control = PathDelimLabel
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Bevel2
AnchorSideTop.Side = asrBottom
Left = 116
Height = 27
Top = 326
Width = 119
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Enabled = False
ItemHeight = 0
TabOrder = 9
Text = 'PathDelimComboBox'
end
end

View File

@ -15,11 +15,14 @@ type
TProjectMiscOptionsFrame = class(TAbstractIDEOptionsEditor)
AlwaysBuildCheckBox: TCheckBox;
Bevel1: TBevel;
Bevel2: TBevel;
LRSInOutputDirCheckBox: TCheckBox;
MainUnitHasCreateFormStatementsCheckBox: TCheckBox;
MainUnitHasTitleStatementCheckBox: TCheckBox;
MainUnitHasUsesSectionForAllUnitsCheckBox: TCheckBox;
MainUnitIsPascalSourceCheckBox: TCheckBox;
PathDelimComboBox: TComboBox;
PathDelimLabel: TLabel;
ResourceGroupBox: TGroupBox;
RunnableCheckBox: TCheckBox;
UseDesignTimePkgsCheckBox: TCheckBox;
@ -61,6 +64,7 @@ begin
UseLRSFilesRadioButton.Hint := lisAutomaticallyConvertLfmFilesToLrsIncludeFiles;
UseFPCResourcesRadioButton.Caption := lisFPCResources;
UseFPCResourcesRadioButton.Hint := lisRequiresFPC24OrAboveLikeDelphiResources;
PathDelimLabel.Caption:=lisStorePathDelimitersAndAs;
end;
procedure TProjectMiscOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);

View File

@ -4807,6 +4807,7 @@ resourcestring
lisFPCResources = 'FPC resources';
lisRequiresFPC24OrAboveLikeDelphiResources = 'Requires FPC 2.4 or above. '
+'Like Delphi resources';
lisStorePathDelimitersAndAs = 'Store path delimiters \ and / as';
dlgCOCreateNodeAbove = 'Create node above';
dlgCOCreateNodeBelow = 'Create node below';
dlgCOCreateChildNode = 'Create child node';

View File

@ -560,10 +560,9 @@ begin
LastLine:=StringConstSynEdit.Lines[EndPos.Y-StartPos.Y];
RightSide:=copy(LastLine,EndPos.X,length(LastLine)-EndPos.X+1);
NewSource:=LeftSide+NewString;
NewSource:=LeftSide+NewString+RightSide;
with CodeToolBoss.SourceChangeCache.BeautifyCodeOptions do
NewSource:=BeautifyStatement(NewSource,0);
NewSource:=NewString+RightSide;
ResourceStringValue:=FormatStringConstant;
end;