List:Commits« Previous MessageNext Message »
From:Iggy Galarza Date:March 18 2011 7:02pm
Subject:bzr commit into wex-installer-1.0 branch (iggy:375)
View as plain text  
#At file:///C:/src/bzr.mysql/wex/installer/ based on revid:iggy@stripped

  375 Iggy Galarza	2011-03-18
      - Migrated more strings into resources.

    modified:
      WexInstaller/Controls/RemoveControl.Designer.cs
      WexInstaller/Controls/ResourcesPage.Designer.cs
      WexInstaller/InstallWizard/InstallationComplete.cs
      WexInstaller/Properties/Resources.Designer.cs
      WexInstaller/Properties/Resources.resx
=== modified file 'WexInstaller/Controls/RemoveControl.Designer.cs'
--- a/WexInstaller/Controls/RemoveControl.Designer.cs	2010-11-30 14:52:06 +0000
+++ b/WexInstaller/Controls/RemoveControl.Designer.cs	2011-03-18 19:02:42 +0000
@@ -133,7 +133,7 @@
             this.Back.Name = "Back";
             this.Back.Size = new System.Drawing.Size(86, 26);
             this.Back.TabIndex = 28;
-            this.Back.Text = "< &Back";
+            this.Back.Text = Properties.Resources.BackButtonDefaultText;
             this.Back.UseVisualStyleBackColor = false;
             this.Back.Click += new System.EventHandler(this.Back_Click);
             // 
@@ -146,7 +146,7 @@
             this.Cancel.Name = "Cancel";
             this.Cancel.Size = new System.Drawing.Size(86, 26);
             this.Cancel.TabIndex = 27;
-            this.Cancel.Text = "&Cancel";
+            this.Cancel.Text = Properties.Resources.CancelButtonDefaultText;
             this.Cancel.UseVisualStyleBackColor = false;
             this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
             // 
@@ -158,7 +158,7 @@
             this.Help.Name = "Help";
             this.Help.Size = new System.Drawing.Size(86, 26);
             this.Help.TabIndex = 26;
-            this.Help.Text = "&Help";
+            this.Help.Text = Properties.Resources.HelpButtonDefaultText;
             this.Help.UseVisualStyleBackColor = false;
             this.Help.Click += new System.EventHandler(this.Help_Click);
             // 

=== modified file 'WexInstaller/Controls/ResourcesPage.Designer.cs'
--- a/WexInstaller/Controls/ResourcesPage.Designer.cs	2010-11-30 20:23:23 +0000
+++ b/WexInstaller/Controls/ResourcesPage.Designer.cs	2011-03-18 19:02:42 +0000
@@ -83,7 +83,7 @@
             this.backBtn.Name = "backBtn";
             this.backBtn.Size = new System.Drawing.Size(86, 26);
             this.backBtn.TabIndex = 9;
-            this.backBtn.Text = "< Back";
+            this.backBtn.Text = Properties.Resources.BackButtonDefaultText;
             this.backBtn.UseVisualStyleBackColor = false;
             this.backBtn.Click += new System.EventHandler(this.backBtn_Click);
             // 

=== modified file 'WexInstaller/InstallWizard/InstallationComplete.cs'
--- a/WexInstaller/InstallWizard/InstallationComplete.cs	2011-03-10 18:30:35 +0000
+++ b/WexInstaller/InstallWizard/InstallationComplete.cs	2011-03-18 19:02:42 +0000
@@ -11,98 +11,98 @@ using System.Diagnostics;
 
 namespace WexInstaller
 {
-    public partial class InstallationComplete : InstallerPanel
+  public partial class InstallationComplete : InstallerPanel
+  {
+    public InstallationComplete()
     {
-        public InstallationComplete()
-        {
-            InitializeComponent();
-            Caption = "Installation Complete";
-            backOk = false;
-            cancelOk = false;
-        }
+      InitializeComponent();
+      Caption = "Installation Complete";
+      backOk = false;
+      cancelOk = false;
+    }
 
-        public override bool Next()
-        {
-            if (startWorkbench.Checked == true)
+    public override bool Next()
+    {
+      if (startWorkbench.Checked == true)
+      {
+        // Launch the Workbench process.
+        string workbenchFullPath = String.Empty;
+        foreach (ProductCategory c in ProductManager.ProductCategories)
+        {
+          foreach (Product p in c.Products)
+          {
+            if (p.Name == "workbench")
             {
-                // Launch the Workbench process.
-                string workbenchFullPath = String.Empty;
-                foreach (ProductCategory c in ProductManager.ProductCategories)
-                {
-                    foreach (Product p in c.Products)
-                    {
-                        if (p.Name == "workbench")
-                        {
-                            workbenchFullPath = p.GetInstalledProductRegistryKey("Location");
-                        }
-                    }
-                }
-                workbenchFullPath += "MySQLWorkbench.exe";
-
-                try
-                {
-                    Process.Start(workbenchFullPath);
-                }
-                catch
-                {
-                }
+              workbenchFullPath = p.GetInstalledProductRegistryKey("Location");
             }
-            return base.Next();
+          }
         }
+        workbenchFullPath += "MySQLWorkbench.exe";
 
-        private string GetProductLogs()
+        try
         {
-            StringBuilder logs = new StringBuilder();
-
-            foreach (ProductCategory pc in ProductManager.ProductCategories)
-            {
-                foreach (Product p in pc.Products)
-                {
-                    if (p.CurrentState != ProductState.Unknown)
-                    {
-                        // This product should have a log.
-                        logs.AppendLine(p.GetLog());
-                    }
-                }
-            }
-
-            return logs.ToString();
+            Process.Start(workbenchFullPath);
         }
-
-        private void copyClipboard_Click(object sender, EventArgs e)
+        catch
         {
-            string completeProductLog = GetProductLogs();
-            Clipboard.SetText(completeProductLog);
         }
+      }
+      return base.Next();
+    }
+
+    private string GetProductLogs()
+    {
+      StringBuilder logs = new StringBuilder();
 
-        private void copyEmail_Click(object sender, EventArgs e)
+      foreach (ProductCategory pc in ProductManager.ProductCategories)
+      {
+        foreach (Product p in pc.Products)
         {
-            string completeProductLog = GetProductLogs();
-            string email = String.Format("mailto:{0}?subject={1}&body={2}",
-                                         "support@stripped",
-                                         "Help with MySQL Universal Installer.",
-                                         completeProductLog);  // No common method for attaching files, AFAICS
-            Process.Start(email);
+          if (p.CurrentState != ProductState.Unknown)
+          {
+            // This product should have a log.
+            logs.AppendLine(p.GetLog());
+          }
         }
+      }
 
-        public override void Activate()
-        {
-            base.Activate();
+      return logs.ToString();
+    }
 
-            if (NextButton != null)
-                NextButton.Text = "&Finish";
+    private void copyClipboard_Click(object sender, EventArgs e)
+    {
+      string completeProductLog = GetProductLogs();
+      Clipboard.SetText(completeProductLog);
+    }
 
-            foreach (ProductCategory pc in ProductManager.ProductCategories)
-            {
-                foreach (Product p in pc.Products)
-                {
-                    if (p.Name == "workbench")
-                    {
-                        startWorkbench.Visible = (p.CurrentState == ProductState.InstallSuccess);
-                        startWorkbench.Checked = (p.CurrentState == ProductState.InstallSuccess);
-                    }
-                }
-            }
+    private void copyEmail_Click(object sender, EventArgs e)
+    {
+      string completeProductLog = GetProductLogs();
+      string email = String.Format("mailto:{0}?subject={1}&body={2}",
+                                    "support@stripped",
+                                    "Help with MySQL Universal Installer.",
+                                    completeProductLog);  // No common method for attaching files, AFAICS
+      Process.Start(email);
+    }
+
+    public override void Activate()
+    {
+      base.Activate();
+
+      if (NextButton != null)
+        NextButton.Text = Properties.Resources.NextButtonFinishText;
+
+      foreach (ProductCategory pc in ProductManager.ProductCategories)
+      {
+        foreach (Product p in pc.Products)
+        {
+          if (p.Name == "workbench")
+          {
+            startWorkbench.Visible = (p.CurrentState == ProductState.InstallSuccess);
+            startWorkbench.Checked = (p.CurrentState == ProductState.InstallSuccess);
+          }
         }
+      }
     }
+  }
 }

=== modified file 'WexInstaller/Properties/Resources.Designer.cs'
--- a/WexInstaller/Properties/Resources.Designer.cs	2011-03-18 18:41:46 +0000
+++ b/WexInstaller/Properties/Resources.Designer.cs	2011-03-18 19:02:42 +0000
@@ -563,6 +563,15 @@ namespace WexInstaller.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to &amp;Finish.
+        /// </summary>
+        internal static string NextButtonFinishText {
+            get {
+                return ResourceManager.GetString("NextButtonFinishText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Downloading necessary packages....
         /// </summary>
         internal static string OverallStatusDownloading {

=== modified file 'WexInstaller/Properties/Resources.resx'
--- a/WexInstaller/Properties/Resources.resx	2011-03-18 18:41:46 +0000
+++ b/WexInstaller/Properties/Resources.resx	2011-03-18 19:02:42 +0000
@@ -411,4 +411,7 @@
   <data name="HelpButtonDefaultText" xml:space="preserve">
     <value>&amp;Button</value>
   </data>
+  <data name="NextButtonFinishText" xml:space="preserve">
+    <value>&amp;Finish</value>
+  </data>
 </root>
\ No newline at end of file


Attachment: [text/bzr-bundle] bzr/iggy@mysql.com-20110318190242-6eu9dk5x4vkmtnq7.bundle
Thread
bzr commit into wex-installer-1.0 branch (iggy:375) Iggy Galarza18 Mar