diff --git a/checkin_notes b/checkin_notes index c9def3ebbd..0228e4df39 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6007,3 +6007,10 @@ Charlie 11 Aug 2010 clientgui/ DlgEventLog.cpp + +Charlie 11 Aug 2010 + - MGR: "Another instance" message in Select Computer dialog gets Manager name + from skin. + + clientgui/ + DlgSelectComputer.cpp diff --git a/clientgui/DlgSelectComputer.cpp b/clientgui/DlgSelectComputer.cpp index 5d84f6885a..30c0bf5dd8 100644 --- a/clientgui/DlgSelectComputer.cpp +++ b/clientgui/DlgSelectComputer.cpp @@ -115,11 +115,17 @@ void CDlgSelectComputer::CreateControls(bool required) itemDialog1->SetSizer(itemBoxSizer2); if (required) { - wxStaticText* itemStaticText1 = new wxStaticText; - itemStaticText1->Create( itemDialog1, wxID_STATIC, - _("Another instance of BOINC Manager is already running \non this computer. Please select a client to monitor."), - wxDefaultPosition, wxDefaultSize, 0 + CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced(); + wxASSERT(pSkinAdvanced); + wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced)); + + wxString strInfo = wxEmptyString; + strInfo.Printf( + _("Another instance of %s is already running \non this computer. Please select a client to monitor."), + pSkinAdvanced->GetApplicationName().c_str() ); + wxStaticText* itemStaticText1 = new wxStaticText; + itemStaticText1->Create( itemDialog1, wxID_STATIC, strInfo, wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer2->Add(itemStaticText1, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); }