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

CA-242134: Rename some of the classes and files, following the removal of the VMPP support

Browse Source 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2017-05-25 16:29:27 +01:00
parent f752f05a1d
commit 71600b20de
17 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Dialogs/VMProtectionRecovery/DataGridViewTextAndImageCell.cs → XenAdmin/Controls/DataGridViewTextAndImageCell.cs
View File

@ -35,7 +35,7 @@ using System.Text;
using System.Windows.Forms;
using System.Drawing;
namespace XenAdmin.Dialogs.VMProtectionRecovery
namespace XenAdmin.Controls
{
public class DataGridViewTextAndImageCell : DataGridViewTextBoxCell
{

4
XenAdmin/Core/VMGroup.cs
View File

@ -33,8 +33,8 @@ using System;
using System.Collections.Generic;
using XenAdmin.Actions;
using XenAdmin.Dialogs;
using XenAdmin.Dialogs.ScheduledSnapshots;
using XenAdmin.Dialogs.VMAppliances;
using XenAdmin.Dialogs.VMProtection_Recovery;
using XenAdmin.Network;
using XenAdmin.Wizards;
using XenAdmin.Wizards.NewPolicyWizard;
@ -182,7 +182,7 @@ namespace XenAdmin.Core
internal static XenDialogBase ManageGroupsDialog(Pool pool)
{
return typeof(T) == typeof(VMSS) ? (XenDialogBase)(new VMProtectionPoliciesDialog(pool)) : (XenDialogBase)(new VMAppliancesDialog(pool));
return typeof(T) == typeof(VMSS) ? (XenDialogBase)(new ScheduledSnapshotsDialog(pool)) : (XenDialogBase)(new VMAppliancesDialog(pool));
}
internal static bool FeaturePossible(IXenConnection connection)

2
XenAdmin/Dialogs/DRConfigureDialog.cs
View File

@ -34,7 +34,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
using XenAdmin.Dialogs.VMProtectionRecovery;
using XenAdmin.Controls;
using XenAPI;

2
XenAdmin/Dialogs/HealthCheck/HealthCheckOverviewDialog.cs
View File

@ -37,7 +37,7 @@ using System.Linq;
using System.Windows.Forms;
using XenAdmin.Actions;
using XenAdmin.Core;
using XenAdmin.Dialogs.VMProtectionRecovery;
using XenAdmin.Controls;
using XenAdmin.Model;
using XenAdmin.Network;
using XenAPI;

2
XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.Designer.cs → XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.Designer.cs generated
View File

@ -1,6 +1,6 @@
using XenAdmin.Controls.DataGridViewEx;
namespace XenAdmin.Dialogs.VMProtectionRecovery
namespace XenAdmin.Dialogs.ScheduledSnapshots
{
partial class PolicyHistory
{

16
XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.cs → XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.cs
View File

@ -30,17 +30,17 @@
*/
using System;
using System.Windows.Forms;
using XenAdmin.Alerts;
using XenAPI;
using XenAdmin.Properties;
using System.ComponentModel;
using XenAdmin.Actions;
using System.Collections.Generic;
using System.ComponentModel;
using System.Windows.Forms;
using XenAdmin.Actions;
using XenAdmin.Alerts;
using XenAdmin.Controls;
using XenAdmin.Core;
using XenAdmin.Properties;
using XenAPI;
namespace XenAdmin.Dialogs.VMProtectionRecovery
namespace XenAdmin.Dialogs.ScheduledSnapshots
{
public partial class PolicyHistory : UserControl
{

0
XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.ja.resx → XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.ja.resx
View File

0
XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.resx → XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.resx
View File

0
XenAdmin/Dialogs/VMProtectionRecovery/PolicyHistory.zh-CN.resx → XenAdmin/Dialogs/ScheduledSnapshots/PolicyHistory.zh-CN.resx
View File

15
XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.Designer.cs → XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.Designer.cs generated
View File

@ -1,10 +1,9 @@
using XenAdmin.Controls.DataGridViewEx;
using XenAdmin.Wizards.NewPolicyWizard;
using XenAPI;
namespace XenAdmin.Dialogs.VMProtection_Recovery
namespace XenAdmin.Dialogs.ScheduledSnapshots
{
partial class VMProtectionPoliciesDialog
partial class ScheduledSnapshotsDialog
{
/// <summary>
/// Required designer variable.
@ -32,7 +31,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VMProtectionPoliciesDialog));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScheduledSnapshotsDialog));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.dataGridView1 = new XenAdmin.Controls.DataGridViewEx.DataGridViewEx();
this.NameColum = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -48,7 +47,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery
this.buttonRunNow = new System.Windows.Forms.Button();
this.labelPolicyTitle = new System.Windows.Forms.Label();
this.buttonProperties = new System.Windows.Forms.Button();
this.policyHistory1 = new XenAdmin.Dialogs.VMProtectionRecovery.PolicyHistory();
this.policyHistory1 = new PolicyHistory();
this.label2 = new System.Windows.Forms.Label();
this.localServerTime1 = new XenAdmin.Wizards.NewPolicyWizard.LocalServerTime();
this.chevronButton1 = new XenAdmin.Controls.ChevronButton();
@ -245,13 +244,13 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery
this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel4, 0, 3);
this.tableLayoutPanel5.Name = "tableLayoutPanel5";
//
// VMProtectionPoliciesDialog
// ScheduledSnapshotsDialog
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.CancelButton = this.buttonCancel;
this.Controls.Add(this.tableLayoutPanel5);
this.Name = "VMProtectionPoliciesDialog";
this.Name = "ScheduledSnapshotsDialog";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.Load += new System.EventHandler(this.VMProtectionPoliciesDialog_Load);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.VMProtectionPoliciesDialog_FormClosed);
@ -279,7 +278,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery
protected System.Windows.Forms.Button buttonRunNow;
protected System.Windows.Forms.Label labelPolicyTitle;
protected System.Windows.Forms.Button buttonProperties;
protected XenAdmin.Dialogs.VMProtectionRecovery.PolicyHistory policyHistory1;
protected PolicyHistory policyHistory1;
protected System.Windows.Forms.Label label2;
protected LocalServerTime localServerTime1;
protected XenAdmin.Controls.ChevronButton chevronButton1;

16
XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.cs → XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.cs
View File

@ -32,23 +32,23 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
using XenAdmin.Actions;
using XenAdmin.Alerts;
using XenAdmin.Controls;
using XenAdmin.Core;
using XenAdmin.Wizards.NewPolicyWizard;
using XenAPI;
using XenAdmin.Core;
using XenAdmin.Dialogs.VMProtectionRecovery;
using XenAdmin.Alerts;
using System.Linq;
namespace XenAdmin.Dialogs.VMProtection_Recovery
namespace XenAdmin.Dialogs.ScheduledSnapshots
{
public partial class VMProtectionPoliciesDialog: XenDialogBase
public partial class ScheduledSnapshotsDialog: XenDialogBase
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public readonly Pool Pool;
public VMProtectionPoliciesDialog(Pool pool)
public ScheduledSnapshotsDialog(Pool pool)
: base(pool.Connection)
{
Pool = pool;
@ -60,7 +60,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery
policyHistory1.pool = pool;
RefreshPoolTitle(pool);
}
public VMProtectionPoliciesDialog() { }
public ScheduledSnapshotsDialog() { }
public class PolicyRow : DataGridViewRow
{

2
XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.ja.resx → XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.ja.resx
View File

@ -829,7 +829,7 @@
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>VMProtectionPoliciesDialog</value>
<value>ScheduledSnapshotsDialog</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>

4
XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.resx → XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -829,7 +829,7 @@
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>VMProtectionPoliciesDialog</value>
<value>ScheduledSnapshotsDialog</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>

2
XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.zh-CN.resx → XenAdmin/Dialogs/ScheduledSnapshots/ScheduledSnapshotsDialog.zh-CN.resx
View File

@ -829,7 +829,7 @@
<value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>VMProtectionPoliciesDialog</value>
<value>ScheduledSnapshotsDialog</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>XenAdmin.Dialogs.XenDialogBase, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>

2
XenAdmin/Dialogs/VMAppliances/VMAppliancesDialog.cs
View File

@ -38,7 +38,7 @@ using System.Windows.Forms;
using XenAdmin.Actions;
using XenAdmin.Commands;
using XenAdmin.Core;
using XenAdmin.Dialogs.VMProtectionRecovery;
using XenAdmin.Controls;
using XenAdmin.Wizards.ImportWizard;
using XenAdmin.Wizards.NewVMApplianceWizard;
using XenAdmin.Wizards.ExportWizard;

30
XenAdmin/XenAdmin.csproj
View File

@ -167,6 +167,7 @@
<Compile Include="Controls\DataGridViewEx\DataGridViewEx.Designer.cs">
<DependentUpon>DataGridViewEx.cs</DependentUpon>
</Compile>
<Compile Include="Controls\DataGridViewTextAndImageCell.cs" />
<Compile Include="Controls\FolderChangeDialogTreeView.cs">
<SubType>Component</SubType>
</Compile>
@ -3448,18 +3449,17 @@
<Compile Include="Dialogs\VMDialogs\MoveVMDialog.Designer.cs">
<DependentUpon>MoveVMDialog.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\VMProtectionRecovery\DataGridViewTextAndImageCell.cs" />
<Compile Include="Dialogs\VMProtectionRecovery\PolicyHistory.cs">
<Compile Include="Dialogs\ScheduledSnapshots\PolicyHistory.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Dialogs\VMProtectionRecovery\PolicyHistory.Designer.cs">
<Compile Include="Dialogs\ScheduledSnapshots\PolicyHistory.Designer.cs">
<DependentUpon>PolicyHistory.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\VMProtectionRecovery\VMProtectionPoliciesDialog.cs">
<Compile Include="Dialogs\ScheduledSnapshots\ScheduledSnapshotsDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\VMProtectionRecovery\VMProtectionPoliciesDialog.Designer.cs">
<DependentUpon>VMProtectionPoliciesDialog.cs</DependentUpon>
<Compile Include="Dialogs\ScheduledSnapshots\ScheduledSnapshotsDialog.Designer.cs">
<DependentUpon>ScheduledSnapshotsDialog.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\Wlb\ConfirmDeconfigureWLBDialog.cs">
<SubType>Form</SubType>
@ -5528,24 +5528,24 @@
<EmbeddedResource Include="Dialogs\VMDialogs\SelectVMsToSuspendDialog.zh-CN.resx">
<DependentUpon>SelectVMsToSuspendDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\VMProtectionRecovery\PolicyHistory.ja.resx">
<EmbeddedResource Include="Dialogs\ScheduledSnapshots\PolicyHistory.ja.resx">
<DependentUpon>PolicyHistory.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\VMProtectionRecovery\PolicyHistory.resx">
<EmbeddedResource Include="Dialogs\ScheduledSnapshots\PolicyHistory.resx">
<DependentUpon>PolicyHistory.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\VMProtectionRecovery\PolicyHistory.zh-CN.resx">
<EmbeddedResource Include="Dialogs\ScheduledSnapshots\PolicyHistory.zh-CN.resx">
<DependentUpon>PolicyHistory.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\VMProtectionRecovery\VMProtectionPoliciesDialog.ja.resx">
<DependentUpon>VMProtectionPoliciesDialog.cs</DependentUpon>
<EmbeddedResource Include="Dialogs\ScheduledSnapshots\ScheduledSnapshotsDialog.ja.resx">
<DependentUpon>ScheduledSnapshotsDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\VMProtectionRecovery\VMProtectionPoliciesDialog.resx">
<DependentUpon>VMProtectionPoliciesDialog.cs</DependentUpon>
<EmbeddedResource Include="Dialogs\ScheduledSnapshots\ScheduledSnapshotsDialog.resx">
<DependentUpon>ScheduledSnapshotsDialog.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\VMProtectionRecovery\VMProtectionPoliciesDialog.zh-CN.resx">
<DependentUpon>VMProtectionPoliciesDialog.cs</DependentUpon>
<EmbeddedResource Include="Dialogs\ScheduledSnapshots\ScheduledSnapshotsDialog.zh-CN.resx">
<DependentUpon>ScheduledSnapshotsDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\VmSnapshotDialog.ja.resx">
<DependentUpon>VmSnapshotDialog.cs</DependentUpon>

8
XenAdminTests/DialogTests/DialogsForPool.cs
View File

@ -36,7 +36,7 @@ using System.Windows.Forms;
using NUnit.Framework;
using XenAdmin.Controls;
using XenAdmin.Dialogs;
using XenAdmin.Dialogs.VMProtection_Recovery;
using XenAdmin.Dialogs.ScheduledSnapshots;
namespace XenAdminTests.DialogTests.state1_xml.DialogsForPool
{
@ -76,11 +76,11 @@ namespace XenAdminTests.DialogTests.state2_xml.DialogsForPool
namespace XenAdminTests.DialogTests.cowleyPolicies_xml.DialogsForPool
{
[TestFixture, Category(TestCategories.UICategoryA)]
public class VMProtectionPoliciesDialogTest : DialogTest<VMProtectionPoliciesDialog>
public class VMProtectionPoliciesDialogTest : DialogTest<ScheduledSnapshotsDialog>
{
protected override VMProtectionPoliciesDialog NewDialog()
protected override ScheduledSnapshotsDialog NewDialog()
{
return new VMProtectionPoliciesDialog(GetAnyPool());
return new ScheduledSnapshotsDialog(GetAnyPool());
}
}
}