diff --git a/XenAdmin/Dialogs/AdPasswordPrompt.Designer.cs b/XenAdmin/Dialogs/AdPasswordPrompt.Designer.cs index f9e21005e..49728eed8 100644 --- a/XenAdmin/Dialogs/AdPasswordPrompt.Designer.cs +++ b/XenAdmin/Dialogs/AdPasswordPrompt.Designer.cs @@ -50,7 +50,6 @@ namespace XenAdmin.Dialogs // resources.ApplyResources(this.labelBlurb, "labelBlurb"); this.tableLayoutPanel2.SetColumnSpan(this.labelBlurb, 2); - this.labelBlurb.MaximumSize = new System.Drawing.Size(379, 9999); this.labelBlurb.Name = "labelBlurb"; // // label2 @@ -66,14 +65,12 @@ namespace XenAdmin.Dialogs // textBoxUsername // resources.ApplyResources(this.textBoxUsername, "textBoxUsername"); - this.textBoxUsername.MinimumSize = new System.Drawing.Size(280, 23); this.textBoxUsername.Name = "textBoxUsername"; this.textBoxUsername.TextChanged += new System.EventHandler(this.textBoxUsername_TextChanged); // // textBoxPassword // resources.ApplyResources(this.textBoxPassword, "textBoxPassword"); - this.textBoxPassword.MinimumSize = new System.Drawing.Size(280, 23); this.textBoxPassword.Name = "textBoxPassword"; this.textBoxPassword.UseSystemPasswordChar = true; this.textBoxPassword.TextChanged += new System.EventHandler(this.textBoxPassword_TextChanged); @@ -81,7 +78,6 @@ namespace XenAdmin.Dialogs // buttonOk // resources.ApplyResources(this.buttonOk, "buttonOk"); - this.buttonOk.MinimumSize = new System.Drawing.Size(75, 25); this.buttonOk.Name = "buttonOk"; this.buttonOk.UseVisualStyleBackColor = true; this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click); @@ -90,7 +86,6 @@ namespace XenAdmin.Dialogs // resources.ApplyResources(this.buttonCancel, "buttonCancel"); this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.MinimumSize = new System.Drawing.Size(75, 25); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); @@ -117,7 +112,6 @@ namespace XenAdmin.Dialogs // textBoxDomain // resources.ApplyResources(this.textBoxDomain, "textBoxDomain"); - this.textBoxDomain.MinimumSize = new System.Drawing.Size(280, 23); this.textBoxDomain.Name = "textBoxDomain"; this.textBoxDomain.TextChanged += new System.EventHandler(this.textBoxDomain_TextChanged); // @@ -138,7 +132,6 @@ namespace XenAdmin.Dialogs // SkipButton // resources.ApplyResources(this.SkipButton, "SkipButton"); - this.SkipButton.MinimumSize = new System.Drawing.Size(75, 25); this.SkipButton.Name = "SkipButton"; this.SkipButton.UseVisualStyleBackColor = true; this.SkipButton.Click += new System.EventHandler(this.SkipButton_Click); diff --git a/XenAdmin/Dialogs/AdPasswordPrompt.resx b/XenAdmin/Dialogs/AdPasswordPrompt.resx index af2cc9bb6..7cb01fd22 100644 --- a/XenAdmin/Dialogs/AdPasswordPrompt.resx +++ b/XenAdmin/Dialogs/AdPasswordPrompt.resx @@ -112,19 +112,19 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True True - + GrowAndShrink @@ -137,7 +137,7 @@ Fill - + Segoe UI, 9pt @@ -145,7 +145,7 @@ 3, 46 - 66, 29 + 63, 29 1 @@ -160,7 +160,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -175,10 +175,13 @@ Segoe UI, 9pt - 75, 49 + 72, 49 + + + 280, 23 - 280, 23 + 283, 23 2 @@ -187,7 +190,7 @@ textBoxDomain - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -208,13 +211,13 @@ 3, 75 - 66, 29 + 63, 29 3 - &User name: + &Username: MiddleLeft @@ -223,7 +226,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -238,10 +241,13 @@ Segoe UI, 9pt - 75, 78 + 72, 78 + + + 280, 23 - 280, 23 + 283, 23 4 @@ -250,7 +256,7 @@ textBoxUsername - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -271,7 +277,7 @@ 3, 104 - 66, 29 + 63, 29 5 @@ -286,7 +292,7 @@ label3 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -301,10 +307,13 @@ Segoe UI, 9pt - 75, 107 + 72, 107 + + + 280, 23 - 280, 23 + 283, 23 6 @@ -313,7 +322,7 @@ textBoxPassword - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -355,7 +364,7 @@ labelAdditionalInfo - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -379,11 +388,14 @@ Segoe UI, 9pt - 202, 6 + 205, 6 3, 3, 0, 3 + + 75, 25 + 75, 26 @@ -397,7 +409,7 @@ buttonCancel - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 flowLayoutPanel1 @@ -418,7 +430,10 @@ NoControl - 121, 6 + 124, 6 + + + 75, 25 75, 26 @@ -433,7 +448,7 @@ SkipButton - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 flowLayoutPanel1 @@ -454,7 +469,10 @@ Segoe UI, 9pt - 40, 6 + 43, 6 + + + 75, 25 75, 26 @@ -469,7 +487,7 @@ buttonOk - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 flowLayoutPanel1 @@ -487,13 +505,13 @@ Segoe UI, 9pt - 75, 157 + 72, 157 3, 3, 0, 3 - 280, 36 + 283, 36 8 @@ -502,7 +520,7 @@ flowLayoutPanel1 - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -532,7 +550,7 @@ tableLayoutPanel2 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -555,6 +573,9 @@ 6, 6, 6, 10 + + 379, 9999 + 346, 30 @@ -568,7 +589,7 @@ labelBlurb - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -576,7 +597,7 @@ 0 - + True diff --git a/XenAdmin/Dialogs/AddServerDialog.Designer.cs b/XenAdmin/Dialogs/AddServerDialog.Designer.cs index 2a898dd2c..87097e2de 100644 --- a/XenAdmin/Dialogs/AddServerDialog.Designer.cs +++ b/XenAdmin/Dialogs/AddServerDialog.Designer.cs @@ -160,7 +160,6 @@ namespace XenAdmin.Dialogs // resources.ApplyResources(this.labelInstructions, "labelInstructions"); this.tableLayoutPanelType.SetColumnSpan(this.labelInstructions, 3); - this.labelInstructions.MaximumSize = new System.Drawing.Size(355, 100); this.labelInstructions.Name = "labelInstructions"; // // tableLayoutPanelType diff --git a/XenAdmin/Dialogs/AddServerDialog.resx b/XenAdmin/Dialogs/AddServerDialog.resx index 39a404190..7a9bbf0c1 100644 --- a/XenAdmin/Dialogs/AddServerDialog.resx +++ b/XenAdmin/Dialogs/AddServerDialog.resx @@ -112,25 +112,25 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Bottom, Right - + False - + Segoe UI, 9pt - 232, 7 + 222, 7 75, 23 @@ -145,7 +145,7 @@ AddButton - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 flowLayoutPanel1 @@ -160,7 +160,7 @@ Segoe UI, 9pt - 313, 7 + 303, 7 3, 3, 0, 3 @@ -178,7 +178,7 @@ CancelButton2 - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 flowLayoutPanel1 @@ -217,7 +217,7 @@ ServerNameLabel - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelType @@ -241,13 +241,13 @@ 0, 0, 3, 0 - 66, 29 + 63, 29 0 - &User name: + &Username: MiddleLeft @@ -256,7 +256,7 @@ UsernameLabel - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCreds @@ -280,7 +280,7 @@ 0, 0, 3, 0 - 66, 29 + 63, 29 2 @@ -295,7 +295,7 @@ PasswordLabel - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCreds @@ -310,10 +310,10 @@ Segoe UI, 9pt - 72, 13 + 69, 13 - 307, 23 + 300, 23 1 @@ -325,7 +325,7 @@ UsernameTextBox - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCreds @@ -340,10 +340,10 @@ Segoe UI, 9pt - 72, 42 + 69, 42 - 307, 23 + 300, 23 3 @@ -352,7 +352,7 @@ PasswordTextBox - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCreds @@ -397,13 +397,13 @@ Segoe UI, 9pt - 72, 68 + 69, 68 0, 3, 0, 0 - 307, 22 + 300, 22 4 @@ -418,7 +418,7 @@ labelError - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCreds @@ -433,7 +433,7 @@ Segoe UI, 9pt - 50, 71 + 47, 71 16, 16 @@ -451,7 +451,7 @@ pictureBoxError - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCreds @@ -475,7 +475,7 @@ 3 - 382, 93 + 372, 93 0 @@ -484,7 +484,7 @@ tableLayoutPanelCreds - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox1 @@ -508,7 +508,7 @@ 0, 5, 0, 0 - 388, 115 + 378, 115 6 @@ -520,7 +520,7 @@ groupBox1 - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelType @@ -546,6 +546,9 @@ 3, 0, 3, 6 + + 355, 100 + 0, 0, 0, 3 @@ -562,7 +565,7 @@ labelInstructions - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelType @@ -580,7 +583,7 @@ Segoe UI, 9pt - 6, 7 + 155, 36 220, 23 @@ -595,7 +598,7 @@ comboBoxClouds - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 flowLayoutPanel1 @@ -622,7 +625,7 @@ 0, 4, 0, 0 - 388, 96 + 378, 96 7 @@ -631,7 +634,7 @@ flowLayoutPanel1 - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelType @@ -655,7 +658,7 @@ 5 - 388, 284 + 378, 284 14 @@ -664,7 +667,7 @@ tableLayoutPanelType - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -685,7 +688,7 @@ 3, 3, 0, 3 - 335, 23 + 325, 23 5 @@ -694,7 +697,7 @@ ServerNameComboBox - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelType @@ -721,12 +724,12 @@ tableLayoutPanel2 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls /><Columns Styles="Absolute,20,Absolute,20,Absolute,20" /><Rows Styles="Absolute,20" /></TableLayoutSettings> - + True @@ -739,7 +742,7 @@ GrowAndShrink - 410, 306 + 400, 306 Segoe UI, 9pt diff --git a/XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs b/XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs index 593e31dc5..3caf3ff77 100644 --- a/XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs +++ b/XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs @@ -31,24 +31,23 @@ namespace XenAdmin.Dialogs System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ReconnectAsDialog)); this.labelBlurb = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.pictureBoxAdPicture = new System.Windows.Forms.PictureBox(); this.labelUsername = new System.Windows.Forms.Label(); - this.labelPassword = new System.Windows.Forms.Label(); this.textBoxUsername = new System.Windows.Forms.TextBox(); + this.labelPassword = new System.Windows.Forms.Label(); this.textBoxPassword = new System.Windows.Forms.TextBox(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.buttonCancel = new System.Windows.Forms.Button(); this.buttonOK = new System.Windows.Forms.Button(); - this.pictureBoxAdPicture = new System.Windows.Forms.PictureBox(); this.tableLayoutPanel1.SuspendLayout(); - this.flowLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAdPicture)).BeginInit(); + this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // labelBlurb // resources.ApplyResources(this.labelBlurb, "labelBlurb"); this.tableLayoutPanel1.SetColumnSpan(this.labelBlurb, 2); - this.labelBlurb.MinimumSize = new System.Drawing.Size(397, 80); this.labelBlurb.Name = "labelBlurb"; // // tableLayoutPanel1 @@ -63,22 +62,29 @@ namespace XenAdmin.Dialogs this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 2, 3); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; // + // pictureBoxAdPicture + // + resources.ApplyResources(this.pictureBoxAdPicture, "pictureBoxAdPicture"); + this.pictureBoxAdPicture.Image = global::XenAdmin.Properties.Resources._000_User_h32bit_16; + this.pictureBoxAdPicture.Name = "pictureBoxAdPicture"; + this.pictureBoxAdPicture.TabStop = false; + // // labelUsername // resources.ApplyResources(this.labelUsername, "labelUsername"); this.labelUsername.Name = "labelUsername"; // - // labelPassword - // - resources.ApplyResources(this.labelPassword, "labelPassword"); - this.labelPassword.Name = "labelPassword"; - // // textBoxUsername // resources.ApplyResources(this.textBoxUsername, "textBoxUsername"); this.textBoxUsername.Name = "textBoxUsername"; this.textBoxUsername.TextChanged += new System.EventHandler(this.textBoxUsername_TextChanged); // + // labelPassword + // + resources.ApplyResources(this.labelPassword, "labelPassword"); + this.labelPassword.Name = "labelPassword"; + // // textBoxPassword // resources.ApplyResources(this.textBoxPassword, "textBoxPassword"); @@ -108,13 +114,6 @@ namespace XenAdmin.Dialogs this.buttonOK.UseVisualStyleBackColor = true; this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click); // - // pictureBoxAdPicture - // - resources.ApplyResources(this.pictureBoxAdPicture, "pictureBoxAdPicture"); - this.pictureBoxAdPicture.Image = global::XenAdmin.Properties.Resources._000_User_h32bit_16; - this.pictureBoxAdPicture.Name = "pictureBoxAdPicture"; - this.pictureBoxAdPicture.TabStop = false; - // // ReconnectAsDialog // this.AcceptButton = this.buttonOK; @@ -125,8 +124,8 @@ namespace XenAdmin.Dialogs this.Name = "ReconnectAsDialog"; this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.flowLayoutPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAdPicture)).EndInit(); + this.flowLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); diff --git a/XenAdmin/Dialogs/ReconnectAsDialog.resx b/XenAdmin/Dialogs/ReconnectAsDialog.resx index 57ce35d06..d9600a961 100644 --- a/XenAdmin/Dialogs/ReconnectAsDialog.resx +++ b/XenAdmin/Dialogs/ReconnectAsDialog.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True @@ -127,11 +127,11 @@ 3 - + Top - + Segoe UI, 9pt @@ -151,7 +151,7 @@ pictureBoxAdPicture - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -172,13 +172,13 @@ 55, 92 - 66, 29 + 63, 29 1 - &User name: + &Username: MiddleLeft @@ -187,7 +187,7 @@ labelUsername - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -202,13 +202,13 @@ Segoe UI, 9pt - 127, 95 + 124, 95 3, 3, 20, 3 - 314, 23 + 317, 23 2 @@ -217,7 +217,7 @@ textBoxUsername - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -238,7 +238,7 @@ 55, 121 - 66, 29 + 63, 29 3 @@ -253,7 +253,7 @@ labelPassword - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -268,13 +268,13 @@ Segoe UI, 9pt - 127, 124 + 124, 124 3, 3, 20, 3 - 314, 23 + 317, 23 4 @@ -283,7 +283,7 @@ textBoxPassword - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -295,7 +295,7 @@ Segoe UI, 9pt - 253, 3 + 256, 3 75, 23 @@ -310,7 +310,7 @@ buttonCancel - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 flowLayoutPanel1 @@ -325,7 +325,7 @@ Segoe UI, 9pt - 172, 3 + 175, 3 75, 23 @@ -340,7 +340,7 @@ buttonOK - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 flowLayoutPanel1 @@ -358,13 +358,13 @@ Segoe UI, 9pt - 127, 160 + 124, 160 3, 10, 3, 3 - 331, 32 + 334, 32 5 @@ -373,7 +373,7 @@ flowLayoutPanel1 - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -406,7 +406,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -429,6 +429,9 @@ 6, 6, 6, 6 + + 397, 80 + 397, 80 @@ -444,7 +447,7 @@ To log out of this server and log in again using a different user account, enter labelBlurb - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -452,7 +455,7 @@ To log out of this server and log in again using a different user account, enter 1 - + True diff --git a/XenAdmin/Dialogs/RoleElevationDialog.Designer.cs b/XenAdmin/Dialogs/RoleElevationDialog.Designer.cs index 0520e8bbb..495803d77 100644 --- a/XenAdmin/Dialogs/RoleElevationDialog.Designer.cs +++ b/XenAdmin/Dialogs/RoleElevationDialog.Designer.cs @@ -60,7 +60,6 @@ namespace XenAdmin.Dialogs // resources.ApplyResources(this.labelBlurb, "labelBlurb"); this.tableLayoutPanel1.SetColumnSpan(this.labelBlurb, 2); - this.labelBlurb.MaximumSize = new System.Drawing.Size(380, 0); this.labelBlurb.Name = "labelBlurb"; // // buttonCancel @@ -74,7 +73,6 @@ namespace XenAdmin.Dialogs // labelCurrentRoleValue // resources.ApplyResources(this.labelCurrentRoleValue, "labelCurrentRoleValue"); - this.labelCurrentRoleValue.MaximumSize = new System.Drawing.Size(250, 0); this.labelCurrentRoleValue.Name = "labelCurrentRoleValue"; // // labelCurrentRole @@ -100,7 +98,6 @@ namespace XenAdmin.Dialogs // labelRequiredRoleValue // resources.ApplyResources(this.labelRequiredRoleValue, "labelRequiredRoleValue"); - this.labelRequiredRoleValue.MaximumSize = new System.Drawing.Size(250, 0); this.labelRequiredRoleValue.Name = "labelRequiredRoleValue"; // // TextBoxUsername @@ -188,7 +185,6 @@ namespace XenAdmin.Dialogs // resources.ApplyResources(this.labelBlurb2, "labelBlurb2"); this.tableLayoutPanel1.SetColumnSpan(this.labelBlurb2, 2); - this.labelBlurb2.MaximumSize = new System.Drawing.Size(380, 0); this.labelBlurb2.Name = "labelBlurb2"; // // TextBoxPassword diff --git a/XenAdmin/Dialogs/RoleElevationDialog.resx b/XenAdmin/Dialogs/RoleElevationDialog.resx index dc50ecec9..7b7ed2e94 100644 --- a/XenAdmin/Dialogs/RoleElevationDialog.resx +++ b/XenAdmin/Dialogs/RoleElevationDialog.resx @@ -112,26 +112,26 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True True - + GrowAndShrink 3 - + Segoe UI, 9pt @@ -148,7 +148,7 @@ pictureBox1 - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -187,7 +187,7 @@ labelCurrentAction - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -226,7 +226,7 @@ labelCurrentActionValue - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -259,7 +259,7 @@ labelServer - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -292,7 +292,7 @@ labelServerValue - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -331,7 +331,7 @@ labelCurrentUser - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -370,7 +370,7 @@ labelCurrentUserValue - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -409,7 +409,7 @@ labelCurrentRole - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -435,6 +435,9 @@ 3, 3, 15, 3 + + 250, 0 + 250, 15 @@ -448,7 +451,7 @@ labelCurrentRoleValue - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -478,7 +481,7 @@ divider - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -504,6 +507,9 @@ 3, 10, 20, 10 + + 380, 0 + 380, 15 @@ -517,7 +523,7 @@ labelBlurb2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -556,7 +562,7 @@ labelRequiredRole - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -582,6 +588,9 @@ 3, 3, 15, 3 + + 250, 0 + 250, 15 @@ -595,7 +604,7 @@ labelRequiredRoleValue - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -628,7 +637,7 @@ 14 - &User name: + &Username: MiddleLeft @@ -637,7 +646,7 @@ labelUserName - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -667,7 +676,7 @@ TextBoxUsername - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -709,7 +718,7 @@ labelPassword - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -739,7 +748,7 @@ TextBoxPassword - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -775,7 +784,7 @@ buttonCancel - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel1 @@ -808,7 +817,7 @@ buttonAuthorize - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel1 @@ -832,7 +841,7 @@ panel1 - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -862,7 +871,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -885,6 +894,9 @@ 3, 5, 20, 10 + + 380, 0 + 380, 15 @@ -898,7 +910,7 @@ labelBlurb - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -906,7 +918,7 @@ 1 - + True @@ -939,4 +951,4 @@ XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - + \ No newline at end of file diff --git a/XenAdmin/Dialogs/Wlb/WlbCredentialsDialog.resx b/XenAdmin/Dialogs/Wlb/WlbCredentialsDialog.resx index bbf8194d2..09d85a138 100644 --- a/XenAdmin/Dialogs/Wlb/WlbCredentialsDialog.resx +++ b/XenAdmin/Dialogs/Wlb/WlbCredentialsDialog.resx @@ -196,7 +196,7 @@ 94, 119 - 352, 19 + 232, 19 13 @@ -340,13 +340,13 @@ 6, 64 - 66, 15 + 63, 15 9 - U&ser name: + U&sername: LabelXenServerUsername @@ -490,13 +490,13 @@ 6, 61 - 66, 15 + 63, 15 5 - &User name: + &Username: LabelWLBUsername @@ -612,6 +612,27 @@ Top, Left, Right + + True + + + Segoe UI, 9pt + + + NoControl + + + 153, 85 + + + 91, 15 + + + 5 + + + (Default is 8012) + labelDefaultPortBlurb @@ -651,105 +672,9 @@ 4 - - True - - - Segoe UI, 9pt - - - NoControl - - - 153, 85 - - - 91, 15 - - - 5 - - - (Default is 8012) - - - labelDefaultPortBlurb - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - decentGroupBoxWLBServerAddress - - - 0 - Top, Left, Right - - pictureBox3 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - decentGroupBoxWLBCredentials - - - 0 - - - pictureBox2 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - decentGroupBoxWLBCredentials - - - 1 - - - pictureBox1 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - decentGroupBoxWLBCredentials - - - 2 - - - Segoe UI, 9pt - - - 13, 135 - - - 497, 121 - - - 3 - - - WLB Server Credentials - - - decentGroupBoxWLBCredentials - - - XenAdmin.Controls.DecentGroupBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 1 - Segoe UI, 9pt @@ -831,6 +756,33 @@ 2 + + Segoe UI, 9pt + + + 13, 135 + + + 497, 121 + + + 3 + + + WLB Server Credentials + + + decentGroupBoxWLBCredentials + + + XenAdmin.Controls.DecentGroupBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + Top, Left, Right @@ -1018,53 +970,53 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACq - CgAAAk1TRnQBSQFMAgEBBAEAAfgBAAH4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8ABQAGBQHO - AWEOBQGMAWcDBQFnAewB6wIFIAAFBQGMAd0B1QHcARkBCQEZCgUB3QHVAtwBtAPTAbMBYSAABQUB3QEJ - AtUBrQG0AbMBzgHcAhkFBQHdAQkC1QHtAYsBrQHNAYsBrQHHBQAB/wG7Af8RAAHUAfQB/wQABAUB3QEJ - AdUB1AHVAbQB3AHUAc4BCQGzAdUEBQHdAQkB1gHUAdUBpgHHA/8BxwGtBAAB/wG7AdsB/xEAAbMB1AH0 - Af8DAAMFAd0BCQLVAc4B1ALVAdwBzgFhBQUB3QEJAdYB1QHOAdQBpgLHAv8BxwGtBAABuwHUAdsI/wMA - B/8CswHUAfQB/wIAAwUBCQHWAdUBswHNAQkB1AGzAdUBzgYFAQkB3AHVAbMBzQHcAe8BpgH/AqYB/wGt - AwABvAKzAdQF2wG6AbMB/wMAAbMF2wHaAbMBsgGzAdQB9AH/AQADBQEJAdUBswGtArQBuwEZAdQBegYF - AQkB1QGzAa0CtAG7Ac8BiwKGAc8B6wIAAfEEswHUAdoC1AKzAbQB/wMAAawCswHaAdQB2gHUArMBsgGz - AdQB/wEAAwUB3AHVAq0BBwK0ArsB9gEJAdQEBQHcAdUCrQFlA7QBiwG0AV8BZwEFAgABrQSzA9oB1AKz - AboB/wMAAawDswPaAdQCswGyAbQB/wEAAwUB1QGzAq0BswG0AawBCQG0Ac4GBQHVAbQCrQGzAbQBswH0 - AbQBCQMFAgAB/wGLBLMF2gHbAf8DAAGKBLME2gKzAf8CAAMFAdUBswKtAbMBrQHzArQBzgYFAdUBswKt - ArMDtAFfAwUEAAGLArMDrQOzAbQEAAHwA6YDrAGzAdoB2wH0AwADBQHVAbMBrQEJAfQCswG0AccBzgYF - AdUBswGtAv8BrQGzAbQBswG8AwUEAAH/AYsBswH/EQABswHbAfQEAAMFAdUBswEZBAkB9AG0Ac4GBQHV - AbMFCQH/AbMBtAMFBQAB/wGtAf8RAAGzAfMFAAMFAdUDGQEJAtwCCQcFAdUDGQEJA9wBCQQFBgAB/xIA - AfQGAAMFAc4DGQEJAdsB3AHOCAUBzgMZAd0B2wLcBQUgAAYFAeYBGQEJDQUBqAIJBwUgACAFIAABQgFN - AT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/4UABP8EAAT/BAAB+AL/AY8EAAHwAv8BhwQA - AfABAQHAAQMEAAHgAQEBwAEBBAABwAEBAcABAQQAAcABAQHAAQEEAAHAAQEBwAEDBAAB8AEDAcABBwQA - AfAC/wGPBAAB+AL/AZ8EAAH9Av8BvwQABP8EAAT/BAAE/ws= + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo + CgAAAk1TRnQBSQFMAgEBBAIAAQEBAAEBARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + AUADAAEgAwABAQEAAQgGAAEIGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA + AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA + AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm + AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ + AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm + AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz + AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm + AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm + AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA + ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm + AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm + ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm + AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA + AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ + AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz + AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ + AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA + AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM + AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm + ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ + AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ + ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM + ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm + AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM + AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA + AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA + ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 + Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA///AP8A/wD/AAUABgUBzgFh + DgUBjAFnAwUBZwHsAesCBSAABQUBjAHdAdUB3AEZAQkBGQoFAd0B1QLcAbQD0wGzAWEgAAUFAd0BCQLV + Aa0BtAGzAc4B3AIZBQUB3QEJAtUB7QGLAa0BzQGLAa0BxwUAAf8BuwH/EQAB1AH0Af8EAAQFAd0BCQHV + AdQB1QG0AdwB1AHOAQkBswHVBAUB3QEJAdYB1AHVAaYBxwP/AccBrQQAAf8BuwHbAf8RAAGzAdQB9AH/ + AwADBQHdAQkC1QHOAdQC1QHcAc4BYQUFAd0BCQHWAdUBzgHUAaYCxwL/AccBrQQAAbsB1AHbCP8DAAf/ + ArMB1AH0Af8CAAMFAQkB1gHVAbMBzQEJAdQBswHVAc4GBQEJAdwB1QGzAc0B3AHvAaYB/wKmAf8BrQMA + AbwCswHUBdsBugGzAf8DAAGzBdsB2gGzAbIBswHUAfQB/wEAAwUBCQHVAbMBrQK0AbsBGQHUAXoGBQEJ + AdUBswGtArQBuwHPAYsChgHPAesCAAHxBLMB1AHaAtQCswG0Af8DAAGsArMB2gHUAdoB1AKzAbIBswHU + Af8BAAMFAdwB1QKtAQcCtAK7AfYBCQHUBAUB3AHVAq0BZQO0AYsBtAFfAWcBBQIAAa0EswPaAdQCswG6 + Af8DAAGsA7MD2gHUArMBsgG0Af8BAAMFAdUBswKtAbMBtAGsAQkBtAHOBgUB1QG0Aq0BswG0AbMB9AG0 + AQkDBQIAAf8BiwSzBdoB2wH/AwABigSzBNoCswH/AgADBQHVAbMCrQGzAa0B8wK0Ac4GBQHVAbMCrQKz + A7QBXwMFBAABiwKzA60DswG0BAAB8AOmA6wBswHaAdsB9AMAAwUB1QGzAa0BCQH0ArMBtAHHAc4GBQHV + AbMBrQL/Aa0BswG0AbMBvAMFBAAB/wGLAbMB/xEAAbMB2wH0BAADBQHVAbMBGQQJAfQBtAHOBgUB1QGz + BQkB/wGzAbQDBQUAAf8BrQH/EQABswHzBQADBQHVAxkBCQLcAgkHBQHVAxkBCQPcAQkEBQYAAf8SAAH0 + BgADBQHOAxkBCQHbAdwBzggFAc4DGQHdAdsC3AUFIAAGBQHmARkBCQ0FAagCCQcFIAAgBSAAAUIBTQE+ + BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+FAAT/BAAE/wQAAfgC/wGPBAAB8AL/AYcEAAHw + AQEBwAEDBAAB4AEBAcABAQQAAcABAQHAAQEEAAHAAQEBwAEBBAABwAEBAcABAwQAAfABAwHAAQcEAAHw + Av8BjwQAAfgC/wGfBAAB/QL/Ab8EAAT/BAAE/wQABP8L @@ -1094,4 +1046,4 @@ XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - + \ No newline at end of file diff --git a/XenAdmin/SettingsPanels/HostPowerONPages/HostPowerONEditPage.Designer.cs b/XenAdmin/SettingsPanels/HostPowerONPages/HostPowerONEditPage.Designer.cs index a806b9cae..13962461c 100644 --- a/XenAdmin/SettingsPanels/HostPowerONPages/HostPowerONEditPage.Designer.cs +++ b/XenAdmin/SettingsPanels/HostPowerONPages/HostPowerONEditPage.Designer.cs @@ -180,7 +180,6 @@ namespace XenAdmin.SettingsPanels this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle1; resources.ApplyResources(this.dataGridView1, "dataGridView1"); this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter; - this.dataGridView1.MaximumSize = new System.Drawing.Size(0, 120); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellEndEdit); diff --git a/XenAdmin/SettingsPanels/HostPowerONPages/HostPowerONEditPage.resx b/XenAdmin/SettingsPanels/HostPowerONPages/HostPowerONEditPage.resx index f44fc8109..fd413ea97 100644 --- a/XenAdmin/SettingsPanels/HostPowerONPages/HostPowerONEditPage.resx +++ b/XenAdmin/SettingsPanels/HostPowerONPages/HostPowerONEditPage.resx @@ -112,20 +112,20 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + NoControl - + 6, 19 @@ -142,7 +142,7 @@ radioButtonDisabled - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBoxMode @@ -172,7 +172,7 @@ radioButtonWakeonLAN - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBoxMode @@ -202,7 +202,7 @@ radioButtonILO - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBoxMode @@ -232,7 +232,7 @@ radioButtonDRAC - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBoxMode @@ -262,7 +262,7 @@ radioButtonCustom - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBoxMode @@ -289,7 +289,7 @@ textBoxCustom - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBoxMode @@ -316,7 +316,7 @@ groupBoxMode - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -355,7 +355,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCredentials @@ -382,7 +382,7 @@ 2 - &User name: + &Username: MiddleLeft @@ -391,7 +391,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCredentials @@ -427,7 +427,7 @@ label3 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCredentials @@ -451,7 +451,7 @@ textBoxInterface - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCredentials @@ -475,7 +475,7 @@ textBoxUser - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCredentials @@ -502,7 +502,7 @@ textBoxPassword - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanelCredentials @@ -532,7 +532,7 @@ tableLayoutPanelCredentials - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBoxCredentials @@ -568,7 +568,7 @@ groupBoxCredentials - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -576,13 +576,13 @@ 2 - + True Key - + True @@ -594,6 +594,9 @@ 12, 281 + + 0, 120 + 0, 44 @@ -631,7 +634,7 @@ label4 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -639,7 +642,7 @@ 0 - + True @@ -652,18 +655,18 @@ ColumnKey - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ColumnValue - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 HostPowerONEditPage - System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/XenAdmin/Wizards/BugToolWizardFiles/BugToolPageDestination.resx b/XenAdmin/Wizards/BugToolWizardFiles/BugToolPageDestination.resx index e3087fba7..ea4f2f4a7 100644 --- a/XenAdmin/Wizards/BugToolWizardFiles/BugToolPageDestination.resx +++ b/XenAdmin/Wizards/BugToolWizardFiles/BugToolPageDestination.resx @@ -139,13 +139,13 @@ 30, 5, 3, 5 - 61, 13 + 58, 13 8 - U&ser name: + U&sername: MiddleLeft @@ -493,7 +493,7 @@ 3, 20, 3, 6 - 451, 17 + 260, 17 6 @@ -687,4 +687,4 @@ XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - + \ No newline at end of file diff --git a/XenAdmin/Wizards/NewPolicyWizard/NewPolicyArchivePage.Designer.cs b/XenAdmin/Wizards/NewPolicyWizard/NewPolicyArchivePage.Designer.cs index c9e27fcc3..c6279c668 100644 --- a/XenAdmin/Wizards/NewPolicyWizard/NewPolicyArchivePage.Designer.cs +++ b/XenAdmin/Wizards/NewPolicyWizard/NewPolicyArchivePage.Designer.cs @@ -35,6 +35,7 @@ this.radioButtonDoNotArchive = new System.Windows.Forms.RadioButton(); this.m_tlpDestination = new System.Windows.Forms.TableLayoutPanel(); this.label2 = new System.Windows.Forms.Label(); + this.textBoxPath = new System.Windows.Forms.TextBox(); this.buttonTest = new System.Windows.Forms.Button(); this.pictureBoxTest = new System.Windows.Forms.PictureBox(); this.checkBoxCredentials = new System.Windows.Forms.CheckBox(); @@ -60,7 +61,6 @@ this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); this.m_tlpRecur = new System.Windows.Forms.TableLayoutPanel(); this.sectionLabelDest = new XenAdmin.Controls.SectionHeaderLabel(); - this.textBoxPath = new System.Windows.Forms.TextBox(); this.m_tlpDestination.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTest)).BeginInit(); this.m_tlpCredentials.SuspendLayout(); @@ -117,6 +117,12 @@ resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; // + // textBoxPath + // + resources.ApplyResources(this.textBoxPath, "textBoxPath"); + this.textBoxPath.Name = "textBoxPath"; + this.textBoxPath.TextChanged += new System.EventHandler(this.textBoxPath_TextChanged); + // // buttonTest // resources.ApplyResources(this.buttonTest, "buttonTest"); @@ -210,8 +216,6 @@ resources.ApplyResources(this.daysWeekCheckboxes1, "daysWeekCheckboxes1"); this.m_tlpRecur.SetColumnSpan(this.daysWeekCheckboxes1, 2); this.daysWeekCheckboxes1.Days = ""; - this.daysWeekCheckboxes1.MaximumSize = new System.Drawing.Size(400, 80); - this.daysWeekCheckboxes1.MinimumSize = new System.Drawing.Size(0, 75); this.daysWeekCheckboxes1.Name = "daysWeekCheckboxes1"; // // labelDays @@ -260,7 +264,6 @@ resources.ApplyResources(this.sectionLabelSchedule, "sectionLabelSchedule"); this.sectionLabelSchedule.LineColor = System.Drawing.SystemColors.Window; this.sectionLabelSchedule.LineLocation = XenAdmin.Controls.SectionHeaderLabel.VerticalAlignment.Middle; - this.sectionLabelSchedule.MinimumSize = new System.Drawing.Size(0, 14); this.sectionLabelSchedule.Name = "sectionLabelSchedule"; this.sectionLabelSchedule.TabStop = false; // @@ -297,16 +300,9 @@ resources.ApplyResources(this.sectionLabelDest, "sectionLabelDest"); this.sectionLabelDest.LineColor = System.Drawing.SystemColors.Window; this.sectionLabelDest.LineLocation = XenAdmin.Controls.SectionHeaderLabel.VerticalAlignment.Middle; - this.sectionLabelDest.MinimumSize = new System.Drawing.Size(0, 14); this.sectionLabelDest.Name = "sectionLabelDest"; this.sectionLabelDest.TabStop = false; // - // textBoxPath - // - resources.ApplyResources(this.textBoxPath, "textBoxPath"); - this.textBoxPath.Name = "textBoxPath"; - this.textBoxPath.TextChanged += new System.EventHandler(this.textBoxPath_TextChanged); - // // NewPolicyArchivePage // resources.ApplyResources(this, "$this"); diff --git a/XenAdmin/Wizards/NewPolicyWizard/NewPolicyArchivePage.resx b/XenAdmin/Wizards/NewPolicyWizard/NewPolicyArchivePage.resx index d699125dc..1b0f246eb 100644 --- a/XenAdmin/Wizards/NewPolicyWizard/NewPolicyArchivePage.resx +++ b/XenAdmin/Wizards/NewPolicyWizard/NewPolicyArchivePage.resx @@ -112,20 +112,20 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + NoControl - + 3, 72 @@ -142,7 +142,7 @@ radioButtonArchiveWeekly - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel5 @@ -175,7 +175,7 @@ radioButtonArchiveDaily - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 toolTipContainer1 @@ -205,7 +205,7 @@ radioButtonArchiveASAP - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel5 @@ -232,7 +232,7 @@ radioButtonDoNotArchive - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel5 @@ -271,7 +271,7 @@ label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpDestination @@ -295,7 +295,7 @@ textBoxPath - XenAdmin.Controls.WatermarkTextBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpDestination @@ -322,7 +322,7 @@ buttonTest - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpDestination @@ -355,7 +355,7 @@ pictureBoxTest - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpDestination @@ -394,7 +394,7 @@ checkBoxCredentials - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpDestination @@ -427,13 +427,13 @@ 18, 6 - 61, 13 + 58, 13 0 - &User name: + &Username: MiddleLeft @@ -442,7 +442,7 @@ labelUser - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpCredentials @@ -454,10 +454,10 @@ Fill - 85, 3 + 82, 3 - 174, 20 + 176, 20 1 @@ -466,7 +466,7 @@ textBoxUser - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpCredentials @@ -484,7 +484,7 @@ NoControl - 265, 6 + 264, 6 56, 13 @@ -502,7 +502,7 @@ labelPassword - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpCredentials @@ -514,13 +514,13 @@ Fill - 327, 3 + 326, 3 * - 175, 20 + 176, 20 3 @@ -529,7 +529,7 @@ textBoxPassword - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpCredentials @@ -556,7 +556,7 @@ m_tlpCredentials - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpDestination @@ -601,7 +601,7 @@ Fill - 3, 267 + 3, 271 4 @@ -616,7 +616,7 @@ m_tlpDestination - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -691,7 +691,7 @@ tableLayoutPanel5 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel4 @@ -712,7 +712,7 @@ labelDivider - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel5 @@ -745,7 +745,7 @@ labelRecurDaily - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpRecur @@ -817,7 +817,7 @@ labelRecurWeekly - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpRecur @@ -871,7 +871,7 @@ labelDays - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_tlpRecur @@ -898,7 +898,7 @@ m_tlpRecur - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel4 @@ -915,6 +915,12 @@ 3, 68 + + 400, 80 + + + 0, 75 + 376, 75 @@ -949,7 +955,7 @@ 4, 3, 3, 3 - 613, 18 + 613, 22 2 @@ -1008,6 +1014,9 @@ Top + + + Left @@ -1021,7 +1030,10 @@ 0, 0, 0, 0 - 3, 69 + 3, 73 + + + 0, 14 614, 14 @@ -1029,6 +1041,9 @@ 1 + + False + sectionLabelSchedule @@ -1054,7 +1069,7 @@ Fill - 3, 89 + 3, 93 1 @@ -1069,7 +1084,7 @@ tableLayoutPanel4 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -1086,6 +1101,9 @@ Top + + + Left @@ -1099,7 +1117,10 @@ 0, 0, 0, 0 - 3, 247 + 3, 251 + + + 0, 14 614, 14 @@ -1107,6 +1128,9 @@ 3 + + False + sectionLabelDest @@ -1138,7 +1162,7 @@ tableLayoutPanel2 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -1149,7 +1173,7 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="autoHeightLabel1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="sectionLabelSchedule" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="localServerTime1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel4" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="sectionLabelDest" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_tlpDestination" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /></TableLayoutSettings> - + True diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFSFrontend.Designer.cs b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFSFrontend.Designer.cs index ebd74f3b5..a4e56968e 100644 --- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFSFrontend.Designer.cs +++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFSFrontend.Designer.cs @@ -28,133 +28,133 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CifsFrontend)); - this.CifsScanButton = new System.Windows.Forms.Button(); - this.listBoxCifsSRs = new XenAdmin.Controls.SRListBox(); - this.radioButtonCifsReattach = new System.Windows.Forms.RadioButton(); - this.radioButtonCifsNew = new System.Windows.Forms.RadioButton(); - this.label2 = new System.Windows.Forms.Label(); - this.labelAdvancedOptions = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.CifsServerPathTextBox = new System.Windows.Forms.TextBox(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.passwordTextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.userNameTextBox = new System.Windows.Forms.TextBox(); - this.tableLayoutPanel1.SuspendLayout(); - this.SuspendLayout(); - // - // CifsScanButton - // - resources.ApplyResources(this.CifsScanButton, "CifsScanButton"); - this.CifsScanButton.Name = "CifsScanButton"; - this.CifsScanButton.UseVisualStyleBackColor = true; - this.CifsScanButton.Click += new System.EventHandler(this.buttonCifsScan_Click); - // - // listBoxCifsSRs - // - this.tableLayoutPanel1.SetColumnSpan(this.listBoxCifsSRs, 3); - resources.ApplyResources(this.listBoxCifsSRs, "listBoxCifsSRs"); - this.listBoxCifsSRs.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.listBoxCifsSRs.Name = "listBoxCifsSRs"; - this.listBoxCifsSRs.Sorted = true; - this.listBoxCifsSRs.SelectedIndexChanged += new System.EventHandler(this.listBoxCifsSRs_SelectedIndexChanged); - // - // radioButtonCifsReattach - // - resources.ApplyResources(this.radioButtonCifsReattach, "radioButtonCifsReattach"); - this.tableLayoutPanel1.SetColumnSpan(this.radioButtonCifsReattach, 3); - this.radioButtonCifsReattach.Name = "radioButtonCifsReattach"; - this.radioButtonCifsReattach.UseVisualStyleBackColor = true; - this.radioButtonCifsReattach.CheckedChanged += new System.EventHandler(this.radioButtonCifsReattach_CheckedChanged); - // - // radioButtonCifsNew - // - resources.ApplyResources(this.radioButtonCifsNew, "radioButtonCifsNew"); - this.radioButtonCifsNew.Checked = true; - this.tableLayoutPanel1.SetColumnSpan(this.radioButtonCifsNew, 3); - this.radioButtonCifsNew.Name = "radioButtonCifsNew"; - this.radioButtonCifsNew.TabStop = true; - this.radioButtonCifsNew.UseVisualStyleBackColor = true; - this.radioButtonCifsNew.CheckedChanged += new System.EventHandler(this.radioButtonCifsNew_CheckedChanged); - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.ForeColor = System.Drawing.SystemColors.WindowText; - this.label2.Name = "label2"; - // - // labelAdvancedOptions - // - resources.ApplyResources(this.labelAdvancedOptions, "labelAdvancedOptions"); - this.labelAdvancedOptions.ForeColor = System.Drawing.SystemColors.WindowText; - this.labelAdvancedOptions.Name = "labelAdvancedOptions"; - // - // label3 - // - resources.ApplyResources(this.label3, "label3"); - this.label3.ForeColor = System.Drawing.SystemColors.WindowText; - this.label3.Name = "label3"; - // - // CifsServerPathTextBox - // - resources.ApplyResources(this.CifsServerPathTextBox, "CifsServerPathTextBox"); - this.CifsServerPathTextBox.Name = "CifsServerPathTextBox"; - this.CifsServerPathTextBox.TextChanged += new System.EventHandler(this.AnyCifsParameters_TextChanged); - // - // tableLayoutPanel1 - // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.passwordTextBox, 1, 4); - this.tableLayoutPanel1.Controls.Add(this.label4, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.label3, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.CifsServerPathTextBox, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.CifsScanButton, 2, 1); - this.tableLayoutPanel1.Controls.Add(this.labelAdvancedOptions, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.userNameTextBox, 1, 3); - this.tableLayoutPanel1.Controls.Add(this.radioButtonCifsNew, 0, 6); - this.tableLayoutPanel1.Controls.Add(this.radioButtonCifsReattach, 0, 7); - this.tableLayoutPanel1.Controls.Add(this.listBoxCifsSRs, 0, 8); - this.tableLayoutPanel1.Controls.Add(this.label2, 1, 2); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - // - // passwordTextBox - // - resources.ApplyResources(this.passwordTextBox, "passwordTextBox"); - this.passwordTextBox.Name = "passwordTextBox"; - this.passwordTextBox.UseSystemPasswordChar = true; - this.passwordTextBox.TextChanged += new System.EventHandler(this.AnyCifsParameters_TextChanged); - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.ForeColor = System.Drawing.SystemColors.WindowText; - this.label4.Name = "label4"; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.tableLayoutPanel1.SetColumnSpan(this.label1, 3); - this.label1.Name = "label1"; - // - // userNameTextBox - // - resources.ApplyResources(this.userNameTextBox, "userNameTextBox"); - this.userNameTextBox.Name = "userNameTextBox"; - this.userNameTextBox.TextChanged += new System.EventHandler(this.AnyCifsParameters_TextChanged); - // - // CifsFrontend - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.tableLayoutPanel1); - this.Name = "CifsFrontend"; - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.ResumeLayout(false); - + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CifsFrontend)); + this.CifsScanButton = new System.Windows.Forms.Button(); + this.listBoxCifsSRs = new XenAdmin.Controls.SRListBox(); + this.radioButtonCifsReattach = new System.Windows.Forms.RadioButton(); + this.radioButtonCifsNew = new System.Windows.Forms.RadioButton(); + this.label2 = new System.Windows.Forms.Label(); + this.labelAdvancedOptions = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.CifsServerPathTextBox = new System.Windows.Forms.TextBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.passwordTextBox = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.userNameTextBox = new System.Windows.Forms.TextBox(); + this.tableLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // CifsScanButton + // + resources.ApplyResources(this.CifsScanButton, "CifsScanButton"); + this.CifsScanButton.Name = "CifsScanButton"; + this.CifsScanButton.UseVisualStyleBackColor = true; + this.CifsScanButton.Click += new System.EventHandler(this.buttonCifsScan_Click); + // + // listBoxCifsSRs + // + this.tableLayoutPanel1.SetColumnSpan(this.listBoxCifsSRs, 3); + resources.ApplyResources(this.listBoxCifsSRs, "listBoxCifsSRs"); + this.listBoxCifsSRs.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.listBoxCifsSRs.Name = "listBoxCifsSRs"; + this.listBoxCifsSRs.Sorted = true; + this.listBoxCifsSRs.SelectedIndexChanged += new System.EventHandler(this.listBoxCifsSRs_SelectedIndexChanged); + // + // radioButtonCifsReattach + // + resources.ApplyResources(this.radioButtonCifsReattach, "radioButtonCifsReattach"); + this.tableLayoutPanel1.SetColumnSpan(this.radioButtonCifsReattach, 3); + this.radioButtonCifsReattach.Name = "radioButtonCifsReattach"; + this.radioButtonCifsReattach.UseVisualStyleBackColor = true; + this.radioButtonCifsReattach.CheckedChanged += new System.EventHandler(this.radioButtonCifsReattach_CheckedChanged); + // + // radioButtonCifsNew + // + resources.ApplyResources(this.radioButtonCifsNew, "radioButtonCifsNew"); + this.radioButtonCifsNew.Checked = true; + this.tableLayoutPanel1.SetColumnSpan(this.radioButtonCifsNew, 3); + this.radioButtonCifsNew.Name = "radioButtonCifsNew"; + this.radioButtonCifsNew.TabStop = true; + this.radioButtonCifsNew.UseVisualStyleBackColor = true; + this.radioButtonCifsNew.CheckedChanged += new System.EventHandler(this.radioButtonCifsNew_CheckedChanged); + // + // label2 + // + resources.ApplyResources(this.label2, "label2"); + this.label2.ForeColor = System.Drawing.SystemColors.WindowText; + this.label2.Name = "label2"; + // + // labelAdvancedOptions + // + resources.ApplyResources(this.labelAdvancedOptions, "labelAdvancedOptions"); + this.labelAdvancedOptions.ForeColor = System.Drawing.SystemColors.WindowText; + this.labelAdvancedOptions.Name = "labelAdvancedOptions"; + // + // label3 + // + resources.ApplyResources(this.label3, "label3"); + this.label3.ForeColor = System.Drawing.SystemColors.WindowText; + this.label3.Name = "label3"; + // + // CifsServerPathTextBox + // + resources.ApplyResources(this.CifsServerPathTextBox, "CifsServerPathTextBox"); + this.CifsServerPathTextBox.Name = "CifsServerPathTextBox"; + this.CifsServerPathTextBox.TextChanged += new System.EventHandler(this.AnyCifsParameters_TextChanged); + // + // tableLayoutPanel1 + // + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); + this.tableLayoutPanel1.Controls.Add(this.passwordTextBox, 1, 4); + this.tableLayoutPanel1.Controls.Add(this.label4, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.label3, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.CifsServerPathTextBox, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.CifsScanButton, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.labelAdvancedOptions, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.userNameTextBox, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.radioButtonCifsNew, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.radioButtonCifsReattach, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.listBoxCifsSRs, 0, 8); + this.tableLayoutPanel1.Controls.Add(this.label2, 1, 2); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + // + // passwordTextBox + // + resources.ApplyResources(this.passwordTextBox, "passwordTextBox"); + this.passwordTextBox.Name = "passwordTextBox"; + this.passwordTextBox.UseSystemPasswordChar = true; + this.passwordTextBox.TextChanged += new System.EventHandler(this.AnyCifsParameters_TextChanged); + // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.ForeColor = System.Drawing.SystemColors.WindowText; + this.label4.Name = "label4"; + // + // label1 + // + resources.ApplyResources(this.label1, "label1"); + this.tableLayoutPanel1.SetColumnSpan(this.label1, 3); + this.label1.Name = "label1"; + // + // userNameTextBox + // + resources.ApplyResources(this.userNameTextBox, "userNameTextBox"); + this.userNameTextBox.Name = "userNameTextBox"; + this.userNameTextBox.TextChanged += new System.EventHandler(this.AnyCifsParameters_TextChanged); + // + // CifsFrontend + // + resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.Controls.Add(this.tableLayoutPanel1); + this.Name = "CifsFrontend"; + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.ResumeLayout(false); + } #endregion diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFSFrontend.resx b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFSFrontend.resx index 0cce4b1d9..c7dcfab83 100644 --- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFSFrontend.resx +++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFSFrontend.resx @@ -1,546 +1,546 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Left - - - - False - - - NoControl - - - - 427, 49 - - - 70, 23 - - - 15 - - - &Scan - - - CifsScanButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 5 - - - 3 - - - Left, Right - - - 78, 132 - - - 343, 20 - - - 11 - - - passwordTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 0 - - - Left - - - True - - - NoControl - - - 3, 135 - - - 56, 13 - - - 10 - - - Password: - - - MiddleLeft - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 1 - - - True - - - Fill - - - 3, 0 - - - 3, 0, 3, 20 - - - 494, 26 - - - 0 - - - Provide the name of the share where your SR is located, optionally specifying advanced options. Indicate whether you wish to create a new SR or reattach an existing SR before proceeding. - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 2 - - - Left - - - True - - - NoControl - - - 3, 54 - - - 69, 13 - - - 1 - - - S&hare Name: - - - MiddleLeft - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 3 - - - Left, Right - - - 78, 50 - - - 343, 20 - - - 2 - - - CifsServerPathTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 4 - - - Left - - - True - - - NoControl - - - 3, 109 - - - 61, 13 - - - 5 - - - &User name: - - - MiddleLeft - - - labelAdvancedOptions - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 6 - - - Left, Right - - - 78, 106 - - - 343, 20 - - - 6 - - - userNameTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 7 - - - True - - - NoControl - - - 3, 180 - - - 3, 25, 3, 3 - - - 106, 17 - - - 12 - - - &Create a new SR - - - radioButtonCifsNew - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 8 - - - True - - - NoControl - - - 3, 203 - - - 143, 17 - - - 13 - - - &Reattach an existing SR: - - - radioButtonCifsReattach - - - System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 9 - - - True - - - Microsoft Sans Serif, 8.25pt - - - NoControl - - - 78, 75 - - - 3, 0, 3, 15 - - - 118, 13 - - - 4 - - - Example: \\server\path - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tableLayoutPanel1 - - - 11 - - - Fill - - - 0, 0 - - - 9 - - - 500, 461 - - - 0 - - - tableLayoutPanel1 - - - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="passwordTextBox" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="label3" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CifsServerPathTextBox" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="CifsScanButton" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="labelAdvancedOptions" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="userNameTextBox" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="radioButtonCifsNew" Row="6" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="radioButtonCifsReattach" Row="7" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="listBoxCifsSRs" Row="8" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="label2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20" /></TableLayoutSettings> - - - Fill - - - False - - - 14 - - - 3, 226 - - - 494, 232 - - - 9 - - - listBoxCifsSRs - - - XenAdmin.Controls.SRListBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - tableLayoutPanel1 - - - 10 - - - True - - - 96, 96 - - - 500, 461 - - - CifsFrontend - - - XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Left + + + + False + + + NoControl + + + + 427, 49 + + + 70, 23 + + + 15 + + + &Scan + + + CifsScanButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 5 + + + 3 + + + Left, Right + + + 78, 132 + + + 343, 20 + + + 11 + + + passwordTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 0 + + + Left + + + True + + + NoControl + + + 3, 135 + + + 56, 13 + + + 10 + + + Password: + + + MiddleLeft + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 1 + + + True + + + Fill + + + 3, 0 + + + 3, 0, 3, 20 + + + 494, 26 + + + 0 + + + Provide the name of the share where your SR is located, optionally specifying advanced options. Indicate whether you wish to create a new SR or reattach an existing SR before proceeding. + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 2 + + + Left + + + True + + + NoControl + + + 3, 54 + + + 69, 13 + + + 1 + + + S&hare Name: + + + MiddleLeft + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 3 + + + Left, Right + + + 78, 50 + + + 343, 20 + + + 2 + + + CifsServerPathTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 4 + + + Left + + + True + + + NoControl + + + 3, 109 + + + 58, 13 + + + 5 + + + &Username: + + + MiddleLeft + + + labelAdvancedOptions + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 6 + + + Left, Right + + + 78, 106 + + + 343, 20 + + + 6 + + + userNameTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 7 + + + True + + + NoControl + + + 3, 180 + + + 3, 25, 3, 3 + + + 106, 17 + + + 12 + + + &Create a new SR + + + radioButtonCifsNew + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 8 + + + True + + + NoControl + + + 3, 203 + + + 143, 17 + + + 13 + + + &Reattach an existing SR: + + + radioButtonCifsReattach + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 9 + + + True + + + Microsoft Sans Serif, 8.25pt + + + NoControl + + + 78, 75 + + + 3, 0, 3, 15 + + + 118, 13 + + + 4 + + + Example: \\server\path + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tableLayoutPanel1 + + + 11 + + + Fill + + + 0, 0 + + + 9 + + + 500, 461 + + + 0 + + + tableLayoutPanel1 + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="passwordTextBox" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="label4" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="label3" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="CifsServerPathTextBox" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="CifsScanButton" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="labelAdvancedOptions" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="userNameTextBox" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="radioButtonCifsNew" Row="6" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="radioButtonCifsReattach" Row="7" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="listBoxCifsSRs" Row="8" RowSpan="1" Column="0" ColumnSpan="3" /><Control Name="label2" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100,AutoSize,0" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,Absolute,20" /></TableLayoutSettings> + + + Fill + + + False + + + 14 + + + 3, 226 + + + 494, 232 + + + 9 + + + listBoxCifsSRs + + + XenAdmin.Controls.SRListBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + tableLayoutPanel1 + + + 10 + + + True + + + 96, 96 + + + 500, 461 + + + CifsFrontend + + + XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFS_ISO.resx b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFS_ISO.resx index dbd0c5e29..bfb58aba6 100644 --- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFS_ISO.resx +++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CIFS_ISO.resx @@ -193,13 +193,13 @@ 6, 26 - 61, 13 + 58, 13 0 - &User name: + &Username: labelCifsUsername diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CslgLocation.Designer.cs b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CslgLocation.Designer.cs index 537467c63..6af31731b 100644 --- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CslgLocation.Designer.cs +++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CslgLocation.Designer.cs @@ -146,12 +146,12 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages.Frontends this.tableLayoutPanel2.SetColumnSpan(this.autoHeightLabel1, 2); this.autoHeightLabel1.Name = "autoHeightLabel1"; // - // StorageSystem + // CslgLocation // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.tableLayoutPanel2); - this.Name = "StorageSystem"; + this.Name = "CslgLocation"; this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); this.groupBox1.ResumeLayout(false); diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CslgLocation.resx b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CslgLocation.resx index a9e6c425a..2ed0865ef 100644 --- a/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CslgLocation.resx +++ b/XenAdmin/Wizards/NewSRWizard_Pages/Frontends/CslgLocation.resx @@ -112,23 +112,23 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 2 True - + 3, 44 - + 3, 5, 3, 0 @@ -145,7 +145,7 @@ label4 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -172,7 +172,7 @@ textBoxTarget - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -196,19 +196,19 @@ 3, 5, 3, 0 - 61, 13 + 58, 13 0 - &User name: + &Username: label6 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel3 @@ -232,7 +232,7 @@ textBoxUsername - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel3 @@ -265,7 +265,7 @@ label7 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel3 @@ -289,7 +289,7 @@ textBoxPassword - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel3 @@ -319,7 +319,7 @@ tableLayoutPanel3 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox1 @@ -349,7 +349,7 @@ groupBox1 - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -382,7 +382,7 @@ label8 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -409,7 +409,7 @@ comboBoxStorageSystemBoston - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel1 @@ -439,7 +439,7 @@ buttonDiscoverBostonSS - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel1 @@ -466,7 +466,7 @@ panel1 - System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel2 @@ -529,7 +529,7 @@ tableLayoutPanel2 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -540,7 +540,7 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label4" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="textBoxTarget" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="groupBox1" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /><Control Name="label8" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="panel1" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="autoHeightLabel1" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /></Controls><Columns Styles="Absolute,120,Percent,100" /><Rows Styles="AutoSize,0,Absolute,38,Absolute,96,Absolute,46" /></TableLayoutSettings> - + True @@ -550,7 +550,7 @@ 528, 325 - StorageSystem + CslgLocation XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null diff --git a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_SelectInstallMethod.resx b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_SelectInstallMethod.resx index ec28ffa9b..368bf63f9 100644 --- a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_SelectInstallMethod.resx +++ b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizard_SelectInstallMethod.resx @@ -112,16 +112,16 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Top, Left, Right - + 4 @@ -134,7 +134,7 @@ FTP - + 3, 3 @@ -148,7 +148,7 @@ comboBoxUpgradeMethod - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -172,7 +172,7 @@ watermarkTextBox1 - XenAdmin.Controls.WatermarkTextBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -196,7 +196,7 @@ buttonTest - System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -220,7 +220,7 @@ pictureBox1 - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -247,7 +247,7 @@ 2 - U&ser name: + U&sername: MiddleLeft @@ -256,7 +256,7 @@ labelUser - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -280,7 +280,7 @@ textBoxUser - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -316,7 +316,7 @@ labelPassword - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -340,7 +340,7 @@ textBoxPassword - System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tableLayoutPanel1 @@ -367,7 +367,7 @@ tableLayoutPanel1 - System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 groupBox2 @@ -397,7 +397,7 @@ groupBox2 - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -427,7 +427,7 @@ label1 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -457,7 +457,7 @@ labelErrors - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -484,7 +484,7 @@ pictureBox2 - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -516,7 +516,7 @@ The upgrade process may take some time. label2 - System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this @@ -524,7 +524,7 @@ The upgrade process may take some time. 0 - + True @@ -542,4 +542,4 @@ The upgrade process may take some time. XenAdmin.Controls.XenTabPage, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - + \ No newline at end of file diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 975195d78..c508cc209 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -3747,7 +3747,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Enter your fully qualified AD domain name, and a username and password with sufficient privileges to add servers to your domain.. + /// Looks up a localized string similar to Enter your fully qualified AD domain name, and a user name and password with sufficient privileges to add servers to your domain.. /// public static string AD_JOIN_DOMAIN_BLURB_SHORT { get { @@ -3756,7 +3756,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Enter your fully qualified AD domain name, and a username and password with sufficient privileges to add servers to your domain.. + /// Looks up a localized string similar to Enter your fully qualified AD domain name, and a user name and password with sufficient privileges to add servers to your domain.. /// public static string AD_JOIN_DOMAIN_BLURB_SHORT_HOST { get { @@ -4244,7 +4244,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Incorrect username and/or password.. + /// Looks up a localized string similar to Incorrect user name and/or password.. /// public static string ADD_NEW_INCORRECT { get { @@ -8057,7 +8057,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Enter your username and password to connect to this server.. + /// Looks up a localized string similar to Enter your user name and password to connect to this server.. /// public static string CONNECT_TO_SERVER_BLURB { get { @@ -9804,7 +9804,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Username and password check complete. + /// Looks up a localized string similar to User name and password check complete. /// public static string CREDENTIALS_CHECK_COMPLETE { get { @@ -9813,7 +9813,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Checking username and password.... + /// Looks up a localized string similar to Checking user name and password.... /// public static string CREDENTIALS_CHECKING { get { @@ -13676,7 +13676,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Username and Password mismatch.. + /// Looks up a localized string similar to User name and password mismatch.. /// public static string ERROR_AUTHENTICATION { get { @@ -17032,7 +17032,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Invalid username or password. Please try again.. + /// Looks up a localized string similar to Invalid user name or password. Please try again.. /// public static string HEALTH_CHECK_AUTHENTICATION_INVALID_CREDENTIALS { get { @@ -19487,7 +19487,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Please enter a username and password with sufficient privileges to add servers to domain '{0}'.. + /// Looks up a localized string similar to Please enter a user name and password with sufficient privileges to add servers to domain '{0}'.. /// public static string JOINING_AD { get { @@ -19577,7 +19577,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Enter a username and password with sufficient privileges to remove your machine account from AD. Authentication will be disabled even if the machine account cannot be removed.. + /// Looks up a localized string similar to Enter a user name and password with sufficient privileges to remove your machine account from AD. Authentication will be disabled even if the machine account cannot be removed.. /// public static string LEAVING_AD { get { @@ -23651,7 +23651,7 @@ namespace XenAdmin { /// ///As SMB storage repositories are shared, the virtual disks stored in them allow VMs to be started on any server in a resource pool and to be migrated between them using Live Migration. /// - ///When you configure a SMB storage repository, you simply provide the hostname or IP address of the SMB server, the username, the password and the path to a directory that will be [rest of string was truncated]";. + ///When you configure a SMB storage repository, you simply provide the hostname or IP address of the SMB server, the user name, the password and the path to a directory that will be [rest of string was truncated]";. /// public static string NEWSR_CIFS_BLURB { get { @@ -31040,7 +31040,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Try again using a correct Username and Password.. + /// Looks up a localized string similar to Try again using a correct user name and password.. /// public static string SOLUTION_AUTHENTICATION { get { diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 079d4beca..ff9509a61 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -1440,7 +1440,7 @@ It is strongly recommended that you Cancel and apply the latest version of the p Enter the host name or IP address of the server you want to add and your user login credentials for that server. - Incorrect username and/or password. + Incorrect user name and/or password. &Add New Server... @@ -1548,10 +1548,10 @@ To join '{1}' to the Active Directory domain '{2}', enter a domain user account You must use a user account with sufficient privileges. - Enter your fully qualified AD domain name, and a username and password with sufficient privileges to add servers to your domain. + Enter your fully qualified AD domain name, and a user name and password with sufficient privileges to add servers to your domain. - Enter your fully qualified AD domain name, and a username and password with sufficient privileges to add servers to your domain. + Enter your fully qualified AD domain name, and a user name and password with sufficient privileges to add servers to your domain. You are about to remove '{0}' from the AD domain '{1}'. Any users authenticated using AD will be disconnected. @@ -3030,7 +3030,7 @@ You can only connect to a single [Citrix] [XenServer product] Express Edition se Connect to Server - Enter your username and password to connect to this server. + Enter your user name and password to connect to this server. Console @@ -3527,10 +3527,10 @@ For optimal performance and reliability during VM migration, ensure that the net Creation time - Checking username and password... + Checking user name and password... - Username and password check complete + User name and password check complete Dell EqualLogic @@ -4828,7 +4828,7 @@ Would you like to eject these ISOs before continuing? Error Activating Virtual Disks - Username and Password mismatch. + User name and password mismatch. [XenCenter] has encountered a problem connecting to this server. @@ -6012,7 +6012,7 @@ Click Configure HA to alter the settings displayed below. Authentication with [Citrix] Insight Services failed. See the application log files for more information. - Invalid username or password. Please try again. + Invalid user name or password. Please try again. This user is not authorized to access this server. @@ -6797,7 +6797,7 @@ Size: {3} Is standalone - Please enter a username and password with sufficient privileges to add servers to domain '{0}'. + Please enter a user name and password with sufficient privileges to add servers to domain '{0}'. &Keep waiting @@ -6827,7 +6827,7 @@ Size: {3} License Manager - Enter a username and password with sufficient privileges to remove your machine account from AD. Authentication will be disabled even if the machine account cannot be removed. + Enter a user name and password with sufficient privileges to remove your machine account from AD. Authentication will be disabled even if the machine account cannot be removed. Left Alt @@ -8089,7 +8089,7 @@ You should only proceed if you have verified that these settings are correct. +When you configure a SMB storage repository, you simply provide the hostname or IP address of the SMB server, the user name, the password and the path to a directory that will be used to contain the storage repository. The SMB server must be configured to export the specified path to all servers in the pool. Select this option if you have a library of VM installation ISO images available as a Windows (SMB/CIFS) share that you wish to attach to your host or pool. @@ -10781,7 +10781,7 @@ Do you want to connect to the pool master '{1}'? XCP version - Try again using a correct Username and Password. + Try again using a correct user name and password. Check that [XenServer] is configured correctly on '{0}' and try again.