From d74ac631ae0307d6283a50fb6a98437b835d76f2 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Fri, 6 Jan 2006 10:50:59 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9183 --- checkin_notes | 19 +++++ clientgui/AccountInfoPage.cpp | 10 +-- clientgui/AccountManagerProcessingPage.cpp | 2 +- clientgui/AccountManagerPropertiesPage.cpp | 2 +- clientgui/BOINCGUIApp.cpp | 10 ++- clientgui/BOINCGUIApp.h | 2 + clientgui/BOINCGUIApp.rc | 1 + clientgui/CompletionPage.cpp | 75 ++++++++++++++---- clientgui/CompletionPage.h | 3 + clientgui/MainFrame.cpp | 8 +- .../res/gridrepublic2.ico | Bin clientgui/resource.h | 3 +- win_build/installerv2/GridRepublic.ism | Bin 205852 -> 205852 bytes .../redist/GridRepublic/GR_splash.bmp | Bin 583686 -> 583688 bytes .../redist/GridRepublic/acct_mgr_url.xml | 11 ++- 15 files changed, 120 insertions(+), 26 deletions(-) rename win_build/installerv2/redist/GridRepublic/GridRepublic.ico => clientgui/res/gridrepublic2.ico (100%) diff --git a/checkin_notes b/checkin_notes index 026a111b2e..8ca91edb33 100755 --- a/checkin_notes +++ b/checkin_notes @@ -97,3 +97,22 @@ Bruce 6 Jan 2006 graphics_impl.h graphics_impl_lib.C +Rom 6 Jan 2006 + - Branding update for GridRepublic + + clientgui/ + AccountInfoPage.cpp + AccountManagerProcessingPage.cpp + AccountManagerPropertiesPage.cpp + BOINCGUIApp.cpp, .h + BOINCGUIApp.rc + CompletionPage.cpp, .h + MainFrame.cpp + resource.h + clientgui/res/ + gridrepublic2.ico (Added) + win_build/installerv2/ + GridRepublic.ism + win_build/installerv2/redist/GridRepublic/ + acct_mgr_url.xml + GR_splash.bmp diff --git a/clientgui/AccountInfoPage.cpp b/clientgui/AccountInfoPage.cpp index e6316f52ab..11cb9d8f5c 100644 --- a/clientgui/AccountInfoPage.cpp +++ b/clientgui/AccountInfoPage.cpp @@ -138,7 +138,7 @@ void CAccountInfoPage::CreateControls() itemFlexGridSizer61->Add(m_AccountUseExistingCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); } else { m_AccountManagerInformation = new wxStaticText; - m_AccountManagerInformation->Create( itemWizardPage56, wxID_STATIC, _("Please provide your email address and password you used on\nthe website so that your projects and preferences can be retrieved."), wxDefaultPosition, wxDefaultSize, 0 ); + m_AccountManagerInformation->Create( itemWizardPage56, wxID_STATIC, _("Please provide the email address and password you used on\nthe website so that your projects and preferences can be retrieved."), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer57->Add(m_AccountManagerInformation, 0, wxALIGN_LEFT|wxALL, 5); itemBoxSizer57->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); @@ -267,8 +267,6 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) } } - if (m_AccountEmailAddressCtrl) m_AccountEmailAddressCtrl->SetFocus(); - if (((CBOINCBaseWizard*)GetParent())->project_config.account_creation_disabled) { if (!IS_ACCOUNTMANAGERWIZARD()) { m_AccountCreateCtrl->SetValue(false); @@ -283,7 +281,7 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) if (((CBOINCBaseWizard*)GetParent())->project_config.uses_username) { if (m_AccountManagerInformation) { m_AccountManagerInformation->SetLabel( - _("Please provide your username and password you used on\n" + _("Please provide the username and password you used on\n" "the website so that your projects and preferences can be retrieved.") ); } @@ -293,7 +291,7 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) } else { if (m_AccountManagerInformation) { m_AccountManagerInformation->SetLabel( - _("Please provide your email address and password you used on\n" + _("Please provide the email address and password you used on\n" "the website so that your projects and preferences can be retrieved.") ); } @@ -303,6 +301,8 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) } Fit(); + + if (m_AccountEmailAddressCtrl) m_AccountEmailAddressCtrl->SetFocus(); } /*! diff --git a/clientgui/AccountManagerProcessingPage.cpp b/clientgui/AccountManagerProcessingPage.cpp index c2bd857ee1..07d81ae910 100644 --- a/clientgui/AccountManagerProcessingPage.cpp +++ b/clientgui/AccountManagerProcessingPage.cpp @@ -129,7 +129,7 @@ void CAccountManagerProcessingPage::CreateControls() itemWizardPage51->SetSizer(itemBoxSizer52); wxStaticText* itemStaticText53 = new wxStaticText; - itemStaticText53->Create( itemWizardPage51, wxID_STATIC, _("Communicating with account manager\nPlease wait..."), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText53->Create( itemWizardPage51, wxID_STATIC, _("Communicating with website\nPlease wait..."), wxDefaultPosition, wxDefaultSize, 0 ); itemStaticText53->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); itemBoxSizer52->Add(itemStaticText53, 0, wxALIGN_LEFT|wxALL, 5); diff --git a/clientgui/AccountManagerPropertiesPage.cpp b/clientgui/AccountManagerPropertiesPage.cpp index d93b60e2cd..e4d151f02f 100644 --- a/clientgui/AccountManagerPropertiesPage.cpp +++ b/clientgui/AccountManagerPropertiesPage.cpp @@ -132,7 +132,7 @@ void CAccountManagerPropertiesPage::CreateControls() itemWizardPage34->SetSizer(itemBoxSizer35); wxStaticText* itemStaticText36 = new wxStaticText; - itemStaticText36->Create( itemWizardPage34, wxID_STATIC, _("Communicating with account manager\nPlease wait..."), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText36->Create( itemWizardPage34, wxID_STATIC, _("Communicating with website\nPlease wait..."), wxDefaultPosition, wxDefaultSize, 0 ); itemStaticText36->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); itemBoxSizer35->Add(itemStaticText36, 0, wxALIGN_LEFT|wxALL, 5); diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index fdfaed683b..06b46a353f 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -83,6 +83,9 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) { m_strProjectName = wxT("GridRepublic"); m_bitmapAPWizardLogo = wxBitmap(gridrepublicamwizard_xpm); m_bitmapAMWizardLogo = wxBitmap(gridrepublicamwizard_xpm); + m_strAMWizardAttachMessage = + wxT("Together we are building the most powerful computer in the world;\n" + "Together anything is possible!"); break; default: // Running in native mode without any branding @@ -94,6 +97,7 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) { m_strProjectName = wxT("BOINC"); m_bitmapAPWizardLogo = wxBitmap(attachprojectwizard_xpm); m_bitmapAMWizardLogo = wxBitmap(attachprojectwizard_xpm); + m_strAMWizardAttachMessage = wxEmptyString; break; } @@ -223,7 +227,7 @@ bool CBOINCGUIApp::OnInit() { // Setup the branding scheme m_pBranding = new CBrandingScheme; - wxASSERT(m_pLocale); + wxASSERT(m_pBranding); m_pBranding->OnInit(m_pConfig); @@ -329,6 +333,10 @@ int CBOINCGUIApp::OnExit() { delete m_pDocument; } + if (m_pBranding) { + delete m_pBranding; + } + if (m_pLocale) { delete m_pLocale; } diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h index 0fe22e1283..a1bbec81e2 100644 --- a/clientgui/BOINCGUIApp.h +++ b/clientgui/BOINCGUIApp.h @@ -46,6 +46,7 @@ private: wxString m_strProjectName; wxBitmap m_bitmapAPWizardLogo; wxBitmap m_bitmapAMWizardLogo; + wxString m_strAMWizardAttachMessage; public: bool IsBranded() { return m_bIsBranded; } @@ -57,6 +58,7 @@ public: wxString GetProjectName() { return m_strProjectName; } wxBitmap* GetAPWizardLogo() { return &m_bitmapAPWizardLogo; } wxBitmap* GetAMWizardLogo() { return &m_bitmapAMWizardLogo; } + wxString GetAMWizardSuccessMessage() { return m_strAMWizardAttachMessage; } bool OnInit( wxConfigBase* pConfig ); }; diff --git a/clientgui/BOINCGUIApp.rc b/clientgui/BOINCGUIApp.rc index f9fe2803da..b6d69fd92c 100644 --- a/clientgui/BOINCGUIApp.rc +++ b/clientgui/BOINCGUIApp.rc @@ -32,6 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef _GRIDREPUBLIC APP_ICON ICON "res\\gridrepublic.ico" +APP_ICON2 ICON "res\\gridrepublic2.ico" #else diff --git a/clientgui/CompletionPage.cpp b/clientgui/CompletionPage.cpp index f1c5d5efa0..14f4e63f74 100644 --- a/clientgui/CompletionPage.cpp +++ b/clientgui/CompletionPage.cpp @@ -74,6 +74,9 @@ CCompletionPage::CCompletionPage( CBOINCBaseWizard* parent ) bool CCompletionPage::Create( CBOINCBaseWizard* parent ) { ////@begin CCompletionPage member initialisation + m_CompletionTitle = NULL; + m_CompletionWelcome = NULL; + m_CompletionBrandedMessage = NULL; m_CompletionMessage = NULL; ////@end CCompletionPage member initialisation @@ -100,34 +103,76 @@ void CCompletionPage::CreateControls() wxBoxSizer* itemBoxSizer80 = new wxBoxSizer(wxVERTICAL); itemWizardPage79->SetSizer(itemBoxSizer80); - wxStaticText* itemStaticText81 = new wxStaticText; - wxStaticText* itemStaticText82 = new wxStaticText; - m_CompletionMessage = new wxStaticText; if (IS_ATTACHTOPROJECTWIZARD()) { - itemStaticText81->Create( itemWizardPage79, wxID_STATIC, _("Attached to project"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText81->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer80->Add(itemStaticText81, 0, wxALIGN_LEFT|wxALL, 5); + m_CompletionTitle = new wxStaticText; + m_CompletionTitle->Create( itemWizardPage79, wxID_STATIC, _("Attached to project"), wxDefaultPosition, wxDefaultSize, 0 ); + m_CompletionTitle->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT("Verdana"))); + itemBoxSizer80->Add(m_CompletionTitle, 0, wxALIGN_LEFT|wxALL, 5); - itemStaticText82->Create( itemWizardPage79, wxID_STATIC, _("You are now successfully attached to this project."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer80->Add(itemStaticText82, 0, wxALIGN_LEFT|wxALL, 5); + m_CompletionBrandedMessage = new wxStaticText; + m_CompletionBrandedMessage->Create( itemWizardPage79, wxID_STATIC, _("You are now successfully attached to this project."), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer80->Add(m_CompletionBrandedMessage, 0, wxALIGN_LEFT|wxALL, 5); itemBoxSizer80->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + m_CompletionMessage = new wxStaticText; m_CompletionMessage->Create( itemWizardPage79, wxID_STATIC, _("When you click Finish, your web browser will go to a page where\nyou can set your account name and preferences."), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer80->Add(m_CompletionMessage, 0, wxALIGN_LEFT|wxALL, 5); } if (IS_ACCOUNTMANAGERWIZARD()) { - itemStaticText81->Create( itemWizardPage79, wxID_STATIC, _("Attached to account manager"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText81->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana"))); - itemBoxSizer80->Add(itemStaticText81, 0, wxALIGN_LEFT|wxALL, 5); + 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"); + } - itemStaticText82->Create( itemWizardPage79, wxID_STATIC, _("You are now successfully attached to this account manager."), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer80->Add(itemStaticText82, 0, wxALIGN_LEFT|wxALL, 5); + m_CompletionTitle = new wxStaticText; + m_CompletionTitle->Create( itemWizardPage79, wxID_STATIC, strTitle, wxDefaultPosition, wxDefaultSize, 0 ); + m_CompletionTitle->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT("Verdana"))); + itemBoxSizer80->Add(m_CompletionTitle, 0, wxALIGN_LEFT|wxALL, 5); - itemBoxSizer80->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5); + if (wxGetApp().GetBrand()->IsBranded()) { + // %s is the project name + // i.e. 'GridRepublic' + wxString strWelcome; + strWelcome.Printf( + _("Welcome to %s!"), + wxGetApp().GetBrand()->GetProjectName().c_str() + ); + m_CompletionWelcome = new wxStaticText; + m_CompletionWelcome->Create( itemWizardPage79, wxID_STATIC, strWelcome, wxDefaultPosition, wxDefaultSize, 0 ); + m_CompletionWelcome->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxT("Verdana"))); + itemBoxSizer80->Add(m_CompletionWelcome, 0, wxALIGN_LEFT|wxALL, 5); + } - m_CompletionMessage->Create( itemWizardPage79, wxID_STATIC, _("When you click Finish, your web browser will go to a page where\nyou can set your account name and preferences."), wxDefaultPosition, wxDefaultSize, 0 ); + 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_CompletionBrandedMessage = new wxStaticText; + m_CompletionBrandedMessage->Create( itemWizardPage79, wxID_STATIC, strBrandedMessage, wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer80->Add(m_CompletionBrandedMessage, 0, wxALIGN_LEFT|wxALL, 5); + + m_CompletionMessage = new wxStaticText; + m_CompletionMessage->Create( itemWizardPage79, wxID_STATIC, _("Click Finish to close."), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer80->Add(m_CompletionMessage, 0, wxALIGN_LEFT|wxALL, 5); } diff --git a/clientgui/CompletionPage.h b/clientgui/CompletionPage.h index 5c63c190c8..760de8241d 100644 --- a/clientgui/CompletionPage.h +++ b/clientgui/CompletionPage.h @@ -77,6 +77,9 @@ public: static bool ShowToolTips(); ////@begin CCompletionPage member variables + wxStaticText* m_CompletionTitle; + wxStaticText* m_CompletionWelcome; + wxStaticText* m_CompletionBrandedMessage; wxStaticText* m_CompletionMessage; ////@end CCompletionPage member variables }; diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index 7c6ee6d38f..09e66f1277 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -1405,7 +1405,13 @@ void CMainFrame::OnConnect(CMainFrameEvent&) { pDoc->rpc.acct_mgr_info(ami); if (ami.acct_mgr_url.size()) { pAMWizard = new CWizardAccountManager(this); - pAMWizard->Run(); + if (pAMWizard->Run()) { + // If successful, hide the main window + Hide(); + } else { + // If failure, display the messages tab + m_pNotebook->SetSelection(ID_LIST_MESSAGESVIEW - ID_LIST_BASE); + } } else { pAPWizard = new CWizardAttachProject(this); pDoc->rpc.get_project_init_status(pis); diff --git a/win_build/installerv2/redist/GridRepublic/GridRepublic.ico b/clientgui/res/gridrepublic2.ico similarity index 100% rename from win_build/installerv2/redist/GridRepublic/GridRepublic.ico rename to clientgui/res/gridrepublic2.ico diff --git a/clientgui/resource.h b/clientgui/resource.h index 31925769f0..4470166293 100644 --- a/clientgui/resource.h +++ b/clientgui/resource.h @@ -2,7 +2,8 @@ // Microsoft Visual C++ generated include file. // Used by BOINCGUIApp.rc // -#define APP_ICON 100 +#define APP_ICON 0 +#define APP_ICON2 1 // Next default values for new objects // diff --git a/win_build/installerv2/GridRepublic.ism b/win_build/installerv2/GridRepublic.ism index ec0a8503e1f3f57c82010a41bf3e76bf2f839769..8faa053e84cdc81d1f445be02f7523261cadeae0 100644 GIT binary patch delta 802 zcmXw%Z%9*77{>4WzIXGw-FuzRnQ6ov6KjsH?A;cDWif6zZT?dnFn z_%wCcy-q8V+e`jij!(PAv>V#1`DO%~`HKe}>~LXYW*xjes{b@+O(iM4$=oFO9D|a~ z7<3mwkWYMo`ur83DAkg+k{ZcMp8No_a8gWu1eg!G;{6Pic|_EO{W%;QKsUQfFq|$% z6wwmwCur9Lij6gh2Fcc9a~Q9|_2?R0l-`Rf-|9q< zi0#4)l#ZjFXb%W7lzyg=-k#FUH2OF(CR3NL0pV>e_E z=2KsA0vw|CEB1ouo5B{GrBPqz7mmz@Z0nV#H~jk#o;`9#MrHEXHjSSZFyY zoC<4xPB`ebs%77l{RtxBq(v8}9 delta 948 zcmX|N=B>9kZ-_`tkf8`6h9+n*8&Ya-DKfMF`goQWQy&Q~^(a0*3-c#5nv5x@?z@$0`e6L@qX9 ztkj4_Dm{vwPM&PTd$zF|gDU2$?3cR{Rf%wZi$_GZJQh0&U!t7<8bf?wD>(S4E7;7}zr}XD{Td#tt&OH9r!vXi3Cn1W zK4}CxJA>?Qp>6h8KVVKT{f09@+a=%+f5-2@Y45y;$AL$G#S^6k9CeiL<7LWS*8Ps- zq9hCa&k7#IU8seh=S>32)XjKhpm()w@vc{h$Ai|MKipU`?L!7OomPT?fYJY3X+ImCQ zn(`1X3r`+h!V`RF32W>cg`R_aHJQrVm~0S^>!ZR}HGLyLoE+P7(stl~4}s2)-Gmp} zU4cy;QK`(MRW!vNUb^_yj`963B+?lxzR&XS42SxA`+9=@KC@>_u-ohncLoB1et%b} z-|XIMhI`oOqodB;K?SMb@vUw)cgEkbYNuA c9O;|(+n=@2tD-EM$gMYvaIc_kJq1Yr0TFE_y!ffrDH&UWs67wSDi*6Dk2v*=)0{K1N z=k)Y+&pkl2OjT;nhckV;`+4c7|NZpSFY}dybH93UZqJP?<3`Wis66eWi^|g;9NsqE zwQab2+i=ge;ofb-7jGMmzBgR>%|!ExZxq#wuN6woXFf7CQQLj-z>6=wxOMB+l`B_{ zwLjzI;}1OWz>`lt+1z!PyOOpp{%}q zqEKzrihWr4g%@5x>0P^a89SigzJ2=ufO>FYZ$;H#FC^-o6NQrc?(2o3+A}MTDil(M ziiYCx#~z&4Z-o*+(jUWRoP%=wRtm#rqnyO7p%(q>?#tQH?K&Bei2rT>AG1qr^2a zy|0d)DOA-@$Ko<7wn#QFi7WkBhgMpQ(;1A4mtTIFen7Iidnm4|Ur&!qDp`Plkz3=W zQA?_*@X$jKSt{hwVGyd(%i`*gn@Nj$>nj?g$!aXRn6!_%jXtRUlVjve4X;NR#HGfED{96`FtuO>mN-lM)qh|&^-;;&e3JVAvk5`*^0-fJ zJq3K`F6Z-CV^ldf77y50qJFi4yxM7CR+B1cmWe6L>asQP&3dmG9XfP~2CAi}VgJ21 z3Q1%6$cAWaop-6SxP?T4_kCyl{o$-Trz7fuaLQK?RejcfO6jtkW=~R&RxYH89Z@n5* zenM zqI%*Qs?LQ@Nv#yj=um0O(k;LnedRMS;l8!EVUFwOk0_u)de$iPzfS-Kyhq&xbE_V~gxu zsciPYL%lkLAAIHv(0%$+;QaN|z;s50yFIxPB-_{^Axs0Q3^ux30>W{byfaXj)WIIu zNKhcLo2i9DXlx&1P&M;xp;98BsFXT9>U}pMMf>eZ@!%fl#TS<$#IB~k31`*1Ww`9a ze?;kL))JSBzD4{F4{ECIH^kKvX`_jZuhnM?l}FwaC(ZBNQCS7J@|{X(yqsP**XYn4 z+Qt#Eq5_zsRo)C@>YZzJgkFmFU}xxfFmEUmYZ#D+MaYB}^G>CarA2E|&>I~z!Sr#* zwjj@rE|fD3bl<3s0Amnv6%KnV9zI(8e`=At+)<)cpi@>bjq{55gcjE5#M_gKPO>(f zsJ*vKt-8gy_7eChs*@vep8!ey^G&=)7UAa?Bylx@2MaMlUPYqlqFN|{?n`s1MA%Xi zaH0h0RsV9TFdzX)S^cCN>Jasj>R$xe2MChYKTKzkJvB)zys}~<@J~wiBa2~vWU??M z6T;xCu;nxlkeF`q+GY%qV>kh{*Tt=XIkcq934_y-p+Jmm`@-u8bhJe#At>|YgDe9O zx2iV^Sd^Jk6v~$os%YDgA=Hu2BFmLZM|#{XG1W5qRu!Ox8*(`yp3GK_u`ySK(SD6B zcDaZBZ28i9OJWi(Q>r1=j?d(+m zz62;a#IS87fs- zy+%C@eTLkSU1laGrdljxN!IqV!=S^eAG5w>@wm#fA&o`>YY+4>mUOL>W6NC7V;+|c zX|GEW8{*=EKriIe+l4e=yDQsI0P4m+oA!Av!xHNG6NQQodu%}c5R$H9hM_lNT|0&3 zvLRIu@n$&j_Ox@EpvTzMoj&-4bX2;S%tt zLz&ZrH_ZB_9*EVkTdANC`JNFf+`J|pvK+*frh)vLQ|wf{avAt++sBC1s;j^;ZX0)8 z>OnscJK`Yrpu|qvLF>@uN0-6@X#=Z)OMBmncXnGwI;@jpIf3ht$I^OIuWzVZS&gz@ zbr%I*k>zAn^g52tYAmg)UAM-S4*QaoO;bq=!Q^UTq|s_u9oGmUxom$`)`$6)Z4NiD zO$fEkbrm2jh@Yr^yi0fWe1U9x^4AoUGF=^YKSlTN>lI=E= z@c1$7sfk@(Llxssyi)e-svGUZXn50eaLNId73eYJ(-wu~Y}r*?^STjbr>q=Ko-H9X zLP80$E%Es-*|SaNvksyfwD#c>A7ejFE7|E+SH26tNnoqCE&vznPqDMRe>S*ifsoXo zb#$z^-2G;6cP&yHboO>Df&etfCrdkHT3B@ppCmnpC^|NKpJp)hlz zJT3UGz|7M;=hH}$R!wti2@p4UO~oK|TG-F7o(2mZA)h8cB*#X5J_?N->gKQsJI6=} zwac~^K4*N>*P^&Mh?9hYdGJJdlB#P5#D`Bh|iw#~-iy*jq~L@UHTfyrUO`dV+I4jY0t;iNH2d^v=!H>pdOKbcqUohK~%x zVYp2!{dAYvUS(li>|ttFTV^p4-#bLerk5v6J^>&H?~cn6g?LT%+*NUZM5lp8XQxRo z!q@Z$OBs!L&e1w!k>z(%WM|dHg=*V$>fa%NG&(0E8z?YPn8BcbEBCNh0! z-sc}AVsL$`=^5UFl!RA=?ye}(;UdbND?M^=hXite6)r1lV#na56&M=99vB!noE014e09H#(!R>Ir6N4kY0!7Z~tn@Tbegt+rDC=Hmnb76ZOP20QT+axIK=)O6n&Z ziIp)Uon;>sRUf^cD3CQvRb5&FWK85GHDip|8$&EkXp`C4XBnlovget4!blE-#Vw{7 z=GI7}b}lxdY1yP?^r)9EAunC(r)#2pY_Zy1Q{D7VC^yYzjurqGUY=4I`Tmc?yKB;e(JcdKq0B889 z|GGTBr0#iFe7GU?P!4ZbvZ*6Or~NVc)NIf0K%4SEPn5Gj?6m)6+v;hX-%UnI-t@Sq zr(>S977h+>_?WY*c~88qQJYj|!k+~B*Ubc7PfRlP|EHY({`QZBq(@?lEwjOxJ}8*S ztpmB(P;`#X>atrUTm4mJa8iXwrr&r7k!g|43RlZn*ZUK=EKWB=BlWcr@UBk?^a-3k zuhXZ@xOIK|rl=-+sdA_6-0CyD%yFm32zo&1n?7uURrD~E9o~UDYIrcfEGR?1dC3-KlmKE>$S6FPZ#xrp>w+fN!sH-l6-d2OIb1E`(} z>9nJ3mGFoWkkO~)@bbK-^(grRB9-q6;M3|A(j(rq$<{$p&xGh_OLLg-TplK>u1zI=uI0Ycy#=l3`64O}h>jAKnPeOIT!b8F8Iy#_g%^0>>Fo-(pM{V zYS#kt7sORReaJavhE#@n}5%rT}WZ1WrB*NBzh=W4(rZMWM%siZ& z$X$&(+FFd-1Qvu1!^H!Vso)}lYL=>F0^#(cR|HkswROEuvdiLe%ku?rK-QfV$k?iV~%t78axh-eL z-CQOX4SpTz>ru4fLu~Zv+aRNIopje3&Y1OBILaZkxt9dH0a+psnB(nFT_QuMmsf#J zytZ4mI+vxcKJ2TSJ9XybZ^@4}+D*{m%k7c33V34jdT`Lknb3mhBD||{WZ>;YnFS`|*UN%~Ov7lDw4Y>hrVUvgT%9dOYa;M16Bq-)q*i8#l-Otv&4w z{Y6Li-@>!`&9C>@&)H7T3a)`Y_%jRhv<#EQLT(Oes9J`u>!q?M!z1uMT?~0ep6_;b z^@=jWcKD-*4Xuoh9)P^|Wn9uj{r}5*B)u#Ep?h;G_vn7 zc5~{cNfb)4f1-uA@$_#H=@FhRtnCUpF}L(vm-e%b$BGf42-t1D6n5Ugeyp))KPI4-Cm;PKR=g5{pENPjVvNB;H?3tBMM1Q&`A zwRi224vRQzh1^*fz(;xw&Whz117&yghN$U2>>_D%wO*!FJ-(WV=Lgq=)p@tYYd;$wePztpxl&18S>xi8MDyx?{zf2t`;15!V{XG0Xp@GEI#VP5 zM+l&he_!z@rl^8qlv2l3hFPn$^`DyoIlOkYpti_0+K$Lywy+>rz+SuwNa3rtoGA3m zf3Xs|l51^28fwbPLA07it>*6SMVTNV=OICXA#g2D+UBRk>$r9lp_?$0I|1s@KpZ7T z5jX(@WYJAr@=9-w``>4QMJ--|e=5f_0r=w0Z$Tfj*?JFa} zt<0x-{ur0n_-|UZ429LBrOMz$?Rj(2Lzb1-Hfm=r7WnvO+yBept@sz!E9ForPOe8g zT#e!HlZ9@VVH@{HSw)uAENseO<1R$fR1MurLx0A9y#8)#k-iwtp-26^yhdKw@jO>* uk56sgM}5KXxH7M-B_cerHom@5+xZt&W}m66%XSaQ;Hn;nti~a<$_$gul delta 8390 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 diff --git a/win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml b/win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml index 27f2cd8393..6d164c9465 100644 --- a/win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml +++ b/win_build/installerv2/redist/GridRepublic/acct_mgr_url.xml @@ -2,6 +2,15 @@ Grid Republic http://www.gridrepublic.com/ - +1024 +efbeefcfcbb82b7b58f7ea9b126805486fe917bece0647dd8a87d4110adb9390 +b71ecdbb812f7785afac5a0028fbc76507a257666ea89b5c20cb84e72f9183dc +eca42195689846eb37dd46cb63f9fe16435a4e8aca762f95bd0a8b21ae614082 +a258af17c6367010be57ac43df459ebfa8bd169cf6dc779726dff88141bb28cd +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000010001 +. \ No newline at end of file