paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-28 13:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: load High-DPI images

Browse Source
This commit is contained in:
Ondrej Pokorny 2022-09-29 00:59:16 +02:00
parent 560b8bb852
commit da539c7b9c
10 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/ideintf/checklistboxeditordlg.pas
View File

@ -94,7 +94,7 @@ begin
BtnPanel.CancelButton.Caption := oisCancel; BtnPanel.CancelButton.Caption := oisCancel;
BtnPanel.HelpButton.Caption := cActionListEditorHelpCategory; BtnPanel.HelpButton.Caption := cActionListEditorHelpCategory;
BtnPanel.CloseButton.Kind := bkCustom; BtnPanel.CloseButton.Kind := bkCustom;
BtnPanel.CloseButton.LoadGlyphFromStock(idButtonYes); BtnPanel.CloseButton.LoadGlyphFromResource(idButtonYes);
BtnPanel.CloseButton.Caption := sccsTrEdtApply; BtnPanel.CloseButton.Caption := sccsTrEdtApply;
BtnPanel.CloseButton.OnClick := @ApplyCheck; BtnPanel.CloseButton.OnClick := @ApplyCheck;

4
ide/buildlazdialog.pas
View File

@ -1051,9 +1051,7 @@ begin
CompileAdvancedButton.Caption := lisLazBuildBuildMany; CompileAdvancedButton.Caption := lisLazBuildBuildMany;
IDEImages.AssignImage(CompileAdvancedButton, 'menu_build_all'); IDEImages.AssignImage(CompileAdvancedButton, 'menu_build_all');
SaveSettingsButton.Caption := lisSaveSettings; SaveSettingsButton.Caption := lisSaveSettings;
SaveSettingsButton.LoadGlyphFromStock(idButtonSave); IDEImages.AssignImage(SaveSettingsButton, 'laz_save');
if SaveSettingsButton.Glyph.Empty then
IDEImages.AssignImage(SaveSettingsButton, 'laz_save');
CancelButton.Caption := lisCancel; CancelButton.Caption := lisCancel;
HelpButton.Caption := lisMenuHelp; HelpButton.Caption := lisMenuHelp;

4
ide/desktopmanager.pas
View File

@ -393,9 +393,9 @@ begin
ExportAction.Caption := lisExportSelected; ExportAction.Caption := lisExportSelected;
ExportAllAction.Caption := lisExportAll; ExportAllAction.Caption := lisExportAll;
ImportAction.Hint := lisImport; ImportAction.Hint := lisImport;
ExportBitBtn.LoadGlyphFromStock(idButtonSave); IDEImages.AssignImage(ExportBitBtn, 'laz_save');
ExportBitBtn.Caption := lisExportSub; ExportBitBtn.Caption := lisExportSub;
ImportBitBtn.LoadGlyphFromStock(idButtonOpen); IDEImages.AssignImage(ImportBitBtn, 'laz_open');
ImportBitBtn.Caption := lisImport; ImportBitBtn.Caption := lisImport;
ButtonPanel1.HelpButton.TabOrder := 0; ButtonPanel1.HelpButton.TabOrder := 0;

4
ide/diffdialog.pas
View File

@ -359,9 +359,7 @@ begin
OpenInEditorButton.Caption:=lisDiffDlgOpenDiffInEditor; OpenInEditorButton.Caption:=lisDiffDlgOpenDiffInEditor;
HelpButton.Caption:=lisMenuHelp; HelpButton.Caption:=lisMenuHelp;
OpenInEditorButton.LoadGlyphFromStock(idButtonOpen); IDEImages.AssignImage(OpenInEditorButton, 'laz_open');
if OpenInEditorButton.Glyph.Empty then
IDEImages.AssignImage(OpenInEditorButton, 'laz_open');
// dialogs // dialogs
dlgOpen.Title:=lisOpenExistingFile; dlgOpen.Title:=lisOpenExistingFile;

2
ide/encloseifdef.pas
View File

@ -239,7 +239,7 @@ begin
IDEImages.AssignImage(RemoveBtn, 'laz_delete'); IDEImages.AssignImage(RemoveBtn, 'laz_delete');
ButtonPanel1.CloseButton.Caption := lisSave; ButtonPanel1.CloseButton.Caption := lisSave;
ButtonPanel1.OKButton.Caption := lisOk; ButtonPanel1.OKButton.Caption := lisOk;
//ButtonPanel1.CloseButton.LoadGlyphFromStock(idButtonSave); //ButtonPanel1.CloseButton.LoadGlyphFromResource(idButtonSave);
//if btnSave.Glyph.Empty then //if btnSave.Glyph.Empty then
// btnSave.LoadGlyphFromResourceName(HInstance, 'laz_save'); // btnSave.LoadGlyphFromResourceName(HInstance, 'laz_save');
try try

8
ide/frames/compiler_path_options.pas
View File

@ -642,7 +642,7 @@ begin
btnCheck := CreateButton(lisCompTest); btnCheck := CreateButton(lisCompTest);
btnCheck.ModalResult := mrNone; btnCheck.ModalResult := mrNone;
btnCheck.OnClick := @DoCheck; btnCheck.OnClick := @DoCheck;
btnCheck.LoadGlyphFromStock(idButtonYes); btnCheck.LoadGlyphFromResource(idButtonYes);
ADialog.AddButtonSeparator; ADialog.AddButtonSeparator;
@ -650,14 +650,12 @@ begin
btnExport := CreateButton(lisExport); btnExport := CreateButton(lisExport);
btnExport.OnClick := @DoExport; btnExport.OnClick := @DoExport;
btnExport.Hint := dlgCOLoadSaveHint; btnExport.Hint := dlgCOLoadSaveHint;
btnExport.LoadGlyphFromStock(idButtonSave); IDEImages.AssignImage(btnExport, 'laz_save');
// Import // Import
btnLoadSave := CreateButton(lisImport); btnLoadSave := CreateButton(lisImport);
btnLoadSave.OnClick := @DoImport; btnLoadSave.OnClick := @DoImport;
btnLoadSave.Hint := dlgCOLoadSaveHint; btnLoadSave.Hint := dlgCOLoadSaveHint;
btnLoadSave.LoadGlyphFromStock(idButtonOpen); IDEImages.AssignImage(btnLoadSave, 'laz_save');
if btnLoadSave.Glyph.Empty then
IDEImages.AssignImage(btnLoadSave, 'laz_save');
ADialog.AddButtonSeparator; ADialog.AddButtonSeparator;

7
ide/frames/project_application_options.pas
View File

@ -294,13 +294,10 @@ begin
DefaultIconButton.Caption := dlgPODefaultIcon; DefaultIconButton.Caption := dlgPODefaultIcon;
SaveIconButton.Caption := dlgPOSaveIcon; SaveIconButton.Caption := dlgPOSaveIcon;
ClearIconButton.Caption := dlgPOClearIcon; ClearIconButton.Caption := dlgPOClearIcon;
LoadIconButton.LoadGlyphFromStock(idButtonOpen); IDEImages.AssignImage(LoadIconButton, 'laz_open');
if LoadIconButton.Glyph.Empty then
IDEImages.AssignImage(LoadIconButton, 'laz_open');
SaveIconButton.LoadGlyphFromStock(idButtonSave); SaveIconButton.LoadGlyphFromStock(idButtonSave);
IDEImages.AssignImage(DefaultIconButton, 'restore_default'); IDEImages.AssignImage(DefaultIconButton, 'restore_default');
if SaveIconButton.Glyph.Empty then IDEImages.AssignImage(SaveIconButton, 'laz_save');
IDEImages.AssignImage(SaveIconButton, 'laz_save');
IDEImages.AssignImage(ClearIconButton, 'menu_clean'); IDEImages.AssignImage(ClearIconButton, 'menu_clean');
IconImage.KeepOriginXWhenClipped := True; IconImage.KeepOriginXWhenClipped := True;
IconImage.KeepOriginYWhenClipped := True; IconImage.KeepOriginYWhenClipped := True;

8
ide/imexportcompileropts.pas
View File

@ -291,9 +291,7 @@ begin
with ButtonPanel1 do begin with ButtonPanel1 do begin
OKButton.Caption:=lisIECOLoadFromFile; OKButton.Caption:=lisIECOLoadFromFile;
OKButton.LoadGlyphFromStock(idButtonOpen); IDEImages.AssignImage(OKButton, 'laz_open');
if OKButton.Glyph.Empty then
IDEImages.AssignImage(OKButton, 'laz_open');
OKButton.Enabled:=False; OKButton.Enabled:=False;
OKButton.OnClick:=@OpenButtonCLICK; OKButton.OnClick:=@OpenButtonCLICK;
end; end;
@ -312,9 +310,7 @@ begin
ExportRadioGroup.Enabled:=False; ExportRadioGroup.Enabled:=False;
with ButtonPanel1 do begin with ButtonPanel1 do begin
OKButton.Caption:=lisIECOSaveToFile; OKButton.Caption:=lisIECOSaveToFile;
OKButton.LoadGlyphFromStock(idButtonSave); IDEImages.AssignImage(OKButton, 'laz_save');
if OKButton.Glyph.Empty then
IDEImages.AssignImage(OKButton, 'laz_save');
OKButton.Enabled:=False; OKButton.Enabled:=False;
OKButton.OnClick:=@SaveButtonCLICK; OKButton.OnClick:=@SaveButtonCLICK;
end; end;

6
lcl/buttons.pp
View File

@ -56,6 +56,8 @@ type
bsHot // button is under mouse bsHot // button is under mouse
); );
TButtonImage = idButtonOk..idButtonNoToAll;
{ {
TNumGlyphs holds the number of glyphs in an image. TNumGlyphs holds the number of glyphs in an image.
If we change this the code in SetNumGlyphs for @link(TCustomSpeedButton) If we change this the code in SetNumGlyphs for @link(TCustomSpeedButton)
@ -207,7 +209,8 @@ type
procedure Click; override; procedure Click; override;
procedure LoadGlyphFromResourceName(Instance: THandle; const AName: String); procedure LoadGlyphFromResourceName(Instance: THandle; const AName: String);
procedure LoadGlyphFromLazarusResource(const AName: String); procedure LoadGlyphFromLazarusResource(const AName: String);
procedure LoadGlyphFromStock(idButton: Integer); procedure LoadGlyphFromStock(idButton: Integer); // not DPI-aware, uses widgetset themed icons if available
procedure LoadGlyphFromResource(idButton: TButtonImage); // DPI-aware
function CanShowGlyph(const AWithShowMode: Boolean = False): Boolean; function CanShowGlyph(const AWithShowMode: Boolean = False): Boolean;
public public
property Caption stored IsCaptionStored; property Caption stored IsCaptionStored;
@ -511,7 +514,6 @@ type
} }
type type
TGetDefaultBitBtnGlyph = function(Kind: TBitBtnKind; var Handled: Boolean): TBitmap; TGetDefaultBitBtnGlyph = function(Kind: TBitBtnKind; var Handled: Boolean): TBitmap;
TButtonImage = idButtonOk..idButtonNoToAll;
var var
GetDefaultBitBtnGlyph: TGetDefaultBitBtnGlyph = nil; GetDefaultBitBtnGlyph: TGetDefaultBitBtnGlyph = nil;

5
lcl/include/bitbtn.inc
View File

@ -77,6 +77,11 @@ begin
Buttons.LoadGlyphFromLazarusResource(FButtonGlyph, AName); Buttons.LoadGlyphFromLazarusResource(FButtonGlyph, AName);
end; end;
procedure TCustomBitBtn.LoadGlyphFromResource(idButton: TButtonImage);
begin
Buttons.LoadGlyphFromResource(FButtonGlyph, idButton);
end;
procedure TCustomBitBtn.LoadGlyphFromStock(idButton: Integer); procedure TCustomBitBtn.LoadGlyphFromStock(idButton: Integer);
begin begin
Buttons.LoadGlyphFromStock(FButtonGlyph, idButton); Buttons.LoadGlyphFromStock(FButtonGlyph, idButton);