paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-04 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

ide, components: move images related code to use FPC resource instead of Lazarus resources

Browse Source 
git-svn-id: trunk@42984 -
This commit is contained in:
paul 2013-09-27 12:27:04 +00:00
parent b49be32350
commit 7f4caeb374
66 changed files with 234 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -5329,6 +5329,7 @@ images/actions/laz_set_color_default.png -text svneol=unset#image/png
images/actions/laz_set_colors_default.png -text svneol=unset#image/png
images/actions/laz_wand.png -text svneol=unset#image/png
images/bookmark.lrs svneol=native#text/pascal
images/bookmark.res -text
images/bookmark.sh svneol=native#text/plain
images/bookmark_list.txt svneol=native#text/plain
images/btn_downarrow.png -text
@ -5587,6 +5588,7 @@ images/keymapcategory.png -text
images/keymaprelation.png -text
images/laz_images.bat svneol=native#text/x-msdos-program
images/laz_images.lrs svneol=native#text/pascal
images/laz_images.res -text
images/laz_images.sh svneol=native#text/plain
images/laz_images_list.txt svneol=native#text/plain
images/lazarus_about_logo.xpm -text svneol=native#image/x-xpixmap

6
components/codetools/ide/addassignmethoddlg.pas
View File

@ -189,9 +189,9 @@ procedure TAddAssignMethodDialog.FormCreate(Sender: TObject);
begin
FProcName:='Assign';
FItems:=TAVLTree.Create(@CompareAAMDItemsByName);
ImgIDImplementation := Imagelist1.AddLazarusResource('ce_implementation');
ImgIDVariable := Imagelist1.AddLazarusResource('ce_variable');
ImgIDProperty := Imagelist1.AddLazarusResource('ce_property');
ImgIDImplementation := Imagelist1.AddResourceName(HInstance, 'ce_implementation');
ImgIDVariable := Imagelist1.AddResourceName(HInstance, 'ce_variable');
ImgIDProperty := Imagelist1.AddResourceName(HInstance, 'ce_property');
ProcNameEdit.Text:=FProcName;
end;

4
components/codetools/ide/codyfrm.pas
View File

@ -96,8 +96,8 @@ begin
if CodyWindow=nil then CodyWindow:=Self;
Caption:='Cody';
ImgIDRefresh := Imagelist1.AddLazarusResource('laz_refresh');
ImgIDOptions := Imagelist1.AddLazarusResource('menu_environment_options');
ImgIDRefresh := Imagelist1.AddResourceName(HInstance, 'laz_refresh');
ImgIDOptions := Imagelist1.AddResourceName(HInstance, 'menu_environment_options');
ToolBar1.Images:=ImageList1;
OptionsToolButton.Hint:=crsOptions;
OptionsToolButton.ImageIndex:=ImgIDOptions;

8
components/editortoolbar/edttbconfigfrm.pas
View File

@ -80,10 +80,10 @@ begin
pnlButtons.Color := clBtnFace;
// load button images
btnAdd.LoadGlyphFromLazarusResource('arrow_right');
btnRemove.LoadGlyphFromLazarusResource('arrow_left');
btnMoveUp.LoadGlyphFromLazarusResource('arrow_up');
btnMoveDown.LoadGlyphFromLazarusResource('arrow_down');
btnAdd.LoadGlyphFromResourceName(HInstance, 'arrow_right');
btnRemove.LoadGlyphFromResourceName(HInstance, 'arrow_left');
btnMoveUp.LoadGlyphFromResourceName(HInstance, 'arrow_up');
btnMoveDown.LoadGlyphFromResourceName(HInstance, 'arrow_down');
btnAdd.Hint := rsAddSelected;
btnRemove.Hint := rsRemoveSelected;

4
components/education/educomppalette.pas
View File

@ -172,11 +172,11 @@ begin
CompNode:=ComponentsTreeView.Items.AddChild(PageNode,CompName);
ResHandle := LazarusResources.Find(CompName);
if ResHandle <> nil then
Image := CreateBitmapFromLazarusResource(ResHandle)
Image := CreateBitmapFromResourceName(HInstance, ResHandle)
else
Image := nil;
if Image = nil then
Image := CreateBitmapFromLazarusResource('default');
Image := CreateBitmapFromResourceName(HInstance, 'default');
CompNode.ImageIndex:=ComponentsTreeView.Images.Add(Image,nil);
Image.Free;
CompNode.SelectedIndex:=CompNode.ImageIndex;

30
components/education/eduspeedbuttons.pas
View File

@ -304,43 +304,43 @@ end;
function TEduSpeedButtonsFrame.GetImageForSpeedBtn(btnName: String) :TCustomBitmap;
begin
if (CompareText(btnName,'NewUnitSpeedBtn')=0) or (CompareText(btnName,'EduNewSingleFileProgramBtn')=0) then begin
Result := CreateBitmapFromLazarusResource('item_unit');
Result := CreateBitmapFromResourceName(HInstance, 'item_unit');
end
else if (CompareText(btnName,'OpenFileSpeedBtn')=0) then begin
Result := CreateBitmapFromLazarusResource('laz_open');
Result := CreateBitmapFromResourceName(HInstance, 'laz_open');
end
else if (CompareText(btnName,'SaveSpeedBtn')=0) then begin
Result := CreateBitmapFromLazarusResource('laz_save');
Result := CreateBitmapFromResourceName(HInstance, 'laz_save');
end
else if (CompareText(btnName,'SaveAllSpeedBtn')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_save_all');
Result := CreateBitmapFromResourceName(HInstance, 'menu_save_all');
end
else if (CompareText(btnName,'NewFormSpeedBtn')=0) then begin
Result := CreateBitmapFromLazarusResource('item_form');
Result := CreateBitmapFromResourceName(HInstance, 'item_form');
end
else if (CompareText(btnName,'ToggleFormSpeedBtn')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_view_toggle_form_unit');
Result := CreateBitmapFromResourceName(HInstance, 'menu_view_toggle_form_unit');
end
else if (CompareText(btnName,'ViewUnitsSpeedBtn')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_view_units');
Result := CreateBitmapFromResourceName(HInstance, 'menu_view_units');
end
else if (CompareText(btnName,'ViewFormsSpeedBtn')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_view_forms');
Result := CreateBitmapFromResourceName(HInstance, 'menu_view_forms');
end
else if (CompareText(btnName,'RunSpeedButton')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_run');
Result := CreateBitmapFromResourceName(HInstance, 'menu_run');
end
else if (CompareText(btnName,'PauseSpeedButton')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_pause');
Result := CreateBitmapFromResourceName(HInstance, 'menu_pause');
end
else if (CompareText(btnName,'StopSpeedButton')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_stop');
Result := CreateBitmapFromResourceName(HInstance, 'menu_stop');
end
else if (CompareText(btnName,'StepIntoSpeedButton')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_stepinto');
Result := CreateBitmapFromResourceName(HInstance, 'menu_stepinto');
end
else if (CompareText(btnName,'StepOverpeedButton')=0) then begin
Result := CreateBitmapFromLazarusResource('menu_stepover');
Result := CreateBitmapFromResourceName(HInstance, 'menu_stepover');
end
else
result := nil;
@ -376,7 +376,7 @@ begin
curNode:=SpeedButtonsTreeView.Items.AddChild(CategoryNode,curButton.Name);
Image := GetImageForSpeedBtn(curButton.Name);
if (Image = nil) then
Image := CreateBitmapFromLazarusResource('default');
Image := CreateBitmapFromResourceName(HInstance, 'default');
curNode.ImageIndex:=SpeedButtonsTreeView.Images.Add(Image,nil);
Image.Free;
curNode.SelectedIndex:=curNode.ImageIndex;
@ -397,7 +397,7 @@ begin
curNode:=SpeedButtonsTreeView.Items.AddChild(CategoryNode,curButton.Name);
Image := GetImageForSpeedBtn(curButton.Name);
if (Image = nil) then
Image := CreateBitmapFromLazarusResource('default');
Image := CreateBitmapFromResourceName(HInstance, 'default');
curNode.ImageIndex:=SpeedButtonsTreeView.Images.Add(Image,nil);
Image.Free;
curNode.SelectedIndex:=curNode.ImageIndex;

4
components/externhelp/externhelpfrm.pas
View File

@ -1132,8 +1132,8 @@ constructor TExternHelpGeneralOptsFrame.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);
FOptions:=TExternHelpOptions.Create;
AddSpeedButton.LoadGlyphFromLazarusResource('laz_add');
DeleteSpeedButton.LoadGlyphFromLazarusResource('laz_delete');
AddSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
DeleteSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
end;
destructor TExternHelpGeneralOptsFrame.Destroy;

8
components/ideintf/actionseditor.pas
View File

@ -883,10 +883,10 @@ begin
mItemActListMoveUpAction.Caption := cActionListEditorMoveUpAction;
mItemActListDelAction.Caption := cActionListEditorDeleteAction;
btnAdd.LoadGlyphFromLazarusResource('laz_add');
btnDelete.LoadGlyphFromLazarusResource('laz_delete');
btnUp.LoadGlyphFromLazarusResource('arrow_up');
btnDown.LoadGlyphFromLazarusResource('arrow_down');
btnAdd.LoadGlyphFromResourceName(HInstance, 'laz_add');
btnDelete.LoadGlyphFromResourceName(HInstance, 'laz_delete');
btnUp.LoadGlyphFromResourceName(HInstance, 'arrow_up');
btnDown.LoadGlyphFromResourceName(HInstance, 'arrow_down');
GlobalDesignHook.AddHandlerComponentRenamed(@OnComponentRenamed);
GlobalDesignHook.AddHandlerSetSelection(@OnComponentSelection);

4
components/ideintf/filefilterpropeditor.pas
View File

@ -45,8 +45,8 @@ begin
Caption:=peFilterEditor;
StringGrid1.Cells[0, 0] := peFilterName;
StringGrid1.Cells[1, 0] := peFilter;
MoveUpBtn.LoadGlyphFromLazarusResource('arrow_up');
MoveDownBtn.LoadGlyphFromLazarusResource('arrow_down');
MoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
MoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
MoveUpBtn.Hint := rscdMoveUp;
MoveDownBtn.Hint := rscdMoveDown;
end;

2
components/ideintf/ideimagesintf.pas
View File

@ -170,7 +170,7 @@ begin
Exit;
end;
try
Result := List.AddLazarusResource(ImageName);
Result := List.AddResourceName(HInstance, ImageName);
except
on E: Exception do
DebugLn('While loading IDEImages: ' + e.Message);

2
components/ideintf/objectinspector.pp
View File

@ -959,7 +959,7 @@ begin
Parent:=Self;
end;
FActiveRowBmp := CreateBitmapFromLazarusResource('pg_active_row');
FActiveRowBmp := CreateBitmapFromResourceName(HInstance, 'pg_active_row');
if DefItemHeight<3 then
FDefaultItemHeight:=ValueComboBox.Height-3

4
components/ideintf/treeviewpropedit.pas
View File

@ -141,8 +141,8 @@ begin
BtnLoad.Caption := sccsTrEdtLoad;
BtnSave.Caption := sccsTrEdtSave;
BtnApply.Caption := sccsTrEdtApply;
MoveUpBtn.LoadGlyphFromLazarusResource('arrow_up');
MoveDownBtn.LoadGlyphFromLazarusResource('arrow_down');
MoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
MoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
MoveUpBtn.Hint:=rscdMoveUp;
MoveDownBtn.Hint:=rscdMoveDown;

10
converter/convertsettings.pas
View File

@ -883,7 +883,7 @@ begin
// Unit Replacements
UnitReplaceDivider.Caption:=lisConvUnitReplacements;
UnitReplaceButton.Caption:=lisEdit; // Recycled string.
UnitReplaceButton.LoadGlyphFromLazarusResource('laz_edit');
UnitReplaceButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
UnitReplaceDivider.Hint:=lisConvUnitReplHint;
UnitReplaceButton.Hint:=lisConvUnitReplHint;
UnitReplaceComboBox.Items.Add(lisDisabled); // 'Disabled'
@ -897,7 +897,7 @@ begin
// Type Replacements
TypeReplaceDivider.Caption:=lisConvTypeReplacements;
TypeReplaceButton.Caption:=lisEdit;
TypeReplaceButton.LoadGlyphFromLazarusResource('laz_edit');
TypeReplaceButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
TypeReplaceDivider.Hint:=lisConvTypeReplHint;
TypeReplaceButton.Hint:=lisConvTypeReplHint;
TypeReplaceComboBox.Items.Add(lisInteractive);
@ -905,7 +905,7 @@ begin
// Func Replacements
FuncReplaceDivider.Caption:=lisConvFuncReplacements;
FuncReplaceButton.Caption:=lisEdit;
FuncReplaceButton.LoadGlyphFromLazarusResource('laz_edit');
FuncReplaceButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
FuncReplaceDivider.Hint:=lisConvFuncReplHint;
FuncReplaceButton.Hint:=lisConvFuncReplHint;
FuncReplaceComboBox.Items.Add(lisDisabled);
@ -914,7 +914,7 @@ begin
// Coordinate Offsets
CoordOffsDivider.Caption:=lisConvCoordOffs;
CoordOffsButton.Caption:=lisEdit;
CoordOffsButton.LoadGlyphFromLazarusResource('laz_edit');
CoordOffsButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
CoordOffsDivider.Hint:=lisConvCoordHint;
CoordOffsButton.Hint:=lisConvCoordHint;
CoordOffsComboBox.Items.Add(lisDisabled);
@ -922,7 +922,7 @@ begin
// File system scanning
ScanLabel.Caption := lisScanParentDir;
StopScanButton.Caption:=lisStop;
StopScanButton.LoadGlyphFromLazarusResource('menu_stop');
StopScanButton.LoadGlyphFromResourceName(HInstance, 'menu_stop');
ButtonPanel1.OKButton.Caption:=lisStartConversion;
ButtonPanel1.HelpButton.Caption:=lisMenuHelp;

2
converter/missingpropertiesdlg.pas
View File

@ -704,7 +704,7 @@ begin
PropertiesText.Caption:=lisProperties;
TypesText.Caption:=lisTypes;
ReplaceAllButton.Caption:=lisReplaceRemoveUnknown;
ReplaceAllButton.LoadGlyphFromLazarusResource('laz_refresh');
ReplaceAllButton.LoadGlyphFromResourceName(HInstance, 'laz_refresh');
EditorOpts.GetHighlighterSettings(SynLFMSyn1);
EditorOpts.GetSynEditSettings(LFMSynEdit);
end;

6
converter/missingunits.pas
View File

@ -132,10 +132,10 @@ begin
MissingUnitsGroupBox.Caption:=lisTheseUnitsWereNotFound;
ChoicesLabel.Caption:=lisMissingUnitsChoices;
SearchButton.Caption:=lisMissingUnitsSearch;
SearchButton.LoadGlyphFromLazarusResource('menu_search_find');
SearchButton.LoadGlyphFromResourceName(HInstance, 'menu_search_find');
SkipButton.Caption:=lisMissingUnitsSkip;
SkipButton.LoadGlyphFromLazarusResource('debugger_current_line_breakpoint');
CommentButton.LoadGlyphFromLazarusResource('menu_comment'); // or insertremark
SkipButton.LoadGlyphFromResourceName(HInstance, 'debugger_current_line_breakpoint');
CommentButton.LoadGlyphFromResourceName(HInstance, 'menu_comment'); // or insertremark
if ATargetDelphi then begin
CommentButton.Caption:=lisMissingUnitsForDelphi;
Info1Label.Caption:=lisMissingUnitsInfo1b;

4
debugger/exceptiondlg.pas
View File

@ -77,8 +77,8 @@ begin
btnContinue.Caption := lisContinue;
cbIgnoreExceptionType.Caption := lisIgnoreExceptionType;
btnBreak.LoadGlyphFromLazarusResource('menu_pause');
btnContinue.LoadGlyphFromLazarusResource('menu_run');
btnBreak.LoadGlyphFromResourceName(HInstance, 'menu_pause');
btnContinue.LoadGlyphFromResourceName(HInstance, 'menu_run');
end;
function TIDEExceptionDlg.Execute(AMessage: String; out IgnoreException: Boolean): TModalResult;

4
debugger/frames/debugger_language_exceptions_options.pas
View File

@ -148,8 +148,8 @@ begin
DbgLangExceptHint.Caption := lisTheseSettingsAreStoredWithTheProject;
cmdExceptionRemove.Caption := lisRemove;
cmdExceptionAdd.Caption := lisAdd;
cmdExceptionRemove.LoadGlyphFromLazarusResource('laz_delete');
cmdExceptionAdd.LoadGlyphFromLazarusResource('laz_add');
cmdExceptionRemove.LoadGlyphFromResourceName(HInstance, 'laz_delete');
cmdExceptionAdd.LoadGlyphFromResourceName(HInstance, 'laz_add');
chkNotifyOnException.Caption := lisDebugOptionsFrmNotifyOnLazarusExceptions;
end;

4
debugger/frames/debugger_signals_options.pas
View File

@ -89,8 +89,8 @@ begin
lvSignals.Column[3].Caption := lisDebugOptionsFrmResume;
cmdSignalAdd.Caption := lisAdd;
cmdSignalRemove.Caption := lisRemove;
cmdSignalAdd.LoadGlyphFromLazarusResource('laz_add');
cmdSignalRemove.LoadGlyphFromLazarusResource('laz_delete');
cmdSignalAdd.LoadGlyphFromResourceName(HInstance, 'laz_add');
cmdSignalRemove.LoadGlyphFromResourceName(HInstance, 'laz_delete');
mnuHandledByProgram.Caption := lisDebugOptionsFrmHandledByProgram;
mnuiHandledByDebugger.Caption := lisDebugOptionsFrmHandledByDebugger;

24
designer/anchoreditor.pas
View File

@ -233,18 +233,18 @@ begin
TopSiblingComboBox.Hint:=lisTopSiblingComboBoxHint;
TopSiblingLabel.Caption:=lisSibling;
LeftRefLeftSpeedButton.LoadGlyphFromLazarusResource('anchor_left');
LeftRefCenterSpeedButton.LoadGlyphFromLazarusResource('anchor_center_horizontal');
LeftRefRightSpeedButton.LoadGlyphFromLazarusResource('anchor_left_right');
RightRefLeftSpeedButton.LoadGlyphFromLazarusResource('anchor_left_right');
RightRefCenterSpeedButton.LoadGlyphFromLazarusResource('anchor_center_horizontal');
RightRefRightSpeedButton.LoadGlyphFromLazarusResource('anchor_right');
TopRefTopSpeedButton.LoadGlyphFromLazarusResource('anchor_top');
TopRefCenterSpeedButton.LoadGlyphFromLazarusResource('anchor_center_vertical');
TopRefBottomSpeedButton.LoadGlyphFromLazarusResource('anchor_top_bottom');
BottomRefTopSpeedButton.LoadGlyphFromLazarusResource('anchor_top_bottom');
BottomRefCenterSpeedButton.LoadGlyphFromLazarusResource('anchor_center_vertical');
BottomRefBottomSpeedButton.LoadGlyphFromLazarusResource('anchor_bottom');
LeftRefLeftSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_left');
LeftRefCenterSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_center_horizontal');
LeftRefRightSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_left_right');
RightRefLeftSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_left_right');
RightRefCenterSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_center_horizontal');
RightRefRightSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_right');
TopRefTopSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_top');
TopRefCenterSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_center_vertical');
TopRefBottomSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_top_bottom');
BottomRefTopSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_top_bottom');
BottomRefCenterSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_center_vertical');
BottomRefBottomSpeedButton.LoadGlyphFromResourceName(HInstance, 'anchor_bottom');
// autosizing
BottomSiblingLabel.AnchorToNeighbour(akLeft,10,BottomAnchoredCheckBox);

6
designer/taborderdlg.pas
View File

@ -128,9 +128,9 @@ begin
GlobalDesignHook.AddHandlerDeletePersistent(@OnDeletePersistent);
GlobalDesignHook.AddHandlerSetSelection(@OnSetSelection);
ArrowDown.LoadGlyphFromLazarusResource('arrow_down');
ArrowUp.LoadGlyphFromLazarusResource('arrow_up');
SortByPositionButton.LoadGlyphFromLazarusResource('menu_edit_sort');
ArrowDown.LoadGlyphFromResourceName(HInstance, 'arrow_down');
ArrowUp.LoadGlyphFromResourceName(HInstance, 'arrow_up');
SortByPositionButton.LoadGlyphFromResourceName(HInstance, 'menu_edit_sort');
ArrowDown.Hint:=lisTabOrderDownHint;
ArrowUp.Hint:=lisTabOrderUpHint;

6
ide/addtoprojectdlg.pas
View File

@ -506,12 +506,12 @@ begin
with FilesBrowseButton do begin
Caption:=lisA2PAddFiles;
LoadGlyphFromLazarusResource('laz_add');
LoadGlyphFromResourceName(HInstance, 'laz_add');
end;
with FilesDirButton do begin
Caption:=lisAddFilesInDirectory;
LoadGlyphFromLazarusResource('pkg_files');
LoadGlyphFromResourceName(HInstance, 'pkg_files');
end;
with FilesShortenButton do begin
@ -524,7 +524,7 @@ begin
Caption:=lisDelete;
ShowHint:=true;
Hint:=lisDeleteSelectedFiles;
LoadGlyphFromLazarusResource('laz_delete');
LoadGlyphFromResourceName(HInstance, 'laz_delete');
end;
UpdateFilesButtons;

6
ide/buildlazdialog.pas
View File

@ -937,13 +937,13 @@ begin
ConfirmBuildCheckBox.Hint := lisLazBuildShowConfirmationDialogWhenBuilding;
CompileButton.Caption := lisBuild;
CompileButton.LoadGlyphFromLazarusResource('menu_build');
CompileButton.LoadGlyphFromResourceName(HInstance, 'menu_build');
CompileAdvancedButton.Caption := lisLazBuildBuildMany;
CompileAdvancedButton.LoadGlyphFromLazarusResource('menu_build_all');
CompileAdvancedButton.LoadGlyphFromResourceName(HInstance, 'menu_build_all');
SaveSettingsButton.Caption := lisSaveSettings;
SaveSettingsButton.LoadGlyphFromStock(idButtonSave);
if SaveSettingsButton.Glyph.Empty then
SaveSettingsButton.LoadGlyphFromLazarusResource('laz_save');
SaveSettingsButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
CancelButton.Caption := lisCancel;
HelpButton.Caption := lisMenuHelp;

10
ide/buildmodesmanager.pas
View File

@ -212,11 +212,11 @@ begin
FillBuildModesGrid;
UpdateBuildModeButtons;
AddSpeedButton.LoadGlyphFromLazarusResource('laz_add');
DeleteSpeedButton.LoadGlyphFromLazarusResource('laz_delete');
MoveUpSpeedButton.LoadGlyphFromLazarusResource('arrow_up');
MoveDownSpeedButton.LoadGlyphFromLazarusResource('arrow_down');
DiffSpeedButton.LoadGlyphFromLazarusResource('menu_tool_diff');
AddSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
DeleteSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
MoveUpSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_up');
MoveDownSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_down');
DiffSpeedButton.LoadGlyphFromResourceName(HInstance, 'menu_tool_diff');
end;
procedure TBuildModesForm.DiffSpeedButtonClick(Sender: TObject);

2
ide/checklfmdlg.pas
View File

@ -762,7 +762,7 @@ begin
ErrorsGroupBox.Caption:=lisErrors;
LFMGroupBox.Caption:=lisLFMFile;
RemoveAllButton.Caption:=lisRemoveAllInvalidProperties;
RemoveAllButton.LoadGlyphFromLazarusResource('laz_delete');
RemoveAllButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
CancelButton.Caption:=lisCancel;
EditorOpts.GetHighlighterSettings(SynLFMSyn1);
EditorOpts.GetSynEditSettings(LFMSynEdit);

36
ide/codebrowser.pas
View File

@ -798,24 +798,24 @@ end;
procedure TCodeBrowserView.InitImageList;
begin
ImgIDDefault := Imagelist1.AddLazarusResource('ce_default');
ImgIDProgramCode := Imagelist1.AddLazarusResource('ce_program');
ImgIDUnitCode := Imagelist1.AddLazarusResource('ce_unit');
ImgIDInterfaceSection := Imagelist1.AddLazarusResource('ce_interface');
ImgIDImplementation := Imagelist1.AddLazarusResource('ce_implementation');
ImgIDInitialization := Imagelist1.AddLazarusResource('ce_initialization');
ImgIDFinalization := Imagelist1.AddLazarusResource('ce_finalization');
ImgIDTypeSection := Imagelist1.AddLazarusResource('ce_type');
ImgIDType := Imagelist1.AddLazarusResource('ce_type');
ImgIDVarSection := Imagelist1.AddLazarusResource('ce_variable');
ImgIDVariable := Imagelist1.AddLazarusResource('ce_variable');
ImgIDConstSection := Imagelist1.AddLazarusResource('ce_const');
ImgIDConst := Imagelist1.AddLazarusResource('ce_const');
ImgIDClass := Imagelist1.AddLazarusResource('ce_class');
ImgIDProc := Imagelist1.AddLazarusResource('ce_procedure');
ImgIDProperty := Imagelist1.AddLazarusResource('ce_property');
ImgIDPackage := Imagelist1.AddLazarusResource('item_package');
ImgIDProject := Imagelist1.AddLazarusResource('item_project');
ImgIDDefault := Imagelist1.AddResourceName(HInstance, 'ce_default');
ImgIDProgramCode := Imagelist1.AddResourceName(HInstance, 'ce_program');
ImgIDUnitCode := Imagelist1.AddResourceName(HInstance, 'ce_unit');
ImgIDInterfaceSection := Imagelist1.AddResourceName(HInstance, 'ce_interface');
ImgIDImplementation := Imagelist1.AddResourceName(HInstance, 'ce_implementation');
ImgIDInitialization := Imagelist1.AddResourceName(HInstance, 'ce_initialization');
ImgIDFinalization := Imagelist1.AddResourceName(HInstance, 'ce_finalization');
ImgIDTypeSection := Imagelist1.AddResourceName(HInstance, 'ce_type');
ImgIDType := Imagelist1.AddResourceName(HInstance, 'ce_type');
ImgIDVarSection := Imagelist1.AddResourceName(HInstance, 'ce_variable');
ImgIDVariable := Imagelist1.AddResourceName(HInstance, 'ce_variable');
ImgIDConstSection := Imagelist1.AddResourceName(HInstance, 'ce_const');
ImgIDConst := Imagelist1.AddResourceName(HInstance, 'ce_const');
ImgIDClass := Imagelist1.AddResourceName(HInstance, 'ce_class');
ImgIDProc := Imagelist1.AddResourceName(HInstance, 'ce_procedure');
ImgIDProperty := Imagelist1.AddResourceName(HInstance, 'ce_property');
ImgIDPackage := Imagelist1.AddResourceName(HInstance, 'item_package');
ImgIDProject := Imagelist1.AddResourceName(HInstance, 'item_project');
end;
procedure TCodeBrowserView.SetScannedBytes(const AValue: PtrInt);

2
ide/codecontextform.pas
View File

@ -499,7 +499,7 @@ begin
Btn.Name:='CopyAllSpeedButton'+IntToStr(i+1);
Btn.OnClick:=@CopyAllBtnClick;
Btn.Visible:=false;
Btn.LoadGlyphFromLazarusResource('laz_copy');
Btn.LoadGlyphFromResourceName(HInstance, 'laz_copy');
Btn.Flat:=true;
Btn.Parent:=Self;
FHints.Add(Item);

46
ide/codeexplorer.pas
View File

@ -472,29 +472,29 @@ begin
DirRefreshSpeedButton.Hint:=dlgUnitDepRefresh;
DirOptionsSpeedButton.Hint:=dlgFROpts;
CodeRefreshSpeedButton.LoadGlyphFromLazarusResource('laz_refresh');
CodeOptionsSpeedButton.LoadGlyphFromLazarusResource('menu_environment_options');
DirRefreshSpeedButton.LoadGlyphFromLazarusResource('laz_refresh');
DirOptionsSpeedButton.LoadGlyphFromLazarusResource('menu_environment_options');
CodeRefreshSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_refresh');
CodeOptionsSpeedButton.LoadGlyphFromResourceName(HInstance, 'menu_environment_options');
DirRefreshSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_refresh');
DirOptionsSpeedButton.LoadGlyphFromResourceName(HInstance, 'menu_environment_options');
ImgIDDefault := Imagelist1.AddLazarusResource('ce_default');
ImgIDProgram := Imagelist1.AddLazarusResource('ce_program');
ImgIDUnit := Imagelist1.AddLazarusResource('ce_unit');
ImgIDInterface := Imagelist1.AddLazarusResource('ce_interface');
ImgIDImplementation := Imagelist1.AddLazarusResource('ce_implementation');
ImgIDInitialization := Imagelist1.AddLazarusResource('ce_initialization');
ImgIDFinalization := Imagelist1.AddLazarusResource('ce_finalization');
ImgIDType := Imagelist1.AddLazarusResource('ce_type');
ImgIDVariable := Imagelist1.AddLazarusResource('ce_variable');
ImgIDConst := Imagelist1.AddLazarusResource('ce_const');
ImgIDClass := Imagelist1.AddLazarusResource('ce_class');
ImgIDProcedure := Imagelist1.AddLazarusResource('ce_procedure');
ImgIDFunction := Imagelist1.AddLazarusResource('ce_function');
ImgIDProperty := Imagelist1.AddLazarusResource('ce_property');
ImgIDPropertyReadOnly := Imagelist1.AddLazarusResource('ce_property_readonly');
ImgIDDefault := Imagelist1.AddResourceName(HInstance, 'ce_default');
ImgIDProgram := Imagelist1.AddResourceName(HInstance, 'ce_program');
ImgIDUnit := Imagelist1.AddResourceName(HInstance, 'ce_unit');
ImgIDInterface := Imagelist1.AddResourceName(HInstance, 'ce_interface');
ImgIDImplementation := Imagelist1.AddResourceName(HInstance, 'ce_implementation');
ImgIDInitialization := Imagelist1.AddResourceName(HInstance, 'ce_initialization');
ImgIDFinalization := Imagelist1.AddResourceName(HInstance, 'ce_finalization');
ImgIDType := Imagelist1.AddResourceName(HInstance, 'ce_type');
ImgIDVariable := Imagelist1.AddResourceName(HInstance, 'ce_variable');
ImgIDConst := Imagelist1.AddResourceName(HInstance, 'ce_const');
ImgIDClass := Imagelist1.AddResourceName(HInstance, 'ce_class');
ImgIDProcedure := Imagelist1.AddResourceName(HInstance, 'ce_procedure');
ImgIDFunction := Imagelist1.AddResourceName(HInstance, 'ce_function');
ImgIDProperty := Imagelist1.AddResourceName(HInstance, 'ce_property');
ImgIDPropertyReadOnly := Imagelist1.AddResourceName(HInstance, 'ce_property_readonly');
// sections
ImgIDSection := Imagelist1.AddLazarusResource('ce_section');
ImgIDHint := Imagelist1.AddLazarusResource('state_hint');
ImgIDSection := Imagelist1.AddResourceName(HInstance, 'ce_section');
ImgIDHint := Imagelist1.AddResourceName(HInstance, 'state_hint');
// assign the root TMenuItem to the registered menu root.
// This will automatically create all registered items
@ -1855,11 +1855,11 @@ procedure TCodeExplorerView.UpdateMode;
begin
if FMode=cemCategory
then begin
CodeModeSpeedButton.LoadGlyphFromLazarusResource('show_category');
CodeModeSpeedButton.LoadGlyphFromResourceName(HInstance, 'show_category');
CodeModeSpeedButton.Hint:=lisCEModeShowSourceNodes;
end
else begin
CodeModeSpeedButton.LoadGlyphFromLazarusResource('show_source');
CodeModeSpeedButton.LoadGlyphFromResourceName(HInstance, 'show_source');
CodeModeSpeedButton.Hint:=lisCEModeShowCategories;
end;
Refresh(true);

2
ide/componentpalette.pas
View File

@ -709,7 +709,7 @@ var
BtnRight:=TSpeedButton.Create(aCompPage.PageComponent);
with BtnRight do
begin
LoadGlyphFromLazarusResource('SelCompPage');
LoadGlyphFromResourceName(HInstance, 'SelCompPage');
Flat := True;
SetBounds(2,1,16,16);
Hint := 'Click to Select Palette Page';

8
ide/condef.pas
View File

@ -234,16 +234,16 @@ begin
NewTestGroupBox.Caption := rsCreateNewDefine;
Caption := rsConditionalDefines;
AddBtn.Caption := lisBtnAdd;
AddBtn.LoadGlyphFromLazarusResource('laz_add');
AddBtn.LoadGlyphFromResourceName(HInstance, 'laz_add');
AddInverse.Caption := rsAddInverse;
AddInverse.LoadGlyphFromLazarusResource('pkg_issues');
AddInverse.LoadGlyphFromResourceName(HInstance, 'pkg_issues');
RemoveBtn.Caption := lisBtnRemove;
RemoveBtn.LoadGlyphFromLazarusResource('laz_delete');
RemoveBtn.LoadGlyphFromResourceName(HInstance, 'laz_delete');
btnSave.Caption := lisSave;
btnSave.LoadGlyphFromStock(idButtonSave);
btnOk.Caption := lisApply;
//if btnSave.Glyph.Empty then
// btnSave.LoadGlyphFromLazarusResource('laz_save');
// btnSave.LoadGlyphFromResourceName(HInstance, 'laz_save');
try
XMLConfig:=CreateXMLConfig;
try

4
ide/customdefines.pas
View File

@ -80,9 +80,9 @@ begin
Caption := lisLazBuildDefines;
gbNewDefine.Caption := lisCodeToolsDefsDefine;
AddBtn.Caption := lisBtnAdd;
AddBtn.LoadGlyphFromLazarusResource('laz_add');
AddBtn.LoadGlyphFromResourceName(HInstance, 'laz_add');
RemoveBtn.Caption := lisBtnRemove;
RemoveBtn.LoadGlyphFromLazarusResource('laz_delete');
RemoveBtn.LoadGlyphFromResourceName(HInstance, 'laz_delete');
end;
procedure TCustomDefinesForm.FormShow(Sender: TObject);

4
ide/diffdialog.pas
View File

@ -282,11 +282,11 @@ begin
OpenInEditorButton.LoadGlyphFromStock(idButtonOpen);
if OpenInEditorButton.Glyph.Empty then
OpenInEditorButton.LoadGlyphFromLazarusResource('laz_open');
OpenInEditorButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
SaveDiffButton.LoadGlyphFromStock(idButtonSave);
if SaveDiffButton.Glyph.Empty then
SaveDiffButton.LoadGlyphFromLazarusResource('laz_save');
SaveDiffButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
// dialogs
dlgOpen.Title:=lisOpenExistingFile;

4
ide/editmsgscannersdlg.pas
View File

@ -100,8 +100,8 @@ begin
AddSpeedButton.Hint:=lisAdd;
RemoveSpeedButton.Hint:=lisRemove;
AddSpeedButton.LoadGlyphFromLazarusResource('arrow_left');
RemoveSpeedButton.LoadGlyphFromLazarusResource('arrow_right');
AddSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_left');
RemoveSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_right');
FillAvailableListbox;
end;

12
ide/editorfilemanager.pas
View File

@ -102,15 +102,15 @@ begin
PopupMenu1.Images:=IDEImages.Images_16;
ActivateMenuItem.ImageIndex:=IDEImages.LoadImage(16, 'laz_open');
CloseMenuItem.ImageIndex:=IDEImages.LoadImage(16, 'menu_close');
CloseCheckedButton.LoadGlyphFromLazarusResource('menu_close_all');
SaveCheckedButton.LoadGlyphFromLazarusResource('menu_save_all');
MoveUpBtn.LoadGlyphFromLazarusResource('arrow_up');
MoveDownBtn.LoadGlyphFromLazarusResource('arrow_down');
CloseCheckedButton.LoadGlyphFromResourceName(HInstance, 'menu_close_all');
SaveCheckedButton.LoadGlyphFromResourceName(HInstance, 'menu_save_all');
MoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
MoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
// Buttons on FilterPanel
OpenButton.LoadGlyphFromLazarusResource('laz_open');
OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
OpenButton.Hint:=lisActivateSelected;
SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
SortAlphabeticallyButton.LoadGlyphFromLazarusResource('pkg_sortalphabetically');
SortAlphabeticallyButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
end;
procedure TEditorFileManagerForm.CheckListBox1Click(Sender: TObject);

6
ide/etmessageframe.pas
View File

@ -3501,12 +3501,12 @@ begin
// search
SearchPanel.Visible:=false; // by default the search is hidden
HideSearchSpeedButton.Hint:='Hide Search';
HideSearchSpeedButton.LoadGlyphFromLazarusResource('debugger_power_grey');
HideSearchSpeedButton.LoadGlyphFromResourceName(HInstance, 'debugger_power_grey');
SearchEdit.Text:=GetDefaultSearchText;
SearchNextSpeedButton.Hint:='Find the next occurence of the phrase';
SearchNextSpeedButton.LoadGlyphFromLazarusResource('callstack_bottom');
SearchNextSpeedButton.LoadGlyphFromResourceName(HInstance, 'callstack_bottom');
SearchPrevSpeedButton.Hint:='Find the previous occurence of the phrase';
SearchPrevSpeedButton.LoadGlyphFromLazarusResource('callstack_top');
SearchPrevSpeedButton.LoadGlyphFromResourceName(HInstance, 'callstack_top');
end;
destructor TMessagesFrame.Destroy;

8
ide/examplemanager.pas
View File

@ -161,10 +161,10 @@ begin
SelectAllButton.Caption:=lisMenuSelectAll;
SelectNoneButton.Caption:=lisSAMSelectNone;
OpenSelectedButton.LoadGlyphFromLazarusResource('laz_open');
BuildAllSelectedButton.LoadGlyphFromLazarusResource('menu_build_all');
SelectAllButton.LoadGlyphFromLazarusResource('menu_select_all');
SelectNoneButton.LoadGlyphFromLazarusResource('ce_default');
OpenSelectedButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
BuildAllSelectedButton.LoadGlyphFromResourceName(HInstance, 'menu_build_all');
SelectAllButton.LoadGlyphFromResourceName(HInstance, 'menu_select_all');
SelectNoneButton.LoadGlyphFromResourceName(HInstance, 'ce_default');
edRootDirectory.Text:=EnvironmentOptions.GetParsedLazarusDirectory;
FillProjectsPending;

2
ide/findreplacedialog.pp
View File

@ -135,7 +135,7 @@ begin
TextToFindLabel.Caption:=dlgTextToFind;
ReplaceTextComboBox.Text:='';
ReplaceWithCheckbox.Caption:=dlgReplaceWith;
EnableAutoCompleteSpeedButton.LoadGlyphFromLazarusResource('menu_stepinto');
EnableAutoCompleteSpeedButton.LoadGlyphFromResourceName(HInstance, 'menu_stepinto');
OptionsGroupBox.Caption:=dlgFROpts;
with CaseSensitiveCheckBox do begin

16
ide/fpdoceditwindow.pas
View File

@ -296,14 +296,14 @@ begin
Name := NonModalIDEWindowNames[nmiwFPDocEditorName];
BoldFormatButton.LoadGlyphFromLazarusResource('formatbold');
UnderlineFormatButton.LoadGlyphFromLazarusResource('formatunderline');
ItalicFormatButton.LoadGlyphFromLazarusResource('formatitalic');
InsertVarTagButton.LoadGlyphFromLazarusResource('insertvartag');
InsertCodeTagButton.LoadGlyphFromLazarusResource('insertcodetag');
InsertRemarkButton.LoadGlyphFromLazarusResource('insertremark');
InsertURLTagSpeedButton.LoadGlyphFromLazarusResource('formatunderline');
SaveButton.LoadGlyphFromLazarusResource('laz_save');
BoldFormatButton.LoadGlyphFromResourceName(HInstance, 'formatbold');
UnderlineFormatButton.LoadGlyphFromResourceName(HInstance, 'formatunderline');
ItalicFormatButton.LoadGlyphFromResourceName(HInstance, 'formatitalic');
InsertVarTagButton.LoadGlyphFromResourceName(HInstance, 'insertvartag');
InsertCodeTagButton.LoadGlyphFromResourceName(HInstance, 'insertcodetag');
InsertRemarkButton.LoadGlyphFromResourceName(HInstance, 'insertremark');
InsertURLTagSpeedButton.LoadGlyphFromResourceName(HInstance, 'formatunderline');
SaveButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
SourceEditorManagerIntf.RegisterChangeEvent(semEditorActivate, @DoEditorUpdate);
SourceEditorManagerIntf.RegisterChangeEvent(semEditorStatus, @DoEditorUpdate);

6
ide/frames/compiler_buildmacro_options.pas
View File

@ -490,9 +490,9 @@ begin
lisHintADefaultValueCanBeDefinedInTheConditionals;
BuildMacroDescriptionLabel.Caption:=lisCodeToolsDefsDescription;
BMAddMacroSpeedButton.LoadGlyphFromLazarusResource('laz_add');
BMAddMacroValueSpeedButton.LoadGlyphFromLazarusResource('laz_add');
BMDeleteMacroSpeedButton.LoadGlyphFromLazarusResource('laz_delete');
BMAddMacroSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
BMAddMacroValueSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
BMDeleteMacroSpeedButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
end;
destructor TCompOptBuildMacrosFrame.Destroy;

4
ide/frames/compiler_path_options.pas
View File

@ -723,7 +723,7 @@ begin
// register special buttons in the dialog itself
btnShowOptions := CreateButton(dlgCOShowOptions);
btnShowOptions.LoadGlyphFromLazarusResource('menu_compiler_options');
btnShowOptions.LoadGlyphFromResourceName(HInstance, 'menu_compiler_options');
btnShowOptions.OnClick := @DoShowOptions;
btnCheck := CreateButton(lisCompTest);
btnCheck.ModalResult := mrNone;
@ -734,7 +734,7 @@ begin
btnLoadSave.Hint := dlgCOLoadSave;
btnLoadSave.LoadGlyphFromStock(idButtonSave);
if btnLoadSave.Glyph.Empty then
btnLoadSave.LoadGlyphFromLazarusResource('laz_save');
btnLoadSave.LoadGlyphFromResourceName(HInstance, 'laz_save');
chkUseAsDefault := TCheckBox(ADialog.AddControl(TCheckBox));
chkUseAsDefault.Caption := dlgCOSetAsDefault;

8
ide/frames/componentpalette_options.pas
View File

@ -126,13 +126,13 @@ begin
ComponentsListView.Column[2].Caption := lisPage;
ComponentsListView.Column[3].Caption := lisPackage;
// Arrow buttons for pages
PageMoveUpBtn.LoadGlyphFromLazarusResource('arrow_up');
PageMoveDownBtn.LoadGlyphFromLazarusResource('arrow_down');
PageMoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
PageMoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
PageMoveUpBtn.Hint:=lisMoveSelectedUp;
PageMoveDownBtn.Hint:=lisMoveSelectedDown;
// Arrow buttons for components
CompMoveUpBtn.LoadGlyphFromLazarusResource('arrow_up');
CompMoveDownBtn.LoadGlyphFromLazarusResource('arrow_down');
CompMoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
CompMoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
CompMoveUpBtn.Hint:=lisMoveSelectedUp;
CompMoveDownBtn.Hint:=lisMoveSelectedDown;

2
ide/frames/editor_general_options.pas
View File

@ -370,7 +370,7 @@ begin
FDefaultBookmarkImages.Width := 11;
FDefaultBookmarkImages.Height := 11;
for i := 0 to 9 do
FDefaultBookmarkImages.AddLazarusResource('bookmark' + IntToStr(i));
FDefaultBookmarkImages.AddResourceName(HInstance, 'bookmark' + IntToStr(i));
end;
Result := FDefaultBookmarkImages;
end;

2
ide/frames/editor_indent_options.pas
View File

@ -666,7 +666,7 @@ begin
FDefaultBookmarkImages.Width := 11;
FDefaultBookmarkImages.Height := 11;
for i := 0 to 9 do
FDefaultBookmarkImages.AddLazarusResource('bookmark' + IntToStr(i));
FDefaultBookmarkImages.AddResourceName(HInstance, 'bookmark' + IntToStr(i));
end;
Result := FDefaultBookmarkImages;
end;

8
ide/frames/editor_keymapping_options.pas
View File

@ -375,10 +375,10 @@ begin
ConflictsTreeView.Images := IDEImages.Images_16;
imgKeyCategory := IDEImages.LoadImage(16, 'item_keyboard');
imgKeyItem := IDEImages.LoadImage(16, 'item_character');
ChooseSchemeButton.LoadGlyphFromLazarusResource('item_keyboard'); // keymapcategory
FindKeyButton.LoadGlyphFromLazarusResource('menu_search_find');
EditButton.LoadGlyphFromLazarusResource('laz_edit');
ClearButton.LoadGlyphFromLazarusResource('menu_clean');
ChooseSchemeButton.LoadGlyphFromResourceName(HInstance, 'item_keyboard'); // keymapcategory
FindKeyButton.LoadGlyphFromResourceName(HInstance, 'menu_search_find');
EditButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
ClearButton.LoadGlyphFromResourceName(HInstance, 'menu_clean');
PopupMenu1.Images := IDEImages.Images_16;
EditMenuItem.ImageIndex := IDEImages.LoadImage(16, 'laz_edit');
ClearMenuItem.ImageIndex := IDEImages.LoadImage(16, 'menu_clean');

8
ide/frames/project_application_options.pas
View File

@ -213,7 +213,7 @@ begin
UIAccessCheckBox.Caption := dlgPOUIAccess;
CreateAppBundleButton.Caption := dlgPOCreateAppBundle;
CreateAppBundleButton.LoadGlyphFromLazarusResource('pkg_compile');
CreateAppBundleButton.LoadGlyphFromResourceName(HInstance, 'pkg_compile');
// icon
IconLabel.Caption := dlgPOIcon;
@ -222,11 +222,11 @@ begin
ClearIconButton.Caption := dlgPOClearIcon;
LoadIconButton.LoadGlyphFromStock(idButtonOpen);
if LoadIconButton.Glyph.Empty then
LoadIconButton.LoadGlyphFromLazarusResource('laz_open');
LoadIconButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
SaveIconButton.LoadGlyphFromStock(idButtonSave);
if SaveIconButton.Glyph.Empty then
SaveIconButton.LoadGlyphFromLazarusResource('laz_save');
ClearIconButton.LoadGlyphFromLazarusResource('menu_clean');
SaveIconButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
ClearIconButton.LoadGlyphFromResourceName(HInstance, 'menu_clean');
IconImagePictureChanged(nil);
end;

8
ide/frames/project_forms_options.pas
View File

@ -184,10 +184,10 @@ begin
FormsAutoCreatedLabel.Caption := dlgAutoCreateForms;
FormsAvailFormsLabel.Caption := dlgAvailableForms;
FormsAutoCreateNewFormsCheckBox.Caption := dlgAutoCreateNewForms;
FormsMoveAutoCreatedFormUpBtn.LoadGlyphFromLazarusResource('arrow_up');
FormsMoveAutoCreatedFormsDownBtn.LoadGlyphFromLazarusResource('arrow_down');
FormsAddToAutoCreatedFormsBtn.LoadGlyphFromLazarusResource('arrow_left');
FormsRemoveFromAutoCreatedFormsBtn.LoadGlyphFromLazarusResource('arrow_right');
FormsMoveAutoCreatedFormUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
FormsMoveAutoCreatedFormsDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
FormsAddToAutoCreatedFormsBtn.LoadGlyphFromResourceName(HInstance, 'arrow_left');
FormsRemoveFromAutoCreatedFormsBtn.LoadGlyphFromResourceName(HInstance, 'arrow_right');
end;
procedure TProjectFormsOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);

4
ide/frames/project_lazdoc_options.pas
View File

@ -58,8 +58,8 @@ begin
SearchPathsGroupBox.Caption:=lisSearchPaths2;
AddPathButton.Caption := lisCodeHelpAddPathButton;
DeletePathButton.Caption := lisCodeHelpDeletePathButton;
DeletePathButton.LoadGlyphFromLazarusResource('laz_delete');
AddPathButton.LoadGlyphFromLazarusResource('laz_add');
DeletePathButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
AddPathButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
PathEdit.Clear;
end;

2
ide/genericchecklist.pas
View File

@ -45,7 +45,7 @@ begin
fActionBtn.BorderSpacing.Left:=6;
fActionBtn.BorderSpacing.Right:=6;
if aResourceGlyphName <> '' then
fActionBtn.LoadGlyphFromLazarusResource(aResourceGlyphName);
fActionBtn.LoadGlyphFromResourceName(HInstance, aResourceGlyphName);
fActionBtn.AutoSize:=True;
fActionBtn.Parent:=ButtonPanel1;
end;

4
ide/imexportcompileropts.pas
View File

@ -206,10 +206,10 @@ begin
CancelButton.Caption:=lisCancel;
OpenButton.LoadGlyphFromStock(idButtonOpen);
if OpenButton.Glyph.Empty then
OpenButton.LoadGlyphFromLazarusResource('laz_open');
OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
SaveButton.LoadGlyphFromStock(idButtonSave);
if SaveButton.Glyph.Empty then
SaveButton.LoadGlyphFromLazarusResource('laz_save');
SaveButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
LoadRecentList;
end;

8
ide/initialsetupdlgs.pas
View File

@ -1353,17 +1353,17 @@ begin
DebuggerTabSheet.Caption:=lisDebugger;
FHeadGraphic:=TPortableNetworkGraphic.Create;
FHeadGraphic.LoadFromLazarusResource('ide_icon48x48');
FHeadGraphic.LoadFromResourceName(HInstance, 'ide_icon48x48');
TVNodeLazarus:=PropertiesTreeView.Items.Add(nil,LazarusTabSheet.Caption);
TVNodeCompiler:=PropertiesTreeView.Items.Add(nil,CompilerTabSheet.Caption);
TVNodeFPCSources:=PropertiesTreeView.Items.Add(nil,FPCSourcesTabSheet.Caption);
TVNodeMakeExe:=PropertiesTreeView.Items.Add(nil,MakeExeTabSheet.Caption);
TVNodeDebugger:=PropertiesTreeView.Items.Add(nil,DebuggerTabSheet.Caption);
ImgIDError := ImageList1.AddLazarusResource('state_error');
ImgIDWarning := ImageList1.AddLazarusResource('state_warning');
ImgIDError := Imagelist1.AddResourceName(HInstance, 'state_error');
ImgIDWarning := Imagelist1.AddResourceName(HInstance, 'state_warning');
StopScanButton.LoadGlyphFromLazarusResource('menu_stop');
StopScanButton.LoadGlyphFromResourceName(HInstance, 'menu_stop');
UpdateCaptions;

4
ide/main.pp
View File

@ -1023,6 +1023,8 @@ var
implementation
{$R ../images/laz_images.res}
var
ParamBaseDirectory: string = '';
SkipAutoLoadingLastProject: boolean = false;
@ -14171,8 +14173,6 @@ end;
initialization
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('main.pp: initialization');{$ENDIF}
{$I ../images/laz_images.lrs}
// we have a bundle icon, don't use low quality standard icon
ShowSplashScreen:=true;
DebugLogger.ParamForEnabledLogGroups := '--debug-enable=';
end.

6
ide/msgvieweditor.pas
View File

@ -95,9 +95,9 @@ begin
DeleteSetButton.Caption:=lisDelete;
FilterSetGroupBox.Caption:=lisFilterSets;
AddNewSetButton.LoadGlyphFromLazarusResource('laz_add');
DeleteSetButton.LoadGlyphFromLazarusResource('laz_delete');
RenameSetButton.LoadGlyphFromLazarusResource('laz_edit');
AddNewSetButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
DeleteSetButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
RenameSetButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
end;
procedure TMsgViewEditorDlg.DeleteSetButtonClick(Sender: TObject);

14
ide/patheditordlg.pas
View File

@ -264,13 +264,13 @@ begin
AddTemplateButton.Caption:=lisCodeTemplAdd;
AddTemplateButton.Hint:=lisPathEditorTemplAddHint;
MoveUpButton.LoadGlyphFromLazarusResource('arrow_up');
MoveDownButton.LoadGlyphFromLazarusResource('arrow_down');
ReplaceButton.LoadGlyphFromLazarusResource('menu_reportingbug');
AddButton.LoadGlyphFromLazarusResource('laz_add');
DeleteButton.LoadGlyphFromLazarusResource('laz_delete');
DeleteInvalidPathsButton.LoadGlyphFromLazarusResource('menu_clean');
AddTemplateButton.LoadGlyphFromLazarusResource('laz_add');
MoveUpButton.LoadGlyphFromResourceName(HInstance, 'arrow_up');
MoveDownButton.LoadGlyphFromResourceName(HInstance, 'arrow_down');
ReplaceButton.LoadGlyphFromResourceName(HInstance, 'menu_reportingbug');
AddButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
DeleteButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
DeleteInvalidPathsButton.LoadGlyphFromResourceName(HInstance, 'menu_clean');
AddTemplateButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
end;
procedure TPathEditorDialog.FormResize(Sender: TObject);

6
ide/projectinspector.pas
View File

@ -616,13 +616,13 @@ begin
OptionsBitBtn := CreateToolButton('OptionsBitBtn', dlgFROpts, lisPckEditEditGeneralOptions, 'menu_environment_options', @OptionsBitBtnClick);
HelpBitBtn := CreateToolButton('HelpBitBtn', GetButtonCaption(idButtonHelp), lisPkgEdThereAreMoreFunctionsInThePopupmenu, 'menu_help', @HelpBitBtnClick);
OpenButton.LoadGlyphFromLazarusResource('laz_open');
OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
OpenButton.Caption:='';
OpenButton.Hint:=lisOpenFile2;
SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
SortAlphabeticallyButton.LoadGlyphFromLazarusResource('pkg_sortalphabetically');
SortAlphabeticallyButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
DirectoryHierarchyButton.Hint:=lisPEShowDirectoryHierarchy;
DirectoryHierarchyButton.LoadGlyphFromLazarusResource('pkg_hierarchical');
DirectoryHierarchyButton.LoadGlyphFromResourceName(HInstance, 'pkg_hierarchical');
with ItemsTreeView do begin
FFilesNode:=Items.Add(nil, dlgEnvFiles);

10
ide/projectwizarddlg.pas
View File

@ -85,11 +85,11 @@ begin
btnConvertProject.caption:=lisPWConvertProject;
gbRecent.Caption:=lisPWOpenRecentProject;
btnCloseIDE.caption:=lisQuitLazarus;
btnNewProject.LoadGlyphFromLazarusResource('item_project');
btnOpenProject.LoadGlyphFromLazarusResource('menu_project_open');
btnExamples.LoadGlyphFromLazarusResource('camera');
btnConvertProject.LoadGlyphFromLazarusResource('laz_wand');
btnCloseIDE.LoadGlyphFromLazarusResource('menu_exit');
btnNewProject.LoadGlyphFromResourceName(HInstance, 'item_project');
btnOpenProject.LoadGlyphFromResourceName(HInstance, 'menu_project_open');
btnExamples.LoadGlyphFromResourceName(HInstance, 'camera');
btnConvertProject.LoadGlyphFromResourceName(HInstance, 'laz_wand');
btnCloseIDE.LoadGlyphFromResourceName(HInstance, 'menu_exit');
cbRecentProjects.Items.AddStrings(EnvironmentOptions.RecentProjectFiles);
end;

2
ide/publishprojectdlg.pas
View File

@ -181,7 +181,7 @@ begin
ButtonPanel1.CloseButton.Kind := bkCustom;
ButtonPanel1.CloseButton.LoadGlyphFromStock(idButtonSave);
if ButtonPanel1.CloseButton.Glyph.Empty then
ButtonPanel1.CloseButton.LoadGlyphFromLazarusResource('laz_save');
ButtonPanel1.CloseButton.LoadGlyphFromResourceName(HInstance, 'laz_save');
ButtonPanel1.CloseButton.OnClick := @SaveSettingsButtonCLICK;
ButtonPanel1.HelpButton.OnClick := @HelpButtonClick;

6
ide/runparamsopts.pas
View File

@ -381,9 +381,9 @@ begin
SetupLocalPage;
SetupEnvironmentPage;
UserOverridesAddButton.LoadGlyphFromLazarusResource('laz_add');
UserOverridesEditButton.LoadGlyphFromLazarusResource('laz_edit');
UserOverridesDeleteButton.LoadGlyphFromLazarusResource('laz_delete');
UserOverridesAddButton.LoadGlyphFromResourceName(HInstance, 'laz_add');
UserOverridesEditButton.LoadGlyphFromResourceName(HInstance, 'laz_edit');
UserOverridesDeleteButton.LoadGlyphFromResourceName(HInstance, 'laz_delete');
end;
procedure TRunParamsOptsDlg.SetupLocalPage;

4
ide/sourceeditor.pp
View File

@ -1329,6 +1329,7 @@ function CompareFilenameWithSrcEditIntf(FilenameStr, SrcEdit: Pointer): integer;
implementation
{$R *.lfm}
{$R ../images/bookmark.res}
var
SRCED_LOCK, SRCED_OPEN, SRCED_CLOSE, SRCED_PAGES: PLazLoggerLogGroup;
@ -4513,7 +4514,7 @@ Begin
Manager.NewEditorCreated(self);
FEditor.TemplateEdit.OnActivate := @EditorActivateSyncro;
FEditor.TemplateEdit.OnDeactivate := @EditorDeactivateSyncro;
bmp := CreateBitmapFromLazarusResource('tsynsyncroedit');
bmp := CreateBitmapFromResourceName(HInstance, 'tsynsyncroedit');
FEditor.SyncroEdit.GutterGlyph.Assign(bmp);
bmp.Free;
FEditor.SyncroEdit.OnBeginEdit := @EditorActivateSyncro;
@ -10504,7 +10505,6 @@ initialization
SRCED_PAGES := DebugLogger.RegisterLogGroup('SRCED_PAGES' {$IFDEF SRCED_PAGES} , True {$ENDIF} );
InternalInit;
{$I ../images/bookmark.lrs}
finalization
InternalFinal;

2
ide/sourcemarks.pas
View File

@ -779,7 +779,7 @@ end;
function TSourceMarks.AddImage(const ResName: string): integer;
begin
Result := ImgList.AddLazarusResource(Resname);
Result := ImgList.AddResourceName(HInstance, Resname);
end;
function TSourceMarks.GetFilename(AMark: TSourceMark): string;

12
ide/unitdependencies.pas
View File

@ -1806,25 +1806,25 @@ begin
AllUnitsFilterEdit.Text:=ResStrFilter;
AllUnitsShowDirsSpeedButton.Hint:=lisUDShowNodesForDirectories;
AllUnitsShowDirsSpeedButton.LoadGlyphFromLazarusResource('pkg_hierarchical');
AllUnitsShowDirsSpeedButton.LoadGlyphFromResourceName(HInstance, 'pkg_hierarchical');
AllUnitsShowDirsSpeedButton.Down:=true;
AllUnitsShowGroupNodesSpeedButton.Hint:=lisUDShowNodesForProjectAndPackages;
AllUnitsShowGroupNodesSpeedButton.LoadGlyphFromLazarusResource('pkg_hierarchical');
AllUnitsShowGroupNodesSpeedButton.LoadGlyphFromResourceName(HInstance, 'pkg_hierarchical');
AllUnitsShowGroupNodesSpeedButton.Down:=true;
AllUnitsSearchEdit.Text:=ResStrSearch;
AllUnitsSearchNextSpeedButton.Hint:=lisUDSearchNextOccurrenceOfThisPhrase;
AllUnitsSearchNextSpeedButton.LoadGlyphFromLazarusResource('arrow_down');
AllUnitsSearchNextSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_down');
AllUnitsSearchPrevSpeedButton.Hint:=lisUDSearchPreviousOccurrenceOfThisPhrase;
AllUnitsSearchPrevSpeedButton.LoadGlyphFromLazarusResource('arrow_up');
AllUnitsSearchPrevSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_up');
// selected units
SelectedUnitsGroupBox.Caption:=lisUDSelectedUnits;
SelUnitsSearchEdit.Text:=ResStrSearch;
SelUnitsSearchNextSpeedButton.Hint:=lisUDSearchNextUnitOfThisPhrase;
SelUnitsSearchNextSpeedButton.LoadGlyphFromLazarusResource('arrow_down');
SelUnitsSearchNextSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_down');
SelUnitsSearchPrevSpeedButton.Hint:=lisUDSearchPreviousUnitOfThisPhrase;
SelUnitsSearchPrevSpeedButton.LoadGlyphFromLazarusResource('arrow_up');
SelUnitsSearchPrevSpeedButton.LoadGlyphFromResourceName(HInstance, 'arrow_up');
// popup menu
UnitsTVCopyFilenameMenuItem.Caption:=uemCopyFilename;

2
ide/viewunit_dlg.pp
View File

@ -445,7 +445,7 @@ begin
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;
SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically;
SortAlphabeticallySpeedButton.LoadGlyphFromLazarusResource('pkg_sortalphabetically');
SortAlphabeticallySpeedButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
end;
procedure TViewUnitDialog.OKButtonClick(Sender: TObject);

BIN
images/bookmark.res Normal file
View File

Binary file not shown.

2
images/laz_images.bat
View File

@ -1 +1 @@
..\tools\lazres laz_images.lrs @laz_images_list.txt
..\tools\lazres laz_images.rc @laz_images_list.txt

BIN
images/laz_images.res Normal file
View File

Binary file not shown.

6
packager/addtopackagedlg.pas
View File

@ -1179,12 +1179,12 @@ begin
with FilesBrowseButton do begin
Caption:=lisA2PAddFiles;
LoadGlyphFromLazarusResource('laz_add');
LoadGlyphFromResourceName(HInstance, 'laz_add');
end;
with FilesDirButton do begin
Caption:=lisAddFilesInDirectory;
LoadGlyphFromLazarusResource('pkg_files');
LoadGlyphFromResourceName(HInstance, 'pkg_files');
end;
with FilesShortenButton do begin
@ -1197,7 +1197,7 @@ begin
Caption:=lisDelete;
ShowHint:=true;
Hint:=lisDeleteSelectedFiles;
LoadGlyphFromLazarusResource('laz_delete');
LoadGlyphFromResourceName(HInstance, 'laz_delete');
end;
end;

4
packager/installpkgsetdlg.pas
View File

@ -200,10 +200,10 @@ begin
ExportButton.Caption:=lisExportList;
ImportButton.Caption:=lisImportList;
UninstallButton.Caption:=lisUninstallSelection;
UninstallButton.LoadGlyphFromLazarusResource('arrow_right');
UninstallButton.LoadGlyphFromResourceName(HInstance, 'arrow_right');
InstallPkgGroupBox.Caption:=lisPkgsInstalled;
AddToInstallButton.Caption:=lisInstallSelection;
AddToInstallButton.LoadGlyphFromLazarusResource('arrow_left');
AddToInstallButton.LoadGlyphFromResourceName(HInstance, 'arrow_left');
PkgInfoGroupBox.Caption := lisPackageInfo;
SaveAndRebuildButton.Caption:=lisSaveAndRebuildIDE;
SaveAndExitButton.Caption:=lisSaveAndExitDialog;

10
packager/packageeditor.pas
View File

@ -1392,16 +1392,16 @@ begin
MoreBitBtn.DropdownMenu := MorePopupMenu;
// Buttons on FilterPanel
OpenButton.LoadGlyphFromLazarusResource('laz_open');
OpenButton.LoadGlyphFromResourceName(HInstance, 'laz_open');
OpenButton.Hint:=lisOpenFile2;
SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
SortAlphabeticallyButton.LoadGlyphFromLazarusResource('pkg_sortalphabetically');
SortAlphabeticallyButton.LoadGlyphFromResourceName(HInstance, 'pkg_sortalphabetically');
DirectoryHierarchyButton.Hint:=lisPEShowDirectoryHierarchy;
DirectoryHierarchyButton.LoadGlyphFromLazarusResource('pkg_hierarchical');
DirectoryHierarchyButton.LoadGlyphFromResourceName(HInstance, 'pkg_hierarchical');
// Up / Down buttons
MoveUpBtn.LoadGlyphFromLazarusResource('arrow_up');
MoveDownBtn.LoadGlyphFromLazarusResource('arrow_down');
MoveUpBtn.LoadGlyphFromResourceName(HInstance, 'arrow_up');
MoveDownBtn.LoadGlyphFromResourceName(HInstance, 'arrow_down');
MoveUpBtn.Hint:=lisMoveSelectedUp;
MoveDownBtn.Hint:=lisMoveSelectedDown;