Menu
▾
▴
[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[839] trunk/mmex
|
From: <kkk...@us...> - 2009-11-29 13:59:23
|
Revision: 839
http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=839&view=rev
Author: kkkvadim
Date: 2009-11-29 13:59:06 +0000 (Sun, 29 Nov 2009)
Log Message:
-----------
new helpers.h\.cpp
Modified Paths:
--------------
trunk/mmex/Makefile.in
trunk/mmex/build/msw/makefile.bcc
trunk/mmex/build/msw/makefile.gcc
trunk/mmex/build/msw/makefile.vc
trunk/mmex/build/msw/mmex_mmex.vcproj
trunk/mmex/build/msw/tests/makefile.bcc
trunk/mmex/build/msw/tests/makefile.gcc
trunk/mmex/build/msw/tests/makefile.vc
trunk/mmex/build/msw/tests/mmex_tests_mmex_tests.vcproj
trunk/mmex/src/aboutdialog.cpp
trunk/mmex/src/qifimport.cpp
trunk/mmex/src/tests/Makefile.in
trunk/mmex/src/univcsvdialog.cpp
trunk/mmex/src/util.cpp
trunk/mmex/src/util.h
Added Paths:
-----------
trunk/mmex/src/helpers.cpp
trunk/mmex/src/helpers.h
Modified: trunk/mmex/Makefile.in
===================================================================
--- trunk/mmex/Makefile.in 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/Makefile.in 2009-11-29 13:59:06 UTC (rev 839)
@@ -72,6 +72,7 @@
mmex_fileviewerdialog.o \
mmex_filtertransdialog.o \
mmex_guiid.o \
+ mmex_helpers.o \
mmex_htmlbuilder.o \
mmex_led.o \
mmex_maincurrencydialog.o \
@@ -259,6 +260,9 @@
mmex_guiid.o: $(srcdir)/src/guiid.cpp
$(CXXC) -c -o $@ $(MMEX_CXXFLAGS) $(srcdir)/src/guiid.cpp
+mmex_helpers.o: $(srcdir)/src/helpers.cpp
+ $(CXXC) -c -o $@ $(MMEX_CXXFLAGS) $(srcdir)/src/helpers.cpp
+
mmex_htmlbuilder.o: $(srcdir)/src/htmlbuilder.cpp
$(CXXC) -c -o $@ $(MMEX_CXXFLAGS) $(srcdir)/src/htmlbuilder.cpp
Modified: trunk/mmex/build/msw/makefile.bcc
===================================================================
--- trunk/mmex/build/msw/makefile.bcc 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/build/msw/makefile.bcc 2009-11-29 13:59:06 UTC (rev 839)
@@ -65,6 +65,7 @@
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_fileviewerdialog.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_filtertransdialog.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_guiid.obj \
+ bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_helpers.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_htmlbuilder.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_led.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_maincurrencydialog.obj \
@@ -423,6 +424,9 @@
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_guiid.obj: ..\..\src\guiid.cpp
$(CXX) -q -c -P -o$@ $(MMEX_CXXFLAGS) ..\..\src\guiid.cpp
+bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_helpers.obj: ..\..\src\helpers.cpp
+ $(CXX) -q -c -P -o$@ $(MMEX_CXXFLAGS) ..\..\src\helpers.cpp
+
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_htmlbuilder.obj: ..\..\src\htmlbuilder.cpp
$(CXX) -q -c -P -o$@ $(MMEX_CXXFLAGS) ..\..\src\htmlbuilder.cpp
Modified: trunk/mmex/build/msw/makefile.gcc
===================================================================
--- trunk/mmex/build/msw/makefile.gcc 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/build/msw/makefile.gcc 2009-11-29 13:59:06 UTC (rev 839)
@@ -59,6 +59,7 @@
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_fileviewerdialog.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_filtertransdialog.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_guiid.o \
+ gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_helpers.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_htmlbuilder.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_led.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_maincurrencydialog.o \
@@ -412,6 +413,9 @@
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_guiid.o: ../../src/guiid.cpp
$(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
+gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_helpers.o: ../../src/helpers.cpp
+ $(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
+
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_htmlbuilder.o: ../../src/htmlbuilder.cpp
$(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
Modified: trunk/mmex/build/msw/makefile.vc
===================================================================
--- trunk/mmex/build/msw/makefile.vc 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/build/msw/makefile.vc 2009-11-29 13:59:06 UTC (rev 839)
@@ -63,6 +63,7 @@
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_fileviewerdialog.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_filtertransdialog.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_guiid.obj \
+ vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_helpers.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_htmlbuilder.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_led.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_maincurrencydialog.obj \
@@ -477,6 +478,9 @@
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_guiid.obj: ..\..\src\guiid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\guiid.cpp
+vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_helpers.obj: ..\..\src\helpers.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\helpers.cpp
+
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_htmlbuilder.obj: ..\..\src\htmlbuilder.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\htmlbuilder.cpp
Modified: trunk/mmex/build/msw/mmex_mmex.vcproj
===================================================================
--- trunk/mmex/build/msw/mmex_mmex.vcproj 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/build/msw/mmex_mmex.vcproj 2009-11-29 13:59:06 UTC (rev 839)
@@ -2096,6 +2096,9 @@
RelativePath="..\..\src\guiid.cpp">
</File>
<File
+ RelativePath="..\..\src\helpers.cpp">
+ </File>
+ <File
RelativePath="..\..\src\htmlbuilder.cpp">
</File>
<File
@@ -2260,6 +2263,9 @@
RelativePath="..\..\src\guiid.h">
</File>
<File
+ RelativePath="..\..\src\helpers.h">
+ </File>
+ <File
RelativePath="..\..\src\htmlbuilder.h">
</File>
<File
Modified: trunk/mmex/build/msw/tests/makefile.bcc
===================================================================
--- trunk/mmex/build/msw/tests/makefile.bcc 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/build/msw/tests/makefile.bcc 2009-11-29 13:59:06 UTC (rev 839)
@@ -79,6 +79,7 @@
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_fileviewerdialog.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_filtertransdialog.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_guiid.obj \
+ bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_helpers.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_htmlbuilder.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_led.obj \
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_maincurrencydialog.obj \
@@ -416,6 +417,9 @@
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_guiid.obj: ..\..\..\src\guiid.cpp
$(CXX) -q -c -P -o$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\guiid.cpp
+bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_helpers.obj: ..\..\..\src\helpers.cpp
+ $(CXX) -q -c -P -o$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\helpers.cpp
+
bcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_htmlbuilder.obj: ..\..\..\src\htmlbuilder.cpp
$(CXX) -q -c -P -o$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\htmlbuilder.cpp
Modified: trunk/mmex/build/msw/tests/makefile.gcc
===================================================================
--- trunk/mmex/build/msw/tests/makefile.gcc 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/build/msw/tests/makefile.gcc 2009-11-29 13:59:06 UTC (rev 839)
@@ -71,6 +71,7 @@
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_fileviewerdialog.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_filtertransdialog.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_guiid.o \
+ gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_helpers.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_htmlbuilder.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_led.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_maincurrencydialog.o \
@@ -420,6 +421,9 @@
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_guiid.o: ../../../src/guiid.cpp
$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
+gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_helpers.o: ../../../src/helpers.cpp
+ $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
+
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_htmlbuilder.o: ../../../src/htmlbuilder.cpp
$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
Modified: trunk/mmex/build/msw/tests/makefile.vc
===================================================================
--- trunk/mmex/build/msw/tests/makefile.vc 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/build/msw/tests/makefile.vc 2009-11-29 13:59:06 UTC (rev 839)
@@ -79,6 +79,7 @@
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_fileviewerdialog.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_filtertransdialog.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_guiid.obj \
+ vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_helpers.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_htmlbuilder.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_led.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_maincurrencydialog.obj \
@@ -458,6 +459,9 @@
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_guiid.obj: ..\..\..\src\guiid.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\guiid.cpp
+vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_helpers.obj: ..\..\..\src\helpers.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\helpers.cpp
+
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_htmlbuilder.obj: ..\..\..\src\htmlbuilder.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\htmlbuilder.cpp
Modified: trunk/mmex/build/msw/tests/mmex_tests_mmex_tests.vcproj
===================================================================
--- trunk/mmex/build/msw/tests/mmex_tests_mmex_tests.vcproj 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/build/msw/tests/mmex_tests_mmex_tests.vcproj 2009-11-29 13:59:06 UTC (rev 839)
@@ -2099,6 +2099,9 @@
RelativePath="..\..\..\src\guiid.cpp">
</File>
<File
+ RelativePath="..\..\..\src\helpers.cpp">
+ </File>
+ <File
RelativePath="..\..\..\src\htmlbuilder.cpp">
</File>
<File
@@ -2269,6 +2272,9 @@
RelativePath="..\..\..\src\guiid.h">
</File>
<File
+ RelativePath="..\..\..\src\helpers.h">
+ </File>
+ <File
RelativePath="..\..\..\src\htmlbuilder.h">
</File>
<File
Modified: trunk/mmex/src/aboutdialog.cpp
===================================================================
--- trunk/mmex/src/aboutdialog.cpp 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/src/aboutdialog.cpp 2009-11-29 13:59:06 UTC (rev 839)
@@ -22,6 +22,7 @@
#include "util.h"
#include "paths.h"
#include "constants.h"
+#include "helpers.h"
/*******************************************************/
/* Include XPM Support */
#include "../resources/money.xpm"
@@ -69,15 +70,17 @@
void mmAboutDialog::OnVersionHistory(wxCommandEvent& /*event*/)
{
wxString filePath = mmex::getPathDoc(mmex::F_VERSION);
- fileviewer dlg(filePath, this);
- dlg.ShowModal();
+
+ boost::shared_ptr<fileviewer> dlg(new fileviewer(filePath, this), mmex::Destroy);
+ dlg->ShowModal();
}
void mmAboutDialog::OnContributerList(wxCommandEvent& /*event*/)
{
wxString filePath = mmex::getPathDoc(mmex::F_CONTRIB);
- fileviewer dlg(filePath, this);
- dlg.ShowModal();
+
+ boost::shared_ptr<fileviewer> dlg(new fileviewer(filePath, this), mmex::Destroy);
+ dlg->ShowModal();
}
void mmAboutDialog::CreateControls()
Added: trunk/mmex/src/helpers.cpp
===================================================================
--- trunk/mmex/src/helpers.cpp (rev 0)
+++ trunk/mmex/src/helpers.cpp 2009-11-29 13:59:06 UTC (rev 839)
@@ -0,0 +1,35 @@
+/*******************************************************
+Copyright (C) 2009 VaDiM
+
+This program is free software; you can redistribute it and/or modify
+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
+ ********************************************************/
+
+#include "helpers.h"
+//----------------------------------------------------------------------------
+#include <wx/window.h>
+#include <wx/debug.h>
+//----------------------------------------------------------------------------
+
+bool mmex::Destroy(wxWindow *w)
+{
+ bool ok = w != 0;
+ wxASSERT(ok);
+
+ ok = w->Destroy();
+ wxASSERT(ok);
+
+ return ok;
+}
+//----------------------------------------------------------------------------
Property changes on: trunk/mmex/src/helpers.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/mmex/src/helpers.h
===================================================================
--- trunk/mmex/src/helpers.h (rev 0)
+++ trunk/mmex/src/helpers.h 2009-11-29 13:59:06 UTC (rev 839)
@@ -0,0 +1,39 @@
+/*******************************************************
+Copyright (C) 2009 VaDiM
+
+This program is free software; you can redistribute it and/or modify
+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
+ ********************************************************/
+
+#ifndef _MM_EX_HELPERS_H_
+#define _MM_EX_HELPERS_H_
+//----------------------------------------------------------------------------
+class wxWindow;
+//----------------------------------------------------------------------------
+
+namespace mmex
+{
+
+/*
+ Usage:
+ boost::shared_ptr win(new SomeWin, mmex::Destroy);
+ // win->Destroy() will be called automatically when win goes out of scope.
+*/
+bool Destroy(wxWindow *w);
+
+} // namespace mmex
+
+//----------------------------------------------------------------------------
+#endif // _MM_EX_HELPERS_H_
+//----------------------------------------------------------------------------
Property changes on: trunk/mmex/src/helpers.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/mmex/src/qifimport.cpp
===================================================================
--- trunk/mmex/src/qifimport.cpp 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/src/qifimport.cpp 2009-11-29 13:59:06 UTC (rev 839)
@@ -220,6 +220,7 @@
#include "mmex.h"
#include "mmcoredb.h"
#include "platfdep.h"
+#include "helpers.h"
namespace
{
@@ -711,9 +712,8 @@
outputLog.Close();
- fileviewer *dlg = new fileviewer(logFile.GetFullPath(), 0);
+ boost::shared_ptr<fileviewer> dlg(new fileviewer(logFile.GetFullPath(), 0), mmex::Destroy);
dlg->ShowModal();
- dlg->Destroy();
}
scd->Destroy();
Modified: trunk/mmex/src/tests/Makefile.in
===================================================================
--- trunk/mmex/src/tests/Makefile.in 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/src/tests/Makefile.in 2009-11-29 13:59:06 UTC (rev 839)
@@ -87,6 +87,7 @@
mmex_tests_fileviewerdialog.o \
mmex_tests_filtertransdialog.o \
mmex_tests_guiid.o \
+ mmex_tests_helpers.o \
mmex_tests_htmlbuilder.o \
mmex_tests_led.o \
mmex_tests_maincurrencydialog.o \
@@ -297,6 +298,9 @@
mmex_tests_guiid.o: $(srcdir)/../../src/guiid.cpp
$(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/guiid.cpp
+mmex_tests_helpers.o: $(srcdir)/../../src/helpers.cpp
+ $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/helpers.cpp
+
mmex_tests_htmlbuilder.o: $(srcdir)/../../src/htmlbuilder.cpp
$(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/htmlbuilder.cpp
Modified: trunk/mmex/src/univcsvdialog.cpp
===================================================================
--- trunk/mmex/src/univcsvdialog.cpp 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/src/univcsvdialog.cpp 2009-11-29 13:59:06 UTC (rev 839)
@@ -22,6 +22,7 @@
#include "defs.h"
#include "paths.h"
#include "platfdep.h"
+#include "helpers.h"
IMPLEMENT_DYNAMIC_CLASS( mmUnivCSVImportDialog, wxDialog )
@@ -565,11 +566,8 @@
mmShowErrorMessage(0, msg, _("Import from CSV"));
outputLog.Close();
- fileviewer* dlg = new fileviewer(logFile.GetFullPath(), 0);
+ boost::shared_ptr<fileviewer> dlg(new fileviewer(logFile.GetFullPath(), 0), mmex::Destroy);
dlg->ShowModal();
- dlg->Destroy();
-
-
}
}
scd->Destroy();
Modified: trunk/mmex/src/util.cpp
===================================================================
--- trunk/mmex/src/util.cpp 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/src/util.cpp 2009-11-29 13:59:06 UTC (rev 839)
@@ -25,9 +25,11 @@
#include "mmcoredb.h"
#include "paths.h"
#include "platfdep.h"
+#include "helpers.h"
#include "wxautocombobox.h"
//----------------------------------------------------------------------------
#include <wx/sound.h>
+#include <boost/shared_ptr.hpp>
//----------------------------------------------------------------------------
namespace
@@ -329,149 +331,152 @@
void mmExportCSV(wxSQLite3Database* db_)
{
- if (mmDBWrapper::getNumAccounts(db_) == 0)
+ if (mmDBWrapper::getNumAccounts(db_) == 0)
{
mmShowErrorMessage(0, _("No Account available! Cannot Export!"), _("Error"));
return;
}
+
wxArrayString as;
- wxSQLite3ResultSet q1 = db_->ExecuteQuery(g_AccountNameSQL);
- while (q1.NextRow())
{
- as.Add(q1.GetString(wxT("ACCOUNTNAME")));
+ wxSQLite3ResultSet q1 = db_->ExecuteQuery(g_AccountNameSQL);
+ while (q1.NextRow())
+ {
+ as.Add(q1.GetString(wxT("ACCOUNTNAME")));
+ }
+ q1.Finalize();
}
- q1.Finalize();
wxString delimit = mmDBWrapper::getInfoSettingValue(db_, wxT("DELIMITER"), mmex::DEFDELIMTER);
- wxSingleChoiceDialog* scd = new wxSingleChoiceDialog(0, _("Choose Account to Export from:"),
- _("CSV Export"), as);
- if (scd->ShowModal() == wxID_OK)
- {
- wxString acctName = scd->GetStringSelection();
- int fromAccountID = mmDBWrapper::getAccountID(db_, acctName);
+ boost::shared_ptr<wxSingleChoiceDialog> scd(new wxSingleChoiceDialog(0,
+ _("Choose Account to Export from:"), _("CSV Export"), as), mmex::Destroy);
- wxString fileName = wxFileSelector(_("Choose CSV data file to Export"),
- wxT(""), wxT(""), wxT(""), wxT("*.csv"), wxSAVE | wxOVERWRITE_PROMPT);
- if ( !fileName.IsEmpty() )
- {
- wxFileOutputStream output( fileName );
- wxTextOutputStream text( output );
+ if (scd->ShowModal() != wxID_OK)
+ return;
+
+ wxString acctName = scd->GetStringSelection();
+ int fromAccountID = mmDBWrapper::getAccountID(db_, acctName);
- static const char sql[] =
- "SELECT TRANSID, TRANSDATE, "
- "TRANSCODE, TRANSAMOUNT, SUBCATEGID, "
- "CATEGID, PAYEEID, "
- "TRANSACTIONNUMBER, NOTES, TOACCOUNTID, ACCOUNTID "
- "FROM CHECKINGACCOUNT_V1 "
- "where ACCOUNTID = ? OR TOACCOUNTID = ?"
- "ORDER BY TRANSDATE";
+ wxString fileName = wxFileSelector(_("Choose CSV data file to Export"),
+ wxT(""), wxT(""), wxT(""), wxT("*.csv"), wxSAVE | wxOVERWRITE_PROMPT);
- wxSQLite3Statement st = db_->PrepareStatement(sql);
- st.Bind(1, fromAccountID);
- st.Bind(2, fromAccountID);
+ if (fileName.empty())
+ return;
+
+ wxFileOutputStream output( fileName );
+ wxTextOutputStream text( output );
- wxSQLite3ResultSet q1 = st.ExecuteQuery();
- int numRecords = 0;
+ static const char sql[] =
+ "SELECT TRANSID, TRANSDATE, "
+ "TRANSCODE, TRANSAMOUNT, SUBCATEGID, "
+ "CATEGID, PAYEEID, "
+ "TRANSACTIONNUMBER, NOTES, TOACCOUNTID, ACCOUNTID "
+ "FROM CHECKINGACCOUNT_V1 "
+ "where ACCOUNTID = ? OR TOACCOUNTID = ?"
+ "ORDER BY TRANSDATE";
- while (q1.NextRow())
- {
- wxString transid = q1.GetString(wxT("TRANSID"));
- wxString dateDBString = q1.GetString(wxT("TRANSDATE"));
- wxDateTime dtdt = mmGetStorageStringAsDate(dateDBString);
- wxString dateString = mmGetDateForDisplay(db_, dtdt);
+ wxSQLite3Statement st = db_->PrepareStatement(sql);
+ st.Bind(1, fromAccountID);
+ st.Bind(2, fromAccountID);
- int sid, cid;
- wxString payee = mmDBWrapper::getPayee(db_, q1.GetInt(wxT("PAYEEID")), sid, cid);
- wxString type = q1.GetString(wxT("TRANSCODE"));
- wxString sign = wxT("");
- wxString amount = q1.GetString(wxT("TRANSAMOUNT"));
- //Amount should be formated if delimiters is not "." or ","
- if (delimit != wxT(".") && delimit != wxT(","))
- {
- double value = 0;
- mmCurrencyFormatter::formatCurrencyToDouble(amount, value);
- mmCurrencyFormatter::formatDoubleToCurrencyEdit(value, amount);
- }
- wxString categ = mmDBWrapper::getCategoryName(db_, q1.GetInt(wxT("CATEGID")));
- wxString subcateg = mmDBWrapper::getSubCategoryName(db_,
- q1.GetInt(wxT("CATEGID")), q1.GetInt(wxT("SUBCATEGID")));
- wxString transNum = mmNotes4ExportString(q1.GetString(wxT("TRANSACTIONNUMBER")));
- wxString notes = mmNotes4ExportString(q1.GetString(wxT("NOTES")));
- wxString origtype = type;
- if (type == wxT("Transfer"))
- {
- int tAccountID = q1.GetInt(wxT("TOACCOUNTID"));
- int fAccountID = q1.GetInt(wxT("ACCOUNTID"));
+ wxSQLite3ResultSet q1 = st.ExecuteQuery();
+ int numRecords = 0;
- wxString fromAccount = mmDBWrapper::getAccountName(db_, fAccountID);
- wxString toAccount = mmDBWrapper::getAccountName(db_, tAccountID );
+ while (q1.NextRow())
+ {
+ wxString transid = q1.GetString(wxT("TRANSID"));
+ wxString dateDBString = q1.GetString(wxT("TRANSDATE"));
+ wxDateTime dtdt = mmGetStorageStringAsDate(dateDBString);
+ wxString dateString = mmGetDateForDisplay(db_, dtdt);
- if (tAccountID == fromAccountID)
- {
- type = wxT("Deposit");
- payee = fromAccount;
- }
- else if (fAccountID == fromAccountID)
- {
- type = wxT("Withdrawal");
- payee = toAccount;
- //transfer = wxT("T");
- }
- }
- //It should be negative amounts for withdrwal
- if (type == wxT("Withdrawal"))
- {
- sign = wxT("-");
- }
- if (categ.IsEmpty() && subcateg.IsEmpty())
- {
- static const char sql4splitedtrx[] =
- "SELECT SUBCATEGID, CATEGID, SPLITTRANSAMOUNT "
- "FROM splittransactions_v1 "
- "WHERE TRANSID = ?";
+ int sid, cid;
+ wxString payee = mmDBWrapper::getPayee(db_, q1.GetInt(wxT("PAYEEID")), sid, cid);
+ wxString type = q1.GetString(wxT("TRANSCODE"));
+ wxString sign = wxT("");
+ wxString amount = q1.GetString(wxT("TRANSAMOUNT"));
+ //Amount should be formated if delimiters is not "." or ","
+ if (delimit != wxT(".") && delimit != wxT(","))
+ {
+ double value = 0;
+ mmCurrencyFormatter::formatCurrencyToDouble(amount, value);
+ mmCurrencyFormatter::formatDoubleToCurrencyEdit(value, amount);
+ }
+ wxString categ = mmDBWrapper::getCategoryName(db_, q1.GetInt(wxT("CATEGID")));
+ wxString subcateg = mmDBWrapper::getSubCategoryName(db_,
+ q1.GetInt(wxT("CATEGID")), q1.GetInt(wxT("SUBCATEGID")));
+ wxString transNum = mmNotes4ExportString(q1.GetString(wxT("TRANSACTIONNUMBER")));
+ wxString notes = mmNotes4ExportString(q1.GetString(wxT("NOTES")));
+ wxString origtype = type;
+ if (type == wxT("Transfer"))
+ {
+ int tAccountID = q1.GetInt(wxT("TOACCOUNTID"));
+ int fAccountID = q1.GetInt(wxT("ACCOUNTID"));
- wxSQLite3Statement st2 = db_->PrepareStatement(sql4splitedtrx);
- st2.Bind(1, transid);
-
- wxSQLite3ResultSet q2 = st2.ExecuteQuery();
- while (q2.NextRow())
- {
- wxString splitamount = q2.GetString(wxT("SPLITTRANSAMOUNT"));
- //Amount should be formated if delimiters is not "." or ","
- if (delimit != wxT(".") && delimit != wxT(","))
- {
- double value = 0;
- mmCurrencyFormatter::formatCurrencyToDouble(splitamount, value);
- mmCurrencyFormatter::formatDoubleToCurrencyEdit(value, splitamount);
- }
- wxString splitcateg = mmDBWrapper::getCategoryName(db_, q2.GetInt(wxT("CATEGID")));
- wxString splitsubcateg = mmDBWrapper::getSubCategoryName(db_,q2.GetInt(wxT("CATEGID")), q2.GetInt(wxT("SUBCATEGID")));
-
- text << dateString << delimit << payee << delimit << sign << splitamount << delimit
- << splitcateg << delimit << splitsubcateg << delimit << transNum << delimit
- << notes << delimit << origtype << endl;
+ wxString fromAccount = mmDBWrapper::getAccountName(db_, fAccountID);
+ wxString toAccount = mmDBWrapper::getAccountName(db_, tAccountID );
- }
- st2.Finalize();
- }
- else
- {
- text << dateString << delimit << payee << delimit << sign << amount << delimit
- << categ << delimit << subcateg << delimit << transNum << delimit
- << notes << delimit << origtype << endl;
- }
- numRecords++;
+ if (tAccountID == fromAccountID)
+ {
+ type = wxT("Deposit");
+ payee = fromAccount;
+ }
+ else if (fAccountID == fromAccountID)
+ {
+ type = wxT("Withdrawal");
+ payee = toAccount;
+ //transfer = wxT("T");
}
- st.Finalize();
+ }
+ //It should be negative amounts for withdrwal
+ if (type == wxT("Withdrawal"))
+ {
+ sign = wxT("-");
+ }
+ if (categ.IsEmpty() && subcateg.IsEmpty())
+ {
+ static const char sql4splitedtrx[] =
+ "SELECT SUBCATEGID, CATEGID, SPLITTRANSAMOUNT "
+ "FROM splittransactions_v1 "
+ "WHERE TRANSID = ?";
- wxString msg = wxString::Format(wxT("%d transactions exported"), numRecords);
- mmShowErrorMessage(0, msg, _("Export to CSV"));
- }// if fileName.empty();
+ wxSQLite3Statement st2 = db_->PrepareStatement(sql4splitedtrx);
+ st2.Bind(1, transid);
+
+ wxSQLite3ResultSet q2 = st2.ExecuteQuery();
+ while (q2.NextRow())
+ {
+ wxString splitamount = q2.GetString(wxT("SPLITTRANSAMOUNT"));
+ //Amount should be formated if delimiters is not "." or ","
+ if (delimit != wxT(".") && delimit != wxT(","))
+ {
+ double value = 0;
+ mmCurrencyFormatter::formatCurrencyToDouble(splitamount, value);
+ mmCurrencyFormatter::formatDoubleToCurrencyEdit(value, splitamount);
+ }
+ wxString splitcateg = mmDBWrapper::getCategoryName(db_, q2.GetInt(wxT("CATEGID")));
+ wxString splitsubcateg = mmDBWrapper::getSubCategoryName(db_,q2.GetInt(wxT("CATEGID")), q2.GetInt(wxT("SUBCATEGID")));
+
+ text << dateString << delimit << payee << delimit << sign << splitamount << delimit
+ << splitcateg << delimit << splitsubcateg << delimit << transNum << delimit
+ << notes << delimit << origtype << endl;
- }// show Modal
- scd->Destroy();
+ }
+ st2.Finalize();
+ }
+ else
+ {
+ text << dateString << delimit << payee << delimit << sign << amount << delimit
+ << categ << delimit << subcateg << delimit << transNum << delimit
+ << notes << delimit << origtype << endl;
+ }
+ numRecords++;
+ }
+ st.Finalize();
+
+ wxString msg = wxString::Format(wxT("%d transactions exported"), numRecords);
+ mmShowErrorMessage(0, msg, _("Export to CSV"));
}
void mmExportQIF(wxSQLite3Database* db_)
@@ -898,9 +903,8 @@
mmShowErrorMessage(0, msg, _("Import from CSV"));
outputLog.Close();
- fileviewer* dlg = new fileviewer(logFile.GetFullPath(), 0);
+ boost::shared_ptr<fileviewer> dlg(new fileviewer(logFile.GetFullPath(), 0), mmex::Destroy);
dlg->ShowModal();
- dlg->Destroy();
}
}
scd->Destroy();
@@ -1120,9 +1124,8 @@
mmShowErrorMessage(0, msg, _("Import from CSV"));
outputLog.Close();
- fileviewer* dlg = new fileviewer(logFile.GetFullPath(), 0);
+ boost::shared_ptr<fileviewer> dlg(new fileviewer(logFile.GetFullPath(), 0), mmex::Destroy);
dlg->ShowModal();
- dlg->Destroy();
}
}
scd->Destroy();
Modified: trunk/mmex/src/util.h
===================================================================
--- trunk/mmex/src/util.h 2009-11-29 13:08:40 UTC (rev 838)
+++ trunk/mmex/src/util.h 2009-11-29 13:59:06 UTC (rev 839)
@@ -19,7 +19,7 @@
#ifndef _MM_EX_UTIL_H_
#define _MM_EX_UTIL_H_
-#include "wx/wxprec.h"
+#include <wx/wxprec.h>
#include "boost/shared_ptr.hpp"
#include "defs.h"
#include "mmcurrency.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|