From 6a0f3847d46b6d03b03140864ee7415d5ad7e575 Mon Sep 17 00:00:00 2001
From: canni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 29 Apr 2010 17:27:22 +0000
Subject: - applied patch by tobigun - small changes

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2318 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 installer/UltraStar Deluxe.nsi            | 17 ++++++++---------
 installer/settings/files_main_install.nsh | 15 ++++++---------
 installer/settings/functions.nsh          | 24 ------------------------
 installer/settings/settings-1031.ini      |  2 +-
 installer/settings/settings-1033.ini      |  2 +-
 installer/settings/settings-1038.ini      |  2 +-
 6 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
index e21c601f..66b0bd42 100644
--- a/installer/UltraStar Deluxe.nsi	
+++ b/installer/UltraStar Deluxe.nsi	
@@ -190,17 +190,16 @@ ${EndIf}
 
 StrCpy $path_configini "$path_config\config.ini"
 
-${WriteToConfig} "[Game]$\r$\n" "$path_configini"
-${WriteToConfig} "Language=$language2$\r$\n" "$path_configini"
-${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini"
-${WriteToConfig} "Sorting=$sorting$\r$\n" "$path_configini"
+WriteINIStr "$path_configini" "Game" "Language" "$language2"
+WriteINIStr "$path_configini" "Game" "Tabs" "$tabs"
+WriteINIStr "$path_configini" "Game" "Sorting" "$sorting"
 
-${WriteToConfig} "[Graphics]$\r$\n" "$path_configini"
-${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini"
-${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini"
+WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen"
+WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution"
 
-${WriteToConfig} "[Directories]$\r$\n" "$path_configini"
-${WriteToConfig} "SongDir2=$songdir$\r$\n" "$path_configini"
+${If} $songdir != "$INSTDIR\songs"
+WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir"
+${EndIf}
 
 FunctionEnd ; Settings page End
 
diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
index bd748a12..df697d5e 100644
--- a/installer/settings/files_main_install.nsh
+++ b/installer/settings/files_main_install.nsh
@@ -16,9 +16,6 @@ ${If} ${AtLeastWinVista}
   CreateDirectory $APPDATA\ultrastardx\screenshots
   CreateDirectory $APPDATA\ultrastardx\playlists
 
-  SetOutPath "$APPDATA\ultrastardx"
-  File ..\game\config.ini
-
   SetOutPath "$INSTDIR"
 
   CreateShortCut "screenshots.lnk" "$APPDATA\ultrastardx\screenshots"
@@ -32,12 +29,12 @@ ${EndIf}
 
 SetOutPath "$INSTDIR"
 
-File /r ..\game\themes
-File /r ..\game\languages
-File /r ..\game\sounds
-File /r ..\game\fonts
-File /r ..\game\resources
-File /r ..\game\visuals
+File /r /x .svn /x .gitignore ..\game\themes
+File /r /x .svn /x .gitignore ..\game\languages
+File /r /x .svn /x .gitignore ..\game\sounds
+File /r /x .svn /x .gitignore ..\game\fonts
+File /r /x .svn /x .gitignore ..\game\resources
+File /r /x .svn /x .gitignore ..\game\visuals
 
 ; Root dir:
 
diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh
index e8655bc3..d437c9e1 100644
--- a/installer/settings/functions.nsh
+++ b/installer/settings/functions.nsh
@@ -24,30 +24,6 @@ Function un.DeleteIfEmpty
    FindClose $R0
 FunctionEnd
 
-; This is used to write a
-; string to config.ini
-
-Function WriteToConfig
- Exch $0
- Exch
- Exch $1
- 
-  FileOpen $0 $0 a
-   FileSeek $0 0 END
-   FileWrite $0 $1
-  FileClose $0
- 
- Pop $1
- Pop $0
-FunctionEnd
- 
-!macro WriteToConfig String File
- Push "${String}"
- Push "${File}"
-  Call WriteToConfig
-!macroend
-!define WriteToConfig "!insertmacro WriteToConfig"
-
 ; Finds UltraStar Deluxe process
 ;
 
diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini
index 411e1fc1..7f9573a1 100644
--- a/installer/settings/settings-1031.ini
+++ b/installer/settings/settings-1031.ini
@@ -158,4 +158,4 @@ Left=158
 Top=119
 Right=295
 Bottom=134
-Text=Alternativen Ordner mit (weiteren) Songs für UltraStar Deluxe definieren.
+Text=Hier kann ein weiterer Ordner mit Songs für UltraStar Deluxe angegeben werden.
diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini
index 9326d276..5e6b6055 100644
--- a/installer/settings/settings-1033.ini
+++ b/installer/settings/settings-1033.ini
@@ -158,4 +158,4 @@ Left=158
 Top=119
 Right=295
 Bottom=134
-Text=Choose alternative dir with (additional) songs for UltraStar Deluxe.
+Text=Choose additional song directory for UltraStar Deluxe.
\ No newline at end of file
diff --git a/installer/settings/settings-1038.ini b/installer/settings/settings-1038.ini
index c012c674..62994a1f 100644
--- a/installer/settings/settings-1038.ini
+++ b/installer/settings/settings-1038.ini
@@ -158,4 +158,4 @@ Left=158
 Top=119
 Right=295
 Bottom=134
-Text=Choose alternative dir with (additional) songs for UltraStar Deluxe.
+Text=Choose additional song directory for UltraStar Deluxe.
-- 
cgit v1.2.3