GNOME.org
 

[gthumb] Add 'Iptc.Application2.ProvinceState' to 'other' tab

commit 17e2c8e79450168ddf300652ba971514416a6915
Author: Matthew Geier <matthew sleeper apana org au>
Date:   Sun Nov 14 13:01:26 2010 +0100

    Add 'Iptc.Application2.ProvinceState' to 'other' tab
    
    [bug #630279]

 extensions/exiv2_tools/data/ui/edit-exiv2-page.ui |  114 +++++++++++++--------
 extensions/exiv2_tools/gth-edit-exiv2-page.c      |    4 +-
 2 files changed, 72 insertions(+), 46 deletions(-)
---
diff --git a/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui b/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui
index 8deb068..4a96ef3 100644
--- a/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui
+++ b/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkTable" id="content">
     <property name="visible">True</property>
-    <property name="n_rows">10</property>
+    <property name="n_rows">11</property>
     <property name="n_columns">2</property>
     <property name="column_spacing">6</property>
     <property name="row_spacing">6</property>
@@ -13,7 +13,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="max_length">128</property>
-        <property name="invisible_char">&#x25CF;</property>
+        <property name="invisible_char">â??</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
@@ -50,20 +50,6 @@
       </packing>
     </child>
     <child>
-      <object class="GtkLabel" id="label7">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">_Language:</property>
-        <property name="use_underline">True</property>
-      </object>
-      <packing>
-        <property name="top_attach">5</property>
-        <property name="bottom_attach">6</property>
-        <property name="x_options">GTK_FILL</property>
-        <property name="y_options">GTK_FILL</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkHBox" id="hbox2">
         <property name="visible">True</property>
         <property name="spacing">6</property>
@@ -72,7 +58,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="max_length">64</property>
-            <property name="invisible_char">&#x25CF;</property>
+            <property name="invisible_char">â??</property>
           </object>
           <packing>
             <property name="position">0</property>
@@ -94,7 +80,7 @@
           <object class="GtkEntry" id="country_code_entry">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="invisible_char">&#x25CF;</property>
+            <property name="invisible_char">â??</property>
             <property name="width_chars">5</property>
           </object>
           <packing>
@@ -116,7 +102,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="max_length">32</property>
-        <property name="invisible_char">&#x25CF;</property>
+        <property name="invisible_char">â??</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -145,13 +131,13 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="max_length">1024</property>
-        <property name="invisible_char">&#x25CF;</property>
+        <property name="invisible_char">â??</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
         <property name="right_attach">2</property>
-        <property name="top_attach">8</property>
-        <property name="bottom_attach">9</property>
+        <property name="top_attach">9</property>
+        <property name="bottom_attach">10</property>
         <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
@@ -163,8 +149,8 @@
         <property name="use_underline">True</property>
       </object>
       <packing>
-        <property name="top_attach">8</property>
-        <property name="bottom_attach">9</property>
+        <property name="top_attach">9</property>
+        <property name="bottom_attach">10</property>
         <property name="x_options">GTK_FILL</property>
         <property name="y_options">GTK_FILL</property>
       </packing>
@@ -174,13 +160,13 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="max_length">1024</property>
-        <property name="invisible_char">&#x25CF;</property>
+        <property name="invisible_char">â??</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
         <property name="right_attach">2</property>
-        <property name="top_attach">7</property>
-        <property name="bottom_attach">8</property>
+        <property name="top_attach">8</property>
+        <property name="bottom_attach">9</property>
         <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
@@ -192,8 +178,8 @@
         <property name="use_underline">True</property>
       </object>
       <packing>
-        <property name="top_attach">7</property>
-        <property name="bottom_attach">8</property>
+        <property name="top_attach">8</property>
+        <property name="bottom_attach">9</property>
         <property name="x_options">GTK_FILL</property>
         <property name="y_options">GTK_FILL</property>
       </packing>
@@ -205,7 +191,7 @@
           <object class="GtkSpinButton" id="urgency_spinbutton">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="invisible_char">&#x25CF;</property>
+            <property name="invisible_char">â??</property>
             <property name="adjustment">urgency_adjustment</property>
           </object>
           <packing>
@@ -217,8 +203,8 @@
       <packing>
         <property name="left_attach">1</property>
         <property name="right_attach">2</property>
-        <property name="top_attach">9</property>
-        <property name="bottom_attach">10</property>
+        <property name="top_attach">10</property>
+        <property name="bottom_attach">11</property>
         <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
@@ -230,8 +216,8 @@
         <property name="use_underline">True</property>
       </object>
       <packing>
-        <property name="top_attach">9</property>
-        <property name="bottom_attach">10</property>
+        <property name="top_attach">10</property>
+        <property name="bottom_attach">11</property>
         <property name="x_options">GTK_FILL</property>
         <property name="y_options">GTK_FILL</property>
       </packing>
@@ -244,8 +230,8 @@
         <property name="use_underline">True</property>
       </object>
       <packing>
-        <property name="top_attach">6</property>
-        <property name="bottom_attach">7</property>
+        <property name="top_attach">7</property>
+        <property name="bottom_attach">8</property>
         <property name="x_options">GTK_FILL</property>
         <property name="y_options">GTK_FILL</property>
       </packing>
@@ -255,13 +241,13 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="max_length">1024</property>
-        <property name="invisible_char">&#x25CF;</property>
+        <property name="invisible_char">â??</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
         <property name="right_attach">2</property>
-        <property name="top_attach">6</property>
-        <property name="bottom_attach">7</property>
+        <property name="top_attach">7</property>
+        <property name="bottom_attach">8</property>
         <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
@@ -274,7 +260,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="max_length">32</property>
-            <property name="invisible_char">&#x25CF;</property>
+            <property name="invisible_char">â??</property>
             <property name="activates_default">True</property>
           </object>
           <packing>
@@ -299,7 +285,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="max_length">32</property>
-            <property name="invisible_char">&#x25CF;</property>
+            <property name="invisible_char">â??</property>
             <property name="activates_default">True</property>
             <property name="width_chars">16</property>
           </object>
@@ -336,7 +322,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="max_length">32</property>
-        <property name="invisible_char">&#x25CF;</property>
+        <property name="invisible_char">â??</property>
         <property name="activates_default">True</property>
       </object>
       <packing>
@@ -363,6 +349,20 @@
       </packing>
     </child>
     <child>
+      <object class="GtkLabel" id="label7">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">_Language:</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="top_attach">6</property>
+        <property name="bottom_attach">7</property>
+        <property name="x_options">GTK_FILL</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
       <object class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
         <child>
@@ -370,7 +370,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="max_length">3</property>
-            <property name="invisible_char">&#x25CF;</property>
+            <property name="invisible_char">â??</property>
             <property name="width_chars">3</property>
           </object>
           <packing>
@@ -382,9 +382,33 @@
       <packing>
         <property name="left_attach">1</property>
         <property name="right_attach">2</property>
+        <property name="top_attach">6</property>
+        <property name="bottom_attach">7</property>
+        <property name="y_options">GTK_FILL</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkEntry" id="state_name_entry">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="invisible_char">â?¢</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="right_attach">2</property>
+        <property name="top_attach">5</property>
+        <property name="bottom_attach">6</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label9">
+        <property name="visible">True</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">State/Provence:</property>
+      </object>
+      <packing>
         <property name="top_attach">5</property>
         <property name="bottom_attach">6</property>
-        <property name="y_options">GTK_FILL</property>
       </packing>
     </child>
   </object>
diff --git a/extensions/exiv2_tools/gth-edit-exiv2-page.c b/extensions/exiv2_tools/gth-edit-exiv2-page.c
index bc7158d..a2e3f9a 100644
--- a/extensions/exiv2_tools/gth-edit-exiv2-page.c
+++ b/extensions/exiv2_tools/gth-edit-exiv2-page.c
@@ -79,7 +79,7 @@ gth_edit_exiv2_page_real_set_file_list (GthEditMetadataPage *base,
 	}
 
 	_g_object_unref (self->priv->info);
-	self->priv->info = gth_file_data_list_get_common_info (file_data_list, "Iptc::Application2::Copyright,Iptc::Application2::Credit,Iptc::Application2::Byline,Iptc::Application2::BylineTitle,Iptc::Application2::CountryName,Iptc::Application2::CountryCode,Iptc::Application2::City,Iptc::Application2::Language,Iptc::Application2::ObjectName,Iptc::Application2::Source,Iptc::Envelope::Destination,Iptc::Application2::Urgency");
+	self->priv->info = gth_file_data_list_get_common_info (file_data_list, "Iptc::Application2::Copyright,Iptc::Application2::Credit,Iptc::Application2::Byline,Iptc::Application2::BylineTitle,Iptc::Application2::CountryName,Iptc::Application2::CountryCode,Iptc::Application2::City,Iptc::Application2::Language,Iptc::Application2::ObjectName,Iptc::Application2::Source,Iptc::Envelope::Destination,Iptc::Application2::Urgency,Iptc::Application2:ProvinceState");
 
 	set_entry_value (self, self->priv->info, "Iptc::Application2::Copyright", "copyright_entry");
 	set_entry_value (self, self->priv->info, "Iptc::Application2::Credit", "credit_entry");
@@ -87,6 +87,7 @@ gth_edit_exiv2_page_real_set_file_list (GthEditMetadataPage *base,
 	set_entry_value (self, self->priv->info, "Iptc::Application2::BylineTitle", "byline_title_entry");
 	set_entry_value (self, self->priv->info, "Iptc::Application2::CountryName", "country_name_entry");
 	set_entry_value (self, self->priv->info, "Iptc::Application2::CountryCode", "country_code_entry");
+	set_entry_value (self, self->priv->info, "Iptc::Application2::ProvinceState", "state_name_entry");
 	set_entry_value (self, self->priv->info, "Iptc::Application2::City", "city_entry");
 	set_entry_value (self, self->priv->info, "Iptc::Application2::Language", "language_entry");
 	set_entry_value (self, self->priv->info, "Iptc::Application2::ObjectName", "object_name_entry");
@@ -162,6 +163,7 @@ gth_edit_exiv2_page_real_update_info (GthEditMetadataPage *base,
 	set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::ObjectName", "object_name_entry");
 	set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Source", "source_entry");
 	set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Envelope::Destination", "destination_entry");
+	set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::ProvinceState", "state_name_entry");
 
 	/* urgency */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]