Merge 65352df into 2f327d9

opencor · Jan 16, 2019 · 9a2db46 · 9a2db46
2 parents 2f327d9 + 65352df
commit 9a2db46
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwidget.cpp b/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwidget.cpp
@@ -200,12 +200,7 @@ QModelIndex FileOrganiserWindowModel::decodeHierarchyData(QDataStream &pStream)
     for (int j = 0; j < levelsCount; ++j) {
         pStream >> row;
 
-        QStandardItem *newCrtItem = crtItem->child(row, 0);
-
-        if (newCrtItem)
-            crtItem = newCrtItem;
-        else
-            break;
+        crtItem = crtItem->child(row, 0);
     }
 
     return indexFromItem(crtItem);
@@ -365,7 +360,7 @@ void FileOrganiserWindowWidget::loadItemSettings(QSettings *pSettings,
     QStringList itemInfo = pSettings->value(QString::number(++crtItemIndex)).toStringList();
 
     if (!itemInfo.isEmpty()) {
-        int childItemsCount = itemInfo[1].toInt();
+        int childItemsCount = itemInfo[2].toInt();
 
         // Create the item, in case we are not dealing with the root folder item
 
@@ -388,7 +383,7 @@ void FileOrganiserWindowWidget::loadItemSettings(QSettings *pSettings,
 
                 // Expand the folder item, if necessary
 
-                if (itemInfo[2].toInt())
+                if (itemInfo[3].toInt())
                     setExpanded(folderItem->index(), true);
 
                 // The folder item is to be the parent of any of its child item
@@ -458,7 +453,8 @@ void FileOrganiserWindowWidget::loadSettings(QSettings *pSettings)
 //==============================================================================
 
 void FileOrganiserWindowWidget::saveItemSettings(QSettings *pSettings,
-                                                 QStandardItem *pItem) const
+                                                 QStandardItem *pItem,
+                                                 int pParentItemIndex) const
 {
     // Recursively keep track of the item settings
 
@@ -476,14 +472,16 @@ void FileOrganiserWindowWidget::saveItemSettings(QSettings *pSettings,
     if ((item == mModel->invisibleRootItem()) || item->isFolder()) {
         // We are dealing with a folder item (be it the root folder item or not)
 
-        itemInfo << item->text() << QString::number(item->rowCount())
+        itemInfo << item->text() << QString::number(pParentItemIndex)
+                 << QString::number(item->rowCount())
                  << QString(isExpanded(item->index())?"1":"0");
     } else {
         // We are dealing with a file item
 
         QString fileName = item->path();
 
-        itemInfo << fileName << "-1" << "0";
+        itemInfo << fileName
+                 << QString::number(pParentItemIndex) << "-1" << "0";
 
         // Remove the file from our file manager
         // Note: it doesn't matter whether or not the file has already been
@@ -496,8 +494,10 @@ void FileOrganiserWindowWidget::saveItemSettings(QSettings *pSettings,
 
     // Keep track of any child item
 
+    int childParentItemIndex = crtItemIndex;
+
     for (int i = 0, iMax = item->rowCount(); i < iMax; ++i)
-        saveItemSettings(pSettings, item->child(i));
+        saveItemSettings(pSettings, item->child(i), childParentItemIndex);
 }
 
 //==============================================================================
@@ -514,7 +514,7 @@ void FileOrganiserWindowWidget::saveSettings(QSettings *pSettings) const
     pSettings->remove(SettingsModel);
 
     pSettings->beginGroup(SettingsModel);
-        saveItemSettings(pSettings, mModel->invisibleRootItem());
+        saveItemSettings(pSettings, mModel->invisibleRootItem(), -1);
     pSettings->endGroup();
 
     // Keep track of the currently selected item, but only if it is visible

diff --git a/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwidget.h b/src/plugins/organisation/FileOrganiserWindow/src/fileorganiserwindowwidget.h
@@ -124,7 +124,8 @@ class FileOrganiserWindowWidget : public Core::TreeViewWidget
     FileOrganiserWindowModel *mModel;
 
     void loadItemSettings(QSettings *pSettings, QStandardItem *pParentItem);
-    void saveItemSettings(QSettings *pSettings, QStandardItem *pItem) const;
+    void saveItemSettings(QSettings *pSettings, QStandardItem *pItem,
+                          int pParentItemIndex) const;
 
     QString newFolderName(QStandardItem *pFolderItem) const;
     void collapseEmptyFolders(QStandardItem *pFolder);