merged trunk r2528 into us_maker branch

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2530 b956fd51-792f-4845-bead-9b4dfca2ff2c

6 files changed, 176 insertions, 15 deletions

diff --git a/us_maker_edition/installer/settings/files_main_install.nsh b/us_maker_edition/installer/settings/files_main_install.nsh
index a79d4991..10afc6f6 100644
--- a/us_maker_edition/installer/settings/files_main_install.nsh
+++ b/us_maker_edition/installer/settings/files_main_install.nsh
@@ -33,19 +33,19 @@ CreateDirectory $INSTDIR\plugins
 CreateDirectory $INSTDIR\covers

 CreateDirectory $INSTDIR\songs

 

-${If} ${AtLeastWinVista}

+${If} $UseAppData == true

 

   ; Create folders in appdata for current user

   SetShellVarContext current		

-  CreateDirectory $APPDATA\ultrastardx

-  CreateDirectory $APPDATA\ultrastardx\screenshots

-  CreateDirectory $APPDATA\ultrastardx\playlists

+  CreateDirectory $UserDataPath

+  CreateDirectory $UserDataPath\screenshots

+  CreateDirectory $UserDataPath\playlists

 

   SetOutPath "$INSTDIR"

 

-  CreateShortCut "screenshots.lnk" "$APPDATA\ultrastardx\screenshots"

-  CreateShortCut "playlists.lnk" "$APPDATA\ultrastardx\playlists"

-  CreateShortCut "config.ini.lnk" "$APPDATA\ultrastardx\config.ini"

+  CreateShortCut "screenshots.lnk" "$UserDataPath\screenshots"

+  CreateShortCut "playlists.lnk" "$UserDataPath\playlists"

+  CreateShortCut "config.ini.lnk" "$ConfigIniPath"

 

   SetShellVarContext all

 ${EndIf}

diff --git a/us_maker_edition/installer/settings/settings-1031.ini b/us_maker_edition/installer/settings/settings-1031.ini
index 7f9573a1..9a6b4b71 100644
--- a/us_maker_edition/installer/settings/settings-1031.ini
+++ b/us_maker_edition/installer/settings/settings-1031.ini
@@ -53,7 +53,7 @@ Bottom=39
 

 [Field 6]

 Type=DropList

-ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

+ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish

 State=German

 Left=62

 Right=152

diff --git a/us_maker_edition/installer/settings/settings-1033.ini b/us_maker_edition/installer/settings/settings-1033.ini
index 5e6b6055..7176d229 100644
--- a/us_maker_edition/installer/settings/settings-1033.ini
+++ b/us_maker_edition/installer/settings/settings-1033.ini
@@ -8,7 +8,7 @@ Left=1
 Top=1

 Right=300

 Bottom=140

-Text=UltraStar Deluxe Konfiguration (Optional) 

+Text=UltraStar Deluxe Configuration (optional) 

 

 [Field 1]

 Type=Label

@@ -53,8 +53,8 @@ Bottom=39
 

 [Field 6]

 Type=DropList

-ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

-State=German

+ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish

+State=English

 Left=62

 Right=152

 Top=45

diff --git a/us_maker_edition/installer/settings/settings-1038.ini b/us_maker_edition/installer/settings/settings-1038.ini
index 62994a1f..f2ef973a 100644
--- a/us_maker_edition/installer/settings/settings-1038.ini
+++ b/us_maker_edition/installer/settings/settings-1038.ini
@@ -8,7 +8,7 @@ Left=1
 Top=1

 Right=300

 Bottom=140

-Text=UltraStar Deluxe Konfiguration (Optional) 

+Text=UltraStar Deluxe Configuration (optional) 

 

 [Field 1]

 Type=Label

@@ -53,8 +53,8 @@ Bottom=39
 

 [Field 6]

 Type=DropList

-ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Icelandic|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish

-State=German

+ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish

+State=Hungarian

 Left=62

 Right=152

 Top=45

diff --git a/us_maker_edition/installer/settings/settings-1045.ini b/us_maker_edition/installer/settings/settings-1045.ini
new file mode 100644
index 00000000..e59f0227
--- /dev/null
+++ b/us_maker_edition/installer/settings/settings-1045.ini
@@ -0,0 +1,161 @@
+[Settings]

+NumFields=19

+

+; Background Group of Settings Box

+[Field 17]

+Type=GroupBox

+Left=1

+Top=1

+Right=300

+Bottom=140

+Text=Konfiguracja UltraStar Deluxe (opcjonalnie) 

+

+[Field 1]

+Type=Label

+Text="Tryb Pełnoekranowy:"

+Left=5

+Right=58

+Top=30

+Bottom=38

+

+[Field 2]

+Type=Label

+Text="Język:"

+Left=5

+Right=58

+Top=47

+Bottom=55

+

+[Field 3]

+Type=Label

+Text="Rozdzielczość:"

+Left=5

+Right=58

+Top=64

+Bottom=72

+

+[Field 4]

+Type=Label

+Text="Zakładki:"

+Left=5

+Right=58

+Top=82

+Bottom=90

+

+[Field 5]

+Type=DropList

+ListItems=On|Off

+State=On

+Left=62

+Right=152

+Top=28

+Bottom=39

+

+[Field 6]

+Type=DropList

+ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish

+State=Polish

+Left=62

+Right=152

+Top=45

+Bottom=56

+

+[Field 7]

+Type=DropList

+ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200

+State=800x600

+Left=62

+Right=152

+Top=62

+Bottom=73

+

+[Field 8]

+Type=DropList

+ListItems=On|Off

+State=Off

+Left=62

+Right=152

+Top=81

+Bottom=91

+

+[Field 9]

+Type=Label

+Text=Czy uruchamiać grę w oknie czy na pełnym ekranie?

+Left=157

+Right=300

+Top=30

+Bottom=38

+

+[Field 10]

+Type=Label

+Text=Wszystkie ustawienia można później zmienić w grze.

+Left=5

+Right=246

+Top=14

+Bottom=23

+

+[Field 11]

+Type=Label

+Text=Dostosuj język GUI.

+Left=158

+Right=300

+Top=46

+Bottom=55

+

+[Field 12]

+Type=Label

+Text=Wybierz rozdzieczość ekrany/okna.

+Left=157

+Right=300

+Top=64

+Bottom=72

+

+[Field 13]

+Type=Label

+Text=Czy chcesz aby piosenki zostały pogrupowane na zakładki ?

+Left=158

+Right=300

+Top=78

+Bottom=94

+

+[Field 14]

+Type=Label

+Left=5

+Top=100

+Right=58

+Bottom=109

+Text=Sortowanie:

+

+[Field 15]

+Type=DropList

+Left=62

+Top=100

+Right=152

+Bottom=111

+State=Artist

+ListItems=Edition|Genre|Language|Folder|Title|Artist

+

+[Field 16]

+Type=Label

+Left=157

+Top=101

+Right=300

+Bottom=110

+Text=Wybierz kryteria sortowania piosenek.

+

+[Field 18]

+Type=DirRequest

+Left=5

+Top=121

+Right=152

+Bottom=132

+Text=SongDir

+State=

+

+[Field 19]

+Type=Label

+Left=158

+Top=119

+Right=295

+Bottom=134

+Text=Wybierz katalog w którym znajdują się piosenki?
\ No newline at end of file
diff --git a/us_maker_edition/installer/settings/variables.nsh b/us_maker_edition/installer/settings/variables.nsh
index 5d79e115..43d19a7f 100644
--- a/us_maker_edition/installer/settings/variables.nsh
+++ b/us_maker_edition/installer/settings/variables.nsh
@@ -4,7 +4,7 @@
 

 ; Product Information:

 

-!define version "1.1beta" ; Make sure version is also set in onInit

+!define version "1.1RC" ; Make sure version is also set in onInit

 

 

 !define name "UltraStar Deluxe"