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

- fixed a typo in inner langstrings name - [un]LicenseTextRB

Browse source 
- Finnish language files updated
- made SetStlColors able to set background color with /BRANDING
- some optimizations
- fixed progress showing for WriteUninstaller


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2870 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-09-07 08:53:22 +00:00
parent ff2ab1239f
commit bb927a6230
10 changed files with 239 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Source/script.cpp
View file

@ -3329,34 +3329,26 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ent.which=EW_SETCTLCOLORS;
ent.offsets[0]=add_string(line.gettoken_str(1));
if (!strcmpi(line.gettoken_str(2),"branding")) {
if (line.getnumtokens() == 4) {
ERROR_MSG("Error: SetCtlColors expected 2 parameters, got 3\n");
return PS_ERROR;
}
int a = 2;
c.flags|=CC_BK|CC_BK_SYS|CC_BKB;
c.bk.lbStyle=BS_NULL;
c.bk.lbColor=COLOR_BTNFACE;
c.flags|=CC_TEXT|CC_TEXT_SYS;
c.text=COLOR_BTNFACE;
c.bkmode=OPAQUE;
}
else {
if (!strcmpi(line.gettoken_str(2),"/BRANDING"))
a++;
{
char *p;
if (line.getnumtokens() == 3) {
ERROR_MSG("Error: SetCtlColors expected 3 parameters, got 2\n");
if (a == 2 && line.getnumtokens() == 5) {
ERROR_MSG("Error: SetCtlColors expected 3 parameters, got 4\n");
return PS_ERROR;
}
if (!strcmpi(line.gettoken_str(3),"transparent")) {
if (!strcmpi(line.gettoken_str(a+1),"transparent")) {
c.flags|=CC_BKB;
c.bk.lbStyle=BS_NULL;
c.bkmode=TRANSPARENT;
}
else {
p=line.gettoken_str(3);
p=line.gettoken_str(a+1);
if (*p) {
int v=strtoul(p,&p,16);
c.bk.lbColor=((v&0xff)<<16)|(v&0xff00)|((v&0xff0000)>>16);
@ -3367,7 +3359,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
c.bkmode=OPAQUE;
}
p=line.gettoken_str(2);
p=line.gettoken_str(a);
if (*p) {
int v=strtoul(p,&p,16);
c.text=((v&0xff)<<16)|(v&0xff00)|((v&0xff0000)>>16);
@ -3375,6 +3367,24 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
}
}
if (a == 3)
{
c.flags|=CC_BK|CC_BKB;
c.bk.lbStyle=BS_NULL;
if (!*line.gettoken_str(a))
{
c.bk.lbColor=COLOR_BTNFACE;
c.flags|=CC_BK_SYS;
}
c.flags|=CC_TEXT;
if (!*line.gettoken_str(a+1))
{
c.text=COLOR_BTNFACE;
c.flags|=CC_TEXT_SYS;
}
c.bkmode=OPAQUE;
}
int i;
int l=cur_ctlcolors->getlen()/sizeof(ctlcolors);
for (i=0; i<l; i++) {
@ -3387,7 +3397,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ent.offsets[1]=cur_ctlcolors->add(&c,sizeof(ctlcolors));
}
SCRIPT_MSG("SetCtlColors: hwnd=%s text=%s background=%s\n",line.gettoken_str(1),line.gettoken_str(2),line.gettoken_str(3));
SCRIPT_MSG("SetCtlColors: hwnd=%s %stext=%s background=%s\n",line.gettoken_str(1),a==2?"":"/BRANDING ",line.gettoken_str(a),line.gettoken_str(a+1));
}
return add_entry(&ent);
case TOK_CREATEFONT: