- MGR: Provide a way to re-enable the Exit Dialog.

clientgui/
        AdvancedFrame.cpp
        BOINCGUIApp.h
        DlgOptions.cpp, .h

svn path=/trunk/boinc/; revision=16462
This commit is contained in:
Rom Walton 2008-11-10 19:44:54 +00:00
parent 7c250e026f
commit f0da3b7c50
5 changed files with 32 additions and 0 deletions

View File

@ -9330,3 +9330,11 @@ Rom 10 Nov 2008
clientgui/
SkinManager.cpp
DlgExitMessage.cpp
Rom 10 Nov 2008
- MGR: Provide a way to re-enable the Exit Dialog.
clientgui/
AdvancedFrame.cpp
BOINCGUIApp.h
DlgOptions.cpp, .h

View File

@ -1497,7 +1497,10 @@ void CAdvancedFrame::OnOptionsOptions(wxCommandEvent& WXUNUSED(event)) {
dlg.m_ReminderFrequencyCtrl->SetValue(m_iReminderFrequency);
#ifdef __WXMSW__
dlg.m_EnableBOINCManagerAutoStartCtrl->SetValue(!wxGetApp().GetBOINCMGRDisableAutoStart());
dlg.m_EnableBOINCManagerExitMessageCtrl->SetValue(wxGetApp().GetBOINCMGRDisplayExitMessage());
#endif
#ifdef __WXMSW__
// Connection Tab
if (m_pDialupManager) {
m_pDialupManager->GetISPNames(astrDialupConnections);
@ -1570,7 +1573,10 @@ void CAdvancedFrame::OnOptionsOptions(wxCommandEvent& WXUNUSED(event)) {
m_iReminderFrequency = dlg.m_ReminderFrequencyCtrl->GetValue();
#ifdef __WXMSW__
wxGetApp().SetBOINCMGRDisableAutoStart(!dlg.m_EnableBOINCManagerAutoStartCtrl->GetValue());
wxGetApp().SetBOINCMGRDisplayExitMessage(dlg.m_EnableBOINCManagerExitMessageCtrl->GetValue());
#endif
#ifdef __WXMSW__
// Connection Tab
m_strNetworkDialupConnectionName = dlg.GetDefaultDialupConnection();
#endif

View File

@ -142,6 +142,11 @@ public:
void SetBOINCMGRDisableAutoStart(int iDisableAutoStart)
{ m_iBOINCMGRDisableAutoStart = iDisableAutoStart; }
int GetBOINCMGRDisplayExitMessage()
{ return m_iDisplayExitDialog; }
void SetBOINCMGRDisplayExitMessage(int iDisplayExitMessage)
{ m_iDisplayExitDialog = iDisplayExitMessage; }
wxArrayString& GetSupportedLanguages() { return m_astrLanguages; }

View File

@ -86,6 +86,7 @@ bool CDlgOptions::Create(wxWindow* parent, wxWindowID id, const wxString& captio
m_LanguageSelectionCtrl = NULL;
m_ReminderFrequencyCtrl = NULL;
m_EnableBOINCManagerAutoStartCtrl = NULL;
m_EnableBOINCManagerExitMessageCtrl = NULL;
m_DialupStaticBoxCtrl = NULL;
#if defined(__WXMSW__)
m_DialupConnectionsCtrl = NULL;
@ -189,6 +190,16 @@ void CDlgOptions::CreateControls()
if (ShowToolTips())
m_EnableBOINCManagerAutoStartCtrl->SetToolTip(_("Launch BOINC Manager when you log on."));
itemFlexGridSizer6->Add(m_EnableBOINCManagerAutoStartCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText11 = new wxStaticText;
itemStaticText11->Create( itemPanel4, wxID_STATIC, _("Enable BOINC Manager exit message:"), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer6->Add(itemStaticText11, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_EnableBOINCManagerExitMessageCtrl = new wxCheckBox;
m_EnableBOINCManagerExitMessageCtrl->Create( itemPanel4, ID_ENABLEEXITMESSAGE, wxT(""), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
if (ShowToolTips())
m_EnableBOINCManagerExitMessageCtrl->SetToolTip(_("Display the exit message dialog when shutting down BOINC Manager."));
itemFlexGridSizer6->Add(m_EnableBOINCManagerExitMessageCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
#endif
itemNotebook3->AddPage(itemPanel4, _("General"));

View File

@ -53,6 +53,7 @@
#define ID_LANGUAGESELECTION 10004
#define ID_REMINDERFREQUENCY 10018
#define ID_ENABLEAUTOSTART 10031
#define ID_ENABLEEXITMESSAGE 10032
#define ID_CONNECTONS 10019
#define ID_NETWORKAUTODETECT 10020
#define ID_NETWORKLAN 10021
@ -157,6 +158,7 @@ public:
wxComboBox* m_LanguageSelectionCtrl;
wxSlider* m_ReminderFrequencyCtrl;
wxCheckBox* m_EnableBOINCManagerAutoStartCtrl;
wxCheckBox* m_EnableBOINCManagerExitMessageCtrl;
wxStaticBoxSizer* m_DialupStaticBoxCtrl;
wxListBox* m_DialupConnectionsCtrl;
wxButton* m_DialupSetDefaultCtrl;