From 05ff1b174f54ee43b5350d37a30bfe8670b946bf Mon Sep 17 00:00:00 2001 From: Mario Zimmermann Date: Fri, 21 Feb 2025 13:53:09 +0100 Subject: [PATCH 1/6] add module preset label to module header --- .../themes/darktable-elegant-highcontrast.css | 2 +- data/themes/darktable-icons-highcontrast.css | 2 +- data/themes/darktable.css | 3 ++- src/libs/lib.c | 19 +++++++++++++++++-- src/libs/lib.h | 1 + 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/data/themes/darktable-elegant-highcontrast.css b/data/themes/darktable-elegant-highcontrast.css index ce514283368c..ba21229f38e7 100644 --- a/data/themes/darktable-elegant-highcontrast.css +++ b/data/themes/darktable-elegant-highcontrast.css @@ -37,5 +37,5 @@ @define-color graph_fg_active @grey_100; @define-color graph_grid @grey_00; -#iop-panel-label, #lib-panel-label, #iop-module-name { color: @fg_color; } +#iop-panel-label, #lib-panel-label, #iop-module-name, #lib-module-name { color: @fg_color; } #module-header .toggle:checked { color: @fg_color; } diff --git a/data/themes/darktable-icons-highcontrast.css b/data/themes/darktable-icons-highcontrast.css index f94a1f4d3a09..06b17e1b6cc4 100644 --- a/data/themes/darktable-icons-highcontrast.css +++ b/data/themes/darktable-icons-highcontrast.css @@ -37,5 +37,5 @@ @define-color graph_fg_active @grey_100; @define-color graph_grid @grey_00; -#iop-panel-label, #lib-panel-label, #iop-module-name { color: @fg_color; } +#iop-panel-label, #lib-panel-label, #iop-module-name, #lib-module-name { color: @fg_color; } #module-header .toggle:checked { color: @fg_color; } diff --git a/data/themes/darktable.css b/data/themes/darktable.css index e3defb87dbe2..92d28f089a13 100644 --- a/data/themes/darktable.css +++ b/data/themes/darktable.css @@ -600,7 +600,8 @@ dialog .sidebar row:selected:hover label, } #snapshot-button entry, -#iop-module-name +#iop-module-name, +#lib-module-name { font-weight: lighter; font-family: sans-serif, "Arial Unicode MS"; diff --git a/src/libs/lib.c b/src/libs/lib.c index 39bb6325a60a..3ded1e023515 100644 --- a/src/libs/lib.c +++ b/src/libs/lib.c @@ -403,8 +403,15 @@ void dt_lib_presets_update(const gchar *preset, static void _menuitem_activate_preset(GtkMenuItem *menuitem, dt_lib_module_info_t *minfo) { - dt_lib_presets_apply(g_object_get_data(G_OBJECT(menuitem), "dt-preset-name"), - minfo->plugin_name, minfo->version); + 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); + } } static gboolean _menuitem_button_preset(GtkMenuItem *menuitem, @@ -892,6 +899,7 @@ static gboolean _lib_gui_reset_callback(GtkButton *button, { dt_lib_module_t *module = (dt_lib_module_t *)user_data; module->gui_reset(module); + gtk_label_set_text(GTK_LABEL(module->preset_label), ""); return TRUE; } @@ -1275,6 +1283,13 @@ 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); + 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); + gtk_widget_set_valign(module->preset_label, GTK_ALIGN_BASELINE); + g_object_set(G_OBJECT(module->preset_label), "xalign", 0.0, (gchar *)0); + gtk_box_pack_start(GTK_BOX(header), module->preset_label, FALSE, FALSE, 0); + /* add preset button if module has implementation */ module->presets_button = dtgtk_button_new(dtgtk_cairo_paint_presets, 0, NULL); gtk_widget_set_tooltip_text(module->presets_button, _("presets and preferences")); diff --git a/src/libs/lib.h b/src/libs/lib.h index 04d1319c4cdc..cef38d379da1 100644 --- a/src/libs/lib.h +++ b/src/libs/lib.h @@ -116,6 +116,7 @@ typedef struct dt_lib_module_t gboolean gui_uptodate; GtkWidget *arrow; + GtkWidget *preset_label; GtkWidget *reset_button; GtkWidget *presets_button; From 1cdb48bf1d685560ef584ae7a8dad0958f83509c Mon Sep 17 00:00:00 2001 From: Mario Zimmermann Date: Sat, 22 Feb 2025 20:08:45 +0100 Subject: [PATCH 2/6] update preset_label on param change --- src/libs/filtering.c | 8 +++-- src/libs/import.c | 11 +++--- src/libs/lib.c | 82 ++++++++++++++++++++++++++++++-------------- 3 files changed, 70 insertions(+), 31 deletions(-) diff --git a/src/libs/filtering.c b/src/libs/filtering.c index d6e30f39942a..dbd77d1fbf4b 100644 --- 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 index d9ad5c68a3ca..2b32edc6a684 100644 --- 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 . */ -#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 index 3ded1e023515..f2a890aee6fa 100644 --- 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 +#include #ifdef GDK_WINDOWING_QUARTZ -#include "osx/osx.h" #endif #include #include @@ -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: ¶ms=%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: ¶ms=%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, From f03df1adb17b9b2276a08cdff86bd8813619f0ea Mon Sep 17 00:00:00 2001 From: Mario Zimmermann Date: Sun, 23 Feb 2025 18:31:58 +0100 Subject: [PATCH 3/6] rename static functions with leading '_' --- src/libs/lib.c | 63 ++++++++++++++++++++++++-------------------------- src/libs/lib.h | 6 +---- 2 files changed, 31 insertions(+), 38 deletions(-) diff --git a/src/libs/lib.c b/src/libs/lib.c index f2a890aee6fa..9d0c891f45d3 100644 --- a/src/libs/lib.c +++ b/src/libs/lib.c @@ -27,10 +27,6 @@ #include "gui/drag_and_drop.h" #include "gui/gtk.h" #include "gui/presets.h" -#include -#include -#ifdef GDK_WINDOWING_QUARTZ -#endif #include #include @@ -103,7 +99,7 @@ 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() +// 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)); @@ -122,7 +118,8 @@ static dt_lib_module_info_t *_get_module_info_for_module(dt_lib_module_t *module return mi; } -static void _set_module_preset_label(dt_lib_module_t *module, const gchar *preset_name) +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); @@ -130,8 +127,8 @@ static void _set_module_preset_label(dt_lib_module_t *module, const gchar *prese g_free(preset_label_text); } -static void edit_preset(const char *name_in, - dt_lib_module_info_t *minfo) +static void _edit_preset(const char *name_in, + dt_lib_module_info_t *minfo) { // get the original name of the preset gchar *name = NULL; @@ -171,8 +168,8 @@ static void edit_preset(const char *name_in, GTK_WINDOW(window)); } -static void menuitem_update_preset(GtkMenuItem *menuitem, - dt_lib_module_info_t *minfo) +static void _menuitem_update_preset(GtkMenuItem *menuitem, + dt_lib_module_info_t *minfo) { char *name = g_object_get_data(G_OBJECT(menuitem), "dt-preset-name"); @@ -204,8 +201,8 @@ static void menuitem_update_preset(GtkMenuItem *menuitem, } } -static void menuitem_new_preset(GtkMenuItem *menuitem, - dt_lib_module_info_t *minfo) +static void _menuitem_new_preset(GtkMenuItem *menuitem, + dt_lib_module_info_t *minfo) { dt_lib_presets_remove(_("new preset"), minfo->plugin_name, minfo->version); @@ -235,23 +232,23 @@ static void menuitem_new_preset(GtkMenuItem *menuitem, dt_action_define_preset(&minfo->module->actions, _("new preset")); // then show edit dialog - edit_preset(_("new preset"), minfo); + _edit_preset(_("new preset"), minfo); } -static void menuitem_edit_preset(GtkMenuItem *menuitem, - dt_lib_module_info_t *minfo) +static void _menuitem_edit_preset(GtkMenuItem *menuitem, + dt_lib_module_info_t *minfo) { - edit_preset(NULL, minfo); + _edit_preset(NULL, minfo); } -static void menuitem_manage_presets(GtkMenuItem *menuitem, - dt_lib_module_info_t *minfo) +static void _menuitem_manage_presets(GtkMenuItem *menuitem, + dt_lib_module_info_t *minfo) { if(minfo->module->manage_presets) minfo->module->manage_presets(minfo->module); } -static void menuitem_delete_preset(GtkMenuItem *menuitem, - dt_lib_module_info_t *minfo) +static void _menuitem_delete_preset(GtkMenuItem *menuitem, + dt_lib_module_info_t *minfo) { gchar *name = dt_lib_get_active_preset_name(minfo); if(name == NULL) return; @@ -448,8 +445,8 @@ static gboolean _menuitem_button_preset(GtkMenuItem *menuitem, return TRUE; } -static void free_module_info(GtkWidget *widget, - gpointer user_data) +static void _free_module_info(GtkWidget *widget, + gpointer user_data) { dt_lib_module_info_t *minfo = (dt_lib_module_info_t *)user_data; g_free(minfo->plugin_name); @@ -457,15 +454,15 @@ static void free_module_info(GtkWidget *widget, free(minfo); } -static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo, - GtkWidget *w) +static void _dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo, + GtkWidget *w) { GtkMenu *menu = GTK_MENU(gtk_menu_new()); const gboolean hide_default = dt_conf_get_bool("plugins/lighttable/hide_default_presets"); const gboolean default_first = dt_conf_get_bool("modules/default_presets_first"); - g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(free_module_info), minfo); + g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(_free_module_info), minfo); GtkWidget *mi; int active_preset = -1, cnt = 0; @@ -559,7 +556,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo, if(minfo->module->manage_presets) { mi = gtk_menu_item_new_with_label(_("manage presets...")); - g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_manage_presets), minfo); + g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_manage_presets), minfo); gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); cnt++; } @@ -568,11 +565,11 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo, if(!selected_writeprotect) { mi = gtk_menu_item_new_with_label(_("edit this preset..")); - g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_edit_preset), minfo); + g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_edit_preset), minfo); gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); mi = gtk_menu_item_new_with_label(_("delete this preset")); - g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_delete_preset), minfo); + g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_delete_preset), minfo); gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); cnt++; } @@ -586,7 +583,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo, gtk_widget_set_tooltip_text(mi, _("nothing to save")); } else - g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_new_preset), minfo); + g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(_menuitem_new_preset), minfo); gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); if(darktable.gui->last_preset && found) @@ -600,7 +597,7 @@ static void dt_lib_presets_popup_menu_show(dt_lib_module_info_t *minfo, g_object_set_data_full(G_OBJECT(mi), "dt-preset-name", g_strdup(darktable.gui->last_preset), g_free); g_signal_connect(G_OBJECT(mi), "activate", - G_CALLBACK(menuitem_update_preset), minfo); + G_CALLBACK(_menuitem_update_preset), minfo); gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); g_free(markup); } @@ -890,7 +887,7 @@ void dt_lib_gui_update(dt_lib_module_t *module) 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); + _free_module_info(NULL, mi); _set_module_preset_label(module, active_preset_name? active_preset_name : ""); g_free(active_preset_name); } @@ -937,7 +934,7 @@ static gboolean _presets_popup_callback(GtkButton *button, dt_lib_module_t *module) { dt_lib_module_info_t *mi = _get_module_info_for_module(module); - dt_lib_presets_popup_menu_show(mi, GTK_WIDGET(button)); + _dt_lib_presets_popup_menu_show(mi, GTK_WIDGET(button)); if(button) dtgtk_button_set_active(DTGTK_BUTTON(button), FALSE); @@ -1357,7 +1354,7 @@ GtkWidget *dt_lib_gui_get_expander(dt_lib_module_t *module) _set_module_preset_label(mi->module, preset_name); g_free(preset_name); } - free_module_info(NULL, mi); + _free_module_info(NULL, mi); return module->expander; } diff --git a/src/libs/lib.h b/src/libs/lib.h index cef38d379da1..395c2b6b20bc 100644 --- a/src/libs/lib.h +++ b/src/libs/lib.h @@ -1,6 +1,6 @@ /* This file is part of darktable, - Copyright (C) 2009-2023 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 @@ -28,11 +28,7 @@ #include "gui/presets.h" #ifdef USE_LUA -#include "lua/call.h" -#include "lua/events.h" #include "lua/lib.h" -#include "lua/modules.h" -#include "lua/types.h" #endif struct dt_lib_module_t; From 8ea7ac5743d7606920cc83ce34bba34a597c6262 Mon Sep 17 00:00:00 2001 From: Mario Zimmermann Date: Sun, 23 Feb 2025 19:34:13 +0100 Subject: [PATCH 4/6] make gui_update a default function --- src/libs/filtering.c | 6 ------ src/libs/import.c | 6 ------ src/libs/lib.c | 12 ++++++++---- src/libs/lib_api.h | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/libs/filtering.c b/src/libs/filtering.c index dbd77d1fbf4b..613175457d65 100644 --- a/src/libs/filtering.c +++ b/src/libs/filtering.c @@ -2250,12 +2250,6 @@ 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 index 2b32edc6a684..f2a9a50f7a8f 100644 --- a/src/libs/import.c +++ b/src/libs/import.c @@ -2502,12 +2502,6 @@ 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 index 9d0c891f45d3..58200c2ad77f 100644 --- a/src/libs/lib.c +++ b/src/libs/lib.c @@ -661,6 +661,11 @@ static gboolean default_preset_autoapply(dt_lib_module_t *self) return FALSE; } +/* default gui_update implementation */ +static void default_gui_update(dt_lib_module_t *self) +{ +} + static int dt_lib_load_module(void *m, const char *libname, const char *module_name) @@ -879,7 +884,7 @@ void dt_lib_gui_queue_update(dt_lib_module_t *module) void dt_lib_gui_update(dt_lib_module_t *module) { - if(module && module->gui_update && !module->gui_uptodate) + if(module && !module->gui_uptodate) { module->gui_update(module); module->gui_uptodate = TRUE; @@ -906,9 +911,8 @@ static void dt_lib_init_module(void *m) if(module->widget) { g_object_ref_sink(module->widget); - if(module->gui_update) - g_signal_connect(G_OBJECT(module->widget), "draw", - G_CALLBACK(_lib_draw_callback), module); + g_signal_connect(G_OBJECT(module->widget), "draw", + G_CALLBACK(_lib_draw_callback), module); } } } diff --git a/src/libs/lib_api.h b/src/libs/lib_api.h index d2116a3d4504..b7e2c0338d23 100644 --- a/src/libs/lib_api.h +++ b/src/libs/lib_api.h @@ -64,7 +64,7 @@ OPTIONAL(void, gui_reset, struct dt_lib_module_t *self); /** update libs gui when visible triggered by dt_lib_gui_queue_update. don't use for widgets accessible via actions when hidden. */ -OPTIONAL(void, gui_update, struct dt_lib_module_t *self); +DEFAULT(void, gui_update, struct dt_lib_module_t *self); OPTIONAL(GtkWidget *, gui_tool_box, struct dt_lib_module_t *self); From c816fa7be28d4b9bf6894ae39f02bfb3ea02a321 Mon Sep 17 00:00:00 2001 From: Mario Zimmermann Date: Mon, 24 Feb 2025 09:38:27 +0100 Subject: [PATCH 5/6] fix gtk critical errors --- src/libs/lib.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/libs/lib.c b/src/libs/lib.c index 58200c2ad77f..725024df953d 100644 --- a/src/libs/lib.c +++ b/src/libs/lib.c @@ -121,6 +121,8 @@ static dt_lib_module_info_t *_get_module_info_for_module(dt_lib_module_t *module static void _set_module_preset_label(dt_lib_module_t *module, const gchar *preset_name) { + if(!module->expander) return; + 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); @@ -698,6 +700,7 @@ static int dt_lib_load_module(void *m, module->widget = NULL; module->expander = NULL; module->arrow = NULL; + module->preset_label = NULL; module->reset_button = NULL; module->presets_button = NULL; @@ -890,11 +893,14 @@ void dt_lib_gui_update(dt_lib_module_t *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); + if(module->preset_label) + { + 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) From 2ff0dbabfe5813dc81a3d1538f0733060c29d599 Mon Sep 17 00:00:00 2001 From: Mario Zimmermann Date: Mon, 24 Feb 2025 21:12:17 +0100 Subject: [PATCH 6/6] fix metadata module preset handling --- src/libs/metadata.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/libs/metadata.c b/src/libs/metadata.c index f8b42ed644c7..f53555a51802 100644 --- a/src/libs/metadata.c +++ b/src/libs/metadata.c @@ -1520,14 +1520,19 @@ void *get_params(dt_lib_module_t *self, int *size) GtkTextBuffer *buffer = gtk_text_view_get_buffer(textview); GtkTextIter start, end; gtk_text_buffer_get_bounds(buffer, &start, &end); - const gchar *tagname = g_object_get_data(G_OBJECT(textview), "tagname"); - metadata_tagnames[i] = g_strdup(tagname); - metadata_tagname_len[i] = strlen(metadata_tagnames[i]) + 1; - metadata_texts[i] = gtk_text_buffer_get_text(buffer, &start, &end, TRUE); - if(!metadata_texts[i]) metadata_texts[i] = g_strdup(""); - metadata_len[i] = strlen(metadata_texts[i]) + 1; - *size = *size + metadata_tagname_len[i] + metadata_len[i]; - i++; + gchar *tagtext = gtk_text_buffer_get_text(buffer, &start, &end, TRUE); + if(*tagtext != '\0') + { + const gchar *tagname = g_object_get_data(G_OBJECT(textview), "tagname"); + metadata_tagnames[i] = g_strdup(tagname); + metadata_tagname_len[i] = strlen(metadata_tagnames[i]) + 1; + metadata_texts[i] = tagtext; + metadata_len[i] = strlen(metadata_texts[i]) + 1; + *size = *size + metadata_tagname_len[i] + metadata_len[i]; + i++; + } + else + g_free(tagtext); } dt_pthread_mutex_unlock(&darktable.metadata_threadsafe);