[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[virt-tools-list] [PATCH 06/10] Updated all configuration screens to use the new base classes.



From: "Darryl L. Pierce" <dpierce redhat com>

---
 src/virtManagerTui/adddomain.py       |    8 +++++---
 src/virtManagerTui/addhost.py         |    6 +++---
 src/virtManagerTui/addpool.py         |    8 ++++----
 src/virtManagerTui/addvolume.py       |    5 +++--
 src/virtManagerTui/changehost.py      |    2 +-
 src/virtManagerTui/createuser.py      |    2 +-
 src/virtManagerTui/definenet.py       |    2 +-
 src/virtManagerTui/hostconnect.py     |    2 +-
 src/virtManagerTui/hostmenu.py        |    3 ++-
 src/virtManagerTui/listdomains.py     |    2 +-
 src/virtManagerTui/listnetworks.py    |    2 +-
 src/virtManagerTui/listpools.py       |    5 +++--
 src/virtManagerTui/mainmenu.py        |    3 ++-
 src/virtManagerTui/migratedomain.py   |    2 +-
 src/virtManagerTui/netmenu.py         |    3 ++-
 src/virtManagerTui/nodemenu.py        |    3 ++-
 src/virtManagerTui/pausedomain.py     |    2 +-
 src/virtManagerTui/removedomain.py    |    2 +-
 src/virtManagerTui/removehost.py      |    2 +-
 src/virtManagerTui/removepool.py      |    2 +-
 src/virtManagerTui/removevolume.py    |    2 +-
 src/virtManagerTui/startdomain.py     |    3 ++-
 src/virtManagerTui/startnetwork.py    |    2 +-
 src/virtManagerTui/startpool.py       |    2 +-
 src/virtManagerTui/stopdomain.py      |    2 +-
 src/virtManagerTui/stopnetwork.py     |    2 +-
 src/virtManagerTui/stoppool.py        |    2 +-
 src/virtManagerTui/storagemenu.py     |    3 ++-
 src/virtManagerTui/undefinenetwork.py |    2 +-
 29 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/src/virtManagerTui/adddomain.py b/src/virtManagerTui/adddomain.py
index 2187521..6a4bd3a 100644
--- a/src/virtManagerTui/adddomain.py
+++ b/src/virtManagerTui/adddomain.py
@@ -20,9 +20,11 @@
 
 import snack
 import os
+
+from vmmconfigscreen import VmmTuiConfigScreen
 from createmeter  import CreateMeter
 from domainconfig import DomainConfig
-from configscreen import ConfigScreen
+
 from virtinst import Guest
 
 VM_DETAILS_PAGE      =  1
@@ -49,9 +51,9 @@ OS_VARIANT = "os.variant"
 MEMORY = "memory"
 CPUS = "cpus"
 
-class DomainConfigScreen(ConfigScreen):
+class DomainConfigScreen(VmmTuiConfigScreen):
     def __init__(self):
-        ConfigScreen.__init__(self, "Create A New Virtual Machine")
+        VmmTuiConfigScreen.__init__(self, "Create A New Virtual Machine")
         self.__config = DomainConfig()
         self.__config.set_architecture(self.get_libvirt().get_default_architecture())
         self.__config.set_virt_type(self.get_libvirt().get_default_virt_type())
diff --git a/src/virtManagerTui/addhost.py b/src/virtManagerTui/addhost.py
index 38a0730..343b823 100644
--- a/src/virtManagerTui/addhost.py
+++ b/src/virtManagerTui/addhost.py
@@ -18,7 +18,7 @@
 
 import snack
 
-from configscreen import ConfigScreen
+from vmmconfigscreen import VmmTuiConfigScreen
 
 DETAILS_PAGE = 1
 CONFIRM_PAGE = 2
@@ -39,9 +39,9 @@ CONNECTIONS = {CONNECTION_LOCAL    : "Local",
                CONNECTION_SSL      : "Remote SSL/TLS with x509 certificate",
                CONNECTION_SSH      : "Remote tunnel over SSH"}
 
-class AddHostConfigScreen(ConfigScreen):
+class AddHostConfigScreen(VmmTuiConfigScreen):
     def __init__(self):
-        ConfigScreen.__init__(self, "Add A Remote Host")
+        VmmTuiConfigScreen.__init__(self, "Add A Remote Host")
         self.__configured = False
         self.__connection = None
         self.__hostname = None
diff --git a/src/virtManagerTui/addpool.py b/src/virtManagerTui/addpool.py
index 392d853..82a72f3 100644
--- a/src/virtManagerTui/addpool.py
+++ b/src/virtManagerTui/addpool.py
@@ -17,9 +17,9 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-import utils
+import newt_syrup.utils
 
-from configscreen import ConfigScreen
+from vmmconfigscreen import VmmTuiConfigScreen
 from poolconfig import PoolConfig
 from virtinst import Storage
 
@@ -27,9 +27,9 @@ POOL_NAME_PAGE    = 1
 POOL_DETAILS_PAGE = 2
 CONFIRM_PAGE      = 3
 
-class AddStoragePoolConfigScreen(ConfigScreen):
+class AddStoragePoolConfigScreen(VmmTuiConfigScreen):
     def __init__(self):
-        ConfigScreen.__init__(self, "Add A Storage Pool")
+        VmmTuiConfigScreen.__init__(self, "Add A Storage Pool")
         self.__config = PoolConfig(self.get_libvirt())
         self.__hostname = None
         self.__formats = None
diff --git a/src/virtManagerTui/addvolume.py b/src/virtManagerTui/addvolume.py
index f4b9d03..fa368c9 100644
--- a/src/virtManagerTui/addvolume.py
+++ b/src/virtManagerTui/addvolume.py
@@ -19,9 +19,10 @@
 import snack
 
 from createmeter import CreateMeter
-from configscreen import StorageListConfigScreen
+from storagelistconfigscreen import StorageListConfigScreen
 from volumeconfig import StorageVolumeConfig
-import utils
+
+import newt_syrup.utils
 
 SELECT_POOL_PAGE   = 1
 VOLUME_NAME_PAGE   = 2
diff --git a/src/virtManagerTui/changehost.py b/src/virtManagerTui/changehost.py
index 2212451..bb7dadb 100644
--- a/src/virtManagerTui/changehost.py
+++ b/src/virtManagerTui/changehost.py
@@ -19,7 +19,7 @@
 import snack
 
 import logging
-from configscreen import HostListConfigScreen
+from hostlistconfigscreen import HostListConfigScreen
 
 CONNECTION_LIST_PAGE = 1
 CONNECTED_PAGE       = 2
diff --git a/src/virtManagerTui/createuser.py b/src/virtManagerTui/createuser.py
index c51257a..1bcd9ae 100644
--- a/src/virtManagerTui/createuser.py
+++ b/src/virtManagerTui/createuser.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import ConfigScreen
+from newt_syrup.configscreen import ConfigScreen
 from userworker import UserWorker
 
 import libuser
diff --git a/src/virtManagerTui/definenet.py b/src/virtManagerTui/definenet.py
index 08f96d2..7a4b3c4 100644
--- a/src/virtManagerTui/definenet.py
+++ b/src/virtManagerTui/definenet.py
@@ -21,7 +21,7 @@ from IPy import IP
 import logging
 import re
 
-from configscreen import ConfigScreen
+from newt_syrup.configscreen import ConfigScreen
 from networkconfig import NetworkConfig
 
 NETWORK_NAME_PAGE            = 1
diff --git a/src/virtManagerTui/hostconnect.py b/src/virtManagerTui/hostconnect.py
index 0f3cc62..6e81b23 100644
--- a/src/virtManagerTui/hostconnect.py
+++ b/src/virtManagerTui/hostconnect.py
@@ -16,7 +16,7 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-from configscreen import ConfigScreen
+from newt_syrup.configscreen import ConfigScreen
 
 class HostConnectConfigScreen(ConfigScreen):
     def __init__(self):
diff --git a/src/virtManagerTui/hostmenu.py b/src/virtManagerTui/hostmenu.py
index 7adde2a..01c82f1 100644
--- a/src/virtManagerTui/hostmenu.py
+++ b/src/virtManagerTui/hostmenu.py
@@ -16,7 +16,8 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-from menuscreen import MenuScreen
+from newt_syrup.menuscreen import MenuScreen
+
 from changehost import ChangeHost
 from addhost    import AddHost
 from removehost import RemoveHost
diff --git a/src/virtManagerTui/listdomains.py b/src/virtManagerTui/listdomains.py
index 9705e69..9e6a3b5 100755
--- a/src/virtManagerTui/listdomains.py
+++ b/src/virtManagerTui/listdomains.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import DomainListConfigScreen
+from domainlistconfigscreen import DomainListConfigScreen
 
 class ListDomainsConfigScreen(DomainListConfigScreen):
     LIST_PAGE   = 1
diff --git a/src/virtManagerTui/listnetworks.py b/src/virtManagerTui/listnetworks.py
index b18d195..4acd3bf 100644
--- a/src/virtManagerTui/listnetworks.py
+++ b/src/virtManagerTui/listnetworks.py
@@ -17,7 +17,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import NetworkListConfigScreen
+from networklistconfigscreen import NetworkListConfigScreen
 
 LIST_PAGE    = 1
 DETAILS_PAGE = 2
diff --git a/src/virtManagerTui/listpools.py b/src/virtManagerTui/listpools.py
index 6a55828..0bd906c 100644
--- a/src/virtManagerTui/listpools.py
+++ b/src/virtManagerTui/listpools.py
@@ -18,8 +18,9 @@
 
 import snack
 
-from configscreen import StorageListConfigScreen
-import utils
+from storagelistconfigscreen import StorageListConfigScreen
+
+import newt_syrup.utils
 
 LIST_PAGE    = 1
 DETAILS_PAGE = 2
diff --git a/src/virtManagerTui/mainmenu.py b/src/virtManagerTui/mainmenu.py
index 736723a..cd5b65f 100644
--- a/src/virtManagerTui/mainmenu.py
+++ b/src/virtManagerTui/mainmenu.py
@@ -16,7 +16,8 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-from menuscreen  import MenuScreen
+from newt_syrup.menuscreen  import MenuScreen
+
 from nodemenu    import NodeMenu
 from netmenu     import NetworkMenu
 from storagemenu import StoragePoolMenu
diff --git a/src/virtManagerTui/migratedomain.py b/src/virtManagerTui/migratedomain.py
index 01beab5..ce89d6e 100644
--- a/src/virtManagerTui/migratedomain.py
+++ b/src/virtManagerTui/migratedomain.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import DomainListConfigScreen
+from domainlistconfigscreen import DomainListConfigScreen
 
 LIST_DOMAINS  = 1
 SELECT_TARGET = 2
diff --git a/src/virtManagerTui/netmenu.py b/src/virtManagerTui/netmenu.py
index 7db0471..1b1575b 100644
--- a/src/virtManagerTui/netmenu.py
+++ b/src/virtManagerTui/netmenu.py
@@ -16,7 +16,8 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-from menuscreen      import MenuScreen
+from newt_syrup.menuscreen import MenuScreen
+
 from definenet       import DefineNetwork
 from startnetwork    import StartNetwork
 from stopnetwork     import StopNetwork
diff --git a/src/virtManagerTui/nodemenu.py b/src/virtManagerTui/nodemenu.py
index 160aec6..17f8374 100644
--- a/src/virtManagerTui/nodemenu.py
+++ b/src/virtManagerTui/nodemenu.py
@@ -16,7 +16,8 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-from menuscreen     import MenuScreen
+from newt_syrup.menuscreen     import MenuScreen
+
 from adddomain      import AddDomain
 from startdomain    import StartDomain
 from stopdomain     import StopDomain
diff --git a/src/virtManagerTui/pausedomain.py b/src/virtManagerTui/pausedomain.py
index b5b5028..47b4976 100644
--- a/src/virtManagerTui/pausedomain.py
+++ b/src/virtManagerTui/pausedomain.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import DomainListConfigScreen
+from domainlistconfigscreen import DomainListConfigScreen
 
 class PauseDomainConfigScreen(DomainListConfigScreen):
     LIST_PAGE = 1
diff --git a/src/virtManagerTui/removedomain.py b/src/virtManagerTui/removedomain.py
index 32519cd..a81863b 100644
--- a/src/virtManagerTui/removedomain.py
+++ b/src/virtManagerTui/removedomain.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import DomainListConfigScreen
+from domainlistconfigscreen import DomainListConfigScreen
 
 class RemoveDomainConfigScreen(DomainListConfigScreen):
     LIST_PAGE     = 1
diff --git a/src/virtManagerTui/removehost.py b/src/virtManagerTui/removehost.py
index df2f05a..b93b2e0 100644
--- a/src/virtManagerTui/removehost.py
+++ b/src/virtManagerTui/removehost.py
@@ -18,7 +18,7 @@
 
 import snack
 
-from configscreen import HostListConfigScreen
+from hostlistconfigscreen import HostListConfigScreen
 
 SELECT_HOST_PAGE    = 1
 CONFIRM_REMOVE_PAGE = 2
diff --git a/src/virtManagerTui/removepool.py b/src/virtManagerTui/removepool.py
index 410e151..1c27f7f 100644
--- a/src/virtManagerTui/removepool.py
+++ b/src/virtManagerTui/removepool.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import StorageListConfigScreen
+from storagelistconfigscreen import StorageListConfigScreen
 
 LIST_POOLS_PAGE    = 1
 CONFIRM_PAGE       = 2
diff --git a/src/virtManagerTui/removevolume.py b/src/virtManagerTui/removevolume.py
index dad8f5f..249c5fa 100644
--- a/src/virtManagerTui/removevolume.py
+++ b/src/virtManagerTui/removevolume.py
@@ -18,7 +18,7 @@
 
 import snack
 
-from configscreen import StorageListConfigScreen
+from storagelistconfigscreen import StorageListConfigScreen
 from volumeconfig import StorageVolumeConfig
 
 SELECT_POOL_PAGE   = 1
diff --git a/src/virtManagerTui/startdomain.py b/src/virtManagerTui/startdomain.py
index 638922f..8b326d5 100644
--- a/src/virtManagerTui/startdomain.py
+++ b/src/virtManagerTui/startdomain.py
@@ -19,7 +19,8 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import DomainListConfigScreen
+
+from domainlistconfigscreen import DomainListConfigScreen
 
 class StartDomainConfigScreen(DomainListConfigScreen):
     LIST_PAGE  = 1
diff --git a/src/virtManagerTui/startnetwork.py b/src/virtManagerTui/startnetwork.py
index 4dc5e6d..37abbbf 100644
--- a/src/virtManagerTui/startnetwork.py
+++ b/src/virtManagerTui/startnetwork.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import NetworkListConfigScreen
+from networklistconfigscreen import NetworkListConfigScreen
 
 LIST_PAGE   = 1
 START_PAGE = 2
diff --git a/src/virtManagerTui/startpool.py b/src/virtManagerTui/startpool.py
index ff3aece..b1b7e46 100644
--- a/src/virtManagerTui/startpool.py
+++ b/src/virtManagerTui/startpool.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import StorageListConfigScreen
+from storagelistconfigscreen import StorageListConfigScreen
 
 LIST_POOLS_PAGE    = 1
 FINAL_PAGE         = 2
diff --git a/src/virtManagerTui/stopdomain.py b/src/virtManagerTui/stopdomain.py
index f13efa5..609a851 100644
--- a/src/virtManagerTui/stopdomain.py
+++ b/src/virtManagerTui/stopdomain.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import DomainListConfigScreen
+from domainlistconfigscreen import DomainListConfigScreen
 
 class StopDomainConfigScreen(DomainListConfigScreen):
     LIST_PAGE    = 1
diff --git a/src/virtManagerTui/stopnetwork.py b/src/virtManagerTui/stopnetwork.py
index 6baa2ba..e437439 100644
--- a/src/virtManagerTui/stopnetwork.py
+++ b/src/virtManagerTui/stopnetwork.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import NetworkListConfigScreen
+from networklistconfigscreen import NetworkListConfigScreen
 
 LIST_PAGE = 1
 STOP_PAGE = 2
diff --git a/src/virtManagerTui/stoppool.py b/src/virtManagerTui/stoppool.py
index 6376ca9..17c9055 100644
--- a/src/virtManagerTui/stoppool.py
+++ b/src/virtManagerTui/stoppool.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import StorageListConfigScreen
+from storagelistconfigscreen import StorageListConfigScreen
 
 LIST_POOLS_PAGE    = 1
 FINAL_PAGE         = 2
diff --git a/src/virtManagerTui/storagemenu.py b/src/virtManagerTui/storagemenu.py
index ca6f4be..2ba9859 100644
--- a/src/virtManagerTui/storagemenu.py
+++ b/src/virtManagerTui/storagemenu.py
@@ -16,7 +16,8 @@
 # MA  02110-1301, USA.  A copy of the GNU General Public License is
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
-from menuscreen    import MenuScreen
+from newt_syrup.menuscreen import MenuScreen
+
 from addpool       import AddStoragePool
 from startpool     import StartStoragePool
 from stoppool      import StopStoragePool
diff --git a/src/virtManagerTui/undefinenetwork.py b/src/virtManagerTui/undefinenetwork.py
index 041ca75..a2c5e5f 100644
--- a/src/virtManagerTui/undefinenetwork.py
+++ b/src/virtManagerTui/undefinenetwork.py
@@ -19,7 +19,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 import snack
-from configscreen import NetworkListConfigScreen
+from networklistconfigscreen import NetworkListConfigScreen
 
 LIST_PAGE     = 1
 CONFIRM_PAGE  = 2
-- 
1.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]