[PATCH 1/2] Put TUI spokes in common categories
Vratislav Podzimek
vpodzime at redhat.com
Tue Oct 8 12:08:14 UTC 2013
There is no reason to have a special category for every spoke we have.
Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
pyanaconda/ui/tui/hubs/summary.py | 2 +-
pyanaconda/ui/tui/spokes/network.py | 2 +-
pyanaconda/ui/tui/spokes/source.py | 6 +++---
pyanaconda/ui/tui/spokes/storage.py | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pyanaconda/ui/tui/hubs/summary.py b/pyanaconda/ui/tui/hubs/summary.py
index 0bc5911..1318c3c 100644
--- a/pyanaconda/ui/tui/hubs/summary.py
+++ b/pyanaconda/ui/tui/hubs/summary.py
@@ -29,7 +29,7 @@ import time
class SummaryHub(TUIHub):
title = _("Installation")
## FIXME: this should be pulling data from somewhere, not just a static list
- categories = ["source", "localization", "destination", "password", "software", "network"]
+ categories = ["localization", "password", "software", "system"]
def setup(self, environment="anaconda"):
should_schedule = TUIHub.setup(self, environment=environment)
diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py
index c07af01..f4b99dc 100644
--- a/pyanaconda/ui/tui/spokes/network.py
+++ b/pyanaconda/ui/tui/spokes/network.py
@@ -40,7 +40,7 @@ __all__ = ["NetworkSpoke"]
class NetworkSpoke(EditTUISpoke):
""" Spoke used to configure network settings. """
title = _("Network settings")
- category = "network"
+ category = "system"
def __init__(self, app, data, storage, payload, instclass):
EditTUISpoke.__init__(self, app, data, storage, payload, instclass)
diff --git a/pyanaconda/ui/tui/spokes/source.py b/pyanaconda/ui/tui/spokes/source.py
index de8eac4..25a60c4 100644
--- a/pyanaconda/ui/tui/spokes/source.py
+++ b/pyanaconda/ui/tui/spokes/source.py
@@ -43,7 +43,7 @@ __all__ = ["SourceSpoke"]
class SourceSpoke(EditTUISpoke):
""" Spoke used to customize the install source repo. """
title = _("Installation source")
- category = "source"
+ category = "software"
_protocols = (_("Closest mirror"), "http://", "https://", "ftp://", "nfs")
@@ -222,7 +222,7 @@ class SourceSpoke(EditTUISpoke):
class SpecifyRepoSpoke(EditTUISpoke):
""" Specify the repo URL here if closest mirror not selected. """
title = _("Specify Repo Options")
- category = "source"
+ category = "software"
edit_fields = [
Entry(_("Repo URL"), "url", re.compile(".*$"), True)
@@ -257,7 +257,7 @@ class SpecifyRepoSpoke(EditTUISpoke):
class SpecifyNFSRepoSpoke(EditTUISpoke):
""" Specify server and mount opts here if NFS selected. """
title = _("Specify Repo Options")
- category = "source"
+ category = "software"
edit_fields = [
Entry(_("NFS <server>:/<path>"), "server", re.compile(".*$"), True),
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index 714c590..30bd3a6 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -58,7 +58,7 @@ class StorageSpoke(NormalTUISpoke):
as disk selection, partitioning, and fs type.
"""
title = _("Install Destination")
- category = "destination"
+ category = "system"
def __init__(self, app, data, storage, payload, instclass):
NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
@@ -306,7 +306,7 @@ class StorageSpoke(NormalTUISpoke):
class AutoPartSpoke(NormalTUISpoke):
""" Autopartitioning options are presented here. """
title = _("Autopartitioning Options")
- category = "destination"
+ category = "system"
def __init__(self, app, data, storage, payload, instclass):
NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
@@ -372,7 +372,7 @@ class AutoPartSpoke(NormalTUISpoke):
class PartitionSchemeSpoke(NormalTUISpoke):
""" Spoke to select what partitioning scheme to use on disk(s). """
title = _("Partition Scheme Options")
- category = "destination"
+ category = "system"
# set default FS to LVM, for consistency with graphical behavior
_selection = 1
--
1.7.11.7
More information about the anaconda-patches
mailing list