Various improvements and tidy ups.

[andy/viking.git] / src / vikfileentry.c

diff --git a/src/vikfileentry.c b/src/vikfileentry.c
index 0d9493165a583ee9c76a00fa2441e475ea1cebea..707fb01551a1403c879c081d4409ffdeb3c60ae8 100644 (file)
--- a/src/vikfileentry.c
+++ b/src/vikfileentry.c
@@ -19,7 +19,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include "vikfileentry.h"
 
@@ -29,6 +34,7 @@ struct _VikFileEntry {
   GtkHBox parent;
   GtkWidget *entry, *button;
   GtkWidget *file_selector;
+  GtkFileChooserAction action;
 };
 
 GType vik_file_entry_get_type (void)
@@ -55,11 +61,12 @@ GType vik_file_entry_get_type (void)
   return vs_type;
 }
 
-GtkWidget *vik_file_entry_new ()
+GtkWidget *vik_file_entry_new (GtkFileChooserAction action)
 {
   VikFileEntry *vfe = VIK_FILE_ENTRY ( g_object_new ( VIK_FILE_ENTRY_TYPE, NULL ) );
   vfe->entry = gtk_entry_new ();
-  vfe->button = gtk_button_new_with_label ( "Browse..." );
+  vfe->button = gtk_button_new_with_label ( _("Browse...") );
+  vfe->action = action;
   g_signal_connect_swapped ( G_OBJECT(vfe->button), "clicked", G_CALLBACK(choose_file), vfe );
 
   gtk_box_pack_start ( GTK_BOX(vfe), vfe->entry, TRUE, TRUE, 3 );
@@ -86,13 +93,18 @@ static void choose_file ( VikFileEntry *vfe )
   {
     GtkWidget *win;
     g_assert ( (win = gtk_widget_get_toplevel(GTK_WIDGET(vfe))) );
-    vfe->file_selector = gtk_file_selection_new ("Choose file");
+    vfe->file_selector = gtk_file_chooser_dialog_new (_("Choose file"),
+                                     GTK_WINDOW(win),
+                                     vfe->action,   /* open file or directory */
+                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                     GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                     NULL);
     gtk_window_set_transient_for ( GTK_WINDOW(vfe->file_selector), GTK_WINDOW(win) );
     gtk_window_set_destroy_with_parent ( GTK_WINDOW(vfe->file_selector), TRUE );
   }
 
-  if ( gtk_dialog_run ( GTK_DIALOG(vfe->file_selector) ) == GTK_RESPONSE_OK )
-    gtk_entry_set_text ( GTK_ENTRY (vfe->entry), gtk_file_selection_get_filename ( GTK_FILE_SELECTION(vfe->file_selector) ) );
+  if ( gtk_dialog_run ( GTK_DIALOG(vfe->file_selector) ) == GTK_RESPONSE_ACCEPT )
+    gtk_entry_set_text ( GTK_ENTRY (vfe->entry), gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER(vfe->file_selector) ) );
   gtk_widget_hide ( vfe->file_selector );
 }