Changed Configuration naming to include left and top coordinates for …

…cache image names and basic string output. Added Elite Dangerous
ScottyMac52 · Sep 19, 2019 · 800c86c · 800c86c
1 parent 8757c47
commit 800c86c
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 454 deletions.
diff --git a/.gitignore b/.gitignore
@@ -235,3 +235,4 @@
 /CustomActions/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
 /CustomActions/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
 /CustomActions/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+/MFDSettingsManager/`1
diff --git a/MFDSettingsManager/MFDSettingsManager.csproj b/MFDSettingsManager/MFDSettingsManager.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Output\</OutputPath>
+    <OutputPath>`1\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/MFDSettingsManager/Models/ConfigurationDefinition.cs b/MFDSettingsManager/Models/ConfigurationDefinition.cs
@@ -70,7 +70,7 @@ public ConfigurationDefinition(ConfigurationDefinition dc) : base(dc)
         /// <returns></returns>
         protected override string GetReadableString()
         {
-            return $"{Width}_{Height}";
+            return $"({Left}, {Top})_{Width}_{Height}";
         }
 
         #endregion Protected overrides 

diff --git a/MFDSettingsManager/Properties/AssemblyInfo.cs b/MFDSettingsManager/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.4.0")]
-[assembly: AssemblyFileVersion("2.6.4.0")]
+[assembly: AssemblyVersion("2.6.5.0")]
+[assembly: AssemblyFileVersion("2.6.5.0")]
diff --git a/MFDisplay/Properties/AssemblyInfo.cs b/MFDisplay/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.4.0")]
-[assembly: AssemblyFileVersion("2.6.4.0")]
+[assembly: AssemblyVersion("2.6.5.0")]
+[assembly: AssemblyFileVersion("2.6.5.0")]
 [assembly: Guid("FE237DCB-D0D2-477C-BCC0-6004B30B0D9E")]
 
diff --git a/MFDisplay/mfdsettings.config b/MFDisplay/mfdsettings.config
@@ -148,6 +148,18 @@ xsi:schemaLocation="http://tempuri.org/mfdsettings.xsd mfdsettings.xsd" filePath
         <add name="WHKEY" filename="Combined Arms\DCS CA WH.jpg" />
       </Configurations>
     </add>
+    <add moduleName="Elite" displayName="Elite: Dangerous" filename="Elite Dangerous\EliteD MFD.jpg">
+      <Configurations>
+        <add name="RMFD"  enable="false" />
+        <add name="WHKEY" filename="Elite Dangerous\EliteD WH.jpg" />
+      </Configurations>
+    </add>
+    <add moduleName="EliteHV" displayName="Elite: Dangerous HiViz" filename="_High Contrast MFDs\EliteD MFD HiVis.jpg">
+      <Configurations>
+        <add name="RMFD"  enable="false" />
+        <add name="WHKEY" filename="Elite Dangerous\EliteD WH.jpg"  />
+      </Configurations>
+    </add>
     <add moduleName="F-5E" displayName="F-5E Tiger II" filename="F-5E\DCS F5E MFD.jpg">
       <Configurations>
         <add name="WHKEY" filename="F-5E\DCS F5E WH.jpg" />