[OMPT-svn-commit] SF.net SVN: modplug:[548] trunk/OpenMPT/installer/install.iss

[<sag...@us...>]

Revision: 548
          http://modplug.svn.sourceforge.net/modplug/?rev=548&view=rev
Author:   saga-games
Date:     2010-03-24 14:27:14 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
[Imp] Installer: Copy config files from app's directory to appdata if necessary and possible.
[Fix] Installer: When autodetecting which keyboard config fits best, don't overwrite an already existing config anymore.

Modified Paths:
--------------
    trunk/OpenMPT/installer/install.iss

Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss	2010-03-24 12:22:00 UTC (rev 547)
+++ trunk/OpenMPT/installer/install.iss	2010-03-24 14:27:14 UTC (rev 548)
@@ -99,6 +99,41 @@
 
 [Code]
 
+// Copy old config files to the AppData directory, if there are any (and if the files don't exist already)
+procedure CopyConfigsToAppDataDir();
+var
+    adjustIniPath: Boolean;
+    keyFile: String;
+
+begin
+
+    // Not needed if portable mode is enabled.
+    if(IsTaskSelected('portable')) then
+    begin
+        Exit;
+    end;
+
+    // If there was an INI file with portable mode flag set, we have to reset it (or else, the mptrack.ini in %appdata% will never be used!)
+    if(IniKeyExists('Paths', 'UseAppDataDirectory', ExpandConstant('{app}\mptrack.ini'))) then
+    begin
+        DeleteIniEntry('Paths', 'UseAppDataDirectory', ExpandConstant('{app}\mptrack.ini'));
+    end;
+
+    FileCopy(ExpandConstant('{app}\mptrack.ini'), ExpandConstant('{userappdata}\OpenMPT\mptrack.ini'), true);
+    FileCopy(ExpandConstant('{app}\plugin.cache'), ExpandConstant('{userappdata}\OpenMPT\plugin.cache'), true);
+    FileCopy(ExpandConstant('{app}\mpt_intl.ini'), ExpandConstant('{userappdata}\OpenMPT\mpt_intl.ini'), true);
+    adjustIniPath := FileCopy(ExpandConstant('{app}\Keybindings.mkb'), ExpandConstant('{userappdata}\OpenMPT\Keybindings.mkb'), true);
+    adjustIniPath := adjustIniPath or FileCopy(ExpandConstant('{app}\default.mkb'), ExpandConstant('{userappdata}\OpenMPT\Keybindings.mkb'), true);
+
+    // If the keymappings moved, we might have to update the path in the INI file.
+    keyFile := GetIniString('Paths', 'Key_Config_File', '', ExpandConstant('{userappdata}\OpenMPT\mptrack.ini'));
+    if(((keyFile = ExpandConstant('{app}\Keybindings.mkb')) or (keyFile = ExpandConstant('{app}\default.mkb'))) and (adjustIniPath)) then
+    begin
+        SetIniString('Paths', 'Key_Config_File', ExpandConstant('{userappdata}\OpenMPT\Keybindings.mkb'), ExpandConstant('{userappdata}\OpenMPT\mptrack.ini'));
+    end;
+
+end;
+
 procedure CurStepChanged(CurStep: TSetupStep);
 var
     INIFile: String;
@@ -118,6 +153,9 @@
     case CurStep of
     ssPostInstall:
         begin
+            // Copy old config files from app's directory, if possible and necessary.
+            CopyConfigsToAppDataDir();
+
             // Find a suitable keyboard layout (might not be very precise sometimes, as it's based on the UI language)
             // Check http://msdn.microsoft.com/en-us/library/ms776294%28VS.85%29.aspx for the correct language codes.
             keyboardFilepath := '';
@@ -138,7 +176,7 @@
             end;
 
             // Found an alternative keybinding.
-            if(keyboardFilepath <> '') then
+            if((keyboardFilepath <> '') and (not IniKeyExists('Paths', 'Key_Config_File', INIFile))) then
             begin
                 keyboardFilepath := ExpandConstant('{app}\extraKeymaps\' + keyboardFilepath + '.mkb');
                 SetIniString('Paths', 'Key_Config_File', keyboardFilepath, INIFile);
@@ -196,6 +234,3 @@
     end;
 end;
 
-
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.