From 028d26892ec78e9e14dfa4c4884d0c831ecf0ccb Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Tue, 13 Jul 2010 16:02:23 +0000 Subject: [PATCH] - MGR: Load up the new BOINC-Client catalog if it exists. clientgui/ BOINCGUIApp.cpp svn path=/trunk/boinc/; revision=21898 --- checkin_notes | 6 ++++++ clientgui/BOINCGUIApp.cpp | 12 +----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/checkin_notes b/checkin_notes index f1056bab4a..210c2fcbbf 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5066,3 +5066,9 @@ David 12 Jul 2010 BOINC-Client.pot (new) client/ build_po (new) + +Rom 13 July 2010 + - MGR: Load up the new BOINC-Client catalog if it exists. + + clientgui/ + BOINCGUIApp.cpp diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index 020e86efab..c4e0b2f227 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -284,6 +284,7 @@ bool CBOINCGUIApp::OnInit() { } m_pLocale->AddCatalogLookupPathPrefix(wxT("locale")); m_pLocale->AddCatalog(wxT("BOINC-Manager")); + m_pLocale->AddCatalog(wxT("BOINC-Client")); InitSupportedLanguages(); @@ -396,17 +397,6 @@ bool CBOINCGUIApp::OnInit() { } } -#ifdef __WXMAC__ -#if 0 - // We may still need this code; don't remove it yet -- CAF 1/30/08 - // When running BOINC Client as a daemon / service, the menubar icon is sometimes - // unresponsive to mouse clicks if we create it before connecting to the Client. - CBOINCClientManager* pcm = m_pDocument->m_pClientManager; - if (pcm->IsSystemBooting() && pcm->IsBOINCConfiguredAsDaemon()) { - pcm->StartupBOINCCore(); - } -#endif -#endif // Initialize the task bar icon m_pTaskBarIcon = new CTaskBarIcon(