mirror of https://github.com/BOINC/boinc.git
MGR: hide main window after auto AM sync only if we showed it; add PTP signing key with UNIX line endings.
svn path=/trunk/boinc/; revision=18411
This commit is contained in:
parent
5d6142863e
commit
cc2c807c34
|
@ -5638,3 +5638,15 @@ Rom 13 June 2009
|
||||||
AccountManagerPropertiesPage.cpp
|
AccountManagerPropertiesPage.cpp
|
||||||
ProjectProcessingPage.cpp
|
ProjectProcessingPage.cpp
|
||||||
ProjectPropertiesPage.cpp
|
ProjectPropertiesPage.cpp
|
||||||
|
|
||||||
|
Charlie 14 June 2009
|
||||||
|
- MGR: When automatically running Synchronize AM Wizard ar Manager launch,
|
||||||
|
hide the main window only if it was not previously shown.
|
||||||
|
- Mac Installer: check in a copy of GR / PTP signing key with UNIX / Mac
|
||||||
|
line endings.
|
||||||
|
|
||||||
|
clientgui/
|
||||||
|
AdvancedFrame.cpp
|
||||||
|
mac_installer/
|
||||||
|
Progress/
|
||||||
|
acct_mgr_url.xml (added)
|
|
@ -1527,6 +1527,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
|
||||||
wxWindow* pwndNotebookPage = NULL;
|
wxWindow* pwndNotebookPage = NULL;
|
||||||
CBOINCBaseView* pView = NULL;
|
CBOINCBaseView* pView = NULL;
|
||||||
int iItemCount = 0, iIndex;
|
int iItemCount = 0, iIndex;
|
||||||
|
int wasShown = 0;
|
||||||
|
|
||||||
wxASSERT(m_pNotebook);
|
wxASSERT(m_pNotebook);
|
||||||
wxASSERT(pDoc);
|
wxASSERT(pDoc);
|
||||||
|
@ -1577,7 +1578,9 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
|
||||||
pDoc->rpc.get_project_init_status(pis);
|
pDoc->rpc.get_project_init_status(pis);
|
||||||
pDoc->rpc.acct_mgr_info(ami);
|
pDoc->rpc.acct_mgr_info(ami);
|
||||||
if (ami.acct_mgr_url.size() && !ami.have_credentials) {
|
if (ami.acct_mgr_url.size() && !ami.have_credentials) {
|
||||||
if (!IsShown()) {
|
if (IsShown()) {
|
||||||
|
wasShown = 1;
|
||||||
|
} else {
|
||||||
Show();
|
Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1585,8 +1588,10 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
|
||||||
if (pAPWizard->SyncToAccountManager()) {
|
if (pAPWizard->SyncToAccountManager()) {
|
||||||
|
|
||||||
#if defined(__WXMSW__) || defined(__WXMAC__)
|
#if defined(__WXMSW__) || defined(__WXMAC__)
|
||||||
// If successful, hide the main window
|
// If successful, hide the main window if we showed it
|
||||||
Hide();
|
if (!wasShown) {
|
||||||
|
Hide();
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// %s is the application name
|
// %s is the application name
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
<acct_mgr>
|
||||||
|
<name>GridRepublic</name>
|
||||||
|
<url>http://www.gridrepublic.org/</url>
|
||||||
|
<signing_key>
|
||||||
|
1024
|
||||||
|
9c3af22a230f1eb122b8eab256e5e46b49f6d357e65d00e414cf6af105aef217
|
||||||
|
1de0793353097bbbb918413f79cb5bfaa4532daf061ece07b63f209690a3e1b1
|
||||||
|
8906a9ae4f521ec25e6fb79b8679dd4c18c0f022dcb95baefeca091d572c7738
|
||||||
|
e1b1d542bbec94552e0e37c698427f4538b947b79072d112ebcf4d9c509b16d9
|
||||||
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
0000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
0000000000000000000000000000000000000000000000000000000000010001
|
||||||
|
.
|
||||||
|
</signing_key>
|
||||||
|
</acct_mgr>
|
Loading…
Reference in New Issue