From 09809c48f227ffa2bb0fc3948b2ef336ab0110f5 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 6 Jun 2010 13:48:33 +0000
Subject: unified indentation

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2453 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 installer/UltraStar Deluxe.nsi | 437 ++++++++++++++++++++---------------------
 1 file changed, 218 insertions(+), 219 deletions(-)

diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
index 13cf46d0..497f53ee 100644
--- a/installer/UltraStar Deluxe.nsi	
+++ b/installer/UltraStar Deluxe.nsi	
@@ -151,67 +151,67 @@ Page custom Settings
 
 Function Settings
 
-!insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs"
-
-!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)"   
-!insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE"
-
-; Get all the variables:
-
-Var /GLOBAL LABEL_COMPONENTS
-
-Var /GLOBAL CHECKBOX_COVERS
-Var /GLOBAL CB_COVERS_State
-Var /GLOBAL CHECKBOX_SCORES
-Var /GLOBAL CB_SCORES_State
-Var /GLOBAL CHECKBOX_CONFIG
-Var /GLOBAL CB_CONFIG_State
-Var /GLOBAL CHECKBOX_SCREENSHOTS
-Var /GLOBAL CB_SCREENSHOTS_State
-Var /GLOBAL CHECKBOX_PLAYLISTS
-Var /GLOBAL CB_PLAYLISTS_State
-Var /GLOBAL CHECKBOX_SONGS 
-Var /GLOBAL CB_SONGS_State
-
-var /GLOBAL fullscreen
-var /GLOBAL language2
-var /GLOBAL resolution
-var /GLOBAL tabs
-var /GLOBAL sorting
-var /GLOBAL songdir
-
-  !insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State"
-  !insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State"
-  !insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State"
-  !insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State"
-  !insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State"
-  !insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State"
-
-; Write all variables to config.ini
-
-var /GLOBAL path_config
-var /GLOBAL path_configini
-
-${If} ${AtLeastWinVista}  
-  SetShellVarContext current
-  StrCpy $path_config "$APPDATA\ultrastardx"
-  SetShellVarContext all
-${Else}
-  StrCpy $path_config "$INSTDIR"
-${EndIf}
-
-StrCpy $path_configini "$path_config\config.ini"
-
-WriteINIStr "$path_configini" "Game" "Language" "$language2"
-WriteINIStr "$path_configini" "Game" "Tabs" "$tabs"
-WriteINIStr "$path_configini" "Game" "Sorting" "$sorting"
-
-WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen"
-WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution"
-
-${If} $songdir != "$INSTDIR\songs"
-WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir"
-${EndIf}
+	!insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs"
+
+	!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)"   
+	!insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE"
+
+	; Get all the variables:
+
+	Var /GLOBAL LABEL_COMPONENTS
+
+	Var /GLOBAL CHECKBOX_COVERS
+	Var /GLOBAL CB_COVERS_State
+	Var /GLOBAL CHECKBOX_SCORES
+	Var /GLOBAL CB_SCORES_State
+	Var /GLOBAL CHECKBOX_CONFIG
+	Var /GLOBAL CB_CONFIG_State
+	Var /GLOBAL CHECKBOX_SCREENSHOTS
+	Var /GLOBAL CB_SCREENSHOTS_State
+	Var /GLOBAL CHECKBOX_PLAYLISTS
+	Var /GLOBAL CB_PLAYLISTS_State
+	Var /GLOBAL CHECKBOX_SONGS 
+	Var /GLOBAL CB_SONGS_State
+
+	Var /GLOBAL fullscreen
+	Var /GLOBAL language2
+	Var /GLOBAL resolution
+	Var /GLOBAL tabs
+	Var /GLOBAL sorting
+	Var /GLOBAL songdir
+
+	!insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State"
+	!insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State"
+	!insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State"
+	!insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State"
+	!insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State"
+	!insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State"
+
+	; Write all variables to config.ini
+
+	var /GLOBAL path_config
+	var /GLOBAL path_configini
+
+	${If} ${AtLeastWinVista}  
+		SetShellVarContext current
+		StrCpy $path_config "$APPDATA\ultrastardx"
+		SetShellVarContext all
+	${Else}
+		StrCpy $path_config "$INSTDIR"
+	${EndIf}
+
+	StrCpy $path_configini "$path_config\config.ini"
+
+	WriteINIStr "$path_configini" "Game" "Language" "$language2"
+	WriteINIStr "$path_configini" "Game" "Tabs" "$tabs"
+	WriteINIStr "$path_configini" "Game" "Sorting" "$sorting"
+
+	WriteINIStr "$path_configini" "Graphics" "FullScreen" "$fullscreen"
+	WriteINIStr "$path_configini" "Graphics" "Resolution" "$resolution"
+
+	${If} $songdir != "$INSTDIR\songs"
+	WriteINIStr "$path_configini" "Directories" "SongDir1" "$songdir"
+	${EndIf}
 
 FunctionEnd ; Settings page End
 
@@ -229,7 +229,7 @@ UninstPage custom un.AskDelete un.DeleteAll
 
 Function un.AskDelete
 
-nsDialogs::Create /NOUNLOAD 1018
+	nsDialogs::Create /NOUNLOAD 1018
 
 	${NSD_CreateLabel} 0 -195 100% 12u "$(delete_components)"
 	Pop $LABEL_COMPONENTS
@@ -259,7 +259,7 @@ nsDialogs::Create /NOUNLOAD 1018
 	nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SONGS $6
 
 
-nsDialogs::Show
+	nsDialogs::Show
 
 FunctionEnd
 
@@ -273,45 +273,45 @@ ${NSD_GetState} $CHECKBOX_SCORES $CB_PLAYLISTS_State
 ${NSD_GetState} $CHECKBOX_SONGS  $CB_SONGS_State
 
 ${If} $CB_COVERS_State == "1" ; Remove covers
- RMDir /r "$INSTDIR\covers"
- SetShellVarContext current	
- RMDir /r "$APPDATA\ultrastardx\covers"
- SetShellVarContext all
+	RMDir /r "$INSTDIR\covers"
+	SetShellVarContext current	
+	RMDir /r "$APPDATA\ultrastardx\covers"
+	SetShellVarContext all
 ${EndIf}
 
 ${If} $CB_CONFIG_State == "1" ; Remove config
- SetShellVarContext current
- Delete "$APPDATA\ultrastardx\config.ini" 
- SetShellVarContext all
- Delete "$INSTDIR\config.ini"
+	SetShellVarContext current
+	Delete "$APPDATA\ultrastardx\config.ini" 
+	SetShellVarContext all
+	Delete "$INSTDIR\config.ini"
 ${EndIf}
 
 ${If} $CB_SCORES_State == "1" ; Remove highscores
- SetShellVarContext current
- Delete "$APPDATA\ultrastardx\Ultrastar.db" 
- SetShellVarContext all
- Delete "$INSTDIR\Ultrastar.db"
+	SetShellVarContext current
+	Delete "$APPDATA\ultrastardx\Ultrastar.db" 
+	SetShellVarContext all
+	Delete "$INSTDIR\Ultrastar.db"
 ${EndIf}
 
 ${If} $CB_SCREENSHOTS_State == "1" ; Remove screenshots
- RMDir /r "$INSTDIR\sreenshots"
- SetShellVarContext current
- RMDir /r "$APPDATA\ultrastardx\screenshots"
- SetShellVarContext all
+	RMDir /r "$INSTDIR\sreenshots"
+	SetShellVarContext current
+	RMDir /r "$APPDATA\ultrastardx\screenshots"
+	SetShellVarContext all
 ${EndIf}
 
 ${If} $CB_SCREENSHOTS_State == "1" ; Remove playlists
- RMDir /r "$INSTDIR\playlists"
- SetShellVarContext current
- RMDir /r "$APPDATA\ultrastardx\playlists"
- SetShellVarContext all
+	RMDir /r "$INSTDIR\playlists"
+	SetShellVarContext current
+	RMDir /r "$APPDATA\ultrastardx\playlists"
+	SetShellVarContext all
 ${EndIf}
 
 ${If} $CB_SONGS_State == "1" ; Remove songs
- RMDir /r "$INSTDIR\songs"
- SetShellVarContext current
- RMDir /r "$APPDATA\ultrastardx\songs"
- SetShellVarContext all
+	RMDir /r "$INSTDIR\songs"
+	SetShellVarContext current
+	RMDir /r "$APPDATA\ultrastardx\songs"
+	SetShellVarContext all
 ${EndIf}
 
 
@@ -333,39 +333,39 @@ Section $(name_section1) Section1
 	SetOutPath $INSTDIR
 	SetOverwrite try
 
-!include "${path_settings}\files_main_install.nsh"
+	!include "${path_settings}\files_main_install.nsh"
 
-; Create Shortcuts:
-SetOutPath "$INSTDIR"
+	; Create Shortcuts:
+	SetOutPath "$INSTDIR"
 
 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-  SetShellVarContext all
-  SetOutPath "$INSTDIR"
-
-  CreateDirectory "${name}"
-  CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe"
+	SetShellVarContext all
+	SetOutPath "$INSTDIR"
+
+	CreateDirectory "${name}"
+	CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
+	CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe"
+	CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/"
+	CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs"
+	CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe"
 !insertmacro MUI_STARTMENU_WRITE_END
 
-; Vista Game Explorer:
-; (removed due to incompatibility with Windows 7, needs rewrite)
+	; Vista Game Explorer:
+	; (removed due to incompatibility with Windows 7, needs rewrite)
 
-; Create Uninstaller:
+	; Create Uninstaller:
 
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
+	WriteUninstaller "$INSTDIR\Uninstall.exe"
 
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 
-  SetOutPath "$INSTDIR"
+	SetOutPath "$INSTDIR"
 
 SectionEnd
 
@@ -388,14 +388,14 @@ SectionEnd
 
 Section Uninstall
 
- !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
+	!insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
 
- !include "${path_settings}\files_main_uninstall.nsh"
+	!include "${path_settings}\files_main_uninstall.nsh"
 
- DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+	DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
 
-; Unregister from Windows Vista Game Explorer
-; (removed due to incompatibility with Windows 7)
+	; Unregister from Windows Vista Game Explorer
+	; (removed due to incompatibility with Windows 7)
 
 SectionEnd
 
@@ -406,59 +406,59 @@ SectionEnd
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4)
-; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES
-
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6)
-
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24)
-
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9)
-
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4)
+;	!insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6)
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24)
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9)
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3)
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -475,89 +475,88 @@ SectionEnd
 !include "${path_languages}\*.nsh"
 
 ;!addPluginDir "${path_plugins}\"
-
+ 
 Function bgmusic
-    File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav
-    BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav
+	File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav
+	BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav
 FunctionEnd
 
 Function .onGUIEnd
-    BGImage::Sound /STOP
+	BGImage::Sound /STOP
 FunctionEnd
 
 Function .onInit
 
-var /GLOBAL version
-StrCpy $version "1.1beta"
+	var /GLOBAL version
+	StrCpy $version "1.1beta"
 
 
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e'
+	System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e'
 
-  Pop $R0
+	Pop $R0
 
-  StrCmp $R0 0 +3
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running)
-    Abort
+	StrCmp $R0 0 +3
+	MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running)
+	Abort
 
-  ReadRegStr $R0  HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion'
+	ReadRegStr $R0  HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion'
 
-  ${If} $R0 == $version
-	  MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-          "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \
-          IDYES continue
-          Abort
-  ${EndIf}
+	${If} $R0 == $version
+		MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+			"${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \
+			IDYES continue
+		Abort
+	${EndIf}
 
-  ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString'
-  StrCmp $R1 "" done
+	ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString'
+	StrCmp $R1 "" done
   
 
-  ${If} $R0 != $version
-	  MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-          "${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \
-          IDYES continue
-          Abort
-  ${EndIf}
+	${If} $R0 != $version
+		MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+			"${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \
+			IDYES continue
+			Abort
+	${EndIf}
 
 
 continue:
-  ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString'
-  MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done
-  ExecWait '"$R2" _?=$INSTDIR'
+	ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString'
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done
+	ExecWait '"$R2" _?=$INSTDIR'
 
 done:
+	!insertmacro MUI_LANGDLL_DISPLAY
 
-  !insertmacro MUI_LANGDLL_DISPLAY
-
-  !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031"
-  !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033"
-  !insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038"
+	!insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031"
+	!insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033"
+	!insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038"
 
 FunctionEnd
 
 Function un.onInit
 
-        ${nsProcess::FindProcess} "USdx.exe" $R0
-        StrCmp $R0 0 0 +2
-        MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end
+	${nsProcess::FindProcess} "USdx.exe" $R0
+	StrCmp $R0 0 0 +2
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end
 
-	closeit:
-        ${nsProcess::KillProcess} "USdx.exe" $R0
-        goto continue
+closeit:
+	${nsProcess::KillProcess} "USdx.exe" $R0
+	goto continue
 
-        ${nsProcess::FindProcess} "ultrastardx.exe" $R0
-        StrCmp $R0 0 0 +2
-        MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end
+	${nsProcess::FindProcess} "ultrastardx.exe" $R0
+	StrCmp $R0 0 0 +2
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end
 
-	closeusdx:
+closeusdx:
 	${nsProcess::KillProcess} "ultrastardx.exe" $R0
-        goto continue
+	goto continue
 
-        end:
-        ${nsProcess::Unload}
-        Abort
+end:
+	${nsProcess::Unload}
+	Abort
 
-  continue:
-  !insertmacro MUI_LANGDLL_DISPLAY
+continue:
+	!insertmacro MUI_LANGDLL_DISPLAY
 
 FunctionEnd
-- 
cgit v1.2.3