mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-03 21:22:47 +00:00
NOT in building Seamonkey tree, checkin OK'd by chofmann. Major whackage of OnCommand routine to enhance readability.
This commit is contained in:
selmer%netscape.com
parent
243c97188a
commit
f5449edd7c
@ -255,24 +255,32 @@ void CWizardUI::OnPaint()
|
||||
// Do not call CPropertyPage::OnPaint() for painting messages
|
||||
}
|
||||
|
||||
BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
void ExecuteCommand(char *command)
|
||||
{
|
||||
STARTUPINFO startupInfo;
|
||||
PROCESS_INFORMATION processInfo;
|
||||
|
||||
memset(&startupInfo, 0, sizeof(startupInfo));
|
||||
memset(&processInfo, 0, sizeof(processInfo));
|
||||
|
||||
startupInfo.cb = sizeof(STARTUPINFO);
|
||||
startupInfo.dwFlags = STARTF_USESHOWWINDOW;
|
||||
startupInfo.wShowWindow = SW_SHOW;
|
||||
|
||||
BOOL executionSuccessful = CreateProcess(NULL, command, NULL, NULL, TRUE,
|
||||
NORMAL_PRIORITY_CLASS, NULL, NULL,
|
||||
&startupInfo, &processInfo);
|
||||
DWORD error = GetLastError();
|
||||
WaitForSingleObject(processInfo.hProcess, INFINITE);
|
||||
}
|
||||
|
||||
BOOL CWizardUI::ActCommand(WIDGET *curWidget)
|
||||
{
|
||||
for(int i=0; i < CurrentNode->numWidgets; i++)
|
||||
{
|
||||
WIDGET* curWidget = CurrentNode->pageWidgets[i];
|
||||
if (curWidget->widgetID == (int)wParam)
|
||||
{
|
||||
if (curWidget->action.dll == "NULL")
|
||||
{
|
||||
if (curWidget->action.function == "command")
|
||||
{
|
||||
UpdateGlobals();
|
||||
char params[MAX_SIZE];
|
||||
|
||||
CString function;
|
||||
strcpy(params, curWidget->action.parameters);
|
||||
CString orgParams = CString(params);
|
||||
CString setBack;
|
||||
int numCommands=0;
|
||||
char target[MID_SIZE] = {'\0'};
|
||||
char baseCommand[MID_SIZE] = {'\0'};
|
||||
@ -285,7 +293,6 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
|
||||
commands[0] = (char *) GlobalAlloc(0, MAX_SIZE * sizeof(char));
|
||||
commands[0] = strtok(params, ";");
|
||||
setBack = CString(commands[0]);
|
||||
|
||||
int i=0;
|
||||
while (commands[i])
|
||||
@ -294,15 +301,12 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
commands[i] = strtok(NULL, ";");
|
||||
if (commands[i])
|
||||
{
|
||||
setBack += ";" + CString(commands[i]);
|
||||
|
||||
if(!(strcmp(commands[i], "inform")))
|
||||
{
|
||||
informAct = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
strcpy(curWidget->action.parameters, (char *) (LPCTSTR) setBack);
|
||||
numCommands = i;
|
||||
|
||||
if (curWidget->target != "")
|
||||
@ -333,6 +337,8 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
commandListLength = 0;
|
||||
if (!abortProcessing)
|
||||
{
|
||||
// Need to replace this gunk with replaceVars() call, but listbox iterator needs
|
||||
// to be solved first.
|
||||
int numArgs = 0;
|
||||
|
||||
|
||||
@ -346,10 +352,6 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
x++;
|
||||
args[x] = strtok(NULL, " ");
|
||||
if (args[x])
|
||||
{
|
||||
setBack += " " + CString(args[x]);
|
||||
}
|
||||
}
|
||||
|
||||
numArgs = x;
|
||||
@ -398,6 +400,10 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
if (aWidget->type == "ListBox")
|
||||
{
|
||||
// Listbox iterator: apply command to each selected value
|
||||
//
|
||||
// Use this index value to find the string from the listbox
|
||||
// If the index is a ',' separated list, iterate over each value
|
||||
CString valueSet = aWidget->value;
|
||||
|
||||
char *values[MIN_SIZE];
|
||||
@ -465,6 +471,7 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
}
|
||||
else if (CString(args[k]) == "newEntry")
|
||||
{
|
||||
// Funky reference to newEntry as value just prompted for
|
||||
strcat(commandList[commandListLength], currDirPath);
|
||||
if (localPath) {
|
||||
strcat(commandList[commandListLength], localPath);
|
||||
@ -485,26 +492,13 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
}
|
||||
newEntry = FALSE;
|
||||
for (int listNum =0; listNum < commandListLength; listNum++)
|
||||
{
|
||||
//system(commandList[listNum]);
|
||||
STARTUPINFO startupInfo;
|
||||
PROCESS_INFORMATION processInfo;
|
||||
|
||||
memset(&startupInfo, '\0', sizeof(startupInfo));
|
||||
memset(&processInfo, '\0', sizeof(processInfo));
|
||||
|
||||
startupInfo.cb = sizeof(STARTUPINFO);
|
||||
startupInfo.dwFlags = STARTF_USESHOWWINDOW;
|
||||
startupInfo.wShowWindow = SW_SHOW;
|
||||
|
||||
BOOL executionSuccessful = CreateProcess(NULL, commandList[listNum], NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &startupInfo, &processInfo);
|
||||
DWORD error = GetLastError();
|
||||
WaitForSingleObject(processInfo.hProcess, INFINITE);
|
||||
}
|
||||
ExecuteCommand(commandList[listNum]);
|
||||
|
||||
// This is the list of the target widget, but assumes the function
|
||||
theApp.GenerateList(tmpFunction, tmpWidget, tmpParams);
|
||||
}
|
||||
|
||||
// Special dialog to show where the file was saved. Should be replaced with interpreted call in INI file
|
||||
if (informAct)
|
||||
{
|
||||
CWnd myWnd;
|
||||
@ -518,39 +512,82 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
myWnd.MessageBox( entryName + " is saved in " + CString(infoPath), "Information", MB_OK);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (curWidget->action.function == "DisplayImage") {
|
||||
// This is to dsiplay an image in a separate dialog
|
||||
CImgDlg imgDlg(curWidget->action.parameters);
|
||||
int retVal = imgDlg.DoModal();
|
||||
}
|
||||
else if (curWidget->action.function == "ShowSum") {
|
||||
// This is to see if this works
|
||||
// CWnd Mywnd;
|
||||
// Mywnd.MessageBox("hello","hello",MB_OK);
|
||||
CSumDlg sumdlg;
|
||||
int retVal = sumdlg.DoModal();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL CWizardUI::SortList(WIDGET *curWidget)
|
||||
{
|
||||
#ifdef ACTUALLYNEEDTODOSOMETHINGLIKETHIS
|
||||
WIDGET* listWidget = theApp.findWidget((char*) (LPCTSTR)curWidget->target);
|
||||
int count = ((CListBox*)(listWidget->control))->GetCount();
|
||||
char* items[MAX_SIZE];
|
||||
|
||||
for (int i = 0; i < count; i++) {
|
||||
items[i] = new char[MAX_SIZE];
|
||||
((CListBox*)(listWidget->control))->GetText(i, items[i]);
|
||||
}
|
||||
|
||||
else if (curWidget->action.function == "BrowseFile") {
|
||||
|
||||
// Please use qsort() if this code becomes active again...
|
||||
|
||||
if (curWidget->action.function == "SortByName")
|
||||
{
|
||||
}
|
||||
|
||||
else if (curWidget->action.function == "SortByPhone")
|
||||
{
|
||||
}
|
||||
|
||||
((CListBox*)(listWidget->control))->ResetContent();
|
||||
for (int k = 0; k < count; k++) {
|
||||
((CListBox*)(listWidget->control))->AddString(CString(items[k]));
|
||||
}
|
||||
#endif
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL CWizardUI::NewConfig(WIDGET *curWidget)
|
||||
{
|
||||
// This doesn't really belong here...
|
||||
CNewConfigDialog newDlg;
|
||||
newDlg.DoModal();
|
||||
CString configField = newDlg.GetConfigName();
|
||||
CString newDir = CString(customizationPath);
|
||||
newDir += configField;
|
||||
_mkdir(newDir);
|
||||
|
||||
WIDGET* tmpWidget = theApp.findWidget((char*) (LPCTSTR)curWidget->target);
|
||||
CString tmpFunction = tmpWidget->action.function;
|
||||
CString params = CString(tmpWidget->action.parameters);
|
||||
theApp.GenerateList(tmpFunction, tmpWidget, params);
|
||||
|
||||
((CComboBox*)tmpWidget->control)->SelectString(0, configField);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL CWizardUI::BrowseFile(WIDGET *curWidget)
|
||||
{
|
||||
// This is to browse to a file
|
||||
CFileDialog fileDlg(TRUE, NULL, NULL, OFN_OVERWRITEPROMPT, NULL, NULL);
|
||||
int retVal = fileDlg.DoModal();
|
||||
CString fullFileName="";
|
||||
|
||||
|
||||
WIDGET* editWidget = CurrentNode->pageWidgets[i-1];
|
||||
//Checking to see if the open file dialog did get a value or was merely cancelled.
|
||||
//If it was cancelled then the value of the edit box is not changed.
|
||||
//Checking to see if the open file dialog did get a value or was merely cancelled.
|
||||
//If it was cancelled then the value of the edit box is not changed.
|
||||
if (fileDlg.GetPathName() != "")
|
||||
{
|
||||
fullFileName = fileDlg.GetPathName();
|
||||
((CEdit*)editWidget->control)->SetWindowText(fullFileName);
|
||||
WIDGET* tmpWidget = theApp.findWidget((char*) (LPCTSTR)curWidget->target);
|
||||
if (tmpWidget)
|
||||
((CEdit*)tmpWidget->control)->SetWindowText(fullFileName);
|
||||
}
|
||||
}
|
||||
else if (curWidget->action.function == "BrowseDir") {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL CWizardUI::BrowseDir(WIDGET *curWidget)
|
||||
{
|
||||
// The following code is used to browse to a dir
|
||||
// CFileDialog does not allow this
|
||||
|
||||
@ -581,140 +618,19 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
else if( bi.ulFlags & BIF_RETURNONLYFSDIRS )
|
||||
{
|
||||
// szPath variable contains the path
|
||||
WIDGET* editWidget = CurrentNode->pageWidgets[i-1];
|
||||
((CEdit*)editWidget->control)->SetWindowText(szPath);
|
||||
WIDGET* tmpWidget = theApp.findWidget((char*) (LPCTSTR)curWidget->target);
|
||||
if (tmpWidget)
|
||||
((CEdit*)tmpWidget->control)->SetWindowText(szPath);
|
||||
}
|
||||
}
|
||||
|
||||
free( bi.pszDisplayName );
|
||||
}
|
||||
else if (curWidget->action.function == "NewConfig") {
|
||||
CNewConfigDialog newDlg;
|
||||
newDlg.DoModal();
|
||||
CString configField = newDlg.GetConfigName();
|
||||
CString newDir = CString(customizationPath);
|
||||
newDir += configField;
|
||||
_mkdir(newDir);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/**
|
||||
char srcCache[250];
|
||||
char destCache[250];
|
||||
strcpy(srcCache, Path);
|
||||
strcat(srcCache, "cck.che");
|
||||
strcpy(destCache, newDir);
|
||||
strcat(destCache, "\\cck.che");
|
||||
CopyFile(srcCache, destCache, FALSE);
|
||||
**/
|
||||
|
||||
WIDGET* tmpWidget = theApp.findWidget((char*) (LPCTSTR)curWidget->target);
|
||||
CString tmpFunction = tmpWidget->action.function;
|
||||
CString params = CString(tmpWidget->action.parameters);
|
||||
theApp.GenerateList(tmpFunction, tmpWidget, params);
|
||||
|
||||
((CComboBox*)tmpWidget->control)->SelectString(0, configField);
|
||||
|
||||
|
||||
// remembering the widget name for subsequent .che file operations
|
||||
//customizationWidgetName = tmpWidget->name;
|
||||
}
|
||||
else if ((curWidget->action.function == "SortByName")
|
||||
|| (curWidget->action.function == "SortByPhone"))
|
||||
{
|
||||
WIDGET* listWidget = theApp.findWidget("AcctSetupListBox");
|
||||
int count = ((CListBox*)(listWidget->control))->GetCount();
|
||||
char* items[MAX_SIZE];
|
||||
|
||||
for (int i = 0; i < count; i++) {
|
||||
items[i] = new char[MAX_SIZE];
|
||||
((CListBox*)(listWidget->control))->GetText(i, items[i]);
|
||||
}
|
||||
|
||||
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
if (curWidget->action.function == "SortByName") {
|
||||
int ch = '.';
|
||||
char* pDest;
|
||||
int result;
|
||||
CString str1;
|
||||
CString str2;
|
||||
CString tmpStr;
|
||||
|
||||
for (x = count-1; x >= 0; x--) {
|
||||
BOOL flipped = FALSE;
|
||||
|
||||
for (int y = 0; y < x; y++) {
|
||||
// number 1
|
||||
pDest = strchr(items[y], ch);
|
||||
result = pDest - items[y] + 1;
|
||||
tmpStr = items[y];
|
||||
str1 = tmpStr.Left(result);
|
||||
|
||||
// number 2
|
||||
pDest = strchr(items[y+1], ch);
|
||||
result = pDest - items[y+1] + 1;
|
||||
tmpStr = items[y+1];
|
||||
str2 = tmpStr.Left(result);
|
||||
|
||||
if (str1 > str2)
|
||||
{
|
||||
char tmpItem[MAX_SIZE];
|
||||
strcpy(tmpItem, items[y]);
|
||||
|
||||
strcpy(items[y], items[y+1]);
|
||||
strcpy(items[y+1], tmpItem);
|
||||
|
||||
flipped = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if (!flipped) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (curWidget->action.function == "SortByPhone") {
|
||||
char* s1 = new char[MAX_SIZE];
|
||||
char* s2 = new char[MAX_SIZE];
|
||||
|
||||
for (x = count-1; x >= 0; x--) {
|
||||
BOOL flipped = FALSE;
|
||||
|
||||
for (int y = 0; y < x; y++) {
|
||||
// number 1
|
||||
s1 = strstr(items[y], "(");
|
||||
|
||||
// number 2
|
||||
s2 = strstr(items[y+1], "(");
|
||||
|
||||
if (CString(s1) > CString(s2))
|
||||
{
|
||||
char tmpItem[MAX_SIZE];
|
||||
strcpy(tmpItem, items[y]);
|
||||
|
||||
strcpy(items[y], items[y+1]);
|
||||
strcpy(items[y+1], tmpItem);
|
||||
|
||||
flipped = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if (!flipped) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
((CListBox*)(listWidget->control))->ResetContent();
|
||||
for (int k = 0; k < count; k++) {
|
||||
((CListBox*)(listWidget->control))->AddString(CString(items[k]));
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/**
|
||||
BOOL CWizardUI::Progress()
|
||||
{
|
||||
#ifdef SUPPORTINGIBPROGRESS
|
||||
CProgressDialog progressDlg(this);
|
||||
progressDlg.Create(IDD_PROGRESS_DLG);
|
||||
CProgressDialog *pProgressDlg = &progressDlg;
|
||||
@ -760,17 +676,78 @@ BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
|
||||
MessageBox("CD Directory created", "OK", MB_OK);
|
||||
}
|
||||
**/
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL CWizardUI::OnCommand(WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
for(int i=0; i < CurrentNode->numWidgets; i++)
|
||||
{
|
||||
WIDGET* curWidget = CurrentNode->pageWidgets[i];
|
||||
if (curWidget->widgetID != (int)wParam)
|
||||
continue;
|
||||
|
||||
if (curWidget->action.dll == "NULL")
|
||||
{
|
||||
if (curWidget->action.function == "command")
|
||||
ActCommand(curWidget);
|
||||
|
||||
else if (curWidget->action.function == "DisplayImage")
|
||||
{
|
||||
// This is to dsiplay an image in a separate dialog
|
||||
CImgDlg imgDlg(curWidget->action.parameters);
|
||||
int retVal = imgDlg.DoModal();
|
||||
}
|
||||
else if (curWidget->action.function == "ShowSum")
|
||||
{
|
||||
CSumDlg sumdlg;
|
||||
int retVal = sumdlg.DoModal();
|
||||
}
|
||||
else if (curWidget->action.function == "BrowseFile")
|
||||
BrowseFile(curWidget);
|
||||
|
||||
else if (curWidget->action.function == "BrowseDir")
|
||||
BrowseDir(curWidget);
|
||||
|
||||
else if (curWidget->action.function == "NewConfig")
|
||||
NewConfig(curWidget);
|
||||
|
||||
else if ((curWidget->action.function == "SortByName") ||
|
||||
(curWidget->action.function == "SortByPhone"))
|
||||
SortList(curWidget);
|
||||
}
|
||||
else
|
||||
Progress();
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return CPropertyPage::OnCommand(wParam, lParam);
|
||||
}
|
||||
|
||||
// This is a comparison function for the TabOrder qsort() call
|
||||
// Return -1 for "less than", 0 for "equals", and 1 for "greater than"
|
||||
int TabSort(const void *w1, const void *w2)
|
||||
{
|
||||
WIDGET *widget1 = *((WIDGET **) w1);
|
||||
WIDGET *widget2 = *((WIDGET **) w2);
|
||||
|
||||
// Primary key is y coordinate
|
||||
if (widget1->location.y > widget2->location.y)
|
||||
return 1;
|
||||
|
||||
if (widget1->location.y < widget2->location.y)
|
||||
return -1;
|
||||
|
||||
// Primary key is equal, Secondary key is x coordinate
|
||||
return (widget2->location.x - widget1->location.x);
|
||||
}
|
||||
|
||||
void CWizardUI::SortWidgetsForTabOrder()
|
||||
{
|
||||
#ifdef USEOLDSORTCODEINSTEADOFBUILTINFUNCTION
|
||||
// Sort on y-coordinate
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
@ -824,6 +801,9 @@ void CWizardUI::SortWidgetsForTabOrder()
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
qsort(CurrentNode->pageWidgets, CurrentNode->numWidgets, sizeof(WIDGET *), TabSort);
|
||||
CurrentNode->isWidgetsSorted = TRUE;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user