GNOME.org
 

[gthumb] file properties: show only the basic properties, allow to show all of them

commit db7b717db520e1bc976514535034d494d7e7a12f
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Dec 1 18:13:05 2013 +0100

    file properties: show only the basic properties, allow to show all of them

 data/org.gnome.gthumb.gschema.xml.in   |    3 +
 extensions/exiv2_tools/exiv2-utils.cpp |   31 +++++++++++++
 gthumb/gth-file-properties.c           |   77 +++++++++++++++++++++++++++++++-
 gthumb/gth-main-default-metadata.c     |   35 +++++++++-----
 gthumb/gth-preferences.h               |    1 +
 5 files changed, 134 insertions(+), 13 deletions(-)
---
diff --git a/data/org.gnome.gthumb.gschema.xml.in b/data/org.gnome.gthumb.gschema.xml.in
index 847b68c..54e30c6 100644
--- a/data/org.gnome.gthumb.gschema.xml.in
+++ b/data/org.gnome.gthumb.gschema.xml.in
@@ -110,6 +110,9 @@
     <key name="properties-on-the-right" type="b">
       <default>false</default>
     </key>
+    <key name="properties-details" type="b">
+      <default>false</default>
+    </key>
     <key name="thumbnail-list-visible" type="b">
       <default>true</default>
     </key>
diff --git a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
index 1eb0776..21672e6 100644
--- a/extensions/exiv2_tools/exiv2-utils.cpp
+++ b/extensions/exiv2_tools/exiv2-utils.cpp
@@ -176,6 +176,27 @@ const char *_RATING_TAG_NAMES[] = {
        NULL
 };
 
+const char *_AUTHOR_TAG_NAMES[] = {
+       "Exif::Image::Artist",
+       "Iptc::Application2::Byline",
+       "Xmp::dc::creator",
+       "Xmp::xmpDM::artist",
+       "Xmp::tiff::Artist",
+       "Xmp::plus::ImageCreator",
+       "Xmp::plus::ImageCreatorName",
+       NULL
+};
+
+const char *_COPYRIGHT_TAG_NAMES[] = {
+       "Exif::Image::Copyright",
+       "Iptc::Application2::Copyright",
+       "Xmp::dc::rights",
+       "Xmp::xmpDM::copyright",
+       "Xmp::tiff::Copyright",
+       "Xmp::plus::CopyrightOwner",
+       "Xmp::plus::CopyrightOwnerName",
+       NULL
+};
 
 /* Some evil camera fill in the ImageDescription or UserComment fields
    with useless fluff. Try to filter these out, so they do not show up
@@ -602,6 +623,16 @@ set_attributes_from_tagsets (GFileInfo *info,
        set_attribute_from_tagset (info, "Embedded::Photo::DateTimeOriginal", _ORIGINAL_DATE_TAG_NAMES);
        set_attribute_from_tagset (info, "Embedded::Image::Orientation", _ORIENTATION_TAG_NAMES);
 
+       set_attribute_from_tagset (info, "Embedded::Photo::Aperture", _APERTURE_TAG_NAMES);
+       set_attribute_from_tagset (info, "Embedded::Photo::ISOSpeed", _ISOSPEED_TAG_NAMES);
+       set_attribute_from_tagset (info, "Embedded::Photo::ExposureTime", _EXPOSURE_TIME_TAG_NAMES);
+       set_attribute_from_tagset (info, "Embedded::Photo::ShutterSpeed", _SHUTTER_SPEED_TAG_NAMES);
+       set_attribute_from_tagset (info, "Embedded::Photo::FocalLength", _FOCAL_LENGTH_TAG_NAMES);
+       set_attribute_from_tagset (info, "Embedded::Photo::Flash", _FLASH_TAG_NAMES);
+       set_attribute_from_tagset (info, "Embedded::Photo::CameraModel", _MODEL_TAG_NAMES);
+       set_attribute_from_tagset (info, "Embedded::Photo::Author", _AUTHOR_TAG_NAMES);
+       set_attribute_from_tagset (info, "Embedded::Photo::Copyright", _COPYRIGHT_TAG_NAMES);
+
        /* Embedded::Photo::Exposure */
 
        GObject *aperture;
diff --git a/gthumb/gth-file-properties.c b/gthumb/gth-file-properties.c
index 44d3fdf..a5127ce 100644
--- a/gthumb/gth-file-properties.c
+++ b/gthumb/gth-file-properties.c
@@ -25,6 +25,7 @@
 #include "gth-file-properties.h"
 #include "gth-main.h"
 #include "gth-multipage.h"
+#include "gth-preferences.h"
 #include "gth-sidebar.h"
 #include "gth-string-list.h"
 #include "gth-time.h"
@@ -60,6 +61,9 @@ struct _GthFilePropertiesPrivate {
        GtkWidget     *comment_win;
        GtkListStore  *tree_model;
        GtkWidget     *popup_menu;
+       GtkWidget     *details_button;
+       gboolean       show_details;
+       GthFileData   *last_file_data;
 };
 
 
@@ -110,8 +114,16 @@ gth_file_properties_real_set_file (GthPropertyView *base,
        GList             *scan;
        GtkTextBuffer     *text_buffer;
        char              *comment;
+       gboolean           details_available;
 
        self = GTH_FILE_PROPERTIES (base);
+
+       if (file_data != self->priv->last_file_data) {
+               _g_object_unref (self->priv->last_file_data);
+               self->priv->last_file_data = gth_file_data_dup (file_data);
+       }
+
+       gtk_widget_set_sensitive (self->priv->details_button, FALSE);
        gtk_list_store_clear (self->priv->tree_model);
 
        if (file_data == NULL) {
@@ -121,6 +133,7 @@ gth_file_properties_real_set_file (GthPropertyView *base,
 
        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->priv->tree_model), 
GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, 0);
 
+       details_available = FALSE;
        category_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
        metadata_info = gth_main_get_all_metadata_info ();
        for (scan = metadata_info; scan; scan = scan->next) {
@@ -137,6 +150,24 @@ gth_file_properties_real_set_file (GthPropertyView *base,
                if ((value == NULL) || (*value == '\0'))
                        continue;
 
+               if (info->id != NULL) {
+                       if (g_str_has_prefix (info->id, "Exif")) {
+                               details_available = TRUE;
+                               if (! self->priv->show_details)
+                                       continue;
+                       }
+                       if (g_str_has_prefix (info->id, "Iptc")) {
+                               details_available = TRUE;
+                               if (! self->priv->show_details)
+                                       continue;
+                       }
+                       if (g_str_has_prefix (info->id, "Xmp")) {
+                               details_available = TRUE;
+                               if (! self->priv->show_details)
+                                       continue;
+                       }
+               }
+
                if (value != NULL) {
                        char *tmp_value;
 
@@ -181,6 +212,7 @@ gth_file_properties_real_set_file (GthPropertyView *base,
 
        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->priv->tree_model), POS_COLUMN, 
GTK_SORT_ASCENDING);
        gtk_tree_view_expand_all (GTK_TREE_VIEW (self->priv->tree_view));
+       gtk_widget_set_sensitive (self->priv->details_button, details_available);
 
        g_hash_table_destroy (category_hash);
 
@@ -231,6 +263,7 @@ gth_file_properties_finalize (GObject *base)
 
        if (self->priv->popup_menu != NULL)
                gtk_widget_destroy (self->priv->popup_menu);
+       _g_object_unref (self->priv->last_file_data);
 
        G_OBJECT_CLASS (gth_file_properties_parent_class)->finalize (base);
 }
@@ -323,15 +356,40 @@ tree_view_popup_menu_cb (GtkWidget *widget,
 
 
 static void
+details_button_toggled_cb (GtkToggleButton *button,
+                          gpointer         user_data)
+{
+       GthFileProperties *self = user_data;
+       GSettings         *settings;
+
+       self->priv->show_details = gtk_toggle_button_get_active (button);
+       gth_file_properties_real_set_file (GTH_PROPERTY_VIEW (self), self->priv->last_file_data);
+
+       settings = g_settings_new (GTHUMB_BROWSER_SCHEMA);
+       g_settings_set_boolean (settings, PREF_BROWSER_PROPERTIES_DETAILS, self->priv->show_details);
+       g_object_unref (settings);
+}
+
+
+static void
 gth_file_properties_init (GthFileProperties *self)
 {
+       GSettings         *settings;
        GtkWidget         *vpaned;
+       GtkWidget         *properties_box;
        GtkWidget         *scrolled_win;
+       GtkWidget         *button_box;
        GtkWidget         *menu_item;
        GtkCellRenderer   *renderer;
        GtkTreeViewColumn *column;
 
+       settings = g_settings_new (GTHUMB_BROWSER_SCHEMA);
+
        self->priv = GTH_FILE_PROPERTIES_GET_PRIVATE (self);
+       self->priv->show_details = g_settings_get_boolean (settings, PREF_BROWSER_PROPERTIES_DETAILS);
+       self->priv->last_file_data = NULL;
+
+       g_object_unref (settings);
 
        gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL);
        gtk_box_set_spacing (GTK_BOX (self), 6);
@@ -340,12 +398,29 @@ gth_file_properties_init (GthFileProperties *self)
        gtk_widget_show (vpaned);
        gtk_box_pack_start (GTK_BOX (self), vpaned, TRUE, TRUE, 0);
 
+       properties_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+       gtk_widget_show (properties_box);
+       gtk_paned_pack1 (GTK_PANED (vpaned), properties_box, TRUE, FALSE);
+
        scrolled_win = gtk_scrolled_window_new (NULL, NULL);
        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, 
GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_NONE);
        gtk_widget_show (scrolled_win);
        gtk_widget_set_size_request (scrolled_win, -1, MIN_HEIGHT);
-       gtk_paned_pack1 (GTK_PANED (vpaned), scrolled_win, TRUE, FALSE);
+       gtk_box_pack_start (GTK_BOX (properties_box), scrolled_win, TRUE, TRUE, 0);
+
+       button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+       gtk_widget_show (button_box);
+       gtk_box_pack_start (GTK_BOX (properties_box), button_box, FALSE, FALSE, 2);
+
+       self->priv->details_button = gtk_toggle_button_new_with_label (_("Details"));
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->details_button), 
self->priv->show_details);
+       gtk_widget_show (self->priv->details_button);
+       gtk_box_pack_start (GTK_BOX (button_box), self->priv->details_button, FALSE, FALSE, 0);
+       g_signal_connect (self->priv->details_button,
+                         "toggled",
+                         G_CALLBACK (details_button_toggled_cb),
+                         self);
 
        self->priv->tree_view = gtk_tree_view_new ();
        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (self->priv->tree_view), FALSE);
diff --git a/gthumb/gth-main-default-metadata.c b/gthumb/gth-main-default-metadata.c
index ffc58b5..564a6c1 100644
--- a/gthumb/gth-main-default-metadata.c
+++ b/gthumb/gth-main-default-metadata.c
@@ -30,7 +30,7 @@
 
 GthMetadataCategory file_metadata_category[] = {
        { "file", N_("File"), 1 },
-       { "general", N_("General"), 2 },
+       { "general", N_("Metadata"), 2 },
        { NULL, NULL, 0 }
 };
 
@@ -41,18 +41,29 @@ GthMetadataInfo file_metadata_info[] = {
        { "gth::file::display-mtime", N_("Modified"), "file", 3, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
        { "standard::fast-content-type", N_("Type"), "file", 4, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
        { "gth::file::is-modified", NULL, "file", 5, NULL, GTH_METADATA_ALLOW_NOWHERE },
-       { "gth::file::full-name", N_("Full Name"), "file", 6, NULL, GTH_METADATA_ALLOW_IN_PRINT | 
GTH_METADATA_ALLOW_IN_FILE_LIST | GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW },
+       { "gth::file::full-name", N_("Location"), "file", 6, NULL, GTH_METADATA_ALLOW_IN_PRINT | 
GTH_METADATA_ALLOW_IN_FILE_LIST | GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW },
+       { "general::format", N_("Format"), "file", 10, NULL, GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW },
+       { "general::dimensions", N_("Dimensions"), "file", 12, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
+       { "general::duration", N_("Duration"), "file", 11, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
 
-       { "general::title", N_("Title"), "general", 1, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
-       { "general::dimensions", N_("Dimensions"), "general", 10, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
-       { "general::duration", N_("Duration"), "general", 11, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
-       { "general::format", N_("Format"), "general", 12, NULL, GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW },
-       { "general::location", N_("Place"), "general", 14, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
-       { "general::datetime", N_("Date"), "general", 15, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
-       { "general::description", N_("Description"), "general", 17, NULL, GTH_METADATA_ALLOW_IN_PRINT },
-       { "general::tags", N_("Tags"), "general", 18, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
-       { "general::rating", N_("Rating"), "general", 19, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
-       { "Embedded::Photo::Exposure", N_("Exposure"), "general", 20, NULL, GTH_METADATA_ALLOW_IN_PRINT | 
GTH_METADATA_ALLOW_IN_FILE_LIST | GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW  },
+       { "Embedded::Photo::Exposure", N_("Exposure Settings"), "general", 10, NULL, 
GTH_METADATA_ALLOW_IN_PRINT | GTH_METADATA_ALLOW_IN_FILE_LIST  },
+       { "Embedded::Photo::Aperture", N_("Aperture"), "general", 11, NULL, GTH_METADATA_ALLOW_EVERYWHERE  },
+       { "Embedded::Photo::ISOSpeed", N_("ISO Speed"), "general", 12, NULL, GTH_METADATA_ALLOW_EVERYWHERE  },
+       { "Embedded::Photo::ExposureTime", N_("Exposure Time"), "general", 13, NULL, 
GTH_METADATA_ALLOW_EVERYWHERE  },
+       { "Embedded::Photo::ShutterSpeed", N_("Shutter Speed"), "general", 14, NULL, 
GTH_METADATA_ALLOW_EVERYWHERE  },
+       { "Embedded::Photo::FocalLength", N_("Focal Length"), "general", 16, NULL, 
GTH_METADATA_ALLOW_EVERYWHERE  },
+       { "Embedded::Photo::Flash", N_("Flash"), "general", 17, NULL, GTH_METADATA_ALLOW_EVERYWHERE  },
+       { "Embedded::Photo::CameraModel", N_("Camera Model"), "general", 18, NULL, 
GTH_METADATA_ALLOW_EVERYWHERE  },
+
+       { "general::datetime", N_("Date"), "general", 20, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
+       { "general::title", N_("Title"), "general", 21, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
+       { "general::location", N_("Place"), "general", 22, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
+       { "general::description", N_("Description"), "general", 23, NULL, GTH_METADATA_ALLOW_IN_PRINT },
+       { "general::tags", N_("Tags"), "general", 24, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
+       { "general::rating", N_("Rating"), "general", 25, NULL, GTH_METADATA_ALLOW_EVERYWHERE },
+
+       { "Embedded::Photo::Author", N_("Author"), "general", 30, NULL, GTH_METADATA_ALLOW_EVERYWHERE  },
+       { "Embedded::Photo::Copyright", N_("Copyright"), "general", 31, NULL, GTH_METADATA_ALLOW_EVERYWHERE  
},
 
        { "gth::file::emblems", "", "", 0, NULL, GTH_METADATA_ALLOW_NOWHERE },
        { "image::width", "", "", 0, NULL, GTH_METADATA_ALLOW_NOWHERE },
diff --git a/gthumb/gth-preferences.h b/gthumb/gth-preferences.h
index 26799bd..1e9337f 100644
--- a/gthumb/gth-preferences.h
+++ b/gthumb/gth-preferences.h
@@ -71,6 +71,7 @@ G_BEGIN_DECLS
 #define PREF_BROWSER_SIDEBAR_VISIBLE          "sidebar-visible"
 #define PREF_BROWSER_PROPERTIES_VISIBLE       "properties-visible"
 #define PREF_BROWSER_PROPERTIES_ON_THE_RIGHT  "properties-on-the-right"
+#define PREF_BROWSER_PROPERTIES_DETAILS       "properties-details"
 #define PREF_BROWSER_THUMBNAIL_LIST_VISIBLE   "thumbnail-list-visible"
 #define PREF_BROWSER_THUMBNAIL_LIST_SIZE      "thumbnail-list-size"
 #define PREF_BROWSER_BROWSER_SIDEBAR_WIDTH    "browser-sidebar-width"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]