From 297afef5f5dec2435f62038a24ceae7d5b7da649 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 19 Jul 2011 14:02:39 -0400 Subject: [PATCH] create: Read storage size from text field in spinner Not just the spun value. Reuse the helper from details.py --- src/virtManager/create.py | 2 +- src/virtManager/details.py | 18 ++++-------------- src/virtManager/uihelpers.py | 10 ++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/virtManager/create.py b/src/virtManager/create.py index bdb431f05..ba9d9c69e 100644 --- a/src/virtManager/create.py +++ b/src/virtManager/create.py @@ -931,7 +931,7 @@ class vmmCreate(vmmGObjectUI): def get_storage_info(self): path = None - size = self.widget("config-storage-size").get_value() + size = uihelpers.spin_get_helper(self.widget("config-storage-size")) sparse = not self.widget("config-storage-nosparse").get_active() if self.get_config_install_page() == INSTALL_PAGE_IMPORT: diff --git a/src/virtManager/details.py b/src/virtManager/details.py index 42398e746..2ee0db55a 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -1513,16 +1513,6 @@ class vmmDetails(vmmGObjectUI): ############################## # Details/Hardware listeners # ############################## - def _spin_get_helper(self, wname): - widget = self.widget(wname) - adj = widget.get_adjustment() - txt = widget.get_text() - - try: - ret = int(txt) - except: - ret = adj.value - return ret def _browse_file(self, callback, is_media=False): if is_media: @@ -1579,9 +1569,9 @@ class vmmDetails(vmmGObjectUI): # Memory def config_get_maxmem(self): - return self._spin_get_helper("config-maxmem") + return uihelpers.spin_get_helper(self.widget("config-maxmem")) def config_get_memory(self): - return self._spin_get_helper("config-memory") + return uihelpers.spin_get_helper(self.widget("config-memory")) def config_maxmem_changed(self, src_ignore): self.enable_apply(EDIT_MEM) @@ -1602,9 +1592,9 @@ class vmmDetails(vmmGObjectUI): # VCPUS def config_get_vcpus(self): - return self._spin_get_helper("config-vcpus") + return uihelpers.spin_get_helper(self.widget("config-vcpus")) def config_get_maxvcpus(self): - return self._spin_get_helper("config-maxvcpus") + return uihelpers.spin_get_helper(self.widget("config-maxvcpus")) def config_vcpupin_generate(self, ignore): try: diff --git a/src/virtManager/uihelpers.py b/src/virtManager/uihelpers.py index 616bf96c8..d39838f1c 100644 --- a/src/virtManager/uihelpers.py +++ b/src/virtManager/uihelpers.py @@ -53,6 +53,16 @@ def cleanup(): global err_dial err_dial = None +def spin_get_helper(widget): + adj = widget.get_adjustment() + txt = widget.get_text() + + try: + ret = int(txt) + except: + ret = adj.value + return ret + ############################################################ # Helpers for shared storage UI between create/addhardware # ############################################################