mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=9488
This commit is contained in:
Rom Walton
parent
1d0b412cca
commit
fcf8fd0398
|
|
@ -1933,9 +1933,21 @@ Charlie 16 Feb 2006
|
||||||
|
|
||||||
Rom 16 Feb 2006
|
Rom 16 Feb 2006
|
||||||
- Modify the disk usage and statistics tab icons
|
- Modify the disk usage and statistics tab icons
|
||||||
|
- Add a worning before the account manager wizard will actually
|
||||||
|
defect from an account manager
|
||||||
|
- Remove CompletionUpdatePage.cpp and CompletionRemovePage.cpp
|
||||||
|
- Remove AccountManagerStatusPage.cpp
|
||||||
|
|
||||||
clientgui/
|
clientgui/
|
||||||
|
AccountManagerProcessingPage.cpp
|
||||||
|
BOINCWizards.h
|
||||||
|
CompletionPage.cpp
|
||||||
ViewStatistics.cpp, .h
|
ViewStatistics.cpp, .h
|
||||||
|
WelcomePage.cpp
|
||||||
|
WizardAccountManager.cpp, .h
|
||||||
|
CompletionUpdatePage.cpp, .h (Removed)
|
||||||
|
CompletionRemovePage.cpp, .h (Removed)
|
||||||
|
AccountManagerStatusPage.cpp, .h (Removed)
|
||||||
clientgui/res/
|
clientgui/res/
|
||||||
stats.xpm (Added)
|
stats.xpm (Added)
|
||||||
usage.xpm
|
usage.xpm
|
||||||
|
|
|
||||||
|
|
@ -347,12 +347,6 @@ wxWizardPageEx* CAccountManagerProcessingPage::GetNext() const
|
||||||
if (CHECK_CLOSINGINPROGRESS()) {
|
if (CHECK_CLOSINGINPROGRESS()) {
|
||||||
// Cancel Event Detected
|
// Cancel Event Detected
|
||||||
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
|
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
|
||||||
} else if (GetProjectAttachSucceeded() && IS_ACCOUNTMANAGERUPDATEWIZARD()) {
|
|
||||||
// We were successful in updating the client account
|
|
||||||
return PAGE_TRANSITION_NEXT(ID_COMPLETIONUPDATEPAGE);
|
|
||||||
} else if (GetProjectAttachSucceeded() && IS_ACCOUNTMANAGERREMOVEWIZARD()) {
|
|
||||||
// We were successful in removing the client from the account manager
|
|
||||||
return PAGE_TRANSITION_NEXT(ID_COMPLETIONREMOVEPAGE);
|
|
||||||
} else if (GetProjectAttachSucceeded()) {
|
} else if (GetProjectAttachSucceeded()) {
|
||||||
// We were successful in creating or retrieving an account
|
// We were successful in creating or retrieving an account
|
||||||
return PAGE_TRANSITION_NEXT(ID_COMPLETIONPAGE);
|
return PAGE_TRANSITION_NEXT(ID_COMPLETIONPAGE);
|
||||||
|
|
|
||||||
|
|
@ -1,316 +0,0 @@
|
||||||
// Berkeley Open Infrastructure for Network Computing
|
|
||||||
// http://boinc.berkeley.edu
|
|
||||||
// Copyright (C) 2005 University of California
|
|
||||||
//
|
|
||||||
// This is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU Lesser General Public
|
|
||||||
// License as published by the Free Software Foundation;
|
|
||||||
// either version 2.1 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This software is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
// See the GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// To view the GNU Lesser General Public License visit
|
|
||||||
// http://www.gnu.org/copyleft/lesser.html
|
|
||||||
// or write to the Free Software Foundation, Inc.,
|
|
||||||
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
//
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
|
||||||
#pragma implementation "AccountManagerStatusPage.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "stdwx.h"
|
|
||||||
#include "wizardex.h"
|
|
||||||
#include "wx/valgen.h"
|
|
||||||
#include "error_numbers.h"
|
|
||||||
#include "BOINCGUIApp.h"
|
|
||||||
#include "hyperlink.h"
|
|
||||||
#include "BOINCWizards.h"
|
|
||||||
#include "BOINCBaseWizard.h"
|
|
||||||
#include "WizardAccountManager.h"
|
|
||||||
#include "AccountManagerStatusPage.h"
|
|
||||||
#include "AccountManagerInfoPage.h"
|
|
||||||
#include "AccountInfoPage.h"
|
|
||||||
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CAccountManagerStatusPage type definition
|
|
||||||
*/
|
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS( CAccountManagerStatusPage, wxWizardPageEx )
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CAccountManagerStatusPage event table definition
|
|
||||||
*/
|
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE( CAccountManagerStatusPage, wxWizardPageEx )
|
|
||||||
|
|
||||||
////@begin CAccountManagerStatusPage event table entries
|
|
||||||
EVT_WIZARDEX_PAGE_CHANGED( -1, CAccountManagerStatusPage::OnPageChanged )
|
|
||||||
EVT_WIZARDEX_CANCEL( -1, CAccountManagerStatusPage::OnCancel )
|
|
||||||
|
|
||||||
////@end CAccountManagerStatusPage event table entries
|
|
||||||
|
|
||||||
END_EVENT_TABLE()
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CAccountManagerStatusPage constructors
|
|
||||||
*/
|
|
||||||
|
|
||||||
CAccountManagerStatusPage::CAccountManagerStatusPage( )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
CAccountManagerStatusPage::CAccountManagerStatusPage( CBOINCBaseWizard* parent )
|
|
||||||
{
|
|
||||||
Create( parent );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CErrNoInternetConnection creator
|
|
||||||
*/
|
|
||||||
|
|
||||||
bool CAccountManagerStatusPage::Create( CBOINCBaseWizard* parent )
|
|
||||||
{
|
|
||||||
////@begin CAccountManagerStatusPage member initialisation
|
|
||||||
m_pTitleStaticCtrl = NULL;
|
|
||||||
m_pAcctManagerDescriptionStaticCtrl = NULL;
|
|
||||||
m_pAcctManagerNameStaticCtrl = NULL;
|
|
||||||
m_pAcctManagerNameCtrl = NULL;
|
|
||||||
m_pAcctManagerURLStaticCtrl = NULL;
|
|
||||||
m_pAcctManagerURLCtrl = NULL;
|
|
||||||
m_pAcctManagerUpdateCtrl = NULL;
|
|
||||||
m_pAcctManagerUpdateDescriptionStaticCtrl = NULL;
|
|
||||||
m_pAcctManagerRemoveCtrl = NULL;
|
|
||||||
m_pAcctManagerRemoveDescriptionStaticCtrl = NULL;
|
|
||||||
////@end CAccountManagerStatusPage member initialisation
|
|
||||||
|
|
||||||
////@begin CAccountManagerStatusPage creation
|
|
||||||
wxBitmap wizardBitmap(wxNullBitmap);
|
|
||||||
wxWizardPageEx::Create( parent, wizardBitmap );
|
|
||||||
|
|
||||||
CreateControls();
|
|
||||||
GetSizer()->Fit(this);
|
|
||||||
////@end CAccountManagerStatusPage creation
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Control creation for CErrNoInternetConnection
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CAccountManagerStatusPage::CreateControls()
|
|
||||||
{
|
|
||||||
////@begin CAccountManagerStatusPage content construction
|
|
||||||
CAccountManagerStatusPage* itemWizardPage111 = this;
|
|
||||||
|
|
||||||
wxBoxSizer* itemBoxSizer112 = new wxBoxSizer(wxVERTICAL);
|
|
||||||
itemWizardPage111->SetSizer(itemBoxSizer112);
|
|
||||||
|
|
||||||
m_pTitleStaticCtrl = new wxStaticText;
|
|
||||||
m_pTitleStaticCtrl->Create( itemWizardPage111, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_pTitleStaticCtrl->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
|
|
||||||
itemBoxSizer112->Add(m_pTitleStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
|
|
||||||
itemBoxSizer112->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerDescriptionStaticCtrl = new wxStaticText;
|
|
||||||
m_pAcctManagerDescriptionStaticCtrl->Create( itemWizardPage111, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
itemBoxSizer112->Add(m_pAcctManagerDescriptionStaticCtrl, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
|
|
||||||
|
|
||||||
wxFlexGridSizer* itemFlexGridSizer5 = new wxFlexGridSizer(2, 2, 0, 0);
|
|
||||||
itemBoxSizer112->Add(itemFlexGridSizer5, 0, wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerNameStaticCtrl = new wxStaticText;
|
|
||||||
m_pAcctManagerNameStaticCtrl->Create( itemWizardPage111, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
itemFlexGridSizer5->Add(m_pAcctManagerNameStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerNameCtrl = new wxStaticText;
|
|
||||||
m_pAcctManagerNameCtrl->Create( itemWizardPage111, ID_ACCTMANAGERNAMECTRL, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 0 );
|
|
||||||
itemFlexGridSizer5->Add(m_pAcctManagerNameCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerURLStaticCtrl = new wxStaticText;
|
|
||||||
m_pAcctManagerURLStaticCtrl->Create( itemWizardPage111, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
itemFlexGridSizer5->Add(m_pAcctManagerURLStaticCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerURLCtrl = new wxHyperLink;
|
|
||||||
m_pAcctManagerURLCtrl->Create( itemWizardPage111, ID_ACCTMANAGERLINKCTRL, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 0 );
|
|
||||||
itemFlexGridSizer5->Add(m_pAcctManagerURLCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
|
||||||
|
|
||||||
itemBoxSizer112->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerUpdateCtrl = new wxRadioButton;
|
|
||||||
m_pAcctManagerUpdateCtrl->Create( itemWizardPage111, ID_ACCTMANAGERUPDATECTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_pAcctManagerUpdateCtrl->SetValue(FALSE);
|
|
||||||
itemBoxSizer112->Add(m_pAcctManagerUpdateCtrl, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
|
|
||||||
wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL);
|
|
||||||
itemBoxSizer112->Add(itemBoxSizer12, 0, wxALIGN_LEFT|wxALL, 0);
|
|
||||||
|
|
||||||
itemBoxSizer12->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerUpdateDescriptionStaticCtrl = new wxStaticText;
|
|
||||||
m_pAcctManagerUpdateDescriptionStaticCtrl->Create( itemWizardPage111, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
itemBoxSizer12->Add(m_pAcctManagerUpdateDescriptionStaticCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerRemoveCtrl = new wxRadioButton;
|
|
||||||
m_pAcctManagerRemoveCtrl->Create( itemWizardPage111, ID_ACCTMANAGERREMOVECTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_pAcctManagerRemoveCtrl->SetValue(FALSE);
|
|
||||||
itemBoxSizer112->Add(m_pAcctManagerRemoveCtrl, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
|
|
||||||
wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxHORIZONTAL);
|
|
||||||
itemBoxSizer112->Add(itemBoxSizer16, 0, wxALIGN_LEFT|wxALL, 0);
|
|
||||||
|
|
||||||
itemBoxSizer16->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
|
||||||
|
|
||||||
m_pAcctManagerRemoveDescriptionStaticCtrl = new wxStaticText;
|
|
||||||
m_pAcctManagerRemoveDescriptionStaticCtrl->Create( itemWizardPage111, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
itemBoxSizer16->Add(m_pAcctManagerRemoveDescriptionStaticCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
|
||||||
|
|
||||||
// Set validators
|
|
||||||
m_pAcctManagerNameCtrl->SetValidator( wxGenericValidator(& m_strAcctManagerName) );
|
|
||||||
m_pAcctManagerURLCtrl->SetValidator( wxGenericValidator(& m_strAcctManagerURL) );
|
|
||||||
|
|
||||||
////@end CAccountManagerStatusPage content construction
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Gets the previous page.
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxWizardPageEx* CAccountManagerStatusPage::GetPrev() const
|
|
||||||
{
|
|
||||||
return PAGE_TRANSITION_BACK;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Gets the next page.
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxWizardPageEx* CAccountManagerStatusPage::GetNext() const
|
|
||||||
{
|
|
||||||
if (CHECK_CLOSINGINPROGRESS()) {
|
|
||||||
// Cancel Event Detected
|
|
||||||
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
|
|
||||||
} else if (m_pAcctManagerUpdateCtrl->GetValue() && ((CWizardAccountManager*)GetParent())->m_bCredentialsCached) {
|
|
||||||
// We are supposed to update and we already have credentials to the
|
|
||||||
// account manager
|
|
||||||
((CWizardAccountManager*)GetParent())->IsAccountManagerUpdateWizard = true;
|
|
||||||
((CWizardAccountManager*)GetParent())->IsAccountManagerRemoveWizard = false;
|
|
||||||
return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERPROCESSINGPAGE);
|
|
||||||
} else if (m_pAcctManagerUpdateCtrl->GetValue()) {
|
|
||||||
// We are supposed to update and we do not have credentials to the
|
|
||||||
// account manager
|
|
||||||
((CWizardAccountManager*)GetParent())->IsAccountManagerUpdateWizard = true;
|
|
||||||
((CWizardAccountManager*)GetParent())->IsAccountManagerRemoveWizard = false;
|
|
||||||
return PAGE_TRANSITION_NEXT(ID_ACCOUNTINFOPAGE);
|
|
||||||
} else if (m_pAcctManagerRemoveCtrl->GetValue()) {
|
|
||||||
// We are supposed to the account manager
|
|
||||||
((CWizardAccountManager*)GetParent())->IsAccountManagerUpdateWizard = false;
|
|
||||||
((CWizardAccountManager*)GetParent())->IsAccountManagerRemoveWizard = true;
|
|
||||||
((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->SetProjectURL(wxEmptyString);
|
|
||||||
((CWizardAccountManager*)GetParent())->m_AccountInfoPage->SetAccountEmailAddress(wxEmptyString);
|
|
||||||
((CWizardAccountManager*)GetParent())->m_AccountInfoPage->SetAccountPassword(wxEmptyString);
|
|
||||||
((CWizardAccountManager*)GetParent())->m_bCredentialsCached = false;
|
|
||||||
return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERPROCESSINGPAGE);
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Should we show tooltips?
|
|
||||||
*/
|
|
||||||
|
|
||||||
bool CAccountManagerStatusPage::ShowToolTips()
|
|
||||||
{
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Get bitmap resources
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxBitmap CAccountManagerStatusPage::GetBitmapResource( const wxString& name )
|
|
||||||
{
|
|
||||||
// Bitmap retrieval
|
|
||||||
////@begin CAccountManagerStatusPage bitmap retrieval
|
|
||||||
return wxNullBitmap;
|
|
||||||
////@end CAccountManagerStatusPage bitmap retrieval
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Get icon resources
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxIcon CAccountManagerStatusPage::GetIconResource( const wxString& name )
|
|
||||||
{
|
|
||||||
// Icon retrieval
|
|
||||||
////@begin CAccountManagerStatusPage icon retrieval
|
|
||||||
return wxNullIcon;
|
|
||||||
////@end CAccountManagerStatusPage icon retrieval
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ERRNACCOUNTDOESNOTEXISTPAGE
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CAccountManagerStatusPage::OnPageChanged( wxWizardExEvent& event ) {
|
|
||||||
if (event.GetDirection() == false) return;
|
|
||||||
|
|
||||||
wxASSERT(m_pTitleStaticCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerDescriptionStaticCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerNameStaticCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerNameCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerURLStaticCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerURLCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerUpdateCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerUpdateDescriptionStaticCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerRemoveCtrl);
|
|
||||||
wxASSERT(m_pAcctManagerRemoveDescriptionStaticCtrl);
|
|
||||||
|
|
||||||
|
|
||||||
m_pTitleStaticCtrl->SetLabel(
|
|
||||||
_("Account Manager")
|
|
||||||
);
|
|
||||||
m_pAcctManagerDescriptionStaticCtrl->SetLabel(
|
|
||||||
_("Your current account manager is:")
|
|
||||||
);
|
|
||||||
m_pAcctManagerNameStaticCtrl->SetLabel(
|
|
||||||
_("Name:")
|
|
||||||
);
|
|
||||||
m_pAcctManagerNameCtrl->SetLabel(
|
|
||||||
((CWizardAccountManager*)GetParent())->m_strProjectName
|
|
||||||
);
|
|
||||||
m_pAcctManagerNameStaticCtrl->SetLabel(
|
|
||||||
_("URL:")
|
|
||||||
);
|
|
||||||
m_pAcctManagerURLCtrl->SetLabel(
|
|
||||||
((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL()
|
|
||||||
);
|
|
||||||
m_pAcctManagerUpdateCtrl->SetLabel(
|
|
||||||
_("Update")
|
|
||||||
);
|
|
||||||
m_pAcctManagerUpdateDescriptionStaticCtrl->SetLabel(
|
|
||||||
_("Get latest settings from account manager.")
|
|
||||||
);
|
|
||||||
m_pAcctManagerRemoveCtrl->SetLabel(
|
|
||||||
_("Remove")
|
|
||||||
);
|
|
||||||
m_pAcctManagerRemoveDescriptionStaticCtrl->SetLabel(
|
|
||||||
_("Stop using account manager.")
|
|
||||||
);
|
|
||||||
|
|
||||||
Fit();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxEVT_WIZARD_CANCEL event handler for ID_ERRNACCOUNTDOESNOTEXISTPAGE
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CAccountManagerStatusPage::OnCancel( wxWizardExEvent& event ) {
|
|
||||||
PROCESS_CANCELEVENT(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,93 +0,0 @@
|
||||||
// Berkeley Open Infrastructure for Network Computing
|
|
||||||
// http://boinc.berkeley.edu
|
|
||||||
// Copyright (C) 2005 University of California
|
|
||||||
//
|
|
||||||
// This is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU Lesser General Public
|
|
||||||
// License as published by the Free Software Foundation;
|
|
||||||
// either version 2.1 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This software is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
// See the GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// To view the GNU Lesser General Public License visit
|
|
||||||
// http://www.gnu.org/copyleft/lesser.html
|
|
||||||
// or write to the Free Software Foundation, Inc.,
|
|
||||||
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
//
|
|
||||||
#ifndef _WIZ_ACCOUNTMANAGERSTATUSPAGE_H_
|
|
||||||
#define _WIZ_ACCOUNTMANAGERSTATUSPAGE_H_
|
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
|
||||||
#pragma interface "AccountManagerStatusPage.cpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CAccountManagerStatusPage class declaration
|
|
||||||
*/
|
|
||||||
|
|
||||||
class CAccountManagerStatusPage: public wxWizardPageEx
|
|
||||||
{
|
|
||||||
DECLARE_DYNAMIC_CLASS( CAccountManagerStatusPage )
|
|
||||||
DECLARE_EVENT_TABLE()
|
|
||||||
|
|
||||||
public:
|
|
||||||
/// Constructors
|
|
||||||
CAccountManagerStatusPage( );
|
|
||||||
|
|
||||||
CAccountManagerStatusPage( CBOINCBaseWizard* parent );
|
|
||||||
|
|
||||||
/// Creation
|
|
||||||
bool Create( CBOINCBaseWizard* parent );
|
|
||||||
|
|
||||||
/// Creates the controls and sizers
|
|
||||||
void CreateControls();
|
|
||||||
|
|
||||||
////@begin CAccountManagerStatusPage event handler declarations
|
|
||||||
|
|
||||||
/// wxEVT_WIZARD_PAGE_CHANGED event handler for ID_ACCOUNTMANAGERSTATUSPAGE
|
|
||||||
void OnPageChanged( wxWizardExEvent& event );
|
|
||||||
|
|
||||||
/// wxEVT_WIZARD_CANCEL event handler for ID_ACCOUNTMANAGERSTATUSPAGE
|
|
||||||
void OnCancel( wxWizardExEvent& event );
|
|
||||||
|
|
||||||
////@end CAccountManagerStatusPage event handler declarations
|
|
||||||
|
|
||||||
////@begin CAccountManagerStatusPage member function declarations
|
|
||||||
|
|
||||||
/// Gets the previous page.
|
|
||||||
virtual wxWizardPageEx* GetPrev() const;
|
|
||||||
|
|
||||||
/// Gets the next page.
|
|
||||||
virtual wxWizardPageEx* GetNext() const;
|
|
||||||
|
|
||||||
/// Retrieves bitmap resources
|
|
||||||
wxBitmap GetBitmapResource( const wxString& name );
|
|
||||||
|
|
||||||
/// Retrieves icon resources
|
|
||||||
wxIcon GetIconResource( const wxString& name );
|
|
||||||
////@end CAccountManagerStatusPage member function declarations
|
|
||||||
|
|
||||||
/// Should we show tooltips?
|
|
||||||
static bool ShowToolTips();
|
|
||||||
|
|
||||||
////@begin CAccountManagerStatusPage member variables
|
|
||||||
wxStaticText* m_pTitleStaticCtrl;
|
|
||||||
wxStaticText* m_pAcctManagerDescriptionStaticCtrl;
|
|
||||||
wxStaticText* m_pAcctManagerNameStaticCtrl;
|
|
||||||
wxStaticText* m_pAcctManagerNameCtrl;
|
|
||||||
wxStaticText* m_pAcctManagerURLStaticCtrl;
|
|
||||||
wxHyperLink* m_pAcctManagerURLCtrl;
|
|
||||||
wxRadioButton* m_pAcctManagerUpdateCtrl;
|
|
||||||
wxStaticText* m_pAcctManagerUpdateDescriptionStaticCtrl;
|
|
||||||
wxRadioButton* m_pAcctManagerRemoveCtrl;
|
|
||||||
wxStaticText* m_pAcctManagerRemoveDescriptionStaticCtrl;
|
|
||||||
wxString m_strAcctManagerName;
|
|
||||||
wxString m_strAcctManagerURL;
|
|
||||||
////@end CAccountManagerStatusPage member variables
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#endif // _WIZ_ACCOUNTMANAGERSTATUSPAGE_H_
|
|
||||||
|
|
@ -44,8 +44,6 @@
|
||||||
#define ID_ERRALREADYEXISTSPAGE 10110
|
#define ID_ERRALREADYEXISTSPAGE 10110
|
||||||
#define ID_ERRPROXYINFOPAGE 10111
|
#define ID_ERRPROXYINFOPAGE 10111
|
||||||
#define ID_ERRPROXYPAGE 10112
|
#define ID_ERRPROXYPAGE 10112
|
||||||
#define ID_COMPLETIONUPDATEPAGE 10113
|
|
||||||
#define ID_COMPLETIONREMOVEPAGE 10114
|
|
||||||
|
|
||||||
// Attach to Project Wizard Pages
|
// Attach to Project Wizard Pages
|
||||||
#define ID_PROJECTINFOPAGE 10200
|
#define ID_PROJECTINFOPAGE 10200
|
||||||
|
|
@ -135,8 +133,6 @@ class CWelcomePage;
|
||||||
class CAccountKeyPage;
|
class CAccountKeyPage;
|
||||||
class CAccountInfoPage;
|
class CAccountInfoPage;
|
||||||
class CCompletionPage;
|
class CCompletionPage;
|
||||||
class CCompletionUpdatePage;
|
|
||||||
class CCompletionRemovePage;
|
|
||||||
class CCompletionErrorPage;
|
class CCompletionErrorPage;
|
||||||
class CErrNotDetectedPage;
|
class CErrNotDetectedPage;
|
||||||
class CErrUnavailablePage;
|
class CErrUnavailablePage;
|
||||||
|
|
|
||||||
|
|
@ -220,56 +220,103 @@ void CCompletionPage::OnPageChanged( wxWizardExEvent& event ) {
|
||||||
"you can set your account name and preferences.");
|
"you can set your account name and preferences.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
m_pCompletionMessage->SetLabel( strMessage );
|
m_pCompletionMessage->SetLabel( strMessage );
|
||||||
|
|
||||||
} else if (IS_ACCOUNTMANAGERWIZARD()) {
|
} else if (IS_ACCOUNTMANAGERWIZARD()) {
|
||||||
wxString strTitle;
|
|
||||||
if (wxGetApp().GetBrand()->IsBranded()) {
|
if (IS_ACCOUNTMANAGERUPDATEWIZARD()) {
|
||||||
// %s is the project name
|
// Update completed
|
||||||
// i.e. 'GridRepublic'
|
|
||||||
strTitle.Printf(
|
wxString strTitle;
|
||||||
_("Attached to %s"),
|
if (wxGetApp().GetBrand()->IsBranded()) {
|
||||||
wxGetApp().GetBrand()->GetProjectName().c_str()
|
// %s is the project name
|
||||||
|
// i.e. 'GridRepublic'
|
||||||
|
strTitle.Printf(
|
||||||
|
_("Update from %s completed."),
|
||||||
|
wxGetApp().GetBrand()->GetProjectName().c_str()
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
strTitle = _("Update completed.");
|
||||||
|
}
|
||||||
|
|
||||||
|
m_pCompletionTitle->SetLabel( strTitle );
|
||||||
|
|
||||||
|
m_pCompletionMessage->SetLabel(
|
||||||
|
_("Click Finish to close.")
|
||||||
);
|
);
|
||||||
|
|
||||||
|
} else if (IS_ACCOUNTMANAGERREMOVEWIZARD()) {
|
||||||
|
// Remove Completed
|
||||||
|
|
||||||
|
wxString strTitle;
|
||||||
|
if (wxGetApp().GetBrand()->IsBranded()) {
|
||||||
|
// %s is the project name
|
||||||
|
// i.e. 'GridRepublic'
|
||||||
|
strTitle.Printf(
|
||||||
|
_("Removal from %s completed."),
|
||||||
|
wxGetApp().GetBrand()->GetProjectName().c_str()
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
strTitle = _("Removal succeeded!");
|
||||||
|
}
|
||||||
|
|
||||||
|
m_pCompletionTitle->SetLabel( strTitle );
|
||||||
|
|
||||||
|
m_pCompletionMessage->SetLabel(
|
||||||
|
_("Click Finish to close.")
|
||||||
|
);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
strTitle = _("Attached to account manager");
|
// Attach Completed
|
||||||
}
|
|
||||||
|
|
||||||
m_pCompletionTitle->SetLabel( strTitle );
|
wxString strTitle;
|
||||||
|
if (wxGetApp().GetBrand()->IsBranded()) {
|
||||||
|
// %s is the project name
|
||||||
|
// i.e. 'GridRepublic'
|
||||||
|
strTitle.Printf(
|
||||||
|
_("Attached to %s"),
|
||||||
|
wxGetApp().GetBrand()->GetProjectName().c_str()
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
strTitle = _("Attached to account manager");
|
||||||
|
}
|
||||||
|
|
||||||
if (wxGetApp().GetBrand()->IsBranded()) {
|
m_pCompletionTitle->SetLabel( strTitle );
|
||||||
// %s is the project name
|
|
||||||
// i.e. 'GridRepublic'
|
if (wxGetApp().GetBrand()->IsBranded()) {
|
||||||
wxString strWelcome;
|
// %s is the project name
|
||||||
strWelcome.Printf(
|
// i.e. 'GridRepublic'
|
||||||
_("Welcome to %s!"),
|
wxString strWelcome;
|
||||||
wxGetApp().GetBrand()->GetProjectName().c_str()
|
strWelcome.Printf(
|
||||||
|
_("Welcome to %s!"),
|
||||||
|
wxGetApp().GetBrand()->GetProjectName().c_str()
|
||||||
|
);
|
||||||
|
|
||||||
|
m_pCompletionWelcome->Show();
|
||||||
|
m_pCompletionWelcome->SetLabel( strWelcome );
|
||||||
|
}
|
||||||
|
|
||||||
|
wxString strBrandedMessage;
|
||||||
|
if (wxGetApp().GetBrand()->IsBranded()) {
|
||||||
|
// 1st %s is the project name
|
||||||
|
// i.e. 'GridRepublic'
|
||||||
|
// 2nd %s is the account manager success message
|
||||||
|
strBrandedMessage.Printf(
|
||||||
|
_("You are now successfully attached to the %s system.\n"
|
||||||
|
"%s"),
|
||||||
|
wxGetApp().GetBrand()->GetProjectName().c_str(),
|
||||||
|
wxGetApp().GetBrand()->GetAMWizardSuccessMessage().c_str()
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
strBrandedMessage = _("You are now successfully attached to this account manager.");
|
||||||
|
}
|
||||||
|
|
||||||
|
m_pCompletionBrandedMessage->SetLabel( strBrandedMessage );
|
||||||
|
|
||||||
|
m_pCompletionMessage->SetLabel(
|
||||||
|
_("Click Finish to close.")
|
||||||
);
|
);
|
||||||
|
|
||||||
m_pCompletionWelcome->Show();
|
|
||||||
m_pCompletionWelcome->SetLabel( strWelcome );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString strBrandedMessage;
|
|
||||||
if (wxGetApp().GetBrand()->IsBranded()) {
|
|
||||||
// 1st %s is the project name
|
|
||||||
// i.e. 'GridRepublic'
|
|
||||||
// 2nd %s is the account manager success message
|
|
||||||
strBrandedMessage.Printf(
|
|
||||||
_("You are now successfully attached to the %s system.\n"
|
|
||||||
"%s"),
|
|
||||||
wxGetApp().GetBrand()->GetProjectName().c_str(),
|
|
||||||
wxGetApp().GetBrand()->GetAMWizardSuccessMessage().c_str()
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
strBrandedMessage = _("You are now successfully attached to this account manager.");
|
|
||||||
}
|
|
||||||
|
|
||||||
m_pCompletionBrandedMessage->SetLabel( strBrandedMessage );
|
|
||||||
|
|
||||||
m_pCompletionMessage->SetLabel(
|
|
||||||
_("Click Finish to close.")
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Fit();
|
Fit();
|
||||||
|
|
|
||||||
|
|
@ -1,213 +0,0 @@
|
||||||
// Berkeley Open Infrastructure for Network Computing
|
|
||||||
// http://boinc.berkeley.edu
|
|
||||||
// Copyright (C) 2005 University of California
|
|
||||||
//
|
|
||||||
// This is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU Lesser General Public
|
|
||||||
// License as published by the Free Software Foundation;
|
|
||||||
// either version 2.1 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This software is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
// See the GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// To view the GNU Lesser General Public License visit
|
|
||||||
// http://www.gnu.org/copyleft/lesser.html
|
|
||||||
// or write to the Free Software Foundation, Inc.,
|
|
||||||
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
//
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
|
||||||
#pragma implementation "CompletionRemovePage.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "stdwx.h"
|
|
||||||
#include "wizardex.h"
|
|
||||||
#include "error_numbers.h"
|
|
||||||
#include "BOINCGUIApp.h"
|
|
||||||
#include "BOINCWizards.h"
|
|
||||||
#include "BOINCBaseWizard.h"
|
|
||||||
#include "WizardAttachProject.h"
|
|
||||||
#include "WizardAccountManager.h"
|
|
||||||
#include "CompletionRemovePage.h"
|
|
||||||
#include "AccountInfoPage.h"
|
|
||||||
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionRemovePage type definition
|
|
||||||
*/
|
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS( CCompletionRemovePage, wxWizardPageEx )
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionRemovePage event table definition
|
|
||||||
*/
|
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE( CCompletionRemovePage, wxWizardPageEx )
|
|
||||||
|
|
||||||
////@begin CCompletionRemovePage event table entries
|
|
||||||
EVT_WIZARDEX_PAGE_CHANGED( -1, CCompletionRemovePage::OnPageChanged )
|
|
||||||
EVT_WIZARDEX_CANCEL( -1, CCompletionRemovePage::OnCancel )
|
|
||||||
EVT_WIZARDEX_FINISHED( ID_COMPLETIONREMOVEPAGE, CCompletionRemovePage::OnFinished )
|
|
||||||
|
|
||||||
////@end CCompletionRemovePage event table entries
|
|
||||||
|
|
||||||
END_EVENT_TABLE()
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionRemovePage constructors
|
|
||||||
*/
|
|
||||||
|
|
||||||
CCompletionRemovePage::CCompletionRemovePage( )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
CCompletionRemovePage::CCompletionRemovePage( CBOINCBaseWizard* parent )
|
|
||||||
{
|
|
||||||
Create( parent );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionRemovePage creator
|
|
||||||
*/
|
|
||||||
|
|
||||||
bool CCompletionRemovePage::Create( CBOINCBaseWizard* parent )
|
|
||||||
{
|
|
||||||
////@begin CCompletionRemovePage member initialisation
|
|
||||||
m_pCompletionTitle = NULL;
|
|
||||||
m_pCompletionMessage = NULL;
|
|
||||||
////@end CCompletionRemovePage member initialisation
|
|
||||||
|
|
||||||
////@begin CCompletionRemovePage creation
|
|
||||||
wxBitmap wizardBitmap(wxNullBitmap);
|
|
||||||
wxWizardPageEx::Create( parent, wizardBitmap );
|
|
||||||
|
|
||||||
CreateControls();
|
|
||||||
GetSizer()->Fit(this);
|
|
||||||
////@end CCompletionRemovePage creation
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Control creation for CCompletionRemovePage
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CCompletionRemovePage::CreateControls()
|
|
||||||
{
|
|
||||||
////@begin CCompletionRemovePage content construction
|
|
||||||
CCompletionRemovePage* itemWizardPage79 = this;
|
|
||||||
|
|
||||||
wxBoxSizer* itemBoxSizer80 = new wxBoxSizer(wxVERTICAL);
|
|
||||||
itemWizardPage79->SetSizer(itemBoxSizer80);
|
|
||||||
|
|
||||||
m_pCompletionTitle = new wxStaticText;
|
|
||||||
m_pCompletionTitle->Create( itemWizardPage79, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_pCompletionTitle->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT("Verdana")));
|
|
||||||
itemBoxSizer80->Add(m_pCompletionTitle, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
|
|
||||||
m_pCompletionMessage = new wxStaticText;
|
|
||||||
m_pCompletionMessage->Create( itemWizardPage79, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
itemBoxSizer80->Add(m_pCompletionMessage, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
////@end CCompletionRemovePage content construction
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Gets the previous page.
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxWizardPageEx* CCompletionRemovePage::GetPrev() const
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Gets the next page.
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxWizardPageEx* CCompletionRemovePage::GetNext() const
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Should we show tooltips?
|
|
||||||
*/
|
|
||||||
|
|
||||||
bool CCompletionRemovePage::ShowToolTips()
|
|
||||||
{
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Get bitmap resources
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxBitmap CCompletionRemovePage::GetBitmapResource( const wxString& name )
|
|
||||||
{
|
|
||||||
// Bitmap retrieval
|
|
||||||
////@begin CCompletionRemovePage bitmap retrieval
|
|
||||||
return wxNullBitmap;
|
|
||||||
////@end CCompletionRemovePage bitmap retrieval
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Get icon resources
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxIcon CCompletionRemovePage::GetIconResource( const wxString& name )
|
|
||||||
{
|
|
||||||
// Icon retrieval
|
|
||||||
|
|
||||||
////@begin CCompletionRemovePage icon retrieval
|
|
||||||
return wxNullIcon;
|
|
||||||
////@end CCompletionRemovePage icon retrieval
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxEVT_WIZARD_PAGE_CHANGED event handler for ID_CompletionRemovePage
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CCompletionRemovePage::OnPageChanged( wxWizardExEvent& event ) {
|
|
||||||
if (event.GetDirection() == false) return;
|
|
||||||
|
|
||||||
wxASSERT(m_pCompletionTitle);
|
|
||||||
wxASSERT(m_pCompletionMessage);
|
|
||||||
|
|
||||||
wxString strTitle;
|
|
||||||
if (wxGetApp().GetBrand()->IsBranded()) {
|
|
||||||
// %s is the project name
|
|
||||||
// i.e. 'GridRepublic'
|
|
||||||
strTitle.Printf(
|
|
||||||
_("Removal from %s completed."),
|
|
||||||
wxGetApp().GetBrand()->GetProjectName().c_str()
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
strTitle = _("Removal succeeded!");
|
|
||||||
}
|
|
||||||
|
|
||||||
m_pCompletionTitle->SetLabel( strTitle );
|
|
||||||
|
|
||||||
m_pCompletionMessage->SetLabel(
|
|
||||||
_("Click Finish to close.")
|
|
||||||
);
|
|
||||||
|
|
||||||
Fit();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxEVT_WIZARD_CANCEL event handler for ID_CompletionRemovePage
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CCompletionRemovePage::OnCancel( wxWizardExEvent& event ) {
|
|
||||||
PROCESS_CANCELEVENT(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxEVT_WIZARD_FINISHED event handler for ID_CompletionRemovePage
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CCompletionRemovePage::OnFinished( wxWizardExEvent& event ) {
|
|
||||||
event.Skip();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
// Berkeley Open Infrastructure for Network Computing
|
|
||||||
// http://boinc.berkeley.edu
|
|
||||||
// Copyright (C) 2005 University of California
|
|
||||||
//
|
|
||||||
// This is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU Lesser General Public
|
|
||||||
// License as published by the Free Software Foundation;
|
|
||||||
// either version 2.1 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This software is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
// See the GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// To view the GNU Lesser General Public License visit
|
|
||||||
// http://www.gnu.org/copyleft/lesser.html
|
|
||||||
// or write to the Free Software Foundation, Inc.,
|
|
||||||
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
//
|
|
||||||
#ifndef _WIZ_COMPLETIONREMOVEPAGE_H_
|
|
||||||
#define _WIZ_COMPLETIONREMOVEPAGE_H_
|
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
|
||||||
#pragma interface "CompletionRemovePage.cpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionRemovePage class declaration
|
|
||||||
*/
|
|
||||||
|
|
||||||
class CCompletionRemovePage: public wxWizardPageEx
|
|
||||||
{
|
|
||||||
DECLARE_DYNAMIC_CLASS( CCompletionRemovePage )
|
|
||||||
DECLARE_EVENT_TABLE()
|
|
||||||
|
|
||||||
public:
|
|
||||||
/// Constructors
|
|
||||||
CCompletionRemovePage( );
|
|
||||||
|
|
||||||
CCompletionRemovePage( CBOINCBaseWizard* parent );
|
|
||||||
|
|
||||||
/// Creation
|
|
||||||
bool Create( CBOINCBaseWizard* parent );
|
|
||||||
|
|
||||||
/// Creates the controls and sizers
|
|
||||||
void CreateControls();
|
|
||||||
|
|
||||||
////@begin CCompletionRemovePage event handler declarations
|
|
||||||
|
|
||||||
/// wxEVT_WIZARD_PAGE_CHANGED event handler for ID_CompletionRemovePage
|
|
||||||
void OnPageChanged( wxWizardExEvent& event );
|
|
||||||
|
|
||||||
/// wxEVT_WIZARD_CANCEL event handler for ID_CompletionRemovePage
|
|
||||||
void OnCancel( wxWizardExEvent& event );
|
|
||||||
|
|
||||||
/// wxEVT_WIZARD_FINISHED event handler for ID_CompletionRemovePage
|
|
||||||
void OnFinished( wxWizardExEvent& event );
|
|
||||||
|
|
||||||
////@end CCompletionRemovePage event handler declarations
|
|
||||||
|
|
||||||
////@begin CCompletionRemovePage member function declarations
|
|
||||||
|
|
||||||
/// Gets the previous page.
|
|
||||||
virtual wxWizardPageEx* GetPrev() const;
|
|
||||||
|
|
||||||
/// Gets the next page.
|
|
||||||
virtual wxWizardPageEx* GetNext() const;
|
|
||||||
|
|
||||||
/// Retrieves bitmap resources
|
|
||||||
wxBitmap GetBitmapResource( const wxString& name );
|
|
||||||
|
|
||||||
/// Retrieves icon resources
|
|
||||||
wxIcon GetIconResource( const wxString& name );
|
|
||||||
////@end CCompletionRemovePage member function declarations
|
|
||||||
|
|
||||||
/// Should we show tooltips?
|
|
||||||
static bool ShowToolTips();
|
|
||||||
|
|
||||||
////@begin CCompletionRemovePage member variables
|
|
||||||
wxStaticText* m_pCompletionTitle;
|
|
||||||
wxStaticText* m_pCompletionMessage;
|
|
||||||
////@end CCompletionRemovePage member variables
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // _WIZ_COMPLETIONREMOVEPAGE_H_
|
|
||||||
|
|
@ -1,213 +0,0 @@
|
||||||
// Berkeley Open Infrastructure for Network Computing
|
|
||||||
// http://boinc.berkeley.edu
|
|
||||||
// Copyright (C) 2005 University of California
|
|
||||||
//
|
|
||||||
// This is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU Lesser General Public
|
|
||||||
// License as published by the Free Software Foundation;
|
|
||||||
// either version 2.1 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This software is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
// See the GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// To view the GNU Lesser General Public License visit
|
|
||||||
// http://www.gnu.org/copyleft/lesser.html
|
|
||||||
// or write to the Free Software Foundation, Inc.,
|
|
||||||
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
//
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
|
||||||
#pragma implementation "CompletionUpdatePage.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "stdwx.h"
|
|
||||||
#include "wizardex.h"
|
|
||||||
#include "error_numbers.h"
|
|
||||||
#include "BOINCGUIApp.h"
|
|
||||||
#include "BOINCWizards.h"
|
|
||||||
#include "BOINCBaseWizard.h"
|
|
||||||
#include "WizardAttachProject.h"
|
|
||||||
#include "WizardAccountManager.h"
|
|
||||||
#include "CompletionUpdatePage.h"
|
|
||||||
#include "AccountInfoPage.h"
|
|
||||||
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionUpdatePage type definition
|
|
||||||
*/
|
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS( CCompletionUpdatePage, wxWizardPageEx )
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionUpdatePage event table definition
|
|
||||||
*/
|
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE( CCompletionUpdatePage, wxWizardPageEx )
|
|
||||||
|
|
||||||
////@begin CCompletionUpdatePage event table entries
|
|
||||||
EVT_WIZARDEX_PAGE_CHANGED( -1, CCompletionUpdatePage::OnPageChanged )
|
|
||||||
EVT_WIZARDEX_CANCEL( -1, CCompletionUpdatePage::OnCancel )
|
|
||||||
EVT_WIZARDEX_FINISHED( ID_COMPLETIONUPDATEPAGE, CCompletionUpdatePage::OnFinished )
|
|
||||||
|
|
||||||
////@end CCompletionUpdatePage event table entries
|
|
||||||
|
|
||||||
END_EVENT_TABLE()
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionUpdatePage constructors
|
|
||||||
*/
|
|
||||||
|
|
||||||
CCompletionUpdatePage::CCompletionUpdatePage( )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
CCompletionUpdatePage::CCompletionUpdatePage( CBOINCBaseWizard* parent )
|
|
||||||
{
|
|
||||||
Create( parent );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionUpdatePage creator
|
|
||||||
*/
|
|
||||||
|
|
||||||
bool CCompletionUpdatePage::Create( CBOINCBaseWizard* parent )
|
|
||||||
{
|
|
||||||
////@begin CCompletionUpdatePage member initialisation
|
|
||||||
m_pCompletionTitle = NULL;
|
|
||||||
m_pCompletionMessage = NULL;
|
|
||||||
////@end CCompletionUpdatePage member initialisation
|
|
||||||
|
|
||||||
////@begin CCompletionUpdatePage creation
|
|
||||||
wxBitmap wizardBitmap(wxNullBitmap);
|
|
||||||
wxWizardPageEx::Create( parent, wizardBitmap );
|
|
||||||
|
|
||||||
CreateControls();
|
|
||||||
GetSizer()->Fit(this);
|
|
||||||
////@end CCompletionUpdatePage creation
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Control creation for CCompletionUpdatePage
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CCompletionUpdatePage::CreateControls()
|
|
||||||
{
|
|
||||||
////@begin CCompletionUpdatePage content construction
|
|
||||||
CCompletionUpdatePage* itemWizardPage79 = this;
|
|
||||||
|
|
||||||
wxBoxSizer* itemBoxSizer80 = new wxBoxSizer(wxVERTICAL);
|
|
||||||
itemWizardPage79->SetSizer(itemBoxSizer80);
|
|
||||||
|
|
||||||
m_pCompletionTitle = new wxStaticText;
|
|
||||||
m_pCompletionTitle->Create( itemWizardPage79, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_pCompletionTitle->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT("Verdana")));
|
|
||||||
itemBoxSizer80->Add(m_pCompletionTitle, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
|
|
||||||
m_pCompletionMessage = new wxStaticText;
|
|
||||||
m_pCompletionMessage->Create( itemWizardPage79, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
itemBoxSizer80->Add(m_pCompletionMessage, 0, wxALIGN_LEFT|wxALL, 5);
|
|
||||||
////@end CCompletionUpdatePage content construction
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Gets the previous page.
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxWizardPageEx* CCompletionUpdatePage::GetPrev() const
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Gets the next page.
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxWizardPageEx* CCompletionUpdatePage::GetNext() const
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Should we show tooltips?
|
|
||||||
*/
|
|
||||||
|
|
||||||
bool CCompletionUpdatePage::ShowToolTips()
|
|
||||||
{
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Get bitmap resources
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxBitmap CCompletionUpdatePage::GetBitmapResource( const wxString& name )
|
|
||||||
{
|
|
||||||
// Bitmap retrieval
|
|
||||||
////@begin CCompletionUpdatePage bitmap retrieval
|
|
||||||
return wxNullBitmap;
|
|
||||||
////@end CCompletionUpdatePage bitmap retrieval
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* Get icon resources
|
|
||||||
*/
|
|
||||||
|
|
||||||
wxIcon CCompletionUpdatePage::GetIconResource( const wxString& name )
|
|
||||||
{
|
|
||||||
// Icon retrieval
|
|
||||||
|
|
||||||
////@begin CCompletionUpdatePage icon retrieval
|
|
||||||
return wxNullIcon;
|
|
||||||
////@end CCompletionUpdatePage icon retrieval
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxEVT_WIZARD_PAGE_CHANGED event handler for ID_CompletionUpdatePage
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CCompletionUpdatePage::OnPageChanged( wxWizardExEvent& event ) {
|
|
||||||
if (event.GetDirection() == false) return;
|
|
||||||
|
|
||||||
wxASSERT(m_pCompletionTitle);
|
|
||||||
wxASSERT(m_pCompletionMessage);
|
|
||||||
|
|
||||||
wxString strTitle;
|
|
||||||
if (wxGetApp().GetBrand()->IsBranded()) {
|
|
||||||
// %s is the project name
|
|
||||||
// i.e. 'GridRepublic'
|
|
||||||
strTitle.Printf(
|
|
||||||
_("Update from %s completed."),
|
|
||||||
wxGetApp().GetBrand()->GetProjectName().c_str()
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
strTitle = _("Update completed.");
|
|
||||||
}
|
|
||||||
|
|
||||||
m_pCompletionTitle->SetLabel( strTitle );
|
|
||||||
|
|
||||||
m_pCompletionMessage->SetLabel(
|
|
||||||
_("Click Finish to close.")
|
|
||||||
);
|
|
||||||
|
|
||||||
Fit();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxEVT_WIZARD_CANCEL event handler for ID_CompletionUpdatePage
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CCompletionUpdatePage::OnCancel( wxWizardExEvent& event ) {
|
|
||||||
PROCESS_CANCELEVENT(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* wxEVT_WIZARD_FINISHED event handler for ID_CompletionUpdatePage
|
|
||||||
*/
|
|
||||||
|
|
||||||
void CCompletionUpdatePage::OnFinished( wxWizardExEvent& event ) {
|
|
||||||
event.Skip();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
// Berkeley Open Infrastructure for Network Computing
|
|
||||||
// http://boinc.berkeley.edu
|
|
||||||
// Copyright (C) 2005 University of California
|
|
||||||
//
|
|
||||||
// This is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU Lesser General Public
|
|
||||||
// License as published by the Free Software Foundation;
|
|
||||||
// either version 2.1 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This software is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
// See the GNU Lesser General Public License for more details.
|
|
||||||
//
|
|
||||||
// To view the GNU Lesser General Public License visit
|
|
||||||
// http://www.gnu.org/copyleft/lesser.html
|
|
||||||
// or write to the Free Software Foundation, Inc.,
|
|
||||||
// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
//
|
|
||||||
#ifndef _WIZ_COMPLETIONUPDATEPAGE_H_
|
|
||||||
#define _WIZ_COMPLETIONUPDATEPAGE_H_
|
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
|
||||||
#pragma interface "CompletionUpdatePage.cpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* CCompletionUpdatePage class declaration
|
|
||||||
*/
|
|
||||||
|
|
||||||
class CCompletionUpdatePage: public wxWizardPageEx
|
|
||||||
{
|
|
||||||
DECLARE_DYNAMIC_CLASS( CCompletionUpdatePage )
|
|
||||||
DECLARE_EVENT_TABLE()
|
|
||||||
|
|
||||||
public:
|
|
||||||
/// Constructors
|
|
||||||
CCompletionUpdatePage( );
|
|
||||||
|
|
||||||
CCompletionUpdatePage( CBOINCBaseWizard* parent );
|
|
||||||
|
|
||||||
/// Creation
|
|
||||||
bool Create( CBOINCBaseWizard* parent );
|
|
||||||
|
|
||||||
/// Creates the controls and sizers
|
|
||||||
void CreateControls();
|
|
||||||
|
|
||||||
////@begin CCompletionUpdatePage event handler declarations
|
|
||||||
|
|
||||||
/// wxEVT_WIZARD_PAGE_CHANGED event handler for ID_CompletionUpdatePage
|
|
||||||
void OnPageChanged( wxWizardExEvent& event );
|
|
||||||
|
|
||||||
/// wxEVT_WIZARD_CANCEL event handler for ID_CompletionUpdatePage
|
|
||||||
void OnCancel( wxWizardExEvent& event );
|
|
||||||
|
|
||||||
/// wxEVT_WIZARD_FINISHED event handler for ID_CompletionUpdatePage
|
|
||||||
void OnFinished( wxWizardExEvent& event );
|
|
||||||
|
|
||||||
////@end CCompletionUpdatePage event handler declarations
|
|
||||||
|
|
||||||
////@begin CCompletionUpdatePage member function declarations
|
|
||||||
|
|
||||||
/// Gets the previous page.
|
|
||||||
virtual wxWizardPageEx* GetPrev() const;
|
|
||||||
|
|
||||||
/// Gets the next page.
|
|
||||||
virtual wxWizardPageEx* GetNext() const;
|
|
||||||
|
|
||||||
/// Retrieves bitmap resources
|
|
||||||
wxBitmap GetBitmapResource( const wxString& name );
|
|
||||||
|
|
||||||
/// Retrieves icon resources
|
|
||||||
wxIcon GetIconResource( const wxString& name );
|
|
||||||
////@end CCompletionUpdatePage member function declarations
|
|
||||||
|
|
||||||
/// Should we show tooltips?
|
|
||||||
static bool ShowToolTips();
|
|
||||||
|
|
||||||
////@begin CCompletionUpdatePage member variables
|
|
||||||
wxStaticText* m_pCompletionTitle;
|
|
||||||
wxStaticText* m_pCompletionMessage;
|
|
||||||
////@end CCompletionUpdatePage member variables
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // _WIZ_COMPLETIONUPDATEPAGE_H_
|
|
||||||
|
|
@ -27,6 +27,8 @@
|
||||||
#include "BOINCGUIApp.h"
|
#include "BOINCGUIApp.h"
|
||||||
#include "BOINCWizards.h"
|
#include "BOINCWizards.h"
|
||||||
#include "BOINCBaseWizard.h"
|
#include "BOINCBaseWizard.h"
|
||||||
|
#include "WizardAttachProject.h"
|
||||||
|
#include "WizardAccountManager.h"
|
||||||
#include "WelcomePage.h"
|
#include "WelcomePage.h"
|
||||||
|
|
||||||
////@begin XPM images
|
////@begin XPM images
|
||||||
|
|
@ -225,6 +227,8 @@ wxWizardPageEx* CWelcomePage::GetNext() const
|
||||||
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
|
return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
|
||||||
} else if (IS_ATTACHTOPROJECTWIZARD()) {
|
} else if (IS_ATTACHTOPROJECTWIZARD()) {
|
||||||
return PAGE_TRANSITION_NEXT(ID_PROJECTINFOPAGE);
|
return PAGE_TRANSITION_NEXT(ID_PROJECTINFOPAGE);
|
||||||
|
} else if (IS_ACCOUNTMANAGERUPDATEWIZARD() || IS_ACCOUNTMANAGERREMOVEWIZARD()) {
|
||||||
|
return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERPROCESSINGPAGE);
|
||||||
} else if (IS_ACCOUNTMANAGERWIZARD()) {
|
} else if (IS_ACCOUNTMANAGERWIZARD()) {
|
||||||
return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERINFOPAGE);
|
return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERINFOPAGE);
|
||||||
}
|
}
|
||||||
|
|
@ -271,6 +275,14 @@ wxIcon CWelcomePage::GetIconResource( const wxString& name )
|
||||||
void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
|
void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
|
||||||
if (event.GetDirection() == false) return;
|
if (event.GetDirection() == false) return;
|
||||||
|
|
||||||
|
// Be careful about which pointer you use in which scenario.
|
||||||
|
wxString strBuffer = wxEmptyString;
|
||||||
|
CWizardAttachProject* pWAP = ((CWizardAttachProject*)GetParent());
|
||||||
|
CWizardAccountManager* pWAM = ((CWizardAccountManager*)GetParent());
|
||||||
|
|
||||||
|
|
||||||
|
wxASSERT(pWAP);
|
||||||
|
wxASSERT(pWAM);
|
||||||
wxASSERT(m_pTitleStaticCtrl);
|
wxASSERT(m_pTitleStaticCtrl);
|
||||||
wxASSERT(m_pDescriptionStaticCtrl);
|
wxASSERT(m_pDescriptionStaticCtrl);
|
||||||
wxASSERT(m_pDirectionsStaticCtrl);
|
wxASSERT(m_pDirectionsStaticCtrl);
|
||||||
|
|
@ -296,6 +308,23 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
|
||||||
m_pDescriptionStaticCtrl->SetLabel(
|
m_pDescriptionStaticCtrl->SetLabel(
|
||||||
_("We'll now guide you through the process of attaching to a project.")
|
_("We'll now guide you through the process of attaching to a project.")
|
||||||
);
|
);
|
||||||
|
} else if (IS_ACCOUNTMANAGERREMOVEWIZARD()) {
|
||||||
|
strBuffer.Printf(
|
||||||
|
_("&Defect from %s"),
|
||||||
|
pWAM->m_strProjectName.c_str()
|
||||||
|
);
|
||||||
|
m_pTitleStaticCtrl->SetLabel(
|
||||||
|
strBuffer
|
||||||
|
);
|
||||||
|
strBuffer.Printf(
|
||||||
|
_("We'll now remove this computer from %s. You will\n"
|
||||||
|
"be responisible for managing the BOINC client software from\n"
|
||||||
|
"now on."),
|
||||||
|
pWAM->m_strProjectName.c_str()
|
||||||
|
);
|
||||||
|
m_pDescriptionStaticCtrl->SetLabel(
|
||||||
|
strBuffer
|
||||||
|
);
|
||||||
} else if (IS_ACCOUNTMANAGERWIZARD()) {
|
} else if (IS_ACCOUNTMANAGERWIZARD()) {
|
||||||
m_pTitleStaticCtrl->SetLabel(
|
m_pTitleStaticCtrl->SetLabel(
|
||||||
_("Account manager")
|
_("Account manager")
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,6 @@
|
||||||
#include "AccountInfoPage.h"
|
#include "AccountInfoPage.h"
|
||||||
#include "AccountManagerProcessingPage.h"
|
#include "AccountManagerProcessingPage.h"
|
||||||
#include "CompletionPage.h"
|
#include "CompletionPage.h"
|
||||||
#include "CompletionUpdatePage.h"
|
|
||||||
#include "CompletionRemovePage.h"
|
|
||||||
#include "CompletionErrorPage.h"
|
#include "CompletionErrorPage.h"
|
||||||
#include "NotDetectedPage.h"
|
#include "NotDetectedPage.h"
|
||||||
#include "UnavailablePage.h"
|
#include "UnavailablePage.h"
|
||||||
|
|
@ -96,8 +94,6 @@ bool CWizardAccountManager::Create( wxWindow* parent, wxWindowID id, const wxPoi
|
||||||
m_AccountInfoPage = NULL;
|
m_AccountInfoPage = NULL;
|
||||||
m_AccountManagerProcessingPage = NULL;
|
m_AccountManagerProcessingPage = NULL;
|
||||||
m_CompletionPage = NULL;
|
m_CompletionPage = NULL;
|
||||||
m_CompletionUpdatePage = NULL;
|
|
||||||
m_CompletionRemovePage = NULL;
|
|
||||||
m_CompletionErrorPage = NULL;
|
m_CompletionErrorPage = NULL;
|
||||||
m_ErrNotDetectedPage = NULL;
|
m_ErrNotDetectedPage = NULL;
|
||||||
m_ErrUnavailablePage = NULL;
|
m_ErrUnavailablePage = NULL;
|
||||||
|
|
@ -178,14 +174,6 @@ void CWizardAccountManager::CreateControls()
|
||||||
m_CompletionPage->Create( itemWizard1 );
|
m_CompletionPage->Create( itemWizard1 );
|
||||||
|
|
||||||
itemWizard1->FitToPage(m_CompletionPage);
|
itemWizard1->FitToPage(m_CompletionPage);
|
||||||
m_CompletionUpdatePage = new CCompletionUpdatePage;
|
|
||||||
m_CompletionUpdatePage->Create( itemWizard1 );
|
|
||||||
|
|
||||||
itemWizard1->FitToPage(m_CompletionUpdatePage);
|
|
||||||
m_CompletionRemovePage = new CCompletionRemovePage;
|
|
||||||
m_CompletionRemovePage->Create( itemWizard1 );
|
|
||||||
|
|
||||||
itemWizard1->FitToPage(m_CompletionRemovePage);
|
|
||||||
m_CompletionErrorPage = new CCompletionErrorPage;
|
m_CompletionErrorPage = new CCompletionErrorPage;
|
||||||
m_CompletionErrorPage->Create( itemWizard1 );
|
m_CompletionErrorPage->Create( itemWizard1 );
|
||||||
|
|
||||||
|
|
@ -225,8 +213,6 @@ void CWizardAccountManager::CreateControls()
|
||||||
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_AccountInfoPage = id: '%d', location: '%p'"), ID_ACCOUNTINFOPAGE, m_AccountInfoPage);
|
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_AccountInfoPage = id: '%d', location: '%p'"), ID_ACCOUNTINFOPAGE, m_AccountInfoPage);
|
||||||
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_AccountManagerProcessingPage = id: '%d', location: '%p'"), ID_ACCOUNTMANAGERPROCESSINGPAGE, m_AccountManagerProcessingPage);
|
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_AccountManagerProcessingPage = id: '%d', location: '%p'"), ID_ACCOUNTMANAGERPROCESSINGPAGE, m_AccountManagerProcessingPage);
|
||||||
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_CompletionPage = id: '%d', location: '%p'"), ID_COMPLETIONPAGE, m_CompletionPage);
|
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_CompletionPage = id: '%d', location: '%p'"), ID_COMPLETIONPAGE, m_CompletionPage);
|
||||||
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_CompletionUpdatePage = id: '%d', location: '%p'"), ID_COMPLETIONUPDATEPAGE, m_CompletionUpdatePage);
|
|
||||||
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_CompletionRemovePage = id: '%d', location: '%p'"), ID_COMPLETIONREMOVEPAGE, m_CompletionRemovePage);
|
|
||||||
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_CompletionErrorPage = id: '%d', location: '%p'"), ID_COMPLETIONERRORPAGE, m_CompletionErrorPage);
|
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_CompletionErrorPage = id: '%d', location: '%p'"), ID_COMPLETIONERRORPAGE, m_CompletionErrorPage);
|
||||||
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_ErrNotDetectedPage = id: '%d', location: '%p'"), ID_ERRNOTDETECTEDPAGE, m_ErrNotDetectedPage);
|
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_ErrNotDetectedPage = id: '%d', location: '%p'"), ID_ERRNOTDETECTEDPAGE, m_ErrNotDetectedPage);
|
||||||
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_ErrUnavailablePage = id: '%d', location: '%p'"), ID_ERRUNAVAILABLEPAGE, m_ErrUnavailablePage);
|
wxLogTrace(wxT("Function Status"), wxT("CWizardAccountManager::CreateControls - m_ErrUnavailablePage = id: '%d', location: '%p'"), ID_ERRUNAVAILABLEPAGE, m_ErrUnavailablePage);
|
||||||
|
|
@ -289,7 +275,7 @@ bool CWizardAccountManager::Run(int action) {
|
||||||
m_AccountInfoPage->SetAccountEmailAddress(wxEmptyString);
|
m_AccountInfoPage->SetAccountEmailAddress(wxEmptyString);
|
||||||
m_AccountInfoPage->SetAccountPassword(wxEmptyString);
|
m_AccountInfoPage->SetAccountPassword(wxEmptyString);
|
||||||
m_bCredentialsCached = false;
|
m_bCredentialsCached = false;
|
||||||
return RunWizard(m_AccountManagerProcessingPage);
|
return RunWizard(m_WelcomePage);
|
||||||
} else if (m_WelcomePage) {
|
} else if (m_WelcomePage) {
|
||||||
return RunWizard(m_WelcomePage);
|
return RunWizard(m_WelcomePage);
|
||||||
}
|
}
|
||||||
|
|
@ -344,8 +330,6 @@ bool CWizardAccountManager::HasNextPage( wxWizardPageEx* page )
|
||||||
bool bNoNextPageDetected = false;
|
bool bNoNextPageDetected = false;
|
||||||
|
|
||||||
bNoNextPageDetected |= (page == m_CompletionPage);
|
bNoNextPageDetected |= (page == m_CompletionPage);
|
||||||
bNoNextPageDetected |= (page == m_CompletionUpdatePage);
|
|
||||||
bNoNextPageDetected |= (page == m_CompletionRemovePage);
|
|
||||||
bNoNextPageDetected |= (page == m_CompletionErrorPage);
|
bNoNextPageDetected |= (page == m_CompletionErrorPage);
|
||||||
bNoNextPageDetected |= (page == m_ErrNotDetectedPage);
|
bNoNextPageDetected |= (page == m_ErrNotDetectedPage);
|
||||||
bNoNextPageDetected |= (page == m_ErrUnavailablePage);
|
bNoNextPageDetected |= (page == m_ErrUnavailablePage);
|
||||||
|
|
@ -367,8 +351,6 @@ bool CWizardAccountManager::HasPrevPage( wxWizardPageEx* page )
|
||||||
|
|
||||||
bNoPrevPageDetected |= (page == m_WelcomePage);
|
bNoPrevPageDetected |= (page == m_WelcomePage);
|
||||||
bNoPrevPageDetected |= (page == m_CompletionPage);
|
bNoPrevPageDetected |= (page == m_CompletionPage);
|
||||||
bNoPrevPageDetected |= (page == m_CompletionUpdatePage);
|
|
||||||
bNoPrevPageDetected |= (page == m_CompletionRemovePage);
|
|
||||||
bNoPrevPageDetected |= (page == m_CompletionErrorPage);
|
bNoPrevPageDetected |= (page == m_CompletionErrorPage);
|
||||||
|
|
||||||
if (bNoPrevPageDetected)
|
if (bNoPrevPageDetected)
|
||||||
|
|
@ -428,12 +410,6 @@ wxWizardPageEx* CWizardAccountManager::_PushPageTransition( wxWizardPageEx* pCur
|
||||||
if (ID_COMPLETIONPAGE == ulPageID)
|
if (ID_COMPLETIONPAGE == ulPageID)
|
||||||
pPage = m_CompletionPage;
|
pPage = m_CompletionPage;
|
||||||
|
|
||||||
if (ID_COMPLETIONUPDATEPAGE == ulPageID)
|
|
||||||
pPage = m_CompletionUpdatePage;
|
|
||||||
|
|
||||||
if (ID_COMPLETIONREMOVEPAGE == ulPageID)
|
|
||||||
pPage = m_CompletionRemovePage;
|
|
||||||
|
|
||||||
if (ID_COMPLETIONERRORPAGE == ulPageID)
|
if (ID_COMPLETIONERRORPAGE == ulPageID)
|
||||||
pPage = m_CompletionErrorPage;
|
pPage = m_CompletionErrorPage;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -113,8 +113,6 @@ public:
|
||||||
CAccountInfoPage* m_AccountInfoPage;
|
CAccountInfoPage* m_AccountInfoPage;
|
||||||
CAccountManagerProcessingPage* m_AccountManagerProcessingPage;
|
CAccountManagerProcessingPage* m_AccountManagerProcessingPage;
|
||||||
CCompletionPage* m_CompletionPage;
|
CCompletionPage* m_CompletionPage;
|
||||||
CCompletionUpdatePage* m_CompletionUpdatePage;
|
|
||||||
CCompletionRemovePage* m_CompletionRemovePage;
|
|
||||||
CCompletionErrorPage* m_CompletionErrorPage;
|
CCompletionErrorPage* m_CompletionErrorPage;
|
||||||
CErrNotDetectedPage* m_ErrNotDetectedPage;
|
CErrNotDetectedPage* m_ErrNotDetectedPage;
|
||||||
CErrUnavailablePage* m_ErrUnavailablePage;
|
CErrUnavailablePage* m_ErrUnavailablePage;
|
||||||
|
|
|
||||||
|
|
@ -445,18 +445,6 @@
|
||||||
<File
|
<File
|
||||||
RelativePath="..\clientgui\CompletionPage.h">
|
RelativePath="..\clientgui\CompletionPage.h">
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\clientgui\CompletionRemovePage.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\clientgui\CompletionRemovePage.h">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\clientgui\CompletionUpdatePage.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\clientgui\CompletionUpdatePage.h">
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\clientgui\NoInternetConnectionPage.cpp">
|
RelativePath="..\clientgui\NoInternetConnectionPage.cpp">
|
||||||
</File>
|
</File>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue