Diff of /trunk/src/main.c

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

revision 128 by harbaum, Tue Sep 29 07:31:18 2009 UTC revision 130 by harbaum, Wed Sep 30 12:11:22 2009 UTC
# Line 278  static GtkWidget *cachelist_create(appda Line 278  static GtkWidget *cachelist_create(appda
278                                     cache_t *sel_cache);                                     cache_t *sel_cache);
279    
280  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
 #ifndef USE_MAEMO  
   //  gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
   //  appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
   //  gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
   // gtk_widget_show_all(appdata->vbox);  
 #else  
   
281    if(!appdata->cur_view) {    if(!appdata->cur_view) {
282      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
283      return;      return;
# Line 302  void cachelist_redraw(appdata_t *appdata Line 295  void cachelist_redraw(appdata_t *appdata
295    if(redraw) {    if(redraw) {
296      GtkWidget *container = appdata->vbox;      GtkWidget *container = appdata->vbox;
297    
     printf("redraw %d\n", redraw);  
   
298  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
299      HildonWindowStack *stack = hildon_window_stack_get_default();      HildonWindowStack *stack = hildon_window_stack_get_default();
300      container = hildon_window_stack_peek(stack);      container = hildon_window_stack_peek(stack);
# Line 330  void cachelist_redraw(appdata_t *appdata Line 321  void cachelist_redraw(appdata_t *appdata
321    
322      gtk_widget_show_all(container);      gtk_widget_show_all(container);
323    }    }
 #endif  
324  }  }
325    
326    
# Line 338  static gboolean cachelist_update(gpointe Line 328  static gboolean cachelist_update(gpointe
328    
329    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
330    
 #ifdef USE_MAEMO  
331    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
332    
333    if(appdata->cur_cache)    if(appdata->cur_cache)
334      return TRUE;      return TRUE;
335    
336    #ifdef USE_MAEMO
337    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
338      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
339        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
340    #endif
341    
342    if(appdata->cachelist_update)    if(appdata->cachelist_update)
343      cachelist_redraw(appdata);      cachelist_redraw(appdata);
344    
 #endif  
   
345    return TRUE;    return TRUE;
346  }  }
347    
# Line 598  void on_cachelist_destroy(GtkWidget *wid Line 587  void on_cachelist_destroy(GtkWidget *wid
587    }    }
588    appdata->cur_gpx = NULL;    appdata->cur_gpx = NULL;
589    
590    #ifdef ENABLE_OSM_GPS_MAP
591      map_update(appdata);
592    #endif
593    
594    /* restore cur_view */    /* restore cur_view */
595    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
596  }  }
# Line 624  void cachelist_dialog(appdata_t *appdata Line 617  void cachelist_dialog(appdata_t *appdata
617                     G_CALLBACK(on_cachelist_destroy), appdata);                     G_CALLBACK(on_cachelist_destroy), appdata);
618    
619    gtk_widget_show_all(window);    gtk_widget_show_all(window);
620    
621    #ifdef ENABLE_OSM_GPS_MAP
622      map_update(appdata);
623    #endif
624  }  }
625  #endif  #endif
626  #endif  #endif
# Line 2143  crumb_back(gpointer data) { Line 2140  crumb_back(gpointer data) {
2140    
2141    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2142    g_free(data);    g_free(data);
2143    
2144    #ifdef ENABLE_OSM_GPS_MAP
2145      map_update(crumb->appdata);
2146    #endif
2147  }  }
2148    
2149  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2189  static void crumb_add(appdata_t *appdata Line 2190  static void crumb_add(appdata_t *appdata
2190  #else  #else
2191    bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);    bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2192  #endif  #endif
2193    
2194    #ifdef ENABLE_OSM_GPS_MAP
2195      map_update(appdata);
2196    #endif
2197  }  }
2198  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2199    
# Line 2200  void main_after_settings_redraw(appdata_ Line 2205  void main_after_settings_redraw(appdata_
2205      return;      return;
2206    }    }
2207    
 #ifndef USE_MAEMO  
   // in non-maemo setup this can only affect the main screen as  
   // the menu is blocked while a dialog is open. also the main  
   // screen is always present  
   if(appdata->gpxlist_items != appdata->cur_items) {  
     /* re-do the main screen */  
     gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);  
     appdata->cur_view = gpxlist_create_view_and_model(appdata, NULL);  
     gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  
     gtk_widget_show_all(appdata->vbox);  
   }  
 #else  
2208    /* a cache screen cannot be changed from the settings and thus doesn't */    /* a cache screen cannot be changed from the settings and thus doesn't */
2209    /* need to be redrawn */    /* need to be redrawn */
2210    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2266  void main_after_settings_redraw(appdata_ Line 2259  void main_after_settings_redraw(appdata_
2259    
2260      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2261    }    }
 #endif // USE_MAEMO  
2262  }  }
2263    
2264  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2322  int main(int argc, char *argv[]) { Line 2314  int main(int argc, char *argv[]) {
2314    /* Create a Window. */    /* Create a Window. */
2315    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2316    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2317    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2318  #endif  #endif
2319    
2320  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
Legend:
Removed from v.128  
changed lines
  Added in v.130