Diff of /trunk/src/main.c

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

revision 4 by harbaum, Mon Jun 22 14:25:59 2009 UTC revision 14 by harbaum, Sat Jun 27 19:18:40 2009 UTC
# Line 120  gpx_t *choose_file(appdata_t *appdata, g Line 120  gpx_t *choose_file(appdata_t *appdata, g
120                   HELP_ID_IMPORT, appdata->osso_context);                   HELP_ID_IMPORT, appdata->osso_context);
121  #endif  #endif
122  #else  #else
123    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Open Directory"):    dialog = gtk_file_chooser_dialog_new (whole_dir?_("Import directory"):
124                                          _("Open File"),                                          _("Import file"),
125                          GTK_WINDOW(appdata->window),                          GTK_WINDOW(appdata->window),
126                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :                          whole_dir?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER :
127                                          GTK_FILE_CHOOSER_ACTION_OPEN,                                          GTK_FILE_CHOOSER_ACTION_OPEN,
# Line 264  void cachelist_redraw(appdata_t *appdata Line 264  void cachelist_redraw(appdata_t *appdata
264    // gtk_widget_show_all(appdata->vbox);    // gtk_widget_show_all(appdata->vbox);
265  #else  #else
266    
267      if(!appdata->cur_view) {
268        printf("cachelist redraw: no active view\n");
269        return;
270      }
271    
272    g_assert(!appdata->cur_cache);    g_assert(!appdata->cur_cache);
273    int redraw = 0;    int redraw = 0;
274    if(appdata->search_results)    if(appdata->search_results)
# Line 274  void cachelist_redraw(appdata_t *appdata Line 279  void cachelist_redraw(appdata_t *appdata
279    }    }
280    
281    if(redraw) {    if(redraw) {
282      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
283    
284        printf("redraw %d\n", redraw);
285    
286    #ifdef USE_STACKABLE_WINDOW
287        HildonWindowStack *stack = hildon_window_stack_get_default();
288        container = hildon_window_stack_peek(stack);
289    #endif
290    
291        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
292      switch(redraw) {      switch(redraw) {
293      case 1:      case 1:
294        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 286  void cachelist_redraw(appdata_t *appdata Line 300  void cachelist_redraw(appdata_t *appdata
300        break;        break;
301      }      }
302    
303      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
304      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
305          gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
306        else
307    #endif
308          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
309    
310        gtk_widget_show_all(container);
311    }    }
312  #endif  #endif
313  }  }
# Line 300  static gboolean cachelist_update(gpointe Line 320  static gboolean cachelist_update(gpointe
320  #ifdef USE_MAEMO  #ifdef USE_MAEMO
321    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
322    
323      if(appdata->cur_cache)
324        return TRUE;
325    
326    if(appdata->cachelist_disable_screensaver)    if(appdata->cachelist_disable_screensaver)
327      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)      if (osso_display_blanking_pause(appdata->osso_context) != OSSO_OK)
328        fprintf(stderr, "error with display blank\n");        fprintf(stderr, "error with display blank\n");
# Line 312  static gboolean cachelist_update(gpointe Line 335  static gboolean cachelist_update(gpointe
335  }  }
336    
337  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(appdata_t *appdata) {
338      printf("cachelist timer reset\n");
339    g_assert(appdata->cachelist_handler_id);    g_assert(appdata->cachelist_handler_id);
340    gtk_timeout_remove(appdata->cachelist_handler_id);    gtk_timeout_remove(appdata->cachelist_handler_id);
341    appdata->cachelist_handler_id =    appdata->cachelist_handler_id =
# Line 543  void cachelist_dialog(appdata_t *appdata Line 567  void cachelist_dialog(appdata_t *appdata
567  }  }
568  #else  #else
569  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
570    static void search_result_free(gpx_t *result);
571    
572    void on_cachelist_destroy(GtkWidget *widget, appdata_t *appdata) {
573      if(appdata->search_results) {
574        search_result_free(appdata->search_results);
575        appdata->search_results = NULL;
576      }
577      appdata->cur_gpx = NULL;
578    
579      /* restore cur_view */
580      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
581    }
582    
583  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {  void cachelist_dialog(appdata_t *appdata, gpx_t *gpx) {
584    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
585    
586    gtk_window_set_title(GTK_WINDOW(window), gpx->name);    /* store last "cur_view" in window */
587      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
588    
589    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_gpx = gpx;
590                      cachelist_create(appdata, gpx, NULL));    char *title = g_strdup_printf("GPXView - %s", gpx->name);
591      gtk_window_set_title(GTK_WINDOW(window), title);
592      g_free(title);
593    
594      appdata->cur_view = cachelist_create(appdata, gpx, NULL);
595      gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
596    
597    
598    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
599                               menu_create(appdata, MENU_CACHELIST));                               menu_create(appdata, MENU_CACHELIST));
600    
601      g_signal_connect(G_OBJECT(window), "destroy",
602                       G_CALLBACK(on_cachelist_destroy), appdata);
603    
604    gtk_widget_show_all(window);    gtk_widget_show_all(window);
605  }  }
606  #endif  #endif
# Line 764  static void gpxlist_view_onRowActivated( Line 811  static void gpxlist_view_onRowActivated(
811          gpx_busy_dialog_destroy(dialog);          gpx_busy_dialog_destroy(dialog);
812        }        }
813  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
814        cachelist_dialog(appdata, gpx);  #ifdef USE_STACKABLE_WINDOW
815          if(!appdata->cur_gpx)
816    #endif
817            cachelist_dialog(appdata, gpx);
818    #ifdef USE_STACKABLE_WINDOW
819          else
820            printf("selected gpx, but cachelist window already present\n");
821    #endif
822  #else  #else
823        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
824        appdata->cur_view = cachelist_create(appdata, gpx, NULL);        appdata->cur_view = cachelist_create(appdata, gpx, NULL);
# Line 969  cb_menu_about(GtkWidget *window, gpointe Line 1023  cb_menu_about(GtkWidget *window, gpointe
1023    
1024    gtk_about_dialog_set_name(about, "GPXView");    gtk_about_dialog_set_name(about, "GPXView");
1025    gtk_about_dialog_set_version(about, VERSION);    gtk_about_dialog_set_version(about, VERSION);
1026    gtk_about_dialog_set_copyright(about,  
1027           _("GPXView (c) 2008 by\n"  #ifdef ENABLE_LIBLOCATION
1028           "Till Harbaum <till@harbaum.org>\n"    char *uses = "uses liblocation";
1029           "Geocaching.com: Tantil"));  #elif defined(ENABLE_GPSBT)
1030      char *uses = "uses gpsbt and gpsd";
1031    #else
1032      char *uses = "uses gpsd";
1033    #endif
1034    
1035      char *str = g_strdup_printf("%s\n\n%s",
1036                                  _("GPXView (c) 2008 by\n"
1037                                    "Till Harbaum <till@harbaum.org>\n"
1038                                    "Geocaching.com: Tantil"),
1039                                  _(uses)
1040                                  );
1041    
1042      gtk_about_dialog_set_copyright(about, str);
1043      g_free(str);
1044    
1045    gtk_about_dialog_set_website(about,    gtk_about_dialog_set_website(about,
1046         _("http://www.harbaum.org/till/maemo"));         _("http://www.harbaum.org/till/maemo"));
# Line 1010  cb_menu_adddir(GtkWidget *window, gpoint Line 1078  cb_menu_adddir(GtkWidget *window, gpoint
1078    if(new) gpxlist_add(appdata, new);    if(new) gpxlist_add(appdata, new);
1079  }  }
1080    
 static void  
 cb_menu_geomath(GtkWidget *window, gpointer data) {  
   geomath_dialog((appdata_t *)data);  
 }  
   
 static void  
 cb_menu_geotext(GtkWidget *window, gpointer data) {  
   geotext_dialog((appdata_t *)data);  
 }  
   
 static void  
 cb_menu_precpos(GtkWidget *window, gpointer data) {  
   precise_position((appdata_t *)data);  
 }  
   
1081  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1082  static void  static void
1083  cb_menu_close(GtkWidget *window, gpointer data) {  cb_menu_close(GtkWidget *window, gpointer data) {
# Line 1343  cb_menu_search(GtkWidget *window, gpoint Line 1396  cb_menu_search(GtkWidget *window, gpoint
1396      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1397      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1398          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1399    
1400        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1401    
1402  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1403        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        gpx_t *found =
1404            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1405    
1406        /* do search result dialog here ... */        /* do search result dialog here ... */
1407        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, found);
1408    #ifndef USE_STACKABLE_WINDOW
1409        search_result_free(found);        search_result_free(found);
1410  #else  #else
1411          appdata->search_results = found;
1412    #endif
1413    #else
1414          gpx_t *found = NULL;
1415    
1416        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1417          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1418        else        else
# Line 1450  cb_menu_export_garmin(GtkWidget *widget, Line 1509  cb_menu_export_garmin(GtkWidget *widget,
1509    garmin_export(appdata);    garmin_export(appdata);
1510  }  }
1511    
1512  #ifdef USE_STACKABLE_WINDOW  static void
1513  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1514    GtkWidget *but, *dialog = gtk_dialog_new();    geomath_dialog((appdata_t *)data);
1515    }
1516    
1517    static void
1518    cb_menu_geotext(GtkWidget *window, gpointer data) {
1519      geotext_dialog((appdata_t *)data);
1520    }
1521    
1522    gtk_window_set_title(GTK_WINDOW(dialog), _("Export"));  static void
1523    cb_menu_precpos(GtkWidget *window, gpointer data) {
1524      precise_position((appdata_t *)data);
1525    }
1526    
1527    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  #ifdef USE_STACKABLE_WINDOW
1528                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,  static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {
1529                                      _("Export to Maemo Mapper"),    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1530                                      _("Write a Maemo Mapper POI file"));  }
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);  
   
1531    
1532    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1533                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    HildonStackableWindow *view_window;
1534                                      _("Export Field Notes"),    GtkWidget *but;
                                     _("Write a Garmin Field Notes file"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);  
   
1535    
1536    but = hildon_button_new_with_text(HILDON_SIZE_AUTO,    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1537                                      HILDON_BUTTON_ARRANGEMENT_VERTICAL,    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");
                                     _("Export Garmin GPX"),  
                                     _("Write GPX file of modified points"));  
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), but);  
   
1538    
1539  #if 0     /* store last "cur_view" in window */
1540     g_signal_connect_swapped (dialog,    g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1541                               "response",    appdata->cur_view = NULL;
1542                               G_CALLBACK (gtk_widget_destroy),  
1543                               dialog);    g_signal_connect(G_OBJECT(view_window), "destroy",
1544  #endif                     G_CALLBACK(on_export_destroy), appdata);
1545    
1546      GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1547    
1548      but = hildon_button_new_with_text(
1549                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1550                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1551                _("Export to Maemo Mapper"),
1552                _("Save a Maemo Mapper POI file"));
1553      g_signal_connect(but, "clicked",
1554                       G_CALLBACK(cb_menu_export_mmpoi), appdata);
1555      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1556    
1557    
1558      but = hildon_button_new_with_text(
1559                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1560                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1561                _("Export Field Notes"),
1562                _("Save a Garmin Field Notes file"));
1563      g_signal_connect(but, "clicked",
1564                       G_CALLBACK(cb_menu_export_log), appdata);
1565      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1566    
1567    
1568      but = hildon_button_new_with_text(
1569                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1570                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1571                _("Export Garmin GPX"),
1572                _("Save a GPX file containing modified waypoints"));
1573      g_signal_connect(but, "clicked",
1574                       G_CALLBACK(cb_menu_export_garmin), appdata);
1575      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1576    
1577      gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1578      gtk_widget_show_all (GTK_WIDGET (view_window));
1579    }
1580    
1581    static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) {
1582      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1583    }
1584    
1585    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1586      HildonStackableWindow *view_window;
1587      GtkWidget *but;
1588    
1589      view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1590      gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools");
1591    
1592       /* store last "cur_view" in window */
1593      g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1594      appdata->cur_view = NULL;
1595    
1596      g_signal_connect(G_OBJECT(view_window), "destroy",
1597                       G_CALLBACK(on_tools_destroy), appdata);
1598    
1599      GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1600    
1601      but = hildon_button_new_with_text(
1602                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1603                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1604                _("Geomath"),
1605                _("Geocoordinate calculation"));
1606      g_signal_connect(but, "clicked",
1607                       G_CALLBACK(cb_menu_geomath), appdata);
1608      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1609    
1610    
1611      but = hildon_button_new_with_text(
1612                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1613                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1614                _("Geotext"),
1615                _("Text analysis, letter counting etc"));
1616      g_signal_connect(but, "clicked",
1617                       G_CALLBACK(cb_menu_geotext), appdata);
1618      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1619    
1620    
1621      but = hildon_button_new_with_text(
1622                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1623                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1624                _("Precise Position"),
1625                _("Calculate a very precise GPS position"));
1626      g_signal_connect(but, "clicked",
1627                       G_CALLBACK(cb_menu_precpos), appdata);
1628      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1629    
1630     gtk_widget_show_all (dialog);    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1631     gint result = gtk_dialog_run(GTK_DIALOG(dialog));    gtk_widget_show_all (GTK_WIDGET (view_window));
    gtk_widget_destroy(dialog);  
1632  }  }
1633    
1634  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1494  HildonAppMenu *menu_create(appdata_t *ap Line 1636  HildonAppMenu *menu_create(appdata_t *ap
1636    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1637    
1638    /* ------- */    /* ------- */
1639      button = gtk_button_new_with_label(_("About"));
1640      g_signal_connect_after(button, "clicked",
1641                             G_CALLBACK(cb_menu_about), appdata);
1642      hildon_app_menu_append(menu, GTK_BUTTON(button));
1643    
1644    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1645    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1646                           appdata);                           appdata);
# Line 1505  HildonAppMenu *menu_create(appdata_t *ap Line 1652  HildonAppMenu *menu_create(appdata_t *ap
1652                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1653      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1654    
1655      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1656      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1657                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1658      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1659    }    }
1660    
 #if 0  
   if(mode == MENU_GPXLIST || mode == MENU_CACHELIST) {  
     button = gtk_button_new_with_label(_("Export to Mapper"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_export_mmpoi), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   }  
   
   if(mode == MENU_GPXLIST) {  
     button = gtk_button_new_with_label(_("Export Field Notes"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_export_log), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
     button = gtk_button_new_with_label(_("Export Garmin GPX"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_export_garmin), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   
     button = gtk_button_new_with_label(_("Search"));  
     g_signal_connect_after(button, "clicked",  
                            G_CALLBACK(cb_menu_search), appdata);  
     hildon_app_menu_append(menu, GTK_BUTTON(button));  
   }  
 #else  
   
1661    if(mode == MENU_GPXLIST) {    if(mode == MENU_GPXLIST) {
1662      button = gtk_button_new_with_label(_("Export"));      button = gtk_button_new_with_label(_("Export"));
1663      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
# Line 1549  HildonAppMenu *menu_create(appdata_t *ap Line 1670  HildonAppMenu *menu_create(appdata_t *ap
1670      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1671    }    }
1672    
1673  #endif    button = gtk_button_new_with_label(_("Tools"));
   
   button = gtk_button_new_with_label(_("About"));  
1674    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1675                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1676    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1677    
1678    gtk_widget_show(GTK_WIDGET(menu));    //  gtk_widget_show(GTK_WIDGET(menu));
1679    
1680    return menu;    return menu;
1681  }  }
1682  #else  #else
1683    
1684  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1685    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1686    menu = gtk_menu_new();    menu = gtk_menu_new();
# Line 1573  void menu_create(appdata_t *appdata) { Line 1693  void menu_create(appdata_t *appdata) {
1693    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1694    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1695    
1696    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1697    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1698    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1699    
1700    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1701    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1702    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1703    
# Line 1604  void menu_create(appdata_t *appdata) { Line 1724  void menu_create(appdata_t *appdata) {
1724    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1725    
1726  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1727    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1728    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1729    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1730                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1731  #endif  #endif
1732    
1733    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1734    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1735    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1736                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1737    
1738    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1739    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1740    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1741                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
# Line 1623  void menu_create(appdata_t *appdata) { Line 1743  void menu_create(appdata_t *appdata) {
1743  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
1744    appdata->menu_search =    appdata->menu_search =
1745  #endif  #endif
1746    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1747    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1748    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1749    
# Line 1665  void menu_create(appdata_t *appdata) { Line 1785  void menu_create(appdata_t *appdata) {
1785    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1786    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1787    
1788    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1789    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1790    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1791                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1792    
1793    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1794    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1795    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1796                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1797    
1798    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1799    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1800    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1801                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1683  void menu_create(appdata_t *appdata) { Line 1803  void menu_create(appdata_t *appdata) {
1803    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1804    
1805  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1806    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1807    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1808    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1809  #endif  #endif
1810    
1811    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1812    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1813    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1814    
# Line 1761  void on_window_destroy (GtkWidget *widge Line 1881  void on_window_destroy (GtkWidget *widge
1881  }  }
1882    
1883  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1884                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1885    int handled = FALSE;    int handled = FALSE;
1886    
1887    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1770  gboolean on_window_key_press(GtkWidget * Line 1889  gboolean on_window_key_press(GtkWidget *
1889    switch(event->keyval) {    switch(event->keyval) {
1890  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1891    
 #if 0  /* don't do this as it interferes with gtkentry fields */  
   case HILDON_HARDKEY_SELECT:  
     /* remove as long as we haven't reached the main gpx list */  
     if(appdata->cur_gpx)  
       hildon_bread_crumb_trail_pop(HILDON_BREAD_CRUMB_TRAIL(appdata->bct));  
     handled = TRUE;  
     break;  
 #endif  
   
1892  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
1893    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
1894      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1963  static void crumb_add(appdata_t *appdata Line 2073  static void crumb_add(appdata_t *appdata
2073  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2074    
2075  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2076      printf("main after settings redraw\n");
2077    
2078      if(!appdata->cur_view) {
2079        printf("no active view\n");
2080        return;
2081      }
2082    
2083  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2084    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2085    // the menu is blocked while a dialog is open. also the main    // the menu is blocked while a dialog is open. also the main
# Line 1998  void main_after_settings_redraw(appdata_ Line 2115  void main_after_settings_redraw(appdata_
2115    }    }
2116    
2117    if(redraw) {    if(redraw) {
2118      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2119    
2120    #ifdef USE_STACKABLE_WINDOW
2121        HildonWindowStack *stack = hildon_window_stack_get_default();
2122        container = hildon_window_stack_peek(stack);
2123    #endif
2124    
2125        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2126      switch(redraw) {      switch(redraw) {
2127      case 1:      case 1:
2128        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 2013  void main_after_settings_redraw(appdata_ Line 2137  void main_after_settings_redraw(appdata_
2137        break;        break;
2138      }      }
2139    
2140      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2141      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2142    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2143        else
2144  #endif  #endif
2145          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2146    
2147        gtk_widget_show_all(container);
2148      }
2149    #endif // USE_MAEMO
2150  }  }
2151    
2152  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 2073  int main(int argc, char *argv[]) { Line 2203  int main(int argc, char *argv[]) {
2203    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2204  #endif  #endif
2205    
2206    #if MAEMO_VERSION_MAJOR == 5
2207    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2208    #endif
2209    
2210    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2211                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2212    
Legend:
Removed from v.4  
changed lines
  Added in v.14