Diff of /trunk/src/main.c

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

revision 169 by harbaum, Tue Apr 28 09:10:17 2009 UTC revision 177 by harbaum, Wed Jun 10 12:07:11 2009 UTC
# Line 36  static void main_ui_enable(appdata_t *ap Line 36  static void main_ui_enable(appdata_t *ap
36      map_action_cancel(appdata);      map_action_cancel(appdata);
37    
38    /* ---- set project name as window title ----- */    /* ---- set project name as window title ----- */
39  #ifndef USE_HILDON  #if defined(USE_HILDON) && MAEMO_VERSION_MAJOR < 5
40      if(project_valid)
41        gtk_window_set_title(GTK_WINDOW(appdata->window), appdata->project->name);
42      else
43        gtk_window_set_title(GTK_WINDOW(appdata->window), "");
44    #else
45    char *str = NULL;    char *str = NULL;
46    if(project_valid)    if(project_valid)
47      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);      str = g_strdup_printf("OSM2Go - %s", appdata->project->name);
# Line 45  static void main_ui_enable(appdata_t *ap Line 50  static void main_ui_enable(appdata_t *ap
50    
51    gtk_window_set_title(GTK_WINDOW(appdata->window), str);    gtk_window_set_title(GTK_WINDOW(appdata->window), str);
52    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), "");  
53  #endif  #endif
54    
55    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
# Line 147  cb_menu_download(GtkMenuItem *item, gpoi Line 147  cb_menu_download(GtkMenuItem *item, gpoi
147    // download    // download
148    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,    if(osm_download(GTK_WIDGET(appdata->window), appdata->settings,
149                    appdata->project)) {                    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"
155    }    }
156    
157    main_ui_enable(appdata);    main_ui_enable(appdata);
# Line 197  cb_menu_redraw(GtkMenuItem *item, gpoint Line 197  cb_menu_redraw(GtkMenuItem *item, gpoint
197    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
198    
199    /* redraw the entire map by destroying all map items and redrawing them */    /* redraw the entire map by destroying all map items and redrawing them */
200    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing");
201    track_save(appdata->project, appdata->track.track);    track_save(appdata->project, appdata->track.track);
202    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
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 212  cb_menu_redraw(GtkMenuItem *item, gpoint Line 212  cb_menu_redraw(GtkMenuItem *item, gpoint
212      map_track_draw(appdata->map, appdata->track.track);      map_track_draw(appdata->map, appdata->track.track);
213    
214    wms_load(appdata);    wms_load(appdata);
215    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
216  }  }
217  #endif  #endif
218    
# Line 220  static void Line 220  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    
223    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing");
224    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
225    appdata->settings->no_icons = gtk_check_menu_item_get_active(item);    appdata->settings->no_icons = gtk_check_menu_item_get_active(item);
226    map_paint(appdata);    map_paint(appdata);
227    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
228  }  }
229    
230  static void  static void
231  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {  cb_menu_map_no_antialias(GtkCheckMenuItem *item, gpointer data) {
232    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
233    
234    banner_busy_start(appdata, 1, "Redrawing...");    banner_busy_start(appdata, 1, "Redrawing");
235    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);    map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
236    appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);    appdata->settings->no_antialias = gtk_check_menu_item_get_active(item);
237    map_paint(appdata);    map_paint(appdata);
238    banner_busy_stop(appdata); //"Redrawing..."    banner_busy_stop(appdata); //"Redrawing"
239  }  }
240    
241  static void  static void
# Line 272  cb_menu_undo_changes(GtkMenuItem *item, Line 272  cb_menu_undo_changes(GtkMenuItem *item,
272                   "uploaded yet? This can't be undone.")))                   "uploaded yet? This can't be undone.")))
273      return;      return;
274    
275    banner_busy_start(appdata, 1, _("Redrawing..."));    banner_busy_start(appdata, 1, _("Redrawing"));
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    
283    banner_show_info(appdata, _("Discarded local changes"));    banner_show_info(appdata, _("Discarded local changes"));
284  }  }
# Line 626  void menu_create(appdata_t *appdata) { Line 626  void menu_create(appdata_t *appdata) {
626  #endif  #endif
627    
628    menu_append_new_item(    menu_append_new_item(
629      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_project_open), _("_Open"),
630      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",      GTK_STOCK_OPEN, "<OSM2Go-Main>/Project/Open",
631      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
632    );    );
# Line 698  void menu_create(appdata_t *appdata) { Line 698  void menu_create(appdata_t *appdata) {
698    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
699    
700    appdata->menu_item_osm_upload = menu_append_new_item(    appdata->menu_item_osm_upload = menu_append_new_item(
701      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_upload), _("_Upload"),
702      "upload.16", "<OSM2Go-Main>/OSM/Upload",      "upload.16", "<OSM2Go-Main>/OSM/Upload",
703      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_u, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
704    );    );
705    
706    menu_append_new_item(    menu_append_new_item(
707      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_download), _("_Download"),
708      "download.16", "<OSM2Go-Main>/OSM/Download",      "download.16", "<OSM2Go-Main>/OSM/Download",
709      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_d, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
710    );    );
# Line 727  void menu_create(appdata_t *appdata) { Line 727  void menu_create(appdata_t *appdata) {
727    );    );
728    
729    appdata->menu_item_osm_undo_changes = menu_append_new_item(    appdata->menu_item_osm_undo_changes = menu_append_new_item(
730      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"),
731      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",      GTK_STOCK_DELETE, "<OSM2Go-Main>/OSM/DiscardChanges",
732      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
733    );    );
734    
735    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());
736    appdata->menu_item_osm_relations = menu_append_new_item(    appdata->menu_item_osm_relations = menu_append_new_item(
737      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_osm_relations), _("_Relations"),
738      NULL, "<OSM2Go-Main>/OSM/Relations",      NULL, "<OSM2Go-Main>/OSM/Relations",
739      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE      GDK_r, GDK_SHIFT_MASK|GDK_CONTROL_MASK, TRUE, FALSE, FALSE
740    );    );
# Line 748  void menu_create(appdata_t *appdata) { Line 748  void menu_create(appdata_t *appdata) {
748    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
749    
750    menu_append_new_item(    menu_append_new_item(
751      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_wms_import), _("_Import"),
752      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",      GTK_STOCK_INDEX, "<OSM2Go-Main>/WMS/Import",
753      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
754    );    );
# Line 792  void menu_create(appdata_t *appdata) { Line 792  void menu_create(appdata_t *appdata) {
792    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());
793    
794    menu_append_new_item(    menu_append_new_item(
795      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_style), _("St_yle"),
796      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",      GTK_STOCK_SELECT_COLOR, "<OSM2Go-Main>/Map/Style",
797      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
798    );    );
# Line 828  void menu_create(appdata_t *appdata) { Line 828  void menu_create(appdata_t *appdata) {
828    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
829    
830    appdata->track.menu_item_import = menu_append_new_item(    appdata->track.menu_item_import = menu_append_new_item(
831      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_import), _("_Import"),
832      NULL, "<OSM2Go-Main>/Track/Import",      NULL, "<OSM2Go-Main>/Track/Import",
833      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
834    );    );
835    
836    appdata->track.menu_item_export = menu_append_new_item(    appdata->track.menu_item_export = menu_append_new_item(
837      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export..."),      appdata, submenu, GTK_SIGNAL_FUNC(cb_menu_track_export), _("_Export"),
838      NULL, "<OSM2Go-Main>/Track/Export",      NULL, "<OSM2Go-Main>/Track/Export",
839      0, 0, FALSE, FALSE, FALSE      0, 0, FALSE, FALSE, FALSE
840    );    );
# Line 866  void menu_create(appdata_t *appdata) { Line 866  void menu_create(appdata_t *appdata) {
866                          gtk_separator_menu_item_new());                          gtk_separator_menu_item_new());
867    
868    menu_append_new_item(    menu_append_new_item(
869      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About..."),      appdata, about_quit_items_menu, GTK_SIGNAL_FUNC(cb_menu_about), _("_About"),
870      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",      GTK_STOCK_ABOUT, "<OSM2Go-Main>/About",
871      0, 0, TRUE, FALSE, FALSE      0, 0, TRUE, FALSE, FALSE
872    );    );
# Line 1109  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.169  
changed lines
  Added in v.177