- if ( w->interface->progress_func )
- w->interface->progress_func ( (gpointer) c, data, w );
+ if ( w->source_interface->progress_func )
+ w->source_interface->progress_func ( (gpointer) c, data, w );
VikLayer *current_selected = vik_layers_panel_get_selected ( w->vlp );
if ( IS_VIK_TRW_LAYER(current_selected) ) {
vtl = VIK_TRW_LAYER(current_selected);
VikLayer *current_selected = vik_layers_panel_get_selected ( w->vlp );
if ( IS_VIK_TRW_LAYER(current_selected) ) {
vtl = VIK_TRW_LAYER(current_selected);
}
if ( creating_new_layer ) {
vtl = VIK_TRW_LAYER ( vik_layer_create ( VIK_LAYER_TRW, w->vvp, NULL, FALSE ) );
}
if ( creating_new_layer ) {
vtl = VIK_TRW_LAYER ( vik_layer_create ( VIK_LAYER_TRW, w->vvp, NULL, FALSE ) );
result = a_babel_convert_from (vtl, cmd, (BabelStatusFunc) progress_func, extra, w);
result = a_babel_convert_from (vtl, cmd, (BabelStatusFunc) progress_func, extra, w);
+ break;
+ case VIK_DATASOURCE_URL:
+ result = a_babel_convert_from_url (vtl, cmd, extra, (BabelStatusFunc) progress_func, w);
+ break;
+ case VIK_DATASOURCE_SHELL_CMD:
result = a_babel_convert_from_shellcommand ( vtl, cmd, extra, (BabelStatusFunc) progress_func, w);
result = a_babel_convert_from_shellcommand ( vtl, cmd, extra, (BabelStatusFunc) progress_func, w);
gtk_label_set_text ( GTK_LABEL(w->status), _("Done.") );
if ( creating_new_layer )
vik_aggregate_layer_add_layer( vik_layers_panel_get_top_layer(w->vlp), VIK_LAYER(vtl));
gtk_label_set_text ( GTK_LABEL(w->status), _("Done.") );
if ( creating_new_layer )
vik_aggregate_layer_add_layer( vik_layers_panel_get_top_layer(w->vlp), VIK_LAYER(vtl));
gtk_dialog_set_response_sensitive ( GTK_DIALOG(w->dialog), GTK_RESPONSE_ACCEPT, TRUE );
gtk_dialog_set_response_sensitive ( GTK_DIALOG(w->dialog), GTK_RESPONSE_REJECT, FALSE );
} else {
gtk_dialog_set_response_sensitive ( GTK_DIALOG(w->dialog), GTK_RESPONSE_ACCEPT, TRUE );
gtk_dialog_set_response_sensitive ( GTK_DIALOG(w->dialog), GTK_RESPONSE_REJECT, FALSE );
} else {
f = fdopen(fd_src, "w");
a_gpx_write_track_file("track", track, f); /* Thank you Guilhem! Just when I needed this function... -- Evan */
fclose(f);
f = fdopen(fd_src, "w");
a_gpx_write_track_file("track", track, f); /* Thank you Guilhem! Just when I needed this function... -- Evan */
fclose(f);
-static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikDataSourceInterface *interface,
+static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikDataSourceInterface *source_interface,
- if ( interface->check_existence_func ) {
- gchar *error_str = interface->check_existence_func();
+ if ( source_interface->check_existence_func ) {
+ gchar *error_str = source_interface->check_existence_func();
dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
- interface->add_setup_widgets_func(dialog, vvp, user_data);
- gtk_window_set_title ( GTK_WINDOW(dialog), _(interface->window_title) );
+ source_interface->add_setup_widgets_func(dialog, vvp, user_data);
+ gtk_window_set_title ( GTK_WINDOW(dialog), _(source_interface->window_title) );
- interface->params, interface->params_count,
- interface->params_groups, interface->params_groups_count,
- interface->params_defaults );
+ source_interface->params, source_interface->params_count,
+ source_interface->params_groups, source_interface->params_groups_count,
+ source_interface->params_defaults );
( pass_along_data, &cmd, &extra, name_src );
g_free ( name_src );
/* TODO: delete the tmp file? or delete it only after we're done with it? */
( pass_along_data, &cmd, &extra, name_src );
g_free ( name_src );
/* TODO: delete the tmp file? or delete it only after we're done with it? */
( pass_along_data, &cmd, &extra, name_src, name_src_track );
g_free ( name_src );
g_free ( name_src_track );
( pass_along_data, &cmd, &extra, name_src, name_src_track );
g_free ( name_src );
g_free ( name_src_track );
( pass_along_data, &cmd, &extra, name_src_track );
g_free ( name_src_track );
} else
( pass_along_data, &cmd, &extra, name_src_track );
g_free ( name_src_track );
} else
- } else if ( interface->params ) {
- a_uibuilder_free_paramdatas ( paramdatas, interface->params, interface->params_count );
+ } else if ( source_interface->params ) {
+ a_uibuilder_free_paramdatas ( paramdatas, source_interface->params, source_interface->params_count );
wi->cmd = cmd;
wi->extra = extra; /* usually input data type (?) */
dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
gtk_dialog_set_response_sensitive ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT, FALSE );
wi->cmd = cmd;
wi->extra = extra; /* usually input data type (?) */
dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
gtk_dialog_set_response_sensitive ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT, FALSE );
- if ( interface->add_progress_widgets_func ) {
- interface->add_progress_widgets_func ( dialog, user_data );
+ if ( source_interface->add_progress_widgets_func ) {
+ source_interface->add_progress_widgets_func ( dialog, user_data );
-void a_acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikDataSourceInterface *interface ) {
- acquire ( vw, vlp, vvp, interface, NULL, NULL );
+void a_acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikDataSourceInterface *source_interface ) {
+ acquire ( vw, vlp, vvp, source_interface, NULL, NULL );
VikTrwLayer *vtl, VikTrack *track, /* both passed to acquire, although for many filters only one ness */
const gchar *menu_title, vik_datasource_inputtype_t inputtype )
{
VikTrwLayer *vtl, VikTrack *track, /* both passed to acquire, although for many filters only one ness */
const gchar *menu_title, vik_datasource_inputtype_t inputtype )
{