From 3451c5a9b343e36c6cfe092f7c4b721537fb7e34 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Thu, 5 May 2011 14:56:24 +0200 Subject: [PATCH] Remove the option to generate coins from the Options Dialog. --- ui.cpp | 23 ------- ui.h | 1 - uibase.cpp | 19 ------ uibase.h | 51 ++++++-------- uiproject.fbp | 181 -------------------------------------------------- 5 files changed, 22 insertions(+), 253 deletions(-) diff --git a/ui.cpp b/ui.cpp index 5e534891..2ffa351f 100644 --- a/ui.cpp +++ b/ui.cpp @@ -1649,13 +1649,6 @@ COptionsDialog::COptionsDialog(wxWindow* parent) : COptionsDialogBase(parent) // Init values m_textCtrlTransactionFee->SetValue(FormatMoney(nTransactionFee)); - m_checkBoxLimitProcessors->SetValue(fLimitProcessors); - m_spinCtrlLimitProcessors->Enable(fLimitProcessors); - m_spinCtrlLimitProcessors->SetValue(nLimitProcessors); - int nProcessors = wxThread::GetCPUCount(); - if (nProcessors < 1) - nProcessors = 999; - m_spinCtrlLimitProcessors->SetRange(1, nProcessors); m_checkBoxStartOnSystemStartup->SetValue(fTmpStartOnSystemStartup = GetStartOnSystemStartup()); m_checkBoxMinimizeToTray->SetValue(fMinimizeToTray); m_checkBoxMinimizeOnClose->SetValue(fMinimizeOnClose); @@ -1696,11 +1689,6 @@ void COptionsDialog::OnKillFocusTransactionFee(wxFocusEvent& event) m_textCtrlTransactionFee->SetValue(FormatMoney(nTmp)); } -void COptionsDialog::OnCheckBoxLimitProcessors(wxCommandEvent& event) -{ - m_spinCtrlLimitProcessors->Enable(event.IsChecked()); -} - void COptionsDialog::OnCheckBoxUseProxy(wxCommandEvent& event) { m_textCtrlProxyIP->Enable(event.IsChecked()); @@ -1749,17 +1737,6 @@ void COptionsDialog::OnButtonApply(wxCommandEvent& event) if (ParseMoney(m_textCtrlTransactionFee->GetValue(), nTransactionFee) && nTransactionFee != nPrevTransactionFee) walletdb.WriteSetting("nTransactionFee", nTransactionFee); - int nPrevMaxProc = (fLimitProcessors ? nLimitProcessors : INT_MAX); - if (fLimitProcessors != m_checkBoxLimitProcessors->GetValue()) - { - fLimitProcessors = m_checkBoxLimitProcessors->GetValue(); - walletdb.WriteSetting("fLimitProcessors", fLimitProcessors); - } - if (nLimitProcessors != m_spinCtrlLimitProcessors->GetValue()) - { - nLimitProcessors = m_spinCtrlLimitProcessors->GetValue(); - walletdb.WriteSetting("nLimitProcessors", nLimitProcessors); - } if (fTmpStartOnSystemStartup != m_checkBoxStartOnSystemStartup->GetValue()) { fTmpStartOnSystemStartup = m_checkBoxStartOnSystemStartup->GetValue(); diff --git a/ui.h b/ui.h index a6a94695..aff1f1e0 100644 --- a/ui.h +++ b/ui.h @@ -126,7 +126,6 @@ protected: // Event handlers void OnListBox(wxCommandEvent& event); void OnKillFocusTransactionFee(wxFocusEvent& event); - void OnCheckBoxLimitProcessors(wxCommandEvent& event); void OnCheckBoxUseProxy(wxCommandEvent& event); void OnKillFocusProxy(wxFocusEvent& event); diff --git a/uibase.cpp b/uibase.cpp index 8b0d4927..1b901a1e 100644 --- a/uibase.cpp +++ b/uibase.cpp @@ -28,7 +28,6 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString& m_menubar->Append( m_menuFile, _("&File") ); m_menuOptions = new wxMenu(); - wxMenuItem* m_menuOptionsChangeYourAddress; m_menuOptionsChangeYourAddress = new wxMenuItem( m_menuOptions, wxID_ANY, wxString( _("&Your Receiving Addresses...") ) , wxEmptyString, wxITEM_NORMAL ); m_menuOptions->Append( m_menuOptionsChangeYourAddress ); @@ -245,7 +244,6 @@ CMainFrameBase::~CMainFrameBase() this->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) ); this->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) ); - this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateUIOptionsGenerate ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsChangeYourAddress ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsOptions ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuHelpAbout ) ); @@ -344,21 +342,6 @@ COptionsDialogBase::COptionsDialogBase( wxWindow* parent, wxWindowID id, const w bSizer69->Add( 0, 16, 0, wxEXPAND, 5 ); - wxBoxSizer* bSizer71; - bSizer71 = new wxBoxSizer( wxHORIZONTAL ); - - m_checkBoxLimitProcessors = new wxCheckBox( m_panelMain, wxID_ANY, _("&Limit coin generation to"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer71->Add( m_checkBoxLimitProcessors, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_spinCtrlLimitProcessors = new wxSpinCtrl( m_panelMain, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 48,-1 ), wxSP_ARROW_KEYS, 1, 999, 1 ); - bSizer71->Add( m_spinCtrlLimitProcessors, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_staticText35 = new wxStaticText( m_panelMain, wxID_ANY, _("processors"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText35->Wrap( -1 ); - bSizer71->Add( m_staticText35, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - bSizer69->Add( bSizer71, 0, 0, 5 ); - m_checkBoxStartOnSystemStartup = new wxCheckBox( m_panelMain, wxID_ANY, _("&Start Bitcoin on system startup"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer69->Add( m_checkBoxStartOnSystemStartup, 0, wxALL, 5 ); @@ -473,7 +456,6 @@ COptionsDialogBase::COptionsDialogBase( wxWindow* parent, wxWindowID id, const w // Connect Events m_listBox->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( COptionsDialogBase::OnListBox ), NULL, this ); - m_checkBoxLimitProcessors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnCheckBoxLimitProcessors ), NULL, this ); m_checkBoxMinimizeToTray->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnCheckBoxMinimizeToTray ), NULL, this ); m_checkBoxUseProxy->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnCheckBoxUseProxy ), NULL, this ); m_textCtrlProxyIP->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( COptionsDialogBase::OnKillFocusProxy ), NULL, this ); @@ -488,7 +470,6 @@ COptionsDialogBase::~COptionsDialogBase() { // Disconnect Events m_listBox->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( COptionsDialogBase::OnListBox ), NULL, this ); - m_checkBoxLimitProcessors->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnCheckBoxLimitProcessors ), NULL, this ); m_checkBoxMinimizeToTray->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnCheckBoxMinimizeToTray ), NULL, this ); m_checkBoxUseProxy->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( COptionsDialogBase::OnCheckBoxUseProxy ), NULL, this ); m_textCtrlProxyIP->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( COptionsDialogBase::OnKillFocusProxy ), NULL, this ); diff --git a/uibase.h b/uibase.h index 29368679..78f3d1b3 100644 --- a/uibase.h +++ b/uibase.h @@ -34,36 +34,34 @@ #include #include #include -#include #include #include /////////////////////////////////////////////////////////////////////////// #define wxID_MAINFRAME 1000 -#define wxID_OPTIONSGENERATEBITCOINS 1001 -#define wxID_BUTTONSEND 1002 -#define wxID_BUTTONRECEIVE 1003 -#define wxID_TEXTCTRLADDRESS 1004 -#define wxID_BUTTONNEW 1005 -#define wxID_BUTTONCOPY 1006 -#define wxID_PROXYIP 1007 -#define wxID_PROXYPORT 1008 -#define wxID_TRANSACTIONFEE 1009 -#define wxID_TEXTCTRLPAYTO 1010 -#define wxID_BUTTONPASTE 1011 -#define wxID_BUTTONADDRESSBOOK 1012 -#define wxID_TEXTCTRLAMOUNT 1013 -#define wxID_CHOICETRANSFERTYPE 1014 -#define wxID_LISTCTRL 1015 -#define wxID_BUTTONRENAME 1016 -#define wxID_PANELSENDING 1017 -#define wxID_LISTCTRLSENDING 1018 -#define wxID_PANELRECEIVING 1019 -#define wxID_LISTCTRLRECEIVING 1020 -#define wxID_BUTTONDELETE 1021 -#define wxID_BUTTONEDIT 1022 -#define wxID_TEXTCTRL 1023 +#define wxID_BUTTONSEND 1001 +#define wxID_BUTTONRECEIVE 1002 +#define wxID_TEXTCTRLADDRESS 1003 +#define wxID_BUTTONNEW 1004 +#define wxID_BUTTONCOPY 1005 +#define wxID_PROXYIP 1006 +#define wxID_PROXYPORT 1007 +#define wxID_TRANSACTIONFEE 1008 +#define wxID_TEXTCTRLPAYTO 1009 +#define wxID_BUTTONPASTE 1010 +#define wxID_BUTTONADDRESSBOOK 1011 +#define wxID_TEXTCTRLAMOUNT 1012 +#define wxID_CHOICETRANSFERTYPE 1013 +#define wxID_LISTCTRL 1014 +#define wxID_BUTTONRENAME 1015 +#define wxID_PANELSENDING 1016 +#define wxID_LISTCTRLSENDING 1017 +#define wxID_PANELRECEIVING 1018 +#define wxID_LISTCTRLRECEIVING 1019 +#define wxID_BUTTONDELETE 1020 +#define wxID_BUTTONEDIT 1021 +#define wxID_TEXTCTRL 1022 /////////////////////////////////////////////////////////////////////////////// /// Class CMainFrameBase @@ -99,7 +97,6 @@ class CMainFrameBase : public wxFrame virtual void OnMouseEvents( wxMouseEvent& event ) { event.Skip(); } virtual void OnPaint( wxPaintEvent& event ) { event.Skip(); } virtual void OnMenuFileExit( wxCommandEvent& event ) { event.Skip(); } - virtual void OnUpdateUIOptionsGenerate( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnMenuOptionsChangeYourAddress( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuOptionsOptions( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuHelpAbout( wxCommandEvent& event ) { event.Skip(); } @@ -164,9 +161,6 @@ class COptionsDialogBase : public wxDialog wxScrolledWindow* m_scrolledWindow; wxPanel* m_panelMain; - wxCheckBox* m_checkBoxLimitProcessors; - wxSpinCtrl* m_spinCtrlLimitProcessors; - wxStaticText* m_staticText35; wxCheckBox* m_checkBoxStartOnSystemStartup; wxCheckBox* m_checkBoxMinimizeToTray; wxCheckBox* m_checkBoxUseUPnP; @@ -191,7 +185,6 @@ class COptionsDialogBase : public wxDialog // Virtual event handlers, overide them in your derived class virtual void OnListBox( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCheckBoxLimitProcessors( wxCommandEvent& event ) { event.Skip(); } virtual void OnCheckBoxMinimizeToTray( wxCommandEvent& event ) { event.Skip(); } virtual void OnCheckBoxUseProxy( wxCommandEvent& event ) { event.Skip(); } virtual void OnKillFocusProxy( wxFocusEvent& event ) { event.Skip(); } diff --git a/uiproject.fbp b/uiproject.fbp index 6513fd24..d9d46382 100644 --- a/uiproject.fbp +++ b/uiproject.fbp @@ -1814,187 +1814,6 @@ 0 - - 5 - - 0 - - - bSizer71 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - &Limit coin generation to - - - m_checkBoxLimitProcessors - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnCheckBoxLimitProcessors - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - - - 1 - - - 0 - wxID_ANY - 1 - 999 - - 1 - - m_spinCtrlLimitProcessors - protected - - 48,-1 - wxSP_ARROW_KEYS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - - - 1 - - - 0 - wxID_ANY - processors - - - m_staticText35 - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxALL