diff --git a/.gitattributes b/.gitattributes index 6724d5bf35..1373a54bf0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/components/codetools/ide/addassignmethoddlg.pas b/components/codetools/ide/addassignmethoddlg.pas index 8394d74548..fd2ab92082 100644 --- a/components/codetools/ide/addassignmethoddlg.pas +++ b/components/codetools/ide/addassignmethoddlg.pas @@ -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; diff --git a/components/codetools/ide/codyfrm.pas b/components/codetools/ide/codyfrm.pas index 3d5feec990..6722189624 100644 --- a/components/codetools/ide/codyfrm.pas +++ b/components/codetools/ide/codyfrm.pas @@ -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; diff --git a/components/editortoolbar/edttbconfigfrm.pas b/components/editortoolbar/edttbconfigfrm.pas index fc1a94b85b..1369a690b8 100644 --- a/components/editortoolbar/edttbconfigfrm.pas +++ b/components/editortoolbar/edttbconfigfrm.pas @@ -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; diff --git a/components/education/educomppalette.pas b/components/education/educomppalette.pas index ea569f7a04..7e9343b716 100644 --- a/components/education/educomppalette.pas +++ b/components/education/educomppalette.pas @@ -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; diff --git a/components/education/eduspeedbuttons.pas b/components/education/eduspeedbuttons.pas index fa88ce8e9b..a0e564d983 100644 --- a/components/education/eduspeedbuttons.pas +++ b/components/education/eduspeedbuttons.pas @@ -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; diff --git a/components/externhelp/externhelpfrm.pas b/components/externhelp/externhelpfrm.pas index 0b582aed11..43d9b4aeb2 100644 --- a/components/externhelp/externhelpfrm.pas +++ b/components/externhelp/externhelpfrm.pas @@ -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; diff --git a/components/ideintf/actionseditor.pas b/components/ideintf/actionseditor.pas index 08ff59e735..ead3e1959d 100644 --- a/components/ideintf/actionseditor.pas +++ b/components/ideintf/actionseditor.pas @@ -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); diff --git a/components/ideintf/filefilterpropeditor.pas b/components/ideintf/filefilterpropeditor.pas index 0690a819a1..8f57034117 100644 --- a/components/ideintf/filefilterpropeditor.pas +++ b/components/ideintf/filefilterpropeditor.pas @@ -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; diff --git a/components/ideintf/ideimagesintf.pas b/components/ideintf/ideimagesintf.pas index 04d25545d0..e68faf43d9 100644 --- a/components/ideintf/ideimagesintf.pas +++ b/components/ideintf/ideimagesintf.pas @@ -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); diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp index bd680f1501..c7c317fcc2 100644 --- a/components/ideintf/objectinspector.pp +++ b/components/ideintf/objectinspector.pp @@ -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 diff --git a/components/ideintf/treeviewpropedit.pas b/components/ideintf/treeviewpropedit.pas index dafc5106d9..e7963eb159 100644 --- a/components/ideintf/treeviewpropedit.pas +++ b/components/ideintf/treeviewpropedit.pas @@ -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; diff --git a/converter/convertsettings.pas b/converter/convertsettings.pas index d37ce89ac8..ae72cda319 100644 --- a/converter/convertsettings.pas +++ b/converter/convertsettings.pas @@ -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; diff --git a/converter/missingpropertiesdlg.pas b/converter/missingpropertiesdlg.pas index 37a6a2701c..8dcfba594c 100644 --- a/converter/missingpropertiesdlg.pas +++ b/converter/missingpropertiesdlg.pas @@ -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; diff --git a/converter/missingunits.pas b/converter/missingunits.pas index 362fc31a56..77ee99a344 100644 --- a/converter/missingunits.pas +++ b/converter/missingunits.pas @@ -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; diff --git a/debugger/exceptiondlg.pas b/debugger/exceptiondlg.pas index 659ceac238..a362841b2a 100644 --- a/debugger/exceptiondlg.pas +++ b/debugger/exceptiondlg.pas @@ -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; diff --git a/debugger/frames/debugger_language_exceptions_options.pas b/debugger/frames/debugger_language_exceptions_options.pas index 891b21bf5c..6979d9fa5e 100644 --- a/debugger/frames/debugger_language_exceptions_options.pas +++ b/debugger/frames/debugger_language_exceptions_options.pas @@ -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; diff --git a/debugger/frames/debugger_signals_options.pas b/debugger/frames/debugger_signals_options.pas index 150555fa3e..331a0b1f6e 100644 --- a/debugger/frames/debugger_signals_options.pas +++ b/debugger/frames/debugger_signals_options.pas @@ -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; diff --git a/designer/anchoreditor.pas b/designer/anchoreditor.pas index b625e11c02..3704924a49 100644 --- a/designer/anchoreditor.pas +++ b/designer/anchoreditor.pas @@ -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); diff --git a/designer/taborderdlg.pas b/designer/taborderdlg.pas index 7a48594dd5..d83b799bba 100644 --- a/designer/taborderdlg.pas +++ b/designer/taborderdlg.pas @@ -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; diff --git a/ide/addtoprojectdlg.pas b/ide/addtoprojectdlg.pas index 8bec4b1c32..3592a7d493 100644 --- a/ide/addtoprojectdlg.pas +++ b/ide/addtoprojectdlg.pas @@ -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; diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas index c90644ed5d..cf2f9944ae 100644 --- a/ide/buildlazdialog.pas +++ b/ide/buildlazdialog.pas @@ -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; diff --git a/ide/buildmodesmanager.pas b/ide/buildmodesmanager.pas index 31bca68945..49d2e4b113 100644 --- a/ide/buildmodesmanager.pas +++ b/ide/buildmodesmanager.pas @@ -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); diff --git a/ide/checklfmdlg.pas b/ide/checklfmdlg.pas index 41397e6f04..f5e7260609 100644 --- a/ide/checklfmdlg.pas +++ b/ide/checklfmdlg.pas @@ -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); diff --git a/ide/codebrowser.pas b/ide/codebrowser.pas index 54fcf86591..fcb43c6a42 100644 --- a/ide/codebrowser.pas +++ b/ide/codebrowser.pas @@ -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); diff --git a/ide/codecontextform.pas b/ide/codecontextform.pas index 2474f43806..36f2acbcd8 100644 --- a/ide/codecontextform.pas +++ b/ide/codecontextform.pas @@ -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); diff --git a/ide/codeexplorer.pas b/ide/codeexplorer.pas index aeb83480f0..cef42283b9 100644 --- a/ide/codeexplorer.pas +++ b/ide/codeexplorer.pas @@ -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); diff --git a/ide/componentpalette.pas b/ide/componentpalette.pas index 6395acd3d8..87ab2419d0 100644 --- a/ide/componentpalette.pas +++ b/ide/componentpalette.pas @@ -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'; diff --git a/ide/condef.pas b/ide/condef.pas index b0b973cc9d..7cf74b6e12 100644 --- a/ide/condef.pas +++ b/ide/condef.pas @@ -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 diff --git a/ide/customdefines.pas b/ide/customdefines.pas index 827d47bfce..698ce3bef6 100644 --- a/ide/customdefines.pas +++ b/ide/customdefines.pas @@ -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); diff --git a/ide/diffdialog.pas b/ide/diffdialog.pas index 4c2d7ee791..df79264bce 100644 --- a/ide/diffdialog.pas +++ b/ide/diffdialog.pas @@ -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; diff --git a/ide/editmsgscannersdlg.pas b/ide/editmsgscannersdlg.pas index 6252e89108..2e75d8c958 100644 --- a/ide/editmsgscannersdlg.pas +++ b/ide/editmsgscannersdlg.pas @@ -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; diff --git a/ide/editorfilemanager.pas b/ide/editorfilemanager.pas index 4c73e69e7d..ebac818e74 100644 --- a/ide/editorfilemanager.pas +++ b/ide/editorfilemanager.pas @@ -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); diff --git a/ide/etmessageframe.pas b/ide/etmessageframe.pas index 818c8df5a3..802584705e 100644 --- a/ide/etmessageframe.pas +++ b/ide/etmessageframe.pas @@ -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; diff --git a/ide/examplemanager.pas b/ide/examplemanager.pas index ff9518deb1..2017ec8a41 100644 --- a/ide/examplemanager.pas +++ b/ide/examplemanager.pas @@ -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; diff --git a/ide/findreplacedialog.pp b/ide/findreplacedialog.pp index a264ba39f9..639494b92d 100644 --- a/ide/findreplacedialog.pp +++ b/ide/findreplacedialog.pp @@ -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 diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas index f342e1c55e..af8e4ca9e9 100644 --- a/ide/fpdoceditwindow.pas +++ b/ide/fpdoceditwindow.pas @@ -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); diff --git a/ide/frames/compiler_buildmacro_options.pas b/ide/frames/compiler_buildmacro_options.pas index 7d0d484e40..fb8ee3cf82 100644 --- a/ide/frames/compiler_buildmacro_options.pas +++ b/ide/frames/compiler_buildmacro_options.pas @@ -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; diff --git a/ide/frames/compiler_path_options.pas b/ide/frames/compiler_path_options.pas index 3cb2ba592a..1a96420815 100644 --- a/ide/frames/compiler_path_options.pas +++ b/ide/frames/compiler_path_options.pas @@ -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; diff --git a/ide/frames/componentpalette_options.pas b/ide/frames/componentpalette_options.pas index a03692d029..e0a619ca8c 100644 --- a/ide/frames/componentpalette_options.pas +++ b/ide/frames/componentpalette_options.pas @@ -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; diff --git a/ide/frames/editor_general_options.pas b/ide/frames/editor_general_options.pas index 3a65c4643e..eeef87b1d5 100644 --- a/ide/frames/editor_general_options.pas +++ b/ide/frames/editor_general_options.pas @@ -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; diff --git a/ide/frames/editor_indent_options.pas b/ide/frames/editor_indent_options.pas index b64f07391c..e4a010db9c 100644 --- a/ide/frames/editor_indent_options.pas +++ b/ide/frames/editor_indent_options.pas @@ -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; diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas index b69a85d41e..fc1efa89ec 100644 --- a/ide/frames/editor_keymapping_options.pas +++ b/ide/frames/editor_keymapping_options.pas @@ -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'); diff --git a/ide/frames/project_application_options.pas b/ide/frames/project_application_options.pas index 51f406400d..acb51a5baa 100644 --- a/ide/frames/project_application_options.pas +++ b/ide/frames/project_application_options.pas @@ -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; diff --git a/ide/frames/project_forms_options.pas b/ide/frames/project_forms_options.pas index 3d1c52e1b5..09f97edb11 100644 --- a/ide/frames/project_forms_options.pas +++ b/ide/frames/project_forms_options.pas @@ -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); diff --git a/ide/frames/project_lazdoc_options.pas b/ide/frames/project_lazdoc_options.pas index c2c25cdcb8..b3358c0f53 100644 --- a/ide/frames/project_lazdoc_options.pas +++ b/ide/frames/project_lazdoc_options.pas @@ -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; diff --git a/ide/genericchecklist.pas b/ide/genericchecklist.pas index 1b461a7fc9..c959b11c24 100644 --- a/ide/genericchecklist.pas +++ b/ide/genericchecklist.pas @@ -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; diff --git a/ide/imexportcompileropts.pas b/ide/imexportcompileropts.pas index d4f41e3bac..fe146b4100 100644 --- a/ide/imexportcompileropts.pas +++ b/ide/imexportcompileropts.pas @@ -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; diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas index 737c0784cc..ed19e6a4a6 100644 --- a/ide/initialsetupdlgs.pas +++ b/ide/initialsetupdlgs.pas @@ -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; diff --git a/ide/main.pp b/ide/main.pp index b28b0a98e9..7e9389d33d 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -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. diff --git a/ide/msgvieweditor.pas b/ide/msgvieweditor.pas index d2b04010b8..9d7d56c1cc 100644 --- a/ide/msgvieweditor.pas +++ b/ide/msgvieweditor.pas @@ -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); diff --git a/ide/patheditordlg.pas b/ide/patheditordlg.pas index fc4e2c2147..25e3c30847 100644 --- a/ide/patheditordlg.pas +++ b/ide/patheditordlg.pas @@ -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); diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas index 8e925b2f3a..6008108555 100644 --- a/ide/projectinspector.pas +++ b/ide/projectinspector.pas @@ -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); diff --git a/ide/projectwizarddlg.pas b/ide/projectwizarddlg.pas index 3bb43e1469..dd66e0c43d 100644 --- a/ide/projectwizarddlg.pas +++ b/ide/projectwizarddlg.pas @@ -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; diff --git a/ide/publishprojectdlg.pas b/ide/publishprojectdlg.pas index d8f1f888d7..3e1d880175 100644 --- a/ide/publishprojectdlg.pas +++ b/ide/publishprojectdlg.pas @@ -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; diff --git a/ide/runparamsopts.pas b/ide/runparamsopts.pas index 0f9bbabdad..2a137278c9 100644 --- a/ide/runparamsopts.pas +++ b/ide/runparamsopts.pas @@ -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; diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp index 7a4978eabf..18df574833 100644 --- a/ide/sourceeditor.pp +++ b/ide/sourceeditor.pp @@ -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; diff --git a/ide/sourcemarks.pas b/ide/sourcemarks.pas index 44905e3e25..ecc0e1d46d 100644 --- a/ide/sourcemarks.pas +++ b/ide/sourcemarks.pas @@ -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; diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas index 07310061c8..4b89738d2d 100644 --- a/ide/unitdependencies.pas +++ b/ide/unitdependencies.pas @@ -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; diff --git a/ide/viewunit_dlg.pp b/ide/viewunit_dlg.pp index 397b5f2f51..67de98e8d7 100644 --- a/ide/viewunit_dlg.pp +++ b/ide/viewunit_dlg.pp @@ -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); diff --git a/images/bookmark.res b/images/bookmark.res new file mode 100644 index 0000000000..fcd6271960 Binary files /dev/null and b/images/bookmark.res differ diff --git a/images/laz_images.bat b/images/laz_images.bat index 538217f82a..657170d052 100644 --- a/images/laz_images.bat +++ b/images/laz_images.bat @@ -1 +1 @@ -..\tools\lazres laz_images.lrs @laz_images_list.txt +..\tools\lazres laz_images.rc @laz_images_list.txt diff --git a/images/laz_images.res b/images/laz_images.res new file mode 100644 index 0000000000..c2504dd758 Binary files /dev/null and b/images/laz_images.res differ diff --git a/packager/addtopackagedlg.pas b/packager/addtopackagedlg.pas index 43397bafb0..3a2114fd0b 100644 --- a/packager/addtopackagedlg.pas +++ b/packager/addtopackagedlg.pas @@ -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; diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas index 3794b880b4..be1e84d0d7 100644 --- a/packager/installpkgsetdlg.pas +++ b/packager/installpkgsetdlg.pas @@ -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; diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas index 25010f1ddf..e47730d6d4 100644 --- a/packager/packageeditor.pas +++ b/packager/packageeditor.pas @@ -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;