From: <ste...@us...> - 2013-02-13 07:54:45
|
Revision: 3469 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3469&view=rev Author: stef145g Date: 2013-02-13 07:54:38 +0000 (Wed, 13 Feb 2013) Log Message: ----------- Update - providing printing of Home Page Modified Paths: -------------- trunk/mmex/src/mmex.cpp trunk/mmex/src/mmex.h trunk/mmex/src/mmhelppanel.cpp trunk/mmex/src/mmhelppanel.h trunk/mmex/src/mmhomepagepanel.cpp trunk/mmex/src/mmhomepagepanel.h trunk/mmex/src/mmpanelbase.h Modified: trunk/mmex/src/mmex.cpp =================================================================== --- trunk/mmex/src/mmex.cpp 2013-02-12 17:26:15 UTC (rev 3468) +++ trunk/mmex/src/mmex.cpp 2013-02-13 07:54:38 UTC (rev 3469) @@ -3466,11 +3466,14 @@ { if (!printer_) return; - mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_); - mmHelpPanel* hp = dynamic_cast<mmHelpPanel*>(panelCurrent_); - if (rp) - printer_ ->PrintText(rp->getReportText()); - else if (hp) + mmReportsPanel* report_panel = dynamic_cast<mmReportsPanel*>(panelCurrent_); + mmHomePagePanel* home_page = dynamic_cast<mmHomePagePanel*>(panelCurrent_); + mmHelpPanel* help_page = dynamic_cast<mmHelpPanel*>(panelCurrent_); + if (report_panel) + printer_ ->PrintText(report_panel->getReportText()); + else if (home_page && activeHomePage_) + printer_ ->PrintText(home_page->GetHomePageText()); + else if (help_page) printer_ ->PrintFile(mmex::getPathDoc((mmex::EDocFile)helpFileIndex_)); } //---------------------------------------------------------------------------- @@ -3479,11 +3482,14 @@ { if (!printer_) return; - mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_); - mmHelpPanel* hp = dynamic_cast<mmHelpPanel*>(panelCurrent_); - if (rp) - printer_ ->PreviewText(rp->getReportText()); - else if (hp) + mmReportsPanel* report_panel = dynamic_cast<mmReportsPanel*>(panelCurrent_); + mmHomePagePanel* home_page = dynamic_cast<mmHomePagePanel*>(panelCurrent_); + mmHelpPanel* help_page = dynamic_cast<mmHelpPanel*>(panelCurrent_); + if (report_panel) + printer_ ->PreviewText(report_panel->getReportText()); + else if (home_page && activeHomePage_) + printer_ ->PreviewText(home_page->GetHomePageText()); + else if (help_page) printer_ ->PreviewFile(mmex::getPathDoc((mmex::EDocFile)helpFileIndex_)); } //---------------------------------------------------------------------------- Modified: trunk/mmex/src/mmex.h =================================================================== --- trunk/mmex/src/mmex.h 2013-02-12 17:26:15 UTC (rev 3468) +++ trunk/mmex/src/mmex.h 2013-02-13 07:54:38 UTC (rev 3469) @@ -214,6 +214,7 @@ bool setNavTreeSection( wxString sectionName); void SetCheckingAccountPageInactive(); void SetBudgetingPageInactive(); + void menuPrintingEnable(bool enable); private: /* handles to the DB Abstraction */ @@ -295,7 +296,6 @@ void createControls(); void saveSettings(); void menuEnableItems(bool enable); - void menuPrintingEnable(bool enable); void updateNavTreeControl(bool expandTermAccounts = false); void showTreePopupMenu(wxTreeItemId id, const wxPoint& pt); void showBeginAppDialog(bool fromScratch = false); Modified: trunk/mmex/src/mmhelppanel.cpp =================================================================== --- trunk/mmex/src/mmhelppanel.cpp 2013-02-12 17:26:15 UTC (rev 3468) +++ trunk/mmex/src/mmhelppanel.cpp 2013-02-13 07:54:38 UTC (rev 3469) @@ -32,28 +32,17 @@ EVT_BUTTON(wxID_FORWARD, mmHelpPanel::OnHelpPageForward) END_EVENT_TABLE() -mmHelpPanel::mmHelpPanel( mmGUIFrame* frame, wxSQLite3Database* db, wxWindow *parent, - wxWindowID winid, const wxPoint& pos, const wxSize& size, long style, - const wxString& name ) +mmHelpPanel::mmHelpPanel(mmGUIFrame* frame, wxSQLite3Database* db, + wxWindow *parent, wxWindowID winid, + const wxPoint& pos, const wxSize& size, long style, const wxString& name) +: db_(db) +, frame_(frame) { - db_ = db; - frame_ = frame; Create(parent, winid, pos, size, style, name); } -wxString mmHelpPanel::getReportText() -{ - return htmlWindow_->ToText(); -} - -mmHelpPanel::~mmHelpPanel() -{ - -} - bool mmHelpPanel::Create( wxWindow *parent, wxWindowID winid, - const wxPoint& pos, const wxSize& size, long style, - const wxString& name ) + const wxPoint& pos, const wxSize& size, long style, const wxString& name) { SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); wxPanel::Create(parent, winid, pos, size, style, name); Modified: trunk/mmex/src/mmhelppanel.h =================================================================== --- trunk/mmex/src/mmhelppanel.h 2013-02-12 17:26:15 UTC (rev 3468) +++ trunk/mmex/src/mmhelppanel.h 2013-02-13 07:54:38 UTC (rev 3469) @@ -33,21 +33,18 @@ DECLARE_EVENT_TABLE() public: - mmHelpPanel( mmGUIFrame* frame, wxSQLite3Database* db_, + mmHelpPanel( mmGUIFrame* frame, wxSQLite3Database* db, wxWindow *parent, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, const wxString& name = wxPanelNameStr ); - ~mmHelpPanel(); - - /// Overrides the base class method to return a report from a predefined file. - wxString getReportText(); - + private: wxHtmlWindow* htmlWindow_; mmGUIFrame* frame_; + wxSQLite3Database* db_; bool Create( wxWindow *parent, wxWindowID winid, const wxPoint& pos = wxDefaultPosition, Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-02-12 17:26:15 UTC (rev 3468) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-02-13 07:54:38 UTC (rev 3469) @@ -48,15 +48,22 @@ , frame_(frame) , topCategories_(topCategories) { + Create(parent, winid, pos, size, style, name); frame_->setHomePageActive(); - Create(parent, winid, pos, size, style, name); + frame_->menuPrintingEnable(true); } mmHomePagePanel::~mmHomePagePanel() { frame_->setHomePageActive(false); + frame_->menuPrintingEnable(false); } +wxString mmHomePagePanel::GetHomePageText() +{ + return html_text_; +} + bool mmHomePagePanel::Create( wxWindow *parent, wxWindowID winid, const wxPoint& pos, @@ -779,8 +786,8 @@ hb.endTable(); hb.end(); - wxString htmlText = hb.getHTMLText(); - htmlWindow_->SetPage(htmlText); + html_text_ = hb.getHTMLText(); + htmlWindow_->SetPage(html_text_); } void mmHomePagePanel::CreateControls() Modified: trunk/mmex/src/mmhomepagepanel.h =================================================================== --- trunk/mmex/src/mmhomepagepanel.h 2013-02-12 17:26:15 UTC (rev 3468) +++ trunk/mmex/src/mmhomepagepanel.h 2013-02-13 07:54:38 UTC (rev 3469) @@ -71,12 +71,16 @@ const wxString& name = wxPanelNameStr); ~mmHomePagePanel(); + + wxString GetHomePageText(); + private: void CreateControls(); void updateAccounts(); mmGUIFrame* frame_; mmHtmlWindow* htmlWindow_; wxString topCategories_; + wxString html_text_; void displaySummaryHeader(mmHTMLBuilder& hb, wxString summaryTitle ); void displayStocksHeader(mmHTMLBuilder& hb, wxString summaryTitle ); Modified: trunk/mmex/src/mmpanelbase.h =================================================================== --- trunk/mmex/src/mmpanelbase.h 2013-02-12 17:26:15 UTC (rev 3468) +++ trunk/mmex/src/mmpanelbase.h 2013-02-13 07:54:38 UTC (rev 3469) @@ -41,7 +41,6 @@ : core_(core) {} - wxSQLite3Database* db_; //TODO remove mmCoreDB* core_; }; //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |