https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21b7648f153521df903a1…
commit 21b7648f153521df903a1fe1efaeebf2ebbede13
Author: Adam Słaboń <asaillen456esx(a)gmail.com>
AuthorDate: Sat Apr 6 01:00:46 2019 +0200
Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Sat Apr 6 01:10:52 2019 +0200
[SYSSETUP] Add Lunar theme option to 2nd setup stage
This adds Lunar theme option to the 2nd setup stage theme chooser page.
---
dll/win32/syssetup/lang/bg-BG.rc | 1 +
dll/win32/syssetup/lang/cs-CZ.rc | 1 +
dll/win32/syssetup/lang/da-DK.rc | 1 +
dll/win32/syssetup/lang/de-DE.rc | 1 +
dll/win32/syssetup/lang/el-GR.rc | 1 +
dll/win32/syssetup/lang/en-US.rc | 1 +
dll/win32/syssetup/lang/es-ES.rc | 1 +
dll/win32/syssetup/lang/et-EE.rc | 1 +
dll/win32/syssetup/lang/fi-FI.rc | 1 +
dll/win32/syssetup/lang/fr-FR.rc | 1 +
dll/win32/syssetup/lang/he-IL.rc | 1 +
dll/win32/syssetup/lang/hi-IN.rc | 1 +
dll/win32/syssetup/lang/hu-HU.rc | 1 +
dll/win32/syssetup/lang/id-ID.rc | 1 +
dll/win32/syssetup/lang/it-IT.rc | 1 +
dll/win32/syssetup/lang/ja-JP.rc | 1 +
dll/win32/syssetup/lang/lt-LT.rc | 1 +
dll/win32/syssetup/lang/nl-NL.rc | 1 +
dll/win32/syssetup/lang/no-NO.rc | 1 +
dll/win32/syssetup/lang/pl-PL.rc | 1 +
dll/win32/syssetup/lang/pt-BR.rc | 1 +
dll/win32/syssetup/lang/ro-RO.rc | 1 +
dll/win32/syssetup/lang/ru-RU.rc | 1 +
dll/win32/syssetup/lang/sk-SK.rc | 1 +
dll/win32/syssetup/lang/sq-AL.rc | 1 +
dll/win32/syssetup/lang/sv-SE.rc | 1 +
dll/win32/syssetup/lang/th-TH.rc | 1 +
dll/win32/syssetup/lang/tr-TR.rc | 1 +
dll/win32/syssetup/lang/uk-UA.rc | 1 +
dll/win32/syssetup/lang/zh-CN.rc | 1 +
dll/win32/syssetup/lang/zh-TW.rc | 1 +
dll/win32/syssetup/resource.h | 2 ++
dll/win32/syssetup/resources/thmlunar.bmp | Bin 0 -> 88074 bytes
dll/win32/syssetup/syssetup.rc | 1 +
dll/win32/syssetup/wizard.c | 1 +
35 files changed, 35 insertions(+)
diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc
index 1ed71abcf2..3126b44d09 100644
--- a/dll/win32/syssetup/lang/bg-BG.rc
+++ b/dll/win32/syssetup/lang/bg-BG.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc
index 341b935f05..19b168c4bd 100644
--- a/dll/win32/syssetup/lang/cs-CZ.rc
+++ b/dll/win32/syssetup/lang/cs-CZ.rc
@@ -227,4 +227,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc
index be23699f38..5637c633c1 100644
--- a/dll/win32/syssetup/lang/da-DK.rc
+++ b/dll/win32/syssetup/lang/da-DK.rc
@@ -240,4 +240,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc
index bc80914a8c..1799fc95e6 100644
--- a/dll/win32/syssetup/lang/de-DE.rc
+++ b/dll/win32/syssetup/lang/de-DE.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc
index 99b5f706d3..d36cb5e023 100644
--- a/dll/win32/syssetup/lang/el-GR.rc
+++ b/dll/win32/syssetup/lang/el-GR.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc
index 531dd8fa3e..89063f42a8 100644
--- a/dll/win32/syssetup/lang/en-US.rc
+++ b/dll/win32/syssetup/lang/en-US.rc
@@ -241,4 +241,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc
index 52c8141536..67434c92df 100644
--- a/dll/win32/syssetup/lang/es-ES.rc
+++ b/dll/win32/syssetup/lang/es-ES.rc
@@ -229,4 +229,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc
index a65e9fa2b2..869d392698 100644
--- a/dll/win32/syssetup/lang/et-EE.rc
+++ b/dll/win32/syssetup/lang/et-EE.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc
index fa3b9569c2..8fa4fdb16b 100644
--- a/dll/win32/syssetup/lang/fi-FI.rc
+++ b/dll/win32/syssetup/lang/fi-FI.rc
@@ -240,4 +240,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc
index c60e249083..3c63f52646 100644
--- a/dll/win32/syssetup/lang/fr-FR.rc
+++ b/dll/win32/syssetup/lang/fr-FR.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc
index c62d47b2a0..23b21f1910 100644
--- a/dll/win32/syssetup/lang/he-IL.rc
+++ b/dll/win32/syssetup/lang/he-IL.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc
index 65a1be8532..8ff1a8f965 100644
--- a/dll/win32/syssetup/lang/hi-IN.rc
+++ b/dll/win32/syssetup/lang/hi-IN.rc
@@ -229,4 +229,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc
index 323f818234..7c6ede2ab4 100644
--- a/dll/win32/syssetup/lang/hu-HU.rc
+++ b/dll/win32/syssetup/lang/hu-HU.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc
index d6cfa7337b..67817b8a3d 100644
--- a/dll/win32/syssetup/lang/id-ID.rc
+++ b/dll/win32/syssetup/lang/id-ID.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc
index 9e999a0ae0..42245fa4d3 100644
--- a/dll/win32/syssetup/lang/it-IT.rc
+++ b/dll/win32/syssetup/lang/it-IT.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc
index 3ef3bec17c..c97f23cb63 100644
--- a/dll/win32/syssetup/lang/ja-JP.rc
+++ b/dll/win32/syssetup/lang/ja-JP.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc
index 817a01bd61..746edf2f92 100644
--- a/dll/win32/syssetup/lang/lt-LT.rc
+++ b/dll/win32/syssetup/lang/lt-LT.rc
@@ -240,4 +240,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc
index 57f7aea1dc..4a102aba64 100644
--- a/dll/win32/syssetup/lang/nl-NL.rc
+++ b/dll/win32/syssetup/lang/nl-NL.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc
index 0d2ce42677..308ff05f31 100644
--- a/dll/win32/syssetup/lang/no-NO.rc
+++ b/dll/win32/syssetup/lang/no-NO.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc
index e942a82d61..444fa20182 100644
--- a/dll/win32/syssetup/lang/pl-PL.rc
+++ b/dll/win32/syssetup/lang/pl-PL.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc
index 9857df3dea..f05f86df16 100644
--- a/dll/win32/syssetup/lang/pt-BR.rc
+++ b/dll/win32/syssetup/lang/pt-BR.rc
@@ -221,4 +221,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index d7f82b3f16..28f3dcdd7c 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -230,4 +230,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc
index a2cd4fde35..85a6e68206 100644
--- a/dll/win32/syssetup/lang/ru-RU.rc
+++ b/dll/win32/syssetup/lang/ru-RU.rc
@@ -223,4 +223,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc
index 1f6198f969..6e05e47811 100644
--- a/dll/win32/syssetup/lang/sk-SK.rc
+++ b/dll/win32/syssetup/lang/sk-SK.rc
@@ -227,4 +227,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc
index 60fbbbd3c6..a3c978732b 100644
--- a/dll/win32/syssetup/lang/sq-AL.rc
+++ b/dll/win32/syssetup/lang/sq-AL.rc
@@ -240,4 +240,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc
index a1609d3007..fbeb8789c4 100644
--- a/dll/win32/syssetup/lang/sv-SE.rc
+++ b/dll/win32/syssetup/lang/sv-SE.rc
@@ -240,4 +240,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc
index 5ae89a6edb..f4a44348eb 100644
--- a/dll/win32/syssetup/lang/th-TH.rc
+++ b/dll/win32/syssetup/lang/th-TH.rc
@@ -240,4 +240,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc
index ee17829e90..43b8930a31 100644
--- a/dll/win32/syssetup/lang/tr-TR.rc
+++ b/dll/win32/syssetup/lang/tr-TR.rc
@@ -223,4 +223,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc
index 0c9ffb6f65..d92fbdd4f8 100644
--- a/dll/win32/syssetup/lang/uk-UA.rc
+++ b/dll/win32/syssetup/lang/uk-UA.rc
@@ -229,4 +229,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc
index 515e594111..e2adecc3fd 100644
--- a/dll/win32/syssetup/lang/zh-CN.rc
+++ b/dll/win32/syssetup/lang/zh-CN.rc
@@ -226,4 +226,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc
index 6da4da4437..39a6148f3e 100644
--- a/dll/win32/syssetup/lang/zh-TW.rc
+++ b/dll/win32/syssetup/lang/zh-TW.rc
@@ -248,4 +248,5 @@ STRINGTABLE
BEGIN
IDS_CLASSIC "Classic"
IDS_LAUTUS "Lautus"
+ IDS_LUNAR "Lunar"
END
diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h
index 030a5c2eed..2578f5ccda 100644
--- a/dll/win32/syssetup/resource.h
+++ b/dll/win32/syssetup/resource.h
@@ -22,6 +22,7 @@
#define IDB_HEADER 101
#define IDB_CLASSIC 102
#define IDB_LAUTUS 103
+#define IDB_LUNAR 104
#define IDI_ICON1 10
#define IDI_ICON2 11
@@ -141,5 +142,6 @@
#define IDS_CLASSIC 3800
#define IDS_LAUTUS 3801
+#define IDS_LUNAR 3802
#define IDR_GPL 4000
diff --git a/dll/win32/syssetup/resources/thmlunar.bmp
b/dll/win32/syssetup/resources/thmlunar.bmp
new file mode 100644
index 0000000000..bd4358f209
Binary files /dev/null and b/dll/win32/syssetup/resources/thmlunar.bmp differ
diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc
index 800d4d2ce6..57137d8ef1 100644
--- a/dll/win32/syssetup/syssetup.rc
+++ b/dll/win32/syssetup/syssetup.rc
@@ -20,6 +20,7 @@ IDB_WATERMARK BITMAP "resources/watermark.bmp"
IDB_HEADER BITMAP "resources/header.bmp"
IDB_CLASSIC BITMAP "resources/thmclassic.bmp"
IDB_LAUTUS BITMAP "resources/thmlautus.bmp"
+IDB_LUNAR BITMAP "resources/thmlunar.bmp"
IDI_ICON1 ICON "resources/1.ico"
IDI_ICON2 ICON "resources/2.ico"
diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c
index 5255b82a0c..45f1394781 100644
--- a/dll/win32/syssetup/wizard.c
+++ b/dll/win32/syssetup/wizard.c
@@ -1602,6 +1602,7 @@ static struct ThemeInfo
} Themes[] = {
{ MAKEINTRESOURCE(IDB_CLASSIC), IDS_CLASSIC, NULL },
{ MAKEINTRESOURCE(IDB_LAUTUS), IDS_LAUTUS,
L"themes\\lautus\\lautus.msstyles" },
+ { MAKEINTRESOURCE(IDB_LUNAR), IDS_LUNAR, L"themes\\lunar\\lunar.msstyles"
},
};
static INT_PTR CALLBACK