scale main menu icons

lazproj/coedit.lpi

@@ -13,7 +13,7 @@
         <DpiAware Value="True/PM"/>
       </XPManifest>
       <Icon Value="0"/>
-      <Resources Count="333">
+      <Resources Count="354">
         <Resource_0 FileName="..\icons\arrow\arrow_up.png" Type="RCDATA" ResourceName="ARROW_UP"/>
         <Resource_1 FileName="..\icons\arrow\arrow_down.png" Type="RCDATA" ResourceName="ARROW_DOWN"/>
         <Resource_2 FileName="..\icons\arrow\arrow_divide.png" Type="RCDATA" ResourceName="ARROW_DIVIDE"/>
@@ -347,6 +347,27 @@
         <Resource_330 FileName="..\icons\window\watch_window24.png" Type="RCDATA" ResourceName="WATCH_WINDOW24"/>
         <Resource_331 FileName="..\icons\window\watch_window32.png" Type="RCDATA" ResourceName="WATCH_WINDOW32"/>
         <Resource_332 FileName="..\cesetup\version.txt" Type="RCDATA" ResourceName="VERSION"/>
+        <Resource_333 FileName="../icons/other/evaluate_formula.png" Type="RCDATA" ResourceName="EVALUATE_FORMULA"/>
+        <Resource_334 FileName="../icons/other/evaluate_formula24.png" Type="RCDATA" ResourceName="EVALUATE_FORMULA24"/>
+        <Resource_335 FileName="../icons/other/evaluate_formula32.png" Type="RCDATA" ResourceName="EVALUATE_FORMULA32"/>
+        <Resource_336 FileName="../icons/folder/folders_explorer.png" Type="RCDATA" ResourceName="FOLDERS_EXPLORER"/>
+        <Resource_337 FileName="../icons/folder/folders_explorer24.png" Type="RCDATA" ResourceName="FOLDERS_EXPLORER24"/>
+        <Resource_338 FileName="../icons/folder/folders_explorer32.png" Type="RCDATA" ResourceName="FOLDERS_EXPLORER32"/>
+        <Resource_339 FileName="../icons/folder/folder_vertical_document.png" Type="RCDATA" ResourceName="FOLDER_VERTICAL_DOCUMENT"/>
+        <Resource_340 FileName="../icons/folder/folder_vertical_document24.png" Type="RCDATA" ResourceName="FOLDER_VERTICAL_DOCUMENT24"/>
+        <Resource_341 FileName="../icons/folder/folder_vertical_document32.png" Type="RCDATA" ResourceName="FOLDER_VERTICAL_DOCUMENT32"/>
+        <Resource_342 FileName="../icons/other/error_checking.png" Type="RCDATA" ResourceName="ERROR_CHECKING"/>
+        <Resource_343 FileName="../icons/other/error_checking24.png" Type="RCDATA" ResourceName="ERROR_CHECKING24"/>
+        <Resource_344 FileName="../icons/other/error_checking32.png" Type="RCDATA" ResourceName="ERROR_CHECKING32"/>
+        <Resource_345 FileName="../icons/file/script_lightning.png" Type="RCDATA" ResourceName="SCRIPT_LIGHTNING"/>
+        <Resource_346 FileName="../icons/file/script_lightning24.png" Type="RCDATA" ResourceName="SCRIPT_LIGHTNING24"/>
+        <Resource_347 FileName="../icons/file/script_lightning32.png" Type="RCDATA" ResourceName="SCRIPT_LIGHTNING32"/>
+        <Resource_348 FileName="../icons/cog/system_run.png" Type="RCDATA" ResourceName="SYSTEM_RUN"/>
+        <Resource_349 FileName="../icons/cog/system_run24.png" Type="RCDATA" ResourceName="SYSTEM_RUN24"/>
+        <Resource_350 FileName="../icons/cog/system_run32.png" Type="RCDATA" ResourceName="SYSTEM_RUN32"/>
+        <Resource_351 FileName="../icons/other/cross.png" Type="RCDATA" ResourceName="CROSS"/>
+        <Resource_352 FileName="../icons/other/cross24.png" Type="RCDATA" ResourceName="CROSS24"/>
+        <Resource_353 FileName="../icons/other/cross32.png" Type="RCDATA" ResourceName="CROSS32"/>
       </Resources>
     </General>
     <i18n>

src/ce_gdb.lfm

@@ -37,15 +37,15 @@ inherited CEGdbWidget: TCEGdbWidget
           Width = 517
           Align = alClient
           Caption = 'CPU'
-          ClientHeight = 161
-          ClientWidth = 513
+          ClientHeight = 162
+          ClientWidth = 515
           TabOrder = 0
           object cpuViewer: TTIPropertyGrid
             Left = 0
-            Height = 161
+            Height = 162
             Hint = 'cpu registers'
             Top = 0
-            Width = 513
+            Width = 515
             Align = alClient
             CheckboxForBoolean = True
             DefaultValueFont.Color = clWindowText
@@ -82,8 +82,8 @@ inherited CEGdbWidget: TCEGdbWidget
             ClientWidth = 511
             object lstVariables: TListView
               Left = 2
-              Height = 132
-              Top = 31
+              Height = 136
+              Top = 27
               Width = 507
               Align = alClient
               AutoWidthLastColumn = True
@@ -109,7 +109,7 @@ inherited CEGdbWidget: TCEGdbWidget
             end
             object varListFlt: TListViewFilterEdit
               Left = 2
-              Height = 27
+              Height = 23
               Hint = 'locate variables'
               Top = 2
               Width = 507
@@ -458,7 +458,7 @@ inherited CEGdbWidget: TCEGdbWidget
         DropdownMenu = mnuEval
         OnClick = btnEvalClick
         Style = tbsDropDown
-        resourceName = 'DEBUGGER_INSPECT'
+        resourceName = 'EVALUATE_FORMULA'
         scaledSeparator = False
       end
     end

src/ce_libmaneditor.pas

@@ -98,16 +98,31 @@ begin
 end;
 
 procedure TCELibManEditorWidget.updateButtonsState;
+var
+  i: TIconScaledSize;
 begin
   btnReg.Enabled := (fProj <> nil) and (fProj.binaryKind = staticlib) and
     fProj.Filename.fileExists;
   btnOpenProj.Enabled := List.Selected.isNotNil and
     List.Selected.SubItems[2].fileExists;
+  i := GetIconScaledSize;
   if List.Selected.isNotNil and itemForRow(List.Selected).isNotNil and
     itemForRow(List.Selected).enabled then
-      btnEnabled.resourceName := 'BOOK'
+  begin
+    case i of
+      iss16: btnEnabled.resourceName := 'BOOK';
+      iss24: btnEnabled.resourceName := 'BOOK24';
+      iss32: btnEnabled.resourceName := 'BOOK32';
+    end;
+  end
   else
-    btnEnabled.resourceName := 'BOOK_GREY';
+  begin
+    case i of
+      iss16: btnEnabled.resourceName := 'BOOK_GREY';
+      iss24: btnEnabled.resourceName := 'BOOK_GREY24';
+      iss32: btnEnabled.resourceName := 'BOOK_GREY32';
+    end;
+  end;
 end;
 
 function TCELibManEditorWidget.isAliasRegistered(const anAlias: string): boolean;

src/ce_main.pas

@@ -184,7 +184,7 @@ type
     MenuItem29: TMenuItem;
     MenuItem3: TMenuItem;
     MenuItem30: TMenuItem;
-    MenuItem31: TMenuItem;
+    mnuProjNew: TMenuItem;
     MenuItem32: TMenuItem;
     MenuItem33: TMenuItem;
     MenuItem34: TMenuItem;
@@ -342,6 +342,7 @@ type
 
   private
 
+    fImages: TImageList;
     fOptionCategories: TCEEditableOptionsSubject;
     fRunnablesOptions: TCEEditableRunnableOptions;
     fSymStringExpander: ICESymStringExpander;
@@ -426,6 +427,7 @@ type
     procedure scedSendDone;
 
     //Init - Fina
+    procedure InitImages;
     procedure getCMdParams;
     procedure InitMRUs;
     procedure InitWidgets;
@@ -1175,6 +1177,7 @@ begin
   EntitiesConnector.addObserver(self);
   EntitiesConnector.addSingleService(self);
 
+  InitImages;
   InitMRUs;
   InitWidgets;
   InitDocking;
@@ -1301,6 +1304,117 @@ begin
   fPrjGrpMru.OnChange := @mruChange;
 end;
 
+procedure TCEMainForm.InitImages;
+var
+  c: TIconScaledSize;
+  z: array[TIconScaledSize] of integer = (16, 24, 32);
+  i: integer;
+
+function loadIcon(value: string): integer;
+const
+  s: array[TIconScaledSize] of string = ('', '24', '32');
+begin
+  result := fImages.AddResourceName(HINSTANCE, value + s[c]);
+end;
+
+begin
+  c := GetIconScaledSize;
+
+  fImages := TImageList.Create(self);
+  fImages.Width:= z[c];
+  fImages.Height:= z[c];
+  Actions.Images := fImages;
+  mainMenu.Images := fImages;
+
+  i := loadIcon('CROSS');
+  actFileClose.ImageIndex:= i;
+  actFileCloseAll.ImageIndex:= i;
+  actFileCloseAllOthers.ImageIndex:= i;
+  actProjClose.ImageIndex:= i;
+  actProjGroupClose.ImageIndex:=i;
+
+  i := loadIcon('ERROR_CHECKING');
+  actFileDscanner.ImageIndex := i;
+  actProjDscan.ImageIndex:= i;
+  actFileMetricsHalstead.ImageIndex:=i;
+
+  i := loadIcon('DISK');
+  actFileSave.ImageIndex:= i;
+  actProjSave.ImageIndex:= i;
+  actProjSaveGroup.ImageIndex:=i;
+
+  i := loadIcon('DISK_PEN');
+  actFileSaveAs.ImageIndex:= i;
+  actFileSaveCopyAs.ImageIndex:= i;
+  actProjSaveAs.ImageIndex:= i;
+  actProjSaveGroupAs.ImageIndex:= i;
+
+  i := loadIcon('DISK_MULTIPLE');
+  actFileSaveAll.ImageIndex := i;
+
+  i := loadIcon('FOLDER_VERTICAL_DOCUMENT');
+  actFileOpen.ImageIndex:= i;
+  actProjOpen.ImageIndex:= i;
+  actProjOpenGroup.ImageIndex:= i;
+  mnuItemMruFile.ImageIndex:= i;
+  mnuItemMruGroup.ImageIndex:= i;
+  mnuItemMruProj.ImageIndex:= i;
+
+  i := loadIcon('SCRIPT_GEAR');
+  actFileNewRun.ImageIndex:= i;
+  actFileCompAndRun.ImageIndex:= i;
+  actFileCompAndRunWithArgs.ImageIndex:= i;
+  actFileCompileAndRunOut.ImageIndex:= i;
+  actFileCompile.ImageIndex:= i;
+  actFileRun.ImageIndex:= i;
+  actFileRunOut.ImageIndex:= i;
+  actFileUnittest.ImageIndex:= i;
+
+  i := loadIcon('DOCUMENT');
+  actFileNew.ImageIndex:= i;
+  mnuProjNew.ImageIndex:= i;
+  actProjNewNative.ImageIndex:= i;
+  actProjNewDubJson.ImageIndex:= i;
+  actProjNewGroup.ImageIndex:= i;
+
+  i := loadIcon('DUB');
+  actFileNewDubScript.ImageIndex:= i;
+  actFileRunDub.ImageIndex:= i;
+  actFileRunDubOut.ImageIndex:= i;
+
+  i := loadIcon('FOLDERS_EXPLORER');
+  actFileOpenContFold.ImageIndex:= i;
+  actProjOpenContFold.ImageIndex:= i;
+
+  i := loadIcon('CUT');
+  actEdCut.ImageIndex:= i;
+  i := loadIcon('COPY');
+  actEdCopy.ImageIndex:= i;
+  i := loadIcon('PASTE');
+  actEdPaste.ImageIndex:= i;
+  actFileNewClip.ImageIndex:= i;
+  i := loadIcon('ARROW_UNDO');
+  actEdUndo.ImageIndex:= i;
+  i := loadIcon('ARROW_REDO');
+  actEdRedo.ImageIndex:= i;
+  i := loadIcon('FIND');
+  actEdFind.ImageIndex:= i;
+  actEdFindNext.ImageIndex:= i;
+
+  i := loadIcon('SYSTEM_RUN');
+  actProjCompile.ImageIndex:= i;
+  actProjCompileAndRun.ImageIndex:= i;
+  actProjCompAndRunWithArgs.ImageIndex:= i;
+  actProjGroupCompile.ImageIndex:= i;
+  actProjGroupCompileCustomSync.ImageIndex:= i;
+  actProjGroupCompileSync.ImageIndex:= i;
+
+  i := loadIcon('FLASH');
+  actProjRun.ImageIndex:= i;
+  actProjRunWithArgs.ImageIndex:= i;
+
+end;
+
 procedure TCEMainForm.InitWidgets;
 var
   widg: TCEWidget;