Diff of /trunk/src/main.c

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

revision 231 by harbaum, Mon Dec 7 16:14:50 2009 UTC revision 237 by harbaum, Thu Dec 10 21:24:43 2009 UTC
# Line 36  Line 36 
36  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
37  #include <hildon/hildon-note.h>  #include <hildon/hildon-note.h>
38  #include <hildon/hildon-entry.h>  #include <hildon/hildon-entry.h>
 #include <hildon/hildon-check-button.h>  
39  #endif  #endif
40  #endif  #endif
41    
# Line 307  void cachelist_redraw(appdata_t *appdata Line 306  void cachelist_redraw(appdata_t *appdata
306    }    }
307    
308    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
   
309  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
310      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
311      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
312    #else
313        GtkWidget *container = appdata->vbox;
314  #endif  #endif
315    
316      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 327  void cachelist_redraw(appdata_t *appdata Line 326  void cachelist_redraw(appdata_t *appdata
326      }      }
327    
328  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
329      if(container != appdata->vbox)      gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
330        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);  #else
331      else      gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
332  #endif  #endif
       gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);  
333    
334      gtk_widget_show_all(container);      gtk_widget_show_all(container);
335    }    }
# Line 976  static GtkWidget *gpxlist_create_view_an Line 974  static GtkWidget *gpxlist_create_view_an
974    
975    appdata->gpxview = gtk_tree_view_new ();    appdata->gpxview = gtk_tree_view_new ();
976    
977      printf("building gpx list, items = %d\n", appdata->gpxlist_items);
978    
979    GtkTreeSelection *selection =    GtkTreeSelection *selection =
980      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));      gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
981  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
# Line 1343  typedef struct { Line 1343  typedef struct {
1343  } search_context_t;  } search_context_t;
1344    
1345    
 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  
 }  
   
1346  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {  static void callback_finds_toggled(GtkWidget *widget, gpointer data ) {
1347    search_context_t *context = (search_context_t*)data;    search_context_t *context = (search_context_t*)data;
1348    
# Line 2290  void main_after_settings_redraw(appdata_ Line 2263  void main_after_settings_redraw(appdata_
2263    }    }
2264    
2265    if(redraw) {    if(redraw) {
     GtkWidget *container = appdata->vbox;  
2266    
2267  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
2268      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
2269      container = hildon_window_stack_peek(stack);      GtkWidget *container = hildon_window_stack_peek(stack);
2270    #else
2271        GtkWidget *container = appdata->vbox;
2272  #endif  #endif
2273    
2274      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
# Line 2313  void main_after_settings_redraw(appdata_ Line 2287  void main_after_settings_redraw(appdata_
2287      }      }
2288    
2289  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
     if(container != appdata->vbox)  
2290        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2291      else  #else
 #endif  
2292        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);        gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2293    #endif
2294    
2295      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2296    }    }
# Line 2397  int main(int argc, char *argv[]) { Line 2370  int main(int argc, char *argv[]) {
2370    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);    appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2371    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);    gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2372    
2373    #ifndef USE_STACKABLE_WINDOW
2374    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2375    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
 #ifndef USE_STACKABLE_WINDOW  
2376    menu_create(&appdata);    menu_create(&appdata);
2377  #else  #else
2378    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),    hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
# Line 2435  int main(int argc, char *argv[]) { Line 2408  int main(int argc, char *argv[]) {
2408    gps_init(&appdata);    gps_init(&appdata);
2409    
2410    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);    appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
2411    #ifndef USE_STACKABLE_WINDOW
2412    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);    gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
2413    #else
2414      gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
2415    #endif
2416    
2417    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2418    gtk_main();    gtk_main();
Legend:
Removed from v.231  
changed lines
  Added in v.237