#At file:///C:/src/bzr.mysql/wex/installer/ based on revid:iggy@stripped
368 Iggy Galarza 2011-03-17
- Server Config: Moved hard coded strings into the Properties.
- Server Config: Removed 'Reconfigure' panel, instead simply execute configuration.
- Server Config: Disallow 'Back' from screen 1.
- Server Config: Aligned icons on screen 2.
modified:
StandardPlugins/Properties/Resources.Designer.cs
StandardPlugins/Properties/Resources.resx
StandardPlugins/Server/ConfigurationController.cs
StandardPlugins/Server/ServerConfigPanel1.cs
StandardPlugins/Server/ServerConfigPanel2.Designer.cs
StandardPlugins/StandardPlugins.csproj
=== modified file 'StandardPlugins/Properties/Resources.Designer.cs'
--- a/StandardPlugins/Properties/Resources.Designer.cs 2011-02-09 19:17:23 +0000
+++ b/StandardPlugins/Properties/Resources.Designer.cs 2011-03-17 14:42:21 +0000
@@ -141,6 +141,33 @@ namespace WexInstaller.Plugins.Propertie
}
/// <summary>
+ /// Looks up a localized string similar to Dedicated Machine.
+ /// </summary>
+ internal static string ConfigMachineTypeDedicated {
+ get {
+ return ResourceManager.GetString("ConfigMachineTypeDedicated", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Development Machine.
+ /// </summary>
+ internal static string ConfigMachineTypeDevelopment {
+ get {
+ return ResourceManager.GetString("ConfigMachineTypeDevelopment", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Server Machine.
+ /// </summary>
+ internal static string ConfigMachineTypeServer {
+ get {
+ return ResourceManager.GetString("ConfigMachineTypeServer", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to There are no features installed that need configuration..
/// </summary>
internal static string ConfigSuccessNoFeaturesToConfig {
@@ -223,6 +250,150 @@ namespace WexInstaller.Plugins.Propertie
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Unable to configure service..
+ /// </summary>
+ internal static string ServerConfigEventConfigureServiceError {
+ get {
+ return ResourceManager.GetString("ServerConfigEventConfigureServiceError", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Attempting to configure service..
+ /// </summary>
+ internal static string ServerConfigEventConfigureServiceInfo {
+ get {
+ return ResourceManager.GetString("ServerConfigEventConfigureServiceInfo", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Configured service..
+ /// </summary>
+ internal static string ServerConfigEventConfigureServiceSuccess {
+ get {
+ return ResourceManager.GetString("ServerConfigEventConfigureServiceSuccess", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Product configuration controller finished configuration..
+ /// </summary>
+ internal static string ServerConfigEventFinished {
+ get {
+ return ResourceManager.GetString("ServerConfigEventFinished", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Failed to process template..
+ /// </summary>
+ internal static string ServerConfigEventProcessTemplateError {
+ get {
+ return ResourceManager.GetString("ServerConfigEventProcessTemplateError", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Attempting to process template..
+ /// </summary>
+ internal static string ServerConfigEventProcessTemplateInfo {
+ get {
+ return ResourceManager.GetString("ServerConfigEventProcessTemplateInfo", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Processed template..
+ /// </summary>
+ internal static string ServerConfigEventProcessTemplateSuccess {
+ get {
+ return ResourceManager.GetString("ServerConfigEventProcessTemplateSuccess", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to update security settings..
+ /// </summary>
+ internal static string ServerConfigEventSecuritySettingsError {
+ get {
+ return ResourceManager.GetString("ServerConfigEventSecuritySettingsError", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Attempting to update security settings..
+ /// </summary>
+ internal static string ServerConfigEventSecuritySettingsInfo {
+ get {
+ return ResourceManager.GetString("ServerConfigEventSecuritySettingsInfo", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Updated security settings..
+ /// </summary>
+ internal static string ServerConfigEventSecuritySettingsSuccess {
+ get {
+ return ResourceManager.GetString("ServerConfigEventSecuritySettingsSuccess", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Failed to start service..
+ /// </summary>
+ internal static string ServerConfigEventStartServiceError {
+ get {
+ return ResourceManager.GetString("ServerConfigEventStartServiceError", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Attempting to start service..
+ /// </summary>
+ internal static string ServerConfigEventStartServiceInfo {
+ get {
+ return ResourceManager.GetString("ServerConfigEventStartServiceInfo", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Started service..
+ /// </summary>
+ internal static string ServerConfigEventStartServiceSuccess {
+ get {
+ return ResourceManager.GetString("ServerConfigEventStartServiceSuccess", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to find a valid template..
+ /// </summary>
+ internal static string ServerConfigEventValidTemplateError {
+ get {
+ return ResourceManager.GetString("ServerConfigEventValidTemplateError", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Looking for valid template.
+ /// </summary>
+ internal static string ServerConfigEventValidTemplateInfo {
+ get {
+ return ResourceManager.GetString("ServerConfigEventValidTemplateInfo", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Found valid template..
+ /// </summary>
+ internal static string ServerConfigEventValidTemplateSuccess {
+ get {
+ return ResourceManager.GetString("ServerConfigEventValidTemplateSuccess", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap warning_sign {
get {
object obj = ResourceManager.GetObject("warning_sign", resourceCulture);
=== modified file 'StandardPlugins/Properties/Resources.resx'
--- a/StandardPlugins/Properties/Resources.resx 2011-02-09 19:17:23 +0000
+++ b/StandardPlugins/Properties/Resources.resx 2011-03-17 14:42:21 +0000
@@ -184,4 +184,61 @@
<data name="ConfigInfoNoSampleDbsToConfigure" xml:space="preserve">
<value>No sample databases were found to configure</value>
</data>
+ <data name="ConfigMachineTypeDedicated" xml:space="preserve">
+ <value>Dedicated Machine</value>
+ </data>
+ <data name="ConfigMachineTypeDevelopment" xml:space="preserve">
+ <value>Development Machine</value>
+ </data>
+ <data name="ConfigMachineTypeServer" xml:space="preserve">
+ <value>Server Machine</value>
+ </data>
+ <data name="ServerConfigEventConfigureServiceError" xml:space="preserve">
+ <value>Unable to configure service.</value>
+ </data>
+ <data name="ServerConfigEventConfigureServiceInfo" xml:space="preserve">
+ <value>Attempting to configure service.</value>
+ </data>
+ <data name="ServerConfigEventConfigureServiceSuccess" xml:space="preserve">
+ <value>Configured service.</value>
+ </data>
+ <data name="ServerConfigEventFinished" xml:space="preserve">
+ <value>Product configuration controller finished configuration.</value>
+ </data>
+ <data name="ServerConfigEventProcessTemplateError" xml:space="preserve">
+ <value>Failed to process template.</value>
+ </data>
+ <data name="ServerConfigEventProcessTemplateInfo" xml:space="preserve">
+ <value>Attempting to process template.</value>
+ </data>
+ <data name="ServerConfigEventProcessTemplateSuccess" xml:space="preserve">
+ <value>Processed template.</value>
+ </data>
+ <data name="ServerConfigEventSecuritySettingsError" xml:space="preserve">
+ <value>Unable to update security settings.</value>
+ </data>
+ <data name="ServerConfigEventSecuritySettingsInfo" xml:space="preserve">
+ <value>Attempting to update security settings.</value>
+ </data>
+ <data name="ServerConfigEventSecuritySettingsSuccess" xml:space="preserve">
+ <value>Updated security settings.</value>
+ </data>
+ <data name="ServerConfigEventStartServiceError" xml:space="preserve">
+ <value>Failed to start service.</value>
+ </data>
+ <data name="ServerConfigEventStartServiceInfo" xml:space="preserve">
+ <value>Attempting to start service.</value>
+ </data>
+ <data name="ServerConfigEventStartServiceSuccess" xml:space="preserve">
+ <value>Started service.</value>
+ </data>
+ <data name="ServerConfigEventValidTemplateError" xml:space="preserve">
+ <value>Unable to find a valid template.</value>
+ </data>
+ <data name="ServerConfigEventValidTemplateInfo" xml:space="preserve">
+ <value>Looking for valid template</value>
+ </data>
+ <data name="ServerConfigEventValidTemplateSuccess" xml:space="preserve">
+ <value>Found valid template.</value>
+ </data>
</root>
\ No newline at end of file
=== modified file 'StandardPlugins/Server/ConfigurationController.cs'
--- a/StandardPlugins/Server/ConfigurationController.cs 2011-03-09 12:44:28 +0000
+++ b/StandardPlugins/Server/ConfigurationController.cs 2011-03-17 14:42:21 +0000
@@ -8,6 +8,7 @@ using System.Windows.Forms;
using MySql.Data.MySqlClient;
using WexInstaller.Core;
+using WexInstaller.Core.Properties;
namespace WexInstaller.Plugins
{
@@ -61,7 +62,7 @@ namespace WexInstaller.Plugins
public override int NumPages
{
- get { return (Reconfigure) ? 1 : 2; }
+ get { return (Reconfigure) ? 0 : 2; }
}
public override void PostAction()
@@ -296,31 +297,28 @@ namespace WexInstaller.Plugins
private void GetPages()
{
if (pages != null) return;
- pages = new UserControl[NumPages];
if (Reconfigure)
{
Logger.LogInformation("Setting up product configuration controller for reconfiguration.");
- pages[0]= new ServerConfigStep1a(this);
}
else
{
Logger.LogInformation("Setting up product configuration controller for new installation.");
+ pages = new UserControl[NumPages];
pages[0] = new ServerConfigStep1(this);
pages[1] = new ServerConfigStep2(this);
- // pages[2] = new ServerConfigStep3(this);
- // pages[3] = new ServerConfigAction(this);
}
}
private string GetServerTypeAsString()
{
if (ServerInstallType == ServerInstallationType.Developer)
- return "Development Machine";
+ return Properties.Resources.ConfigMachineTypeDevelopment;
else if (ServerInstallType == ServerInstallationType.Server)
- return "Server Machine";
+ return Properties.Resources.ConfigMachineTypeServer;
else
- return "Dedicated Machine";
+ return Properties.Resources.ConfigMachineTypeDedicated;
}
protected override void ReportConfigStatus(ConfigurationEventArgs e)
@@ -334,24 +332,24 @@ namespace WexInstaller.Plugins
switch (e.Action)
{
case "VALID_TEMPLATE":
- message = "Looking for valid template.";
+ message = Properties.Resources.ServerConfigEventValidTemplateInfo;
percent *= 1;
break;
case "PROCESS_TEMPLATE":
percent *= 3;
- message = "Attempting to process template.";
+ message = Properties.Resources.ServerConfigEventProcessTemplateInfo;
break;
case "CONFIGURE_SERVICE":
percent *= 5;
- message = "Attempting to configure service.";
+ message = Properties.Resources.ServerConfigEventConfigureServiceInfo;
break;
case "START_SERVICE":
percent *= 7;
- message = "Attempting to start service.";
+ message = Properties.Resources.ServerConfigEventStartServiceInfo;
break;
case "SECURITY_SETTING":
percent *= 9;
- message = "Attempting to update security settings.";
+ message = Properties.Resources.ServerConfigEventSecuritySettingsInfo;
break;
}
Logger.LogInformation(message);
@@ -362,23 +360,23 @@ namespace WexInstaller.Plugins
{
case "VALID_TEMPLATE":
percent *= 2;
- message = "Found valid template.";
+ message = Properties.Resources.ServerConfigEventValidTemplateSuccess;
break;
case "PROCESS_TEMPLATE":
percent *= 4;
- message = "Processed template.";
+ message = Properties.Resources.ServerConfigEventProcessTemplateSuccess;
break;
case "CONFIGURE_SERVICE":
percent *= 6;
- message = "Configured service.";
+ message = Properties.Resources.ServerConfigEventConfigureServiceSuccess;
break;
case "START_SERVICE":
percent *= 8;
- message = "Started service.";
+ message = Properties.Resources.ServerConfigEventStartServiceSuccess;
break;
case "SECURITY_SETTING":
percent *= 10;
- message = "Updated security settings.";
+ message = Properties.Resources.ServerConfigEventSecuritySettingsSuccess;
break;
}
Logger.LogInformation(message);
@@ -388,19 +386,19 @@ namespace WexInstaller.Plugins
switch (e.Action)
{
case "VALID_TEMPLATE":
- message = "Unable to find a valid template.";
+ message = Properties.Resources.ServerConfigEventValidTemplateError;
break;
case "PROCESS_TEMPLATE":
- message = "Failed to process template.";
+ message = Properties.Resources.ServerConfigEventProcessTemplateError;
break;
case "CONFIGURE_SERVICE":
- message = "Unable to configure service.";
+ message = Properties.Resources.ServerConfigEventConfigureServiceError;
break;
case "START_SERVICE":
- message = "Failed to start service.";
+ message = Properties.Resources.ServerConfigEventStartServiceError;
break;
case "SECURITY_SETTING":
- message = "Unable to update security settings.";
+ message = Properties.Resources.ServerConfigEventSecuritySettingsError;
break;
}
percent *= 11;
@@ -409,7 +407,7 @@ namespace WexInstaller.Plugins
break;
case (ConfigurationEventType.Finished):
- message = "Product configuration controller finished configuration.";
+ message = Properties.Resources.ServerConfigEventFinished;
percent *= 11;
CurrentState = ConfigState.ConfigurationComplete;
Logger.LogInformation(message);
=== modified file 'StandardPlugins/Server/ServerConfigPanel1.cs'
--- a/StandardPlugins/Server/ServerConfigPanel1.cs 2011-03-08 11:10:55 +0000
+++ b/StandardPlugins/Server/ServerConfigPanel1.cs 2011-03-17 14:42:21 +0000
@@ -8,52 +8,48 @@ using System.Windows.Forms;
namespace WexInstaller.Plugins
{
- public partial class ServerConfigStep1 : InstallerPanel
+ public partial class ServerConfigStep1 : InstallerPanel
+ {
+ public ServerConfigStep1(ServerConfigurationController controller)
{
- public ServerConfigStep1(ServerConfigurationController controller)
- {
- InitializeComponent();
- Caption = "MySQL Server Configuration";
- Controller = controller;
- }
+ InitializeComponent();
+ Caption = "MySQL Server Configuration";
+ Controller = controller;
+ }
- public override void Activate()
- {
- if (Controller.Template != null && Controller.Template.Reconfiguring)
- {
- switch (Controller.Template.ServerType)
- {
- case Core.IniServerType.Dedicated:
- dedicatedMachine.Checked = true;
- break;
- case Core.IniServerType.Developer:
- devMachine.Checked = true;
- break;
- case Core.IniServerType.Server:
- serverMachine.Checked = true;
- break;
- }
- }
+ public override void Activate()
+ {
+ backOk = false; // Once this screen is displayed, user cannot click 'Back'.
- base.Activate();
+ if (Controller.Template != null && Controller.Template.Reconfiguring)
+ {
+ switch (Controller.Template.ServerType)
+ {
+ case Core.IniServerType.Dedicated:
+ dedicatedMachine.Checked = true;
+ break;
+ case Core.IniServerType.Developer:
+ devMachine.Checked = true;
+ break;
+ case Core.IniServerType.Server:
+ serverMachine.Checked = true;
+ break;
}
+ }
- private ServerConfigurationController Controller { get; set; }
+ base.Activate();
+ }
- private void machineType_CheckedChanged(object sender, EventArgs e)
- {
- if (devMachine.Checked)
- Controller.ServerInstallType = ServerInstallationType.Developer;
- else if (serverMachine.Checked)
- Controller.ServerInstallType = ServerInstallationType.Server;
- else if (dedicatedMachine.Checked)
- Controller.ServerInstallType = ServerInstallationType.Dedicated;
- }
+ private ServerConfigurationController Controller { get; set; }
- public override bool Next()
- {
- NextButton.Enabled = false;
- return base.Next();
- }
+ private void machineType_CheckedChanged(object sender, EventArgs e)
+ {
+ if (devMachine.Checked)
+ Controller.ServerInstallType = ServerInstallationType.Developer;
+ else if (serverMachine.Checked)
+ Controller.ServerInstallType = ServerInstallationType.Server;
+ else if (dedicatedMachine.Checked)
+ Controller.ServerInstallType = ServerInstallationType.Dedicated;
}
+ }
}
=== modified file 'StandardPlugins/Server/ServerConfigPanel2.Designer.cs'
--- a/StandardPlugins/Server/ServerConfigPanel2.Designer.cs 2011-03-07 12:55:25 +0000
+++ b/StandardPlugins/Server/ServerConfigPanel2.Designer.cs 2011-03-17 14:42:21 +0000
@@ -276,7 +276,7 @@ namespace WexInstaller.Plugins
//
this.portErrorSign.Cursor = System.Windows.Forms.Cursors.SizeAll;
this.portErrorSign.Image = global::WexInstaller.Plugins.Properties.Resources.warning_sign;
- this.portErrorSign.Location = new System.Drawing.Point(453, 169);
+ this.portErrorSign.Location = new System.Drawing.Point(453, 172);
this.portErrorSign.Name = "portErrorSign";
this.portErrorSign.Size = new System.Drawing.Size(16, 16);
this.portErrorSign.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -287,7 +287,7 @@ namespace WexInstaller.Plugins
// rootPwdErrorSign
//
this.rootPwdErrorSign.Image = global::WexInstaller.Plugins.Properties.Resources.warning_sign;
- this.rootPwdErrorSign.Location = new System.Drawing.Point(453, 420);
+ this.rootPwdErrorSign.Location = new System.Drawing.Point(453, 422);
this.rootPwdErrorSign.Name = "rootPwdErrorSign";
this.rootPwdErrorSign.Size = new System.Drawing.Size(16, 16);
this.rootPwdErrorSign.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -307,7 +307,7 @@ namespace WexInstaller.Plugins
// serviceErrorSign
//
this.serviceErrorSign.Image = global::WexInstaller.Plugins.Properties.Resources.warning_sign;
- this.serviceErrorSign.Location = new System.Drawing.Point(453, 284);
+ this.serviceErrorSign.Location = new System.Drawing.Point(453, 283);
this.serviceErrorSign.Name = "serviceErrorSign";
this.serviceErrorSign.Size = new System.Drawing.Size(16, 16);
this.serviceErrorSign.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -380,11 +380,11 @@ namespace WexInstaller.Plugins
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.serviceErrorSign);
- this.Controls.Add(this.rootPwdErrorSign);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.rootPasswordError);
this.Controls.Add(this.portErrorSign);
this.Controls.Add(this.securitySettingsLabel);
+ this.Controls.Add(this.rootPwdErrorSign);
this.Controls.Add(this.pictureBox6);
this.Controls.Add(this.serviceLabel);
this.Controls.Add(this.portLabel);
@@ -418,11 +418,11 @@ namespace WexInstaller.Plugins
this.Controls.SetChildIndex(this.portLabel, 0);
this.Controls.SetChildIndex(this.serviceLabel, 0);
this.Controls.SetChildIndex(this.pictureBox6, 0);
+ this.Controls.SetChildIndex(this.rootPwdErrorSign, 0);
this.Controls.SetChildIndex(this.securitySettingsLabel, 0);
this.Controls.SetChildIndex(this.portErrorSign, 0);
this.Controls.SetChildIndex(this.rootPasswordError, 0);
this.Controls.SetChildIndex(this.tableLayoutPanel1, 0);
- this.Controls.SetChildIndex(this.rootPwdErrorSign, 0);
this.Controls.SetChildIndex(this.serviceErrorSign, 0);
this.Controls.SetChildIndex(this.CaptionLabel, 0);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
=== modified file 'StandardPlugins/StandardPlugins.csproj'
--- a/StandardPlugins/StandardPlugins.csproj 2011-03-14 20:53:53 +0000
+++ b/StandardPlugins/StandardPlugins.csproj 2011-03-17 14:42:21 +0000
@@ -70,12 +70,6 @@
<Compile Include="Server\ServerConfigPanel2.Designer.cs">
<DependentUpon>ServerConfigPanel2.cs</DependentUpon>
</Compile>
- <Compile Include="Server\ServerConfigPanel5.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Server\ServerConfigPanel5.Designer.cs">
- <DependentUpon>ServerConfigPanel5.cs</DependentUpon>
- </Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
@@ -88,9 +82,6 @@
<EmbeddedResource Include="Server\ServerConfigPanel2.resx">
<DependentUpon>ServerConfigPanel2.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Server\ServerConfigPanel5.resx">
- <DependentUpon>ServerConfigPanel5.cs</DependentUpon>
- </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Resources\server-confirm.JPG" />
Attachment: [text/bzr-bundle] bzr/iggy@mysql.com-20110317144221-zsbjtm9x1o8ruyhk.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (iggy:368) | Iggy Galarza | 17 Mar |
