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 133 by harbaum, Mon Oct 12 20:27:55 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 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 757  static void gpxlist_view_onRowActivated( Line 754  static void gpxlist_view_onRowActivated(
754        GtkWidget *dialog = gtk_message_dialog_new(        GtkWidget *dialog = gtk_message_dialog_new(
755                   GTK_WINDOW(appdata->window),                   GTK_WINDOW(appdata->window),
756                   GTK_DIALOG_DESTROY_WITH_PARENT,                   GTK_DIALOG_DESTROY_WITH_PARENT,
757                   GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL,                   /* this doesn't fix the text selection issues ... */
758    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >=5)
759                     GTK_MESSAGE_OTHER,
760    #else
761                     GTK_MESSAGE_QUESTION,
762    #endif
763                     GTK_BUTTONS_CANCEL,
764                   _("Do you want to close this entry only or do "                   _("Do you want to close this entry only or do "
765                     "you want to remove it completely from the list?"));                     "you want to remove it completely from the list?"));
766    
# Line 769  static void gpxlist_view_onRowActivated( Line 772  static void gpxlist_view_onRowActivated(
772        if(gpx->closed)        if(gpx->closed)
773          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);          gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), 2, FALSE);
774    
775        gtk_window_set_title(GTK_WINDOW(dialog), _("Remove entry?"));        gtk_window_set_title(GTK_WINDOW(dialog), _("Close or remove entry?"));
776    
777        /* set the active flag again if the user answered "no" */        /* set the active flag again if the user answered "no" */
778        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {        switch(gtk_dialog_run(GTK_DIALOG(dialog))) {
# Line 838  static void gpxlist_view_onRowActivated( Line 841  static void gpxlist_view_onRowActivated(
841    
842          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
843        }        }
844  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
845  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
846        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
847  #endif  #endif
# Line 1461  cb_menu_search(GtkWidget *window, gpoint Line 1464  cb_menu_search(GtkWidget *window, gpoint
1464    
1465        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1466    
1467  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(MY_BCT)  #if !defined(USE_BREAD_CRUMB_TRAIL) && !defined(BCT)
1468        gpx_t *found =        gpx_t *found =
1469          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1470    
# Line 1789  void menu_create(appdata_t *appdata) { Line 1792  void menu_create(appdata_t *appdata) {
1792    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1793    menu = gtk_menu_new();    menu = gtk_menu_new();
1794    
1795  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1796    appdata->menu_import =    appdata->menu_import =
1797  #endif  #endif
1798    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 1822  void menu_create(appdata_t *appdata) {
1822    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1823  #endif  #endif
1824    
1825  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1826    appdata->menu_export =    appdata->menu_export =
1827  #endif  #endif
1828      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 1847  void menu_create(appdata_t *appdata) {
1847    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1848                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1849    
1850  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(MY_BCT)  #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
1851    appdata->menu_search =    appdata->menu_search =
1852  #endif  #endif
1853    item = gtk_menu_item_new_with_label( _("Search") );    item = gtk_menu_item_new_with_label( _("Search") );
# Line 1853  void menu_create(appdata_t *appdata) { Line 1856  void menu_create(appdata_t *appdata) {
1856    
1857    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1858    
 #ifndef NO_COPY_N_PASTE  
1859    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1860    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);  #ifndef NO_COPY_N_PASTE
   gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);  
   
1861    item = gtk_menu_item_new_with_label(_("Edit"));    item = gtk_menu_item_new_with_label(_("Edit"));
1862    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1863    submenu = gtk_menu_new();    submenu = gtk_menu_new();
# 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 2143  crumb_back(gpointer data) { Line 2143  crumb_back(gpointer data) {
2143    
2144    gtk_widget_show_all(crumb->appdata->vbox);    gtk_widget_show_all(crumb->appdata->vbox);
2145    g_free(data);    g_free(data);
2146    
2147    #ifdef ENABLE_OSM_GPS_MAP
2148      map_update(crumb->appdata);
2149    #endif
2150  }  }
2151    
2152  static void crumb_add(appdata_t *appdata, char *name, int level,  static void crumb_add(appdata_t *appdata, char *name, int level,
# Line 2187  static void crumb_add(appdata_t *appdata Line 2191  static void crumb_add(appdata_t *appdata
2191    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),    hildon_bread_crumb_trail_push_text(HILDON_BREAD_CRUMB_TRAIL(appdata->bct),
2192                                       name, crumb, (GDestroyNotify)crumb_back);                                       name, crumb, (GDestroyNotify)crumb_back);
2193  #else  #else
2194  #warning replacement missing    bct_push_text(appdata->bct, name, crumb, (GDestroyNotify)crumb_back);
2195    #endif
2196    
2197    #ifdef ENABLE_OSM_GPS_MAP
2198      map_update(appdata);
2199  #endif  #endif
2200  }  }
2201  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
# Line 2200  void main_after_settings_redraw(appdata_ Line 2208  void main_after_settings_redraw(appdata_
2208      return;      return;
2209    }    }
2210    
 #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  
2211    /* 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 */
2212    /* need to be redrawn */    /* need to be redrawn */
2213    if(appdata->cur_cache) {    if(appdata->cur_cache) {
# Line 2266  void main_after_settings_redraw(appdata_ Line 2262  void main_after_settings_redraw(appdata_
2262    
2263      gtk_widget_show_all(container);      gtk_widget_show_all(container);
2264    }    }
 #endif // USE_MAEMO  
2265  }  }
2266    
2267  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2322  int main(int argc, char *argv[]) { Line 2317  int main(int argc, char *argv[]) {
2317    /* Create a Window. */    /* Create a Window. */
2318    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    appdata.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2319    /* Set a decent default size for the window. */    /* Set a decent default size for the window. */
2320    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 640, 480);
2321  #endif  #endif
2322    
2323  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
# Line 2335  int main(int argc, char *argv[]) { Line 2330  int main(int argc, char *argv[]) {
2330    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",    g_signal_connect(G_OBJECT(appdata.window), "key_press_event",
2331                     G_CALLBACK(on_window_key_press), &appdata);                     G_CALLBACK(on_window_key_press), &appdata);
2332    
2333      /* prepare clipboard */
2334      appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
2335      gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
2336    
2337    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2338    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2339  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
# Line 2350  int main(int argc, char *argv[]) { Line 2349  int main(int argc, char *argv[]) {
2349    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);
2350    
2351    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);  
2352  #else  #else
2353  #ifdef MY_BCT  #ifdef BCT
2354    /* on non-hildon machines we use some custom made breadcrumbtrail */    /* on non-hildon machines we use some custom made breadcrumbtrail */
2355    /* replacement */    /* replacement */
2356    appdata.bct = my_bct_new();    appdata.bct = bct_new();
2357    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);
2358  #endif  #endif
2359  #endif  #endif
2360    
2361    #if defined(USE_BREAD_CRUMB_TRAIL) || defined(BCT)
2362      crumb_add(&appdata, "GPX", CRUMB_GPXLIST, NULL);
2363    #endif
2364    
2365    /* wait for main gui to appear */    /* wait for main gui to appear */
2366    gtk_widget_show_all(GTK_WIDGET(appdata.window));    gtk_widget_show_all(GTK_WIDGET(appdata.window));
2367    while(gtk_events_pending())    while(gtk_events_pending())
Legend:
Removed from v.126  
changed lines
  Added in v.133