Diff of /trunk/src/settings.c

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

revision 203 by harbaum, Tue Nov 17 09:07:17 2009 UTC revision 204 by harbaum, Mon Nov 23 18:32:06 2009 UTC
# Line 563  static GtkWidget *location_widget(locati Line 563  static GtkWidget *location_widget(locati
563    return vbox;    return vbox;
564  }  }
565    
566    #ifdef FREMANTLE
567  static GtkWidget *title_new(char *title) {  static GtkWidget *title_new(char *title) {
568    GtkWidget *vbox = gtk_vbox_new(FALSE, 10);    GtkWidget *vbox = gtk_vbox_new(FALSE, 10);
569    gtk_box_pack_start_defaults(GTK_BOX(vbox), gtk_label_new(""));    gtk_box_pack_start_defaults(GTK_BOX(vbox), gtk_label_new(""));
# Line 573  static GtkWidget *title_new(char *title) Line 574  static GtkWidget *title_new(char *title)
574    gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);    gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);
575    return vbox;    return vbox;
576  }  }
577    #endif
578    
579  void cb_menu_settings(GtkWidget *window, gpointer data) {  void cb_menu_settings(GtkWidget *window, gpointer data) {
580    appdata_t *appdata = (appdata_t *)data;    appdata_t *appdata = (appdata_t *)data;
# Line 638  void cb_menu_settings(GtkWidget *window, Line 640  void cb_menu_settings(GtkWidget *window,
640    
641    /* ---------------- misc old main menu entries ----------------- */    /* ---------------- misc old main menu entries ----------------- */
642    
643  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)  #ifndef FREMANTLE
   // gtk_box_pack_start_defaults(GTK_BOX(vbox), title_new(_("Misc")));  
 #else  
644    vbox = gtk_vbox_new(FALSE, 0);    vbox = gtk_vbox_new(FALSE, 0);
645  #endif  #endif
646    
# Line 648  void cb_menu_settings(GtkWidget *window, Line 648  void cb_menu_settings(GtkWidget *window,
648    check_button_set_active(cbox_imperial, appdata->imperial);    check_button_set_active(cbox_imperial, appdata->imperial);
649    gtk_box_pack_start(GTK_BOX(vbox), cbox_imperial, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), cbox_imperial, FALSE, FALSE, 0);
650    
651      hbox = gtk_hbox_new(FALSE,2);
652      gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("Username:")),
653                         FALSE, FALSE, 0);
654    #ifndef FREMANTLE
655      GtkWidget *username = gtk_entry_new();
656    #else
657      GtkWidget *username = hildon_entry_new(HILDON_SIZE_AUTO);
658    #endif
659    
660      if(appdata->username)
661        gtk_entry_set_text(GTK_ENTRY(username), appdata->username);
662    
663      gtk_box_pack_start(GTK_BOX(hbox), username, FALSE, FALSE, 0);
664    
665      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
666    
667  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
668    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,    gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox,
669                             gtk_label_new(_("Misc")));                             gtk_label_new(_("Misc")));
# Line 792  void cb_menu_settings(GtkWidget *window, Line 808  void cb_menu_settings(GtkWidget *window,
808      appdata->imperial =      appdata->imperial =
809        check_button_get_active(cbox_imperial);        check_button_get_active(cbox_imperial);
810    
811        if(appdata->username) {
812          g_free(appdata->username);
813          appdata->username = NULL;
814        }
815    
816        const char *uname = gtk_entry_get_text(GTK_ENTRY(username));
817        if(uname && strlen(uname)>0)
818          appdata->username = g_strdup(uname);
819    
820      appdata->compass_damping = 0.5 + gtk_range_get_value(GTK_RANGE(scale));      appdata->compass_damping = 0.5 + gtk_range_get_value(GTK_RANGE(scale));
821    
822      appdata->gpxlist_items = GPXLIST_ITEM_VALID;      appdata->gpxlist_items = GPXLIST_ITEM_VALID;
Legend:
Removed from v.203  
changed lines
  Added in v.204