[anaconda][PATCH 1/2] Move categories to pyanaconda.ui.categories. (#1128616)

Samantha N. Bueno sbueno+anaconda at redhat.com
Wed Sep 3 20:05:23 UTC 2014


Get rid of separately managed TUI and GUI categories.

Resolves: rhbz#1128616
---
 po/POTFILES.in                                | 12 +++---
 pyanaconda/ui/categories/Makefile.am          | 22 +++++++++++
 pyanaconda/ui/categories/__init__.py          | 47 ++++++++++++++++++++++
 pyanaconda/ui/categories/customization.py     | 32 +++++++++++++++
 pyanaconda/ui/categories/localization.py      | 31 +++++++++++++++
 pyanaconda/ui/categories/software.py          | 31 +++++++++++++++
 pyanaconda/ui/categories/system.py            | 32 +++++++++++++++
 pyanaconda/ui/categories/user_settings.py     | 32 +++++++++++++++
 pyanaconda/ui/gui/categories/Makefile.am      | 22 -----------
 pyanaconda/ui/gui/categories/__init__.py      | 57 ---------------------------
 pyanaconda/ui/gui/categories/customization.py | 32 ---------------
 pyanaconda/ui/gui/categories/localization.py  | 31 ---------------
 pyanaconda/ui/gui/categories/software.py      | 31 ---------------
 pyanaconda/ui/gui/categories/system.py        | 32 ---------------
 pyanaconda/ui/gui/categories/user_settings.py | 32 ---------------
 15 files changed, 233 insertions(+), 243 deletions(-)
 create mode 100644 pyanaconda/ui/categories/Makefile.am
 create mode 100644 pyanaconda/ui/categories/__init__.py
 create mode 100644 pyanaconda/ui/categories/customization.py
 create mode 100644 pyanaconda/ui/categories/localization.py
 create mode 100644 pyanaconda/ui/categories/software.py
 create mode 100644 pyanaconda/ui/categories/system.py
 create mode 100644 pyanaconda/ui/categories/user_settings.py
 delete mode 100644 pyanaconda/ui/gui/categories/Makefile.am
 delete mode 100644 pyanaconda/ui/gui/categories/__init__.py
 delete mode 100644 pyanaconda/ui/gui/categories/customization.py
 delete mode 100644 pyanaconda/ui/gui/categories/localization.py
 delete mode 100644 pyanaconda/ui/gui/categories/software.py
 delete mode 100644 pyanaconda/ui/gui/categories/system.py
 delete mode 100644 pyanaconda/ui/gui/categories/user_settings.py

diff --git a/po/POTFILES.in b/po/POTFILES.in
index da1880f..b298e17 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,6 +37,12 @@ pyanaconda/packaging/rpmostreepayload.py
 # Interfaces
 pyanaconda/ui/common.py
 pyanaconda/ui/__init__.py
+pyanaconda/ui/categories/__init__.py
+pyanaconda/ui/categories/customization.py
+pyanaconda/ui/categories/localization.py
+pyanaconda/ui/categories/software.py
+pyanaconda/ui/categories/system.py
+pyanaconda/ui/categories/user_settings.py
 
 # Common stuff
 pyanaconda/ui/lib/space.py
@@ -64,12 +70,6 @@ pyanaconda/ui/tui/__init__.py
 
 # Graphical interface
 pyanaconda/ui/gui/__init__.py
-pyanaconda/ui/gui/categories/__init__.py
-pyanaconda/ui/gui/categories/customization.py
-pyanaconda/ui/gui/categories/localization.py
-pyanaconda/ui/gui/categories/software.py
-pyanaconda/ui/gui/categories/system.py
-pyanaconda/ui/gui/categories/user_settings.py
 pyanaconda/ui/gui/hubs/__init__.py
 pyanaconda/ui/gui/hubs/progress.py
 pyanaconda/ui/gui/spokes/custom.py
diff --git a/pyanaconda/ui/categories/Makefile.am b/pyanaconda/ui/categories/Makefile.am
new file mode 100644
index 0000000..e7d0e34
--- /dev/null
+++ b/pyanaconda/ui/categories/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright (C) 2011  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Chris Lumens <clumens at redhat.com>
+
+MAINTAINERCLEANFILES = Makefile.in
+
+pkgpyexecdir        = $(pyexecdir)/py$(PACKAGE_NAME)
+categoriesdir       = $(pkgpyexecdir)/ui/categories
+categories_PYTHON   = $(srcdir)/*.py
diff --git a/pyanaconda/ui/categories/__init__.py b/pyanaconda/ui/categories/__init__.py
new file mode 100644
index 0000000..024436b
--- /dev/null
+++ b/pyanaconda/ui/categories/__init__.py
@@ -0,0 +1,47 @@
+# Base classes for spoke categories.
+#
+# 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>
+#
+
+import os.path
+from pyanaconda.i18n import N_
+
+__all__ = ["SpokeCategory"]
+
+class SpokeCategory(object):
+    """A SpokeCategory is an object used to group multiple related Spokes
+       together on a hub.  It consists of a title displayed above, and then
+       a two-column grid of SpokeSelectors.  Each SpokeSelector is associated
+       with a Spoke subclass.  A SpokeCategory will only display those Spokes
+       with a matching category attribute.
+
+       Class attributes:
+
+       displayOnHub  -- The Hub subclass to display this Category on.  If
+                        None, this Category will be skipped.
+       sortOrder     -- A number indicating the order in which this Category
+                        will be displayed.  A lower number indicates display
+                        higher up in the Hub.
+       title         -- The title of this SpokeCategory, to be displayed above
+                        the grid.
+    """
+    displayOnHubGUI = None
+    displayOnHubTUI = None
+    sortOrder = 1000
+    title = N_("DEFAULT TITLE")
diff --git a/pyanaconda/ui/categories/customization.py b/pyanaconda/ui/categories/customization.py
new file mode 100644
index 0000000..f2c6e05
--- /dev/null
+++ b/pyanaconda/ui/categories/customization.py
@@ -0,0 +1,32 @@
+# Localization 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>
+#                    Martin Sivak <msivak at redhat.com>
+#
+
+from pyanaconda.i18n import N_
+from pyanaconda.ui.gui.categories import SpokeCategory
+
+__all__ = ["CustomizationCategory"]
+
+class CustomizationCategory(SpokeCategory):
+    displayOnHubGUI = "SummaryHub"
+    displayOnHubTUI = "SummaryHub"
+    sortOrder = 100
+    title = N_("CUSTOMIZATION")
diff --git a/pyanaconda/ui/categories/localization.py b/pyanaconda/ui/categories/localization.py
new file mode 100644
index 0000000..dead551
--- /dev/null
+++ b/pyanaconda/ui/categories/localization.py
@@ -0,0 +1,31 @@
+# Localization 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>
+#
+
+from pyanaconda.i18n import N_
+from pyanaconda.ui.gui.categories import SpokeCategory
+
+__all__ = ["LocalizationCategory"]
+
+class LocalizationCategory(SpokeCategory):
+    displayOnHubGUI = "SummaryHub"
+    displayOnHubTUI = "SummaryHub"
+    sortOrder = 100
+    title = N_("LOCALIZATION")
diff --git a/pyanaconda/ui/categories/software.py b/pyanaconda/ui/categories/software.py
new file mode 100644
index 0000000..0a4969b
--- /dev/null
+++ b/pyanaconda/ui/categories/software.py
@@ -0,0 +1,31 @@
+# Software 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>
+#
+
+from pyanaconda.i18n import N_
+from pyanaconda.ui.gui.categories import SpokeCategory
+
+__all__ = ["SoftwareCategory"]
+
+class SoftwareCategory(SpokeCategory):
+    displayOnHubGUI = "SummaryHub"
+    displayOnHubTUI = "SummaryHub"
+    sortOrder = 200
+    title = N_("SOFTWARE")
diff --git a/pyanaconda/ui/categories/system.py b/pyanaconda/ui/categories/system.py
new file mode 100644
index 0000000..bd8da3d
--- /dev/null
+++ b/pyanaconda/ui/categories/system.py
@@ -0,0 +1,32 @@
+# System 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
+
+__all__ = ["SystemCategory"]
+
+class SystemCategory(SpokeCategory):
+    displayOnHubGUI = "SummaryHub"
+    displayOnHubTUI = "SummaryHub"
+    sortOrder = 300
+    title = N_("SYSTEM")
diff --git a/pyanaconda/ui/categories/user_settings.py b/pyanaconda/ui/categories/user_settings.py
new file mode 100644
index 0000000..d04d1f4
--- /dev/null
+++ b/pyanaconda/ui/categories/user_settings.py
@@ -0,0 +1,32 @@
+# User settings 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>
+#                    Martin Sivak <msivak at redhat.com>
+#
+
+from pyanaconda.i18n import N_
+from pyanaconda.ui.gui.categories import SpokeCategory
+
+__all__ = ["UserSettingsCategory"]
+
+class UserSettingsCategory(SpokeCategory):
+    displayOnHubGUI = "ProgressHub"
+    displayOnHubTUI = "SummaryHub"
+    sortOrder = 200
+    title = N_("USER SETTINGS")
diff --git a/pyanaconda/ui/gui/categories/Makefile.am b/pyanaconda/ui/gui/categories/Makefile.am
deleted file mode 100644
index ed3ecee..0000000
--- a/pyanaconda/ui/gui/categories/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2011  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Chris Lumens <clumens at redhat.com>
-
-MAINTAINERCLEANFILES = Makefile.in
-
-pkgpyexecdir        = $(pyexecdir)/py$(PACKAGE_NAME)
-categoriesdir       = $(pkgpyexecdir)/ui/gui/categories
-categories_PYTHON   = $(srcdir)/*.py
diff --git a/pyanaconda/ui/gui/categories/__init__.py b/pyanaconda/ui/gui/categories/__init__.py
deleted file mode 100644
index 66bd5d4..0000000
--- a/pyanaconda/ui/gui/categories/__init__.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Base classes for spoke categories.
-#
-# 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>
-#
-
-import os.path
-from pyanaconda.i18n import N_
-from pyanaconda.ui.common import collect
-
-__all__ = ["SpokeCategory", "collect_categories"]
-
-class SpokeCategory(object):
-    """A SpokeCategory is an object used to group multiple related Spokes
-       together on a hub.  It consists of a title displayed above, and then
-       a two-column grid of SpokeSelectors.  Each SpokeSelector is associated
-       with a Spoke subclass.  A SpokeCategory will only display those Spokes
-       with a matching category attribute.
-
-       Class attributes:
-
-       displayOnHub  -- The Hub subclass to display this Category on.  If
-                        None, this Category will be skipped.
-       sortOrder     -- A number indicating the order in which this Category
-                        will be displayed.  A lower number indicates display
-                        higher up in the Hub.
-       title         -- The title of this SpokeCategory, to be displayed above
-                        the grid.
-    """
-    displayOnHub = None
-    sortOrder = 1000
-    title = N_("DEFAULT TITLE")
-
-def collect_categories(mask_paths):
-    """Return a list of all category subclasses. Look for them in modules
-       imported as module_mask % basename(f) where f is name of all files in path.
-    """
-    categories = []
-    for mask, path in mask_paths:
-        categories.extend(collect(mask, path, lambda obj: getattr(obj, "displayOnHub", None) != None))
-
-    return categories
diff --git a/pyanaconda/ui/gui/categories/customization.py b/pyanaconda/ui/gui/categories/customization.py
deleted file mode 100644
index be59dec..0000000
--- a/pyanaconda/ui/gui/categories/customization.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Localization 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>
-#                    Martin Sivak <msivak at redhat.com>
-#
-
-from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.progress import ProgressHub
-
-__all__ = ["CustomizationCategory"]
-
-class CustomizationCategory(SpokeCategory):
-    displayOnHub = ProgressHub
-    sortOrder = 100
-    title = N_("CUSTOMIZATION")
diff --git a/pyanaconda/ui/gui/categories/localization.py b/pyanaconda/ui/gui/categories/localization.py
deleted file mode 100644
index 19a77ee..0000000
--- a/pyanaconda/ui/gui/categories/localization.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Localization 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>
-#
-
-from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.summary import SummaryHub
-
-__all__ = ["LocalizationCategory"]
-
-class LocalizationCategory(SpokeCategory):
-    displayOnHub = SummaryHub
-    sortOrder = 100
-    title = N_("LOCALIZATION")
diff --git a/pyanaconda/ui/gui/categories/software.py b/pyanaconda/ui/gui/categories/software.py
deleted file mode 100644
index 843f736..0000000
--- a/pyanaconda/ui/gui/categories/software.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Software 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>
-#
-
-from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.summary import SummaryHub
-
-__all__ = ["SoftwareCategory"]
-
-class SoftwareCategory(SpokeCategory):
-    displayOnHub = SummaryHub
-    sortOrder = 200
-    title = N_("SOFTWARE")
diff --git a/pyanaconda/ui/gui/categories/system.py b/pyanaconda/ui/gui/categories/system.py
deleted file mode 100644
index d8ca268..0000000
--- a/pyanaconda/ui/gui/categories/system.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# System 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/categories/user_settings.py b/pyanaconda/ui/gui/categories/user_settings.py
deleted file mode 100644
index e025428..0000000
--- a/pyanaconda/ui/gui/categories/user_settings.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# User settings 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>
-#                    Martin Sivak <msivak at redhat.com>
-#
-
-from pyanaconda.i18n import N_
-from pyanaconda.ui.gui.categories import SpokeCategory
-from pyanaconda.ui.gui.hubs.progress import ProgressHub
-
-__all__ = ["UserSettingsCategory"]
-
-class UserSettingsCategory(SpokeCategory):
-    displayOnHub = ProgressHub
-    sortOrder = 200
-    title = N_("USER SETTINGS")
-- 
1.9.3



More information about the anaconda-patches mailing list