Added progress dialog to show plugins loading

nickgammon · Jul 14, 2011 · 727d41e · 727d41e
1 parent a387512
commit 727d41e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/dialogs/ProgDlg.cpp b/dialogs/ProgDlg.cpp
@@ -27,6 +27,7 @@ CProgressDlg::CProgressDlg(UINT nCaptionID)
     // NOTE: the ClassWizard will add member initialization here
     //}}AFX_DATA_INIT
     m_bParentDisabled = FALSE;
+    m_bHideCancel = FALSE;
 }
 
 CProgressDlg::~CProgressDlg()
@@ -212,5 +213,8 @@ BOOL CProgressDlg::OnInitDialog()
     m_Progress.SetStep(m_nStep);
     m_Progress.SetPos(m_nLower);
 
+    if (m_bHideCancel)
+      GetDlgItem (IDCANCEL)->ShowWindow (SW_HIDE); 
+
     return TRUE;  
 }
diff --git a/dialogs/ProgDlg.h b/dialogs/ProgDlg.h
@@ -26,6 +26,8 @@ class CProgressDlg : public CDialog
     int  OffsetPos(int nPos);
     int  StepIt();
 
+    bool m_bHideCancel;
+
 // Dialog Data
     //{{AFX_DATA(CProgressDlg)
     enum { IDD = CG_IDD_PROGRESS };

diff --git a/xml/xml_load_world.cpp b/xml/xml_load_world.cpp
@@ -7,6 +7,7 @@
 #include "..\MUSHview.h"
 #include "..\genprint.h"
 #include "..\mainfrm.h"
+#include "..\dialogs\ProgDlg.h"
 
 /*
 
@@ -594,10 +595,46 @@ POSITION lpos;
   for (lpos = m_strCurrentIncludeFileList.GetHeadPosition (); lpos; )
     strIncludeList.AddTail (m_strCurrentIncludeFileList.GetNext (lpos));
 
+  int iCount = 0;
+
+  if (bPlugins)
+    {
+    for (POSITION nodepos = (parent).ChildrenList.GetHeadPosition (); nodepos; )    
+      {                                
+      CXMLelement * node = (parent).ChildrenList.GetNext (nodepos);    
+      if (node->strName == "include" && !node->bUsed)        
+        iCount++;
+      }
+    }
+
+  CProgressDlg * pDlg = NULL;
+
+  if (iCount)
+    {
+    pDlg = new CProgressDlg;
+    pDlg->m_bHideCancel = true;
+    pDlg->Create ();
+    pDlg->SetRange (0, iCount);
+    pDlg->SetStep (1);
+    pDlg->SetWindowText (Translate ("Loading plugins ..."));                              
+    }
+
   // see if we have "include" tag(s)
 
   LOAD_LOOP (parent, "include", pIncludeElement);
 
+  if (pDlg)
+    {
+    Get_XML_string (*pIncludeElement, "name", strFileName, false, true);
+
+    int iSlash = strFileName.ReverseFind ('\\');
+    if (iSlash != -1)
+      strFileName = strFileName.Mid (iSlash + 1);
+
+    pDlg->SetStatus (TFormat ("Loading plugin: %s", (LPCTSTR) strFileName));
+    pDlg->StepIt ();
+    }
+
     try
       {
       Load_One_Include_XML (*pIncludeElement, 
@@ -623,6 +660,8 @@ POSITION lpos;
 
   END_LOAD_LOOP;
 
+  delete pDlg;
+
   // restore current include list tree
   m_strCurrentIncludeFileList.RemoveAll ();
   for (lpos = strIncludeList.GetHeadPosition (); lpos; )