#At file:///D:/Work/MySQL/installer/ based on revid:iggy@stripped
435 Mike Lischke 2011-04-18
- Utilities: changed how the current DPI settings are retrieved. This should now work under all circumstances.
- Removed obsolete hack using the config file and app parameters to determine the current DPI setting in the installer msi and passing it on to the installer exe.
- Moved font adjustments to the form loading events to ensure everything is set up then.
- No need to call loading done event in installer panel descendants anymore. The base class can handle that in its load event.
- InstallerConfiguration: default for SendSystemInfo set to 1.
- Package: log exception when unzipping fails.
modified:
StandardPlugins/Server/ServerConfigPanel1.cs
StandardPlugins/Server/ServerConfigPanel2.cs
WexInstaller.Core/InstallerConfiguration.cs
WexInstaller.Core/InstallerPanel.Designer.cs
WexInstaller.Core/InstallerPanel.cs
WexInstaller.Core/InstallerPanel.resx
WexInstaller.Core/Package.cs
WexInstaller.Core/Utilities.cs
WexInstaller/Controls/AboutPage.cs
WexInstaller/Controls/FeatureBox.Designer.cs
WexInstaller/Controls/FeatureBox.cs
WexInstaller/Controls/InstallWizardControl.Designer.cs
WexInstaller/Controls/InstallWizardControl.cs
WexInstaller/Controls/RemoveControl.Designer.cs
WexInstaller/Controls/RemoveControl.cs
WexInstaller/Controls/RemoveControl.resx
WexInstaller/Controls/ResourcesPage.Designer.cs
WexInstaller/Controls/ResourcesPage.cs
WexInstaller/Controls/WelcomeControl.Designer.cs
WexInstaller/Controls/WelcomeControl.cs
WexInstaller/InstallWizard/AllConfigOverview.cs
WexInstaller/InstallWizard/CheckRequirements.cs
WexInstaller/InstallWizard/DetailedUpdateCheck.cs
WexInstaller/InstallWizard/Features.cs
WexInstaller/InstallWizard/InstallProgressPanel.cs
WexInstaller/InstallWizard/InstallType.cs
WexInstaller/InstallWizard/InstallationComplete.cs
WexInstaller/InstallWizard/LicenseAgreement.Designer.cs
WexInstaller/InstallWizard/LicenseAgreement.cs
WexInstaller/InstallWizard/UpdateCheck.cs
WexInstaller/Program.cs
WexInstaller/RemovePanels/RemoveComplete.cs
WexInstaller/RemovePanels/RemoveProgress.cs
=== modified file 'StandardPlugins/Server/ServerConfigPanel1.cs'
=== modified file 'StandardPlugins/Server/ServerConfigPanel1.cs'
--- a/StandardPlugins/Server/ServerConfigPanel1.cs 2011-04-07 14:04:55 +0000
+++ b/StandardPlugins/Server/ServerConfigPanel1.cs 2011-04-18 08:06:38 +0000
@@ -16,8 +16,6 @@
Caption = "MySQL Server Configuration";
Controller = controller;
-
- InitDone();
}
public override void Activate()
=== modified file 'StandardPlugins/Server/ServerConfigPanel2.cs'
--- a/StandardPlugins/Server/ServerConfigPanel2.cs 2011-04-07 14:04:55 +0000
+++ b/StandardPlugins/Server/ServerConfigPanel2.cs 2011-04-18 08:06:38 +0000
@@ -28,8 +28,6 @@
serviceTip.SetToolTip(serviceErrorSign, Resources.ServerConfigServiceNameInUse);
rootPwdTip = new ToolTip();
-
- InitDone();
}
private ServerConfigurationController Controller { get; set; }
=== modified file 'WexInstaller.Core/InstallerConfiguration.cs'
--- a/WexInstaller.Core/InstallerConfiguration.cs 2011-04-09 17:45:39 +0000
+++ b/WexInstaller.Core/InstallerConfiguration.cs 2011-04-18 08:06:38 +0000
@@ -6,6 +6,7 @@
using System.Net;
using System.Xml.Serialization;
using System.ComponentModel;
+using System.Windows.Forms;
using MySQL.Utilities.SysUtils;
@@ -118,31 +119,6 @@
set { instance.ActiveCatalog = value; }
}
- public static int CurrentUserDPI
- {
- get
- {
- int currentDPI;
- // This value is initially read fromn the Registry so some cleanup may be required.
- try
- {
- if (instance.CurrentUserDPI.StartsWith("#"))
- {
- instance.CurrentUserDPI = instance.CurrentUserDPI.Substring(1);
- }
-
- currentDPI = Convert.ToInt16(instance.CurrentUserDPI);
- }
- catch (Exception)
- {
- // Not to worry, we were only hoping for a hint is ok just to use OS reported values.
- currentDPI = 0;
- }
-
- return currentDPI;
- }
- set { instance.CurrentUserDPI = value.ToString(); }
- }
#endregion
public static void Save()
@@ -222,11 +198,11 @@
public Point Location { get; set; }
public string ProductCode { get; set; }
public string ActiveCatalog { get; set; }
- public string CurrentUserDPI { get; set; }
public InstallerConfigurationData()
{
LicenseAgreement = 1;
+ SendSystemInfo = 1;
}
}
=== modified file 'WexInstaller.Core/InstallerPanel.Designer.cs'
--- a/WexInstaller.Core/InstallerPanel.Designer.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller.Core/InstallerPanel.Designer.cs 2011-04-18 08:06:38 +0000
@@ -72,6 +72,7 @@
this.Controls.Add(this.captionLabel);
resources.ApplyResources(this, "$this");
this.Name = "InstallerPanel";
+ this.Load += new System.EventHandler(this.InstallerPanel_Load);
((System.ComponentModel.ISupportInitialize)(this.topDivider)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bottomDivider)).EndInit();
this.ResumeLayout(false);
=== modified file 'WexInstaller.Core/InstallerPanel.cs'
--- a/WexInstaller.Core/InstallerPanel.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller.Core/InstallerPanel.cs 2011-04-18 08:06:38 +0000
@@ -39,7 +39,7 @@
/// <summary>
/// Method to be called by each descendant.
/// </summary>
- public void InitDone()
+ public void LoadingDone()
{
// Scale all fonts to the same size as they were at 96 DPI when running on a different
// resolution. This is necessary as we work with a fixed layout.
@@ -176,5 +176,10 @@
{
Process.Start(url);
}
+
+ private void InstallerPanel_Load(object sender, EventArgs e)
+ {
+ LoadingDone();
+ }
}
}
=== modified file 'WexInstaller.Core/InstallerPanel.resx'
--- a/WexInstaller.Core/InstallerPanel.resx 2011-04-07 14:04:55 +0000
+++ b/WexInstaller.Core/InstallerPanel.resx 2011-04-18 08:06:38 +0000
@@ -136,7 +136,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="captionLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>378, 25</value>
+ <value>302, 21</value>
</data>
<data name="captionLabel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -199,7 +199,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="subCaptionLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>426, 18</value>
+ <value>361, 14</value>
</data>
<data name="subCaptionLabel.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
=== modified file 'WexInstaller.Core/Package.cs'
--- a/WexInstaller.Core/Package.cs 2011-04-11 20:32:47 +0000
+++ b/WexInstaller.Core/Package.cs 2011-04-18 08:06:38 +0000
@@ -459,6 +459,7 @@
catch (Exception e)
{
greatSuccess = false;
+ Logger.LogException(e);
}
return greatSuccess;
=== modified file 'WexInstaller.Core/Utilities.cs'
--- a/WexInstaller.Core/Utilities.cs 2011-04-10 18:28:04 +0000
+++ b/WexInstaller.Core/Utilities.cs 2011-04-18 08:06:38 +0000
@@ -9,34 +9,13 @@
{
public class Utilities
{
- private static int currentDPI = 0;
public static int CurrentDPI
{
get
{
- if (currentDPI == 0)
- {
- RegistryKey serviceEntry = Registry.CurrentUser;
- try
- {
- serviceEntry = serviceEntry.OpenSubKey(@"Control Panel\Desktop\WindowMetrics", false);
- currentDPI = (int) serviceEntry.GetValue("AppliedDPI", 96);
- }
- catch (Exception e)
- {
- Logger.LogException(e);
- }
- finally
- {
- serviceEntry.Close();
- }
- }
-
- return currentDPI;
- }
- set
- {
- currentDPI = value;
+ Control control = new Control();
+ using (Graphics graphics = control.CreateGraphics())
+ return (int) graphics.DpiX;
}
}
=== modified file 'WexInstaller/Controls/AboutPage.cs'
--- a/WexInstaller/Controls/AboutPage.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/AboutPage.cs 2011-04-18 08:06:38 +0000
@@ -12,6 +12,11 @@
{
InitializeComponent();
+ }
+
+ private void AboutPage_Load(object sender, EventArgs e)
+ {
+ aboutText.Rtf = Resources.about;
if (Utilities.CurrentDPI != 96)
{
Utilities.MakeFontsNonAmbient(this);
@@ -19,11 +24,6 @@
}
}
- private void AboutPage_Load(object sender, EventArgs e)
- {
- aboutText.Rtf = Resources.about;
- }
-
private void backBtn_Click(object sender, EventArgs e)
{
(this.ParentForm as MainForm).GoBack();
=== modified file 'WexInstaller/Controls/FeatureBox.Designer.cs'
--- a/WexInstaller/Controls/FeatureBox.Designer.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/FeatureBox.Designer.cs 2011-04-18 08:06:38 +0000
@@ -52,7 +52,6 @@
//
// FeatureBox
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.BackColor = System.Drawing.SystemColors.Window;
this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -60,6 +59,7 @@
this.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.Name = "FeatureBox";
this.Size = new System.Drawing.Size(266, 306);
+ this.Load += new System.EventHandler(this.FeatureBox_Load);
this.ResumeLayout(false);
}
=== modified file 'WexInstaller/Controls/FeatureBox.cs'
--- a/WexInstaller/Controls/FeatureBox.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/FeatureBox.cs 2011-04-18 08:06:38 +0000
@@ -26,20 +26,6 @@
public FeatureBox()
{
InitializeComponent();
-
- if (Utilities.CurrentDPI != 96)
- {
- largeFont = new Font(Font.FontFamily, Utilities.ScaleTo(Font.Size, Utilities.CurrentDPI), FontStyle.Bold, Font.Unit);
- smallFont = new Font(Font.FontFamily, Utilities.ScaleTo(Font.SizeInPoints * .85f, Utilities.CurrentDPI), FontStyle.Regular, Font.Unit);
- Utilities.MakeFontsNonAmbient(this);
- Utilities.ScaleControlFont(this);
- featureList.ItemHeight = 20; // Keep current item height. The icons need it.
- }
- else
- {
- largeFont = new Font(Font, FontStyle.Bold);
- smallFont = new Font(Font.FontFamily, (float)(Font.SizeInPoints * .85));
- }
}
#endregion
@@ -420,6 +406,23 @@
e.Cancel = (p.MutualExcludedProduct != null && (p.MutualExcludedProduct.Installed || p.MutualExcludedProduct.ProposedInstalled));
}
+ private void FeatureBox_Load(object sender, EventArgs e)
+ {
+ if (Utilities.CurrentDPI != 96)
+ {
+ largeFont = new Font(Font.FontFamily, Utilities.ScaleTo(Font.Size, Utilities.CurrentDPI), FontStyle.Bold, Font.Unit);
+ smallFont = new Font(Font.FontFamily, Utilities.ScaleTo(Font.SizeInPoints * .85f, Utilities.CurrentDPI), FontStyle.Regular, Font.Unit);
+ Utilities.MakeFontsNonAmbient(this);
+ Utilities.ScaleControlFont(this);
+ featureList.ItemHeight = 20; // Keep current item height. The icons need it.
+ }
+ else
+ {
+ largeFont = new Font(Font, FontStyle.Bold);
+ smallFont = new Font(Font.FontFamily, (float)(Font.SizeInPoints * .85));
+ }
+ }
+
#endregion
}
=== modified file 'WexInstaller/Controls/InstallWizardControl.Designer.cs'
--- a/WexInstaller/Controls/InstallWizardControl.Designer.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.Designer.cs 2011-04-18 08:06:38 +0000
@@ -144,10 +144,10 @@
//
this.licenseTab.BackColor = System.Drawing.Color.White;
this.licenseTab.Controls.Add(this.licensePanel);
- this.licenseTab.Location = new System.Drawing.Point(4, 48);
+ this.licenseTab.Location = new System.Drawing.Point(4, 40);
this.licenseTab.Name = "licenseTab";
this.licenseTab.Padding = new System.Windows.Forms.Padding(3);
- this.licenseTab.Size = new System.Drawing.Size(556, 453);
+ this.licenseTab.Size = new System.Drawing.Size(556, 461);
this.licenseTab.TabIndex = 0;
this.licenseTab.Text = "License Information";
//
@@ -160,16 +160,16 @@
this.licensePanel.Location = new System.Drawing.Point(3, 3);
this.licensePanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.licensePanel.Name = "licensePanel";
- this.licensePanel.Size = new System.Drawing.Size(550, 447);
+ this.licensePanel.Size = new System.Drawing.Size(550, 455);
this.licensePanel.TabIndex = 0;
//
// updateTab
//
this.updateTab.BackColor = System.Drawing.Color.White;
this.updateTab.Controls.Add(this.updatePanel);
- this.updateTab.Location = new System.Drawing.Point(4, 48);
+ this.updateTab.Location = new System.Drawing.Point(4, 40);
this.updateTab.Name = "updateTab";
- this.updateTab.Size = new System.Drawing.Size(556, 453);
+ this.updateTab.Size = new System.Drawing.Size(192, 56);
this.updateTab.TabIndex = 1;
this.updateTab.Text = "Find latest products";
//
@@ -182,16 +182,16 @@
this.updatePanel.Location = new System.Drawing.Point(0, 0);
this.updatePanel.Margin = new System.Windows.Forms.Padding(0);
this.updatePanel.Name = "updatePanel";
- this.updatePanel.Size = new System.Drawing.Size(556, 461);
+ this.updatePanel.Size = new System.Drawing.Size(192, 56);
this.updatePanel.TabIndex = 1;
//
// detailedUpdateTab
//
this.detailedUpdateTab.BackColor = System.Drawing.Color.White;
this.detailedUpdateTab.Controls.Add(this.detailedUpdatePanel);
- this.detailedUpdateTab.Location = new System.Drawing.Point(4, 48);
+ this.detailedUpdateTab.Location = new System.Drawing.Point(4, 40);
this.detailedUpdateTab.Name = "detailedUpdateTab";
- this.detailedUpdateTab.Size = new System.Drawing.Size(556, 453);
+ this.detailedUpdateTab.Size = new System.Drawing.Size(192, 56);
this.detailedUpdateTab.TabIndex = 2;
this.detailedUpdateTab.Text = "Apply updates";
//
@@ -204,16 +204,16 @@
this.detailedUpdatePanel.Location = new System.Drawing.Point(0, 0);
this.detailedUpdatePanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.detailedUpdatePanel.Name = "detailedUpdatePanel";
- this.detailedUpdatePanel.Size = new System.Drawing.Size(556, 461);
+ this.detailedUpdatePanel.Size = new System.Drawing.Size(192, 56);
this.detailedUpdatePanel.TabIndex = 2;
//
// typeTab
//
this.typeTab.BackColor = System.Drawing.Color.White;
this.typeTab.Controls.Add(this.typePanel);
- this.typeTab.Location = new System.Drawing.Point(4, 48);
+ this.typeTab.Location = new System.Drawing.Point(4, 58);
this.typeTab.Name = "typeTab";
- this.typeTab.Size = new System.Drawing.Size(556, 453);
+ this.typeTab.Size = new System.Drawing.Size(192, 38);
this.typeTab.TabIndex = 3;
this.typeTab.Text = "Setup Type";
//
@@ -226,16 +226,16 @@
this.typePanel.Location = new System.Drawing.Point(0, 0);
this.typePanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.typePanel.Name = "typePanel";
- this.typePanel.Size = new System.Drawing.Size(556, 461);
+ this.typePanel.Size = new System.Drawing.Size(192, 38);
this.typePanel.TabIndex = 3;
//
// featuresTab
//
this.featuresTab.BackColor = System.Drawing.Color.White;
this.featuresTab.Controls.Add(this.featuresPanel);
- this.featuresTab.Location = new System.Drawing.Point(4, 48);
+ this.featuresTab.Location = new System.Drawing.Point(4, 58);
this.featuresTab.Name = "featuresTab";
- this.featuresTab.Size = new System.Drawing.Size(556, 453);
+ this.featuresTab.Size = new System.Drawing.Size(192, 38);
this.featuresTab.TabIndex = 4;
this.featuresTab.Text = "Feature Selection";
//
@@ -248,16 +248,16 @@
this.featuresPanel.Location = new System.Drawing.Point(0, 0);
this.featuresPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.featuresPanel.Name = "featuresPanel";
- this.featuresPanel.Size = new System.Drawing.Size(556, 461);
+ this.featuresPanel.Size = new System.Drawing.Size(192, 38);
this.featuresPanel.TabIndex = 4;
//
// requirementsTab
//
this.requirementsTab.BackColor = System.Drawing.Color.White;
this.requirementsTab.Controls.Add(this.checkRequirementsPanel);
- this.requirementsTab.Location = new System.Drawing.Point(4, 48);
+ this.requirementsTab.Location = new System.Drawing.Point(4, 76);
this.requirementsTab.Name = "requirementsTab";
- this.requirementsTab.Size = new System.Drawing.Size(556, 453);
+ this.requirementsTab.Size = new System.Drawing.Size(192, 20);
this.requirementsTab.TabIndex = 5;
this.requirementsTab.Text = "Check Requirements";
//
@@ -270,7 +270,7 @@
this.checkRequirementsPanel.Location = new System.Drawing.Point(0, 0);
this.checkRequirementsPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.checkRequirementsPanel.Name = "checkRequirementsPanel";
- this.checkRequirementsPanel.Size = new System.Drawing.Size(556, 461);
+ this.checkRequirementsPanel.Size = new System.Drawing.Size(192, 20);
this.checkRequirementsPanel.TabIndex = 5;
//
// installProgressTab
@@ -278,9 +278,9 @@
this.installProgressTab.BackColor = System.Drawing.Color.White;
this.installProgressTab.Controls.Add(this.installProgressPanel);
this.installProgressTab.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.installProgressTab.Location = new System.Drawing.Point(4, 48);
+ this.installProgressTab.Location = new System.Drawing.Point(4, 76);
this.installProgressTab.Name = "installProgressTab";
- this.installProgressTab.Size = new System.Drawing.Size(556, 453);
+ this.installProgressTab.Size = new System.Drawing.Size(192, 20);
this.installProgressTab.TabIndex = 6;
this.installProgressTab.Text = "Installation";
//
@@ -293,16 +293,16 @@
this.installProgressPanel.Location = new System.Drawing.Point(0, 0);
this.installProgressPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.installProgressPanel.Name = "installProgressPanel";
- this.installProgressPanel.Size = new System.Drawing.Size(556, 461);
+ this.installProgressPanel.Size = new System.Drawing.Size(192, 20);
this.installProgressPanel.TabIndex = 6;
//
// allConfigTab
//
this.allConfigTab.BackColor = System.Drawing.Color.White;
this.allConfigTab.Controls.Add(this.allConfigPanel);
- this.allConfigTab.Location = new System.Drawing.Point(4, 48);
+ this.allConfigTab.Location = new System.Drawing.Point(4, 94);
this.allConfigTab.Name = "allConfigTab";
- this.allConfigTab.Size = new System.Drawing.Size(556, 453);
+ this.allConfigTab.Size = new System.Drawing.Size(192, 2);
this.allConfigTab.TabIndex = 7;
this.allConfigTab.Text = "Configuration";
this.allConfigTab.UseVisualStyleBackColor = true;
@@ -316,16 +316,16 @@
this.allConfigPanel.Location = new System.Drawing.Point(0, 0);
this.allConfigPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.allConfigPanel.Name = "allConfigPanel";
- this.allConfigPanel.Size = new System.Drawing.Size(556, 461);
+ this.allConfigPanel.Size = new System.Drawing.Size(192, 2);
this.allConfigPanel.TabIndex = 7;
//
// completeTab
//
this.completeTab.BackColor = System.Drawing.Color.White;
this.completeTab.Controls.Add(this.completePanel);
- this.completeTab.Location = new System.Drawing.Point(4, 48);
+ this.completeTab.Location = new System.Drawing.Point(4, 94);
this.completeTab.Name = "completeTab";
- this.completeTab.Size = new System.Drawing.Size(556, 453);
+ this.completeTab.Size = new System.Drawing.Size(192, 2);
this.completeTab.TabIndex = 8;
this.completeTab.Text = "Complete";
//
@@ -337,7 +337,7 @@
this.completePanel.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.completePanel.Location = new System.Drawing.Point(0, 0);
this.completePanel.Name = "completePanel";
- this.completePanel.Size = new System.Drawing.Size(556, 461);
+ this.completePanel.Size = new System.Drawing.Size(192, 2);
this.completePanel.TabIndex = 8;
//
// installWizardSideBarControl1
@@ -367,6 +367,7 @@
this.Margin = new System.Windows.Forms.Padding(0);
this.Name = "InstallWizardControl";
this.Size = new System.Drawing.Size(784, 562);
+ this.Load += new System.EventHandler(this.InstallWizardControl_Load);
this.wizardPages.ResumeLayout(false);
this.licenseTab.ResumeLayout(false);
this.updateTab.ResumeLayout(false);
=== modified file 'WexInstaller/Controls/InstallWizardControl.cs'
--- a/WexInstaller/Controls/InstallWizardControl.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.cs 2011-04-18 08:06:38 +0000
@@ -16,11 +16,6 @@
defaultSelected = false;
}
- if (Utilities.CurrentDPI != 96)
- {
- Utilities.MakeFontsNonAmbient(this);
- Utilities.ScaleControlFont(this);
- }
}
private EventHandler statusChanged;
@@ -260,5 +255,14 @@
}
}
+ private void InstallWizardControl_Load(object sender, EventArgs e)
+ {
+ if (Utilities.CurrentDPI != 96)
+ {
+ Utilities.MakeFontsNonAmbient(this);
+ Utilities.ScaleControlFont(this);
+ }
+ }
+
}
}
=== modified file 'WexInstaller/Controls/RemoveControl.Designer.cs'
--- a/WexInstaller/Controls/RemoveControl.Designer.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/RemoveControl.Designer.cs 2011-04-18 08:06:38 +0000
@@ -176,6 +176,7 @@
this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Name = "RemoveControl";
this.Size = new System.Drawing.Size(784, 562);
+ this.Load += new System.EventHandler(this.RemoveControl_Load);
this.wizardPages.ResumeLayout(false);
this.removeProgressTab.ResumeLayout(false);
this.removeFinalTab.ResumeLayout(false);
=== modified file 'WexInstaller/Controls/RemoveControl.cs'
--- a/WexInstaller/Controls/RemoveControl.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/RemoveControl.cs 2011-04-18 08:06:38 +0000
@@ -16,11 +16,6 @@
InstallerPanel.StatusChanged += statusChanged;
wizardPages.SelectedIndex = 0;
- if (Utilities.CurrentDPI != 96)
- {
- Utilities.MakeFontsNonAmbient(this);
- Utilities.ScaleControlFont(this);
- }
}
void InstallerPanel_StatusChanged(object sender, EventArgs e)
@@ -95,5 +90,14 @@
InstallerPanel panel = wizardPages.SelectedTab.Controls[0] as InstallerPanel;
panel.Activate();
}
+
+ private void RemoveControl_Load(object sender, EventArgs e)
+ {
+ if (Utilities.CurrentDPI != 96)
+ {
+ Utilities.MakeFontsNonAmbient(this);
+ Utilities.ScaleControlFont(this);
+ }
+ }
}
}
=== modified file 'WexInstaller/Controls/RemoveControl.resx'
--- a/WexInstaller/Controls/RemoveControl.resx 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/RemoveControl.resx 2011-04-18 08:06:38 +0000
@@ -121,8 +121,8 @@
<data name="sideBarControl1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAANsAAAIyCAYAAABCV78jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK+AAA
- CvgBZiY8/QAAnydJREFUeF7t3eW/NLfRPni/331ijJmZmZmZncRxGBwmhxOHmRwzMzNTDGEG2+HYMd5O
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK9wAA
+ CvcBEOiS5wAAnydJREFUeF7t3eW/NLfRPni/331ijJmZmZmZncRxGBwmhxOHmRwzMzNTDGEG2+HYMd5O
HIbnt7t/QO9VaqlHUpekkhpm5tznRX1mzswc8O3+zlWq7ule5uW//P8qaZ2I16p6TF4vw2uT9SheE6iX
4vGsegSvb+r/xX15vQSvbdUv8Fgf9XP8nFb9P3hMWD/D61AndKmf4vs71kvw/ap+UlL/B98XqB/j8dL6
Eb43UCfg8aZ+iPtO/S++/t/qeLt+gK91HYdbu47F18d+361j8LWq79V1tFdHffd/K11LlpFAywVGGKPA
=== modified file 'WexInstaller/Controls/ResourcesPage.Designer.cs'
--- a/WexInstaller/Controls/ResourcesPage.Designer.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/ResourcesPage.Designer.cs 2011-04-18 08:06:38 +0000
@@ -216,6 +216,7 @@
this.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.Name = "ResourcesPage";
this.Size = new System.Drawing.Size(784, 562);
+ this.Load += new System.EventHandler(this.ResourcesPage_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.ResumeLayout(false);
=== modified file 'WexInstaller/Controls/ResourcesPage.cs'
--- a/WexInstaller/Controls/ResourcesPage.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/ResourcesPage.cs 2011-04-18 08:06:38 +0000
@@ -11,16 +11,20 @@
{
InitializeComponent();
+ }
+
+ private void backBtn_Click(object sender, EventArgs e)
+ {
+ (this.ParentForm as MainForm).GoBack();
+ }
+
+ private void ResourcesPage_Load(object sender, EventArgs e)
+ {
if (Utilities.CurrentDPI != 96)
{
Utilities.MakeFontsNonAmbient(this);
Utilities.ScaleControlFont(this);
}
}
-
- private void backBtn_Click(object sender, EventArgs e)
- {
- (this.ParentForm as MainForm).GoBack();
- }
}
}
=== modified file 'WexInstaller/Controls/WelcomeControl.Designer.cs'
--- a/WexInstaller/Controls/WelcomeControl.Designer.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/Controls/WelcomeControl.Designer.cs 2011-04-18 08:06:38 +0000
@@ -385,6 +385,7 @@
this.Margin = new System.Windows.Forms.Padding(0);
this.Name = "WelcomeControl";
this.Size = new System.Drawing.Size(784, 562);
+ this.Load += new System.EventHandler(this.WelcomeControl_Load);
((System.ComponentModel.ISupportInitialize)(this.installActionIcon)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.aboutActionIcon)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.resourcesActionIcon)).EndInit();
=== modified file 'WexInstaller/Controls/WelcomeControl.cs'
--- a/WexInstaller/Controls/WelcomeControl.cs 2011-04-07 18:04:48 +0000
+++ b/WexInstaller/Controls/WelcomeControl.cs 2011-04-18 08:06:38 +0000
@@ -11,15 +11,6 @@
{
InitializeComponent();
- // Scale all fonts to the same size as they were at 96 DPI when running on a different
- // resolution. This is necessary as we work with a fixed layout.
- // TODO: change layout to resize dynamically, to avoid forcing a user into using a certain font size.
- if (Utilities.CurrentDPI != 96)
- {
- Utilities.MakeFontsNonAmbient(this);
- Utilities.ScaleControlFont(this);
- }
-
if (!ProductManager.IsNewSetup())
{
// Maintenance mode.
@@ -119,5 +110,17 @@
(ParentForm as MainForm).RemoveAll();
}
+ private void WelcomeControl_Load(object sender, System.EventArgs e)
+ {
+ // Scale all fonts to the same size as they were at 96 DPI when running on a different
+ // resolution. This is necessary as we work with a fixed layout.
+ // TODO: change layout to resize dynamically, to avoid forcing a user into using a certain font size.
+ if (Utilities.CurrentDPI != 96)
+ {
+ Utilities.MakeFontsNonAmbient(this);
+ Utilities.ScaleControlFont(this);
+ }
+ }
+
}
}
=== modified file 'WexInstaller/InstallWizard/AllConfigOverview.cs'
--- a/WexInstaller/InstallWizard/AllConfigOverview.cs 2011-04-09 17:45:39 +0000
+++ b/WexInstaller/InstallWizard/AllConfigOverview.cs 2011-04-18 08:06:38 +0000
@@ -17,8 +17,6 @@
InitializeComponent();
backOk = false;
nextOk = true;
-
- InitDone();
}
public override void Activate()
=== modified file 'WexInstaller/InstallWizard/CheckRequirements.cs'
--- a/WexInstaller/InstallWizard/CheckRequirements.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/InstallWizard/CheckRequirements.cs 2011-04-18 08:06:38 +0000
@@ -14,8 +14,6 @@
InitializeComponent();
Caption = "Check Requirements";
nextOk = true;
-
- InitDone();
}
private void hideDetailsButton_Click(object sender, EventArgs e)
=== modified file 'WexInstaller/InstallWizard/DetailedUpdateCheck.cs'
--- a/WexInstaller/InstallWizard/DetailedUpdateCheck.cs 2011-04-11 20:32:47 +0000
+++ b/WexInstaller/InstallWizard/DetailedUpdateCheck.cs 2011-04-18 08:06:38 +0000
@@ -22,8 +22,6 @@
nextOk = true;
backOk = true;
executed = false;
-
- InitDone();
}
public override bool Next()
=== modified file 'WexInstaller/InstallWizard/Features.cs'
--- a/WexInstaller/InstallWizard/Features.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/InstallWizard/Features.cs 2011-04-18 08:06:38 +0000
@@ -110,8 +110,6 @@
architectureLabel.Visible = false;
catalogList.Width = featureBox.Right - catalogList.Left;
}
-
- InitDone();
}
#endregion
=== modified file 'WexInstaller/InstallWizard/InstallProgressPanel.cs'
--- a/WexInstaller/InstallWizard/InstallProgressPanel.cs 2011-04-10 18:37:08 +0000
+++ b/WexInstaller/InstallWizard/InstallProgressPanel.cs 2011-04-18 08:06:38 +0000
@@ -47,8 +47,6 @@
installedProductsNeedConfig = false;
progressLevels = new Dictionary<string, int>();
ListViewHelper.EnableDoubleBuffer(productList);
-
- InitDone();
}
#endregion
=== modified file 'WexInstaller/InstallWizard/InstallType.cs'
--- a/WexInstaller/InstallWizard/InstallType.cs 2011-04-10 18:28:04 +0000
+++ b/WexInstaller/InstallWizard/InstallType.cs 2011-04-18 08:06:38 +0000
@@ -23,8 +23,6 @@
InitializeComponent();
Caption = Resources.InstallTypeCaption;
nextOk = true;
-
- InitDone();
}
public override void Activate()
=== modified file 'WexInstaller/InstallWizard/InstallationComplete.cs'
--- a/WexInstaller/InstallWizard/InstallationComplete.cs 2011-04-09 02:17:03 +0000
+++ b/WexInstaller/InstallWizard/InstallationComplete.cs 2011-04-18 08:06:38 +0000
@@ -15,8 +15,6 @@
Caption = "Installation Complete";
backOk = false;
cancelOk = false;
-
- InitDone();
}
public override bool Next()
=== modified file 'WexInstaller/InstallWizard/LicenseAgreement.Designer.cs'
--- a/WexInstaller/InstallWizard/LicenseAgreement.Designer.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/InstallWizard/LicenseAgreement.Designer.cs 2011-04-18 08:06:38 +0000
@@ -59,6 +59,7 @@
//
// licenseText
//
+ this.licenseText.BackColor = System.Drawing.SystemColors.Window;
this.licenseText.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.licenseText.Dock = System.Windows.Forms.DockStyle.Fill;
this.licenseText.Font = new System.Drawing.Font("Tahoma", 8.25F);
=== modified file 'WexInstaller/InstallWizard/LicenseAgreement.cs'
--- a/WexInstaller/InstallWizard/LicenseAgreement.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/InstallWizard/LicenseAgreement.cs 2011-04-18 08:06:38 +0000
@@ -19,8 +19,6 @@
backOk = true;
nextOk = false;
-
- InitDone();
}
public override bool Next()
=== modified file 'WexInstaller/InstallWizard/UpdateCheck.cs'
--- a/WexInstaller/InstallWizard/UpdateCheck.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/InstallWizard/UpdateCheck.cs 2011-04-18 08:06:38 +0000
@@ -21,8 +21,6 @@
nextOk = true;
backOk = true;
executed = false;
-
- InitDone();
}
public override bool Next()
=== modified file 'WexInstaller/Program.cs'
--- a/WexInstaller/Program.cs 2011-04-11 13:15:47 +0000
+++ b/WexInstaller/Program.cs 2011-04-18 08:06:38 +0000
@@ -20,15 +20,9 @@
NetworkUtilities.InitiateNetworkConfiguration();
- // TODO: The MSI is supposed to pass a parameter but it isn't therefore this bit
- // is never called. Once it's sorted the following line can be removed.
- Utilities.CurrentDPI = InstallerConfiguration.CurrentUserDPI; // This value is written by the installer.
-
string[] args = Environment.GetCommandLineArgs();
- if (args.Length > 2)
+ if (args.Length > 1)
{
- Utilities.CurrentDPI = InstallerConfiguration.CurrentUserDPI; // This value is written by the installer.
-
Logger.LogInformation(string.Format("Using default catalog from command line {0}.", args[1]));
InstallerConfiguration.ActiveCatalog = args[1]; // this should be the default catalog name
}
@@ -45,9 +39,6 @@
Application.Run(new MainForm());
- if (args.Length < 2)
- InstallerConfiguration.CurrentUserDPI = Utilities.CurrentDPI;
-
InstallerConfiguration.Save();
InstallerInfo.SaveAndSend(InstallerConfiguration.SendSystemInfo);
=== modified file 'WexInstaller/RemovePanels/RemoveComplete.cs'
--- a/WexInstaller/RemovePanels/RemoveComplete.cs 2011-04-07 14:04:55 +0000
+++ b/WexInstaller/RemovePanels/RemoveComplete.cs 2011-04-18 08:06:38 +0000
@@ -18,8 +18,6 @@
{
InitializeComponent();
backOk = false;
-
- InitDone();
}
public override void Activate()
=== modified file 'WexInstaller/RemovePanels/RemoveProgress.cs'
--- a/WexInstaller/RemovePanels/RemoveProgress.cs 2011-04-10 18:28:04 +0000
+++ b/WexInstaller/RemovePanels/RemoveProgress.cs 2011-04-18 08:06:38 +0000
@@ -23,8 +23,6 @@
nextOk = true;
backOk = true;
executed = false;
-
- InitDone();
}
private void ProductInstallProgressChanged(object sender, ProductMSIActionProgressEventArgs pe)
Attachment: [text/bzr-bundle] bzr/mike.lischke@oracle.com-20110418080638-mxjc6e2dao601z3u.bundle
| Thread |
|---|
| • bzr commit into wex-installer-1.0 branch (mike.lischke:435) | Mike Lischke | 18 Apr |
