Diff of /trunk/src/main.c

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

revision 113 by harbaum, Wed Sep 16 13:45:10 2009 UTC revision 126 by harbaum, Mon Sep 28 19:01:03 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  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_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 95  void errorf(const char *fmt, ...) { Line 95  void errorf(const char *fmt, ...) {
95    GtkWidget *dialog = gtk_message_dialog_new(    GtkWidget *dialog = gtk_message_dialog_new(
96                             GTK_WINDOW(NULL),                             GTK_WINDOW(NULL),
97                             GTK_DIALOG_DESTROY_WITH_PARENT,                             GTK_DIALOG_DESTROY_WITH_PARENT,
98                             GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
99                             buf);                             GTK_MESSAGE_ERROR,
100    #else
101                               GTK_MESSAGE_OTHER,
102    #endif
103                               GTK_BUTTONS_CLOSE, buf);
104    
105    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));    gtk_window_set_title(GTK_WINDOW(dialog), _("ERROR"));
106    
# Line 222  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  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_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 346  static gboolean cachelist_update(gpointe Line 350  static gboolean cachelist_update(gpointe
350    
351    if(appdata->cachelist_update)    if(appdata->cachelist_update)
352      cachelist_redraw(appdata);      cachelist_redraw(appdata);
353    
354  #endif  #endif
355    
356    return TRUE;    return TRUE;
# Line 833  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  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT)
842  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
843        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
844  #endif  #endif
# Line 1456  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  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_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 1552  cb_menu_export_log(GtkWidget *widget, gp Line 1557  cb_menu_export_log(GtkWidget *widget, gp
1557    notes_log_export(appdata);    notes_log_export(appdata);
1558  }  }
1559    
1560  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1561  static void  static void
1562  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1563    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1671  static void submenu_cleanup(GtkWidget *m Line 1676  static void submenu_cleanup(GtkWidget *m
1676  }  }
1677    
1678  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1679    #ifdef ENABLE_MAEMO_MAPPER
1680    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1681      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1682    #endif
1683    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1684      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1685    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1759  HildonAppMenu *menu_create(appdata_t *ap Line 1766  HildonAppMenu *menu_create(appdata_t *ap
1766    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1767    
1768  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
   if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {  
1769      button = gtk_button_new_with_label(_("Map"));      button = gtk_button_new_with_label(_("Map"));
1770      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1771                             G_CALLBACK(cb_menu_map), appdata);                             G_CALLBACK(cb_menu_map), appdata);
1772      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
   }  
1773  #endif  #endif
1774    
1775  #ifdef HILDON_HELP  #ifdef HILDON_HELP
# Line 1784  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  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_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 1814  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  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_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 1822  void menu_create(appdata_t *appdata) { Line 1827  void menu_create(appdata_t *appdata) {
1827    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1828    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1829    
1830  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1831    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1832    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1833    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1839  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  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_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 2046  gboolean on_window_key_press(GtkWidget * Line 2051  gboolean on_window_key_press(GtkWidget *
2051    return handled;    return handled;
2052  }  }
2053    
2054  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)
2055  typedef struct {  typedef struct {
2056    int level;    int level;
2057    appdata_t *appdata;    appdata_t *appdata;
# Line 2178  static void crumb_add(appdata_t *appdata Line 2183  static void crumb_add(appdata_t *appdata
2183  #endif  #endif
2184    }    }
2185    
2186    #ifdef USE_BREAD_CRUMB_TRAIL
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
2190    #warning replacement missing
2191    #endif
2192  }  }
2193  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2194    
# Line 2286  int main(int argc, char *argv[]) { Line 2295  int main(int argc, char *argv[]) {
2295      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2296    }    }
2297    
2298    #ifdef ENABLE_MAEMO_MAPPER
2299    dbus_register(&appdata);    dbus_register(&appdata);
2300  #endif  #endif
2301    #endif
2302    
2303    icons_init();    icons_init();
2304    
# Line 2340  int main(int argc, char *argv[]) { Line 2351  int main(int argc, char *argv[]) {
2351    
2352    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2353    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2354    #else
2355    #ifdef MY_BCT
2356      /* on non-hildon machines we use some custom made breadcrumbtrail */
2357      /* replacement */
2358      appdata.bct = my_bct_new();
2359      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2360    #endif
2361  #endif  #endif
2362    
2363    /* wait for main gui to appear */    /* wait for main gui to appear */
Legend:
Removed from v.113  
changed lines
  Added in v.126