LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #142 from jgarzik/remove-gui-gen.

Browse source 
Remove GUI 'generate coins' option.
This commit is contained in:
Gavin Andresen 2011-05-03 08:27:45 -07:00
commit b99c23af40
11 changed files with 3 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
db.cpp
View file

@ -778,10 +778,10 @@ bool CWalletDB::LoadWallet()
string strKey; string strKey;
ssKey >> strKey; ssKey >> strKey;
// Menu state
if (strKey == "fGenerateBitcoins") ssValue >> fGenerateBitcoins;
// Options // Options
#ifndef GUI
if (strKey == "fGenerateBitcoins") ssValue >> fGenerateBitcoins;
#endif
if (strKey == "nTransactionFee") ssValue >> nTransactionFee; if (strKey == "nTransactionFee") ssValue >> nTransactionFee;
if (strKey == "addrIncoming") ssValue >> addrIncoming; if (strKey == "addrIncoming") ssValue >> addrIncoming;
if (strKey == "fLimitProcessors") ssValue >> fLimitProcessors; if (strKey == "fLimitProcessors") ssValue >> fLimitProcessors;

5
locale/de/LC_MESSAGES/bitcoin.po
View file

@ -531,11 +531,6 @@ msgstr "Bitcoin Ö&ffnen"
msgid "O&ptions..." msgid "O&ptions..."
msgstr "O&ptionen..." msgstr "O&ptionen..."
#: ../../../ui.cpp:2502
#: ../../../uibase.cpp:34
msgid "&Generate Coins"
msgstr "Münzen Er&zeugen"
#: ../../../ui.cpp:2505 #: ../../../ui.cpp:2505
#: ../../../uibase.cpp:27 #: ../../../uibase.cpp:27
msgid "E&xit" msgid "E&xit"

5
locale/es/LC_MESSAGES/bitcoin.po
View file

@ -556,11 +556,6 @@ msgstr "&Abrir Bitcoin"
msgid "O&ptions..." msgid "O&ptions..."
msgstr "O&pciones" msgstr "O&pciones"
#: ../../../ui.cpp:2521
#: ../../../uibase.cpp:32
msgid "&Generate Coins"
msgstr "&Generar monedas"
#: ../../../ui.cpp:2524 #: ../../../ui.cpp:2524
#: ../../../uibase.cpp:25 #: ../../../uibase.cpp:25
msgid "E&xit" msgid "E&xit"

5
locale/fr/LC_MESSAGES/bitcoin.po
View file

@ -559,11 +559,6 @@ msgstr "&Ouvrir Bitcoin"
msgid "O&ptions..." msgid "O&ptions..."
msgstr "O&ptions..." msgstr "O&ptions..."
#: ../../../ui.cpp:2521
#: ../../../uibase.cpp:32
msgid "&Generate Coins"
msgstr "&Générer des pièces"
#: ../../../ui.cpp:2524 #: ../../../ui.cpp:2524
#: ../../../uibase.cpp:25 #: ../../../uibase.cpp:25
msgid "E&xit" msgid "E&xit"

5
locale/it/LC_MESSAGES/bitcoin.po
View file

@ -527,11 +527,6 @@ msgstr "&Apri Bitcoin"
msgid "O&ptions..." msgid "O&ptions..."
msgstr "O&pzioni..." msgstr "O&pzioni..."
#: ../../../ui.cpp:2502
#: ../../../uibase.cpp:34
msgid "&Generate Coins"
msgstr "&Genera monete"
#: ../../../ui.cpp:2505 #: ../../../ui.cpp:2505
#: ../../../uibase.cpp:27 #: ../../../uibase.cpp:27
msgid "E&xit" msgid "E&xit"

5
locale/nl/LC_MESSAGES/bitcoin.po
View file

@ -528,11 +528,6 @@ msgstr "&Open Bitcoin"
msgid "O&ptions..." msgid "O&ptions..."
msgstr "O&pties" msgstr "O&pties"
#: ../../../ui.cpp:2502
#: ../../../uibase.cpp:34
msgid "&Generate Coins"
msgstr "&Genereer coins"
#: ../../../ui.cpp:2505 #: ../../../ui.cpp:2505
#: ../../../uibase.cpp:27 #: ../../../uibase.cpp:27
msgid "E&xit" msgid "E&xit"

5
locale/pt/LC_MESSAGES/bitcoin.po
View file

@ -527,11 +527,6 @@ msgstr "&Abrir Bitcoin"
msgid "O&ptions..." msgid "O&ptions..."
msgstr "O&pções" msgstr "O&pções"
#: ../../../ui.cpp:2502
#: ../../../uibase.cpp:34
msgid "&Generate Coins"
msgstr "&Gerar Moedas"
#: ../../../ui.cpp:2505 #: ../../../ui.cpp:2505
#: ../../../uibase.cpp:27 #: ../../../uibase.cpp:27
msgid "E&xit" msgid "E&xit"

5
locale/ru/LC_MESSAGES/bitcoin.po
View file

@ -587,11 +587,6 @@ msgstr "&Открыть Bitcoin"
msgid "O&ptions..." msgid "O&ptions..."
msgstr "О&пции..." msgstr "О&пции..."
#: ../../../ui.cpp:2713
#: ../../../uibase.cpp:32
msgid "&Generate Coins"
msgstr "&Генерировать монеты"
#: ../../../ui.cpp:2716 #: ../../../ui.cpp:2716
#: ../../../uibase.cpp:25 #: ../../../uibase.cpp:25
msgid "E&xit" msgid "E&xit"

16
ui.cpp
View file

@ -1094,12 +1094,6 @@ void CMainFrame::OnMenuFileExit(wxCommandEvent& event)
Close(true); Close(true);
} }
void CMainFrame::OnMenuOptionsGenerate(wxCommandEvent& event)
{
// Options->Generate Coins
GenerateBitcoins(event.IsChecked());
}
void CMainFrame::OnUpdateUIOptionsGenerate(wxUpdateUIEvent& event) void CMainFrame::OnUpdateUIOptionsGenerate(wxUpdateUIEvent& event)
{ {
event.Check(fGenerateBitcoins); event.Check(fGenerateBitcoins);
@ -1766,9 +1760,6 @@ void COptionsDialog::OnButtonApply(wxCommandEvent& event)
nLimitProcessors = m_spinCtrlLimitProcessors->GetValue(); nLimitProcessors = m_spinCtrlLimitProcessors->GetValue();
walletdb.WriteSetting("nLimitProcessors", nLimitProcessors); walletdb.WriteSetting("nLimitProcessors", nLimitProcessors);
} }
if (fGenerateBitcoins && (fLimitProcessors ? nLimitProcessors : INT_MAX) > nPrevMaxProc)
GenerateBitcoins(fGenerateBitcoins);
if (fTmpStartOnSystemStartup != m_checkBoxStartOnSystemStartup->GetValue()) if (fTmpStartOnSystemStartup != m_checkBoxStartOnSystemStartup->GetValue())
{ {
fTmpStartOnSystemStartup = m_checkBoxStartOnSystemStartup->GetValue(); fTmpStartOnSystemStartup = m_checkBoxStartOnSystemStartup->GetValue();
@ -2617,7 +2608,6 @@ BEGIN_EVENT_TABLE(CMyTaskBarIcon, wxTaskBarIcon)
EVT_MENU(ID_TASKBAR_RESTORE, CMyTaskBarIcon::OnMenuRestore) EVT_MENU(ID_TASKBAR_RESTORE, CMyTaskBarIcon::OnMenuRestore)
EVT_MENU(ID_TASKBAR_SEND, CMyTaskBarIcon::OnMenuSend) EVT_MENU(ID_TASKBAR_SEND, CMyTaskBarIcon::OnMenuSend)
EVT_MENU(ID_TASKBAR_OPTIONS, CMyTaskBarIcon::OnMenuOptions) EVT_MENU(ID_TASKBAR_OPTIONS, CMyTaskBarIcon::OnMenuOptions)
EVT_MENU(ID_TASKBAR_GENERATE, CMyTaskBarIcon::OnMenuGenerate)
EVT_UPDATE_UI(ID_TASKBAR_GENERATE, CMyTaskBarIcon::OnUpdateUIGenerate) EVT_UPDATE_UI(ID_TASKBAR_GENERATE, CMyTaskBarIcon::OnUpdateUIGenerate)
EVT_MENU(ID_TASKBAR_EXIT, CMyTaskBarIcon::OnMenuExit) EVT_MENU(ID_TASKBAR_EXIT, CMyTaskBarIcon::OnMenuExit)
END_EVENT_TABLE() END_EVENT_TABLE()
@ -2691,11 +2681,6 @@ void CMyTaskBarIcon::Restore()
pframeMain->Raise(); pframeMain->Raise();
} }
void CMyTaskBarIcon::OnMenuGenerate(wxCommandEvent& event)
{
GenerateBitcoins(event.IsChecked());
}
void CMyTaskBarIcon::OnUpdateUIGenerate(wxUpdateUIEvent& event) void CMyTaskBarIcon::OnUpdateUIGenerate(wxUpdateUIEvent& event)
{ {
event.Check(fGenerateBitcoins); event.Check(fGenerateBitcoins);
@ -2718,7 +2703,6 @@ wxMenu* CMyTaskBarIcon::CreatePopupMenu()
pmenu->Append(ID_TASKBAR_RESTORE, _("&Open Bitcoin")); pmenu->Append(ID_TASKBAR_RESTORE, _("&Open Bitcoin"));
pmenu->Append(ID_TASKBAR_SEND, _("&Send Bitcoins")); pmenu->Append(ID_TASKBAR_SEND, _("&Send Bitcoins"));
pmenu->Append(ID_TASKBAR_OPTIONS, _("O&ptions...")); pmenu->Append(ID_TASKBAR_OPTIONS, _("O&ptions..."));
pmenu->AppendCheckItem(ID_TASKBAR_GENERATE, _("&Generate Coins"))->Check(fGenerateBitcoins);
#ifndef __WXMAC_OSX__ // Mac has built-in quit menu #ifndef __WXMAC_OSX__ // Mac has built-in quit menu
pmenu->AppendSeparator(); pmenu->AppendSeparator();
pmenu->Append(ID_TASKBAR_EXIT, _("E&xit")); pmenu->Append(ID_TASKBAR_EXIT, _("E&xit"));

6
uibase.cpp
View file

@ -28,9 +28,6 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
m_menubar->Append( m_menuFile, _("&File") ); m_menubar->Append( m_menuFile, _("&File") );
m_menuOptions = new wxMenu(); m_menuOptions = new wxMenu();
wxMenuItem* m_menuOptionsGenerateBitcoins;
m_menuOptionsGenerateBitcoins = new wxMenuItem( m_menuOptions, wxID_OPTIONSGENERATEBITCOINS, wxString( _("&Generate Coins") ) , wxEmptyString, wxITEM_CHECK );
m_menuOptions->Append( m_menuOptionsGenerateBitcoins );
wxMenuItem* m_menuOptionsChangeYourAddress; wxMenuItem* m_menuOptionsChangeYourAddress;
m_menuOptionsChangeYourAddress = new wxMenuItem( m_menuOptions, wxID_ANY, wxString( _("&Your Receiving Addresses...") ) , wxEmptyString, wxITEM_NORMAL ); m_menuOptionsChangeYourAddress = new wxMenuItem( m_menuOptions, wxID_ANY, wxString( _("&Your Receiving Addresses...") ) , wxEmptyString, wxITEM_NORMAL );
@ -190,8 +187,6 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
this->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) ); this->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );
this->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) ); this->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) );
this->Connect( m_menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) ); this->Connect( m_menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) );
this->Connect( m_menuOptionsGenerateBitcoins->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsGenerate ) );
this->Connect( m_menuOptionsGenerateBitcoins->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateUIOptionsGenerate ) );
this->Connect( m_menuOptionsChangeYourAddress->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsChangeYourAddress ) ); this->Connect( m_menuOptionsChangeYourAddress->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsChangeYourAddress ) );
this->Connect( m_menuOptionsOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsOptions ) ); this->Connect( m_menuOptionsOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsOptions ) );
this->Connect( m_menuHelpAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuHelpAbout ) ); this->Connect( m_menuHelpAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuHelpAbout ) );
@ -250,7 +245,6 @@ CMainFrameBase::~CMainFrameBase()
this->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) ); this->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );
this->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) ); this->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsGenerate ) );
this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateUIOptionsGenerate ) ); 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::OnMenuOptionsChangeYourAddress ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsOptions ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsOptions ) );

15
uiproject.fbp
View file

@ -147,21 +147,6 @@
<property name="label">&amp;Settings</property> <property name="label">&amp;Settings</property>
<property name="name">m_menuOptions</property> <property name="name">m_menuOptions</property>
<property name="permission">public</property> <property name="permission">public</property>
<object class="wxMenuItem" expanded="1">
<property name="bitmap"></property>
<property name="checked">0</property>
<property name="enabled">1</property>
<property name="help"></property>
<property name="id">wxID_OPTIONSGENERATEBITCOINS</property>
<property name="kind">wxITEM_CHECK</property>
<property name="label">&amp;Generate Coins</property>
<property name="name">m_menuOptionsGenerateBitcoins</property>
<property name="permission">none</property>
<property name="shortcut"></property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnMenuOptionsGenerate</event>
<event name="OnUpdateUI">OnUpdateUIOptionsGenerate</event>
</object>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="checked">0</property> <property name="checked">0</property>