From 1e438b3e8796c21bc463a27ccb6b3467cc8b3050 Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 5 Aug 2003 15:50:17 +0000 Subject: [PATCH] Reverted Ramon's addition of SS_NOPREFIX. It causes trouble with ClearType, compatibility and doesn't allow the user to use accelerators for edit boxes anywhere. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2790 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/UIs/UI Holder/resource.rc | 96 +++++++++++++----------------- Contrib/UIs/default.exe | Bin 5632 -> 5632 bytes Contrib/UIs/modern.exe | Bin 6144 -> 6144 bytes Contrib/UIs/modern_headerbmp.exe | Bin 4608 -> 4608 bytes Contrib/UIs/modern_headerbmpr.exe | Bin 4608 -> 4608 bytes Contrib/UIs/modern_nodesc.exe | Bin 4096 -> 4096 bytes Contrib/UIs/modern_smalldesc.exe | Bin 4096 -> 4096 bytes Contrib/UIs/sdbarker_tiny.exe | Bin 5632 -> 5632 bytes Source/exehead/resource.rc | 52 +++++++--------- 9 files changed, 65 insertions(+), 83 deletions(-) diff --git a/Contrib/UIs/UI Holder/resource.rc b/Contrib/UIs/UI Holder/resource.rc index a9ca4251..ba18d09e 100644 --- a/Contrib/UIs/UI Holder/resource.rc +++ b/Contrib/UIs/UI Holder/resource.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" - ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -26,100 +25,92 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog // -IDD_LICENSE DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_LICENSE DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - ICON 103,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_INTROTEXT,25,0,241,23,SS_NOPREFIX + ICON IDI_ICON2,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_INTROTEXT,25,0,241,23 CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 0x804,0,24,266,105 END -IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_DIR DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL PUSHBUTTON "",IDC_BROWSE,202,48,55,14 - ICON 103,IDC_ULICON,0,0,20,20 - CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,36,265,8 - CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,122,265,8 + ICON IDI_ICON2,IDC_ULICON,0,0,20,20 + CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP, + 0,36,265,8 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,122,265,8 CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,8,65,118,10 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,111,265,8 - LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8 + LTEXT "",IDC_INTROTEXT,25,0,241,34 END -IDD_SELCOM DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - ICON 103,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_TEXT2,0,40,108,65,SS_NOPREFIX - CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX,0, - 27,108,8 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,111,111,8 - LTEXT "",IDC_INTROTEXT,25,0,241,25,SS_NOPREFIX + COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | NOT WS_VISIBLE + ICON IDI_ICON2,IDC_ULICON,0,0,21,20 + LTEXT "",IDC_TEXT2,0,40,108,65 + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,27,108,8 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,111,8 + LTEXT "",IDC_INTROTEXT,25,0,241,25 CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,114,39,151,90 END -IDD_INST DIALOG DISCARDABLE 0, 0, 280, 162 -STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | - WS_SYSMENU +IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162 +STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP + PUSHBUTTON "",IDC_BACK,171,142,50,14,WS_GROUP | NOT WS_VISIBLE PUSHBUTTON "",IDOK,223,142,50,14 PUSHBUTTON "",IDCANCEL,7,142,50,14 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138, - 267,1 - CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | - WS_GROUP,7,6,266,130 - CTEXT "",IDC_VERSTR,59,145,108,8,SS_NOPREFIX | WS_DISABLED + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138,267,1 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | WS_GROUP, + 7,6,266,130 + CTEXT "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP END -IDD_INSTFILES DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241, - 11 - CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,24,0,241,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,11 + CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP, + 24,0,241,8 CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,0,25,265,104 - ICON 103,IDC_ULICON,0,0,20,20 + ICON IDI_ICON2,IDC_ULICON,0,0,20,20 PUSHBUTTON "",IDC_SHOWDETAILS,0,28,60,14,NOT WS_TABSTOP END -IDD_UNINST DIALOG DISCARDABLE 0, 0, 266, 130 -STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD +IDD_UNINST DIALOGEX DISCARDABLE 0, 0, 266, 130 +STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - ICON 103,IDC_ULICON,0,1,20,20 + ICON IDI_ICON2,IDC_ULICON,0,1,20,20 LTEXT "",IDC_UNINSTFROM,0,45,55,8 EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX + LTEXT "",IDC_INTROTEXT,25,0,241,34 END -IDD_VERIFY DIALOG DISCARDABLE 0, 0, 162, 22 -STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE +IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22 +STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX + CTEXT "",IDC_STR,7,7,148,8 END - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -143,7 +134,4 @@ END #endif // APSTUDIO_INVOKED -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - +#endif \ No newline at end of file diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe index 4c99f3b3f4fbd0842a4a6a516780d79341abfae5..3c5d062683c7fc40437b88b1ea5f9bc3f420265b 100755 GIT binary patch delta 1692 zcmah}OGp%99RGc@vpeI149!;4Af>E)gm%zCiP5Z#9t;`u&_j}&YsN0Aq}0LLjXDH{ zHnByQ!kcsnycAt4Lb`Mhx*BM$w;ty9pKrd;ogJ2ThTZ@Czu*7;_^f8DdDa?S*njc; zYF|f6{=#DiQa^~_Fs^aB+Si_1Cq72}GSN36Vj9szf{}Wy0-^vf2h;Fb4NcB2qOQ%Z#*TAz|uh!&{W%5BHOhkf6+5 zLMuA31>ZPs<=}KwFqcv;vl~TB$2zx>-1N_lxdOMi07OB&UIJj0OE+$!80kDgxcYIf zpK%>{)#+OnvtAUl$t{V$U>aBR70ezg-znk^pw1XaHJ;)sesM>4a~#nTuSR8o&I0>z zof6u}6Rev|4dFWeN_-&4jpHOvZ#n*-ZFSz!2~*3*u@_Hp2|88VZYbZiC#Mqnk`>|( ztJu77%tyyl2_Rs+#6ujUxu76vJ}n_B2{XS6+*zl5xF&EV55ARJrr|zHm>b#V{0|HJ zDilLQh)?%#Stfxwgh9E`i8)?I)iYB$iK;MyTqjS>MH*MOcoJ_ delta 1467 zcmaJ>-Afcv6#w0sS?BtZnpy7J2CGC#Sy(SE88mJgMkR{|S#RNP?n1bvl2H#kD;O0e zE)x_znD`dalaKua;zLo767*^inJ>}zcJ7^-ohxqMW#`^=e)pbxe&^%bop$G}9pAGy zzy0#en?&$`o9H8X<*t)R(!A|eDKSLz+`T0^4`hckVsEi6T$k(x&NBn|-|stF{9tQg z)48FYb6&9LEWCJD)6Jga+F*J#bs;@Iesv_>15A@VaVa~R%1vHO-eEc4roYR2(f;SgZA1(pXSdDp5AW{DLi5;swUugZnN!JIT&QjBg4TKk5e z344AJT;>(>(PoKlV~F4>uHgrno)!ukTk-U-1v+q@T>h)L6u7&aFpfVJu^e*X-S|J3 z$ObMgUb4opA5U-v+;C=_Vo@T^d@qbTEIDCrk^KUEu_Y+OCbVdxn%NRFZ#`ZR%`zAp;IkH*tg%<~Db`Fph(GM_sr|5%asyuQK;V*j(I8 j9J9h31~kyLfL+oz|Fzjk5tnpKO2}inw@TbgFYMYshc^ZQ diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe index e2351a649de6e6fd666ed68c672640cd02238128..9296c8e594ed40187a8dbcb4a7cc0705cd954976 100644 GIT binary patch delta 187 zcmZoLXfW7tfPb=pD9hv{`~i#%lSKvQGxAK{Dj*LeuL{`n@-Q$2FfbG|Ok?0+_&@oe zfG|*vso;EG2C%pWLp*~c!#|KXRHYJ_M7D0zi??iURi;0nRW9x&QzG delta 38 kcmZorX;9g)fS<8p@J_M7D0zi??iURi;0sAlvIsgCw diff --git a/Contrib/UIs/modern_nodesc.exe b/Contrib/UIs/modern_nodesc.exe index e0c0bae4d980ff1d6c8d3b9f30b65207aab09118..d9d99ab987cfb6b37782df4d03b143cef32fd7b9 100644 GIT binary patch delta 31 jcmZorXi(U2fRB-3@vEMt%^f$bTOItt$#u diff --git a/Contrib/UIs/modern_smalldesc.exe b/Contrib/UIs/modern_smalldesc.exe index f69f18ba278055a7d53dd447f1b4ec91b0cd3122..9b20bce96f812a33a2071fa10c5b4790d5a3465b 100644 GIT binary patch delta 37 ocmZorXi(U2fRB-3@vEMt%^f$X^a5XY!{50Pk}Q5C8xG diff --git a/Contrib/UIs/sdbarker_tiny.exe b/Contrib/UIs/sdbarker_tiny.exe index d96c337a1704e544daa1b2701260352618848d80..c2eb8ee47d785168838c54706a18ba3d7f84ac8e 100644 GIT binary patch delta 92 zcmZqBY0%m5grAXN@>Blrj69R?3djS=zhF{UP#!35E4Ua)J_NFPCNm0wNJSvYu-Q?_ goRN`na;5NMppdM{f1n~+QF|a6D;f_J-z(}20H#3~wEzGB delta 92 zcmZqBY0%m5grBit@>Blrj6IX@3djS=zhF{UP#!35E4Ua)J_NFRCNm0wNJSvou-Q?_ goRP6{a;5NMppdM{f1n~+QF|a6D;f_J-z(}20N&6ZwEzGB diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc index c718e800..e4807741 100644 --- a/Source/exehead/resource.rc +++ b/Source/exehead/resource.rc @@ -36,7 +36,7 @@ STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_INTROTEXT,25,0,241,23,SS_NOPREFIX + LTEXT "",IDC_INTROTEXT,25,0,241,23 CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 0x804,0,24,266,105 END @@ -54,15 +54,13 @@ BEGIN EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL PUSHBUTTON "",IDC_BROWSE,202,48,55,14 ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,36,265,8 - CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,122,265,8 + CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP, + 0,36,265,8 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,122,265,8 CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,8,65,118,10 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,0,111,265,8 - LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8 + LTEXT "",IDC_INTROTEXT,25,0,241,34 END #endif @@ -75,15 +73,13 @@ IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT - WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_TEXT2,0,40,108,65,SS_NOPREFIX - CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX,0, - 27,108,8 - LTEXT "",IDC_SPACEREQUIRED,0,111,111,18,SS_NOPREFIX | NOT - WS_GROUP - LTEXT "",IDC_INTROTEXT,25,0,241,25,SS_NOPREFIX + COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | NOT WS_VISIBLE + ICON IDI_ICON2,IDC_ULICON,0,0,21,20 + LTEXT "",IDC_TEXT2,0,40,108,65 + CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,27,108,8 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFT,0,111,111,18 + LTEXT "",IDC_INTROTEXT,25,0,241,25 CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,114,39,151,90 @@ -99,14 +95,13 @@ IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162 STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP + PUSHBUTTON "",IDC_BACK,171,142,50,14,WS_GROUP | NOT WS_VISIBLE PUSHBUTTON "",IDOK,223,142,50,14 PUSHBUTTON "",IDCANCEL,7,142,50,14 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138, - 267,1 - CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | - WS_GROUP,7,6,266,130 - CTEXT "",IDC_VERSTR,59,145,108,8,SS_NOPREFIX | WS_DISABLED + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138,267,1 + CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | WS_GROUP, + 7,6,266,130 + CTEXT "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP END #endif @@ -119,10 +114,9 @@ IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241, - 11 - CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | - SS_NOPREFIX,24,0,241,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,11 + CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP, + 24,0,241,8 CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,0,25,265,104 @@ -143,7 +137,7 @@ BEGIN ICON IDI_ICON2,IDC_ULICON,0,1,20,20 LTEXT "",IDC_UNINSTFROM,0,45,55,8 EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX + LTEXT "",IDC_INTROTEXT,25,0,241,34 END #endif @@ -156,7 +150,7 @@ IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX + CTEXT "",IDC_STR,7,7,148,8 END #endif