flush wallet.dat, multi-proc, reorg options, revert to startup folder shortcut

1 files changed, 87 insertions, 106 deletions

diff --git a/uibase.h b/uibase.h
index 61e0552283..e262a3dcb6 100644
--- a/uibase.h
+++ b/uibase.h
@@ -30,69 +30,70 @@
 #include <wx/frame.h>

 #include <wx/html/htmlwin.h>

 #include <wx/dialog.h>

-#include <wx/treectrl.h>

-#include <wx/statline.h>

+#include <wx/listbox.h>

+#include <wx/checkbox.h>

+#include <wx/spinctrl.h>

+#include <wx/scrolwin.h>

 #include <wx/statbmp.h>

 #include <wx/combobox.h>

-#include <wx/scrolwin.h>

 #include <wx/richtext/richtextctrl.h>

-#include <wx/checkbox.h>

+#include <wx/treectrl.h>

 

 ///////////////////////////////////////////////////////////////////////////

 

 #define wxID_MAINFRAME 1000

-#define wxID_OPTIONSGENERATEBITCOINS 1001

-#define wxID_BUTTONSEND 1002

-#define wxID_BUTTONRECEIVE 1003

-#define wxID_TEXTCTRLADDRESS 1004

-#define wxID_BUTTONCOPY 1005

-#define wxID_BUTTONCHANGE 1006

-#define wxID_TEXTCTRLPAYTO 1007

-#define wxID_BUTTONPASTE 1008

-#define wxID_BUTTONADDRESSBOOK 1009

-#define wxID_TEXTCTRLAMOUNT 1010

-#define wxID_CHOICETRANSFERTYPE 1011

-#define wxID_LISTCTRL 1012

-#define wxID_BUTTONRENAME 1013

-#define wxID_BUTTONNEW 1014

-#define wxID_BUTTONEDIT 1015

-#define wxID_BUTTONDELETE 1016

-#define wxID_DEL0 1017

-#define wxID_DEL1 1018

-#define wxID_DEL2 1019

-#define wxID_DEL3 1020

-#define wxID_DEL4 1021

-#define wxID_DEL5 1022

-#define wxID_DEL6 1023

-#define wxID_DEL7 1024

-#define wxID_DEL8 1025

-#define wxID_DEL9 1026

-#define wxID_DEL10 1027

-#define wxID_DEL11 1028

-#define wxID_DEL12 1029

-#define wxID_DEL13 1030

-#define wxID_DEL14 1031

-#define wxID_DEL15 1032

-#define wxID_DEL16 1033

-#define wxID_DEL17 1034

-#define wxID_DEL18 1035

-#define wxID_DEL19 1036

-#define wxID_BUTTONPREVIEW 1037

-#define wxID_BUTTONSAMPLE 1038

-#define wxID_CANCEL2 1039

-#define wxID_BUTTONBACK 1040

-#define wxID_BUTTONNEXT 1041

-#define wxID_SUBMIT 1042

-#define wxID_OPENNEWTABLE 1043

-#define wxID_DEALHAND 1044

-#define wxID_FOLD 1045

-#define wxID_CALL 1046

-#define wxID_RAISE 1047

-#define wxID_LEAVETABLE 1048

-#define wxID_DITCHPLAYER 1049

-#define wxID_TEXTCTRL 1050

-#define wxID_TRANSACTIONFEE 1051

-#define wxID_MINTOTRAY 1052

+#define wxID_VIEWSHOWGENERATED 1001

+#define wxID_OPTIONSGENERATEBITCOINS 1002

+#define wxID_BUTTONSEND 1003

+#define wxID_BUTTONRECEIVE 1004

+#define wxID_TEXTCTRLADDRESS 1005

+#define wxID_BUTTONCOPY 1006

+#define wxID_BUTTONCHANGE 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_BUTTONNEW 1016

+#define wxID_BUTTONEDIT 1017

+#define wxID_BUTTONDELETE 1018

+#define wxID_DEL0 1019

+#define wxID_DEL1 1020

+#define wxID_DEL2 1021

+#define wxID_DEL3 1022

+#define wxID_DEL4 1023

+#define wxID_DEL5 1024

+#define wxID_DEL6 1025

+#define wxID_DEL7 1026

+#define wxID_DEL8 1027

+#define wxID_DEL9 1028

+#define wxID_DEL10 1029

+#define wxID_DEL11 1030

+#define wxID_DEL12 1031

+#define wxID_DEL13 1032

+#define wxID_DEL14 1033

+#define wxID_DEL15 1034

+#define wxID_DEL16 1035

+#define wxID_DEL17 1036

+#define wxID_DEL18 1037

+#define wxID_DEL19 1038

+#define wxID_BUTTONPREVIEW 1039

+#define wxID_BUTTONSAMPLE 1040

+#define wxID_CANCEL2 1041

+#define wxID_BUTTONBACK 1042

+#define wxID_BUTTONNEXT 1043

+#define wxID_SUBMIT 1044

+#define wxID_OPENNEWTABLE 1045

+#define wxID_DEALHAND 1046

+#define wxID_FOLD 1047

+#define wxID_CALL 1048

+#define wxID_RAISE 1049

+#define wxID_LEAVETABLE 1050

+#define wxID_DITCHPLAYER 1051

+#define wxID_TEXTCTRL 1052

 

 ///////////////////////////////////////////////////////////////////////////////

 /// Class CMainFrameBase

@@ -104,6 +105,7 @@ class CMainFrameBase : public wxFrame
 	protected:

 		wxMenuBar* m_menubar;

 		wxMenu* m_menuFile;

+		wxMenu* m_menuView;

 		wxMenu* m_menuHelp;

 		wxToolBar* m_toolBar;

 		wxStatusBar* m_statusBar;

@@ -132,8 +134,10 @@ 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 OnMenuViewShowGenerated( wxCommandEvent& event ){ event.Skip(); }

+		virtual void OnUpdateUIViewShowGenerated( wxUpdateUIEvent& event ){ event.Skip(); }

 		virtual void OnMenuOptionsGenerate( wxCommandEvent& event ){ event.Skip(); }

-		virtual void OnUpdateMenuGenerate( wxUpdateUIEvent& 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(); }

@@ -193,21 +197,42 @@ class COptionsDialogBase : public wxDialog
 	private:

 	

 	protected:

-		wxBoxSizer* panelSizer;

-		wxTreeCtrl* m_treeCtrl;

-		wxStaticLine* m_staticline1;

+		wxListBox* m_listBox;

+		wxScrolledWindow* m_scrolledWindow;

+		wxPanel* m_panelMain;

+		

+		wxStaticText* m_staticText32;

+		wxStaticText* m_staticText31;

+		wxTextCtrl* m_textCtrlTransactionFee;

+		wxCheckBox* m_checkBoxLimitProcessors;

+		wxSpinCtrl* m_spinCtrlLimitProcessors;

+		wxStaticText* m_staticText35;

+		wxCheckBox* m_checkBoxStartOnSystemStartup;

+		wxCheckBox* m_checkBoxMinimizeToTray;

+		

+		wxCheckBox* m_checkBoxMinimizeOnClose;

+		wxPanel* m_panelTest2;

+		

+		wxStaticText* m_staticText321;

+		wxStaticText* m_staticText69;

+		wxStaticText* m_staticText70;

+		wxStaticText* m_staticText71;

 		wxButton* m_buttonOK;

 		wxButton* m_buttonCancel;

 		wxButton* m_buttonApply;

 		

 		// Virtual event handlers, overide them in your derived class

-		virtual void MenuSelChanged( wxTreeEvent& event ){ event.Skip(); }

+		virtual void OnListBox( wxCommandEvent& event ){ event.Skip(); }

+		virtual void OnKillFocusTransactionFee( wxFocusEvent& event ){ event.Skip(); }

+		virtual void OnCheckBoxLimitProcessors( wxCommandEvent& event ){ event.Skip(); }

+		virtual void OnCheckBoxMinimizeToTray( wxCommandEvent& event ){ event.Skip(); }

 		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }

 		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }

+		virtual void OnButtonApply( wxCommandEvent& event ){ event.Skip(); }

 		

 	

 	public:

-		COptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 555,377 ), long style = wxDEFAULT_DIALOG_STYLE );

+		COptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 540,360 ), long style = wxDEFAULT_DIALOG_STYLE );

 		~COptionsDialogBase();

 	

 };

@@ -720,48 +745,4 @@ class CGetTextFromUserDialogBase : public wxDialog
 	

 };

 

-///////////////////////////////////////////////////////////////////////////////

-/// Class COptionsPanelBitcoinBase

-///////////////////////////////////////////////////////////////////////////////

-class COptionsPanelBitcoinBase : public wxPanel 

-{

-	private:

-	

-	protected:

-		

-		wxStaticText* m_staticText32;

-		wxStaticText* m_staticText31;

-		

-		// Virtual event handlers, overide them in your derived class

-		virtual void OnKillFocusTransactionFee( wxFocusEvent& event ){ event.Skip(); }

-		

-	

-	public:

-		wxTextCtrl* m_textCtrlTransactionFee;

-		COptionsPanelBitcoinBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );

-		~COptionsPanelBitcoinBase();

-	

-};

-

-///////////////////////////////////////////////////////////////////////////////

-/// Class COptionsPanelUIBase

-///////////////////////////////////////////////////////////////////////////////

-class COptionsPanelUIBase : public wxPanel 

-{

-	private:

-	

-	protected:

-		

-	

-	public:

-		wxCheckBox* m_checkMinToTray;

-		wxCheckBox* m_checkCloseToTray;

-		wxCheckBox* m_checkStartOnSysBoot;

-		wxCheckBox* m_checkAskBeforeClosing;

-		wxCheckBox* m_checkAlwaysShowTray;

-		COptionsPanelUIBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );

-		~COptionsPanelUIBase();

-	

-};

-

 #endif //__uibase__