update preset_label on param change

zisoft · zisoft · commit 1cdb48bf1d68 · 2025-02-23T17:40:21.000+01:00
diff --git a/src/libs/filtering.c b/src/libs/filtering.c
@@ -19,10 +19,8 @@
 #include "bauhaus/bauhaus.h"
 #include "common/collection.h"
 #include "common/darktable.h"
-#include "common/metadata.h"
 #include "control/conf.h"
 #include "control/control.h"
-#include "control/jobs.h"
 #include "dtgtk/button.h"
 #include "dtgtk/range.h"
 #include "gui/accelerators.h"
@@ -2252,6 +2250,12 @@ void gui_init(dt_lib_module_t *self)
   DT_CONTROL_SIGNAL_HANDLE(DT_SIGNAL_IMAGES_ORDER_CHANGE, _dt_images_order_change);
 }
 
+void gui_update(dt_lib_module_t *self)
+{
+  // Don't remove the empty function to not break the gui_update chain.
+  // It is needed to update the preset_label in the module header when params change.
+}
+
 void gui_cleanup(dt_lib_module_t *self)
 {
   dt_lib_filtering_t *d = self->data;
diff --git a/src/libs/import.c b/src/libs/import.c
@@ -1,6 +1,6 @@
 /*
     This file is part of darktable,
-    Copyright (C) 2011-2024 darktable developers.
+    Copyright (C) 2011-2025 darktable developers.
 
     darktable is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,11 +16,9 @@
     along with darktable.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "bauhaus/bauhaus.h"
 #include "common/collection.h"
 #include "common/darktable.h"
 #include "common/file_location.h"
-#include "common/debug.h"
 #include "common/exif.h"
 #include "common/metadata.h"
 #include "common/datetime.h"
@@ -29,7 +27,6 @@
 #ifdef HAVE_GPHOTO2
 #include "control/jobs/camera_jobs.h"
 #endif
-#include "dtgtk/expander.h"
 #include "dtgtk/button.h"
 #include "gui/accelerators.h"
 #include "gui/gtk.h"
@@ -2505,6 +2502,12 @@ void gui_init(dt_lib_module_t *self)
   dt_gui_update_collapsible_section(&d->cs);
 }
 
+void gui_update(dt_lib_module_t *self)
+{
+  // Don't remove the empty function to not break the gui_update chain.
+  // It is needed to update the preset_label in the module header when params change.
+}
+
 void gui_cleanup(dt_lib_module_t *self)
 {
   dt_lib_import_t *d = self->data;
diff --git a/src/libs/lib.c b/src/libs/lib.c
@@ -1,6 +1,6 @@
 /*
     This file is part of darktable,
-    Copyright (C) 2009-2024 darktable developers.
+    Copyright (C) 2009-2025 darktable developers.
 
     darktable is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,13 +23,13 @@
 #include "control/control.h"
 #include "dtgtk/button.h"
 #include "dtgtk/expander.h"
-#include "dtgtk/icon.h"
 #include "gui/accelerators.h"
 #include "gui/drag_and_drop.h"
 #include "gui/gtk.h"
 #include "gui/presets.h"
+#include <glib-2.0/glib.h>
+#include <string.h>
 #ifdef GDK_WINDOWING_QUARTZ
-#include "osx/osx.h"
 #endif
 #include <stdbool.h>
 #include <stdlib.h>
@@ -103,6 +103,33 @@ gchar *dt_lib_get_active_preset_name(dt_lib_module_info_t *minfo)
   return name;
 }
 
+// get dt_lib_module_info_t for a module. Must be freed by free_module_info()
+static dt_lib_module_info_t *_get_module_info_for_module(dt_lib_module_t *module)
+{
+  dt_lib_module_info_t *mi = calloc(1, sizeof(dt_lib_module_info_t));
+
+  mi->plugin_name = g_strdup(module->plugin_name);
+  mi->version = module->version();
+  mi->module = module;
+  mi->params = module->get_params ? module->get_params(module, &mi->params_size) : NULL;
+  if(!mi->params)
+  {
+    // this is a valid case, for example in location.c when nothing got selected
+    // fprintf(stderr, "something went wrong: &params=%p, size=%i\n",
+    //         mi->params, mi->params_size);
+    mi->params_size = 0;
+  }
+  return mi;
+}
+
+static void _set_module_preset_label(dt_lib_module_t *module, const gchar *preset_name)
+{
+  gchar *preset_label_text = (*preset_name == '\0')? g_strdup("")
+                                                   : g_strdup_printf("• %s", preset_name);
+  gtk_label_set_text(GTK_LABEL(module->preset_label), preset_label_text);
+  g_free(preset_label_text);
+}
+
 static void edit_preset(const char *name_in,
                         dt_lib_module_info_t *minfo)
 {
@@ -237,6 +264,7 @@ static void menuitem_delete_preset(GtkMenuItem *menuitem,
     dt_action_rename_preset(&minfo->module->actions, name, NULL);
 
     dt_lib_presets_remove(name, minfo->plugin_name, minfo->version);
+    _set_module_preset_label(minfo->module, "");
 
     DT_CONTROL_SIGNAL_RAISE(DT_SIGNAL_PRESETS_CHANGED,
                             g_strdup(minfo->plugin_name));
@@ -356,6 +384,8 @@ gboolean dt_lib_presets_apply(const gchar *preset,
           dt_conf_set_string(tx, preset);
           g_free(tx);
           res = module->set_params(module, blob, length);
+          if(!res)
+            _set_module_preset_label(module, preset);
           break;
         }
       }
@@ -403,15 +433,8 @@ void dt_lib_presets_update(const gchar *preset,
 static void _menuitem_activate_preset(GtkMenuItem *menuitem,
                                       dt_lib_module_info_t *minfo)
 {
-  gchar *preset_name = g_object_get_data(G_OBJECT(menuitem), "dt-preset-name");
-  gboolean res = dt_lib_presets_apply(preset_name,
-                                      minfo->plugin_name, minfo->version);
-
-  if(res){
-    gchar *preset_label_text = g_strdup_printf("• %s", preset_name);
-    gtk_label_set_text(GTK_LABEL(minfo->module->preset_label), preset_label_text);
-    g_free(preset_label_text);
-  }
+  dt_lib_presets_apply(g_object_get_data(G_OBJECT(menuitem), "dt-preset-name"),
+                       minfo->plugin_name, minfo->version);
 }
 
 static gboolean _menuitem_button_preset(GtkMenuItem *menuitem,
@@ -864,6 +887,12 @@ void dt_lib_gui_update(dt_lib_module_t *module)
     module->gui_update(module);
     module->gui_uptodate = TRUE;
   }
+
+  dt_lib_module_info_t *mi = _get_module_info_for_module(module);
+  gchar *active_preset_name = dt_lib_get_active_preset_name(mi);
+  free_module_info(NULL, mi);
+  _set_module_preset_label(module, active_preset_name? active_preset_name : "");
+  g_free(active_preset_name);
 }
 
 static void dt_lib_init_module(void *m)
@@ -907,19 +936,7 @@ static gboolean _presets_popup_callback(GtkButton *button,
                                         GdkEventButton *e,
                                         dt_lib_module_t *module)
 {
-  dt_lib_module_info_t *mi = calloc(1, sizeof(dt_lib_module_info_t));
-
-  mi->plugin_name = g_strdup(module->plugin_name);
-  mi->version = module->version();
-  mi->module = module;
-  mi->params = module->get_params ? module->get_params(module, &mi->params_size) : NULL;
-  if(!mi->params)
-  {
-    // this is a valid case, for example in location.c when nothing got selected
-    // fprintf(stderr, "something went wrong: &params=%p, size=%i\n",
-    //         mi->params, mi->params_size);
-    mi->params_size = 0;
-  }
+  dt_lib_module_info_t *mi = _get_module_info_for_module(module);
   dt_lib_presets_popup_menu_show(mi, GTK_WIDGET(button));
 
   if(button)
@@ -1283,6 +1300,7 @@ GtkWidget *dt_lib_gui_get_expander(dt_lib_module_t *module)
   dt_action_define(&module->actions, NULL, NULL, label_evb, NULL);
   gtk_box_pack_start(GTK_BOX(header), label_evb, FALSE, FALSE, 0);
 
+  /* add preset label */
   module->preset_label = gtk_label_new(NULL);
   gtk_widget_set_name(module->preset_label, "lib-module-name");
   gtk_label_set_ellipsize(GTK_LABEL(module->preset_label), PANGO_ELLIPSIZE_MIDDLE);
@@ -1331,6 +1349,15 @@ GtkWidget *dt_lib_gui_get_expander(dt_lib_module_t *module)
   dt_gui_add_class(pluginui_frame, "dt_plugin_ui");
   module->expander = expander;
 
+  // get active preset and set preset_label
+  dt_lib_module_info_t *mi = _get_module_info_for_module(module);
+  gchar *preset_name = dt_lib_get_active_preset_name(mi);
+  if(preset_name)
+  {
+    _set_module_preset_label(mi->module, preset_name);
+    g_free(preset_name);
+  }
+  free_module_info(NULL, mi);
 
   return module->expander;
 }
@@ -1553,6 +1580,11 @@ gboolean dt_lib_presets_can_autoapply(dt_lib_module_t *mod)
   return mod->preset_autoapply(mod);
 }
 
+void dt_lib_reset_preset_label(dt_lib_module_t *mod)
+{
+  gtk_label_set_text(GTK_LABEL(mod->preset_label), "");
+}
+
 static float _action_process(gpointer target,
                              const dt_action_element_t element,
                              const dt_action_effect_t effect,
