- manager: "Notifications" => "Notices". Consistent terminology.

svn path=/trunk/boinc/; revision=20142

checkin_notes

@@ -336,3 +336,12 @@ David  12 Jan 2010
             rss_main.php
     lib/
         util.cpp
+
+David  12 Jan 2010
+    - manager: "Notifications" => "Notices".  Consistent terminology.
+
+    clientgui/
+        Events.h
+        AdvancedFrame.cpp
+        Makefile.am
+        ViewNotifications* -> ViewNotices*

clientgui/AdvancedFrame.cpp

@@ -39,7 +39,7 @@
 #include "BOINCTaskBar.h"
 #include "BOINCDialupManager.h"
 #include "AdvancedFrame.h"
-#include "ViewNotifications.h"
+#include "ViewNotices.h"
 #include "ViewProjects.h"
 #include "ViewWork.h"
 #include "ViewTransfers.h"
@@ -159,7 +159,7 @@ IMPLEMENT_DYNAMIC_CLASS(CAdvancedFrame, CBOINCBaseFrame)
 
 BEGIN_EVENT_TABLE (CAdvancedFrame, CBOINCBaseFrame)
     // View
-    EVT_MENU_RANGE(ID_ADVNOTIFICATIONSVIEW, ID_ADVRESOURCEUSAGEVIEW, CAdvancedFrame::OnChangeView)
+    EVT_MENU_RANGE(ID_ADVNOTICESVIEW, ID_ADVRESOURCEUSAGEVIEW, CAdvancedFrame::OnChangeView)
     EVT_MENU(ID_CHANGEGUI, CAdvancedFrame::OnChangeGUI)
     // Tools
     EVT_MENU(ID_WIZARDATTACH, CAdvancedFrame::OnWizardAttach)
@@ -328,9 +328,9 @@ bool CAdvancedFrame::CreateMenu( bool bRPCsSafe ) {
     wxMenu *menuView = new wxMenu;
 
     menuView->Append(
-        ID_ADVNOTIFICATIONSVIEW,
-        _("&Notifications\tCtrl+Shift+N"),
-        _("Display notifications")
+        ID_ADVNOTICESVIEW,
+        _("&Notices\tCtrl+Shift+N"),
+        _("Display notices")
     );
 
     menuView->Append(
@@ -730,7 +730,7 @@ bool CAdvancedFrame::RepopulateNotebook() {
     DeleteNotebook();
 
     // Create the various notebook pages
-    CreateNotebookPage(new CViewNotifications(m_pNotebook));
+    CreateNotebookPage(new CViewNotices(m_pNotebook));
     CreateNotebookPage(new CViewProjects(m_pNotebook));
     CreateNotebookPage(new CViewWork(m_pNotebook));
     CreateNotebookPage(new CViewTransfers(m_pNotebook));
@@ -927,7 +927,7 @@ bool CAdvancedFrame::RestoreState() {
     if (wxGetApp().GetSkinManager()->GetAdvanced()->GetDefaultTab()) {
         m_pNotebook->SetSelection(wxGetApp().GetSkinManager()->GetAdvanced()->GetDefaultTab());
     } else {
-        pConfig->Read(wxT("CurrentPageV2"), &iCurrentPage, (ID_ADVNOTIFICATIONSVIEW - ID_ADVVIEWBASE));
+        pConfig->Read(wxT("CurrentPageV2"), &iCurrentPage, (ID_ADVNOTICESVIEW - ID_ADVVIEWBASE));
         m_pNotebook->SetSelection(iCurrentPage);
     }
 
@@ -1756,7 +1756,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
             );
         } else {
             // If failure, display the notification tab
-            m_pNotebook->SetSelection(ID_ADVNOTIFICATIONSVIEW - ID_ADVVIEWBASE);
+            m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
         }
     } else if ((pis.url.size() || (0 >= pDoc->GetProjectCount())) && !status.disallow_attach) {
         if (!IsShown()) {
@@ -1804,7 +1804,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
 void CAdvancedFrame::OnNotification(CFrameEvent& WXUNUSED(event)) {
     wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnNotification - Function Begin"));
 
-    m_pNotebook->SetSelection(ID_ADVNOTIFICATIONSVIEW - ID_ADVVIEWBASE);
+    m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
 
     wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnNotification - Function End"));
 }

clientgui/Events.h

@@ -50,7 +50,7 @@
 
 // View Menu
 #define ID_ADVVIEWBASE                          6125
-#define ID_ADVNOTIFICATIONSVIEW                 6125
+#define ID_ADVNOTICESVIEW                       6125
 #define ID_ADVPROJECTSVIEW                      6126
 #define ID_ADVTASKSVIEW                         6127
 #define ID_ADVTRANSFERSVIEW                     6128

clientgui/Makefile.am

@@ -97,7 +97,7 @@ boincmgr_SOURCES = \
     ValidateAccountKey.cpp \
     ValidateEmailAddress.cpp \
     ValidateURL.cpp \
-    ViewNotifications.cpp \
+    ViewNotices.cpp \
     ViewProjects.cpp \
     ViewResources.cpp \
     ViewStatistics.cpp \

clientgui/ViewNotices.cpp

@@ -16,7 +16,7 @@
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 #if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "ViewNotifications.h"
+#pragma implementation "ViewNotices.h"
 #endif
 
 #include "stdwx.h"
@@ -25,7 +25,7 @@
 #include "MainDocument.h"
 #include "AdvancedFrame.h"
 #include "BOINCTaskCtrl.h"
-#include "ViewNotifications.h"
+#include "ViewNotices.h"
 #include "Events.h"
 #include "error_numbers.h"
 
@@ -33,17 +33,17 @@
 #include "res/mess.xpm"
 
 
-IMPLEMENT_DYNAMIC_CLASS(CViewNotifications, CBOINCBaseView)
+IMPLEMENT_DYNAMIC_CLASS(CViewNotices, CBOINCBaseView)
 
-BEGIN_EVENT_TABLE (CViewNotifications, CBOINCBaseView)
+BEGIN_EVENT_TABLE (CViewNotices, CBOINCBaseView)
 END_EVENT_TABLE ()
 
 
-CViewNotifications::CViewNotifications()
+CViewNotices::CViewNotices()
 {}
 
 
-CViewNotifications::CViewNotifications(wxNotebook* pNotebook) :
+CViewNotices::CViewNotices(wxNotebook* pNotebook) :
     CBOINCBaseView(pNotebook)
 {
     CTaskItemGroup* pGroup = NULL;
@@ -90,48 +90,48 @@ CViewNotifications::CViewNotifications(wxNotebook* pNotebook) :
 }
 
 
-CViewNotifications::~CViewNotifications() {
+CViewNotices::~CViewNotices() {
 }
 
 
-wxString& CViewNotifications::GetViewName() {
+wxString& CViewNotices::GetViewName() {
     static wxString strViewName(wxT("Notices"));
     return strViewName;
 }
 
 
-wxString& CViewNotifications::GetViewDisplayName() {
+wxString& CViewNotices::GetViewDisplayName() {
     static wxString strViewName(_("Notices"));
     return strViewName;
 }
 
 
-const char** CViewNotifications::GetViewIcon() {
+const char** CViewNotices::GetViewIcon() {
     return mess_xpm;
 }
 
 
-const int CViewNotifications::GetViewRefreshRate() {
+const int CViewNotices::GetViewRefreshRate() {
     return 10;
 }
 
-const int CViewNotifications::GetViewCurrentViewPage() {
+const int CViewNotices::GetViewCurrentViewPage() {
      return VW_NOTIF;
 }
 
 
-bool CViewNotifications::OnSaveState(wxConfigBase* WXUNUSED(pConfig)) {
+bool CViewNotices::OnSaveState(wxConfigBase* WXUNUSED(pConfig)) {
     return true;
 }
 
 
-bool CViewNotifications::OnRestoreState(wxConfigBase* WXUNUSED(pConfig)) {
+bool CViewNotices::OnRestoreState(wxConfigBase* WXUNUSED(pConfig)) {
     return true;
 }
 
 
-void CViewNotifications::OnListRender(wxTimerEvent& WXUNUSED(event)) {
-    wxLogTrace(wxT("Function Start/End"), wxT("CViewNotifications::OnListRender - Function Begin"));
+void CViewNotices::OnListRender(wxTimerEvent& WXUNUSED(event)) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CViewNotices::OnListRender - Function Begin"));
 
     CMainDocument*  pDoc   = wxGetApp().GetDocument();
     wxString strHTML;
@@ -188,5 +188,5 @@ void CViewNotifications::OnListRender(wxTimerEvent& WXUNUSED(event)) {
 done:
     s_bInProgress = false;
 
-    wxLogTrace(wxT("Function Start/End"), wxT("CViewNotifications::OnListRender - Function End"));
+    wxLogTrace(wxT("Function Start/End"), wxT("CViewNotices::OnListRender - Function End"));
 }

clientgui/ViewNotices.h

@@ -19,21 +19,21 @@
 #define _VIEWNOTIFICATIONS_H_
 
 #if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "ViewNotifications.cpp"
+#pragma interface "ViewNotices.cpp"
 #endif
 
 
 #include "BOINCBaseView.h"
 
 
-class CViewNotifications : public CBOINCBaseView {
-    DECLARE_DYNAMIC_CLASS( CViewNotifications )
+class CViewNotices : public CBOINCBaseView {
+    DECLARE_DYNAMIC_CLASS( CViewNotices )
 
 public:
-    CViewNotifications();
-    CViewNotifications(wxNotebook* pNotebook);
+    CViewNotices();
+    CViewNotices(wxNotebook* pNotebook);
 
-    ~CViewNotifications();
+    ~CViewNotices();
 
     virtual wxString&       GetViewName();
     virtual wxString&       GetViewDisplayName();