paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 21:41:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: code browser, code explorer: use new High-DPI icons, issue #33056

Browse Source 
git-svn-id: trunk@57128 -
This commit is contained in:
ondrej 2018-01-20 10:56:23 +00:00
parent 427a4f600d
commit f46f474a77
3 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ide/codebrowser.pas
View File

@ -822,20 +822,20 @@ begin
ImageList1.Height := ImageSize; ImageList1.Height := ImageSize;
ImgIDDefault := TIDEImages.AddImageToImageList(Imagelist1, 'ce_default'); ImgIDDefault := TIDEImages.AddImageToImageList(Imagelist1, 'ce_default');
ImgIDProgramCode := TIDEImages.AddImageToImageList(Imagelist1, 'ce_program'); ImgIDProgramCode := TIDEImages.AddImageToImageList(Imagelist1, 'ce_program');
ImgIDUnitCode := TIDEImages.AddImageToImageList(Imagelist1, 'ce_unit'); ImgIDUnitCode := TIDEImages.AddImageToImageList(Imagelist1, 'cc_unit');
ImgIDInterfaceSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_interface'); ImgIDInterfaceSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_interface');
ImgIDImplementation := TIDEImages.AddImageToImageList(Imagelist1, 'ce_implementation'); ImgIDImplementation := TIDEImages.AddImageToImageList(Imagelist1, 'ce_implementation');
ImgIDInitialization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_initialization'); ImgIDInitialization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_initialization');
ImgIDFinalization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_finalization'); ImgIDFinalization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_finalization');
ImgIDTypeSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type'); ImgIDTypeSection := TIDEImages.AddImageToImageList(Imagelist1, 'cc_type');
ImgIDType := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type'); ImgIDType := TIDEImages.AddImageToImageList(Imagelist1, 'cc_type');
ImgIDVarSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable'); ImgIDVarSection := TIDEImages.AddImageToImageList(Imagelist1, 'cc_variable');
ImgIDVariable := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable'); ImgIDVariable := TIDEImages.AddImageToImageList(Imagelist1, 'cc_variable');
ImgIDConstSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const'); ImgIDConstSection := TIDEImages.AddImageToImageList(Imagelist1, 'cc_constant');
ImgIDConst := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const'); ImgIDConst := TIDEImages.AddImageToImageList(Imagelist1, 'cc_constant');
ImgIDClass := TIDEImages.AddImageToImageList(Imagelist1, 'ce_class'); ImgIDClass := TIDEImages.AddImageToImageList(Imagelist1, 'cc_class');
ImgIDProc := TIDEImages.AddImageToImageList(Imagelist1, 'ce_procedure'); ImgIDProc := TIDEImages.AddImageToImageList(Imagelist1, 'cc_procedure');
ImgIDProperty := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property'); ImgIDProperty := TIDEImages.AddImageToImageList(Imagelist1, 'cc_property');
ImgIDPackage := TIDEImages.AddImageToImageList(Imagelist1, 'item_package'); ImgIDPackage := TIDEImages.AddImageToImageList(Imagelist1, 'item_package');
ImgIDProject := TIDEImages.AddImageToImageList(Imagelist1, 'item_project'); ImgIDProject := TIDEImages.AddImageToImageList(Imagelist1, 'item_project');
end; end;

43
ide/codeexplorer.pas
View File

@ -182,6 +182,7 @@ type
ImgIDClass: Integer; ImgIDClass: Integer;
ImgIDClassInterface: Integer; ImgIDClassInterface: Integer;
ImgIDRecord: Integer; ImgIDRecord: Integer;
ImgIDEnum: Integer;
ImgIDHelper: Integer; ImgIDHelper: Integer;
ImgIDConst: Integer; ImgIDConst: Integer;
ImgIDSection: Integer; ImgIDSection: Integer;
@ -192,6 +193,8 @@ type
ImgIDInterface: Integer; ImgIDInterface: Integer;
ImgIDProcedure: Integer; ImgIDProcedure: Integer;
ImgIDFunction: Integer; ImgIDFunction: Integer;
ImgIDConstructor: Integer;
ImgIDDestructor: Integer;
ImgIDProgram: Integer; ImgIDProgram: Integer;
ImgIDProperty: Integer; ImgIDProperty: Integer;
ImgIDPropertyReadOnly: Integer; ImgIDPropertyReadOnly: Integer;
@ -199,6 +202,7 @@ type
ImgIDUnit: Integer; ImgIDUnit: Integer;
ImgIDVariable: Integer; ImgIDVariable: Integer;
ImgIDHint: Integer; ImgIDHint: Integer;
ImgIDLabel: Integer;
procedure AssignAllImages; procedure AssignAllImages;
procedure ClearCodeTreeView; procedure ClearCodeTreeView;
procedure ClearDirectivesTreeView; procedure ClearDirectivesTreeView;
@ -727,22 +731,26 @@ begin
Imagelist1.Height := ImageSize; Imagelist1.Height := ImageSize;
ImgIDDefault := TIDEImages.AddImageToImageList(Imagelist1, 'ce_default'); ImgIDDefault := TIDEImages.AddImageToImageList(Imagelist1, 'ce_default');
ImgIDProgram := TIDEImages.AddImageToImageList(Imagelist1, 'ce_program'); ImgIDProgram := TIDEImages.AddImageToImageList(Imagelist1, 'ce_program');
ImgIDUnit := TIDEImages.AddImageToImageList(Imagelist1, 'ce_unit'); ImgIDUnit := TIDEImages.AddImageToImageList(Imagelist1, 'cc_unit');
ImgIDInterface := TIDEImages.AddImageToImageList(Imagelist1, 'ce_interface'); ImgIDInterface := TIDEImages.AddImageToImageList(Imagelist1, 'ce_interface');
ImgIDImplementation := TIDEImages.AddImageToImageList(Imagelist1, 'ce_implementation'); ImgIDImplementation := TIDEImages.AddImageToImageList(Imagelist1, 'ce_implementation');
ImgIDInitialization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_initialization'); ImgIDInitialization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_initialization');
ImgIDFinalization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_finalization'); ImgIDFinalization := TIDEImages.AddImageToImageList(Imagelist1, 'ce_finalization');
ImgIDType := TIDEImages.AddImageToImageList(Imagelist1, 'ce_type'); ImgIDType := TIDEImages.AddImageToImageList(Imagelist1, 'cc_type');
ImgIDVariable := TIDEImages.AddImageToImageList(Imagelist1, 'ce_variable'); ImgIDVariable := TIDEImages.AddImageToImageList(Imagelist1, 'cc_variable');
ImgIDConst := TIDEImages.AddImageToImageList(Imagelist1, 'ce_const'); ImgIDConst := TIDEImages.AddImageToImageList(Imagelist1, 'cc_constant');
ImgIDClass := TIDEImages.AddImageToImageList(Imagelist1, 'ce_class'); ImgIDClass := TIDEImages.AddImageToImageList(Imagelist1, 'cc_class');
ImgIDClassInterface := TIDEImages.AddImageToImageList(Imagelist1, 'ce_classinterface'); ImgIDClassInterface := TIDEImages.AddImageToImageList(Imagelist1, 'ce_classinterface');
ImgIDHelper := TIDEImages.AddImageToImageList(Imagelist1, 'ce_helper'); ImgIDHelper := TIDEImages.AddImageToImageList(Imagelist1, 'ce_helper');
ImgIDRecord := TIDEImages.AddImageToImageList(Imagelist1, 'ce_record'); ImgIDRecord := TIDEImages.AddImageToImageList(Imagelist1, 'cc_record');
ImgIDProcedure := TIDEImages.AddImageToImageList(Imagelist1, 'ce_procedure'); ImgIDEnum := TIDEImages.AddImageToImageList(Imagelist1, 'cc_enum');
ImgIDFunction := TIDEImages.AddImageToImageList(Imagelist1, 'ce_function'); ImgIDProcedure := TIDEImages.AddImageToImageList(Imagelist1, 'cc_procedure');
ImgIDProperty := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property'); ImgIDFunction := TIDEImages.AddImageToImageList(Imagelist1, 'cc_function');
ImgIDPropertyReadOnly := TIDEImages.AddImageToImageList(Imagelist1, 'ce_property_readonly'); ImgIDConstructor := TIDEImages.AddImageToImageList(Imagelist1, 'cc_constructor');
ImgIDDestructor := TIDEImages.AddImageToImageList(Imagelist1, 'cc_destructor');
ImgIDLabel := TIDEImages.AddImageToImageList(Imagelist1, 'cc_label');
ImgIDProperty := TIDEImages.AddImageToImageList(Imagelist1, 'cc_property');
ImgIDPropertyReadOnly := TIDEImages.AddImageToImageList(Imagelist1, 'cc_property_ro');
// sections // sections
ImgIDSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_section'); ImgIDSection := TIDEImages.AddImageToImageList(Imagelist1, 'ce_section');
ImgIDHint := TIDEImages.AddImageToImageList(Imagelist1, 'state_hint'); ImgIDHint := TIDEImages.AddImageToImageList(Imagelist1, 'state_hint');
@ -907,6 +915,8 @@ begin
Result := ImgIDClass; Result := ImgIDClass;
ctnObject,ctnRecordType: ctnObject,ctnRecordType:
Result := ImgIDRecord; Result := ImgIDRecord;
ctnEnumerationType,ctnEnumIdentifier:
Result:=ImgIDEnum;
ctnClassHelper,ctnRecordHelper,ctnTypeHelper: ctnClassHelper,ctnRecordHelper,ctnTypeHelper:
Result := ImgIDHelper; Result := ImgIDHelper;
else else
@ -925,15 +935,26 @@ begin
ctnObjCClass,ctnObjCCategory,ctnCPPClass: ctnObjCClass,ctnObjCCategory,ctnCPPClass:
Result:=ImgIDClass; Result:=ImgIDClass;
ctnRecordType: Result:=ImgIDRecord; ctnRecordType: Result:=ImgIDRecord;
ctnEnumerationType,ctnEnumIdentifier:
Result:=ImgIDEnum;
ctnClassHelper,ctnRecordHelper,ctnTypeHelper: ctnClassHelper,ctnRecordHelper,ctnTypeHelper:
Result:=ImgIDHelper; Result:=ImgIDHelper;
ctnProcedure: if Tool.NodeIsFunction(CodeNode) then ctnProcedure:
if Tool.NodeIsConstructor(CodeNode) then
Result:=ImgIDConstructor
else
if Tool.NodeIsDestructor(CodeNode) then
Result:=ImgIDDestructor
else
if Tool.NodeIsFunction(CodeNode) then
Result:=ImgIDFunction Result:=ImgIDFunction
else else
Result:=ImgIDProcedure; Result:=ImgIDProcedure;
ctnProperty: Result:=ImgIDProperty; ctnProperty: Result:=ImgIDProperty;
ctnUsesSection: Result:=ImgIDSection; ctnUsesSection: Result:=ImgIDSection;
ctnUseUnit: Result:=ImgIDUnit; ctnUseUnit: Result:=ImgIDUnit;
ctnLabelSection: Result:=ImgIDSection;
ctnLabel: Result:=ImgIDLabel;
else else
Result:=ImgIDDefault; Result:=ImgIDDefault;
end; end;

4
ide/procedurelist.pas
View File

@ -361,8 +361,8 @@ begin
SG.Columns[SG_COLIDX_TYPE].Width := 110; SG.Columns[SG_COLIDX_TYPE].Width := 110;
SG.Columns[SG_COLIDX_LINE].Width := 60; SG.Columns[SG_COLIDX_LINE].Width := 60;
FImageIdxProcedure := IDEImages.LoadImage('ce_procedure'); FImageIdxProcedure := IDEImages.LoadImage('cc_procedure');
FImageIdxFunction := IDEImages.LoadImage('ce_function');; FImageIdxFunction := IDEImages.LoadImage('cc_function');;
cbObjects.Style := csDropDownList; cbObjects.Style := csDropDownList;
cbObjects.Sorted := True; cbObjects.Sorted := True;