From cc1814213ea3cf19208b950b857ba698e3ce15b1 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 10 Dec 2013 17:37:27 +0100 Subject: [RHEL-7.0 virt-manager PATCH] addhw: Fix FS UI for non-qemu Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1039829 (cherry picked from commit 1ce02cc7d954069ce87bc5b330dfddf8491a1121) Signed-off-by: Giuseppe Scrivano --- ui/vmm-add-hardware.ui | 259 +++++++++++++++++++++++---------------------- virtManager/addhardware.py | 29 ++--- 2 files changed, 143 insertions(+), 145 deletions(-) diff --git a/ui/vmm-add-hardware.ui b/ui/vmm-add-hardware.ui index 875b4d7..1f1a92a 100644 --- a/ui/vmm-add-hardware.ui +++ b/ui/vmm-add-hardware.ui @@ -2337,29 +2337,13 @@ access in the guest. False 24 - + True False - 4 - 2 - 12 6 + 12 - - True - False - 0 - _Type: - True - fs-type-combo - - - GTK_FILL - GTK_FILL - - - - + True False @@ -2390,28 +2374,13 @@ access in the guest. 1 - 2 - GTK_FILL - - - - - True - False - 0 - _Mode: - True - fs-mode-combo - - - 1 - 2 - GTK_FILL - GTK_FILL + 0 + 1 + 1 - + True False @@ -2441,30 +2410,13 @@ access in the guest. 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - False - 0 - _Driver: - True - fs-driver-combo - - 2 - 3 - GTK_FILL - GTK_FILL + 1 + 1 - + True False @@ -2495,30 +2447,13 @@ access in the guest. 1 - 2 - 2 - 3 - GTK_FILL - - - - - True - False - 0 - _Write Policy: - True - fs-wrpolicy-combo - - - 3 - 4 - GTK_FILL - GTK_FILL + 1 + 1 + 1 - + True False @@ -2548,42 +2483,9 @@ access in the guest. 1 - 2 3 - 4 - GTK_FILL - - - - - True - False - 0 - src labelll: - True - fs-source - - - 4 - 5 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - Ta_rget path: - True - fs-target - - - 5 - 6 - GTK_FILL - GTK_FILL + 1 + 1 @@ -2594,10 +2496,9 @@ access in the guest. 1 - 2 5 - 6 - GTK_FILL + 1 + 1 @@ -2612,16 +2513,12 @@ access in the guest. 1 - 2 6 - 7 - GTK_FILL + 1 + 1 - - - True False @@ -2656,10 +2553,120 @@ access in the guest. 1 - 2 4 - 5 - GTK_FILL + 1 + 1 + + + + + True + False + 0 + _Type: + True + fs-type-combo + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + _Mode: + True + fs-mode-combo + + + 0 + 2 + 1 + 1 + + + + + True + False + 0 + _Driver: + True + fs-driver-combo + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + _Write Policy: + True + fs-wrpolicy-combo + + + 0 + 3 + 1 + 1 + + + + + True + False + 0 + src labelll: + True + fs-source + + + 0 + 4 + 1 + 1 + + + + + True + False + 0 + Ta_rget path: + True + fs-target + + + 0 + 5 + 1 + 1 + + + + + True + False + + + + + + 0 + 6 + 1 + 1 diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py index f66e493..6851238 100644 --- a/virtManager/addhardware.py +++ b/virtManager/addhardware.py @@ -1250,30 +1250,21 @@ class vmmAddHardware(vmmGObjectUI): self.show_pair_combo("fs-wrpolicy", show_wrpolicy_combo) def change_fs_driver(self, src): - idx = src.get_active() fsdriver = None - modecombo = self.widget("fs-mode-combo") - modelabel1 = self.widget("fs-mode-title") - wrpcombo = self.widget("fs-wrpolicy-combo") - wrplabel1 = self.widget("fs-wrpolicy-title") - + idx = src.get_active() if idx >= 0 and src.get_property("visible"): fsdriver = src.get_model()[idx][0] - if (fsdriver == virtinst.VirtualFilesystem.DRIVER_PATH or - fsdriver == virtinst.VirtualFilesystem.DRIVER_DEFAULT): - modecombo.set_property("visible", True) - modelabel1.set_property("visible", True) - else: - modecombo.set_property("visible", False) - modelabel1.set_property("visible", False) + show_mode = bool( + fsdriver == virtinst.VirtualFilesystem.DRIVER_PATH or + fsdriver == virtinst.VirtualFilesystem.DRIVER_DEFAULT) + self.widget("fs-mode-title").set_visible(show_mode) + self.widget("fs-mode-box").set_visible(show_mode) - if (fsdriver == virtinst.VirtualFilesystem.DRIVER_DEFAULT): - wrpcombo.set_property("visible", False) - wrplabel1.set_property("visible", False) - else: - wrpcombo.set_property("visible", True) - wrplabel1.set_property("visible", True) + show_wrpol = bool( + fsdriver and fsdriver != virtinst.VirtualFilesystem.DRIVER_DEFAULT) + self.widget("fs-wrpolicy-title").set_visible(show_wrpol) + self.widget("fs-wrpolicy-box").set_visible(show_wrpol) -- 1.8.5.2