From a0228920d8aa251681b47bc93eb7285c1abbf173 Mon Sep 17 00:00:00 2001 From: Lorenz Cuno Klopfenstein Date: Sat, 18 Jan 2014 02:00:47 +0100 Subject: [PATCH] Removed debugging info from PostInstaller application. Version number upgraded to 3.5. Installer script updated. --- .../PostInstaller/PostInstaller/Program.cs | 26 +++------ Installer/script.nsi | 4 +- OnTopReplica/OnTopReplica.csproj | 57 ++++++++++++++++++- OnTopReplica/Properties/AssemblyInfo.cs | 4 +- OnTopReplica/Strings.Designer.cs | 2 +- OnTopReplica/app.config | 4 +- 6 files changed, 71 insertions(+), 26 deletions(-) diff --git a/Installer/PostInstaller/PostInstaller/Program.cs b/Installer/PostInstaller/PostInstaller/Program.cs index 82f0010..6810601 100644 --- a/Installer/PostInstaller/PostInstaller/Program.cs +++ b/Installer/PostInstaller/PostInstaller/Program.cs @@ -10,13 +10,17 @@ namespace PostInstaller { static int Main(string[] args) { var success = Run(args); +#if DEBUG Console.Read(); +#endif return success ? 0 : 1; } private static bool Run(string[] args) { +#if DEBUG Console.WriteLine("Attempting to create IShellItem for file {0}...", args[0]); +#endif IShellLink link = (IShellLink)new CShellLink(); //Win32Shell.SHCreateItemFromParsingName(args[0], IntPtr.Zero, Win32Shell.IShellLinkId, out link); @@ -33,29 +37,17 @@ namespace PostInstaller { link.SetArguments(""); */ +#if DEBUG Console.WriteLine("Querying for IPropertyStore interface..."); +#endif IPropertyStore propStore = (IPropertyStore)link; - PropertyKey appUserModelKey = new PropertyKey(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 5); - try { - object oldValue; - propStore.GetValue(ref appUserModelKey, out oldValue); - - Console.WriteLine("AppUserModel.ID value: {0} (type {1})", oldValue, oldValue.GetType().AssemblyQualifiedName); - } - catch (Exception ex) { #if DEBUG - throw; -#else - Console.WriteLine("Unable to get value of AppUserModel.ID property."); - Console.WriteLine(ex); -#endif - } - - try { Console.WriteLine("Attempting to set property 'System.AppUserModel.ID' to {0}...", args[1]); +#endif + PropertyKey appUserModelKey = new PropertyKey(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 5); propStore.SetValue(ref appUserModelKey, new BStrWrapper(args[1])); propStore.Commit(); @@ -72,8 +64,6 @@ namespace PostInstaller { return false; #endif } - - Console.WriteLine("Done."); return true; } diff --git a/Installer/script.nsi b/Installer/script.nsi index a97f521..5120e30 100644 --- a/Installer/script.nsi +++ b/Installer/script.nsi @@ -18,8 +18,8 @@ RequestExecutionLevel user !define WEBSITE_LINK "http://www.klopfenstein.net/lorenz.aspx/ontopreplica" # GRAPHICS -!define MUI_ICON "..\OnTopReplica\Assets\icon-new.ico" -!define MUI_UNICON "..\OnTopReplica\Assets\icon-new-red.ico" +!define MUI_ICON "..\OriginalAssets\new-flat-icon.ico" +!define MUI_UNICON "..\OriginalAssets\new-flat-icon.ico" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_RIGHT !define MUI_HEADERIMAGE_BITMAP "header.bmp" diff --git a/OnTopReplica/OnTopReplica.csproj b/OnTopReplica/OnTopReplica.csproj index ce91235..6fd5b79 100644 --- a/OnTopReplica/OnTopReplica.csproj +++ b/OnTopReplica/OnTopReplica.csproj @@ -50,7 +50,7 @@ publish.htm false 0 - 3.4.0.%2a + 3.5.0.%2a false true true @@ -192,11 +192,66 @@ + + True + True + Strings.cs.resx + + + True + True + Strings.da.resx + + + True + True + Strings.de.resx + True True Strings.resx + + True + True + Strings.es.resx + + + True + True + Strings.fi.resx + + + True + True + Strings.it.resx + + + True + True + Strings.no.resx + + + True + True + Strings.pl.resx + + + True + True + Strings.pt-BR.resx + + + True + True + Strings.pt.resx + + + True + True + Strings.ru.resx + diff --git a/OnTopReplica/Properties/AssemblyInfo.cs b/OnTopReplica/Properties/AssemblyInfo.cs index f58a612..c73cc16 100644 --- a/OnTopReplica/Properties/AssemblyInfo.cs +++ b/OnTopReplica/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ using System.Runtime.InteropServices; // 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("3.4.0.0")] -[assembly: AssemblyFileVersion("3.4.0.0")] +[assembly: AssemblyVersion("3.5.0.0")] +[assembly: AssemblyFileVersion("3.5.0.0")] diff --git a/OnTopReplica/Strings.Designer.cs b/OnTopReplica/Strings.Designer.cs index d1ed777..0dce384 100644 --- a/OnTopReplica/Strings.Designer.cs +++ b/OnTopReplica/Strings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18051 +// Runtime Version:4.0.30319.34003 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/OnTopReplica/app.config b/OnTopReplica/app.config index 9494b26..0362e7a 100644 --- a/OnTopReplica/app.config +++ b/OnTopReplica/app.config @@ -41,10 +41,10 @@ False - + - + 0