Diff of /trunk/src/main.c

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

revision 6 by harbaum, Wed Jun 24 19:20:21 2009 UTC revision 142 by harbaum, Mon Oct 26 10:40:06 2009 UTC
# Line 35  Line 35 
35    
36  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
37    
38  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
39  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
40                        gpointer user_data);                        gpointer user_data);
41    
# Line 95  void errorf(const char *fmt, ...) { Line 95  void errorf(const char *fmt, ...) {
95    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
96                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
97                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
98                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
99                             buf);                             GTK_MESSAGE_ERROR,
100    #else
101                               GTK_MESSAGE_OTHER,
102    #endif
103                               GTK_BUTTONS_CLOSE, buf);
104    
105    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
106    
# Line 120  gpx_t *choose_file(appdata_t *appdata, g Line 124  gpx_t *choose_file(appdata_t *appdata, g
124                   HELP_ID_IMPORT, appdata->osso_context);                   HELP_ID_IMPORT, appdata->osso_context);
125  #endif  #endif
126  #else  #else
127    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Open Directory"):    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Import directory"):
128                                          _("Open File"),                                          _("Import file"),
129                          GTK_WINDOW(appdata->window),                          GTK_WINDOW(appdata->window),
130                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
131                                          GTK_FILE_CHOOSER_ACTION_OPEN,                                          GTK_FILE_CHOOSER_ACTION_OPEN,
# Line 138  gpx_t *choose_file(appdata_t *appdata, g Line 142  gpx_t *choose_file(appdata_t *appdata, g
142    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
143    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
144      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));      char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
145    
146        if(filename) {
147          gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));
148    
149      gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window));        if(!whole_dir)
150            gpx = gpx_parse(dialog, filename);
151      if(!whole_dir)        else {
152        gpx = gpx_parse(dialog, filename);          /* cur trailing '/' if present */
153      else {          if(strlastchr(filename) == '/')
154        /* cur trailing '/' if present */            filename[strlen(filename)] = 0;
155        if(strlastchr(filename) == '/')  
156          filename[strlen(filename)] = 0;          gpx = gpx_parse_dir(dialog, filename);
   
       gpx = gpx_parse_dir(dialog, filename);  
     }  
   
     gpx_busy_dialog_destroy(dialog);  
   
     /* save path if gpx was successfully loaded */  
     if(gpx) {  
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r && !whole_dir) {  
         *r = 0;  
         if(appdata->path) free(appdata->path);  
         appdata->path = strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
157        }        }
158    
159          gpx_busy_dialog_destroy(dialog);
160    
161          /* save path if gpx was successfully loaded */
162          if(gpx) {
163            char *r = strrchr(filename, '/');
164    
165            /* there is a delimiter, use everything left of it as path */
166            if(r && !whole_dir) {
167              *r = 0;
168              if(appdata->path) free(appdata->path);
169              appdata->path = strdup(filename);
170              /* restore path ... just in case ... */
171              *r = '/';
172            }
173    
174            if(whole_dir)
175              appdata->path = strdup(filename);
176          } else
177            errorf(_("Load error"));
178    
179        if(whole_dir)        g_free (filename);
180          appdata->path = strdup(filename);      } else {
181    #ifndef USE_MAEMO
182          errorf(_("Error accessing the file."));
183    #else
184          errorf(_("Error accessing the file. This may happen if the file "
185                   "resides on a remote file system. Please copy the file onto "
186                   "the device (e.g. onto the memory card) and try again."));
187    #endif
188      }      }
   
     g_free (filename);  
189    }    }
190    
191    gtk_widget_destroy (dialog);    gtk_widget_destroy (dialog);
# Line 194  enum { Line 209  enum {
209    CACHELIST_NUM_COLS    CACHELIST_NUM_COLS
210  } ;  } ;
211    
212  void cachelist_view_onRowActivated(GtkTreeView        *treeview,  void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) {
213    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
214        cache_dialog(appdata, cache);
215    #else
216        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
217        appdata->cur_view = cache_view(appdata, cache);
218        gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
219        gtk_widget_show_all(appdata->vbox);
220    
221        crumb_add(appdata, cache->name, CRUMB_CACHE, cache);
222    #endif
223    }
224    
225    static void cachelist_view_onRowActivated(GtkTreeView        *treeview,
226                                     GtkTreePath        *path,                                     GtkTreePath        *path,
227                                     GtkTreeViewColumn  *col,                                     GtkTreeViewColumn  *col,
228                                     gpointer            userdata) {                                     gpointer            userdata) {
# Line 202  void cachelist_view_onRowActivated(GtkTr Line 230  void cachelist_view_onRowActivated(GtkTr
230    GtkTreeIter   iter;    GtkTreeIter   iter;
231    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
232    
233    #ifdef USE_MAEMO
234      /* check if a cache is already selected and ignore click if yes */
235      /* (was probably a double click) */
236      if(appdata->cur_cache) return;
237    #endif
238    
239    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
240      cache_t *cache;      cache_t *cache;
241      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
242  #ifndef USE_BREAD_CRUMB_TRAIL      cachelist_goto_cache(appdata, cache);
     cache_dialog(appdata, cache);  
 #else  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = cache_view(appdata, cache);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   
     crumb_add(appdata, cache->name, CRUMB_CACHE, cache);  
 #endif  
243    }    }
244  }  }
245    
# Line 257  static GtkWidget *cachelist_create(appda Line 282  static GtkWidget *cachelist_create(appda
282                                     cache_t *sel_cache);                                     cache_t *sel_cache);
283    
284  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
285  #ifndef USE_MAEMO    if(!appdata->cur_view) {
286    //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      printf("cachelist redraw: no active view\n");
287    //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);      return;
288    //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);    }
   // gtk_widget_show_all(appdata->vbox);  
 #else  
289    
290    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
291    int redraw = 0;    int redraw = 0;
# Line 274  void cachelist_redraw(appdata_t *appdata Line 297  void cachelist_redraw(appdata_t *appdata
297    }    }
298    
299    if(redraw) {    if(redraw) {
300      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
301    
302    #ifdef USE_STACKABLE_WINDOW
303        HildonWindowStack *stack = hildon_window_stack_get_default();
304        container = hildon_window_stack_peek(stack);
305    #endif
306    
307        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
308      switch(redraw) {      switch(redraw) {
309      case 1:      case 1:
310        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 316  void cachelist_redraw(appdata_t *appdata
316        break;        break;
317      }      }
318    
319      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
320      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
321    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
322        else
323  #endif  #endif
324          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
325    
326        gtk_widget_show_all(container);
327      }
328  }  }
329    
330    
# Line 297  static gboolean cachelist_update(gpointe Line 332  static gboolean cachelist_update(gpointe
332    
333    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
334    
 #ifdef USE_MAEMO  
335    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
336    
337      if(appdata->cur_cache)
338        return TRUE;
339    
340    #ifdef USE_MAEMO
341    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
342      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
343        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
344    #endif
345    
346    if(appdata->cachelist_update)    if(appdata->cachelist_update)
347      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
348    
349    return TRUE;    return TRUE;
350  }  }
351    
352  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
353      printf("cachelist timer reset\n");
354    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
355    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
356    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 543  void cachelist_dialog(appdata_t *appdata Line 582  void cachelist_dialog(appdata_t *appdata
582  }  }
583  #else  #else
584  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
585    static void search_result_free(gpx_t *result);
586    
587    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
588      if(appdata->search_results) {
589        search_result_free(appdata->search_results);
590        appdata->search_results = NULL;
591      }
592      appdata->cur_gpx = NULL;
593    
594    #ifdef ENABLE_OSM_GPS_MAP
595      map_update(appdata);
596    #endif
597    
598      /* restore cur_view */
599      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
600    }
601    
602  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
603    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
604    
605    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
606      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
607    
608    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
609                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("%s - GPXView", gpx->name);
610      gtk_window_set_title(GTK_WINDOW(window), title);
611      g_free(title);
612    
613      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
614      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
615    
616    
617    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
618                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
619    
620      g_signal_connect(G_OBJECT(window), "destroy",
621                       G_CALLBACK(on_cachelist_destroy), appdata);
622    
623    gtk_widget_show_all(window);    gtk_widget_show_all(window);
624    
625    #ifdef ENABLE_OSM_GPS_MAP
626      map_update(appdata);
627    #endif
628  }  }
629  #endif  #endif
630  #endif  #endif
# Line 658  static void gpxlist_close(appdata_t *app Line 728  static void gpxlist_close(appdata_t *app
728    gconf_save_closed_name(appdata, gpx->filename, gpx->name);    gconf_save_closed_name(appdata, gpx->filename, gpx->name);
729  }  }
730    
731    void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) {
732    #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
733    #ifdef USE_STACKABLE_WINDOW
734      if(!appdata->cur_gpx)
735    #endif
736        cachelist_dialog(appdata, gpx);
737    #ifdef USE_STACKABLE_WINDOW
738      else
739        printf("selected gpx, but cachelist window already present\n");
740    #endif
741    #else
742      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
743      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
744      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);
745      gtk_widget_show_all(appdata->vbox);
746    
747      crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);
748    #endif
749    }
750    
751  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,  static void gpxlist_view_onRowActivated(GtkTreeView *treeview,
752                            GtkTreePath        *path,                            GtkTreePath        *path,
753                            GtkTreeViewColumn  *col,                            GtkTreeViewColumn  *col,
# Line 666  static void gpxlist_view_onRowActivated( Line 756  static void gpxlist_view_onRowActivated(
756    GtkTreeIter   iter;    GtkTreeIter   iter;
757    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
758    
759    #ifdef USE_MAEMO
760      /* check if a cache is already selected and ignore click if yes */
761      /* (was probably a double click) */
762      if(appdata->cur_gpx) return;
763    #endif
764    
765    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
766      gpx_t *gpx;      gpx_t *gpx;
767      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 682  static void gpxlist_view_onRowActivated( Line 778  static void gpxlist_view_onRowActivated(
778        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
779                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
780                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
781                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   /* this doesn't fix the text selection issues ... */
782    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)
783                     GTK_MESSAGE_OTHER,
784    #else
785                     GTK_MESSAGE_QUESTION,
786    #endif
787                     GTK_BUTTONS_CANCEL,
788                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
789                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
790    
# Line 694  static void gpxlist_view_onRowActivated( Line 796  static void gpxlist_view_onRowActivated(
796        if(gpx->closed)        if(gpx->closed)
797          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
798    
799        gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));        gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
800    
801        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
802        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
# Line 763  static void gpxlist_view_onRowActivated( Line 865  static void gpxlist_view_onRowActivated(
865    
866          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
867        }        }
868  #ifndef USE_BREAD_CRUMB_TRAIL  
869        cachelist_dialog(appdata, gpx);        gpxlist_goto_cachelist(appdata, gpx);
 #else  
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);  
       gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
       gtk_widget_show_all(appdata->vbox);  
   
       crumb_add(appdata, gpx->name, CRUMB_CACHELIST, gpx);  
 #endif  
870      }      }
871    }    }
872  }  }
# Line 903  static GtkWidget *gpxlist_create_view_an Line 997  static GtkWidget *gpxlist_create_view_an
997      GtkTreeIter         iter;      GtkTreeIter         iter;
998      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
999      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
1000    
1001      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
1002        sel_iter = iter;        sel_iter = iter;
1003        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 963  static void gpxlist_add(appdata_t *appda Line 1057  static void gpxlist_add(appdata_t *appda
1057    
1058  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1059    
1060    typedef struct {
1061      appdata_t *appdata;
1062      GtkWidget *dialog;
1063    } about_context_t;
1064    
1065    #ifdef ENABLE_BROWSER_INTERFACE
1066    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1067      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1068      browser_url(context->appdata,
1069                  "https://www.paypal.com/cgi-bin/webscr"
1070                  "?cmd=_s-xclick&hosted_button_id=7400558");
1071    }
1072    #endif
1073    
1074  static void  static void
1075  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1076    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1077    
1078      context.appdata = (appdata_t *)data;
1079    
1080    gtk_about_dialog_set_name(about, "GPXView");  #ifdef ENABLE_LIBLOCATION
1081    gtk_about_dialog_set_version(about, VERSION);    char *uses = "uses liblocation";
1082    gtk_about_dialog_set_copyright(about,  #elif defined(ENABLE_GPSBT)
1083           _("GPXView (c) 2008 by\n"    char *uses = "uses gpsbt and gpsd";
1084           "Till Harbaum <till@harbaum.org>\n"  #else
1085           "Geocaching.com: Tantil"));    char *uses = "uses gpsd";
1086    #endif
1087    gtk_about_dialog_set_website(about,  
1088         _("http://www.harbaum.org/till/maemo"));    const gchar *authors[] = {
1089        "Till Harbaum <till@harbaum.org>",
1090    gtk_about_dialog_set_comments(about,      "John Stowers <john.stowers@gmail.com>",
1091         _("Geocaching.com GPX file viewer"));      NULL };
1092    
1093    gtk_widget_show_all(GTK_WIDGET(about));    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1094    gtk_dialog_run(GTK_DIALOG(about));                          "name", "GPXView",
1095    gtk_widget_destroy(GTK_WIDGET(about));                          "version", VERSION,
1096                            "copyright", _("Copyright 2008-2009"),
1097                            "authors", authors,
1098                            "website", _("http://www.harbaum.org/till/maemo"),
1099                            "comments", _(uses),
1100                            NULL);
1101    
1102    #ifdef ENABLE_BROWSER_INTERFACE
1103      /* add a way to donate to the project */
1104      GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1105    
1106      GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1107      gtk_box_pack_start(GTK_BOX(hbox),
1108                         gtk_label_new(_("Do you like GPXView?")),
1109                         FALSE, FALSE, 0);
1110    
1111      GtkWidget *button = gtk_button_new();
1112      gtk_button_set_image(GTK_BUTTON(button),
1113                           icon_get_widget(ICON_MISC, 8));
1114      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1115      g_signal_connect(button, "clicked",
1116                       G_CALLBACK(on_paypal_button_clicked), &context);
1117      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1118    
1119      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1120      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1121                                  alignment);
1122    
1123      gtk_widget_show_all(alignment);
1124    #endif
1125    
1126      gtk_dialog_run(GTK_DIALOG(context.dialog));
1127      gtk_widget_destroy(context.dialog);
1128  }  }
1129    
1130  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1328  cb_menu_search(GtkWidget *window, gpoint Line 1470  cb_menu_search(GtkWidget *window, gpoint
1470      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1471      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1472          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1473    
1474        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1475    
1476  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1477        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1478            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1479    
1480        /* do search result dialog here ... */        /* do search result dialog here ... */
1481        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1482    #ifndef USE_STACKABLE_WINDOW
1483        search_result_free(found);        search_result_free(found);
1484  #else  #else
1485          appdata->search_results = found;
1486    #endif
1487    #else
1488          gpx_t *found = NULL;
1489    
1490        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1491          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1492        else        else
# Line 1359  cb_menu_search(GtkWidget *window, gpoint Line 1507  cb_menu_search(GtkWidget *window, gpoint
1507      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1508  }  }
1509    
1510  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1511    
1512  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1513  static void  static void
# Line 1421  cb_menu_export_log(GtkWidget *widget, gp Line 1569  cb_menu_export_log(GtkWidget *widget, gp
1569    notes_log_export(appdata);    notes_log_export(appdata);
1570  }  }
1571    
1572  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1573  static void  static void
1574  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1575    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1435  cb_menu_export_garmin(GtkWidget *widget, Line 1583  cb_menu_export_garmin(GtkWidget *widget,
1583    garmin_export(appdata);    garmin_export(appdata);
1584  }  }
1585    
1586    #ifdef ENABLE_OSM_GPS_MAP
1587    static void
1588    cb_menu_map(GtkWidget *window, gpointer data) {
1589      map((appdata_t *)data);
1590    }
1591    #endif
1592    
1593  static void  static void
1594  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1595    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1451  cb_menu_precpos(GtkWidget *window, gpoin Line 1606  cb_menu_precpos(GtkWidget *window, gpoin
1606  }  }
1607    
1608  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1609    typedef struct {
1610      char *label, *desc;
1611      GtkSignalFunc activate_cb;
1612    } menu_entry_t;
1613    
1614  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  typedef struct {
1615    HildonStackableWindow *view_window;    const char *title;
1616    GtkWidget *but;    const menu_entry_t *menu;
1617      int len;
1618    } submenu_t;
1619    
1620    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  #define COLUMNS  1
   gtk_window_set_title (GTK_WINDOW (view_window), "Export");  
1621    
1622    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1623    
1624    but = hildon_button_new_with_text(    /* force closing of submenu dialog */
1625              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1626              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_widget_hide(menu);
1627              _("Export to Maemo Mapper"),  
1628              _("Save a Maemo Mapper POI file"));    /* let gtk clean up */
1629    g_signal_connect(but, "clicked",    while(gtk_events_pending())
1630                     G_CALLBACK(cb_menu_export_mmpoi), appdata);      gtk_main_iteration();
1631    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  }
1632    
1633    static GtkWidget *app_submenu_create(appdata_t *appdata,
1634                                         const submenu_t *submenu) {
1635    
1636    but = hildon_button_new_with_text(    /* create a oridinary dialog box */
1637              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    GtkWidget *dialog = gtk_dialog_new();
1638              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1639              _("Export Field Notes"),    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1640              _("Save a Garmin Field Notes file"));    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1641    g_signal_connect(but, "clicked",                                 GTK_WINDOW(appdata->window));
1642                     G_CALLBACK(cb_menu_export_log), appdata);    gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1643    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1644      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1645      int x = 0, y = 0;
1646    
1647    but = hildon_button_new_with_text(    const menu_entry_t *menu_entries = submenu->menu;
1648      while(menu_entries->label) {
1649        GtkWidget *button = NULL;
1650    
1651        button = hildon_button_new_with_text(
1652              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1653              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1654              _("Export Garmin GPX"),              _(menu_entries->label), _(menu_entries->desc));
1655              _("Save a GPX file containing modified waypoints"));  
1656    g_signal_connect(but, "clicked",      /* try to center both texts */
1657                     G_CALLBACK(cb_menu_export_garmin), appdata);      hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1658    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);      hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1659    
1660    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));      g_signal_connect(button, "clicked",
1661    gtk_widget_show_all (GTK_WIDGET (view_window));                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1662    
1663        g_signal_connect(button, "clicked",
1664                         menu_entries->activate_cb, appdata);
1665    
1666        gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1667    
1668        x++;
1669        if(x == COLUMNS) { x = 0; y++; }
1670    
1671        menu_entries++;
1672      }
1673    
1674      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1675    
1676      return dialog;
1677  }  }
1678    
1679  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  /* popup the dialog shaped submenu */
1680    HildonStackableWindow *view_window;  static void submenu_popup(GtkWidget *menu) {
1681    GtkWidget *but;    gtk_widget_show_all(menu);
1682      gtk_dialog_run(GTK_DIALOG(menu));
1683      gtk_widget_hide(menu);
1684    }
1685    
1686    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  static void submenu_cleanup(GtkWidget *menu) {
1687    gtk_window_set_title (GTK_WINDOW (view_window), "Export");    gtk_widget_destroy(menu);
1688    }
1689    
1690    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  static const menu_entry_t submenu_export_entries[] = {
1691    #ifdef ENABLE_MAEMO_MAPPER
1692      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1693        G_CALLBACK(cb_menu_export_mmpoi)  },
1694    #endif
1695      { "Export Field Notes",      "Save a Garmin Field Notes file",
1696        G_CALLBACK(cb_menu_export_log)    },
1697      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1698        G_CALLBACK(cb_menu_export_garmin) },
1699      { NULL, NULL, NULL }
1700    };
1701    
1702    but = hildon_button_new_with_text(  static const submenu_t submenu_export = {
1703              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    "Export", submenu_export_entries,
1704              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1705              _("Geomath"),  };
             _("Geocoordinate calculation"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1706    
1707    /* the export submenu */
1708    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1709      if(!appdata->export_menu)
1710        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1711    
1712    but = hildon_button_new_with_text(    submenu_popup(appdata->export_menu);
1713              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Geotext"),  
             _("Text analysis, letter counting etc"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geotext), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
   
1714    
1715    but = hildon_button_new_with_text(  static const menu_entry_t submenu_tools_entries[] = {
1716              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    { "Geomath",          "Geocoordinate calculation",
1717              HILDON_BUTTON_ARRANGEMENT_VERTICAL,      G_CALLBACK(cb_menu_geomath) },
1718              _("Precise Position"),    { "Geotext",          "Text analysis",
1719              _("Calculate a very precise GPS posotions"));      G_CALLBACK(cb_menu_geotext) },
1720    g_signal_connect(but, "clicked",    { "Precise Position", "Calculate a precise GPS position",
1721                     G_CALLBACK(cb_menu_precpos), appdata);      G_CALLBACK(cb_menu_precpos) },
1722    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);    { NULL, NULL, NULL }
1723    };
1724    
1725    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));  static const submenu_t submenu_tools = {
1726    gtk_widget_show_all (GTK_WIDGET (view_window));    "Tools", submenu_tools_entries,
1727      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1728    };
1729    
1730    /* the tools submenu */
1731    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1732      if(!appdata->tools_menu)
1733        appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1734    
1735      submenu_popup(appdata->tools_menu);
1736  }  }
1737    
1738  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1541  HildonAppMenu *menu_create(appdata_t *ap Line 1740  HildonAppMenu *menu_create(appdata_t *ap
1740    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1741    
1742    /* ------- */    /* ------- */
1743      button = gtk_button_new_with_label(_("About"));
1744      g_signal_connect_after(button, "clicked",
1745                             G_CALLBACK(cb_menu_about), appdata);
1746      hildon_app_menu_append(menu, GTK_BUTTON(button));
1747    
1748    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1749    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1750                           appdata);                           appdata);
# Line 1552  HildonAppMenu *menu_create(appdata_t *ap Line 1756  HildonAppMenu *menu_create(appdata_t *ap
1756                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1757      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1758    
1759      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1760      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1761                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1762      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1763    
   if(mode == MENU_GPXLIST) {  
1764      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1765      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1766                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1575  HildonAppMenu *menu_create(appdata_t *ap Line 1777  HildonAppMenu *menu_create(appdata_t *ap
1777                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1778    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1779    
1780    button = gtk_button_new_with_label(_("About"));  #ifdef ENABLE_OSM_GPS_MAP
1781        button = gtk_button_new_with_label(_("Map"));
1782        g_signal_connect_after(button, "clicked",
1783                               G_CALLBACK(cb_menu_map), appdata);
1784        hildon_app_menu_append(menu, GTK_BUTTON(button));
1785    #endif
1786    
1787    #ifdef HILDON_HELP
1788      button = gtk_button_new_with_label(_("Help"));
1789    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1790                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(cb_menu_help), appdata);
1791    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1792    #endif
1793    
1794    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show_all(GTK_WIDGET(menu));
1795    
1796    return menu;    return menu;
1797  }  }
# Line 1590  void menu_create(appdata_t *appdata) { Line 1801  void menu_create(appdata_t *appdata) {
1801    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1802    menu = gtk_menu_new();    menu = gtk_menu_new();
1803    
1804  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1805    appdata->menu_import =    appdata->menu_import =
1806  #endif  #endif
1807    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1598  void menu_create(appdata_t *appdata) { Line 1809  void menu_create(appdata_t *appdata) {
1809    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1810    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1811    
1812    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1813    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1814    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1815    
1816    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1817    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1818    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1819    
# Line 1620  void menu_create(appdata_t *appdata) { Line 1831  void menu_create(appdata_t *appdata) {
1831    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1832  #endif  #endif
1833    
1834  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1835    appdata->menu_export =    appdata->menu_export =
1836  #endif  #endif
1837      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1628  void menu_create(appdata_t *appdata) { Line 1839  void menu_create(appdata_t *appdata) {
1839    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1840    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1841    
1842  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1843    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1844    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1845    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1846                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1847  #endif  #endif
1848    
1849    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1850    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1851    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1852                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1853    
1854    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1855    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1856    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1857                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1858    
1859  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1860    appdata->menu_search =    appdata->menu_search =
1861  #endif  #endif
1862    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1863    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1864    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1865    
1866    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1867    
 #ifndef NO_COPY_N_PASTE  
1868    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1869    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1870    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1871    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1872    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1685  void menu_create(appdata_t *appdata) { Line 1893  void menu_create(appdata_t *appdata) {
1893    
1894    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1895    
1896    #ifdef ENABLE_OSM_GPS_MAP
1897      item = gtk_menu_item_new_with_label( _("Map") );
1898      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1899      g_signal_connect(item, "activate",
1900                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1901    #endif
1902    
1903    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1904    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1905    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1906    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1907    
1908    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1909    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1910    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1911                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1912    
1913    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1914    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1915    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1916                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1917    
1918    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1919    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1920    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1921                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1708  void menu_create(appdata_t *appdata) { Line 1923  void menu_create(appdata_t *appdata) {
1923    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1924    
1925  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1926    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1927    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1928    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1929  #endif  #endif
1930    
1931    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1932    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1933    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1934    
# Line 1749  void cleanup(appdata_t *appdata) { Line 1964  void cleanup(appdata_t *appdata) {
1964    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1965    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1966    
1967    #ifdef USE_STACKABLE_WINDOW
1968      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1969      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1970    #endif
1971    
1972    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1973    icons_free();    icons_free();
1974    gps_release(appdata);    gps_release(appdata);
# Line 1777  void cleanup(appdata_t *appdata) { Line 1997  void cleanup(appdata_t *appdata) {
1997    puts("everything is gone");    puts("everything is gone");
1998  }  }
1999    
2000  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
2001    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
2002    
2003    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1786  void on_window_destroy (GtkWidget *widge Line 2006  void on_window_destroy (GtkWidget *widge
2006  }  }
2007    
2008  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
2009                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
2010    int handled = FALSE;    int handled = FALSE;
2011    
2012    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1795  gboolean on_window_key_press(GtkWidget * Line 2014  gboolean on_window_key_press(GtkWidget *
2014    switch(event->keyval) {    switch(event->keyval) {
2015  #ifdef USE_MAEMO  #ifdef USE_MAEMO
2016    
 #if 0  /* don't do this as it interferes with gtkentry fields */  
   case HILDON_HARDKEY_SELECT:  
     /* remove as long as we haven't reached the main gpx list */  
     if(appdata->cur_gpx)  
       hildon_bread_crumb_trail_pop(HILDON_BREAD_CRUMB_TRAIL(appdata->bct));  
     handled = TRUE;  
     break;  
 #endif  
   
2017  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
2018    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
2019      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1850  gboolean on_window_key_press(GtkWidget * Line 2060  gboolean on_window_key_press(GtkWidget *
2060    return handled;    return handled;
2061  }  }
2062    
2063  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2064  typedef struct {  typedef struct {
2065    int level;    int level;
2066    appdata_t *appdata;    appdata_t *appdata;
# Line 1942  crumb_back(gpointer data) { Line 2152  crumb_back(gpointer data) {
2152    
2153    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2154    g_free(data);    g_free(data);
2155    
2156    #ifdef ENABLE_OSM_GPS_MAP
2157      map_update(crumb->appdata);
2158    #endif
2159  }  }
2160    
2161  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 1982  static void crumb_add(appdata_t *appdata Line 2196  static void crumb_add(appdata_t *appdata
2196  #endif  #endif
2197    }    }
2198    
2199    #ifdef USE_BREAD_CRUMB_TRAIL
2200    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2201                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2202    #else
2203      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2204    #endif
2205    
2206    #ifdef ENABLE_OSM_GPS_MAP
2207      map_update(appdata);
2208    #endif
2209  }  }
2210  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2211    
2212  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2213  #ifndef USE_MAEMO    printf("main after settings redraw\n");
2214    // in non-maemo setup this can only affect the main screen as  
2215    // the menu is blocked while a dialog is open. also the main    if(!appdata->cur_view) {
2216    // screen is always present      printf("no active view\n");
2217    if(appdata->gpxlist_items != appdata->cur_items) {      return;
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
2218    }    }
2219  #else  
2220    /* a cache screen cannot be changed from the settings and thus doesn't */    /* a cache screen cannot be changed from the settings and thus doesn't */
2221    /* need to be redrawn */    /* need to be redrawn */
2222    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2023  void main_after_settings_redraw(appdata_ Line 2240  void main_after_settings_redraw(appdata_
2240    }    }
2241    
2242    if(redraw) {    if(redraw) {
2243      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2244    
2245    #ifdef USE_STACKABLE_WINDOW
2246        HildonWindowStack *stack = hildon_window_stack_get_default();
2247        container = hildon_window_stack_peek(stack);
2248    #endif
2249    
2250        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2251      switch(redraw) {      switch(redraw) {
2252      case 1:      case 1:
2253        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2038  void main_after_settings_redraw(appdata_ Line 2262  void main_after_settings_redraw(appdata_
2262        break;        break;
2263      }      }
2264    
2265      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2266      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2267    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2268        else
2269  #endif  #endif
2270          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2271    
2272        gtk_widget_show_all(container);
2273      }
2274  }  }
2275    
2276  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2070  int main(int argc, char *argv[]) { Line 2299  int main(int argc, char *argv[]) {
2299      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2300    }    }
2301    
2302    #ifdef ENABLE_MAEMO_MAPPER
2303    dbus_register(&appdata);    dbus_register(&appdata);
2304  #endif  #endif
2305    #endif
2306    
2307    icons_init();    icons_init();
2308    
# Line 2095  int main(int argc, char *argv[]) { Line 2326  int main(int argc, char *argv[]) {
2326    /* Create a Window. */    /* Create a Window. */
2327    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2328    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2329    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2330  #endif  #endif
2331    
2332    #if MAEMO_VERSION_MAJOR == 5
2333    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2334    #endif
2335    
2336    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2337                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2338    
2339    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2340                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2341    
2342      /* prepare clipboard */
2343      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2344      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2345    
2346    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2347    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2348  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2349    menu_create(&appdata);    menu_create(&appdata);
2350  #else  #else
# Line 2121  int main(int argc, char *argv[]) { Line 2358  int main(int argc, char *argv[]) {
2358    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2359    
2360    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2361    #else
2362    #ifdef BCT
2363      /* on non-hildon machines we use some custom made breadcrumbtrail */
2364      /* replacement */
2365      appdata.bct = bct_new();
2366      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2367    #endif
2368    #endif
2369    
2370    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2371    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2372  #endif  #endif
2373    
Legend:
Removed from v.6  
changed lines
  Added in v.142