Skip to content

Commit 05ff1b1

Browse files
committed
add module preset label to module header
1 parent 65c2c85 commit 05ff1b1

File tree

5 files changed

+22
-5
lines changed

5 files changed

+22
-5
lines changed

data/themes/darktable-elegant-highcontrast.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
@define-color graph_fg_active @grey_100;
3838
@define-color graph_grid @grey_00;
3939

40-
#iop-panel-label, #lib-panel-label, #iop-module-name { color: @fg_color; }
40+
#iop-panel-label, #lib-panel-label, #iop-module-name, #lib-module-name { color: @fg_color; }
4141
#module-header .toggle:checked { color: @fg_color; }

data/themes/darktable-icons-highcontrast.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
@define-color graph_fg_active @grey_100;
3838
@define-color graph_grid @grey_00;
3939

40-
#iop-panel-label, #lib-panel-label, #iop-module-name { color: @fg_color; }
40+
#iop-panel-label, #lib-panel-label, #iop-module-name, #lib-module-name { color: @fg_color; }
4141
#module-header .toggle:checked { color: @fg_color; }

data/themes/darktable.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,8 @@ dialog .sidebar row:selected:hover label,
600600
}
601601

602602
#snapshot-button entry,
603-
#iop-module-name
603+
#iop-module-name,
604+
#lib-module-name
604605
{
605606
font-weight: lighter;
606607
font-family: sans-serif, "Arial Unicode MS";

src/libs/lib.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,15 @@ void dt_lib_presets_update(const gchar *preset,
403403
static void _menuitem_activate_preset(GtkMenuItem *menuitem,
404404
dt_lib_module_info_t *minfo)
405405
{
406-
dt_lib_presets_apply(g_object_get_data(G_OBJECT(menuitem), "dt-preset-name"),
407-
minfo->plugin_name, minfo->version);
406+
gchar *preset_name = g_object_get_data(G_OBJECT(menuitem), "dt-preset-name");
407+
gboolean res = dt_lib_presets_apply(preset_name,
408+
minfo->plugin_name, minfo->version);
409+
410+
if(res){
411+
gchar *preset_label_text = g_strdup_printf("• %s", preset_name);
412+
gtk_label_set_text(GTK_LABEL(minfo->module->preset_label), preset_label_text);
413+
g_free(preset_label_text);
414+
}
408415
}
409416

410417
static gboolean _menuitem_button_preset(GtkMenuItem *menuitem,
@@ -892,6 +899,7 @@ static gboolean _lib_gui_reset_callback(GtkButton *button,
892899
{
893900
dt_lib_module_t *module = (dt_lib_module_t *)user_data;
894901
module->gui_reset(module);
902+
gtk_label_set_text(GTK_LABEL(module->preset_label), "");
895903
return TRUE;
896904
}
897905

@@ -1275,6 +1283,13 @@ GtkWidget *dt_lib_gui_get_expander(dt_lib_module_t *module)
12751283
dt_action_define(&module->actions, NULL, NULL, label_evb, NULL);
12761284
gtk_box_pack_start(GTK_BOX(header), label_evb, FALSE, FALSE, 0);
12771285

1286+
module->preset_label = gtk_label_new(NULL);
1287+
gtk_widget_set_name(module->preset_label, "lib-module-name");
1288+
gtk_label_set_ellipsize(GTK_LABEL(module->preset_label), PANGO_ELLIPSIZE_MIDDLE);
1289+
gtk_widget_set_valign(module->preset_label, GTK_ALIGN_BASELINE);
1290+
g_object_set(G_OBJECT(module->preset_label), "xalign", 0.0, (gchar *)0);
1291+
gtk_box_pack_start(GTK_BOX(header), module->preset_label, FALSE, FALSE, 0);
1292+
12781293
/* add preset button if module has implementation */
12791294
module->presets_button = dtgtk_button_new(dtgtk_cairo_paint_presets, 0, NULL);
12801295
gtk_widget_set_tooltip_text(module->presets_button, _("presets and preferences"));

src/libs/lib.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ typedef struct dt_lib_module_t
116116
gboolean gui_uptodate;
117117

118118
GtkWidget *arrow;
119+
GtkWidget *preset_label;
119120
GtkWidget *reset_button;
120121
GtkWidget *presets_button;
121122

0 commit comments

Comments
 (0)