[PATCH] Consolidate storage and networking under one category (#973013).

Chris Lumens clumens at redhat.com
Mon Jul 29 20:28:00 UTC 2013


---
 pyanaconda/ui/gui/categories/storage.py | 32 --------------------------------
 pyanaconda/ui/gui/categories/system.py  | 32 ++++++++++++++++++++++++++++++++
 pyanaconda/ui/gui/spokes/custom.py      |  4 ++--
 pyanaconda/ui/gui/spokes/filter.py      |  4 ++--
 pyanaconda/ui/gui/spokes/network.py     |  4 ++--
 pyanaconda/ui/gui/spokes/storage.py     |  4 ++--
 6 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 pyanaconda/ui/gui/categories/storage.py
 create mode 100644 pyanaconda/ui/gui/categories/system.py

diff --git a/pyanaconda/ui/gui/categories/storage.py b/pyanaconda/ui/gui/categories/storage.py
deleted file mode 100644
index bf24a0a..0000000
--- a/pyanaconda/ui/gui/categories/storage.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Storage category classes
-#
-# Copyright (C) 2011, 2013 Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-#                    David Lehman <dlehman at redhat.com>
-#
-
-from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.summary import SummaryHub
-
-__all__ = ["StorageCategory"]
-
-class StorageCategory(SpokeCategory):
-    displayOnHub = SummaryHub
-    sortOrder = 300
-    title = N_("STORAGE")
diff --git a/pyanaconda/ui/gui/categories/system.py b/pyanaconda/ui/gui/categories/system.py
new file mode 100644
index 0000000..dd30688
--- /dev/null
+++ b/pyanaconda/ui/gui/categories/system.py
@@ -0,0 +1,32 @@
+# Storage category classes
+#
+# Copyright (C) 2011, 2013 Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions of
+# the GNU General Public License v.2, or (at your option) any later version.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY expressed or implied, including the implied warranties of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.  You should have received a copy of the
+# GNU General Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
+# source code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission of
+# Red Hat, Inc.
+#
+# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
+#                    David Lehman <dlehman at redhat.com>
+#
+
+from pyanaconda.i18n import N_
+from pyanaconda.ui.gui.categories import SpokeCategory
+from pyanaconda.ui.gui.hubs.summary import SummaryHub
+
+__all__ = ["SystemCategory"]
+
+class SystemCategory(SpokeCategory):
+    displayOnHub = SummaryHub
+    sortOrder = 300
+    title = N_("SYSTEM")
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 8a2b9cd..61963bc 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -76,7 +76,7 @@ from pyanaconda.ui.gui.spokes.lib.accordion import *
 from pyanaconda.ui.gui.spokes.lib.refresh import RefreshDialog
 from pyanaconda.ui.gui.spokes.lib.summary import ActionSummaryDialog
 from pyanaconda.ui.gui.utils import setViewportBackground, gtk_action_wait, enlightbox, fancy_set_sensitive, ignoreEscape
-from pyanaconda.ui.gui.categories.storage import StorageCategory
+from pyanaconda.ui.gui.categories.system import SystemCategory
 from pyanaconda.ui.lib.disks import size_str
 
 # pylint: disable-msg=E0611
@@ -607,7 +607,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
     mainWidgetName = "customStorageWindow"
     uiFile = "spokes/custom.glade"
 
-    category = StorageCategory
+    category = SystemCategory
     title = N_("MANUAL PARTITIONING")
 
     def __init__(self, data, storage, payload, instclass):
diff --git a/pyanaconda/ui/gui/spokes/filter.py b/pyanaconda/ui/gui/spokes/filter.py
index 308f4b3..8936969 100644
--- a/pyanaconda/ui/gui/spokes/filter.py
+++ b/pyanaconda/ui/gui/spokes/filter.py
@@ -35,7 +35,7 @@ from pyanaconda.ui.gui.spokes import NormalSpoke
 from pyanaconda.ui.gui.spokes.advstorage.fcoe import FCoEDialog
 from pyanaconda.ui.gui.spokes.advstorage.iscsi import ISCSIDialog
 from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog
-from pyanaconda.ui.gui.categories.storage import StorageCategory
+from pyanaconda.ui.gui.categories.system import SystemCategory
 
 __all__ = ["FilterSpoke"]
 
@@ -403,7 +403,7 @@ class FilterSpoke(NormalSpoke):
     mainWidgetName = "filterWindow"
     uiFile = "spokes/filter.glade"
 
-    category = StorageCategory
+    category = SystemCategory
 
     title = N_("_INSTALLATION DESTINATION")
 
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index f30d314..6d06578 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -38,7 +38,7 @@ from pyanaconda import constants
 from pyanaconda.ui.communication import hubQ
 from pyanaconda.ui.gui import GUIObject
 from pyanaconda.ui.gui.spokes import NormalSpoke, StandaloneSpoke
-from pyanaconda.ui.gui.categories.software import SoftwareCategory
+from pyanaconda.ui.gui.categories.system import SystemCategory
 from pyanaconda.ui.gui.hubs.summary import SummaryHub
 from pyanaconda.ui.gui.utils import gtk_call_once, enlightbox
 from pyanaconda.ui.common import FirstbootSpokeMixIn
@@ -1285,7 +1285,7 @@ class NetworkSpoke(FirstbootSpokeMixIn, NormalSpoke):
     title = N_("_NETWORK CONFIGURATION")
     icon = "network-transmit-receive-symbolic"
 
-    category = SoftwareCategory
+    category = SystemCategory
 
     def __init__(self, *args, **kwargs):
         NormalSpoke.__init__(self, *args, **kwargs)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index ab50072..9b72240 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -49,7 +49,7 @@ from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog
 from pyanaconda.ui.gui.spokes.lib.passphrase import PassphraseDialog
 from pyanaconda.ui.gui.spokes.lib.detailederror import DetailedErrorDialog
 from pyanaconda.ui.gui.spokes.lib.resize import ResizeDialog
-from pyanaconda.ui.gui.categories.storage import StorageCategory
+from pyanaconda.ui.gui.categories.system import SystemCategory
 from pyanaconda.ui.gui.utils import enlightbox, gtk_call_once, gtk_action_wait
 
 from pyanaconda.kickstart import doKickstartStorage
@@ -310,7 +310,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
     mainWidgetName = "storageWindow"
     uiFile = "spokes/storage.glade"
 
-    category = StorageCategory
+    category = SystemCategory
 
     # other candidates: computer-symbolic, folder-symbolic
     icon = "drive-harddisk-symbolic"
-- 
1.8.1.2



More information about the anaconda-patches mailing list