+ New browse dialog style (modern)

+ Word wrapping for check boxes and radio buttons
+ No ugly border for edit fields under XP
+ Scroll bar for list boxes
+ Only labels can have \r\n - fixed in docs


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2084 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/InstallOptions/InstallerOptions.cpp

@@ -272,7 +272,10 @@ bool BrowseForFolder(int nControlIdx) {
   bi.pidlRoot = NULL;
   bi.pszDisplayName = (char*)MALLOC(MAX_PATH);
   bi.lpszTitle = pFields[nControlIdx].pszText;
-  bi.ulFlags = BIF_STATUSTEXT;
+#ifndef BIF_NEWDIALOGSTYLE
+#define BIF_NEWDIALOGSTYLE 0x0040
+#endif
+  bi.ulFlags = BIF_STATUSTEXT | BIF_RETURNONLYFSDIRS| BIF_NEWDIALOGSTYLE;
   bi.lpfn = BrowseCallbackProc;
   bi.lParam = nControlIdx;
   bi.iImage = 0;
@@ -852,25 +855,25 @@ int createCfgDlg()
         DEFAULT_STYLES | WS_TABSTOP,
         0 },
       { "BUTTON",       // FIELD_CHECKBOX
-        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX,
+        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX | BS_MULTILINE,
         0 },
       { "BUTTON",       // FIELD_RADIOBUTTON
-        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON,
+        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON | BS_MULTILINE,
         0 },
       { "EDIT",         // FIELD_TEXT
-        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "EDIT",         // FIELD_FILEREQUEST
-        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "EDIT",         // FIELD_DIRREQUEST
-        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "COMBOBOX",     // FIELD_COMBOBOX
         DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | WS_CLIPCHILDREN | CBS_AUTOHSCROLL | CBS_HASSTRINGS,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "LISTBOX",      // FIELD_LISTBOX
-        DEFAULT_STYLES | WS_TABSTOP | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
+        DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "BUTTON",       // FIELD_GROUPBOX
         DEFAULT_STYLES | BS_GROUPBOX,

Contrib/InstallOptions/Readme.html

@@ -235,7 +235,7 @@ numbers from 1 to NumFields. Each Field section can contain the following values
       <td class="lefttable"><span class="italic">(optional)</span></td>
       <td class="righttable">Specifies the caption of a label, checkbox, or radio button control.
       For icon and bitmaps control this specifies the path to the image.<br /><br />
-      <span class="bold">Note:</span> \r\n will be replaced by a newline.
+      <span class="bold">Note:</span> \r\n will be replaced by a newline for labels.
       </td></tr>
     <tr>
       <td class="lefttable"><span class="bold">State</span></td>