Changed a few language strings (again) to English
Fixed bug in the replace system Fixed bug in the Autcomplete Check Changed version number to 1.4
This commit is contained in:
parent
83d2e1a510
commit
507a901a9e
|
@ -113,9 +113,9 @@ RootDir=C:\Programme\Borland\Delphi7\Bin\
|
||||||
IncludeVerInfo=1
|
IncludeVerInfo=1
|
||||||
AutoIncBuild=1
|
AutoIncBuild=1
|
||||||
MajorVer=1
|
MajorVer=1
|
||||||
MinorVer=3
|
MinorVer=4
|
||||||
Release=0
|
Release=0
|
||||||
Build=36
|
Build=1
|
||||||
Debug=0
|
Debug=0
|
||||||
PreRelease=0
|
PreRelease=0
|
||||||
Special=0
|
Special=0
|
||||||
|
@ -126,13 +126,13 @@ CodePage=1252
|
||||||
[Version Info Keys]
|
[Version Info Keys]
|
||||||
CompanyName=AMX Mod X Dev Team
|
CompanyName=AMX Mod X Dev Team
|
||||||
FileDescription=
|
FileDescription=
|
||||||
FileVersion=1.3.0.36
|
FileVersion=1.4.0.1
|
||||||
InternalName=
|
InternalName=gaben
|
||||||
LegalCopyright=
|
LegalCopyright=AMX Mod X Dev Team
|
||||||
LegalTrademarks=
|
LegalTrademarks=
|
||||||
OriginalFilename=
|
OriginalFilename=
|
||||||
ProductName=AMXX-Studio
|
ProductName=AMXX-Studio
|
||||||
ProductVersion=1.2.0.0
|
ProductVersion=1.4.0.0
|
||||||
Comments=
|
Comments=
|
||||||
[HistoryLists\hlConditionals]
|
[HistoryLists\hlConditionals]
|
||||||
Count=1
|
Count=1
|
||||||
|
|
|
@ -47,7 +47,6 @@ uses
|
||||||
- FlatStyle
|
- FlatStyle
|
||||||
- Toolbar2000, TBX, SpTBX, mbTBX Lib
|
- Toolbar2000, TBX, SpTBX, mbTBX Lib
|
||||||
- Scintilla and DelphiSci
|
- Scintilla and DelphiSci
|
||||||
- madExcept
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{$R *.res}
|
{$R *.res}
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -456,10 +456,11 @@ var eStr: String;
|
||||||
begin
|
begin
|
||||||
Result := 0;
|
Result := 0;
|
||||||
eStr := StringReplace(frmMain.sciEditor.Lines[frmMain.sciEditor.GetCurrentLineNumber], '^"', '', [rfReplaceAll]);
|
eStr := StringReplace(frmMain.sciEditor.Lines[frmMain.sciEditor.GetCurrentLineNumber], '^"', '', [rfReplaceAll]);
|
||||||
|
eStr := Copy(eStr, 1, frmMain.sciEditor.GetCaretInLine);
|
||||||
while Between(eStr, '"', '"') <> '' do
|
while Between(eStr, '"', '"') <> '' do
|
||||||
eStr := StringReplace(eStr, Between(eStr, '"', '"'), '', [rfReplaceAll]);
|
eStr := StringReplace(eStr, Between(eStr, '"', '"'), '', [rfReplaceAll]);
|
||||||
while Between(eStr, '{', '}') <> '' do
|
while Between(eStr, '{', '}') <> '' do
|
||||||
eStr := StringReplace(eStr, Between(eStr, '"', '"'), '', [rfReplaceAll]);
|
eStr := StringReplace(eStr, Between(eStr, '{', '}'), '', [rfReplaceAll]);
|
||||||
for i := 0 to Length(eStr) -1 do begin
|
for i := 0 to Length(eStr) -1 do begin
|
||||||
if eStr[i] = ',' then
|
if eStr[i] = ',' then
|
||||||
Result := Result +1;
|
Result := Result +1;
|
||||||
|
|
Binary file not shown.
|
@ -756,7 +756,6 @@ object frmMain: TfrmMain
|
||||||
Align = alClient
|
Align = alClient
|
||||||
OnModified = sciEditorModified
|
OnModified = sciEditorModified
|
||||||
OnDblClick = sciEditorDblClick
|
OnDblClick = sciEditorDblClick
|
||||||
OnCallTipClick = sciEditorCallTipClick
|
|
||||||
OnKeyUp = sciEditorKeyUp
|
OnKeyUp = sciEditorKeyUp
|
||||||
OnKeyDown = sciEditorKeyDown
|
OnKeyDown = sciEditorKeyDown
|
||||||
OnKeyPress = sciEditorKeyPress
|
OnKeyPress = sciEditorKeyPress
|
||||||
|
@ -7781,7 +7780,7 @@ object frmMain: TfrmMain
|
||||||
OnBeforeShow = sciAutoCompleteBeforeShow
|
OnBeforeShow = sciAutoCompleteBeforeShow
|
||||||
MaxWidth = 0
|
MaxWidth = 0
|
||||||
MaxHeight = 5
|
MaxHeight = 5
|
||||||
Left = 842
|
Left = 844
|
||||||
Top = 6
|
Top = 6
|
||||||
end
|
end
|
||||||
object ppmDocuments: TSpTBXPopupMenu
|
object ppmDocuments: TSpTBXPopupMenu
|
||||||
|
|
|
@ -1204,11 +1204,14 @@ begin
|
||||||
if frmReplace.ShowModal = mrOk then begin
|
if frmReplace.ShowModal = mrOk then begin
|
||||||
if not Plugin_SearchReplace(frmReplace.cboSearchFor.Text, frmReplace.cboReplaceWith.Text, frmReplace.cboSearchFor.Items.Text, frmReplace.cboReplaceWith.Items.Text, frmSearch.chkCaseSensivity.Checked, frmSearch.chkWholeWordsOnly.Checked, frmSearch.chkSearchFromCaret.Checked, frmSearch.chkSelectedTextOnly.Checked, frmSearch.chkRegularExpression.Checked, frmSearch.chkForward.Checked) then
|
if not Plugin_SearchReplace(frmReplace.cboSearchFor.Text, frmReplace.cboReplaceWith.Text, frmReplace.cboSearchFor.Items.Text, frmReplace.cboReplaceWith.Items.Text, frmSearch.chkCaseSensivity.Checked, frmSearch.chkWholeWordsOnly.Checked, frmSearch.chkSearchFromCaret.Checked, frmSearch.chkSelectedTextOnly.Checked, frmSearch.chkRegularExpression.Checked, frmSearch.chkForward.Checked) then
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
with sciSearchReplace do begin
|
with sciSearchReplace do begin
|
||||||
SearchBackwards := frmReplace.chkBackward.Checked;
|
SearchBackwards := frmReplace.chkBackward.Checked;
|
||||||
SearchCaseSensitive := frmReplace.chkCaseSensivity.Checked;
|
SearchCaseSensitive := frmReplace.chkCaseSensivity.Checked;
|
||||||
if (frmReplace.chkReplaceAll.Checked) and (LowerCase(frmReplace.cboSearchFor.Text) = LowerCase(frmReplace.cboReplaceWith.Text)) then
|
// I don't like this but it works so far
|
||||||
SearchCaseSensitive := True;
|
if (frmReplace.chkReplaceAll.Checked) and (Pos(LowerCase(frmReplace.cboSearchFor.Text), LowerCase(frmReplace.cboReplaceWith.Text)) <> 0) then
|
||||||
|
SearchFromCaret := True
|
||||||
|
else
|
||||||
SearchFromCaret := frmReplace.chkSearchFromCaret.Checked;
|
SearchFromCaret := frmReplace.chkSearchFromCaret.Checked;
|
||||||
SearchSelectionOnly := frmReplace.chkSelectedTextOnly.Checked;
|
SearchSelectionOnly := frmReplace.chkSelectedTextOnly.Checked;
|
||||||
SearchWholeWords := frmReplace.chkWholeWordsOnly.Checked;
|
SearchWholeWords := frmReplace.chkWholeWordsOnly.Checked;
|
||||||
|
@ -1991,6 +1994,7 @@ begin
|
||||||
for i := 0 to eACList.Count -1 do begin
|
for i := 0 to eACList.Count -1 do begin
|
||||||
if eFunction = LowerCase(Trim(TACFunction(eACList.Items[i]).Name)) then begin
|
if eFunction = LowerCase(Trim(TACFunction(eACList.Items[i]).Name)) then begin
|
||||||
if TACFunction(eACList.Items[i]).Items.Count > GetFunctionPos then begin
|
if TACFunction(eACList.Items[i]).Items.Count > GetFunctionPos then begin
|
||||||
|
if Trim(TACFunction(eACList.Items[i]).Items[GetFunctionPos]) <> '' then
|
||||||
ListToDisplay.Text := StringReplace(TACFunction(eACList.Items[i]).Items[GetFunctionPos], '; ', #13, [rfReplaceAll]);
|
ListToDisplay.Text := StringReplace(TACFunction(eACList.Items[i]).Items[GetFunctionPos], '; ', #13, [rfReplaceAll]);
|
||||||
break;
|
break;
|
||||||
end;
|
end;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user