nemo-action.c: Support icons provided by Spices.

Author: mtwebster

action-layout-editor/nemo_action_layout_editor.py

@@ -80,7 +80,11 @@ def get_icon_type_and_data(self, original=False):
         if icon_string is None:
             return None
 
-        if icon_string.startswith("/"):
+        if icon_string.startswith("<") and icon_string.endswith(">"):
+            real_string = icon_string[1:-1]
+            icon_string = str(self.path.parent / real_string)
+
+        if GLib.path_is_absolute(icon_string):
             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_string, 16, 16)
             surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, self.scale_factor, None)
             return ("surface", surface)

files/usr/share/nemo/action-info.md

@@ -106,12 +106,14 @@ Displays the action if all selected files have a mimetype included in this semic
 Comment=If you click this menu entry, %F will be acted upon!
 `
 
-**Icon-Name** (optional): The name of the icon to display in Nemo's context menu next to the action entry. This must be an icon that is part of the GtkIconTheme. Symbolic icons are supported.
+**Icon-Name** (optional): The name of the icon to display in Nemo's context menu next to the action entry. This must be an icon that is part of the GtkIconTheme, or an absolute path.  Symbolic icons are supported.
 
 `
 Icon-Name=folder
 `
 
+If you have a custom icon, you can enclose the filename in `<...>` to have it loaded from the action's directory. For instance, with `<my-action-icon.png>` nemo will look for an icon by that name in the same directory as the action file. If your action is a Spice and has its own subfolder, that can be included as a relative path (`my-action@me/my-action-icon.png`).
+
 **Separator** (optional): Character(s) to separate multiple filenames if more than a single file is selected. By default a space is used.
 
 `

libnemo-private/nemo-action.c

@@ -670,17 +670,34 @@ nemo_action_constructed (GObject *object)
     gicon = NULL;
 
     if (icon_name != NULL) {
-        if (g_path_is_absolute (icon_name)) {
-            GFile *icon_file = g_file_new_for_path (icon_name);
+        gboolean prepend_action_dir = FALSE;
+        gchar *real_icon_name;
+
+        strip_custom_modifier (icon_name, &prepend_action_dir, &real_icon_name);
+
+        if (prepend_action_dir) {
+            gchar *action_dir = g_path_get_dirname (action->key_file_path);
+            gchar *icon_path = g_build_filename (action_dir, real_icon_name, NULL);
+
+            g_free (action_dir);
+            g_free (real_icon_name);
+
+            real_icon_name = icon_path;
+        }
+
+        if (g_path_is_absolute (real_icon_name)) {
+            GFile *icon_file = g_file_new_for_path (real_icon_name);
             if (g_file_is_native (icon_file)) {
                 gicon = g_file_icon_new (icon_file);
             }
             g_object_unref (icon_file);
         }
 
         if (gicon == NULL) {
-            gicon = g_themed_icon_new (icon_name);
+            gicon = g_themed_icon_new (real_icon_name);
         }
+
+        g_free (real_icon_name);
     }
     g_free (icon_name);