dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2790 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-08-05 15:50:17 +00:00
parent 7093dc3b2d
commit 1e438b3e87
9 changed files with 65 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

96
Contrib/UIs/UI Holder/resource.rc
View file

@ -8,7 +8,6 @@
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include "afxres.h" #include "afxres.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
@ -26,100 +25,92 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Dialog // Dialog
// //
IDD_LICENSE DIALOG DISCARDABLE 0, 0, 266, 130 IDD_LICENSE DIALOGEX DISCARDABLE 0, 0, 266, 130
STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN 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,SS_NOPREFIX LTEXT "",IDC_INTROTEXT,25,0,241,23
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL | CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
0x804,0,24,266,105 0x804,0,24,266,105
END END
IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130 IDD_DIR DIALOGEX DISCARDABLE 0, 0, 266, 130
STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL
PUSHBUTTON "",IDC_BROWSE,202,48,55,14 PUSHBUTTON "",IDC_BROWSE,202,48,55,14
ICON 103,IDC_ULICON,0,0,20,20 ICON IDI_ICON2,IDC_ULICON,0,0,20,20
CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP,
SS_NOPREFIX,0,36,265,8 0,36,265,8
CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,122,265,8
SS_NOPREFIX,0,122,265,8
CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE |
WS_TABSTOP,8,65,118,10 WS_TABSTOP,8,65,118,10
CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8
SS_NOPREFIX,0,111,265,8 LTEXT "",IDC_INTROTEXT,25,0,241,34
LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX
END END
IDD_SELCOM DIALOG DISCARDABLE 0, 0, 266, 130 IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130
STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_VISIBLE | WS_VSCROLL | WS_TABSTOP WS_TABSTOP | NOT WS_VISIBLE
ICON 103,IDC_ULICON,0,0,20,20 ICON IDI_ICON2,IDC_ULICON,0,0,21,20
LTEXT "",IDC_TEXT2,0,40,108,65,SS_NOPREFIX LTEXT "",IDC_TEXT2,0,40,108,65
CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX,0, CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,27,108,8
27,108,8 CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,111,8
CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | LTEXT "",IDC_INTROTEXT,25,0,241,25
SS_NOPREFIX,0,111,111,8
LTEXT "",IDC_INTROTEXT,25,0,241,25,SS_NOPREFIX
CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP |
WS_BORDER | WS_TABSTOP,114,39,151,90 WS_BORDER | WS_TABSTOP,114,39,151,90
END END
IDD_INST DIALOG DISCARDABLE 0, 0, 280, 162 IDD_INST DIALOGEX DISCARDABLE 0, 0, 280, 162
STYLE DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER
WS_SYSMENU
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN 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 "",IDOK,223,142,50,14
PUSHBUTTON "",IDCANCEL,7,142,50,14 PUSHBUTTON "",IDCANCEL,7,142,50,14
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138, CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138,267,1
267,1 CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | WS_GROUP,
CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | 7,6,266,130
WS_GROUP,7,6,266,130 CTEXT "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP
CTEXT "",IDC_VERSTR,59,145,108,8,SS_NOPREFIX | WS_DISABLED
END END
IDD_INSTFILES DIALOG DISCARDABLE 0, 0, 266, 130 IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130
STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241, CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,11
11 CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP,
CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | 24,0,241,8
SS_NOPREFIX,24,0,241,8
CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL |
LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER |
WS_TABSTOP,0,25,265,104 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 PUSHBUTTON "",IDC_SHOWDETAILS,0,28,60,14,NOT WS_TABSTOP
END END
IDD_UNINST DIALOG DISCARDABLE 0, 0, 266, 130 IDD_UNINST DIALOGEX DISCARDABLE 0, 0, 266, 130
STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN 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 LTEXT "",IDC_UNINSTFROM,0,45,55,8
EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY 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 END
IDD_VERIFY DIALOG DISCARDABLE 0, 0, 162, 22 IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX CTEXT "",IDC_STR,7,7,148,8
END END
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
@ -143,7 +134,4 @@ END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources #endif
/////////////////////////////////////////////////////////////////////////////

BIN
Contrib/UIs/default.exe
View file

Binary file not shown.

BIN
Contrib/UIs/modern.exe
View file

Binary file not shown.

BIN
Contrib/UIs/modern_headerbmp.exe
View file

Binary file not shown.

BIN
Contrib/UIs/modern_headerbmpr.exe
View file

Binary file not shown.

BIN
Contrib/UIs/modern_nodesc.exe
View file

Binary file not shown.

BIN
Contrib/UIs/modern_smalldesc.exe
View file

Binary file not shown.

BIN
Contrib/UIs/sdbarker_tiny.exe
View file

Binary file not shown.

52
Source/exehead/resource.rc
View file

@ -36,7 +36,7 @@ STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
ICON IDI_ICON2,IDC_ULICON,0,0,20,20 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 | CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
0x804,0,24,266,105 0x804,0,24,266,105
END END
@ -54,15 +54,13 @@ BEGIN
EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL EDITTEXT IDC_DIR,8,49,187,12,ES_AUTOHSCROLL
PUSHBUTTON "",IDC_BROWSE,202,48,55,14 PUSHBUTTON "",IDC_BROWSE,202,48,55,14
ICON IDI_ICON2,IDC_ULICON,0,0,20,20 ICON IDI_ICON2,IDC_ULICON,0,0,20,20
CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP,
SS_NOPREFIX,0,36,265,8 0,36,265,8
CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP | CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP,0,122,265,8
SS_NOPREFIX,0,122,265,8
CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE |
WS_TABSTOP,8,65,118,10 WS_TABSTOP,8,65,118,10
CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP | CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFTNOWORDWRAP,0,111,265,8
SS_NOPREFIX,0,111,265,8 LTEXT "",IDC_INTROTEXT,25,0,241,34
LTEXT "",IDC_INTROTEXT,25,0,241,34,SS_NOPREFIX
END END
#endif #endif
@ -75,15 +73,13 @@ IDD_SELCOM DIALOGEX DISCARDABLE 0, 0, 266, 130
STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | NOT COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_VISIBLE | WS_VSCROLL | WS_TABSTOP WS_TABSTOP | NOT WS_VISIBLE
ICON IDI_ICON2,IDC_ULICON,0,0,20,20 ICON IDI_ICON2,IDC_ULICON,0,0,21,20
LTEXT "",IDC_TEXT2,0,40,108,65,SS_NOPREFIX LTEXT "",IDC_TEXT2,0,40,108,65
CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX,0, CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP,0,27,108,8
27,108,8 CONTROL "",IDC_SPACEREQUIRED,"Static",SS_LEFT,0,111,111,18
LTEXT "",IDC_SPACEREQUIRED,0,111,111,18,SS_NOPREFIX | NOT LTEXT "",IDC_INTROTEXT,25,0,241,25
WS_GROUP
LTEXT "",IDC_INTROTEXT,25,0,241,25,SS_NOPREFIX
CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS |
TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP |
WS_BORDER | WS_TABSTOP,114,39,151,90 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 STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_BORDER
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN 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 "",IDOK,223,142,50,14
PUSHBUTTON "",IDCANCEL,7,142,50,14 PUSHBUTTON "",IDCANCEL,7,142,50,14
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138, CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ | WS_GROUP,7,138,267,1
267,1 CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | WS_GROUP,
CONTROL "",IDC_CHILDRECT,"Static",SS_BLACKRECT | NOT WS_VISIBLE | 7,6,266,130
WS_GROUP,7,6,266,130 CTEXT "",IDC_VERSTR,59,145,108,8,WS_DISABLED | WS_GROUP
CTEXT "",IDC_VERSTR,59,145,108,8,SS_NOPREFIX | WS_DISABLED
END END
#endif #endif
@ -119,10 +114,9 @@ IDD_INSTFILES DIALOGEX DISCARDABLE 0, 0, 266, 130
STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241, CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,24,10,241,11
11 CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP,
CONTROL "",IDC_INTROTEXT,"Static",SS_LEFTNOWORDWRAP | 24,0,241,8
SS_NOPREFIX,24,0,241,8
CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL | CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL |
LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER | LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER |
WS_TABSTOP,0,25,265,104 WS_TABSTOP,0,25,265,104
@ -143,7 +137,7 @@ BEGIN
ICON IDI_ICON2,IDC_ULICON,0,1,20,20 ICON IDI_ICON2,IDC_ULICON,0,1,20,20
LTEXT "",IDC_UNINSTFROM,0,45,55,8 LTEXT "",IDC_UNINSTFROM,0,45,55,8
EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY 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 END
#endif #endif
@ -156,7 +150,7 @@ IDD_VERIFY DIALOGEX DISCARDABLE 0, 0, 162, 22
STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN BEGIN
CTEXT "",IDC_STR,7,7,148,8,SS_NOPREFIX CTEXT "",IDC_STR,7,7,148,8
END END
#endif #endif