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

ide, debugger, packager: don't use special Ok, Cancel, Help captions for buttons - use standard LCL - they have accelerators (Ok and Help) (fixes a part of issue #0001379)

Browse Source 
git-svn-id: trunk@20045 -
This commit is contained in:
paul 2009-05-19 08:54:33 +00:00
parent a2c07aa8cf
commit e932577e22
38 changed files with 3 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debugger/breakpropertydlg.pas
View File

@ -152,10 +152,6 @@ begin
FBreakpointsNotification.OnRemove := @BreakPointRemove;
UpdateInfo;
ButtonPanel.OKButton.Caption:= lisOkBtn;
ButtonPanel.CancelButton.Caption:= dlgCancel;
ButtonPanel.HelpButton.Caption:= lisPckEditHelp;
ButtonPanel.OKButton.OnClick := @btnOKClick;
ButtonPanel.HelpButton.OnClick := @btnHelpClick;
end;

3
debugger/watchpropertydlg.pp
View File

@ -117,9 +117,6 @@ begin
lblDigits.Caption:= lisDigits;
chkEnabled.Caption:= lisEnabled;
chkAllowFunc.Caption:= lisAllowFunctio;
ButtonPanel.OKButton.Caption:= lisOkBtn;
ButtonPanel.CancelButton.Caption:= dlgCancel;
ButtonPanel.HelpButton.Caption:= lisPckEditHelp;
rgStyle.Caption:= lisStyle;
rgStyle.Items[0]:= lisCharacter;
rgStyle.Items[1]:= lisString;

3
designer/aligncompsdlg.pp
View File

@ -108,9 +108,6 @@ begin
EndUpdate;
end;
end;
BtnPanel.OKButton.Caption := lisOkBtn;
BtnPanel.CancelButton.Caption := dlgCancel;
end;
initialization

2
designer/changeclassdialog.pas
View File

@ -303,8 +303,6 @@ begin
NewGroupBox.Caption:=lisNewClass;
OldAncestorGroupBox.Caption:=lisOldAncestors;
NewAncestorGroupBox.Caption:=lisNewAncestors;
BtnPanel.OkButton.Caption := lisOkBtn;
BtnPanel.CancelButton.Caption := dlgCancel;
end;
procedure TChangeClassDlg.NewClassComboBoxEditingDone(Sender: TObject);

5
designer/designermenu.pp
View File

@ -2026,11 +2026,6 @@ begin
Label_template_view.Caption:=lisMenuEditorTemplatePreview;
Edit_template_description.Text:=lisMenuEditorNewTemplateDescription;
OKBitBtn.Caption:=lisOkBtn;
CancelBitBtn.Caption:=dlgCancel;
OKBitBtn.LoadGlyphFromLazarusResource('btn_ok');
CancelBitBtn.LoadGlyphFromLazarusResource('btn_cancel');
// Templates from menutemplates.xml
i:=1;
Str(i,str_i);

3
designer/scalecompsdlg.pp
View File

@ -74,9 +74,6 @@ begin
ScaleLabel.Caption := lisScalingFactor;
PercentLabel.Caption := '%';
ButtonPanel1.OkButton.Caption := lisOkBtn;
ButtonPanel1.CancelButton.Caption := dlgCancel;
end;
initialization

3
designer/sizecompsdlg.pp
View File

@ -115,9 +115,6 @@ begin
WidthEdit.Text:='';
HeightEdit.Text:='';
ButtonPanel1.OkButton.Caption := lisOkBtn;
ButtonPanel1.CancelButton.Caption := dlgCancel;
end;
initialization

2
designer/taborderdlg.pas
View File

@ -84,9 +84,7 @@ end;
procedure TTabOrderDialog.TabOrderDialogCREATE(Sender: TObject);
begin
ShowOldValuesCheckbox.Caption := lisShowOldTabOrder;
BtnPanel.OkButton.Caption := lisOkBtn;
BtnPanel.OKButton.OnClick := @OkButtonCLICK;
BtnPanel.CancelButton.Caption := dlgCancel;
ArrowDown.LoadGlyphFromLazarusResource('arrow_down');
ArrowUp.LoadGlyphFromLazarusResource('arrow_up');

1
ide/abstractsmethodsdlg.pas
View File

@ -158,7 +158,6 @@ begin
AddFirstBitBtn.Caption:=lisSAMOverrideFirstSelected;
AddAllBitBtn.Caption:=lisSAMOverrideAllSelected;
CancelBitBtn.Caption:=dlgCancel;
SelectNoneButton.Caption:=lisSAMSelectNone;
SelectAllButton.Caption:=lisMenuSelectAll;

1
ide/addtoprojectdlg.pas
View File

@ -410,7 +410,6 @@ begin
DependMaxVersionEdit.Text:='';
NewDependButton.Caption:=lisLazBuildOk;
CancelDependButton.Caption:=dlgCancel;
end;
procedure TAddToProjectDialog.SetupAddFilesPage(index: integer);

1
ide/checklfmdlg.pas
View File

@ -559,7 +559,6 @@ end;
procedure TCheckLFMDialog.SetupComponents;
begin
NoteLabel.Caption:=lisTheLFMLazarusFormFileContainsInvalidPropertiesThis;
CancelButton.Caption:=dlgCancel;
ErrorsGroupBox.Caption:=lisErrors;
LFMGroupBox.Caption:=lisLFMFile;
RemoveAllButton.Caption:=lisRemoveAllInvalidProperties;

1
ide/codemacroselect.pas
View File

@ -86,7 +86,6 @@ begin
MacrosGroupBox.Caption:=lisEdtExtToolMacros;
DescriptionGroupBox.Caption:=lisToDoLDescription;
ButtonPanel1.OkButton.Caption:=lisCTInsertMacro;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ParameterGroupBox.Caption:=lisCMParameter;
ParameterEdit.Text:='';

4
ide/compileroptionsdlg.pp
View File

@ -1663,9 +1663,6 @@ end;
procedure TfrmCompilerOptions.SetupButtonBar;
begin
// Setup the Button Bar
btnOK.Caption := lisOkBtn;
btnCancel.Caption := dlgCancel;
CancelControl:=btnCancel;
btnShowOptions.Caption := dlgCOShowOptions;
btnCheck.Caption := lisCompTest;
btnLoadSave.Hint := dlgCOLoadSave;
@ -1673,7 +1670,6 @@ begin
btnLoadSave.LoadGlyphFromStock(idButtonSave);
if btnLoadSave.Glyph.Empty then
btnLoadSave.LoadGlyphFromLazarusResource('laz_save');
HelpButton.Caption:=lisPckEditHelp;
end;
function TfrmCompilerOptions.CheckSearchPath(const Context,

2
ide/extractprocdlg.pas
View File

@ -178,9 +178,7 @@ begin
CreateFunctionCheckBox.Caption:=lisCreateFunction;
FuncVariableLabel.Caption:=lisResult2;
HelpButton.Caption:=lisPckEditHelp;
OkButton.Caption:=lisExtract;
CancelButton.Caption:=dlgCancel;
end;
procedure TExtractProcDialog.HelpButtonClick(Sender: TObject);

1
ide/findinfilesdlg.pas
View File

@ -146,7 +146,6 @@ begin
ButtonPanel1.OkButton.Caption := lisLazBuildOk;
ButtonPanel1.OKButton.OnClick:= @OKButtonClick;
ButtonPanel1.CancelButton.Caption := dlgCancel;
ButtonPanel1.HelpButton.OnClick:=@HelpButtonClick;
ReplaceCheckBox.Enabled:=true;

1
ide/findpalettecomp.pas
View File

@ -89,7 +89,6 @@ begin
Caption:=lisFPFindPaletteComponent;
ComponentsGroupBox.Caption:=lisFPComponents;
BtnPanel.OKButton.Caption:=lisMenuSelect;
BtnPanel.CancelButton.Caption:=dlgCancel;
PatternEdit.Text:='';
SearchPatternGroupBox.Caption:=lisMenuFind;

1
ide/findrenameidentifier.pas
View File

@ -498,7 +498,6 @@ begin
IDEDialogLayoutList.ApplyLayout(Self,450,480);
Caption:=lisFRIFindOrRenameIdentifier;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
CurrentGroupBox.Caption:=lisCodeToolsOptsIdentifier;
ExtraFilesGroupBox.Caption:=lisFRIAdditionalFilesToSearchEGPathPasPath2Pp;
ButtonPanel1.OKButton.Caption:=lisFRIFindReferences;

1
ide/findreplacedialog.pp
View File

@ -173,7 +173,6 @@ begin
BackwardRadioButton.Caption := lisFRBackwardSearch;
ReplaceAllButton.Caption:=dlgReplaceAll;
CancelButton.Caption:=dlgCancel;
fReplaceAllClickedLast:=false;
end;

2
ide/fpdocselectinherited.pas
View File

@ -45,8 +45,6 @@ implementation
procedure TFPDocSelectInheritedDlg.FormCreate(Sender: TObject);
begin
Caption:=rsSelectAnInheritedEntry;
ButtonPanel1.OKButton.Caption:=lisOkBtn;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
end;
initialization

3
ide/fpdocselectlink.pas
View File

@ -79,9 +79,6 @@ begin
LinkLabel.Hint:=Format(lisExamplesIdentifierTMyEnumEnumUnitnameIdentifierPac,
[#13, #13, #13, #13]);
TitleLabel.Caption:=lisTitleLeaveEmptyForDefault;
ButtonPanel1.OKButton.Caption:=lisOkBtn;
ButtonPanel1.CancelButton.Caption:=dlgCancel;
ButtonPanel1.HelpButton.Caption:=lisPckEditHelp;
LinkEdit.Text:='';
TitleEdit.Text:='';

3
ide/frmcustomapplicationoptions.pas
View File

@ -115,9 +115,6 @@ begin
// set all defaults to true
for i:=0 to CGOptions.Items.Count-1 do
CGOptions.Checked[i]:= true;
BOK.Caption:= lisOkBtn;
BCancel.Caption:= dlgCancel;
end;
function TCustomApplicationOptionsForm.GetBool(Index: integer): Boolean;

1
ide/helpmanager.pas
View File

@ -583,7 +583,6 @@ begin
Caption := lisHelpSelectorDialog;
NodesGroupBox.Caption:=lisSelectAHelpItem;
BtnPanel.OKButton.Caption:=lisLazBuildOk;
BtnPanel.CancelButton.Caption:=dlgCancel;
end;
{ TIDEHelpDatabases }

1
ide/imexportcompileropts.pas
View File

@ -230,7 +230,6 @@ begin
OpenRecentButton.Caption:=lisIECOOpenRecent;
SaveButton.Caption:=lisIECOSaveToFile;
OpenButton.Caption:=lisIECOLoadFromFile;
CancelButton.Caption:=dlgCancel;
OpenButton.LoadGlyphFromStock(idButtonOpen);
if OpenButton.Glyph.Empty then
OpenButton.LoadGlyphFromLazarusResource('laz_open');

5
ide/lazarusidestrconsts.pas
View File

@ -903,7 +903,6 @@ resourcestring
dlgEnvBckup = 'Backup';
dlgNaming = 'Naming';
lisFPDocEditor = 'FPDoc Editor';
lisOkBtn = 'OK';
dlgCancel = 'Cancel';
lisSAMSelectNone = 'Select none';
lisKMClassic = 'Classic';
@ -1490,7 +1489,7 @@ resourcestring
dlgUnitOutp = 'Unit output directory (-FU):';
lisCOdefault = 'default (%s)';
dlgButApply = 'Apply';
dlgCOShowOptions = 'Show Options';
dlgCOShowOptions = '&Show Options';
dlgCOLoadSave = 'Load/Save';
dlgMainViewForms = 'View project forms';
dlgMainViewUnits = 'View project units';
@ -3648,7 +3647,7 @@ resourcestring
lisErrors = 'Errors';
lisLFMFile = 'LFM file';
lisRemoveAllInvalidProperties = 'Remove all invalid properties';
lisCompTest = 'Test';
lisCompTest = '&Test';
lisA2PSwitchPaths = 'Switch Paths';
lisA2PAddFilesToPackage = 'Add files to package';

2
ide/makeresstrdlg.pas
View File

@ -303,8 +303,6 @@ begin
// ok+cancel buttons
OkButton.Caption:=lisLazBuildOk;
CancelButton.Caption:=dlgCancel;
HelpButton.Caption:=lisPckEditHelp;
end;
constructor TMakeResStrDialog.Create(TheOwner: TComponent);

4
ide/msgvieweditor.pas
View File

@ -89,14 +89,10 @@ begin
Caption:= lisMessagesEditor;
AddNewSetButton.Caption:=lisAddNewSet;
ActiveFilterSetGroupBox.Caption:=lisActiveFilter;
OkButton.Caption:=lisOkBtn;
CancelButton.Caption:=dlgCancel;
RenameSetButton.Caption:=lisFRIRename;
DeleteSetButton.Caption:=dlgEdDelete;
FilterSetGroupBox.Caption:=lisFilterSets;
OkButton.LoadGlyphFromLazarusResource('btn_ok');
CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
AddNewSetButton.LoadGlyphFromLazarusResource('laz_add');
DeleteSetButton.LoadGlyphFromLazarusResource('laz_delete');
RenameSetButton.LoadGlyphFromLazarusResource('laz_edit');

2
ide/patheditordlg.pas
View File

@ -152,8 +152,6 @@ begin
TemplateGroupBox.Caption:=lisPathEditPathTemplates;
AddTemplateButton.Caption:=lisCodeTemplAdd;
OKBitBtn.Caption:=lisOkBtn;
CancelBitBtn.Caption:=dlgCancel;
AddTemplateButton.LoadGlyphFromLazarusResource('laz_add');
MoveUpButton.LoadGlyphFromLazarusResource('arrow_up');
MoveDownButton.LoadGlyphFromLazarusResource('arrow_down');

2
ide/publishprojectdlg.pas
View File

@ -169,8 +169,6 @@ begin
ButtonPanel1.OkButton.Caption := lisLazBuildOk;
ButtonPanel1.OKButton.OnClick := @OkButtonCLICK;
ButtonPanel1.CancelButton.Caption := dlgCancel;
ButtonPanel1.CloseButton.Caption := lisSaveSettings;
ButtonPanel1.CloseButton.ModalResult := mrNone;
ButtonPanel1.CloseButton.Kind := bkCustom;

1
ide/searchfrm.pas
View File

@ -619,7 +619,6 @@ begin
MatchesLabel.Caption:=lissMatches;
SearchingLabel.Caption:=lissSearching;
SearchTextLabel.Caption:=lissSearchText;
btnCancel.Caption:=dlgCancel;
Caption:=dlgSearchCaption;
fProgress:=TIDESearchInTextProgress.Create;

2
ide/showcompileropts.pas
View File

@ -92,8 +92,6 @@ begin
CmdLineGroupBox.Caption:=dlgCommandLineParameters;
Self.Caption:=dlgCompilerOptions;
RelativePathsCheckBox.Caption:=lisRelativePaths;
OKButton.Caption:=lisOkBtn;
OKButton.LoadGlyphFromLazarusResource('btn_ok');
end;
procedure TShowCompilerOptionsDlg.SetCompilerOpts(

1
ide/sysvaruseroverridedlg.pas
View File

@ -100,7 +100,6 @@ begin
ValueLabel.Caption:='Value:';
OkButton.Caption:=lisSVUOOk;
CancelButton.Caption:=dlgCancel;
end;
initialization

2
ide/tododlg.pas
View File

@ -76,8 +76,6 @@ begin
PriorityLabel.Caption:=lisToDoLPriority;
OwnerLabel.Caption:=lisToDoLOwner;
CategoryLabel.Caption:=listToDoLCategory;
BtnPanel.OKButton.Caption:=lisOkBtn;
BtnPanel.CancelButton.Caption:=dlgCancel;
end;
function ExecuteTodoDialog: TTodoItem;

1
ide/unusedunitsdlg.pas
View File

@ -137,7 +137,6 @@ begin
RemoveSelectedBitBtn.Caption:=lisRemoveSelectedUnits;
RemoveAllBitBtn.Caption:=lisRemoveAllUnits;
CancelBitBtn.Caption:=dlgCancel;
UnitsTreeView.StateImages := IDEImages.Images_16;
ImgIDInterface := IDEImages.LoadImage(16, 'ce_interface');

1
packager/addfiletoapackagedlg.pas
View File

@ -203,7 +203,6 @@ begin
PackagesGroupBox.Caption:=lisAF2PDestinationPackage;
ShowAllCheckBox.Caption:=lisAF2PShowAll;
BtnPanel.OkButton.Caption:=lisLazBuildOk;
BtnPanel.CancelButton.Caption:=dlgCancel;
BtnPanel.OkButton.OnClick:=@OkButtonClick;
BtnPanel.OkButton.ModalResult:=mrNone;
BtnPanel.HelpButton.OnClick:=@HelpButtonClick;

1
packager/installpkgsetdlg.pas
View File

@ -155,7 +155,6 @@ begin
PkgInfoGroupBox.Caption := lisPackageInfo;
SaveAndRebuildButton.Caption:=lisSaveAndRebuildIDE;
SaveAndExitButton.Caption:=lisSaveAndExitDialog;
CancelButton.Caption:=dlgCancel;
fPackages:=TAVLTree.Create(@CompareLazPackageIDNames);
FNewInstalledPackages:=TFPList.Create;

1
packager/openinstalledpkgdlg.pas
View File

@ -154,7 +154,6 @@ begin
end;
OpenButton.Caption:=lisMenuOpen;
CancelButton.Caption:=dlgCancel;
end;
procedure TOpenInstalledPackagesDlg.HelpButtonClick(Sender: TObject);

2
packager/packageeditor.pas
View File

@ -1389,8 +1389,8 @@ begin
HelpBitBtn:=TBitBtn.Create(Self);
with HelpBitBtn do begin
Name:='HelpBitBtn';
Kind := bkHelp;
Parent:=Self;
Caption:=lisPckEditHelp;
OnClick:=@HelpBitBtnClick;
Hint:=lisPkgEdThereAreMoreFunctionsInThePopupmenu;
ShowHint:=true;

2
packager/pkgvirtualuniteditor.pas
View File

@ -83,8 +83,6 @@ end;
procedure TEditVirtualUnitDialog.EditVirtualUnitDialogCreate(Sender: TObject);
begin
Caption:=lisPVUEditVirtualUnit;
OkButton.Caption:=lisOkBtn;
CancelButton.Caption:=dlgCancel;
FilenameLabel.Caption:=lisPEFilename;
UnitnameLabel.Caption:=lisPEUnitname;
UnitnameEdit.Hint:=lisPVUTheUnitnameIsUsedWhenTheIDEExtendsUsesClauses;