From 67e00fcaa151f4189cdd98a46c04d62077d714b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sat, 11 Feb 2012 14:02:30 +0100
Subject: [PATCH] Add ExportPanel and update Import/Export engines

---
 src/model/export/XMLExportEngine.cpp    | 4 +++-
 src/model/import/GrisbiImportEngine.cpp | 1 +
 src/model/import/OFXImportEngine.cpp    | 1 +
 src/model/import/XMLImportEngine.cpp    | 6 ++++++
 src/view/wxUI.cpp                       | 4 ++--
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/model/export/XMLExportEngine.cpp b/src/model/export/XMLExportEngine.cpp
index 40812e3..69ff884 100644
--- a/src/model/export/XMLExportEngine.cpp
+++ b/src/model/export/XMLExportEngine.cpp
@@ -31,7 +31,7 @@ XMLExportEngine::XMLExportEngine()
     KissCount::RegisterExportEngine(this);
 
     _shortExt = "xml";
-    _longExt = _("XML files (*.xml)|*.xml");
+    _longExt = _("KissCount XML files (*.xml)|*.xml");
 }
 
 XMLExportEngine::~XMLExportEngine()
@@ -64,6 +64,7 @@ bool XMLExportEngine::SaveAccounts()
 	// xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "default", (const xmlChar*)  (account._default ? "1" : "0"));
 	// xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "is_owner", (const xmlChar*) (account.is_owner ? "1" : "0"));
 	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "virtual", (const xmlChar*) (account._virtual ? "1" : "0"));
+	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "hidden", (const xmlChar*) (account.hidden ? "1" : "0"));
 	xmlTextWriterEndElement(_writer);
     }
 
@@ -101,6 +102,7 @@ bool XMLExportEngine::SaveCategories()
 
 	xmlTextWriterStartElement(_writer, (const xmlChar*) "category");
 	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "id", (const xmlChar*) QString::number(category.id).toStdString().c_str());
+	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "parent", (const xmlChar*) QString::number(category.parent).toStdString().c_str());
 	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "name", (const xmlChar*) category.name.toStdString().c_str());
 	xmlTextWriterWriteAttribute(_writer, (const xmlChar*) "font", (const xmlChar*) category.font.toStdString().c_str());
 	rgb = category.backcolor.blue();
diff --git a/src/model/import/GrisbiImportEngine.cpp b/src/model/import/GrisbiImportEngine.cpp
index 284ae60..633628d 100644
--- a/src/model/import/GrisbiImportEngine.cpp
+++ b/src/model/import/GrisbiImportEngine.cpp
@@ -67,6 +67,7 @@ void GrisbiImportEngine::LoadAccount(GrisbiImportEngine* _this, const char** att
     ac._default = false;
     ac.is_owner = true;
     ac._virtual = false;
+    ac.hidden = false;
     _this->_unresolvedAccounts.push_back(ac);
 }
 
diff --git a/src/model/import/OFXImportEngine.cpp b/src/model/import/OFXImportEngine.cpp
index 2cdf2b2..a4f027c 100644
--- a/src/model/import/OFXImportEngine.cpp
+++ b/src/model/import/OFXImportEngine.cpp
@@ -57,6 +57,7 @@ int OFXImportEngine::account_cb(const struct OfxAccountData data, void * account
 	ac._default = false;
 	ac.is_owner = true;
 	ac._virtual = false;
+	ac.hidden = false;
 	_this->_unresolvedAccounts.push_back(ac);
     }
 
diff --git a/src/model/import/XMLImportEngine.cpp b/src/model/import/XMLImportEngine.cpp
index bf64dcc..d994c83 100644
--- a/src/model/import/XMLImportEngine.cpp
+++ b/src/model/import/XMLImportEngine.cpp
@@ -47,6 +47,9 @@ void XMLImportEngine::LoadAccount(XMLImportEngine* _this, const char** attrs)
 
 	else if (!strcmp(attrs[i], "virtual"))
 	    ac._virtual = (QString(attrs[i+1]) == "1");
+
+	else if (!strcmp(attrs[i], "hidden"))
+	    ac.hidden = (QString(attrs[i+1]) == "1");
     }
 
     UNESCAPE_CHARS(ac.name);
@@ -115,6 +118,9 @@ void XMLImportEngine::LoadCategory(XMLImportEngine* _this, const char** attrs)
 	else if (!strcmp(attrs[i], "id"))
 	    cat.id = id = QString(attrs[i+1]).toInt();
 
+	else if (!strcmp(attrs[i], "parent"))
+	    cat.parent = id = QString(attrs[i+1]).toInt();
+
 	else if (!strcmp(attrs[i], "font"))
 	    cat.font = QString(attrs[i+1]);
 
diff --git a/src/view/wxUI.cpp b/src/view/wxUI.cpp
index a9dabf2..e7c2f5a 100644
--- a/src/view/wxUI.cpp
+++ b/src/view/wxUI.cpp
@@ -25,7 +25,7 @@
 //#include "UsersDialog.hpp"
 #include "StatsPanel.hpp"
 //#include "ImportPanel.hpp"
-//#include "ExportPanel.hpp"
+#include "ExportPanel.hpp"
 
 #include "wxUI.hpp"
 #include "view.hpp"
@@ -169,7 +169,7 @@ void wxUI::InitPanels()
     ADD_PANEL(SearchPanel);
     ADD_PANEL(PreferencesPanel);
     // ADD_PANEL(ImportPanel, 4);
-    // ADD_PANEL(ExportPanel, 5);
+    ADD_PANEL(ExportPanel);
 }
 
 void wxUI::LoadPanels()