transaction filter tabs instead of view->show generated

-- version 0.2.5

diff --git a/build-unix.txt b/build-unix.txt
index 5e3f574..395ac97 100644 (file)
--- a/build-unix.txt
+++ b/build-unix.txt
@@ -70,7 +70,7 @@ ldconfig
 Boost\r
 -----\r
 If you want to build Boost yourself,\r
-cd /usr/local/boost_1_42_0\r
+cd /usr/local/boost_1_38_0\r
 su\r
 ./bootstrap.sh\r
 ./bjam install\r

diff --git a/db.cpp b/db.cpp
index bbf24a0..51cbb30 100644 (file)
--- a/db.cpp
+++ b/db.cpp
@@ -599,7 +599,6 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
                 ssKey >> strKey;\r
 \r
                 // Menu state\r
-                if (strKey == "fShowGenerated")     ssValue >> fShowGenerated;\r
                 if (strKey == "fGenerateBitcoins")  ssValue >> fGenerateBitcoins;\r
 \r
                 // Options\r
@@ -618,7 +617,6 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
     }\r
 \r
     printf("nFileVersion = %d\n", nFileVersion);\r
-    printf("fShowGenerated = %d\n", fShowGenerated);\r
     printf("fGenerateBitcoins = %d\n", fGenerateBitcoins);\r
     printf("nTransactionFee = %"PRI64d"\n", nTransactionFee);\r
     printf("addrIncoming = %s\n", addrIncoming.ToString().c_str());\r

diff --git a/main.cpp b/main.cpp
index e5cc881..56020a1 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1335,7 +1335,9 @@ bool CBlock::AcceptBlock()
     if (!AddToBlockIndex(nFile, nBlockPos))\r
         return error("AcceptBlock() : AddToBlockIndex failed");\r
 \r
-    if (hashBestChain == hash && nBestHeight > 28000)\r
+    // Don't relay old inventory during initial block download.\r
+    // Please keep this constant updated to a few thousand below current block count.\r
+    if (hashBestChain == hash && nBestHeight > 40000)\r
         RelayInventory(CInv(MSG_BLOCK, hash));\r
 \r
     // // Add atoms to user reviews for coins created\r

diff --git a/serialize.h b/serialize.h
index 23d61fe..fb06f88 100644 (file)
--- a/serialize.h
+++ b/serialize.h
@@ -19,7 +19,7 @@ class CScript;
 class CDataStream;\r
 class CAutoFile;\r
 \r
-static const int VERSION = 204;\r
+static const int VERSION = 205;\r
 static const char* pszSubVer = ".0";\r
 \r
 \r

diff --git a/ui.cpp b/ui.cpp
index 9bd34e0..68d57b6 100644 (file)
--- a/ui.cpp
+++ b/ui.cpp
@@ -20,7 +20,6 @@ extern int g_isPainting;
 bool fClosedToTray = false;\r
 \r
 // Settings\r
-int fShowGenerated = true;\r
 int fMinimizeToTray = true;\r
 int fMinimizeOnClose = true;\r
 \r
@@ -282,6 +281,12 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent)
 {\r
     Connect(wxEVT_UITHREADCALL, wxCommandEventHandler(CMainFrame::OnUIThreadCall), NULL, this);\r
 \r
+    // Set initially selected page\r
+    wxNotebookEvent event;\r
+    event.SetSelection(0);\r
+    OnNotebookPageChanged(event);\r
+    m_notebook->ChangeSelection(0);\r
+\r
     // Init\r
     fRefreshListCtrl = false;\r
     fRefreshListCtrlRunning = false;\r
@@ -298,8 +303,8 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent)
     m_staticTextBalance->SetFont(fontTmp);\r
     m_staticTextBalance->SetSize(140, 17);\r
     // resize to fit ubuntu's huge default font\r
-    dResize = 1.20;\r
-    SetSize((dResize + 0.02) * GetSize().GetWidth(), 1.09 * GetSize().GetHeight());\r
+    dResize = 1.22;\r
+    SetSize(dResize * GetSize().GetWidth(), 1.09 * GetSize().GetHeight());\r
 #endif\r
     m_staticTextBalance->SetLabel(FormatMoney(GetBalance()) + "  ");\r
     m_listCtrl->SetFocus();\r
@@ -309,13 +314,17 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent)
     int nDateWidth = DateTimeStr(1229413914).size() * 6 + 8;\r
     if (!strstr(DateTimeStr(1229413914).c_str(), "2008"))\r
         nDateWidth += 12;\r
-    m_listCtrl->InsertColumn(0, "",               wxLIST_FORMAT_LEFT,  dResize * 0);\r
-    m_listCtrl->InsertColumn(1, "",               wxLIST_FORMAT_LEFT,  dResize * 0);\r
-    m_listCtrl->InsertColumn(2, _("Status"),      wxLIST_FORMAT_LEFT,  dResize * 110);\r
-    m_listCtrl->InsertColumn(3, _("Date"),        wxLIST_FORMAT_LEFT,  dResize * nDateWidth);\r
-    m_listCtrl->InsertColumn(4, _("Description"), wxLIST_FORMAT_LEFT,  dResize * 409 - nDateWidth);\r
-    m_listCtrl->InsertColumn(5, _("Debit"),       wxLIST_FORMAT_RIGHT, dResize * 79);\r
-    m_listCtrl->InsertColumn(6, _("Credit"),      wxLIST_FORMAT_RIGHT, dResize * 79);\r
+    wxListCtrl* pplistCtrl[] = {m_listCtrlAll, m_listCtrlSentReceived, m_listCtrlSent, m_listCtrlReceived};\r
+    foreach(wxListCtrl* p, pplistCtrl)\r
+    {\r
+        p->InsertColumn(0, "",               wxLIST_FORMAT_LEFT,  dResize * 0);\r
+        p->InsertColumn(1, "",               wxLIST_FORMAT_LEFT,  dResize * 0);\r
+        p->InsertColumn(2, _("Status"),      wxLIST_FORMAT_LEFT,  dResize * 112);\r
+        p->InsertColumn(3, _("Date"),        wxLIST_FORMAT_LEFT,  dResize * nDateWidth);\r
+        p->InsertColumn(4, _("Description"), wxLIST_FORMAT_LEFT,  dResize * 409 - nDateWidth);\r
+        p->InsertColumn(5, _("Debit"),       wxLIST_FORMAT_RIGHT, dResize * 79);\r
+        p->InsertColumn(6, _("Credit"),      wxLIST_FORMAT_RIGHT, dResize * 79);\r
+    }\r
 \r
     // Init status bar\r
     int pnWidths[3] = { -100, 88, 290 };\r
@@ -341,6 +350,42 @@ CMainFrame::~CMainFrame()
     ptaskbaricon = NULL;\r
 }\r
 \r
+void CMainFrame::OnNotebookPageChanged(wxNotebookEvent& event)\r
+{\r
+    event.Skip();\r
+    nPage = event.GetSelection();\r
+    if (nPage == ALL)\r
+    {\r
+        m_listCtrl = m_listCtrlAll;\r
+        fShowGenerated = true;\r
+        fShowSent = true;\r
+        fShowReceived = true;\r
+    }\r
+    else if (nPage == SENTRECEIVED)\r
+    {\r
+        m_listCtrl = m_listCtrlSentReceived;\r
+        fShowGenerated = false;\r
+        fShowSent = true;\r
+        fShowReceived = true;\r
+    }\r
+    else if (nPage == SENT)\r
+    {\r
+        m_listCtrl = m_listCtrlSent;\r
+        fShowGenerated = false;\r
+        fShowSent = true;\r
+        fShowReceived = false;\r
+    }\r
+    else if (nPage == RECEIVED)\r
+    {\r
+        m_listCtrl = m_listCtrlReceived;\r
+        fShowGenerated = false;\r
+        fShowSent = false;\r
+        fShowReceived = true;\r
+    }\r
+    RefreshListCtrl();\r
+    m_listCtrl->SetFocus();\r
+}\r
+\r
 void CMainFrame::OnClose(wxCloseEvent& event)\r
 {\r
     if (fMinimizeOnClose && event.CanVeto() && !IsIconized())\r
@@ -547,7 +592,6 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex)
             return false;\r
         }\r
 \r
-        // View->Show Generated\r
         if (!fShowGenerated)\r
             return false;\r
     }\r
@@ -571,7 +615,6 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex)
         // Credit\r
         //\r
         string strDescription;\r
-\r
         if (wtx.IsCoinBase())\r
         {\r
             // Generated\r
@@ -598,6 +641,8 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex)
         else if (!mapValue["from"].empty() || !mapValue["message"].empty())\r
         {\r
             // Received by IP connection\r
+            if (!fShowReceived)\r
+                return false;\r
             if (!mapValue["from"].empty())\r
                 strDescription += _("From: ") + mapValue["from"];\r
             if (!mapValue["message"].empty())\r
@@ -610,6 +655,8 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex)
         else\r
         {\r
             // Received by Bitcoin Address\r
+            if (!fShowReceived)\r
+                return false;\r
             foreach(const CTxOut& txout, wtx.vout)\r
             {\r
                 if (txout.IsMine())\r
@@ -675,6 +722,9 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex)
             //\r
             // Debit\r
             //\r
+            if (!fShowSent)\r
+                return false;\r
+\r
             int64 nTxFee = nDebit - wtx.GetValueOut();\r
             wtx.nLinesDisplayed = 0;\r
             for (int nOut = 0; nOut < wtx.vout.size(); nOut++)\r
@@ -1035,19 +1085,6 @@ void CMainFrame::OnMenuFileExit(wxCommandEvent& event)
     Close(true);\r
 }\r
 \r
-void CMainFrame::OnMenuViewShowGenerated(wxCommandEvent& event)\r
-{\r
-    // View->Show Generated\r
-    fShowGenerated = event.IsChecked();\r
-    CWalletDB().WriteSetting("fShowGenerated", fShowGenerated);\r
-    RefreshListCtrl();\r
-}\r
-\r
-void CMainFrame::OnUpdateUIViewShowGenerated(wxUpdateUIEvent& event)\r
-{\r
-    event.Check(fShowGenerated);\r
-}\r
-\r
 void CMainFrame::OnMenuOptionsGenerate(wxCommandEvent& event)\r
 {\r
     // Options->Generate Coins\r

diff --git a/ui.h b/ui.h
index 317b87e..acabd55 100644 (file)
--- a/ui.h
+++ b/ui.h
@@ -8,7 +8,6 @@ DECLARE_EVENT_TYPE(wxEVT_UITHREADCALL, -1)
 extern map<string, string> mapArgs;\r
 \r
 // Settings\r
-extern int fShowGenerated;\r
 extern int fMinimizeToTray;\r
 extern int fMinimizeOnClose;\r
 \r
@@ -31,6 +30,7 @@ class CMainFrame : public CMainFrameBase
 {\r
 protected:\r
     // Event handlers\r
+    void OnNotebookPageChanged(wxNotebookEvent& event);\r
     void OnClose(wxCloseEvent& event);\r
     void OnIconize(wxIconizeEvent& event);\r
     void OnMouseEvents(wxMouseEvent& event);\r
@@ -39,8 +39,6 @@ protected:
     void OnPaint(wxPaintEvent& event);\r
     void OnPaintListCtrl(wxPaintEvent& event);\r
     void OnMenuFileExit(wxCommandEvent& event);\r
-    void OnMenuViewShowGenerated(wxCommandEvent& event);\r
-    void OnUpdateUIViewShowGenerated(wxUpdateUIEvent& event);\r
     void OnMenuOptionsGenerate(wxCommandEvent& event);\r
     void OnUpdateUIOptionsGenerate(wxUpdateUIEvent& event);\r
     void OnMenuOptionsChangeYourAddress(wxCommandEvent& event);\r
@@ -64,6 +62,18 @@ public:
     ~CMainFrame();\r
 \r
     // Custom\r
+    enum\r
+    {\r
+        ALL = 0,\r
+        SENTRECEIVED = 1,\r
+        SENT = 2,\r
+        RECEIVED = 3,\r
+    };\r
+    int nPage;\r
+    wxListCtrl* m_listCtrl;\r
+    bool fShowGenerated;\r
+    bool fShowSent;\r
+    bool fShowReceived;\r
     bool fRefreshListCtrl;\r
     bool fRefreshListCtrlRunning;\r
     bool fOnSetFocusAddress;\r

diff --git a/uibase.cpp b/uibase.cpp
index 340c7ab..03ca13d 100644 (file)
--- a/uibase.cpp
+++ b/uibase.cpp
@@ -29,13 +29,6 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
        \r
        m_menubar->Append( m_menuFile, _("&File") );\r
        \r
-       m_menuView = new wxMenu();\r
-       wxMenuItem* m_menuViewShowGenerated;\r
-       m_menuViewShowGenerated = new wxMenuItem( m_menuView, wxID_VIEWSHOWGENERATED, wxString( _("&Show Generated Coins") ) , wxEmptyString, wxITEM_CHECK );\r
-       m_menuView->Append( m_menuViewShowGenerated );\r
-       \r
-       m_menubar->Append( m_menuView, _("&View") );\r
-       \r
        m_menuOptions = new wxMenu();\r
        wxMenuItem* m_menuOptionsGenerateBitcoins;\r
        m_menuOptionsGenerateBitcoins = new wxMenuItem( m_menuOptions, wxID_OPTIONSGENERATEBITCOINS, wxString( _("&Generate Coins") ) , wxEmptyString, wxITEM_CHECK );\r
@@ -135,8 +128,53 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
        \r
        bSizer2->Add( bSizer3, 0, wxEXPAND, 5 );\r
        \r
-       m_listCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );\r
-       bSizer2->Add( m_listCtrl, 1, wxEXPAND, 5 );\r
+       m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );\r
+       m_panel9 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       wxBoxSizer* bSizer11;\r
+       bSizer11 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrlAll = new wxListCtrl( m_panel9, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );\r
+       bSizer11->Add( m_listCtrlAll, 1, wxEXPAND, 5 );\r
+       \r
+       m_panel9->SetSizer( bSizer11 );\r
+       m_panel9->Layout();\r
+       bSizer11->Fit( m_panel9 );\r
+       m_notebook->AddPage( m_panel9, _("All Transactions"), true );\r
+       m_panel91 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       wxBoxSizer* bSizer111;\r
+       bSizer111 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrlSentReceived = new wxListCtrl( m_panel91, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );\r
+       bSizer111->Add( m_listCtrlSentReceived, 1, wxEXPAND, 5 );\r
+       \r
+       m_panel91->SetSizer( bSizer111 );\r
+       m_panel91->Layout();\r
+       bSizer111->Fit( m_panel91 );\r
+       m_notebook->AddPage( m_panel91, _("Sent/Received"), false );\r
+       m_panel92 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       wxBoxSizer* bSizer112;\r
+       bSizer112 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrlSent = new wxListCtrl( m_panel92, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );\r
+       bSizer112->Add( m_listCtrlSent, 1, wxEXPAND, 5 );\r
+       \r
+       m_panel92->SetSizer( bSizer112 );\r
+       m_panel92->Layout();\r
+       bSizer112->Fit( m_panel92 );\r
+       m_notebook->AddPage( m_panel92, _("Sent"), false );\r
+       m_panel93 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       wxBoxSizer* bSizer113;\r
+       bSizer113 = new wxBoxSizer( wxVERTICAL );\r
+       \r
+       m_listCtrlReceived = new wxListCtrl( m_panel93, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING|wxVSCROLL );\r
+       bSizer113->Add( m_listCtrlReceived, 1, wxEXPAND, 5 );\r
+       \r
+       m_panel93->SetSizer( bSizer113 );\r
+       m_panel93->Layout();\r
+       bSizer113->Fit( m_panel93 );\r
+       m_notebook->AddPage( m_panel93, _("Received"), false );\r
+       \r
+       bSizer2->Add( m_notebook, 1, wxEXPAND, 5 );\r
        \r
        this->SetSizer( bSizer2 );\r
        this->Layout();\r
@@ -160,8 +198,6 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
        this->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
        this->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) );\r
        this->Connect( m_menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) );\r
-       this->Connect( m_menuViewShowGenerated->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuViewShowGenerated ) );\r
-       this->Connect( m_menuViewShowGenerated->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateUIViewShowGenerated ) );\r
        this->Connect( m_menuOptionsGenerateBitcoins->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsGenerate ) );\r
        this->Connect( m_menuOptionsGenerateBitcoins->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateUIOptionsGenerate ) );\r
        this->Connect( m_menuOptionsChangeYourAddress->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsChangeYourAddress ) );\r
@@ -186,9 +222,19 @@ CMainFrameBase::CMainFrameBase( wxWindow* parent, wxWindowID id, const wxString&
        m_textCtrlAddress->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( CMainFrameBase::OnSetFocusAddress ), NULL, this );\r
        m_buttonNew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonNew ), NULL, this );\r
        m_buttonCopy->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonCopy ), NULL, this );\r
-       m_listCtrl->Connect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
-       m_listCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
-       m_listCtrl->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_notebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( CMainFrameBase::OnNotebookPageChanged ), NULL, this );\r
+       m_listCtrlAll->Connect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrlAll->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrlAll->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_listCtrlSentReceived->Connect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrlSentReceived->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrlSentReceived->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_listCtrlSent->Connect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrlSent->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrlSent->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_listCtrlReceived->Connect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrlReceived->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrlReceived->Connect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
 }\r
 \r
 CMainFrameBase::~CMainFrameBase()\r
@@ -212,8 +258,6 @@ CMainFrameBase::~CMainFrameBase()
        this->Disconnect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( CMainFrameBase::OnMouseEvents ) );\r
        this->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaint ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuFileExit ) );\r
-       this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuViewShowGenerated ) );\r
-       this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateUIViewShowGenerated ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsGenerate ) );\r
        this->Disconnect( wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler( CMainFrameBase::OnUpdateUIOptionsGenerate ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( CMainFrameBase::OnMenuOptionsChangeYourAddress ) );\r
@@ -238,9 +282,19 @@ CMainFrameBase::~CMainFrameBase()
        m_textCtrlAddress->Disconnect( wxEVT_SET_FOCUS, wxFocusEventHandler( CMainFrameBase::OnSetFocusAddress ), NULL, this );\r
        m_buttonNew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonNew ), NULL, this );\r
        m_buttonCopy->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CMainFrameBase::OnButtonCopy ), NULL, this );\r
-       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
-       m_listCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
-       m_listCtrl->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_notebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( CMainFrameBase::OnNotebookPageChanged ), NULL, this );\r
+       m_listCtrlAll->Disconnect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrlAll->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrlAll->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_listCtrlSentReceived->Disconnect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrlSentReceived->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrlSentReceived->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_listCtrlSent->Disconnect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrlSent->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrlSent->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
+       m_listCtrlReceived->Disconnect( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEventHandler( CMainFrameBase::OnListColBeginDrag ), NULL, this );\r
+       m_listCtrlReceived->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( CMainFrameBase::OnListItemActivated ), NULL, this );\r
+       m_listCtrlReceived->Disconnect( wxEVT_PAINT, wxPaintEventHandler( CMainFrameBase::OnPaintListCtrl ), NULL, this );\r
 }\r
 \r
 CTxDetailsDialogBase::CTxDetailsDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )\r

diff --git a/uibase.h b/uibase.h
index 90abd00..1686cbf 100644 (file)
--- a/uibase.h
+++ b/uibase.h
@@ -28,6 +28,7 @@
 #include <wx/panel.h>\r
 #include <wx/choice.h>\r
 #include <wx/listctrl.h>\r
+#include <wx/notebook.h>\r
 #include <wx/frame.h>\r
 #include <wx/html/htmlwin.h>\r
 #include <wx/dialog.h>\r
@@ -36,36 +37,34 @@
 #include <wx/spinctrl.h>\r
 #include <wx/scrolwin.h>\r
 #include <wx/statbmp.h>\r
-#include <wx/notebook.h>\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
 \r
 #define wxID_MAINFRAME 1000\r
-#define wxID_VIEWSHOWGENERATED 1001\r
-#define wxID_OPTIONSGENERATEBITCOINS 1002\r
-#define wxID_MENUOPTIONSOPTIONS 1003\r
-#define wxID_BUTTONSEND 1004\r
-#define wxID_BUTTONRECEIVE 1005\r
-#define wxID_TEXTCTRLADDRESS 1006\r
-#define wxID_BUTTONNEW 1007\r
-#define wxID_BUTTONCOPY 1008\r
-#define wxID_TRANSACTIONFEE 1009\r
-#define wxID_PROXYIP 1010\r
-#define wxID_PROXYPORT 1011\r
-#define wxID_TEXTCTRLPAYTO 1012\r
-#define wxID_BUTTONPASTE 1013\r
-#define wxID_BUTTONADDRESSBOOK 1014\r
-#define wxID_TEXTCTRLAMOUNT 1015\r
-#define wxID_CHOICETRANSFERTYPE 1016\r
-#define wxID_LISTCTRL 1017\r
-#define wxID_BUTTONRENAME 1018\r
-#define wxID_PANELSENDING 1019\r
-#define wxID_LISTCTRLSENDING 1020\r
-#define wxID_PANELRECEIVING 1021\r
-#define wxID_LISTCTRLRECEIVING 1022\r
-#define wxID_BUTTONDELETE 1023\r
-#define wxID_BUTTONEDIT 1024\r
-#define wxID_TEXTCTRL 1025\r
+#define wxID_OPTIONSGENERATEBITCOINS 1001\r
+#define wxID_MENUOPTIONSOPTIONS 1002\r
+#define wxID_BUTTONSEND 1003\r
+#define wxID_BUTTONRECEIVE 1004\r
+#define wxID_TEXTCTRLADDRESS 1005\r
+#define wxID_BUTTONNEW 1006\r
+#define wxID_BUTTONCOPY 1007\r
+#define wxID_TRANSACTIONFEE 1008\r
+#define wxID_PROXYIP 1009\r
+#define wxID_PROXYPORT 1010\r
+#define wxID_TEXTCTRLPAYTO 1011\r
+#define wxID_BUTTONPASTE 1012\r
+#define wxID_BUTTONADDRESSBOOK 1013\r
+#define wxID_TEXTCTRLAMOUNT 1014\r
+#define wxID_CHOICETRANSFERTYPE 1015\r
+#define wxID_LISTCTRL 1016\r
+#define wxID_BUTTONRENAME 1017\r
+#define wxID_PANELSENDING 1018\r
+#define wxID_LISTCTRLSENDING 1019\r
+#define wxID_PANELRECEIVING 1020\r
+#define wxID_LISTCTRLRECEIVING 1021\r
+#define wxID_BUTTONDELETE 1022\r
+#define wxID_BUTTONEDIT 1023\r
+#define wxID_TEXTCTRL 1024\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r
 /// Class CMainFrameBase\r
@@ -77,7 +76,6 @@ class CMainFrameBase : public wxFrame
        protected:\r
                wxMenuBar* m_menubar;\r
                wxMenu* m_menuFile;\r
-               wxMenu* m_menuView;\r
                wxMenu* m_menuHelp;\r
                wxToolBar* m_toolBar;\r
                wxStatusBar* m_statusBar;\r
@@ -91,6 +89,11 @@ class CMainFrameBase : public wxFrame
                wxStaticText* m_staticTextBalance;\r
                \r
                wxChoice* m_choiceFilter;\r
+               wxNotebook* m_notebook;\r
+               wxPanel* m_panel9;\r
+               wxPanel* m_panel91;\r
+               wxPanel* m_panel92;\r
+               wxPanel* m_panel93;\r
                \r
                // Virtual event handlers, overide them in your derived class\r
                virtual void OnClose( wxCloseEvent& event ){ event.Skip(); }\r
@@ -99,8 +102,6 @@ class CMainFrameBase : public wxFrame
                virtual void OnMouseEvents( wxMouseEvent& event ){ event.Skip(); }\r
                virtual void OnPaint( wxPaintEvent& event ){ event.Skip(); }\r
                virtual void OnMenuFileExit( wxCommandEvent& event ){ event.Skip(); }\r
-               virtual void OnMenuViewShowGenerated( wxCommandEvent& event ){ event.Skip(); }\r
-               virtual void OnUpdateUIViewShowGenerated( wxUpdateUIEvent& event ){ event.Skip(); }\r
                virtual void OnMenuOptionsGenerate( wxCommandEvent& event ){ event.Skip(); }\r
                virtual void OnUpdateUIOptionsGenerate( wxUpdateUIEvent& event ){ event.Skip(); }\r
                virtual void OnMenuOptionsChangeYourAddress( wxCommandEvent& event ){ event.Skip(); }\r
@@ -113,6 +114,7 @@ class CMainFrameBase : public wxFrame
                virtual void OnSetFocusAddress( wxFocusEvent& event ){ event.Skip(); }\r
                virtual void OnButtonNew( wxCommandEvent& event ){ event.Skip(); }\r
                virtual void OnButtonCopy( wxCommandEvent& event ){ event.Skip(); }\r
+               virtual void OnNotebookPageChanged( wxNotebookEvent& event ){ event.Skip(); }\r
                virtual void OnListColBeginDrag( wxListEvent& event ){ event.Skip(); }\r
                virtual void OnListItemActivated( wxListEvent& event ){ event.Skip(); }\r
                virtual void OnPaintListCtrl( wxPaintEvent& event ){ event.Skip(); }\r
@@ -121,8 +123,11 @@ class CMainFrameBase : public wxFrame
        public:\r
                wxMenu* m_menuOptions;\r
                wxTextCtrl* m_textCtrlAddress;\r
-               wxListCtrl* m_listCtrl;\r
-               CMainFrameBase( wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = _("Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 712,484 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
+               wxListCtrl* m_listCtrlAll;\r
+               wxListCtrl* m_listCtrlSentReceived;\r
+               wxListCtrl* m_listCtrlSent;\r
+               wxListCtrl* m_listCtrlReceived;\r
+               CMainFrameBase( wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = _("Bitcoin"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 723,484 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );\r
                ~CMainFrameBase();\r
        \r
 };\r

diff --git a/uiproject.fbp b/uiproject.fbp
index 113a157..8643fba 100644 (file)
--- a/uiproject.fbp
+++ b/uiproject.fbp
@@ -18,7 +18,7 @@
         <property name="relative_path">1</property>\r
         <property name="use_enum">0</property>\r
         <property name="use_microsoft_bom">0</property>\r
-        <object class="Frame" expanded="0">\r
+        <object class="Frame" expanded="1">\r
             <property name="bg">wxSYS_COLOUR_BTNFACE</property>\r
             <property name="center"></property>\r
             <property name="context_help"></property>\r
@@ -32,7 +32,7 @@
             <property name="minimum_size"></property>\r
             <property name="name">CMainFrameBase</property>\r
             <property name="pos"></property>\r
-            <property name="size">712,484</property>\r
+            <property name="size">723,484</property>\r
             <property name="style">wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>\r
             <property name="subclass"></property>\r
             <property name="title">Bitcoin</property>\r
@@ -135,26 +135,6 @@
                     </object>\r
                 </object>\r
                 <object class="wxMenu" expanded="1">\r
-                    <property name="label">&amp;View</property>\r
-                    <property name="name">m_menuView</property>\r
-                    <property name="permission">protected</property>\r
-                    <object class="wxMenuItem" expanded="1">\r
-                        <property name="bitmap"></property>\r
-                        <property name="checked">0</property>\r
-                        <property name="enabled">1</property>\r
-                        <property name="help"></property>\r
-                        <property name="id">wxID_VIEWSHOWGENERATED</property>\r
-                        <property name="kind">wxITEM_CHECK</property>\r
-                        <property name="label">&amp;Show Generated Coins</property>\r
-                        <property name="name">m_menuViewShowGenerated</property>\r
-                        <property name="permission">none</property>\r
-                        <property name="shortcut"></property>\r
-                        <property name="unchecked_bitmap"></property>\r
-                        <event name="OnMenuSelection">OnMenuViewShowGenerated</event>\r
-                        <event name="OnUpdateUI">OnUpdateUIViewShowGenerated</event>\r
-                    </object>\r
-                </object>\r
-                <object class="wxMenu" expanded="1">\r
                     <property name="label">&amp;Settings</property>\r
                     <property name="name">m_menuOptions</property>\r
                     <property name="permission">public</property>\r
@@ -346,7 +326,7 @@
                 <event name="OnSize"></event>\r
                 <event name="OnUpdateUI"></event>\r
             </object>\r
-            <object class="wxBoxSizer" expanded="0">\r
+            <object class="wxBoxSizer" expanded="1">\r
                 <property name="minimum_size"></property>\r
                 <property name="name">bSizer2</property>\r
                 <property name="orient">wxVERTICAL</property>\r
@@ -824,8 +804,9 @@
                     <property name="border">5</property>\r
                     <property name="flag">wxEXPAND</property>\r
                     <property name="proportion">1</property>\r
-                    <object class="wxListCtrl" expanded="1">\r
+                    <object class="wxNotebook" expanded="1">\r
                         <property name="bg"></property>\r
+                        <property name="bitmapsize"></property>\r
                         <property name="context_help"></property>\r
                         <property name="enabled">1</property>\r
                         <property name="fg"></property>\r
@@ -834,16 +815,16 @@
                         <property name="id">wxID_ANY</property>\r
                         <property name="maximum_size"></property>\r
                         <property name="minimum_size"></property>\r
-                        <property name="name">m_listCtrl</property>\r
-                        <property name="permission">public</property>\r
+                        <property name="name">m_notebook</property>\r
+                        <property name="permission">protected</property>\r
                         <property name="pos"></property>\r
                         <property name="size"></property>\r
-                        <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING</property>\r
+                        <property name="style"></property>\r
                         <property name="subclass"></property>\r
                         <property name="tooltip"></property>\r
                         <property name="window_extra_style"></property>\r
                         <property name="window_name"></property>\r
-                        <property name="window_style">wxVSCROLL</property>\r
+                        <property name="window_style"></property>\r
                         <event name="OnChar"></event>\r
                         <event name="OnEnterWindow"></event>\r
                         <event name="OnEraseBackground"></event>\r
@@ -854,39 +835,513 @@
                         <event name="OnLeftDClick"></event>\r
                         <event name="OnLeftDown"></event>\r
                         <event name="OnLeftUp"></event>\r
-                        <event name="OnListBeginDrag"></event>\r
-                        <event name="OnListBeginLabelEdit"></event>\r
-                        <event name="OnListBeginRDrag"></event>\r
-                        <event name="OnListCacheHint"></event>\r
-                        <event name="OnListColBeginDrag">OnListColBeginDrag</event>\r
-                        <event name="OnListColClick"></event>\r
-                        <event name="OnListColDragging"></event>\r
-                        <event name="OnListColEndDrag"></event>\r
-                        <event name="OnListColRightClick"></event>\r
-                        <event name="OnListDeleteAllItems"></event>\r
-                        <event name="OnListDeleteItem"></event>\r
-                        <event name="OnListEndLabelEdit"></event>\r
-                        <event name="OnListInsertItem"></event>\r
-                        <event name="OnListItemActivated">OnListItemActivated</event>\r
-                        <event name="OnListItemDeselected"></event>\r
-                        <event name="OnListItemFocused"></event>\r
-                        <event name="OnListItemMiddleClick"></event>\r
-                        <event name="OnListItemRightClick"></event>\r
-                        <event name="OnListItemSelected"></event>\r
-                        <event name="OnListKeyDown"></event>\r
                         <event name="OnMiddleDClick"></event>\r
                         <event name="OnMiddleDown"></event>\r
                         <event name="OnMiddleUp"></event>\r
                         <event name="OnMotion"></event>\r
                         <event name="OnMouseEvents"></event>\r
                         <event name="OnMouseWheel"></event>\r
-                        <event name="OnPaint">OnPaintListCtrl</event>\r
+                        <event name="OnNotebookPageChanged">OnNotebookPageChanged</event>\r
+                        <event name="OnNotebookPageChanging"></event>\r
+                        <event name="OnPaint"></event>\r
                         <event name="OnRightDClick"></event>\r
                         <event name="OnRightDown"></event>\r
                         <event name="OnRightUp"></event>\r
                         <event name="OnSetFocus"></event>\r
                         <event name="OnSize"></event>\r
                         <event name="OnUpdateUI"></event>\r
+                        <object class="notebookpage" expanded="1">\r
+                            <property name="bitmap"></property>\r
+                            <property name="label">All Transactions</property>\r
+                            <property name="select">1</property>\r
+                            <object class="wxPanel" expanded="1">\r
+                                <property name="bg"></property>\r
+                                <property name="context_help"></property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="font"></property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="name">m_panel9</property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pos"></property>\r
+                                <property name="size"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style">wxTAB_TRAVERSAL</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                                <object class="wxBoxSizer" expanded="1">\r
+                                    <property name="minimum_size"></property>\r
+                                    <property name="name">bSizer11</property>\r
+                                    <property name="orient">wxVERTICAL</property>\r
+                                    <property name="permission">none</property>\r
+                                    <object class="sizeritem" expanded="1">\r
+                                        <property name="border">5</property>\r
+                                        <property name="flag">wxEXPAND</property>\r
+                                        <property name="proportion">1</property>\r
+                                        <object class="wxListCtrl" expanded="1">\r
+                                            <property name="bg"></property>\r
+                                            <property name="context_help"></property>\r
+                                            <property name="enabled">1</property>\r
+                                            <property name="fg"></property>\r
+                                            <property name="font"></property>\r
+                                            <property name="hidden">0</property>\r
+                                            <property name="id">wxID_ANY</property>\r
+                                            <property name="maximum_size"></property>\r
+                                            <property name="minimum_size"></property>\r
+                                            <property name="name">m_listCtrlAll</property>\r
+                                            <property name="permission">public</property>\r
+                                            <property name="pos"></property>\r
+                                            <property name="size"></property>\r
+                                            <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING</property>\r
+                                            <property name="subclass"></property>\r
+                                            <property name="tooltip"></property>\r
+                                            <property name="window_extra_style"></property>\r
+                                            <property name="window_name"></property>\r
+                                            <property name="window_style">wxVSCROLL</property>\r
+                                            <event name="OnChar"></event>\r
+                                            <event name="OnEnterWindow"></event>\r
+                                            <event name="OnEraseBackground"></event>\r
+                                            <event name="OnKeyDown"></event>\r
+                                            <event name="OnKeyUp"></event>\r
+                                            <event name="OnKillFocus"></event>\r
+                                            <event name="OnLeaveWindow"></event>\r
+                                            <event name="OnLeftDClick"></event>\r
+                                            <event name="OnLeftDown"></event>\r
+                                            <event name="OnLeftUp"></event>\r
+                                            <event name="OnListBeginDrag"></event>\r
+                                            <event name="OnListBeginLabelEdit"></event>\r
+                                            <event name="OnListBeginRDrag"></event>\r
+                                            <event name="OnListCacheHint"></event>\r
+                                            <event name="OnListColBeginDrag">OnListColBeginDrag</event>\r
+                                            <event name="OnListColClick"></event>\r
+                                            <event name="OnListColDragging"></event>\r
+                                            <event name="OnListColEndDrag"></event>\r
+                                            <event name="OnListColRightClick"></event>\r
+                                            <event name="OnListDeleteAllItems"></event>\r
+                                            <event name="OnListDeleteItem"></event>\r
+                                            <event name="OnListEndLabelEdit"></event>\r
+                                            <event name="OnListInsertItem"></event>\r
+                                            <event name="OnListItemActivated">OnListItemActivated</event>\r
+                                            <event name="OnListItemDeselected"></event>\r
+                                            <event name="OnListItemFocused"></event>\r
+                                            <event name="OnListItemMiddleClick"></event>\r
+                                            <event name="OnListItemRightClick"></event>\r
+                                            <event name="OnListItemSelected"></event>\r
+                                            <event name="OnListKeyDown"></event>\r
+                                            <event name="OnMiddleDClick"></event>\r
+                                            <event name="OnMiddleDown"></event>\r
+                                            <event name="OnMiddleUp"></event>\r
+                                            <event name="OnMotion"></event>\r
+                                            <event name="OnMouseEvents"></event>\r
+                                            <event name="OnMouseWheel"></event>\r
+                                            <event name="OnPaint">OnPaintListCtrl</event>\r
+                                            <event name="OnRightDClick"></event>\r
+                                            <event name="OnRightDown"></event>\r
+                                            <event name="OnRightUp"></event>\r
+                                            <event name="OnSetFocus"></event>\r
+                                            <event name="OnSize"></event>\r
+                                            <event name="OnUpdateUI"></event>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="notebookpage" expanded="1">\r
+                            <property name="bitmap"></property>\r
+                            <property name="label">Sent/Received</property>\r
+                            <property name="select">0</property>\r
+                            <object class="wxPanel" expanded="1">\r
+                                <property name="bg"></property>\r
+                                <property name="context_help"></property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="font"></property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="name">m_panel91</property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pos"></property>\r
+                                <property name="size"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style">wxTAB_TRAVERSAL</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                                <object class="wxBoxSizer" expanded="1">\r
+                                    <property name="minimum_size"></property>\r
+                                    <property name="name">bSizer111</property>\r
+                                    <property name="orient">wxVERTICAL</property>\r
+                                    <property name="permission">none</property>\r
+                                    <object class="sizeritem" expanded="1">\r
+                                        <property name="border">5</property>\r
+                                        <property name="flag">wxEXPAND</property>\r
+                                        <property name="proportion">1</property>\r
+                                        <object class="wxListCtrl" expanded="1">\r
+                                            <property name="bg"></property>\r
+                                            <property name="context_help"></property>\r
+                                            <property name="enabled">1</property>\r
+                                            <property name="fg"></property>\r
+                                            <property name="font"></property>\r
+                                            <property name="hidden">0</property>\r
+                                            <property name="id">wxID_ANY</property>\r
+                                            <property name="maximum_size"></property>\r
+                                            <property name="minimum_size"></property>\r
+                                            <property name="name">m_listCtrlSentReceived</property>\r
+                                            <property name="permission">public</property>\r
+                                            <property name="pos"></property>\r
+                                            <property name="size"></property>\r
+                                            <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING</property>\r
+                                            <property name="subclass"></property>\r
+                                            <property name="tooltip"></property>\r
+                                            <property name="window_extra_style"></property>\r
+                                            <property name="window_name"></property>\r
+                                            <property name="window_style">wxVSCROLL</property>\r
+                                            <event name="OnChar"></event>\r
+                                            <event name="OnEnterWindow"></event>\r
+                                            <event name="OnEraseBackground"></event>\r
+                                            <event name="OnKeyDown"></event>\r
+                                            <event name="OnKeyUp"></event>\r
+                                            <event name="OnKillFocus"></event>\r
+                                            <event name="OnLeaveWindow"></event>\r
+                                            <event name="OnLeftDClick"></event>\r
+                                            <event name="OnLeftDown"></event>\r
+                                            <event name="OnLeftUp"></event>\r
+                                            <event name="OnListBeginDrag"></event>\r
+                                            <event name="OnListBeginLabelEdit"></event>\r
+                                            <event name="OnListBeginRDrag"></event>\r
+                                            <event name="OnListCacheHint"></event>\r
+                                            <event name="OnListColBeginDrag">OnListColBeginDrag</event>\r
+                                            <event name="OnListColClick"></event>\r
+                                            <event name="OnListColDragging"></event>\r
+                                            <event name="OnListColEndDrag"></event>\r
+                                            <event name="OnListColRightClick"></event>\r
+                                            <event name="OnListDeleteAllItems"></event>\r
+                                            <event name="OnListDeleteItem"></event>\r
+                                            <event name="OnListEndLabelEdit"></event>\r
+                                            <event name="OnListInsertItem"></event>\r
+                                            <event name="OnListItemActivated">OnListItemActivated</event>\r
+                                            <event name="OnListItemDeselected"></event>\r
+                                            <event name="OnListItemFocused"></event>\r
+                                            <event name="OnListItemMiddleClick"></event>\r
+                                            <event name="OnListItemRightClick"></event>\r
+                                            <event name="OnListItemSelected"></event>\r
+                                            <event name="OnListKeyDown"></event>\r
+                                            <event name="OnMiddleDClick"></event>\r
+                                            <event name="OnMiddleDown"></event>\r
+                                            <event name="OnMiddleUp"></event>\r
+                                            <event name="OnMotion"></event>\r
+                                            <event name="OnMouseEvents"></event>\r
+                                            <event name="OnMouseWheel"></event>\r
+                                            <event name="OnPaint">OnPaintListCtrl</event>\r
+                                            <event name="OnRightDClick"></event>\r
+                                            <event name="OnRightDown"></event>\r
+                                            <event name="OnRightUp"></event>\r
+                                            <event name="OnSetFocus"></event>\r
+                                            <event name="OnSize"></event>\r
+                                            <event name="OnUpdateUI"></event>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="notebookpage" expanded="1">\r
+                            <property name="bitmap"></property>\r
+                            <property name="label">Sent</property>\r
+                            <property name="select">0</property>\r
+                            <object class="wxPanel" expanded="1">\r
+                                <property name="bg"></property>\r
+                                <property name="context_help"></property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="font"></property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="name">m_panel92</property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pos"></property>\r
+                                <property name="size"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style">wxTAB_TRAVERSAL</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                                <object class="wxBoxSizer" expanded="1">\r
+                                    <property name="minimum_size"></property>\r
+                                    <property name="name">bSizer112</property>\r
+                                    <property name="orient">wxVERTICAL</property>\r
+                                    <property name="permission">none</property>\r
+                                    <object class="sizeritem" expanded="1">\r
+                                        <property name="border">5</property>\r
+                                        <property name="flag">wxEXPAND</property>\r
+                                        <property name="proportion">1</property>\r
+                                        <object class="wxListCtrl" expanded="1">\r
+                                            <property name="bg"></property>\r
+                                            <property name="context_help"></property>\r
+                                            <property name="enabled">1</property>\r
+                                            <property name="fg"></property>\r
+                                            <property name="font"></property>\r
+                                            <property name="hidden">0</property>\r
+                                            <property name="id">wxID_ANY</property>\r
+                                            <property name="maximum_size"></property>\r
+                                            <property name="minimum_size"></property>\r
+                                            <property name="name">m_listCtrlSent</property>\r
+                                            <property name="permission">public</property>\r
+                                            <property name="pos"></property>\r
+                                            <property name="size"></property>\r
+                                            <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING</property>\r
+                                            <property name="subclass"></property>\r
+                                            <property name="tooltip"></property>\r
+                                            <property name="window_extra_style"></property>\r
+                                            <property name="window_name"></property>\r
+                                            <property name="window_style">wxVSCROLL</property>\r
+                                            <event name="OnChar"></event>\r
+                                            <event name="OnEnterWindow"></event>\r
+                                            <event name="OnEraseBackground"></event>\r
+                                            <event name="OnKeyDown"></event>\r
+                                            <event name="OnKeyUp"></event>\r
+                                            <event name="OnKillFocus"></event>\r
+                                            <event name="OnLeaveWindow"></event>\r
+                                            <event name="OnLeftDClick"></event>\r
+                                            <event name="OnLeftDown"></event>\r
+                                            <event name="OnLeftUp"></event>\r
+                                            <event name="OnListBeginDrag"></event>\r
+                                            <event name="OnListBeginLabelEdit"></event>\r
+                                            <event name="OnListBeginRDrag"></event>\r
+                                            <event name="OnListCacheHint"></event>\r
+                                            <event name="OnListColBeginDrag">OnListColBeginDrag</event>\r
+                                            <event name="OnListColClick"></event>\r
+                                            <event name="OnListColDragging"></event>\r
+                                            <event name="OnListColEndDrag"></event>\r
+                                            <event name="OnListColRightClick"></event>\r
+                                            <event name="OnListDeleteAllItems"></event>\r
+                                            <event name="OnListDeleteItem"></event>\r
+                                            <event name="OnListEndLabelEdit"></event>\r
+                                            <event name="OnListInsertItem"></event>\r
+                                            <event name="OnListItemActivated">OnListItemActivated</event>\r
+                                            <event name="OnListItemDeselected"></event>\r
+                                            <event name="OnListItemFocused"></event>\r
+                                            <event name="OnListItemMiddleClick"></event>\r
+                                            <event name="OnListItemRightClick"></event>\r
+                                            <event name="OnListItemSelected"></event>\r
+                                            <event name="OnListKeyDown"></event>\r
+                                            <event name="OnMiddleDClick"></event>\r
+                                            <event name="OnMiddleDown"></event>\r
+                                            <event name="OnMiddleUp"></event>\r
+                                            <event name="OnMotion"></event>\r
+                                            <event name="OnMouseEvents"></event>\r
+                                            <event name="OnMouseWheel"></event>\r
+                                            <event name="OnPaint">OnPaintListCtrl</event>\r
+                                            <event name="OnRightDClick"></event>\r
+                                            <event name="OnRightDown"></event>\r
+                                            <event name="OnRightUp"></event>\r
+                                            <event name="OnSetFocus"></event>\r
+                                            <event name="OnSize"></event>\r
+                                            <event name="OnUpdateUI"></event>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
+                        <object class="notebookpage" expanded="1">\r
+                            <property name="bitmap"></property>\r
+                            <property name="label">Received</property>\r
+                            <property name="select">0</property>\r
+                            <object class="wxPanel" expanded="1">\r
+                                <property name="bg"></property>\r
+                                <property name="context_help"></property>\r
+                                <property name="enabled">1</property>\r
+                                <property name="fg"></property>\r
+                                <property name="font"></property>\r
+                                <property name="hidden">0</property>\r
+                                <property name="id">wxID_ANY</property>\r
+                                <property name="maximum_size"></property>\r
+                                <property name="minimum_size"></property>\r
+                                <property name="name">m_panel93</property>\r
+                                <property name="permission">protected</property>\r
+                                <property name="pos"></property>\r
+                                <property name="size"></property>\r
+                                <property name="subclass"></property>\r
+                                <property name="tooltip"></property>\r
+                                <property name="window_extra_style"></property>\r
+                                <property name="window_name"></property>\r
+                                <property name="window_style">wxTAB_TRAVERSAL</property>\r
+                                <event name="OnChar"></event>\r
+                                <event name="OnEnterWindow"></event>\r
+                                <event name="OnEraseBackground"></event>\r
+                                <event name="OnKeyDown"></event>\r
+                                <event name="OnKeyUp"></event>\r
+                                <event name="OnKillFocus"></event>\r
+                                <event name="OnLeaveWindow"></event>\r
+                                <event name="OnLeftDClick"></event>\r
+                                <event name="OnLeftDown"></event>\r
+                                <event name="OnLeftUp"></event>\r
+                                <event name="OnMiddleDClick"></event>\r
+                                <event name="OnMiddleDown"></event>\r
+                                <event name="OnMiddleUp"></event>\r
+                                <event name="OnMotion"></event>\r
+                                <event name="OnMouseEvents"></event>\r
+                                <event name="OnMouseWheel"></event>\r
+                                <event name="OnPaint"></event>\r
+                                <event name="OnRightDClick"></event>\r
+                                <event name="OnRightDown"></event>\r
+                                <event name="OnRightUp"></event>\r
+                                <event name="OnSetFocus"></event>\r
+                                <event name="OnSize"></event>\r
+                                <event name="OnUpdateUI"></event>\r
+                                <object class="wxBoxSizer" expanded="1">\r
+                                    <property name="minimum_size"></property>\r
+                                    <property name="name">bSizer113</property>\r
+                                    <property name="orient">wxVERTICAL</property>\r
+                                    <property name="permission">none</property>\r
+                                    <object class="sizeritem" expanded="1">\r
+                                        <property name="border">5</property>\r
+                                        <property name="flag">wxEXPAND</property>\r
+                                        <property name="proportion">1</property>\r
+                                        <object class="wxListCtrl" expanded="1">\r
+                                            <property name="bg"></property>\r
+                                            <property name="context_help"></property>\r
+                                            <property name="enabled">1</property>\r
+                                            <property name="fg"></property>\r
+                                            <property name="font"></property>\r
+                                            <property name="hidden">0</property>\r
+                                            <property name="id">wxID_ANY</property>\r
+                                            <property name="maximum_size"></property>\r
+                                            <property name="minimum_size"></property>\r
+                                            <property name="name">m_listCtrlReceived</property>\r
+                                            <property name="permission">public</property>\r
+                                            <property name="pos"></property>\r
+                                            <property name="size"></property>\r
+                                            <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SORT_DESCENDING</property>\r
+                                            <property name="subclass"></property>\r
+                                            <property name="tooltip"></property>\r
+                                            <property name="window_extra_style"></property>\r
+                                            <property name="window_name"></property>\r
+                                            <property name="window_style">wxVSCROLL</property>\r
+                                            <event name="OnChar"></event>\r
+                                            <event name="OnEnterWindow"></event>\r
+                                            <event name="OnEraseBackground"></event>\r
+                                            <event name="OnKeyDown"></event>\r
+                                            <event name="OnKeyUp"></event>\r
+                                            <event name="OnKillFocus"></event>\r
+                                            <event name="OnLeaveWindow"></event>\r
+                                            <event name="OnLeftDClick"></event>\r
+                                            <event name="OnLeftDown"></event>\r
+                                            <event name="OnLeftUp"></event>\r
+                                            <event name="OnListBeginDrag"></event>\r
+                                            <event name="OnListBeginLabelEdit"></event>\r
+                                            <event name="OnListBeginRDrag"></event>\r
+                                            <event name="OnListCacheHint"></event>\r
+                                            <event name="OnListColBeginDrag">OnListColBeginDrag</event>\r
+                                            <event name="OnListColClick"></event>\r
+                                            <event name="OnListColDragging"></event>\r
+                                            <event name="OnListColEndDrag"></event>\r
+                                            <event name="OnListColRightClick"></event>\r
+                                            <event name="OnListDeleteAllItems"></event>\r
+                                            <event name="OnListDeleteItem"></event>\r
+                                            <event name="OnListEndLabelEdit"></event>\r
+                                            <event name="OnListInsertItem"></event>\r
+                                            <event name="OnListItemActivated">OnListItemActivated</event>\r
+                                            <event name="OnListItemDeselected"></event>\r
+                                            <event name="OnListItemFocused"></event>\r
+                                            <event name="OnListItemMiddleClick"></event>\r
+                                            <event name="OnListItemRightClick"></event>\r
+                                            <event name="OnListItemSelected"></event>\r
+                                            <event name="OnListKeyDown"></event>\r
+                                            <event name="OnMiddleDClick"></event>\r
+                                            <event name="OnMiddleDown"></event>\r
+                                            <event name="OnMiddleUp"></event>\r
+                                            <event name="OnMotion"></event>\r
+                                            <event name="OnMouseEvents"></event>\r
+                                            <event name="OnMouseWheel"></event>\r
+                                            <event name="OnPaint">OnPaintListCtrl</event>\r
+                                            <event name="OnRightDClick"></event>\r
+                                            <event name="OnRightDown"></event>\r
+                                            <event name="OnRightUp"></event>\r
+                                            <event name="OnSetFocus"></event>\r
+                                            <event name="OnSize"></event>\r
+                                            <event name="OnUpdateUI"></event>\r
+                                        </object>\r
+                                    </object>\r
+                                </object>\r
+                            </object>\r
+                        </object>\r
                     </object>\r
                 </object>\r
             </object>\r