added more error handling

Author: agallero

MultIDE.Resources.res

@@ -1,5 +1,7 @@
 program multide;
 
+{$R 'MultIDE.Resources.res' 'src\MultIDE.Resources.rc'}
+
 uses
   Vcl.Forms,
   Form.Main in 'src\Form.Main.pas' {FormMain},

ide-images/development.png

@@ -133,6 +133,9 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
+        <RcCompile Include="src\MultIDE.Resources.rc">
+            <Form>MultIDE.Resources.res</Form>
+        </RcCompile>
         <DCCReference Include="src\Form.Main.pas">
             <Form>FormMain</Form>
             <FormType>dfm</FormType>

multide.dpr

@@ -22,7 +22,7 @@ object FormGlobalConfig: TFormGlobalConfig
     Align = alBottom
     BevelOuter = bvNone
     Color = clWhite
-    TabOrder = 0
+    TabOrder = 2
     ExplicitTop = 368
     ExplicitWidth = 486
     DesignSize = (
@@ -58,7 +58,7 @@ object FormGlobalConfig: TFormGlobalConfig
     Height = 81
     Align = alTop
     BevelOuter = bvNone
-    TabOrder = 1
+    TabOrder = 0
     ExplicitWidth = 486
     DesignSize = (
       496
@@ -79,22 +79,22 @@ object FormGlobalConfig: TFormGlobalConfig
     end
     object btnExport: TButton
       Left = 342
-      Top = 4
+      Top = 25
       Width = 136
       Height = 25
       Anchors = [akTop, akRight]
       Caption = 'Export Configurations'
-      TabOrder = 0
+      TabOrder = 2
       OnClick = btnExportClick
     end
     object btnImport: TButton
       Left = 342
-      Top = 35
+      Top = 56
       Width = 136
       Height = 25
       Anchors = [akTop, akRight]
       Caption = 'Import Configurations'
-      TabOrder = 1
+      TabOrder = 3
       OnClick = btnImportClick
     end
     object cbItemSize: TComboBox
@@ -103,7 +103,7 @@ object FormGlobalConfig: TFormGlobalConfig
       Width = 150
       Height = 23
       Style = csDropDownList
-      TabOrder = 2
+      TabOrder = 0
       OnChange = cbItemSizeChange
       Items.Strings = (
         'Small'
@@ -116,7 +116,7 @@ object FormGlobalConfig: TFormGlobalConfig
       Width = 150
       Height = 23
       Style = csDropDownList
-      TabOrder = 3
+      TabOrder = 1
       OnChange = cbLightModeChange
       Items.Strings = (
         'Automatic'
@@ -131,7 +131,7 @@ object FormGlobalConfig: TFormGlobalConfig
     Height = 319
     Align = alClient
     BevelOuter = bvNone
-    TabOrder = 2
+    TabOrder = 1
     ExplicitWidth = 486
     ExplicitHeight = 287
     DesignSize = (
@@ -155,7 +155,7 @@ object FormGlobalConfig: TFormGlobalConfig
       ItemSelectionOptions.SelectedColorAlpha = 70
       ItemSelectionOptions.FocusedColorAlpha = 80
       ParentColor = False
-      TabOrder = 0
+      TabOrder = 1
       SmoothMouseWheelScrolling = True
       OnBeforeDrawItem = IDEListBeforeDrawItem
       object IDECaption: TLabel
@@ -273,7 +273,7 @@ object FormGlobalConfig: TFormGlobalConfig
       Width = 145
       Height = 25
       Caption = 'Add &Configuration'
-      TabOrder = 1
+      TabOrder = 0
       OnClick = btnAddConfigurationClick
     end
   end

multide.dproj

@@ -10,16 +10,16 @@ object FormMain: TFormMain
   Color = clBtnFace
   CustomTitleBar.Enabled = True
   CustomTitleBar.Height = 58
-  CustomTitleBar.BackgroundColor = clWhite
-  CustomTitleBar.ForegroundColor = 65793
+  CustomTitleBar.BackgroundColor = 8288617
+  CustomTitleBar.ForegroundColor = clWhite
   CustomTitleBar.InactiveBackgroundColor = clWhite
   CustomTitleBar.InactiveForegroundColor = 10066329
-  CustomTitleBar.ButtonForegroundColor = 65793
-  CustomTitleBar.ButtonBackgroundColor = clWhite
+  CustomTitleBar.ButtonForegroundColor = clWhite
+  CustomTitleBar.ButtonBackgroundColor = 8288617
   CustomTitleBar.ButtonHoverForegroundColor = 65793
-  CustomTitleBar.ButtonHoverBackgroundColor = 16053492
+  CustomTitleBar.ButtonHoverBackgroundColor = 9736063
   CustomTitleBar.ButtonPressedForegroundColor = 65793
-  CustomTitleBar.ButtonPressedBackgroundColor = 15395562
+  CustomTitleBar.ButtonPressedBackgroundColor = 11644578
   CustomTitleBar.ButtonInactiveForegroundColor = 10066329
   CustomTitleBar.ButtonInactiveBackgroundColor = clWhite
   Constraints.MinHeight = 100

res/missing.png

@@ -132,6 +132,12 @@ procedure TFormMain.LoadIDEIcons;
         begin
           IDEImages.Delete(IDEImages.Images.Count - 1);
         end;
+        var MissingStream := TResourceStream.Create(HInstance, 'MISSING_IMAGE', RT_RCDATA);
+        try
+          IDEImages.Add(IconName, MissingStream);
+        finally
+          MissingStream.Free;
+        end;
       end;
     end;
   end;

src/Form.GlobalConfig.dfm

@@ -24,8 +24,7 @@ class function Config.ShortcutsImagePath(const FileName: string): string;
 
 class function Config.IDEImagePath(const FileName: string): string;
 begin
-  Result := TPath.Combine('ide-images', FileName);
-  if not TFile.Exists(Result) then Result := '';
+  Result := TPath.GetFullPath(TPath.Combine('ide-images', FileName));
 end;
 
 class function Config.IDEIconPath(const FileName: string): string;

src/Form.Main.dfm

@@ -99,8 +99,13 @@ procedure SavePngStreamToIcoStream(PngStream, IcoStream: TStream; AWidth, AHeigh
 
 class procedure TIcoCreator.Convert(const InFileName, OutFileName: string);
 begin
-  var PngStream := TFileStream.Create(InFileName, fmOpenRead);
+  var PngStream: TStream := nil;
   try
+    try
+      PngStream := TFileStream.Create(InFileName, fmOpenRead);
+    except
+      PngStream := TResourceStream.Create(HInstance, 'MISSING_IMAGE', RT_RCDATA);
+    end;
     var IcoStream := TFileStream.Create(OutFileName, fmCreate);
     try
       SavePngStreamToIcoStream(PngStream, IcoStream, 512, 512);