aboutsummaryrefslogtreecommitdiffstats
path: root/installer/settings
diff options
context:
space:
mode:
authorcanni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-29 17:27:22 +0000
committercanni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-29 17:27:22 +0000
commit6a0f3847d46b6d03b03140864ee7415d5ad7e575 (patch)
tree8cc5b4c7bcc44823e5684d52a4ed70a09e8a7181 /installer/settings
parent88b765c10347e10d792b727fb4bb613cce719bf1 (diff)
downloadusdx-6a0f3847d46b6d03b03140864ee7415d5ad7e575.tar.gz
usdx-6a0f3847d46b6d03b03140864ee7415d5ad7e575.tar.xz
usdx-6a0f3847d46b6d03b03140864ee7415d5ad7e575.zip
- applied patch by tobigun
- small changes git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2318 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--installer/settings/files_main_install.nsh15
-rw-r--r--installer/settings/functions.nsh24
-rw-r--r--installer/settings/settings-1031.ini2
-rw-r--r--installer/settings/settings-1033.ini2
-rw-r--r--installer/settings/settings-1038.ini2
5 files changed, 9 insertions, 36 deletions
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.