Renamed control because Resharper was complaining about ambiguous references in

the resx files between this and homonymous control in two derived classes. Removed
reference of non-existent file from XenAdmin.csproj.
This commit is contained in:
Konstantina Chremmou 2016-07-03 19:45:40 +01:00
parent 975fe4f303
commit f320dd7881
3 changed files with 65 additions and 53 deletions

View File

@ -30,11 +30,11 @@ namespace XenAdmin.TabPages
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BaseTabPage));
this.pageContainerPanel = new System.Windows.Forms.Panel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanelBanner = new System.Windows.Forms.TableLayoutPanel();
this.deprecationBanner1 = new XenAdmin.Controls.DeprecationBanner();
this.gradientPanel1 = new XenAdmin.Controls.GradientPanel.GradientPanel();
this.titleLabel = new System.Windows.Forms.Label();
this.tableLayoutPanel1.SuspendLayout();
this.tableLayoutPanelBanner.SuspendLayout();
this.gradientPanel1.SuspendLayout();
this.SuspendLayout();
//
@ -43,11 +43,11 @@ namespace XenAdmin.TabPages
resources.ApplyResources(this.pageContainerPanel, "pageContainerPanel");
this.pageContainerPanel.Name = "pageContainerPanel";
//
// tableLayoutPanel1
// tableLayoutPanelBanner
//
resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
this.tableLayoutPanel1.Controls.Add(this.deprecationBanner1, 1, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
resources.ApplyResources(this.tableLayoutPanelBanner, "tableLayoutPanelBanner");
this.tableLayoutPanelBanner.Controls.Add(this.deprecationBanner1, 1, 0);
this.tableLayoutPanelBanner.Name = "tableLayoutPanelBanner";
//
// deprecationBanner1
//
@ -77,11 +77,11 @@ namespace XenAdmin.TabPages
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.Controls.Add(this.pageContainerPanel);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.tableLayoutPanelBanner);
this.Controls.Add(this.gradientPanel1);
this.Name = "BaseTabPage";
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.tableLayoutPanelBanner.ResumeLayout(false);
this.tableLayoutPanelBanner.PerformLayout();
this.gradientPanel1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@ -93,7 +93,7 @@ namespace XenAdmin.TabPages
private XenAdmin.Controls.GradientPanel.GradientPanel gradientPanel1;
private System.Windows.Forms.Label titleLabel;
protected System.Windows.Forms.Panel pageContainerPanel;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanelBanner;
private XenAdmin.Controls.DeprecationBanner deprecationBanner1;
}

View File

@ -112,31 +112,34 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pageContainerPanel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pageContainerPanel.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="pageContainerPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pageContainerPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 91</value>
<value>0, 118</value>
</data>
<data name="pageContainerPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="pageContainerPanel.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>10, 10, 10, 10</value>
<value>12, 12, 12, 12</value>
</data>
<data name="pageContainerPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>482, 368</value>
<value>602, 456</value>
</data>
<data name="pageContainerPanel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -145,7 +148,7 @@
<value>pageContainerPanel</value>
</data>
<data name="&gt;&gt;pageContainerPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pageContainerPanel.Parent" xml:space="preserve">
<value>$this</value>
@ -153,13 +156,13 @@
<data name="&gt;&gt;pageContainerPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tableLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<data name="tableLayoutPanelBanner.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="tableLayoutPanel1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<data name="tableLayoutPanelBanner.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
<data name="tableLayoutPanelBanner.ColumnCount" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="deprecationBanner1.AutoScroll" type="System.Boolean, mscorlib">
@ -175,16 +178,16 @@
<value>Fill</value>
</data>
<data name="deprecationBanner1.Location" type="System.Drawing.Point, System.Drawing">
<value>53, 5</value>
<value>66, 6</value>
</data>
<data name="deprecationBanner1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>5, 5, 5, 5</value>
<value>6, 6, 6, 6</value>
</data>
<data name="deprecationBanner1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
<value>4, 4, 4, 4</value>
</data>
<data name="deprecationBanner1.Size" type="System.Drawing.Size, System.Drawing">
<value>375, 44</value>
<value>469, 60</value>
</data>
<data name="deprecationBanner1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -199,42 +202,42 @@
<value>XenAdmin.Controls.DeprecationBanner, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;deprecationBanner1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
<value>tableLayoutPanelBanner</value>
</data>
<data name="&gt;&gt;deprecationBanner1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<data name="tableLayoutPanelBanner.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 37</value>
<data name="tableLayoutPanelBanner.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 46</value>
</data>
<data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 0</value>
<data name="tableLayoutPanelBanner.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 0</value>
</data>
<data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
<data name="tableLayoutPanelBanner.RowCount" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>482, 54</value>
<data name="tableLayoutPanelBanner.Size" type="System.Drawing.Size, System.Drawing">
<value>602, 72</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<data name="tableLayoutPanelBanner.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
<value>tableLayoutPanel1</value>
<data name="&gt;&gt;tableLayoutPanelBanner.Name" xml:space="preserve">
<value>tableLayoutPanelBanner</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;tableLayoutPanelBanner.Type" xml:space="preserve">
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
<data name="&gt;&gt;tableLayoutPanelBanner.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
<data name="&gt;&gt;tableLayoutPanelBanner.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<data name="tableLayoutPanelBanner.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="deprecationBanner1" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,10,Percent,80,Percent,10" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="titleLabel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -247,13 +250,16 @@
<value>NoControl</value>
</data>
<data name="titleLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 7</value>
<value>0, 8</value>
</data>
<data name="titleLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 0, 4, 0</value>
</data>
<data name="titleLabel.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>8, 0, 0, 0</value>
<value>10, 0, 0, 0</value>
</data>
<data name="titleLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>482, 30</value>
<value>602, 38</value>
</data>
<data name="titleLabel.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -265,7 +271,7 @@
<value>titleLabel</value>
</data>
<data name="&gt;&gt;titleLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;titleLabel.Parent" xml:space="preserve">
<value>gradientPanel1</value>
@ -279,8 +285,11 @@
<data name="gradientPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="gradientPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="gradientPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>482, 37</value>
<value>602, 46</value>
</data>
<data name="gradientPanel1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -297,19 +306,22 @@
<data name="&gt;&gt;gradientPanel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>96, 96</value>
<value>120, 120</value>
</data>
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 4, 4, 4</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>482, 459</value>
<value>602, 574</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>BaseTabPage</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

View File

@ -2396,7 +2396,6 @@
<None Include="HomePage.mht">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="HomePage\License" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@ -5737,6 +5736,7 @@
</EmbeddedResource>
<EmbeddedResource Include="TabPages\HAPage.ja.resx">
<DependentUpon>HAPage.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="TabPages\HAPage.zh-CN.resx">
<DependentUpon>HAPage.cs</DependentUpon>