Fix <GTK 2.24 combo box usage.

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

diff --git a/src/acquire.c b/src/acquire.c
index be883b2d70d43d808df1de650f13947cff0f1563..1a65e91f9f42be58406a0248f910325fef91d3eb 100644 (file)
--- a/src/acquire.c
+++ b/src/acquire.c
@@ -76,16 +76,16 @@ static void progress_func ( BabelProgressCode c, gpointer data, acq_dialog_widge
 {
   gdk_threads_enter ();
   if (!w->ok) {
 {
   gdk_threads_enter ();
   if (!w->ok) {

-    if ( w->interface->cleanup_func )
-      w->interface->cleanup_func( w->user_data );
+    if ( w->source_interface->cleanup_func )
+      w->source_interface->cleanup_func( w->user_data );

     g_free ( w );
     gdk_threads_leave();
     g_thread_exit ( NULL );
   }
   gdk_threads_leave ();
 
     g_free ( w );
     gdk_threads_leave();
     g_thread_exit ( NULL );
   }
   gdk_threads_leave ();
 

-  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 );

 }
 
 
 }
 
 


@@ -94,18 +94,18 @@ static void get_from_anything ( w_and_interface_t *wi )
 {
   gchar *cmd = wi->cmd;
   gchar *extra = wi->extra;
 {
   gchar *cmd = wi->cmd;
   gchar *extra = wi->extra;

-  gboolean result;
-  VikTrwLayer *vtl;
+  gboolean result = TRUE;
+  VikTrwLayer *vtl = NULL;

 
   gboolean creating_new_layer = TRUE;
 
   acq_dialog_widgets_t *w = wi->w;
 
   gboolean creating_new_layer = TRUE;
 
   acq_dialog_widgets_t *w = wi->w;

-  VikDataSourceInterface *interface = wi->w->interface;
+  VikDataSourceInterface *source_interface = wi->w->source_interface;

   g_free ( wi );
   wi = NULL;
 
   gdk_threads_enter();
   g_free ( wi );
   wi = NULL;
 
   gdk_threads_enter();

-  if (interface->mode == VIK_DATASOURCE_ADDTOLAYER) {
+  if (source_interface->mode == VIK_DATASOURCE_ADDTOLAYER) {

     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);


@@ -114,12 +114,12 @@ static void get_from_anything ( w_and_interface_t *wi )
   }
   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 ) );

-    vik_layer_rename ( VIK_LAYER ( vtl ), _(interface->layer_title) );
+    vik_layer_rename ( VIK_LAYER ( vtl ), _(source_interface->layer_title) );

     gtk_label_set_text ( GTK_LABEL(w->status), _("Working...") );
   }
   gdk_threads_leave();
 
     gtk_label_set_text ( GTK_LABEL(w->status), _("Working...") );
   }
   gdk_threads_leave();
 

-  switch ( interface->type ) {
+  switch ( source_interface->type ) {

   case VIK_DATASOURCE_GPSBABEL_DIRECT:
     result = a_babel_convert_from (vtl, cmd, (BabelStatusFunc) progress_func, extra, w);
     break;
   case VIK_DATASOURCE_GPSBABEL_DIRECT:
     result = a_babel_convert_from (vtl, cmd, (BabelStatusFunc) progress_func, extra, w);
     break;


@@ -138,7 +138,7 @@ static void get_from_anything ( w_and_interface_t *wi )
 
   if (!result) {
     gdk_threads_enter();
 
   if (!result) {
     gdk_threads_enter();

-    gtk_label_set_text ( GTK_LABEL(w->status), _("Error: couldn't find gpsbabel.") );
+    gtk_label_set_text ( GTK_LABEL(w->status), _("Error: acquisition failed.") );

     if ( creating_new_layer )
       g_object_unref ( G_OBJECT ( vtl ) );
     gdk_threads_leave();
     if ( creating_new_layer )
       g_object_unref ( G_OBJECT ( vtl ) );
     gdk_threads_leave();


@@ -147,9 +147,20 @@ static void get_from_anything ( w_and_interface_t *wi )
     gdk_threads_enter();
     if (w->ok) {
       gtk_label_set_text ( GTK_LABEL(w->status), _("Done.") );
     gdk_threads_enter();
     if (w->ok) {
       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));
-      if ( interface->keep_dialog_open ) {
+      if ( creating_new_layer ) {
+       /* Only create the layer if it actually contains anything useful */
+       if ( g_hash_table_size (vik_trw_layer_get_tracks(vtl)) ||
+            g_hash_table_size (vik_trw_layer_get_waypoints(vtl)) )
+         vik_aggregate_layer_add_layer( vik_layers_panel_get_top_layer(w->vlp), VIK_LAYER(vtl));
+       else
+         gtk_label_set_text ( GTK_LABEL(w->status), _("No data.") );
+      }
+      /* View this data if available and is desired */
+      if ( vtl && source_interface->autoview ) {
+       vik_trw_layer_auto_set_view ( vtl, vik_layers_panel_get_viewport(w->vlp) );
+       vik_layers_panel_emit_update (w->vlp);
+      }
+      if ( source_interface->keep_dialog_open ) {

         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 {


@@ -161,8 +172,8 @@ static void get_from_anything ( w_and_interface_t *wi )
        g_object_unref(vtl);
     }
   }
        g_object_unref(vtl);
     }
   }

-  if ( interface->cleanup_func )
-    interface->cleanup_func ( w->user_data );
+  if ( source_interface->cleanup_func )
+    source_interface->cleanup_func ( w->user_data );

 
   if ( w->ok ) {
     w->ok = FALSE;
 
   if ( w->ok ) {
     w->ok = FALSE;


@@ -207,13 +218,15 @@ static gchar *write_tmp_track ( VikTrack *track )
 /* depending on type of filter, often only vtl or track will be given.
  * the other can be NULL.
  */
 /* depending on type of filter, often only vtl or track will be given.
  * the other can be NULL.
  */

-static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikDataSourceInterface *interface,
+static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikDataSourceInterface *source_interface,

                      VikTrwLayer *vtl, VikTrack *track )
 {
   /* for manual dialogs */
   GtkWidget *dialog = NULL;
   GtkWidget *status;
   gchar *cmd, *extra;
                      VikTrwLayer *vtl, VikTrack *track )
 {
   /* for manual dialogs */
   GtkWidget *dialog = NULL;
   GtkWidget *status;
   gchar *cmd, *extra;

+  gchar *cmd_off = NULL;
+  gchar *extra_off = NULL;

   acq_dialog_widgets_t *w;
   gpointer user_data;
 
   acq_dialog_widgets_t *w;
   gpointer user_data;
 


@@ -224,14 +237,14 @@ static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikD
   w_and_interface_t *wi;
 
   /*** INIT AND CHECK EXISTENCE ***/
   w_and_interface_t *wi;
 
   /*** INIT AND CHECK EXISTENCE ***/

-  if ( interface->init_func )
-    user_data = interface->init_func();
+  if ( source_interface->init_func )
+    user_data = source_interface->init_func();

   else
     user_data = NULL;
   pass_along_data = user_data;
 
   else
     user_data = NULL;
   pass_along_data = user_data;
 

-  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();

     if ( error_str ) {
       a_dialog_error_msg ( GTK_WINDOW(vw), error_str );
       g_free ( error_str );
     if ( error_str ) {
       a_dialog_error_msg ( GTK_WINDOW(vw), error_str );
       g_free ( error_str );


@@ -243,24 +256,33 @@ static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikD
 
   /* POSSIBILITY 0: NO OPTIONS. DO NOTHING HERE. */
   /* POSSIBILITY 1: ADD_SETUP_WIDGETS_FUNC */
 
   /* POSSIBILITY 0: NO OPTIONS. DO NOTHING HERE. */
   /* POSSIBILITY 1: ADD_SETUP_WIDGETS_FUNC */

-  if ( interface->add_setup_widgets_func ) {
+  if ( source_interface->add_setup_widgets_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) );
+    gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+    GtkWidget *response_w = NULL;
+#if GTK_CHECK_VERSION (2, 20, 0)
+    response_w = gtk_dialog_get_widget_for_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+#endif
+
+    source_interface->add_setup_widgets_func(dialog, vvp, user_data);
+    gtk_window_set_title ( GTK_WINDOW(dialog), _(source_interface->window_title) );
+
+    if ( response_w )
+      gtk_widget_grab_focus ( response_w );

 
     if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) != GTK_RESPONSE_ACCEPT ) {
 
     if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) != GTK_RESPONSE_ACCEPT ) {

-      interface->cleanup_func(user_data);
+      source_interface->cleanup_func(user_data);

       gtk_widget_destroy(dialog);
       return;
     }
   }
   /* POSSIBILITY 2: UI BUILDER */
       gtk_widget_destroy(dialog);
       return;
     }
   }
   /* POSSIBILITY 2: UI BUILDER */

-  else if ( interface->params ) {
-    paramdatas = a_uibuilder_run_dialog ( GTK_WINDOW(vw),
-                       interface->params, interface->params_count,
-                       interface->params_groups, interface->params_groups_count,
-                       interface->params_defaults );
+  else if ( source_interface->params ) {
+    paramdatas = a_uibuilder_run_dialog ( source_interface->window_title, GTK_WINDOW(vw),
+                       source_interface->params, source_interface->params_count,
+                       source_interface->params_groups, source_interface->params_groups_count,
+                       source_interface->params_defaults );

     if ( paramdatas )
       pass_along_data = paramdatas;
     else
     if ( paramdatas )
       pass_along_data = paramdatas;
     else


@@ -269,39 +291,44 @@ static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikD
 
   /* CREATE INPUT DATA & GET COMMAND STRING */
 
 
   /* CREATE INPUT DATA & GET COMMAND STRING */
 

-  if ( interface->inputtype == VIK_DATASOURCE_INPUTTYPE_TRWLAYER ) {
+  if ( source_interface->inputtype == VIK_DATASOURCE_INPUTTYPE_TRWLAYER ) {

     gchar *name_src = write_tmp_trwlayer ( vtl );
 
     gchar *name_src = write_tmp_trwlayer ( vtl );
 

-    ((VikDataSourceGetCmdStringFuncWithInput) interface->get_cmd_string_func)
+    ((VikDataSourceGetCmdStringFuncWithInput) source_interface->get_cmd_string_func)

        ( 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? */

-  } else if ( interface->inputtype == VIK_DATASOURCE_INPUTTYPE_TRWLAYER_TRACK ) {
+  } else if ( source_interface->inputtype == VIK_DATASOURCE_INPUTTYPE_TRWLAYER_TRACK ) {

     gchar *name_src = write_tmp_trwlayer ( vtl );
     gchar *name_src_track = write_tmp_track ( track );
 
     gchar *name_src = write_tmp_trwlayer ( vtl );
     gchar *name_src_track = write_tmp_track ( track );
 

-    ((VikDataSourceGetCmdStringFuncWithInputInput) interface->get_cmd_string_func)
+    ((VikDataSourceGetCmdStringFuncWithInputInput) source_interface->get_cmd_string_func)

        ( 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 );

-  } else if ( interface->inputtype == VIK_DATASOURCE_INPUTTYPE_TRACK ) {
+  } else if ( source_interface->inputtype == VIK_DATASOURCE_INPUTTYPE_TRACK ) {

     gchar *name_src_track = write_tmp_track ( track );
 
     gchar *name_src_track = write_tmp_track ( track );
 

-    ((VikDataSourceGetCmdStringFuncWithInput) interface->get_cmd_string_func)
+    ((VikDataSourceGetCmdStringFuncWithInput) source_interface->get_cmd_string_func)

        ( 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

-    interface->get_cmd_string_func ( pass_along_data, &cmd, &extra );
+    source_interface->get_cmd_string_func ( pass_along_data, &cmd, &extra );
+
+  /* Get data for Off command */
+  if ( source_interface->off_func ) {
+    source_interface->off_func ( pass_along_data, &cmd_off, &extra_off );
+  }

 
   /* cleanup for option dialogs */
 
   /* cleanup for option dialogs */

-  if ( interface->add_setup_widgets_func ) {
+  if ( source_interface->add_setup_widgets_func ) {

     gtk_widget_destroy(dialog);
     dialog = NULL;
     gtk_widget_destroy(dialog);
     dialog = NULL;

-  } 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 );

   }
 
   /*** LET'S DO IT! ***/
   }
 
   /*** LET'S DO IT! ***/


@@ -312,27 +339,28 @@ static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikD
   w = g_malloc(sizeof(*w));
   wi = g_malloc(sizeof(*wi));
   wi->w = w;
   w = g_malloc(sizeof(*w));
   wi = g_malloc(sizeof(*wi));
   wi->w = w;

-  wi->w->interface = interface;
+  wi->w->source_interface = source_interface;

   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 );

-  gtk_window_set_title ( GTK_WINDOW(dialog), _(interface->window_title) );
+  gtk_window_set_title ( GTK_WINDOW(dialog), _(source_interface->window_title) );

 
 
   w->dialog = dialog;
   w->ok = TRUE;
   status = gtk_label_new (_("Status: detecting gpsbabel"));
   gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), status, FALSE, FALSE, 5 );
 
 
   w->dialog = dialog;
   w->ok = TRUE;
   status = gtk_label_new (_("Status: detecting gpsbabel"));
   gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), status, FALSE, FALSE, 5 );

+  gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );

   gtk_widget_show_all(status);
   w->status = status;
 
   w->vw = vw;
   w->vlp = vlp;
   w->vvp = vvp;
   gtk_widget_show_all(status);
   w->status = status;
 
   w->vw = vw;
   w->vlp = vlp;
   w->vvp = vvp;

-  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 );

   }
   w->user_data = user_data;
 
   }
   w->user_data = user_data;
 


@@ -343,13 +371,17 @@ static void acquire ( VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikD
   if ( w->ok )
     w->ok = FALSE; /* tell thread to stop. TODO: add mutex */
   else {
   if ( w->ok )
     w->ok = FALSE; /* tell thread to stop. TODO: add mutex */
   else {

+    if ( cmd_off ) {
+      /* Turn off */
+      a_babel_convert_from (NULL, cmd_off, NULL, extra_off, NULL);
+    }

     g_free ( w ); /* thread has finished; free w */
   }
   gtk_widget_destroy ( dialog );
 }
 
     g_free ( w ); /* thread has finished; free w */
   }
   gtk_widget_destroy ( dialog );
 }
 

-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 );

 }
 
 static void acquire_trwlayer_callback ( GObject *menuitem, gpointer *pass_along )
 }
 
 static void acquire_trwlayer_callback ( GObject *menuitem, gpointer *pass_along )


@@ -368,7 +400,7 @@ static GtkWidget *acquire_build_menu ( VikWindow *vw, VikLayersPanel *vlp, VikVi
                                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 )
 {

-  static gpointer pass_along[4];
+  static gpointer pass_along[5];

   GtkWidget *menu_item=NULL, *menu=NULL;
   GtkWidget *item=NULL;
   int i;
   GtkWidget *menu_item=NULL, *menu=NULL;
   GtkWidget *item=NULL;
   int i;


@@ -383,7 +415,7 @@ static GtkWidget *acquire_build_menu ( VikWindow *vw, VikLayersPanel *vlp, VikVi
     if ( filters[i]->inputtype == inputtype ) {
       if ( ! menu_item ) { /* do this just once, but return NULL if no filters */
         menu = gtk_menu_new();
     if ( filters[i]->inputtype == inputtype ) {
       if ( ! menu_item ) { /* do this just once, but return NULL if no filters */
         menu = gtk_menu_new();

-        menu_item = gtk_menu_item_new_with_label ( menu_title );
+        menu_item = gtk_menu_item_new_with_mnemonic ( menu_title );

         gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu );
       }
 
         gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu );
       }
 


@@ -400,7 +432,7 @@ static GtkWidget *acquire_build_menu ( VikWindow *vw, VikLayersPanel *vlp, VikVi
 
 GtkWidget *a_acquire_trwlayer_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrwLayer *vtl)
 {
 
 GtkWidget *a_acquire_trwlayer_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrwLayer *vtl)
 {

-  return acquire_build_menu ( vw, vlp, vvp, vtl, NULL, "Filter", VIK_DATASOURCE_INPUTTYPE_TRWLAYER );
+  return acquire_build_menu ( vw, vlp, vvp, vtl, NULL, "_Filter", VIK_DATASOURCE_INPUTTYPE_TRWLAYER );

 }
 
 GtkWidget *a_acquire_trwlayer_track_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrwLayer *vtl)
 }
 
 GtkWidget *a_acquire_trwlayer_track_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrwLayer *vtl)