From: <ste...@us...> - 2011-05-16 12:04:31
|
Revision: 1278 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1278&view=rev Author: stef145g Date: 2011-05-16 12:04:25 +0000 (Mon, 16 May 2011) Log Message: ----------- fix bug: creating a report that deletes a record - not using correct field in dialog. Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2011-05-16 05:21:43 UTC (rev 1277) +++ trunk/mmex/src/customreportdialog.cpp 2011-05-16 12:04:25 UTC (rev 1278) @@ -272,7 +272,7 @@ wxMessageDialog msgDlg(this, _("SQL Query will modify your Data. Proceed??"), _("Warning"), wxYES_NO); if (msgDlg.ShowModal() == wxID_YES) { - sqlQuery_ = reportTitleTxtCtrl_->GetValue(); + sqlQuery_ = sqlSourceTxtCtrl_->GetValue(); EndModal(wxID_MORE); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-06-14 00:18:22
|
Revision: 1326 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1326&view=rev Author: stef145g Date: 2011-06-14 00:18:16 +0000 (Tue, 14 Jun 2011) Log Message: ----------- Fixed: Bugs-2823660 - Custom SQL Query Save Missing Ext Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2011-06-13 09:07:56 UTC (rev 1325) +++ trunk/mmex/src/customreportdialog.cpp 2011-06-14 00:18:16 UTC (rev 1326) @@ -225,7 +225,12 @@ mmex::getPathUser(mmex::DIRECTORY), wxT(""),wxT("SQL File(*.sql)|*.sql"),wxSAVE); if (fileDialog.ShowModal() == wxID_OK) + { reportfileName = fileDialog.GetFilename(); + wxFileName tempFileName(reportfileName); + if (tempFileName.GetExt() == wxT("")) + reportfileName << wxT(".sql"); + } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-11-28 17:47:49
|
Revision: 1542 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1542&view=rev Author: vomikan Date: 2011-11-28 17:47:43 +0000 (Mon, 28 Nov 2011) Log Message: ----------- correction Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2011-11-28 14:02:29 UTC (rev 1541) +++ trunk/mmex/src/customreportdialog.cpp 2011-11-28 17:47:43 UTC (rev 1542) @@ -28,7 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS( mmCustomSQLDialog, wxDialog ) BEGIN_EVENT_TABLE( mmCustomSQLDialog, wxDialog ) - EVT_BUTTON(wxID_HELP, mmCustomSQLDialog::OnDialogContextHelp) + //EVT_BUTTON(wxID_HELP, mmCustomSQLDialog::OnDialogContextHelp) EVT_BUTTON(wxID_OPEN, mmCustomSQLDialog::OnLoad) EVT_BUTTON(wxID_SAVE, mmCustomSQLDialog::OnSave) EVT_BUTTON(DIALOG_CUSTOM_SQL_BTN_QUERY, mmCustomSQLDialog::OnRun) @@ -357,11 +357,11 @@ } } -void mmCustomSQLDialog::OnDialogContextHelp(wxCommandEvent & event) -{ +//void mmCustomSQLDialog::OnDialogContextHelp(wxCommandEvent & event) +//{ // dlg(this); // dlg.ShowModal(); -} +//} //mmCustomSQLDialog::~mmCustomSQLDialog() //{ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-03-10 06:09:26
|
Revision: 1986 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1986&view=rev Author: guanlisheng Date: 2012-03-10 06:09:20 +0000 (Sat, 10 Mar 2012) Log Message: ----------- format Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-03-10 06:07:01 UTC (rev 1985) +++ trunk/mmex/src/customreportdialog.cpp 2012-03-10 06:09:20 UTC (rev 1986) @@ -99,13 +99,13 @@ wxBoxSizer* centerHorizontalBoxSizer = new wxBoxSizer(wxHORIZONTAL); mainBoxSizer->Add(centerHorizontalBoxSizer, 1, wxGROW|wxALL, 5); - wxPanel* centerPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* centerPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); centerHorizontalBoxSizer->Add(centerPanel, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); wxBoxSizer* centerVerticalBoxSizer = new wxBoxSizer(wxVERTICAL); centerPanel->SetSizer(centerVerticalBoxSizer); - // ListBox for source code + // ListBox for source code sqlSourceTxtCtrl_ = new wxTextCtrl( this, DIALOG_CUSTOM_SQL_TXTCTRL_SOURCE, _T(""), wxDefaultPosition, wxSize(-1, sourceTextHeight), wxTE_MULTILINE ); centerHorizontalBoxSizer->Add(sqlSourceTxtCtrl_, 1, wxGROW|wxALL, 1); @@ -290,9 +290,9 @@ wxString lower = sqlSourceTxtCtrl_->GetValue().Lower(); if ((lower.Find(wxT("update")) != wxNOT_FOUND) || (lower.Find(wxT("delete")) != wxNOT_FOUND) || (lower.Find(wxT("insert")) != wxNOT_FOUND)) { - wxMessageDialog msgDlg(this, _("SQL Query will modify your Data. Proceed??"), _("Warning"), wxYES_NO); + wxMessageDialog msgDlg(this, _("SQL Query will modify your Data. Proceed??"), _("Warning"), wxYES_NO); if (msgDlg.ShowModal() == wxID_YES) - { + { sqlQuery_ = sqlSourceTxtCtrl_->GetValue(); EndModal(wxID_MORE); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-29 14:13:37
|
Revision: 3168 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3168&view=rev Author: vomikan Date: 2012-11-29 14:13:26 +0000 (Thu, 29 Nov 2012) Log Message: ----------- F9 = run Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-11-29 13:59:24 UTC (rev 3167) +++ trunk/mmex/src/customreportdialog.cpp 2012-11-29 14:13:26 UTC (rev 3168) @@ -53,6 +53,13 @@ SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); wxDialog::Create( parent, id, caption, pos, size, style ); + wxAcceleratorEntry entries[1]; + entries[0].Set(wxACCEL_NORMAL, WXK_F9, wxID_REFRESH); + wxAcceleratorTable accel(1, entries); + SetAcceleratorTable(accel); + + Connect(wxID_REFRESH, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(mmCustomSQLDialog::OnRun)); + CreateControls(); GetSizer()->Fit(this); GetSizer()->SetSizeHints(this); @@ -97,7 +104,7 @@ Center Area ***************************************/ wxStaticText* sourceTitleText = new wxStaticText( this, wxID_STATIC, _("SQL Source Script:")); - mainBoxSizer->Add(sourceTitleText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxADJUST_MINSIZE, 9); + mainBoxSizer->Add(sourceTitleText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxADJUST_MINSIZE, 9); wxBoxSizer* centerHorizontalBoxSizer = new wxBoxSizer(wxHORIZONTAL); mainBoxSizer->Add(centerHorizontalBoxSizer, 1, wxGROW|wxALL, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-15 22:32:20
|
Revision: 3211 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3211&view=rev Author: vomikan Date: 2012-12-15 22:32:13 +0000 (Sat, 15 Dec 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-12-15 18:36:38 UTC (rev 3210) +++ trunk/mmex/src/customreportdialog.cpp 2012-12-15 22:32:13 UTC (rev 3211) @@ -5,12 +5,12 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -19,8 +19,10 @@ #include "customreportdialog.h" #include "paths.h" #include "util.h" -#include <wx/cshelp.h> -#include <wx/html/helpctrl.h> +//#include <wx/cshelp.h> +//#include <wx/html/helpctrl.h> +#include <wx/helpbase.h> +#include <wx/help.h> const int titleTextWidth = 350; // Determines width of Headings Textbox. const int sourceTextHeight = 200; // Determines height of Source Textbox. @@ -47,17 +49,17 @@ Create(parent_, id, caption, pos, size, style); } -bool mmCustomSQLDialog::Create( wxWindow* parent, wxWindowID id, +bool mmCustomSQLDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); wxDialog::Create( parent, id, caption, pos, size, style ); - wxAcceleratorEntry entries[1]; + wxAcceleratorEntry entries[2]; entries[0].Set(wxACCEL_NORMAL, WXK_F9, wxID_REFRESH); wxAcceleratorTable accel(1, entries); SetAcceleratorTable(accel); - + Connect(wxID_REFRESH, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(mmCustomSQLDialog::OnRun)); CreateControls(); @@ -71,7 +73,7 @@ } void mmCustomSQLDialog::CreateControls() -{ +{ wxSizerFlags flags, flagsExpand; flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, 5); @@ -79,7 +81,7 @@ this->SetSizer(mainBoxSizer); /**************************************** - Heading Panel + Heading Panel ***************************************/ wxPanel* headingPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); mainBoxSizer->Add(headingPanel, flags); @@ -148,10 +150,9 @@ buttonPanelSizer->Add(button_Close, flags); button_Close->SetToolTip(_("Save changes before closing. Changes without Save will be lost.")); - //TODO: Help page //wxButton* button_Help = new wxButton( buttonPanel, wxID_HELP); //buttonPanelSizer->Add(button_Help, flags); - + button_Save_->Disable(); // Will be activated if text changes in either text field. if (edit_) @@ -172,7 +173,7 @@ sqlSourceTxtCtrl_->ChangeValue(sqlData); } button_Open_->Disable(); - } + } else { button_Run_->Disable(); @@ -191,7 +192,7 @@ void mmCustomSQLDialog::OnOpen(wxCommandEvent& /*event*/) { - wxString sqlScriptFileName = wxFileSelector( _("Load Custom SQL file:"), + wxString sqlScriptFileName = wxFileSelector( _("Load Custom SQL file:"), mmex::getPathUser(mmex::DIRECTORY), wxEmptyString, wxEmptyString, wxT("SQL File(*.sql)|*.sql"), wxFD_FILE_MUST_EXIST); if ( !sqlScriptFileName.empty() ) @@ -200,15 +201,15 @@ loadedFileName_ = selectedFileName.GetFullName(); wxString sqlText; - wxTextFile sqlFile(sqlScriptFileName); + wxTextFile sqlFile(sqlScriptFileName); if (sqlFile.Open()) { - sqlText << sqlFile.GetFirstLine(); + sqlText << sqlFile.GetFirstLine(); while (! sqlFile.Eof()) { wxString nextLine = sqlFile.GetNextLine(); if (! nextLine.IsEmpty()) - sqlText << wxT("\n"); + sqlText << wxT("\n"); sqlText << nextLine; } sqlSourceTxtCtrl_->SetValue(sqlText); @@ -252,7 +253,7 @@ reportIndex_->getUserTitleSelection(_(" entry location:\n\nOK....: Insert before selected entry\nCancel: Add at bottom of List.")); } - if ( headingOnlyCheckBox_->GetValue() ) + if ( headingOnlyCheckBox_->GetValue() ) { reportIndex_->addReportTitle(reportTitleTxtCtrl_->GetValue(), edit_); navCtrlUpdateRequired_ = true; @@ -297,6 +298,7 @@ void mmCustomSQLDialog::OnRun(wxCommandEvent& /*event*/) { + if (sqlSourceTxtCtrl_->IsEmpty()) return; sqlQuery_ = sqlSourceTxtCtrl_->GetValue(); EndModal(wxID_MORE); } @@ -323,16 +325,14 @@ { subMenuCheckBox_->Enable( !headingOnlyCheckBox_->GetValue()); sqlSourceTxtCtrl_->Enable(!headingOnlyCheckBox_->GetValue()); - button_Open_->Enable(!headingOnlyCheckBox_->GetValue()); - button_Run_->Enable(!headingOnlyCheckBox_->GetValue()); + button_Open_->Enable(!headingOnlyCheckBox_->GetValue() && sqlSourceTxtCtrl_->IsEmpty()); + button_Run_->Enable(!headingOnlyCheckBox_->GetValue() && !sqlSourceTxtCtrl_->IsEmpty()); } void mmCustomSQLDialog::OnCheckedHeading(wxCommandEvent& /*event*/) { - if (!reportTitleTxtCtrl_->IsEmpty()) - { - button_Save_->Enable(); - } + button_Save_->Enable(!reportTitleTxtCtrl_->IsEmpty()); + SetDialogBoxForHeadings(); } @@ -350,24 +350,7 @@ void mmCustomSQLDialog::OnTextChangeSubReport(wxCommandEvent& /*event*/) { - if (!reportTitleTxtCtrl_->IsEmpty()) - { - button_Save_->Enable(); - } - if (!sqlSourceTxtCtrl_->IsEmpty()) - { - button_Run_->Enable(); - button_Open_->Disable(); - } + button_Save_->Enable(!reportTitleTxtCtrl_->IsEmpty()); + button_Run_->Enable(!sqlSourceTxtCtrl_->IsEmpty()); + button_Open_->Enable(sqlSourceTxtCtrl_->IsEmpty()); } - -//void mmCustomSQLDialog::OnDialogContextHelp(wxCommandEvent & event) -//{ -// dlg(this); -// dlg.ShowModal(); -//} - -//mmCustomSQLDialog::~mmCustomSQLDialog() -//{ -// wxMessageBox(wxT("Testing that the dialog is being destroyed.\nGoodby.."),wxT("Custom SQL Dialog destructor...")); -//} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-18 17:23:03
|
Revision: 3226 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3226&view=rev Author: vomikan Date: 2012-12-18 17:22:57 +0000 (Tue, 18 Dec 2012) Log Message: ----------- redesigned Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-12-18 14:31:47 UTC (rev 3225) +++ trunk/mmex/src/customreportdialog.cpp 2012-12-18 17:22:57 UTC (rev 3226) @@ -19,12 +19,10 @@ #include "customreportdialog.h" #include "paths.h" #include "util.h" -//#include <wx/cshelp.h> -//#include <wx/html/helpctrl.h> #include <wx/helpbase.h> #include <wx/help.h> -const int titleTextWidth = 350; // Determines width of Headings Textbox. +const int titleTextWidth = 200; // Determines width of Headings Textbox. const int sourceTextHeight = 200; // Determines height of Source Textbox. IMPLEMENT_DYNAMIC_CLASS( mmCustomSQLDialog, wxDialog ) @@ -38,8 +36,8 @@ EVT_BUTTON(wxID_CLOSE, mmCustomSQLDialog::OnClose) EVT_CHECKBOX(DIALOG_CUSTOM_SQL_CHKBOX_HEADING_ONLY, mmCustomSQLDialog::OnCheckedHeading) EVT_CHECKBOX(DIALOG_CUSTOM_SQL_CHKBOX_SUB_REPORT, mmCustomSQLDialog::OnCheckedSubReport) - EVT_TEXT( DIALOG_CUSTOM_SQL_TXTCTRL_REPORT_TITLE, mmCustomSQLDialog::OnTextChangeHeading) - EVT_TEXT( DIALOG_CUSTOM_SQL_TXTCTRL_SOURCE, mmCustomSQLDialog::OnTextChangeSubReport) + EVT_TEXT( wxID_FILE, mmCustomSQLDialog::OnTextChangeHeading) + EVT_TEXT( wxID_VIEW_DETAILS, mmCustomSQLDialog::OnTextChangeSubReport) END_EVENT_TABLE() mmCustomSQLDialog::mmCustomSQLDialog(customSQLReportIndex* reportIndex, wxWindow* parent, bool edit, @@ -81,71 +79,81 @@ this->SetSizer(mainBoxSizer); /**************************************** - Heading Panel + Parameters Area ***************************************/ - wxPanel* headingPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - mainBoxSizer->Add(headingPanel, flags); wxBoxSizer* headingPanelSizerH = new wxBoxSizer(wxHORIZONTAL); - headingPanel->SetSizer(headingPanelSizerH); + mainBoxSizer->Add(headingPanelSizerH, 5, wxGROW|wxALL, 5); - wxStaticText* headingTitleText = new wxStaticText( headingPanel, wxID_STATIC, _("Report Title:") ); - headingPanelSizerH->Add(headingTitleText, flags); + wxBoxSizer* headingPanelSizerH2 = new wxBoxSizer(wxVERTICAL); + headingPanelSizerH2->AddSpacer(15); - reportTitleTxtCtrl_ = new wxTextCtrl( headingPanel, DIALOG_CUSTOM_SQL_TXTCTRL_REPORT_TITLE, wxT(""), wxDefaultPosition, wxSize(titleTextWidth,-1), 0 ); + headingPanelSizerH->Add(headingPanelSizerH2); + wxFlexGridSizer* flex_sizer = new wxFlexGridSizer(0, 2, 0, 0); + // + flex_sizer->Add(new wxStaticText( this, wxID_ANY, _("Script type:")), flags.Bottom()); + wxString choices[] = { _("SQL"), _("Lua")}; + int num = sizeof(choices) / sizeof(wxString); + wxRadioBox* m_radio_box_ = new wxRadioBox(this, wxID_STATIC, wxT("") + , wxDefaultPosition, wxDefaultSize, num, choices, 2, wxRA_SPECIFY_COLS); + flex_sizer->Add(m_radio_box_, flags.Center()); + + headingOnlyCheckBox_ = new wxCheckBox(this, DIALOG_CUSTOM_SQL_CHKBOX_HEADING_ONLY, _("Heading")); + flex_sizer->Add(headingOnlyCheckBox_, flags); + + subMenuCheckBox_ = new wxCheckBox( this, DIALOG_CUSTOM_SQL_CHKBOX_SUB_REPORT, _("Sub-Menu")); + flex_sizer->Add(subMenuCheckBox_, flags); + + flex_sizer->Add(new wxStaticText( this, wxID_ANY, _("Report Title:")), flags); + flex_sizer->AddSpacer(1); + + reportTitleTxtCtrl_ = new wxTextCtrl( this, wxID_FILE, wxT(""), + wxDefaultPosition, wxSize(titleTextWidth,-1)); reportTitleTxtCtrl_->SetToolTip(_("Report Title is used as the file name of the SQL script.")); - headingPanelSizerH->Add(reportTitleTxtCtrl_, flags); - headingOnlyCheckBox_ = new wxCheckBox(headingPanel, DIALOG_CUSTOM_SQL_CHKBOX_HEADING_ONLY, _("Heading")); - headingPanelSizerH->Add(headingOnlyCheckBox_, flags); + headingPanelSizerH2->Add(flex_sizer, flags); + headingPanelSizerH2->Add(reportTitleTxtCtrl_, flags); + headingPanelSizerH2->AddSpacer(titleTextWidth); - subMenuCheckBox_ = new wxCheckBox( headingPanel, DIALOG_CUSTOM_SQL_CHKBOX_SUB_REPORT, _("Sub-Menu")); - headingPanelSizerH->Add(subMenuCheckBox_, flags); - /**************************************** - Center Area + Script Area ***************************************/ - wxStaticText* sourceTitleText = new wxStaticText( this, wxID_STATIC, _("SQL Source Script:")); - mainBoxSizer->Add(sourceTitleText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxADJUST_MINSIZE, 9); + // ListBox for source code + wxBoxSizer* headingPanelSizerV3 = new wxBoxSizer(wxVERTICAL); + wxBoxSizer* headingPanelSizerH4 = new wxBoxSizer(wxHORIZONTAL); + headingPanelSizerH->Add(headingPanelSizerV3, 1, wxGROW|wxALL, 5); + + headingPanelSizerV3->Add(new wxStaticText( this, wxID_ANY, _("Custom script:")), flags); + sqlSourceTxtCtrl_ = new wxTextCtrl( this, wxID_VIEW_DETAILS, wxT(""), + wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxHSCROLL ); + headingPanelSizerV3->Add(sqlSourceTxtCtrl_, 1, wxGROW|wxALL); + headingPanelSizerV3->Add(headingPanelSizerH4, flagsExpand.Center()); - wxBoxSizer* centerHorizontalBoxSizer = new wxBoxSizer(wxHORIZONTAL); - mainBoxSizer->Add(centerHorizontalBoxSizer, 1, wxGROW|wxALL, 5); + button_Open_ = new wxButton( this, wxID_OPEN); + headingPanelSizerH4->Add(button_Open_, flags.Center()); + button_Open_->SetToolTip(_("Locate and load an SQL script file into the script area.")); - wxPanel* centerPanel = new wxPanel( this, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - centerHorizontalBoxSizer->Add(centerPanel, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); + button_Save_ = new wxButton( this, wxID_SAVE); + headingPanelSizerH4->Add(button_Save_, flags); + button_Save_->SetToolTip(_("Save SQL script to file name set by the Report Title.")); - wxBoxSizer* centerVerticalBoxSizer = new wxBoxSizer(wxVERTICAL); - centerPanel->SetSizer(centerVerticalBoxSizer); + wxButton* button_Clear = new wxButton( this, wxID_CLEAR); + headingPanelSizerH4->Add(button_Clear, flags); + button_Clear->SetToolTip(_("Clear the SQL Source script area")); - // ListBox for source code - sqlSourceTxtCtrl_ = new wxTextCtrl( this, DIALOG_CUSTOM_SQL_TXTCTRL_SOURCE, wxT(""), wxDefaultPosition, wxSize(-1, sourceTextHeight), wxTE_MULTILINE ); - centerHorizontalBoxSizer->Add(sqlSourceTxtCtrl_, 1, wxGROW|wxALL, 1); - /**************************************** Bottom Panel ***************************************/ wxPanel* buttonPanel = new wxPanel( this, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - mainBoxSizer->Add(buttonPanel, flags.Center()); + mainBoxSizer->Add(buttonPanel, flagsExpand.Center()); wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); buttonPanel->SetSizer(buttonPanelSizer); - button_Open_ = new wxButton( buttonPanel, wxID_OPEN); - buttonPanelSizer->Add(button_Open_, flags); - button_Open_->SetToolTip(_("Locate and load an SQL script file into the script area.")); - - button_Save_ = new wxButton( buttonPanel, wxID_SAVE); - buttonPanelSizer->Add(button_Save_, flags); - button_Save_->SetToolTip(_("Save SQL script to file name set by the Report Title.")); - button_Run_ = new wxButton( buttonPanel, wxID_REFRESH, _("&Run")); buttonPanelSizer->Add(button_Run_, flags); button_Run_->SetToolTip(_("Test script. Save before running. SQL errors will result in loss of script.")); - wxButton* button_Clear = new wxButton( buttonPanel, wxID_CLEAR); - buttonPanelSizer->Add(button_Clear, flags); - button_Clear->SetToolTip(_("Clear the SQL Source script area")); - wxButton* button_Close = new wxButton( buttonPanel, wxID_CLOSE); buttonPanelSizer->Add(button_Close, flags); button_Close->SetToolTip(_("Save changes before closing. Changes without Save will be lost.")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2012-12-28 04:14:35
|
Revision: 3256 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3256&view=rev Author: stef145g Date: 2012-12-28 04:14:28 +0000 (Fri, 28 Dec 2012) Log Message: ----------- Fix: Disappearing script files in Windows 7 Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-12-28 01:55:05 UTC (rev 3255) +++ trunk/mmex/src/customreportdialog.cpp 2012-12-28 04:14:28 UTC (rev 3256) @@ -287,6 +287,7 @@ wxString sqlSource = sSourceTxtCtrl_->GetValue(); if ( !reportfileName.empty() && !sqlSource.empty() ) { + reportfileName.Replace(wxT(":"),wxT("_")); // else windows 7 will hide the filename. wxTextFile tfSourceFile(mmex::getPathUser(mmex::DIRECTORY) + reportfileName); // If the file does not exist and cannot be created, throw an error This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-28 19:25:09
|
Revision: 3259 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3259&view=rev Author: vomikan Date: 2012-12-28 19:25:02 +0000 (Fri, 28 Dec 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-12-28 10:50:15 UTC (rev 3258) +++ trunk/mmex/src/customreportdialog.cpp 2012-12-28 19:25:02 UTC (rev 3259) @@ -129,7 +129,7 @@ } treeCtrl_->ExpandAll(); //TODO: Under construncion - treeCtrl_->Disable(); + //treeCtrl_->Show(false); } void mmCustomSQLDialog::CreateControls() @@ -178,9 +178,12 @@ wxDefaultPosition, wxSize(titleTextWidth,-1)); reportTitleTxtCtrl_->SetToolTip(_("Report Title is used as the file name of the SQL script.")); + long treeCtrlFlags = wxTR_SINGLE | wxTR_HAS_BUTTONS; +#if defined (__WXWIN__) + treeCtrlFlags = wxTR_SINGLE | wxTR_HAS_BUTTONS | wxTR_ROW_LINES; +#endif treeCtrl_ = new wxTreeCtrl( this, wxID_ANY, - wxDefaultPosition, wxSize(titleTextWidth, titleTextWidth) - , wxTR_SINGLE | wxTR_HAS_BUTTONS | wxTR_ROW_LINES ); + wxDefaultPosition, wxSize(titleTextWidth, titleTextWidth), treeCtrlFlags ); headingPanelSizerH2->Add(flex_sizer, flags); headingPanelSizerH2->Add(reportTitleTxtCtrl_, flags); @@ -360,6 +363,7 @@ edit_ = true; loadedFileName_ = reportfileName; } + fillControls(); } void mmCustomSQLDialog::OnRun(wxCommandEvent& /*event*/) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2012-12-30 01:35:08
|
Revision: 3266 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3266&view=rev Author: stef145g Date: 2012-12-30 01:35:00 +0000 (Sun, 30 Dec 2012) Log Message: ----------- Normalise line endings Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-12-30 01:22:21 UTC (rev 3265) +++ trunk/mmex/src/customreportdialog.cpp 2012-12-30 01:35:00 UTC (rev 3266) @@ -17,7 +17,7 @@ ********************************************************/ #include "customreportdialog.h" -#include "customreportindex.h" +#include "customreportindex.h" #include "paths.h" #include "util.h" #include <wx/helpbase.h> @@ -38,7 +38,7 @@ EVT_CHECKBOX(DIALOG_CUSTOM_SQL_CHKBOX_SUB_REPORT, mmCustomSQLDialog::OnCheckedSubReport) EVT_TEXT( wxID_FILE, mmCustomSQLDialog::OnTextChangeHeading) EVT_TEXT( wxID_VIEW_DETAILS, mmCustomSQLDialog::OnTextChangeSubReport) - EVT_TREE_ITEM_RIGHT_CLICK(wxID_ANY, mmCustomSQLDialog::OnItemRightClick) + EVT_TREE_ITEM_RIGHT_CLICK(wxID_ANY, mmCustomSQLDialog::OnItemRightClick) EVT_TREE_SEL_CHANGED(wxID_ANY, mmCustomSQLDialog::OnSelChanged) //EVT_TREE_ITEM_ACTIVATED(wxID_ANY, mmCustomSQLDialog::OnDoubleClicked) END_EVENT_TABLE() @@ -426,26 +426,26 @@ button_Open_->Enable(sSourceTxtCtrl_->IsEmpty()); } -void mmCustomSQLDialog::OnItemRightClick(wxTreeEvent& event) -{ - wxTreeItemId id = event.GetItem(); - treeCtrl_ ->SelectItem(id); - - wxMenu* customReportMenu = new wxMenu; - customReportMenu->Append(1, _("Edit Custom Report")); - customReportMenu->Append(2, _("Delete Custom Report")); - PopupMenu(&*customReportMenu); - -} - -void mmCustomSQLDialog::OnSelChanged(wxTreeEvent& event) -{ - selectedItemId_ = event.GetItem(); - mmTreeItemData* iData = dynamic_cast<mmTreeItemData*>(treeCtrl_->GetItemData(selectedItemId_)); - if (!iData) return; - - reportIndex_->getSelectedTitleSelection(iData->getString()); - - edit_ = true; - fillControls(); -} +void mmCustomSQLDialog::OnItemRightClick(wxTreeEvent& event) +{ + wxTreeItemId id = event.GetItem(); + treeCtrl_ ->SelectItem(id); + + wxMenu* customReportMenu = new wxMenu; + customReportMenu->Append(1, _("Edit Custom Report")); + customReportMenu->Append(2, _("Delete Custom Report")); + PopupMenu(&*customReportMenu); + +} + +void mmCustomSQLDialog::OnSelChanged(wxTreeEvent& event) +{ + selectedItemId_ = event.GetItem(); + mmTreeItemData* iData = dynamic_cast<mmTreeItemData*>(treeCtrl_->GetItemData(selectedItemId_)); + if (!iData) return; + + reportIndex_->getSelectedTitleSelection(iData->getString()); + + edit_ = true; + fillControls(); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-31 14:19:51
|
Revision: 3275 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3275&view=rev Author: vomikan Date: 2012-12-31 14:19:42 +0000 (Mon, 31 Dec 2012) Log Message: ----------- fix Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-12-31 12:52:05 UTC (rev 3274) +++ trunk/mmex/src/customreportdialog.cpp 2012-12-31 14:19:42 UTC (rev 3275) @@ -109,8 +109,7 @@ treeCtrl_->DeleteAllItems(); wxTreeItemId root_ = treeCtrl_->AddRoot(_("Custom Reports")); - customSQLReportIndex* custRepIndex_ = new customSQLReportIndex(); - if (custRepIndex_->hasActiveSQLReports()) + if (reportIndex_->hasActiveSQLReports()) { if (reportIndex_->currentReportFileType() == wxT("LUA")) { @@ -119,12 +118,12 @@ int reportNumber = -1; wxString reportNumberStr; wxTreeItemId customSqlReportRootItem; - custRepIndex_->resetReportsIndex(); - wxString reportTitle = custRepIndex_->nextReportTitle(); - while (custRepIndex_->validTitle()) + reportIndex_->resetReportsIndex(); + wxString reportTitle = reportIndex_->nextReportTitle(); + while (reportIndex_->validTitle()) { wxTreeItemId customSqlReportItem; - if (custRepIndex_->reportIsSubReport() && reportNumber >= 0 ) + if (reportIndex_->reportIsSubReport() && reportNumber >= 0 ) { customSqlReportItem = treeCtrl_->AppendItem(customSqlReportRootItem, reportTitle); } @@ -138,7 +137,7 @@ if (reportNumber == iSelectedId_) treeCtrl_->SelectItem(customSqlReportItem); - reportTitle = custRepIndex_->nextReportTitle(); + reportTitle = reportIndex_->nextReportTitle(); } } treeCtrl_->ExpandAll(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-01 23:24:55
|
Revision: 3278 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3278&view=rev Author: vomikan Date: 2013-01-01 23:24:43 +0000 (Tue, 01 Jan 2013) Log Message: ----------- debug code removed Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-01 23:22:31 UTC (rev 3277) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-01 23:24:43 UTC (rev 3278) @@ -74,7 +74,7 @@ edit_ = reportIndex_->getSelectedTitleSelection(customSqlReportSelectedItem_); iSelectedId_ = reportIndex_->getCustomReportId(); -wxSafeShowMessage( wxString()<<iSelectedId_, customSqlReportSelectedItem_); + fillControls(); return TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2013-01-03 00:38:53
|
Revision: 3288 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3288&view=rev Author: stef145g Date: 2013-01-03 00:38:46 +0000 (Thu, 03 Jan 2013) Log Message: ----------- Normalise line endings (Unix lf) Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-02 22:38:21 UTC (rev 3287) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-03 00:38:46 UTC (rev 3288) @@ -535,28 +535,28 @@ return (iError == wxYES); } -void mmCustomSQLDialog::OnMenuSelected(wxCommandEvent& event) -{ - int id = event.GetId(); - if (id == wxID_NEW) - { - reportTitleTxtCtrl_->SetValue(_("New SQL Custom Report")); - tcSourceTxtCtrl_->ChangeValue(wxT("select 'Hello World'")); - loadedFileName_.Clear(); - m_radio_box_->SetSelection(0); - navCtrlUpdateRequired_ = SaveCustomReport(); - } - if (id == wxID_NEW+1) - { - reportTitleTxtCtrl_->SetValue(_("New Lua Custom Report")); - tcSourceTxtCtrl_->ChangeValue(wxT("return \"Hello World\"")); - loadedFileName_.Clear(); - m_radio_box_->SetSelection(1); - navCtrlUpdateRequired_ = SaveCustomReport(); - } - else if (id == wxID_DELETE) - { - navCtrlUpdateRequired_ = DeleteCustomSqlReport(); - } - if (navCtrlUpdateRequired_) fillControls(); +void mmCustomSQLDialog::OnMenuSelected(wxCommandEvent& event) +{ + int id = event.GetId(); + if (id == wxID_NEW) + { + reportTitleTxtCtrl_->SetValue(_("New SQL Custom Report")); + tcSourceTxtCtrl_->ChangeValue(wxT("select 'Hello World'")); + loadedFileName_.Clear(); + m_radio_box_->SetSelection(0); + navCtrlUpdateRequired_ = SaveCustomReport(); + } + if (id == wxID_NEW+1) + { + reportTitleTxtCtrl_->SetValue(_("New Lua Custom Report")); + tcSourceTxtCtrl_->ChangeValue(wxT("return \"Hello World\"")); + loadedFileName_.Clear(); + m_radio_box_->SetSelection(1); + navCtrlUpdateRequired_ = SaveCustomReport(); + } + else if (id == wxID_DELETE) + { + navCtrlUpdateRequired_ = DeleteCustomSqlReport(); + } + if (navCtrlUpdateRequired_) fillControls(); } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-03 09:59:54
|
Revision: 3291 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3291&view=rev Author: vomikan Date: 2013-01-03 09:59:47 +0000 (Thu, 03 Jan 2013) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-03 08:09:49 UTC (rev 3290) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-03 09:59:47 UTC (rev 3291) @@ -43,7 +43,7 @@ EVT_TREE_END_LABEL_EDIT(wxID_ANY, mmCustomSQLDialog::OnLabelChanged) EVT_TREE_ITEM_MENU(wxID_ANY, mmCustomSQLDialog::OnItemRightClick) //EVT_TREE_ITEM_ACTIVATED(wxID_ANY, mmCustomSQLDialog::OnDoubleClicked) - EVT_MENU_RANGE(wxID_NEW, wxID_DELETE, mmCustomSQLDialog::OnMenuSelected) + EVT_MENU_RANGE(wxID_NEW, wxID_DELETE, mmCustomSQLDialog::OnMenuSelected) END_EVENT_TABLE() mmCustomSQLDialog::mmCustomSQLDialog(customSQLReportIndex* reportIndex, wxString customSqlReportSelectedItem, wxWindow* parent, @@ -303,8 +303,8 @@ void mmCustomSQLDialog::OnSave(wxCommandEvent& /*event*/) { - if (SaveCustomReport()) - fillControls(); + if (SaveCustomReport() && navCtrlUpdateRequired_) + fillControls(); } bool mmCustomSQLDialog::SaveCustomReport() @@ -317,6 +317,8 @@ return false; } + navCtrlUpdateRequired_ = false; + reportfileName.Replace(wxT(" "),wxT("_")); // Replace spaces with underscore character reportfileName += sSctiptType() == wxT("SQL") ? wxT(".sql") : wxT(".lua"); // Add the file extenstion @@ -327,11 +329,12 @@ else if (loadedFileName_.IsEmpty()) { loadedFileName_ = reportfileName; + navCtrlUpdateRequired_ = true; } button_Save_->Disable(); - if (! edit_ && reportIndex_->ReportListHasItems() ) + if ( !edit_ && reportIndex_->ReportListHasItems() ) { reportIndex_->getUserTitleSelection(_(" entry location:\n\nOK....: Insert before selected entry\nCancel: Add at bottom of List.")); } @@ -339,7 +342,7 @@ if ( headingOnlyCheckBox_->IsChecked() ) { reportIndex_->addReportTitle(reportTitleTxtCtrl_->GetValue(), edit_); - navCtrlUpdateRequired_ = true; + navCtrlUpdateRequired_ = !edit_; } else { @@ -374,11 +377,12 @@ // update the index file reportIndex_->addReportTitle(reportTitleTxtCtrl_->GetValue(), edit_, reportfileName, subMenuCheckBox_->GetValue()); - navCtrlUpdateRequired_ = true; + iSelectedId_ = reportIndex_->getCustomReportId(); + navCtrlUpdateRequired_ = !edit_; loadedFileName_ = reportfileName; } edit_ = true; - return true; + return true; } void mmCustomSQLDialog::OnRun(wxCommandEvent& /*event*/) @@ -428,13 +432,14 @@ { button_Save_->Enable(); headingOnlyCheckBox_->Enable(!subMenuCheckBox_->GetValue()); - navCtrlUpdateRequired_=true; + navCtrlUpdateRequired_ = true; } void mmCustomSQLDialog::OnTextChangeHeading(wxCommandEvent& /*event*/) { button_Save_->Enable(); edit_ = false; // Allow saving as a new file name. + navCtrlUpdateRequired_ = !edit_; } void mmCustomSQLDialog::OnTextChangeSubReport(wxCommandEvent& /*event*/) @@ -442,6 +447,7 @@ button_Save_->Enable(!reportTitleTxtCtrl_->IsEmpty()); button_Run_->Enable(!tcSourceTxtCtrl_->IsEmpty()); button_Open_->Enable(tcSourceTxtCtrl_->IsEmpty()); + navCtrlUpdateRequired_ = !edit_; } void mmCustomSQLDialog::OnItemRightClick(wxTreeEvent& event) @@ -455,15 +461,15 @@ customReportMenu->AppendSeparator(); customReportMenu->Append(wxID_DELETE, _("Delete Custom Report")); PopupMenu(customReportMenu); - delete customReportMenu; + delete customReportMenu; } void mmCustomSQLDialog::OnSelChanged(wxTreeEvent& event) { mmTreeItemData* iData = dynamic_cast<mmTreeItemData*>(treeCtrl_->GetItemData(event.GetItem())); if (!iData) return; + iSelectedId_ = reportIndex_->getCustomReportId(); - reportIndex_->getSelectedTitleSelection(iData->getString()); loadedFileName_ = reportIndex_->currentReportFileName(false); @@ -511,7 +517,7 @@ wxString msg = wxString() << _("Delete the Custom Report Title:") << wxT("\n\n") << reportIndex_->currentReportTitle(); - int iError = wxMessageBox(msg ,reportIndex_->UserDialogHeading(),wxYES_NO|wxICON_QUESTION); + int iError = wxMessageBox(msg ,reportIndex_->UserDialogHeading(),wxYES_NO|wxICON_QUESTION); if ( iError == wxYES ) { reportIndex_->deleteSelectedReportTitle(); @@ -532,31 +538,31 @@ } } } - return (iError == wxYES); + return (iError == wxYES); } -void mmCustomSQLDialog::OnMenuSelected(wxCommandEvent& event) +void mmCustomSQLDialog::OnMenuSelected(wxCommandEvent& event) { - int id = event.GetId(); - if (id == wxID_NEW) - { - reportTitleTxtCtrl_->SetValue(_("New SQL Custom Report")); - tcSourceTxtCtrl_->ChangeValue(wxT("select 'Hello World'")); - loadedFileName_.Clear(); - m_radio_box_->SetSelection(0); - navCtrlUpdateRequired_ = SaveCustomReport(); - } - if (id == wxID_NEW+1) - { - reportTitleTxtCtrl_->SetValue(_("New Lua Custom Report")); - tcSourceTxtCtrl_->ChangeValue(wxT("return \"Hello World\"")); - loadedFileName_.Clear(); - m_radio_box_->SetSelection(1); - navCtrlUpdateRequired_ = SaveCustomReport(); - } - else if (id == wxID_DELETE) - { - navCtrlUpdateRequired_ = DeleteCustomSqlReport(); - } - if (navCtrlUpdateRequired_) fillControls(); -} \ No newline at end of file + int id = event.GetId(); + if (id == wxID_NEW) + { + reportTitleTxtCtrl_->SetValue(_("New SQL Custom Report")); + tcSourceTxtCtrl_->ChangeValue(wxT("select 'Hello World'")); + loadedFileName_.Clear(); + m_radio_box_->SetSelection(0); + navCtrlUpdateRequired_ = SaveCustomReport(); + } + if (id == wxID_NEW+1) + { + reportTitleTxtCtrl_->SetValue(_("New Lua Custom Report")); + tcSourceTxtCtrl_->ChangeValue(wxT("return \"Hello World\"")); + loadedFileName_.Clear(); + m_radio_box_->SetSelection(1); + navCtrlUpdateRequired_ = SaveCustomReport(); + } + else if (id == wxID_DELETE) + { + navCtrlUpdateRequired_ = DeleteCustomSqlReport(); + } + if (navCtrlUpdateRequired_) fillControls(); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-03 17:54:08
|
Revision: 3294 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3294&view=rev Author: vomikan Date: 2013-01-03 17:54:01 +0000 (Thu, 03 Jan 2013) Log Message: ----------- fix for report delete Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-03 12:11:46 UTC (rev 3293) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-03 17:54:01 UTC (rev 3294) @@ -534,6 +534,7 @@ if (wxFileExists(reportIndex_->currentReportFileName())) { wxRemoveFile(reportIndex_->currentReportFileName()); + loadedFileName_ = reportIndex_->reportFileName(iSelectedId_); } } } @@ -541,28 +542,29 @@ return (iError == wxYES); } -void mmCustomSQLDialog::OnMenuSelected(wxCommandEvent& event) +void mmCustomSQLDialog::OnMenuSelected(wxCommandEvent& event) { - int id = event.GetId(); - if (id == wxID_NEW) - { - reportTitleTxtCtrl_->SetValue(_("New SQL Custom Report")); - tcSourceTxtCtrl_->ChangeValue(wxT("select 'Hello World'")); - loadedFileName_.Clear(); - m_radio_box_->SetSelection(0); - navCtrlUpdateRequired_ = SaveCustomReport(); - } - if (id == wxID_NEW+1) - { - reportTitleTxtCtrl_->SetValue(_("New Lua Custom Report")); - tcSourceTxtCtrl_->ChangeValue(wxT("return \"Hello World\"")); - loadedFileName_.Clear(); - m_radio_box_->SetSelection(1); - navCtrlUpdateRequired_ = SaveCustomReport(); - } - else if (id == wxID_DELETE) - { - navCtrlUpdateRequired_ = DeleteCustomSqlReport(); - } - if (navCtrlUpdateRequired_) fillControls(); + int id = event.GetId(); + if (id == wxID_NEW) + { + reportTitleTxtCtrl_->SetValue(_("New SQL Custom Report")); + tcSourceTxtCtrl_->ChangeValue(wxT("select 'Hello World'")); + loadedFileName_.Clear(); + m_radio_box_->SetSelection(0); + navCtrlUpdateRequired_ = SaveCustomReport(); + } + if (id == wxID_NEW+1) + { + reportTitleTxtCtrl_->SetValue(_("New Lua Custom Report")); + tcSourceTxtCtrl_->ChangeValue(wxT("return \"Hello World\"")); + loadedFileName_.Clear(); + m_radio_box_->SetSelection(1); + navCtrlUpdateRequired_ = SaveCustomReport(); + } + else if (id == wxID_DELETE) + { + navCtrlUpdateRequired_ = DeleteCustomSqlReport(); + if (navCtrlUpdateRequired_) iSelectedId_--; + } + if (navCtrlUpdateRequired_) fillControls(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-07 16:58:12
|
Revision: 3307 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3307&view=rev Author: vomikan Date: 2013-01-07 16:58:06 +0000 (Mon, 07 Jan 2013) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-07 16:20:25 UTC (rev 3306) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-07 16:58:06 UTC (rev 3307) @@ -511,7 +511,7 @@ wxCommandEvent evt(wxEVT_COMMAND_BUTTON_CLICKED, wxID_SAVE); OnSave(evt); } - + navCtrlUpdateRequired_ = true; } bool mmCustomSQLDialog::DeleteCustomSqlReport() @@ -523,6 +523,7 @@ if ( iError == wxYES ) { reportIndex_->deleteSelectedReportTitle(); + navCtrlUpdateRequired_ = true; if (! reportIndex_->currentReportFileName(false).IsEmpty()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-09 12:31:00
|
Revision: 3320 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3320&view=rev Author: vomikan Date: 2013-01-09 12:30:54 +0000 (Wed, 09 Jan 2013) Log Message: ----------- monospace font for scripts area Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-09 12:07:44 UTC (rev 3319) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-09 12:30:54 UTC (rev 3320) @@ -221,10 +221,13 @@ headingPanelSizerV3->Add(new wxStaticText( this, wxID_PROPERTIES, _("Custom script:")), flags); tcSourceTxtCtrl_ = new wxTextCtrl( this, wxID_VIEW_DETAILS, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxHSCROLL|wxTE_NOHIDESEL ); + tcSourceTxtCtrl_->Connect(wxID_ANY, wxEVT_CHAR, + wxKeyEventHandler(mmCustomSQLDialog::OnSourceTxtChar), NULL, this); + int font_size = this->GetFont().GetPointSize(); + wxFont teletype( font_size, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ); + tcSourceTxtCtrl_->SetFont(teletype); headingPanelSizerV3->Add(tcSourceTxtCtrl_, flagsExpand); headingPanelSizerV3->Add(headingPanelSizerH4, flags.Center()); - tcSourceTxtCtrl_->Connect(wxID_ANY, wxEVT_CHAR, - wxKeyEventHandler(mmCustomSQLDialog::OnSourceTxtChar), NULL, this); button_Open_ = new wxButton( this, wxID_OPEN); headingPanelSizerH4->Add(button_Open_, flags); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-01-19 16:48:25
|
Revision: 3369 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3369&view=rev Author: vomikan Date: 2013-01-19 16:48:18 +0000 (Sat, 19 Jan 2013) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-19 11:04:25 UTC (rev 3368) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-19 16:48:18 UTC (rev 3369) @@ -43,7 +43,7 @@ EVT_TREE_END_LABEL_EDIT(wxID_ANY, mmCustomSQLDialog::OnLabelChanged) EVT_TREE_ITEM_MENU(wxID_ANY, mmCustomSQLDialog::OnItemRightClick) //EVT_TREE_ITEM_ACTIVATED(wxID_ANY, mmCustomSQLDialog::OnDoubleClicked) - EVT_MENU_RANGE(wxID_NEW, wxID_DELETE, mmCustomSQLDialog::OnMenuSelected) + EVT_MENU(wxID_ANY, mmCustomSQLDialog::OnMenuSelected) EVT_TIMER(wxID_ANY, mmCustomSQLDialog::ShowCursorCoordinates) END_EVENT_TABLE() @@ -325,12 +325,11 @@ if (reportfileName.IsEmpty()) { - wxMessageBox(_("Please supply the Report Title before saving"),reportIndex_->UserDialogHeading(),wxOK|wxICON_WARNING); + wxMessageBox(_("Please supply the Report Title before saving"), + reportIndex_->UserDialogHeading(), wxOK|wxICON_WARNING); return false; } - navCtrlUpdateRequired_ = false; - reportfileName.Replace(wxT(" "),wxT("_")); // Replace spaces with underscore character reportfileName += sSctiptType() == wxT("SQL") ? wxT(".sql") : wxT(".lua"); // Add the file extenstion @@ -344,8 +343,6 @@ navCtrlUpdateRequired_ = true; } - button_Save_->Disable(); - if ( !edit_ && reportIndex_->ReportListHasItems() ) { reportIndex_->getUserTitleSelection(_(" entry location:\n\nOK....: Insert before selected entry\nCancel: Add at bottom of List.")); @@ -397,6 +394,8 @@ navCtrlUpdateRequired_ = navCtrlUpdateRequired_ || !edit_; loadedFileName_ = reportfileName; } + + button_Save_->Disable(); edit_ = true; return true; } @@ -472,8 +471,8 @@ treeCtrl_ ->SelectItem(id); wxMenu* customReportMenu = new wxMenu; - customReportMenu->Append(wxID_NEW, _("New SQL Custom Report")); - customReportMenu->Append(wxID_NEW+1, _("New Lua Custom Report")); + customReportMenu->Append(1, _("New SQL Custom Report")); + customReportMenu->Append(2, _("New Lua Custom Report")); customReportMenu->AppendSeparator(); customReportMenu->Append(wxID_DELETE, _("Delete Custom Report")); PopupMenu(customReportMenu); @@ -565,7 +564,7 @@ void mmCustomSQLDialog::OnMenuSelected(wxCommandEvent& event) { int id = event.GetId(); - if (id == wxID_NEW) + if (id == 1) { reportTitleTxtCtrl_->SetValue(_("New SQL Custom Report")); tcSourceTxtCtrl_->ChangeValue(wxT("select 'Hello World'")); @@ -573,7 +572,7 @@ m_radio_box_->SetSelection(0); navCtrlUpdateRequired_ = SaveCustomReport(); } - if (id == wxID_NEW+1) + if (id == 2) { reportTitleTxtCtrl_->SetValue(_("New Lua Custom Report")); tcSourceTxtCtrl_->ChangeValue(wxT("return \"Hello World\"")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2013-01-20 12:03:27
|
Revision: 3378 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3378&view=rev Author: stef145g Date: 2013-01-20 12:03:21 +0000 (Sun, 20 Jan 2013) Log Message: ----------- fix empty lines removal Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-20 11:47:21 UTC (rev 3377) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-20 12:03:21 UTC (rev 3378) @@ -288,22 +288,25 @@ { wxFileName selectedFileName(sScriptFileName); loadedFileName_ = selectedFileName.GetFullName(); - wxString sqlText; + wxString reportText; - wxTextFile sqlFile(sScriptFileName); - if (sqlFile.Open()) + wxTextFile reportFile(sScriptFileName); + if (reportFile.Open()) { - sqlText << sqlFile.GetFirstLine(); - while (! sqlFile.Eof()) + reportText << reportFile.GetFirstLine() << wxT("\n"); + size_t currentline = 1; + while (! reportFile.Eof()) { - wxString nextLine = sqlFile.GetNextLine(); - if (! nextLine.IsEmpty()) - sqlText << wxT("\n"); - sqlText << nextLine; + reportText << reportFile.GetNextLine(); + currentline ++; + if (currentline < reportFile.GetLineCount()) + { + reportText << wxT("\n"); + } } - tcSourceTxtCtrl_->SetValue(sqlText); + tcSourceTxtCtrl_->SetValue(reportText); newFileCreated_ = false; - sqlFile.Close(); + reportFile.Close(); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2013-01-22 22:56:57
|
Revision: 3390 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3390&view=rev Author: stef145g Date: 2013-01-22 22:56:49 +0000 (Tue, 22 Jan 2013) Log Message: ----------- Fix crash opening Report Manager after removing reports without deleting report files Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-01-22 22:20:52 UTC (rev 3389) +++ trunk/mmex/src/customreportdialog.cpp 2013-01-22 22:56:49 UTC (rev 3390) @@ -55,6 +55,7 @@ , navCtrlUpdateRequired_(false) , newFileCreated_(true) , parent_(parent) +, edit_(false) , newload_(false) { Create(parent_, id, caption, pos, size, style); @@ -86,7 +87,9 @@ SetIcon(mmex::getProgramIcon()); Centre(); - edit_ = reportIndex_->GetSelectedTitleSelection(customSqlReportSelectedItem_); + if (reportIndex_->ValidTitle()) + edit_ = reportIndex_->GetSelectedTitleSelection(customSqlReportSelectedItem_); + iSelectedId_ = reportIndex_->GetCustomReportId(); timer_ = new wxTimer(this, wxID_ANY); timer_->Start(INTERVAL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-04-19 16:18:25
|
Revision: 3736 http://sourceforge.net/p/moneymanagerex/code/3736 Author: vomikan Date: 2013-04-19 16:18:23 +0000 (Fri, 19 Apr 2013) Log Message: ----------- wxT() remove Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2013-04-19 00:06:38 UTC (rev 3735) +++ trunk/mmex/src/customreportdialog.cpp 2013-04-19 16:18:23 UTC (rev 3736) @@ -102,7 +102,7 @@ if (edit_) { - m_radio_box_->SetSelection(reportIndex_->CurrentReportFileType() == wxT("LUA")); + m_radio_box_->SetSelection(reportIndex_->CurrentReportFileType() == "LUA"); reportTitleTxtCtrl_->ChangeValue(reportIndex_->CurrentReportTitle()); if (reportIndex_->CurrentReportFileName().IsEmpty()) { @@ -152,7 +152,7 @@ customReportItem = treeCtrl_->AppendItem(root_, reportTitle); customSqlReportRootItem = customReportItem; } - reportNumberStr.Printf(wxT("Custom_Report_%d"), ++reportNumber); + reportNumberStr.Printf("Custom_Report_%d", ++reportNumber); treeCtrl_->SetItemData(customReportItem, new mmTreeItemData(reportNumberStr)); if (reportNumber == iSelectedId_) customReportSelectedItem = customReportItem; @@ -189,7 +189,7 @@ flex_sizer->Add(new wxStaticText( this, wxID_ANY, _("Script type:")), flags); wxString choices[] = { _("SQL"), _("Lua")}; int num = sizeof(choices) / sizeof(wxString); - m_radio_box_ = new wxRadioBox(this, wxID_STATIC, wxT("") + m_radio_box_ = new wxRadioBox(this, wxID_STATIC, "" , wxDefaultPosition, wxDefaultSize, num, choices, 2, wxRA_SPECIFY_COLS); flex_sizer->Add(m_radio_box_, flags.Center()); @@ -202,7 +202,7 @@ flex_sizer->Add(new wxStaticText( this, wxID_ANY, _("Report Title:")), flags); flex_sizer->AddSpacer(1); - reportTitleTxtCtrl_ = new wxTextCtrl( this, wxID_FILE, wxT(""), + reportTitleTxtCtrl_ = new wxTextCtrl( this, wxID_FILE, "", wxDefaultPosition, wxSize(titleTextWidth,-1)); reportTitleTxtCtrl_->SetToolTip(_("Report Title is used as the file name of the SQL script.")); @@ -226,7 +226,7 @@ headingPanelSizerH->Add(headingPanelSizerV3, flagsExpand); headingPanelSizerV3->Add(new wxStaticText( this, wxID_PROPERTIES, _("Custom script:")), flags); - tcSourceTxtCtrl_ = new wxTextCtrl( this, wxID_VIEW_DETAILS, wxT(""), + tcSourceTxtCtrl_ = new wxTextCtrl( this, wxID_VIEW_DETAILS, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxHSCROLL|wxTE_NOHIDESEL ); tcSourceTxtCtrl_->Connect(wxID_ANY, wxEVT_CHAR, wxKeyEventHandler(mmCustomSQLDialog::OnSourceTxtChar), NULL, this); @@ -281,17 +281,17 @@ { int i = m_radio_box_->GetSelection(); if (i == 0) - return wxT("SQL"); + return "SQL"; else - return wxT("LUA"); + return "LUA"; } void mmCustomSQLDialog::OnOpen(wxCommandEvent& /*event*/) { - wxString sScriptFileName = wxFileSelector( sSctiptType()==wxT("SQL") ? + wxString sScriptFileName = wxFileSelector( sSctiptType()=="SQL" ? _("Load Custom SQL file:") : _("Load Custom Lua file:"), mmex::getPathUser(mmex::DIRECTORY), wxEmptyString, wxEmptyString, - sSctiptType()==wxT("SQL") ? wxT("SQL File(*.sql)|*.sql") : wxT("Lua File(*.lua)|*.lua") + sSctiptType()=="SQL" ? "SQL File(*.sql)|*.sql" : "Lua File(*.lua)|*.lua" , wxFD_FILE_MUST_EXIST); if ( !sScriptFileName.empty() ) { @@ -302,7 +302,7 @@ wxTextFile reportFile(sScriptFileName); if (reportFile.Open()) { - reportText << reportFile.GetFirstLine() << wxT("\n"); + reportText << reportFile.GetFirstLine() << "\n"; size_t currentline = 1; while (! reportFile.Eof()) { @@ -310,7 +310,7 @@ currentline ++; if (currentline < reportFile.GetLineCount()) { - reportText << wxT("\n"); + reportText << "\n"; } } tcSourceTxtCtrl_->SetValue(reportText); @@ -321,7 +321,7 @@ } else { - wxString msg = wxString() << _("Unable to open file.") << sScriptFileName << wxT("\n\n"); + wxString msg = wxString() << _("Unable to open file.") << sScriptFileName << "\n\n"; wxMessageBox(msg,reportIndex_->UserDialogHeading(),wxOK|wxICON_ERROR); } } @@ -344,8 +344,8 @@ return false; } - reportfileName.Replace(wxT(" "),wxT("_")); // Replace spaces with underscore character - reportfileName += sSctiptType() == wxT("SQL") ? wxT(".sql") : wxT(".lua"); // Add the file extenstion + reportfileName.Replace(" ", "_"); // Replace spaces with underscore character + reportfileName += sSctiptType() == "SQL" ? ".sql" : ".lua"; // Add the file extenstion if (reportfileName == loadedFileName_ && !newload_) { @@ -373,7 +373,7 @@ wxString sqlSource = tcSourceTxtCtrl_->GetValue(); if ( !reportfileName.empty() && !sqlSource.empty() ) { - reportfileName.Replace(wxT(":"),wxT("_")); // else windows 7 will hide the filename. + reportfileName.Replace(":", "_"); // else windows 7 will hide the filename. wxTextFile tfSourceFile(mmex::getPathUser(mmex::DIRECTORY) + reportfileName); // If the file does not exist and cannot be created, throw an error @@ -508,7 +508,7 @@ loadedFileName_ = reportIndex_->CurrentReportFileName(false); if (reportIndex_->CurrentReportFileName().IsEmpty()) { - tcSourceTxtCtrl_->ChangeValue(wxT("")); + tcSourceTxtCtrl_->ChangeValue(""); headingOnlyCheckBox_->SetValue(true); } else @@ -518,7 +518,7 @@ wxString sSQLData; reportIndex_->GetReportFileData(sSQLData); tcSourceTxtCtrl_->ChangeValue(sSQLData); - if (reportIndex_->CurrentReportFileType() == wxT("LUA")) + if (reportIndex_->CurrentReportFileType() == "LUA") m_radio_box_->SetSelection(1); else m_radio_box_->SetSelection(0); @@ -533,7 +533,7 @@ edit_ = true; wxString sOldLabel = reportIndex_->CurrentReportTitle(); wxString sLabel = event.GetLabel(); - wxString reportNumberStr = wxString::Format(wxT("Custom_Report_%d"), iSelectedId_); + wxString reportNumberStr = wxString::Format("Custom_Report_%d", iSelectedId_); if (!sLabel.IsEmpty() && sLabel!=sOldLabel) { @@ -548,17 +548,17 @@ bool mmCustomSQLDialog::DeleteCustomSqlReport() { wxString msg = wxString() << _("Delete the Custom Report Title:") - << wxT("\n\n") + << "\n\n" << reportIndex_->CurrentReportTitle(); int iError = wxMessageBox(msg ,reportIndex_->UserDialogHeading(),wxYES_NO|wxICON_QUESTION); if ( iError == wxYES ) { wxString msg = _("Do you want to delete the SQL file as well?"); - if (reportIndex_->CurrentReportFileType() == wxT("LUA")) + if (reportIndex_->CurrentReportFileType() == "LUA") { msg = _("Do you want to delete the Lua file as well?"); } - msg << wxT("\n"); + msg << "\n"; bool delete_file = false; if ( wxMessageBox(msg, reportIndex_->UserDialogHeading(), wxYES_NO|wxNO_DEFAULT|wxICON_QUESTION) == wxYES) @@ -588,7 +588,7 @@ if (id == 1) { reportTitleTxtCtrl_->SetValue(_("New SQL Custom Report")); - tcSourceTxtCtrl_->ChangeValue(wxT("select 'Hello World'")); + tcSourceTxtCtrl_->ChangeValue("select 'Hello World'"); loadedFileName_.Clear(); m_radio_box_->SetSelection(0); navCtrlUpdateRequired_ = SaveCustomReport(); @@ -596,7 +596,7 @@ if (id == 2) { reportTitleTxtCtrl_->SetValue(_("New Lua Custom Report")); - tcSourceTxtCtrl_->ChangeValue(wxT("return \"Hello World\"")); + tcSourceTxtCtrl_->ChangeValue("return \"Hello World\""); loadedFileName_.Clear(); m_radio_box_->SetSelection(1); navCtrlUpdateRequired_ = SaveCustomReport(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |