From 1bc92810912bc6f4801f5d10374f4c5d1ed16770 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Thu, 9 May 2024 11:17:20 +0200 Subject: [PATCH 1/3] plug-ins: Use G_DECLARE_FINAL_TYPE in metadata plugin Use the opportunity also to rename the plug-in to a more self-explanatory `GimpMetadataViewer` (rather than a `Metadata` struct which can be easily confused with `GimpMetadata`). --- plug-ins/metadata/metadata-viewer.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/plug-ins/metadata/metadata-viewer.c b/plug-ins/metadata/metadata-viewer.c index 8b0e025294..a285ee4eec 100644 --- a/plug-ins/metadata/metadata-viewer.c +++ b/plug-ins/metadata/metadata-viewer.c @@ -69,24 +69,14 @@ enum }; -typedef struct _Metadata Metadata; -typedef struct _MetadataClass MetadataClass; +#define GIMP_TYPE_METADATA_VIEWER (gimp_metadata_viewer_get_type ()) +G_DECLARE_FINAL_TYPE (GimpMetadataViewer, gimp_metadata_viewer, GIMP, METADATA_VIEWER, GimpPlugIn) -struct _Metadata +struct _GimpMetadataViewer { GimpPlugIn parent_instance; }; -struct _MetadataClass -{ - GimpPlugInClass parent_class; -}; - - -#define METADATA_TYPE (metadata_get_type ()) -#define METADATA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), METADATA_TYPE, Metadata)) - -GType metadata_get_type (void) G_GNUC_CONST; static GList * metadata_query_procedures (GimpPlugIn *plug_in); static GimpProcedure * metadata_create_procedure (GimpPlugIn *plug_in, @@ -137,14 +127,14 @@ static gchar * metadata_format_string_value (const gchar *value, static inline gboolean metadata_tag_is_string (const gchar *tag); -G_DEFINE_TYPE (Metadata, metadata, GIMP_TYPE_PLUG_IN) +G_DEFINE_TYPE (GimpMetadataViewer, gimp_metadata_viewer, GIMP_TYPE_PLUG_IN) -GIMP_MAIN (METADATA_TYPE) +GIMP_MAIN (GIMP_TYPE_METADATA_VIEWER) DEFINE_STD_SET_I18N static void -metadata_class_init (MetadataClass *klass) +gimp_metadata_viewer_class_init (GimpMetadataViewerClass *klass) { GimpPlugInClass *plug_in_class = GIMP_PLUG_IN_CLASS (klass); @@ -154,7 +144,7 @@ metadata_class_init (MetadataClass *klass) } static void -metadata_init (Metadata *metadata) +gimp_metadata_viewer_init (GimpMetadataViewer *self) { } From 705cf31c19315c81de16487d12e391277b8740ce Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Thu, 9 May 2024 14:16:40 +0200 Subject: [PATCH 2/3] plug-ins: Use GtkListBox in metadata viewer This commit changes the metadata viewer to use `GtkListBox`es instead of `GtkTreeView`s for displaying the tags and their values. The main advantages is that the latter isn't available in GTK4 (making the eventual port to it smaller), that they have a11y problems, and that list boxes allow more advanced UIs than just showing a simple string. One thing for example that this commit introduces, is to make the labels selectable, so they can be easily copy-pasted for lookup. Since we wanted to use `GListModel`, this commit also introduces a helper object `GimpMetadataTagObject` which holds both a tag's name and its value. In the future, we could use this to move the string formatting logic to that helper object, which we could then in turn use for more advanced UIs. --- plug-ins/metadata/meson.build | 1 + plug-ins/metadata/metadata-tag-object.c | 94 ++++++++ plug-ins/metadata/metadata-tag-object.h | 36 +++ plug-ins/metadata/metadata-viewer.c | 285 +++++++++--------------- 4 files changed, 232 insertions(+), 184 deletions(-) create mode 100644 plug-ins/metadata/metadata-tag-object.c create mode 100644 plug-ins/metadata/metadata-tag-object.h diff --git a/plug-ins/metadata/meson.build b/plug-ins/metadata/meson.build index e69e0ad218..19a8ac0212 100644 --- a/plug-ins/metadata/meson.build +++ b/plug-ins/metadata/meson.build @@ -43,6 +43,7 @@ plugin_name = 'metadata-viewer' plugin_sources = [ 'metadata-viewer.c', + 'metadata-tag-object.c', 'metadata-tags.c', ] diff --git a/plug-ins/metadata/metadata-tag-object.c b/plug-ins/metadata/metadata-tag-object.c new file mode 100644 index 0000000000..32da1187e9 --- /dev/null +++ b/plug-ins/metadata/metadata-tag-object.c @@ -0,0 +1,94 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * metadata-tag.c + * Copyright (C) 2024 Niels De Graef + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "config.h" + +#include +#include + +#include "metadata-tag-object.h" + +struct _GimpMetadataTagObject +{ + GObject parent_instance; + + gchar *tag; + gchar *value; +}; + +G_DEFINE_TYPE (GimpMetadataTagObject, gimp_metadata_tag_object, G_TYPE_OBJECT); + +static void gimp_metadata_tag_object_finalize (GObject *object); + +static void +gimp_metadata_tag_object_finalize (GObject *object) +{ + GimpMetadataTagObject *self = GIMP_METADATA_TAG_OBJECT (object); + + g_free (self->tag); + g_free (self->value); + + G_OBJECT_CLASS (gimp_metadata_tag_object_parent_class)->finalize (object); +} + +static void +gimp_metadata_tag_object_init (GimpMetadataTagObject *self) +{ +} + +static void +gimp_metadata_tag_object_class_init (GimpMetadataTagObjectClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = gimp_metadata_tag_object_finalize; +} + +GimpMetadataTagObject * +gimp_metadata_tag_object_new (const gchar *tag, + const gchar *value) +{ + GimpMetadataTagObject *self; + + g_return_val_if_fail (tag != NULL, NULL); + g_return_val_if_fail (value != NULL, NULL); + + self = g_object_new (GIMP_TYPE_METADATA_TAG_OBJECT, NULL); + self->tag = g_strdup (tag); + self->value = g_strdup (value); + + return self; +} + +const gchar * +gimp_metadata_tag_object_get_tag (GimpMetadataTagObject *self) +{ + g_return_val_if_fail (GIMP_IS_METADATA_TAG_OBJECT (self), NULL); + + return self->tag; +} + +const gchar * +gimp_metadata_tag_object_get_value (GimpMetadataTagObject *self) +{ + g_return_val_if_fail (GIMP_IS_METADATA_TAG_OBJECT (self), NULL); + + return self->value; +} diff --git a/plug-ins/metadata/metadata-tag-object.h b/plug-ins/metadata/metadata-tag-object.h new file mode 100644 index 0000000000..00241bd1fb --- /dev/null +++ b/plug-ins/metadata/metadata-tag-object.h @@ -0,0 +1,36 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * Copyright (C) 2024 Niels De Graef + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __METADATA_TAG_OBJECT_H__ +#define __METADATA_TAG_OBJECT_H__ + +#include + +#define GIMP_TYPE_METADATA_TAG_OBJECT (gimp_metadata_tag_object_get_type ()) +G_DECLARE_FINAL_TYPE (GimpMetadataTagObject, gimp_metadata_tag_object, + GIMP, METADATA_TAG_OBJECT, + GObject); + +GimpMetadataTagObject * gimp_metadata_tag_object_new (const gchar *tag, + const gchar *value); + +const gchar * gimp_metadata_tag_object_get_tag (GimpMetadataTagObject *self); +const gchar * gimp_metadata_tag_object_get_value (GimpMetadataTagObject *self); + +#endif /* __METADATA_TAG_OBJECT_H__ */ diff --git a/plug-ins/metadata/metadata-viewer.c b/plug-ins/metadata/metadata-viewer.c index a285ee4eec..95e869b149 100644 --- a/plug-ins/metadata/metadata-viewer.c +++ b/plug-ins/metadata/metadata-viewer.c @@ -28,6 +28,7 @@ #include "libgimp/stdplugins-intl.h" +#include "metadata-tag-object.h" #include "metadata-tags.h" #define PLUG_IN_PROC "plug-in-metadata-viewer" @@ -47,28 +48,6 @@ #define RAW_DATA_MAX_SIZE 16 -enum -{ - C_XMP_TAG = 0, - C_XMP_VALUE, - NUM_XMP_COLS -}; - -enum -{ - C_EXIF_TAG = 0, - C_EXIF_VALUE, - NUM_EXIF_COLS -}; - -enum -{ - C_IPTC_TAG = 0, - C_IPTC_VALUE, - NUM_IPTC_COLS -}; - - #define GIMP_TYPE_METADATA_VIEWER (gimp_metadata_viewer_get_type ()) G_DECLARE_FINAL_TYPE (GimpMetadataViewer, gimp_metadata_viewer, GIMP, METADATA_VIEWER, GimpPlugIn) @@ -94,29 +73,23 @@ static gboolean metadata_viewer_dialog (GimpImage *image, GimpMetadata *g_metadata, GError **error); static void metadata_dialog_set_metadata (GExiv2Metadata *metadata, - GtkListStore *exif_store, - GtkListStore *xmp_store, - GtkListStore *iptc_store); + GListStore *exif_store, + GListStore *xmp_store, + GListStore *iptc_store); +static GtkWidget * create_widget_for_tag_object (gpointer item, + gpointer user_data); static void metadata_dialog_add_multiple_values (GExiv2Metadata *metadata, const gchar *tag, - GtkListStore *store, - gint tag_column, - gint value_column); + GListStore *store); static void metadata_dialog_append_tags (GExiv2Metadata *metadata, gchar **tags, - GtkListStore *store, - gint tag_column, - gint value_column, + GListStore *store, gboolean load_iptc); -static void metadata_dialog_add_tag (GtkListStore *store, - gint tag_column, - gint value_column, +static void metadata_dialog_add_tag (GListStore *store, const gchar *tag, const gchar *value); static void metadata_dialog_add_translated_tag (GExiv2Metadata *metadata, - GtkListStore *store, - gint tag_column, - gint value_column, + GListStore *store, const gchar *tag); static gchar * metadata_interpret_user_comment (gchar *comment); static gchar * metadata_dialog_format_tag_value (GExiv2Metadata *metadata, @@ -234,11 +207,9 @@ metadata_viewer_dialog (GimpImage *image, GtkWidget *metadata_vbox; GtkWidget *notebook; GtkWidget *scrolled_win; - GtkWidget *list_view; + GtkWidget *list_box; GtkWidget *label; - GtkListStore *exif_store, *xmp_store, *iptc_store; - GtkCellRenderer *rend; - GtkTreeViewColumn *col; + GListStore *exif_store, *xmp_store, *iptc_store; GExiv2Metadata *metadata; metadata = GEXIV2_METADATA(g_metadata); @@ -280,36 +251,20 @@ metadata_viewer_dialog (GimpImage *image, gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 6); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); - exif_store = gtk_list_store_new (NUM_EXIF_COLS, - G_TYPE_STRING, /* column-name c_exif_tag */ - G_TYPE_STRING); /* column-name c_exif_value */ - list_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (exif_store)); - gtk_widget_set_vexpand (list_view, TRUE); - - rend = gtk_cell_renderer_text_new (); - col = gtk_tree_view_column_new_with_attributes (_("Exif Tag"), - rend, - "text", C_EXIF_TAG, - NULL); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_spacing (col, 3); - gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), col); - - rend = gtk_cell_renderer_text_new (); - col = gtk_tree_view_column_new_with_attributes (C_("A tag value", "Value"), - rend, - "text", C_EXIF_VALUE, - NULL); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_spacing (col, 3); - gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), col); + exif_store = g_list_store_new (GIMP_TYPE_METADATA_TAG_OBJECT); + list_box = gtk_list_box_new (); + gtk_list_box_set_selection_mode (GTK_LIST_BOX (list_box), + GTK_SELECTION_NONE); + gtk_list_box_bind_model (GTK_LIST_BOX (list_box), G_LIST_MODEL (exif_store), + create_widget_for_tag_object, NULL, NULL); + gtk_widget_set_vexpand (list_box, TRUE); label = gtk_label_new (_("Exif")); gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scrolled_win, label); - gtk_container_add (GTK_CONTAINER (scrolled_win), list_view); - gtk_widget_show (list_view); + gtk_container_add (GTK_CONTAINER (scrolled_win), list_box); + gtk_widget_show (list_box); gtk_widget_show (scrolled_win); /* XMP tab */ @@ -318,36 +273,20 @@ metadata_viewer_dialog (GimpImage *image, gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 6); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); - xmp_store = gtk_list_store_new (NUM_XMP_COLS, - G_TYPE_STRING, /* column-name c_xmp_tag */ - G_TYPE_STRING); /* column-name c_xmp_value */ - list_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (xmp_store)); - gtk_widget_set_vexpand (list_view, TRUE); - - rend = gtk_cell_renderer_text_new (); - col = gtk_tree_view_column_new_with_attributes (_("XMP Tag"), - rend, - "text", C_XMP_TAG, - NULL); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_spacing (col, 3); - gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), col); - - rend = gtk_cell_renderer_text_new (); - col = gtk_tree_view_column_new_with_attributes (C_("A tag value", "Value"), - rend, - "text", C_XMP_VALUE, - NULL); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_spacing (col, 3); - gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), col); + xmp_store = g_list_store_new (GIMP_TYPE_METADATA_TAG_OBJECT); + list_box = gtk_list_box_new (); + gtk_list_box_set_selection_mode (GTK_LIST_BOX (list_box), + GTK_SELECTION_NONE); + gtk_list_box_bind_model (GTK_LIST_BOX (list_box), G_LIST_MODEL (xmp_store), + create_widget_for_tag_object, NULL, NULL); + gtk_widget_set_vexpand (list_box, TRUE); label = gtk_label_new (_("XMP")); gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scrolled_win, label); - gtk_container_add (GTK_CONTAINER (scrolled_win), list_view); - gtk_widget_show (list_view); + gtk_container_add (GTK_CONTAINER (scrolled_win), list_box); + gtk_widget_show (list_box); gtk_widget_show (scrolled_win); /* IPTC tab */ @@ -356,41 +295,25 @@ metadata_viewer_dialog (GimpImage *image, gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 6); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_IN); - iptc_store = gtk_list_store_new (NUM_IPTC_COLS, - G_TYPE_STRING, /* column-name c_iptc_tag */ - G_TYPE_STRING); /* column-name c_iptc_value */ - list_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (iptc_store)); - gtk_widget_set_vexpand (list_view, TRUE); - - rend = gtk_cell_renderer_text_new (); - col = gtk_tree_view_column_new_with_attributes (_("IPTC Tag"), - rend, - "text", C_IPTC_TAG, - NULL); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_spacing (col, 3); - gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), col); - - rend = gtk_cell_renderer_text_new (); - col = gtk_tree_view_column_new_with_attributes (C_("A tag value", "Value"), - rend, - "text", C_IPTC_VALUE, - NULL); - gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_spacing (col, 3); - gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), col); + iptc_store = g_list_store_new (GIMP_TYPE_METADATA_TAG_OBJECT); + list_box = gtk_list_box_new (); + gtk_list_box_set_selection_mode (GTK_LIST_BOX (list_box), + GTK_SELECTION_NONE); + gtk_list_box_bind_model (GTK_LIST_BOX (list_box), G_LIST_MODEL (iptc_store), + create_widget_for_tag_object, NULL, NULL); + gtk_widget_set_vexpand (list_box, TRUE); label = gtk_label_new (_("IPTC")); gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), scrolled_win, label); - gtk_container_add (GTK_CONTAINER (scrolled_win), list_view); - gtk_widget_show (list_view); + gtk_container_add (GTK_CONTAINER (scrolled_win), list_box); + gtk_widget_show (list_box); gtk_widget_show (scrolled_win); gtk_widget_show (notebook); - /* Add the metadata to the tree views */ + /* Add the metadata to the list models */ metadata_dialog_set_metadata (metadata, exif_store, xmp_store, iptc_store); g_object_unref (exif_store); @@ -407,34 +330,63 @@ metadata_viewer_dialog (GimpImage *image, static void metadata_dialog_set_metadata (GExiv2Metadata *metadata, - GtkListStore *exif_store, - GtkListStore *xmp_store, - GtkListStore *iptc_store) + GListStore *exif_store, + GListStore *xmp_store, + GListStore *iptc_store) { gchar **tags; /* load exif tags */ tags = gexiv2_metadata_get_exif_tags (metadata); - metadata_dialog_append_tags (metadata, tags, exif_store, C_EXIF_TAG, C_EXIF_VALUE, FALSE); + metadata_dialog_append_tags (metadata, tags, exif_store, FALSE); g_strfreev (tags); /* load xmp tags */ tags = gexiv2_metadata_get_xmp_tags (metadata); - metadata_dialog_append_tags (metadata, tags, xmp_store, C_XMP_TAG, C_XMP_VALUE, FALSE); + metadata_dialog_append_tags (metadata, tags, xmp_store, FALSE); g_strfreev (tags); /* load iptc tags */ tags = gexiv2_metadata_get_iptc_tags (metadata); - metadata_dialog_append_tags (metadata, tags, iptc_store, C_IPTC_TAG, C_IPTC_VALUE, TRUE); + metadata_dialog_append_tags (metadata, tags, iptc_store, TRUE); g_strfreev (tags); } +static GtkWidget * +create_widget_for_tag_object (gpointer item, + gpointer user_data) +{ + GimpMetadataTagObject *tag_obj = GIMP_METADATA_TAG_OBJECT (item); + GtkWidget *row; + GtkWidget *box; + GtkWidget *tag_label; + GtkWidget *value_label; + + row = gtk_list_box_row_new (); + gtk_widget_show (row); + + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + gtk_container_add (GTK_CONTAINER (row), box); + gtk_widget_show (box); + + tag_label = gtk_label_new (gimp_metadata_tag_object_get_tag (tag_obj)); + gtk_widget_show (tag_label); + gtk_box_pack_start (GTK_BOX (box), tag_label, FALSE, FALSE, 6); + + value_label = gtk_label_new (gimp_metadata_tag_object_get_value (tag_obj)); + gtk_label_set_selectable (GTK_LABEL (value_label), TRUE); + gtk_widget_show (value_label); + gtk_box_pack_end (GTK_BOX (box), value_label, FALSE, FALSE, 6); + + return row; +} + static gchar * metadata_format_string_value (const gchar *value, gboolean truncate) @@ -490,29 +442,23 @@ metadata_tag_is_string (const gchar *tag) } static void -metadata_dialog_add_tag (GtkListStore *store, - gint tag_column, - gint value_column, +metadata_dialog_add_tag (GListStore *store, const gchar *tag, const gchar *value) { - if (value) - { - GtkTreeIter iter; + GimpMetadataTagObject *tag_object; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - tag_column, tag, - value_column, value, - -1); - } + if (value == NULL) + return; + + tag_object = gimp_metadata_tag_object_new (tag, value); + g_list_store_append (store, tag_object); + g_object_unref (tag_object); } static void metadata_dialog_add_translated_tag (GExiv2Metadata *metadata, - GtkListStore *store, - gint tag_column, - gint value_column, + GListStore *store, const gchar *tag) { gchar *value = NULL; @@ -526,8 +472,7 @@ metadata_dialog_add_translated_tag (GExiv2Metadata *metadata, g_clear_error (&error); } - metadata_dialog_add_tag (store, tag_column, value_column, - tag, gettext (value)); + metadata_dialog_add_tag (store, tag, gettext (value)); g_free (value); } @@ -567,9 +512,7 @@ metadata_interpret_user_comment (gchar *comment) static void metadata_dialog_add_multiple_values (GExiv2Metadata *metadata, const gchar *tag, - GtkListStore *store, - gint tag_column, - gint value_column) + GListStore *store) { gchar **values; GError *error = NULL; @@ -582,37 +525,25 @@ metadata_dialog_add_multiple_values (GExiv2Metadata *metadata, g_clear_error (&error); } - if (values) + if (values == NULL) + return; + + for (gsize i = 0; values[i] != NULL; i++) { - gint i; + gchar *value; - for (i = 0; values[i] != NULL; i++) - { - gchar *value; - GtkTreeIter iter; - - gtk_list_store_append (store, &iter); - - value = metadata_format_string_value (values[i], /* truncate = */ TRUE); - - gtk_list_store_set (store, &iter, - tag_column, tag, - value_column, value, - -1); - - g_free (value); - } - - g_strfreev (values); + value = metadata_format_string_value (values[i], /* truncate = */ TRUE); + metadata_dialog_add_tag (store, tag, value); + g_free (value); } + + g_strfreev (values); } static void metadata_dialog_append_tags (GExiv2Metadata *metadata, gchar **tags, - GtkListStore *store, - gint tag_column, - gint value_column, + GListStore *store, gboolean load_iptc) { const gchar *tag; @@ -639,9 +570,7 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, last_tag = tag; metadata_dialog_add_multiple_values (GEXIV2_METADATA (metadata), - tag, store, - tag_column, - value_column); + tag, store); } else if (! strcmp ("Exif.GPSInfo.GPSLongitude", tag) || ! strcmp ("Exif.GPSInfo.GPSLongitudeRef", tag) || @@ -664,7 +593,6 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, { str = metadata_format_gps_longitude_latitude (lng); metadata_dialog_add_tag (store, - tag_column, value_column, "Exif.GPSInfo.GPSLongitude", str); g_free (str); @@ -677,7 +605,6 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, } metadata_dialog_add_translated_tag (metadata, store, - tag_column, value_column, "Exif.GPSInfo.GPSLongitudeRef"); if (gexiv2_metadata_try_get_gps_latitude (GEXIV2_METADATA (metadata), @@ -685,7 +612,6 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, { str = metadata_format_gps_longitude_latitude (lat); metadata_dialog_add_tag (store, - tag_column, value_column, "Exif.GPSInfo.GPSLatitude", str); g_free (str); @@ -698,7 +624,6 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, } metadata_dialog_add_translated_tag (metadata, store, - tag_column, value_column, "Exif.GPSInfo.GPSLatitudeRef"); if (gexiv2_metadata_try_get_gps_altitude (GEXIV2_METADATA (metadata), @@ -711,7 +636,6 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, str2 = metadata_format_gps_altitude (alt, FALSE, _(" feet")); str3 = g_strdup_printf ("%s (%s)", str, str2); metadata_dialog_add_tag (store, - tag_column, value_column, "Exif.GPSInfo.GPSAltitude", str3); g_free (str); @@ -739,7 +663,6 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, else index = 0; metadata_dialog_add_tag (store, - tag_column, value_column, "Exif.GPSInfo.GPSAltitudeRef", gettext (gpsaltref[index])); g_free (value); @@ -769,9 +692,7 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, /* Can start with charset. Remove part that is not relevant. */ value = metadata_interpret_user_comment (value); - metadata_dialog_add_tag (store, - tag_column, value_column, - tag, value); + metadata_dialog_add_tag (store, tag, value); g_free (value); } else @@ -791,18 +712,14 @@ metadata_dialog_append_tags (GExiv2Metadata *metadata, else if (g_strcmp0 (tag_type, "XmpText") != 0) { metadata_dialog_add_multiple_values (GEXIV2_METADATA (metadata), - tag, store, - tag_column, - value_column); + tag, store); continue; } } value = metadata_dialog_format_tag_value (metadata, tag, /* truncate = */ TRUE); - metadata_dialog_add_tag (store, - tag_column, value_column, - tag, value); + metadata_dialog_add_tag (store, tag, value); g_free (value); } } From 6f67c611da27dac1a85c22625e7ee67a85821a3e Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Thu, 9 May 2024 23:17:12 +0200 Subject: [PATCH 3/3] plug-ins: Put the same size on metadata tag values ... by using a `GtkSizeGroup` in the metadata viewer. --- plug-ins/metadata/metadata-viewer.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/plug-ins/metadata/metadata-viewer.c b/plug-ins/metadata/metadata-viewer.c index 95e869b149..f8582f86fc 100644 --- a/plug-ins/metadata/metadata-viewer.c +++ b/plug-ins/metadata/metadata-viewer.c @@ -209,6 +209,7 @@ metadata_viewer_dialog (GimpImage *image, GtkWidget *scrolled_win; GtkWidget *list_box; GtkWidget *label; + GtkSizeGroup *tag_size_group; GListStore *exif_store, *xmp_store, *iptc_store; GExiv2Metadata *metadata; @@ -255,8 +256,9 @@ metadata_viewer_dialog (GimpImage *image, list_box = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list_box), GTK_SELECTION_NONE); + tag_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); gtk_list_box_bind_model (GTK_LIST_BOX (list_box), G_LIST_MODEL (exif_store), - create_widget_for_tag_object, NULL, NULL); + create_widget_for_tag_object, tag_size_group, g_object_unref); gtk_widget_set_vexpand (list_box, TRUE); label = gtk_label_new (_("Exif")); @@ -277,8 +279,9 @@ metadata_viewer_dialog (GimpImage *image, list_box = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list_box), GTK_SELECTION_NONE); + tag_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); gtk_list_box_bind_model (GTK_LIST_BOX (list_box), G_LIST_MODEL (xmp_store), - create_widget_for_tag_object, NULL, NULL); + create_widget_for_tag_object, tag_size_group, g_object_unref); gtk_widget_set_vexpand (list_box, TRUE); label = gtk_label_new (_("XMP")); @@ -299,8 +302,9 @@ metadata_viewer_dialog (GimpImage *image, list_box = gtk_list_box_new (); gtk_list_box_set_selection_mode (GTK_LIST_BOX (list_box), GTK_SELECTION_NONE); + tag_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); gtk_list_box_bind_model (GTK_LIST_BOX (list_box), G_LIST_MODEL (iptc_store), - create_widget_for_tag_object, NULL, NULL); + create_widget_for_tag_object, tag_size_group, g_object_unref); gtk_widget_set_vexpand (list_box, TRUE); label = gtk_label_new (_("IPTC")); @@ -363,6 +367,7 @@ create_widget_for_tag_object (gpointer item, gpointer user_data) { GimpMetadataTagObject *tag_obj = GIMP_METADATA_TAG_OBJECT (item); + GtkSizeGroup *tag_size_group = GTK_SIZE_GROUP (user_data); GtkWidget *row; GtkWidget *box; GtkWidget *tag_label; @@ -376,13 +381,15 @@ create_widget_for_tag_object (gpointer item, gtk_widget_show (box); tag_label = gtk_label_new (gimp_metadata_tag_object_get_tag (tag_obj)); + gtk_label_set_xalign (GTK_LABEL (tag_label), 0.0); + gtk_size_group_add_widget (tag_size_group, tag_label); gtk_widget_show (tag_label); gtk_box_pack_start (GTK_BOX (box), tag_label, FALSE, FALSE, 6); value_label = gtk_label_new (gimp_metadata_tag_object_get_value (tag_obj)); gtk_label_set_selectable (GTK_LABEL (value_label), TRUE); gtk_widget_show (value_label); - gtk_box_pack_end (GTK_BOX (box), value_label, FALSE, FALSE, 6); + gtk_box_pack_start (GTK_BOX (box), value_label, FALSE, FALSE, 6); return row; }