GNOME.org
 

[gthumb] organize folder: fixed missing tag icon

commit e0b55744fa5f2c84f878405bf8a17ccd2c0d356e
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Oct 11 20:10:02 2013 +0200

    organize folder: fixed missing tag icon

 data/icons/hicolor/16x16/actions/Makefile.am       |    1 +
 data/icons/hicolor/16x16/actions/tag.png           |  Bin 0 -> 832 bytes
 extensions/catalogs/data/ui/organize-files-task.ui |   14 +++-----
 extensions/catalogs/data/ui/organize-files.ui      |   33 ++-----------------
 extensions/catalogs/dlg-organize-files.c           |   35 ++++++++++++++++++++
 5 files changed, 44 insertions(+), 39 deletions(-)
---
diff --git a/data/icons/hicolor/16x16/actions/Makefile.am b/data/icons/hicolor/16x16/actions/Makefile.am
index 2e4a910..17cd0ee 100644
--- a/data/icons/hicolor/16x16/actions/Makefile.am
+++ b/data/icons/hicolor/16x16/actions/Makefile.am
@@ -24,6 +24,7 @@ icons_DATA =                          \
        site-photobucket.png            \
        site-picasaweb.png              \
        site-twentythree.png            \
+       tag.png                         \
        tool-adjust-colors.png          \
        tool-adjust-contrast.png        \
        tool-crop.png                   \
diff --git a/data/icons/hicolor/16x16/actions/tag.png b/data/icons/hicolor/16x16/actions/tag.png
new file mode 100644
index 0000000..3158cdf
Binary files /dev/null and b/data/icons/hicolor/16x16/actions/tag.png differ
diff --git a/extensions/catalogs/data/ui/organize-files-task.ui 
b/extensions/catalogs/data/ui/organize-files-task.ui
index 1bbe9e8..c0b3d32 100644
--- a/extensions/catalogs/data/ui/organize-files-task.ui
+++ b/extensions/catalogs/data/ui/organize-files-task.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Oct 11 19:38:40 2013 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="results_liststore">
     <columns>
       <!-- column-name catalog -->
@@ -38,7 +39,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -54,7 +54,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -70,7 +69,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -111,7 +109,7 @@
                         <property name="yalign">0</property>
                         <property name="stock">gtk-dialog-info</property>
                         <property name="pixel_size">24</property>
-                        <property name="icon-size">6</property>
+                        <property name="icon_size">6</property>
                       </object>
                     </child>
                   </object>
@@ -326,7 +324,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_action_appearance">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -341,7 +338,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_action_appearance">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -387,7 +383,7 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
@@ -415,7 +411,7 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
diff --git a/extensions/catalogs/data/ui/organize-files.ui b/extensions/catalogs/data/ui/organize-files.ui
index 16eb193..02a2717 100644
--- a/extensions/catalogs/data/ui/organize-files.ui
+++ b/extensions/catalogs/data/ui/organize-files.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Oct 11 20:06:34 2013 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="group_by_liststore">
     <columns>
       <!-- column-name type -->
@@ -10,28 +11,6 @@
       <!-- column-name icon-name -->
       <column type="gchararray"/>
     </columns>
-    <data>
-      <row>
-        <col id="0">0</col>
-        <col id="1" translatable="yes">Date photo was taken</col>
-        <col id="2">camera-photo</col>
-      </row>
-      <row>
-        <col id="0">1</col>
-        <col id="1" translatable="yes">File modified date</col>
-        <col id="2">appointment-soon</col>
-      </row>
-      <row>
-        <col id="0">2</col>
-        <col id="1" translatable="yes">Tag</col>
-        <col id="2" translatable="yes">tag</col>
-      </row>
-      <row>
-        <col id="0">3</col>
-        <col id="1" translatable="yes">Tag (embedded)</col>
-        <col id="2" translatable="yes">tag</col>
-      </row>
-    </data>
   </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
@@ -62,7 +41,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -79,7 +57,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -95,7 +72,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </object>
@@ -137,7 +113,7 @@
                         <property name="yalign">0</property>
                         <property name="pixel_size">48</property>
                         <property name="icon_name">file-catalog</property>
-                        <property name="icon-size">6</property>
+                        <property name="icon_size">6</property>
                       </object>
                     </child>
                   </object>
@@ -233,7 +209,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -251,7 +226,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -278,7 +252,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
diff --git a/extensions/catalogs/dlg-organize-files.c b/extensions/catalogs/dlg-organize-files.c
index 33fa747..42d7176 100644
--- a/extensions/catalogs/dlg-organize-files.c
+++ b/extensions/catalogs/dlg-organize-files.c
@@ -122,6 +122,41 @@ dlg_organize_files (GthBrowser *browser,
        gtk_widget_show (info_bar);
        gtk_container_add (GTK_CONTAINER (GET_WIDGET ("info_alignment")), info_bar);
 
+       {
+               GtkListStore *list_store = (GtkListStore *) GET_WIDGET ("group_by_liststore");
+               GtkTreeIter   iter;
+
+               gtk_list_store_append (list_store, &iter);
+               gtk_list_store_set (list_store, &iter,
+                                   0, GTH_GROUP_POLICY_DIGITALIZED_DATE,
+                                   1, _("Date photo was taken"),
+                                   2, "camera-photo",
+                                   -1);
+
+               gtk_list_store_append (list_store, &iter);
+               gtk_list_store_set (list_store, &iter,
+                                   0, GTH_GROUP_POLICY_MODIFIED_DATE,
+                                   1, _("File modified date"),
+                                   2, "appointment-soon",
+                                   -1);
+
+               gtk_list_store_append (list_store, &iter);
+               gtk_list_store_set (list_store, &iter,
+                                   0, GTH_GROUP_POLICY_TAG,
+                                   1, _("Tag"),
+                                   2, "tag",
+                                   -1);
+
+               gtk_list_store_append (list_store, &iter);
+               gtk_list_store_set (list_store, &iter,
+                                   0, GTH_GROUP_POLICY_TAG_EMBEDDED,
+                                   1, _("Tag (embedded)"),
+                                   2, "tag",
+                                   -1);
+       }
+
+       gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("group_by_combobox")), 0);
+
        /* Set the signals handlers. */
 
        g_signal_connect (G_OBJECT (data->dialog),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]