- gapp: fix Google Map for geocaches with corrected coords

- gapp: change, main window menu image items are not scaled any more
GlobalcachingEU · Mar 4, 2015 · 8948574 · 8948574
1 parent de5ff48
commit 8948574
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 48 deletions.
diff --git a/DefaultPlugins/GlobalcachingApplication.Plugins.GMap/GMapForm.cs b/DefaultPlugins/GlobalcachingApplication.Plugins.GMap/GMapForm.cs
@@ -493,7 +493,7 @@ public void UpdateView(MapUpdateReason reason)
                 {
                     if (Core.ActiveGeocache.ContainsCustomLatLon)
                     {
-                        executeScript(string.Format("setGeocache('gapp://{0}', '{1}','{2}', {3}, {4}, '{5}')", Utils.ImageSupport.Instance.GetImagePath(Core, Framework.Data.ImageSize.Medium, Core.ActiveGeocache.GeocacheType), Core.ActiveGeocache.Code, HttpUtility.HtmlEncode(Core.ActiveGeocache.Name), ((double)Core.ActiveGeocache.CustomLat).ToString(CultureInfo.InvariantCulture), ((double)Core.ActiveGeocache.CustomLon).ToString(CultureInfo.InvariantCulture), string.Format("gct{0}IconC", Core.ActiveGeocache.GeocacheType.ID.ToString().Replace("-", "_"))));
+                        executeScript(string.Format("setGeocache('gapp://{0}', '{1}','{2}', {3}, {4}, '{5}')", Utils.ImageSupport.Instance.GetImagePath(Core, Framework.Data.ImageSize.Medium, Core.ActiveGeocache.GeocacheType).Replace('\\', '/'), Core.ActiveGeocache.Code, HttpUtility.HtmlEncode(Core.ActiveGeocache.Name), ((double)Core.ActiveGeocache.CustomLat).ToString(CultureInfo.InvariantCulture), ((double)Core.ActiveGeocache.CustomLon).ToString(CultureInfo.InvariantCulture), string.Format("gct{0}IconC", Core.ActiveGeocache.GeocacheType.ID.ToString().Replace("-", "_"))));
                     }
                     else
                     {

diff --git a/DefaultPlugins/GlobalcachingApplication.Plugins.UIMainWindow/FormMain.cs b/DefaultPlugins/GlobalcachingApplication.Plugins.UIMainWindow/FormMain.cs
@@ -577,6 +577,7 @@ public override void AddPluginAction(PluginAction pa)
             if (tsp != null)
             {
                 (mi as ToolStripMenuItem).Image = tsp.ButtonImage;
+                (mi as ToolStripMenuItem).ImageScaling = ToolStripItemImageScaling.None;
             }
 
             ToolStripMenuItem misub = null;

diff --git a/GAPPSF.sln b/GAPPSF.sln
@@ -1,40 +1,38 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GAPPSF", "GAPPSF\GAPPSF.csproj", "{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|x64.ActiveCfg = Debug|x64
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|x64.Build.0 = Debug|x64
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|x86.ActiveCfg = Debug|x86
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|x86.Build.0 = Debug|x86
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|x64.ActiveCfg = Release|x64
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|x64.Build.0 = Release|x64
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|x86.ActiveCfg = Release|x86
-		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GAPPSF", "GAPPSF\GAPPSF.csproj", "{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|x64.ActiveCfg = Debug|x64
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|x64.Build.0 = Debug|x64
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|x86.ActiveCfg = Debug|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Debug|x86.Build.0 = Debug|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|Any CPU.ActiveCfg = Release|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|Mixed Platforms.Build.0 = Release|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|x64.ActiveCfg = Release|x64
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|x64.Build.0 = Release|x64
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|x86.ActiveCfg = Release|x86
+		{DEE3C2B3-236E-42AC-BD54-2EA0100BCEF9}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/GAPPSF/Properties/AssemblyInfo.cs b/GAPPSF/Properties/AssemblyInfo.cs
@@ -51,5 +51,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.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
diff --git a/GlobalcachingApplication.Core/Properties/AssemblyInfo.cs b/GlobalcachingApplication.Core/Properties/AssemblyInfo.cs
@@ -32,5 +32,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.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
diff --git a/GlobalcachingApplication.Utils/Controls/GAPPWebBrowser.cs b/GlobalcachingApplication.Utils/Controls/GAPPWebBrowser.cs
@@ -70,7 +70,7 @@ public object InvokeScript(string script)
                 task.Wait();
                 result = task.Result.Result;
             }
-            catch
+            catch(Exception e)
             {
             }
             return result;

diff --git a/GlobalcachingApplication/Properties/AssemblyInfo.cs b/GlobalcachingApplication/Properties/AssemblyInfo.cs
@@ -32,5 +32,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.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
diff --git a/History.txt b/History.txt
@@ -1,3 +1,7 @@
+V2.0.5.0
+- gapp: fix Google Map for geocaches with corrected coords
+- gapp: change, main window menu image items are not scaled any more
+
 V2.0.4.0
 - gapp: fix icons in toolbar