Diff of /trunk/src/settings.c

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

revision 132 by harbaum, Tue Sep 29 14:30:16 2009 UTC revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC
# Line 381  view_selection_func(GtkTreeSelection *se Line 381  view_selection_func(GtkTreeSelection *se
381  static GtkWidget *location_widget(location_context_t *context) {  static GtkWidget *location_widget(location_context_t *context) {
382    
383    GtkWidget *vbox = gtk_vbox_new(FALSE,3);    GtkWidget *vbox = gtk_vbox_new(FALSE,3);
384    
385    #ifndef USE_PANNABLE_AREA
386    context->view = gtk_tree_view_new();    context->view = gtk_tree_view_new();
387    #else
388      context->view = hildon_gtk_tree_view_new(HILDON_UI_MODE_EDIT);
389    #endif
390    
391    gtk_tree_selection_set_select_function(    gtk_tree_selection_set_select_function(
392           gtk_tree_view_get_selection(GTK_TREE_VIEW(context->view)),           gtk_tree_view_get_selection(GTK_TREE_VIEW(context->view)),
# Line 451  static GtkWidget *location_widget(locati Line 456  static GtkWidget *location_widget(locati
456    
457    g_object_unref(context->store);    g_object_unref(context->store);
458    
 #if 0  
   /* make list react on clicks */  
   g_signal_connect(context->view, "row-activated",  
                    (GCallback)gpxlist_view_onRowActivated, appdata);  
 #endif  
   
459    /* select the "active" row */    /* select the "active" row */
460    location_select(context);    location_select(context);
461    
462    /* put it into a scrolled window */    /* put it into a scrolled window */
463    #ifndef USE_PANNABLE_AREA
464    GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
465    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
466                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
467    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
468                                        GTK_SHADOW_ETCHED_IN);                                        GTK_SHADOW_ETCHED_IN);
   //  gtk_container_set_border_width(GTK_CONTAINER(scrolled_window), 3);  
469    gtk_container_add(GTK_CONTAINER(scrolled_window), context->view);    gtk_container_add(GTK_CONTAINER(scrolled_window), context->view);
470    gtk_box_pack_start_defaults(GTK_BOX(vbox), scrolled_window);    gtk_box_pack_start_defaults(GTK_BOX(vbox), scrolled_window);
471    #else
472      GtkWidget *pannable_area = hildon_pannable_area_new();
473      gtk_container_add(GTK_CONTAINER(pannable_area), context->view);
474      gtk_box_pack_start_defaults(GTK_BOX(vbox), pannable_area);
475    #endif
476    
477    /* ------- button box ------------ */    /* ------- button box ------------ */
478    
479    GtkWidget *hbox = gtk_hbox_new(TRUE,3);    GtkWidget *hbox = gtk_hbox_new(TRUE,3);
480    context->but_add = gtk_button_new_with_label(_("Add"));    context->but_add = gtk_button_new_with_label(_("Add"));
481    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
482      hildon_gtk_widget_set_theme_size(context->but_add,
483                 (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
484    #endif
485    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_add);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_add);
486    gtk_signal_connect(GTK_OBJECT(context->but_add), "clicked",    gtk_signal_connect(GTK_OBJECT(context->but_add), "clicked",
487                       GTK_SIGNAL_FUNC(on_location_add), context);                       GTK_SIGNAL_FUNC(on_location_add), context);
488    
489    context->but_edit = gtk_button_new_with_label(_("Edit"));    context->but_edit = gtk_button_new_with_label(_("Edit"));
490    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
491      hildon_gtk_widget_set_theme_size(context->but_edit,
492                 (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
493    #endif
494    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_edit);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_edit);
495    gtk_signal_connect(GTK_OBJECT(context->but_edit), "clicked",    gtk_signal_connect(GTK_OBJECT(context->but_edit), "clicked",
496                       GTK_SIGNAL_FUNC(on_location_edit), context);                       GTK_SIGNAL_FUNC(on_location_edit), context);
497    
498    context->but_remove = gtk_button_new_with_label(_("Remove"));    context->but_remove = gtk_button_new_with_label(_("Remove"));
499    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
500      hildon_gtk_widget_set_theme_size(context->but_remove,
501                 (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
502    #endif
503    gtk_widget_set_sensitive(context->but_remove,    gtk_widget_set_sensitive(context->but_remove,
504                             context->appdata->active_location);                             context->appdata->active_location);
505    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_remove);    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->but_remove);
506    gtk_signal_connect(GTK_OBJECT(context->but_remove), "clicked",    gtk_signal_connect(GTK_OBJECT(context->but_remove), "clicked",
507        GTK_SIGNAL_FUNC(on_location_remove), context);        GTK_SIGNAL_FUNC(on_location_remove), context);
508    
509    gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
510    return vbox;    return vbox;
511  }  }
512    
# Line 509  void cb_menu_settings(GtkWidget *window, Line 525  void cb_menu_settings(GtkWidget *window,
525  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
526    hildon_help_dialog_help_enable(GTK_DIALOG(dialog),    hildon_help_dialog_help_enable(GTK_DIALOG(dialog),
527                   HELP_ID_SETTINGS, appdata->osso_context);                   HELP_ID_SETTINGS, appdata->osso_context);
   gtk_window_set_default_size(GTK_WINDOW(dialog), 550, 100);  
528  #endif  #endif
529    
530    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
531      gtk_window_set_default_size(GTK_WINDOW(dialog), 550, 300);
532    #endif
533    
534    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
535                       notebook = gtk_notebook_new(), TRUE, TRUE, 0);                       notebook = gtk_notebook_new(), TRUE, TRUE, 0);
536    
Legend:
Removed from v.132  
changed lines
  Added in v.133