Merge branch 'presets-popover-menu' into collect_popover_menu

Author: zisoft

src/common/presets.c

@@ -25,6 +25,8 @@
 #include "develop/imageop.h"
 #include "libs/lib.h"
 
+#include <glib-2.0/gio/gmenu.h>
+#include <glib-2.0/gio/gmenumodel.h>
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include <libxml/parser.h>
@@ -548,6 +550,84 @@ GtkWidget *dt_insert_preset_in_menu_hierarchy(const char *name,
   return mi;
 }
 
+static void _menu_shell_insert_sorted2(GMenu *menu,
+                                       GMenuItem *item,
+                                       const gchar *name)
+{
+  GMenuModel *model = G_MENU_MODEL(menu);
+
+  int num = g_menu_model_get_n_items(model);
+  gboolean found = FALSE;
+  int i;
+  for(i = 0; i < num; i++)
+  {
+    gchar *item_label = NULL;
+    GVariant *attr = g_menu_model_get_item_attribute_value(model, i, "label", G_VARIANT_TYPE_STRING);
+    if(attr)
+    {
+      item_label = g_variant_dup_string(attr, NULL);
+      g_variant_unref(attr);
+      if(g_utf8_collate(item_label, name) > 0) found = TRUE;
+      g_free(item_label);
+      if(found) break;
+    }
+  }
+
+  g_menu_insert_item(menu, i, item);
+}
+
+void dt_insert_preset_in_menu_hierarchy2(const char *name,
+                                         const char *action,
+                                         GSList **menu_path,
+                                         GMenu *mainmenu,
+                                         GMenu **submenu,
+                                         gchar ***prev_split,
+                                         gboolean isdefault)
+{
+  gchar *local_name = dt_util_localize_segmented_name(name, FALSE);
+  gchar **split = g_strsplit(local_name, "|", -1);
+  gchar **s = split;
+  gchar **p = *prev_split;
+  GSList *mpath = *menu_path;
+  GMenuItem *mi;
+  g_free(local_name);
+
+  for(; p && *(p+1) && *(s+1) && !g_strcmp0(*s, *p); p++, s++)
+    ;
+
+  for(; p && *(p+1); p++)
+  {
+    mpath = g_slist_delete_link(mpath, mpath); // pop
+    *submenu = mpath ? mpath->data : mainmenu;
+  }
+
+  for(; *(s+1); s++)
+  {
+    GMenu *sm = g_menu_new();
+    GMenuItem *smi = g_menu_item_new_submenu(*s, G_MENU_MODEL(sm));
+    _menu_shell_insert_sorted2(*submenu, smi, *s);
+    *submenu = sm;
+    mpath = g_slist_prepend(mpath, sm); // push
+  }
+
+  *menu_path = mpath;
+  g_strfreev(*prev_split);
+  *prev_split = split;
+
+  if(isdefault)
+  {
+    gchar *label = g_strdup_printf("%s %s", *s, _("(default)"));
+    mi = g_menu_item_new(label, action);
+    _menu_shell_insert_sorted2(*submenu, mi, label);
+    g_free(label);
+  }
+  else
+  {
+    mi = g_menu_item_new(*s, action);
+    _menu_shell_insert_sorted2(*submenu, mi, *s);
+  }
+}
+
 // clang-format off
 // modelines: These editor modelines have been set for all relevant files by tools/update_modelines.py
 // vim: shiftwidth=2 expandtab tabstop=2 cindent

src/common/presets.h

@@ -65,6 +65,14 @@ GtkWidget *dt_insert_preset_in_menu_hierarchy(const char *name,
                                               gboolean isdefault,
                                               gboolean writeprotect);
 
+void dt_insert_preset_in_menu_hierarchy2(const char *name,
+                                         const char *action,
+                                         GSList **menu_path2,
+                                         GMenu *mainmenu2,
+                                         GMenu **submenu2,
+                                         gchar ***prev_split,
+                                         gboolean isdefault);
+
 // clang-format off
 // modelines: These editor modelines have been set for all relevant files by tools/update_modelines.py
 // vim: shiftwidth=2 expandtab tabstop=2 cindent

src/gui/gtk.c

@@ -4832,7 +4832,8 @@ GtkWidget *dt_gui_popover_menu_from_model(GtkWidget *parent, GMenu *menu)
   GtkWidget *popover_menu;
 
 #if GTK_CHECK_VERSION(4, 0, 0)
-  popover_menu = gtk_popover_menu_new_from_model(G_MENU_MODEL(menu));
+  popover_menu = gtk_popover_menu_new_from_model_full(G_MENU_MODEL(menu),
+                                                      GTK_POPOVER_MENU_NESTED);
   gtk_widget_set_parent(popover_menu, parent);
 #else
   popover_menu = gtk_popover_new_from_model(parent, G_MENU_MODEL(menu));

src/libs/collect.c

@@ -3383,8 +3383,9 @@ static void _populate_collect_combo(GtkWidget *w)
 #undef ADD_COLLECT_ENTRY
 }
 
-void _menuitem_preferences(GtkMenuItem *menuitem,
-                           dt_lib_module_t *self)
+static void _menuitem_preferences(GSimpleAction *action,
+                                  GVariant *parameter,
+                                  gpointer user_data)
 {
   GtkWidget *win = dt_ui_main_window(darktable.gui->ui);
   GtkWidget *dialog = gtk_dialog_new_with_buttons
@@ -3407,12 +3408,12 @@ void _menuitem_preferences(GtkMenuItem *menuitem,
                              DT_COLLECTION_PROP_UNDEF, NULL);
 }
 
-void set_preferences(void *menu,
-                     dt_lib_module_t *self)
+void set_preferences(GMenu *menu, GActionGroup *action_group, dt_lib_module_t *self)
 {
-  GtkWidget *mi = gtk_menu_item_new_with_label(_("preferences..."));
-  g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_preferences), self);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+  GSimpleAction *action = g_simple_action_new("preferences", NULL);
+  g_signal_connect(action, "activate", G_CALLBACK(_menuitem_preferences), self);
+  g_action_map_add_action(G_ACTION_MAP(action_group), G_ACTION(action));
+  g_menu_append(menu, _("preferences..."), "presets.preferences");
 }
 
 static gint _sort_model_func(GtkTreeModel *model,

src/libs/export.c

@@ -1274,8 +1274,11 @@ static void _on_storage_list_changed(gpointer instance,
   dt_bauhaus_combobox_set(d->storage, dt_imageio_get_index_of_storage(storage));
 }
 
-static void _menuitem_preferences(GtkMenuItem *menuitem, dt_lib_module_t *self)
+static void _menuitem_preferences(GSimpleAction *action,
+                                  GVariant *parameter,
+                                  gpointer user_data)
 {
+  dt_lib_module_t *self = (dt_lib_module_t *)user_data;
   dt_lib_export_t *d = self->data;
   const gchar *name = dt_bauhaus_combobox_get_text(d->storage);
   const gboolean ondisk = name
@@ -1422,12 +1425,12 @@ static void _export_presets_changed_callback(gpointer instance, gpointer module,
     _fill_batch_export_list(self);
 }
 
-void set_preferences(void *menu, dt_lib_module_t *self)
+void set_preferences(GMenu *menu, GActionGroup *action_group, dt_lib_module_t *self)
 {
-  GtkWidget *mi = gtk_menu_item_new_with_label(_("preferences..."));
-  g_signal_connect(G_OBJECT(mi), "activate",
-                   G_CALLBACK(_menuitem_preferences), self);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+  GSimpleAction *action = g_simple_action_new("preferences", NULL);
+  g_signal_connect(action, "activate", G_CALLBACK(_menuitem_preferences), self);
+  g_action_map_add_action(G_ACTION_MAP(action_group), G_ACTION(action));
+  g_menu_append(menu, _("preferences..."), "presets.preferences");
 }
 
 void gui_init(dt_lib_module_t *self)