Diff of /trunk/src/main.c

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

revision 156 by harbaum, Wed Apr 1 12:47:35 2009 UTC revision 175 by harbaum, Wed Jun 10 09:24:47 2009 UTC
# Line 62  static void main_ui_enable(appdata_t *ap Line 62  static void main_ui_enable(appdata_t *ap
62      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);      gtk_widget_set_sensitive(appdata->menu_item_osm_undo, osm_valid);
63    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_save_changes, osm_valid);
64    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_osm_undo_changes, osm_valid);
65      gtk_widget_set_sensitive(appdata->menu_item_osm_relations, osm_valid);
66    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);    gtk_widget_set_sensitive(appdata->track.menu_track, osm_valid);
67    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);    gtk_widget_set_sensitive(appdata->menu_view, osm_valid);
68    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);    gtk_widget_set_sensitive(appdata->menu_wms, osm_valid);
# Line 144  cb_menu_download(GtkMenuItem *item, gpoi Line 145  cb_menu_download(GtkMenuItem *item, gpoi
145    }    }
146    
147    // download    // download
148    if(osm_download(GTK_WIDGET(appdata->window), appdata->project)) {    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
149                      appdata->project)) {
150      banner_busy_start(appdata, 1, "Redrawing...");      banner_busy_start(appdata, 1, "Redrawing...");
151      appdata->osm = osm_parse(appdata->project->osm);      appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
152      diff_restore(appdata, appdata->project, appdata->osm);      diff_restore(appdata, appdata->project, appdata->osm);
153      map_paint(appdata);      map_paint(appdata);
154      banner_busy_stop(appdata); //"Redrawing..."      banner_busy_stop(appdata); //"Redrawing..."
# Line 201  cb_menu_redraw(GtkMenuItem *item, gpoint Line 203  cb_menu_redraw(GtkMenuItem *item, gpoint
203    map_clear(appdata, MAP_LAYER_ALL);    map_clear(appdata, MAP_LAYER_ALL);
204    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
205    
206    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
207    diff_restore(appdata, appdata->project, appdata->osm);    diff_restore(appdata, appdata->project, appdata->osm);
208    map_paint(appdata);    map_paint(appdata);
209    
# Line 215  cb_menu_redraw(GtkMenuItem *item, gpoint Line 217  cb_menu_redraw(GtkMenuItem *item, gpoint
217  #endif  #endif
218    
219  static void  static void
 cb_menu_style(GtkMenuItem *item, gpointer data) {  
   appdata_t *appdata = (appdata_t*)data;  
   
   style_select(GTK_WIDGET(appdata->window), appdata);  
 }  
   
 static void  
220  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {  cb_menu_map_no_icons(GtkCheckMenuItem *item, gpointer data) {
221    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
222    
# Line 244  cb_menu_map_no_antialias(GtkCheckMenuIte Line 239  cb_menu_map_no_antialias(GtkCheckMenuIte
239  }  }
240    
241  static void  static void
242    cb_menu_style(GtkMenuItem *item, gpointer data) {
243      appdata_t *appdata = (appdata_t*)data;
244    
245      style_select(GTK_WIDGET(appdata->window), appdata);
246    }
247    
248    static void
249  cb_menu_undo(GtkMenuItem *item, gpointer data) {  cb_menu_undo(GtkMenuItem *item, gpointer data) {
250    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
251    
# Line 274  cb_menu_undo_changes(GtkMenuItem *item, Line 276  cb_menu_undo_changes(GtkMenuItem *item,
276    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
277    osm_free(&appdata->icon, appdata->osm);    osm_free(&appdata->icon, appdata->osm);
278    diff_remove(appdata->project);    diff_remove(appdata->project);
279    appdata->osm = osm_parse(appdata->project->osm);    appdata->osm = osm_parse(appdata->project->path, appdata->project->osm);
280    map_paint(appdata);    map_paint(appdata);
281    banner_busy_stop(appdata);  //"Redrawing..."    banner_busy_stop(appdata);  //"Redrawing..."
282    
# Line 286  cb_menu_osm_relations(GtkMenuItem *item, Line 288  cb_menu_osm_relations(GtkMenuItem *item,
288    relation_list((appdata_t*)data);    relation_list((appdata_t*)data);
289  }  }
290    
291    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
292  static void  static void
293  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {  cb_menu_fullscreen(GtkCheckMenuItem *item, gpointer data) {
294    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
# Line 295  cb_menu_fullscreen(GtkCheckMenuItem *ite Line 298  cb_menu_fullscreen(GtkCheckMenuItem *ite
298    else    else
299      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));      gtk_window_unfullscreen(GTK_WINDOW(appdata->window));
300  }  }
301    #endif
302    
303  static void  static void
304  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_zoomin(GtkMenuItem *item, appdata_t *appdata) {
# Line 313  cb_menu_zoomout(GtkMenuItem *item, appda Line 317  cb_menu_zoomout(GtkMenuItem *item, appda
317  }  }
318    
319  static void  static void
320    cb_menu_view_detail_inc(GtkMenuItem *item, gpointer data) {
321      appdata_t *appdata = (appdata_t*)data;
322    
323      printf("detail level increase\n");
324      map_detail_increase(appdata->map);
325    }
326    
327    static void
328    cb_menu_view_detail_normal(GtkMenuItem *item, gpointer data) {
329      appdata_t *appdata = (appdata_t*)data;
330    
331      printf("detail level normal\n");
332      map_detail_normal(appdata->map);
333    }
334    
335    static void
336    cb_menu_view_detail_dec(GtkMenuItem *item, gpointer data) {
337      appdata_t *appdata = (appdata_t*)data;
338    
339      printf("detail level decrease\n");
340      map_detail_decrease(appdata->map);
341    }
342    
343    static void
344  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {  cb_menu_track_import(GtkMenuItem *item, appdata_t *appdata) {
345    g_assert(appdata->settings);    g_assert(appdata->settings);
346    
# Line 621  void menu_create(appdata_t *appdata) { Line 649  void menu_create(appdata_t *appdata) {
649    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);    gtk_menu_set_accel_group(GTK_MENU(submenu), accel_grp);
650    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
651    
652    #if !defined(USE_HILDON) || (MAEMO_VERSION_MAJOR < 5)
653    appdata->menu_item_view_fullscreen = menu_append_new_item(    appdata->menu_item_view_fullscreen = menu_append_new_item(
654      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_fullscreen), _("_Fullscreen"),
655      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",      GTK_STOCK_FULLSCREEN, "<OSM2Go-Main>/View/Fullscreen",
656      0, 0, TRUE, TRUE, FALSE      0, 0, TRUE, TRUE, FALSE
657    );    );
658    #endif
659    
660    menu_append_new_item(    menu_append_new_item(
661      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_zoomin), _("Zoom _in"),
# Line 639  void menu_create(appdata_t *appdata) { Line 669  void menu_create(appdata_t *appdata) {
669      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_period, GDK_CONTROL_MASK, TRUE, FALSE, FALSE
670    );    );
671    
672      gtk_menu_shell_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
673    
674      menu_append_new_item(
675        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_inc), _("More details"),
676        NULL, "<OSM2Go-Main>/View/DetailInc",
677        GDK_period, GDK_MOD1_MASK, TRUE, FALSE, FALSE
678      );
679    
680      menu_append_new_item(
681        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_normal), _("Normal details"),
682        NULL, "<OSM2Go-Main>/View/DetailNormal",
683        0, 0, TRUE, FALSE, FALSE
684      );
685    
686      menu_append_new_item(
687        appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_view_detail_dec), _("Less details"),
688        NULL, "<OSM2Go-Main>/View/DetailDec",
689        GDK_comma, GDK_MOD1_MASK, TRUE, FALSE, FALSE
690      );
691    
692    /* -------------------- OSM submenu -------------------- */    /* -------------------- OSM submenu -------------------- */
693    
694    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );    appdata->menu_osm = item = gtk_menu_item_new_with_mnemonic( _("_OSM") );
# Line 1059  int main(int argc, char *argv[]) { Line 1109  int main(int argc, char *argv[]) {
1109  #ifndef PORTRAIT  #ifndef PORTRAIT
1110    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);
1111  #endif  #endif
1112    gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);    //  gtk_box_pack_start(GTK_BOX(hbox), gtk_vseparator_new(), FALSE, FALSE, 0);
1113    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1114    
1115    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), hbox, TRUE, TRUE, 0);
Legend:
Removed from v.156  
changed lines
  Added in v.175