Merge branch 'taxonomy'

This commit is contained in:
Dirk Hohndel 2015-07-02 07:03:03 -07:00
commit f554c2d16c
20 changed files with 1358 additions and 65 deletions

View file

@ -116,6 +116,8 @@ GeoReferencingOptionsModel *GeoReferencingOptionsModel::instance() {
GeoReferencingOptionsModel::GeoReferencingOptionsModel(QObject *parent) : QStringListModel(parent)
{
QStringList list;
list << "Country" << "State" << "District" << "Town" << "Suburb" << "Body of Water" << "Site Name";
int i;
for (i = 0; i < NR_CATEGORIES; i++)
list << taxonomy_category_names[i];
setStringList(list);
}