Diff of /trunk/src/main.c

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

revision 13 by achadwick, Thu Dec 11 13:26:13 2008 UTC revision 14 by harbaum, Mon Dec 15 19:45:38 2008 UTC
# Line 193  cb_menu_map_show_all(GtkWidget *window, Line 193  cb_menu_map_show_all(GtkWidget *window,
193    map_show_all(appdata);    map_show_all(appdata);
194  }  }
195    
196  /* ----------------------------------------------- ----------- */  /* ---------------------------------------------------------- */
197    
198  #if 1  // mainly for testing  #if 1  // mainly for testing
199  static void  static void
# Line 219  cb_menu_redraw(GtkWidget *window, gpoint Line 219  cb_menu_redraw(GtkWidget *window, gpoint
219  #endif  #endif
220    
221  static void  static void
222  cb_menu_style(GtkWidget *window, gpointer data) {  cb_menu_style(GtkWidget *widget, gpointer data) {
223    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
224    
225    style_select(GTK_WIDGET(appdata->window), appdata);    style_select(GTK_WIDGET(appdata->window), appdata);
226  }  }
227    
228  static void  static void
229  cb_menu_save_changes(GtkWidget *window, gpointer data) {  cb_menu_map_no_icons(GtkWidget *widget, gpointer data) {
230      appdata_t *appdata = (appdata_t*)data;
231    
232      map_clear(appdata, MAP_LAYER_OBJECTS_ONLY);
233      appdata->settings->no_icons =
234        gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
235      map_paint(appdata);
236    }
237    
238    static void
239    cb_menu_save_changes(GtkWidget *widget, gpointer data) {
240    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
241    
242    diff_save(appdata->project, appdata->osm);    diff_save(appdata->project, appdata->osm);
243    statusbar_set(appdata, _("Saved all changes made to this project so far"), FALSE);    statusbar_set(appdata, _("Saved all changes made "
244                               "to this project so far"), FALSE);
245  }  }
246    
247    
# Line 470  void menu_create(appdata_t *appdata) { Line 481  void menu_create(appdata_t *appdata) {
481    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
482    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_style), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_style), appdata);
483    
484      gtk_menu_append(GTK_MENU_SHELL(submenu), gtk_separator_menu_item_new());
485    
486      appdata->menu_item_map_no_icons =
487        item = gtk_check_menu_item_new_with_label( _("No Icons") );
488      gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),
489                                     appdata->settings->no_icons);
490      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
491      g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_map_no_icons),
492                       appdata);
493    
494    /* -------------------- track submenu -------------------- */    /* -------------------- track submenu -------------------- */
495    
496    appdata->track.menu_track = item = gtk_menu_item_new_with_label(_("Track"));    appdata->track.menu_track = item = gtk_menu_item_new_with_label(_("Track"));
# Line 688  int main(int argc, char *argv[]) { Line 709  int main(int argc, char *argv[]) {
709    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
710                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
711    
   appdata.vbox = gtk_vbox_new(FALSE,0);  
   menu_create(&appdata);  
   
712    /* user specific init */    /* user specific init */
713    appdata.settings = settings_load();    appdata.settings = settings_load();
714    
715      appdata.vbox = gtk_vbox_new(FALSE,0);
716      menu_create(&appdata);
717    
718    /* ----------------------- setup main window ---------------- */    /* ----------------------- setup main window ---------------- */
719    
720    GtkWidget *hbox = gtk_hbox_new(FALSE,0);    GtkWidget *hbox = gtk_hbox_new(FALSE,0);
Legend:
Removed from v.13  
changed lines
  Added in v.14