There is no reason to have a special category for every spoke we have.
Related: rhbz#1019248
(cherry-picked 51007bde8a5cf66485eea52b0775b1e3493faa87 from master)
Signed-off-by: Vratislav Podzimek <vpodzime(a)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 3f5f53e..b0f1997 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"):
TUIHub.setup(self, environment=environment)
diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py
index a599a40..cb88373 100644
--- a/pyanaconda/ui/tui/spokes/network.py
+++ b/pyanaconda/ui/tui/spokes/network.py
@@ -41,7 +41,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 7167361..f49a9e4 100644
--- a/pyanaconda/ui/tui/spokes/source.py
+++ b/pyanaconda/ui/tui/spokes/source.py
@@ -145,7 +145,7 @@ class SourceSwitchHandler(object):
class SourceSpoke(SourceSwitchHandler, EditTUISpoke):
""" Spoke used to customize the install source repo.
"""
title = _("Installation source")
- category = "source"
+ category = "software"
_protocols = ["http://", "https://", "ftp://",
"nfs", _("Closest mirror")]
@@ -348,7 +348,7 @@ class SourceSpoke(SourceSwitchHandler, EditTUISpoke):
class SpecifyRepoSpoke(SourceSwitchHandler, 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)
@@ -386,7 +386,7 @@ class SpecifyRepoSpoke(SourceSwitchHandler, EditTUISpoke):
class SpecifyNFSRepoSpoke(SourceSwitchHandler, 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 00fa9fe..ba40ead 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -57,7 +57,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)
@@ -310,7 +310,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)
@@ -379,7 +379,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 = 2
--
1.8.4.2