Diff of /trunk/src/settings.c

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

revision 1 by harbaum, Sat Jun 20 11:08:47 2009 UTC revision 35 by harbaum, Thu Jul 30 08:29:52 2009 UTC
# Line 159  static void on_location_edit(GtkWidget * Line 159  static void on_location_edit(GtkWidget *
159    if(loc) pos = loc->pos;    if(loc) pos = loc->pos;
160    else    pos = context->appdata->home;    else    pos = context->appdata->home;
161    
162      /* avoid to use "nan" as the user will then not be displayed a nice */
163      /* preset value to alter */
164      if(isnan(pos.lat)) pos.lat = 0;
165      if(isnan(pos.lon)) pos.lon = 0;
166    
167    gtk_table_attach_defaults(GTK_TABLE(table),    gtk_table_attach_defaults(GTK_TABLE(table),
168                     label = gtk_label_new(_("Latitude:")), 0, 1, 1, 2);                     label = gtk_label_new(_("Latitude:")), 0, 1, 1, 2);
169    gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);    gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
# Line 468  static GtkWidget *location_widget(locati Line 473  static GtkWidget *location_widget(locati
473    /* ------- button box ------------ */    /* ------- button box ------------ */
474    
475    GtkWidget *hbox = gtk_hbox_new(TRUE,3);    GtkWidget *hbox = gtk_hbox_new(TRUE,3);
476    context->but_add = gtk_button_new_with_label(_("Add..."));    context->but_add = gtk_button_new_with_label(_("Add"));
477    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_add);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_add);
478    gtk_signal_connect(GTK_OBJECT(context->but_add), "clicked",    gtk_signal_connect(GTK_OBJECT(context->but_add), "clicked",
479                       GTK_SIGNAL_FUNC(on_location_add), context);                       GTK_SIGNAL_FUNC(on_location_add), context);
480    
481    context->but_edit = gtk_button_new_with_label(_("Edit..."));    context->but_edit = gtk_button_new_with_label(_("Edit"));
482    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_edit);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_edit);
483    gtk_signal_connect(GTK_OBJECT(context->but_edit), "clicked",    gtk_signal_connect(GTK_OBJECT(context->but_edit), "clicked",
484                       GTK_SIGNAL_FUNC(on_location_edit), context);                       GTK_SIGNAL_FUNC(on_location_edit), context);
# Line 492  static GtkWidget *location_widget(locati Line 497  static GtkWidget *location_widget(locati
497  void cb_menu_settings(GtkWidget *window, gpointer data) {  void cb_menu_settings(GtkWidget *window, gpointer data) {
498    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
499    GtkWidget *table, *label, *hbox, *notebook;    GtkWidget *table, *label, *hbox, *notebook;
500    GtkWidget *cbox_imperial, *cbox_load_images;    GtkWidget *cbox_imperial;
501    settings_dialog_state_t hstate;    settings_dialog_state_t hstate;
502    
503    GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Settings"),    GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Settings"),
# Line 548  void cb_menu_settings(GtkWidget *window, Line 553  void cb_menu_settings(GtkWidget *window,
553                     cbox_imperial, 0, 2, 0, 1, GTK_FILL, 0, 2, 0);                     cbox_imperial, 0, 2, 0, 1, GTK_FILL, 0, 2, 0);
554    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbox_imperial),    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbox_imperial),
555                                 appdata->imperial);                                 appdata->imperial);
   cbox_load_images = gtk_check_button_new_with_label(  
                    _("Load images"));  
   gtk_table_attach(GTK_TABLE(table),  
                    cbox_load_images, 0, 2, 1, 2, GTK_FILL, 0, 2, 0);  
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbox_load_images),  
                                appdata->load_images);  
   
556    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table,    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table,
557                             gtk_label_new(_("Misc")));                             gtk_label_new(_("Misc")));
558    
# Line 678  void cb_menu_settings(GtkWidget *window, Line 676  void cb_menu_settings(GtkWidget *window,
676                              GTK_TOGGLE_BUTTON(hstate.cbox_gps));                              GTK_TOGGLE_BUTTON(hstate.cbox_gps));
677      appdata->imperial = gtk_toggle_button_get_active(      appdata->imperial = gtk_toggle_button_get_active(
678                              GTK_TOGGLE_BUTTON(cbox_imperial));                              GTK_TOGGLE_BUTTON(cbox_imperial));
     appdata->load_images = gtk_toggle_button_get_active(  
                             GTK_TOGGLE_BUTTON(cbox_load_images));  
679    
680      appdata->compass_damping = 0.5 + gtk_range_get_value(GTK_RANGE(scale));      appdata->compass_damping = 0.5 + gtk_range_get_value(GTK_RANGE(scale));
681    
Legend:
Removed from v.1  
changed lines
  Added in v.35