--- pyanaconda/ui/gui/spokes/welcome.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index a3a33a6..80bf7ac 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -27,7 +27,7 @@ _ = lambda x: gettext.ldgettext("anaconda", x) N_ = lambda x: x
# pylint: disable-msg=E0611 -from gi.repository import AnacondaWidgets, Gtk +from gi.repository import AnacondaWidgets, Gtk, Pango from pyanaconda.ui.gui.hubs.summary import SummaryHub from pyanaconda.ui.gui.spokes import StandaloneSpoke, NormalSpoke from pyanaconda.ui.gui.utils import enlightbox @@ -209,7 +209,10 @@ class LanguageMixIn(object): store.append(['<span lang="%s">%s</span>' % (re.sub('..*', '', setting), native), english, setting])
def _matchesEntry(self, model, itr, *args): - native = model[itr][0] + # Need to strip out the pango markup before attempting to match. + # Otherwise, starting to type "span" for "spanish" will match everything + # due to the enclosing span tag. + (success, attrs, native, accel) = Pango.parse_markup(model[itr][0], -1, "_") english = model[itr][1] entry = self._languageEntry.get_text().strip()
For some reason, lightboxing this dialog means if you go back into the custom partitioning screen, all other dialogs will be displayed hidden but still take focus. I can't figure out what's going on, so just disabling this lightbox for now seems a reasonable workaround. --- pyanaconda/ui/gui/spokes/custom.glade | 1 - pyanaconda/ui/gui/spokes/custom.py | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade index 72d06ca..aadcd57 100644 --- a/pyanaconda/ui/gui/spokes/custom.glade +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -76,7 +76,6 @@ <property name="can_focus">False</property> <property name="border_width">5</property> <property name="type_hint">dialog</property> - <property name="decorated">False</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 8552f35..74e0717 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1758,14 +1758,13 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
dialog = AddDialog(self.data, mountpoints=self.__storage.mountpoints.keys()) - with enlightbox(self.window, dialog.window): - dialog.refresh() - rc = dialog.run() + dialog.refresh() + rc = dialog.run()
- if rc != 1: - # user cancel - dialog.window.destroy() - return + if rc != 1: + # user cancel + dialog.window.destroy() + return
# create a device of the default type, using any disks, with an # appropriate fstype and mountpoint
--- pyanaconda/ui/gui/spokes/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 74e0717..bcfa001 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1481,7 +1481,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): delta = factory.device_size - base_size label.set_text("+%s" % str(Size(spec="%fmb" % delta)).upper()) else: - label.set_text("(not enough disks)") + label.set_text(_("(not enough disks)"))
# some features are not available to some raid levels button.set_sensitive(feature not in disabled)
anaconda-patches@lists.fedorahosted.org