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

diff --git a/win32/installer/translations/english.nsh b/win32/installer/translations/english.nsh
index 841c3f6332464fc9d55f71edc8578e8829184d7b..043fc6525ded037c0fe3ea828c37a61b26144fe9 100644 (file)
--- 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 4f3537d814f80ebe511dae0ecae825c1ce98c47b..f70c4c3db51bfcbff045eee70ad884382cb5de3f 100644 (file)
--- 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 041eac4bf552a51bcea7a88d47c5711dff57a35c..4d2ef08a5d064ad8a2417519043d671e80700624 100644 (file)
--- a/win32/installer/translations/spanish.nsh
+++ b/win32/installer/translations/spanish.nsh
@@ -25,14 +25,14 @@
 !define VIKING_SHORTCUTS_SECTION_TITLE         "Accesos directos"\r
 !define VIKING_DESKTOP_SHORTCUT_SECTION_TITLE  "Escritorio"\r
 !define VIKING_STARTMENU_SHORTCUT_SECTION_TITLE        "Menú Inicio"\r
-!define VIKING_FILE_ASSOCIATION_SECTION_TITLE  "Extensión.vik"\r
+!define VIKING_FILE_ASSOCIATION_SECTION_TITLE  "Extensión.gpx"\r
 !define VIKING_SECTION_DESCRIPTION             "Ficheros y DLLs de base de Viking"\r
 !define VIKING_GPSBABEL_SECTION_TITLE  "GPSBabel 1.5.1"
 \r
 !define VIKING_SHORTCUTS_SECTION_DESCRIPTION   "Accesos directos para lanzar Viking"\r
 !define VIKING_DESKTOP_SHORTCUT_DESC           "Crear un acceso directo a Viking en el escritorio"\r
 !define VIKING_STARTMENU_SHORTCUT_DESC         "Crear un acceso directo a Viking en el menú de inicio"\r
-!define VIKING_FILE_ASSOCIATION_DESC    "Asociar Viking con la extensión .vik"\r
+!define VIKING_FILE_ASSOCIATION_DESC    "Asociar Viking con la extensión .gpx"\r
 !define VIKING_INSTALL_GPSBABEL_DESC   "Instalar GPSBabel Programa"
 \r
 ; Installer Finish Page\r

diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi
index 9e01fce1975c8b881bf0ce2ab6676e2216ecac65..80303808027827197e5fdea34edd164fbe723a32 100644 (file)
--- 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