From 804810bf37c388f92bcaaa4041771bdc11d8e099 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 16 May 2015 08:59:21 +0000 Subject: [PATCH] [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 svn path=/trunk/; revision=67752 --- reactos/dll/cpl/appwiz/appwiz.rc | 62 +++++++++++++++++- reactos/dll/cpl/appwiz/createlink.c | 2 +- reactos/dll/cpl/appwiz/resource.h | 1 + reactos/dll/cpl/appwiz/resources/shortcut.bmp | Bin 0 -> 66678 bytes reactos/dll/cpl/appwiz/rsrc.rc | 59 ----------------- 5 files changed, 63 insertions(+), 61 deletions(-) create mode 100644 reactos/dll/cpl/appwiz/resources/shortcut.bmp delete mode 100644 reactos/dll/cpl/appwiz/rsrc.rc diff --git a/reactos/dll/cpl/appwiz/appwiz.rc b/reactos/dll/cpl/appwiz/appwiz.rc index a6d23ba8c46..eaf7f5a0c17 100644 --- 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 -#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 361ca156c9e..947f695d5a8 100644 --- 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 7c5117229f6..9108f7a8e52 100644 --- 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 index 0000000000000000000000000000000000000000..c10864ba7d0d136029e0d100ec13ca7695ae626c GIT binary patch literal 66678 zcmeI%TWnKx9KiA4%2=nJ3Z+|T*XgPhs7}QTOgnWGXJH^9Eh^rp==P+EG4VxBH1W~E zo*)q((J{8*xJI7@AB1rem<&k-2^$*>#{GWv|36*gY1lar15S_0_rILAJ^!x#?sLw+ z-DT4B&vSD`kBPY=}TKN6NKp*NnNZ)n}j2C-wF9vS7giS+r=8 zc)ea(Ja3-t*s(({Uc4yRuV0rAb$y=N_l=sXtE-c3+qOw>Z?7CUa6r1cx}>|iTMiyP zD2EOmlAfL(S*#xG@ZrPK*ViXUjvSGrM~}+>{rlzD_3Neer{(fv^HN#f)+XzITQ7U} z?v?)je%Z8TvuxSARhpWc<%gwB>b~owPkrsNW5;A;d%G-Y`cXD--6CzPR?6=iHpsqz z_DOSVi?pp=Ax+DgrMaa=jvqfRYk&D!{@SxgPMkO)r%s)cKelg|Wv#8!)!ikhPoI`E zXU<4ZZ;xzf-za~p=RSM(tn{nrIC=7S#RFO_LyW25ZawM#lXJ7xa- z`O=__8yXtqd*!ll;X?UVUH@3!?=!W1rM55B_KDg)RT~2V1Q0*~0R#|0009ILKmY** z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0 z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{ z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY+tft;HdmJfQ1CvGA!=N6|}KHUGM z(KBoaAL^U4{Kjwbgm&}{WjNi4<4qrV<5=T}quqMX=DMCU@LFkgnLc;tc${vu^Rk+A zy3xF@=XyT$e55|=jnDsGHe|dP&BZbErQn9w$9LX+&pXJddq4LBlVnyM^WS(gSun^* zzV&u~#;KXb^Krzhsj5U(bWO9~oTJ4mY>Zj9$9uwR1U1`S!$%$b*0g0em`=$(d6STD32!+2_tga z%hRXNm@#AK%$cvG8%_6fe9f4ARAWUvG1_>AtgRh0b?Vd!6DC9=iFk#Z&c~>NoLr?N z)tIabRibJvchmV8RgjZjRFTy+H8n4l8Htg2g>E!?JASN9=b5*lR7E~t7Od2jFO1iS zkw~nfJnAOLu#SAX?3s9F^x5aqg|S$9wA4+GB|7qnNbJd{1`H?0VzFpx*iDWlVIBFH z3QLdi#gE5grD5IZn)5MKq9vna$E6b=dbm9L$fMzs5;r*pLm^FBdf)wJkp~_e9gUWj zhR2kILT+;O2ZNeYRSt}>LJS3iZgMR4`!%J`G={ns3I+XsH#rs+>q?cWJ9VEj^!tm8 z-Q-wUG*D@D2G!7oMMZ9M3l0^tSGC{AUW&`$zsAclrkT6F`CQuDkDXi=!uZc-|m?O7Z3m z&&^=WrelVc$@hl+S^Rw_6U*k7(~WjsR&!1_+HhG;Io)VwWw+nyMoTQ438x$FysYM& zZnWXDoN~I+%F1rP(~Xu`HWN-a+Id;cIo)W(WjW<^qm`B2euo>?(+z24{x|CO-5OHd hz!%-Vs?0~GG1G%v2q1s}0tg_000IagfPjky{skr_Y*GLK literal 0 HcmV?d00001 diff --git a/reactos/dll/cpl/appwiz/rsrc.rc b/reactos/dll/cpl/appwiz/rsrc.rc deleted file mode 100644 index e0a56f71705..00000000000 --- 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