зеркало из https://github.com/mozilla/pjs.git
Enable/Disable for Network builds
This commit is contained in:
Родитель
4bb8ee1f88
Коммит
340a14b366
|
@ -59,7 +59,7 @@ Height=11
|
||||||
|
|
||||||
|
|
||||||
[Widget 2]
|
[Widget 2]
|
||||||
Type=Text
|
Type=BoldText
|
||||||
Name=Text32
|
Name=Text32
|
||||||
Value=Before you begin:
|
Value=Before you begin:
|
||||||
Start_x=7
|
Start_x=7
|
||||||
|
|
|
@ -63,6 +63,9 @@ Start_x=6
|
||||||
Start_y=71
|
Start_y=71
|
||||||
Width=330
|
Width=330
|
||||||
Height=13
|
Height=13
|
||||||
|
dll=NULL
|
||||||
|
function=command
|
||||||
|
parameters=toggleEnabled(%Network%,Text103,Text10389,FTPLocation)
|
||||||
|
|
||||||
|
|
||||||
[Widget 3]
|
[Widget 3]
|
||||||
|
@ -83,6 +86,9 @@ Start_x=25
|
||||||
Start_y=104
|
Start_y=104
|
||||||
Width=148
|
Width=148
|
||||||
Height=15
|
Height=15
|
||||||
|
dll=NULL
|
||||||
|
function=Enable
|
||||||
|
parameters=%Network%
|
||||||
|
|
||||||
[Widget 5509]
|
[Widget 5509]
|
||||||
Type=EditBox
|
Type=EditBox
|
||||||
|
@ -92,6 +98,9 @@ Start_x=175
|
||||||
Start_y=101
|
Start_y=101
|
||||||
Width=188
|
Width=188
|
||||||
Height=15
|
Height=15
|
||||||
|
dll=NULL
|
||||||
|
function=Enable
|
||||||
|
parameters=%Network%
|
||||||
|
|
||||||
[Widget 472]
|
[Widget 472]
|
||||||
Type=Text
|
Type=Text
|
||||||
|
@ -101,6 +110,9 @@ Start_x=25
|
||||||
Start_y=84
|
Start_y=84
|
||||||
Width=370
|
Width=370
|
||||||
Height=20
|
Height=20
|
||||||
|
dll=NULL
|
||||||
|
function=Enable
|
||||||
|
parameters=%Network%
|
||||||
|
|
||||||
|
|
||||||
[Widget 4937]
|
[Widget 4937]
|
||||||
|
|
|
@ -809,6 +809,18 @@ void CWizardUI::SortWidgetsForTabOrder()
|
||||||
CurrentNode->isWidgetsSorted = TRUE;
|
CurrentNode->isWidgetsSorted = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CWizardUI::EnableWidget(WIDGET *curWidget)
|
||||||
|
{
|
||||||
|
// all controls are enabled by default, only do something if not enabled...
|
||||||
|
int enabled = TRUE;
|
||||||
|
if (curWidget->action.function == "Enable")
|
||||||
|
{
|
||||||
|
CString enableStr = theInterpreter->replaceVars(curWidget->action.parameters,NULL);
|
||||||
|
if (enableStr != "1")
|
||||||
|
enabled = FALSE;
|
||||||
|
curWidget->control->EnableWindow(enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void CWizardUI::CreateControls()
|
void CWizardUI::CreateControls()
|
||||||
{
|
{
|
||||||
|
@ -854,10 +866,12 @@ void CWizardUI::CreateControls()
|
||||||
if (widgetType == "Text" || widgetType == "BoldText") {
|
if (widgetType == "Text" || widgetType == "BoldText") {
|
||||||
curWidget->control = new CStatic;
|
curWidget->control = new CStatic;
|
||||||
((CStatic*)curWidget->control)->Create(curWidget->value, SS_LEFT, tmpRect, this, ID);
|
((CStatic*)curWidget->control)->Create(curWidget->value, SS_LEFT, tmpRect, this, ID);
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
else if (widgetType == "Navigation Text") {
|
else if (widgetType == "Navigation Text") {
|
||||||
curWidget->control = new CNavText;
|
curWidget->control = new CNavText;
|
||||||
((CNavText*)curWidget->control)->Create(curWidget->value, SS_LEFT, tmpRect, this, ID);
|
((CNavText*)curWidget->control)->Create(curWidget->value, SS_LEFT, tmpRect, this, ID);
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
else if (widgetType == "EditBox") {
|
else if (widgetType == "EditBox") {
|
||||||
curWidget->control = new CEdit;//Added new style parameter ES_AUTOHSCROLL- to allow *GASP* SCROLLING!!
|
curWidget->control = new CEdit;//Added new style parameter ES_AUTOHSCROLL- to allow *GASP* SCROLLING!!
|
||||||
|
@ -874,11 +888,13 @@ void CWizardUI::CreateControls()
|
||||||
//Set maximum number of characters allowed per line - limit set to 200
|
//Set maximum number of characters allowed per line - limit set to 200
|
||||||
((CEdit*)curWidget->control)->SetLimitText(int(curWidget->fieldlen.length));
|
((CEdit*)curWidget->control)->SetLimitText(int(curWidget->fieldlen.length));
|
||||||
((CEdit*)curWidget->control)->SetWindowText(curWidget->value);
|
((CEdit*)curWidget->control)->SetWindowText(curWidget->value);
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (widgetType == "Button") {
|
else if (widgetType == "Button") {
|
||||||
curWidget->control = new CButton;
|
curWidget->control = new CButton;
|
||||||
((CButton*)curWidget->control)->Create(curWidget->value, BS_PUSHBUTTON | WS_TABSTOP, tmpRect, this, ID);
|
((CButton*)curWidget->control)->Create(curWidget->value, BS_PUSHBUTTON | WS_TABSTOP, tmpRect, this, ID);
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
else if (widgetType == "RadioButton") {
|
else if (widgetType == "RadioButton") {
|
||||||
curWidget->control = new CButton;
|
curWidget->control = new CButton;
|
||||||
|
@ -950,11 +966,13 @@ void CWizardUI::CreateControls()
|
||||||
else {
|
else {
|
||||||
((CButton*)curWidget->control)->SetCheck(0);
|
((CButton*)curWidget->control)->SetCheck(0);
|
||||||
}
|
}
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
else if (widgetType == "CheckBox") {
|
else if (widgetType == "CheckBox") {
|
||||||
curWidget->control = new CButton;
|
curWidget->control = new CButton;
|
||||||
((CButton*)curWidget->control)->Create(curWidget->title, BS_AUTOCHECKBOX | WS_TABSTOP, tmpRect, this, ID);
|
((CButton*)curWidget->control)->Create(curWidget->title, BS_AUTOCHECKBOX | WS_TABSTOP, tmpRect, this, ID);
|
||||||
((CButton*)curWidget->control)->SetCheck(atoi(curWidget->value));
|
((CButton*)curWidget->control)->SetCheck(atoi(curWidget->value));
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
else if (widgetType == "ListBox")
|
else if (widgetType == "ListBox")
|
||||||
{
|
{
|
||||||
|
@ -989,6 +1007,7 @@ void CWizardUI::CreateControls()
|
||||||
((CListBox*)curWidget->control)->SelectString(0, s);
|
((CListBox*)curWidget->control)->SelectString(0, s);
|
||||||
s = strtok( NULL, "," );
|
s = strtok( NULL, "," );
|
||||||
}
|
}
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
else if (widgetType == "CheckListBox")
|
else if (widgetType == "CheckListBox")
|
||||||
{
|
{
|
||||||
|
@ -1029,6 +1048,7 @@ void CWizardUI::CreateControls()
|
||||||
((CCheckListBox*)curWidget->control)->SetCheck(i, 1);
|
((CCheckListBox*)curWidget->control)->SetCheck(i, 1);
|
||||||
s = strtok( NULL, "," );
|
s = strtok( NULL, "," );
|
||||||
}
|
}
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
else if (widgetType == "ComboBox") {
|
else if (widgetType == "ComboBox") {
|
||||||
curWidget->control = new CComboBox;
|
curWidget->control = new CComboBox;
|
||||||
|
@ -1050,16 +1070,19 @@ void CWizardUI::CreateControls()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
EnableWidget(curWidget);
|
||||||
|
|
||||||
//((CComboBox*)curWidget->control)->SelectString(0, selectedCustomization);
|
//((CComboBox*)curWidget->control)->SelectString(0, selectedCustomization);
|
||||||
}
|
}
|
||||||
else if (widgetType == "GroupBox") {
|
else if (widgetType == "GroupBox") {
|
||||||
curWidget->control = new CButton;
|
curWidget->control = new CButton;
|
||||||
((CButton*)curWidget->control)->Create(curWidget->value, BS_GROUPBOX, tmpRect, this, ID);
|
((CButton*)curWidget->control)->Create(curWidget->value, BS_GROUPBOX, tmpRect, this, ID);
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
else if (widgetType == "ProgressBar") {
|
else if (widgetType == "ProgressBar") {
|
||||||
curWidget->control = new CProgressCtrl;
|
curWidget->control = new CProgressCtrl;
|
||||||
((CProgressCtrl*)curWidget->control)->Create(WS_TABSTOP, tmpRect, this, ID);
|
((CProgressCtrl*)curWidget->control)->Create(WS_TABSTOP, tmpRect, this, ID);
|
||||||
|
EnableWidget(curWidget);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1132,7 +1155,11 @@ CString CWizardUI::GetScreenValue(WIDGET *curWidget)
|
||||||
CString rv("");
|
CString rv("");
|
||||||
|
|
||||||
if (widgetType == "CheckBox") {
|
if (widgetType == "CheckBox") {
|
||||||
int state = ((CButton*)curWidget->control)->GetState();
|
// Mask off everything but the checked/not checked state
|
||||||
|
// Ignore indeterminate state
|
||||||
|
int state = ((CButton*)curWidget->control)->GetState() & 0x0003;
|
||||||
|
if (state == 2)
|
||||||
|
state = 0;
|
||||||
|
|
||||||
char temp[MIN_SIZE];
|
char temp[MIN_SIZE];
|
||||||
|
|
||||||
|
@ -1142,7 +1169,11 @@ CString CWizardUI::GetScreenValue(WIDGET *curWidget)
|
||||||
}
|
}
|
||||||
else if (widgetType == "RadioButton")
|
else if (widgetType == "RadioButton")
|
||||||
{
|
{
|
||||||
|
// Mask off everything but the checked/not checked state
|
||||||
|
// Ignore indeterminate state
|
||||||
int state = ((CButton*)curWidget->control)->GetState();
|
int state = ((CButton*)curWidget->control)->GetState();
|
||||||
|
if (state == 2)
|
||||||
|
state = 0;
|
||||||
|
|
||||||
CString allOptions;
|
CString allOptions;
|
||||||
CString setBack;
|
CString setBack;
|
||||||
|
|
|
@ -80,6 +80,7 @@ public:
|
||||||
BOOL containsImage;
|
BOOL containsImage;
|
||||||
|
|
||||||
void SortWidgetsForTabOrder();
|
void SortWidgetsForTabOrder();
|
||||||
|
void EnableWidget(WIDGET *curWidget);
|
||||||
void CreateControls();
|
void CreateControls();
|
||||||
void DisplayControls();
|
void DisplayControls();
|
||||||
void UpdateGlobals();
|
void UpdateGlobals();
|
||||||
|
|
|
@ -509,6 +509,30 @@ BOOL CInterpret::interpret(CString cmds, WIDGET *curWidget)
|
||||||
((CEdit*)t->control)->SetWindowText(msg);
|
((CEdit*)t->control)->SetWindowText(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (strcmp(pcmd, "toggleEnabled") == 0)
|
||||||
|
{
|
||||||
|
// convert first parm into boolean...
|
||||||
|
char *p2 = strchr(parms, ',');
|
||||||
|
if (p2)
|
||||||
|
{
|
||||||
|
*p2++ = '\0';
|
||||||
|
CString value = replaceVars(parms, NULL);
|
||||||
|
int newval = (value == "1");
|
||||||
|
parms = p2;
|
||||||
|
p2 = strchr(parms, ',');
|
||||||
|
while (parms)
|
||||||
|
{
|
||||||
|
if (p2)
|
||||||
|
*p2++ = '\0';
|
||||||
|
WIDGET *w = theApp.findWidget(parms);
|
||||||
|
if (w)
|
||||||
|
w->control->EnableWindow(newval);
|
||||||
|
parms = p2;
|
||||||
|
if (parms)
|
||||||
|
p2 = strchr(parms, ',');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// This is an extra free...
|
// This is an extra free...
|
||||||
//free(pcmd);
|
//free(pcmd);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче