paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-09 04:07:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: improved wording in several dialogs ('Where' -> 'Search scope' etc.), bug #27966

Browse Source 
git-svn-id: trunk@48964 -
This commit is contained in:
maxim 2015-05-07 22:45:36 +00:00
parent b7fbd190af
commit 1070610a83
7 changed files with 64 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/codebrowser.pas
View File

@ -468,7 +468,7 @@ begin
Name:=NonModalIDEWindowNames[nmiwCodeBrowser];
Caption:=lisCodeBrowser;
ScopeGroupBox.Caption:=dlgScope;
ScopeGroupBox.Caption:=dlgSearchScope;
ScopeWithRequiredPackagesCheckBox.Caption:=lisWithRequiredPackages;
RescanButton.Caption:=lisRescan;
LevelsGroupBox.Caption:=lisLevels;

46
ide/findrenameidentifier.lfm
View File

@ -14,22 +14,22 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
OnCreate = FindRenameIdentifierDialogCreate
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '1.1'
LCLVersion = '1.5'
object CurrentGroupBox: TGroupBox
Left = 6
Height = 121
Height = 139
Top = 6
Width = 448
Align = alClient
BorderSpacing.Around = 6
Caption = 'CurrentGroupBox'
ClientHeight = 103
ClientHeight = 121
ClientWidth = 444
Constraints.MinHeight = 100
TabOrder = 0
object CurrentListBox: TListBox
Left = 6
Height = 91
Height = 109
Top = 6
Width = 432
Align = alClient
@ -42,14 +42,14 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
end
object NewGroupBox: TGroupBox
Left = 6
Height = 103
Top = 133
Height = 97
Top = 151
Width = 448
Align = alBottom
AutoSize = True
BorderSpacing.Around = 6
Caption = 'NewGroupBox'
ClientHeight = 85
ClientHeight = 79
ClientWidth = 444
TabOrder = 1
object NewEdit: TEdit
@ -59,8 +59,8 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
AnchorSideRight.Control = NewGroupBox
AnchorSideRight.Side = asrBottom
Left = 6
Height = 23
Top = 56
Height = 21
Top = 52
Width = 432
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
@ -69,7 +69,7 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
end
object RenameCheckBox: TCheckBox
Left = 6
Height = 19
Height = 17
Top = 6
Width = 432
Align = alTop
@ -85,8 +85,8 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
AnchorSideRight.Control = NewGroupBox
AnchorSideRight.Side = asrBottom
Left = 6
Height = 19
Top = 31
Height = 17
Top = 29
Width = 432
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
@ -96,20 +96,20 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
end
object ScopeGroupBox: TGroupBox
Left = 6
Height = 220
Top = 242
Height = 208
Top = 254
Width = 448
Align = alBottom
AutoSize = True
BorderSpacing.Around = 6
Caption = 'ScopeGroupBox'
ClientHeight = 202
ClientHeight = 190
ClientWidth = 444
TabOrder = 2
object ScopeCommentsCheckBox: TCheckBox
Left = 6
Height = 19
Top = 177
Height = 17
Top = 167
Width = 432
Align = alTop
BorderSpacing.Around = 6
@ -118,7 +118,7 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
end
object ScopeRadioGroup: TRadioGroup
Left = 6
Height = 106
Height = 98
Top = 6
Width = 432
Align = alTop
@ -134,7 +134,7 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1
ClientHeight = 88
ClientHeight = 80
ClientWidth = 428
Items.Strings = (
'in current unit'
@ -146,19 +146,19 @@ object FindRenameIdentifierDialog: TFindRenameIdentifierDialog
end
object ExtraFilesGroupBox: TGroupBox
Left = 6
Height = 53
Top = 118
Height = 51
Top = 110
Width = 432
Align = alTop
AutoSize = True
BorderSpacing.Around = 6
Caption = 'ExtraFilesGroupBox'
ClientHeight = 35
ClientHeight = 33
ClientWidth = 428
TabOrder = 1
object ExtraFilesEdit: TEdit
Left = 6
Height = 23
Height = 21
Top = 6
Width = 416
Align = alTop

6
ide/findrenameidentifier.pas
View File

@ -521,12 +521,12 @@ begin
ButtonPanel1.OKButton.Caption:=lisFRIFindReferences;
ButtonPanel1.OKButton.ModalResult:=mrNone;
ButtonPanel1.CancelButton.Caption:=lisCancel;
NewGroupBox.Caption:=lisFRIRenameTo;
NewGroupBox.Caption:=lisFRIRenaming;
RenameCheckBox.Caption:=lisRename;
ShowResultCheckBox.Caption:=lisRenameShowResult;
ScopeCommentsCheckBox.Caption:=lisFRISearchInCommentsToo;
ScopeGroupBox.Caption:=lisFRISearchWhere;
ScopeRadioGroup.Caption:=dlgScope;
ScopeGroupBox.Caption:=lisFRISearch;
ScopeRadioGroup.Caption:=dlgSearchScope;
ScopeRadioGroup.Items[0]:=lisFRIinCurrentUnit;
ScopeRadioGroup.Items[1]:=lisFRIinMainProject;
ScopeRadioGroup.Items[2]:=lisFRIinProjectPackageOwningCurrentUnit;

2
ide/findreplacedialog.pp
View File

@ -163,7 +163,7 @@ begin
FromCursorRadioButton.Caption := dlgFromCursor;
EntireScopeRadioButton.Caption := dlgFromBeginning;
ScopeGroupBox.Caption := dlgScope;
ScopeGroupBox.Caption := dlgSearchScope;
GlobalRadioButton.Caption := dlgGlobal;
SelectedRadioButton.Caption := dlgSelectedText;

6
ide/lazarusidestrconsts.pas
View File

@ -2523,7 +2523,7 @@ resourcestring
dlgSROrigin = 'Origin';
dlgFromCursor = '&From cursor';
dlgFromBeginning = 'From b&eginning';
dlgScope = 'Scope';
dlgSearchScope = 'Search scope';
dlgProject = 'Project';
lisProjectSession = 'Project Session';
lisWithRequiredPackages = 'With required packages';
@ -3335,9 +3335,9 @@ resourcestring
+'search (e.g. /path/*.pas;/path2/*.pp)';
lisFRIFindReferences = 'Find References';
lisFRIInvalidIdentifier = 'Invalid Identifier';
lisFRIRenameTo = 'Rename to';
lisFRIRenaming = 'Renaming';
lisFRISearchInCommentsToo = 'Search in comments too';
lisFRISearchWhere = 'Search where';
lisFRISearch = 'Search';
lisCodeToolsOptsColon = 'Colon';
lisCodeToolsOptsSemicolon = 'Semicolon';
lisCodeToolsOptsComma = 'Comma';

65
packager/pkglinksdlg.lfm
View File

@ -12,7 +12,7 @@ object PackageLinksDialog: TPackageLinksDialog
LCLVersion = '1.5'
object ScopeGroupBox: TGroupBox
Left = 0
Height = 144
Height = 120
Top = 0
Width = 659
Align = alTop
@ -22,16 +22,16 @@ object PackageLinksDialog: TPackageLinksDialog
ChildSizing.TopBottomSpacing = 6
ChildSizing.HorizontalSpacing = 6
ChildSizing.VerticalSpacing = 6
ClientHeight = 127
ClientHeight = 102
ClientWidth = 655
TabOrder = 0
object ShowGlobalLinksCheckBox: TCheckBox
AnchorSideLeft.Control = ScopeGroupBox
AnchorSideTop.Control = ScopeGroupBox
Left = 6
Height = 24
Height = 17
Top = 6
Width = 170
Width = 143
Caption = 'ShowGlobalLinksCheckBox'
Checked = True
OnChange = ShowGlobalLinksCheckBoxChange
@ -43,9 +43,9 @@ object PackageLinksDialog: TPackageLinksDialog
AnchorSideTop.Control = ShowGlobalLinksCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 36
Width = 161
Height = 17
Top = 29
Width = 136
Caption = 'ShowUserLinksCheckBox'
Checked = True
OnChange = ShowUserLinksCheckBoxChange
@ -57,9 +57,9 @@ object PackageLinksDialog: TPackageLinksDialog
AnchorSideTop.Control = ShowUserLinksCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 24
Top = 66
Width = 147
Height = 17
Top = 52
Width = 120
Caption = 'LPKFileValidCheckBox'
Checked = True
OnChange = LPKFileValidCheckBoxChange
@ -71,10 +71,10 @@ object PackageLinksDialog: TPackageLinksDialog
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = LPKFileValidCheckBox
AnchorSideTop.Side = asrCenter
Left = 168
Height = 24
Top = 66
Width = 155
Left = 141
Height = 17
Top = 52
Width = 130
BorderSpacing.Left = 15
Caption = 'LPKFileInvalidCheckBox'
Checked = True
@ -89,8 +89,8 @@ object PackageLinksDialog: TPackageLinksDialog
AnchorSideRight.Control = ScopeGroupBox
AnchorSideRight.Side = asrBottom
Left = 6
Height = 25
Top = 96
Height = 21
Top = 75
Width = 643
Anchors = [akTop, akLeft, akRight]
OnChange = FilterEditChange
@ -103,8 +103,8 @@ object PackageLinksDialog: TPackageLinksDialog
object PkgStringGrid: TStringGrid
AnchorSideBottom.Control = BtnPanel
Left = 0
Height = 265
Top = 144
Height = 291
Top = 120
Width = 659
Align = alTop
Anchors = [akTop, akLeft, akRight, akBottom]
@ -145,12 +145,12 @@ object PackageLinksDialog: TPackageLinksDialog
end
object BtnPanel: TPanel
Left = 0
Height = 42
Top = 409
Height = 40
Top = 411
Width = 659
Align = alBottom
AutoSize = True
ClientHeight = 42
ClientHeight = 40
ClientWidth = 659
TabOrder = 2
object CloseBitBtn: TBitBtn
@ -159,10 +159,10 @@ object PackageLinksDialog: TPackageLinksDialog
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = BtnPanel
AnchorSideBottom.Side = asrBottom
Left = 591
Height = 28
Left = 580
Height = 26
Top = 7
Width = 61
Width = 72
Anchors = [akRight, akBottom]
AutoSize = True
BorderSpacing.Around = 6
@ -178,10 +178,10 @@ object PackageLinksDialog: TPackageLinksDialog
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = CloseBitBtn
AnchorSideTop.Side = asrCenter
Left = 150
Height = 27
Top = 8
Width = 152
Left = 143
Height = 23
Top = 9
Width = 145
AutoSize = True
BorderSpacing.Around = 6
Caption = 'UpdateGlobalLinksButton'
@ -193,9 +193,9 @@ object PackageLinksDialog: TPackageLinksDialog
AnchorSideTop.Control = CloseBitBtn
AnchorSideTop.Side = asrCenter
Left = 7
Height = 27
Top = 8
Width = 137
Height = 23
Top = 9
Width = 130
AutoSize = True
BorderSpacing.Around = 6
Caption = 'DeleteSelectedButton'
@ -206,7 +206,7 @@ object PackageLinksDialog: TPackageLinksDialog
object ProgressBar1: TProgressBar
Left = 0
Height = 20
Top = 389
Top = 391
Width = 659
Align = alBottom
TabOrder = 3
@ -217,7 +217,6 @@ object PackageLinksDialog: TPackageLinksDialog
top = 190
end
object GridPopupMenu: TPopupMenu
OnPopup = GridPopupMenuPopup
left = 206
top = 288
object CopyCellToClipboardMenuItem: TMenuItem

8
packager/pkglinksdlg.pas
View File

@ -88,7 +88,6 @@ type
procedure FilterEditExit(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure GridPopupMenuPopup(Sender: TObject);
procedure LPKFileValidCheckBoxChange(Sender: TObject);
procedure LPKFileInvalidCheckBoxChange(Sender: TObject);
procedure LPKParsingTimerTimer(Sender: TObject);
@ -141,7 +140,7 @@ end;
procedure TPackageLinksDialog.FormCreate(Sender: TObject);
begin
Caption:=lisPLDPackageLinks;
ScopeGroupBox.Caption:=dlgScope;
ScopeGroupBox.Caption:=dlgSearchScope;
CopyCellToClipboardMenuItem.Caption:=srkmecCopy;
DeleteSelectedButton.Caption:=lrsPLDDeleteSelected;
UpdateGlobalLinksButton.Caption:=lrsRescanLplFiles;
@ -214,11 +213,6 @@ begin
ClearLinks;
end;
procedure TPackageLinksDialog.GridPopupMenuPopup(Sender: TObject);
begin
end;
procedure TPackageLinksDialog.LPKFileValidCheckBoxChange(Sender: TObject);
begin
UpdatePackageList;