Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-01 11:27:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug #6572 the progress bar now displays the information regarding the progress - no bar but there are text.

Browse Source
This commit is contained in:
varada%netscape.com 2000-01-18 22:42:18 +00:00
parent 4e67064f23
commit 997191560c
2 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cck/ib/NewDialog.cpp
View File

@ -88,10 +88,11 @@ BOOL CNewDialog::OnInitDialog()
{
CDialog::OnInitDialog();
CRect tmpRect = CRect(7,7,173,13);
CWnd * dlg;
/*dlg = GetDlgItem(IDC_BASE_TEXT);
dlg = GetDlgItem(IDC_BASE_TEXT);
dlg->SetWindowText("Customization is in Progress");
dlg = GetDlgItem(IDC_TITLE_TEXT);
/*dlg = GetDlgItem(IDC_TITLE_TEXT);
dlg->ShowWindow(SW_HIDE);
dlg = GetDlgItem(IDC_EDIT1);
dlg->ShowWindow(SW_HIDE);
@ -101,10 +102,9 @@ dlg = GetDlgItem(IDCANCEL);
dlg->ShowWindow(SW_HIDE);
*/
SetWindowText("Progress");
CWnd * dlg;
dlg= new CProgressCtrl;
((CProgressCtrl*)dlg)->Create(WS_TABSTOP|PBS_VERTICAL, tmpRect, this, 12345);
dlg->ShowWindow(SW_SHOW);
//((CProgressCtrl*)dlg)->Create(WS_TABSTOP|PBS_VERTICAL, tmpRect, this, 12345);
//dlg->ShowWindow(SW_SHOW);
// TODO: Add extra initialization here

64
cck/ib/ib.cpp
View File

@ -494,7 +494,47 @@ CString GetBrowser(void)
return retflag;
}
/*BOOL Progress()
{
CProgressCtrl progressDlg(this);
progressDlg.Create(IDD_NEW_DIALOG);
CProgressCtrl *pProgressDlg = &progressDlg;
//CRuntimeClass *pProgDlgThread = RUNTIME_CLASS(CProgDlgThread); //This is the multi-threading stuff for the progress dialog
//AfxBeginThread(pProgDlgThread);
pProgressDlg->m_ProgressText.SetWindowText("Creating a CD Layout...");
pProgressDlg->m_ProgressBar.SetPos(0);
pProgressDlg->m_ProgressBar.SetRange(0,4);
pProgressDlg->m_ProgressBar.SetStep(1);
pProgressDlg->m_ProgressText.SetWindowText("Loading Globals...");
// LoadGlobals();
pProgressDlg->m_ProgressBar.StepIt();
pProgressDlg->UpdateWindow();
pProgressDlg->m_ProgressText.SetWindowText("Reading files...");
// ReadIniFile();
pProgressDlg->m_ProgressBar.StepIt();
pProgressDlg->UpdateWindow();
pProgressDlg->m_ProgressText.SetWindowText("Merging files...");
// MergeFiles();
pProgressDlg->m_ProgressBar.StepIt();
pProgressDlg->UpdateWindow();
pProgressDlg->m_ProgressText.SetWindowText("Creating CD Layout...");
// CreateMedia();
pProgressDlg->m_ProgressBar.StepIt();
pProgressDlg->UpdateWindow();
AfxMessageBox("CD Directory created", MB_OK);
}
return TRUE;
}
*/
extern "C" __declspec(dllexport)
int StartIB(CString parms, WIDGET *curWidget)
{
@ -524,7 +564,14 @@ int StartIB(CString parms, WIDGET *curWidget)
CNewDialog newprog;
newprog.Create(IDD_NEW_DIALOG,NULL );
newprog.ShowWindow(SW_SHOW);
/////////////////////////////
CWnd * dlg;
CRect tmpRect = CRect(7,7,173,13);
dlg = newprog.GetDlgItem(IDC_BASE_TEXT);
CWnd* pwnd = newprog.GetDlgItem(IDD_NEW_DIALOG);
dlg->SetWindowText(" Customization is in Progress");
/////////////////////////////
_mkdir((char *)(LPCTSTR) cdPath);
_mkdir((char *)(LPCTSTR) tempPath);
_mkdir((char *)(LPCTSTR) workspacePath);
@ -566,9 +613,13 @@ int StartIB(CString parms, WIDGET *curWidget)
fclose(f);
}
dlg->SetWindowText(" Replacing XPI Files");
// Put all the extracted files back into their new XPI homes
ReplaceXPIFiles();
dlg->SetWindowText(" Copying default files into the configuration");
// Copy remaining default installer files into config
// preserving any existing files that we created already
// in previous steps
@ -621,19 +672,28 @@ int StartIB(CString parms, WIDGET *curWidget)
}
// Didn't work...
dlg->SetWindowText(" Checking for neccessary components to install");
invisible();
dlg->SetWindowText(" Checking for Third Party Software");
AddThirdParty();
dlg->SetWindowText(" Replacing config.ini");
ReplaceINIFile();
dlg->SetWindowText(" Creating Desktop Shortcut for Help");
SetCurrentDirectory(olddir);
newprog.DestroyWindow();
CString TargetDir = GetGlobal("Root");
CString TargetFile = TargetDir + "wizardmachine.ini";
CString MozBrowser = GetBrowser();
CreateShortcut(MozBrowser, TargetFile, "HelpLink", TargetDir, FALSE);
dlg->SetWindowText(" Customization is Complete");
newprog.DestroyWindow();
return rv;
}