Diff of /trunk/src/settings.c

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

revision 221 by harbaum, Mon Nov 30 21:28:04 2009 UTC revision 233 by harbaum, Wed Dec 9 19:45:36 2009 UTC
# Line 29  typedef struct { Line 29  typedef struct {
29    GtkWidget *loc;    GtkWidget *loc;
30  } settings_dialog_state_t;  } settings_dialog_state_t;
31    
 /* ------------------------ special gui elements for fremantle ------------------ */  
   
 static GtkWidget *toggle_button_new_with_label(char *label) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_check_button_new_with_label(label);  
 #else  
   GtkWidget *cbut = gtk_toggle_button_new_with_label(label);  
   hildon_gtk_widget_set_theme_size(cbut,  
            (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));  
   gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(cbut), FALSE);  
   return cbut;  
 #endif  
 }  
   
 static void toggle_button_set_active(GtkWidget *button, gboolean active) {  
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);  
 }  
   
 static gboolean toggle_button_get_active(GtkWidget *button) {  
   return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));  
 }  
   
 static GtkWidget *check_button_new_with_label(char *label) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_check_button_new_with_label(label);  
 #else  
   GtkWidget *cbut =  
     hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);  
   gtk_button_set_label(GTK_BUTTON(cbut), label);  
   return cbut;  
 #endif  
 }  
   
 static void check_button_set_active(GtkWidget *button, gboolean active) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);  
 #else  
   hildon_check_button_set_active(HILDON_CHECK_BUTTON(button), active);  
 #endif  
 }  
   
 static gboolean check_button_get_active(GtkWidget *button) {  
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));  
 #else  
   return hildon_check_button_get_active(HILDON_CHECK_BUTTON(button));  
 #endif  
 }  
   
32  /* Our usual callback function */  /* Our usual callback function */
33  static void settings_update(GtkWidget *widget, gpointer data) {  static void settings_update(GtkWidget *widget, gpointer data) {
34    settings_dialog_state_t *hstate = (settings_dialog_state_t *)data;    settings_dialog_state_t *hstate = (settings_dialog_state_t *)data;
# Line 182  static void on_location_edit(GtkWidget * Line 133  static void on_location_edit(GtkWidget *
133    
134    gtk_table_attach_defaults(GTK_TABLE(table),    gtk_table_attach_defaults(GTK_TABLE(table),
135             preset_coordinate_picker(context->appdata, latw, lonw), 2, 3, 1, 2);             preset_coordinate_picker(context->appdata, latw, lonw), 2, 3, 1, 2);
136      gtk_table_attach_defaults(GTK_TABLE(table),
137               goto_coordinate(context->appdata, latw, lonw), 2, 3, 2, 3);
138    
139    if(loc)    if(loc)
140      gtk_entry_set_text(GTK_ENTRY(name), loc->name);      gtk_entry_set_text(GTK_ENTRY(name), loc->name);
Legend:
Removed from v.221  
changed lines
  Added in v.233