From c4b87bf1029c44173e3df8c7fc333033cac96f9d Mon Sep 17 00:00:00 2001 From: Paddy Xu Date: Tue, 28 Jul 2015 17:18:34 +0800 Subject: [PATCH] Done. --- LEInstaller/Form1.Designer.cs | 7 +++---- LEInstaller/Form1.cs | 16 +--------------- LEProc/LERegistry.xml | 18 +----------------- LEProc/LEVersion.xml | 2 +- 4 files changed, 6 insertions(+), 37 deletions(-) diff --git a/LEInstaller/Form1.Designer.cs b/LEInstaller/Form1.Designer.cs index 01554ea..95a952b 100644 --- a/LEInstaller/Form1.Designer.cs +++ b/LEInstaller/Form1.Designer.cs @@ -44,7 +44,7 @@ private void InitializeComponent() this.buttonInstall.Name = "buttonInstall"; this.buttonInstall.Size = new System.Drawing.Size(226, 69); this.buttonInstall.TabIndex = 0; - this.buttonInstall.Text = "Install"; + this.buttonInstall.Text = "Install / Upgrade"; this.buttonInstall.UseVisualStyleBackColor = true; this.buttonInstall.Click += new System.EventHandler(this.buttonInstall_Click); // @@ -75,9 +75,8 @@ private void InitializeComponent() this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(463, 65); this.label1.TabIndex = 3; - this.label1.Text = "As you click any button above, a restart of Windows File Explorer is required. Th" + - "is action will be done automatically by this Installer.\r\nSave your work before c" + - "licking any buttons above."; + this.label1.Text = "When you clicking any button above, a restart of Windows File Explorer is require" + + "d. This action will be done automatically by this Installer. Save your work."; // // Form1 // diff --git a/LEInstaller/Form1.cs b/LEInstaller/Form1.cs index c175f85..38864f6 100644 --- a/LEInstaller/Form1.cs +++ b/LEInstaller/Form1.cs @@ -267,14 +267,7 @@ private static bool Is64BitOS() return ((DoesWin32MethodExist("kernel32.dll", "IsWow64Process") && IsWow64Process(GetCurrentProcess(), out flag)) && flag); } - - private static bool IsInstalled() - { - return - File.Exists(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), - "LECommonLibrary.dll")); - } - + private static bool DoesWin32MethodExist(string moduleName, string methodName) { var moduleHandle = GetModuleHandle(moduleName); @@ -309,13 +302,6 @@ private void Form1_Load(object sender, EventArgs e) Environment.Exit(0); } - - Text += @" - Version " + GetLEVersion(); - - if (IsInstalled()) - { - buttonInstall.Text = "Upgrade"; - } } } } \ No newline at end of file diff --git a/LEProc/LERegistry.xml b/LEProc/LERegistry.xml index 6b15467..f16b25e 100644 --- a/LEProc/LERegistry.xml +++ b/LEProc/LERegistry.xml @@ -1,5 +1,4 @@  - @@ -11,23 +10,8 @@ 1041 - + 1041 - - - ja-JP - - - 00000411 - \ No newline at end of file diff --git a/LEProc/LEVersion.xml b/LEProc/LEVersion.xml index 6f92510..d764e12 100644 --- a/LEProc/LEVersion.xml +++ b/LEProc/LEVersion.xml @@ -1,3 +1,3 @@  - \ No newline at end of file + \ No newline at end of file