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

applied patch #1683189 - [InstallOptions] new control type: "line"

Browse source 
added VLine and HLine


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5039 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-09 10:52:45 +00:00
parent b60f5f2aa9
commit a2b1a9e178
2 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -68,20 +68,22 @@ char *WINAPI STRDUP(const char *c)
// NB - the order of this list is important - see below // NB - the order of this list is important - see below
#define FIELD_INVALID (0) #define FIELD_INVALID (0)
#define FIELD_LABEL (1) #define FIELD_HLINE (1)
#define FIELD_ICON (2) #define FIELD_VLINE (2)
#define FIELD_BITMAP (3) #define FIELD_LABEL (3)
#define FIELD_BROWSEBUTTON (4) #define FIELD_ICON (4)
#define FIELD_LINK (5) #define FIELD_BITMAP (5)
#define FIELD_BUTTON (6) #define FIELD_BROWSEBUTTON (6)
#define FIELD_GROUPBOX (7) #define FIELD_LINK (7)
#define FIELD_CHECKBOX (8) #define FIELD_BUTTON (8)
#define FIELD_RADIOBUTTON (9) #define FIELD_GROUPBOX (9)
#define FIELD_TEXT (10) #define FIELD_CHECKBOX (10)
#define FIELD_FILEREQUEST (11) #define FIELD_RADIOBUTTON (11)
#define FIELD_DIRREQUEST (12) #define FIELD_TEXT (12)
#define FIELD_COMBOBOX (13) #define FIELD_FILEREQUEST (13)
#define FIELD_LISTBOX (14) #define FIELD_DIRREQUEST (14)
#define FIELD_COMBOBOX (15)
#define FIELD_LISTBOX (16)
#define FIELD_SETFOCUS FIELD_CHECKBOX // First field that qualifies for having the initial keyboard focus #define FIELD_SETFOCUS FIELD_CHECKBOX // First field that qualifies for having the initial keyboard focus
#define FIELD_CHECKLEN FIELD_TEXT // First field to have length of state value checked against MinLen/MaxLen #define FIELD_CHECKLEN FIELD_TEXT // First field to have length of state value checked against MinLen/MaxLen
@ -457,6 +459,8 @@ int WINAPI ReadSettings(void) {
{ "LINK", FIELD_LABEL }, { "LINK", FIELD_LABEL },
#endif #endif
{ "BUTTON", FIELD_BUTTON }, { "BUTTON", FIELD_BUTTON },
{ "HLINE", FIELD_HLINE },
{ "VLINE", FIELD_VLINE },
{ NULL, 0 } { NULL, 0 }
}; };
// Control flags // Control flags
@ -1014,6 +1018,16 @@ int WINAPI createCfgDlg()
DWORD dwExStyle; DWORD dwExStyle;
DWORD dwRTLExStyle; DWORD dwRTLExStyle;
} ClassTable[] = { } ClassTable[] = {
{ "STATIC", // FIELD_HLINE
DEFAULT_STYLES | SS_ETCHEDHORZ | SS_SUNKEN,
DEFAULT_STYLES | SS_ETCHEDHORZ | SS_SUNKEN,
WS_EX_TRANSPARENT,
WS_EX_TRANSPARENT | RTL_EX_STYLES },
{ "STATIC", // FIELD_VLINE
DEFAULT_STYLES | SS_ETCHEDVERT | SS_SUNKEN,
DEFAULT_STYLES | SS_ETCHEDVERT | SS_SUNKEN,
WS_EX_TRANSPARENT,
WS_EX_TRANSPARENT | RTL_EX_STYLES },
{ "STATIC", // FIELD_LABEL { "STATIC", // FIELD_LABEL
DEFAULT_STYLES, DEFAULT_STYLES,
DEFAULT_STYLES | SS_RIGHT, DEFAULT_STYLES | SS_RIGHT,

8
Contrib/InstallOptions/Readme.html
View file

@ -236,8 +236,8 @@ are "<em>Label</em>", "<em>Text</em>", "<em>Password</em>",
"<em>Combobox</em>", "<em>DropList</em>", "<em>Listbox</em>", "<em>Combobox</em>", "<em>DropList</em>", "<em>Listbox</em>",
"<em>CheckBox</em>", "<em>RadioButton</em>", "<em>CheckBox</em>", "<em>RadioButton</em>",
"<em>FileRequest</em>", "<em>DirRequest</em>" "<em>Icon</em>", "<em>FileRequest</em>", "<em>DirRequest</em>" "<em>Icon</em>",
"<em>Bitmap</em>", "<em>GroupBox</em>", "<em>Link</em>" or "<em>Bitmap</em>", "<em>GroupBox</em>", "<em>HLine</em>",
"<em>Button</em>".<br /> "<em>VLine</em>", "<em>Link</em>" or "<em>Button</em>".<br />
<br /> <br />
A "<em>Label</em>" is used to display static text. (i.e. a caption A "<em>Label</em>" is used to display static text. (i.e. a caption
for a textbox)<br /> for a textbox)<br />
@ -264,6 +264,10 @@ installer icon.<br />
A "<em>Bitmap</em>" control displays a bitmap.<br /> A "<em>Bitmap</em>" control displays a bitmap.<br />
A "<em>GroupBox</em>" control displays a frame to group A "<em>GroupBox</em>" control displays a frame to group
controls.<br /> controls.<br />
A "<em>HLine</em>" control displays a horizontal line to separate
controls.<br />
A "<em>VLine</em>" control displays a vertical line to separate
controls.<br />
A "<em>Link</em>" control displays a static hot text. When the user A "<em>Link</em>" control displays a static hot text. When the user
clicks the control the contents of <strong>State</strong> (e.g. clicks the control the contents of <strong>State</strong> (e.g.
http://...) will be executed using ShellExecute. Alternatively http://...) will be executed using ShellExecute. Alternatively