- Make sure forms have the same icon

- Set `app.manifest` to deal with high dpi
Smurf-IV · Dec 29, 2021 · da43179 · da43179
1 parent 8780758
commit da43179
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 838 deletions.
diff --git a/Elucidate/Elucidate.sln b/Elucidate/Elucidate.sln
@@ -79,4 +79,14 @@ Global
 		BuildVersion_StartDate = 2000/1/1
 		SolutionGuid = {39E6A612-AC12-4D63-BE2A-60EA16940A8A}
 	EndGlobalSection
+	GlobalSection(AutomaticVersions) = postSolution
+		UpdateAssemblyVersion = True
+		UpdateAssemblyFileVersion = True
+		UpdateAssemblyInfoVersion = False
+		AssemblyVersionSettings = YearStamp.MonthStamp.DayStamp.Increment
+		AssemblyFileVersionSettings = ShortYearStamp.MonthStamp.DayStamp.Increment
+		UpdatePackageVersion = False
+		AssemblyInfoVersionType = SettingsVersion
+		InheritWinAppVersionFrom = None
+	EndGlobalSection
 EndGlobal
diff --git a/Elucidate/Elucidate/Controls/RunControl.Designer.cs b/Elucidate/Elucidate/Controls/RunControl.Designer.cs
diff --git a/Elucidate/Elucidate/Elucidate.csproj b/Elucidate/Elucidate/Elucidate.csproj
@@ -10,7 +10,7 @@
         <PlatformTarget>AnyCPU</PlatformTarget>
         <ApplicationIcon>Elucidate.ico</ApplicationIcon>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <NeutralLanguage>en</NeutralLanguage>
+        <NeutralLanguage>en-GB</NeutralLanguage>
         <WarningLevel>5</WarningLevel>
         <LangVersion>preview</LangVersion>
         <AnalysLevel>preview</AnalysLevel>
@@ -24,7 +24,6 @@
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         <Content Include="Elucidate.ico" />
-        <None Include="Resources\cam_48.png" />
         <None Include="Resources\camera_48.png" />
         <None Include="Resources\database_add_48.png" />
         <None Include="Resources\database_warning_48.png" />

diff --git a/Elucidate/Elucidate/Forms/CalculateBlockSize.cs b/Elucidate/Elucidate/Forms/CalculateBlockSize.cs
@@ -45,6 +45,8 @@ public partial class CalculateBlockSize : KryptonForm
         public CalculateBlockSize()
         {
             ParityTargets = new List<string>(2);
+            Icon = Properties.Resources.ElucidateIco;
+
             InitializeComponent();
             var available = new ComputerInfo().TotalPhysicalMemory;
             const decimal testValue = 1UL << 30; // Should be 1 GBytes 

diff --git a/Elucidate/Elucidate/Forms/ElucidateForm.Designer.cs b/Elucidate/Elucidate/Forms/ElucidateForm.Designer.cs
diff --git a/Elucidate/Elucidate/Forms/ElucidateForm.cs b/Elucidate/Elucidate/Forms/ElucidateForm.cs
@@ -53,6 +53,10 @@ public sealed partial class ElucidateForm : KryptonForm
 
         public ElucidateForm()
         {
+            // For some reason the designer keeps removing the following !!
+            tpCoverage = new Controls.ProtectedDrivesDisplay();
+            Icon = Properties.Resources.ElucidateIco;
+
             InitializeComponent();
 
             if (Properties.Settings.Default.UpdateRequired)