Diff of /trunk/src/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 193 by harbaum, Tue Nov 17 20:13:09 2009 UTC revision 243 by harbaum, Mon Dec 14 20:07:54 2009 UTC
# Line 15  Line 15 
15   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
16   */   */
17    
18  #include <stdio.h>  #define __USE_GNU
19  #include <string.h>  #include <string.h>
20    
21    #include <stdio.h>
22  #include <math.h>  #include <math.h>
23    
24  #include <curl/curl.h>  #include <curl/curl.h>
# Line 34  Line 36 
36  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
37  #include <hildon/hildon-note.h>  #include <hildon/hildon-note.h>
38  #include <hildon/hildon-entry.h>  #include <hildon/hildon-entry.h>
 #include <hildon/hildon-check-button.h>  
39  #endif  #endif
40  #endif  #endif
41    
# Line 155  gpx_t *choose_file(appdata_t *appdata, g Line 156  gpx_t *choose_file(appdata_t *appdata, g
156        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
157    
158        if(!whole_dir)        if(!whole_dir)
159          gpx = gpx_parse(dialog, filename);          gpx = gpx_parse(dialog, filename, appdata->username);
160        else {        else {
161          /* cur trailing '/' if present */          /* cur trailing '/' if present */
162          if(strlastchr(filename) == '/')          if(strlastchr(filename) == '/')
163            filename[strlen(filename)] = 0;            filename[strlen(filename)] = 0;
164    
165          gpx = gpx_parse_dir(dialog, filename);          gpx = gpx_parse_dir(dialog, filename, appdata->username);
166        }        }
167    
168        gpx_busy_dialog_destroy(dialog);        gpx_busy_dialog_destroy(dialog);
169    
170        /* save path if gpx was successfully loaded */        /* save path if gpx was successfully loaded */
# Line 221  void cachelist_goto_cache(appdata_t *app Line 222  void cachelist_goto_cache(appdata_t *app
222  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
223      cache_dialog(appdata, cache);      cache_dialog(appdata, cache);
224  #else  #else
225        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
226    
227      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
228      appdata->cur_view = cache_view(appdata, cache);      appdata->cur_view = cache_view(appdata, cache);
229      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
230      gtk_widget_show_all(appdata->vbox);      gtk_widget_show_all(appdata->vbox);
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
231  #endif  #endif
232  }  }
233    
# Line 255  typedef struct { Line 256  typedef struct {
256    appdata_t *appdata;    appdata_t *appdata;
257    GtkTreePath *path;    GtkTreePath *path;
258    gboolean done;    gboolean done;
259  } cachelist_expose_t;  } cachelist_context_t;
260    
261  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,
262                                   gpointer user_data) {                                   gpointer user_data) {
263    cachelist_expose_t *ce = (cachelist_expose_t*)user_data;    cachelist_context_t *ce = (cachelist_context_t*)user_data;
264    
265    if(event->type == GDK_EXPOSE) {    if(event->type == GDK_EXPOSE) {
266      if(ce->path && !ce->done) {      if(ce->path && !ce->done) {
# Line 274  static gboolean cachelist_expose(GtkWidg Line 275  static gboolean cachelist_expose(GtkWidg
275  }  }
276    
277  static void cachelist_destroy(GtkWidget *widget, gpointer user_data) {  static void cachelist_destroy(GtkWidget *widget, gpointer user_data) {
   cachelist_expose_t *ce = (cachelist_expose_t*)user_data;  
278    
279    printf("cachelist timer removed\n");    guint handler_id =
280    g_assert(ce->appdata->cachelist_handler_id);      (guint)g_object_get_data(G_OBJECT(user_data), "handler_id");
281    gtk_timeout_remove(ce->appdata->cachelist_handler_id);  
282    ce->appdata->cachelist_handler_id = 0;    if(handler_id) {
283        gtk_timeout_remove(handler_id);
284        g_object_set_data(G_OBJECT(user_data), "handler_id", NULL);
285    
286        printf("cachelist timer removed\n");
287      }
288    
289      gpointer *ce =
290        g_object_get_data(G_OBJECT(user_data), "ce");
291      g_assert(ce);
292    
293    free(user_data);    free(ce);
294  }  }
295    
296  #define CACHELIST_UPDATE_TIMEOUT (30000)  #define CACHELIST_UPDATE_TIMEOUT (30000)
# Line 290  static GtkWidget *cachelist_create(appda Line 299  static GtkWidget *cachelist_create(appda
299                                     cache_t *sel_cache);                                     cache_t *sel_cache);
300    
301  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
302      printf("redrawing cachelist\n");
303    
304    if(!appdata->cur_view) {    if(!appdata->cur_view) {
305      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
306      return;      return;
# Line 305  void cachelist_redraw(appdata_t *appdata Line 316  void cachelist_redraw(appdata_t *appdata
316    }    }
317    
318    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
   
319  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
320      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
321      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
322    #else
323        GtkWidget *container = appdata->vbox;
324  #endif  #endif
325    
326      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 325  void cachelist_redraw(appdata_t *appdata Line 336  void cachelist_redraw(appdata_t *appdata
336      }      }
337    
338  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
339      if(container != appdata->vbox)      gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
340        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);  #else
341      else      gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
342  #endif  #endif
       gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);  
343    
344      gtk_widget_show_all(container);      gtk_widget_show_all(container);
345    }    }
# Line 337  void cachelist_redraw(appdata_t *appdata Line 347  void cachelist_redraw(appdata_t *appdata
347    
348    
349  static gboolean cachelist_update(gpointer data) {  static gboolean cachelist_update(gpointer data) {
350      appdata_t *appdata =
351        (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
352      g_assert(appdata);
353    
354    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
355    
356    appdata_t *appdata = (appdata_t*)data;    /* check if the widget the timer fired for is the currently */
357      /* visible one (if a search result is being shown, a cachlist */
358      /* may also be present below it) */
359      if(appdata->cur_view != data) {
360        printf("-> widget is not the one currently on top, don't redraw\n");
361        return TRUE;
362      }
363    
364    if(appdata->cur_cache)    if(appdata->cur_cache)
365      return TRUE;      return TRUE;
# Line 353  static gboolean cachelist_update(gpointe Line 372  static gboolean cachelist_update(gpointe
372    
373    if(appdata->cachelist_update)    if(appdata->cachelist_update)
374      cachelist_redraw(appdata);      cachelist_redraw(appdata);
375      else
376        printf("update disabled\n");
377    
378    return TRUE;    return TRUE;
379  }  }
380    
381  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(GtkWidget *widget) {
382      guint handler_id =
383        (guint)g_object_get_data(G_OBJECT(widget), "handler_id");
384      g_assert(handler_id);
385    
386      appdata_t *appdata =
387        (appdata_t*)g_object_get_data(G_OBJECT(widget), "appdata");
388      g_assert(appdata);
389    
390    printf("cachelist timer reset\n");    printf("cachelist timer reset\n");
391    g_assert(appdata->cachelist_handler_id);    gtk_timeout_remove(handler_id);
392    gtk_timeout_remove(appdata->cachelist_handler_id);    g_object_set_data(G_OBJECT(widget), "handler_id", (gpointer)
393    appdata->cachelist_handler_id =      gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, widget));
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
394  }  }
395    
396  static gboolean cachelist_update_reset0(GtkWidget *widget,  static gboolean cachelist_update_reset0(GtkWidget *widget,
397                                          GdkEventButton *event,                                          GdkEventButton *event,
398                                          gpointer user_data) {                                          gpointer user_data) {
399    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
400    return FALSE;    return FALSE;
401  }  }
402    
403  static void cachelist_update_reset1(GtkAdjustment *adj,  static void cachelist_update_reset1(GtkAdjustment *adj,
404                                      gpointer user_data) {                                      gpointer user_data) {
405    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
406  }  }
407    
408    static gboolean on_cachelist_focus_in(GtkWidget *widget, GdkEventFocus *event,
409                                          gpointer data) {
410    
411    
412      /* we don't want a runnign timer yet */
413      if(!g_object_get_data(G_OBJECT(data), "handler_id")) {
414        printf("focus received: restarting cachelist timer\n");
415    
416        appdata_t *appdata =
417          (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
418        g_assert(appdata);
419    
420        g_object_set_data(G_OBJECT(data), "handler_id", (gpointer)
421          gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, data));
422      }
423    
424      return FALSE;
425    }
426    
427    static gboolean on_cachelist_focus_out(GtkWidget *widget, GdkEventFocus *event,
428                                           gpointer data) {
429    
430      guint handler_id =
431        (guint)g_object_get_data(G_OBJECT(data), "handler_id");
432      g_assert(handler_id);
433    
434      gtk_timeout_remove(handler_id);
435      g_object_set_data(G_OBJECT(data), "handler_id", NULL);
436    
437      printf("focus lost: cachelist timer removed\n");
438    
439      return FALSE;
440    }
441    
442  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,
443                                     cache_t *sel_cache) {                                     cache_t *sel_cache) {
444    GtkCellRenderer *renderer;    GtkCellRenderer *renderer;
# Line 474  static GtkWidget *cachelist_create(appda Line 536  static GtkWidget *cachelist_create(appda
536      if(tint > 8) tint = 8;      if(tint > 8) tint = 8;
537    
538      /* cache type includes "solved" flag in lowest bit */      /* cache type includes "solved" flag in lowest bit */
539      int type = (cache->type<<8) +      int type = cache->type<<8;
540        (cache->notes?4:0) +      if(cache->notes) type |= 4;
541        ((cache->notes && cache->notes->override)?1:0) +      if(cache->notes && cache->notes->override) type |= 1;
542        ((cache->notes && cache->notes->found)?2:0);      if(cache->notes && cache->notes->found) type |= 2;
543        if(cache->found) type |= 2;
544        if(cache->mine) type |= 8;
545    
546      if((!(type & 2)) || !appdata->cachelist_hide_found) {      if((!(type & 2)) || !appdata->cachelist_hide_found) {
547    
# Line 520  static GtkWidget *cachelist_create(appda Line 584  static GtkWidget *cachelist_create(appda
584    g_signal_connect(view, "row-activated",    g_signal_connect(view, "row-activated",
585                     (GCallback)cachelist_view_onRowActivated, appdata);                     (GCallback)cachelist_view_onRowActivated, appdata);
586    
587    cachelist_expose_t *ce = malloc(sizeof(cachelist_expose_t));    cachelist_context_t *ce = g_new0(cachelist_context_t, 1);
588    ce->appdata = appdata;    ce->appdata = appdata;
589    ce->path = path;    ce->path = path;
590    ce->done = FALSE;    ce->done = FALSE;
591    
592    g_signal_connect(view, "expose-event",    g_signal_connect(view, "expose-event",
593                     (GCallback)cachelist_expose, ce);                     (GCallback)cachelist_expose, ce);
   g_signal_connect(view, "destroy",  
                    (GCallback)cachelist_destroy, ce);  
594    
595    /* put this inside a scrolled view */    /* put this inside a scrolled view */
596  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
597    GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);    GtkWidget *container = gtk_scrolled_window_new (NULL, NULL);
598    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(container),
599                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
600    gtk_container_add(GTK_CONTAINER(scrolled_window), view);    gtk_container_add(GTK_CONTAINER(container), view);
601  #else  #else
602    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *container = hildon_pannable_area_new();
603      gtk_container_add(GTK_CONTAINER(container), view);
   gtk_container_add(GTK_CONTAINER(pannable_area), view);  
604  #endif  #endif
605    
606    /* add a timer for automatic update */    g_signal_connect(view, "destroy",
607    g_assert(!appdata->cachelist_handler_id);                     (GCallback)cachelist_destroy, container);
   appdata->cachelist_handler_id =  
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
608    
609    /* update timer is being reset if the user scrolls or selects */    /* update timer is being reset if the user scrolls or selects */
610    g_signal_connect(view, "button-press-event",    g_signal_connect(view, "button-press-event",
611                     (GCallback)cachelist_update_reset0, appdata);                     (GCallback)cachelist_update_reset0, container);
612    
613      /* add a timer for automatic update */
614      g_object_set_data(G_OBJECT(container), "handler_id", (gpointer)
615        gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, container));
616    
617      printf("cachelist timer created\n");
618    
619      g_object_set_data(G_OBJECT(container), "appdata", (gpointer)appdata);
620    
621      g_object_set_data(G_OBJECT(container), "ce", (gpointer)ce);
622    
623      /* the timer is removed and re-enabled on every focus change event */
624      /* for the main top window */
625      //  GtkWidget *root = gtk_widget_get_toplevel(GTK_WIDGET(button)))
626    
627      g_signal_connect(G_OBJECT(view), "focus-in-event",
628                       G_CALLBACK(on_cachelist_focus_in), container);
629    
630      g_signal_connect(G_OBJECT(view), "focus-out-event",
631                       G_CALLBACK(on_cachelist_focus_out), container);
632    
633  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
634    g_signal_connect(gtk_scrolled_window_get_vadjustment(    g_signal_connect(gtk_scrolled_window_get_vadjustment(
635                         GTK_SCROLLED_WINDOW(scrolled_window)),                 GTK_SCROLLED_WINDOW(container)),
636                             "value-changed",                 "value-changed",
637                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
   return scrolled_window;  
638  #else  #else
639    g_signal_connect(hildon_pannable_area_get_vadjustment(    g_signal_connect(hildon_pannable_area_get_vadjustment(
640                         HILDON_PANNABLE_AREA(pannable_area)),                 HILDON_PANNABLE_AREA(container)),
641                             "value-changed",                 "value-changed",
642                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
643    
   return pannable_area;  
644  #endif  #endif
645      return container;
646  }  }
647    
648  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 593  void cachelist_dialog(appdata_t *appdata Line 669  void cachelist_dialog(appdata_t *appdata
669  static void search_result_free(gpx_t *result);  static void search_result_free(gpx_t *result);
670    
671  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {  void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
672      printf("cachelist destroy\n");
673    
674      HildonWindowStack *stack = hildon_window_stack_get_default();
675      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
676    
677    if(appdata->search_results) {    if(appdata->search_results) {
678      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
679      appdata->search_results = NULL;      appdata->search_results = NULL;
# Line 609  void on_cachelist_destroy(GtkWidget *wid Line 690  void on_cachelist_destroy(GtkWidget *wid
690    
691  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
692    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
693      appdata->window = HILDON_WINDOW(window);
694    
695    /* store last "cur_view" in window */    /* store last "cur_view" in window */
696    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
697    
698    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
699    char *title = g_strdup_printf("%s - GPXView", gpx->name);    gtk_window_set_title(GTK_WINDOW(window), gpx->name);
   gtk_window_set_title(GTK_WINDOW(window), title);  
   g_free(title);  
700    
701    appdata->cur_view = cachelist_create(appdata, gpx, NULL);    appdata->cur_view = cachelist_create(appdata, gpx, NULL);
702    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
# Line 665  static GdkPixbuf *gpx_icon_get(gpx_t *gp Line 745  static GdkPixbuf *gpx_icon_get(gpx_t *gp
745    return icon_get(ICON_FILE, 0);    return icon_get(ICON_FILE, 0);
746  }  }
747    
748  static void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {  void gpxlist_set(GtkListStore *store, GtkTreeIter *iter, gpx_t *gpx) {
749    char date_str[32], cnum[32];    char date_str[32], cnum[32];
750    
751    if(gpx->year && gpx->month && gpx->day) {    if(gpx->year && gpx->month && gpx->day) {
# Line 690  static void gpxlist_set(GtkListStore *st Line 770  static void gpxlist_set(GtkListStore *st
770                       GPXLIST_COL_OPEN, !gpx->closed,                       GPXLIST_COL_OPEN, !gpx->closed,
771                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,                       GPXLIST_COL_CACHES, gpx->closed?NULL:cnum,
772  #ifdef USE_PANNABLE_AREA  #ifdef USE_PANNABLE_AREA
773                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 4),                       GPXLIST_COL_DELETE, icon_get(ICON_MISC, 2),
774  #endif  #endif
775                       GPXLIST_COL_DATA, gpx,                       GPXLIST_COL_DATA, gpx,
776                       -1);                       -1);
# Line 814  static void gpxlist_view_onRowActivated( Line 894  static void gpxlist_view_onRowActivated(
894    
895        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
896    
       gtk_box_pack_start(GTK_BOX(hbox),  
          gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,  
                                    GTK_ICON_SIZE_DIALOG),  
                          FALSE, FALSE, 0);  
   
897        GtkWidget *label = gtk_label_new(        GtkWidget *label = gtk_label_new(
898                    _("Do you want to close this entry only or do "                    _("Do you want to close this entry only or do "
899                      "you want to remove it completely from the list?"));                      "you want to remove it completely from the list?"));
# Line 864  static void gpxlist_view_onRowActivated( Line 939  static void gpxlist_view_onRowActivated(
939          gpx_t *new = NULL;          gpx_t *new = NULL;
940    
941          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))          if(g_file_test(gpx->filename, G_FILE_TEST_IS_DIR))
942            new = gpx_parse_dir(dialog, gpx->filename);            new = gpx_parse_dir(dialog, gpx->filename, appdata->username);
943          else          else
944            new = gpx_parse(dialog, gpx->filename);            new = gpx_parse(dialog, gpx->filename, appdata->username);
945    
946          if(new) {          if(new) {
947            gpx_t **prev = &(appdata->gpx);            gpx_t **prev = &(appdata->gpx);
# Line 908  static void gpxlist_view_onRowActivated( Line 983  static void gpxlist_view_onRowActivated(
983    }    }
984  }  }
985    
986    /* search gpx file in gpx list */
987    gboolean gpxlist_find(appdata_t *appdata, GtkTreeIter *iter, gpx_t *gpx) {
988      GtkTreeModel *model =
989        gtk_tree_view_get_model(GTK_TREE_VIEW(appdata->gpxview));
990    
991      gboolean found =
992        gtk_tree_model_get_iter_first(model, iter);
993    
994      while(found) {
995        gpx_t *this_gpx;
996        gtk_tree_model_get(model, iter, GPXLIST_COL_DATA, &this_gpx, -1);
997    
998        if(gpx == this_gpx)
999          return TRUE;
1000    
1001        found = gtk_tree_model_iter_next(model, iter);
1002      }
1003    
1004      return FALSE;
1005    }
1006    
1007    
1008  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1009  static gboolean  static gboolean
1010  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,  view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
# Line 946  static GtkWidget *gpxlist_create_view_an Line 1043  static GtkWidget *gpxlist_create_view_an
1043    
1044    appdata->gpxview = gtk_tree_view_new ();    appdata->gpxview = gtk_tree_view_new ();
1045    
1046      printf("building gpx list, items = %d\n", appdata->gpxlist_items);
1047    
1048    GtkTreeSelection *selection =    GtkTreeSelection *selection =
1049      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1050  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 1082  static GtkWidget *gpxlist_create_view_an Line 1181  static GtkWidget *gpxlist_create_view_an
1181  }  }
1182    
1183  /* add last entry in gpx list to visual representation */  /* add last entry in gpx list to visual representation */
1184  static void gpxlist_add(appdata_t *appdata, gpx_t *new) {  void gpxlist_add(appdata_t *appdata, gpx_t *new) {
1185    GtkTreeIter         iter;    GtkTreeIter         iter;
1186    
1187    gtk_list_store_append(appdata->gpxstore, &iter);    gtk_list_store_append(appdata->gpxstore, &iter);
# Line 1092  static void gpxlist_add(appdata_t *appda Line 1191  static void gpxlist_add(appdata_t *appda
1191    gpx_t **gpx = &appdata->gpx;    gpx_t **gpx = &appdata->gpx;
1192    while(*gpx) gpx = &((*gpx)->next);    while(*gpx) gpx = &((*gpx)->next);
1193    *gpx = new;    *gpx = new;
1194    
1195      /* select new iter */
1196      GtkTreeSelection *selection =
1197        gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
1198      gtk_tree_selection_select_iter(selection, &iter);
1199      GtkTreePath *path =
1200        gtk_tree_model_get_path(GTK_TREE_MODEL(appdata->gpxstore), &iter);
1201      gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(appdata->gpxview),
1202                                   path, NULL, TRUE, 0.0, 0.0);
1203      gtk_tree_path_free(path);
1204  }  }
1205    
1206  /******************** end of gpxlist ********************/  /******************** end of gpxlist ********************/
1207    
1208  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1209    
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *dialog;  
 } about_context_t;  
   
 #ifdef ENABLE_BROWSER_INTERFACE  
 void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {  
   gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);  
   browser_url(context->appdata,  
               "https://www.paypal.com/cgi-bin/webscr"  
               "?cmd=_s-xclick&hosted_button_id=7400558");  
 }  
 #endif  
   
1210  static void  static void
1211  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1212    about_context_t context;    about_box((appdata_t*)data);
   
   context.appdata = (appdata_t *)data;  
   
 #ifdef ENABLE_LIBLOCATION  
   char *uses = "uses liblocation";  
 #elif defined(ENABLE_GPSBT)  
   char *uses = "uses gpsbt and gpsd";  
 #else  
   char *uses = "uses gpsd";  
 #endif  
   
   const gchar *authors[] = {  
     "Till Harbaum <till@harbaum.org>",  
     "John Stowers <john.stowers@gmail.com>",  
     "GCVote: Guido Wegener <guido.wegener@gmx.de>",  
     NULL };  
   
   context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,  
                         "name", "GPXView",  
                         "version", VERSION,  
                         "copyright", _("Copyright 2008-2009"),  
                         "authors", authors,  
                         "website", _("http://www.harbaum.org/till/maemo"),  
                         "comments", _(uses),  
                         NULL);  
   
 #ifdef ENABLE_BROWSER_INTERFACE  
   /* add a way to donate to the project */  
   GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);  
   
   GtkWidget *hbox = gtk_hbox_new(FALSE, 8);  
   gtk_box_pack_start(GTK_BOX(hbox),  
                      gtk_label_new(_("Do you like GPXView?")),  
                      FALSE, FALSE, 0);  
   
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button),  
                        icon_get_widget(ICON_MISC, 5));  
   gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(on_paypal_button_clicked), &context);  
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);  
   
   gtk_container_add(GTK_CONTAINER(alignment), hbox);  
   gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),  
                               alignment);  
   
   gtk_widget_show_all(alignment);  
 #endif  
   
   gtk_dialog_run(GTK_DIALOG(context.dialog));  
   gtk_widget_destroy(context.dialog);  
1213  }  }
1214    
1215  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1369  typedef struct { Line 1412  typedef struct {
1412  } search_context_t;  } search_context_t;
1413    
1414    
 static GtkWidget *check_button_new_with_label(char *label) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_check_button_new_with_label(label);  
 #else  
   GtkWidget *cbut =  
     hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);  
   gtk_button_set_label(GTK_BUTTON(cbut), label);  
   return cbut;  
 #endif  
 }  
   
 static void check_button_set_active(GtkWidget *button, gboolean active) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);  
 #else  
   hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);  
 #endif  
 }  
   
 static gboolean check_button_get_active(GtkWidget *button) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));  
 #else  
   return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));  
 #endif  
 }  
   
1415  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1416    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1417    
# Line 1451  cb_menu_search(GtkWidget *window, gpoint Line 1467  cb_menu_search(GtkWidget *window, gpoint
1467    
1468    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1469                                gtk_label_new(_("Search for:")));                                gtk_label_new(_("Search for:")));
1470  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)    context.entry = entry_new();
   context.entry = gtk_entry_new();  
 #else  
   context.entry = hildon_entry_new(HILDON_SIZE_AUTO);  
 #endif  
   
1471    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),
1472                                context.entry);                                context.entry);
1473    
# Line 1843  HildonAppMenu *menu_create(appdata_t *ap Line 1854  HildonAppMenu *menu_create(appdata_t *ap
1854      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1855                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1856      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1857      }
1858    
1859      /* if search results exist, don't allow another search */
1860      if(!appdata->search_results &&
1861         ((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST))) {
1862      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
1863      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1864                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_search), appdata);
# Line 2042  void menu_create(appdata_t *appdata) { Line 2057  void menu_create(appdata_t *appdata) {
2057  /********************* end of menu **********************/  /********************* end of menu **********************/
2058    
2059  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
2060      gconf_save_state(appdata);
2061    
2062    gpx_free_all(appdata->gpx);    gpx_free_all(appdata->gpx);
   if(appdata->path) free(appdata->path);  
   if(appdata->image_path) free(appdata->image_path);  
   if(appdata->search_str) free(appdata->search_str);  
2063    
2064  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2065    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);    if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
# Line 2056  void cleanup(appdata_t *appdata) { Line 2070  void cleanup(appdata_t *appdata) {
2070    icons_free();    icons_free();
2071    gps_release(appdata);    gps_release(appdata);
2072    
 #ifdef USE_MAEMO  
2073    if(appdata->search_results) {    if(appdata->search_results) {
2074      printf("freeing pending search\n");      printf("freeing pending search\n");
2075      search_result_free(appdata->search_results);      search_result_free(appdata->search_results);
2076    }    }
2077    
2078    #ifdef USE_MAEMO
2079    if(appdata->osso_context)    if(appdata->osso_context)
2080      osso_deinitialize(appdata->osso_context);      osso_deinitialize(appdata->osso_context);
2081    
# Line 2083  void cleanup(appdata_t *appdata) { Line 2097  void cleanup(appdata_t *appdata) {
2097  static void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2098    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2099    
   gconf_save_state(appdata);  
2100    gtk_main_quit();    gtk_main_quit();
2101    appdata->window = NULL;    appdata->window = NULL;
2102  }  }
# Line 2243  crumb_back(gpointer data) { Line 2256  crumb_back(gpointer data) {
2256    
2257  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
2258                        gpointer user_data) {                        gpointer user_data) {
2259    crumb_t *crumb = malloc(sizeof(crumb_t));    crumb_t *crumb = g_new0(crumb_t, 1);
2260    crumb->level = level;    crumb->level = level;
2261    crumb->appdata = appdata;    crumb->appdata = appdata;
2262    crumb->data = user_data;    crumb->data = user_data;
# Line 2323  void main_after_settings_redraw(appdata_ Line 2336  void main_after_settings_redraw(appdata_
2336    }    }
2337    
2338    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
2339    
2340  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2341      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
2342      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
2343    #else
2344        GtkWidget *container = appdata->vbox;
2345  #endif  #endif
2346    
2347      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 2346  void main_after_settings_redraw(appdata_ Line 2360  void main_after_settings_redraw(appdata_
2360      }      }
2361    
2362  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
     if(container != appdata->vbox)  
2363        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2364      else  #else
 #endif  
2365        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2366    #endif
2367    
2368      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2369    }    }
# Line 2374  int main(int argc, char *argv[]) { Line 2387  int main(int argc, char *argv[]) {
2387    
2388    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
2389    
2390      misc_init();
2391    
2392    curl_global_init(CURL_GLOBAL_ALL);    curl_global_init(CURL_GLOBAL_ALL);
2393    
2394  #ifdef USE_MAEMO  #ifdef USE_MAEMO
# Line 2428  int main(int argc, char *argv[]) { Line 2443  int main(int argc, char *argv[]) {
2443    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2444    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2445    
2446    #ifndef USE_STACKABLE_WINDOW
2447    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2448    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
 #ifndef USE_STACKABLE_WINDOW  
2449    menu_create(&appdata);    menu_create(&appdata);
2450  #else  #else
2451    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
# Line 2466  int main(int argc, char *argv[]) { Line 2481  int main(int argc, char *argv[]) {
2481    gps_init(&appdata);    gps_init(&appdata);
2482    
2483    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
2484    #ifndef USE_STACKABLE_WINDOW
2485    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
2486    #else
2487      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
2488    #endif
2489    
2490    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2491    gtk_main();    gtk_main();
Legend:
Removed from v.193  
changed lines
  Added in v.243