[ros-diffs] [akhaldi] 67752: [APPWIZ] Remove rsrc.rc and move its content to appwiz.rc. Add a better bitmap to the create shortcut window. By Jared Smudde. CORE-9633

Author: akhaldi
Date: Sat May 16 08:59:21 2015
New Revision: 67752

URL: http://svn.reactos.org/svn/reactos?rev=67752&view=rev
Log:
[APPWIZ] Remove rsrc.rc and move its content to appwiz.rc. Add a better bitmap to the
create shortcut window. By Jared Smudde. CORE-9633

Added:
    trunk/reactos/dll/cpl/appwiz/resources/shortcut.bmp   (with props)
Removed:
    trunk/reactos/dll/cpl/appwiz/rsrc.rc
Modified:
    trunk/reactos/dll/cpl/appwiz/appwiz.rc
    trunk/reactos/dll/cpl/appwiz/createlink.c
    trunk/reactos/dll/cpl/appwiz/resource.h

Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.rc	[iso-8859-1] Sat May 16 08:59:21 2015
@@ -20,7 +20,67 @@
 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

Modified: trunk/reactos/dll/cpl/appwiz/createlink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/createlink.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/createlink.c	[iso-8859-1] Sat May 16 08:59:21 2015
@@ -379,7 +379,7 @@
     psh.nPages = nPages;
     psh.nStartPage = 0;
     psh.phpage = ahpsp;
-    psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_WATERMARK);
+    psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_SHORTCUT);
 
     /* Display the wizard */
     PropertySheet(&psh);

Modified: trunk/reactos/dll/cpl/appwiz/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/resource.h	[iso-8859-1] Sat May 16 08:59:21 2015
@@ -19,6 +19,7 @@
 
 /* Bitmaps */
 #define IDB_WATERMARK	5001
+#define IDB_SHORTCUT	5002
 
 /* Strings */
 #define IDS_CPLSYSTEMNAME			1001

Added: trunk/reactos/dll/cpl/appwiz/resources/shortcut.bmp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/s…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/cpl/appwiz/resources/shortcut.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Removed: trunk/reactos/dll/cpl/appwiz/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/rsrc.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/appwiz/rsrc.rc	(removed)
@@ -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