Fix archiving pictures

Well, what can I say. Lost in recursion and parent pointers. This commit
actually boils down to using the proper database tables and inserting
the right values. 'Nuff said...

1 files changed, 4 insertions, 14 deletions

diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp
index 31a7c8e..e9d0c93 100644
--- a/mappingtreewidget.cpp
+++ b/mappingtreewidget.cpp
@@ -94,7 +94,7 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){
 }
 
 MappingData MappingTreeWidget::selectedItem() const {
-    MappingData retval = { -1, QString(), QList<QStringList>() };
+    MappingData retval = { -1, -1, -1, QString(), QList<QStringList>() };
     QModelIndex sel = selected();
     if(!sel.isValid()){
         return retval;
@@ -270,10 +270,12 @@ MappingEditWidget::MappingEditWidget(QWidget *parent) : QWidget(parent){
     //the views
     mMappingTree = new MappingTreeWidget;
     mMappingResult = new MappingTreeResultView;
-    mResultModel = new MappingTreeResultModel(QStringList() << tr("Name") << tr("Id"), this);
+    mResultModel = new MappingTreeResultModel(QStringList() << tr("Name") << tr("MappingId") << tr("ParentId") << tr("MyId"), this);
     mMappingResult->setModel(mResultModel);
     mMappingResult->setAlternatingRowColors(true);
     mMappingResult->setColumnHidden(1, true);
+    mMappingResult->setColumnHidden(2, true);
+    mMappingResult->setColumnHidden(3, true);
 
     //buttons
     mAddMapping = new QPushButton(tr(">>"));
@@ -294,15 +296,8 @@ MappingEditWidget::MappingEditWidget(QWidget *parent) : QWidget(parent){
     setLayout(mainLayout);
 }
 
-QList<int> MappingEditWidget::mappingIds() const {
-    return mResultModel->mappingsIds();
-}
-
 void MappingEditWidget::addMapping(){
     MappingData selected = mMappingTree->selectedItem();
-    if(selected.id == -1){
-        return;
-    }
     mResultModel->addItem(selected);
     mMappingResult->expandAll();
 }
@@ -320,14 +315,9 @@ void MappingEditWidget::setMappings(const QList<MappingData> &mappings){
     if(mappings.isEmpty()){
         return;
     }
-    //MappingTreeModel *mModel = static_cast<MappingTreeModel*>(SmGlobals::instance()->model("MappingTree"));
     mResultModel->clearData();
     foreach(MappingData d, mappings){
         mResultModel->addItem(d);
-        /*MappingData curData = mModel->mappingDataFromId(i);
-        if(curData.id != -1){
-            mResultModel->addItem(curData);
-        }*/
     }
     mMappingResult->expandAll();
 }