From 4dfdbe9b728768bbbe0bbdcb1a9b0d32ce04c53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fauconnier?= <fc86@outlook.fr>
Date: Mon, 29 Jul 2019 14:45:26 +0200
Subject: [PATCH] reorder automatically renamed documents

---
 src/document/UBDocumentController.cpp   | 9 +++++++++
 src/document/UBDocumentController.h     | 2 ++
 src/document/UBSortFilterProxyModel.cpp | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
index 10c9eb50..0f8d464f 100644
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
@@ -1592,6 +1592,7 @@ void UBDocumentTreeItemDelegate::commitAndCloseEditor()
     if (lineEditor) {
         emit commitData(lineEditor);
         //emit closeEditor(lineEditor);
+        emit UBApplication::documentController->reorderDocumentsRequested();
     }
 }
 
@@ -1680,6 +1681,7 @@ UBDocumentController::UBDocumentController(UBMainWindow* mainWindow)
     setupToolbar();
     connect(this, SIGNAL(exportDone()), mMainWindow, SLOT(onExportDone()));
     connect(this, SIGNAL(documentThumbnailsUpdated(UBDocumentContainer*)), this, SLOT(refreshDocumentThumbnailsView(UBDocumentContainer*)));
+    connect(this, SIGNAL(reorderDocumentsRequested()), this, SLOT(reorderDocuments()));
 }
 
 UBDocumentController::~UBDocumentController()
@@ -2070,6 +2072,13 @@ void UBDocumentController::refreshDateColumns()
     }
 }
 
+void UBDocumentController::reorderDocuments()
+{
+   int kindIndex = mDocumentUI->sortKind->currentIndex();
+   int orderIndex = mDocumentUI->sortOrder->isChecked() ? UBDocumentController::DESC : UBDocumentController::ASC;
+
+   sortDocuments(kindIndex, orderIndex);
+}
 
 void UBDocumentController::sortDocuments(int kind, int order)
 {
diff --git a/src/document/UBDocumentController.h b/src/document/UBDocumentController.h
index 283853ff..c2afaa84 100644
--- a/src/document/UBDocumentController.h
+++ b/src/document/UBDocumentController.h
@@ -426,10 +426,12 @@ class UBDocumentController : public UBDocumentContainer
 
     signals:
         void exportDone();
+        void reorderDocumentsRequested();
 
     public slots:
         void createNewDocument();
         void refreshDateColumns();
+        void reorderDocuments();
         //issue 1629 - NNE - 20131105
         void createNewDocumentInUntitledFolder();
 
diff --git a/src/document/UBSortFilterProxyModel.cpp b/src/document/UBSortFilterProxyModel.cpp
index 33cabf08..b46465fb 100644
--- a/src/document/UBSortFilterProxyModel.cpp
+++ b/src/document/UBSortFilterProxyModel.cpp
@@ -4,7 +4,7 @@
 UBSortFilterProxyModel::UBSortFilterProxyModel():
     QSortFilterProxyModel()
 {
-    setDynamicSortFilter(true);
+    setDynamicSortFilter(false);
     setSortCaseSensitivity(Qt::CaseInsensitive);
 }