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

MGR: I'm not sure what I was thinking, but the attach wizard should always run if the client isn't attached to any projects.

This commit is contained in:
Rom Walton 2016-02-10 10:51:10 -05:00
parent 30523d9a47
commit c47acc111f
2 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
clientgui/AdvancedFrame.cpp
View File

@ -1912,27 +1912,22 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
wxGetApp().ShowApplication(true);
pWizard = new CWizardAttach(this);
if ( strProjectURL.size() &&
//(strProjectAuthenticator.size() || strProjectSetupCookie.size()) &&
!pDoc->project((char*)strProjectURL.c_str())
if (pWizard->Run(
wxURI::Unescape(strProjectName),
wxURI::Unescape(strProjectURL),
wxURI::Unescape(strProjectAuthenticator),
wxURI::Unescape(strProjectInstitution),
wxURI::Unescape(strProjectDescription),
wxURI::Unescape(strProjectKnown),
wxURI::Unescape(strProjectSetupCookie),
bAccountKeyDetected,
bEmbedded)
){
if (pWizard->Run(
wxURI::Unescape(strProjectName),
wxURI::Unescape(strProjectURL),
wxURI::Unescape(strProjectAuthenticator),
wxURI::Unescape(strProjectInstitution),
wxURI::Unescape(strProjectDescription),
wxURI::Unescape(strProjectKnown),
wxURI::Unescape(strProjectSetupCookie),
bAccountKeyDetected,
bEmbedded)
){
// If successful, display the work tab
m_pNotebook->SetSelection(ID_ADVTASKSVIEW - ID_ADVVIEWBASE);
} else {
// If failure, display the notices tab
m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
}
// If successful, display the work tab
m_pNotebook->SetSelection(ID_ADVTASKSVIEW - ID_ADVVIEWBASE);
} else {
// If failure, display the notices tab
m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
}
}

27
clientgui/sg_BoincSimpleFrame.cpp
View File

@ -837,22 +837,17 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
wxGetApp().ShowApplication(true);
pWizard = new CWizardAttach(this);
if ( strProjectURL.size() &&
(strProjectAuthenticator.size() || strProjectSetupCookie.size()) &&
!pDoc->project((char*)strProjectURL.c_str())
){
pWizard->Run(
wxURI::Unescape(strProjectName),
wxURI::Unescape(strProjectURL),
wxURI::Unescape(strProjectAuthenticator),
wxURI::Unescape(strProjectInstitution),
wxURI::Unescape(strProjectDescription),
wxURI::Unescape(strProjectKnown),
wxURI::Unescape(strProjectSetupCookie),
bAccountKeyDetected,
bEmbedded
);
}
pWizard->Run(
wxURI::Unescape(strProjectName),
wxURI::Unescape(strProjectURL),
wxURI::Unescape(strProjectAuthenticator),
wxURI::Unescape(strProjectInstitution),
wxURI::Unescape(strProjectDescription),
wxURI::Unescape(strProjectKnown),
wxURI::Unescape(strProjectSetupCookie),
bAccountKeyDetected,
bEmbedded
);
}
if (pWizard) {