Diff of /trunk/src/main.c

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

revision 126 by harbaum, Mon Sep 28 19:01:03 2009 UTC revision 129 by harbaum, Tue Sep 29 14:30:16 2009 UTC
# Line 35  Line 35 
35    
36  extern char *strcasestr (__const char *__haystack, __const char *__needle);  extern char *strcasestr (__const char *__haystack, __const char *__needle);
37    
38  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
39  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
40                        gpointer user_data);                        gpointer user_data);
41    
# Line 226  void cachelist_view_onRowActivated(GtkTr Line 226  void cachelist_view_onRowActivated(GtkTr
226    if(gtk_tree_model_get_iter(model, &iter, path)) {    if(gtk_tree_model_get_iter(model, &iter, path)) {
227      cache_t *cache;      cache_t *cache;
228      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);      gtk_tree_model_get(model, &iter, CACHELIST_COL_DATA, &cache, -1);
229  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
230      cache_dialog(appdata, cache);      cache_dialog(appdata, cache);
231  #else  #else
232      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
# 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 546  static GtkWidget *cachelist_create(appda Line 535  static GtkWidget *cachelist_create(appda
535    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
536      gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);      gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);
537    
538    #ifdef ENABLE_OSM_GPS_MAP
539      map_update(appdata);
540    #endif
541    
542    /* update timer is being reset if the user scrolls or selects */    /* update timer is being reset if the user scrolls or selects */
543    g_signal_connect(view, "button-press-event",    g_signal_connect(view, "button-press-event",
544                     (GCallback)cachelist_update_reset0, appdata);                     (GCallback)cachelist_update_reset0, appdata);
# Line 838  static void gpxlist_view_onRowActivated( Line 831  static void gpxlist_view_onRowActivated(
831    
832          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
833        }        }
834  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
835  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
836        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
837  #endif  #endif
# Line 1461  cb_menu_search(GtkWidget *window, gpoint Line 1454  cb_menu_search(GtkWidget *window, gpoint
1454    
1455        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1456    
1457  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1458        gpx_t *found =        gpx_t *found =
1459          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1460    
# Line 1789  void menu_create(appdata_t *appdata) { Line 1782  void menu_create(appdata_t *appdata) {
1782    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1783    menu = gtk_menu_new();    menu = gtk_menu_new();
1784    
1785  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1786    appdata->menu_import =    appdata->menu_import =
1787  #endif  #endif
1788    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1819  void menu_create(appdata_t *appdata) { Line 1812  void menu_create(appdata_t *appdata) {
1812    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1813  #endif  #endif
1814    
1815  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1816    appdata->menu_export =    appdata->menu_export =
1817  #endif  #endif
1818      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1844  void menu_create(appdata_t *appdata) { Line 1837  void menu_create(appdata_t *appdata) {
1837    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1838                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1839    
1840  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1841    appdata->menu_search =    appdata->menu_search =
1842  #endif  #endif
1843    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 2051  gboolean on_window_key_press(GtkWidget * Line 2044  gboolean on_window_key_press(GtkWidget *
2044    return handled;    return handled;
2045  }  }
2046    
2047  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2048  typedef struct {  typedef struct {
2049    int level;    int level;
2050    appdata_t *appdata;    appdata_t *appdata;
# Line 2187  static void crumb_add(appdata_t *appdata Line 2180  static void crumb_add(appdata_t *appdata
2180    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2181                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2182  #else  #else
2183  #warning replacement missing    bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2184  #endif  #endif
2185  }  }
2186  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
# Line 2200  void main_after_settings_redraw(appdata_ Line 2193  void main_after_settings_redraw(appdata_
2193      return;      return;
2194    }    }
2195    
 #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  
2196    /* 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 */
2197    /* need to be redrawn */    /* need to be redrawn */
2198    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2266  void main_after_settings_redraw(appdata_ Line 2247  void main_after_settings_redraw(appdata_
2247    
2248      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2249    }    }
 #endif // USE_MAEMO  
2250  }  }
2251    
2252  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2322  int main(int argc, char *argv[]) { Line 2302  int main(int argc, char *argv[]) {
2302    /* Create a Window. */    /* Create a Window. */
2303    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2304    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2305    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2306  #endif  #endif
2307    
2308  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2350  int main(int argc, char *argv[]) { Line 2330  int main(int argc, char *argv[]) {
2330    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2331    
2332    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
   crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);  
2333  #else  #else
2334  #ifdef MY_BCT  #ifdef BCT
2335    /* on non-hildon machines we use some custom made breadcrumbtrail */    /* on non-hildon machines we use some custom made breadcrumbtrail */
2336    /* replacement */    /* replacement */
2337    appdata.bct = my_bct_new();    appdata.bct = bct_new();
2338    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);    gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2339  #endif  #endif
2340  #endif  #endif
2341    
2342    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2343      crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2344    #endif
2345    
2346    /* wait for main gui to appear */    /* wait for main gui to appear */
2347    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2348    while(gtk_events_pending())    while(gtk_events_pending())
Legend:
Removed from v.126  
changed lines
  Added in v.129