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

IDE: use TLCLGlyphs for IDE buttons

Browse Source 
git-svn-id: trunk@57857 -
This commit is contained in:
ondrej 2018-05-08 23:10:58 +00:00
parent 56ba252d91
commit a914eaa29d
64 changed files with 238 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/externhelp/externhelpfrm.pas
View File

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

4
components/ideintf/filefilterpropeditor.pas
View File

@ -49,8 +49,8 @@ begin
Caption:=peFilterEditor;
StringGrid1.Cells[0, 0] := peFilterName;
StringGrid1.Cells[1, 0] := peFilter;
TIDEImages.AssignImage(MoveUpBtn.Glyph, 'arrow_up');
TIDEImages.AssignImage(MoveDownBtn.Glyph, 'arrow_down');
IDEImages.AssignImage(MoveUpBtn, 'arrow_up');
IDEImages.AssignImage(MoveDownBtn, 'arrow_down');
MoveUpBtn.Hint := rscdMoveUp;
MoveDownBtn.Hint := rscdMoveDown;
IDEDialogLayoutList.ApplyLayout(Self);

6
components/ideintf/frmselectprops.pas
View File

@ -76,11 +76,11 @@ implementation
procedure TSelectPropertiesForm.SelectPropertiesFormCreate(Sender: TObject);
begin
BAdd.Caption:=ilesAdd;
TIDEImages.AssignImage(BAdd.Glyph, 'laz_add');
IDEImages.AssignImage(BAdd, 'laz_add');
BDelete.Caption:=oisDelete;
TIDEImages.AssignImage(BDelete.Glyph, 'laz_delete');
IDEImages.AssignImage(BDelete, 'laz_delete');
BClear.Caption:=oisClear;
TIDEImages.AssignImage(BClear.Glyph, 'menu_clean');
IDEImages.AssignImage(BClear, 'menu_clean');
LComponents.Caption:=oisBtnComponents;
LProperties.Caption:=oisBtnProperties;
LLBSelected.Caption:=oisSelectedProperties;

43
components/ideintf/ideimagesintf.pas
View File

@ -26,7 +26,7 @@ interface
uses
Classes, SysUtils, LCLProc, LCLType, ImgList, Controls, Graphics, LResources,
Math;
Math, Buttons;
type
@ -37,6 +37,8 @@ type
FImages_12: TLCLGlyphs;
FImages_16: TLCLGlyphs;
FImages_24: TLCLGlyphs;
procedure FImages_24_GetWidthForPPI(Sender: TCustomImageList; AImageWidth,
APPI: Integer; var AResultWidth: Integer);
function GetImages(Size: Integer): TLCLGlyphs;
protected
function GetImages_12: TLCLGlyphs;
@ -54,6 +56,10 @@ type
class function CreateImage(ImageSize: Integer; ImageName: String): TCustomBitmap; deprecated 'Use the other overload instead.';
class function CreateImage(ImageName: String; ImageSize: Integer = 16): TCustomBitmap;
class procedure AssignImage(const ABitmap: TCustomBitmap; ImageName: String;
ImageSize: Integer = 16); deprecated 'Use the other overloads instead.';
procedure AssignImage(const ABitBtn: TCustomBitBtn; ImageName: String;
ImageSize: Integer = 16);
procedure AssignImage(const ASpeedButton: TCustomSpeedButton; ImageName: String;
ImageSize: Integer = 16);
class function AddImageToImageList(const AImageList: TImageList;
ImageName: String; ImageSize: Integer = 16): Integer;
@ -84,9 +90,9 @@ begin
if FImages_12 = nil then
begin
FImages_12 := TLCLGlyphs.Create(nil);
FImages_12.RegisterResolutions([12, 16, 24]);
FImages_12.Width := 12;
FImages_12.Height := FImages_12.Width;
FImages_12.RegisterResolutions([12, 16, 24]);
end;
Result := FImages_12;
end;
@ -96,9 +102,9 @@ begin
if FImages_16 = nil then
begin
FImages_16 := TLCLGlyphs.Create(nil);
FImages_16.RegisterResolutions([16, 24, 32]);
FImages_16.Width := 16;
FImages_16.Height := FImages_16.Width;
FImages_16.RegisterResolutions([16, 24, 32]);
end;
Result := FImages_16;
end;
@ -108,9 +114,9 @@ begin
if FImages_24 = nil then
begin
FImages_24 := TLCLGlyphs.Create(nil);
FImages_24.RegisterResolutions([24, 32, 48]);
FImages_24.Width := 24;
FImages_24.Height := FImages_24.Width;
FImages_24.RegisterResolutions([24, 36, 48]);
end;
Result := FImages_24;
end;
@ -165,6 +171,13 @@ begin
inherited Destroy;
end;
procedure TIDEImages.FImages_24_GetWidthForPPI(Sender: TCustomImageList;
AImageWidth, APPI: Integer; var AResultWidth: Integer);
begin
if (30<=AResultWidth) and (AResultWidth<=40) then
AResultWidth := 32;
end;
class procedure TIDEImages.AssignImage(const ABitmap: TCustomBitmap;
ImageName: String; ImageSize: Integer);
var
@ -192,6 +205,28 @@ begin
end;
end;
procedure TIDEImages.AssignImage(const ABitBtn: TCustomBitBtn;
ImageName: String; ImageSize: Integer);
var
IL: TLCLGlyphs;
begin
IL := Images[ImageSize];
if IL=nil then Exit;
ABitBtn.Images := IL;
ABitBtn.ImageIndex := IL.GetImageIndex(ImageName);
end;
procedure TIDEImages.AssignImage(const ASpeedButton: TCustomSpeedButton;
ImageName: String; ImageSize: Integer);
var
IL: TLCLGlyphs;
begin
IL := Images[ImageSize];
if IL=nil then Exit;
ASpeedButton.Images := IL;
ASpeedButton.ImageIndex := IL.GetImageIndex(ImageName);
end;
class function TIDEImages.ScaledSize(ImageSize: Integer): Integer;
begin
Result := ImageSize * GetScalePercent div 100;

2
components/ideintf/objectinspector.pp
View File

@ -1126,7 +1126,7 @@ begin
end;
FHintManager := THintWindowManager.Create;
FActiveRowBmp := TIDEImages.CreateImage('pg_active_row', 9);
FActiveRowBmp := TIDEImages.CreateImage('pg_active_row', 9); // todo: replace with image list
FDefaultItemHeight:=DefItemHeight;

4
components/ideintf/treeviewpropedit.pas
View File

@ -123,8 +123,8 @@ begin
BtnLoad.Caption := sccsTrEdtLoad;
BtnSave.Caption := sccsTrEdtSave;
BtnApply.Caption := sccsTrEdtApply;
TIDEImages.AssignImage(MoveUpBtn.Glyph, 'arrow_up');
TIDEImages.AssignImage(MoveDownBtn.Glyph, 'arrow_down');
IDEImages.AssignImage(MoveUpBtn, 'arrow_up');
IDEImages.AssignImage(MoveDownBtn, 'arrow_down');
MoveUpBtn.Hint:=rscdMoveUp;
MoveDownBtn.Hint:=rscdMoveDown;

2
components/lazsvnpkg/svndiffform.pas
View File

@ -110,7 +110,7 @@ procedure TSVNDiffFrm.FormCreate(Sender: TObject);
begin
ButtonPanel.HelpButton.Enabled := False;
ButtonPanel.HelpButton.Caption := rsSave;
TIDEImages.AssignImage(ButtonPanel.HelpButton.Glyph, 'laz_save');
IDEImages.AssignImage(ButtonPanel.HelpButton, 'laz_save');
end;
procedure TSVNDiffFrm.FormClose(Sender: TObject; var CloseAction: TCloseAction);

2
components/lazsvnpkg/svnupdateform.pas
View File

@ -85,7 +85,7 @@ begin
ButtonPanel.OKButton.OnClick := @OKButtonClick;
ButtonPanel.HelpButton.Caption := rsShowLog;
TIDEImages.AssignImage(ButtonPanel.HelpButton.Glyph, 'tsynsyncroedit');
IDEImages.AssignImage(ButtonPanel.HelpButton, 'tsynsyncroedit');
mnuShowDiff.Caption:=rsShowDiff;
end;

2
components/sparta/smartformeditor/source/sparta_componentpalette.pas
View File

@ -528,7 +528,7 @@ procedure TComponentsPalette.UpdateComponentsList;
LButton := TSpeedButton.Create(LPage);
with LButton do
begin
TIDEImages.AssignImage(Glyph, 'tmouse');
IDEImages.AssignImage(LButton, 'tmouse');
Hint := 'Selection tool';
ShowHint := True;

6
converter/chgencodingdlg.pas
View File

@ -116,9 +116,9 @@ begin
CloseButton.Caption:=lisClose;
ApplyButton.Caption:=lisConvert;
HelpButton.Caption:=lisHelp;
TIDEImages.AssignImage(CloseButton.Glyph, 'btn_close');
TIDEImages.AssignImage(ApplyButton.Glyph, 'btn_ok');
TIDEImages.AssignImage(HelpButton.Glyph, 'btn_help');
IDEImages.AssignImage(CloseButton, 'btn_close');
IDEImages.AssignImage(ApplyButton, 'btn_ok');
IDEImages.AssignImage(HelpButton, 'btn_help');
PreviewGroupBox.Caption:=dlgWRDPreview;
PreviewListView.Column[0].Caption:=dlgEnvFiles;

10
converter/convertsettings.pas
View File

@ -883,11 +883,11 @@ begin
// File system scanning
ScanLabel.Caption := lisScanParentDir;
StopScanButton.Caption:=lisStop;
TIDEImages.AssignImage(StopScanButton.Glyph, 'menu_stop');
IDEImages.AssignImage(StopScanButton, 'menu_stop');
// Unit Replacements
UnitReplaceDivider.Caption:=lisConvUnitReplacements;
UnitReplaceButton.Caption:=lisEdit; // Recycled string.
TIDEImages.AssignImage(UnitReplaceButton.Glyph, 'laz_edit');
IDEImages.AssignImage(UnitReplaceButton, 'laz_edit');
UnitReplaceDivider.Hint:=lisConvUnitReplHint;
UnitReplaceButton.Hint:=lisConvUnitReplHint;
UnitReplaceComboBox.Items.Add(lisDisabled); // 'Disabled'
@ -901,7 +901,7 @@ begin
// Type Replacements
TypeReplaceDivider.Caption:=lisConvTypeReplacements;
TypeReplaceButton.Caption:=lisEdit;
TIDEImages.AssignImage(TypeReplaceButton.Glyph, 'laz_edit');
IDEImages.AssignImage(TypeReplaceButton, 'laz_edit');
TypeReplaceDivider.Hint:=lisConvTypeReplHint;
TypeReplaceButton.Hint:=lisConvTypeReplHint;
TypeReplaceComboBox.Items.Add(lisInteractive);
@ -909,7 +909,7 @@ begin
// Func Replacements
FuncReplaceDivider.Caption:=lisConvFuncReplacements;
FuncReplaceButton.Caption:=lisEdit;
TIDEImages.AssignImage(FuncReplaceButton.Glyph, 'laz_edit');
IDEImages.AssignImage(FuncReplaceButton, 'laz_edit');
FuncReplaceDivider.Hint:=lisConvFuncReplHint;
FuncReplaceButton.Hint:=lisConvFuncReplHint;
FuncReplaceComboBox.Items.Add(lisDisabled);
@ -918,7 +918,7 @@ begin
// Coordinate Offsets
CoordOffsDivider.Caption:=lisConvCoordOffs;
CoordOffsButton.Caption:=lisEdit;
TIDEImages.AssignImage(CoordOffsButton.Glyph, 'laz_edit');
IDEImages.AssignImage(CoordOffsButton, 'laz_edit');
CoordOffsDivider.Hint:=lisConvCoordHint;
CoordOffsButton.Hint:=lisConvCoordHint;
CoordOffsComboBox.Items.Add(lisDisabled);

2
converter/missingpropertiesdlg.pas
View File

@ -741,7 +741,7 @@ begin
PropertiesText.Caption:=lisProperties;
TypesText.Caption:=lisTypes;
ReplaceAllButton.Caption:=lisReplaceRemoveUnknown;
TIDEImages.AssignImage(ReplaceAllButton.Glyph, 'laz_refresh');
IDEImages.AssignImage(ReplaceAllButton, '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;
TIDEImages.AssignImage(SearchButton.Glyph, 'menu_search_find');
IDEImages.AssignImage(SearchButton, 'menu_search_find');
SkipButton.Caption:=lisMissingUnitsSkip;
TIDEImages.AssignImage(SkipButton.Glyph, 'debugger_current_line_breakpoint');
TIDEImages.AssignImage(CommentButton.Glyph, 'menu_comment'); // or insertremark
IDEImages.AssignImage(SkipButton, 'debugger_current_line_breakpoint');
IDEImages.AssignImage(CommentButton, '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 := lisMenuContinue;
cbIgnoreExceptionType.Caption := lisIgnoreExceptionType;
TIDEImages.AssignImage(btnBreak.Glyph, 'menu_pause');
TIDEImages.AssignImage(btnContinue.Glyph, 'menu_run');
IDEImages.AssignImage(btnBreak, 'menu_pause');
IDEImages.AssignImage(btnContinue, 'menu_run');
DefaultControl := btnBreak;
CancelControl := btnContinue;

4
debugger/frames/debugger_language_exceptions_options.pas
View File

@ -149,8 +149,8 @@ begin
DbgLangExceptHint.Caption := lisTheseSettingsAreStoredWithTheProject;
cmdExceptionRemove.Caption := lisRemove;
cmdExceptionAdd.Caption := lisAdd;
TIDEImages.AssignImage(cmdExceptionRemove.Glyph, 'laz_delete');
TIDEImages.AssignImage(cmdExceptionAdd.Glyph, 'laz_add');
IDEImages.AssignImage(cmdExceptionRemove, 'laz_delete');
IDEImages.AssignImage(cmdExceptionAdd, '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;
TIDEImages.AssignImage(cmdSignalAdd.Glyph, 'laz_add');
TIDEImages.AssignImage(cmdSignalRemove.Glyph, 'laz_delete');
IDEImages.AssignImage(cmdSignalAdd, 'laz_add');
IDEImages.AssignImage(cmdSignalRemove, 'laz_delete');
mnuHandledByProgram.Caption := lisDebugOptionsFrmHandledByProgram;
mnuiHandledByDebugger.Caption := lisDebugOptionsFrmHandledByDebugger;

24
designer/anchoreditor.pas
View File

@ -466,18 +466,18 @@ end;
procedure TAnchorDesigner.LoadGlyphs;
begin
TIDEImages.AssignImage(LeftRefLeftSpeedButton.Glyph, 'anchor_left_left');
TIDEImages.AssignImage(LeftRefCenterSpeedButton.Glyph, 'anchor_left_center');
TIDEImages.AssignImage(LeftRefRightSpeedButton.Glyph, 'anchor_left_right');
TIDEImages.AssignImage(RightRefLeftSpeedButton.Glyph, 'anchor_right_left');
TIDEImages.AssignImage(RightRefCenterSpeedButton.Glyph, 'anchor_right_center');
TIDEImages.AssignImage(RightRefRightSpeedButton.Glyph, 'anchor_right_right');
TIDEImages.AssignImage(TopRefTopSpeedButton.Glyph, 'anchor_top_top');
TIDEImages.AssignImage(TopRefCenterSpeedButton.Glyph, 'anchor_top_center');
TIDEImages.AssignImage(TopRefBottomSpeedButton.Glyph, 'anchor_top_bottom');
TIDEImages.AssignImage(BottomRefTopSpeedButton.Glyph, 'anchor_bottom_top');
TIDEImages.AssignImage(BottomRefCenterSpeedButton.Glyph, 'anchor_bottom_center');
TIDEImages.AssignImage(BottomRefBottomSpeedButton.Glyph, 'anchor_bottom_bottom');
IDEImages.AssignImage(LeftRefLeftSpeedButton, 'anchor_left_left');
IDEImages.AssignImage(LeftRefCenterSpeedButton, 'anchor_left_center');
IDEImages.AssignImage(LeftRefRightSpeedButton, 'anchor_left_right');
IDEImages.AssignImage(RightRefLeftSpeedButton, 'anchor_right_left');
IDEImages.AssignImage(RightRefCenterSpeedButton, 'anchor_right_center');
IDEImages.AssignImage(RightRefRightSpeedButton, 'anchor_right_right');
IDEImages.AssignImage(TopRefTopSpeedButton, 'anchor_top_top');
IDEImages.AssignImage(TopRefCenterSpeedButton, 'anchor_top_center');
IDEImages.AssignImage(TopRefBottomSpeedButton, 'anchor_top_bottom');
IDEImages.AssignImage(BottomRefTopSpeedButton, 'anchor_bottom_top');
IDEImages.AssignImage(BottomRefCenterSpeedButton, 'anchor_bottom_center');
IDEImages.AssignImage(BottomRefBottomSpeedButton, 'anchor_bottom_bottom');
end;
procedure TAnchorDesigner.CreateSideControls;

30
designer/menueditor.pp
View File

@ -590,26 +590,26 @@ var
r: TRect;
TextSize: TSize;
TextPoint, AddBmpPoint: TPoint;
AddBmp: TCustomBitmap;
AddBmp: TImageIndex;
IL: TLCLGlyphs;
Res: TScaledImageListResolution;
begin
r:=ClientRect;
Canvas.FillRect(r);
Canvas.RoundRect(r, 3, 3);
try
AddBmp:=TIDEImages.CreateImage('laz_add');
TextSize:=Canvas.TextExtent(Caption);
TextPoint.y:=(r.Bottom - r.Top - TextSize.cy) div 2;
if (TextPoint.y < 1) then
TextPoint.y:=1;
TextPoint.x:=(r.Right - r.Left - TextSize.cx + AddBmp.Width) div 2;
Canvas.TextRect(r, TextPoint.x, TextPoint.y, Caption);
IL:=IDEImages.Images_16;
AddBmp:=IL.GetImageIndex('laz_add');
Res:=IL.ResolutionForControl[0, Self];
TextSize:=Canvas.TextExtent(Caption);
TextPoint.y:=(r.Bottom - r.Top - TextSize.cy) div 2;
if (TextPoint.y < 1) then
TextPoint.y:=1;
TextPoint.x:=(r.Right - r.Left - TextSize.cx + Res.Width) div 2;
Canvas.TextRect(r, TextPoint.x, TextPoint.y, Caption);
AddBmpPoint.x:=(TextPoint.x - AddBmp.Width) div 2;
AddBmpPoint.y:=(r.Bottom - r.Top - AddBmp.Height) div 2;
Canvas.Draw(AddBmpPoint.x, AddBmpPoint.y, AddBmp);
finally
AddBmp.Free;
end;
AddBmpPoint.x:=(TextPoint.x - Res.Width) div 2;
AddBmpPoint.y:=(r.Bottom - r.Top - Res.Height) div 2;
Res.Draw(Canvas, AddBmpPoint.x, AddBmpPoint.y, AddBmp);
end;
procedure TFake.Refresh;

26
designer/menueditorform.pas
View File

@ -475,18 +475,18 @@ procedure TMenuDesignerForm.LoadVariableButtonGlyphs(isInMenubar: boolean);
begin
if isInMenubar then
begin
TIDEImages.AssignImage(MoveItemUpButton.Glyph, 'arrow_left');
TIDEImages.AssignImage(MoveItemDownButton.Glyph, 'arrow_right');
TIDEImages.AssignImage(AddItemAboveButton.Glyph, 'add_item_left', 24);
TIDEImages.AssignImage(AddItemBelowButton.Glyph, 'add_item_right', 24);
TIDEImages.AssignImage(AddSubMenuButton.Glyph, 'add_submenu_below', 24);
IDEImages.AssignImage(MoveItemUpButton, 'arrow_left');
IDEImages.AssignImage(MoveItemDownButton, 'arrow_right');
IDEImages.AssignImage(AddItemAboveButton, 'add_item_left', 24);
IDEImages.AssignImage(AddItemBelowButton, 'add_item_right', 24);
IDEImages.AssignImage(AddSubMenuButton, 'add_submenu_below', 24);
end else
begin
TIDEImages.AssignImage(MoveItemUpButton.Glyph, 'arrow_up');
TIDEImages.AssignImage(MoveItemDownButton.Glyph, 'arrow_down');
TIDEImages.AssignImage(AddItemAboveButton.Glyph, 'add_item_above', 24);
TIDEImages.AssignImage(AddItemBelowButton.Glyph, 'add_item_below', 24);
TIDEImages.AssignImage(AddSubMenuButton.Glyph, 'add_submenu_right', 24);
IDEImages.AssignImage(MoveItemUpButton, 'arrow_up');
IDEImages.AssignImage(MoveItemDownButton, 'arrow_down');
IDEImages.AssignImage(AddItemAboveButton, 'add_item_above', 24);
IDEImages.AssignImage(AddItemBelowButton, 'add_item_below', 24);
IDEImages.AssignImage(AddSubMenuButton, 'add_submenu_right', 24);
end;
UpdateSubmenuGroupBox(nil, nil);
FDesigner.VariableGlyphsInMenuBar:=isInMenubar;
@ -494,9 +494,9 @@ end;
procedure TMenuDesignerForm.LoadFixedButtonGlyphs;
begin
TIDEImages.AssignImage(DeleteItemButton.Glyph, 'laz_delete');
TIDEImages.AssignImage(AddSeparatorAboveButton.Glyph, 'add_sep_above', 24);
TIDEImages.AssignImage(AddSeparatorBelowButton.Glyph, 'add_sep_below', 24);
IDEImages.AssignImage(DeleteItemButton, 'laz_delete');
IDEImages.AssignImage(AddSeparatorAboveButton, 'add_sep_above', 24);
IDEImages.AssignImage(AddSeparatorBelowButton, 'add_sep_below', 24);
HelpButton.Hint:=lisMenuEditorGetHelpToUseThisEditor;
end;

6
designer/taborderdlg.pas
View File

@ -139,9 +139,9 @@ begin
GlobalDesignHook.AddHandlerDeletePersistent(@OnDeletePersistent);
GlobalDesignHook.AddHandlerSetSelection(@OnSetSelection);
TIDEImages.AssignImage(ArrowDown.Glyph, 'arrow_down');
TIDEImages.AssignImage(ArrowUp.Glyph, 'arrow_up');
TIDEImages.AssignImage(SortByPositionButton.Glyph, 'menu_edit_sort');
IDEImages.AssignImage(ArrowDown, 'arrow_down');
IDEImages.AssignImage(ArrowUp, 'arrow_up');
IDEImages.AssignImage(SortByPositionButton, 'menu_edit_sort');
ArrowDown.Hint:=lisTabOrderDownHint;
ArrowUp.Hint:=lisTabOrderUpHint;

4
ide/addtoprojectdlg.pas
View File

@ -343,7 +343,7 @@ begin
with FilesDirButton do begin
Caption:=lisAddFilesInDirectory;
TIDEImages.AssignImage(Glyph, 'pkg_files');
IDEImages.AssignImage(FilesDirButton, 'pkg_files');
end;
with FilesShortenButton do begin
@ -356,7 +356,7 @@ begin
Caption:=lisDelete;
ShowHint:=true;
Hint:=lisDeleteSelectedFiles;
TIDEImages.AssignImage(Glyph, 'laz_delete');
IDEImages.AssignImage(FilesDeleteButton, 'laz_delete');
end;
UpdateFilesButtons;

2
ide/allcompileroptions.pas
View File

@ -85,7 +85,7 @@ procedure TfrmAllCompilerOptions.FormCreate(Sender: TObject);
begin
Caption:=lisAllOptions;
edOptionsFilter.Hint := lisFilterTheAvailableOptionsList;
TIDEImages.AssignImage(btnResetOptionsFilter.Glyph, ResBtnListFilter);
IDEImages.AssignImage(btnResetOptionsFilter, ResBtnListFilter);
btnResetOptionsFilter.Enabled := False;
btnResetOptionsFilter.Hint := lisClearTheFilterForOptions;
cbShowModified.Caption:=lisShowOnlyModified;

6
ide/buildlazdialog.pas
View File

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

2
ide/charactermapdlg.pas
View File

@ -127,7 +127,7 @@ begin
RangeLabel.Caption := lisRange;
SortUniRangeListButton.Flat:=True;
SortUniRangeListButton.Hint:=lisSortUnicodeRangeListAlphabetically;
TIDEImages.AssignImage(SortUniRangeListButton.Glyph, 'pkg_sortalphabetically');
IDEImages.AssignImage(SortUniRangeListButton, 'pkg_sortalphabetically');
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CloseButton.Caption:=lisBtnClose;

2
ide/checklfmdlg.pas
View File

@ -749,7 +749,7 @@ begin
ErrorsGroupBox.Caption:=lisErrors;
LFMGroupBox.Caption:=lisLFMFile;
RemoveAllButton.Caption:=lisRemoveAllInvalidProperties;
TIDEImages.AssignImage(RemoveAllButton.Glyph, 'laz_delete');
IDEImages.AssignImage(RemoveAllButton, 'laz_delete');
CancelButton.Caption:=lisCancel;
EditorOpts.GetHighlighterSettings(SynLFMSyn1);
EditorOpts.GetSynEditSettings(LFMSynEdit);

2
ide/codecontextform.pas
View File

@ -518,7 +518,7 @@ begin
Btn.Name:='CopyAllSpeedButton'+IntToStr(i+1);
Btn.OnClick:=@CopyAllBtnClick;
Btn.Visible:=false;
TIDEImages.AssignImage(Btn.Glyph, 'laz_copy');
IDEImages.AssignImage(Btn, 'laz_copy');
Btn.Flat:=true;
Btn.Parent:=Self;
FHints.Add(Item);

12
ide/codeexplorer.pas
View File

@ -721,10 +721,10 @@ procedure TCodeExplorerView.AssignAllImages;
var
ImageSize: Integer;
begin
TIDEImages.AssignImage(CodeRefreshSpeedButton.Glyph, 'laz_refresh');
TIDEImages.AssignImage(CodeOptionsSpeedButton.Glyph, 'menu_environment_options');
TIDEImages.AssignImage(DirRefreshSpeedButton.Glyph, 'laz_refresh');
TIDEImages.AssignImage(DirOptionsSpeedButton.Glyph, 'menu_environment_options');
IDEImages.AssignImage(CodeRefreshSpeedButton, 'laz_refresh');
IDEImages.AssignImage(CodeOptionsSpeedButton, 'menu_environment_options');
IDEImages.AssignImage(DirRefreshSpeedButton, 'laz_refresh');
IDEImages.AssignImage(DirOptionsSpeedButton, 'menu_environment_options');
ImageSize := TIDEImages.ScaledSize;
Imagelist1.Width := ImageSize;
@ -1964,11 +1964,11 @@ procedure TCodeExplorerView.UpdateMode;
begin
if FMode=cemCategory
then begin
TIDEImages.AssignImage(CodeModeSpeedButton.Glyph, 'show_category');
IDEImages.AssignImage(CodeModeSpeedButton, 'show_category');
CodeModeSpeedButton.Hint:=lisCEModeShowSourceNodes;
end
else begin
TIDEImages.AssignImage(CodeModeSpeedButton.Glyph, 'show_source');
IDEImages.AssignImage(CodeModeSpeedButton, 'show_source');
CodeModeSpeedButton.Hint:=lisCEModeShowCategories;
end;
Refresh(true);

4
ide/componentpalette.pas
View File

@ -355,7 +355,7 @@ begin
BtnRight:=TSpeedButton.Create(PageComponent);
with BtnRight do
begin
TIDEImages.AssignImage(Glyph, 'SelCompPage');
IDEImages.AssignImage(BtnRight, 'SelCompPage');
Flat := True;
Hint := lisClickToSelectPalettePage;
ShowHint := True;
@ -408,7 +408,7 @@ begin
Name := CompPalSelectionToolBtnPrefix + aButtonUniqueName;
OnClick := @Pal.SelectionToolClick;
OnMouseWheel := @Pal.OnPageMouseWheel;
TIDEImages.AssignImage(Glyph, 'tmouse');
IDEImages.AssignImage(Btn, 'tmouse');
Flat := True;
GroupIndex:= 1;
Down := True;

2
ide/comppagespopup.pas
View File

@ -109,7 +109,7 @@ end;
procedure TDlgCompPagesPopup.FormCreate(Sender: TObject);
begin
TIDEImages.AssignImage(cBtnClose.Glyph, 'menu_close');
IDEImages.AssignImage(cBtnClose, 'menu_close');
ImageList1.Width := TIDEImages.ScaledSize;
ImageList1.Height := TIDEImages.ScaledSize;

4
ide/definesgui.pas
View File

@ -82,9 +82,9 @@ begin
Caption := lisLazBuildDefines;
gbNewDefine.Caption := lisCodeToolsDefsDefine;
AddBtn.Caption := lisBtnAdd;
TIDEImages.AssignImage(AddBtn.Glyph, 'laz_add');
IDEImages.AssignImage(AddBtn, 'laz_add');
RemoveBtn.Caption := lisBtnRemove;
TIDEImages.AssignImage(RemoveBtn.Glyph, 'laz_delete');
IDEImages.AssignImage(RemoveBtn, 'laz_delete');
end;
procedure TDefinesGuiForm.FormShow(Sender: TObject);

4
ide/diffdialog.pas
View File

@ -353,14 +353,14 @@ begin
end;
// buttons
TIDEImages.AssignImage(CancelScanningButton.Glyph, 'btn_cancel');
IDEImages.AssignImage(CancelScanningButton, 'btn_cancel');
CloseButton.Caption:=lisClose;
OpenInEditorButton.Caption:=lisDiffDlgOpenDiffInEditor;
HelpButton.Caption:=lisMenuHelp;
OpenInEditorButton.LoadGlyphFromStock(idButtonOpen);
if OpenInEditorButton.Glyph.Empty then
TIDEImages.AssignImage(OpenInEditorButton.Glyph, 'laz_open');
IDEImages.AssignImage(OpenInEditorButton, 'laz_open');
// dialogs
dlgOpen.Title:=lisOpenExistingFile;

12
ide/editorfilemanager.pas
View File

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

6
ide/encloseifdef.pas
View File

@ -232,11 +232,11 @@ begin
FirstLabel.Caption := lisFirstTest;
SecondLabel.Caption := lisSecondTest;
AddBtn.Caption := lisBtnAdd;
TIDEImages.AssignImage(AddBtn.Glyph, 'laz_add');
IDEImages.AssignImage(AddBtn, 'laz_add');
AddInverse.Caption := rsAddInverse;
TIDEImages.AssignImage(AddInverse.Glyph, 'pkg_issues');
IDEImages.AssignImage(AddInverse, 'pkg_issues');
RemoveBtn.Caption := lisBtnRemove;
TIDEImages.AssignImage(RemoveBtn.Glyph, 'laz_delete');
IDEImages.AssignImage(RemoveBtn, 'laz_delete');
ButtonPanel1.CloseButton.Caption := lisSave;
ButtonPanel1.OKButton.Caption := lisOk;
//ButtonPanel1.CloseButton.LoadGlyphFromStock(idButtonSave);

6
ide/etmessageframe.pas
View File

@ -3487,11 +3487,11 @@ begin
// search
SearchPanel.Visible:=false; // by default the search is hidden
HideSearchSpeedButton.Hint:=lisHideSearch;
TIDEImages.AssignImage(HideSearchSpeedButton.Glyph, 'debugger_power_grey');
IDEImages.AssignImage(HideSearchSpeedButton, 'debugger_power_grey');
SearchNextSpeedButton.Hint:=lisUDSearchNextOccurrenceOfThisPhrase;
TIDEImages.AssignImage(SearchNextSpeedButton.Glyph, 'callstack_bottom');
IDEImages.AssignImage(SearchNextSpeedButton, 'callstack_bottom');
SearchPrevSpeedButton.Hint:=lisUDSearchPreviousOccurrenceOfThisPhrase;
TIDEImages.AssignImage(SearchPrevSpeedButton.Glyph, 'callstack_top');
IDEImages.AssignImage(SearchPrevSpeedButton, 'callstack_top');
SearchEdit.TextHint:=lisUDSearch;
end;

8
ide/examplemanager.pas
View File

@ -162,10 +162,10 @@ begin
SelectAllButton.Caption:=lisMenuSelectAll;
SelectNoneButton.Caption:=lisSAMSelectNone;
TIDEImages.AssignImage(OpenSelectedButton.Glyph, 'laz_open');
TIDEImages.AssignImage(BuildAllSelectedButton.Glyph, 'menu_build_all');
TIDEImages.AssignImage(SelectAllButton.Glyph, 'menu_select_all');
TIDEImages.AssignImage(SelectNoneButton.Glyph, 'ce_default');
IDEImages.AssignImage(OpenSelectedButton, 'laz_open');
IDEImages.AssignImage(BuildAllSelectedButton, 'menu_build_all');
IDEImages.AssignImage(SelectAllButton, 'menu_select_all');
IDEImages.AssignImage(SelectNoneButton, 'ce_default');
edRootDirectory.Text:=EnvironmentOptions.GetParsedLazarusDirectory;
FillProjectsPending;

4
ide/findreplacedialog.pp
View File

@ -139,7 +139,7 @@ begin
TextToFindLabel.Caption:=dlgTextToFind;
ReplaceTextComboBox.Text:='';
ReplaceWithCheckbox.Caption:=dlgReplaceWith;
TIDEImages.AssignImage(EnableAutoCompleteSpeedButton.Glyph, 'autocomplete');
IDEImages.AssignImage(EnableAutoCompleteSpeedButton, 'autocomplete');
OptionsGroupBox.Caption:=lisOptions;
with CaseSensitiveCheckBox do begin
@ -181,7 +181,7 @@ begin
// CloseButton works now as ReplaceAllButton
BtnPanel.CloseButton.Caption := dlgReplaceAll;
TIDEImages.AssignImage(BtnPanel.CloseButton.Glyph, 'btn_all');
IDEImages.AssignImage(BtnPanel.CloseButton, 'btn_all');
fReplaceAllClickedLast:=false;
UpdateHints;

16
ide/fpdoceditwindow.pas
View File

@ -293,14 +293,14 @@ begin
Name := NonModalIDEWindowNames[nmiwFPDocEditorName];
TIDEImages.AssignImage(BoldFormatButton.Glyph, 'formatbold');
TIDEImages.AssignImage(UnderlineFormatButton.Glyph, 'formatunderline');
TIDEImages.AssignImage(ItalicFormatButton.Glyph, 'formatitalic');
TIDEImages.AssignImage(InsertVarTagButton.Glyph, 'insertvartag');
TIDEImages.AssignImage(InsertCodeTagButton.Glyph, 'insertcodetag');
TIDEImages.AssignImage(InsertRemarkButton.Glyph, 'insertremark');
TIDEImages.AssignImage(InsertURLTagSpeedButton.Glyph, 'formatunderline');
TIDEImages.AssignImage(SaveButton.Glyph, 'laz_save');
IDEImages.AssignImage(BoldFormatButton, 'formatbold');
IDEImages.AssignImage(UnderlineFormatButton, 'formatunderline');
IDEImages.AssignImage(ItalicFormatButton, 'formatitalic');
IDEImages.AssignImage(InsertVarTagButton, 'insertvartag');
IDEImages.AssignImage(InsertCodeTagButton, 'insertcodetag');
IDEImages.AssignImage(InsertRemarkButton, 'insertremark');
IDEImages.AssignImage(InsertURLTagSpeedButton, 'formatunderline');
IDEImages.AssignImage(SaveButton, '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;
TIDEImages.AssignImage(BMAddMacroSpeedButton.Glyph, 'laz_add');
TIDEImages.AssignImage(BMAddMacroValueSpeedButton.Glyph, 'laz_add');
TIDEImages.AssignImage(BMDeleteMacroSpeedButton.Glyph, 'laz_delete');
IDEImages.AssignImage(BMAddMacroSpeedButton, 'laz_add');
IDEImages.AssignImage(BMAddMacroValueSpeedButton, 'laz_add');
IDEImages.AssignImage(BMDeleteMacroSpeedButton, 'laz_delete');
end;
destructor TCompOptBuildMacrosFrame.Destroy;

4
ide/frames/compiler_path_options.pas
View File

@ -636,7 +636,7 @@ begin
// register special buttons in the dialog itself
btnShowOptions := CreateButton(dlgCOShowOptions);
TIDEImages.AssignImage(btnShowOptions.Glyph, 'menu_compiler_options');
IDEImages.AssignImage(btnShowOptions, 'menu_compiler_options');
btnShowOptions.OnClick := @DoShowOptions;
// Check
btnCheck := CreateButton(lisCompTest);
@ -657,7 +657,7 @@ begin
btnLoadSave.Hint := dlgCOLoadSaveHint;
btnLoadSave.LoadGlyphFromStock(idButtonOpen);
if btnLoadSave.Glyph.Empty then
TIDEImages.AssignImage(btnLoadSave.Glyph, 'laz_save');
IDEImages.AssignImage(btnLoadSave, 'laz_save');
ADialog.AddButtonSeparator;

14
ide/frames/componentpalette_options.pas
View File

@ -152,12 +152,12 @@ begin
// Component pages
PagesGroupBox.Caption := lisCmpPages;
AddPageButton.Caption := lisBtnDlgAdd;
TIDEImages.AssignImage(AddPageButton.Glyph, 'laz_add');
IDEImages.AssignImage(AddPageButton, 'laz_add');
RestoreButton.Caption := lisCmpRestoreDefaults;
ImportDividerBevel.Caption := lisExportImport;
TIDEImages.AssignImage(ImportButton.Glyph, 'laz_open');
IDEImages.AssignImage(ImportButton, 'laz_open');
ImportButton.Caption := lisDlgImport;
TIDEImages.AssignImage(ExportButton.Glyph, 'laz_save');
IDEImages.AssignImage(ExportButton, 'laz_save');
ExportButton.Caption := lisDlgExport;
// File dialogs
ImportDialog.Title := lisImport;
@ -171,13 +171,13 @@ begin
ComponentsListView.Column[3].Caption := lisUnit;
ComponentsListView.SmallImages := IDEImages.Images_24;
// Arrow buttons for pages
TIDEImages.AssignImage(PageMoveUpBtn.Glyph, 'arrow_up');
TIDEImages.AssignImage(PageMoveDownBtn.Glyph, 'arrow_down');
IDEImages.AssignImage(PageMoveUpBtn, 'arrow_up');
IDEImages.AssignImage(PageMoveDownBtn, 'arrow_down');
PageMoveUpBtn.Hint := lisMoveSelectedUp;
PageMoveDownBtn.Hint := lisMoveSelectedDown;
// Arrow buttons for components
TIDEImages.AssignImage(CompMoveUpBtn.Glyph, 'arrow_up');
TIDEImages.AssignImage(CompMoveDownBtn.Glyph, 'arrow_down');
IDEImages.AssignImage(CompMoveUpBtn, 'arrow_up');
IDEImages.AssignImage(CompMoveDownBtn, 'arrow_down');
CompMoveUpBtn.Hint := lisMoveSelectedUp;
CompMoveDownBtn.Hint := lisMoveSelectedDown;

10
ide/frames/editor_keymapping_options.pas
View File

@ -386,15 +386,15 @@ begin
ConflictsTreeView.Images := IDEImages.Images_16;
imgKeyCategory := IDEImages.LoadImage('item_keyboard');
imgKeyItem := IDEImages.LoadImage('item_character');
TIDEImages.AssignImage(ChooseSchemeButton.Glyph, 'item_keyboard'); // keymapcategory
TIDEImages.AssignImage(FindKeyButton.Glyph, 'menu_search_find');
TIDEImages.AssignImage(EditButton.Glyph, 'laz_edit');
TIDEImages.AssignImage(ClearButton.Glyph, 'menu_clean');
IDEImages.AssignImage(ChooseSchemeButton, 'item_keyboard'); // keymapcategory
IDEImages.AssignImage(FindKeyButton, 'menu_search_find');
IDEImages.AssignImage(EditButton, 'laz_edit');
IDEImages.AssignImage(ClearButton, 'menu_clean');
PopupMenu1.Images := IDEImages.Images_16;
EditMenuItem.ImageIndex := IDEImages.LoadImage('laz_edit');
ClearMenuItem.ImageIndex := IDEImages.LoadImage('menu_clean');
TIDEImages.AssignImage(ResetKeyFilterBtn.Glyph, ResBtnListFilter);
IDEImages.AssignImage(ResetKeyFilterBtn, ResBtnListFilter);
ResetKeyFilterBtn.Enabled := not IDEShortCutEmpty(KeyMapKeyFilter);
// FillKeyMappingTreeView; ... Done in ReadSettings.

8
ide/frames/project_application_options.pas
View File

@ -258,7 +258,7 @@ begin
// Darwin specific, Application Bundle
DarwinDividerBevel.Caption := lisForMacOSDarwin;
CreateAppBundleButton.Caption := dlgPOCreateAppBundle;
TIDEImages.AssignImage(CreateAppBundleButton.Glyph, 'pkg_compile');
IDEImages.AssignImage(CreateAppBundleButton, 'pkg_compile');
// Icon
IconLabel.Caption := dlgPOIcon;
@ -268,11 +268,11 @@ begin
ClearIconButton.Caption := dlgPOClearIcon;
LoadIconButton.LoadGlyphFromStock(idButtonOpen);
if LoadIconButton.Glyph.Empty then
TIDEImages.AssignImage(LoadIconButton.Glyph, 'laz_open');
IDEImages.AssignImage(LoadIconButton, 'laz_open');
SaveIconButton.LoadGlyphFromStock(idButtonSave);
if SaveIconButton.Glyph.Empty then
TIDEImages.AssignImage(SaveIconButton.Glyph, 'laz_save');
TIDEImages.AssignImage(ClearIconButton.Glyph, 'menu_clean');
IDEImages.AssignImage(SaveIconButton, 'laz_save');
IDEImages.AssignImage(ClearIconButton, 'menu_clean');
IconImage.KeepOriginXWhenClipped := True;
IconImage.KeepOriginYWhenClipped := True;
IconImagePictureChanged(nil);

8
ide/frames/project_forms_options.pas
View File

@ -186,10 +186,10 @@ begin
FormsAvailFormsLabel.Caption := dlgAvailableForms;
FormsAvailFormsListBox.Hint := dlgAvailableFormsHint;
FormsAutoCreateNewFormsCheckBox.Caption := dlgAutoCreateNewForms;
TIDEImages.AssignImage(FormsMoveAutoCreatedFormUpBtn.Glyph, 'arrow_up');
TIDEImages.AssignImage(FormsMoveAutoCreatedFormsDownBtn.Glyph, 'arrow_down');
TIDEImages.AssignImage(FormsAddToAutoCreatedFormsBtn.Glyph, 'arrow_left');
TIDEImages.AssignImage(FormsRemoveFromAutoCreatedFormsBtn.Glyph, 'arrow_right');
IDEImages.AssignImage(FormsMoveAutoCreatedFormUpBtn, 'arrow_up');
IDEImages.AssignImage(FormsMoveAutoCreatedFormsDownBtn, 'arrow_down');
IDEImages.AssignImage(FormsAddToAutoCreatedFormsBtn, 'arrow_left');
IDEImages.AssignImage(FormsRemoveFromAutoCreatedFormsBtn, 'arrow_right');
end;
procedure TProjectFormsOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);

2
ide/frames/project_i18n_options.pas
View File

@ -126,7 +126,7 @@ begin
ExcludedIdentifiersLabel.ParentFont := True;
ExcludedOriginalsLabel.ParentFont := True;
ForceUpdatePoFilesCheckBox.ParentFont := True;
TIDEImages.AssignImage(POOutDirEdit.Button.Glyph, ResBtnSelDir); //DirectoryEdit
IDEImages.AssignImage(POOutDirEdit.Button, ResBtnSelDir); //DirectoryEdit
end;
procedure TProjectI18NOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);

4
ide/frames/project_lazdoc_options.pas
View File

@ -53,8 +53,8 @@ begin
SearchPathsGroupBox.Caption := lisSearchPaths2;
AddPathButton.Caption := lisCodeHelpAddPathButton;
DeletePathButton.Caption := lisCodeHelpDeletePathButton;
TIDEImages.AssignImage(DeletePathButton.Glyph, 'laz_delete');
TIDEImages.AssignImage(AddPathButton.Glyph, 'laz_add');
IDEImages.AssignImage(DeletePathButton, 'laz_delete');
IDEImages.AssignImage(AddPathButton, 'laz_add');
PathEdit.Clear;
end;

2
ide/genericchecklist.pas
View File

@ -55,7 +55,7 @@ begin
fActionBtn.BorderSpacing.Left := 6;
fActionBtn.BorderSpacing.Right := 6;
if aResourceGlyphName <> '' then
TIDEImages.AssignImage(fActionBtn.Glyph, aResourceGlyphName);
IDEImages.AssignImage(fActionBtn, aResourceGlyphName);
fActionBtn.AutoSize := True;
fActionBtn.Parent := ButtonPanel1;
end;

4
ide/imexportcompileropts.pas
View File

@ -287,7 +287,7 @@ begin
OKButton.Caption:=lisIECOLoadFromFile;
OKButton.LoadGlyphFromStock(idButtonOpen);
if OKButton.Glyph.Empty then
TIDEImages.AssignImage(OKButton.Glyph, 'laz_open');
IDEImages.AssignImage(OKButton, 'laz_open');
OKButton.Enabled:=False;
OKButton.OnClick:=@OpenButtonCLICK;
end;
@ -308,7 +308,7 @@ begin
OKButton.Caption:=lisIECOSaveToFile;
OKButton.LoadGlyphFromStock(idButtonSave);
if OKButton.Glyph.Empty then
TIDEImages.AssignImage(OKButton.Glyph, 'laz_save');
IDEImages.AssignImage(OKButton, 'laz_save');
OKButton.Enabled:=False;
OKButton.OnClick:=@SaveButtonCLICK;
end;

2
ide/initialsetupdlgs.pas
View File

@ -489,7 +489,7 @@ begin
ImgIDError := Imagelist1.AddResourceName(HInstance, 'state_error');
ImgIDWarning := Imagelist1.AddResourceName(HInstance, 'state_warning');
TIDEImages.AssignImage(StopScanButton.Glyph, 'menu_stop');
IDEImages.AssignImage(StopScanButton, 'menu_stop');
UpdateCaptions;

6
ide/msgvieweditor.pas
View File

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

14
ide/patheditordlg.pas
View File

@ -450,13 +450,13 @@ begin
OpenDialog1.Filter:=Filt;
SaveDialog1.Filter:=Filt;
TIDEImages.AssignImage(MoveUpButton.Glyph, 'arrow_up');
TIDEImages.AssignImage(MoveDownButton.Glyph, 'arrow_down');
TIDEImages.AssignImage(ReplaceButton.Glyph, 'menu_reportingbug');
TIDEImages.AssignImage(AddButton.Glyph, 'laz_add');
TIDEImages.AssignImage(DeleteButton.Glyph, 'laz_delete');
TIDEImages.AssignImage(DeleteInvalidPathsButton.Glyph, 'menu_clean');
TIDEImages.AssignImage(AddTemplateButton.Glyph, 'laz_add');
IDEImages.AssignImage(MoveUpButton, 'arrow_up');
IDEImages.AssignImage(MoveDownButton, 'arrow_down');
IDEImages.AssignImage(ReplaceButton, 'menu_reportingbug');
IDEImages.AssignImage(AddButton, 'laz_add');
IDEImages.AssignImage(DeleteButton, 'laz_delete');
IDEImages.AssignImage(DeleteInvalidPathsButton, 'menu_clean');
IDEImages.AssignImage(AddTemplateButton, 'laz_add');
end;
procedure TPathEditorDialog.FormDestroy(Sender: TObject);

6
ide/projectinspector.pas
View File

@ -1071,13 +1071,13 @@ begin
mnuAddEditorFiles.Caption:=lisProjAddEditorFile;
mnuAddReq.Caption:=lisProjAddNewRequirement;
TIDEImages.AssignImage(OpenButton.Glyph, 'laz_open');
IDEImages.AssignImage(OpenButton, 'laz_open');
OpenButton.Caption:='';
OpenButton.Hint:=lisOpenFile2;
SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
TIDEImages.AssignImage(SortAlphabeticallyButton.Glyph, 'pkg_sortalphabetically');
IDEImages.AssignImage(SortAlphabeticallyButton, 'pkg_sortalphabetically');
DirectoryHierarchyButton.Hint:=lisPEShowDirectoryHierarchy;
TIDEImages.AssignImage(DirectoryHierarchyButton.Glyph, 'pkg_hierarchical');
IDEImages.AssignImage(DirectoryHierarchyButton, '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;
TIDEImages.AssignImage(btnNewProject.Glyph, 'item_project');
TIDEImages.AssignImage(btnOpenProject.Glyph, 'menu_project_open');
TIDEImages.AssignImage(btnExamples.Glyph, 'camera');
TIDEImages.AssignImage(btnConvertProject.Glyph, 'laz_wand');
TIDEImages.AssignImage(btnCloseIDE.Glyph, 'menu_exit');
IDEImages.AssignImage(btnNewProject, 'item_project');
IDEImages.AssignImage(btnOpenProject, 'menu_project_open');
IDEImages.AssignImage(btnExamples, 'camera');
IDEImages.AssignImage(btnConvertProject, 'laz_wand');
IDEImages.AssignImage(btnCloseIDE, 'menu_exit');
cbRecentProjects.Items.AddStrings(EnvironmentOptions.RecentProjectFiles);
end;

2
ide/publishprojectdlg.pas
View File

@ -182,7 +182,7 @@ begin
ButtonPanel1.CloseButton.Kind := bkCustom;
ButtonPanel1.CloseButton.LoadGlyphFromStock(idButtonSave);
if ButtonPanel1.CloseButton.Glyph.Empty then
TIDEImages.AssignImage(ButtonPanel1.CloseButton.Glyph, 'laz_save');
IDEImages.AssignImage(ButtonPanel1.CloseButton, 'laz_save');
ButtonPanel1.CloseButton.OnClick := @SaveSettingsButtonCLICK;
ButtonPanel1.HelpButton.OnClick := @HelpButtonClick;

6
ide/runparamsopts.pas
View File

@ -699,9 +699,9 @@ begin
SetupLocalPage;
SetupEnvironmentPage;
TIDEImages.AssignImage(UserOverridesAddButton.Glyph, 'laz_add');
TIDEImages.AssignImage(UserOverridesEditButton.Glyph, 'laz_edit');
TIDEImages.AssignImage(UserOverridesDeleteButton.Glyph, 'laz_delete');
IDEImages.AssignImage(UserOverridesAddButton, 'laz_add');
IDEImages.AssignImage(UserOverridesEditButton, 'laz_edit');
IDEImages.AssignImage(UserOverridesDeleteButton, 'laz_delete');
end;
procedure TRunParamsOptsDlg.NewModeButtonClick(Sender: TObject);

1
ide/searchresultview.pp
View File

@ -318,7 +318,6 @@ begin
ClosePageButton.ImageIndex := IDEImages.LoadImage('menu_close');
ActionList.Images := IDEImages.Images_16;
actClosePage.ImageIndex := IDEImages.LoadImage('menu_close');
TIDEImages.AssignImage(SearchInListEdit.Glyph, 'btnfiltercancel');
end;
procedure TSearchResultsView.FormClose(Sender: TObject; var CloseAction: TCloseAction);

10
ide/toolbarconfig.pas
View File

@ -173,11 +173,11 @@ begin
pnlButtons.Color := clBtnFace;
lblSelect.Caption := '';
// load button images
TIDEImages.AssignImage(btnAdd.Glyph, 'arrow__darkgreen_right');
TIDEImages.AssignImage(btnRemove.Glyph, 'arrow__darkred_left');
TIDEImages.AssignImage(btnMoveUp.Glyph, 'arrow__darkgreen_up');
TIDEImages.AssignImage(btnMoveDown.Glyph, 'arrow__darkgreen_down');
//TIDEImages.AssignImage(btnAddDivider.Glyph, 'menu_divider16'); // uncomment if 'menu_divider16' exists (currently not)
IDEImages.AssignImage(btnAdd, 'arrow__darkgreen_right');
IDEImages.AssignImage(btnRemove, 'arrow__darkred_left');
IDEImages.AssignImage(btnMoveUp, 'arrow__darkgreen_up');
IDEImages.AssignImage(btnMoveDown, 'arrow__darkgreen_down');
//IDEImages.AssignImage(btnAddDivider, 'menu_divider16'); // uncomment if 'menu_divider16' exists (currently not)
btnAddDivider.Caption := '---';
btnAdd.Hint := lisCoolBarAddSelected;

12
ide/unitdependencies.pas
View File

@ -1777,23 +1777,23 @@ begin
AllUnitsGroupBox.Caption:=lisUDAllUnits;
AllUnitsShowDirsSpeedButton.Hint:=lisUDShowNodesForDirectories;
TIDEImages.AssignImage(AllUnitsShowDirsSpeedButton.Glyph, 'pkg_hierarchical');
IDEImages.AssignImage(AllUnitsShowDirsSpeedButton, 'pkg_hierarchical');
AllUnitsShowDirsSpeedButton.Down:=true;
AllUnitsShowGroupNodesSpeedButton.Hint:=lisUDShowNodesForProjectAndPackages;
TIDEImages.AssignImage(AllUnitsShowGroupNodesSpeedButton.Glyph, 'pkg_hierarchical');
IDEImages.AssignImage(AllUnitsShowGroupNodesSpeedButton, 'pkg_hierarchical');
AllUnitsShowGroupNodesSpeedButton.Down:=true;
AllUnitsSearchNextSpeedButton.Hint:=lisUDSearchNextOccurrenceOfThisPhrase;
TIDEImages.AssignImage(AllUnitsSearchNextSpeedButton.Glyph, 'arrow_down');
IDEImages.AssignImage(AllUnitsSearchNextSpeedButton, 'arrow_down');
AllUnitsSearchPrevSpeedButton.Hint:=lisUDSearchPreviousOccurrenceOfThisPhrase;
TIDEImages.AssignImage(AllUnitsSearchPrevSpeedButton.Glyph, 'arrow_up');
IDEImages.AssignImage(AllUnitsSearchPrevSpeedButton, 'arrow_up');
// selected units
SelectedUnitsGroupBox.Caption:=lisUDSelectedUnits;
SelUnitsSearchNextSpeedButton.Hint:=lisUDSearchNextUnitOfThisPhrase;
TIDEImages.AssignImage(SelUnitsSearchNextSpeedButton.Glyph, 'arrow_down');
IDEImages.AssignImage(SelUnitsSearchNextSpeedButton, 'arrow_down');
SelUnitsSearchPrevSpeedButton.Hint:=lisUDSearchPreviousUnitOfThisPhrase;
TIDEImages.AssignImage(SelUnitsSearchPrevSpeedButton.Glyph, 'arrow_up');
IDEImages.AssignImage(SelUnitsSearchPrevSpeedButton, 'arrow_up');
// popup menu
UnitsTVCopyFilenameMenuItem.Caption:=uemCopyFilename;

1
ide/useunitdlg.pas
View File

@ -194,7 +194,6 @@ begin
ButtonPanel1.OKButton.Caption:=lisMenuOk;
ButtonPanel1.CancelButton.Caption:=lisCancel;
UnitImgInd := IDEImages.LoadImage('item_unit');
TIDEImages.AssignImage(FilterEdit.Glyph, 'btnfiltercancel');
FProjUnits:=TStringList.Create;
end;

2
ide/viewunit_dlg.pp
View File

@ -322,7 +322,7 @@ begin
ButtonPanel.HelpButton.Caption:=lisMenuHelp;
ButtonPanel.CancelButton.Caption:=lisCancel;
SortAlphabeticallySpeedButton.Hint:=lisPESortFilesAlphabetically;
TIDEImages.AssignImage(SortAlphabeticallySpeedButton.Glyph, 'pkg_sortalphabetically');
IDEImages.AssignImage(SortAlphabeticallySpeedButton, 'pkg_sortalphabetically');
end;
procedure TViewUnitDialog.FormDestroy(Sender: TObject);

4
packager/addtopackagedlg.pas
View File

@ -718,7 +718,7 @@ begin
with FilesDirButton do begin
Caption:=lisAddFilesInDirectory;
TIDEImages.AssignImage(Glyph, 'pkg_files');
IDEImages.AssignImage(FilesDirButton, 'pkg_files');
end;
with FilesShortenButton do begin
@ -731,7 +731,7 @@ begin
Caption:=lisDelete;
ShowHint:=true;
Hint:=lisDeleteSelectedFiles;
TIDEImages.AssignImage(Glyph, 'laz_delete');
IDEImages.AssignImage(FilesDeleteButton, 'laz_delete');
end;
LabelIconInfo.Caption:=lisNoneClickToChooseOne;

2
packager/frames/package_i18n_options.pas
View File

@ -76,7 +76,7 @@ begin
POOutDirEdit.Text := FLazPackage.POOutputDirectory;
PoForFormsCheckBox.Checked:=FLazPackage.EnableI18NForLFM;
TIDEImages.AssignImage(POOutDirEdit.Button.Glyph, ResBtnSelDir); //DirectoryEdit
IDEImages.AssignImage(POOutDirEdit.Button, ResBtnSelDir); //DirectoryEdit
end;
procedure TPackageI18NOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);

4
packager/installpkgsetdlg.pas
View File

@ -222,10 +222,10 @@ begin
ExportButton.Caption:=lisExportList;
ImportButton.Caption:=lisImportList;
UninstallButton.Caption:=lisUninstallSelection;
TIDEImages.AssignImage(UninstallButton.Glyph, 'arrow_right');
IDEImages.AssignImage(UninstallButton, 'arrow_right');
InstallPkgGroupBox.Caption:=lisPckEditInstall;
AddToInstallButton.Caption:=lisInstallSelection;
TIDEImages.AssignImage(AddToInstallButton.Glyph, 'arrow_left');
IDEImages.AssignImage(AddToInstallButton, 'arrow_left');
PkgInfoGroupBox.Caption := lisPackageInfo;
SaveAndRebuildButton.Caption:=lisSaveAndRebuildIDE;
SaveAndExitButton.Caption:=lisSaveAndExitDialog;

2
packager/packagedefs.pas
View File

@ -3985,7 +3985,7 @@ var
ResName: String;
begin
ResName := ComponentClass.ClassName;
Result := TIDEImages.CreateImage(ResName, 24);
Result := TIDEImages.CreateImage(ResName, 24); // todo: use image list
if Result = nil then
Result := CreateBitmapFromResourceName(HInstance, 'default')

10
packager/packageeditor.pas
View File

@ -1965,16 +1965,16 @@ begin
mnuAddNewReqr.Caption := lisProjAddNewRequirement;
// Buttons on FilterPanel
TIDEImages.AssignImage(OpenButton.Glyph, 'laz_open');
IDEImages.AssignImage(OpenButton, 'laz_open');
OpenButton.Hint:=lisOpenFile2;
SortAlphabeticallyButton.Hint:=lisPESortFilesAlphabetically;
TIDEImages.AssignImage(SortAlphabeticallyButton.Glyph, 'pkg_sortalphabetically');
IDEImages.AssignImage(SortAlphabeticallyButton, 'pkg_sortalphabetically');
DirectoryHierarchyButton.Hint:=lisPEShowDirectoryHierarchy;
TIDEImages.AssignImage(DirectoryHierarchyButton.Glyph, 'pkg_hierarchical');
IDEImages.AssignImage(DirectoryHierarchyButton, 'pkg_hierarchical');
// Up / Down buttons
TIDEImages.AssignImage(MoveUpBtn.Glyph, 'arrow_up');
TIDEImages.AssignImage(MoveDownBtn.Glyph, 'arrow_down');
IDEImages.AssignImage(MoveUpBtn, 'arrow_up');
IDEImages.AssignImage(MoveDownBtn, 'arrow_down');
MoveUpBtn.Hint:=lisMoveSelectedUp;
MoveDownBtn.Hint:=lisMoveSelectedDown;