Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-29 02:18:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #43 from cheng--zhang/CP-7579

Browse Source 
CP-7579: Remove the DVSC deprecated warning messages on XenCenter for XS 6.5
This commit is contained in:
Gabor Apati-Nagy 2014-04-22 16:00:28 +01:00
commit 6930cd86c9
9 changed files with 22 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Wizards/NewNetworkWizard.cs
View File

@ -79,7 +79,7 @@ namespace XenAdmin.Wizards
{
InitializeComponent();
pageNetworkType = new NetWTypeSelect {Banner = Banner};
pageNetworkType = new NetWTypeSelect();
pageName = new NetWName();
pageNetworkDetails = new NetWDetails();
pageBondDetails = new NetWBondDetails();

27
XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.cs
View File

@ -61,8 +61,6 @@ namespace XenAdmin.Wizards.NewNetworkWizard_Pages
Update(Connection);
}
public DeprecationBanner Banner { set; private get; }
public NetworkTypes SelectedNetworkType
{
get
@ -120,18 +118,6 @@ namespace XenAdmin.Wizards.NewNetworkWizard_Pages
}
}
public void SetDeprecationBanner(bool visible)
{
if(Banner != null)
{
Banner.AppliesToVersion = Messages.XENSERVER_6_2;
Banner.BannerType = DeprecationBanner.Type.Deprecation;
Banner.FeatureName = Messages.DVSCS;
Banner.LinkUri = new Uri(InvisibleMessages.DVSC_DEPRECATION_URL);
Banner.Visible = visible;
}
}
private void RemoveFromToolTip(ToolTipContainer container, Panel panel)
{
// We have to remove the controls from the panel (rather than just
@ -155,18 +141,5 @@ namespace XenAdmin.Wizards.NewNetworkWizard_Pages
Controls.Remove(container);
}
public override void PageLoaded(PageLoadedDirection direction)
{
Pool pool = Helpers.GetPoolOfOne(Connection);
SetDeprecationBanner(pool.vSwitchController);
base.PageLoaded(direction);
}
public override void PageLeave(PageLoadedDirection direction, ref bool cancel)
{
SetDeprecationBanner(false);
base.PageLeave(direction, ref cancel);
}
}
}

16
XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.ja.resx
View File

@ -196,7 +196,7 @@
<value>NoControl</value>
</data>
<data name="rbtnBondedNetwork.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 236</value>
<value>20, 200</value>
</data>
<data name="rbtnBondedNetwork.Size" type="System.Drawing.Size, System.Drawing">
<value>170, 19</value>
@ -257,7 +257,7 @@
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>38, 258</value>
<value>38, 222</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>334, 31</value>
@ -294,7 +294,7 @@
<value>19, 20</value>
</data>
<data name="labelCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>331, 65</value>
<value>331, 39</value>
</data>
<data name="labelCHIN.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -302,9 +302,7 @@
<data name="labelCHIN.Text" xml:space="preserve">
<value>XenServer プールの外部に接続しないネットワークを作成します。
これにより、同一プール内の VM どうしを接続できます。
vSwitch コントローラが実行されている必要があります。
この機能は XenServer 6.2 で廃止され、
今後のバージョンで削除される予定です。</value>
vSwitch コントローラが実行されている必要があります。</value>
</data>
<data name="&gt;&gt;labelCHIN.Name" xml:space="preserve">
<value>labelCHIN</value>
@ -370,7 +368,7 @@ vSwitch コントローラが実行されている必要があります。
<value>19, 134</value>
</data>
<data name="toolTipContainerCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 96</value>
<value>380, 76</value>
</data>
<data name="toolTipContainerCHIN.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -406,7 +404,7 @@ vSwitch コントローラが実行されている必要があります。
<value>0, 0</value>
</data>
<data name="panelCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 72</value>
<value>380, 52</value>
</data>
<data name="panelCHIN.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@ -574,7 +572,7 @@ vSwitch コントローラが実行されている必要があります。
<value>0, 32, 0, 0</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>416, 309</value>
<value>416, 281</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>種類の選択</value>

16
XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.resx
View File

@ -196,7 +196,7 @@
<value>NoControl</value>
</data>
<data name="rbtnBondedNetwork.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 233</value>
<value>20, 208</value>
</data>
<data name="rbtnBondedNetwork.Size" type="System.Drawing.Size, System.Drawing">
<value>117, 17</value>
@ -257,7 +257,7 @@ This can be used as a private connection between VMs on the same host.</value>
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>38, 253</value>
<value>38, 228</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>320, 26</value>
@ -294,7 +294,7 @@ This will create a single higher performing channel.</value>
<value>19, 20</value>
</data>
<data name="labelCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>331, 65</value>
<value>331, 39</value>
</data>
<data name="labelCHIN.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -302,9 +302,7 @@ This will create a single higher performing channel.</value>
<data name="labelCHIN.Text" xml:space="preserve">
<value>Create a network that does not leave the XenServer pool.
This can be used as a private connection between VMs in the pool.
This type of network requires the vSwitch Controller to be running.
This feature is deprecated in XenServer 6.2 and may be removed
in future versions.</value>
This type of network requires the vSwitch Controller to be running.</value>
</data>
<data name="&gt;&gt;labelCHIN.Name" xml:space="preserve">
<value>labelCHIN</value>
@ -370,7 +368,7 @@ in future versions.</value>
<value>19, 134</value>
</data>
<data name="toolTipContainerCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 92</value>
<value>380, 72</value>
</data>
<data name="toolTipContainerCHIN.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -406,7 +404,7 @@ in future versions.</value>
<value>0, 0</value>
</data>
<data name="panelCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 92</value>
<value>380, 72</value>
</data>
<data name="panelCHIN.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@ -574,7 +572,7 @@ in future versions.</value>
<value>0, 32, 0, 0</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>416, 297</value>
<value>416, 269</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Select Type</value>

16
XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.zh-CN.resx
View File

@ -196,7 +196,7 @@
<value>NoControl</value>
</data>
<data name="rbtnBondedNetwork.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 250</value>
<value>20, 204</value>
</data>
<data name="rbtnBondedNetwork.Size" type="System.Drawing.Size, System.Drawing">
<value>117, 17</value>
@ -257,7 +257,7 @@
<value>NoControl</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>38, 274</value>
<value>38, 228</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>320, 26</value>
@ -294,7 +294,7 @@
<value>19, 20</value>
</data>
<data name="labelCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>331, 65</value>
<value>331, 39</value>
</data>
<data name="labelCHIN.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -302,9 +302,7 @@
<data name="labelCHIN.Text" xml:space="preserve">
<value>创建不离开 XenServer 池的网络。
此网络可用作池中两个 VM 之间的专用连接。
此类网络需要运行 vSwitch Controller。
此功能在 XenServer 6.2 中已弃用，在将来
的版本中可能会删除。</value>
此类网络需要运行 vSwitch Controller。</value>
</data>
<data name="&gt;&gt;labelCHIN.Name" xml:space="preserve">
<value>labelCHIN</value>
@ -370,7 +368,7 @@
<value>19, 134</value>
</data>
<data name="toolTipContainerCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 110</value>
<value>380, 90</value>
</data>
<data name="toolTipContainerCHIN.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -406,7 +404,7 @@
<value>0, 0</value>
</data>
<data name="panelCHIN.Size" type="System.Drawing.Size, System.Drawing">
<value>380, 110</value>
<value>380, 90</value>
</data>
<data name="panelCHIN.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@ -574,7 +572,7 @@
<value>0, 32, 0, 0</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>416, 309</value>
<value>416, 281</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>选择类型</value>

9
XenModel/InvisibleMessages.Designer.cs generated
View File

@ -105,15 +105,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to http://support.citrix.com/article/CTX137336.
/// </summary>
public static string DVSC_DEPRECATION_URL {
get {
return ResourceManager.GetString("DVSC_DEPRECATION_URL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to http://www.citrix.com/xenserver.
/// </summary>

3
XenModel/InvisibleMessages.ja.resx
View File

@ -132,9 +132,6 @@
<data name="COMMUNITY_URL" xml:space="preserve">
<value>http://xenserver.org/</value>
</data>
<data name="DVSC_DEPRECATION_URL" xml:space="preserve">
<value>http://support.citrix.com/article/CTX137336</value>
</data>
<data name="HOMEPAGE" xml:space="preserve">
<value>http://www.citrix.com/xenserver</value>
</data>

3
XenModel/InvisibleMessages.resx
View File

@ -132,9 +132,6 @@
<data name="COMMUNITY_URL" xml:space="preserve">
<value>http://xenserver.org/</value>
</data>
<data name="DVSC_DEPRECATION_URL" xml:space="preserve">
<value>http://support.citrix.com/article/CTX137336</value>
</data>
<data name="HOMEPAGE" xml:space="preserve">
<value>http://www.citrix.com/xenserver</value>
</data>

3
XenModel/InvisibleMessages.zh-CN.resx
View File

@ -132,9 +132,6 @@
<data name="COMMUNITY_URL" xml:space="preserve">
<value>http://xenserver.org/</value>
</data>
<data name="DVSC_DEPRECATION_URL" xml:space="preserve">
<value>http://support.citrix.com/article/CTX137336</value>
</data>
<data name="HOMEPAGE" xml:space="preserve">
<value>http://www.citrix.com/xenserver</value>
</data>