From: Rob Norris <rw_norris@hotmail.com>
Date: Tue, 14 Oct 2014 23:31:18 +0000 (+0100)
Subject: [WINDOWS] .vik file registration is automatic, .gpx is optional
X-Git-Url: https://git.street.me.uk/andy/viking.git/commitdiff_plain/c6311c82b9c1150ce7ebe18408af30f20f154466?ds=inline;hp=f570ee2bc0dac52b9bba9a193b7ba48e64f797ed

[WINDOWS] .vik file registration is automatic, .gpx is optional
---

diff --git a/win32/installer/translations/english.nsh b/win32/installer/translations/english.nsh
index 841c3f63..043fc652 100644
--- a/win32/installer/translations/english.nsh
+++ b/win32/installer/translations/english.nsh
@@ -32,7 +32,7 @@
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_SHORTCUTS_SECTION_DESCRIPTION	"Shortcuts for starting Viking"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_DESKTOP_SHORTCUT_DESC		"Create a shortcut to Viking on the Desktop"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_STARTMENU_SHORTCUT_DESC		"Create a Start Menu entry for Viking"
-!insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_FILE_ASSOCIATION_DESC	  "Associate .vik files with Viking"
+!insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_FILE_ASSOCIATION_DESC	  "Associate .gpx files with Viking"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_INSTALL_GPSBABEL_DESC	  "Install GPSBabel Program"
 
 ; Installer Finish Page
diff --git a/win32/installer/translations/french.nsh b/win32/installer/translations/french.nsh
index 4f3537d8..f70c4c3d 100644
--- a/win32/installer/translations/french.nsh
+++ b/win32/installer/translations/french.nsh
@@ -26,14 +26,14 @@
 !define VIKING_SHORTCUTS_SECTION_TITLE		"Raccourcis"
 !define VIKING_DESKTOP_SHORTCUT_SECTION_TITLE	"Bureau"
 !define VIKING_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Démarrer"
-!define VIKING_FILE_ASSOCIATION_SECTION_TITLE	"Extension .vik"
+!define VIKING_FILE_ASSOCIATION_SECTION_TITLE	"Extension .gpx"
 !define VIKING_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Viking"
 !define VIKING_GPSBABEL_SECTION_TITLE	"GPSBabel 1.5.1"
 
 !define VIKING_SHORTCUTS_SECTION_DESCRIPTION	"Raccourcis pour lancer Viking"
 !define VIKING_DESKTOP_SHORTCUT_DESC		"Créer un raccourci pour Viking sur le bureau"
 !define VIKING_STARTMENU_SHORTCUT_DESC		"Créer un raccourci pour Viking dans le menu Démarrer"
-!define VIKING_FILE_ASSOCIATION_DESC    "Associer Viking avec l'extension .vik"
+!define VIKING_FILE_ASSOCIATION_DESC    "Associer Viking avec l'extension .gpx"
 !define VIKING_INSTALL_GPSBABEL_DESC	"Installer GPSBabel Programme"
 
 ; Installer Finish Page
diff --git a/win32/installer/translations/spanish.nsh b/win32/installer/translations/spanish.nsh
index 041eac4b..4d2ef08a 100644
--- a/win32/installer/translations/spanish.nsh
+++ b/win32/installer/translations/spanish.nsh
@@ -25,14 +25,14 @@
 !define VIKING_SHORTCUTS_SECTION_TITLE		"Accesos directos"
 !define VIKING_DESKTOP_SHORTCUT_SECTION_TITLE	"Escritorio"
 !define VIKING_STARTMENU_SHORTCUT_SECTION_TITLE	"Menú Inicio"
-!define VIKING_FILE_ASSOCIATION_SECTION_TITLE	"Extensión.vik"
+!define VIKING_FILE_ASSOCIATION_SECTION_TITLE	"Extensión.gpx"
 !define VIKING_SECTION_DESCRIPTION		"Ficheros y DLLs de base de Viking"
 !define VIKING_GPSBABEL_SECTION_TITLE	"GPSBabel 1.5.1"
 
 !define VIKING_SHORTCUTS_SECTION_DESCRIPTION	"Accesos directos para lanzar Viking"
 !define VIKING_DESKTOP_SHORTCUT_DESC		"Crear un acceso directo a Viking en el escritorio"
 !define VIKING_STARTMENU_SHORTCUT_DESC		"Crear un acceso directo a Viking en el menú de inicio"
-!define VIKING_FILE_ASSOCIATION_DESC    "Asociar Viking con la extensión .vik"
+!define VIKING_FILE_ASSOCIATION_DESC    "Asociar Viking con la extensión .gpx"
 !define VIKING_INSTALL_GPSBABEL_DESC	"Instalar GPSBabel Programa"
 
 ; Installer Finish Page
diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi
index 9e01fce1..80303808 100644
--- a/win32/installer/viking-installer.nsi
+++ b/win32/installer/viking-installer.nsi
@@ -257,6 +257,8 @@ Section $(VIKING_SECTION_TITLE) SecViking
     WriteUninstaller "$INSTDIR\${VIKING_UNINST_EXE}"
     SetOverwrite off
 
+    ; Always associate Viking file type
+    ${registerExtension} "$INSTDIR\viking.exe" ".vik" "Viking File"
   done:
 SectionEnd ; end of default Viking section
 
@@ -285,7 +287,7 @@ SectionGroupEnd
 ;File association
 
 Section $(VIKING_FILE_ASSOCIATION_SECTION_TITLE) SecFileAssociation
-  ${registerExtension} "$INSTDIR\viking.exe" ".vik" "Viking File"
+  ${registerExtension} "$INSTDIR\viking.exe" ".gpx" "GPX File"
 SectionEnd
 
 ;--------------------------------
@@ -335,6 +337,7 @@ Section Uninstall
 
     ; File association
     ${unregisterExtension} ".vik" "Viking File"
+    ${unregisterExtension} ".gpx" "GPX File"
 
     Goto done