Diff of /trunk/src/main.c

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

revision 15 by harbaum, Tue Dec 16 17:00:20 2008 UTC revision 224 by harbaum, Tue Jul 14 11:15:40 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 19  Line 21 
21  #include <string.h>  #include <string.h>
22    
23  #include <curl/curl.h>  #include <curl/curl.h>
24    #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"
36    
37  /* disable/enable main screen control dependant on presence of open project */  /* disable/enable main screen control dependant on presence of open project */
38  static void main_ui_enable(appdata_t *appdata) {  void main_ui_enable(appdata_t *appdata) {
39    gboolean project_valid = (appdata->project != NULL);    gboolean project_valid = (appdata->project != NULL);
40    gboolean osm_valid = (appdata->osm != NULL);    gboolean osm_valid = (appdata->osm != NULL);
41    
# Line 32  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 41  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    /* disable all menu entries related to map */    /* disable all menu entries related to map */
66    gtk_widget_set_sensitive(appdata->menu_osm, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
67    gtk_widget_set_sensitive(appdata->menu_item_osm_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
68    gtk_widget_set_sensitive(appdata->menu_item_osm_diff, osm_valid);    if(appdata->menu_item_map_undo)
69    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_map_undo, osm_valid);
70    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_save_changes, osm_valid);
71    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_undo_changes, osm_valid);
72    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_relations, osm_valid);
73    gtk_widget_set_sensitive(appdata->menu_map, osm_valid);    gtk_widget_set_sensitive(appdata->track.submenu_track, osm_valid);
74    gtk_widget_set_sensitive(appdata->menu_item_project_close, project_valid);    gtk_widget_set_sensitive(appdata->submenu_view, osm_valid);
75      gtk_widget_set_sensitive(appdata->submenu_wms, osm_valid);
76    
77    #ifdef ZOOM_BUTTONS
78      gtk_widget_set_sensitive(appdata->btn_zoom_in, osm_valid);
79      gtk_widget_set_sensitive(appdata->btn_zoom_out, osm_valid);
80    #endif
81    
82    if(!project_valid)    if(!project_valid)
83      statusbar_set(appdata, _("Please load or create a project"), FALSE);      statusbar_set(appdata, _("Please load or create a project"), FALSE);
# Line 68  static void main_ui_enable(appdata_t *ap Line 85  static void main_ui_enable(appdata_t *ap
85    
86  /******************** begin of menu *********************/  /******************** begin of menu *********************/
87    
 #if 0 // simplify menu  
 static struct {  
   enum { MENU_END, MENU_ITEM, MENU_SUB, MENU_SUB_END, MENU_SEP }  type;  
   
   char *title;  
   GCallback c_handler;  
 } menu[] = {  
   { MENU_SUB, "OSM", NULL },  
   
   { MENU_END,  NULL, NULL },  
 };  
 #endif  
   
88  static void  static void
89  cb_menu_project_open(GtkWidget *window, gpointer data) {  cb_menu_project_open(GtkMenuItem *item, gpointer data) {
90    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
91    project_load(appdata, NULL);    project_load(appdata, NULL);
92    main_ui_enable(appdata);    main_ui_enable(appdata);
93  }  }
94    
95  static void  static void
96  cb_menu_project_close(GtkWidget *window, gpointer data) {  cb_menu_project_wizard(GtkMenuItem *item, gpointer data) {
97    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
98    project_close(appdata);    project_wizard(appdata);
   main_ui_enable(appdata);  
99  }  }
100    
101  static void  static void
102  cb_menu_about(GtkWidget *window, gpointer data) {  cb_menu_about(GtkMenuItem *item, gpointer data) {
103    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"));  
104    
105    const gchar *authors[] = {    const gchar *authors[] = {
106      "Till Harbaum <till@harbaum.org>",      "Till Harbaum <till@harbaum.org>",
107      "Andrew Chadwick",      "Andrew Chadwick <andrewc-osm2go@piffle.org>",
108        "Marcus Bauer <marcus.bauer@gmail.com>",
109        "John Stowers <john.stowers@gmail.com>",
110      NULL };      NULL };
111    
112    gtk_about_dialog_set_authors(about, authors);    const gchar *artists[] = {
113        "Andrew Zhilin <drew.zhilin@gmail.com>",
114    gtk_about_dialog_set_website(about,      NULL };
        _("http://www.harbaum.org/till/maemo"));  
   
   gtk_about_dialog_set_comments(about,  
        _("Mobile OSM Editor"));  
115    
116    gtk_widget_show_all(GTK_WIDGET(about));    gtk_show_about_dialog(GTK_WINDOW(appdata->window),
117    gtk_dialog_run(GTK_DIALOG(about));                          "name", "OSM2Go",
118    gtk_widget_destroy(GTK_WIDGET(about));                          "version", VERSION,
119                            "copyright", _("Copyright 2008-2009"),
120                            "authors", authors,
121                            "artists", artists,
122                            "website", _("http://www.harbaum.org/till/maemo"),
123                            "comments", _("Mobile OSM Editor"),
124                            NULL);
125  }  }
126    
127  void on_window_destroy (GtkWidget *widget, gpointer data);  void on_window_destroy (GtkWidget *widget, gpointer data);
128    
129    #ifndef USE_HILDON
130  static void  static void
131  cb_menu_quit(GtkWidget *window, gpointer data) {  cb_menu_quit(GtkMenuItem *item, gpointer data) {
132    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
133    gtk_widget_destroy(GTK_WIDGET(appdata->window));    gtk_widget_destroy(GTK_WIDGET(appdata->window));
134  }  }
135    #endif
136    
137  static void  static void
138  cb_menu_upload(GtkWidget *window, gpointer data) {  cb_menu_upload(GtkMenuItem *item, gpointer data) {
139    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
140    if(!appdata->osm || !appdata->project) return;    if(!appdata->osm || !appdata->project) return;
141    
142      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
143        return;
144    
145    osm_upload(appdata, appdata->osm, appdata->project);    osm_upload(appdata, appdata->osm, appdata->project);
146  }  }
147    
148  static void  static void
149  cb_menu_download(GtkWidget *window, gpointer data) {  cb_menu_download(GtkMenuItem *item, gpointer data) {
150    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
151    if(!appdata->project) return;    if(!appdata->project) return;
152    
153      if(project_check_demo(GTK_WIDGET(appdata->window), appdata->project))
154        return;
155    
156    /* if we have valid osm data loaded: save state first */    /* if we have valid osm data loaded: save state first */
157    if(appdata->osm) {    if(appdata->osm) {
158      /* 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 153  cb_menu_download(GtkWidget *window, gpoi Line 164  cb_menu_download(GtkWidget *window, gpoi
164    }    }
165    
166    // download    // download
167    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
168      appdata->osm = osm_parse(appdata->project->osm);                    appdata->project)) {
169        banner_busy_start(appdata, 1, "Redrawing");
170        appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
171      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
172      map_paint(appdata);      map_paint(appdata);
173        banner_busy_stop(appdata); //"Redrawing"
174    }    }
175    
176    main_ui_enable(appdata);    main_ui_enable(appdata);
177  }  }
178    
179  static void  static void
180  cb_menu_wms_import(GtkWidget *window, gpointer data) {  cb_menu_wms_import(GtkMenuItem *item, gpointer data) {
181    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
182    wms_import(appdata);    wms_import(appdata);
183  }  }
184    
185  static void  static void
186  cb_menu_wms_clear(GtkWidget *window, gpointer data) {  cb_menu_wms_clear(GtkMenuItem *item, gpointer data) {
187    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
188    wms_remove(appdata);    wms_remove(appdata);
189  }  }
190    
191  static void  static void
192  cb_menu_wms_adjust(GtkWidget *window, gpointer data) {  cb_menu_wms_adjust(GtkMenuItem *item, gpointer data) {
193    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
194    map_action_set(appdata, MAP_ACTION_BG_ADJUST);    map_action_set(appdata, MAP_ACTION_BG_ADJUST);
195  }  }
# Line 183  cb_menu_wms_adjust(GtkWidget *window, gp Line 197  cb_menu_wms_adjust(GtkWidget *window, gp
197  /* ----------- hide objects for performance reasons ----------- */  /* ----------- hide objects for performance reasons ----------- */
198    
199  static void  static void
200  cb_menu_map_hide_sel(GtkWidget *window, gpointer data) {  cb_menu_map_hide_sel(GtkMenuItem *item, gpointer data) {
201    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
202    map_hide_selected(appdata);    map_hide_selected(appdata);
203  }  }
204    
205  static void  static void
206  cb_menu_map_show_all(GtkWidget *window, gpointer data) {  cb_menu_map_show_all(GtkMenuItem *item, gpointer data) {
207    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
208    map_show_all(appdata);    map_show_all(appdata);
209  }  }
210    
211  /* ---------------------------------------------------------- */  /* ---------------------------------------------------------- */
212    
213  #if 1  // mainly for testing  #if defined(USE_HILDON) && (MAEMO_VERSION_MAJOR == 5)
214  static void  #define MENU_CHECK_ITEM HildonCheckButton
215  cb_menu_redraw(GtkWidget *window, gpointer data) {  #define MENU_CHECK_ITEM_ACTIVE(a) hildon_check_button_get_active(a)
216    appdata_t *appdata = (appdata_t*)data;  #else
217    #define MENU_CHECK_ITEM GtkCheckMenuItem
218    #define MENU_CHECK_ITEM_ACTIVE(a) gtk_check_menu_item_get_active(a)
219    #endif
220    
221    /* redraw the entire map by destroying all map items and redrawing them */  static void
222    track_save(appdata->project, appdata->track.track);  cb_menu_map_no_icons(MENU_CHECK_ITEM *item, appdata_t *appdata) {
   diff_save(appdata->project, appdata->osm);  
   map_clear(appdata, MAP_LAYER_ALL);  
   osm_free(&appdata->icon, appdata->osm);  
223    
224    appdata->osm = osm_parse(appdata->project->osm);    banner_busy_start(appdata, 1, "Redrawing");
225    diff_restore(appdata, appdata->project, appdata->osm);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
   map_paint(appdata);  
226    
227    appdata->track.track = track_restore(appdata, appdata->project);    appdata->settings->no_icons = MENU_CHECK_ITEM_ACTIVE(item);
   if(appdata->track.track)  
     map_track_draw(appdata->map, appdata->track.track);  
228    
229    wms_load(appdata);    map_paint(appdata);
230      banner_busy_stop(appdata); //"Redrawing"
231  }  }
 #endif  
232    
233  static void  static void
234  cb_menu_style(GtkWidget *widget, gpointer data) {  cb_menu_style(GtkMenuItem *item, gpointer data) {
235    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
236    
237    style_select(GTK_WIDGET(appdata->window), appdata);    style_select(GTK_WIDGET(appdata->window), appdata);
238  }  }
239    
240  static void  static void
241  cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {  cb_menu_undo(GtkMenuItem *item, gpointer data) {
242    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
243    
244    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    undo(appdata);
245    appdata->settings->no_icons =  
246      gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));    // the banner will be displayed from within undo with more details
   map_paint(appdata);  
247  }  }
248    
249  static void  static void
250  cb_menu_save_changes(GtkWidget *widget, gpointer data) {  cb_menu_save_changes(GtkMenuItem *item, gpointer data) {
251    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
252    
253    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
254    statusbar_set(appdata, _("Saved all changes made "    banner_show_info(appdata, _("Saved local changes"));
                            "to this project so far"), FALSE);  
255  }  }
256    
257  static void  static void
258  cb_menu_undo_changes(GtkWidget *widget, gpointer data) {  cb_menu_undo_changes(GtkMenuItem *item, gpointer data) {
259    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
260    
261    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,    if(!yes_no_f(GTK_WIDGET(appdata->window), NULL, 0, 0,
262                 _("Undo all changes?"),                 _("Discard local changes?"),
263                 _("Do you really want to undo all your changes "                 _("Throw away all the changes you've not "
264                   "not uploaded so far? This cannot be undone!")))                   "uploaded yet? This can't be undone.")))
265      return;      return;
266    
267      banner_busy_start(appdata, 1, _("Redrawing"));
268    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
269    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
270    diff_remove(appdata->project);    diff_remove(appdata->project);
271    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
272    map_paint(appdata);    map_paint(appdata);
273      banner_busy_stop(appdata);  //"Redrawing"
274    
275    statusbar_set(appdata, _("All changes made "    banner_show_info(appdata, _("Discarded local changes"));
                            "so far have been reset"), FALSE);  
276  }  }
277    
278    static void
279    cb_menu_osm_relations(GtkMenuItem *item, appdata_t *appdata) {
280      /* list relations of all objects */
281      relation_list(GTK_WIDGET(appdata->window), appdata, NULL);
282    }
283    
284  #ifdef USE_HILDON  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
285  static void  static void
286  cb_menu_fullscreen(GtkWidget *widget, gpointer data) {  cb_menu_fullscreen(MENU_CHECK_ITEM *item, gpointer data) {
287    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
288    
289    if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))    if(MENU_CHECK_ITEM_ACTIVE(item))
290      gtk_window_fullscreen(GTK_WINDOW(appdata->window));      gtk_window_fullscreen(GTK_WINDOW(appdata->window));
291    else    else
292      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
# Line 279  cb_menu_fullscreen(GtkWidget *widget, gp Line 294  cb_menu_fullscreen(GtkWidget *widget, gp
294  #endif  #endif
295    
296  static void  static void
297  cb_menu_zoomin(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
298    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
299    
300    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 287  cb_menu_zoomin(GtkWidget *widget, appdat Line 302  cb_menu_zoomin(GtkWidget *widget, appdat
302  }  }
303    
304  static void  static void
305  cb_menu_zoomout(GtkWidget *widget, appdata_t *appdata) {  cb_menu_zoomout(GtkMenuItem *item, appdata_t *appdata) {
306    if(!appdata || !appdata->map) return;    if(!appdata || !appdata->map) return;
307    
308    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 295  cb_menu_zoomout(GtkWidget *widget, appda Line 310  cb_menu_zoomout(GtkWidget *widget, appda
310  }  }
311    
312  static void  static void
313  cb_menu_track_import(GtkWidget *window, appdata_t *appdata) {  cb_menu_view_detail_inc(GtkMenuItem *item, gpointer data) {
314      appdata_t *appdata = (appdata_t*)data;
315    
316      printf("detail level increase\n");
317      map_detail_increase(appdata->map);
318    }
319    
320    static void
321    cb_menu_view_detail_normal(GtkMenuItem *item, gpointer data) {
322      appdata_t *appdata = (appdata_t*)data;
323    
324      printf("detail level normal\n");
325      map_detail_normal(appdata->map);
326    }
327    
328    static void
329    cb_menu_view_detail_dec(GtkMenuItem *item, gpointer data) {
330      appdata_t *appdata = (appdata_t*)data;
331    
332      printf("detail level decrease\n");
333      map_detail_decrease(appdata->map);
334    }
335    
336    static void
337    cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
338      g_assert(appdata->settings);
339    
340    /* open a file selector */    /* open a file selector */
341    GtkWidget *dialog;    GtkWidget *dialog;
# Line 312  cb_menu_track_import(GtkWidget *window, Line 352  cb_menu_track_import(GtkWidget *window,
352                          NULL);                          NULL);
353  #endif  #endif
354    
355    /* use path if one is present */    if(appdata->settings->track_path) {
356    if(appdata->track.import_path)      if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
357      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),        char *last_sep = strrchr(appdata->settings->track_path, '/');
358                                          appdata->track.import_path);        if(last_sep) {
359            *last_sep = 0;  // seperate path from file
360    
361            /* the user just created a new document */
362            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
363                                        appdata->settings->track_path);
364            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
365                                              last_sep+1);
366    
367            /* restore full filename */
368            *last_sep = '/';
369          }
370        } else
371          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
372                                        appdata->settings->track_path);
373      }
374    
375    gtk_widget_show_all (GTK_WIDGET(dialog));    gtk_widget_show_all (GTK_WIDGET(dialog));
376    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {    if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
377      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));      char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
378    
379      /* load a track */      /* load a track */
380      track_do(appdata, TRACK_IMPORT, filename);      appdata->track.track = track_import(appdata, filename);
381      if(appdata->track.track) {      if(appdata->track.track) {
382          if(appdata->settings->track_path) g_free(appdata->settings->track_path);
383        /* 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 = '/';  
       }  
384      }      }
385      g_free (filename);      g_free (filename);
386    }    }
# Line 344  cb_menu_track_import(GtkWidget *window, Line 389  cb_menu_track_import(GtkWidget *window,
389  }  }
390    
391  static void  static void
392  cb_menu_track_gps(GtkWidget *window, gpointer data) {  cb_menu_track_enable_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
393    appdata_t *appdata = (appdata_t*)data;    track_enable_gps(appdata, MENU_CHECK_ITEM_ACTIVE(item));
394    }
395    
396    if(gtk_check_menu_item_get_active(  
397      GTK_CHECK_MENU_ITEM(appdata->track.menu_item_gps))) {  static void
398      track_do(appdata, TRACK_GPS, NULL);  cb_menu_track_follow_gps(MENU_CHECK_ITEM *item, appdata_t *appdata) {
399    } else {    appdata->settings->follow_gps = MENU_CHECK_ITEM_ACTIVE(item);
     track_do(appdata, TRACK_NONE, NULL);  
   }  
400  }  }
401    
402    
403  static void  static void
404  cb_menu_track_export(GtkWidget *window, gpointer data) {  cb_menu_track_export(GtkMenuItem *item, appdata_t *appdata) {
405    appdata_t *appdata = (appdata_t*)data;    g_assert(appdata->settings);
406    messagef(GTK_WIDGET(appdata->window), _("NIY"),  
407             _("Track export is not yet supported."));    /* open a file selector */
408      GtkWidget *dialog;
409    
410    #ifdef USE_HILDON
411      dialog = hildon_file_chooser_dialog_new(GTK_WINDOW(appdata->window),
412                                              GTK_FILE_CHOOSER_ACTION_SAVE);
413    #else
414      dialog = gtk_file_chooser_dialog_new(_("Export track file"),
415                                           GTK_WINDOW(appdata->window),
416                                           GTK_FILE_CHOOSER_ACTION_SAVE,
417                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
418                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
419                                           NULL);
420    #endif
421    
422      printf("set filename <%s>\n", appdata->settings->track_path);
423    
424      if(appdata->settings->track_path) {
425        if(!g_file_test(appdata->settings->track_path, G_FILE_TEST_EXISTS)) {
426          char *last_sep = strrchr(appdata->settings->track_path, '/');
427          if(last_sep) {
428            *last_sep = 0;  // seperate path from file
429    
430            /* the user just created a new document */
431            gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
432                                                appdata->settings->track_path);
433            gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
434                                              last_sep+1);
435    
436            /* restore full filename */
437            *last_sep = '/';
438          }
439        } else
440          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
441                                        appdata->settings->track_path);
442      }
443    
444      if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_FM_OK) {
445        gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
446        if(filename) {
447          printf("export to %s\n", filename);
448    
449          if(!g_file_test(filename, G_FILE_TEST_EXISTS) ||
450             yes_no_f(dialog, appdata, MISC_AGAIN_ID_EXPORT_OVERWRITE,
451                      MISC_AGAIN_FLAG_DONT_SAVE_NO,
452                      "Overwrite existing file",
453                      "The file already exists. "
454                      "Do you really want to replace it?")) {
455            if(appdata->settings->track_path)
456              g_free(appdata->settings->track_path);
457            appdata->settings->track_path = g_strdup(filename);
458    
459            track_export(appdata, filename);
460          }
461        }
462      }
463    
464      gtk_widget_destroy (dialog);
465  }  }
466    
467    
468  static void  static void
469  cb_menu_track_clear(GtkWidget *window, gpointer data) {  cb_menu_track_clear(GtkMenuItem *item, gpointer data) {
470    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
471    track_do(appdata, TRACK_NONE, NULL);    track_clear(appdata, appdata->track.track);
472      appdata->track.track = NULL;
473  }  }
474    
 void menu_create(appdata_t *appdata) {  
   GtkWidget *menu, *item, *submenu;  
   menu = gtk_menu_new();  
475    
476    
   /* -------------------- Project submenu -------------------- */  
477    
478    item = gtk_menu_item_new_with_label( _("Project") );  /*
479    gtk_menu_append(GTK_MENU_SHELL(menu), item);   *  Platform-specific UI tweaks.
480    submenu = gtk_menu_new();   */
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  
481    
   item = gtk_menu_item_new_with_label( _("Open...") );  
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_open),  
                    appdata);  
482    
483    appdata->menu_item_project_close = item =  #ifndef USE_HILDON
484      gtk_menu_item_new_with_label( _("Close") );  #ifdef PORTRAIT
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_project_close),  
                    appdata);  
485    
486    /* --------------- view menu ------------------- */  // Portrait mode, for openmoko-like systems
487    #define uispecific_main_menu_new gtk_menu_new
488    
489    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());  #else
490    
491    appdata->menu_view = item =  // Regular desktop builds
492      gtk_menu_item_new_with_label( _("View") );  #define uispecific_main_menu_new gtk_menu_bar_new
493    gtk_menu_append(GTK_MENU_SHELL(menu), item);  #define UISPECIFIC_MAIN_MENU_IS_MENU_BAR
494    submenu = gtk_menu_new();  #define UISPECIFIC_MENU_HAS_ICONS
495    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);  #define UISPECIFIC_MENU_HAS_ACCELS
496    
497  #ifdef USE_HILDON  #endif //PORTRAIT
498    appdata->fullscreen_menu_item =  #else//USE_HILDON
499      item = gtk_check_menu_item_new_with_label( _("Fullscreen") );  
500    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  // Maemo/Hildon builds
501    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_fullscreen),  #define uispecific_main_menu_new gtk_menu_new
502                     appdata);  
503    #endif
504    
505    
506    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
507    // Half-arsed slapdash common menu item constructor. Let's use GtkBuilder
508    // instead so we have some flexibility.
509    
510    static GtkWidget *
511    menu_append_new_item(appdata_t *appdata,
512                         GtkWidget *menu_shell,
513                         GtkSignalFunc activate_cb,
514                         char *label,
515                         const gchar *icon_name, // stock id or name for icon_load
516                                        // overridden by label, accels, icon_name
517                         const gchar *accel_path,
518                         guint accel_key,      // from gdk/gdkkeysyms.h
519                         GdkModifierType accel_mods, // e.g. GDK_CONTROL_MASK
520                         gboolean enabled,
521                         gboolean is_check, gboolean check_status)
522    {
523      GtkWidget *item = NULL;
524      GtkWidget *image = NULL;
525    
526      gboolean stock_item_known = FALSE;
527      GtkStockItem stock_item;
528      if (icon_name != NULL) {
529        stock_item_known = gtk_stock_lookup(icon_name, &stock_item);
530      }
531    
532      // Icons
533    #ifndef UISPECIFIC_MENU_HAS_ICONS
534      item = is_check ? gtk_check_menu_item_new_with_mnemonic (label)
535                      : gtk_menu_item_new_with_mnemonic       (label);
536    #else
537      if (is_check) {
538        item = gtk_check_menu_item_new_with_mnemonic (label);
539      }
540      else if (!stock_item_known) {
541        GdkPixbuf *pbuf = icon_load(&appdata->icon, icon_name);
542        if (pbuf) {
543          image = gtk_image_new_from_pixbuf(pbuf);
544        }
545        if (image) {
546          item = gtk_image_menu_item_new_with_mnemonic(label);
547          gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
548        }
549        else {
550          item = gtk_menu_item_new_with_mnemonic(label);
551        }
552      }
553      else {
554        item = gtk_image_menu_item_new_with_mnemonic(label);
555        image = gtk_image_new_from_stock(icon_name, GTK_ICON_SIZE_MENU);
556        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
557      }
558    #endif
559    
560    #ifdef UISPECIFIC_MENU_HAS_ACCELS
561      // Accelerators
562      // Default
563      if (accel_path != NULL) {
564        gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
565        if (accel_key != 0) {
566          gtk_accel_map_add_entry( accel_path, accel_key, accel_mods );
567        }
568        else if (stock_item_known) {
569          gtk_accel_map_add_entry( accel_path, stock_item.keyval,
570                                   stock_item.modifier );
571        }
572      }
573  #endif  #endif
574    
575      gtk_menu_shell_append(GTK_MENU_SHELL(menu_shell), GTK_WIDGET(item));
576      gtk_widget_set_sensitive(GTK_WIDGET(item), enabled);
577      if (is_check)
578        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), check_status);
579    
580    item = gtk_menu_item_new_with_label( _("Zoom +" ));    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(activate_cb),
581    gtk_menu_append(GTK_MENU_SHELL(submenu), item);                     appdata);
582    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_zoomin), appdata);    return item;
583    }
584    item = gtk_menu_item_new_with_label( _("Zoom -") );  
585    gtk_menu_append(GTK_MENU_SHELL(submenu), item);  void menu_create(appdata_t *appdata) {
586    g_signal_connect(item, "activate",    GtkWidget *menu, *item, *submenu;
587                     GTK_SIGNAL_FUNC(cb_menu_zoomout), appdata);    GtkWidget *about_quit_items_menu;
588    
589    /* -------------------- OSM submenu -------------------- */    if (g_module_supported()) {
590        printf("*** can use GModule: consider using GtkUIManager / GtkBuilder\n");
591      }
592    
593      menu = uispecific_main_menu_new();
594      about_quit_items_menu = menu;
595    
596      /* -------------------- Project submenu -------------------- */
597    
598    appdata->menu_osm = item = gtk_menu_item_new_with_label( _("OSM") );    GtkAccelGroup *accel_grp = gtk_accel_group_new();
599    gtk_menu_append(GTK_MENU_SHELL(menu), item);    item = gtk_menu_item_new_with_mnemonic( _("_Project") );
600      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
601    submenu = gtk_menu_new();    submenu = gtk_menu_new();
602      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
603    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
604    #ifdef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
605      about_quit_items_menu = submenu;
606    #endif
607    
608    appdata->menu_item_osm_upload = item =    menu_append_new_item(
609      gtk_menu_item_new_with_label( _("Upload...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open"),
610    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
611    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_upload), appdata);      0, 0, TRUE, FALSE, FALSE
612      );
   item = gtk_menu_item_new_with_label( _("Download...") );  
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
   g_signal_connect(item, "activate",  
                    GTK_SIGNAL_FUNC(cb_menu_download), appdata);  
   
   gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
   
   appdata->menu_item_osm_diff = item =  
     gtk_menu_item_new_with_label( _("Save diff file") );  
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_save_changes),  
                    appdata);  
613    
614    appdata->menu_item_osm_undo_changes = item =  #ifndef USE_HILDON
615      gtk_menu_item_new_with_label( _("Undo all changes...") );    menu_append_new_item(
616    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_wizard), _("_Wizard"),
617    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_undo_changes),      GTK_STOCK_NEW, "<OSM2Go-Main>/Project/Wizard",
618                     appdata);      0, 0, TRUE, FALSE, FALSE
619      );
620    #endif
621    
622    /* -------------------- wms submenu -------------------- */    /* --------------- view menu ------------------- */
623    
624    #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
625      gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
626    #endif
627    
628    appdata->menu_wms = item = gtk_menu_item_new_with_label( _("WMS") );    appdata->submenu_view = item = gtk_menu_item_new_with_mnemonic( _("_View") );
629    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
630    submenu = gtk_menu_new();    submenu = gtk_menu_new();
631      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
632    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
633    
634    item = gtk_menu_item_new_with_label( _("Import...") );  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
635    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    appdata->menu_item_view_fullscreen = menu_append_new_item(
636    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_import),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
637                     appdata);      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
638        0, 0, TRUE, TRUE, FALSE
639      );
640    #endif
641    
642    appdata->menu_item_wms_clear = item =    menu_append_new_item(
643      gtk_menu_item_new_with_label( _("Clear") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
644    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_ZOOM_IN, "<OSM2Go-Main>/View/ZoomIn",
645    gtk_widget_set_sensitive(item, FALSE);      GDK_comma, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
646    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_clear),    );
647                     appdata);  
648      menu_append_new_item(
649        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomout), _("Zoom _out"),
650        GTK_STOCK_ZOOM_OUT, "<OSM2Go-Main>/View/ZoomOut",
651        GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
652      );
653    
654      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
655    
656      menu_append_new_item(
657        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_inc), _("More details"),
658        NULL, "<OSM2Go-Main>/View/DetailInc",
659        GDK_period, GDK_MOD1_MASK, TRUE, FALSE, FALSE
660      );
661    
662      menu_append_new_item(
663        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_normal), _("Normal details"),
664        NULL, "<OSM2Go-Main>/View/DetailNormal",
665        0, 0, TRUE, FALSE, FALSE
666      );
667    
668      menu_append_new_item(
669        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_dec), _("Less details"),
670        NULL, "<OSM2Go-Main>/View/DetailDec",
671        GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
672      );
673    
674      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
675    
676      appdata->menu_item_map_hide_sel = menu_append_new_item(
677        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_hide_sel), _("_Hide selected"),
678        GTK_STOCK_REMOVE, "<OSM2Go-Main>/View/HideSelected",
679        0, 0, TRUE, FALSE, FALSE
680      );
681      gtk_widget_set_sensitive(appdata->menu_item_map_hide_sel, FALSE);
682    
683      appdata->menu_item_map_show_all = menu_append_new_item(
684        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_show_all), _("_Show all"),
685        GTK_STOCK_ADD, "<OSM2Go-Main>/View/ShowAll",
686        0, 0, TRUE, FALSE, FALSE
687      );
688      gtk_widget_set_sensitive(appdata->menu_item_map_show_all, FALSE);
689    
690      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
691    
692      menu_append_new_item(
693        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
694        GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/View/Style",
695        0, 0, TRUE, FALSE, FALSE
696      );
697    
698      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
699    
700      appdata->menu_item_map_no_icons = menu_append_new_item(
701        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_map_no_icons), _("No _icons"),
702        NULL, "<OSM2Go-Main>/View/NoIcons",
703        0, 0, TRUE, TRUE, appdata->settings->no_icons
704      );
705    
   appdata->menu_item_wms_adjust = item =  
     gtk_menu_item_new_with_label( _("Adjust") );  
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
   gtk_widget_set_sensitive(item, FALSE);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_wms_adjust),  
                    appdata);  
706    
707    /* -------------------- map submenu -------------------- */    /* -------------------- map submenu -------------------- */
708    
709    appdata->menu_map = item = gtk_menu_item_new_with_label( _("Map") );    appdata->submenu_map = item = gtk_menu_item_new_with_mnemonic( _("_Map") );
710    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
711    submenu = gtk_menu_new();    submenu = gtk_menu_new();
712      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
713    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
714    
715    appdata->menu_item_map_hide_sel = item =    appdata->menu_item_map_upload = menu_append_new_item(
716      gtk_menu_item_new_with_label( _("Hide selected") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
717    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      "upload.16", "<OSM2Go-Main>/Map/Upload",
718    gtk_widget_set_sensitive(item, FALSE);      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
719    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_hide_sel),    );
720                     appdata);  
721      menu_append_new_item(
722        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
723        "download.16", "<OSM2Go-Main>/Map/Download",
724        GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
725      );
726    
727      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
728    
729      if(getenv("OSM2GO_UNDO_TEST")) {
730        appdata->menu_item_map_undo = menu_append_new_item(
731                   appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo), _("_Undo"),
732                   GTK_STOCK_UNDO, "<OSM2Go-Main>/Map/Undo",
733                   GDK_z, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
734                   );
735      } else
736        printf("set environment variable OSM2GO_UNDO_TEST to enable undo framework tests\n");
737    
738      appdata->menu_item_map_save_changes = menu_append_new_item(
739        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_save_changes), _("_Save local changes"),
740        GTK_STOCK_SAVE, "<OSM2Go-Main>/Map/SaveChanges",
741        GDK_s, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
742      );
743    
744      appdata->menu_item_map_undo_changes = menu_append_new_item(
745        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_undo_changes), _("Disca_rd local changes"),
746        GTK_STOCK_DELETE, "<OSM2Go-Main>/Map/DiscardChanges",
747        0, 0, TRUE, FALSE, FALSE
748      );
749    
750      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
751      appdata->menu_item_map_relations = menu_append_new_item(
752        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
753        NULL, "<OSM2Go-Main>/Map/Relations",
754        GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
755      );
756    
757    appdata->menu_item_map_show_all = item =    /* -------------------- wms submenu -------------------- */
     gtk_menu_item_new_with_label( _("Show all") );  
   gtk_menu_append(GTK_MENU_SHELL(submenu), item);  
   gtk_widget_set_sensitive(item, FALSE);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_show_all),  
                    appdata);  
   
   gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());  
758    
759    item = gtk_menu_item_new_with_label( _("Redraw") );    appdata->submenu_wms = item = gtk_menu_item_new_with_mnemonic( _("_WMS") );
760    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
761    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_redraw), appdata);    submenu = gtk_menu_new();
762      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
763    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
764    
765    item = gtk_menu_item_new_with_label( _("Style...") );    menu_append_new_item(
766    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import"),
767    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_style), appdata);      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
768        0, 0, TRUE, FALSE, FALSE
769    gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());    );
770    
771    appdata->menu_item_map_no_icons =    appdata->menu_item_wms_clear = menu_append_new_item(
772      item = gtk_check_menu_item_new_with_label( _("No Icons") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_clear), _("_Clear"),
773    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),      GTK_STOCK_CLEAR, "<OSM2Go-Main>/WMS/Clear",
774                                   appdata->settings->no_icons);      0, 0, TRUE, FALSE, FALSE
775    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    );
776    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_no_icons),    gtk_widget_set_sensitive(appdata->menu_item_wms_clear, FALSE);
777                     appdata);  
778      appdata->menu_item_wms_adjust = menu_append_new_item(
779        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_adjust), _("_Adjust"),
780        NULL, "<OSM2Go-Main>/WMS/Adjust",
781        0, 0, TRUE, FALSE, FALSE
782      );
783      gtk_widget_set_sensitive(appdata->menu_item_wms_adjust, FALSE);
784    
785    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
786    
787    appdata->track.menu_track = item = gtk_menu_item_new_with_label(_("Track"));    appdata->track.submenu_track = item =
788    gtk_menu_append(GTK_MENU_SHELL(menu), item);      gtk_menu_item_new_with_mnemonic(_("_Track"));
789      gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
790    submenu = gtk_menu_new();    submenu = gtk_menu_new();
791      gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
792    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
793    
794    appdata->track.menu_item_import =    appdata->track.menu_item_track_import = menu_append_new_item(
795      item = gtk_menu_item_new_with_label( _("Import...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
796    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Import",
797    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_import),      0, 0, TRUE, FALSE, FALSE
798                     appdata);    );
799    
800    appdata->track.menu_item_export =    appdata->track.menu_item_track_export = menu_append_new_item(
801      item = gtk_menu_item_new_with_label( _("Export...") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
802    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      NULL, "<OSM2Go-Main>/Track/Export",
803    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_export),      0, 0, FALSE, FALSE, FALSE
804                     appdata);    );
805    
806    appdata->track.menu_item_clear =    appdata->track.menu_item_track_clear = menu_append_new_item(
807      item = gtk_menu_item_new_with_label( _("Clear") );      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_clear), _("_Clear"),
808    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      GTK_STOCK_CLEAR, "<OSM2Go-Main>/Track/Clear",
809    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_clear),      0, 0, FALSE, FALSE, FALSE
810                     appdata);    );
811    
812    appdata->track.menu_item_gps =  
813      item = gtk_check_menu_item_new_with_label( _("GPS") );    appdata->track.menu_item_track_enable_gps = menu_append_new_item(
814    gtk_menu_append(GTK_MENU_SHELL(submenu), item);      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_enable_gps),_("_GPS enable"),
815    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_track_gps),      NULL, "<OSM2Go-Main>/Track/GPS",
816                     appdata);      GDK_g, GDK_CONTROL_MASK|GDK_SHIFT_MASK, TRUE, TRUE,
817        appdata->settings->enable_gps
818      );
819    
820      appdata->track.menu_item_track_follow_gps = menu_append_new_item(
821        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_follow_gps), _("GPS follow"),
822        NULL, "<OSM2Go-Main>/Track/Follow",
823        0, 0, appdata->settings->enable_gps, TRUE,
824        appdata->settings->follow_gps
825      );
826    
827    /* ------------------------------------------------------- */    /* ------------------------------------------------------- */
828    
829    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_shell_append(GTK_MENU_SHELL(about_quit_items_menu),
830                            gtk_separator_menu_item_new());
831    
832    item = gtk_menu_item_new_with_label( _("About...") );    menu_append_new_item(
833    gtk_menu_append(GTK_MENU_SHELL(menu), item);      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About"),
834    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
835        0, 0, TRUE, FALSE, FALSE
836      );
837    
838    #ifndef USE_HILDON
839      menu_append_new_item(
840        appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_quit), _("_Quit"),
841        GTK_STOCK_QUIT, "<OSM2Go-Main>/Quit",
842        0, 0, TRUE, FALSE, FALSE
843      );
844    #endif
845    
846    item = gtk_menu_item_new_with_label( _("Quit") );    gtk_window_add_accel_group(GTK_WINDOW(appdata->window), accel_grp);
   gtk_menu_append(GTK_MENU_SHELL(menu), item);  
   g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_quit), appdata);  
847    
848  #ifdef USE_HILDON  #ifdef USE_HILDON
849    hildon_window_set_menu(appdata->window, GTK_MENU(menu));    hildon_window_set_menu(appdata->window, GTK_MENU(menu));
850  #else  #else
851    /* attach ordinary gtk menu */    GtkWidget *menu_bar = menu;
852    GtkWidget *menu_bar = gtk_menu_bar_new();  
853    #ifndef UISPECIFIC_MAIN_MENU_IS_MENU_BAR
854      // we need to make one first
855      menu_bar = gtk_menu_bar_new();
856    
857    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));    GtkWidget *root_menu = gtk_menu_item_new_with_label (_("Menu"));
858    gtk_widget_show(root_menu);    gtk_widget_show(root_menu);
# Line 576  void menu_create(appdata_t *appdata) { Line 861  void menu_create(appdata_t *appdata) {
861    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM (root_menu), menu);
862    
863    gtk_widget_show(menu_bar);    gtk_widget_show(menu_bar);
864    #endif //UISPECIFIC_MAIN_MENU_IS_MENU_BAR
865    
866    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);
867  #endif  
868    #endif //USE_HILDON
869    }
870    #else // !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
871    
872    void submenu_entry(appdata_t *appdata, HildonAppMenu *menu,
873                       const char *label, const char *value,
874                       GtkSignalFunc activate_cb) {
875    
876    }
877    
878    typedef struct {
879      const char *label, *value;
880      gboolean enabled;
881      gboolean (*toggle)(appdata_t *appdata);
882      gulong offset;
883      GtkSignalFunc activate_cb;
884    } menu_entry_t;
885    
886    static gboolean no_icon_get_toggle(appdata_t *appdata) {
887      if(!appdata)           return FALSE;
888      if(!appdata->settings) return FALSE;
889      return appdata->settings->no_icons;
890    }
891    
892    static gboolean enable_gps_get_toggle(appdata_t *appdata) {
893      if(!appdata)           return FALSE;
894      if(!appdata->settings) return FALSE;
895      return appdata->settings->enable_gps;
896    }
897    
898    static gboolean follow_gps_get_toggle(appdata_t *appdata) {
899      if(!appdata)           return FALSE;
900      if(!appdata->settings) return FALSE;
901      return appdata->settings->follow_gps;
902    }
903    
904    /* create a HildonAppMenu */
905    static GtkWidget *app_menu_create(appdata_t *appdata,
906                                      const menu_entry_t *menu_entries) {
907      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
908    
909      while(menu_entries->label) {
910        GtkWidget *button = NULL;
911    
912        if(!menu_entries->toggle) {
913          button = hildon_button_new_with_text(
914                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
915                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
916                _(menu_entries->label), _(menu_entries->value));
917          g_signal_connect_after(button, "clicked",
918                                 menu_entries->activate_cb, appdata);
919        } else {
920          button = hildon_check_button_new(HILDON_SIZE_AUTO);
921          gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
922          printf("requesting check for %s: %p\n", menu_entries->label,
923                 menu_entries->toggle);
924          hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
925                                         menu_entries->toggle(appdata));
926          g_signal_connect_after(button, "toggled",
927                                 menu_entries->activate_cb, appdata);
928        }
929    
930        /* offset to GtkWidget pointer was given -> store pointer */
931        if(menu_entries->offset)
932          *(GtkWidget**)(((void*)appdata)+menu_entries->offset) = button;
933    
934        gtk_widget_set_sensitive(button, menu_entries->enabled);
935    
936        hildon_app_menu_append(menu, GTK_BUTTON(button));
937        menu_entries++;
938      }
939    
940      gtk_widget_show_all(GTK_WIDGET(menu));
941      return GTK_WIDGET(menu);
942  }  }
943    
944    /* the view submenu */
945    void on_submenu_view_clicked(GtkButton *button, appdata_t *appdata) {
946      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_view),
947                            GTK_WINDOW(appdata->window));
948    }
949    
950    void on_submenu_map_clicked(GtkButton *button, appdata_t *appdata) {
951      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_map),
952                            GTK_WINDOW(appdata->window));
953    }
954    
955    void on_submenu_wms_clicked(GtkButton *button, appdata_t *appdata) {
956      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_wms),
957                            GTK_WINDOW(appdata->window));
958    }
959    
960    void on_submenu_track_clicked(GtkButton *button, appdata_t *appdata) {
961      hildon_app_menu_popup(HILDON_APP_MENU(appdata->app_menu_track),
962                            GTK_WINDOW(appdata->window));
963    }
964    
965    #define APP_OFFSET(a)  offsetof(appdata_t, a)
966    #define SIMPLE_ENTRY(a,b)     { a, NULL, TRUE,   NULL, 0, G_CALLBACK(b) }
967    #define ENABLED_ENTRY(a,b,c)  { a, NULL, TRUE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
968    #define DISABLED_ENTRY(a,b,c) { a, NULL, FALSE,  NULL, APP_OFFSET(c), G_CALLBACK(b) }
969    #define TOGGLE_ENTRY(a,b,c)   { a, NULL, TRUE, c, 0, G_CALLBACK(b) }
970    #define DISABLED_TOGGLE_ENTRY(a,b,c,d)  \
971                                  { a, NULL, FALSE, c, APP_OFFSET(d), G_CALLBACK(b) }
972    #define ENABLED_TOGGLE_ENTRY(a,b,c,d) \
973                                  { a, NULL, TRUE, c, APP_OFFSET(d), G_CALLBACK(b) }
974    #define LAST_ENTRY            { NULL, NULL, FALSE, NULL, 0, NULL }
975    
976    /* -- the view submenu -- */
977    static const menu_entry_t submenu_view[] = {
978      SIMPLE_ENTRY("Zoom in",         cb_menu_zoomin),
979      SIMPLE_ENTRY("Zoom out",        cb_menu_zoomout),
980      /* --- */
981      SIMPLE_ENTRY("Style",           cb_menu_style),
982      /* --- */
983      SIMPLE_ENTRY("Normal details",  cb_menu_view_detail_normal),
984      SIMPLE_ENTRY("More details",    cb_menu_view_detail_inc),
985      SIMPLE_ENTRY("Less details",    cb_menu_view_detail_dec),
986      /* --- */
987      DISABLED_ENTRY("Hide selected", cb_menu_map_hide_sel, menu_item_map_hide_sel),
988      DISABLED_ENTRY("Show all",      cb_menu_map_show_all, menu_item_map_show_all),
989      /* --- */
990      TOGGLE_ENTRY("No icons",        cb_menu_map_no_icons, no_icon_get_toggle),
991    
992      LAST_ENTRY
993    };
994    
995    /* -- the map submenu -- */
996    static const menu_entry_t submenu_map[] = {
997      ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
998      SIMPLE_ENTRY("Download",               cb_menu_download),
999      ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
1000                                               menu_item_map_save_changes),
1001      ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
1002                                               menu_item_map_undo_changes),
1003      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
1004                                               menu_item_map_relations),
1005    
1006      LAST_ENTRY
1007    };
1008    
1009    /* -- the wms submenu -- */
1010    static const menu_entry_t submenu_wms[] = {
1011      SIMPLE_ENTRY("Import",   cb_menu_wms_import),
1012      DISABLED_ENTRY("Clear",  cb_menu_wms_clear, menu_item_wms_clear),
1013      DISABLED_ENTRY("Adjust", cb_menu_wms_adjust, menu_item_wms_adjust),
1014    
1015      LAST_ENTRY
1016    };
1017    
1018    /* -- the track submenu -- */
1019    static const menu_entry_t submenu_track[] = {
1020      ENABLED_ENTRY("Import",  cb_menu_track_import, track.menu_item_track_import),
1021      DISABLED_ENTRY("Export", cb_menu_track_export, track.menu_item_track_export),
1022      DISABLED_ENTRY("Clear",  cb_menu_track_clear, track.menu_item_track_clear),
1023      ENABLED_TOGGLE_ENTRY("GPS enable", cb_menu_track_enable_gps,
1024                    enable_gps_get_toggle, track.menu_item_track_enable_gps),
1025      DISABLED_TOGGLE_ENTRY("GPS follow", cb_menu_track_follow_gps,
1026                    follow_gps_get_toggle, track.menu_item_track_follow_gps),
1027    
1028      LAST_ENTRY
1029    };
1030    
1031    
1032    /* -- the applications main menu -- */
1033    static const menu_entry_t main_menu[] = {
1034      SIMPLE_ENTRY("About",   cb_menu_about),
1035      SIMPLE_ENTRY("Project", cb_menu_project_open),
1036      ENABLED_ENTRY("View",   on_submenu_view_clicked,  submenu_view),
1037      ENABLED_ENTRY("Map",    on_submenu_map_clicked,   submenu_map),
1038      ENABLED_ENTRY("WMS",    on_submenu_wms_clicked,   submenu_wms),
1039      ENABLED_ENTRY("Track",  on_submenu_track_clicked, track.submenu_track),
1040    
1041      LAST_ENTRY
1042    };
1043    
1044    void menu_create(appdata_t *appdata) {
1045      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1046    
1047      /* build menu/submenus */
1048      menu = HILDON_APP_MENU(app_menu_create(appdata, main_menu));
1049      appdata->app_menu_wms   = app_menu_create(appdata, submenu_wms);
1050      appdata->app_menu_map   = app_menu_create(appdata, submenu_map);
1051      appdata->app_menu_view  = app_menu_create(appdata, submenu_view);
1052      appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1053    
1054      /* enable/disable some entries according to settings */
1055      if(appdata && appdata->settings)
1056        gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1057                                 appdata->settings->enable_gps);
1058    
1059      hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1060    }
1061    #endif
1062    
1063  /********************* end of menu **********************/  /********************* end of menu **********************/
1064    
1065    #ifdef UISPECIFIC_MENU_HAS_ACCELS
1066    #define ACCELS_FILE "accels"
1067    
1068    static void menu_accels_load(appdata_t *appdata) {
1069      char *accels_file = g_strdup_printf("%s/" ACCELS_FILE,
1070                                          appdata->settings->base_path);
1071      gtk_accel_map_load(accels_file);
1072      g_free(accels_file);
1073    }
1074    
1075    static void menu_accels_save(appdata_t *appdata) {
1076      char *accels_file = g_strdup_printf("%s" ACCELS_FILE,
1077                                          appdata->settings->base_path);
1078      gtk_accel_map_save(accels_file);
1079      g_free(accels_file);
1080    }
1081    
1082    #endif
1083    
1084    
1085  void cleanup(appdata_t *appdata) {  void cleanup(appdata_t *appdata) {
1086    #ifdef UISPECIFIC_MENU_HAS_ACCELS
1087      menu_accels_save(appdata);
1088    #endif
1089    
1090    settings_save(appdata->settings);    settings_save(appdata->settings);
1091    
1092  #ifdef USE_HILDON  #ifdef USE_HILDON
# Line 627  void cleanup(appdata_t *appdata) { Line 1130  void cleanup(appdata_t *appdata) {
1130    
1131    project_free(appdata->project);    project_free(appdata->project);
1132    
1133      if(appdata->menu_item_map_undo)
1134        undo_free(appdata->undo.state);
1135    
1136    puts("everything is gone");    puts("everything is gone");
1137  }  }
1138    
# Line 642  gboolean on_window_key_press(GtkWidget * Line 1148  gboolean on_window_key_press(GtkWidget *
1148    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
1149    int handled = FALSE;    int handled = FALSE;
1150    
1151    //  printf("key event %d\n", event->keyval);    //  printf("key event with keyval %x\n", event->keyval);
1152    
1153    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1154    switch(event->keyval) {    switch(event->keyval) {
 #ifdef USE_HILDON  
1155    
1156  #if 0  #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
1157    case HILDON_HARDKEY_SELECT:  #ifdef USE_HILDON
1158      handled = TRUE;      /* this is in fact a mapping to GDK_F6 */
     break;  
 #endif  
   
1159    case HILDON_HARDKEY_FULLSCREEN:    case HILDON_HARDKEY_FULLSCREEN:
1160      {  #else
1161        gboolean fullscreen = !gtk_check_menu_item_get_active(    case GDK_F11:
1162                 GTK_CHECK_MENU_ITEM(appdata->fullscreen_menu_item));  #endif
1163        if(!gtk_check_menu_item_get_active(
1164                 GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen))) {
1165          gtk_window_fullscreen(GTK_WINDOW(appdata->window));
1166        gtk_check_menu_item_set_active(        gtk_check_menu_item_set_active(
1167                 GTK_CHECK_MENU_ITEM(appdata->fullscreen_menu_item), fullscreen);               GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen), TRUE);
1168          } else {
       if(fullscreen)  
         gtk_window_fullscreen(GTK_WINDOW(appdata->window));  
       else  
1169          gtk_window_unfullscreen(GTK_WINDOW(appdata->window));          gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
1170            gtk_check_menu_item_set_active(
1171        handled = TRUE;               GTK_CHECK_MENU_ITEM(appdata->menu_item_view_fullscreen), FALSE);
1172      }        }
1173    
1174        handled = TRUE;
1175      break;      break;
1176  #endif  #endif
1177    }    }
# Line 697  int main(int argc, char *argv[]) { Line 1201  int main(int argc, char *argv[]) {
1201    
1202    g_thread_init(NULL);    g_thread_init(NULL);
1203    
   gps_init(&appdata);  
   
1204    gtk_init (&argc, &argv);    gtk_init (&argc, &argv);
1205    
1206      gps_init(&appdata);
1207    
1208  #ifdef USE_HILDON  #ifdef USE_HILDON
1209    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");    printf("Installing osso context for \"org.harbaum." PACKAGE "\"\n");
1210    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,    appdata.osso_context = osso_initialize("org.harbaum."PACKAGE,
# Line 719  int main(int argc, char *argv[]) { Line 1223  int main(int argc, char *argv[]) {
1223    /* Create HildonWindow and set it to HildonProgram */    /* Create HildonWindow and set it to HildonProgram */
1224    appdata.window = HILDON_WINDOW(hildon_window_new());    appdata.window = HILDON_WINDOW(hildon_window_new());
1225    hildon_program_add_window(appdata.program, appdata.window);    hildon_program_add_window(appdata.program, appdata.window);
1226    
1227    #if MAEMO_VERSION_MAJOR == 6
1228      unsigned long val;
1229      XChangeProperty(GDK_DISPLAY(),
1230                      GDK_WINDOW_XID(GTK_WIDGET(appdata.window)->window),
1231                      XInternAtom(GDK_DISPLAY(),
1232                                  "_HILDON_ZOOM_KEY_ATOM",
1233                                  False), XA_INTEGER, 32,
1234                      PropModeReplace, (unsigned char *) &val, 1);
1235    #endif
1236    
1237  #else  #else
1238    /* Create a Window. */    /* Create a Window. */
1239    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
# Line 741  int main(int argc, char *argv[]) { Line 1256  int main(int argc, char *argv[]) {
1256    
1257    appdata.vbox = gtk_vbox_new(FALSE,0);    appdata.vbox = gtk_vbox_new(FALSE,0);
1258    menu_create(&appdata);    menu_create(&appdata);
1259    #ifdef UISPECIFIC_MENU_HAS_ACCELS
1260      menu_accels_load(&appdata);
1261    #endif
1262    
1263    /* ----------------------- setup main window ---------------- */    /* ----------------------- setup main window ---------------- */
1264    
# Line 750  int main(int argc, char *argv[]) { Line 1268  int main(int argc, char *argv[]) {
1268  #ifdef PORTRAIT  #ifdef PORTRAIT
1269    gtk_box_pack_start(GTK_BOX(vbox), iconbar_new(&appdata), FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), iconbar_new(&appdata), FALSE, FALSE, 0);
1270  #endif  #endif
1271    gtk_box_pack_start(GTK_BOX(vbox), map_new(&appdata), TRUE, TRUE, 0);  
1272      /* generate main map view */
1273      GtkWidget *map = map_new(&appdata);
1274      if(!map) {
1275        cleanup(&appdata);
1276        return -1;
1277      }
1278    
1279    #if 0  // another test overlay
1280      {
1281        GtkWidget *fixed = gtk_fixed_new();
1282    
1283        gtk_fixed_put(GTK_FIXED(fixed), gtk_label_new("Nase"), 0,0);
1284        gtk_fixed_put(GTK_FIXED(fixed), map, 0,0);
1285    
1286        gtk_box_pack_start(GTK_BOX(vbox), fixed, TRUE, TRUE, 0);
1287      }
1288    #else
1289      gtk_box_pack_start(GTK_BOX(vbox), map, TRUE, TRUE, 0);
1290    #endif
1291    
1292    #ifdef ZOOM_BUTTONS
1293      GtkWidget *zhbox = gtk_hbox_new(FALSE, 0);
1294    
1295      gtk_box_pack_start_defaults(GTK_BOX(zhbox), statusbar_new(&appdata));
1296    
1297      /* ---- add zoom out button right of statusbar ---- */
1298      appdata.btn_zoom_out = gtk_button_new();
1299      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_out),
1300            gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
1301      g_signal_connect(appdata.btn_zoom_out, "clicked",
1302                       G_CALLBACK(cb_menu_zoomout), &appdata);
1303      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_out, FALSE, FALSE, 0);
1304    
1305      /* ---- add zoom in button right of statusbar ---- */
1306      appdata.btn_zoom_in = gtk_button_new();
1307      gtk_button_set_image(GTK_BUTTON(appdata.btn_zoom_in),
1308            gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
1309      g_signal_connect(appdata.btn_zoom_in, "clicked",
1310                       G_CALLBACK(cb_menu_zoomin), &appdata);
1311      gtk_box_pack_start(GTK_BOX(zhbox), appdata.btn_zoom_in, FALSE, FALSE, 0);
1312    
1313    
1314      gtk_box_pack_start(GTK_BOX(vbox), zhbox, FALSE, FALSE, 0);
1315    #else
1316    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);
1317    #endif
1318    
1319  #ifndef PORTRAIT  #ifndef PORTRAIT
1320    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);
1321  #endif  #endif
   gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);  
1322    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1323    
1324    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 769  int main(int argc, char *argv[]) { Line 1331  int main(int argc, char *argv[]) {
1331    
1332    /* let gtk do its thing before loading the data, */    /* let gtk do its thing before loading the data, */
1333    /* so the user sees something */    /* so the user sees something */
1334    while(gtk_events_pending()) {    while(gtk_events_pending())
     putchar('.');  
1335      gtk_main_iteration();      gtk_main_iteration();
   }  
1336    
1337    /* load project if one is specified in the settings */    /* load project if one is specified in the settings */
1338    if(appdata.settings->project)    if(appdata.settings->project)
# Line 780  int main(int argc, char *argv[]) { Line 1340  int main(int argc, char *argv[]) {
1340    
1341    main_ui_enable(&appdata);    main_ui_enable(&appdata);
1342    
1343    /* ------------ jump into main loop ---------------- */    /* start GPS if enabled by config */
1344      if(appdata.settings && appdata.settings->enable_gps)
1345        track_enable_gps(&appdata, TRUE);
1346    
1347      /* again let the ui do its thing */
1348      while(gtk_events_pending())
1349        gtk_main_iteration();
1350    
1351    #if 0  // test overlay
1352      {
1353        GtkWidget *overlay = gtk_window_new(GTK_WINDOW_POPUP);
1354        gtk_window_set_default_size(GTK_WINDOW(overlay), 40, 20);
1355        gtk_window_set_transient_for(GTK_WINDOW(overlay), GTK_WINDOW(appdata.window));
1356        gtk_window_set_keep_above(GTK_WINDOW(overlay), TRUE);
1357        gtk_window_set_destroy_with_parent(GTK_WINDOW(overlay), TRUE);
1358        gtk_window_set_position(GTK_WINDOW(overlay), GTK_WIN_POS_CENTER_ON_PARENT);
1359        gtk_window_set_decorated(GTK_WINDOW(overlay), TRUE);
1360    
1361        /* add some zoom buttons for testing */
1362        GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
1363        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("+"));
1364        gtk_box_pack_start_defaults(GTK_BOX(hbox), gtk_button_new_with_label("-"));
1365        gtk_container_add(GTK_CONTAINER(overlay), hbox);
1366    
1367        gtk_widget_show_all(overlay);
1368      }
1369    #endif
1370    
1371      /* start to interact with the user now that the gui is running */
1372      if(appdata.settings->first_run_demo) {
1373        messagef(GTK_WIDGET(appdata.window), _("Welcome to OSM2Go"),
1374                 _("This is the first time you run OSM2Go. "
1375                   "A demo project has been loaded to get you "
1376                   "started. You can play around with this demo as much "
1377                   "as you like. However, you cannot upload or download "
1378                   "the demo project.\n\n"
1379                   "In order to start working on real data you'll have "
1380                   "to setup a new project and enter your OSM user name "
1381                   "and password. You'll then be able to download the "
1382                   "latest data from OSM and upload your changes into "
1383                   "the OSM main database."
1384                   ));
1385      }
1386    
1387      /* ------------ jump into main loop ---------------- */
1388    gtk_main();    gtk_main();
1389    
1390    puts("gtk_main() left");    puts("gtk_main() left");
1391    
1392    track_save(appdata.project, appdata.track.track);    track_save(appdata.project, appdata.track.track);
1393      track_clear(&appdata, appdata.track.track);
1394      appdata.track.track = NULL;
1395    
1396    /* save a diff if there are dirty entries */    /* save a diff if there are dirty entries */
1397    diff_save(appdata.project, appdata.osm);    diff_save(appdata.project, appdata.osm);
# Line 795  int main(int argc, char *argv[]) { Line 1400  int main(int argc, char *argv[]) {
1400    
1401    return 0;    return 0;
1402  }  }
1403    
1404    // vim:et:ts=8:sw=2:sts=2:ai
Legend:
Removed from v.15  
changed lines
  Added in v.224