[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[2345] trunk/mmex/src

[<gua...@us...>]

Revision: 2345
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2345&view=rev
Author:   guanlisheng
Date:     2012-05-16 00:39:53 +0000 (Wed, 16 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/mmex/src/assetspanel.cpp
    trunk/mmex/src/budgetingpanel.cpp
    trunk/mmex/src/mmcheckingpanel.cpp
    trunk/mmex/src/mmpanelbase.h
    trunk/mmex/src/stockspanel.cpp

Modified: trunk/mmex/src/assetspanel.cpp
===================================================================
--- trunk/mmex/src/assetspanel.cpp	2012-05-15 14:03:16 UTC (rev 2344)
+++ trunk/mmex/src/assetspanel.cpp	2012-05-16 00:39:53 UTC (rev 2345)
@@ -230,6 +230,8 @@
     else if (col == COL_VALUE) column = DB_View_ASSETS_V1::COL_VALUE;
     else if (col == COL_DATE) column = DB_View_ASSETS_V1::COL_STARTDATE;
     else if (col == COL_NOTES) column = DB_View_ASSETS_V1::COL_NOTES;
+
+    m_listCtrlAssets->setColumnImage(col, asc ? ICON_ASC : ICON_DESC);
     all_assets_ = ASSETS_V1.all(db_, column, asc);
     m_listCtrlAssets->SetItemCount(all_assets_.size());
 }

Modified: trunk/mmex/src/budgetingpanel.cpp
===================================================================
--- trunk/mmex/src/budgetingpanel.cpp	2012-05-15 14:03:16 UTC (rev 2344)
+++ trunk/mmex/src/budgetingpanel.cpp	2012-05-16 00:39:53 UTC (rev 2345)
@@ -24,18 +24,6 @@
 #include "mmex.h"
 #include "reportbudget.h"
 
-/*******************************************************/
-/* Include XPM Support */
-#include "../resources/exefile.xpm"
-#include "../resources/flag.xpm"
-#include "../resources/void.xpm"
-#include "../resources/reconciled.xpm"
-#include "../resources/unreconciled.xpm"
-#include "../resources/uparrow.xpm"
-#include "../resources/downarrow.xpm"
-#include "../resources/rightarrow.xpm"
-#include "../resources/empty.xpm"
-/*******************************************************/
 BEGIN_EVENT_TABLE(mmBudgetingPanel, wxPanel)
     EVT_LEFT_DOWN( mmBudgetingPanel::OnMouseLeftDown ) 
 

Modified: trunk/mmex/src/mmcheckingpanel.cpp
===================================================================
--- trunk/mmex/src/mmcheckingpanel.cpp	2012-05-15 14:03:16 UTC (rev 2344)
+++ trunk/mmex/src/mmcheckingpanel.cpp	2012-05-16 00:39:53 UTC (rev 2345)
@@ -29,21 +29,7 @@
 #include <wx/srchctrl.h>
 
 //----------------------------------------------------------------------------
-/* Include XPM Support */
-#include "../resources/exefile.xpm"
-#include "../resources/flag.xpm"
-#include "../resources/void.xpm"
-#include "../resources/reconciled.xpm"
-#include "../resources/unreconciled.xpm"
-#include "../resources/uparrow.xpm"
-#include "../resources/downarrow.xpm"
-#include "../resources/rightarrow.xpm"
-#include "../resources/duplicate.xpm"
-#include "../resources/trans_from.xpm"
-#include "../resources/trans_into.xpm"
-#include "../resources/tipicon.xpm"
-//----------------------------------------------------------------------------
-
+//
 namespace
 {
 
@@ -62,21 +48,6 @@
     COL_DEF_SORT = COL_DATE_OR_TRANSACTION_ID
 };
 //----------------------------------------------------------------------------
-
-enum EIcons
-{
-    ICON_RECONCILED,
-    ICON_VOID,
-    ICON_FOLLOWUP,
-    ICON_NONE,
-    ICON_DESC,
-    ICON_ASC,
-    ICON_DUPLICATE,
-    ICON_TRANS_WITHDRAWAL,
-    ICON_TRANS_DEPOSIT,
-    ICON_TRANS_TRANSFER
-};
-//----------------------------------------------------------------------------
 EColumn g_sortcol = COL_DEF_SORT; // index of column to sort
 bool g_asc = true; // asc\desc sorting
 //----------------------------------------------------------------------------

Modified: trunk/mmex/src/mmpanelbase.h
===================================================================
--- trunk/mmex/src/mmpanelbase.h	2012-05-15 14:03:16 UTC (rev 2344)
+++ trunk/mmex/src/mmpanelbase.h	2012-05-16 00:39:53 UTC (rev 2345)
@@ -24,9 +24,39 @@
 #include <wx/string.h>
 #include "mmcoredb.h"
 //----------------------------------------------------------------------------
+/* Include XPM Support */
+#include "../resources/exefile.xpm"
+#include "../resources/flag.xpm"
+#include "../resources/void.xpm"
+#include "../resources/reconciled.xpm"
+#include "../resources/unreconciled.xpm"
+#include "../resources/uparrow.xpm"
+#include "../resources/downarrow.xpm"
+#include "../resources/rightarrow.xpm"
+#include "../resources/duplicate.xpm"
+#include "../resources/trans_from.xpm"
+#include "../resources/trans_into.xpm"
+#include "../resources/tipicon.xpm"
+#include "../resources/empty.xpm"
+//----------------------------------------------------------------------------
+
 class wxSQLite3Database;
 class wxListCtrl;
 
+enum EIcons
+{
+    ICON_RECONCILED,
+    ICON_VOID,
+    ICON_FOLLOWUP,
+    ICON_NONE,
+    ICON_DESC,
+    ICON_ASC,
+    ICON_DUPLICATE,
+    ICON_TRANS_WITHDRAWAL,
+    ICON_TRANS_DEPOSIT,
+    ICON_TRANS_TRANSFER
+};
+
 struct mmHolderBase
 {
     int id_;
@@ -43,10 +73,43 @@
         , const wxValidator& validator = wxDefaultValidator
         , const wxString& name = wxListCtrlNameStr)
         : wxListCtrl(parent, id, pos, size, style, validator, name)
-    {}
+        , m_imageList(new wxImageList(16, 16))
+    {
+        m_imageList->Add(wxBitmap(reconciled_xpm));
+        m_imageList->Add(wxBitmap(void_xpm));
+        m_imageList->Add(wxBitmap(flag_xpm));
+        m_imageList->Add(wxBitmap(unreconciled_xpm));
+        m_imageList->Add(wxBitmap(uparrow_xpm));
+        m_imageList->Add(wxBitmap(downarrow_xpm));
+        m_imageList->Add(wxBitmap(duplicate_xpm));
+        m_imageList->Add(wxBitmap(trans_from_xpm));
+        m_imageList->Add(wxBitmap(trans_into_xpm));
+        //m_imageList->Add(wxBitmap(trans_transfer_xpm));
+        
+        SetImageList(m_imageList, wxIMAGE_LIST_SMALL);
+    }
 
     virtual ~mmListCtrl() 
-    {}
+    {
+        if (m_imageList)
+        {
+            delete m_imageList;
+            m_imageList = 0;
+        }
+    }
+
+public:
+    wxImageList* m_imageList;
+
+public:
+    void setColumnImage(int col, int image)
+    {
+        wxListItem item;
+        item.SetMask(wxLIST_MASK_IMAGE);
+        item.SetImage(image);
+
+        SetColumn(col, item);
+    }
 };
 
 class mmPanelBase : public wxPanel

Modified: trunk/mmex/src/stockspanel.cpp
===================================================================
--- trunk/mmex/src/stockspanel.cpp	2012-05-15 14:03:16 UTC (rev 2344)
+++ trunk/mmex/src/stockspanel.cpp	2012-05-16 00:39:53 UTC (rev 2345)
@@ -22,10 +22,6 @@
 #include "mmyahoo.h"
 #include "yahoosettingsdialog.h"
 
-/* Include XPM Support */
-#include "../resources/uparrow.xpm"
-#include "../resources/downarrow_red.xpm"
-
 #include "mmex_db_view.h"
 #include <boost/foreach.hpp>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.