Diff of /trunk/src/main.c

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

revision 191 by harbaum, Tue Jul 7 07:36:27 2009 UTC revision 192 by harbaum, Tue Jul 7 11:07:11 2009 UTC
# Line 62  static void main_ui_enable(appdata_t *ap Line 62  static void main_ui_enable(appdata_t *ap
62    
63    if(appdata->iconbar && appdata->iconbar->toolbar)    if(appdata->iconbar && appdata->iconbar->toolbar)
64      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);      gtk_widget_set_sensitive(appdata->iconbar->toolbar, osm_valid);
   
65    /* disable all menu entries related to map */    /* disable all menu entries related to map */
66    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);    gtk_widget_set_sensitive(appdata->submenu_map, project_valid);
67    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);    gtk_widget_set_sensitive(appdata->menu_item_map_upload, osm_valid);
# Line 883  static gboolean no_icon_get_toggle(appda Line 882  static gboolean no_icon_get_toggle(appda
882    
883  static gboolean enable_gps_get_toggle(appdata_t *appdata) {  static gboolean enable_gps_get_toggle(appdata_t *appdata) {
884    if(!appdata)           return FALSE;    if(!appdata)           return FALSE;
885    return appdata->gps_enabled;    if(!appdata->settings) return FALSE;
886      return appdata->settings->enable_gps;
887  }  }
888    
889  static gboolean follow_gps_get_toggle(appdata_t *appdata) {  static gboolean follow_gps_get_toggle(appdata_t *appdata) {
# Line 910  static GtkWidget *app_menu_create(appdat Line 910  static GtkWidget *app_menu_create(appdat
910      } else {      } else {
911        button = hildon_check_button_new(HILDON_SIZE_AUTO);        button = hildon_check_button_new(HILDON_SIZE_AUTO);
912        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));        gtk_button_set_label(GTK_BUTTON(button), _(menu_entries->label));
913          printf("requesting check for %s: %p\n", menu_entries->label,
914                 menu_entries->toggle);
915        hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),        hildon_check_button_set_active(HILDON_CHECK_BUTTON(button),
916                                       menu_entries->toggle(appdata));                                       menu_entries->toggle(appdata));
917        g_signal_connect_after(button, "toggled",        g_signal_connect_after(button, "toggled",
# Line 983  static const menu_entry_t submenu_view[] Line 985  static const menu_entry_t submenu_view[]
985    
986  /* -- the map submenu -- */  /* -- the map submenu -- */
987  static const menu_entry_t submenu_map[] = {  static const menu_entry_t submenu_map[] = {
988    SIMPLE_ENTRY("Upload",                cb_menu_upload),    ENABLED_ENTRY("Upload",                cb_menu_upload, menu_item_map_upload),
989    SIMPLE_ENTRY("Download",              cb_menu_download),    SIMPLE_ENTRY("Download",               cb_menu_download),
990    SIMPLE_ENTRY("Save local changes",    cb_menu_save_changes),    ENABLED_ENTRY("Save local changes",    cb_menu_save_changes,
991    SIMPLE_ENTRY("Discard local changes", cb_menu_undo_changes),                                             menu_item_map_save_changes),
992    SIMPLE_ENTRY("Relations",             cb_menu_osm_relations),    ENABLED_ENTRY("Discard local changes", cb_menu_undo_changes,
993                                               menu_item_map_undo_changes),
994      ENABLED_ENTRY("Relations",             cb_menu_osm_relations,
995                                               menu_item_map_relations),
996    
997    LAST_ENTRY    LAST_ENTRY
998  };  };
# Line 1038  void menu_create(appdata_t *appdata) { Line 1043  void menu_create(appdata_t *appdata) {
1043    appdata->app_menu_track = app_menu_create(appdata, submenu_track);    appdata->app_menu_track = app_menu_create(appdata, submenu_track);
1044    
1045    /* enable/disable some entries according to settings */    /* enable/disable some entries according to settings */
1046    hildon_check_button_set_active(HILDON_CHECK_BUTTON(    if(appdata && appdata->settings)
1047           appdata->track.menu_item_track_enable_gps), appdata->gps_enabled);      gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,
1048    gtk_widget_set_sensitive(appdata->track.menu_item_track_follow_gps,                               appdata->settings->enable_gps);
                            appdata->gps_enabled);  
   if(appdata->settings)  
     hildon_check_button_set_active(HILDON_CHECK_BUTTON(  
        appdata->track.menu_item_track_follow_gps),  
                                  appdata->settings->follow_gps);  
   
1049    
1050    hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);    hildon_window_set_app_menu(HILDON_WINDOW(appdata->window), menu);
1051  }  }
Legend:
Removed from v.191  
changed lines
  Added in v.192