better grouping

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2017 212acab6-be3b-0410-9dea-997c60f758d6
2002-12-29 21:41:12 +00:00 · 2002-12-29 21:41:12 +00:00 · 11f34a1095
commit 11f34a1095
parent cd61ccec21
7 changed files with 125 additions and 61 deletions
--- a/Holder/resource.rc
+++ b/Holder/resource.rc
@ -8,7 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "afxres.h"
-
+#include "config.h"
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

@ -26,112 +26,170 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //

+#if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_LICENSEPAGE)
+#if defined(APSTUDIO_INVOKED)
+IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOGEX DISCARDABLE  0, 0, 266, 130
+#else
 IDD_LICENSE DIALOGEX DISCARDABLE  0, 0, 266, 130
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
+#endif
+STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON            103,IDC_ULICON,0,0,20,20
+    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
+#endif

+#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
+#else
 IDD_DIR DIALOGEX DISCARDABLE  0, 0, 266, 130
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
+#endif
+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 | WS_GROUP,
+    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 | 
-                    WS_GROUP,0,122,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 | 
-                    WS_GROUP,0,111,265,8
+    CONTROL         "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8
    LTEXT           "",IDC_INTROTEXT,25,0,241,34
 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
+#else
 IDD_SELCOM DIALOGEX DISCARDABLE  0, 0, 266, 130
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
+#endif
+STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
    COMBOBOX        IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | 
                    WS_TABSTOP
-    ICON            103,IDC_ULICON,0,0,21,20
-    LTEXT           "",IDC_TEXT2,0,40,108,21
-    CONTROL         "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,0,27,
-                    108,8
-    CONTROL         "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,0,111,111,8
+    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
+#endif

+#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
+#else
 IDD_INST DIALOGEX DISCARDABLE  0, 0, 280, 162
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
+#endif
+STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX
 FONT 8, "MS Shell Dlg"
 BEGIN
+	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,7,138,267,1
-    CONTROL         "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE,
+    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
-    PUSHBUTTON      "",IDC_BACK,171,142,50,14,NOT WS_VISIBLE
-    CTEXT           "",IDC_VERSTR,59,145,108,8,WS_DISABLED
+    CTEXT           "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP
 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
+#else
 IDD_INSTFILES DIALOGEX DISCARDABLE  0, 0, 266, 130
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
+#endif
+STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL         "",IDC_PROGRESS1,"msctls_progress32",NOT WS_VISIBLE | 
                    WS_BORDER,24,10,241,11
    CONTROL         "",IDC_PROGRESS2,"msctls_progress32",PBS_SMOOTH | NOT 
                    WS_VISIBLE | WS_BORDER,24,10,241,11
-    CONTROL         "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
+    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
+#endif

+#if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_UNINSTDLG)
+#if defined(APSTUDIO_INVOKED)
+IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOGEX DISCARDABLE  0, 0, 266, 130
+#else
 IDD_UNINST DIALOGEX DISCARDABLE  0, 0, 266, 130
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
+#endif
+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
 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
+#else
 IDD_VERIFY DIALOGEX DISCARDABLE  0, 0, 162, 22
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
+#endif
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
    CTEXT           "",IDC_STR,7,7,148,8
 END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
+#endif


 /////////////////////////////////////////////////////////////////////////////
-// Unknown language: 0xD, 0x1 resources
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    "IDD_INST$(NSIS_CONFIG_VISIBLE_SUPPORT)", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 273
+        TOPMARGIN, 6
+        BOTTOMMARGIN, 156
+    END
+
+    "IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT)", DIALOG
+    BEGIN
+        RIGHTMARGIN, 246
+        BOTTOMMARGIN, 125
+    END
+
+    "IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG)", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 155
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 15
+    END
+END
+#endif    // APSTUDIO_INVOKED

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HEB)
-#ifdef _WIN32
-LANGUAGE 0xD, 0x1
-#pragma code_page(1255)
-#endif //_WIN32

 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@ -147,29 +205,39 @@ END
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
    "#include ""afxres.h""\r\n"
-    "\0"
+    "#include ""config.h""\0"
 END

 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "\r\n"
    "\0"
 END

 #endif    // APSTUDIO_INVOKED

-#endif    // Unknown language: 0xD, 0x1 resources
-/////////////////////////////////////////////////////////////////////////////

-
-
-#ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
-// Generated from the TEXTINCLUDE 3 resource.
+// Icon
 //

+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON2               ICON    DISCARDABLE     "nsis.ico"

 /////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
+//
+// Bitmap
+//
+
+#if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_COMPONENTPAGE)
+#if defined(APSTUDIO_INVOKED)
+IDB_BITMAP1$(NSIS_CONFIG_COMPONENTPAGE) BITMAP  DISCARDABLE     "bitmap1.bmp"
+#else
+IDB_BITMAP1             BITMAP  DISCARDABLE     "bitmap1.bmp"
+#endif
+#endif
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+

--- a/Contrib/UIs/default.exe
+++ b/Contrib/UIs/default.exe
--- a/Contrib/UIs/modern.exe
+++ b/Contrib/UIs/modern.exe
--- a/Contrib/UIs/modern2.exe
+++ b/Contrib/UIs/modern2.exe
--- a/Contrib/UIs/modern3.exe
+++ b/Contrib/UIs/modern3.exe
--- a/Contrib/UIs/sdbarker_tiny.exe
+++ b/Contrib/UIs/sdbarker_tiny.exe