From kde-commits Thu Jan 06 21:57:57 2011 From: Stephane Mankowski Date: Thu, 06 Jan 2011 21:57:57 +0000 To: kde-commits Subject: extragear/office/skrooge Message-Id: <20110106215757.E88D5AC8B0 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129435111918197 SVN commit 1212415 by smankowski: FEATURE: Import "Money Manager EX" file M +1 -0 CHANGELOG AM images/logos/allianz.png AM images/logos/boursorama_banque.png AM images/logos/cnp.png M +5 -0 images/logos/l10n/fr/list_bank.txt AM images/logos/monabanq.png AM images/logos/ubs.png M +1 -0 skgbankmodeler/CMakeLists.txt M +3 -0 skgbankmodeler/skgimportexportmanager.cpp M +1 -0 skgbankmodeler/skgimportexportmanager.h AM skgbankmodeler/skgimportmmb.cpp [License: GPL (v2+)] AM skgbankmodeler/skgimportmmb.h [License: GPL (v2+)] M +3 -0 skgbankmodelertest/CMakeLists.txt AM skgbankmodelertest/skgtestimportmmb.cpp [License: GPL (v2+)] M +2 -1 skrooge_importexport/skgimportexportplugin.cpp _M tests/input (directory) A tests/input/skgtestimportmmb (directory) AM tests/input/skgtestimportmmb/test.mmb AM tests/scripts/skgtestimportmmb.sh --- trunk/extragear/office/skrooge/CHANGELOG #1212414:1212415 @@ -15,6 +15,7 @@ *New feature: Import csv with ' as cote (for "Money Manager Ex" exports) *New feature: Import csv is now possible on file without header *New feature: Import csv supports more than one "category" column + *New feature: Import "Money Manager EX" file *New feature: Change icon on bookmarks *New feature: "Open potential duplicates" *New feature: Massive update on budgets --- trunk/extragear/office/skrooge/images/logos/l10n/fr/list_bank.txt #1212414:1212415 @@ -1,3 +1,4 @@ +allianz.png axa_banque__41179.png banque_de_savoie__10548.png banque_hervet__30368.png @@ -3,7 +4,9 @@ banque_postale__20041.png bnp_paribas__30004.png +boursorama_banque.png bred__40398.png caisse_epargne.png cic__30066.png +cnp.png cortal_consors__18889.png covefi__14690.png @@ -19,5 +22,7 @@ ing_direct__14559.png la_nef.png lcl__30002.png +monabanq.png smc__30077.png societe_generale__30003.png +ubs.png --- trunk/extragear/office/skrooge/skgbankmodeler/CMakeLists.txt #1212414:1212415 @@ -39,6 +39,7 @@ skgimportskg.cpp skgimportkmy.cpp skgimportgnc.cpp + skgimportmmb.cpp skgimportgsb.cpp skgimportxhb.cpp skgruleobject.cpp --- trunk/extragear/office/skrooge/skgbankmodeler/skgimportexportmanager.cpp #1212414:1212415 @@ -32,6 +32,7 @@ #include "skgimportgnc.h" #include "skgimportgsb.h" #include "skgimportxhb.h" +#include "skgimportmmb.h" #include #include @@ -87,6 +88,7 @@ else if(extension == "SKG") m_mode = SKGImportExportManager::SKG; else if(extension == "SQLITE") m_mode = SKGImportExportManager::SQLITE; else if(extension == "GSB") m_mode = SKGImportExportManager::GSB; + else if(extension == "MMB") m_mode = SKGImportExportManager::MMB; else if(extension == "XHB") m_mode = SKGImportExportManager::XHB; else if(extension == "XML") m_mode = SKGImportExportManager::XML; else m_mode = SKGImportExportManager::CSV; @@ -315,6 +317,7 @@ else if(m_mode == SKGImportExportManager::CSVUNIT) err = SKGImportExportManager::importCSVUnit(); else if(m_mode == SKGImportExportManager::GNUCASH) err = SKGImportGnc::importFile(this, m_document); else if(m_mode == SKGImportExportManager::GSB) err = SKGImportGsb::importFile(this, m_document); + else if(m_mode == SKGImportExportManager::MMB) err = SKGImportMmb::importFile(this, m_document); else if(m_mode == SKGImportExportManager::XHB) err = SKGImportXhb::importFile(this, m_document); else if(m_mode == SKGImportExportManager::KMY) err = SKGImportKmy::importFile(this, m_document); else if(m_mode == SKGImportExportManager::SKG) err = SKGImportSkg::importFile(this, m_document); --- trunk/extragear/office/skrooge/skgbankmodeler/skgimportexportmanager.h #1212414:1212415 @@ -57,6 +57,7 @@ CSV, /**< To export or inport in CSV mode */ CSVUNIT, /**< To inport in CSV mode values for a unit */ GNUCASH, /**< To inport in GNUCASH file */ + MMB, /**< To inport in Money Manager Ex file */ GSB, /**< To inport in GRISBI file */ XHB, /**< To inport in HOMEBANK file */ SKG, /**< To export or inport in SKROOGE file */ --- trunk/extragear/office/skrooge/skgbankmodelertest/CMakeLists.txt #1212414:1212415 @@ -26,6 +26,7 @@ ADD_EXECUTABLE(skgtestimportgnucash skgtestimportgnucash.cpp) ADD_EXECUTABLE(skgtestimportgsb skgtestimportgsb.cpp) ADD_EXECUTABLE(skgtestimportkmy skgtestimportkmy.cpp) +ADD_EXECUTABLE(skgtestimportmmb skgtestimportmmb.cpp) ADD_EXECUTABLE(skgtestimportskg skgtestimportskg.cpp) ADD_EXECUTABLE(skgtestimportstockqif skgtestimportstockqif.cpp) ADD_EXECUTABLE(skgtestimportcsv skgtestimportcsv.cpp) @@ -52,6 +53,7 @@ TARGET_LINK_LIBRARIES(skgtestimportgnucash ${QT_QTCORE_LIBRARY} skgbankmodeler skgbasemodeler) TARGET_LINK_LIBRARIES(skgtestimportgsb ${QT_QTCORE_LIBRARY} skgbankmodeler skgbasemodeler) TARGET_LINK_LIBRARIES(skgtestimportkmy ${QT_QTCORE_LIBRARY} skgbankmodeler skgbasemodeler) +TARGET_LINK_LIBRARIES(skgtestimportmmb ${QT_QTCORE_LIBRARY} skgbankmodeler skgbasemodeler) TARGET_LINK_LIBRARIES(skgtestimportskg ${QT_QTCORE_LIBRARY} skgbankmodeler skgbasemodeler) TARGET_LINK_LIBRARIES(skgtestimportstockqif ${QT_QTCORE_LIBRARY} skgbankmodeler skgbasemodeler) TARGET_LINK_LIBRARIES(skgtestimportcsv ${QT_QTCORE_LIBRARY} skgbankmodeler skgbasemodeler) @@ -85,6 +87,7 @@ ADD_TEST(skgtestimportgnucash ${CMAKE_SOURCE_DIR}/tests/scripts/skgtestimportgnucash.sh) ADD_TEST(skgtestimportgsb ${CMAKE_SOURCE_DIR}/tests/scripts/skgtestimportgsb.sh) ADD_TEST(skgtestimportkmy ${CMAKE_SOURCE_DIR}/tests/scripts/skgtestimportkmy.sh) +ADD_TEST(skgtestimportmmb ${CMAKE_SOURCE_DIR}/tests/scripts/skgtestimportmmb.sh) ADD_TEST(skgtestimportskg ${CMAKE_SOURCE_DIR}/tests/scripts/skgtestimportskg.sh) ADD_TEST(skgtestimportstockqif ${CMAKE_SOURCE_DIR}/tests/scripts/skgtestimportstockqif.sh) ADD_TEST(skgtestimportxhb ${CMAKE_SOURCE_DIR}/tests/scripts/skgtestimportxhb.sh) --- trunk/extragear/office/skrooge/skrooge_importexport/skgimportexportplugin.cpp #1212414:1212415 @@ -304,7 +304,7 @@ //Panel to ask files KEncodingFileDialog::Result result = KEncodingFileDialog::getOpenFileNamesAndEncoding(lastCodecUsed, "kfiledialog:///IMPEXP", sender() == m_importCsvUnitAction ? "*.csv|" + i18nc("A file format", "CSV Files") : - QString(SKGImportExportManager::isOFXSupported() ? "*.ofx *.qfx " : "") + "*.qif *.csv *.uncompressed *.gnucash *.gnc *.kmy *.xhb *.skg *.gsb|" + i18nc("A file format", "All supported formats") + '\n' + + QString(SKGImportExportManager::isOFXSupported() ? "*.ofx *.qfx " : "") + "*.qif *.csv *.uncompressed *.gnucash *.gnc *.kmy *.xhb *.skg *.mmb *.gsb|" + i18nc("A file format", "All supported formats") + '\n' + (SKGImportExportManager::isOFXSupported() ? "*.ofx *.qfx|" + i18nc("A file format", "OFX file") + '\n' : "") + "*.qif|" + i18nc("A file format", "QIF file") + '\n' + "*.csv|" + i18nc("A file format", "CSV file") + '\n' + @@ -313,6 +313,7 @@ "*.kmy|" + i18nc("A file format", "KMyMoney document") + '\n' + "*.uncompressed *.gnucash *.gnc|" + i18nc("A file format", "GnuCash document") + '\n' + "*.xhb|" + i18nc("A file format", "Homebank document") + '\n' + + "*.mmb|" + i18nc("A file format", "Money Manager Ex document") + '\n' + "*.gsb|" + i18nc("A file format", "Grisbi document") , SKGMainPanel::getMainPanel()); fileNames = result.fileNames.toSet();