Diff of /trunk/src/main.c

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

revision 79 by achadwick, Sun Feb 15 22:15:06 2009 UTC revision 191 by harbaum, Tue Jul 7 07:36:27 2009 UTC
# Line 1  Line 1 
1  /*  /*
2     * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.
3     *
4   * This file is part of OSM2Go.   * This file is part of OSM2Go.
5   *   *
6   * OSM2Go is free software: you can redistribute it and/or modify   * OSM2Go is free software: you can redistribute it and/or modify
# Line 21  Line 23 
23  #include <curl/curl.h>  #include <curl/curl.h>
24  #include <gdk/gdkkeysyms.h>  #include <gdk/gdkkeysyms.h>
25    
26    #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
27    #include <hildon/hildon-button.h>
28    #include <hildon/hildon-check-button.h>
29    #include <hildon/hildon-window-stack.h>
30    #include <gdk/gdkx.h>
31    #include <X11/Xatom.h>
32    #endif
33    
34  #include "appdata.h"  #include "appdata.h"
35  #include "banner.h"  #include "banner.h"
36    
# Line 34  static void main_ui_enable(appdata_t *ap Line 44  static void main_ui_enable(appdata_t *ap
44      map_action_cancel(appdata);      map_action_cancel(appdata);
45    
46    /* ---- set project name as window title ----- */    /* ---- set project name as window title ----- */
47  #ifndef USE_HILDON  #if defined(USE_HILDON) && MAEMO_VERSION_MAJOR < 5
48      if(project_valid)
49        gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);
50      else
51        gtk_window_set_title(GTK_WINDOW(appdata->window), "");
52    #else
53    char *str = NULL;    char *str = NULL;
54    if(project_valid)    if(project_valid)
55      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);
# Line 43  static void main_ui_enable(appdata_t *ap Line 58  static void main_ui_enable(appdata_t *ap
58    
59    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
60    g_free(str);    g_free(str);
 #else  
   if(project_valid)  
     gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);  
   else  
     gtk_window_set_title(GTK_WINDOW(appdata->window), "");  
61  #endif  #endif
62    
63    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
64      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
65    
66    /* disable all menu entries related to map */    /* disable all menu entries related to map */
67    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
68    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
69    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
70      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
71    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
72    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
73    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
74    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
75    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
76    gtk_widget_set_sensitive(appdata->menu_map, osm_valid);    gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
   gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);  
77    
78    if(!project_valid)    if(!project_valid)
79      statusbar_set(appdata, _("Please load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
# Line 73  static void main_ui_enable(appdata_t *ap Line 82  static void main_ui_enable(appdata_t *ap
82  /******************** begin of menu *********************/  /******************** begin of menu *********************/
83    
84  static void  static void
85  cb_menu_project_open(GtkWidget *window, gpointer data) {  cb_menu_project_open(GtkMenuItem *item, gpointer data) {
86    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
87    project_load(appdata, NULL);    project_load(appdata, NULL);
88    main_ui_enable(appdata);    main_ui_enable(appdata);
89  }  }
90    
91  static void  static void
92  cb_menu_project_close(GtkWidget *window, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
93    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
94    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
95  }  }
96    
97  static void  static void
98  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkMenuItem *item, gpointer data) {
99    GtkAboutDialog *about = GTK_ABOUT_DIALOG(gtk_about_dialog_new());    appdata_t *appdata = (appdata_t*)data;
   
   gtk_about_dialog_set_name(about, "OSM2Go");  
   gtk_about_dialog_set_version(about, VERSION);  
   gtk_about_dialog_set_copyright(about, _("Copyright 2008"));  
100    
101    const gchar *authors[] = {    const gchar *authors[] = {
102      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
103      "Andrew Chadwick <andrewc-osm2go@piffle.org>",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
104      NULL };      NULL };
105    
106    gtk_about_dialog_set_authors(about, authors);    const gchar *artists[] = {
107        "Andrew Zhilin <drew.zhilin@gmail.com>",
108    gtk_about_dialog_set_website(about,      NULL };
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Mobile OSM Editor"));  
109    
110    gtk_widget_show_all(GTK_WIDGET(about));    gtk_show_about_dialog(GTK_WINDOW(appdata->window),
111    gtk_dialog_run(GTK_DIALOG(about));                          "name", "OSM2Go",
112    gtk_widget_destroy(GTK_WIDGET(about));                          "version", VERSION,
113                            "copyright", _("Copyright 2008-2009"),
114                            "authors", authors,
115                            "artists", artists,
116                            "website", _("http://www.harbaum.org/till/maemo"),
117                            "comments", _("Mobile OSM Editor"),
118                            NULL);
119  }  }
120    
121  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
122    
123    #ifndef USE_HILDON
124  static void  static void
125  cb_menu_quit(GtkWidget *window, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
126    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
127    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
128  }  }
129    #endif
130    
131  static void  static void
132  cb_menu_upload(GtkWidget *window, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
133    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
134    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
135    
136      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
137        return;
138    
139    osm_upload(appdata, appdata->osm, appdata->project);    osm_upload(appdata, appdata->osm, appdata->project);
140  }  }
141    
142  static void  static void
143  cb_menu_download(GtkWidget *window, gpointer data) {  cb_menu_download(GtkMenuItem *item, gpointer data) {
144    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
145    if(!appdata->project) return;    if(!appdata->project) return;
146    
147      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
148        return;
149    
150    /* if we have valid osm data loaded: save state first */    /* if we have valid osm data loaded: save state first */
151    if(appdata->osm) {    if(appdata->osm) {
152      /* redraw the entire map by destroying all map items and redrawing them */      /* redraw the entire map by destroying all map items and redrawing them */
# Line 144  cb_menu_download(GtkWidget *window, gpoi Line 158  cb_menu_download(GtkWidget *window, gpoi
158    }    }
159    
160    // download    // download
161    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
162      banner_busy_start(appdata, 1, "Redrawing...");                    appdata->project)) {
163      appdata->osm = osm_parse(appdata->project->osm);      banner_busy_start(appdata, 1, "Redrawing");
164        appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
165      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
166      map_paint(appdata);      map_paint(appdata);
167      banner_busy_stop(appdata); //"Redrawing..."      banner_busy_stop(appdata); //"Redrawing"
168    }    }
169    
170    main_ui_enable(appdata);    main_ui_enable(appdata);
171  }  }
172    
173  static void  static void
174  cb_menu_wms_import(GtkWidget *window, gpointer data) {  cb_menu_wms_import(GtkMenuItem *item, gpointer data) {
175    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
176    wms_import(appdata);    wms_import(appdata);
177  }  }
178    
179  static void  static void
180  cb_menu_wms_clear(GtkWidget *window, gpointer data) {  cb_menu_wms_clear(GtkMenuItem *item, gpointer data) {
181    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
182    wms_remove(appdata);    wms_remove(appdata);
183  }  }
184    
185  static void  static void
186  cb_menu_wms_adjust(GtkWidget *window, gpointer data) {  cb_menu_wms_adjust(GtkMenuItem *item, gpointer data) {
187    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
188    map_action_set(appdata, MAP_ACTION_BG_ADJUST);    map_action_set(appdata, MAP_ACTION_BG_ADJUST);
189  }  }
# Line 176  cb_menu_wms_adjust(GtkWidget *window, gp Line 191  cb_menu_wms_adjust(GtkWidget *window, gp
191  /* ----------- hide objects for performance reasons ----------- */  /* ----------- hide objects for performance reasons ----------- */
192    
193  static void  static void
194  cb_menu_map_hide_sel(GtkWidget *window, gpointer data) {  cb_menu_map_hide_sel(GtkMenuItem *item, gpointer data) {
195    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
196    map_hide_selected(appdata);    map_hide_selected(appdata);
197  }  }
198    
199  static void  static void
200  cb_menu_map_show_all(GtkWidget *window, gpointer data) {  cb_menu_map_show_all(GtkMenuItem *item, gpointer data) {
201    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
202    map_show_all(appdata);    map_show_all(appdata);
203  }  }
204    
205  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
206    
207  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
208  static void  #define MENU_CHECK_ITEM HildonCheckButton
209  cb_menu_redraw(GtkWidget *window, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
210    appdata_t *appdata = (appdata_t*)data;  #else
211    #define MENU_CHECK_ITEM GtkCheckMenuItem
212    /* redraw the entire map by destroying all map items and redrawing them */  #define MENU_CHECK_ITEM_ACTIVE(a) gtk_check_menu_item_get_active(a)
   banner_busy_start(appdata, 1, "Redrawing...");  
   track_save(appdata->project, appdata->track.track);  
   diff_save(appdata->project, appdata->osm);  
   map_clear(appdata, MAP_LAYER_ALL);  
   osm_free(&appdata->icon, appdata->osm);  
   
   appdata->osm = osm_parse(appdata->project->osm);  
   diff_restore(appdata, appdata->project, appdata->osm);  
   map_paint(appdata);  
   
   appdata->track.track = track_restore(appdata, appdata->project);  
   if(appdata->track.track)  
     map_track_draw(appdata->map, appdata->track.track);  
   
   wms_load(appdata);  
   banner_busy_stop(appdata); //"Redrawing..."  
 }  
213  #endif  #endif
214    
215  static void  static void
216  cb_menu_style(GtkWidget *widget, gpointer data) {  cb_menu_map_no_icons(MENU_CHECK_ITEM *item, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
217    
218    style_select(GTK_WIDGET(appdata->window), appdata);    banner_busy_start(appdata, 1, "Redrawing");
219  }    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
220    
221  static void    appdata->settings->no_icons = MENU_CHECK_ITEM_ACTIVE(item);
 cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
222    
   banner_busy_start(appdata, 1, "Redrawing...");  
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_icons =  
     gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));  
223    map_paint(appdata);    map_paint(appdata);
224    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
225  }  }
226    
227  static void  static void
228  cb_menu_map_no_antialias(GtkWidget *widget, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
229    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
230    
231    banner_busy_start(appdata, 1, "Redrawing...");    style_select(GTK_WIDGET(appdata->window), appdata);
   map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);  
   appdata->settings->no_antialias =  
     gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));  
   map_paint(appdata);  
   banner_busy_stop(appdata); //"Redrawing..."  
232  }  }
233    
234  static void  static void
235  cb_menu_undo(GtkWidget *widget, gpointer data) {  cb_menu_undo(GtkMenuItem *item, gpointer data) {
236    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
237    
238    undo(appdata);    undo(appdata);
# Line 255  cb_menu_undo(GtkWidget *widget, gpointer Line 241  cb_menu_undo(GtkWidget *widget, gpointer
241  }  }
242    
243  static void  static void
244  cb_menu_save_changes(GtkWidget *widget, gpointer data) {  cb_menu_save_changes(GtkMenuItem *item, gpointer data) {
245    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
246    
247    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
# Line 263  cb_menu_save_changes(GtkWidget *widget, Line 249  cb_menu_save_changes(GtkWidget *widget,
249  }  }
250    
251  static void  static void
252  cb_menu_undo_changes(GtkWidget *widget, gpointer data) {  cb_menu_undo_changes(GtkMenuItem *item, gpointer data) {
253    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
254    
255    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
# Line 272  cb_menu_undo_changes(GtkWidget *widget, Line 258  cb_menu_undo_changes(GtkWidget *widget,
258                   "uploaded yet? This can't be undone.")))                   "uploaded yet? This can't be undone.")))
259      return;      return;
260    
261    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing"));
262    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
263    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
264    diff_remove(appdata->project);    diff_remove(appdata->project);
265    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
266    map_paint(appdata);    map_paint(appdata);
267    banner_busy_stop(appdata);  //"Redrawing..."    banner_busy_stop(appdata);  //"Redrawing"
268    
269    banner_show_info(appdata, _("Discarded local changes"));    banner_show_info(appdata, _("Discarded local changes"));
270  }  }
271    
272  static void  static void
273  cb_menu_osm_relations(GtkWidget *widget, gpointer data) {  cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
274    relation_list((appdata_t*)data);    /* list relations of all objects */
275      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
276  }  }
277    
278    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
279  static void  static void
280  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_fullscreen(MENU_CHECK_ITEM *item, gpointer data) {
281    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
282    
283    if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))    if(MENU_CHECK_ITEM_ACTIVE(item))
284      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
285    else    else
286      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
287  }  }
288    #endif
289    
290  static void  static void
291  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
292    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
293    
294    map_set_zoom(appdata->map, appdata->map->state->zoom*ZOOM_FACTOR_MENU, TRUE);    map_set_zoom(appdata->map, appdata->map->state->zoom*ZOOM_FACTOR_MENU, TRUE);
# Line 307  cb_menu_zoomin(GtkWidget *widget, appdat Line 296  cb_menu_zoomin(GtkWidget *widget, appdat
296  }  }
297    
298  static void  static void
299  cb_menu_zoomout(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomout(GtkMenuItem *item, appdata_t *appdata) {
300    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
301    
302    map_set_zoom(appdata->map, appdata->map->state->zoom/ZOOM_FACTOR_MENU, TRUE);    map_set_zoom(appdata->map, appdata->map->state->zoom/ZOOM_FACTOR_MENU, TRUE);
# Line 315  cb_menu_zoomout(GtkWidget *widget, appda Line 304  cb_menu_zoomout(GtkWidget *widget, appda
304  }  }
305    
306  static void  static void
307  cb_menu_track_import(GtkWidget *window, appdata_t *appdata) {  cb_menu_view_detail_inc(GtkMenuItem *item, gpointer data) {
308      appdata_t *appdata = (appdata_t*)data;
309    
310      printf("detail level increase\n");
311      map_detail_increase(appdata->map);
312    }
313    
314    static void
315    cb_menu_view_detail_normal(GtkMenuItem *item, gpointer data) {
316      appdata_t *appdata = (appdata_t*)data;
317    
318      printf("detail level normal\n");
319      map_detail_normal(appdata->map);
320    }
321    
322    static void
323    cb_menu_view_detail_dec(GtkMenuItem *item, gpointer data) {
324      appdata_t *appdata = (appdata_t*)data;
325    
326      printf("detail level decrease\n");
327      map_detail_decrease(appdata->map);
328    }
329    
330    static void
331    cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
332      g_assert(appdata->settings);
333    
334    /* open a file selector */    /* open a file selector */
335    GtkWidget *dialog;    GtkWidget *dialog;
# Line 332  cb_menu_track_import(GtkWidget *window, Line 346  cb_menu_track_import(GtkWidget *window,
346                          NULL);                          NULL);
347  #endif  #endif
348    
349    /* use path if one is present */    if(appdata->settings->track_path) {
350    if(appdata->track.import_path)      if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
351      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),        char *last_sep = strrchr(appdata->settings->track_path, '/');
352                                          appdata->track.import_path);        if(last_sep) {
353            *last_sep = 0;  // seperate path from file
354    
355            /* the user just created a new document */
356            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
357                                        appdata->settings->track_path);
358            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
359                                              last_sep+1);
360    
361            /* restore full filename */
362            *last_sep = '/';
363          }
364        } else
365          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
366                                        appdata->settings->track_path);
367      }
368    
369    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
370    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
371      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
372    
373      /* load a track */      /* load a track */
374      track_do(appdata, TRACK_IMPORT, filename);      appdata->track.track = track_import(appdata, filename);
375      if(appdata->track.track) {      if(appdata->track.track) {
376          if(appdata->settings->track_path) g_free(appdata->settings->track_path);
377        /* save path if gpx was successfully loaded */        appdata->settings->track_path = g_strdup(filename);
       char *r = strrchr(filename, '/');  
   
       /* there is a delimiter, use everything left of it as path */  
       if(r) {  
         *r = 0;  
         if(appdata->track.import_path) g_free(appdata->track.import_path);  
         appdata->track.import_path = g_strdup(filename);  
         /* restore path ... just in case ... */  
         *r = '/';  
       }  
378      }      }
379      g_free (filename);      g_free (filename);
380    }    }
# Line 364  cb_menu_track_import(GtkWidget *window, Line 383  cb_menu_track_import(GtkWidget *window,
383  }  }
384    
385  static void  static void
386  cb_menu_track_gps(GtkWidget *window, gpointer data) {  cb_menu_track_enable_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
387    appdata_t *appdata = (appdata_t*)data;    track_enable_gps(appdata, MENU_CHECK_ITEM_ACTIVE(item));
388    }
389    
390    if(gtk_check_menu_item_get_active(  
391      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_gps))) {  static void
392      track_do(appdata, TRACK_GPS, NULL);  cb_menu_track_follow_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
393    } else {    appdata->settings->follow_gps = MENU_CHECK_ITEM_ACTIVE(item);
     track_do(appdata, TRACK_NONE, NULL);  
   }  
394  }  }
395    
396    
397  static void  static void
398  cb_menu_track_export(GtkWidget *window, gpointer data) {  cb_menu_track_export(GtkMenuItem *item, appdata_t *appdata) {
399    appdata_t *appdata = (appdata_t*)data;    g_assert(appdata->settings);
400    messagef(GTK_WIDGET(appdata->window), _("NIY"),  
401             _("Track export is not yet supported."));    /* open a file selector */
402      GtkWidget *dialog;
403    
404    #ifdef USE_HILDON
405      dialog = hildon_file_chooser_dialog_new(GTK_WINDOW(appdata->window),
406                                              GTK_FILE_CHOOSER_ACTION_SAVE);
407    #else
408      dialog = gtk_file_chooser_dialog_new(_("Export track file"),
409                                           GTK_WINDOW(appdata->window),
410                                           GTK_FILE_CHOOSER_ACTION_SAVE,
411                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
412                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
413                                           NULL);
414    #endif
415    
416      printf("set filename <%s>\n", appdata->settings->track_path);
417    
418      if(appdata->settings->track_path) {
419        if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
420          char *last_sep = strrchr(appdata->settings->track_path, '/');
421          if(last_sep) {
422            *last_sep = 0;  // seperate path from file
423    
424            /* the user just created a new document */
425            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
426                                                appdata->settings->track_path);
427            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
428                                              last_sep+1);
429    
430            /* restore full filename */
431            *last_sep = '/';
432          }
433        } else
434          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
435                                        appdata->settings->track_path);
436      }
437    
438      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_FM_OK) {
439        gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
440        if(filename) {
441          printf("export to %s\n", filename);
442    
443          if(!g_file_test(filename, G_FILE_TEST_EXISTS) ||
444             yes_no_f(dialog, appdata, MISC_AGAIN_ID_EXPORT_OVERWRITE,
445                      MISC_AGAIN_FLAG_DONT_SAVE_NO,
446                      "Overwrite existing file",
447                      "The file already exists. "
448                      "Do you really want to replace it?")) {
449            if(appdata->settings->track_path)
450              g_free(appdata->settings->track_path);
451            appdata->settings->track_path = g_strdup(filename);
452    
453            track_export(appdata, filename);
454          }
455        }
456      }
457    
458      gtk_widget_destroy (dialog);
459  }  }
460    
461    
462  static void  static void
463  cb_menu_track_clear(GtkWidget *window, gpointer data) {  cb_menu_track_clear(GtkMenuItem *item, gpointer data) {
464    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
465    track_do(appdata, TRACK_NONE, NULL);    track_clear(appdata, appdata->track.track);
466      appdata->track.track = NULL;
467  }  }
468    
469    
# Line 419  cb_menu_track_clear(GtkWidget *window, g Line 497  cb_menu_track_clear(GtkWidget *window, g
497  #endif  #endif
498    
499    
500    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
501  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder  // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
502  // instead so we have some flexibility.  // instead so we have some flexibility.
503    
# Line 433  menu_append_new_item(appdata_t *appdata, Line 511  menu_append_new_item(appdata_t *appdata,
511                       const gchar *accel_path,                       const gchar *accel_path,
512                       guint accel_key,      // from gdk/gdkkeysyms.h                       guint accel_key,      // from gdk/gdkkeysyms.h
513                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK                       GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
514                         gboolean enabled,
515                       gboolean is_check, gboolean check_status)                       gboolean is_check, gboolean check_status)
516  {  {
517    GtkWidget *item = NULL;    GtkWidget *item = NULL;
# Line 488  menu_append_new_item(appdata_t *appdata, Line 567  menu_append_new_item(appdata_t *appdata,
567  #endif  #endif
568    
569    gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));    gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
570    if (is_check) {    gtk_widget_set_sensitive(GTK_WIDGET(item), enabled);
571      if (is_check)
572      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
573    }  
574    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
575                     appdata);                     appdata);
576    return item;    return item;
577  }  }
578    
   
579  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
580    GtkWidget *menu, *item, *submenu;    GtkWidget *menu, *item, *submenu;
581    GtkWidget *about_quit_items_menu;    GtkWidget *about_quit_items_menu;
# Line 521  void menu_create(appdata_t *appdata) { Line 600  void menu_create(appdata_t *appdata) {
600  #endif  #endif
601    
602    menu_append_new_item(    menu_append_new_item(
603      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open"),
604      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
605      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
606    );    );
607    
608    appdata->menu_item_project_close = menu_append_new_item(    menu_append_new_item(
609      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_close), _("_Close"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
610      GTK_STOCK_CLOSE, "<OSM2Go-Main>/Project/Close",      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
611      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
612    );    );
613    
614    /* --------------- view menu ------------------- */    /* --------------- view menu ------------------- */
# Line 538  void menu_create(appdata_t *appdata) { Line 617  void menu_create(appdata_t *appdata) {
617    gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
618  #endif  #endif
619    
620    appdata->menu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
621    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
622    submenu = gtk_menu_new();    submenu = gtk_menu_new();
623    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
624    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
625    
626    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
627    appdata->menu_item_view_fullscreen = menu_append_new_item(    appdata->menu_item_view_fullscreen = menu_append_new_item(
628      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
629      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
630      0, 0, TRUE, FALSE      0, 0, TRUE, TRUE, FALSE
631    );    );
632    #endif
633    
634    menu_append_new_item(    menu_append_new_item(
635      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
636      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
637      GDK_comma, GDK_CONTROL_MASK, FALSE, FALSE      GDK_comma, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
638    );    );
639    
640    menu_append_new_item(    menu_append_new_item(
641      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
642      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",      GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
643      GDK_period, GDK_CONTROL_MASK, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
644      );
645    
646      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
647    
648      menu_append_new_item(
649        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_inc), _("More details"),
650        NULL, "<OSM2Go-Main>/View/DetailInc",
651        GDK_period, GDK_MOD1_MASK, TRUE, FALSE, FALSE
652    );    );
653    
654    /* -------------------- OSM submenu -------------------- */    menu_append_new_item(
655        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_normal), _("Normal details"),
656        NULL, "<OSM2Go-Main>/View/DetailNormal",
657        0, 0, TRUE, FALSE, FALSE
658      );
659    
660      menu_append_new_item(
661        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_dec), _("Less details"),
662        NULL, "<OSM2Go-Main>/View/DetailDec",
663        GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
664      );
665    
666    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
667    
668      appdata->menu_item_map_hide_sel = menu_append_new_item(
669        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
670        GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
671        0, 0, TRUE, FALSE, FALSE
672      );
673      gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
674    
675      appdata->menu_item_map_show_all = menu_append_new_item(
676        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
677        GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
678        0, 0, TRUE, FALSE, FALSE
679      );
680      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
681    
682      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
683    
684      menu_append_new_item(
685        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
686        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
687        0, 0, TRUE, FALSE, FALSE
688      );
689    
690      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
691    
692      appdata->menu_item_map_no_icons = menu_append_new_item(
693        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
694        NULL, "<OSM2Go-Main>/View/NoIcons",
695        0, 0, TRUE, TRUE, appdata->settings->no_icons
696      );
697    
698    
699      /* -------------------- map submenu -------------------- */
700    
701      appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
702    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
703    submenu = gtk_menu_new();    submenu = gtk_menu_new();
704    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
705    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
706    
707    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_map_upload = menu_append_new_item(
708      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
709      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/Map/Upload",
710      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
711    );    );
712    
713    menu_append_new_item(    menu_append_new_item(
714      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
715      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/Map/Download",
716      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
717    );    );
718    
719    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
720    
721    if(getenv("OSM2GO_UNDO_TEST")) {    if(getenv("OSM2GO_UNDO_TEST")) {
722      appdata->menu_item_osm_undo = menu_append_new_item(      appdata->menu_item_map_undo = menu_append_new_item(
723                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),                 appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
724                 GTK_STOCK_UNDO, "<OSM2Go-Main>/OSM/Undo",                 GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
725                 GDK_z, GDK_CONTROL_MASK, FALSE, FALSE                 GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
726                 );                 );
727    } else    } else
728      printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");      printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
729    
730    appdata->menu_item_osm_save_changes = menu_append_new_item(    appdata->menu_item_map_save_changes = menu_append_new_item(
731      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
732      GTK_STOCK_SAVE, "<OSM2Go-Main>/OSM/SaveChanges",      GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
733      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
734    );    );
735    
736    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_map_undo_changes = menu_append_new_item(
737      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes"),
738      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
739      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
740    );    );
741    
742    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
743    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_map_relations = menu_append_new_item(
744      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
745      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/Map/Relations",
746      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
747    );    );
748    
749    /* -------------------- wms submenu -------------------- */    /* -------------------- wms submenu -------------------- */
750    
751    appdata->menu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
752    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
753    submenu = gtk_menu_new();    submenu = gtk_menu_new();
754    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
755    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
756    
757    menu_append_new_item(    menu_append_new_item(
758      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import"),
759      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
760      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
761    );    );
762    
763    appdata->menu_item_wms_clear = menu_append_new_item(    appdata->menu_item_wms_clear = menu_append_new_item(
764      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
765      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
766      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
767    );    );
768    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
769    
770    appdata->menu_item_wms_adjust = menu_append_new_item(    appdata->menu_item_wms_adjust = menu_append_new_item(
771      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
772      NULL, "<OSM2Go-Main>/WMS/Adjust",      NULL, "<OSM2Go-Main>/WMS/Adjust",
773      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
774    );    );
775    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);    gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
776    
   /* -------------------- map submenu -------------------- */  
   
   appdata->menu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );  
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);  
   submenu = gtk_menu_new();  
   gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);  
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  
   
   appdata->menu_item_map_hide_sel = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),  
     GTK_STOCK_REMOVE, "<OSM2Go-Main>/Map/HideSelected",  
     0, 0, FALSE, FALSE  
   );  
   gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);  
   
   appdata->menu_item_map_show_all = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),  
     GTK_STOCK_ADD, "<OSM2Go-Main>/Map/ShowAll",  
     0, 0, FALSE, FALSE  
   );  
   gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);  
   
   gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
   
   menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),  
     GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",  
     0, 0, FALSE, FALSE  
   );  
   
   gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
   
   /* switches mainly intended for testing/debugging */  
   menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_redraw), _("_Redraw"),  
     NULL, "<OSM2Go-Main>/Map/Redraw",  
     GDK_r, GDK_CONTROL_MASK, FALSE, FALSE  
   );  
   
   appdata->menu_item_map_no_icons = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),  
     NULL, "<OSM2Go-Main>/Map/NoIcons",  
     0, 0, TRUE, appdata->settings->no_icons  
   );  
   
   appdata->menu_item_map_no_antialias = menu_append_new_item(  
     appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_antialias),  
     _("No _antialias"),  
     NULL, "<OSM2Go-Main>/Map/NoAntialias",  
     0, 0, TRUE, appdata->settings->no_antialias  
   );  
   
777    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
778    
779    appdata->track.menu_track = item = gtk_menu_item_new_with_mnemonic(_("_Track"));    appdata->track.submenu_track = item =
780        gtk_menu_item_new_with_mnemonic(_("_Track"));
781    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
782    submenu = gtk_menu_new();    submenu = gtk_menu_new();
783    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
784    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
785    
786    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_track_import = menu_append_new_item(
787      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
788      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
789      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
790    );    );
791    
792    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_track_export = menu_append_new_item(
793      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
794      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
795      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
796    );    );
797    
798    appdata->track.menu_item_clear = menu_append_new_item(    appdata->track.menu_item_track_clear = menu_append_new_item(
799      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
800      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
801      0, 0, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
802    );    );
803    
804    
805    appdata->track.menu_item_gps = menu_append_new_item(    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
806      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_gps), _("_GPS"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
807      NULL, "<OSM2Go-Main>/Track/GPS",      NULL, "<OSM2Go-Main>/Track/GPS",
808      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, FALSE      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
809        appdata->settings->enable_gps
810      );
811    
812      appdata->track.menu_item_track_follow_gps = menu_append_new_item(
813        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
814        NULL, "<OSM2Go-Main>/Track/Follow",
815        0, 0, appdata->settings->enable_gps, TRUE,
816        appdata->settings->follow_gps
817    );    );
818    
819    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
# Line 731  void menu_create(appdata_t *appdata) { Line 822  void menu_create(appdata_t *appdata) {
822                          gtk_separator_menu_item_new());                          gtk_separator_menu_item_new());
823    
824    menu_append_new_item(    menu_append_new_item(
825      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About"),
826      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
827      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
828    );    );
829    
830    #ifndef USE_HILDON
831    menu_append_new_item(    menu_append_new_item(
832      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
833      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",      GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
834      0, 0, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
835    );    );
836    #endif
837    
838    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
839    
# Line 766  void menu_create(appdata_t *appdata) { Line 859  void menu_create(appdata_t *appdata) {
859    
860  #endif //USE_HILDON  #endif //USE_HILDON
861  }  }
862    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
863    
864    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
865                       const char *label, const char *value,
866                       GtkSignalFunc activate_cb) {
867    
868    }
869    
870    typedef struct {
871      const char *label, *value;
872      gboolean enabled;
873      gboolean (*toggle)(appdata_t *appdata);
874      gulong offset;
875      GtkSignalFunc activate_cb;
876    } menu_entry_t;
877    
878    static gboolean no_icon_get_toggle(appdata_t *appdata) {
879      if(!appdata)           return FALSE;
880      if(!appdata->settings) return FALSE;
881      return appdata->settings->no_icons;
882    }
883    
884    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
885      if(!appdata)           return FALSE;
886      return appdata->gps_enabled;
887    }
888    
889    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
890      if(!appdata)           return FALSE;
891      if(!appdata->settings) return FALSE;
892      return appdata->settings->follow_gps;
893    }
894    
895    /* create a HildonAppMenu */
896    static GtkWidget *app_menu_create(appdata_t *appdata,
897                                      const menu_entry_t *menu_entries) {
898      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
899    
900      while(menu_entries->label) {
901        GtkWidget *button = NULL;
902    
903        if(!menu_entries->toggle) {
904          button = hildon_button_new_with_text(
905                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
906                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
907                _(menu_entries->label), _(menu_entries->value));
908          g_signal_connect_after(button, "clicked",
909                                 menu_entries->activate_cb, appdata);
910        } else {
911          button = hildon_check_button_new(HILDON_SIZE_AUTO);
912          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
913          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
914                                         menu_entries->toggle(appdata));
915          g_signal_connect_after(button, "toggled",
916                                 menu_entries->activate_cb, appdata);
917        }
918    
919        /* offset to GtkWidget pointer was given -> store pointer */
920        if(menu_entries->offset)
921          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
922    
923        gtk_widget_set_sensitive(button, menu_entries->enabled);
924    
925        hildon_app_menu_append(menu, GTK_BUTTON(button));
926        menu_entries++;
927      }
928    
929      gtk_widget_show_all(GTK_WIDGET(menu));
930      return GTK_WIDGET(menu);
931    }
932    
933    /* the view submenu */
934    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
935      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),
936                            GTK_WINDOW(appdata->window));
937    }
938    
939    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
940      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_map),
941                            GTK_WINDOW(appdata->window));
942    }
943    
944    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
945      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),
946                            GTK_WINDOW(appdata->window));
947    }
948    
949    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
950      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),
951                            GTK_WINDOW(appdata->window));
952    }
953    
954    #define APP_OFFSET(a)  offsetof(appdata_t, a)
955    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
956    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
957    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
958    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
959    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
960                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
961    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
962                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
963    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
964    
965    /* -- the view submenu -- */
966    static const menu_entry_t submenu_view[] = {
967      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
968      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
969      /* --- */
970      SIMPLE_ENTRY("Style",           cb_menu_style),
971      /* --- */
972      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
973      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
974      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
975      /* --- */
976      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
977      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
978      /* --- */
979      TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
980    
981      LAST_ENTRY
982    };
983    
984    /* -- the map submenu -- */
985    static const menu_entry_t submenu_map[] = {
986      SIMPLE_ENTRY("Upload",                cb_menu_upload),
987      SIMPLE_ENTRY("Download",              cb_menu_download),
988      SIMPLE_ENTRY("Save local changes",    cb_menu_save_changes),
989      SIMPLE_ENTRY("Discard local changes", cb_menu_undo_changes),
990      SIMPLE_ENTRY("Relations",             cb_menu_osm_relations),
991    
992      LAST_ENTRY
993    };
994    
995    /* -- the wms submenu -- */
996    static const menu_entry_t submenu_wms[] = {
997      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
998      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
999      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
1000    
1001      LAST_ENTRY
1002    };
1003    
1004    /* -- the track submenu -- */
1005    static const menu_entry_t submenu_track[] = {
1006      ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1007      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1008      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1009      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1010                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1011      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1012                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1013    
1014      LAST_ENTRY
1015    };
1016    
1017    
1018    /* -- the applications main menu -- */
1019    static const menu_entry_t main_menu[] = {
1020      SIMPLE_ENTRY("About",   cb_menu_about),
1021      SIMPLE_ENTRY("Project", cb_menu_project_open),
1022      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1023      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1024      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1025      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1026    
1027      LAST_ENTRY
1028    };
1029    
1030    void menu_create(appdata_t *appdata) {
1031      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1032    
1033      /* build menu/submenus */
1034      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1035      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1036      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1037      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1038      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1039    
1040      /* enable/disable some entries according to settings */
1041      hildon_check_button_set_active(HILDON_CHECK_BUTTON(
1042             appdata->track.menu_item_track_enable_gps), appdata->gps_enabled);
1043      gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1044                               appdata->gps_enabled);
1045      if(appdata->settings)
1046        hildon_check_button_set_active(HILDON_CHECK_BUTTON(
1047           appdata->track.menu_item_track_follow_gps),
1048                                     appdata->settings->follow_gps);
1049    
1050    
1051      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1052    }
1053    #endif
1054    
1055  /********************* end of menu **********************/  /********************* end of menu **********************/
1056    
# Line 837  void cleanup(appdata_t *appdata) { Line 1122  void cleanup(appdata_t *appdata) {
1122    
1123    project_free(appdata->project);    project_free(appdata->project);
1124    
1125    if(appdata->menu_item_osm_undo)    if(appdata->menu_item_map_undo)
1126      undo_free(appdata->undo.state);      undo_free(appdata->undo.state);
1127    
1128    puts("everything is gone");    puts("everything is gone");
# Line 855  gboolean on_window_key_press(GtkWidget * Line 1140  gboolean on_window_key_press(GtkWidget *
1140    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1141    int handled = FALSE;    int handled = FALSE;
1142    
1143      //  printf("key event with keyval %x\n", event->keyval);
1144    
1145    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1146    switch(event->keyval) {    switch(event->keyval) {
1147    
1148    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1149  #ifdef USE_HILDON  #ifdef USE_HILDON
1150      /* this is in fact a mapping to GDK_F6 */      /* this is in fact a mapping to GDK_F6 */
1151    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
# Line 877  gboolean on_window_key_press(GtkWidget * Line 1165  gboolean on_window_key_press(GtkWidget *
1165    
1166      handled = TRUE;      handled = TRUE;
1167      break;      break;
1168    #endif
1169    }    }
1170    
1171    /* forward unprocessed key presses to map */    /* forward unprocessed key presses to map */
# Line 904  int main(int argc, char *argv[]) { Line 1193  int main(int argc, char *argv[]) {
1193    
1194    g_thread_init(NULL);    g_thread_init(NULL);
1195    
   gps_init(&appdata);  
   
1196    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
1197    
1198      gps_init(&appdata);
1199    
1200  #ifdef USE_HILDON  #ifdef USE_HILDON
1201    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");
1202    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,
# Line 926  int main(int argc, char *argv[]) { Line 1215  int main(int argc, char *argv[]) {
1215    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1216    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1217    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1218    
1219    #if MAEMO_VERSION_MAJOR == 5
1220      unsigned long val;
1221      XChangeProperty(GDK_DISPLAY(),
1222                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1223                      XInternAtom(GDK_DISPLAY(),
1224                                  "_HILDON_ZOOM_KEY_ATOM",
1225                                  False), XA_INTEGER, 32,
1226                      PropModeReplace, (unsigned char *) &val, 1);
1227    #endif
1228    
1229  #else  #else
1230    /* Create a Window. */    /* Create a Window. */
1231    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 968  int main(int argc, char *argv[]) { Line 1268  int main(int argc, char *argv[]) {
1268      return -1;      return -1;
1269    }    }
1270    
1271    #if 0  // another test overlay
1272      {
1273        GtkWidget *fixed = gtk_fixed_new();
1274    
1275        gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);
1276        gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);
1277    
1278        gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);
1279      }
1280    #else
1281    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1282    #endif
1283    
1284    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), statusbar_new(&appdata), FALSE, FALSE, 0);
1285    
1286  #ifndef PORTRAIT  #ifndef PORTRAIT
1287    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(hbox), iconbar_new(&appdata), FALSE, FALSE, 0);
1288  #endif  #endif
   gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1289    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1290    
1291    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);
# Line 987  int main(int argc, char *argv[]) { Line 1298  int main(int argc, char *argv[]) {
1298    
1299    /* let gtk do its thing before loading the data, */    /* let gtk do its thing before loading the data, */
1300    /* so the user sees something */    /* so the user sees something */
1301    while(gtk_events_pending()) {    while(gtk_events_pending())
     putchar('.');  
1302      gtk_main_iteration();      gtk_main_iteration();
   }  
1303    
1304    /* load project if one is specified in the settings */    /* load project if one is specified in the settings */
1305    if(appdata.settings->project)    if(appdata.settings->project)
# Line 998  int main(int argc, char *argv[]) { Line 1307  int main(int argc, char *argv[]) {
1307    
1308    main_ui_enable(&appdata);    main_ui_enable(&appdata);
1309    
1310    /* ------------ jump into main loop ---------------- */    /* start GPS if enabled by config */
1311      if(appdata.settings && appdata.settings->enable_gps)
1312        track_enable_gps(&appdata, TRUE);
1313    
1314      /* again let the ui do its thing */
1315      while(gtk_events_pending())
1316        gtk_main_iteration();
1317    
1318    #if 0  // test overlay
1319      {
1320        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1321        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1322        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1323        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1324        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1325        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1326        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1327    
1328        /* add some zoom buttons for testing */
1329        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1330        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1331        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1332        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1333    
1334        gtk_widget_show_all(overlay);
1335      }
1336    #endif
1337    
1338      /* start to interact with the user now that the gui is running */
1339      if(appdata.settings->first_run_demo) {
1340        messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
1341                 _("This is the first time you run OSM2Go. "
1342                   "A demo project has been loaded to get you "
1343                   "started. You can play around with this demo as much "
1344                   "as you like. However, you cannot upload or download "
1345                   "the demo project.\n\n"
1346                   "In order to start working on real data you'll have "
1347                   "to setup a new project and enter your OSM user name "
1348                   "and password. You'll then be able to download the "
1349                   "latest data from OSM and upload your changes into "
1350                   "the OSM main database."
1351                   ));
1352      }
1353    
1354      /* ------------ jump into main loop ---------------- */
1355    gtk_main();    gtk_main();
1356    
1357    puts("gtk_main() left");    puts("gtk_main() left");
1358    
1359    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1360      track_clear(&appdata, appdata.track.track);
1361      appdata.track.track = NULL;
1362    
1363    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
1364    diff_save(appdata.project, appdata.osm);    diff_save(appdata.project, appdata.osm);
Legend:
Removed from v.79  
changed lines
  Added in v.191