actions: Sort actions consistently.

Actions not affected by a user layout are now sorted overall by
filename at runtime. This ensures you see them in this same order
in preferences and the layout editor.

Author: mtwebster

action-layout-editor/nemo_action_layout_editor.py

@@ -10,6 +10,7 @@
 import uuid
 import gettext
 import locale
+from collections import OrderedDict
 import subprocess
 import os
 
@@ -481,7 +482,7 @@ def validate_node(self, node):
 
     def load_installed_actions(self):
         # Load installed actions from the system
-        actions = {}
+        action_list = []
 
         data_dirs = GLib.get_system_data_dirs() + [GLib.get_user_data_dir()]
 
@@ -497,11 +498,14 @@ def load_installed_actions(self):
                             kf = GLib.KeyFile()
                             kf.load_from_file(str(file), GLib.KeyFileFlags.NONE)
 
-                            actions[uuid] = (file, kf)
+                            action_list.append((uuid, file, kf))
                         except GLib.Error as e:
                             print("Error loading action file '%s': %s" % (str(file), e.message))
                             continue
 
+
+        actions = OrderedDict(sorted((t[0], t[1:]) for t in action_list))
+
         return actions
 
     def fill_model(self, model, parent, items, installed_actions):

src/nemo-action-config-widget.c

@@ -206,6 +206,15 @@ strip_accel (const gchar *input)
     return ret;
 }
 
+static gint
+sort_actions (gconstpointer a, gconstpointer b)
+{
+    ActionProxy *action_a = (ActionProxy *) a;
+    ActionProxy *action_b = (ActionProxy *) b;
+
+    return g_strcmp0 (action_a->filename, action_b->filename);
+}
+
 static void
 refresh_widget (NemoActionConfigWidget *widget)
 {
@@ -252,6 +261,8 @@ refresh_widget (NemoActionConfigWidget *widget)
         gchar **blacklist = g_settings_get_strv (nemo_plugin_preferences,
         		                                 NEMO_PLUGIN_PREFERENCES_DISABLED_ACTIONS);
 
+        widget->actions = g_list_sort (widget->actions, (GCompareFunc) sort_actions);
+
         for (l = widget->actions; l != NULL; l=l->next) {
             ActionProxy *proxy = l->data;