diff --git a/checkin_notes b/checkin_notes
index fd95ad8555..edf2e4d5b3 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12698,4 +12698,18 @@ Rom    May 26 2004
       each execution of ./configure for the Macs
 
     /
-    config.guess
\ No newline at end of file
+    config.guess
+
+Rom    May 26 2004
+    - NEW GUI: Implement Render and State management infrastructure.
+
+    clientgui/
+        BOINCGUIApp.cpp
+        BaseListCtrlView.cpp, .h
+        BaseWindowView.cpp, .h
+        MainFrame.cpp, .h
+        MessagesView.cpp, .h
+        ProjectsView.cpp, .h
+        ResourceUtilizationView.cpp, .h
+        TransfersView.cpp, .h
+        WorkView.cpp, .h
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 2ba95c2491..92fc43a380 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:14  rwalton
 // *** empty log message ***
 //
@@ -62,6 +65,7 @@ bool CBOINCGUIApp::OnInit()
 
     // Initialize the configuration storage module
     m_pConfig = new wxConfig(wxTheApp->GetAppName());
+    wxConfigBase::Set(m_pConfig);
     wxASSERT(NULL != m_pConfig);
 
     // Initialize the main document
@@ -85,9 +89,6 @@ int CBOINCGUIApp::OnExit()
     if (m_pDocument)
         delete m_pDocument;
 
-    if (m_pConfig)
-        delete m_pConfig;
-
     if (m_pLocale)
         delete m_pLocale;
 
diff --git a/clientgui/BaseListCtrlView.cpp b/clientgui/BaseListCtrlView.cpp
index fc4e3004db..9bf4c33a91 100644
--- a/clientgui/BaseListCtrlView.cpp
+++ b/clientgui/BaseListCtrlView.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:14  rwalton
 // *** empty log message ***
 //
@@ -97,3 +100,25 @@ void CBaseListCtrlView::OnRender (wxTimerEvent &event) {
     wxLogTrace("CBaseListCtrlView::OnRender - Function Ending");
 }
 
+
+bool CBaseListCtrlView::OnSaveState() {
+    wxLogTrace("CBaseListCtrlView::OnSaveState - Function Begining");
+
+    wxLogTrace("CBaseListCtrlView::OnSaveState - ***** Warning ***** Each page is supposed to have it's own OnSaveState");
+    wxLogTrace("CBaseListCtrlView::OnSaveState -                     event handler");
+
+    wxLogTrace("CBaseListCtrlView::OnSaveState - Function Ending");
+    return true;
+}
+
+
+bool CBaseListCtrlView::OnRestoreState() {
+    wxLogTrace("CBaseListCtrlView::OnRestoreState - Function Begining");
+
+    wxLogTrace("CBaseListCtrlView::OnRestoreState - ***** Warning ***** Each page is supposed to have it's own OnRestoreState");
+    wxLogTrace("CBaseListCtrlView::OnRestoreState -                     event handler");
+
+    wxLogTrace("CBaseListCtrlView::OnRestoreState - Function Ending");
+    return true;
+}
+
diff --git a/clientgui/BaseListCtrlView.h b/clientgui/BaseListCtrlView.h
index 3aaea9bf12..605c3c7ef4 100644
--- a/clientgui/BaseListCtrlView.h
+++ b/clientgui/BaseListCtrlView.h
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.7  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.6  2004/05/21 06:27:14  rwalton
 // *** empty log message ***
 //
@@ -42,15 +45,17 @@ class CBaseListCtrlView : public wxListView
     DECLARE_DYNAMIC_CLASS(CBaseListCtrlView)
 
 public:
-    CBaseListCtrlView(void);
+    CBaseListCtrlView();
     CBaseListCtrlView(wxNotebook* pNotebook);
 
-    ~CBaseListCtrlView(void);
+    ~CBaseListCtrlView();
 
-    virtual wxString GetViewName(void);
-    virtual char**   GetViewIcon(void);
+    virtual wxString GetViewName();
+    virtual char**   GetViewIcon();
 
-    void OnRender(wxTimerEvent &event);
+    virtual void OnRender(wxTimerEvent &event);
+    virtual bool OnSaveState();
+    virtual bool OnRestoreState();
 
 };
 
diff --git a/clientgui/BaseWindowView.cpp b/clientgui/BaseWindowView.cpp
index 5e36a130ce..3e07af6a88 100644
--- a/clientgui/BaseWindowView.cpp
+++ b/clientgui/BaseWindowView.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:14  rwalton
 // *** empty log message ***
 //
@@ -98,3 +101,24 @@ void CBaseWindowView::OnRender (wxTimerEvent &event) {
 }
 
 
+bool CBaseWindowView::OnSaveState() {
+    wxLogTrace("CBaseWindowView::OnSaveState - Function Begining");
+
+    wxLogTrace("CBaseWindowView::OnSaveState - ***** Warning ***** Each page is supposed to have it's own OnSaveState");
+    wxLogTrace("CBaseWindowView::OnSaveState -                     event handler");
+
+    wxLogTrace("CBaseWindowView::OnSaveState - Function Ending");
+    return true;
+}
+
+
+bool CBaseWindowView::OnRestoreState() {
+    wxLogTrace("CBaseWindowView::OnRestoreState - Function Begining");
+
+    wxLogTrace("CBaseWindowView::OnRestoreState - ***** Warning ***** Each page is supposed to have it's own OnRestoreState");
+    wxLogTrace("CBaseWindowView::OnRestoreState -                     event handler");
+
+    wxLogTrace("CBaseWindowView::OnRestoreState - Function Ending");
+    return true;
+}
+
diff --git a/clientgui/BaseWindowView.h b/clientgui/BaseWindowView.h
index 021be8d602..6c5bea7e5f 100644
--- a/clientgui/BaseWindowView.h
+++ b/clientgui/BaseWindowView.h
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.7  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.6  2004/05/21 06:27:14  rwalton
 // *** empty log message ***
 //
@@ -42,15 +45,17 @@ class CBaseWindowView : public wxPanel
     DECLARE_DYNAMIC_CLASS(CBaseWindowView)
 
 public:
-    CBaseWindowView(void);
+    CBaseWindowView();
     CBaseWindowView(wxNotebook* pNotebook);
 
-    ~CBaseWindowView(void);
+    ~CBaseWindowView();
 
-    virtual wxString GetViewName(void);
-    virtual char**   GetViewIcon(void);
+    virtual wxString GetViewName();
+    virtual char**   GetViewIcon();
 
-    void OnRender(wxTimerEvent &event);
+    virtual void OnRender(wxTimerEvent &event);
+    virtual bool OnSaveState();
+    virtual bool OnRestoreState();
 
 };
 
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index 5f317c48cf..a55db8b918 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.13  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.12  2004/05/24 23:50:14  rwalton
 // *** empty log message ***
 //
@@ -210,7 +213,8 @@ bool CMainFrame::CreateNotebook() {
 }
 
 
-bool CMainFrame::CreateNotebookPage(wxWindow* pwndNewNotebookPage) {
+template < class T >
+bool CMainFrame::CreateNotebookPage(T pwndNewNotebookPage) {
     wxLogTrace("CMainFrame::CreateNotebookPage - Function Begining");
 
 
@@ -230,49 +234,8 @@ bool CMainFrame::CreateNotebookPage(wxWindow* pwndNewNotebookPage) {
         m_pNotebook->SetImageList(pImageList);
     }
     
-    if        (wxDynamicCast(pwndNewNotebookPage, CProjectsView)) {
-
-        CProjectsView* pPage = wxDynamicCast(pwndNewNotebookPage, CProjectsView);
-        iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
-        m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
-
-    } else if (wxDynamicCast(pwndNewNotebookPage, CWorkView)) {
-
-        CWorkView* pPage = wxDynamicCast(pwndNewNotebookPage, CWorkView);
-        iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
-        m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
-
-    } else if (wxDynamicCast(pwndNewNotebookPage, CTransfersView)) {
-
-        CTransfersView* pPage = wxDynamicCast(pwndNewNotebookPage, CTransfersView);
-        iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
-        m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
-
-    } else if (wxDynamicCast(pwndNewNotebookPage, CMessagesView)) {
-
-        CMessagesView* pPage = wxDynamicCast(pwndNewNotebookPage, CMessagesView);
-        iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
-        m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
-
-    } else if (wxDynamicCast(pwndNewNotebookPage, CResourceUtilizationView)) {
-
-        CResourceUtilizationView* pPage = wxDynamicCast(pwndNewNotebookPage, CResourceUtilizationView);
-        iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
-        m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
-
-    } else if (wxDynamicCast(pwndNewNotebookPage, CBaseListCtrlView)) {
-
-        CBaseListCtrlView* pPage = wxDynamicCast(pwndNewNotebookPage, CBaseListCtrlView);
-        iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
-        m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
-
-    } else if (wxDynamicCast(pwndNewNotebookPage, CBaseWindowView)) {
-
-        CBaseWindowView* pPage = wxDynamicCast(pwndNewNotebookPage, CBaseWindowView);
-        iImageIndex = pImageList->Add(wxBitmap(pPage->GetViewIcon()), wxColour(255, 0, 255));
-        m_pNotebook->AddPage(pPage, pPage->GetViewName(), TRUE, iImageIndex);
-
-    }
+    iImageIndex = pImageList->Add(wxBitmap(pwndNewNotebookPage->GetViewIcon()), wxColour(255, 0, 255));
+    m_pNotebook->AddPage(pwndNewNotebookPage, pwndNewNotebookPage->GetViewName(), TRUE, iImageIndex);
 
 
     wxLogTrace("CMainFrame::CreateNotebookPage - Function Ending");
@@ -357,19 +320,163 @@ bool CMainFrame::DeleteStatusbar() {
 bool CMainFrame::SaveState() {
     wxLogTrace("CMainFrame::SaveState - Function Begining");
 
+    wxString        strBaseConfigLocation = wxString(_T("/"));
+    wxConfigBase*   pConfig = wxConfigBase::Get(FALSE);
+
+
+    wxASSERT(NULL != pConfig);
+    wxASSERT(NULL != m_pNotebook);
+
+
+    //
+    // Save Frame State
+    //
+    pConfig->SetPath(strBaseConfigLocation);
+
+    pConfig->Write("CurrentPage", m_pNotebook->GetSelection());
+
+
+    //
+    // Save Page(s) State
+    //
+
+    wxWindow*       pwndNotebookPage = NULL;
+    wxString        strConfigLocation = wxString(_T(""));
+    int             iIndex;
+    int             iPageCount;
+
+    iPageCount = m_pNotebook->GetPageCount() - 1;
+
+    for ( iIndex = 0; iIndex <= iPageCount; iIndex++ ) {   
+
+        pwndNotebookPage = m_pNotebook->GetPage(iIndex);
+        wxASSERT(wxDynamicCast(pwndNotebookPage, CBaseListCtrlView) ||
+                 wxDynamicCast(pwndNotebookPage, CBaseWindowView));
+
+        if        (wxDynamicCast(pwndNotebookPage, CProjectsView)) {
+            FireSaveStateEvent(wxDynamicCast(pwndNotebookPage, CProjectsView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CWorkView)) {
+            FireSaveStateEvent(wxDynamicCast(pwndNotebookPage, CWorkView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CTransfersView)) {
+            FireSaveStateEvent(wxDynamicCast(pwndNotebookPage, CTransfersView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CMessagesView)) {
+            FireSaveStateEvent(wxDynamicCast(pwndNotebookPage, CMessagesView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CResourceUtilizationView)) {
+            FireSaveStateEvent(wxDynamicCast(pwndNotebookPage, CResourceUtilizationView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CBaseListCtrlView)) {
+            FireSaveStateEvent(wxDynamicCast(pwndNotebookPage, CBaseListCtrlView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CBaseWindowView)) {
+            FireSaveStateEvent(wxDynamicCast(pwndNotebookPage, CBaseWindowView), pConfig);
+        }
+    }
+
+
     wxLogTrace("CMainFrame::SaveState - Function Ending");
     return true;
 }
 
 
+template < class T >
+bool CMainFrame::FireSaveStateEvent( T pPage, wxConfigBase* pConfig ) {
+    wxLogTrace("CMainFrame::FireSaveStateEvent - Function Begining");
+
+    wxString strPreviousLocation = wxString(_T(""));
+    wxString strConfigLocation = wxString(_T(""));
+
+    strPreviousLocation = pConfig->GetPath();
+    strConfigLocation = strPreviousLocation + pPage->GetViewName();
+
+    pConfig->SetPath(strConfigLocation);
+    pPage->OnSaveState();
+    pConfig->SetPath(strPreviousLocation);
+
+    wxLogTrace("CMainFrame::FireSaveStateEvent - Function Ending");
+    return true;
+}
+
+
 bool CMainFrame::RestoreState() {
     wxLogTrace("CMainFrame::RestoreState - Function Begining");
 
+    wxString        strBaseConfigLocation = wxString(_T("/"));
+    wxConfigBase*   pConfig = wxConfigBase::Get(FALSE);
+
+
+    wxASSERT(NULL != pConfig);
+    wxASSERT(NULL != m_pNotebook);
+
+
+    //
+    // Restore Frame State
+    //
+    long            lCurrentPage;
+
+
+    pConfig->SetPath(strBaseConfigLocation);
+
+    pConfig->Read("CurrentPage", &lCurrentPage);
+    m_pNotebook->SetSelection(lCurrentPage);
+
+
+    //
+    // Restore Page(s) State
+    //
+
+    wxWindow*       pwndNotebookPage = NULL;
+    wxString        strConfigLocation = wxString(_T(""));
+    int             iIndex;
+    int             iPageCount;
+
+    iPageCount = m_pNotebook->GetPageCount() - 1;
+
+    for ( iIndex = 0; iIndex <= iPageCount; iIndex++ ) {   
+
+        pwndNotebookPage = m_pNotebook->GetPage(iIndex);
+        wxASSERT(wxDynamicCast(pwndNotebookPage, CBaseListCtrlView) ||
+                 wxDynamicCast(pwndNotebookPage, CBaseWindowView));
+
+        if        (wxDynamicCast(pwndNotebookPage, CProjectsView)) {
+            FireRestoreStateEvent(wxDynamicCast(pwndNotebookPage, CProjectsView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CWorkView)) {
+            FireRestoreStateEvent(wxDynamicCast(pwndNotebookPage, CWorkView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CTransfersView)) {
+            FireRestoreStateEvent(wxDynamicCast(pwndNotebookPage, CTransfersView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CMessagesView)) {
+            FireRestoreStateEvent(wxDynamicCast(pwndNotebookPage, CMessagesView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CResourceUtilizationView)) {
+            FireRestoreStateEvent(wxDynamicCast(pwndNotebookPage, CResourceUtilizationView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CBaseListCtrlView)) {
+            FireRestoreStateEvent(wxDynamicCast(pwndNotebookPage, CBaseListCtrlView), pConfig);
+        } else if (wxDynamicCast(pwndNotebookPage, CBaseWindowView)) {
+            FireRestoreStateEvent(wxDynamicCast(pwndNotebookPage, CBaseWindowView), pConfig);
+        }
+    }
+
+
     wxLogTrace("CMainFrame::RestoreState - Function Ending");
     return true;
 }
 
 
+template < class T >
+bool CMainFrame::FireRestoreStateEvent( T pPage, wxConfigBase* pConfig ) {
+    wxLogTrace("CMainFrame::FireRestoreStateEvent - Function Begining");
+
+    wxString strPreviousLocation = wxString(_T(""));
+    wxString strConfigLocation = wxString(_T(""));
+
+    strPreviousLocation = pConfig->GetPath();
+    strConfigLocation = strPreviousLocation + pPage->GetViewName();
+
+    pConfig->SetPath(strConfigLocation);
+    pPage->OnRestoreState();
+    pConfig->SetPath(strPreviousLocation);
+
+    wxLogTrace("CMainFrame::FireRestoreStateEvent - Function Ending");
+    return true;
+}
+
+
 void CMainFrame::OnExit(wxCommandEvent &WXUNUSED(event)) {
     wxLogTrace("CMainFrame::OnExit - Function Begining");
 
@@ -442,55 +549,43 @@ void CMainFrame::OnAbout(wxCommandEvent &WXUNUSED(event)) {
 void CMainFrame::OnFrameRender (wxTimerEvent &event) {
     wxLogTrace("CMainFrame::OnFrameRender - Function Begining");
 
-    wxWindow*       pwndCurrentlySelectedPage;
+    wxWindow*       pwndNotebookPage;
 
     wxASSERT(NULL != m_pNotebook);
 
 
-    pwndCurrentlySelectedPage = m_pNotebook->GetPage(m_pNotebook->GetSelection());
-    wxASSERT(NULL != pwndCurrentlySelectedPage);
-    wxASSERT(wxDynamicCast(pwndCurrentlySelectedPage, CBaseListCtrlView) ||
-             wxDynamicCast(pwndCurrentlySelectedPage, CBaseWindowView));
-
-
-    if        (wxDynamicCast(pwndCurrentlySelectedPage, CProjectsView)) {
-
-        CProjectsView* pPage = wxDynamicCast(pwndCurrentlySelectedPage, CProjectsView);
-        pPage->OnRender(event);
-
-    } else if (wxDynamicCast(pwndCurrentlySelectedPage, CWorkView)) {
-
-        CWorkView* pPage = wxDynamicCast(pwndCurrentlySelectedPage, CWorkView);
-        pPage->OnRender(event);
-
-    } else if (wxDynamicCast(pwndCurrentlySelectedPage, CTransfersView)) {
-
-        CTransfersView* pPage = wxDynamicCast(pwndCurrentlySelectedPage, CTransfersView);
-        pPage->OnRender(event);
-
-    } else if (wxDynamicCast(pwndCurrentlySelectedPage, CMessagesView)) {
-
-        CMessagesView* pPage = wxDynamicCast(pwndCurrentlySelectedPage, CMessagesView);
-        pPage->OnRender(event);
-
-    } else if (wxDynamicCast(pwndCurrentlySelectedPage, CResourceUtilizationView)) {
-
-        CResourceUtilizationView* pPage = wxDynamicCast(pwndCurrentlySelectedPage, CResourceUtilizationView);
-        pPage->OnRender(event);
-
-    } else if (wxDynamicCast(pwndCurrentlySelectedPage, CBaseListCtrlView)) {
-
-        CBaseListCtrlView* pPage = wxDynamicCast(pwndCurrentlySelectedPage, CBaseListCtrlView);
-        pPage->OnRender(event);
-
-    } else if (wxDynamicCast(pwndCurrentlySelectedPage, CBaseWindowView)) {
-
-        CBaseWindowView* pPage = wxDynamicCast(pwndCurrentlySelectedPage, CBaseWindowView);
-        pPage->OnRender(event);
+    pwndNotebookPage = m_pNotebook->GetPage(m_pNotebook->GetSelection());
+    wxASSERT(NULL != pwndNotebookPage);
+    wxASSERT(wxDynamicCast(pwndNotebookPage, CBaseListCtrlView) ||
+             wxDynamicCast(pwndNotebookPage, CBaseWindowView));
 
+    if        (wxDynamicCast(pwndNotebookPage, CProjectsView)) {
+        FireRenderEvent(wxDynamicCast(pwndNotebookPage, CProjectsView), event);
+    } else if (wxDynamicCast(pwndNotebookPage, CWorkView)) {
+        FireRenderEvent(wxDynamicCast(pwndNotebookPage, CWorkView), event);
+    } else if (wxDynamicCast(pwndNotebookPage, CTransfersView)) {
+        FireRenderEvent(wxDynamicCast(pwndNotebookPage, CTransfersView), event);
+    } else if (wxDynamicCast(pwndNotebookPage, CMessagesView)) {
+        FireRenderEvent(wxDynamicCast(pwndNotebookPage, CMessagesView), event);
+    } else if (wxDynamicCast(pwndNotebookPage, CResourceUtilizationView)) {
+        FireRenderEvent(wxDynamicCast(pwndNotebookPage, CResourceUtilizationView), event);
+    } else if (wxDynamicCast(pwndNotebookPage, CBaseListCtrlView)) {
+        FireRenderEvent(wxDynamicCast(pwndNotebookPage, CBaseListCtrlView), event);
+    } else if (wxDynamicCast(pwndNotebookPage, CBaseWindowView)) {
+        FireRenderEvent(wxDynamicCast(pwndNotebookPage, CBaseWindowView), event);
     }
 
 
     wxLogTrace("CMainFrame::OnFrameRender - Function Ending");
 }
 
+
+template < class T >
+void CMainFrame::FireRenderEvent( T pPage, wxTimerEvent &event ) {
+    wxLogTrace("CMainFrame::FireRenderEvent - Function Begining");
+
+    pPage->OnRender(event);
+
+    wxLogTrace("CMainFrame::FireRenderEvent - Function Ending");
+}
+
diff --git a/clientgui/MainFrame.h b/clientgui/MainFrame.h
index fefe4c1c88..4d9100b2f7 100644
--- a/clientgui/MainFrame.h
+++ b/clientgui/MainFrame.h
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:15  rwalton
 // *** empty log message ***
 //
@@ -78,7 +81,8 @@ private:
 
     // notebook
     bool            CreateNotebook();
-    bool            CreateNotebookPage(wxWindow* pwndNewNotebookPage);
+    template < class T >
+        bool        CreateNotebookPage( T pwndNewNotebookPage );
     bool            DeleteNotebook();
 
     // status bar
@@ -87,7 +91,17 @@ private:
 
     // state management
     bool            SaveState();
+    template < class T >
+        bool        FireSaveStateEvent( T pPage, wxConfigBase* pConfig );
+
     bool            RestoreState();
+    template < class T >
+        bool        FireRestoreStateEvent( T pPage, wxConfigBase* pConfig );
+
+    // Render management
+    template < class T >
+        void        FireRenderEvent( T pPage, wxTimerEvent &event );
+
 
     DECLARE_EVENT_TABLE()
 };
diff --git a/clientgui/MessagesView.cpp b/clientgui/MessagesView.cpp
index 750677e67a..624e6b9a13 100644
--- a/clientgui/MessagesView.cpp
+++ b/clientgui/MessagesView.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.9  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.8  2004/05/24 23:50:14  rwalton
 // *** empty log message ***
 //
@@ -45,7 +48,7 @@
 IMPLEMENT_DYNAMIC_CLASS(CMessagesView, CBaseListCtrlView)
 
 
-CMessagesView::CMessagesView(void)
+CMessagesView::CMessagesView()
 {
     wxLogTrace("CMessagesView::CMessagesView - Function Begining");
 
@@ -66,7 +69,7 @@ CMessagesView::CMessagesView(wxNotebook* pNotebook) :
 }
 
 
-CMessagesView::~CMessagesView(void)
+CMessagesView::~CMessagesView()
 {
     wxLogTrace("CMessagesView::~CMessagesView - Function Begining");
 
@@ -74,7 +77,7 @@ CMessagesView::~CMessagesView(void)
 }
 
 
-wxString CMessagesView::GetViewName(void)
+wxString CMessagesView::GetViewName()
 {
     wxLogTrace("CMessagesView::GetViewName - Function Begining");
 
@@ -83,7 +86,7 @@ wxString CMessagesView::GetViewName(void)
 }
 
 
-char** CMessagesView::GetViewIcon(void)
+char** CMessagesView::GetViewIcon()
 {
     wxLogTrace("CMessagesView::GetViewIcon - Function Begining");
 
@@ -94,7 +97,20 @@ char** CMessagesView::GetViewIcon(void)
 
 void CMessagesView::OnRender(wxTimerEvent &event) {
     wxLogTrace("CMessagesView::OnRender - Function Begining");
-
     wxLogTrace("CMessagesView::OnRender - Function Ending");
 }
 
+
+bool CMessagesView::OnSaveState() {
+    wxLogTrace("CMessagesView::OnSaveState - Function Begining");
+    wxLogTrace("CMessagesView::OnSaveState - Function Ending");
+    return true;
+}
+
+
+bool CMessagesView::OnRestoreState() {
+    wxLogTrace("CMessagesView::OnRestoreState - Function Begining");
+    wxLogTrace("CMessagesView::OnRestoreState - Function Ending");
+    return true;
+}
+
diff --git a/clientgui/MessagesView.h b/clientgui/MessagesView.h
index 37f2e55a48..e2afd62612 100644
--- a/clientgui/MessagesView.h
+++ b/clientgui/MessagesView.h
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:15  rwalton
 // *** empty log message ***
 //
@@ -45,15 +48,17 @@ class CMessagesView : public CBaseListCtrlView
     DECLARE_DYNAMIC_CLASS(CMessagesView)
 
 public:
-    CMessagesView(void);
+    CMessagesView();
     CMessagesView(wxNotebook* pNotebook);
 
-    ~CMessagesView(void);
+    ~CMessagesView();
 
-    virtual wxString GetViewName(void);
-    virtual char**   GetViewIcon(void);
+    virtual wxString GetViewName();
+    virtual char**   GetViewIcon();
 
     void OnRender(wxTimerEvent &event);
+    bool OnSaveState();
+    bool OnRestoreState();
 
 };
 
diff --git a/clientgui/ProjectsView.cpp b/clientgui/ProjectsView.cpp
index 153d1c87af..aa174edd03 100644
--- a/clientgui/ProjectsView.cpp
+++ b/clientgui/ProjectsView.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.9  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.8  2004/05/24 23:50:14  rwalton
 // *** empty log message ***
 //
@@ -45,7 +48,7 @@
 IMPLEMENT_DYNAMIC_CLASS(CProjectsView, CBaseListCtrlView)
 
 
-CProjectsView::CProjectsView(void)
+CProjectsView::CProjectsView()
 {
     wxLogTrace("CProjectsView::CProjectsView - Function Begining");
 
@@ -68,7 +71,7 @@ CProjectsView::CProjectsView(wxNotebook* pNotebook) :
 }
 
 
-CProjectsView::~CProjectsView(void)
+CProjectsView::~CProjectsView()
 {
     wxLogTrace("CProjectsView::~CProjectsView - Function Begining");
 
@@ -76,7 +79,7 @@ CProjectsView::~CProjectsView(void)
 }
 
 
-wxString CProjectsView::GetViewName(void)
+wxString CProjectsView::GetViewName()
 {
     wxLogTrace("CProjectsView::GetViewName - Function Begining");
 
@@ -85,7 +88,7 @@ wxString CProjectsView::GetViewName(void)
 }
 
 
-char** CProjectsView::GetViewIcon(void)
+char** CProjectsView::GetViewIcon()
 {
     wxLogTrace("CProjectsView::GetViewIcon - Function Begining");
 
@@ -96,7 +99,20 @@ char** CProjectsView::GetViewIcon(void)
 
 void CProjectsView::OnRender(wxTimerEvent &event) {
     wxLogTrace("CProjectsView::OnRender - Function Begining");
-
     wxLogTrace("CProjectsView::OnRender - Function Ending");
 }
 
+
+bool CProjectsView::OnSaveState() {
+    wxLogTrace("CProjectsView::OnSaveState - Function Begining");
+    wxLogTrace("CProjectsView::OnSaveState - Function Ending");
+    return true;
+}
+
+
+bool CProjectsView::OnRestoreState() {
+    wxLogTrace("CProjectsView::OnRestoreState - Function Begining");
+    wxLogTrace("CProjectsView::OnRestoreState - Function Ending");
+    return true;
+}
+
diff --git a/clientgui/ProjectsView.h b/clientgui/ProjectsView.h
index f545520026..cc7f6b382d 100644
--- a/clientgui/ProjectsView.h
+++ b/clientgui/ProjectsView.h
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:15  rwalton
 // *** empty log message ***
 //
@@ -45,15 +48,17 @@ class CProjectsView : public CBaseListCtrlView
     DECLARE_DYNAMIC_CLASS(CProjectsView)
 
 public:
-    CProjectsView(void);
+    CProjectsView();
     CProjectsView(wxNotebook* pNotebook);
 
-    ~CProjectsView(void);
+    ~CProjectsView();
 
-    virtual wxString GetViewName(void);
-    virtual char**   GetViewIcon(void);
+    virtual wxString GetViewName();
+    virtual char**   GetViewIcon();
 
     void OnRender(wxTimerEvent &event);
+    bool OnSaveState();
+    bool OnRestoreState();
 
 };
 
diff --git a/clientgui/ResourceUtilizationView.cpp b/clientgui/ResourceUtilizationView.cpp
index 7e17a41da2..46c55b7276 100644
--- a/clientgui/ResourceUtilizationView.cpp
+++ b/clientgui/ResourceUtilizationView.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.9  2004/05/27 06:17:57  rwalton
+// *** empty log message ***
+//
 // Revision 1.8  2004/05/24 23:50:14  rwalton
 // *** empty log message ***
 //
@@ -45,7 +48,7 @@
 IMPLEMENT_DYNAMIC_CLASS(CResourceUtilizationView, CBaseWindowView)
 
 
-CResourceUtilizationView::CResourceUtilizationView(void)
+CResourceUtilizationView::CResourceUtilizationView()
 {
     wxLogTrace("CResourceUtilizationView::CResourceUtilizationView - Function Begining");
 
@@ -67,7 +70,7 @@ CResourceUtilizationView::CResourceUtilizationView(wxNotebook* pNotebook) :
 }
 
 
-CResourceUtilizationView::~CResourceUtilizationView(void)
+CResourceUtilizationView::~CResourceUtilizationView()
 {
     wxLogTrace("CResourceUtilizationView::~CResourceUtilizationView - Function Begining");
 
@@ -75,7 +78,7 @@ CResourceUtilizationView::~CResourceUtilizationView(void)
 }
 
 
-wxString CResourceUtilizationView::GetViewName(void)
+wxString CResourceUtilizationView::GetViewName()
 {
     wxLogTrace("CResourceUtilizationView::GetViewName - Function Begining");
 
@@ -84,7 +87,7 @@ wxString CResourceUtilizationView::GetViewName(void)
 }
 
 
-char** CResourceUtilizationView::GetViewIcon(void)
+char** CResourceUtilizationView::GetViewIcon()
 {
     wxLogTrace("CResourceUtilizationView::GetViewIcon - Function Begining");
 
@@ -95,7 +98,20 @@ char** CResourceUtilizationView::GetViewIcon(void)
 
 void CResourceUtilizationView::OnRender(wxTimerEvent &event) {
     wxLogTrace("CResourceUtilizationView::OnRender - Function Begining");
-
     wxLogTrace("CResourceUtilizationView::OnRender - Function Ending");
 }
 
+
+bool CResourceUtilizationView::OnSaveState() {
+    wxLogTrace("CResourceUtilizationView::OnSaveState - Function Begining");
+    wxLogTrace("CResourceUtilizationView::OnSaveState - Function Ending");
+    return true;
+}
+
+
+bool CResourceUtilizationView::OnRestoreState() {
+    wxLogTrace("CResourceUtilizationView::OnRestoreState - Function Begining");
+    wxLogTrace("CResourceUtilizationView::OnRestoreState - Function Ending");
+    return true;
+}
+
diff --git a/clientgui/ResourceUtilizationView.h b/clientgui/ResourceUtilizationView.h
index 13378c5975..273fe425de 100644
--- a/clientgui/ResourceUtilizationView.h
+++ b/clientgui/ResourceUtilizationView.h
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:58  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:15  rwalton
 // *** empty log message ***
 //
@@ -44,15 +47,17 @@ class CResourceUtilizationView : public CBaseWindowView
     DECLARE_DYNAMIC_CLASS(CResourceUtilizationView)
 
 public:
-    CResourceUtilizationView(void);
+    CResourceUtilizationView();
     CResourceUtilizationView(wxNotebook* pNotebook);
 
-    ~CResourceUtilizationView(void);
+    ~CResourceUtilizationView();
 
-    virtual wxString GetViewName(void);
-    virtual char**   GetViewIcon(void);
+    virtual wxString GetViewName();
+    virtual char**   GetViewIcon();
 
     void OnRender(wxTimerEvent &event);
+    bool OnSaveState();
+    bool OnRestoreState();
 
 };
 
diff --git a/clientgui/TransfersView.cpp b/clientgui/TransfersView.cpp
index c1341c3e9c..b3ccc4cdce 100644
--- a/clientgui/TransfersView.cpp
+++ b/clientgui/TransfersView.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.9  2004/05/27 06:17:58  rwalton
+// *** empty log message ***
+//
 // Revision 1.8  2004/05/24 23:50:14  rwalton
 // *** empty log message ***
 //
@@ -45,7 +48,7 @@
 IMPLEMENT_DYNAMIC_CLASS(CTransfersView, CBaseListCtrlView)
 
 
-CTransfersView::CTransfersView(void)
+CTransfersView::CTransfersView()
 {
     wxLogTrace("CTransfersView::CTransfersView - Function Begining");
 
@@ -70,7 +73,7 @@ CTransfersView::CTransfersView(wxNotebook* pNotebook) :
 }
 
 
-CTransfersView::~CTransfersView(void)
+CTransfersView::~CTransfersView()
 {
     wxLogTrace("CTransfersView::~CTransfersView - Function Begining");
 
@@ -78,7 +81,7 @@ CTransfersView::~CTransfersView(void)
 }
 
 
-wxString CTransfersView::GetViewName(void)
+wxString CTransfersView::GetViewName()
 {
     wxLogTrace("CTransfersView::GetViewName - Function Begining");
 
@@ -87,7 +90,7 @@ wxString CTransfersView::GetViewName(void)
 }
 
 
-char** CTransfersView::GetViewIcon(void)
+char** CTransfersView::GetViewIcon()
 {
     wxLogTrace("CTransfersView::GetViewIcon - Function Begining");
 
@@ -98,7 +101,20 @@ char** CTransfersView::GetViewIcon(void)
 
 void CTransfersView::OnRender(wxTimerEvent &event) {
     wxLogTrace("CTransfersView::OnRender - Function Begining");
-
     wxLogTrace("CTransfersView::OnRender - Function Ending");
 }
 
+
+bool CTransfersView::OnSaveState() {
+    wxLogTrace("CTransfersView::OnSaveState - Function Begining");
+    wxLogTrace("CTransfersView::OnSaveState - Function Ending");
+    return true;
+}
+
+
+bool CTransfersView::OnRestoreState() {
+    wxLogTrace("CTransfersView::OnRestoreState - Function Begining");
+    wxLogTrace("CTransfersView::OnRestoreState - Function Ending");
+    return true;
+}
+
diff --git a/clientgui/TransfersView.h b/clientgui/TransfersView.h
index 2f5a4a1fb0..c1d2829bee 100644
--- a/clientgui/TransfersView.h
+++ b/clientgui/TransfersView.h
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:58  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:15  rwalton
 // *** empty log message ***
 //
@@ -44,15 +47,17 @@ class CTransfersView : public CBaseListCtrlView
     DECLARE_DYNAMIC_CLASS(CTransfersView)
 
 public:
-    CTransfersView(void);
+    CTransfersView();
     CTransfersView(wxNotebook* pNotebook);
 
-    ~CTransfersView(void);
+    ~CTransfersView();
 
-    virtual wxString GetViewName(void);
-    virtual char**   GetViewIcon(void);
+    virtual wxString GetViewName();
+    virtual char**   GetViewIcon();
 
     void OnRender(wxTimerEvent &event);
+    bool OnSaveState();
+    bool OnRestoreState();
 
 };
 
diff --git a/clientgui/WorkView.cpp b/clientgui/WorkView.cpp
index c3a69f16f3..17322f5b9a 100644
--- a/clientgui/WorkView.cpp
+++ b/clientgui/WorkView.cpp
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.9  2004/05/27 06:17:58  rwalton
+// *** empty log message ***
+//
 // Revision 1.8  2004/05/24 23:50:14  rwalton
 // *** empty log message ***
 //
@@ -45,7 +48,7 @@
 IMPLEMENT_DYNAMIC_CLASS(CWorkView, CBaseListCtrlView)
 
 
-CWorkView::CWorkView(void)
+CWorkView::CWorkView()
 {
     wxLogTrace("CWorkView::CWorkView - Function Begining");
 
@@ -71,7 +74,7 @@ CWorkView::CWorkView(wxNotebook* pNotebook) :
 }
 
 
-CWorkView::~CWorkView(void)
+CWorkView::~CWorkView()
 {
     wxLogTrace("CWorkView::~CWorkView - Function Begining");
 
@@ -79,7 +82,7 @@ CWorkView::~CWorkView(void)
 }
 
 
-wxString CWorkView::GetViewName(void)
+wxString CWorkView::GetViewName()
 {
     wxLogTrace("CWorkView::GetViewName - Function Begining");
 
@@ -88,7 +91,7 @@ wxString CWorkView::GetViewName(void)
 }
 
 
-char** CWorkView::GetViewIcon(void)
+char** CWorkView::GetViewIcon()
 {
     wxLogTrace("CWorkView::GetViewIcon - Function Begining");
 
@@ -99,7 +102,20 @@ char** CWorkView::GetViewIcon(void)
 
 void CWorkView::OnRender(wxTimerEvent &event) {
     wxLogTrace("CWorkView::OnRender - Function Begining");
-
     wxLogTrace("CWorkView::OnRender - Function Ending");
 }
 
+
+bool CWorkView::OnSaveState() {
+    wxLogTrace("CWorkView::OnSaveState - Function Begining");
+    wxLogTrace("CWorkView::OnSaveState - Function Ending");
+    return true;
+}
+
+
+bool CWorkView::OnRestoreState() {
+    wxLogTrace("CWorkView::OnRestoreState - Function Begining");
+    wxLogTrace("CWorkView::OnRestoreState - Function Ending");
+    return true;
+}
+
diff --git a/clientgui/WorkView.h b/clientgui/WorkView.h
index 1972d4c4ff..2578309fbd 100644
--- a/clientgui/WorkView.h
+++ b/clientgui/WorkView.h
@@ -21,6 +21,9 @@
 // Revision History:
 //
 // $Log$
+// Revision 1.8  2004/05/27 06:17:58  rwalton
+// *** empty log message ***
+//
 // Revision 1.7  2004/05/21 06:27:15  rwalton
 // *** empty log message ***
 //
@@ -44,15 +47,17 @@ class CWorkView : public CBaseListCtrlView
     DECLARE_DYNAMIC_CLASS(CWorkView)
 
 public:
-    CWorkView(void);
+    CWorkView();
     CWorkView(wxNotebook* pNotebook);
 
-    ~CWorkView(void);
+    ~CWorkView();
 
-    virtual wxString GetViewName(void);
-    virtual char**   GetViewIcon(void);
+    virtual wxString GetViewName();
+    virtual char**   GetViewIcon();
 
     void OnRender(wxTimerEvent &event);
+    bool OnSaveState();
+    bool OnRestoreState();
 
 };