CP-6084: Show the GpuEditPage only for HVMs. Fixed issue with flickering warning

and preselected combobox item when the user first lands on the GpuEditPage.
# HG changeset patch
# User Konstantina Chremmou <Konstantina.Chremmou@citrix.com>
# Date 1382365049 -3600
#      Mon Oct 21 15:17:29 2013 +0100
# Node ID addf480a5eeb1c2bfc1a2756fee55dfa966d1751
# Parent  dc93a040fbe1e9ca80e39352dc776941fd4c7802

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2013-11-14 11:29:41 +00:00
parent c77fcbbbb6
commit 569b35e854
2 changed files with 11 additions and 3 deletions

View File

@ -53,6 +53,11 @@ namespace XenAdmin.SettingsPanels
public GpuEditPage()
{
InitializeComponent();
imgRDP.Visible = labelRDP.Visible =
imgNeedDriver.Visible = labelNeedDriver.Visible =
imgNeedGpu.Visible = labelNeedGpu.Visible =
imgStopVM.Visible = labelStopVM.Visible =
false;
}
public GPU_group GpuGroup
@ -252,6 +257,8 @@ namespace XenAdmin.SettingsPanels
break;
}
}
if (comboBoxGpus.SelectedItem == null)
comboBoxGpus.SelectedItem = noneItem;
}
ShowHideWarnings();

View File

@ -146,9 +146,6 @@ namespace XenAdmin.Wizards.NewVMWizard
AddPages(page_1_Template, page_2_Name, page_3_InstallationMedia, page_4_HomeServer,
page_5_CpuMem, page_6_Storage, page_7_Networking, page_8_Finish);
if (vgpuCapability)
AddAfterPage(page_5_CpuMem, pageVgpu);
m_affinity = affinity;
page_1_Template.SelectedTemplate = template;
page_1b_BiosLocking.Affinity = affinity;
@ -207,6 +204,10 @@ namespace XenAdmin.Wizards.NewVMWizard
page_6_Storage.SelectedTemplate = selectedTemplate;
page_7_Networking.SelectedTemplate = selectedTemplate;
RemovePage(pageVgpu);
if (vgpuCapability && selectedTemplate.IsHVM)
AddAfterPage(page_5_CpuMem, pageVgpu);
RemovePage(page_1b_BiosLocking);
if (page_1_Template.CopyBiosStrings)