From: <ste...@us...> - 2011-06-17 11:51:15
|
Revision: 1332 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1332&view=rev Author: stef145g Date: 2011-06-17 11:51:08 +0000 (Fri, 17 Jun 2011) Log Message: ----------- add missing extent when saving files Modified Paths: -------------- trunk/mmex/src/customreportdialog.cpp trunk/mmex/src/mmex.cpp trunk/mmex/src/univcsvdialog.cpp trunk/mmex/src/util.cpp trunk/mmex/src/util.h Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2011-06-15 09:19:51 UTC (rev 1331) +++ trunk/mmex/src/customreportdialog.cpp 2011-06-17 11:51:08 UTC (rev 1332) @@ -18,6 +18,7 @@ #include "customreportdialog.h" #include "paths.h" +#include "util.h" const int titleTextWidth = 350; // Determines width of Headings Textbox. const int sourceTextHeight = 200; // Determines height of Source Textbox. @@ -227,9 +228,7 @@ if (fileDialog.ShowModal() == wxID_OK) { reportfileName = fileDialog.GetFilename(); - wxFileName tempFileName(reportfileName); - if (tempFileName.GetExt() == wxT("")) - reportfileName << wxT(".sql"); + correctEmptyFileExt(wxT("sql"),reportfileName); } } else Modified: trunk/mmex/src/mmex.cpp =================================================================== --- trunk/mmex/src/mmex.cpp 2011-06-15 09:19:51 UTC (rev 1331) +++ trunk/mmex/src/mmex.cpp 2011-06-17 11:51:08 UTC (rev 1332) @@ -3778,6 +3778,7 @@ wxGetEmptyString(), wxGetEmptyString(), wxGetEmptyString(), wxT("*.html"), wxSAVE | wxOVERWRITE_PROMPT); if ( !fileName.empty() ) { + correctEmptyFileExt(wxT("html"),fileName); wxFileOutputStream output( fileName ); wxTextOutputStream text( output ); text << rp->getReportText(); Modified: trunk/mmex/src/univcsvdialog.cpp =================================================================== --- trunk/mmex/src/univcsvdialog.cpp 2011-06-15 09:19:51 UTC (rev 1331) +++ trunk/mmex/src/univcsvdialog.cpp 2011-06-17 11:51:08 UTC (rev 1332) @@ -362,31 +362,32 @@ //Saves the field order to a template file void mmUnivCSVImportDialog::OnSave(wxCommandEvent& /*event*/) { - wxString fileName = wxFileSelector(wxT("Choose Universal CSV format file to save"), + wxString fileName = wxFileSelector(wxT("Choose Universal CSV format file to save"), wxGetEmptyString(), wxGetEmptyString(), wxGetEmptyString(), wxT("CSV Template(*.mcv)|*.mcv"), wxSAVE); if ( !fileName.empty() ) { - wxTextFile tFile(fileName); - //if the file does not exist and cannot be created, throw an error - //if the file does exist, then skip to else section - if ( !tFile.Exists() && !tFile.Create() ) - { - mmShowErrorMessage(0, - _("Unable to write to file."), - _("Error")); + correctEmptyFileExt(wxT("mcv"),fileName); + + wxTextFile tFile(fileName); + //if the file does not exist and cannot be created, throw an error + //if the file does exist, then skip to else section + if ( !tFile.Exists() && !tFile.Create() ) + { + mmShowErrorMessage(0, _("Unable to write to file."), _("Error")); return; - } - else{ - //clear the contents of the current file - tFile.Clear(); - for (int idx = 0; idx < (int) csvFieldOrder_.size(); idx++) - { - wxString line = wxString::Format(wxT("%d"), csvFieldOrder_[idx]); - tFile.AddLine(line); - } - } - tFile.Write(); - tFile.Close(); + } + else + { + //clear the contents of the current file + tFile.Clear(); + for (int idx = 0; idx < (int) csvFieldOrder_.size(); idx++) + { + wxString line = wxString::Format(wxT("%d"), csvFieldOrder_[idx]); + tFile.AddLine(line); + } + } + tFile.Write(); + tFile.Close(); } } Modified: trunk/mmex/src/util.cpp =================================================================== --- trunk/mmex/src/util.cpp 2011-06-15 09:19:51 UTC (rev 1331) +++ trunk/mmex/src/util.cpp 2011-06-17 11:51:08 UTC (rev 1332) @@ -261,6 +261,14 @@ wxString mmOptions::financialYearStartMonthString_; //---------------------------------------------------------------------------- +void correctEmptyFileExt(wxString ext, wxString & fileName ) +{ + wxFileName tempFileName(fileName); + if (tempFileName.GetExt().IsEmpty()) + fileName << wxT(".") << ext; +} +//---------------------------------------------------------------------------- + void mmOptions::loadOptions( wxSQLite3Database* db ) { dateFormat = mmDBWrapper::getInfoSettingValue( db, wxT( "DATEFORMAT" ), mmex::DEFDATEFORMAT ); @@ -545,10 +553,12 @@ int fromAccountID = mmDBWrapper::getAccountID( db_, acctName ); wxString fileName = wxFileSelector( _( "Choose CSV data file to Export" ), - wxT( "" ), wxT( "" ), wxT( "" ), wxT( "*.csv" ), wxSAVE | wxOVERWRITE_PROMPT ); + wxT( "" ), wxT( "" ), wxT( "" ), wxT( "*.csv" ), wxSAVE | wxOVERWRITE_PROMPT ); if ( fileName.empty() ) return; + + correctEmptyFileExt(wxT("csv"),fileName); wxFileOutputStream output( fileName ); wxTextOutputStream text( output ); @@ -706,12 +716,15 @@ return; } - wxString fileName = wxFileSelector( _( "Choose QIF data file to Export" ), wxT( "" ), wxT( "" ), wxT( "" ), wxT( "*.qif" ), wxSAVE | wxOVERWRITE_PROMPT ); + wxString fileName = wxFileSelector( _( "Choose QIF data file to Export" ), + wxT( "" ), wxT( "" ), wxT( "" ), wxT( "*.qif" ), wxSAVE | wxOVERWRITE_PROMPT ); if ( fileName.IsEmpty() ) { return; } + correctEmptyFileExt(wxT("qif"),fileName); + wxFileOutputStream output( fileName ); wxTextOutputStream text( output ); int fromAccountID = mmDBWrapper::getAccountID( db_, acctName ); Modified: trunk/mmex/src/util.h =================================================================== --- trunk/mmex/src/util.h 2011-06-15 09:19:51 UTC (rev 1331) +++ trunk/mmex/src/util.h 2011-06-17 11:51:08 UTC (rev 1332) @@ -55,6 +55,8 @@ int mmImportCSVMMNET( mmCoreDB* core ); int mmImportQIF( mmCoreDB* core ); +void correctEmptyFileExt(wxString ext, wxString & fileName ); + void mmLoadColorsFromDatabase( wxSQLite3Database* db_ ); wxColour mmGetColourFromString( const wxString& str ); void mmRestoreDefaultColors(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |