--- trunk/src/main.c 2009/06/26 12:24:24 11 +++ trunk/src/main.c 2009/11/08 20:32:55 165 @@ -19,6 +19,8 @@ #include #include +#include + #include #include @@ -29,13 +31,16 @@ #ifdef USE_MAEMO #include +#if MAEMO_VERSION_MAJOR >= 5 +#include +#endif #endif #include extern char *strcasestr (__const char *__haystack, __const char *__needle); -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT) static void crumb_add(appdata_t *appdata, char *name, int level, gpointer user_data); @@ -92,13 +97,18 @@ } } +#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5) GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(NULL), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - buf); + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, buf); gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR")); +#else + GtkWidget *dialog = + hildon_note_new_information(GTK_WINDOW(NULL), buf); +#endif gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); @@ -138,39 +148,50 @@ gtk_widget_show_all (GTK_WIDGET(dialog)); if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) { char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + + if(filename) { + gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window)); - gpx_dialog_t *dialog = gpx_busy_dialog_new(GTK_WIDGET(appdata->window)); - - if(!whole_dir) - gpx = gpx_parse(dialog, filename); - else { - /* cur trailing '/' if present */ - if(strlastchr(filename) == '/') - filename[strlen(filename)] = 0; - - 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 = '/'; + if(!whole_dir) + gpx = gpx_parse(dialog, filename); + else { + /* cur trailing '/' if present */ + if(strlastchr(filename) == '/') + filename[strlen(filename)] = 0; + + 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 = '/'; + } + + if(whole_dir) + appdata->path = strdup(filename); + } else + errorf(_("Load error")); - if(whole_dir) - appdata->path = strdup(filename); + g_free (filename); + } else { +#ifndef USE_MAEMO + errorf(_("Error accessing the file.")); +#else + errorf(_("Error accessing the file. This may happen if the file " + "resides on a remote file system. Please copy the file onto " + "the device (e.g. onto the memory card) and try again.")); +#endif } - - g_free (filename); } gtk_widget_destroy (dialog); @@ -194,7 +215,20 @@ CACHELIST_NUM_COLS } ; -void cachelist_view_onRowActivated(GtkTreeView *treeview, +void cachelist_goto_cache(appdata_t *appdata, cache_t *cache) { +#if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT) + 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 +} + +static void cachelist_view_onRowActivated(GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *col, gpointer userdata) { @@ -202,19 +236,16 @@ GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(treeview); +#ifdef USE_MAEMO + /* check if a cache is already selected and ignore click if yes */ + /* (was probably a double click) */ + if(appdata->cur_cache) return; +#endif + if(gtk_tree_model_get_iter(model, &iter, path)) { cache_t *cache; gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1); -#ifndef USE_BREAD_CRUMB_TRAIL - 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 + cachelist_goto_cache(appdata, cache); } } @@ -257,13 +288,6 @@ cache_t *sel_cache); 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 - if(!appdata->cur_view) { printf("cachelist redraw: no active view\n"); return; @@ -281,8 +305,6 @@ if(redraw) { GtkWidget *container = appdata->vbox; - printf("redraw %d\n", redraw); - #ifdef USE_STACKABLE_WINDOW HildonWindowStack *stack = hildon_window_stack_get_default(); container = hildon_window_stack_peek(stack); @@ -309,7 +331,6 @@ gtk_widget_show_all(container); } -#endif } @@ -317,19 +338,19 @@ printf("cachelist timer fired!\n"); -#ifdef USE_MAEMO appdata_t *appdata = (appdata_t*)data; if(appdata->cur_cache) return TRUE; +#ifdef USE_MAEMO if(appdata->cachelist_disable_screensaver) if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK) fprintf(stderr, "error with display blank\n"); +#endif if(appdata->cachelist_update) cachelist_redraw(appdata); -#endif return TRUE; } @@ -576,6 +597,10 @@ } appdata->cur_gpx = NULL; +#ifdef ENABLE_OSM_GPS_MAP + map_update(appdata); +#endif + /* restore cur_view */ appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view"); } @@ -587,7 +612,7 @@ g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view); appdata->cur_gpx = gpx; - char *title = g_strdup_printf("GPXView - %s", gpx->name); + char *title = g_strdup_printf("%s - GPXView", gpx->name); gtk_window_set_title(GTK_WINDOW(window), title); g_free(title); @@ -602,6 +627,10 @@ G_CALLBACK(on_cachelist_destroy), appdata); gtk_widget_show_all(window); + +#ifdef ENABLE_OSM_GPS_MAP + map_update(appdata); +#endif } #endif #endif @@ -705,6 +734,26 @@ gconf_save_closed_name(appdata, gpx->filename, gpx->name); } +void gpxlist_goto_cachelist(appdata_t *appdata, gpx_t *gpx) { +#if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT) +#ifdef USE_STACKABLE_WINDOW + if(!appdata->cur_gpx) +#endif + cachelist_dialog(appdata, gpx); +#ifdef USE_STACKABLE_WINDOW + else + printf("selected gpx, but cachelist window already present\n"); +#endif +#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 +} + static void gpxlist_view_onRowActivated(GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *col, @@ -713,6 +762,12 @@ GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(treeview); +#ifdef USE_MAEMO + /* check if a cache is already selected and ignore click if yes */ + /* (was probably a double click) */ + if(appdata->cur_gpx) return; +#endif + if (gtk_tree_model_get_iter(model, &iter, path)) { gpx_t *gpx; gtk_tree_model_get(model, &iter, GPXLIST_COL_DATA, &gpx, -1); @@ -725,11 +780,13 @@ if(col_name && !strcmp(col_name, "Del")) { printf("clicked delete\n"); +#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5) /* ask user what he wants */ GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(appdata->window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_CANCEL, _("Do you want to close this entry only or do " "you want to remove it completely from the list?")); @@ -738,11 +795,44 @@ _("Close"), 2, NULL); + gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?")); +#else + + GtkWidget *dialog = + gtk_dialog_new_with_buttons(_("Close or remove entry?"), + GTK_WINDOW(appdata->window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + _("Remove"), 1, + _("Close"), 2, + NULL); + + GtkWidget *content_area = + gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + + GtkWidget *hbox = gtk_hbox_new(FALSE, 0); + + gtk_box_pack_start(GTK_BOX(hbox), + gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION, + GTK_ICON_SIZE_DIALOG), + FALSE, FALSE, 0); + + GtkWidget *label = gtk_label_new( + _("Do you want to close this entry only or do " + "you want to remove it completely from the list?")); + + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD); + + gtk_box_pack_start_defaults(GTK_BOX(hbox), label); + gtk_container_add (GTK_CONTAINER (content_area), hbox); + + gtk_widget_show_all (dialog); +#endif + if(gpx->closed) gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE); - gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?")); - /* set the active flag again if the user answered "no" */ switch(gtk_dialog_run(GTK_DIALOG(dialog))) { @@ -810,19 +900,8 @@ gpx_busy_dialog_destroy(dialog); } -#ifndef USE_BREAD_CRUMB_TRAIL - if(!appdata->cur_gpx) - cachelist_dialog(appdata, gpx); - else - printf("selected gpx, but cachelist window already present\n"); -#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 + + gpxlist_goto_cachelist(appdata, gpx); } } } @@ -877,7 +956,11 @@ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview), -1, "Icon", renderer, "pixbuf", GPXLIST_COL_ICON, - // "sensitive", GPXLIST_COL_OPEN, +#ifdef USE_PANNABLE_AREA + /* at least one entry needs to be sensitive. */ + /* This is the delete icon if the PANNABLE_AREA is used */ + "sensitive", GPXLIST_COL_OPEN, +#endif NULL); /* --- "FileName" column --- */ @@ -933,7 +1016,7 @@ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(appdata->gpxview), -1, "Del", renderer, "pixbuf", GPXLIST_COL_DELETE, - "sensitive", GPXLIST_COL_OPEN, + // "sensitive", GPXLIST_COL_OPEN, NULL); #endif @@ -953,7 +1036,7 @@ GtkTreeIter iter; gtk_list_store_append(appdata->gpxstore, &iter); gpxlist_set(appdata->gpxstore, &iter, gpx); - + if(gpx == sel_gpx) { sel_iter = iter; sel_iter_valid = TRUE; @@ -1013,26 +1096,75 @@ /******************** begin of menu *********************/ +typedef struct { + appdata_t *appdata; + GtkWidget *dialog; +} about_context_t; + +#ifdef ENABLE_BROWSER_INTERFACE +void on_paypal_button_clicked(GtkButton *button, about_context_t *context) { + gtk_dialog_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_ACCEPT); + browser_url(context->appdata, + "https://www.paypal.com/cgi-bin/webscr" + "?cmd=_s-xclick&hosted_button_id=7400558"); +} +#endif + static void cb_menu_about(GtkWidget *window, gpointer data) { - GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new()); + about_context_t context; + + context.appdata = (appdata_t *)data; - gtk_about_dialog_set_name(about, "GPXView"); - gtk_about_dialog_set_version(about, VERSION); - gtk_about_dialog_set_copyright(about, - _("GPXView (c) 2008 by\n" - "Till Harbaum \n" - "Geocaching.com: Tantil")); - - gtk_about_dialog_set_website(about, - _("http://www.harbaum.org/till/maemo")); - - gtk_about_dialog_set_comments(about, - _("Geocaching.com GPX file viewer")); - - gtk_widget_show_all(GTK_WIDGET(about)); - gtk_dialog_run(GTK_DIALOG(about)); - gtk_widget_destroy(GTK_WIDGET(about)); +#ifdef ENABLE_LIBLOCATION + char *uses = "uses liblocation"; +#elif defined(ENABLE_GPSBT) + char *uses = "uses gpsbt and gpsd"; +#else + char *uses = "uses gpsd"; +#endif + + const gchar *authors[] = { + "Till Harbaum ", + "John Stowers ", + "GCVote: Guido Wegener ", + NULL }; + + context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG, + "name", "GPXView", + "version", VERSION, + "copyright", _("Copyright 2008-2009"), + "authors", authors, + "website", _("http://www.harbaum.org/till/maemo"), + "comments", _(uses), + NULL); + +#ifdef ENABLE_BROWSER_INTERFACE + /* add a way to donate to the project */ + GtkWidget *alignment = gtk_alignment_new(0.5, 0, 0, 0); + + GtkWidget *hbox = gtk_hbox_new(FALSE, 8); + gtk_box_pack_start(GTK_BOX(hbox), + gtk_label_new(_("Do you like GPXView?")), + FALSE, FALSE, 0); + + GtkWidget *button = gtk_button_new(); + gtk_button_set_image(GTK_BUTTON(button), + icon_get_widget(ICON_MISC, 8)); + gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); + g_signal_connect(button, "clicked", + G_CALLBACK(on_paypal_button_clicked), &context); + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); + + gtk_container_add(GTK_CONTAINER(alignment), hbox); + gtk_box_pack_start_defaults(GTK_BOX((GTK_DIALOG(context.dialog))->vbox), + alignment); + + gtk_widget_show_all(alignment); +#endif + + gtk_dialog_run(GTK_DIALOG(context.dialog)); + gtk_widget_destroy(context.dialog); } #if defined(USE_MAEMO) && defined(HILDON_HELP) @@ -1204,8 +1336,8 @@ else if(cache->long_description && (what & SEARCH_DESC) && strcasestr(cache->long_description, phrase)) hit = 1; - else if(cache->owner && (what & SEARCH_OWNER) && - strcasestr(cache->owner, phrase)) + else if(cache->owner && cache->owner->name && (what & SEARCH_OWNER) && + strcasestr(cache->owner->name, phrase)) hit = 1; if(hit) { @@ -1381,15 +1513,16 @@ printf("Search for %s (flags = %x)...\n", p, appdata->search); -#ifndef USE_BREAD_CRUMB_TRAIL - appdata->search_results = +#if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT) + gpx_t *found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE); /* do search result dialog here ... */ - cachelist_dialog(appdata, appdata->search_results); + cachelist_dialog(appdata, found); #ifndef USE_STACKABLE_WINDOW - search_result_free(appdata->search_results); - appdata->search_results = NULL; + search_result_free(found); +#else + appdata->search_results = found; #endif #else gpx_t *found = NULL; @@ -1414,7 +1547,7 @@ gtk_widget_destroy(dialog); } -void on_window_destroy (GtkWidget *widget, gpointer data); +static void on_window_destroy (GtkWidget *widget, gpointer data); #ifndef USE_MAEMO static void @@ -1476,7 +1609,7 @@ notes_log_export(appdata); } -#ifdef USE_MAEMO +#ifdef ENABLE_MAEMO_MAPPER static void cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) { appdata_t *appdata = (appdata_t*)data; @@ -1490,6 +1623,13 @@ garmin_export(appdata); } +#ifdef ENABLE_OSM_GPS_MAP +static void +cb_menu_map(GtkWidget *window, gpointer data) { + map((appdata_t *)data); +} +#endif + static void cb_menu_geomath(GtkWidget *window, gpointer data) { geomath_dialog((appdata_t *)data); @@ -1506,110 +1646,133 @@ } #ifdef USE_STACKABLE_WINDOW -static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) { - appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view"); -} +typedef struct { + char *label, *desc; + GtkSignalFunc activate_cb; +} menu_entry_t; -void on_export_clicked(GtkButton *button, appdata_t *appdata) { - HildonStackableWindow *view_window; - GtkWidget *but; +typedef struct { + const char *title; + const menu_entry_t *menu; + int len; +} submenu_t; - view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ()); - gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export"); +#define COLUMNS 1 - /* store last "cur_view" in window */ - g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view); - appdata->cur_view = NULL; +void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) { - g_signal_connect(G_OBJECT(view_window), "destroy", - G_CALLBACK(on_export_destroy), appdata); + /* force closing of submenu dialog */ + gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE); + gtk_widget_hide(menu); + + /* let gtk clean up */ + while(gtk_events_pending()) + gtk_main_iteration(); +} - GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE)); +static GtkWidget *app_submenu_create(appdata_t *appdata, + const submenu_t *submenu) { - but = 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(but, "clicked", - G_CALLBACK(cb_menu_export_mmpoi), appdata); - gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0); + /* create a oridinary dialog box */ + GtkWidget *dialog = gtk_dialog_new(); + gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title)); + gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); + gtk_window_set_transient_for(GTK_WINDOW(dialog), + GTK_WINDOW(appdata->window)); + gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); + GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE); + int x = 0, y = 0; - but = hildon_button_new_with_text( - HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, - HILDON_BUTTON_ARRANGEMENT_VERTICAL, - _("Export Field Notes"), - _("Save a Garmin Field Notes file")); - g_signal_connect(but, "clicked", - G_CALLBACK(cb_menu_export_log), appdata); - gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0); - + const menu_entry_t *menu_entries = submenu->menu; + while(menu_entries->label) { + GtkWidget *button = NULL; - but = hildon_button_new_with_text( + button = hildon_button_new_with_text( HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, HILDON_BUTTON_ARRANGEMENT_VERTICAL, - _("Export Garmin GPX"), - _("Save a GPX file containing modified waypoints")); - g_signal_connect(but, "clicked", - G_CALLBACK(cb_menu_export_garmin), appdata); - gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0); + _(menu_entries->label), _(menu_entries->desc)); - gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents)); - gtk_widget_show_all (GTK_WIDGET (view_window)); -} + /* try to center both texts */ + hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5); + hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5); -static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) { - appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view"); + g_signal_connect(button, "clicked", + G_CALLBACK(on_submenu_entry_clicked), dialog); + + g_signal_connect(button, "clicked", + menu_entries->activate_cb, appdata); + + gtk_table_attach_defaults(GTK_TABLE(table), button, x, x+1, y, y+1); + + x++; + if(x == COLUMNS) { x = 0; y++; } + + menu_entries++; + } + + gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table); + + return dialog; } -void on_tools_clicked(GtkButton *button, appdata_t *appdata) { - HildonStackableWindow *view_window; - GtkWidget *but; +/* popup the dialog shaped submenu */ +static void submenu_popup(GtkWidget *menu) { + gtk_widget_show_all(menu); + gtk_dialog_run(GTK_DIALOG(menu)); + gtk_widget_hide(menu); +} - view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ()); - gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools"); +static void submenu_cleanup(GtkWidget *menu) { + gtk_widget_destroy(menu); +} - /* store last "cur_view" in window */ - g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view); - appdata->cur_view = NULL; +static const menu_entry_t submenu_export_entries[] = { +#ifdef ENABLE_MAEMO_MAPPER + { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file", + G_CALLBACK(cb_menu_export_mmpoi) }, +#endif + { "Export Field Notes", "Save a Garmin Field Notes file", + G_CALLBACK(cb_menu_export_log) }, + { "Export Garmin GPX", "Save modified waypoints in GPX file", + G_CALLBACK(cb_menu_export_garmin) }, + { NULL, NULL, NULL } +}; - g_signal_connect(G_OBJECT(view_window), "destroy", - G_CALLBACK(on_tools_destroy), appdata); +static const submenu_t submenu_export = { + "Export", submenu_export_entries, + sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1 +}; - GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE)); +/* the export submenu */ +void on_export_clicked(GtkButton *button, appdata_t *appdata) { + if(!appdata->export_menu) + appdata->export_menu = app_submenu_create(appdata, &submenu_export); - but = hildon_button_new_with_text( - HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, - HILDON_BUTTON_ARRANGEMENT_VERTICAL, - _("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); + submenu_popup(appdata->export_menu); +} +static const menu_entry_t submenu_tools_entries[] = { + { "Geomath", "Geocoordinate calculation", + G_CALLBACK(cb_menu_geomath) }, + { "Geotext", "Text analysis", + G_CALLBACK(cb_menu_geotext) }, + { "Precise Position", "Calculate a precise GPS position", + G_CALLBACK(cb_menu_precpos) }, + { NULL, NULL, NULL } +}; - but = hildon_button_new_with_text( - 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); - +static const submenu_t submenu_tools = { + "Tools", submenu_tools_entries, + sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1 +}; - but = hildon_button_new_with_text( - HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, - HILDON_BUTTON_ARRANGEMENT_VERTICAL, - _("Precise Position"), - _("Calculate a very precise GPS position")); - g_signal_connect(but, "clicked", - G_CALLBACK(cb_menu_precpos), appdata); - gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0); +/* the tools submenu */ +void on_tools_clicked(GtkButton *button, appdata_t *appdata) { + if(!appdata->tools_menu) + appdata->tools_menu = app_submenu_create(appdata, &submenu_tools); - gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents)); - gtk_widget_show_all (GTK_WIDGET (view_window)); + submenu_popup(appdata->tools_menu); } HildonAppMenu *menu_create(appdata_t *appdata, int mode) { @@ -1637,9 +1800,7 @@ g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_adddir), appdata); hildon_app_menu_append(menu, GTK_BUTTON(button)); - } - if(mode == MENU_GPXLIST) { button = gtk_button_new_with_label(_("Export")); g_signal_connect_after(button, "clicked", G_CALLBACK(on_export_clicked), appdata); @@ -1656,7 +1817,21 @@ G_CALLBACK(on_tools_clicked), appdata); hildon_app_menu_append(menu, GTK_BUTTON(button)); - gtk_widget_show(GTK_WIDGET(menu)); +#ifdef ENABLE_OSM_GPS_MAP + button = gtk_button_new_with_label(_("Map")); + g_signal_connect_after(button, "clicked", + G_CALLBACK(cb_menu_map), appdata); + hildon_app_menu_append(menu, GTK_BUTTON(button)); +#endif + +#ifdef HILDON_HELP + button = gtk_button_new_with_label(_("Help")); + g_signal_connect_after(button, "clicked", + G_CALLBACK(cb_menu_help), appdata); + hildon_app_menu_append(menu, GTK_BUTTON(button)); +#endif + + gtk_widget_show_all(GTK_WIDGET(menu)); return menu; } @@ -1666,7 +1841,7 @@ GtkWidget *menu, *item; menu = gtk_menu_new(); -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT) appdata->menu_import = #endif item = gtk_menu_item_new_with_label(_("Import")); @@ -1696,7 +1871,7 @@ g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata); #endif -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT) appdata->menu_export = #endif item = gtk_menu_item_new_with_label(_("Export")); @@ -1704,7 +1879,7 @@ submenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); -#ifdef USE_MAEMO +#ifdef ENABLE_MAEMO_MAPPER item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") ); gtk_menu_append(GTK_MENU_SHELL(submenu), item); g_signal_connect(item, "activate", @@ -1721,7 +1896,7 @@ g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata); -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT) appdata->menu_search = #endif item = gtk_menu_item_new_with_label( _("Search") ); @@ -1730,11 +1905,8 @@ gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new()); -#ifndef NO_COPY_N_PASTE /* ----------- copy'n paste submenu ----------------- */ - appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0); - +#ifndef NO_COPY_N_PASTE item = gtk_menu_item_new_with_label(_("Edit")); gtk_menu_append(GTK_MENU_SHELL(menu), item); submenu = gtk_menu_new(); @@ -1761,6 +1933,13 @@ gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new()); +#ifdef ENABLE_OSM_GPS_MAP + item = gtk_menu_item_new_with_label( _("Map") ); + gtk_menu_append(GTK_MENU_SHELL(menu), item); + g_signal_connect(item, "activate", + GTK_SIGNAL_FUNC(cb_menu_map), appdata); +#endif + item = gtk_menu_item_new_with_label(_("Tools")); gtk_menu_append(GTK_MENU_SHELL(menu), item); submenu = gtk_menu_new(); @@ -1825,6 +2004,11 @@ if(appdata->image_path) free(appdata->image_path); if(appdata->search_str) free(appdata->search_str); +#ifdef USE_STACKABLE_WINDOW + if(appdata->export_menu) submenu_cleanup(appdata->export_menu); + if(appdata->tools_menu) submenu_cleanup(appdata->tools_menu); +#endif + gnome_vfs_shutdown(); icons_free(); gps_release(appdata); @@ -1853,7 +2037,7 @@ puts("everything is gone"); } -void on_window_destroy (GtkWidget *widget, gpointer data) { +static void on_window_destroy (GtkWidget *widget, gpointer data) { appdata_t *appdata = (appdata_t*)data; gconf_save_state(appdata); @@ -1916,7 +2100,7 @@ return handled; } -#ifdef USE_BREAD_CRUMB_TRAIL +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT) typedef struct { int level; appdata_t *appdata; @@ -2008,6 +2192,10 @@ gtk_widget_show_all(crumb->appdata->vbox); g_free(data); + +#ifdef ENABLE_OSM_GPS_MAP + map_update(crumb->appdata); +#endif } static void crumb_add(appdata_t *appdata, char *name, int level, @@ -2048,8 +2236,16 @@ #endif } +#ifdef USE_BREAD_CRUMB_TRAIL hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct), name, crumb, (GDestroyNotify)crumb_back); +#else + bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back); +#endif + +#ifdef ENABLE_OSM_GPS_MAP + map_update(appdata); +#endif } #endif // USE_BREAD_CRUMB_TRAIL @@ -2061,18 +2257,6 @@ return; } -#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 /* a cache screen cannot be changed from the settings and thus doesn't */ /* need to be redrawn */ if(appdata->cur_cache) { @@ -2127,7 +2311,6 @@ gtk_widget_show_all(container); } -#endif // USE_MAEMO } int main(int argc, char *argv[]) { @@ -2148,6 +2331,8 @@ gtk_init (&argc, &argv); + curl_global_init(CURL_GLOBAL_ALL); + #ifdef USE_MAEMO printf("Installing osso context for \"org.harbaum." APP "\"\n"); appdata.osso_context = osso_initialize("org.harbaum."APP, @@ -2156,8 +2341,10 @@ fprintf(stderr, "error initiating osso context\n"); } +#ifdef ENABLE_MAEMO_MAPPER dbus_register(&appdata); #endif +#endif icons_init(); @@ -2181,19 +2368,25 @@ /* Create a Window. */ appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL); /* Set a decent default size for the window. */ - gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300); + gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480); #endif +#if MAEMO_VERSION_MAJOR == 5 gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView"); +#endif + g_signal_connect(G_OBJECT(appdata.window), "destroy", G_CALLBACK(on_window_destroy), &appdata); g_signal_connect(G_OBJECT(appdata.window), "key_press_event", G_CALLBACK(on_window_key_press), &appdata); + /* prepare clipboard */ + appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0); + appdata.vbox = gtk_vbox_new(FALSE, 2); gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox); - #ifndef USE_STACKABLE_WINDOW menu_create(&appdata); #else @@ -2207,6 +2400,16 @@ gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0); hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct)); +#else +#ifdef BCT + /* on non-hildon machines we use some custom made breadcrumbtrail */ + /* replacement */ + appdata.bct = bct_new(); + gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0); +#endif +#endif + +#if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT) crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL); #endif