Diff of /trunk/src/main.c

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

revision 20 by harbaum, Sat Jul 4 19:42:28 2009 UTC revision 130 by harbaum, Wed Sep 30 12:11:22 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 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 202  void cachelist_view_onRowActivated(GtkTr Line 217  void cachelist_view_onRowActivated(GtkTr
217    GtkTreeIter   iter;    GtkTreeIter   iter;
218    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
219    
220    #ifdef USE_MAEMO
221      /* check if a cache is already selected and ignore click if yes */
222      /* (was probably a double click) */
223      if(appdata->cur_cache) return;
224    #endif
225    
226    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
227      cache_t *cache;      cache_t *cache;
228      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
229  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
230      cache_dialog(appdata, cache);      cache_dialog(appdata, cache);
231  #else  #else
232      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
# Line 257  static GtkWidget *cachelist_create(appda Line 278  static GtkWidget *cachelist_create(appda
278                                     cache_t *sel_cache);                                     cache_t *sel_cache);
279    
280  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #ifndef USE_MAEMO  
   //  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);  
 #else  
   
281    if(!appdata->cur_view) {    if(!appdata->cur_view) {
282      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
283      return;      return;
# Line 281  void cachelist_redraw(appdata_t *appdata Line 295  void cachelist_redraw(appdata_t *appdata
295    if(redraw) {    if(redraw) {
296      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
297    
     printf("redraw %d\n", redraw);  
   
298  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
299      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
300      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 309  void cachelist_redraw(appdata_t *appdata Line 321  void cachelist_redraw(appdata_t *appdata
321    
322      gtk_widget_show_all(container);      gtk_widget_show_all(container);
323    }    }
 #endif  
324  }  }
325    
326    
# Line 317  static gboolean cachelist_update(gpointe Line 328  static gboolean cachelist_update(gpointe
328    
329    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
330    
 #ifdef USE_MAEMO  
331    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
332    
333    if(appdata->cur_cache)    if(appdata->cur_cache)
334      return TRUE;      return TRUE;
335    
336    #ifdef USE_MAEMO
337    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
338      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
339        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
340    #endif
341    
342    if(appdata->cachelist_update)    if(appdata->cachelist_update)
343      cachelist_redraw(appdata);      cachelist_redraw(appdata);
 #endif  
344    
345    return TRUE;    return TRUE;
346  }  }
# Line 576  void on_cachelist_destroy(GtkWidget *wid Line 587  void on_cachelist_destroy(GtkWidget *wid
587    }    }
588    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
589    
590    #ifdef ENABLE_OSM_GPS_MAP
591      map_update(appdata);
592    #endif
593    
594    /* restore cur_view */    /* restore cur_view */
595    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
596  }  }
# Line 587  void cachelist_dialog(appdata_t *appdata Line 602  void cachelist_dialog(appdata_t *appdata
602    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
603    
604    appdata->cur_gpx = gpx;    appdata->cur_gpx = gpx;
605    char *title = g_strdup_printf("GPXView - %s", gpx->name);    char *title = g_strdup_printf("%s - GPXView", gpx->name);
606    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
607    g_free(title);    g_free(title);
608    
# Line 602  void cachelist_dialog(appdata_t *appdata Line 617  void cachelist_dialog(appdata_t *appdata
617                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
618    
619    gtk_widget_show_all(window);    gtk_widget_show_all(window);
620    
621    #ifdef ENABLE_OSM_GPS_MAP
622      map_update(appdata);
623    #endif
624  }  }
625  #endif  #endif
626  #endif  #endif
# Line 713  static void gpxlist_view_onRowActivated( Line 732  static void gpxlist_view_onRowActivated(
732    GtkTreeIter   iter;    GtkTreeIter   iter;
733    GtkTreeModel *model = gtk_tree_view_get_model(treeview);    GtkTreeModel *model = gtk_tree_view_get_model(treeview);
734    
735    #ifdef USE_MAEMO
736      /* check if a cache is already selected and ignore click if yes */
737      /* (was probably a double click) */
738      if(appdata->cur_gpx) return;
739    #endif
740    
741    if (gtk_tree_model_get_iter(model, &iter, path)) {    if (gtk_tree_model_get_iter(model, &iter, path)) {
742      gpx_t *gpx;      gpx_t *gpx;
743      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);      gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1);
# Line 810  static void gpxlist_view_onRowActivated( Line 835  static void gpxlist_view_onRowActivated(
835    
836          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
837        }        }
838  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
839  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
840        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
841  #endif  #endif
# Line 957  static GtkWidget *gpxlist_create_view_an Line 982  static GtkWidget *gpxlist_create_view_an
982      GtkTreeIter         iter;      GtkTreeIter         iter;
983      gtk_list_store_append(appdata->gpxstore, &iter);      gtk_list_store_append(appdata->gpxstore, &iter);
984      gpxlist_set(appdata->gpxstore, &iter, gpx);      gpxlist_set(appdata->gpxstore, &iter, gpx);
985    
986      if(gpx == sel_gpx) {      if(gpx == sel_gpx) {
987        sel_iter = iter;        sel_iter = iter;
988        sel_iter_valid = TRUE;        sel_iter_valid = TRUE;
# Line 1017  static void gpxlist_add(appdata_t *appda Line 1042  static void gpxlist_add(appdata_t *appda
1042    
1043  /******************** begin of menu *********************/  /******************** begin of menu *********************/
1044    
1045    typedef struct {
1046      appdata_t *appdata;
1047      GtkWidget *dialog;
1048    } about_context_t;
1049    
1050    #ifdef ENABLE_BROWSER_INTERFACE
1051    void on_paypal_button_clicked(GtkButton *button, about_context_t *context) {
1052      gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT);
1053      browser_url(context->appdata,
1054                  "https://www.paypal.com/cgi-bin/webscr"
1055                  "?cmd=_s-xclick&hosted_button_id=7400558");
1056    }
1057    #endif
1058    
1059  static void  static void
1060  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkWidget *window, gpointer data) {
1061    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    about_context_t context;
1062    
1063    gtk_about_dialog_set_name(about, "GPXView");    context.appdata = (appdata_t *)data;
   gtk_about_dialog_set_version(about, VERSION);  
1064    
1065  #ifdef ENABLE_LIBLOCATION  #ifdef ENABLE_LIBLOCATION
1066    char *uses = "uses liblocation";    char *uses = "uses liblocation";
# Line 1032  cb_menu_about(GtkWidget *window, gpointe Line 1070  cb_menu_about(GtkWidget *window, gpointe
1070    char *uses = "uses gpsd";    char *uses = "uses gpsd";
1071  #endif  #endif
1072    
1073    char *str = g_strdup_printf("%s\n\n(%s)",    const gchar *authors[] = {
1074                        _("GPXView (c) 2008-2009 by\n"      "Till Harbaum <till@harbaum.org>",
1075                          "Till Harbaum <till@harbaum.org>\n"      "John Stowers <john.stowers@gmail.com>",
1076                          "Mailing list: gpxview-users@garage.maemo.org"),      NULL };
1077                        _(uses)  
1078                        );    context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG,
1079                            "name", "GPXView",
1080    gtk_about_dialog_set_copyright(about, str);                          "version", VERSION,
1081    g_free(str);                          "copyright", _("Copyright 2008-2009"),
1082                            "authors", authors,
1083    gtk_about_dialog_set_website(about,                          "website", _("http://www.harbaum.org/till/maemo"),
1084         _("http://www.harbaum.org/till/maemo"));                          "comments", _(uses),
1085                            NULL);
1086    gtk_about_dialog_set_comments(about,  
1087         _("Geocaching.com GPX file viewer"));  #ifdef ENABLE_BROWSER_INTERFACE
1088      /* add a way to donate to the project */
1089    gtk_widget_show_all(GTK_WIDGET(about));    GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0);
1090    gtk_dialog_run(GTK_DIALOG(about));  
1091    gtk_widget_destroy(GTK_WIDGET(about));    GtkWidget *hbox = gtk_hbox_new(FALSE, 8);
1092      gtk_box_pack_start(GTK_BOX(hbox),
1093                         gtk_label_new(_("Do you like GPXView?")),
1094                         FALSE, FALSE, 0);
1095    
1096      GtkWidget *button = gtk_button_new();
1097      gtk_button_set_image(GTK_BUTTON(button),
1098                           icon_get_widget(ICON_MISC, 8));
1099      gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1100      g_signal_connect(button, "clicked",
1101                       G_CALLBACK(on_paypal_button_clicked), &context);
1102      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1103    
1104      gtk_container_add(GTK_CONTAINER(alignment), hbox);
1105      gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox),
1106                                  alignment);
1107    
1108      gtk_widget_show_all(alignment);
1109    #endif
1110    
1111      gtk_dialog_run(GTK_DIALOG(context.dialog));
1112      gtk_widget_destroy(context.dialog);
1113  }  }
1114    
1115  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
# Line 1399  cb_menu_search(GtkWidget *window, gpoint Line 1458  cb_menu_search(GtkWidget *window, gpoint
1458    
1459        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1460    
1461  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1462        gpx_t *found =        gpx_t *found =
1463          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1464    
# Line 1433  cb_menu_search(GtkWidget *window, gpoint Line 1492  cb_menu_search(GtkWidget *window, gpoint
1492      gtk_widget_destroy(dialog);      gtk_widget_destroy(dialog);
1493  }  }
1494    
1495  void on_window_destroy (GtkWidget *widget, gpointer data);  static void on_window_destroy (GtkWidget *widget, gpointer data);
1496    
1497  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1498  static void  static void
# Line 1493  static void Line 1552  static void
1552  cb_menu_export_log(GtkWidget *widget, gpointer data) {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
1553    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1554    notes_log_export(appdata);    notes_log_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1555  }  }
1556    
1557  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1558  static void  static void
1559  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1560    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1561    mmpoi_export(appdata);    mmpoi_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1562  }  }
1563  #endif  #endif
1564    
# Line 1513  static void Line 1566  static void
1566  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {  cb_menu_export_garmin(GtkWidget *widget, gpointer data) {
1567    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1568    garmin_export(appdata);    garmin_export(appdata);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1569  }  }
1570    
1571    #ifdef ENABLE_OSM_GPS_MAP
1572    static void
1573    cb_menu_map(GtkWidget *window, gpointer data) {
1574      map((appdata_t *)data);
1575    }
1576    #endif
1577    
1578  static void  static void
1579  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1580    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1581  }  }
1582    
1583  static void  static void
1584  cb_menu_geotext(GtkWidget *window, gpointer data) {  cb_menu_geotext(GtkWidget *window, gpointer data) {
1585    geotext_dialog((appdata_t *)data);    geotext_dialog((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1586  }  }
1587    
1588  static void  static void
1589  cb_menu_precpos(GtkWidget *window, gpointer data) {  cb_menu_precpos(GtkWidget *window, gpointer data) {
1590    precise_position((appdata_t *)data);    precise_position((appdata_t *)data);
 #ifdef USE_STACKABLE_WINDOW  
   hildon_window_stack_pop_1 (hildon_window_stack_get_default());  
 #endif  
1591  }  }
1592    
1593  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1594  static GtkWidget *export_menu_create(appdata_t *appdata) {  typedef struct {
1595    GtkWidget *button;    char *label, *desc;
1596    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    GtkSignalFunc activate_cb;
1597    } menu_entry_t;
   button = hildon_button_new_with_text(  
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export to Maemo Mapper"),  
             _("Save a Maemo Mapper POI file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_mmpoi), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1598    
1599    button = hildon_button_new_with_text(  typedef struct {
1600              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    const char *title;
1601              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    const menu_entry_t *menu;
1602              _("Export Field Notes"),    int len;
1603              _("Save a Garmin Field Notes file"));  } submenu_t;
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_log), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1604    
1605    button = hildon_button_new_with_text(  #define COLUMNS  1
             HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export Garmin GPX"),  
             _("Save modified waypoints in GPX file"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1606    
1607    gtk_widget_show_all(GTK_WIDGET(menu));  void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1608    
1609    return GTK_WIDGET(menu);    /* force closing of submenu dialog */
1610      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1611      gtk_widget_hide(menu);
1612    
1613      /* let gtk clean up */
1614      while(gtk_events_pending())
1615        gtk_main_iteration();
1616  }  }
1617    
1618  /* the export submenu */  static GtkWidget *app_submenu_create(appdata_t *appdata,
1619  void on_export_clicked(GtkButton *button, appdata_t *appdata) {                                       const submenu_t *submenu) {
   if(!appdata->export_menu)  
     appdata->export_menu = export_menu_create(appdata);  
1620    
1621    /* draw a popup menu */    /* create a oridinary dialog box */
1622    hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),    GtkWidget *dialog = gtk_dialog_new();
1623                          GTK_WINDOW(hildon_window_stack_peek(    gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1624                      hildon_window_stack_get_default())));    gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1625  }    gtk_window_set_transient_for(GTK_WINDOW(dialog),
1626                                   GTK_WINDOW(appdata->window));
1627      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1628    
1629  static GtkWidget *tools_menu_create(appdata_t *appdata) {    GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1630    GtkWidget *button;    int x = 0, y = 0;
   HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());  
1631    
1632    button = hildon_button_new_with_text(    const menu_entry_t *menu_entries = submenu->menu;
1633      while(menu_entries->label) {
1634        GtkWidget *button = NULL;
1635    
1636        button = hildon_button_new_with_text(
1637              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1638              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1639              _("Geomath"),              _(menu_entries->label), _(menu_entries->desc));
             _("Geocoordinate calculation"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1640    
1641        /* try to center both texts */
1642        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1643        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1644    
1645    button = hildon_button_new_with_text(      g_signal_connect(button, "clicked",
1646              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1647              HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1648              _("Geotext"),      g_signal_connect(button, "clicked",
1649              _("Text analysis"));                       menu_entries->activate_cb, appdata);
1650    g_signal_connect(button, "clicked",  
1651                     G_CALLBACK(cb_menu_geotext), appdata);      gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1652    hildon_app_menu_append(menu, GTK_BUTTON(button));  
1653        x++;
1654        if(x == COLUMNS) { x = 0; y++; }
1655    
1656    button = hildon_button_new_with_text(      menu_entries++;
1657              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Precise Position"),  
             _("Calculate a precise GPS position"));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   hildon_app_menu_append(menu, GTK_BUTTON(button));  
1658    
1659    gtk_widget_show_all(GTK_WIDGET(menu));    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
1660    
1661      return dialog;
1662    }
1663    
1664    /* popup the dialog shaped submenu */
1665    static void submenu_popup(GtkWidget *menu) {
1666      gtk_widget_show_all(menu);
1667      gtk_dialog_run(GTK_DIALOG(menu));
1668      gtk_widget_hide(menu);
1669    }
1670    
1671    static void submenu_cleanup(GtkWidget *menu) {
1672      gtk_widget_destroy(menu);
1673    }
1674    
1675    static const menu_entry_t submenu_export_entries[] = {
1676    #ifdef ENABLE_MAEMO_MAPPER
1677      { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1678        G_CALLBACK(cb_menu_export_mmpoi)  },
1679    #endif
1680      { "Export Field Notes",      "Save a Garmin Field Notes file",
1681        G_CALLBACK(cb_menu_export_log)    },
1682      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1683        G_CALLBACK(cb_menu_export_garmin) },
1684      { NULL, NULL, NULL }
1685    };
1686    
1687    static const submenu_t submenu_export = {
1688      "Export", submenu_export_entries,
1689      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1690    };
1691    
1692    /* the export submenu */
1693    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1694      if(!appdata->export_menu)
1695        appdata->export_menu = app_submenu_create(appdata, &submenu_export);
1696    
1697    return GTK_WIDGET(menu);    submenu_popup(appdata->export_menu);
1698  }  }
1699    
1700    static const menu_entry_t submenu_tools_entries[] = {
1701      { "Geomath",          "Geocoordinate calculation",
1702        G_CALLBACK(cb_menu_geomath) },
1703      { "Geotext",          "Text analysis",
1704        G_CALLBACK(cb_menu_geotext) },
1705      { "Precise Position", "Calculate a precise GPS position",
1706        G_CALLBACK(cb_menu_precpos) },
1707      { NULL, NULL, NULL }
1708    };
1709    
1710    static const submenu_t submenu_tools = {
1711      "Tools", submenu_tools_entries,
1712      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1713    };
1714    
1715  /* the tools submenu */  /* the tools submenu */
1716  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1717    if(!appdata->tools_menu)    if(!appdata->tools_menu)
1718      appdata->tools_menu = tools_menu_create(appdata);      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
1719    
1720    /* draw a popup menu */    submenu_popup(appdata->tools_menu);
   hildon_app_menu_popup(HILDON_APP_MENU(appdata->tools_menu),  
                         GTK_WINDOW(hildon_window_stack_peek(  
                     hildon_window_stack_get_default())));  
1721  }  }
1722    
   
1723  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1724    GtkWidget *button;    GtkWidget *button;
1725    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
# Line 1665  HildonAppMenu *menu_create(appdata_t *ap Line 1745  HildonAppMenu *menu_create(appdata_t *ap
1745      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1746                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1747      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1748    
   if(mode == MENU_GPXLIST) {  
1749      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1750      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1751                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
# Line 1684  HildonAppMenu *menu_create(appdata_t *ap Line 1762  HildonAppMenu *menu_create(appdata_t *ap
1762                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1763    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1764    
1765    #ifdef ENABLE_OSM_GPS_MAP
1766        button = gtk_button_new_with_label(_("Map"));
1767        g_signal_connect_after(button, "clicked",
1768                               G_CALLBACK(cb_menu_map), appdata);
1769        hildon_app_menu_append(menu, GTK_BUTTON(button));
1770    #endif
1771    
1772  #ifdef HILDON_HELP  #ifdef HILDON_HELP
1773    button = gtk_button_new_with_label(_("Help"));    button = gtk_button_new_with_label(_("Help"));
1774    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
# Line 1701  void menu_create(appdata_t *appdata) { Line 1786  void menu_create(appdata_t *appdata) {
1786    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1787    menu = gtk_menu_new();    menu = gtk_menu_new();
1788    
1789  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1790    appdata->menu_import =    appdata->menu_import =
1791  #endif  #endif
1792    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1731  void menu_create(appdata_t *appdata) { Line 1816  void menu_create(appdata_t *appdata) {
1816    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1817  #endif  #endif
1818    
1819  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1820    appdata->menu_export =    appdata->menu_export =
1821  #endif  #endif
1822      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1739  void menu_create(appdata_t *appdata) { Line 1824  void menu_create(appdata_t *appdata) {
1824    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1825    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1826    
1827  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1828    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1829    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1830    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1756  void menu_create(appdata_t *appdata) { Line 1841  void menu_create(appdata_t *appdata) {
1841    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1842                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1843    
1844  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1845    appdata->menu_search =    appdata->menu_search =
1846  #endif  #endif
1847    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1796  void menu_create(appdata_t *appdata) { Line 1881  void menu_create(appdata_t *appdata) {
1881    
1882    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1883    
1884    #ifdef ENABLE_OSM_GPS_MAP
1885      item = gtk_menu_item_new_with_label( _("Map") );
1886      gtk_menu_append(GTK_MENU_SHELL(menu), item);
1887      g_signal_connect(item, "activate",
1888                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1889    #endif
1890    
1891    item = gtk_menu_item_new_with_label(_("Tools"));    item = gtk_menu_item_new_with_label(_("Tools"));
1892    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1893    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# Line 1860  void cleanup(appdata_t *appdata) { Line 1952  void cleanup(appdata_t *appdata) {
1952    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1953    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1954    
1955    #ifdef USE_STACKABLE_WINDOW
1956      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1957      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1958    #endif
1959    
1960    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1961    icons_free();    icons_free();
1962    gps_release(appdata);    gps_release(appdata);
# Line 1888  void cleanup(appdata_t *appdata) { Line 1985  void cleanup(appdata_t *appdata) {
1985    puts("everything is gone");    puts("everything is gone");
1986  }  }
1987    
1988  void on_window_destroy (GtkWidget *widget, gpointer data) {  static void on_window_destroy (GtkWidget *widget, gpointer data) {
1989    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1990    
1991    gconf_save_state(appdata);    gconf_save_state(appdata);
# Line 1951  gboolean on_window_key_press(GtkWidget * Line 2048  gboolean on_window_key_press(GtkWidget *
2048    return handled;    return handled;
2049  }  }
2050    
2051  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2052  typedef struct {  typedef struct {
2053    int level;    int level;
2054    appdata_t *appdata;    appdata_t *appdata;
# Line 2043  crumb_back(gpointer data) { Line 2140  crumb_back(gpointer data) {
2140    
2141    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2142    g_free(data);    g_free(data);
2143    
2144    #ifdef ENABLE_OSM_GPS_MAP
2145      map_update(crumb->appdata);
2146    #endif
2147  }  }
2148    
2149  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2083  static void crumb_add(appdata_t *appdata Line 2184  static void crumb_add(appdata_t *appdata
2184  #endif  #endif
2185    }    }
2186    
2187    #ifdef USE_BREAD_CRUMB_TRAIL
2188    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2189                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2190    #else
2191      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2192    #endif
2193    
2194    #ifdef ENABLE_OSM_GPS_MAP
2195      map_update(appdata);
2196    #endif
2197  }  }
2198  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2199    
# Line 2096  void main_after_settings_redraw(appdata_ Line 2205  void main_after_settings_redraw(appdata_
2205      return;      return;
2206    }    }
2207    
 #ifndef USE_MAEMO  
   // in non-maemo setup this can only affect the main screen as  
   // the menu is blocked while a dialog is open. also the main  
   // screen is always present  
   if(appdata->gpxlist_items != appdata->cur_items) {  
     /* 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);  
   }  
 #else  
2208    /* 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 */
2209    /* need to be redrawn */    /* need to be redrawn */
2210    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2162  void main_after_settings_redraw(appdata_ Line 2259  void main_after_settings_redraw(appdata_
2259    
2260      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2261    }    }
 #endif // USE_MAEMO  
2262  }  }
2263    
2264  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2191  int main(int argc, char *argv[]) { Line 2287  int main(int argc, char *argv[]) {
2287      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2288    }    }
2289    
2290    #ifdef ENABLE_MAEMO_MAPPER
2291    dbus_register(&appdata);    dbus_register(&appdata);
2292  #endif  #endif
2293    #endif
2294    
2295    icons_init();    icons_init();
2296    
# Line 2216  int main(int argc, char *argv[]) { Line 2314  int main(int argc, char *argv[]) {
2314    /* Create a Window. */    /* Create a Window. */
2315    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2316    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2317    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2318  #endif  #endif
2319    
2320  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2231  int main(int argc, char *argv[]) { Line 2329  int main(int argc, char *argv[]) {
2329    
2330    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2331    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2332  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2333    menu_create(&appdata);    menu_create(&appdata);
2334  #else  #else
# Line 2245  int main(int argc, char *argv[]) { Line 2342  int main(int argc, char *argv[]) {
2342    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);
2343    
2344    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2345    #else
2346    #ifdef BCT
2347      /* on non-hildon machines we use some custom made breadcrumbtrail */
2348      /* replacement */
2349      appdata.bct = bct_new();
2350      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2351    #endif
2352    #endif
2353    
2354    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2355    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2356  #endif  #endif
2357    
Legend:
Removed from v.20  
changed lines
  Added in v.130