Merge pull request #18692 from dterrahe/preset_menus

Make preset shortcuts survive language change

Author: TurboGit

data/themes/darktable.css

@@ -1806,6 +1806,7 @@ treeview#delete-dialog:selected
 }
 
   /* set active menu items: needed for some Pango issues not rendering synthetic bold for all OS */
+.active_menu_item,
 .active_menu_item label
 {
   font-weight: bold;

src/common/darktable.h

@@ -958,7 +958,7 @@ static inline void dt_unreachable_codepath_with_caller(const char *description,
  * NQ_ should be used to strip any context from the string.
  */
 #undef NC_
-#define NC_(Context, String) (Context "|" String)
+#define NC_(Context, String) Context "|" String
 
 static inline const gchar *NQ_(const gchar *String)
 {

src/common/presets.c

@@ -443,7 +443,7 @@ const char *dt_presets_get_multi_name(const char *name, const char *multi_name)
   // in auto-update mode     : use either the multi_name if defined otherwise the name
   // in non auto-update mode : use only the multi_name if defined
   if(auto_module)
-    return strlen(multi_name) > 0 ? multi_name : name;
+    return strlen(multi_name) > 0 ? multi_name : dt_util_localize_segmented_name(name, FALSE);
   else
     return strlen(multi_name) > 0 ? multi_name : "";
 }

src/common/utility.c

@@ -59,7 +59,7 @@ const char *dt_util_localize_string(const char *s)
   static const int prefix_len = sizeof(prefix)-1;
 
   if(s && strncmp(s, prefix, prefix_len) == 0)
-    return _(s+prefix_len);
+    return Q_(s+prefix_len);
   else
     return s;
 }
@@ -70,7 +70,9 @@ gchar *dt_util_localize_segmented_name(const char *s,
   const char *sep = with_space ? " | " : "|";
   const int sep_len = strlen(sep);
 
-  gchar **split = g_strsplit(s, "|", 0);
+  const char *local_s = g_str_has_prefix(s, BUILTIN_PREFIX)
+                      ? _(s+sizeof(BUILTIN_PREFIX)-1) : s;
+  gchar **split = g_strsplit(local_s, "|", 0);
   gchar *localized = NULL;
   if(split && split[0])
   {
@@ -81,8 +83,11 @@ gchar *dt_util_localize_segmented_name(const char *s,
     gchar *end = g_stpcpy(localized, dt_util_localize_string(split[0]));
     for(int i = 1; split[i] != NULL; i++)
     {
+      while(*end == ' ') end--;
       end = g_stpcpy(end, sep);
-      end = g_stpcpy(end, dt_util_localize_string(split[i]));
+      gchar *part = split[i];
+      while(*part == ' ' ) part++;
+      end = g_stpcpy(end, dt_util_localize_string(part));
     }
   }
   g_strfreev(split);

src/common/utility.h

@@ -32,6 +32,7 @@ const char *dt_util_localize_string(const char *s);
 /** caller must g_free() return value */
 gchar *dt_util_localize_segmented_name(const char *s,
                                        const gboolean with_space);
+#define BUILTIN_PREFIX "_builtin_"
 
 /** dynamically allocate and concatenate string */
 void dt_util_str_cat(gchar **str, const gchar *format, ...) __attribute__((format(printf, 2, 3)));

src/gui/accelerators.c

@@ -3790,9 +3790,9 @@ static float _process_action(dt_action_t *action,
     }
     else if(owner->type == DT_ACTION_TYPE_IOP)
     {
-      dt_action_widget_toast(action_target, NULL, "\napplying preset '%s'", action->label);
+      dt_action_widget_toast(action_target, NULL, _("\napplying preset '%s'"), action->label);
 
-      dt_gui_presets_apply_preset(action->label, action_target);
+      dt_gui_presets_apply_preset(action->id, action_target);
     }
     else
       dt_print(DT_DEBUG_ALWAYS,
@@ -4740,7 +4740,7 @@ dt_action_t *dt_action_locate(dt_action_t *owner,
       new_action->id = clean_path;
       new_action->label = needs_translation
                         ? g_strdup(Q_(*path))
-                        : dt_util_localize_segmented_name(*path, FALSE);
+                        : dt_util_localize_segmented_name(*path, TRUE);
       new_action->type = DT_ACTION_TYPE_SECTION;
 
       dt_action_insert_sorted(owner, new_action);
@@ -5000,7 +5000,7 @@ void dt_action_rename(dt_action_t *action,
   if(new_name)
   {
     action->id = path_without_symbols(new_name);
-    action->label = g_strdup(_(new_name));
+    action->label = dt_util_localize_segmented_name(new_name, TRUE);
 
     dt_action_insert_sorted(action->owner, action);
   }

src/gui/preferences.c

@@ -777,12 +777,14 @@ static void _update_preset_line(GtkTreeStore *tree_store,
       focal_length = g_strdup_printf("%d – %d", focal_length_min, focal_length_max);
   }
 
+  gchar *local_name = dt_util_localize_segmented_name(name, TRUE);
+
   gtk_tree_store_set(GTK_TREE_STORE(tree_store), iter,
                      P_ROWID_COLUMN, rowid,
                      P_OPERATION_COLUMN, operation,
                      P_MODULE_COLUMN, "",
                      P_EDITABLE_COLUMN, writeprotect ? lock_pixbuf : NULL,
-                     P_NAME_COLUMN, name,
+                     P_NAME_COLUMN, local_name,
                      P_MODEL_COLUMN, smodel,
                      P_MAKER_COLUMN, smaker,
                      P_LENS_COLUMN, slens,
@@ -793,6 +795,7 @@ static void _update_preset_line(GtkTreeStore *tree_store,
                      P_AUTOAPPLY_COLUMN, autoapply ? check_pixbuf : NULL,
                      -1);
 
+  g_free(local_name);
   g_free(focal_length);
   g_free(aperture);
   g_free(exposure);

src/gui/presets.c

@@ -88,7 +88,7 @@ void dt_gui_presets_init()
                         NULL, NULL);
 }
 
-void dt_gui_presets_add_generic(const char *name,
+void (dt_gui_presets_add_generic)(const char *name,
                                 const dt_dev_operation_t op,
                                 const int32_t version,
                                 const void *params,
@@ -98,9 +98,11 @@ void dt_gui_presets_add_generic(const char *name,
 {
   dt_develop_blend_params_t default_blendop_params;
   dt_develop_blend_init_blend_parameters(&default_blendop_params, blend_cst);
+  gchar *prefixed_name = g_strdup_printf(BUILTIN_PREFIX "%s", name);
   dt_gui_presets_add_with_blendop(
-      name, op, version, params, params_size,
+      prefixed_name, op, version, params, params_size,
       &default_blendop_params, enabled);
+  g_free(prefixed_name);
 }
 
 void dt_gui_presets_add_with_blendop(const char *name,
@@ -1588,11 +1590,13 @@ void dt_gui_favorite_presets_menu_show(GtkWidget *w)
         gchar *txt = g_strdup_printf("ꬹ%s|%sꬹ", iop->so->op, name);
         if(config && strstr(config, txt))
         {
-          GtkWidget *mi = gtk_menu_item_new_with_label(name);
+          GtkWidget *mi = gtk_menu_item_new_with_label("");
+          gchar *local_name = dt_util_localize_segmented_name(name, TRUE);
           gchar *tt = g_markup_printf_escaped("<b>%s %s</b> %s",
-                                              iop->name(), iop->multi_name, name);
+                                              iop->name(), iop->multi_name, local_name);
           gtk_label_set_markup(GTK_LABEL(gtk_bin_get_child(GTK_BIN(mi))), tt);
           g_free(tt);
+          g_free(local_name);
           _menuitem_connect_preset(mi, name, iop);
           gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(mi));
         }
@@ -1616,6 +1620,27 @@ void dt_gui_favorite_presets_menu_show(GtkWidget *w)
   dt_gui_menu_popup(menu, w, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST);
 }
 
+// Comparator function to sort menu items alphabetically by their labels in reverse order
+static gint _compare_menu_items(GtkMenuItem *a, GtkMenuItem *b)
+{
+  return - g_utf8_collate(gtk_menu_item_get_label(a), gtk_menu_item_get_label(b));
+}
+
+// Function to sort GtkMenuShell items
+static void _sort_menu_shell(GtkWidget *menu_shell)
+{
+  if(!GTK_IS_MENU_SHELL(menu_shell)) return;
+  GList *items = gtk_container_get_children(GTK_CONTAINER(menu_shell));
+  items = g_list_sort(items, (GCompareFunc)_compare_menu_items);
+  for(GList *iter = items; iter; iter = g_list_delete_link(iter, iter))
+  {
+    g_object_ref(iter->data);
+    gtk_container_remove(GTK_CONTAINER(menu_shell), GTK_WIDGET(iter->data));
+    _sort_menu_shell(gtk_menu_item_get_submenu(GTK_MENU_ITEM(iter->data)));
+    gtk_menu_shell_prepend(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(iter->data));
+    g_object_unref(iter->data);
+  }
+}
 
 GtkMenu *dt_gui_presets_popup_menu_show_for_module(dt_iop_module_t *module)
 {
@@ -1707,7 +1732,7 @@ GtkMenu *dt_gui_presets_popup_menu_show_for_module(dt_iop_module_t *module)
   int last_wp = -1;
   gchar **prev_split = NULL;
   GtkWidget *submenu = GTK_WIDGET(menu);
-  GSList *menu_stack = NULL; // stack of submenus
+  GtkWidget *mainmenu = submenu;
   GSList *menu_path = NULL; // stack of menuitems which are the parents of submenus on menu_stack
   while(sqlite3_step(stmt) == SQLITE_ROW)
   {
@@ -1740,23 +1765,19 @@ GtkMenu *dt_gui_presets_popup_menu_show_for_module(dt_iop_module_t *module)
     if(darktable.gui->last_preset && strcmp(darktable.gui->last_preset, name) == 0)
       found = TRUE;
 
-    gchar **split = g_strsplit(name, "|", -1), **s = split, **p = prev_split;
+    gchar *local_name = dt_util_localize_segmented_name(name, FALSE);
+    gchar **split = g_strsplit(local_name, "|", -1), **s = split, **p = prev_split;
+    g_free(local_name);
     for(; p && *(p+1) && *(s+1) && !g_strcmp0(*s, *p); p++, s++)
       ;
     for(; p && *(p+1); p++)
     {
-      submenu = menu_stack->data;
-      menu_stack = g_slist_delete_link(menu_stack, menu_stack); // pop
       menu_path = g_slist_delete_link(menu_path, menu_path); // pop
+      submenu = menu_path ? gtk_menu_item_get_submenu(menu_path->data) : mainmenu;
     }
     for(; *(s+1); s++)
     {
-      GtkWidget *sm = gtk_menu_item_new_with_label("");
-      GtkWidget *mi_label = gtk_bin_get_child(GTK_BIN(sm));
-      gchar *el = g_markup_escape_text(*s, -1);
-      gtk_label_set_markup(GTK_LABEL(mi_label), el);
-      g_free(el);
-      menu_stack = g_slist_prepend(menu_stack, submenu); // push
+      GtkWidget *sm = gtk_menu_item_new_with_label(*s);
       menu_path = g_slist_prepend(menu_path, sm); // push
 
       gtk_menu_shell_append(GTK_MENU_SHELL(submenu), sm);
@@ -1779,13 +1800,9 @@ GtkMenu *dt_gui_presets_popup_menu_show_for_module(dt_iop_module_t *module)
       label = g_strdup_printf("%s %s", *s, _("(default)"));
     else
       label = g_strdup(*s);
-    mi = gtk_check_menu_item_new_with_label("");
-    GtkWidget *mi_label = gtk_bin_get_child(GTK_BIN(mi));
-    gchar *el = g_markup_escape_text(label, -1);
-    gtk_label_set_markup(GTK_LABEL(mi_label), el);
+    mi = gtk_check_menu_item_new_with_label(label);
     dt_gui_add_class(mi, "dt_transparent_background");
     g_free(label);
-    g_free(el);
 
     if(module
        && ((op_params_size == 0
@@ -1805,16 +1822,7 @@ GtkMenu *dt_gui_presets_popup_menu_show_for_module(dt_iop_module_t *module)
       g_set_weak_pointer(&_active_menu_item, mi);
       // walk back up the menu hierarchy and highlight the entire path down to the current leaf
       for(const GSList *mp = menu_path; mp; mp = g_slist_next(mp))
-      {
-        const char *curr_label = gtk_menu_item_get_label(GTK_MENU_ITEM(mp->data));
-        if(curr_label)
-        {
-          gchar *boldface = g_strdup_printf("<b>%s</b>",curr_label);
-          GtkWidget *child = gtk_bin_get_child(GTK_BIN(mp->data));
-          gtk_label_set_markup(GTK_LABEL(child), boldface);
-          g_free(boldface);
-        }
-      }
+        dt_gui_add_class(gtk_bin_get_child(GTK_BIN(mp->data)), "active_menu_item");
     }
 
     if(isdisabled)
@@ -1831,9 +1839,11 @@ GtkMenu *dt_gui_presets_popup_menu_show_for_module(dt_iop_module_t *module)
     cnt++;
   }
   sqlite3_finalize(stmt);
-  g_slist_free(menu_stack);
+  g_slist_free(menu_path);
   g_strfreev(prev_split);
 
+  _sort_menu_shell(mainmenu);
+
   if(cnt > 0) gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
 
   if(module)
@@ -1859,7 +1869,7 @@ GtkMenu *dt_gui_presets_popup_menu_show_for_module(dt_iop_module_t *module)
 
       if(darktable.gui->last_preset && found)
       {
-        char *markup = g_markup_printf_escaped("%s <span weight='bold'>%s</span>",
+        char *markup = g_markup_printf_escaped("%s <b>%s</b>",
                                                _("update preset"),
                                                darktable.gui->last_preset);
         mi = gtk_menu_item_new_with_label("");

src/gui/presets.h

@@ -75,14 +75,16 @@ typedef struct dt_gui_presets_edit_dialog_t
 void dt_gui_presets_init();
 
 /** add or replace a generic (i.e. non-exif specific) preset for this operation. */
-void dt_gui_presets_add_generic(const char *name,
+/** the names _have_ to be marked for translation with _("") otherwise use dt_gui_presets_add_with_blendop */
+#define dt_gui_presets_add_generic(name, ...) dt_gui_presets_add_generic(N##name, __VA_ARGS__)
+void (dt_gui_presets_add_generic)(const char *name,
                                 const dt_dev_operation_t op,
                                 const int32_t version,
                                 const void *params,
                                 const int32_t params_size,
                                 const int32_t enabled,
                                 const dt_develop_blend_colorspace_t blend_cst);
-
+#define BUILTIN_PRESET(name) BUILTIN_PREFIX name
 /** same as add_generic but also supply blendop parameters for the presets. */
 void dt_gui_presets_add_with_blendop(const char *name,
                                      const dt_dev_operation_t op,