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 128 by harbaum, Tue Sep 29 07:31:18 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 838  static void gpxlist_view_onRowActivated( Line 838  static void gpxlist_view_onRowActivated(
838    
839          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
840        }        }
841  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
842  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
843        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
844  #endif  #endif
# Line 1461  cb_menu_search(GtkWidget *window, gpoint Line 1461  cb_menu_search(GtkWidget *window, gpoint
1461    
1462        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1463    
1464  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1465        gpx_t *found =        gpx_t *found =
1466          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1467    
# Line 1789  void menu_create(appdata_t *appdata) { Line 1789  void menu_create(appdata_t *appdata) {
1789    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1790    menu = gtk_menu_new();    menu = gtk_menu_new();
1791    
1792  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1793    appdata->menu_import =    appdata->menu_import =
1794  #endif  #endif
1795    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 1819  void menu_create(appdata_t *appdata) {
1819    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1820  #endif  #endif
1821    
1822  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1823    appdata->menu_export =    appdata->menu_export =
1824  #endif  #endif
1825      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 1844  void menu_create(appdata_t *appdata) {
1844    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1845                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1846    
1847  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1848    appdata->menu_search =    appdata->menu_search =
1849  #endif  #endif
1850    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 2051  gboolean on_window_key_press(GtkWidget *
2051    return handled;    return handled;
2052  }  }
2053    
2054  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2055  typedef struct {  typedef struct {
2056    int level;    int level;
2057    appdata_t *appdata;    appdata_t *appdata;
# Line 2187  static void crumb_add(appdata_t *appdata Line 2187  static void crumb_add(appdata_t *appdata
2187    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2188                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2189  #else  #else
2190  #warning replacement missing    bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2191  #endif  #endif
2192  }  }
2193  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
# Line 2350  int main(int argc, char *argv[]) { Line 2350  int main(int argc, char *argv[]) {
2350    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);
2351    
2352    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);  
2353  #else  #else
2354  #ifdef MY_BCT  #ifdef BCT
2355    /* on non-hildon machines we use some custom made breadcrumbtrail */    /* on non-hildon machines we use some custom made breadcrumbtrail */
2356    /* replacement */    /* replacement */
2357    appdata.bct = my_bct_new();    appdata.bct = bct_new();
2358    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);
2359  #endif  #endif
2360  #endif  #endif
2361    
2362    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2363      crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2364    #endif
2365    
2366    /* wait for main gui to appear */    /* wait for main gui to appear */
2367    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2368    while(gtk_events_pending())    while(gtk_events_pending())
Legend:
Removed from v.126  
changed lines
  Added in v.128