Diff of /trunk/src/main.c

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

revision 1 by harbaum, Sat Jun 20 11:08:47 2009 UTC revision 24 by harbaum, Mon Jul 6 14:07:36 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),
599                                 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  }  }
# Line 761  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 966  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-2009 by\n"
1037                            "Till Harbaum <till@harbaum.org>\n"
1038                            "Mailing list: gpxview-users@garage.maemo.org"),
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 1007  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 1340  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 1380  cb_menu_quit(GtkWidget *window, gpointer Line 1442  cb_menu_quit(GtkWidget *window, gpointer
1442  }  }
1443  #endif  #endif
1444    
1445    #ifndef NO_COPY_N_PASTE
1446  static void  static void
1447  cb_menu_cut(GtkWidget *widget, gpointer data) {  cb_menu_cut(GtkWidget *widget, gpointer data) {
1448    appdata_t *appdata = (appdata_t*)data;    appdata_t *appdata = (appdata_t*)data;
# Line 1424  cb_menu_paste(GtkWidget *widget, gpointe Line 1487  cb_menu_paste(GtkWidget *widget, gpointe
1487    } else    } else
1488      printf("paste: ERROR, no active buffer\n");      printf("paste: ERROR, no active buffer\n");
1489  }  }
1490    #endif
1491    
1492  static void  static void
1493  cb_menu_export_log(GtkWidget *widget, gpointer data) {  cb_menu_export_log(GtkWidget *widget, gpointer data) {
# Line 1445  cb_menu_export_garmin(GtkWidget *widget, Line 1509  cb_menu_export_garmin(GtkWidget *widget,
1509    garmin_export(appdata);    garmin_export(appdata);
1510  }  }
1511    
1512    static void
1513    cb_menu_geomath(GtkWidget *window, gpointer data) {
1514      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    static void
1523    cb_menu_precpos(GtkWidget *window, gpointer data) {
1524      precise_position((appdata_t *)data);
1525    }
1526    
1527    #ifdef USE_STACKABLE_WINDOW
1528    static GtkWidget *export_menu_create(appdata_t *appdata) {
1529      GtkWidget *button;
1530      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1531    
1532      button = hildon_button_new_with_text(
1533                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1534                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1535                _("Export to Maemo Mapper"),
1536                _("Save a Maemo Mapper POI file"));
1537      g_signal_connect_after(button, "clicked",
1538                       G_CALLBACK(cb_menu_export_mmpoi), appdata);
1539      hildon_app_menu_append(menu, GTK_BUTTON(button));
1540    
1541      button = hildon_button_new_with_text(
1542                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1543                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1544                _("Export Field Notes"),
1545                _("Save a Garmin Field Notes file"));
1546      g_signal_connect_after(button, "clicked",
1547                       G_CALLBACK(cb_menu_export_log), appdata);
1548      hildon_app_menu_append(menu, GTK_BUTTON(button));
1549    
1550      button = hildon_button_new_with_text(
1551                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1552                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1553                _("Export Garmin GPX"),
1554                _("Save modified waypoints in GPX file"));
1555      g_signal_connect_after(button, "clicked",
1556                       G_CALLBACK(cb_menu_export_garmin), appdata);
1557      hildon_app_menu_append(menu, GTK_BUTTON(button));
1558    
1559      gtk_widget_show_all(GTK_WIDGET(menu));
1560    
1561      return GTK_WIDGET(menu);
1562    }
1563    
1564    /* the export submenu */
1565    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1566      if(!appdata->export_menu)
1567        appdata->export_menu = export_menu_create(appdata);
1568    
1569      /* draw a popup menu */
1570      hildon_app_menu_popup(HILDON_APP_MENU(appdata->export_menu),
1571                            GTK_WINDOW(hildon_window_stack_peek(
1572                        hildon_window_stack_get_default())));
1573    }
1574    
1575    static GtkWidget *tools_menu_create(appdata_t *appdata) {
1576      GtkWidget *button;
1577      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1578    
1579      /* the following doesn't have an effect */
1580      //  gtk_window_set_title(GTK_WINDOW(menu), "Tools");
1581    
1582      button = 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_after(button, "clicked",
1588                       G_CALLBACK(cb_menu_geomath), appdata);
1589      hildon_app_menu_append(menu, GTK_BUTTON(button));
1590    
1591    
1592      button = hildon_button_new_with_text(
1593                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1594                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1595                _("Geotext"),
1596                _("Text analysis"));
1597      g_signal_connect_after(button, "clicked",
1598                       G_CALLBACK(cb_menu_geotext), appdata);
1599      hildon_app_menu_append(menu, GTK_BUTTON(button));
1600    
1601    
1602      button = 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 precise GPS position"));
1607      g_signal_connect_after(button, "clicked",
1608                       G_CALLBACK(cb_menu_precpos), appdata);
1609      hildon_app_menu_append(menu, GTK_BUTTON(button));
1610    
1611      gtk_widget_show_all(GTK_WIDGET(menu));
1612    
1613      return GTK_WIDGET(menu);
1614    }
1615    
1616    /* the tools submenu */
1617    void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1618      if(!appdata->tools_menu)
1619        appdata->tools_menu = tools_menu_create(appdata);
1620    
1621      /* draw a popup menu */
1622      hildon_app_menu_popup(HILDON_APP_MENU(appdata->tools_menu),
1623                            GTK_WINDOW(hildon_window_stack_peek(
1624                        hildon_window_stack_get_default())));
1625    }
1626    
1627    
1628    HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1629      GtkWidget *button;
1630      HildonAppMenu *menu = HILDON_APP_MENU(hildon_app_menu_new());
1631    
1632      /* ------- */
1633      button = gtk_button_new_with_label(_("About"));
1634      g_signal_connect_after(button, "clicked",
1635                             G_CALLBACK(cb_menu_about), appdata);
1636      hildon_app_menu_append(menu, GTK_BUTTON(button));
1637    
1638      button = gtk_button_new_with_label(_("Settings"));
1639      g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1640                             appdata);
1641      hildon_app_menu_append(menu, GTK_BUTTON(button));
1642    
1643      if(mode == MENU_GPXLIST) {
1644        button = gtk_button_new_with_label(_("Import file"));
1645        g_signal_connect_after(button, "clicked",
1646                               G_CALLBACK(cb_menu_add), appdata);
1647        hildon_app_menu_append(menu, GTK_BUTTON(button));
1648    
1649        button = gtk_button_new_with_label(_("Import directory"));
1650        g_signal_connect_after(button, "clicked",
1651                               G_CALLBACK(cb_menu_adddir), appdata);
1652        hildon_app_menu_append(menu, GTK_BUTTON(button));
1653      }
1654    
1655      if(mode == MENU_GPXLIST) {
1656        button = gtk_button_new_with_label(_("Export"));
1657        g_signal_connect_after(button, "clicked",
1658                               G_CALLBACK(on_export_clicked), appdata);
1659        hildon_app_menu_append(menu, GTK_BUTTON(button));
1660    
1661        button = gtk_button_new_with_label(_("Search"));
1662        g_signal_connect_after(button, "clicked",
1663                               G_CALLBACK(cb_menu_search), appdata);
1664        hildon_app_menu_append(menu, GTK_BUTTON(button));
1665      }
1666    
1667      button = gtk_button_new_with_label(_("Tools"));
1668      g_signal_connect_after(button, "clicked",
1669                             G_CALLBACK(on_tools_clicked), appdata);
1670      hildon_app_menu_append(menu, GTK_BUTTON(button));
1671    
1672    #ifdef HILDON_HELP
1673      button = gtk_button_new_with_label(_("Help"));
1674      g_signal_connect_after(button, "clicked",
1675                             G_CALLBACK(cb_menu_help), appdata);
1676      hildon_app_menu_append(menu, GTK_BUTTON(button));
1677    #endif
1678    
1679      gtk_widget_show_all(GTK_WIDGET(menu));
1680    
1681      return menu;
1682    }
1683    #else
1684    
1685  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1686    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1687    menu = gtk_menu_new();    menu = gtk_menu_new();
1688    
1689  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1690    appdata->menu_import =    appdata->menu_import =
1691  #endif  #endif
1692    item = gtk_menu_item_new_with_label(_("Import"));    item = gtk_menu_item_new_with_label(_("Import"));
# Line 1457  void menu_create(appdata_t *appdata) { Line 1694  void menu_create(appdata_t *appdata) {
1694    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1695    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1696    
1697    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1698    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1699    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1700    
1701    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1702    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1703    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1704    
# Line 1479  void menu_create(appdata_t *appdata) { Line 1716  void menu_create(appdata_t *appdata) {
1716    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1717  #endif  #endif
1718    
1719  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1720    appdata->menu_export =    appdata->menu_export =
1721  #endif  #endif
1722      item = gtk_menu_item_new_with_label(_("Export"));      item = gtk_menu_item_new_with_label(_("Export"));
# Line 1488  void menu_create(appdata_t *appdata) { Line 1725  void menu_create(appdata_t *appdata) {
1725    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1726    
1727  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1728    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
1729    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1730    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1731                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1732  #endif  #endif
1733    
1734    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1735    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1736    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1737                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1738    
1739    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1740    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1741    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1742                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1743    
1744  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1745    appdata->menu_search =    appdata->menu_search =
1746  #endif  #endif
1747    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1748    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1749    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1750    
1751    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1752    
1753    #ifndef NO_COPY_N_PASTE
1754    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1755    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
1756    gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);    gtk_clipboard_set_can_store(appdata->clipboard, NULL, 0);
# Line 1534  void menu_create(appdata_t *appdata) { Line 1772  void menu_create(appdata_t *appdata) {
1772    gtk_widget_set_sensitive(item, FALSE);    gtk_widget_set_sensitive(item, FALSE);
1773    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1774    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);
1775    #endif
1776    
1777    item = gtk_menu_item_new_with_label( _("Settings...") );    item = gtk_menu_item_new_with_label( _("Settings") );
1778    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1779    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),
1780                     appdata);                     appdata);
# Line 1547  void menu_create(appdata_t *appdata) { Line 1786  void menu_create(appdata_t *appdata) {
1786    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1787    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1788    
1789    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1790    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1791    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1792                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1793    
1794    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1795    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1796    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1797                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1798    
1799    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1800    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1801    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1802                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1565  void menu_create(appdata_t *appdata) { Line 1804  void menu_create(appdata_t *appdata) {
1804    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1805    
1806  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1807    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1808    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1809    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1810  #endif  #endif
1811    
1812    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1813    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1814    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1815    
# Line 1596  void menu_create(appdata_t *appdata) { Line 1835  void menu_create(appdata_t *appdata) {
1835    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);    gtk_box_pack_start(GTK_BOX(appdata->vbox), menu_bar, 0, 0, 0);
1836  #endif  #endif
1837  }  }
1838    #endif
1839    
1840  /********************* end of menu **********************/  /********************* end of menu **********************/
1841    
# Line 1642  void on_window_destroy (GtkWidget *widge Line 1882  void on_window_destroy (GtkWidget *widge
1882  }  }
1883    
1884  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1885                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1886    int handled = FALSE;    int handled = FALSE;
1887    
1888    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1651  gboolean on_window_key_press(GtkWidget * Line 1890  gboolean on_window_key_press(GtkWidget *
1890    switch(event->keyval) {    switch(event->keyval) {
1891  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1892    
 #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  
   
1893  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
1894    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
1895      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1844  static void crumb_add(appdata_t *appdata Line 2074  static void crumb_add(appdata_t *appdata
2074  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2075    
2076  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2077      printf("main after settings redraw\n");
2078    
2079      if(!appdata->cur_view) {
2080        printf("no active view\n");
2081        return;
2082      }
2083    
2084  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2085    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2086    // 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 1879  void main_after_settings_redraw(appdata_ Line 2116  void main_after_settings_redraw(appdata_
2116    }    }
2117    
2118    if(redraw) {    if(redraw) {
2119      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2120    
2121    #ifdef USE_STACKABLE_WINDOW
2122        HildonWindowStack *stack = hildon_window_stack_get_default();
2123        container = hildon_window_stack_peek(stack);
2124    #endif
2125    
2126        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2127      switch(redraw) {      switch(redraw) {
2128      case 1:      case 1:
2129        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 1894  void main_after_settings_redraw(appdata_ Line 2138  void main_after_settings_redraw(appdata_
2138        break;        break;
2139      }      }
2140    
2141      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2142      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2143    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2144        else
2145  #endif  #endif
2146          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2147    
2148        gtk_widget_show_all(container);
2149      }
2150    #endif // USE_MAEMO
2151  }  }
2152    
2153  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 1954  int main(int argc, char *argv[]) { Line 2204  int main(int argc, char *argv[]) {
2204    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2205  #endif  #endif
2206    
2207    #if MAEMO_VERSION_MAJOR == 5
2208    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2209    #endif
2210    
2211    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2212                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2213    
# Line 1964  int main(int argc, char *argv[]) { Line 2217  int main(int argc, char *argv[]) {
2217    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2218    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2219    
2220    #ifndef USE_STACKABLE_WINDOW
2221    menu_create(&appdata);    menu_create(&appdata);
2222    #else
2223      hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
2224                                 menu_create(&appdata, MENU_GPXLIST));
2225    #endif
2226    
2227  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
2228    appdata.bct = hildon_bread_crumb_trail_new();    appdata.bct = hildon_bread_crumb_trail_new();
Legend:
Removed from v.1  
changed lines
  Added in v.24