Diff of /trunk/src/main.c

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

revision 120 by harbaum, Sat Sep 19 19:19:42 2009 UTC revision 130 by harbaum, Wed Sep 30 12:11:22 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(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(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 274  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 298  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 326  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 334  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);
 #endif  
344    
345    return TRUE;    return TRUE;
346  }  }
# Line 593  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 619  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 833  static void gpxlist_view_onRowActivated( Line 835  static void gpxlist_view_onRowActivated(
835    
836          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
837        }        }
838  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
839  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
840        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
841  #endif  #endif
# Line 1456  cb_menu_search(GtkWidget *window, gpoint Line 1458  cb_menu_search(GtkWidget *window, gpoint
1458    
1459        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1460    
1461  #ifndef USE_BREAD_CRUMB_TRAIL  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1462        gpx_t *found =        gpx_t *found =
1463          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1464    
# Line 1552  cb_menu_export_log(GtkWidget *widget, gp Line 1554  cb_menu_export_log(GtkWidget *widget, gp
1554    notes_log_export(appdata);    notes_log_export(appdata);
1555  }  }
1556    
1557  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1558  static void  static void
1559  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {  cb_menu_export_mmpoi(GtkWidget *widget, gpointer data) {
1560    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1671  static void submenu_cleanup(GtkWidget *m Line 1673  static void submenu_cleanup(GtkWidget *m
1673  }  }
1674    
1675  static const menu_entry_t submenu_export_entries[] = {  static const menu_entry_t submenu_export_entries[] = {
1676    #ifdef ENABLE_MAEMO_MAPPER
1677    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1678      G_CALLBACK(cb_menu_export_mmpoi)  },      G_CALLBACK(cb_menu_export_mmpoi)  },
1679    #endif
1680    { "Export Field Notes",      "Save a Garmin Field Notes file",    { "Export Field Notes",      "Save a Garmin Field Notes file",
1681      G_CALLBACK(cb_menu_export_log)    },      G_CALLBACK(cb_menu_export_log)    },
1682    { "Export Garmin GPX",       "Save modified waypoints in GPX file",    { "Export Garmin GPX",       "Save modified waypoints in GPX file",
# Line 1782  void menu_create(appdata_t *appdata) { Line 1786  void menu_create(appdata_t *appdata) {
1786    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1787    menu = gtk_menu_new();    menu = gtk_menu_new();
1788    
1789  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1790    appdata->menu_import =    appdata->menu_import =
1791  #endif  #endif
1792    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1812  void menu_create(appdata_t *appdata) { Line 1816  void menu_create(appdata_t *appdata) {
1816    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1817  #endif  #endif
1818    
1819  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1820    appdata->menu_export =    appdata->menu_export =
1821  #endif  #endif
1822      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1820  void menu_create(appdata_t *appdata) { Line 1824  void menu_create(appdata_t *appdata) {
1824    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1825    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1826    
1827  #ifdef USE_MAEMO  #ifdef ENABLE_MAEMO_MAPPER
1828    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1829    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1830    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1837  void menu_create(appdata_t *appdata) { Line 1841  void menu_create(appdata_t *appdata) {
1841    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1842                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1843    
1844  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1845    appdata->menu_search =    appdata->menu_search =
1846  #endif  #endif
1847    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 2044  gboolean on_window_key_press(GtkWidget * Line 2048  gboolean on_window_key_press(GtkWidget *
2048    return handled;    return handled;
2049  }  }
2050    
2051  #ifdef USE_BREAD_CRUMB_TRAIL  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2052  typedef struct {  typedef struct {
2053    int level;    int level;
2054    appdata_t *appdata;    appdata_t *appdata;
# Line 2136  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 2176  static void crumb_add(appdata_t *appdata Line 2184  static void crumb_add(appdata_t *appdata
2184  #endif  #endif
2185    }    }
2186    
2187    #ifdef USE_BREAD_CRUMB_TRAIL
2188    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2189                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2190    #else
2191      bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2192    #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 2189  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 2255  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 2284  int main(int argc, char *argv[]) { Line 2287  int main(int argc, char *argv[]) {
2287      fprintf(stderr, "error initiating osso context\n");      fprintf(stderr, "error initiating osso context\n");
2288    }    }
2289    
2290    #ifdef ENABLE_MAEMO_MAPPER
2291    dbus_register(&appdata);    dbus_register(&appdata);
2292  #endif  #endif
2293    #endif
2294    
2295    icons_init();    icons_init();
2296    
# Line 2309  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
# Line 2337  int main(int argc, char *argv[]) { Line 2342  int main(int argc, char *argv[]) {
2342    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);
2343    
2344    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));    hildon_bread_crumb_trail_clear(HILDON_BREAD_CRUMB_TRAIL(appdata.bct));
2345    #else
2346    #ifdef BCT
2347      /* on non-hildon machines we use some custom made breadcrumbtrail */
2348      /* replacement */
2349      appdata.bct = bct_new();
2350      gtk_box_pack_start(GTK_BOX(appdata.vbox), appdata.bct, FALSE,FALSE,0);
2351    #endif
2352    #endif
2353    
2354    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2355    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);    crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2356  #endif  #endif
2357    
Legend:
Removed from v.120  
changed lines
  Added in v.130