From 79a49562b344211a5eb55fefddbd6ce2b92d7eab Mon Sep 17 00:00:00 2001 From: ramon18 Date: Tue, 29 Jul 2003 20:25:42 +0000 Subject: [PATCH] SS_NOPREFIX for all STATIC controls, now is possible to name the installer as "My company & CO" for example git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2776 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 19 ++-- 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 Plugins/InstallOptions.dll | Bin 13824 -> 13824 bytes Source/exehead/resource.rc | 95 ++++++++++--------- 11 files changed, 117 insertions(+), 93 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 0f519997..9caa3425 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -432,17 +432,20 @@ bool SaveSettings(void) { } #define BROWSE_WIDTH 15 -static char szResult[4096]; + +#define BUFFER_SIZE 8192 // 8kb of mem is max char count in multiedit +static char szResult[BUFFER_SIZE]; DWORD WINAPI myGetProfileString(LPCTSTR lpAppName, LPCTSTR lpKeyName) { *szResult = '\0'; - return GetPrivateProfileString(lpAppName, lpKeyName, "", szResult, sizeof(szResult), pszFilename); + return GetPrivateProfileString(lpAppName, lpKeyName, "", szResult, BUFFER_SIZE, pszFilename); } char * WINAPI myGetProfileStringDup(LPCTSTR lpAppName, LPCTSTR lpKeyName) { - if (myGetProfileString(lpAppName, lpKeyName)) + int nSize = myGetProfileString(lpAppName, lpKeyName); + if ( nSize ) return strdup(szResult); else return NULL; @@ -543,7 +546,8 @@ bool ReadSettings(void) { // pszState cannot be NULL (?) myGetProfileString(szField, "STATE"); - pFields[nIdx].pszState = STRDUP(szResult); + pFields[nIdx].pszState = myGetProfileStringDup(szField, "STATE"); + //pFields[nIdx].pszState = STRDUP(szResult); pFields[nIdx].pszRoot = myGetProfileStringDup(szField, "ROOT"); @@ -901,7 +905,7 @@ int createCfgDlg() DWORD dwExStyle; } ClassTable[] = { { "STATIC", // FIELD_LABEL - DEFAULT_STYLES /*| WS_TABSTOP*/, + DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_NOPREFIX, WS_EX_TRANSPARENT }, { "STATIC", // FIELD_ICON DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_ICON, @@ -1033,15 +1037,16 @@ int createCfgDlg() // Sets the font of IO window to be the same as the main window SendMessage(hwCtrl, WM_SETFONT, (WPARAM)hFont, TRUE); // make sure we created the window, then set additional attributes - if (pFields[nIdx].nMaxLength > 0) { + //if (pFields[nIdx].nMaxLength > 0) { switch (nType) { case FIELD_TEXT: + SendMessage(hwCtrl, WM_SETTEXT, 0, (LPARAM)title); case FIELD_DIRREQUEST: case FIELD_FILEREQUEST: SendMessage(hwCtrl, EM_LIMITTEXT, (WPARAM)pFields[nIdx].nMaxLength, (LPARAM)0); break; } - } + //} if ((nType == FIELD_CHECKBOX) || (nType == FIELD_RADIOBUTTON)) { if (pFields[nIdx].pszState[0] == '1') { diff --git a/Contrib/UIs/UI Holder/resource.rc b/Contrib/UIs/UI Holder/resource.rc index ba18d09e..a9ca4251 100644 --- a/Contrib/UIs/UI Holder/resource.rc +++ b/Contrib/UIs/UI Holder/resource.rc @@ -8,6 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -25,92 +26,100 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog // -IDD_LICENSE DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_LICENSE DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_INTROTEXT,25,0,241,23 + ICON 103,IDC_ULICON,0,0,20,20 + LTEXT "",IDC_INTROTEXT,25,0,241,23,SS_NOPREFIX CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 0x804,0,24,266,105 END -IDD_DIR DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | 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 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 + 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 CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,8,65,118,10 - CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8 - LTEXT "",IDC_INTROTEXT,25,0,241,34 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,111,265,8 + LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX END -IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_SELCOM DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - 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 + 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 CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,114,39,151,90 END -IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162 -STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER +IDD_INST DIALOG DISCARDABLE 0, 0, 280, 162 +STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | + WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "",IDC_BACK,171,142,50,14,WS_GROUP | NOT WS_VISIBLE + PUSHBUTTON "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP 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,WS_DISABLED | WS_GROUP + 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 END -IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_INSTFILES DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | 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, - 24,0,241,8 + 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_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,0,25,265,104 - ICON IDI_ICON2,IDC_ULICON,0,0,20,20 + ICON 103,IDC_ULICON,0,0,20,20 PUSHBUTTON "",IDC_SHOWDETAILS,0,28,60,14,NOT WS_TABSTOP END -IDD_UNINST DIALOGEX DISCARDABLE 0, 0, 266, 130 -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +IDD_UNINST DIALOG DISCARDABLE 0, 0, 266, 130 +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - ICON IDI_ICON2,IDC_ULICON,0,1,20,20 + ICON 103,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 + LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX END -IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22 -STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE +IDD_VERIFY DIALOG DISCARDABLE 0, 0, 162, 22 +STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CTEXT "",IDC_STR,7,7,148,8 + CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -134,4 +143,7 @@ END #endif // APSTUDIO_INVOKED -#endif \ No newline at end of file +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe index 3c5d062683c7fc40437b88b1ea5f9bc3f420265b..4c99f3b3f4fbd0842a4a6a516780d79341abfae5 100755 GIT binary patch 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 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_ diff --git a/Contrib/UIs/modern.exe b/Contrib/UIs/modern.exe index 9296c8e594ed40187a8dbcb4a7cc0705cd954976..e2351a649de6e6fd666ed68c672640cd02238128 100644 GIT binary patch delta 183 zcmZoLXfW7tfS<8p@J_M7D0zi??iURi;0sAlvIsgCw delta 38 kcmZorX;9g)fS-|J@J_M7D0zi??iURi;0nRW9x&QzG diff --git a/Contrib/UIs/modern_nodesc.exe b/Contrib/UIs/modern_nodesc.exe index d9d99ab987cfb6b37782df4d03b143cef32fd7b9..e0c0bae4d980ff1d6c8d3b9f30b65207aab09118 100644 GIT binary patch delta 31 jcmZorXi(U2fRC|Z@vEMt%^f$bTOItt$#u delta 31 jcmZorXi(U2fRB-3@vEMt%^f$X^a5XY!{50Pk}Q5C8xG delta 37 ocmZorXi(U2fRB-3@Blrj6IX@3djS=zhF{UP#!35E4Ua)J_NFRCNm0wNJSvou-Q?_ goRP6{a;5NMppdM{f1n~+QF|a6D;f_J-z(}20N&6ZwEzGB delta 92 zcmZqBY0%m5grAXN@>Blrj69R?3djS=zhF{UP#!35E4Ua)J_NFPCNm0wNJSvYu-Q?_ goRN`na;5NMppdM{f1n~+QF|a6D;f_J-z(}20H#3~wEzGB diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index cc206d572c1e1826b963329c3325a3dd73ca015f..31e87e6ab5492dbc3f8e87498247ee740c7728f8 100644 GIT binary patch delta 4767 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 So88;oZ@UR%PrGwX#{U4}v6yE7 diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc index e4807741..e1ffc104 100644 --- a/Source/exehead/resource.rc +++ b/Source/exehead/resource.rc @@ -28,15 +28,15 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_LICENSEPAGE) #if defined(APSTUDIO_INVOKED) -IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_LICENSE DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_LICENSE DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2,IDC_ULICON,0,0,20,20 - LTEXT "",IDC_INTROTEXT,25,0,241,23 + LTEXT "",IDC_INTROTEXT,25,0,241,23,SS_NOPREFIX CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | 0x804,0,24,266,105 END @@ -44,42 +44,46 @@ END #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT) #if defined(APSTUDIO_INVOKED) -IDD_DIR$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_DIR$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_DIR DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | 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 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_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,36,265,8 + CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,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,0,111,265,8 - LTEXT "",IDC_INTROTEXT,25,0,241,34 + CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | + SS_NOPREFIX,0,111,265,8 + LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX END #endif #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_COMPONENTPAGE) #if defined(APSTUDIO_INVOKED) -IDD_SELCOM$(NSIS_CONFIG_COMPONENTPAGE) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_SELCOM$(NSIS_CONFIG_COMPONENTPAGE) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_SELCOM DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - 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 + 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 CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,114,39,151,90 @@ -88,35 +92,38 @@ END #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT) #if defined(APSTUDIO_INVOKED) -IDD_INST$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE 0, 0, 280, 162 +IDD_INST$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE 0, 0, 280, 162 #else -IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162 +IDD_INST DIALOG DISCARDABLE 0, 0, 280, 162 #endif -STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER +STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | + WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "",IDC_BACK,171,142,50,14,WS_GROUP | NOT WS_VISIBLE + PUSHBUTTON "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE | WS_GROUP 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,WS_DISABLED | WS_GROUP + 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 END #endif #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT) #if defined(APSTUDIO_INVOKED) -IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_INSTFILES DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | 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, - 24,0,241,8 + 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_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,0,25,265,104 @@ -127,30 +134,30 @@ END #if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_UNINSTDLG) #if defined(APSTUDIO_INVOKED) -IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOG DISCARDABLE 0, 0, 266, 130 #else -IDD_UNINST DIALOGEX DISCARDABLE 0, 0, 266, 130 +IDD_UNINST DIALOG DISCARDABLE 0, 0, 266, 130 #endif -STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD +STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD FONT 8, "MS Shell Dlg" 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 + LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX END #endif #if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_VERIFYDIALOG) #if defined(APSTUDIO_INVOKED) -IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOGEX DISCARDABLE 0, 0, 162, 22 +IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOG DISCARDABLE 0, 0, 162, 22 #else -IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22 +IDD_VERIFY DIALOG DISCARDABLE 0, 0, 162, 22 #endif -STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE +STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - CTEXT "",IDC_STR,7,7,148,8 + CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX END #endif