X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/6e4a49aa9ec3ca64334124a009d4774a7bb4bb8e..70177381ae2b6540e92c504833aeb546c38dd54b:/src/vikfileentry.c diff --git a/src/vikfileentry.c b/src/vikfileentry.c index e151ef26..8c865a29 100644 --- a/src/vikfileentry.c +++ b/src/vikfileentry.c @@ -34,6 +34,10 @@ struct _VikFileEntry { GtkHBox parent; GtkWidget *entry, *button; GtkWidget *file_selector; + GtkFileChooserAction action; + gint filter_type; + VikFileEntryFunc on_finish; + gpointer user_data; }; GType vik_file_entry_get_type (void) @@ -60,22 +64,29 @@ GType vik_file_entry_get_type (void) return vs_type; } -GtkWidget *vik_file_entry_new () +/** + * Create a file entry with an optional file filter and an optional callback on completion + */ +GtkWidget *vik_file_entry_new (GtkFileChooserAction action, vf_filter_type filter_type, VikFileEntryFunc cb, gpointer user_data ) { 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->action = action; + vfe->on_finish = cb; + vfe->user_data = user_data; 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 ); gtk_box_pack_start ( GTK_BOX(vfe), vfe->button, FALSE, FALSE, 3 ); vfe->file_selector = NULL; + vfe->filter_type = filter_type; return GTK_WIDGET(vfe); } -G_CONST_RETURN gchar *vik_file_entry_get_filename ( VikFileEntry *vfe ) +const gchar *vik_file_entry_get_filename ( VikFileEntry *vfe ) { return gtk_entry_get_text ( GTK_ENTRY(vfe->entry) ); } @@ -93,16 +104,76 @@ static void choose_file ( VikFileEntry *vfe ) g_assert ( (win = gtk_widget_get_toplevel(GTK_WIDGET(vfe))) ); vfe->file_selector = gtk_file_chooser_dialog_new (_("Choose file"), GTK_WINDOW(win), - GTK_FILE_CHOOSER_ACTION_OPEN, + 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 ); + + switch ( vfe->filter_type ) { + case VF_FILTER_IMAGE: { + GtkFileFilter *filter = gtk_file_filter_new (); + gtk_file_filter_set_name ( filter, _("JPG") ); + gtk_file_filter_add_mime_type ( filter, "image/jpeg"); + gtk_file_chooser_add_filter ( GTK_FILE_CHOOSER(vfe->file_selector), filter ); + + filter = gtk_file_filter_new (); + gtk_file_filter_set_name ( filter, _("PNG") ); + gtk_file_filter_add_mime_type ( filter, "image/png"); + gtk_file_chooser_add_filter ( GTK_FILE_CHOOSER(vfe->file_selector), filter ); + + filter = gtk_file_filter_new (); + gtk_file_filter_set_name ( filter, _("TIFF") ); + gtk_file_filter_add_mime_type ( filter, "image/tiff"); + gtk_file_chooser_add_filter ( GTK_FILE_CHOOSER(vfe->file_selector), filter ); + + break; + } + case VF_FILTER_MBTILES: { + GtkFileFilter *filter = gtk_file_filter_new (); + gtk_file_filter_set_name ( filter, _("MBTiles") ); + gtk_file_filter_add_pattern ( filter, "*.sqlite" ); + gtk_file_filter_add_pattern ( filter, "*.mbtiles" ); + gtk_file_filter_add_pattern ( filter, "*.db3" ); + gtk_file_chooser_add_filter ( GTK_FILE_CHOOSER(vfe->file_selector), filter ); + break; + } + case VF_FILTER_XML: { + GtkFileFilter *filter = gtk_file_filter_new (); + gtk_file_filter_set_name ( filter, _("XML") ); + gtk_file_filter_add_pattern ( filter, "*.xml" ); + gtk_file_chooser_add_filter ( GTK_FILE_CHOOSER(vfe->file_selector), filter ); + break; + } + case VF_FILTER_CARTO: { + GtkFileFilter *filter = gtk_file_filter_new (); + gtk_file_filter_set_name ( filter, _("MML") ); + gtk_file_filter_add_pattern ( filter, "*.mml" ); + gtk_file_chooser_add_filter ( GTK_FILE_CHOOSER(vfe->file_selector), filter ); + + filter = gtk_file_filter_new (); + gtk_file_filter_set_name ( filter, _("MSS") ); + gtk_file_filter_add_pattern ( filter, "*.mss" ); + gtk_file_chooser_add_filter ( GTK_FILE_CHOOSER(vfe->file_selector), filter ); + break; + } + default: break; + } + if ( vfe->filter_type ) { + // Always have an catch all filter at the end + GtkFileFilter *filter = gtk_file_filter_new (); + gtk_file_filter_set_name( filter, _("All") ); + gtk_file_filter_add_pattern ( filter, "*" ); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(vfe->file_selector), filter); + } } - if ( gtk_dialog_run ( GTK_DIALOG(vfe->file_selector) ) == GTK_RESPONSE_ACCEPT ) + 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) ) ); + // Ideally this should only be called if the entry has changed, but ATM it's any time OK is selected. + if ( vfe->on_finish ) + vfe->on_finish(vfe, vfe->user_data); + } gtk_widget_hide ( vfe->file_selector ); } -