Fix issue with {appfolder} usage in templates

Author: nhmkdev

CardMaker/Card/CardPathUtil.cs

@@ -29,7 +29,6 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Linq.Expressions;
 using CardMaker.Data;
 using CardMaker.Data.Serialization;
 using CardMaker.Events.Managers;
@@ -46,6 +45,8 @@ namespace CardMaker.Card
 {
     public static class ImageCache
     {
+        private const string APPLICATION_FOLDER_MARKER = "{appfolder}";
+
         public enum ImageCacheEntryType
         {
             File,
@@ -335,6 +336,12 @@ private static string GetExistingFilePath(string sFile)
         {
             try
             {
+                if (sFile.StartsWith(APPLICATION_FOLDER_MARKER))
+                {
+                    sFile = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
+                        sFile.Replace(APPLICATION_FOLDER_MARKER, string.Empty));
+                }
+
                 if (File.Exists(sFile))
                 {
                     return sFile;

CardMaker/Card/ImageCache.cs

@@ -79,7 +79,6 @@
     <Compile Include="Card\CardCanvas.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Card\CardPathUtil.cs" />
     <Compile Include="Card\CardRenderer.cs" />
     <Compile Include="Card\CommandLine\CommandLineEnumerations.cs" />
     <Compile Include="Card\CommandLine\CommandLineExporterBase.cs" />

CardMaker/CardMaker.csproj

@@ -22,7 +22,7 @@
 // SOFTWARE.
 ////////////////////////////////////////////////////////////////////////////////
 
-//#define UNSTABLE
+#define UNSTABLE
 
 namespace CardMaker
 {
@@ -31,7 +31,7 @@ public static class CardMakerBuild
         public static string GetBuildSuffix()
         {
 #if UNSTABLE
-            return "[UNSTABLE] V.A8";
+            return "[UNSTABLE] V.A1";
 #else
             return string.Empty;
 #endif

CardMaker/CardMakerBuild.cs

@@ -78,7 +78,6 @@
     <Compile Include="Card\CardCanvas.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Card\CardPathUtil.cs" />
     <Compile Include="Card\CardRenderer.cs" />
     <Compile Include="Card\CommandLine\CommandLineEnumerations.cs" />
     <Compile Include="Card\CommandLine\CommandLineExporterBase.cs" />

CardMaker/CardMaker_Mono.csproj

@@ -640,7 +640,7 @@ private void btnSetSizeToImage_Click(object sender, EventArgs e)
                     Logger.AddLogLine("Unable to set element size. Is an element selected?");
                     return;
                 }
-                var zBmp = ImageCache.LoadCustomImageFromCache(CardPathUtil.getPath(txtElementVariable.Text), zElement);
+                var zBmp = ImageCache.LoadCustomImageFromCache(txtElementVariable.Text, zElement);
                 if (null == zBmp)
                 {
                     // attempt a translated version of the element variable

CardMaker/Forms/MDIElementControl.cs

@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]