Fix Bin sort order lost on exit and sort by insertion order broken

Related to #583

src/bin/bin.cpp

@@ -876,12 +876,14 @@ Bin::Bin(std::shared_ptr<ProjectItemModel> model, QWidget *parent)
     m_sortDescend->setChecked(KdenliveSettings::binSorting() > 99);
     connect(m_sortDescend, &QAction::triggered, [&] () {
         if (m_sortGroup->checkedAction()) {
+            int actionData = m_sortGroup->checkedAction()->data().toInt();
             if ((m_itemView != nullptr) && m_listType == BinTreeView) {
                 auto *view = static_cast<QTreeView *>(m_itemView);
-                view->header()->setSortIndicator(m_sortGroup->checkedAction()->data().toInt(), m_sortDescend->isChecked() ? Qt::DescendingOrder : Qt::AscendingOrder);
+                view->header()->setSortIndicator(actionData, m_sortDescend->isChecked() ? Qt::DescendingOrder : Qt::AscendingOrder);
             } else {
-                m_proxyModel->sort(m_sortGroup->checkedAction()->data().toInt(), m_sortDescend->isChecked() ? Qt::DescendingOrder : Qt::AscendingOrder);
+                m_proxyModel->sort(actionData, m_sortDescend->isChecked() ? Qt::DescendingOrder : Qt::AscendingOrder);
             }
+            KdenliveSettings::setBinSorting(actionData + (m_sortDescend->isChecked() ? 100 : 0));
         }
     });
 
@@ -926,12 +928,14 @@ Bin::Bin(std::shared_ptr<ProjectItemModel> model, QWidget *parent)
     sort->addSeparator();
     sort->addAction(m_sortDescend);
     connect(m_sortGroup, &QActionGroup::triggered, [&] (QAction *ac) {
+        int actionData = ac->data().toInt();
         if ((m_itemView != nullptr) && m_listType == BinTreeView) {
             auto *view = static_cast<QTreeView *>(m_itemView);
-            view->header()->setSortIndicator(ac->data().toInt(), m_sortDescend->isChecked() ? Qt::DescendingOrder : Qt::AscendingOrder);
+            view->header()->setSortIndicator(actionData, m_sortDescend->isChecked() ? Qt::DescendingOrder : Qt::AscendingOrder);
         } else {
-            m_proxyModel->sort(ac->data().toInt(), m_sortDescend->isChecked() ? Qt::DescendingOrder : Qt::AscendingOrder);
+            m_proxyModel->sort(actionData, m_sortDescend->isChecked() ? Qt::DescendingOrder : Qt::AscendingOrder);
         }
+        KdenliveSettings::setBinSorting(actionData + (m_sortDescend->isChecked() ? 100 : 0));
     });
 
     QAction *disableEffects = new QAction(i18n("Disable Bin Effects"), this);
@@ -994,7 +998,7 @@ Bin::Bin(std::shared_ptr<ProjectItemModel> model, QWidget *parent)
     m_filterButton->setToolTip(i18n("Filter"));
     m_filterButton->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
     m_filterButton->setMenu(m_filterMenu);
-    
+
     connect(m_filterButton, &QToolButton::toggled, [this] (bool toggle) {
         if (!toggle) {
             m_proxyModel->slotClearSearchFilters();
@@ -1265,12 +1269,6 @@ void Bin::slotSaveHeaders()
         auto *view = static_cast<QTreeView *>(m_itemView);
         m_headerInfo = view->header()->saveState();
         KdenliveSettings::setTreeviewheaders(m_headerInfo.toBase64());
-        int ix = view->header()->sortIndicatorSection();
-        updateSortingAction(ix);
-        m_sortDescend->setChecked(view->header()->sortIndicatorOrder() == Qt::DescendingOrder);
-    }
-    if (m_sortGroup->checkedAction()) {
-        KdenliveSettings::setBinSorting(m_sortGroup->checkedAction()->data().toInt() + (m_sortDescend->isChecked() ? 100 : 0));
     }
 }
 
@@ -1601,7 +1599,7 @@ void Bin::rebuildFilters(QMap <QString, QString> tags)
         rateFilter->setCheckable(true);
         m_filterMenu->addAction(rateFilter);
     }
-    
+
     // Add type filters
     m_filterMenu->addSeparator();
     QMenu *typeMenu = new QMenu(i18n("Filter by type"), m_filterMenu);
@@ -1963,7 +1961,6 @@ void Bin::slotInitView(QAction *action)
         connect(view, &MyTreeView::displayBinFrame, this, &Bin::showBinFrame);
         if (!m_headerInfo.isEmpty()) {
             view->header()->restoreState(m_headerInfo);
-            m_sortDescend->setChecked(view->header()->sortIndicatorOrder() == Qt::DescendingOrder);
         } else {
             view->header()->resizeSections(QHeaderView::ResizeToContents);
             view->resizeColumnToContents(0);

src/bin/projectitemmodel.cpp

@@ -987,28 +987,33 @@ void ProjectItemModel::loadBinPlaylist(Mlt::Tractor *documentTractor, Mlt::Tract
             if (progressDialog) {
                 progressDialog->setMaximum(progressDialog->maximum() + max);
             }
+            QMap <int, std::shared_ptr<Mlt::Producer> > binProducers;
             for (int i = 0; i < max; i++) {
                 if (progressDialog) {
                     progressDialog->setValue(i);
                 }
                 QScopedPointer<Mlt::Producer> prod(playlist.get_clip(i));
-                std::shared_ptr<Mlt::Producer> producer(new Mlt::Producer(prod->parent()));
-                qDebug() << "dealing with bin clip" << i;
-                if (producer->is_blank() || !producer->is_valid()) {
+                if (prod->is_blank() || !prod->is_valid()) {
                     qDebug() << "producer is not valid or blank";
                     continue;
                 }
-                QString id = qstrdup(producer->get("kdenlive:id"));
-                QString parentId = qstrdup(producer->get("kdenlive:folderid"));
+                std::shared_ptr<Mlt::Producer> producer(new Mlt::Producer(prod->parent()));
+                int id = producer->get_int("kdenlive:id");
+                binProducers.insert(id, producer);
+            }
+            // Do the real insertion
+            QMapIterator<int, std::shared_ptr<Mlt::Producer> > i(binProducers);
+            while (i.hasNext()) {
+                i.next();
+                QString newId = QString::number(getFreeClipId());
+                QString parentId = qstrdup(i.value()->get("kdenlive:folderid"));
                 if (parentId.isEmpty()) {
                     parentId = QStringLiteral("-1");
                 }
-                qDebug() << "clip id" << id;
-                QString newId = isIdFree(id) ? id : QString::number(getFreeClipId());
-                producer->set("_kdenlive_processed", 1);
-                requestAddBinClip(newId, producer, parentId, undo, redo);
-                binIdCorresp[id] = newId;
-                qDebug() << "Loaded clip " << id << "under id" << newId;
+                i.value()->set("_kdenlive_processed", 1);
+                requestAddBinClip(newId, std::move(i.value()), parentId, undo, redo);
+                binIdCorresp[QString::number(i.key())] = newId;
+                qDebug() << "Loaded clip " << i.key() << "under id" << newId;
             }
         }
     }

src/timeline2/model/timelineitemmodel.hpp

@@ -97,7 +97,7 @@ public:
 
     const QString groupsData();
     bool loadGroups(const QString &groupsData);
-    
+
     /** @brief Rebuild track compositing */
     void buildTrackCompositing(bool rebuild = false) override;
     void _beginRemoveRows(const QModelIndex & /*unused*/, int /*unused*/, int /*unused*/) override;