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 15 by harbaum, Sun Jun 28 18:58: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),
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 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 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 void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {
1529      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
1530    }
1531    
1532    void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1533      HildonStackableWindow *view_window;
1534      GtkWidget *but;
1535    
1536      view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());
1537      gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");
1538    
1539       /* store last "cur_view" in window */
1540      g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);
1541      appdata->cur_view = NULL;
1542    
1543      g_signal_connect(G_OBJECT(view_window), "destroy",
1544                       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_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));
1631      gtk_widget_show_all (GTK_WIDGET (view_window));
1632    }
1633    
1634    HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
1635      GtkWidget *button;
1636      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"));
1645      g_signal_connect_after(button, "clicked", G_CALLBACK(cb_menu_settings),
1646                             appdata);
1647      hildon_app_menu_append(menu, GTK_BUTTON(button));
1648    
1649      if(mode == MENU_GPXLIST) {
1650        button = gtk_button_new_with_label(_("Import file"));
1651        g_signal_connect_after(button, "clicked",
1652                               G_CALLBACK(cb_menu_add), appdata);
1653        hildon_app_menu_append(menu, GTK_BUTTON(button));
1654    
1655        button = gtk_button_new_with_label(_("Import directory"));
1656        g_signal_connect_after(button, "clicked",
1657                               G_CALLBACK(cb_menu_adddir), appdata);
1658        hildon_app_menu_append(menu, GTK_BUTTON(button));
1659      }
1660    
1661      if(mode == MENU_GPXLIST) {
1662        button = gtk_button_new_with_label(_("Export"));
1663        g_signal_connect_after(button, "clicked",
1664                               G_CALLBACK(on_export_clicked), appdata);
1665        hildon_app_menu_append(menu, GTK_BUTTON(button));
1666    
1667        button = gtk_button_new_with_label(_("Search"));
1668        g_signal_connect_after(button, "clicked",
1669                               G_CALLBACK(cb_menu_search), appdata);
1670        hildon_app_menu_append(menu, GTK_BUTTON(button));
1671      }
1672    
1673      button = gtk_button_new_with_label(_("Tools"));
1674      g_signal_connect_after(button, "clicked",
1675                             G_CALLBACK(on_tools_clicked), appdata);
1676      hildon_app_menu_append(menu, GTK_BUTTON(button));
1677    
1678    #ifdef HILDON_HELP
1679      button = gtk_button_new_with_label(_("Help"));
1680      g_signal_connect_after(button, "clicked",
1681                             G_CALLBACK(cb_menu_help), appdata);
1682      hildon_app_menu_append(menu, GTK_BUTTON(button));
1683    #endif
1684    
1685      gtk_widget_show_all(GTK_WIDGET(menu));
1686    
1687      return menu;
1688    }
1689    #else
1690    
1691  void menu_create(appdata_t *appdata) {  void menu_create(appdata_t *appdata) {
1692    GtkWidget *menu, *item;    GtkWidget *menu, *item;
1693    menu = gtk_menu_new();    menu = gtk_menu_new();
1694    
1695  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1696    appdata->menu_import =    appdata->menu_import =
1697  #endif  #endif
1698    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 1700  void menu_create(appdata_t *appdata) {
1700    GtkWidget *submenu = gtk_menu_new();    GtkWidget *submenu = gtk_menu_new();
1701    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1702    
1703    item = gtk_menu_item_new_with_label( _("File...") );    item = gtk_menu_item_new_with_label( _("File") );
1704    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1705    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_add), appdata);
1706    
1707    item = gtk_menu_item_new_with_label( _("Directory...") );    item = gtk_menu_item_new_with_label( _("Directory") );
1708    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1709    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_adddir), appdata);
1710    
# Line 1479  void menu_create(appdata_t *appdata) { Line 1722  void menu_create(appdata_t *appdata) {
1722    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_remove), appdata);
1723  #endif  #endif
1724    
1725  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1726    appdata->menu_export =    appdata->menu_export =
1727  #endif  #endif
1728      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 1731  void menu_create(appdata_t *appdata) {
1731    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1732    
1733  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1734    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI...") );    item = gtk_menu_item_new_with_label( _("Maemo Mapper POI") );
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_mmpoi), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_mmpoi), appdata);
1738  #endif  #endif
1739    
1740    item = gtk_menu_item_new_with_label( _("Garmin Field Notes...") );    item = gtk_menu_item_new_with_label( _("Garmin Field Notes") );
1741    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1742    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1743                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_log), appdata);
1744    
1745    item = gtk_menu_item_new_with_label( _("Garmin GPX...") );    item = gtk_menu_item_new_with_label( _("Garmin GPX") );
1746    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1747    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1748                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);                     GTK_SIGNAL_FUNC(cb_menu_export_garmin), appdata);
1749    
1750  #ifdef USE_MAEMO  #ifdef USE_BREAD_CRUMB_TRAIL
1751    appdata->menu_search =    appdata->menu_search =
1752  #endif  #endif
1753    item = gtk_menu_item_new_with_label( _("Search...") );    item = gtk_menu_item_new_with_label( _("Search") );
1754    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1755    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_search), appdata);
1756    
1757    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1758    
1759    #ifndef NO_COPY_N_PASTE
1760    /* ----------- copy'n paste submenu ----------------- */    /* ----------- copy'n paste submenu ----------------- */
1761    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);    appdata->clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
1762    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 1778  void menu_create(appdata_t *appdata) {
1778    gtk_widget_set_sensitive(item, FALSE);    gtk_widget_set_sensitive(item, FALSE);
1779    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1780    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_paste), appdata);
1781    #endif
1782    
1783    item = gtk_menu_item_new_with_label( _("Settings...") );    item = gtk_menu_item_new_with_label( _("Settings") );
1784    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1785    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_settings),
1786                     appdata);                     appdata);
# Line 1547  void menu_create(appdata_t *appdata) { Line 1792  void menu_create(appdata_t *appdata) {
1792    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1793    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1794    
1795    item = gtk_menu_item_new_with_label( _("Geomath...") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1796    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1797    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1798                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geomath), appdata);
1799    
1800    item = gtk_menu_item_new_with_label( _("Geotext...") );    item = gtk_menu_item_new_with_label( _("Geotext") );
1801    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1802    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1803                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);                     GTK_SIGNAL_FUNC(cb_menu_geotext), appdata);
1804    
1805    item = gtk_menu_item_new_with_label( _("Precise Position...") );    item = gtk_menu_item_new_with_label( _("Precise Position") );
1806    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1807    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
1808                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);                     GTK_SIGNAL_FUNC(cb_menu_precpos), appdata);
# Line 1565  void menu_create(appdata_t *appdata) { Line 1810  void menu_create(appdata_t *appdata) {
1810    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());    gtk_menu_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
1811    
1812  #if defined(USE_MAEMO) && defined(HILDON_HELP)  #if defined(USE_MAEMO) && defined(HILDON_HELP)
1813    item = gtk_menu_item_new_with_label( _("Help...") );    item = gtk_menu_item_new_with_label( _("Help") );
1814    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1815    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_help), appdata);
1816  #endif  #endif
1817    
1818    item = gtk_menu_item_new_with_label( _("About...") );    item = gtk_menu_item_new_with_label( _("About") );
1819    gtk_menu_append(GTK_MENU_SHELL(menu), item);    gtk_menu_append(GTK_MENU_SHELL(menu), item);
1820    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);    g_signal_connect(item, "activate", GTK_SIGNAL_FUNC(cb_menu_about), appdata);
1821    
# Line 1596  void menu_create(appdata_t *appdata) { Line 1841  void menu_create(appdata_t *appdata) {
1841    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);
1842  #endif  #endif
1843  }  }
1844    #endif
1845    
1846  /********************* end of menu **********************/  /********************* end of menu **********************/
1847    
# Line 1642  void on_window_destroy (GtkWidget *widge Line 1888  void on_window_destroy (GtkWidget *widge
1888  }  }
1889    
1890  gboolean on_window_key_press(GtkWidget *widget,  gboolean on_window_key_press(GtkWidget *widget,
1891                           GdkEventKey *event, gpointer data) {                           GdkEventKey *event, appdata_t *appdata) {
   appdata_t *appdata = (appdata_t*)data;  
1892    int handled = FALSE;    int handled = FALSE;
1893    
1894    //  printf("key event %d\n", event->keyval);    //  printf("key event %d\n", event->keyval);
# Line 1651  gboolean on_window_key_press(GtkWidget * Line 1896  gboolean on_window_key_press(GtkWidget *
1896    switch(event->keyval) {    switch(event->keyval) {
1897  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1898    
 #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  
   
1899  #ifdef HILDON_HARDKEY_INCREASE  #ifdef HILDON_HARDKEY_INCREASE
1900    case HILDON_HARDKEY_INCREASE:    case HILDON_HARDKEY_INCREASE:
1901      html_zoom(appdata, TRUE);      html_zoom(appdata, TRUE);
# Line 1844  static void crumb_add(appdata_t *appdata Line 2080  static void crumb_add(appdata_t *appdata
2080  #endif // USE_BREAD_CRUMB_TRAIL  #endif // USE_BREAD_CRUMB_TRAIL
2081    
2082  void main_after_settings_redraw(appdata_t *appdata, int flags) {  void main_after_settings_redraw(appdata_t *appdata, int flags) {
2083      printf("main after settings redraw\n");
2084    
2085      if(!appdata->cur_view) {
2086        printf("no active view\n");
2087        return;
2088      }
2089    
2090  #ifndef USE_MAEMO  #ifndef USE_MAEMO
2091    // in non-maemo setup this can only affect the main screen as    // in non-maemo setup this can only affect the main screen as
2092    // 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 2122  void main_after_settings_redraw(appdata_
2122    }    }
2123    
2124    if(redraw) {    if(redraw) {
2125      gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);      GtkWidget *container = appdata->vbox;
2126    
2127    #ifdef USE_STACKABLE_WINDOW
2128        HildonWindowStack *stack = hildon_window_stack_get_default();
2129        container = hildon_window_stack_peek(stack);
2130    #endif
2131    
2132        gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
2133      switch(redraw) {      switch(redraw) {
2134      case 1:      case 1:
2135        appdata->cur_view = cachelist_create(appdata,        appdata->cur_view = cachelist_create(appdata,
# Line 1894  void main_after_settings_redraw(appdata_ Line 2144  void main_after_settings_redraw(appdata_
2144        break;        break;
2145      }      }
2146    
2147      gtk_box_pack_start_defaults(GTK_BOX(appdata->vbox), appdata->cur_view);  #ifdef USE_STACKABLE_WINDOW
2148      gtk_widget_show_all(appdata->vbox);      if(container != appdata->vbox)
2149    }        gtk_container_add(GTK_CONTAINER(container), appdata->cur_view);
2150        else
2151  #endif  #endif
2152          gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
2153    
2154        gtk_widget_show_all(container);
2155      }
2156    #endif // USE_MAEMO
2157  }  }
2158    
2159  int main(int argc, char *argv[]) {  int main(int argc, char *argv[]) {
# Line 1954  int main(int argc, char *argv[]) { Line 2210  int main(int argc, char *argv[]) {
2210    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2211  #endif  #endif
2212    
2213    #if MAEMO_VERSION_MAJOR == 5
2214    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2215    #endif
2216    
2217    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2218                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2219    
# Line 1964  int main(int argc, char *argv[]) { Line 2223  int main(int argc, char *argv[]) {
2223    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2224    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
2225    
2226    #ifndef USE_STACKABLE_WINDOW
2227    menu_create(&appdata);    menu_create(&appdata);
2228    #else
2229      hildon_window_set_app_menu(HILDON_WINDOW(appdata.window),
2230                                 menu_create(&appdata, MENU_GPXLIST));
2231    #endif
2232    
2233  #ifdef USE_BREAD_CRUMB_TRAIL  #ifdef USE_BREAD_CRUMB_TRAIL
2234    appdata.bct = hildon_bread_crumb_trail_new();    appdata.bct = hildon_bread_crumb_trail_new();
Legend:
Removed from v.1  
changed lines
  Added in v.15