Diff of /trunk/src/main.c

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

revision 11 by harbaum, Fri Jun 26 12:24:24 2009 UTC revision 32 by harbaum, Tue Jul 28 13:21:22 2009 UTC
# Line 811  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    #ifdef USE_STACKABLE_WINDOW
815        if(!appdata->cur_gpx)        if(!appdata->cur_gpx)
816    #endif
817          cachelist_dialog(appdata, gpx);          cachelist_dialog(appdata, gpx);
818    #ifdef USE_STACKABLE_WINDOW
819        else        else
820          printf("selected gpx, but cachelist window already present\n");          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 1019  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 1382  cb_menu_search(GtkWidget *window, gpoint Line 1400  cb_menu_search(GtkWidget *window, gpoint
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        appdata->search_results =        gpx_t *found =
1404          search_do(appdata, appdata->gpx, p, appdata->search, FALSE);          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, appdata->search_results);        cachelist_dialog(appdata, found);
1408  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
1409        search_result_free(appdata->search_results);        search_result_free(found);
1410        appdata->search_results = NULL;  #else
1411          appdata->search_results = found;
1412  #endif  #endif
1413  #else  #else
1414        gpx_t *found = NULL;        gpx_t *found = NULL;
# Line 1490  cb_menu_export_garmin(GtkWidget *widget, Line 1509  cb_menu_export_garmin(GtkWidget *widget,
1509    garmin_export(appdata);    garmin_export(appdata);
1510  }  }
1511    
1512    #ifdef ENABLE_OSM_GPS_MAP
1513    static void
1514    cb_menu_map(GtkWidget *window, gpointer data) {
1515      map((appdata_t *)data);
1516    }
1517    #endif
1518    
1519  static void  static void
1520  cb_menu_geomath(GtkWidget *window, gpointer data) {  cb_menu_geomath(GtkWidget *window, gpointer data) {
1521    geomath_dialog((appdata_t *)data);    geomath_dialog((appdata_t *)data);
# Line 1506  cb_menu_precpos(GtkWidget *window, gpoin Line 1532  cb_menu_precpos(GtkWidget *window, gpoin
1532  }  }
1533    
1534  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
1535  static void on_export_destroy(GtkWidget *widget, appdata_t *appdata) {  typedef struct {
1536    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    char *label, *desc;
1537  }    GtkSignalFunc activate_cb;
1538    } menu_entry_t;
 void on_export_clicked(GtkButton *button, appdata_t *appdata) {  
   HildonStackableWindow *view_window;  
   GtkWidget *but;  
   
   view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());  
   gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Export");  
   
    /* store last "cur_view" in window */  
   g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);  
   appdata->cur_view = NULL;  
   
   g_signal_connect(G_OBJECT(view_window), "destroy",  
                    G_CALLBACK(on_export_destroy), appdata);  
1539    
1540    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  typedef struct {
1541      const char *title;
1542      const menu_entry_t *menu;
1543      int len;
1544    } submenu_t;
1545    
1546    #define COLUMNS  1
1547    
1548    void on_submenu_entry_clicked(GtkButton *button, GtkWidget *menu) {
1549    
1550      /* force closing of submenu dialog */
1551      gtk_dialog_response(GTK_DIALOG(menu), GTK_RESPONSE_NONE);
1552      gtk_widget_hide(menu);
1553    
1554      /* let gtk clean up */
1555      while(gtk_events_pending())
1556        gtk_main_iteration();
1557    }
1558    
1559    static GtkWidget *app_submenu_create(appdata_t *appdata,
1560                                         const submenu_t *submenu) {
1561    
1562      /* create a oridinary dialog box */
1563      GtkWidget *dialog = gtk_dialog_new();
1564      gtk_window_set_title(GTK_WINDOW(dialog), _(submenu->title));
1565      gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
1566      gtk_window_set_transient_for(GTK_WINDOW(dialog),
1567                                   GTK_WINDOW(appdata->window));
1568      gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
1569    
1570      GtkWidget *table = gtk_table_new(submenu->len/COLUMNS, COLUMNS, TRUE);
1571      int x = 0, y = 0;
1572    
1573      const menu_entry_t *menu_entries = submenu->menu;
1574      while(menu_entries->label) {
1575        GtkWidget *button = NULL;
1576    
1577    but = hildon_button_new_with_text(      button = hildon_button_new_with_text(
1578              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,
1579              HILDON_BUTTON_ARRANGEMENT_VERTICAL,              HILDON_BUTTON_ARRANGEMENT_VERTICAL,
1580              _("Export to Maemo Mapper"),              _(menu_entries->label), _(menu_entries->desc));
             _("Save a Maemo Mapper POI file"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_export_mmpoi), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1581    
1582        /* try to center both texts */
1583        hildon_button_set_title_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1584        hildon_button_set_value_alignment(HILDON_BUTTON(button), 0.5, 0.5);
1585    
1586    but = hildon_button_new_with_text(      g_signal_connect(button, "clicked",
1587              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,                       G_CALLBACK(on_submenu_entry_clicked), dialog);
1588              HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
1589              _("Export Field Notes"),      g_signal_connect(button, "clicked",
1590              _("Save a Garmin Field Notes file"));                       menu_entries->activate_cb, appdata);
1591    g_signal_connect(but, "clicked",  
1592                     G_CALLBACK(cb_menu_export_log), appdata);      gtk_table_attach_defaults(GTK_TABLE(table),  button, x, x+1, y, y+1);
1593    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1594        x++;
1595        if(x == COLUMNS) { x = 0; y++; }
1596    
1597    but = hildon_button_new_with_text(      menu_entries++;
1598              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,    }
             HILDON_BUTTON_ARRANGEMENT_VERTICAL,  
             _("Export Garmin GPX"),  
             _("Save a GPX file containing modified waypoints"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_export_garmin), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1599    
1600    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), table);
   gtk_widget_show_all (GTK_WIDGET (view_window));  
 }  
1601    
1602  static void on_tools_destroy(GtkWidget *widget, appdata_t *appdata) {    return dialog;
   appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");  
1603  }  }
1604    
1605  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {  /* popup the dialog shaped submenu */
1606    HildonStackableWindow *view_window;  static void submenu_popup(GtkWidget *menu) {
1607    GtkWidget *but;    gtk_widget_show_all(menu);
1608      gtk_dialog_run(GTK_DIALOG(menu));
1609    view_window = HILDON_STACKABLE_WINDOW (hildon_stackable_window_new ());    gtk_widget_hide(menu);
1610    gtk_window_set_title (GTK_WINDOW (view_window), "GPXView - Tools");  }
1611    
1612     /* store last "cur_view" in window */  static void submenu_cleanup(GtkWidget *menu) {
1613    g_object_set_data(G_OBJECT(view_window), "cur_view", appdata->cur_view);    gtk_widget_destroy(menu);
1614    appdata->cur_view = NULL;  }
1615    
1616    g_signal_connect(G_OBJECT(view_window), "destroy",  static const menu_entry_t submenu_export_entries[] = {
1617                     G_CALLBACK(on_tools_destroy), appdata);    { "Export to Maemo Mapper" , "Save a Maemo Mapper POI file",
1618        G_CALLBACK(cb_menu_export_mmpoi)  },
1619      { "Export Field Notes",      "Save a Garmin Field Notes file",
1620        G_CALLBACK(cb_menu_export_log)    },
1621      { "Export Garmin GPX",       "Save modified waypoints in GPX file",
1622        G_CALLBACK(cb_menu_export_garmin) },
1623      { NULL, NULL, NULL }
1624    };
1625    
1626    GtkVBox *contents = GTK_VBOX(gtk_vbox_new (12, FALSE));  static const submenu_t submenu_export = {
1627      "Export", submenu_export_entries,
1628      sizeof(submenu_export_entries)/sizeof(menu_entry_t)-1
1629    };
1630    
1631    but = hildon_button_new_with_text(  /* the export submenu */
1632              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  void on_export_clicked(GtkButton *button, appdata_t *appdata) {
1633              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    if(!appdata->export_menu)
1634              _("Geomath"),      appdata->export_menu = app_submenu_create(appdata, &submenu_export);
             _("Geocoordinate calculation"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_geomath), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1635    
1636      submenu_popup(appdata->export_menu);
1637    }
1638    
1639    but = hildon_button_new_with_text(  static const menu_entry_t submenu_tools_entries[] = {
1640              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  #ifdef ENABLE_OSM_GPS_MAP
1641              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    { "Map",              "Display an interactive world map",
1642              _("Geotext"),      G_CALLBACK(cb_menu_map) },
1643              _("Text analysis, letter counting etc"));  #endif
1644    g_signal_connect(but, "clicked",    { "Geomath",          "Geocoordinate calculation",
1645                     G_CALLBACK(cb_menu_geotext), appdata);      G_CALLBACK(cb_menu_geomath) },
1646    gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);    { "Geotext",          "Text analysis",
1647        G_CALLBACK(cb_menu_geotext) },
1648      { "Precise Position", "Calculate a precise GPS position",
1649        G_CALLBACK(cb_menu_precpos) },
1650      { NULL, NULL, NULL }
1651    };
1652    
1653    static const submenu_t submenu_tools = {
1654      "Tools", submenu_tools_entries,
1655      sizeof(submenu_tools_entries)/sizeof(menu_entry_t)-1
1656    };
1657    
1658    but = hildon_button_new_with_text(  /* the tools submenu */
1659              HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH,  void on_tools_clicked(GtkButton *button, appdata_t *appdata) {
1660              HILDON_BUTTON_ARRANGEMENT_VERTICAL,    if(!appdata->tools_menu)
1661              _("Precise Position"),      appdata->tools_menu = app_submenu_create(appdata, &submenu_tools);
             _("Calculate a very precise GPS position"));  
   g_signal_connect(but, "clicked",  
                    G_CALLBACK(cb_menu_precpos), appdata);  
   gtk_box_pack_start(GTK_BOX(contents), but, FALSE, FALSE, 0);  
1662    
1663    gtk_container_add (GTK_CONTAINER (view_window), GTK_WIDGET (contents));    submenu_popup(appdata->tools_menu);
   gtk_widget_show_all (GTK_WIDGET (view_window));  
1664  }  }
1665    
1666  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {  HildonAppMenu *menu_create(appdata_t *appdata, int mode) {
# Line 1656  HildonAppMenu *menu_create(appdata_t *ap Line 1707  HildonAppMenu *menu_create(appdata_t *ap
1707                           G_CALLBACK(on_tools_clicked), appdata);                           G_CALLBACK(on_tools_clicked), appdata);
1708    hildon_app_menu_append(menu, GTK_BUTTON(button));    hildon_app_menu_append(menu, GTK_BUTTON(button));
1709    
1710    gtk_widget_show(GTK_WIDGET(menu));  #ifdef HILDON_HELP
1711      button = gtk_button_new_with_label(_("Help"));
1712      g_signal_connect_after(button, "clicked",
1713                             G_CALLBACK(cb_menu_help), appdata);
1714      hildon_app_menu_append(menu, GTK_BUTTON(button));
1715    #endif
1716    
1717      gtk_widget_show_all(GTK_WIDGET(menu));
1718    
1719    return menu;    return menu;
1720  }  }
# Line 1766  void menu_create(appdata_t *appdata) { Line 1824  void menu_create(appdata_t *appdata) {
1824    submenu = gtk_menu_new();    submenu = gtk_menu_new();
1825    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
1826    
1827    #ifdef ENABLE_OSM_GPS_MAP
1828      item = gtk_menu_item_new_with_label( _("Map") );
1829      gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1830      g_signal_connect(item, "activate",
1831                       GTK_SIGNAL_FUNC(cb_menu_map), appdata);
1832    #endif
1833    
1834    item = gtk_menu_item_new_with_label( _("Geomath") );    item = gtk_menu_item_new_with_label( _("Geomath") );
1835    gtk_menu_append(GTK_MENU_SHELL(submenu), item);    gtk_menu_append(GTK_MENU_SHELL(submenu), item);
1836    g_signal_connect(item, "activate",    g_signal_connect(item, "activate",
# Line 1825  void cleanup(appdata_t *appdata) { Line 1890  void cleanup(appdata_t *appdata) {
1890    if(appdata->image_path) free(appdata->image_path);    if(appdata->image_path) free(appdata->image_path);
1891    if(appdata->search_str) free(appdata->search_str);    if(appdata->search_str) free(appdata->search_str);
1892    
1893    #ifdef USE_STACKABLE_WINDOW
1894      if(appdata->export_menu) submenu_cleanup(appdata->export_menu);
1895      if(appdata->tools_menu)  submenu_cleanup(appdata->tools_menu);
1896    #endif
1897    
1898    gnome_vfs_shutdown();    gnome_vfs_shutdown();
1899    icons_free();    icons_free();
1900    gps_release(appdata);    gps_release(appdata);
# Line 2184  int main(int argc, char *argv[]) { Line 2254  int main(int argc, char *argv[]) {
2254    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);    gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
2255  #endif  #endif
2256    
2257    #if MAEMO_VERSION_MAJOR == 5
2258    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");    gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
2259    #endif
2260    
2261    g_signal_connect(G_OBJECT(appdata.window), "destroy",    g_signal_connect(G_OBJECT(appdata.window), "destroy",
2262                     G_CALLBACK(on_window_destroy), &appdata);                     G_CALLBACK(on_window_destroy), &appdata);
2263    
# Line 2193  int main(int argc, char *argv[]) { Line 2266  int main(int argc, char *argv[]) {
2266    
2267    appdata.vbox = gtk_vbox_new(FALSE, 2);    appdata.vbox = gtk_vbox_new(FALSE, 2);
2268    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);    gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
   
2269  #ifndef USE_STACKABLE_WINDOW  #ifndef USE_STACKABLE_WINDOW
2270    menu_create(&appdata);    menu_create(&appdata);
2271  #else  #else
Legend:
Removed from v.11  
changed lines
  Added in v.32