--- trunk/src/main.c 2009/09/29 07:31:18 128 +++ trunk/src/main.c 2009/11/08 20:32:55 165 @@ -19,6 +19,8 @@ #include #include +#include + #include #include @@ -29,6 +31,9 @@ #ifdef USE_MAEMO #include +#if MAEMO_VERSION_MAJOR >= 5 +#include +#endif #endif #include @@ -92,17 +97,18 @@ } } +#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5) GtkWidget *dialog = gtk_message_dialog_new( GTK_WINDOW(NULL), GTK_DIALOG_DESTROY_WITH_PARENT, -#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5) GTK_MESSAGE_ERROR, -#else - GTK_MESSAGE_OTHER, -#endif 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); @@ -209,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) { @@ -226,16 +245,7 @@ if(gtk_tree_model_get_iter(model, &iter, path)) { cache_t *cache; gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1); -#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 + cachelist_goto_cache(appdata, cache); } } @@ -278,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; @@ -302,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); @@ -330,7 +331,6 @@ gtk_widget_show_all(container); } -#endif } @@ -338,21 +338,20 @@ 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; } @@ -598,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"); } @@ -624,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 @@ -727,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, @@ -753,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?")); @@ -766,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))) { @@ -838,23 +900,8 @@ gpx_busy_dialog_destroy(dialog); } -#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 + + gpxlist_goto_cachelist(appdata, gpx); } } } @@ -909,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 --- */ @@ -965,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 @@ -1076,6 +1127,7 @@ const gchar *authors[] = { "Till Harbaum ", "John Stowers ", + "GCVote: Guido Wegener ", NULL }; context.dialog = g_object_new(GTK_TYPE_ABOUT_DIALOG, @@ -1284,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) { @@ -1853,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(); @@ -2143,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, @@ -2189,6 +2242,10 @@ #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 @@ -2200,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) { @@ -2266,7 +2311,6 @@ gtk_widget_show_all(container); } -#endif // USE_MAEMO } int main(int argc, char *argv[]) { @@ -2287,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, @@ -2322,7 +2368,7 @@ /* 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 @@ -2335,6 +2381,10 @@ 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