#At file:///C:/src/bzr.mysql/wex/installer/ based on revid:iggy@stripped
374 Iggy Galarza 2011-03-18
- AboutPage - Move strings into resource.
- DriveSpaceAvailable - Move strings into resource.
- Resources - Added global Back, Help, and Cancel text for buttons.
modified:
WexInstaller/Controls/AboutPage.Designer.cs
WexInstaller/Controls/DriveSpaceControl.Designer.cs
WexInstaller/Controls/DriveSpaceControl.resx
WexInstaller/Properties/Resources.Designer.cs
WexInstaller/Properties/Resources.resx
=== modified file 'WexInstaller/Controls/AboutPage.Designer.cs'
--- a/WexInstaller/Controls/AboutPage.Designer.cs 2010-09-07 21:23:40 +0000
+++ b/WexInstaller/Controls/AboutPage.Designer.cs 2011-03-18 18:41:46 +0000
@@ -30,74 +30,74 @@ namespace WexInstaller.Controls
/// </summary>
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutPage));
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.backBtn = new System.Windows.Forms.Button();
- this.aboutText = new System.Windows.Forms.RichTextBox();
- this.copyrightNotice = new System.Windows.Forms.Label();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- this.SuspendLayout();
- //
- // pictureBox1
- //
- this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top;
- this.pictureBox1.Image = global::WexInstaller.Properties.Resources.AboutBanner;
- this.pictureBox1.Location = new System.Drawing.Point(0, 0);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(780, 71);
- this.pictureBox1.TabIndex = 0;
- this.pictureBox1.TabStop = false;
- //
- // backBtn
- //
- this.backBtn.BackColor = System.Drawing.SystemColors.Control;
- this.backBtn.Location = new System.Drawing.Point(402, 520);
- this.backBtn.Name = "backBtn";
- this.backBtn.Size = new System.Drawing.Size(86, 26);
- this.backBtn.TabIndex = 1;
- this.backBtn.Text = "< &Back";
- this.backBtn.UseVisualStyleBackColor = false;
- this.backBtn.Click += new System.EventHandler(this.backBtn_Click);
- //
- // aboutText
- //
- this.aboutText.BackColor = System.Drawing.Color.White;
- this.aboutText.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.aboutText.Font = new System.Drawing.Font("Tahoma", 8.25F);
- this.aboutText.Location = new System.Drawing.Point(22, 99);
- this.aboutText.Name = "aboutText";
- this.aboutText.ReadOnly = true;
- this.aboutText.Size = new System.Drawing.Size(738, 309);
- this.aboutText.TabIndex = 2;
- this.aboutText.Text = "";
- //
- // copyrightNotice
- //
- this.copyrightNotice.Font = new System.Drawing.Font("Tahoma", 7F);
- this.copyrightNotice.Location = new System.Drawing.Point(106, 466);
- this.copyrightNotice.Name = "copyrightNotice";
- this.copyrightNotice.Size = new System.Drawing.Size(577, 41);
- this.copyrightNotice.TabIndex = 3;
- this.copyrightNotice.Text = resources.GetString("copyrightNotice.Text");
- //
- // AboutPage
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.Transparent;
- this.Controls.Add(this.copyrightNotice);
- this.Controls.Add(this.aboutText);
- this.Controls.Add(this.backBtn);
- this.Controls.Add(this.pictureBox1);
- this.DoubleBuffered = true;
- this.Font = new System.Drawing.Font("Tahoma", 8.25F);
- this.Margin = new System.Windows.Forms.Padding(0);
- this.Name = "AboutPage";
- this.Size = new System.Drawing.Size(780, 590);
- this.Load += new System.EventHandler(this.AboutPage_Load);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
- this.ResumeLayout(false);
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutPage));
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.backBtn = new System.Windows.Forms.Button();
+ this.aboutText = new System.Windows.Forms.RichTextBox();
+ this.copyrightNotice = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.pictureBox1.Image = global::WexInstaller.Properties.Resources.AboutBanner;
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(780, 71);
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ //
+ // backBtn
+ //
+ this.backBtn.BackColor = System.Drawing.SystemColors.Control;
+ this.backBtn.Location = new System.Drawing.Point(402, 520);
+ this.backBtn.Name = "backBtn";
+ this.backBtn.Size = new System.Drawing.Size(86, 26);
+ this.backBtn.TabIndex = 1;
+ this.backBtn.Text = global::WexInstaller.Properties.Resources.BackButtonDefaultText;
+ this.backBtn.UseVisualStyleBackColor = false;
+ this.backBtn.Click += new System.EventHandler(this.backBtn_Click);
+ //
+ // aboutText
+ //
+ this.aboutText.BackColor = System.Drawing.Color.White;
+ this.aboutText.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.aboutText.Font = new System.Drawing.Font("Tahoma", 8.25F);
+ this.aboutText.Location = new System.Drawing.Point(22, 99);
+ this.aboutText.Name = "aboutText";
+ this.aboutText.ReadOnly = true;
+ this.aboutText.Size = new System.Drawing.Size(738, 309);
+ this.aboutText.TabIndex = 2;
+ this.aboutText.Text = "";
+ //
+ // copyrightNotice
+ //
+ this.copyrightNotice.Font = new System.Drawing.Font("Tahoma", 7F);
+ this.copyrightNotice.Location = new System.Drawing.Point(106, 466);
+ this.copyrightNotice.Name = "copyrightNotice";
+ this.copyrightNotice.Size = new System.Drawing.Size(577, 41);
+ this.copyrightNotice.TabIndex = 3;
+ this.copyrightNotice.Text = resources.GetString("copyrightNotice.Text");
+ //
+ // AboutPage
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Transparent;
+ this.Controls.Add(this.copyrightNotice);
+ this.Controls.Add(this.aboutText);
+ this.Controls.Add(this.backBtn);
+ this.Controls.Add(this.pictureBox1);
+ this.DoubleBuffered = true;
+ this.Font = new System.Drawing.Font("Tahoma", 8.25F);
+ this.Margin = new System.Windows.Forms.Padding(0);
+ this.Name = "AboutPage";
+ this.Size = new System.Drawing.Size(780, 590);
+ this.Load += new System.EventHandler(this.AboutPage_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
}
=== modified file 'WexInstaller/Controls/DriveSpaceControl.Designer.cs'
--- a/WexInstaller/Controls/DriveSpaceControl.Designer.cs 2010-08-23 15:29:07 +0000
+++ b/WexInstaller/Controls/DriveSpaceControl.Designer.cs 2011-03-18 18:41:46 +0000
@@ -28,50 +28,52 @@
/// </summary>
private void InitializeComponent()
{
- this.driveSpaceAvail = new System.Windows.Forms.Label();
- this.driveSpaceNeeded = new System.Windows.Forms.Label();
- this.SuspendLayout();
- //
- // driveSpaceAvail
- //
- this.driveSpaceAvail.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.driveSpaceAvail.BackColor = System.Drawing.Color.Transparent;
- this.driveSpaceAvail.ForeColor = System.Drawing.Color.Gray;
- this.driveSpaceAvail.Location = new System.Drawing.Point(2, -1);
- this.driveSpaceAvail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
- this.driveSpaceAvail.Name = "driveSpaceAvail";
- this.driveSpaceAvail.Size = new System.Drawing.Size(399, 19);
- this.driveSpaceAvail.TabIndex = 12;
- this.driveSpaceAvail.Text = "Space available on drive:";
- this.driveSpaceAvail.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // driveSpaceNeeded
- //
- this.driveSpaceNeeded.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.driveSpaceNeeded.BackColor = System.Drawing.Color.Transparent;
- this.driveSpaceNeeded.ForeColor = System.Drawing.Color.Gray;
- this.driveSpaceNeeded.Location = new System.Drawing.Point(5, 14);
- this.driveSpaceNeeded.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
- this.driveSpaceNeeded.Name = "driveSpaceNeeded";
- this.driveSpaceNeeded.Size = new System.Drawing.Size(396, 19);
- this.driveSpaceNeeded.TabIndex = 11;
- this.driveSpaceNeeded.Text = "Estimated Total Space required on drive:";
- this.driveSpaceNeeded.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // DriveSpaceControl
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(5F, 11F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.Transparent;
- this.Controls.Add(this.driveSpaceAvail);
- this.Controls.Add(this.driveSpaceNeeded);
- this.Font = new System.Drawing.Font("Tahoma", 7F);
- this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.Name = "DriveSpaceControl";
- this.Size = new System.Drawing.Size(404, 39);
- this.ResumeLayout(false);
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DriveSpaceControl));
+ this.driveSpaceAvail = new System.Windows.Forms.Label();
+ this.driveSpaceNeeded = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // driveSpaceAvail
+ //
+ this.driveSpaceAvail.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.driveSpaceAvail.BackColor = System.Drawing.Color.Transparent;
+ this.driveSpaceAvail.ForeColor = System.Drawing.Color.Gray;
+ this.driveSpaceAvail.Location = new System.Drawing.Point(2, -1);
+ this.driveSpaceAvail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.driveSpaceAvail.Name = "driveSpaceAvail";
+ this.driveSpaceAvail.Size = new System.Drawing.Size(399, 19);
+ this.driveSpaceAvail.TabIndex = 12;
+ this.driveSpaceAvail.Text = resources.GetString("driveSpaceAvail.Text");
+ this.driveSpaceAvail.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // driveSpaceNeeded
+ //
+ this.driveSpaceNeeded.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.driveSpaceNeeded.BackColor = System.Drawing.Color.Transparent;
+ this.driveSpaceNeeded.ForeColor = System.Drawing.Color.Gray;
+ this.driveSpaceNeeded.Location = new System.Drawing.Point(5, 14);
+ this.driveSpaceNeeded.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.driveSpaceNeeded.Name = "driveSpaceNeeded";
+ this.driveSpaceNeeded.Size = new System.Drawing.Size(396, 19);
+ this.driveSpaceNeeded.TabIndex = 11;
+ this.driveSpaceNeeded.Text = resources.GetString("driveSpaceNeeded.Text");
+ this.driveSpaceNeeded.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // DriveSpaceControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(5F, 11F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Transparent;
+ this.Controls.Add(this.driveSpaceAvail);
+ this.Controls.Add(this.driveSpaceNeeded);
+ this.DoubleBuffered = true;
+ this.Font = new System.Drawing.Font("Tahoma", 7F);
+ this.Margin = new System.Windows.Forms.Padding(2);
+ this.Name = "DriveSpaceControl";
+ this.Size = new System.Drawing.Size(404, 39);
+ this.ResumeLayout(false);
}
=== modified file 'WexInstaller/Controls/DriveSpaceControl.resx'
--- a/WexInstaller/Controls/DriveSpaceControl.resx 2010-06-11 21:39:42 +0000
+++ b/WexInstaller/Controls/DriveSpaceControl.resx 2011-03-18 18:41:46 +0000
@@ -117,4 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <data name="driveSpaceAvail.Text" xml:space="preserve">
+ <value>Space available on drive:</value>
+ </data>
+ <data name="driveSpaceNeeded.Text" xml:space="preserve">
+ <value> Estimated Total Space required on drive:</value>
+ </data>
</root>
\ No newline at end of file
=== modified file 'WexInstaller/Properties/Resources.Designer.cs'
--- a/WexInstaller/Properties/Resources.Designer.cs 2011-03-07 12:55:25 +0000
+++ b/WexInstaller/Properties/Resources.Designer.cs 2011-03-18 18:41:46 +0000
@@ -194,6 +194,24 @@ namespace WexInstaller.Properties {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to < &Back.
+ /// </summary>
+ internal static string BackButtonDefaultText {
+ get {
+ return ResourceManager.GetString("BackButtonDefaultText", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to &Cancel.
+ /// </summary>
+ internal static string CancelButtonDefaultText {
+ get {
+ return ResourceManager.GetString("CancelButtonDefaultText", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap check_mark {
get {
object obj = ResourceManager.GetObject("check_mark", resourceCulture);
@@ -418,6 +436,15 @@ namespace WexInstaller.Properties {
}
/// <summary>
+ /// Looks up a localized string similar to &Button.
+ /// </summary>
+ internal static string HelpButtonDefaultText {
+ get {
+ return ResourceManager.GetString("HelpButtonDefaultText", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Show the command line options.
/// </summary>
internal static string HelpDescription {
=== modified file 'WexInstaller/Properties/Resources.resx'
--- a/WexInstaller/Properties/Resources.resx 2011-03-07 12:55:25 +0000
+++ b/WexInstaller/Properties/Resources.resx 2011-03-18 18:41:46 +0000
@@ -402,4 +402,13 @@
<data name="ConfirmDataRemoval2Text" xml:space="preserve">
<value>Are you absolutely sure all server datafiles should be removed? This action cannot be undone!</value>
</data>
+ <data name="BackButtonDefaultText" xml:space="preserve">
+ <value>< &Back</value>
+ </data>
+ <data name="CancelButtonDefaultText" xml:space="preserve">
+ <value>&Cancel</value>
+ </data>
+ <data name="HelpButtonDefaultText" xml:space="preserve">
+ <value>&Button</value>
+ </data>
</root>
\ No newline at end of file
Attachment: [text/bzr-bundle] bzr/iggy@mysql.com-20110318184146-0ouq2ii0yha17y9n.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (iggy:374) | Iggy Galarza | 18 Mar |
