Diff of /trunk/src/main.c

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

revision 3 by harbaum, Mon Jun 22 13:05:30 2009 UTC revision 11 by harbaum, Fri Jun 26 12:24:24 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);        if(!appdata->cur_gpx)
815            cachelist_dialog(appdata, gpx);
816          else
817            printf("selected gpx, but cachelist window already present\n");
818  #else  #else
819        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);        gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
820        appdata->cur_view = cachelist_create(appdata, gpx, NULL);        appdata->cur_view = cachelist_create(appdata, gpx, NULL);
# Line 1010  cb_menu_adddir(GtkWidget *window, gpoint Line 1060  cb_menu_adddir(GtkWidget *window, gpoint
1060    if(new) gpxlist_add(appdata, new);    if(new) gpxlist_add(appdata, new);
1061  }  }
1062    
 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);  
 }  
   
1063  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
1064  static void  static void
1065  cb_menu_close(GtkWidget *window, gpointer data) {  cb_menu_close(GtkWidget *window, gpointer data) {
# Line 1343  cb_menu_search(GtkWidget *window, gpoint Line 1378  cb_menu_search(GtkWidget *window, gpoint
1378      /* don't search if we are asked to search for nothing */      /* don't search if we are asked to search for nothing */
1379      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&      if(((appdata->search & (SEARCH_ID|SEARCH_NAME|SEARCH_DESC|SEARCH_OWNER)) &&
1380          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {          strlen(p) > 0) || (appdata->search & SEARCH_FINDS)) {
       gpx_t *found = NULL;  
1381    
1382        printf("Search for %s (flags = %x)...\n", p, appdata->search);        printf("Search for %s (flags = %x)...\n", p, appdata->search);
1383    
1384  #ifndef USE_BREAD_CRUMB_TRAIL  #ifndef USE_BREAD_CRUMB_TRAIL
1385        found = search_do(appdata, appdata->gpx, p, appdata->search, FALSE);        appdata->search_results =
1386            search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
1387    
1388        /* do search result dialog here ... */        /* do search result dialog here ... */
1389        cachelist_dialog(appdata, found);        cachelist_dialog(appdata, appdata->search_results);
1390        search_result_free(found);  #ifndef USE_STACKABLE_WINDOW
1391          search_result_free(appdata->search_results);
1392          appdata->search_results = NULL;
1393    #endif
1394  #else  #else
1395          gpx_t *found = NULL;
1396    
1397        if(appdata->cur_gpx)        if(appdata->cur_gpx)
1398          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);          found = search_do(appdata, appdata->cur_gpx, p, appdata->search, TRUE);
1399        else        else
# Line 1450  cb_menu_export_garmin(GtkWidget *widget, Line 1490  cb_menu_export_garmin(GtkWidget *widget,
1490    garmin_export(appdata);    garmin_export(appdata);
1491  }  }
1492    
1493    static void
1494    cb_menu_geomath(GtkWidget *window, gpointer data) {
1495      geomath_dialog((appdata_t *)data);
1496    }
1497    
1498    static void
1499    cb_menu_geotext(GtkWidget *window, gpointer data) {
1500      geotext_dialog((appdata_t *)data);
1501    }
1502    
1503    static void
1504    cb_menu_precpos(GtkWidget *window, gpointer data) {
1505      precise_position((appdata_t *)data);
1506    }
1507    
1508  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1509    static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {
1510      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1511    }
1512    
1513  void on_export_clicked(GtkButton *button, appdata_t *appdata) {  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1514    GtkWidget *dialog = gtk_dialog_new();    HildonStackableWindow *view_window;
1515      GtkWidget *but;
1516    
1517    GtkWidget *but =    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1518      hildon_button_new_with_text(HILDON_SIZE_AUTO,    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");
                                 HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
                                 _("Export to Maemo Mapper"),  
                                 _("Write a Maemo Mapper POI file"));  
1519    
1520    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),     /* store last "cur_view" in window */
1521                      but);    g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1522      appdata->cur_view = NULL;
1523    
1524      g_signal_connect(G_OBJECT(view_window), "destroy",
1525                       G_CALLBACK(on_export_destroy), appdata);
1526    
1527      GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1528    
1529      but = hildon_button_new_with_text(
1530                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1531                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1532                _("Export to Maemo Mapper"),
1533                _("Save a Maemo Mapper POI file"));
1534      g_signal_connect(but, "clicked",
1535                       G_CALLBACK(cb_menu_export_mmpoi), appdata);
1536      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1537    
1538    
1539      but = hildon_button_new_with_text(
1540                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1541                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1542                _("Export Field Notes"),
1543                _("Save a Garmin Field Notes file"));
1544      g_signal_connect(but, "clicked",
1545                       G_CALLBACK(cb_menu_export_log), appdata);
1546      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1547    
1548    
1549      but = hildon_button_new_with_text(
1550                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1551                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1552                _("Export Garmin GPX"),
1553                _("Save a GPX file containing modified waypoints"));
1554      g_signal_connect(but, "clicked",
1555                       G_CALLBACK(cb_menu_export_garmin), appdata);
1556      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1557    
1558      gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1559      gtk_widget_show_all (GTK_WIDGET (view_window));
1560    }
1561    
1562    static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) {
1563      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1564    }
1565    
1566    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1567      HildonStackableWindow *view_window;
1568      GtkWidget *but;
1569    
1570      view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1571      gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools");
1572    
1573       /* store last "cur_view" in window */
1574      g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1575      appdata->cur_view = NULL;
1576    
1577      g_signal_connect(G_OBJECT(view_window), "destroy",
1578                       G_CALLBACK(on_tools_destroy), appdata);
1579    
1580      GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));
1581    
1582      but = hildon_button_new_with_text(
1583                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1584                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1585                _("Geomath"),
1586                _("Geocoordinate calculation"));
1587      g_signal_connect(but, "clicked",
1588                       G_CALLBACK(cb_menu_geomath), appdata);
1589      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1590    
1591    
1592      but = hildon_button_new_with_text(
1593                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1594                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1595                _("Geotext"),
1596                _("Text analysis, letter counting etc"));
1597      g_signal_connect(but, "clicked",
1598                       G_CALLBACK(cb_menu_geotext), appdata);
1599      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1600    
1601    
1602      but = hildon_button_new_with_text(
1603                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1604                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1605                _("Precise Position"),
1606                _("Calculate a very precise GPS position"));
1607      g_signal_connect(but, "clicked",
1608                       G_CALLBACK(cb_menu_precpos), appdata);
1609      gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);
1610    
1611  #if 0    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1612     g_signal_connect_swapped (dialog,    gtk_widget_show_all (GTK_WIDGET (view_window));
                              "response",  
                              G_CALLBACK (gtk_widget_destroy),  
                              dialog);  
 #endif  
   
    gtk_widget_show_all (dialog);  
    gint result = gtk_dialog_run(GTK_DIALOG(dialog));  
    gtk_widget_destroy(dialog);  
1613  }  }
1614    
1615  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1481  HildonAppMenu *menu_create(appdata_t *ap Line 1617  HildonAppMenu *menu_create(appdata_t *ap
1617    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());    HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1618    
1619    /* ------- */    /* ------- */
1620      button = gtk_button_new_with_label(_("About"));
1621      g_signal_connect_after(button, "clicked",
1622                             G_CALLBACK(cb_menu_about), appdata);
1623      hildon_app_menu_append(menu, GTK_BUTTON(button));
1624    
1625    button = gtk_button_new_with_label(_("Settings"));    button = gtk_button_new_with_label(_("Settings"));
1626    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),    g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1627                           appdata);                           appdata);
# Line 1492  HildonAppMenu *menu_create(appdata_t *ap Line 1633  HildonAppMenu *menu_create(appdata_t *ap
1633                             G_CALLBACK(cb_menu_add), appdata);                             G_CALLBACK(cb_menu_add), appdata);
1634      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1635    
1636      button = gtk_button_new_with_label(_("Import dir"));      button = gtk_button_new_with_label(_("Import directory"));
1637      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1638                             G_CALLBACK(cb_menu_adddir), appdata);                             G_CALLBACK(cb_menu_adddir), appdata);
1639      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1640    }    }
1641    
   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));  
   }  
   
1642    if(mode == MENU_GPXLIST) {    if(mode == MENU_GPXLIST) {
1643      button = gtk_button_new_with_label(_("Export Field Notes"));      button = gtk_button_new_with_label(_("Export"));
     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"));  
1644      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1645                             G_CALLBACK(cb_menu_export_garmin), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1646      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1647    
1648      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
# Line 1522  HildonAppMenu *menu_create(appdata_t *ap Line 1651  HildonAppMenu *menu_create(appdata_t *ap
1651      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1652    }    }
1653    
1654    button = gtk_button_new_with_label(_("About"));    button = gtk_button_new_with_label(_("Tools"));
1655    g_signal_connect_after(button, "clicked",    g_signal_connect_after(button, "clicked",
1656                           G_CALLBACK(cb_menu_about), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1657    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1658    
1659    gtk_widget_show(GTK_WIDGET(menu));    gtk_widget_show(GTK_WIDGET(menu));
# Line 1532  HildonAppMenu *menu_create(appdata_t *ap Line 1661  HildonAppMenu *menu_create(appdata_t *ap
1661    return menu;    return menu;
1662  }  }
1663  #else  #else
1664    
1665  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1666    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1667    menu = gtk_menu_new();    menu = gtk_menu_new();
# Line 1544  void menu_create(appdata_t *appdata) { Line 1674  void menu_create(appdata_t *appdata) {
1674    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1675    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1676    
1677    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1678    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1679    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1680    
1681    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1682    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1683    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1684    
# Line 1575  void menu_create(appdata_t *appdata) { Line 1705  void menu_create(appdata_t *appdata) {
1705    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1706    
1707  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1708    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1709    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1710    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1711                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1712  #endif  #endif
1713    
1714    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1715    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1716    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1717                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1718    
1719    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1720    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1721    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1722                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
# Line 1594  void menu_create(appdata_t *appdata) { Line 1724  void menu_create(appdata_t *appdata) {
1724  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
1725    appdata->menu_search =    appdata->menu_search =
1726  #endif  #endif
1727    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1728    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1729    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1730    
# Line 1636  void menu_create(appdata_t *appdata) { Line 1766  void menu_create(appdata_t *appdata) {
1766    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1767    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1768    
1769    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1770    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1771    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1772                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1773    
1774    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1775    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1776    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1777                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1778    
1779    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1780    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1781    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1782                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1654  void menu_create(appdata_t *appdata) { Line 1784  void menu_create(appdata_t *appdata) {
1784    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1785    
1786  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1787    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1788    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1789    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1790  #endif  #endif
1791    
1792    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1793    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1794    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1795    
# Line 1732  void on_window_destroy (GtkWidget *widge Line 1862  void on_window_destroy (GtkWidget *widge
1862  }  }
1863    
1864  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1865                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1866    int handled = FALSE;    int handled = FALSE;
1867    
1868    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1741  gboolean on_window_key_press(GtkWidget * Line 1870  gboolean on_window_key_press(GtkWidget *
1870    switch(event->keyval) {    switch(event->keyval) {
1871  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1872    
 #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  
   
1873  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
1874    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
1875      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1934  static void crumb_add(appdata_t *appdata Line 2054  static void crumb_add(appdata_t *appdata
2054  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2055    
2056  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2057      printf("main after settings redraw\n");
2058    
2059      if(!appdata->cur_view) {
2060        printf("no active view\n");
2061        return;
2062      }
2063    
2064  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2065    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2066    // 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 1969  void main_after_settings_redraw(appdata_ Line 2096  void main_after_settings_redraw(appdata_
2096    }    }
2097    
2098    if(redraw) {    if(redraw) {
2099      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2100    
2101    #ifdef USE_STACKABLE_WINDOW
2102        HildonWindowStack *stack = hildon_window_stack_get_default();
2103        container = hildon_window_stack_peek(stack);
2104    #endif
2105    
2106        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2107      switch(redraw) {      switch(redraw) {
2108      case 1:      case 1:
2109        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 1984  void main_after_settings_redraw(appdata_ Line 2118  void main_after_settings_redraw(appdata_
2118        break;        break;
2119      }      }
2120    
2121      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2122      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2123    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2124        else
2125  #endif  #endif
2126          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2127    
2128        gtk_widget_show_all(container);
2129      }
2130    #endif // USE_MAEMO
2131  }  }
2132    
2133  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
Legend:
Removed from v.3  
changed lines
  Added in v.11