From: <sie...@us...> - 2013-09-29 16:02:20
|
Revision: 4635 http://sourceforge.net/p/moneymanagerex/code/4635 Author: siena123 Date: 2013-09-29 16:02:16 +0000 (Sun, 29 Sep 2013) Log Message: ----------- clean up - free memory Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2013-09-29 16:01:38 UTC (rev 4634) +++ trunk/src/mmreportspanel.cpp 2013-09-29 16:02:16 UTC (rev 4635) @@ -40,6 +40,7 @@ mmReportsPanel::~mmReportsPanel() { + if(rb_) delete rb_; } bool mmReportsPanel::Create( wxWindow *parent, wxWindowID winid, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sie...@us...> - 2013-10-02 11:57:38
|
Revision: 4671 http://sourceforge.net/p/moneymanagerex/code/4671 Author: siena123 Date: 2013-10-02 11:57:35 +0000 (Wed, 02 Oct 2013) Log Message: ----------- fix application crash - this memory cleanup is now done elsewhere Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2013-10-02 05:02:09 UTC (rev 4670) +++ trunk/src/mmreportspanel.cpp 2013-10-02 11:57:35 UTC (rev 4671) @@ -40,7 +40,6 @@ mmReportsPanel::~mmReportsPanel() { - if(rb_) delete rb_; } bool mmReportsPanel::Create( wxWindow *parent, wxWindowID winid, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-10-10 02:09:47
|
Revision: 4815 http://sourceforge.net/p/moneymanagerex/code/4815 Author: guanlisheng Date: 2013-10-10 02:09:42 +0000 (Thu, 10 Oct 2013) Log Message: ----------- use get directly Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2013-10-10 01:39:28 UTC (rev 4814) +++ trunk/src/mmreportspanel.cpp 2013-10-10 02:09:42 UTC (rev 4815) @@ -143,10 +143,10 @@ sData.ToLong(&transID); if (transID > 0) { - Model_Checking::Data_Set transactions = Model_Checking::instance().find(Model_Checking::COL_TRANSID, transID); - if (transactions.size() > 0) + const Model_Checking::Data* transaction = Model_Checking::instance().get(transID); + if (transaction) { - int account_id = transactions[0].ACCOUNTID; + int account_id = transaction->ACCOUNTID; frame->setGotoAccountID(account_id, transID); const Model_Account::Data* account = Model_Account::instance().get(account_id); frame->setAccountNavTreeSection(account->ACCOUNTNAME); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-11-11 00:02:09
|
Revision: 5182 http://sourceforge.net/p/moneymanagerex/code/5182 Author: guanlisheng Date: 2013-11-11 00:02:05 +0000 (Mon, 11 Nov 2013) Log Message: ----------- remove incomplete custom report support for v1.0.0.0 release Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2013-11-11 00:00:46 UTC (rev 5181) +++ trunk/src/mmreportspanel.cpp 2013-11-11 00:02:05 UTC (rev 5182) @@ -21,7 +21,6 @@ #include "util.h" #include "reports/htmlbuilder.h" #include "mmex.h" -#include "lua_interface.h" #include "model/Model_Account.h" #include "model/Model_Checking.h" @@ -102,7 +101,6 @@ bool bIsTrxId = sInfo.StartsWith("TRXID:", &sData); bool isAcct = sInfo.StartsWith("ACCT:", &sData); bool isStock = sInfo.StartsWith("STOCK:", &sData); - bool bIsLuaScript = sInfo.StartsWith("LUA:", &sData); bool bIsSort = sInfo.StartsWith("SORT:", &sData); mmGUIFrame* frame = wxGetApp().m_frame; if (sInfo == "billsdeposits") @@ -155,20 +153,6 @@ } } } - else if (bIsLuaScript) - { - wxString lua_result; - wxFileName LuaFile = sData; - if (LuaFile.FileExists()) - { - mmHTMLBuilder hb; - TLuaInterface lua_core(&hb); - lua_core.RunLuaFile(sData); - htmlWindow_->SetPage(hb.getHTMLText()); - } - else - wxMessageBox(wxString::Format(_("File %s not found"), sData), "Lua Script", wxOK|wxICON_ERROR); - } else if (bIsSort) { long sortColumn = -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-12-11 10:09:52
|
Revision: 5547 http://sourceforge.net/p/moneymanagerex/code/5547 Author: guanlisheng Date: 2013-12-11 10:09:49 +0000 (Wed, 11 Dec 2013) Log Message: ----------- add memory file handler Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2013-12-11 09:15:26 UTC (rev 5546) +++ trunk/src/mmreportspanel.cpp 2013-12-11 10:09:49 UTC (rev 5547) @@ -24,6 +24,7 @@ #include "model/Model_Account.h" #include "model/Model_Checking.h" #include <wx/webview.h> +#include <wx/webviewfshandler.h> BEGIN_EVENT_TABLE(mmReportsPanel, wxPanel) EVT_HTML_LINK_CLICKED(wxID_ANY, mmReportsPanel::OnLinkClicked) @@ -87,6 +88,7 @@ itemBoxSizerVHeader->Add(itemStaticText9, 0, wxALL, 1); htmlWindow_ = wxWebView::New(this, wxID_ANY); + htmlWindow_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory"))); /* htmlWindow_ = new wxWebView( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-12-20 02:59:00
|
Revision: 5648 http://sourceforge.net/p/moneymanagerex/code/5648 Author: guanlisheng Date: 2013-12-20 02:58:56 +0000 (Fri, 20 Dec 2013) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2013-12-19 14:52:51 UTC (rev 5647) +++ trunk/src/mmreportspanel.cpp 2013-12-20 02:58:56 UTC (rev 5648) @@ -37,7 +37,7 @@ virtual ~WebViewHandlerStatic() { - // wxDELETE(m_fs); + wxDELETE(m_fs); } virtual wxFSFile* GetFile (const wxString &uri) @@ -114,12 +114,8 @@ htmlWindow_ = wxWebView::New(this, wxID_ANY); htmlWindow_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory"))); - htmlWindow_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandlerStatic("."))); -/* - htmlWindow_ = new wxWebView( this, wxID_ANY, - wxDefaultPosition, wxDefaultSize, - wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER|wxHSCROLL|wxVSCROLL ); -*/ + htmlWindow_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler(""))); + itemBoxSizer2->Add(htmlWindow_, 1, wxGROW|wxALL, 1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2014-03-16 03:17:56
|
Revision: 6191 http://sourceforge.net/p/moneymanagerex/code/6191 Author: guanlisheng Date: 2014-03-16 03:17:52 +0000 (Sun, 16 Mar 2014) Log Message: ----------- test code to try use static local resource Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2014-03-15 11:03:29 UTC (rev 6190) +++ trunk/src/mmreportspanel.cpp 2014-03-16 03:17:52 UTC (rev 6191) @@ -26,6 +26,30 @@ #include "model/Model_Account.h" #include "model/Model_Checking.h" +class WebViewHandlerStatic : public wxWebViewHandler +{ +public: + WebViewHandlerStatic(const wxString& protocol): wxWebViewHandler(protocol) + { + m_fs = new wxFileSystem(); + } + virtual ~WebViewHandlerStatic() + { + wxDELETE(m_fs); + } + virtual wxFSFile* GetFile(const wxString& uri) + { + wxLogDebug("xxxxx %s", uri); + if (wxFileSystem::HasHandlerForPath(uri)) + return m_fs->OpenFile(uri); + else + return NULL; + } + +private: + wxFileSystem* m_fs; +}; + class WebViewHandlerReportsPage : public wxWebViewHandler { public: @@ -143,6 +167,7 @@ htmlWindow_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory"))); htmlWindow_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandlerReportsPage(this, "TRXID"))); htmlWindow_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandlerReportsPage(this, "SORT"))); + htmlWindow_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandlerStatic("static"))); itemBoxSizer2->Add(htmlWindow_, 1, wxGROW|wxALL, 1); } This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-03-19 09:19:56
|
Revision: 6212 http://sourceforge.net/p/moneymanagerex/code/6212 Author: guanlisheng Date: 2014-03-19 09:19:53 +0000 (Wed, 19 Mar 2014) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2014-03-19 09:14:56 UTC (rev 6211) +++ trunk/src/mmreportspanel.cpp 2014-03-19 09:19:53 UTC (rev 6212) @@ -27,31 +27,6 @@ #include "model/Model_Account.h" #include "model/Model_Checking.h" -class WebViewHandlerStatic : public wxWebViewHandler -{ -public: - WebViewHandlerStatic(const wxString& protocol): wxWebViewHandler(protocol) - { - m_fs = new wxFileSystem(); - } - virtual ~WebViewHandlerStatic() - { - wxDELETE(m_fs); - } - virtual wxFSFile* GetFile(const wxString& uri) - { - wxLogDebug("xxxxx %s", uri); - wxLogDebug(wxURI(uri).GetPath()); - wxLogDebug(mmex::GetResourceDir().GetPath()); - - m_fs->ChangePathTo(mmex::GetResourceDir().GetPath(), true); - return m_fs->OpenFile(wxURI(uri).GetPath()); - } - -private: - wxFileSystem* m_fs; -}; - class WebViewHandlerReportsPage : public wxWebViewHandler { public: @@ -169,7 +144,6 @@ browser_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory"))); browser_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandlerReportsPage(this, "TRXID"))); browser_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandlerReportsPage(this, "SORT"))); - browser_->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandlerStatic("local"))); itemBoxSizer2->Add(browser_, 1, wxGROW|wxALL, 1); } This was sent by MMEX an easy to use, money management application. |
From: <sie...@us...> - 2014-03-26 02:54:44
|
Revision: 6251 http://sourceforge.net/p/moneymanagerex/code/6251 Author: siena123 Date: 2014-03-26 02:54:41 +0000 (Wed, 26 Mar 2014) Log Message: ----------- Fix report panel to use files in resource directory Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2014-03-26 01:25:16 UTC (rev 6250) +++ trunk/src/mmreportspanel.cpp 2014-03-26 02:54:41 UTC (rev 6251) @@ -107,7 +107,8 @@ GetSizer()->Fit(this); GetSizer()->SetSizeHints(this); - browser_->SetPage(getReportText(), mmex::GetResourceDir().GetPath() + "/"); + getReportText(); + browser_->LoadURL(mmex::GetResourceDir().GetPath() + "/" + "index.html"); return TRUE; } This was sent by MMEX an easy to use, money management application. |
From: <vo...@us...> - 2014-05-03 09:33:34
|
Revision: 6482 http://sourceforge.net/p/moneymanagerex/code/6482 Author: vomikan Date: 2014-05-03 09:33:30 +0000 (Sat, 03 May 2014) Log Message: ----------- format, FIXME:, TODO: Modified Paths: -------------- trunk/src/mmreportspanel.cpp Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2014-05-03 08:13:28 UTC (rev 6481) +++ trunk/src/mmreportspanel.cpp 2014-05-03 09:33:30 UTC (rev 6482) @@ -96,11 +96,11 @@ delete rb_; } -bool mmReportsPanel::Create( wxWindow *parent, wxWindowID winid, - const wxPoint& pos, const wxSize& size, long style, - const wxString& name ) +bool mmReportsPanel::Create(wxWindow *parent, wxWindowID winid + , const wxPoint& pos, const wxSize& size, long style + , const wxString& name) { - SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); + SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS); wxPanel::Create(parent, winid, pos, size, style, name); CreateControls(); @@ -108,13 +108,14 @@ GetSizer()->SetSizeHints(this); getReportText(); - browser_->LoadURL("file://" + mmex::GetResourceDir().GetPath() + "/" + "index.html"); + //FIXME: ResourceDir is write protected + browser_->LoadURL(wxString::Format("file://%s/index.html", mmex::GetResourceDir().GetPath())); return TRUE; } wxString mmReportsPanel::getReportText() { - htmlreport_ = "coming soon..."; + htmlreport_ = "coming soon..."; //TODO: ?? if (rb_) { json::Object o; @@ -141,15 +142,15 @@ wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); this->SetSizer(itemBoxSizer2); - wxPanel* itemPanel3 = new wxPanel( this, wxID_ANY, - wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* itemPanel3 = new wxPanel(this, wxID_ANY + , wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); itemBoxSizer2->Add(itemPanel3, 0, wxGROW|wxALL, 5); wxBoxSizer* itemBoxSizerVHeader = new wxBoxSizer(wxVERTICAL); itemPanel3->SetSizer(itemBoxSizerVHeader); - wxStaticText* itemStaticText9 = new wxStaticText( itemPanel3, wxID_ANY, - _("REPORTS")); + wxStaticText* itemStaticText9 = new wxStaticText(itemPanel3 + , wxID_ANY, _("REPORTS")); itemStaticText9->SetFont(this->GetFont().Larger().Bold()); itemBoxSizerVHeader->Add(itemStaticText9, 0, wxALL, 1); This was sent by MMEX an easy to use, money management application. |