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

- MGR: Make sure all the dialogs contain the application name 

and do not have BOINC Manager hard coded in them.

    clientgui/
        AdvancedFrame.cpp
        DlgAbout.h
        DlgAdvPreferencesBase.cpp, .h
        DlgOptions.cpp, .h
        DlgSelectComputer.cpp, .h

svn path=/trunk/boinc/; revision=13391
This commit is contained in:
Rom Walton 2007-08-16 20:06:50 +00:00
parent da105cb20b
commit c553674e19
9 changed files with 79 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkin_notes
View File

@ -7919,3 +7919,14 @@ Rom 16 Aug 2007
sg_DlgPreferences.cpp
sg_ProjectsComponent.cpp
SkinManager.cpp, .h
Rom 16 Aug 2007
- MGR: Make sure all the dialogs contain the application name
and do not have BOINC Manager hard coded in them.
clientgui/
AdvancedFrame.cpp
DlgAbout.h
DlgAdvPreferencesBase.cpp, .h
DlgOptions.cpp, .h
DlgSelectComputer.cpp, .h

12
clientgui/AdvancedFrame.cpp
View File

@ -502,7 +502,7 @@ bool CAdvancedFrame::CreateMenu() {
);
if (is_acct_mgr_detected) {
strMenuName.Printf(
_("&Stop using %s"),
_("&Stop using %s..."),
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
);
menuAdvanced->Append(
@ -1206,7 +1206,7 @@ void CAdvancedFrame::OnSelectComputer(wxCommandEvent& WXUNUSED(event)) {
void CAdvancedFrame::OnClientShutdown(wxCommandEvent& WXUNUSED(event)) {
wxCommandEvent evtSelectNewComputer(wxEVT_COMMAND_MENU_SELECTED, ID_FILESELECTCOMPUTER);
CMainDocument* pDoc = wxGetApp().GetDocument();
CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
CDlgGenericMessage dlg(this);
wxString strDialogTitle = wxEmptyString;
wxString strDialogMessage = wxEmptyString;
@ -1226,7 +1226,7 @@ void CAdvancedFrame::OnClientShutdown(wxCommandEvent& WXUNUSED(event)) {
// %s is the application name
// i.e. 'BOINC Manager', 'GridRepublic Manager'
strDialogTitle.Printf(
_("Shutdown the current client..."),
_("%s - Shutdown the current client..."),
pSkinAdvanced->GetApplicationName().c_str()
);
@ -1390,6 +1390,7 @@ void CAdvancedFrame::OnAccountManagerDetach(wxCommandEvent& WXUNUSED(event)) {
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnAccountManagerDetach - Function Begin"));
CMainDocument* pDoc = wxGetApp().GetDocument();
CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
wxInt32 iAnswer = 0;
wxString strTitle = wxEmptyString;
wxString strMessage = wxEmptyString;
@ -1397,6 +1398,8 @@ void CAdvancedFrame::OnAccountManagerDetach(wxCommandEvent& WXUNUSED(event)) {
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
wxASSERT(pSkinAdvanced);
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
if (!pDoc->IsUserAuthorized())
return;
@ -1406,7 +1409,8 @@ void CAdvancedFrame::OnAccountManagerDetach(wxCommandEvent& WXUNUSED(event)) {
pDoc->rpc.acct_mgr_info(ami);
strTitle.Printf(
_("BOINC Manager - Detach from %s"),
_("%s - Detach from %s"),
pSkinAdvanced->GetApplicationName().c_str(),
wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
);
strMessage.Printf(

2
clientgui/DlgAbout.h
View File

@ -49,7 +49,7 @@ class wxHyperLink;
////@begin control identifiers
#define ID_DIALOG 10000
#define SYMBOL_CDLGABOUT_STYLE wxDEFAULT_DIALOG_STYLE
#define SYMBOL_CDLGABOUT_TITLE _("About BOINC Manager")
#define SYMBOL_CDLGABOUT_TITLE wxT("")
#define SYMBOL_CDLGABOUT_IDNAME ID_DIALOG
#define SYMBOL_CDLGABOUT_SIZE wxSize(-1, -1)
#define SYMBOL_CDLGABOUT_POSITION wxDefaultPosition

33
clientgui/DlgAdvPreferencesBase.cpp
View File

@ -5,24 +5,35 @@
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif //__BORLANDC__
#ifndef WX_PRECOMP
#include <wx/wx.h>
#endif //WX_PRECOMP
#include "stdwx.h"
#include "diagnostics.h"
#include "util.h"
#include "mfile.h"
#include "miofile.h"
#include "parse.h"
#include "LogBOINC.h"
#include "BOINCGUIApp.h"
#include "SkinManager.h"
#include "DlgAdvPreferencesBase.h"
///////////////////////////////////////////////////////////////////////////
CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxString title, wxPoint pos, wxSize size, int style ) : wxDialog( parent, id, title, pos, size, style )
CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxString title, wxPoint pos, wxSize size, int style ) :
wxDialog( parent, id, title, pos, size, style )
{
this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
wxString strCaption = title;
if (strCaption.IsEmpty()) {
CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
wxASSERT(pSkinAdvanced);
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
strCaption.Printf(_("%s - Preferences"), pSkinAdvanced->GetApplicationName().c_str());
}
this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
this->Centre( wxBOTH );
this->SetTitle(strCaption);
wxBoxSizer* bSizer1;
bSizer1 = new wxBoxSizer( wxVERTICAL );

2
clientgui/DlgAdvPreferencesBase.h
View File

@ -200,7 +200,7 @@ class CDlgAdvPreferencesBase : public wxDialog
wxButton* m_btnHelp;
public:
CDlgAdvPreferencesBase( wxWindow* parent, int id = -1, wxString title = wxT("BOINC Manager - Preferences"), wxPoint pos = wxDefaultPosition, wxSize size = wxSize( 547,526 ), int style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
CDlgAdvPreferencesBase( wxWindow* parent, int id = -1, wxString title = wxT(""), wxPoint pos = wxDefaultPosition, wxSize size = wxSize( 547,526 ), int style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
};

18
clientgui/DlgOptions.cpp
View File

@ -22,8 +22,15 @@
#endif
#include "stdwx.h"
#include "diagnostics.h"
#include "util.h"
#include "mfile.h"
#include "miofile.h"
#include "parse.h"
#include "LogBOINC.h"
#include "BOINCGUIApp.h"
#include "DlgOptions.h"
#include "SkinManager.h"
////@begin includes
////@end includes
@ -100,9 +107,18 @@ bool CDlgOptions::Create(wxWindow* parent, wxWindowID id, const wxString& captio
m_SOCKSPasswordCtrl = NULL;
////@end CDlgOptions member initialisation
wxString strCaption = caption;
if (strCaption.IsEmpty()) {
CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
wxASSERT(pSkinAdvanced);
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
strCaption.Printf(_("%s - Options"), pSkinAdvanced->GetApplicationName().c_str());
}
////@begin CDlgOptions creation
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style );
wxDialog::Create( parent, id, strCaption, pos, size, style );
CreateControls();
GetSizer()->Fit(this);

2
clientgui/DlgOptions.h
View File

@ -46,7 +46,7 @@
////@begin control identifiers
#define ID_DIALOG 10000
#define SYMBOL_CDLGOPTIONS_STYLE wxDEFAULT_DIALOG_STYLE
#define SYMBOL_CDLGOPTIONS_TITLE _("BOINC Manager - Options")
#define SYMBOL_CDLGOPTIONS_TITLE wxT("")
#define SYMBOL_CDLGOPTIONS_IDNAME ID_DIALOG
#define SYMBOL_CDLGOPTIONS_SIZE wxDefaultSize
#define SYMBOL_CDLGOPTIONS_POSITION wxDefaultPosition

18
clientgui/DlgSelectComputer.cpp
View File

@ -22,8 +22,15 @@
#endif
#include "stdwx.h"
#include "diagnostics.h"
#include "util.h"
#include "mfile.h"
#include "miofile.h"
#include "parse.h"
#include "LogBOINC.h"
#include "BOINCGUIApp.h"
#include "MainDocument.h"
#include "SkinManager.h"
////@begin includes
////@end includes
@ -76,9 +83,18 @@ bool CDlgSelectComputer::Create( wxWindow* parent, wxWindowID id, const wxString
m_ComputerPasswordCtrl = NULL;
////@end CDlgSelectComputer member initialisation
wxString strCaption = caption;
if (strCaption.IsEmpty()) {
CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
wxASSERT(pSkinAdvanced);
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
strCaption.Printf(_("%s - Select Computer"), pSkinAdvanced->GetApplicationName().c_str());
}
////@begin CDlgSelectComputer creation
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style );
wxDialog::Create( parent, id, strCaption, pos, size, style );
CreateControls();
GetSizer()->Fit(this);

2
clientgui/DlgSelectComputer.h
View File

@ -46,7 +46,7 @@
////@begin control identifiers
#define ID_DIALOG 10000
#define SYMBOL_CDLGSELECTCOMPUTER_STYLE wxDEFAULT_DIALOG_STYLE
#define SYMBOL_CDLGSELECTCOMPUTER_TITLE _("BOINC Manager - Select Computer")
#define SYMBOL_CDLGSELECTCOMPUTER_TITLE wxT("")
#define SYMBOL_CDLGSELECTCOMPUTER_IDNAME ID_DIALOG
#define SYMBOL_CDLGSELECTCOMPUTER_SIZE wxSize(400, 300)
#define SYMBOL_CDLGSELECTCOMPUTER_POSITION wxDefaultPosition