[APPWIZ] Remove rsrc.rc and move its content to appwiz.rc. Add a better bitmap to...

svn path=/trunk/; revision=67752

diff --git a/reactos/dll/cpl/appwiz/appwiz.rc b/reactos/dll/cpl/appwiz/appwiz.rc
index a6d23ba..eaf7f5a 100644 (file)
--- a/reactos/dll/cpl/appwiz/appwiz.rc
+++ b/reactos/dll/cpl/appwiz/appwiz.rc
@@ -20,7 +20,67 @@ IDI_DOWNLOADICO ICON "resources/1504.ico"
 IDI_APPINETICO ICON "resources/1505.ico"
 
 IDB_WATERMARK BITMAP "resources/watermark.bmp"
+IDB_SHORTCUT BITMAP "resources/shortcut.bmp"
 
 #include <reactos/manifest_dll.rc>
 
-#include "rsrc.rc"
+/* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_BG_BG
+    #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EL_GR
+    #include "lang/el-GR.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
+    #include "lang/es-ES.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_HE_IL
+    #include "lang/he-IL.rc"
+#endif
+#ifdef LANGUAGE_IT_IT
+    #include "lang/it-IT.rc"
+#endif
+#ifdef LANGUAGE_NB_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_PT_BR
+    #include "lang/pt-BR.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif
+#ifdef LANGUAGE_ZH_CN
+    #include "lang/zh-CN.rc"
+#endif

diff --git a/reactos/dll/cpl/appwiz/createlink.c b/reactos/dll/cpl/appwiz/createlink.c
index 361ca15..947f695 100644 (file)
--- a/reactos/dll/cpl/appwiz/createlink.c
+++ b/reactos/dll/cpl/appwiz/createlink.c
@@ -379,7 +379,7 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath)
     psh.nPages = nPages;
     psh.nStartPage = 0;
     psh.phpage = ahpsp;
-    psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_WATERMARK);
+    psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_SHORTCUT);
 
     /* Display the wizard */
     PropertySheet(&psh);

diff --git a/reactos/dll/cpl/appwiz/resource.h b/reactos/dll/cpl/appwiz/resource.h
index 7c51172..9108f7a 100644 (file)
--- a/reactos/dll/cpl/appwiz/resource.h
+++ b/reactos/dll/cpl/appwiz/resource.h
@@ -19,6 +19,7 @@
 
 /* Bitmaps */
 #define IDB_WATERMARK  5001
+#define IDB_SHORTCUT   5002
 
 /* Strings */
 #define IDS_CPLSYSTEMNAME                      1001

diff --git a/reactos/dll/cpl/appwiz/resources/shortcut.bmp b/reactos/dll/cpl/appwiz/resources/shortcut.bmp
new file mode 100644 (file)
index 0000000..c10864b
Binary files /dev/null and b/reactos/dll/cpl/appwiz/resources/shortcut.bmp differ

diff --git a/reactos/dll/cpl/appwiz/rsrc.rc b/reactos/dll/cpl/appwiz/rsrc.rc
deleted file mode 100644 (file)
index e0a56f7..0000000
--- a/reactos/dll/cpl/appwiz/rsrc.rc
+++ /dev/null
@@ -1,59 +0,0 @@
-// UTF-8
-#pragma code_page(65001)
-#ifdef LANGUAGE_BG_BG
-    #include "lang/bg-BG.rc"
-#endif
-#ifdef LANGUAGE_CS_CZ
-    #include "lang/cs-CZ.rc"
-#endif
-#ifdef LANGUAGE_EN_US
-    #include "lang/en-US.rc"
-#endif
-#ifdef LANGUAGE_DE_DE
-    #include "lang/de-DE.rc"
-#endif
-#ifdef LANGUAGE_EL_GR
-    #include "lang/el-GR.rc"
-#endif
-#ifdef LANGUAGE_ES_ES
-    #include "lang/es-ES.rc"
-#endif
-#ifdef LANGUAGE_FR_FR
-    #include "lang/fr-FR.rc"
-#endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
-#ifdef LANGUAGE_NB_NO
-    #include "lang/no-NO.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/pl-PL.rc"
-#endif
-#ifdef LANGUAGE_PT_BR
-    #include "lang/pt-BR.rc"
-#endif
-#ifdef LANGUAGE_RO_RO
-    #include "lang/ro-RO.rc"
-#endif
-#ifdef LANGUAGE_RU_RU
-    #include "lang/ru-RU.rc"
-#endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SQ_AL
-    #include "lang/sq-AL.rc"
-#endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/tr-TR.rc"
-#endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
-#ifdef LANGUAGE_ZH_CN
-    #include "lang/zh-CN.rc"
-#endif