Merge lp:~agateau/ubiquity/kde-fix-keyboard-selection-glitch into lp:ubiquity

[Aurélien Gâteau]

The keyboard layout combobox used to refresh its content every time it is changed. This breaks manipulating the combobox with the arrow keys. With this patch the keyboard layout and keyboard variant comboboxes are only updated if the new content differs.

[Rohan Garg (rohangarg)]

Looks good to me.

review: Approve

[Jonathan Riddell (jr)]

Trying to recreate this issue with trusty images running ubiquity 2.18.7 and 2.18.8 I could successfully change the keyboard selection with the keyboard. I didn't notice any difference when applying this patch. tested on virtualbox.

[Dimitri John Ledkov (xnox)]

The development of ubiquity has moved to git, still hosted on
launchpad. If this merge proposal is still relevant, please resubmit
it against the git branches found at
https://code.launchpad.net/ubiquity

Sorry for any inconvenience caused.

review: Needs Resubmitting

Unmerged revisions

6187. By Aurélien Gâteau on 2014-05-07

Avoid glitch when changing keyboard layout

The keyboard layout combobox used to refresh its content every time it is
changed. This breaks manipulating the combobox with the arrow keys. With this
patch the keyboard layout and keyboard variant comboboxes are only updated if
the new content differs.

=== modified file 'ubiquity/plugins/ubi-console-setup.py'
--- ubiquity/plugins/ubi-console-setup.py	2013-06-07 12:11:18 +0000
+++ ubiquity/plugins/ubi-console-setup.py	2014-05-07 08:29:54 +0000
@@ -320,7 +320,31 @@
         if layout is not None and variant is not None:
             self.controller.dbfilter.apply_keyboard(layout, variant)
 
+    def _update_combobox(self, combobox, new_lst):
+        """
+        Updates the items of a combobox, but only if the new item list is
+        different. Not updating the items if the list is the same avoids
+        triggering signals about current item changes which break keyboard
+        navigation.
+
+        Returns True if the list has changed, False if not.
+        """
+        old_lst = []
+        for idx in range(combobox.count()):
+            old_lst.append(combobox.itemText(idx))
+
+        new_lst = [misc.utf8(x) for x in sorted(new_lst)]
+
+        if old_lst == new_lst:
+            return False
+        combobox.clear()
+        combobox.addItems(new_lst)
+        return True
+
     def set_keyboard_choices(self, choices):
+        has_changed = self._update_combobox(self.page.keyboard_layout_combobox, choices)
+        if not has_changed:
+            return
         self.page.keyboard_layout_combobox.clear()
         for choice in sorted(choices):
             self.page.keyboard_layout_combobox.addItem(misc.utf8(choice))
@@ -347,9 +371,7 @@
         return str(self.page.keyboard_layout_combobox.currentText())
 
     def set_keyboard_variant_choices(self, choices):
-        self.page.keyboard_variant_combobox.clear()
-        for choice in sorted(choices):
-            self.page.keyboard_variant_combobox.addItem(misc.utf8(choice))
+        self._update_combobox(self.page.keyboard_variant_combobox, choices)
 
     @plugin.only_this_page
     def set_keyboard_variant(self, variant):