Fixed Windows build

.appveyor.yml

@@ -29,7 +29,7 @@ build_script:
     copy release\GPXSee.exe installer
     windeployqt --release installer\GPXSee.exe
     copy pkg\windows\gpxsee64.nsi installer
-    xcopy data\csv installer\csv /i
+    xcopy data\CRS installer\CRS /i
     xcopy data\maps installer\maps /i
     xcopy lang\*.qm installer\translations\ /sy
     xcopy icons\symbols installer\symbols /i

gpxsee.pro

@@ -484,8 +484,8 @@ macx {
     QMAKE_INFO_PLIST = pkg/mac/Info.plist
     locale.path = Contents/Resources/translations
     locale.files = $$files(lang/*.qm)
-    csv.path = Contents/Resources
-    csv.files = data/csv
+    crs.path = Contents/Resources
+    crs.files = data/CRS
     maps.path = Contents/Resources
     maps.files = data/maps
     symbols.path = Contents/Resources/symbols
@@ -495,7 +495,7 @@ macx {
     lproj.path = Contents/Resources
     lproj.files = $$files(pkg/mac/lproj/*)
 
-    QMAKE_BUNDLE_DATA += locale maps symbols icons csv lproj
+    QMAKE_BUNDLE_DATA += locale maps symbols icons crs lproj
 }
 
 win32 {
@@ -542,8 +542,8 @@ unix:!macx:!android {
 
     maps.files = $$files(data/maps/*)
     maps.path = $$PREFIX/share/gpxsee/maps
-    csv.files = $$files(data/csv/*)
-    csv.path = $$PREFIX/share/gpxsee/csv
+    crs.files = $$files(data/CRS/*)
+    crs.path = $$PREFIX/share/gpxsee/CRS
     symbols.files = $$files(icons/symbols/*.png)
     symbols.path = $$PREFIX/share/gpxsee/symbols
     locale.files = $$files(lang/*.qm)
@@ -557,7 +557,7 @@ unix:!macx:!android {
     appdata.files = pkg/linux/gpxsee.appdata.xml
     appdata.path = $$PREFIX/share/metainfo
     target.path = $$PREFIX/bin
-    INSTALLS += target maps csv symbols locale icon desktop mime appdata
+    INSTALLS += target maps crs symbols locale icon desktop mime appdata
 }
 
 android {
@@ -595,11 +595,11 @@ android {
 
     maps.files = $$files(data/maps/*)
     maps.path = /assets/maps
-    csv.files = $$files(data/csv/*)
-    csv.path = /assets/csv
+    crs.files = $$files(data/CRS/*)
+    crs.path = /assets/CRS
     symbols.files = $$files(icons/symbols/*.png)
     symbols.path = /assets/symbols
     translations.files = $$files(lang/*.qm)
     translations.path = /assets/translations
-    INSTALLS += maps csv symbols translations
+    INSTALLS += maps crs symbols translations
 }

lang/gpxsee_cs.ts

@@ -1428,12 +1428,12 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="64"/>
         <source>Select the proper coordinate reference system (CRS) of maps without a CRS definition (JNX, KMZ and World file maps).</source>
-        <translation type="unfinished"></translation>
+        <translation>Souřadnicový referenční systém (CRS) map u kterých není CRS uveden (JNX, KMZ a World-file soubory).</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="67"/>
         <source>Select the desired projection of vector maps (IMG, Mapsforge and ENC maps). The projection must be valid for the whole map area.</source>
-        <translation type="unfinished"></translation>
+        <translation>Projekce vektorových map (IMG, Mapsforge a ENC). Projekce musí být platná přes celou oblast mapy.</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="71"/>

pkg/windows/gpxsee64.nsi

@@ -119,7 +119,7 @@ Section "GPXSee" SEC_APP
   ; Put the files there
   File "gpxsee.exe"
   File /r "maps"
-  File /r "csv"
+  File /r "CRS"
   File /r "symbols"
 
   ; Create the uninstaller

src/GUI/gui.cpp

@@ -904,8 +904,8 @@ void GUI::paths()
 	  + QDir::cleanPath(ProgramPaths::mapDir(true))	+ "<br><br><b>"
 	  + tr("POI directory:") + "</b><br>"
 	  + QDir::cleanPath(ProgramPaths::poiDir(true)) + "<br><br><b>"
-	  + tr("GCS/PCS directory:") + "</b><br>"
-	  + QDir::cleanPath(ProgramPaths::csvDir(true)) + "<br><br><b>"
+	  + tr("CRS directory:") + "</b><br>"
+	  + QDir::cleanPath(ProgramPaths::crsDir(true)) + "<br><br><b>"
 	  + tr("DEM directory:") + "</b><br>"
 	  + QDir::cleanPath(ProgramPaths::demDir(true)) + "<br><br><b>"
 	  + tr("Styles directory:") + "</b><br>"
@@ -922,8 +922,8 @@ void GUI::paths()
 	  + QDir::cleanPath(ProgramPaths::mapDir(true)) + "</code></td></tr><tr><td>"
 	  + tr("POI directory:") + "</td><td><code>"
 	  + QDir::cleanPath(ProgramPaths::poiDir(true)) + "</code></td></tr><tr><td>"
-	  + tr("GCS/PCS directory:") + "</td><td><code>"
-	  + QDir::cleanPath(ProgramPaths::csvDir(true)) + "</code></td></tr><tr><td>"
+	  + tr("CRS directory:") + "</td><td><code>"
+	  + QDir::cleanPath(ProgramPaths::crsDir(true)) + "</code></td></tr><tr><td>"
 	  + tr("DEM directory:") + "</td><td><code>"
 	  + QDir::cleanPath(ProgramPaths::demDir(true)) + "</code></td></tr><tr><td>"
 	  + tr("Styles directory:") + "</td><td><code>"

src/GUI/optionsdialog.cpp

@@ -45,6 +45,8 @@ static QFrame *line()
 }
 #endif // Q_OS_MAC
 
+typedef QList<KV<int, QString> > ProjectionList;
+
 void OptionsDialog::automaticPauseDetectionSet(bool set)
 {
 	_pauseInterval->setEnabled(!set);
@@ -53,11 +55,15 @@ void OptionsDialog::automaticPauseDetectionSet(bool set)
 
 QWidget *OptionsDialog::createMapPage()
 {
-	_outputProjection = new ProjectionComboBox(GCS::WGS84List()
-	  + Conversion::list());
+	ProjectionList outputProjections(GCS::WGS84List() + Conversion::list());
+	ProjectionList inputProjections(GCS::list() + PCS::list());
+	std::sort(outputProjections.begin(), outputProjections.end());
+	std::sort(inputProjections.begin(), inputProjections.end());
+
+	_outputProjection = new ProjectionComboBox(outputProjections);
 	_outputProjection->setCurrentIndex(_outputProjection->findData(
 	  _options.outputProjection));
-	_inputProjection = new ProjectionComboBox(GCS::list() + PCS::list());
+	_inputProjection = new ProjectionComboBox(inputProjections);
 	_inputProjection->setCurrentIndex(_inputProjection->findData(
 	  _options.inputProjection));
 

src/GUI/projectioncombobox.cpp

@@ -6,11 +6,8 @@ ProjectionComboBox::ProjectionComboBox(const QList<KV<int, QString> > &list,
 	setSizeAdjustPolicy(AdjustToMinimumContentsLengthWithIcon);
 	setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
 
-	QList<KV<int, QString> > projs(list);
-	std::sort(projs.begin(), projs.end());
-
 	for (int i = 0; i < list.size(); i++) {
-		const KV<int, QString> &proj = projs.at(i);
+		const KV<int, QString> &proj = list.at(i);
 		QString text = QString::number(proj.key()) + " - " + proj.value();
 		addItem(text, QVariant(proj.key()));
 	}

src/common/programpaths.cpp

@@ -6,7 +6,7 @@
 
 #define MAP_DIR          "maps"
 #define POI_DIR          "POI"
-#define CSV_DIR          "csv"
+#define CRS_DIR          "CRS"
 #define DEM_DIR          "DEM"
 #define TILES_DIR        "tiles"
 #define TRANSLATIONS_DIR "translations"
@@ -63,17 +63,17 @@ QString ProgramPaths::poiDir(bool writable)
 		  QStandardPaths::LocateDirectory);
 }
 
-QString ProgramPaths::csvDir(bool writable)
+QString ProgramPaths::crsDir(bool writable)
 {
 	if (writable)
 		return QDir(QStandardPaths::writableLocation(DATA_LOCATION))
-		  .filePath(CSV_DIR);
+		  .filePath(CRS_DIR);
 	else
 #ifdef Q_OS_ANDROID
-		return assetsPath(QStandardPaths::locate(DATA_LOCATION, CSV_DIR,
-		  QStandardPaths::LocateDirectory), CSV_DIR);
+		return assetsPath(QStandardPaths::locate(DATA_LOCATION, CRS_DIR,
+		  QStandardPaths::LocateDirectory), CRS_DIR);
 #else // Q_OS_ANDROID
-		return QStandardPaths::locate(DATA_LOCATION, CSV_DIR,
+		return QStandardPaths::locate(DATA_LOCATION, CRS_DIR,
 		  QStandardPaths::LocateDirectory);
 #endif // Q_OS_ANDROID
 }
@@ -132,22 +132,22 @@ QString ProgramPaths::translationsDir()
 
 QString ProgramPaths::ellipsoidsFile()
 {
-	return QDir(csvDir()).filePath(ELLIPSOIDS_FILE);
+	return QDir(crsDir()).filePath(ELLIPSOIDS_FILE);
 }
 
 QString ProgramPaths::gcsFile()
 {
-	return QDir(csvDir()).filePath(GCS_FILE);
+	return QDir(crsDir()).filePath(GCS_FILE);
 }
 
 QString ProgramPaths::projectionsFile()
 {
-	return QDir(csvDir()).filePath(PROJECTIONS_FILE);
+	return QDir(crsDir()).filePath(PROJECTIONS_FILE);
 }
 
 QString ProgramPaths::pcsFile()
 {
-	return QDir(csvDir()).filePath(PCS_FILE);
+	return QDir(crsDir()).filePath(PCS_FILE);
 }
 
 QString ProgramPaths::typFile()

src/common/programpaths.h

@@ -7,7 +7,7 @@ namespace ProgramPaths
 {
 	QString mapDir(bool writable = false);
 	QString poiDir(bool writable = false);
-	QString csvDir(bool writable = false);
+	QString crsDir(bool writable = false);
 	QString demDir(bool writable = false);
 	QString styleDir(bool writable = false);
 	QString symbolsDir(bool writable = false);