diff --git a/Installer/setup.aip b/Installer/setup.aip index b9220c2c..80df4d8e 100644 --- a/Installer/setup.aip +++ b/Installer/setup.aip @@ -35,9 +35,12 @@ + + + + - @@ -64,7 +67,10 @@ - + + + + @@ -97,13 +103,16 @@ + + + + + - - @@ -158,6 +167,14 @@ + + + + + + + + @@ -180,7 +197,10 @@ - + + + + @@ -223,7 +243,6 @@ - @@ -238,7 +257,6 @@ - @@ -249,24 +267,25 @@ - + - + + + + - - @@ -274,7 +293,6 @@ - @@ -316,8 +334,7 @@ - - + @@ -331,26 +348,20 @@ - - - - - - @@ -361,23 +372,17 @@ - - - - - - @@ -386,21 +391,29 @@ - - - + + + + + + + + + + + + - @@ -417,7 +430,6 @@ - @@ -426,10 +438,8 @@ - - @@ -440,8 +450,7 @@ - - + @@ -486,7 +495,6 @@ - @@ -498,7 +506,6 @@ - @@ -513,8 +520,6 @@ - - @@ -524,17 +529,13 @@ - - - - @@ -551,7 +552,6 @@ - @@ -575,8 +575,6 @@ - - @@ -585,7 +583,6 @@ - @@ -595,7 +592,6 @@ - @@ -739,8 +735,6 @@ - - @@ -782,6 +776,14 @@ + + + + + + + + @@ -889,8 +891,6 @@ - - @@ -931,6 +931,14 @@ + + + + + + + + diff --git a/Output/Cover/Ambient Blue.xml b/Output/Cover/Ambient Blue.xml new file mode 100644 index 00000000..f1f91328 --- /dev/null +++ b/Output/Cover/Ambient Blue.xml @@ -0,0 +1,166 @@ + + + + Ambient Blue + Ambient Blue + flokuep + + + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.675 + 0.890 + 0.969 + 0.8 + + + + 24 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.675 + 0.890 + 0.969 + 0.8 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.675 + 0.890 + 0.969 + 0.8 + + + + 150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 120 + + + + + 0.675 + 0.890 + 0.969 + 0.8 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + diff --git a/Output/Cover/Ambient Blue/No Cover.png b/Output/Cover/Ambient Blue/No Cover.png new file mode 100644 index 00000000..73a0e4b1 Binary files /dev/null and b/Output/Cover/Ambient Blue/No Cover.png differ diff --git a/Output/Cover/Ambient Blue/Normal.png b/Output/Cover/Ambient Blue/Normal.png new file mode 100644 index 00000000..73a0e4b1 Binary files /dev/null and b/Output/Cover/Ambient Blue/Normal.png differ diff --git a/Output/Cover/Ambient Blue/Resources/Normal.psd b/Output/Cover/Ambient Blue/Resources/Normal.psd new file mode 100644 index 00000000..5cc517a3 Binary files /dev/null and b/Output/Cover/Ambient Blue/Resources/Normal.psd differ diff --git a/Output/Cover/Ambient Green.xml b/Output/Cover/Ambient Green.xml new file mode 100644 index 00000000..3e652377 --- /dev/null +++ b/Output/Cover/Ambient Green.xml @@ -0,0 +1,166 @@ + + + + Ambient Green + Ambient Green + flokuep + + + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.709 + 0.968 + 0.674 + 0.9 + + + + 24 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.709 + 0.968 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.709 + 0.968 + 0.674 + 0.9 + + + + 150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 120 + + + + + 0.709 + 0.968 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + diff --git a/Output/Cover/Ambient Green/No Cover.png b/Output/Cover/Ambient Green/No Cover.png new file mode 100644 index 00000000..2a1612cb Binary files /dev/null and b/Output/Cover/Ambient Green/No Cover.png differ diff --git a/Output/Cover/Ambient Green/Normal.png b/Output/Cover/Ambient Green/Normal.png new file mode 100644 index 00000000..2a1612cb Binary files /dev/null and b/Output/Cover/Ambient Green/Normal.png differ diff --git a/Output/Cover/Ambient Green/Resources/Normal.psd b/Output/Cover/Ambient Green/Resources/Normal.psd new file mode 100644 index 00000000..8f973d02 Binary files /dev/null and b/Output/Cover/Ambient Green/Resources/Normal.psd differ diff --git a/Output/Cover/Ambient Red.xml b/Output/Cover/Ambient Red.xml new file mode 100644 index 00000000..fa65f01d --- /dev/null +++ b/Output/Cover/Ambient Red.xml @@ -0,0 +1,166 @@ + + + + Ambient Red + Ambient Red + flokuep + + + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.674 + 0.674 + 0.9 + + + + 24 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.674 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.674 + 0.674 + 0.9 + + + + 150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 120 + + + + + 0.968 + 0.674 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + diff --git a/Output/Cover/Ambient Red/No Cover.png b/Output/Cover/Ambient Red/No Cover.png new file mode 100644 index 00000000..1bf01057 Binary files /dev/null and b/Output/Cover/Ambient Red/No Cover.png differ diff --git a/Output/Cover/Ambient Red/Normal.png b/Output/Cover/Ambient Red/Normal.png new file mode 100644 index 00000000..1bf01057 Binary files /dev/null and b/Output/Cover/Ambient Red/Normal.png differ diff --git a/Output/Cover/Ambient Red/Resources/Normal.psd b/Output/Cover/Ambient Red/Resources/Normal.psd new file mode 100644 index 00000000..db9fb4ed Binary files /dev/null and b/Output/Cover/Ambient Red/Resources/Normal.psd differ diff --git a/Output/Cover/Ambient Yellow.xml b/Output/Cover/Ambient Yellow.xml new file mode 100644 index 00000000..7636b2fa --- /dev/null +++ b/Output/Cover/Ambient Yellow.xml @@ -0,0 +1,166 @@ + + + + Ambient Yellow + Ambient Yellow + flokuep + + + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.956 + 0.674 + 0.9 + + + + 24 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.956 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Outline + + + + 550 + + + + + 0.968 + 0.956 + 0.674 + 0.9 + + + + 150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 120 + + + + + 0.968 + 0.956 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + diff --git a/Output/Cover/Ambient Yellow/No Cover.png b/Output/Cover/Ambient Yellow/No Cover.png new file mode 100644 index 00000000..e7be3e62 Binary files /dev/null and b/Output/Cover/Ambient Yellow/No Cover.png differ diff --git a/Output/Cover/Ambient Yellow/Normal.png b/Output/Cover/Ambient Yellow/Normal.png new file mode 100644 index 00000000..e7be3e62 Binary files /dev/null and b/Output/Cover/Ambient Yellow/Normal.png differ diff --git a/Output/Cover/Ambient Yellow/Resources/Normal.psd b/Output/Cover/Ambient Yellow/Resources/Normal.psd new file mode 100644 index 00000000..ebc648a0 Binary files /dev/null and b/Output/Cover/Ambient Yellow/Resources/Normal.psd differ diff --git a/Output/Cover/Blue.xml b/Output/Cover/Blue.xml deleted file mode 100644 index 6340b747..00000000 --- a/Output/Cover/Blue.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - Blue - Blue - flokuep - - - - - - - %TEXT% - - Normal - - - - 500 - - - - - 1 - 1 - 1 - 0.8 - - - - 24 - - - 100 - - - 1 - 1 - 1 - 1 - - - EmptyCover.png - - 0.75 - - True - - \ No newline at end of file diff --git a/Output/Cover/Blue/EmptyCover.png b/Output/Cover/Blue/EmptyCover.png deleted file mode 100644 index 048a8dc0..00000000 Binary files a/Output/Cover/Blue/EmptyCover.png and /dev/null differ diff --git a/Output/Cover/Blue/No Cover.png b/Output/Cover/Blue/No Cover.png deleted file mode 100644 index d57d9e73..00000000 Binary files a/Output/Cover/Blue/No Cover.png and /dev/null differ diff --git a/Output/Cover/Blue/Resources/decades.xcf b/Output/Cover/Blue/Resources/decades.xcf deleted file mode 100644 index 4b951b1f..00000000 Binary files a/Output/Cover/Blue/Resources/decades.xcf and /dev/null differ diff --git a/Output/Cover/Blue/Resources/language.xcf b/Output/Cover/Blue/Resources/language.xcf deleted file mode 100644 index 4c7b6a7c..00000000 Binary files a/Output/Cover/Blue/Resources/language.xcf and /dev/null differ diff --git a/Output/Cover/Blue/Resources/letter.xcf b/Output/Cover/Blue/Resources/letter.xcf deleted file mode 100644 index e58b2f5f..00000000 Binary files a/Output/Cover/Blue/Resources/letter.xcf and /dev/null differ diff --git a/Output/Cover/Blue/Resources/no_cover.xcf b/Output/Cover/Blue/Resources/no_cover.xcf deleted file mode 100644 index b1ea09eb..00000000 Binary files a/Output/Cover/Blue/Resources/no_cover.xcf and /dev/null differ diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index a3e1ad2e..2e801f92 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -97,7 +97,7 @@ namespace Vocaluxe.Base { [XmlElement("Name"), DefaultValue("Ambient")] public string Theme; [DefaultValue("Blue")] public string Skin; - [XmlElement("Cover"), DefaultValue("Blue")] public string CoverTheme; + [XmlElement("Cover"), DefaultValue("Ambient Blue")] public string CoverTheme; [DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn DrawNoteLines; [DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn DrawToneHelper; [DefaultValue(ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED)] public ETimerLook TimerLook;