Remove arrow buttons in ibus-setup, which no longer work.

BUG=RH#851758
TEST=ibus-setup

Review URL: https://codereview.appspot.com/6475068

diff --git a/setup/enginetreeview.py b/setup/enginetreeview.py
index 51e4fa2..1a18cc7 100644 (file)
--- a/setup/enginetreeview.py
+++ b/setup/enginetreeview.py
@@ -59,6 +59,8 @@ class EngineTreeView(Gtk.TreeView):
         self.__model.connect("row-deleted", self.__emit_changed_delay_cb, "row-deleted")
         self.__model.connect("row-inserted", self.__emit_changed_delay_cb, "row-inserted")
         self.__model.connect("rows-reordered", self.__emit_changed_delay_cb, "rows-reordered")
+        self.__model.set_default_sort_func(self.__sort_engines, None)
+        self.__model.set_sort_column_id(-1, Gtk.SortType.ASCENDING)
 
         # create im name & icon column
         column = Gtk.TreeViewColumn(_("Input Method"))
@@ -99,6 +101,15 @@ class EngineTreeView(Gtk.TreeView):
 
         self.get_selection().connect("changed", self.__selection_changed_cb)
 
+    def __sort_engines(self, model, a, b, data):
+        engine_a = model[a][0]
+        engine_b = model[b][0]
+        language_a = IBus.get_language_name(engine_a.get_language())
+        language_b = IBus.get_language_name(engine_b.get_language())
+        label_a = "%s - %s" % (language_a, engine_a.get_longname())
+        label_b = "%s - %s" % (language_b, engine_b.get_longname())
+        return cmp(label_a, label_b)
+
     def __selection_changed_cb(self, *args):
         self.notify("active-engine");
 

diff --git a/setup/setup.ui b/setup/setup.ui
index e56e917..2042263 100644 (file)
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -777,7 +777,7 @@
                                   <object class="GtkButton" id="button_engine_up">
                                     <property name="label">gtk-go-up</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
@@ -795,7 +795,7 @@
                                   <object class="GtkButton" id="button_engine_down">
                                     <property name="label">gtk-go-down</property>
                                     <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
+                                    <property name="no_show_all">True</property>
                                     <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>