From 569b35e854a70b0d180acf8d19eba18df56498e8 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Thu, 14 Nov 2013 11:29:41 +0000 Subject: [PATCH] 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 # Date 1382365049 -3600 # Mon Oct 21 15:17:29 2013 +0100 # Node ID addf480a5eeb1c2bfc1a2756fee55dfa966d1751 # Parent dc93a040fbe1e9ca80e39352dc776941fd4c7802 Signed-off-by: Konstantina Chremmou --- XenAdmin/SettingsPanels/GpuEditPage.cs | 7 +++++++ XenAdmin/Wizards/NewVMWizard/NewVMWizard.cs | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/XenAdmin/SettingsPanels/GpuEditPage.cs b/XenAdmin/SettingsPanels/GpuEditPage.cs index 31873cbae..2c2f903f4 100644 --- a/XenAdmin/SettingsPanels/GpuEditPage.cs +++ b/XenAdmin/SettingsPanels/GpuEditPage.cs @@ -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(); diff --git a/XenAdmin/Wizards/NewVMWizard/NewVMWizard.cs b/XenAdmin/Wizards/NewVMWizard/NewVMWizard.cs index 045a548cb..deeeef399 100644 --- a/XenAdmin/Wizards/NewVMWizard/NewVMWizard.cs +++ b/XenAdmin/Wizards/NewVMWizard/NewVMWizard.cs @@ -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)