Use GtkFileChooserButton instead of GnomeFileEntry

diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog
index 4ddcbd2..e32c986 100644 (file)
--- a/libedataserverui/ChangeLog
+++ b/libedataserverui/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-09  Ross Burton  <ross@burtonini.com>
+
+       * e-categories-dialog.c:
+       * e-categories-dialog.glade:
+       Use GtkFileChooserButton instead of a GnomeFileEntry.
+
 2005-05-24  Sushma Rai  <rsushma@novell.com>
 
        * e-name-selector-dialog.c (contact_column_formatter): Using 

diff --git a/libedataserverui/e-categories-dialog.c b/libedataserverui/e-categories-dialog.c
index fecf5c2..e794d51 100644 (file)
--- a/libedataserverui/e-categories-dialog.c
+++ b/libedataserverui/e-categories-dialog.c
@@ -28,6 +28,7 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkcellrenderertoggle.h>
 #include <gtk/gtkentry.h>
+#include <gtk/gtkfilechooserbutton.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmessagedialog.h>
@@ -35,7 +36,6 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtktreeview.h>
-#include <libgnomeui/gnome-file-entry.h>
 #include <glade/glade-xml.h>
 #include <libedataserver/e-categories.h>
 #include "e-categories-dialog.h"
@@ -85,14 +85,7 @@ load_properties_dialog (ECategoriesDialog *parent)
 
        prop_dialog->category_name = glade_xml_get_widget (prop_dialog->gui, "category-name");
        prop_dialog->category_color = glade_xml_get_widget (prop_dialog->gui, "category-color");
-
-       /* create the icon file entry */
-       table = glade_xml_get_widget (prop_dialog->gui, "table-category-properties");
-       prop_dialog->category_icon = gnome_file_entry_new ("category-icon-history-id", _("Category Icon"));
-       g_object_set (G_OBJECT (prop_dialog->category_icon), "use_filechooser", TRUE, NULL);
-       gtk_table_attach (GTK_TABLE (table), prop_dialog->category_icon, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 3, 3);
-       gtk_widget_show (prop_dialog->category_icon);
-       gnome_file_entry_set_modal ((GnomeFileEntry *)prop_dialog->category_icon, TRUE);
+       prop_dialog->category_icon = glade_xml_get_widget (prop_dialog->gui, "category-icon");
 
        return prop_dialog;
 }
@@ -271,8 +264,7 @@ new_button_clicked_cb (GtkButton *button, gpointer user_data)
                                g_free (correct_category_name);
                        } else {
                                /* FIXME: get color */
-                               category_icon = gtk_entry_get_text (
-                                       GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (prop_dialog->category_icon))));
+                               category_icon = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (prop_dialog->category_icon));
 
                                e_categories_add (correct_category_name, NULL, category_icon ? category_icon : NULL, TRUE);
 
@@ -324,16 +316,14 @@ edit_button_clicked_cb (GtkButton *button, gpointer user_data)
        gtk_tree_model_get (model, &iter, 1, &category_name, -1);
        gtk_entry_set_text (GTK_ENTRY (prop_dialog->category_name), category_name);
        gtk_widget_set_sensitive (prop_dialog->category_name, FALSE);
-       gtk_entry_set_text (
-               GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (prop_dialog->category_icon))),
-               e_categories_get_icon_file_for (category_name));
+       gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (prop_dialog->category_icon), 
+                                      e_categories_get_icon_file_for (category_name));
 
        if (gtk_dialog_run (GTK_DIALOG (prop_dialog->the_dialog)) == GTK_RESPONSE_OK) {
                const char *category_icon;
 
                /* FIXME: get color */
-               category_icon = gtk_entry_get_text (
-                       GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (prop_dialog->category_icon))));
+               category_icon = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (prop_dialog->category_icon));
 
                if (category_icon)
                        e_categories_set_icon_file_for (category_name, category_icon);

diff --git a/libedataserverui/e-categories-dialog.glade b/libedataserverui/e-categories-dialog.glade
index 9d77c44..fe41376 100644 (file)
--- a/libedataserverui/e-categories-dialog.glade
+++ b/libedataserverui/e-categories-dialog.glade
@@ -474,6 +474,25 @@
              <property name="y_options"></property>
            </packing>
          </child>
+
+         <child>
+           <widget class="GtkFileChooserButton" id="category-icon">
+             <property name="visible">True</property>
+             <property name="title" translatable="yes">Category Icon</property>
+             <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+             <property name="local_only">True</property>
+             <property name="show_hidden">False</property>
+             <property name="width_chars">-1</property>
+           </widget>
+           <packing>
+             <property name="left_attach">1</property>
+             <property name="right_attach">2</property>
+             <property name="top_attach">2</property>
+             <property name="bottom_attach">3</property>
+             <property name="x_options">fill</property>
+             <property name="y_options">fill</property>
+           </packing>
+         </child>
        </widget>
        <packing>
          <property name="padding">0</property>