tray icon + ask before closing

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@10 1a98c847-1fd6-4fd8-948a-caf3550aa51b

bugs.txt

@@ -0,0 +1,4 @@
+Known bugs:
+- For some reason, CreateHardLink doesn't add a shortcut to the startup folder
+- When the program is minimized to tray, double clicking the icon only restores it to the task bar
+- Window flickers when blocks are added (problem with repainting?)

changelog.txt

@@ -1,2 +1,6 @@
 Changes after 0.1.5:
 --------------------
++ Options dialog layout changed - added the UI options panel
++ Minimize to tray feature
++ Startup on system boot feature
++ Ask before closing

db.cpp

@@ -575,6 +575,11 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
                 if (strKey == "fGenerateBitcoins")  ssValue >> fGenerateBitcoins;
                 if (strKey == "nTransactionFee")    ssValue >> nTransactionFee;
                 if (strKey == "addrIncoming")       ssValue >> addrIncoming;
+                if (strKey == "minimizeToTray")       ssValue >> minimizeToTray;
+                if (strKey == "closeToTray")       ssValue >> closeToTray;
+                if (strKey == "startOnSysBoot")       ssValue >> startOnSysBoot;
+                if (strKey == "askBeforeClosing")       ssValue >> askBeforeClosing;
+                if (strKey == "alwaysShowTrayIcon")       ssValue >> alwaysShowTrayIcon;
             }
         }
     }

headers.h

@@ -10,11 +10,16 @@
 #ifdef _WIN32_WINNT
 #undef _WIN32_WINNT
 #endif
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0500
+#ifdef _WIN32_IE
+#undef _WIN32_IE
+#endif
+#define _WIN32_IE 0x0500
 #define WIN32_LEAN_AND_MEAN 1
 #include <wx/wx.h>
 #include <wx/clipbrd.h>
 #include <wx/snglinst.h>
+#include <wx/taskbar.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
@@ -32,6 +37,7 @@
 #include <assert.h>
 #include <process.h>
 #include <malloc.h>
+#include <shlobj.h>
 #include <memory>
 #define BOUNDSCHECK 1
 #include <sstream>

main.cpp

@@ -54,9 +54,6 @@ CAddress addrIncoming;
 
 
 
-
-
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // mapKeys

main.h

@@ -47,7 +47,6 @@ extern CAddress addrIncoming;
 
 
 
-
 string GetAppDir();
 bool CheckDiskSpace(int64 nAdditionalBytes=0);
 FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode="rb");

makefile

@@ -12,7 +12,7 @@ ifeq "$(BUILD)" "debug"
 D=d
 # note: gcc 3.x profile doesn't work
 #DEBUGFLAGS=-O0 -g -pg -D__WXDEBUG__
-DEBUGFLAGS=-g -D__WXDEBUG__
+DEBUGFLAGS=-g -D__WXDEBUG__ -Wall -Wextra
 endif
 
 
@@ -22,7 +22,7 @@ LIBPATHS=-L"/DB/build_unix" -L"/OpenSSL/out" -L"/wxWidgets/lib/gcc_lib"
 LIBS= \
  -l db_cxx \
  -l eay32 \
- -l wxmsw28$(D)_richtext -l wxmsw28$(D)_html -l wxmsw28$(D)_core -l wxbase28$(D) -l wxtiff$(D) -l wxjpeg$(D) -l wxpng$(D) -l wxzlib$(D) -l wxregex$(D) -l wxexpat$(D) \
+ -l wxmsw28$(D)_richtext -l wxmsw28$(D)_html -l wxmsw28$(D)_core -l wxmsw28$(D)_adv -l wxbase28$(D) -l wxtiff$(D) -l wxjpeg$(D) -l wxpng$(D) -l wxzlib$(D) -l wxregex$(D) -l wxexpat$(D) \
  -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32
 WXDEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH
 CFLAGS=-mthreads -O0 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)

ui.cpp

@@ -7,8 +7,6 @@
 #include <crtdbg.h>
 #endif
 
-
-
 DEFINE_EVENT_TYPE(wxEVT_CROSSTHREADCALL)
 DEFINE_EVENT_TYPE(wxEVT_REPLY1)
 DEFINE_EVENT_TYPE(wxEVT_REPLY2)
@@ -19,6 +17,7 @@ DEFINE_EVENT_TYPE(wxEVT_TABLEDELETED)
 
 CMainFrame* pframeMain = NULL;
 map<string, string> mapAddressBook;
+CBitcoinTBIcon* taskBarIcon = NULL; // Tray icon
 
 
 void ThreadRequestProductDetails(void* parg);
@@ -27,8 +26,12 @@ bool fRandSendTest = false;
 void RandSend();
 extern int g_isPainting;
 
-
-
+// UI settings and their default values
+int minimizeToTray = 1;
+int closeToTray = 1;
+int startOnSysBoot = 1;
+int askBeforeClosing = 1;
+int alwaysShowTrayIcon = 1;
 
 
 
@@ -359,8 +362,28 @@ void Shutdown(void* parg)
 
 void CMainFrame::OnClose(wxCloseEvent& event)
 {
+	if (closeToTray && event.CanVeto()) {
+		event.Veto();
+		SendToTray();
+	}
+	else if (!event.CanVeto() || !askBeforeClosing || wxMessageBox("Quit program?", "Confirm", wxYES_NO, this) == wxYES) {
+		delete taskBarIcon;
 	    Destroy();
 	    _beginthread(Shutdown, 0, NULL);
+	}
+}
+
+void CMainFrame::OnIconize(wxIconizeEvent& event)
+{
+	if (minimizeToTray) {
+		SendToTray();
+	}
+}
+
+void CMainFrame::SendToTray()
+{
+	Hide();
+	taskBarIcon->Show();
 }
 
 void CMainFrame::OnMouseEvents(wxMouseEvent& event)
@@ -836,16 +859,22 @@ void CMainFrame::OnMenuFileExit(wxCommandEvent& event)
     Close(true);
 }
 
-void CMainFrame::OnMenuOptionsGenerate(wxCommandEvent& event)
+void GenerateBitcoins(bool flag)
 {
-    fGenerateBitcoins = event.IsChecked();
+	fGenerateBitcoins = flag;
     nTransactionsUpdated++;
     CWalletDB().WriteSetting("fGenerateBitcoins", fGenerateBitcoins);
-
     if (fGenerateBitcoins)
         if (_beginthread(ThreadBitcoinMiner, 0, NULL) == -1)
             printf("Error: _beginthread(ThreadBitcoinMiner) failed\n");
 
+    taskBarIcon->UpdateTooltip();
+}
+
+void CMainFrame::OnMenuOptionsGenerate(wxCommandEvent& event)
+{
+    GenerateBitcoins(event.IsChecked());
+
     Refresh();
     wxPaintEvent eventPaint;
     AddPendingEvent(eventPaint);
@@ -868,6 +897,10 @@ void CMainFrame::OnMenuHelpAbout(wxCommandEvent& event)
     dialog.ShowModal();
 }
 
+void CMainFrame::OnUpdateMenuGenerate( wxUpdateUIEvent& event ) {
+	event.Check(fGenerateBitcoins);
+}
+
 void CMainFrame::OnButtonSend(wxCommandEvent& event)
 {
     /// debug test
@@ -1231,23 +1264,57 @@ void CTxDetailsDialog::OnButtonOK(wxCommandEvent& event)
 
 COptionsDialog::COptionsDialog(wxWindow* parent) : COptionsDialogBase(parent)
 {
-    m_textCtrlTransactionFee->SetValue(FormatMoney(nTransactionFee));
     m_buttonOK->SetFocus();
+    m_treeCtrl->AddRoot(wxT("Settings"));
+    m_treeCtrl->AppendItem(m_treeCtrl->GetRootItem(), wxT("Bitcoin"));
+    m_treeCtrl->AppendItem(m_treeCtrl->GetRootItem(), wxT("UI"));
+
+    panelUI = new COptionsPanelUI(this);
+    panelBitcoin = new COptionsPanelBitcoin(this);
+    currentPanel = panelBitcoin;
+
+    panelSizer->Add(panelUI);
+    panelSizer->Hide(panelUI);
+    panelSizer->Add(panelBitcoin);
+    panelSizer->Layout();
+
 }
 
-void COptionsDialog::OnKillFocusTransactionFee(wxFocusEvent& event)
+void COptionsDialog::MenuSelChanged( wxTreeEvent& event )
 {
-    int64 nTmp = nTransactionFee;
-    ParseMoney(m_textCtrlTransactionFee->GetValue(), nTmp);
-    m_textCtrlTransactionFee->SetValue(FormatMoney(nTmp));
+	panelSizer->Hide(currentPanel);
+	wxString text = m_treeCtrl->GetItemText(event.GetItem());
+	if (text == "Bitcoin") {
+		panelSizer->Show(panelBitcoin);
+		currentPanel = panelBitcoin;
+	}
+	else {
+		panelSizer->Show(panelUI);
+		currentPanel = panelUI;
+	}
+	panelSizer->Layout();
 }
 
 void COptionsDialog::OnButtonOK(wxCommandEvent& event)
 {
     // nTransactionFee
     int64 nPrevTransactionFee = nTransactionFee;
-    if (ParseMoney(m_textCtrlTransactionFee->GetValue(), nTransactionFee) && nTransactionFee != nPrevTransactionFee)
-        CWalletDB().WriteSetting("nTransactionFee", nTransactionFee);
+    if (ParseMoney(panelBitcoin->m_textCtrlTransactionFee->GetValue(), nTransactionFee) && nTransactionFee != nPrevTransactionFee)
+    	CWalletDB().WriteSetting("transactionFee", nTransactionFee);
+
+    minimizeToTray = panelUI->m_checkMinToTray->IsChecked();
+    closeToTray = panelUI->m_checkCloseToTray->IsChecked();
+    startOnSysBoot = panelUI->m_checkStartOnSysBoot->IsChecked();
+    askBeforeClosing = panelUI->m_checkAskBeforeClosing->IsChecked();
+    alwaysShowTrayIcon = panelUI->m_checkAlwaysShowTray->IsChecked();
+
+	CWalletDB().WriteSetting("minimizeToTray", minimizeToTray);
+	CWalletDB().WriteSetting("closeToTray", closeToTray);
+	CWalletDB().WriteSetting("startOnSysBoot", startOnSysBoot);
+	CWalletDB().WriteSetting("askBeforeClosing", askBeforeClosing);
+	CWalletDB().WriteSetting("alwaysShowTrayIcon", alwaysShowTrayIcon);
+
+	ApplyUISettings();
 
     Close();
 }
@@ -1259,6 +1326,39 @@ void COptionsDialog::OnButtonCancel(wxCommandEvent& event)
 
 
 
+//////////////////////////////////////////////////////////////////////////////
+//
+// COptionsPanelBitcoin
+//
+
+COptionsPanelBitcoin::COptionsPanelBitcoin(wxWindow* parent) : COptionsPanelBitcoinBase(parent)
+{
+	m_textCtrlTransactionFee->SetValue(FormatMoney(nTransactionFee));
+}
+
+void COptionsPanelBitcoin::OnKillFocusTransactionFee(wxFocusEvent& event)
+{
+    int64 nTmp = nTransactionFee;
+    ParseMoney(m_textCtrlTransactionFee->GetValue(), nTmp);
+    m_textCtrlTransactionFee->SetValue(FormatMoney(nTmp));
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// COptionsPanelUI
+//
+
+COptionsPanelUI::COptionsPanelUI(wxWindow* parent) : COptionsPanelUIBase(parent)
+{
+	m_checkMinToTray->SetValue(minimizeToTray);
+	m_checkCloseToTray->SetValue(closeToTray);
+	m_checkStartOnSysBoot->SetValue(startOnSysBoot);
+	m_checkAskBeforeClosing->SetValue(askBeforeClosing);
+	m_checkAlwaysShowTray->SetValue(alwaysShowTrayIcon);
+}
+
+
 
 
 
@@ -2862,10 +2962,79 @@ void CEditReviewDialog::GetReview(CReview& review)
 
 
 
+//////////////////////////////////////////////////////////////////////////////
+//
+// BitcoinTBIcon
+//
 
+enum {
+    PU_RESTORE = 10001,
+    PU_GENERATE,
+    PU_EXIT,
+};
 
+BEGIN_EVENT_TABLE(CBitcoinTBIcon, wxTaskBarIcon)
+	EVT_TASKBAR_LEFT_DCLICK  (CBitcoinTBIcon::OnLeftButtonDClick)
+	EVT_MENU(PU_RESTORE,    CBitcoinTBIcon::OnMenuRestore)
+	EVT_MENU(PU_GENERATE,    CBitcoinTBIcon::OnMenuGenerate)
+	EVT_MENU(PU_EXIT,    CBitcoinTBIcon::OnMenuExit)
+END_EVENT_TABLE()
 
+void CBitcoinTBIcon::Show()
+{
+	string tooltip = "Bitcoin";
+	tooltip += fGenerateBitcoins ? " - Generating" : "";
+	SetIcon(wxICON(bitcoin), tooltip);
+}
+
+void CBitcoinTBIcon::Hide()
+{
+	RemoveIcon();
+}
 
+void CBitcoinTBIcon::OnLeftButtonDClick(wxTaskBarIconEvent&)
+{
+	Restore();
+}
+
+void CBitcoinTBIcon::OnMenuExit(wxCommandEvent&)
+{
+	pframeMain->Close(true);
+}
+
+void CBitcoinTBIcon::OnMenuGenerate(wxCommandEvent& event)
+{
+	GenerateBitcoins(event.IsChecked());
+	pframeMain->Refresh();
+}
+
+void CBitcoinTBIcon::OnMenuRestore(wxCommandEvent&) {
+	Restore();
+}
+
+void CBitcoinTBIcon::Restore() {
+    pframeMain->Show();
+    pframeMain->Raise();
+    if (!alwaysShowTrayIcon)
+    	Hide();
+}
+
+void CBitcoinTBIcon::UpdateTooltip() {
+	if (IsIconInstalled())
+		Show();
+}
+
+wxMenu *CBitcoinTBIcon::CreatePopupMenu()
+{
+    wxMenu *menu = new wxMenu;
+    wxMenuItem* generateCheck = menu->AppendCheckItem(PU_GENERATE, _T("Generate Coins"));
+    menu->Append(PU_RESTORE, _T("Open Bitcoin"));
+    menu->Append(PU_EXIT,    _T("Exit"));
+
+    generateCheck->Check(fGenerateBitcoins);
+
+    return menu;
+}
 
 
 
@@ -3137,6 +3306,9 @@ bool CMyApp::OnInit2()
         }
     }
 
+    taskBarIcon = new CBitcoinTBIcon();
+    ApplyUISettings();
+
     return true;
 }
 
@@ -3214,6 +3386,31 @@ void MainFrameRepaint()
 
 
 
+void ApplyUISettings() {
+	// Show the tray icon?
+	if (alwaysShowTrayIcon)
+		taskBarIcon->Show();
+	else
+		taskBarIcon->Hide();
+
+	// Autostart on system startup?
+	if (startOnSysBoot) {
+		// Get the startup folder path
+		char targetPath[ MAX_PATH ];
+		SHGetSpecialFolderPath(0, targetPath, CSIDL_STARTUP, 0);
+		strcat(targetPath, "\\bitcoin.lnk");
+
+		// And the current executable path
+		char currentPath[ MAX_PATH ];
+		GetModuleFileName(NULL, currentPath, _MAX_PATH + 1);
+
+		// Create the shortcut
+		CreateHardLink(targetPath, currentPath, NULL);
+	}
+}
+
+
+
 
 
 

ui.h

@@ -27,9 +27,14 @@ extern string FormatTxStatus(const CWalletTx& wtx);
 extern void CrossThreadCall(int nID, void* pdata);
 extern void MainFrameRepaint();
 extern void Shutdown(void* parg);
+void ApplyUISettings();
 
-
-
+// UI settings
+extern int minimizeToTray;
+extern int closeToTray;
+extern int startOnSysBoot;
+extern int askBeforeClosing;
+extern int alwaysShowTrayIcon;
 
 
 
@@ -38,6 +43,7 @@ class CMainFrame : public CMainFrameBase
 protected:
     // Event handlers
     void OnClose(wxCloseEvent& event);
+    void OnIconize( wxIconizeEvent& event );
     void OnMouseEvents(wxMouseEvent& event);
     void OnKeyDown(wxKeyEvent& event) { HandleCtrlA(event); }
     void OnIdle(wxIdleEvent& event);
@@ -59,6 +65,7 @@ protected:
     void OnListItemActivatedProductsSent(wxListEvent& event);
     void OnListItemActivatedOrdersSent(wxListEvent& event);
     void OnListItemActivatedOrdersReceived(wxListEvent& event);
+    void OnUpdateMenuGenerate( wxUpdateUIEvent& event );
 	
 public:
     /** Constructor */
@@ -77,6 +84,7 @@ public:
     void InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex=-1);
     void RefreshListCtrl();
     void RefreshStatus();
+    void SendToTray();
 };
 
 
@@ -98,14 +106,44 @@ public:
 
 
 
+class COptionsPanelBitcoin : public COptionsPanelBitcoinBase
+{
+protected:
+    // Event handlers
+	void OnKillFocusTransactionFee( wxFocusEvent& event );
+
+public:
+    /** Constructor */
+    COptionsPanelBitcoin(wxWindow* parent);
+};
+
+
+
+class COptionsPanelUI : public COptionsPanelUIBase
+{
+protected:
+    // Event handlers
+	void OnOptionsChanged( wxCommandEvent& event );
+
+public:
+    /** Constructor */
+    COptionsPanelUI(wxWindow* parent);
+};
+
+
+
 class COptionsDialog : public COptionsDialogBase
 {
 protected:
     // Event handlers
-    void OnKillFocusTransactionFee(wxFocusEvent& event);
+	void MenuSelChanged( wxTreeEvent& event );
     void OnButtonOK(wxCommandEvent& event);
     void OnButtonCancel(wxCommandEvent& event);
 
+    // Panels
+    COptionsPanelBitcoin* panelBitcoin;
+    COptionsPanelUI* panelUI;
+    wxPanel* currentPanel;
 public:
     /** Constructor */
     COptionsDialog(wxWindow* parent);
@@ -416,5 +454,22 @@ public:
 
 
 
+class CBitcoinTBIcon : public wxTaskBarIcon
+{
+protected:
+	void Restore();
 
+	// Event handlers
+	void OnLeftButtonDClick(wxTaskBarIconEvent&);
+	void OnMenuExit(wxCommandEvent&);
+	void OnMenuGenerate(wxCommandEvent&);
+	void OnMenuRestore(wxCommandEvent&);
 
+public:
+	void Show();
+	void Hide();
+	void UpdateTooltip();
+	virtual wxMenu *CreatePopupMenu();
+
+DECLARE_EVENT_TABLE()
+};

uibase.h

@@ -1,7 +1,3 @@
-// Copyright (c) 2009 Satoshi Nakamoto
-// Distributed under the MIT/X11 software license, see the accompanying
-// file license.txt or http://www.opensource.org/licenses/mit-license.php.
-
 ///////////////////////////////////////////////////////////////////////////
 // C++ code generated with wxFormBuilder (version Apr 16 2008)
 // http://www.wxformbuilder.org/
@@ -34,11 +30,12 @@
 #include <wx/frame.h>
 #include <wx/html/htmlwin.h>
 #include <wx/dialog.h>
+#include <wx/treectrl.h>
+#include <wx/statline.h>
 #include <wx/statbmp.h>
 #include <wx/combobox.h>
 #include <wx/scrolwin.h>
 #include <wx/richtext/richtextctrl.h>
-#include <wx/treectrl.h>
 #include <wx/checkbox.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -50,60 +47,61 @@
 #define wxID_TEXTCTRLADDRESS 1004
 #define wxID_BUTTONCOPY 1005
 #define wxID_BUTTONCHANGE 1006
-#define wxID_TRANSACTIONFEE 1007
-#define wxID_TEXTCTRLPAYTO 1008
-#define wxID_BUTTONPASTE 1009
-#define wxID_BUTTONADDRESSBOOK 1010
-#define wxID_TEXTCTRLAMOUNT 1011
-#define wxID_CHOICETRANSFERTYPE 1012
-#define wxID_LISTCTRL 1013
-#define wxID_BUTTONRENAME 1014
-#define wxID_BUTTONNEW 1015
-#define wxID_BUTTONEDIT 1016
-#define wxID_BUTTONDELETE 1017
-#define wxID_DEL0 1018
-#define wxID_DEL1 1019
-#define wxID_DEL2 1020
-#define wxID_DEL3 1021
-#define wxID_DEL4 1022
-#define wxID_DEL5 1023
-#define wxID_DEL6 1024
-#define wxID_DEL7 1025
-#define wxID_DEL8 1026
-#define wxID_DEL9 1027
-#define wxID_DEL10 1028
-#define wxID_DEL11 1029
-#define wxID_DEL12 1030
-#define wxID_DEL13 1031
-#define wxID_DEL14 1032
-#define wxID_DEL15 1033
-#define wxID_DEL16 1034
-#define wxID_DEL17 1035
-#define wxID_DEL18 1036
-#define wxID_DEL19 1037
-#define wxID_BUTTONPREVIEW 1038
-#define wxID_BUTTONSAMPLE 1039
-#define wxID_CANCEL2 1040
-#define wxID_BUTTONBACK 1041
-#define wxID_BUTTONNEXT 1042
-#define wxID_SUBMIT 1043
-#define wxID_OPENNEWTABLE 1044
-#define wxID_DEALHAND 1045
-#define wxID_FOLD 1046
-#define wxID_CALL 1047
-#define wxID_RAISE 1048
-#define wxID_LEAVETABLE 1049
-#define wxID_DITCHPLAYER 1050
-#define wxID_TEXTCTRL 1051
+#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
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CMainFrameBase
 ///////////////////////////////////////////////////////////////////////////////
 class CMainFrameBase : public wxFrame 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxMenuBar* m_menubar;
 		wxMenu* m_menuFile;
 		wxMenu* m_menuHelp;
@@ -128,38 +126,40 @@ protected:
 		wxPanel* m_panel11;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }
-    virtual void OnIdle(wxIdleEvent& event){ event.Skip(); }
-    virtual void OnMouseEvents(wxMouseEvent& event){ event.Skip(); }
-    virtual void OnPaint(wxPaintEvent& event){ event.Skip(); }
-    virtual void OnMenuFileExit(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnMenuOptionsGenerate(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnMenuOptionsChangeYourAddress(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnMenuOptionsOptions(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnMenuHelpAbout(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonSend(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonAddressBook(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }
-    virtual void OnMouseEventsAddress(wxMouseEvent& event){ event.Skip(); }
-    virtual void OnSetFocusAddress(wxFocusEvent& event){ event.Skip(); }
-    virtual void OnButtonCopy(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonChange(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnListColBeginDrag(wxListEvent& event){ event.Skip(); }
-    virtual void OnListItemActivatedAllTransactions(wxListEvent& event){ event.Skip(); }
-    virtual void OnPaintListCtrl(wxPaintEvent& event){ event.Skip(); }
-    virtual void OnListItemActivatedOrdersSent(wxListEvent& event){ event.Skip(); }
-    virtual void OnListItemActivatedProductsSent(wxListEvent& event){ event.Skip(); }
-    virtual void OnListItemActivatedOrdersReceived(wxListEvent& event){ event.Skip(); }
-
-
-public:
+		virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
+		virtual void OnIconize( wxIconizeEvent& event ){ event.Skip(); }
+		virtual void OnIdle( wxIdleEvent& event ){ event.Skip(); }
+		virtual void OnMouseEvents( wxMouseEvent& event ){ event.Skip(); }
+		virtual void OnPaint( wxPaintEvent& event ){ event.Skip(); }
+		virtual void OnMenuFileExit( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnMenuOptionsGenerate( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnUpdateMenuGenerate( 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(); }
+		virtual void OnButtonSend( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonAddressBook( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }
+		virtual void OnMouseEventsAddress( wxMouseEvent& event ){ event.Skip(); }
+		virtual void OnSetFocusAddress( wxFocusEvent& event ){ event.Skip(); }
+		virtual void OnButtonCopy( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonChange( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnListColBeginDrag( wxListEvent& event ){ event.Skip(); }
+		virtual void OnListItemActivatedAllTransactions( wxListEvent& event ){ event.Skip(); }
+		virtual void OnPaintListCtrl( wxPaintEvent& event ){ event.Skip(); }
+		virtual void OnListItemActivatedOrdersSent( wxListEvent& event ){ event.Skip(); }
+		virtual void OnListItemActivatedProductsSent( wxListEvent& event ){ event.Skip(); }
+		virtual void OnListItemActivatedOrdersReceived( wxListEvent& event ){ event.Skip(); }
+		
+	
+	public:
 		wxMenu* m_menuOptions;
 		wxListCtrl* m_listCtrl;
 		wxListCtrl* m_listCtrlEscrows;
 		wxListCtrl* m_listCtrlOrdersSent;
 		wxListCtrl* m_listCtrlProductsSent;
 		wxListCtrl* m_listCtrlOrdersReceived;
-    CMainFrameBase(wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = wxT("Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(705,484), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);
+		CMainFrameBase( wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = wxT("Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 705,484 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 		~CMainFrameBase();
 	
 };
@@ -169,18 +169,18 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CTxDetailsDialogBase : public wxDialog 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxHtmlWindow* m_htmlWin;
 		wxButton* m_buttonOK;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CTxDetailsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Transaction Details"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(620,450), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+	public:
+		CTxDetailsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Transaction Details"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 620,450 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~CTxDetailsDialogBase();
 	
 };
@@ -190,24 +190,24 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class COptionsDialogBase : public wxDialog 
 {
-private:
-
-protected:
+	private:
 	
-    wxStaticText* m_staticText32;
-    wxStaticText* m_staticText31;
-    wxTextCtrl* m_textCtrlTransactionFee;
+	protected:
+		wxBoxSizer* panelSizer;
+		wxTreeCtrl* m_treeCtrl;
+		wxStaticLine* m_staticline1;
 		wxButton* m_buttonOK;
 		wxButton* m_buttonCancel;
+		wxButton* m_buttonApply;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnKillFocusTransactionFee(wxFocusEvent& event){ event.Skip(); }
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
+		virtual void MenuSelChanged( wxTreeEvent& event ){ event.Skip(); }
+		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( 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(500,261), long style = wxDEFAULT_DIALOG_STYLE);
+	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();
 	
 };
@@ -217,9 +217,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CAboutDialogBase : public wxDialog 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		
 		
 		wxStaticText* m_staticText40;
@@ -230,12 +230,12 @@ protected:
 		wxButton* m_buttonOK;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
+	public:
 		wxStaticText* m_staticTextVersion;
-    CAboutDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(507,298), long style = wxDEFAULT_DIALOG_STYLE);
+		CAboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 507,298 ), long style = wxDEFAULT_DIALOG_STYLE );
 		~CAboutDialogBase();
 	
 };
@@ -245,9 +245,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CSendDialogBase : public wxDialog 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		
 		
 		wxStaticText* m_staticText14;
@@ -272,17 +272,17 @@ protected:
 		wxButton* m_buttonCancel;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }
-    virtual void OnTextAddress(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonPaste(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonAddressBook(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnKillFocusAmount(wxFocusEvent& event){ event.Skip(); }
-    virtual void OnButtonSend(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }
+		virtual void OnTextAddress( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonPaste( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonAddressBook( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnKillFocusAmount( wxFocusEvent& event ){ event.Skip(); }
+		virtual void OnButtonSend( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CSendDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Send Coins"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(675,312), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+	public:
+		CSendDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Send Coins"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 675,312 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~CSendDialogBase();
 	
 };
@@ -292,9 +292,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CSendingDialogBase : public wxDialog 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxStaticText* m_staticTextSending;
 		wxTextCtrl* m_textCtrlStatus;
 		
@@ -302,14 +302,14 @@ protected:
 		wxButton* m_buttonCancel;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }
-    virtual void OnPaint(wxPaintEvent& event){ event.Skip(); }
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
+		virtual void OnPaint( wxPaintEvent& event ){ event.Skip(); }
+		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CSendingDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Sending..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(442,151), long style = wxDEFAULT_DIALOG_STYLE);
+	public:
+		CSendingDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Sending..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 442,151 ), long style = wxDEFAULT_DIALOG_STYLE );
 		~CSendingDialogBase();
 	
 };
@@ -319,9 +319,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CYourAddressDialogBase : public wxDialog 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		
 		wxStaticText* m_staticText45;
 		wxListCtrl* m_listCtrl;
@@ -333,19 +333,19 @@ protected:
 		wxButton* m_buttonCancel;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }
-    virtual void OnListEndLabelEdit(wxListEvent& event){ event.Skip(); }
-    virtual void OnListItemActivated(wxListEvent& event){ event.Skip(); }
-    virtual void OnListItemSelected(wxListEvent& event){ event.Skip(); }
-    virtual void OnButtonRename(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonNew(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCopy(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
-
-
-public:
-    CYourAddressDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Your Bitcoin Addresses"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(610,390), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+		virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
+		virtual void OnListEndLabelEdit( wxListEvent& event ){ event.Skip(); }
+		virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }
+		virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }
+		virtual void OnButtonRename( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonNew( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCopy( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	public:
+		CYourAddressDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Your Bitcoin Addresses"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,390 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~CYourAddressDialogBase();
 	
 };
@@ -355,9 +355,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CAddressBookDialogBase : public wxDialog 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		
 		wxStaticText* m_staticText55;
 		wxListCtrl* m_listCtrl;
@@ -368,20 +368,20 @@ protected:
 		wxButton* m_buttonOK;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }
-    virtual void OnListEndLabelEdit(wxListEvent& event){ event.Skip(); }
-    virtual void OnListItemActivated(wxListEvent& event){ event.Skip(); }
-    virtual void OnListItemSelected(wxListEvent& event){ event.Skip(); }
-    virtual void OnButtonEdit(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonNew(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDelete(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
-
-
-public:
+		virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
+		virtual void OnListEndLabelEdit( wxListEvent& event ){ event.Skip(); }
+		virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }
+		virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }
+		virtual void OnButtonEdit( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonNew( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDelete( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	public:
 		wxButton* m_buttonCancel;
-    CAddressBookDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Address Book"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(610,390), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+		CAddressBookDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Address Book"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,390 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~CAddressBookDialogBase();
 	
 };
@@ -391,23 +391,23 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CProductsDialogBase : public wxDialog 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxComboBox* m_comboBoxCategory;
 		wxTextCtrl* m_textCtrlSearch;
 		wxButton* m_buttonSearch;
 		wxListCtrl* m_listCtrl;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnCombobox(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }
-    virtual void OnButtonSearch(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnListItemActivated(wxListEvent& event){ event.Skip(); }
+		virtual void OnCombobox( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }
+		virtual void OnButtonSearch( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CProductsDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Marketplace"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(708,535), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+	public:
+		CProductsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Marketplace"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 708,535 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~CProductsDialogBase();
 	
 };
@@ -417,9 +417,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CEditProductDialogBase : public wxFrame 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxScrolledWindow* m_scrolledWindow;
 		wxStaticText* m_staticText106;
 		wxComboBox* m_comboBoxCategory;
@@ -500,36 +500,36 @@ protected:
 		wxButton* m_buttonCancel;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }
-    virtual void OnButtonDel0(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel1(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel2(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel3(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel4(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel5(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel6(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel7(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel8(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel9(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel10(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel11(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel12(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel13(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel14(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel15(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel16(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel17(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel18(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDel19(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonAddField(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonSend(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonPreview(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
-
-
-public:
+		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel0( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel1( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel2( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel3( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel4( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel5( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel6( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel7( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel8( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel9( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel10( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel11( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel12( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel13( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel14( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel15( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel16( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel17( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel18( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDel19( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonAddField( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonSend( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonPreview( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	public:
 		wxFlexGridSizer* fgSizer5;
-    CEditProductDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Edit Product"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(660,640), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);
+		CEditProductDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Edit Product"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 660,640 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 		~CEditProductDialogBase();
 	
 };
@@ -539,9 +539,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CViewProductDialogBase : public wxFrame 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxHtmlWindow* m_htmlWinReviews;
 		wxScrolledWindow* m_scrolledWindow;
 		wxRichTextCtrl* m_richTextHeading;
@@ -553,15 +553,15 @@ protected:
 		wxButton* m_buttonCancel;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnButtonSubmitForm(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancelForm(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonBack(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonNext(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnButtonSubmitForm( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancelForm( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonBack( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonNext( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CViewProductDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Order Form"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(630,520), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);
+	public:
+		CViewProductDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Order Form"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,520 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 		~CViewProductDialogBase();
 	
 };
@@ -571,18 +571,18 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CViewOrderDialogBase : public wxFrame 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxHtmlWindow* m_htmlWin;
 		wxButton* m_buttonOK;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CViewOrderDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("View Order"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(630,520), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);
+	public:
+		CViewOrderDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("View Order"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,520 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 		~CViewOrderDialogBase();
 	
 };
@@ -592,9 +592,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CEditReviewDialogBase : public wxFrame 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		
 		wxStaticText* m_staticTextSeller;
 		
@@ -606,13 +606,13 @@ protected:
 		wxButton* m_buttonCancel;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }
-    virtual void OnButtonSubmit(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }
+		virtual void OnButtonSubmit( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CEditReviewDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Enter Review"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(630,440), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL);
+	public:
+		CEditReviewDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Enter Review"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 630,440 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 		~CEditReviewDialogBase();
 	
 };
@@ -622,22 +622,22 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CPokerLobbyDialogBase : public wxFrame 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxTreeCtrl* m_treeCtrl;
 		wxListCtrl* m_listCtrl;
 		wxButton* m_buttonNewTable;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnTreeSelChanged(wxTreeEvent& event){ event.Skip(); }
-    virtual void OnListItemActivated(wxListEvent& event){ event.Skip(); }
-    virtual void OnListItemSelected(wxListEvent& event){ event.Skip(); }
-    virtual void OnButtonNewTable(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnTreeSelChanged( wxTreeEvent& event ){ event.Skip(); }
+		virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }
+		virtual void OnListItemSelected( wxListEvent& event ){ event.Skip(); }
+		virtual void OnButtonNewTable( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CPokerLobbyDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Poker Lobby"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(586,457), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL);
+	public:
+		CPokerLobbyDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Poker Lobby"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 586,457 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
 		~CPokerLobbyDialogBase();
 	
 };
@@ -647,9 +647,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CPokerDialogBase : public wxFrame 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		wxButton* m_buttonDealHand;
 		wxButton* m_buttonFold;
 		wxButton* m_buttonCall;
@@ -658,25 +658,25 @@ protected:
 		wxTextCtrl* m_textDitchPlayer;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }
-    virtual void OnMouseEvents(wxMouseEvent& event){ event.Skip(); }
-    virtual void OnPaint(wxPaintEvent& event){ event.Skip(); }
-    virtual void OnSize(wxSizeEvent& event){ event.Skip(); }
-    virtual void OnCheckSitOut(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonDealHand(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonFold(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCall(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonRaise(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonLeaveTable(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnDitchPlayer(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnCheckPreFold(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnCheckPreCall(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnCheckPreCallAny(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnCheckPreRaise(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnCheckPreRaiseAny(wxCommandEvent& event){ event.Skip(); }
-
-
-public:
+		virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
+		virtual void OnMouseEvents( wxMouseEvent& event ){ event.Skip(); }
+		virtual void OnPaint( wxPaintEvent& event ){ event.Skip(); }
+		virtual void OnSize( wxSizeEvent& event ){ event.Skip(); }
+		virtual void OnCheckSitOut( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonDealHand( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonFold( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCall( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonRaise( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonLeaveTable( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnDitchPlayer( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCheckPreFold( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCheckPreCall( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCheckPreCallAny( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCheckPreRaise( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCheckPreRaiseAny( wxCommandEvent& event ){ event.Skip(); }
+		
+	
+	public:
 		wxCheckBox* m_checkSitOut;
 		wxCheckBox* m_checkPreFold;
 		wxCheckBox* m_checkPreCall;
@@ -684,7 +684,7 @@ public:
 		wxCheckBox* m_checkPreRaise;
 		wxCheckBox* m_checkPreRaiseAny;
 		wxStatusBar* m_statusBar;
-    CPokerDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Poker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(806,550), long style = wxDEFAULT_FRAME_STYLE|wxFRAME_NO_TASKBAR|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL);
+		CPokerDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Poker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 806,550 ), long style = wxDEFAULT_FRAME_STYLE|wxFRAME_NO_TASKBAR|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
 		~CPokerDialogBase();
 	
 };
@@ -694,9 +694,9 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 class CGetTextFromUserDialogBase : public wxDialog 
 {
-private:
+	private:
 	
-protected:
+	protected:
 		
 		wxStaticText* m_staticTextMessage1;
 		wxTextCtrl* m_textCtrl1;
@@ -708,16 +708,60 @@ protected:
 		wxButton* m_buttonCancel;
 		
 		// Virtual event handlers, overide them in your derived class
-    virtual void OnClose(wxCloseEvent& event){ event.Skip(); }
-    virtual void OnKeyDown(wxKeyEvent& event){ event.Skip(); }
-    virtual void OnButtonOK(wxCommandEvent& event){ event.Skip(); }
-    virtual void OnButtonCancel(wxCommandEvent& event){ event.Skip(); }
+		virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }
+		virtual void OnKeyDown( wxKeyEvent& event ){ event.Skip(); }
+		virtual void OnButtonOK( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnButtonCancel( wxCommandEvent& event ){ event.Skip(); }
 		
 	
-public:
-    CGetTextFromUserDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(403,138), long style = wxDEFAULT_DIALOG_STYLE);
+	public:
+		CGetTextFromUserDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 403,138 ), long style = wxDEFAULT_DIALOG_STYLE );
 		~CGetTextFromUserDialogBase();
 	
 };
 
+///////////////////////////////////////////////////////////////////////////////
+/// 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__

uiproject.fbp

@@ -18,7 +18,7 @@
         <property name="relative_path">1</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
-        <object class="Frame" expanded="0">
+        <object class="Frame" expanded="1">
             <property name="bg">wxSYS_COLOUR_BTNFACE</property>
             <property name="center"></property>
             <property name="context_help"></property>
@@ -48,7 +48,7 @@
             <event name="OnEnterWindow"></event>
             <event name="OnEraseBackground"></event>
             <event name="OnHibernate"></event>
-            <event name="OnIconize"></event>
+            <event name="OnIconize">OnIconize</event>
             <event name="OnIdle">OnIdle</event>
             <event name="OnKeyDown"></event>
             <event name="OnKeyUp"></event>
@@ -151,7 +151,7 @@
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection">OnMenuOptionsGenerate</event>
-                        <event name="OnUpdateUI"></event>
+                        <event name="OnUpdateUI">OnUpdateMenuGenerate</event>
                     </object>
                     <object class="wxMenuItem" expanded="1">
                         <property name="bitmap"></property>
@@ -1665,7 +1665,7 @@
                 </object>
             </object>
         </object>
-        <object class="Dialog" expanded="0">
+        <object class="Dialog" expanded="1">
             <property name="bg"></property>
             <property name="center"></property>
             <property name="context_help"></property>
@@ -1679,7 +1679,7 @@
             <property name="minimum_size"></property>
             <property name="name">COptionsDialogBase</property>
             <property name="pos"></property>
-            <property name="size">500,261</property>
+            <property name="size">555,377</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>
             <property name="subclass"></property>
             <property name="title">Options</property>
@@ -1724,28 +1724,18 @@
                 <property name="permission">none</property>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxEXPAND|wxLEFT</property>
+                    <property name="flag">wxEXPAND</property>
                     <property name="proportion">1</property>
                     <object class="wxBoxSizer" expanded="1">
                         <property name="minimum_size"></property>
-                        <property name="name">bSizer57</property>
-                        <property name="orient">wxVERTICAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="spacer" expanded="1">
-                                <property name="height">20</property>
+                        <property name="name">panelSizer</property>
+                        <property name="orient">wxHORIZONTAL</property>
                         <property name="permission">protected</property>
-                                <property name="width">0</property>
-                            </object>
-                        </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
                             <property name="proportion">0</property>
-                            <object class="wxStaticText" expanded="1">
+                            <object class="wxTreeCtrl" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
                                 <property name="enabled">1</property>
@@ -1753,20 +1743,18 @@
                                 <property name="font"></property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label">Optional transaction fee you give to the nodes that process your transactions.</property>
                                 <property name="maximum_size"></property>
                                 <property name="minimum_size"></property>
-                                <property name="name">m_staticText32</property>
+                                <property name="name">m_treeCtrl</property>
                                 <property name="permission">protected</property>
                                 <property name="pos"></property>
-                                <property name="size"></property>
-                                <property name="style"></property>
+                                <property name="size">100,-1</property>
+                                <property name="style">wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT|wxTR_LINES_AT_ROOT</property>
                                 <property name="subclass"></property>
                                 <property name="tooltip"></property>
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <property name="wrap">-1</property>
                                 <event name="OnChar"></event>
                                 <event name="OnEnterWindow"></event>
                                 <event name="OnEraseBackground"></event>
@@ -1789,23 +1777,37 @@
                                 <event name="OnRightUp"></event>
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
+                                <event name="OnTreeBeginDrag"></event>
+                                <event name="OnTreeBeginLabelEdit"></event>
+                                <event name="OnTreeBeginRDrag"></event>
+                                <event name="OnTreeDeleteItem"></event>
+                                <event name="OnTreeEndDrag"></event>
+                                <event name="OnTreeEndLabelEdit"></event>
+                                <event name="OnTreeGetInfo"></event>
+                                <event name="OnTreeItemActivated"></event>
+                                <event name="OnTreeItemCollapsed"></event>
+                                <event name="OnTreeItemCollapsing"></event>
+                                <event name="OnTreeItemExpanded"></event>
+                                <event name="OnTreeItemExpanding"></event>
+                                <event name="OnTreeItemGetTooltip"></event>
+                                <event name="OnTreeItemMenu"></event>
+                                <event name="OnTreeItemMiddleClick"></event>
+                                <event name="OnTreeItemRightClick"></event>
+                                <event name="OnTreeKeyDown"></event>
+                                <event name="OnTreeSelChanged">MenuSelChanged</event>
+                                <event name="OnTreeSelChanging"></event>
+                                <event name="OnTreeSetInfo"></event>
+                                <event name="OnTreeStateImageClick"></event>
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
+                    </object>
+                </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">0</property>
-                            <object class="wxBoxSizer" expanded="1">
-                                <property name="minimum_size"></property>
-                                <property name="name">bSizer56</property>
-                                <property name="orient">wxHORIZONTAL</property>
-                                <property name="permission">none</property>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
+                    <property name="flag">wxEXPAND | wxALL</property>
                     <property name="proportion">0</property>
-                                    <object class="wxStaticText" expanded="1">
+                    <object class="wxStaticLine" expanded="1">
                         <property name="bg"></property>
                         <property name="context_help"></property>
                         <property name="enabled">1</property>
@@ -1813,20 +1815,18 @@
                         <property name="font"></property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Transaction fee:</property>
                         <property name="maximum_size"></property>
                         <property name="minimum_size"></property>
-                                        <property name="name">m_staticText31</property>
+                        <property name="name">m_staticline1</property>
                         <property name="permission">protected</property>
                         <property name="pos"></property>
                         <property name="size"></property>
-                                        <property name="style"></property>
+                        <property name="style">wxLI_HORIZONTAL</property>
                         <property name="subclass"></property>
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
                         <property name="window_name"></property>
                         <property name="window_style"></property>
-                                        <property name="wrap">-1</property>
                         <event name="OnChar"></event>
                         <event name="OnEnterWindow"></event>
                         <event name="OnEraseBackground"></event>
@@ -1854,36 +1854,46 @@
                 </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
+                    <property name="flag">wxALIGN_RIGHT</property>
                     <property name="proportion">0</property>
-                                    <object class="wxTextCtrl" expanded="1">
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">bSizer58</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
+                                <property name="default">0</property>
                                 <property name="enabled">1</property>
                                 <property name="fg"></property>
                                 <property name="font"></property>
                                 <property name="hidden">0</property>
-                                        <property name="id">wxID_TRANSACTIONFEE</property>
+                                <property name="id">wxID_OK</property>
+                                <property name="label">OK</property>
                                 <property name="maximum_size"></property>
-                                        <property name="maxlength">0</property>
                                 <property name="minimum_size"></property>
-                                        <property name="name">m_textCtrlTransactionFee</property>
+                                <property name="name">m_buttonOK</property>
                                 <property name="permission">protected</property>
                                 <property name="pos"></property>
-                                        <property name="size">70,-1</property>
+                                <property name="size">85,25</property>
                                 <property name="style"></property>
                                 <property name="subclass"></property>
                                 <property name="tooltip"></property>
-                                        <property name="value"></property>
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
+                                <event name="OnButtonClick">OnButtonOK</event>
                                 <event name="OnChar"></event>
                                 <event name="OnEnterWindow"></event>
                                 <event name="OnEraseBackground"></event>
                                 <event name="OnKeyDown"></event>
                                 <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus">OnKillFocusTransactionFee</event>
+                                <event name="OnKillFocus"></event>
                                 <event name="OnLeaveWindow"></event>
                                 <event name="OnLeftDClick"></event>
                                 <event name="OnLeftDown"></event>
@@ -1900,26 +1910,9 @@
                                 <event name="OnRightUp"></event>
                                 <event name="OnSetFocus"></event>
                                 <event name="OnSize"></event>
-                                        <event name="OnText"></event>
-                                        <event name="OnTextEnter"></event>
-                                        <event name="OnTextMaxLen"></event>
-                                        <event name="OnTextURL"></event>
                                 <event name="OnUpdateUI"></event>
                             </object>
                         </object>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxALIGN_RIGHT</property>
-                    <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">bSizer58</property>
-                        <property name="orient">wxHORIZONTAL</property>
-                        <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
                             <property name="flag">wxALL</property>
@@ -1932,21 +1925,21 @@
                                 <property name="fg"></property>
                                 <property name="font"></property>
                                 <property name="hidden">0</property>
-                                <property name="id">wxID_OK</property>
-                                <property name="label">OK</property>
+                                <property name="id">wxID_CANCEL</property>
+                                <property name="label">Cancel</property>
                                 <property name="maximum_size"></property>
-                                <property name="minimum_size"></property>
-                                <property name="name">m_buttonOK</property>
+                                <property name="minimum_size">85,25</property>
+                                <property name="name">m_buttonCancel</property>
                                 <property name="permission">protected</property>
                                 <property name="pos"></property>
-                                <property name="size">85,25</property>
+                                <property name="size">-1,-1</property>
                                 <property name="style"></property>
                                 <property name="subclass"></property>
                                 <property name="tooltip"></property>
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnButtonClick">OnButtonOK</event>
+                                <event name="OnButtonClick">OnButtonCancel</event>
                                 <event name="OnChar"></event>
                                 <event name="OnEnterWindow"></event>
                                 <event name="OnEraseBackground"></event>
@@ -1980,25 +1973,25 @@
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
                                 <property name="default">0</property>
-                                <property name="enabled">1</property>
+                                <property name="enabled">0</property>
                                 <property name="fg"></property>
                                 <property name="font"></property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_CANCEL</property>
-                                <property name="label">Cancel</property>
+                                <property name="hidden">1</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Apply</property>
                                 <property name="maximum_size"></property>
-                                <property name="minimum_size">85,25</property>
-                                <property name="name">m_buttonCancel</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_buttonApply</property>
                                 <property name="permission">protected</property>
                                 <property name="pos"></property>
-                                <property name="size">-1,-1</property>
+                                <property name="size"></property>
                                 <property name="style"></property>
                                 <property name="subclass"></property>
                                 <property name="tooltip"></property>
                                 <property name="window_extra_style"></property>
                                 <property name="window_name"></property>
                                 <property name="window_style"></property>
-                                <event name="OnButtonClick">OnButtonCancel</event>
+                                <event name="OnButtonClick"></event>
                                 <event name="OnChar"></event>
                                 <event name="OnEnterWindow"></event>
                                 <event name="OnEraseBackground"></event>
@@ -11856,5 +11849,551 @@
                 </object>
             </object>
         </object>
+        <object class="Panel" expanded="1">
+            <property name="bg"></property>
+            <property name="context_help"></property>
+            <property name="enabled">1</property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">COptionsPanelBitcoinBase</property>
+            <property name="pos"></property>
+            <property name="size">-1,-1</property>
+            <property name="subclass"></property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style">wxTAB_TRAVERSAL</property>
+            <event name="OnChar"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer62</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="spacer" expanded="1">
+                        <property name="height">20</property>
+                        <property name="permission">protected</property>
+                        <property name="width">0</property>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStaticText" expanded="1">
+                        <property name="bg"></property>
+                        <property name="context_help"></property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="font"></property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="label">Optional transaction fee you give to the nodes that process your transactions.</property>
+                        <property name="maximum_size"></property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_staticText32</property>
+                        <property name="permission">protected</property>
+                        <property name="pos"></property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <property name="wrap">-1</property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">bSizer56</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxStaticText" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Transaction fee:</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_staticText31</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <property name="wrap">-1</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxTextCtrl" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_TRANSACTIONFEE</property>
+                                <property name="maximum_size"></property>
+                                <property name="maxlength">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_textCtrlTransactionFee</property>
+                                <property name="permission">public</property>
+                                <property name="pos"></property>
+                                <property name="size">70,-1</property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="value"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus">OnKillFocusTransactionFee</event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnText"></event>
+                                <event name="OnTextEnter"></event>
+                                <event name="OnTextMaxLen"></event>
+                                <event name="OnTextURL"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+        <object class="Panel" expanded="1">
+            <property name="bg"></property>
+            <property name="context_help"></property>
+            <property name="enabled">1</property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">COptionsPanelUIBase</property>
+            <property name="pos"></property>
+            <property name="size">-1,-1</property>
+            <property name="subclass"></property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style">wxTAB_TRAVERSAL</property>
+            <event name="OnChar"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">bSizer57</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">1</property>
+                    <object class="spacer" expanded="1">
+                        <property name="height">20</property>
+                        <property name="permission">protected</property>
+                        <property name="width">0</property>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" expanded="1">
+                        <property name="bg"></property>
+                        <property name="checked">0</property>
+                        <property name="context_help"></property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="font"></property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_MINTOTRAY</property>
+                        <property name="label">Minimize to tray</property>
+                        <property name="maximum_size"></property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_checkMinToTray</property>
+                        <property name="permission">public</property>
+                        <property name="pos"></property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" expanded="1">
+                        <property name="bg"></property>
+                        <property name="checked">0</property>
+                        <property name="context_help"></property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="font"></property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="label">Close to tray</property>
+                        <property name="maximum_size"></property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_checkCloseToTray</property>
+                        <property name="permission">public</property>
+                        <property name="pos"></property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" expanded="1">
+                        <property name="bg"></property>
+                        <property name="checked">0</property>
+                        <property name="context_help"></property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="font"></property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="label">Start on system boot</property>
+                        <property name="maximum_size"></property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_checkStartOnSysBoot</property>
+                        <property name="permission">public</property>
+                        <property name="pos"></property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" expanded="1">
+                        <property name="bg"></property>
+                        <property name="checked">0</property>
+                        <property name="context_help"></property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="font"></property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="label">Ask before closing</property>
+                        <property name="maximum_size"></property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_checkAskBeforeClosing</property>
+                        <property name="permission">public</property>
+                        <property name="pos"></property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxCheckBox" expanded="1">
+                        <property name="bg"></property>
+                        <property name="checked">0</property>
+                        <property name="context_help"></property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="font"></property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="label">Always show tray icon</property>
+                        <property name="maximum_size"></property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_checkAlwaysShowTray</property>
+                        <property name="permission">public</property>
+                        <property name="pos"></property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnCheckBox"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+            </object>
+        </object>
     </object>
 </wxFormBuilder_Project>