[ToBeSquashed PATCH 6/6] Move autopart choices to one place and use them in both GUI and TUI

Vratislav Podzimek vpodzime at redhat.com
Thu May 29 07:59:08 UTC 2014


This is to be squashed with commits for ordering and translating autopart
choices.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/storage_utils.py               |  5 +++++
 pyanaconda/ui/gui/spokes/lib/accordion.py | 10 +++-------
 pyanaconda/ui/tui/spokes/storage.py       | 11 ++++-------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pyanaconda/storage_utils.py b/pyanaconda/storage_utils.py
index 6478282..525cbab 100644
--- a/pyanaconda/storage_utils.py
+++ b/pyanaconda/storage_utils.py
@@ -83,6 +83,11 @@ MOUNTPOINT_DESCRIPTIONS = {"Swap": N_("The 'swap' area on your computer is used
                                            "bootloader configuration on some PPC platforms.")
                             }
 
+AUTOPART_CHOICES = ((N_("Standard Partition"), AUTOPART_TYPE_PLAIN),
+                    (N_("BTRFS"), AUTOPART_TYPE_BTRFS),
+                    (N_("LVM"), AUTOPART_TYPE_LVM),
+                    (N_("LVM Thin Provisioning"), AUTOPART_TYPE_LVM_THINP))
+
 AUTOPART_DEVICE_TYPES = {AUTOPART_TYPE_LVM: DEVICE_TYPE_LVM,
                          AUTOPART_TYPE_LVM_THINP: DEVICE_TYPE_LVM_THINP,
                          AUTOPART_TYPE_PLAIN: DEVICE_TYPE_PARTITION,
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
index 5cabcf0..844f725 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -24,9 +24,8 @@
 from pyanaconda.i18n import _
 from pyanaconda.product import productName, productVersion
 from pyanaconda.ui.gui.utils import escape_markup, really_hide, really_show
-from pykickstart.constants import AUTOPART_TYPE_PLAIN, AUTOPART_TYPE_BTRFS
-from pykickstart.constants import AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP
 from pyanaconda.constants import DEFAULT_AUTOPART_TYPE
+from pyanaconda.storage_utils import AUTOPART_CHOICES
 
 from gi.repository.AnacondaWidgets import MountpointSelector
 from gi.repository import Gtk
@@ -328,11 +327,8 @@ class CreateNewPage(Page):
         self._createBox.attach(label, 0, 4, 2, 1)
         label.set_mnemonic_widget(combo)
 
-        for item in ([_("Standard Partition"), AUTOPART_TYPE_PLAIN],
-                     [_("BTRFS"), AUTOPART_TYPE_BTRFS],
-                     [_("LVM"), AUTOPART_TYPE_LVM],
-                     [_("LVM Thin Provisioning"), AUTOPART_TYPE_LVM_THINP]):
-            itr = store.append(item)
+        for item in (AUTOPART_CHOICES):
+            itr = store.append([_(item[0]), item[1]])
             if item[1] == DEFAULT_AUTOPART_TYPE:
                 default = itr
 
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
index c1699fd..3093f89 100644
--- a/pyanaconda/ui/tui/spokes/storage.py
+++ b/pyanaconda/ui/tui/spokes/storage.py
@@ -27,8 +27,8 @@ from pyanaconda.ui.tui.categories.system import SystemCategory
 from pyanaconda.ui.tui.spokes import NormalTUISpoke
 from pyanaconda.ui.tui.simpleline import TextWidget, CheckboxWidget
 from pyanaconda.ui.tui.tuiobject import YesNoDialog
+from pyanaconda.storage_utils import AUTOPART_CHOICES
 
-from pykickstart.constants import AUTOPART_TYPE_LVM, AUTOPART_TYPE_BTRFS, AUTOPART_TYPE_PLAIN, AUTOPART_TYPE_LVM_THINP
 from blivet import storageInitialize, arch
 from blivet.size import Size
 from blivet.errors import StorageError, DasdFormatError
@@ -44,7 +44,7 @@ from pyanaconda.constants_text import INPUT_PROCESSED
 from pyanaconda.i18n import _, P_, N_
 from pyanaconda.bootloader import BootLoaderError
 
-from pykickstart.constants import CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_NONE
+from pykickstart.constants import CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_NONE, AUTOPART_TYPE_LVM
 from pykickstart.errors import KickstartValueError
 
 from collections import OrderedDict
@@ -505,10 +505,7 @@ class PartitionSchemeSpoke(NormalTUISpoke):
         NormalTUISpoke.__init__(self, app, data, storage, payload, instclass)
         self.partschemes = OrderedDict()
         pre_select = self.data.autopart.type or DEFAULT_AUTOPART_TYPE
-        for i, item in enumerate([(_("Standard Partition"), AUTOPART_TYPE_PLAIN),
-                                  (_("BTRFS"), AUTOPART_TYPE_BTRFS),
-                                  (_("LVM"), AUTOPART_TYPE_LVM),
-                                  (_("LVM Thin Provisioning"), AUTOPART_TYPE_LVM_THINP)]):
+        for i, item in enumerate(AUTOPART_CHOICES):
             self.partschemes[item[0]] = item[1]
             if item[1] == pre_select:
                 self._selection = i
@@ -522,7 +519,7 @@ class PartitionSchemeSpoke(NormalTUISpoke):
 
         schemelist = self.partschemes.keys()
         for i, sch in enumerate(schemelist):
-            box = CheckboxWidget(title="%i) %s" %(i + 1, sch), completed=(i == self._selection))
+            box = CheckboxWidget(title="%i) %s" %(i + 1, _(sch)), completed=(i == self._selection))
             self._window += [box, ""]
 
         message = _("Select a partition scheme configuration.")
-- 
1.9.3



More information about the anaconda-patches mailing list