Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

MGR: Fix tools menu when using account manager and switching Simple to Advanced View; update XCode project for ViewNotifications* -> ViewNotices* 

svn path=/trunk/boinc/; revision=20147
This commit is contained in:
Charlie Fenton 2010-01-13 09:30:21 +00:00
parent 564cd7cece
commit 505d099812
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
checkin_notes
View File

@ -375,3 +375,18 @@ David 12 Jan 2010
lib/
notice.cpp
parse.cpp,h
Charlie 13 Jan 2010
- MGR: The fix of 14 Oct 2009 for "initial first connection problem on
startup" caused the Tools menu to be incorrect when switching from
Simple to Advanced View if using an account manager: solve this by
calling pDoc->IsConnected() in CAdvancedFrame::CreateMenu() isntead
of using bool argument bRPCsSafe. Remove unused bRPCsSafe arg from
CAdvancedFrame::CreateNotebook(), CAdvancedFrame::CreateStatusbar().
- Mac: Update XCode project for ViewNotifications* -> ViewNotices*.
clientgui/
AdvancedFrame.cpp, .h
mac_build/
boinc.xcodeproj/
project.pbxproj

14
clientgui/AdvancedFrame.cpp
View File

@ -220,9 +220,9 @@ CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32, wxP
SetIcons(icons);
// Create UI elements
wxCHECK_RET(CreateMenu(false), _T("Failed to create menu bar."));
wxCHECK_RET(CreateNotebook(false), _T("Failed to create notebook."));
wxCHECK_RET(CreateStatusbar(false), _T("Failed to create status bar."));
wxCHECK_RET(CreateMenu(), _T("Failed to create menu bar."));
wxCHECK_RET(CreateNotebook(), _T("Failed to create notebook."));
wxCHECK_RET(CreateStatusbar(), _T("Failed to create status bar."));
RestoreState();
@ -274,7 +274,7 @@ CAdvancedFrame::~CAdvancedFrame() {
}
bool CAdvancedFrame::CreateMenu( bool bRPCsSafe ) {
bool CAdvancedFrame::CreateMenu() {
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CreateMenu - Function Begin"));
CMainDocument* pDoc = wxGetApp().GetDocument();
@ -290,7 +290,7 @@ bool CAdvancedFrame::CreateMenu( bool bRPCsSafe ) {
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
// Account managers have a different menu arrangement
if (bRPCsSafe) {
if (pDoc->IsConnected()) {
pDoc->rpc.acct_mgr_info(ami);
is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
}
@ -689,7 +689,7 @@ bool CAdvancedFrame::CreateMenu( bool bRPCsSafe ) {
}
bool CAdvancedFrame::CreateNotebook( bool WXUNUSED(bRPCsSafe) ) {
bool CAdvancedFrame::CreateNotebook() {
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CreateNotebook - Function Begin"));
// create frame panel
@ -768,7 +768,7 @@ bool CAdvancedFrame::CreateNotebookPage( CBOINCBaseView* pwndNewNotebookPage) {
}
bool CAdvancedFrame::CreateStatusbar( bool WXUNUSED(bRPCsSafe) ) {
bool CAdvancedFrame::CreateStatusbar() {
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CreateStatusbar - Function Begin"));
if (m_pStatusbar)

6
clientgui/AdvancedFrame.h
View File

@ -117,15 +117,15 @@ private:
wxString m_strBaseTitle;
bool CreateMenu( bool bRPCsSafe = true );
bool CreateMenu();
bool DeleteMenu();
bool CreateNotebook( bool bRPCsSafe = true );
bool CreateNotebook();
bool RepopulateNotebook();
bool CreateNotebookPage( CBOINCBaseView* pwndNewNotebookPage );
bool DeleteNotebook();
bool CreateStatusbar( bool bRPCsSafe = true );
bool CreateStatusbar();
bool DeleteStatusbar();
void SaveWindowDimensions();

12
mac_build/boinc.xcodeproj/project.pbxproj
View File

@ -370,7 +370,7 @@
DDE1372A10DC5E5300161D6B /* cs_notice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1372810DC5E5300161D6B /* cs_notice.cpp */; };
DDE1372F10DC5E8D00161D6B /* notice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1372D10DC5E8D00161D6B /* notice.cpp */; };
DDE1373210DC5EA400161D6B /* notice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1372D10DC5E8D00161D6B /* notice.cpp */; };
DDE1373D10DC60BB00161D6B /* ViewNotifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1373B10DC60BB00161D6B /* ViewNotifications.cpp */; };
DDE1373D10DC60BB00161D6B /* ViewNotices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1373B10DC60BB00161D6B /* ViewNotices.cpp */; };
DDE1374210DC60E200161D6B /* DlgEventLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1374010DC60E200161D6B /* DlgEventLog.cpp */; };
DDE1374910DC613600161D6B /* DlgEventLogListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1374710DC613600161D6B /* DlgEventLogListCtrl.cpp */; };
DDE3A8800E90D1BF00A363A7 /* client_state.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE3A87F0E90D1BF00A363A7 /* client_state.cpp */; };
@ -961,8 +961,8 @@
DDE1372910DC5E5300161D6B /* cs_notice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cs_notice.h; path = ../client/cs_notice.h; sourceTree = SOURCE_ROOT; };
DDE1372D10DC5E8D00161D6B /* notice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = notice.cpp; path = ../lib/notice.cpp; sourceTree = SOURCE_ROOT; };
DDE1372E10DC5E8D00161D6B /* notice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = notice.h; path = ../lib/notice.h; sourceTree = SOURCE_ROOT; };
DDE1373B10DC60BB00161D6B /* ViewNotifications.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewNotifications.cpp; path = ../clientgui/ViewNotifications.cpp; sourceTree = SOURCE_ROOT; };
DDE1373C10DC60BB00161D6B /* ViewNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewNotifications.h; path = ../clientgui/ViewNotifications.h; sourceTree = SOURCE_ROOT; };
DDE1373B10DC60BB00161D6B /* ViewNotices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewNotices.cpp; sourceTree = "<group>"; };
DDE1373C10DC60BB00161D6B /* ViewNotices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewNotices.h; sourceTree = "<group>"; };
DDE1374010DC60E200161D6B /* DlgEventLog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DlgEventLog.cpp; path = ../clientgui/DlgEventLog.cpp; sourceTree = SOURCE_ROOT; };
DDE1374110DC60E200161D6B /* DlgEventLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DlgEventLog.h; path = ../clientgui/DlgEventLog.h; sourceTree = SOURCE_ROOT; };
DDE1374710DC613600161D6B /* DlgEventLogListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DlgEventLogListCtrl.cpp; path = ../clientgui/DlgEventLogListCtrl.cpp; sourceTree = SOURCE_ROOT; };
@ -1436,8 +1436,8 @@
DD81C46507C5D29F0098A04D /* ValidateURL.h */,
DD81C42507C5D1D70098A04D /* ViewMessages.cpp */,
DD81C46407C5D29F0098A04D /* ViewMessages.h */,
DDE1373B10DC60BB00161D6B /* ViewNotifications.cpp */,
DDE1373C10DC60BB00161D6B /* ViewNotifications.h */,
DDE1373B10DC60BB00161D6B /* ViewNotices.cpp */,
DDE1373C10DC60BB00161D6B /* ViewNotices.h */,
DDD52DC40C03CAE6009B5FC0 /* ViewProjects.cpp */,
DDD52DC50C03CAE6009B5FC0 /* ViewProjects.h */,
DD81C42307C5D1D70098A04D /* ViewResources.cpp */,
@ -2565,7 +2565,7 @@
DDA99BF41099AF18002F8E9B /* MacAccessiblity.cpp in Sources */,
DDC06ABC10A3E98D00C8D9A5 /* url.cpp in Sources */,
DDD9C5A510CCF61F00A1E4CD /* coproc.cpp in Sources */,
DDE1373D10DC60BB00161D6B /* ViewNotifications.cpp in Sources */,
DDE1373D10DC60BB00161D6B /* ViewNotices.cpp in Sources */,
DDE1374210DC60E200161D6B /* DlgEventLog.cpp in Sources */,
DDE1374910DC613600161D6B /* DlgEventLogListCtrl.cpp in Sources */,
DD867B7510DCE77700128AB4 /* notice.cpp in Sources */,