GUI: show duplicates: use a result table window instead of the static list

src/qtgui/rclm_wins.cpp

@@ -37,6 +37,7 @@
 #include "webcache.h"
 #include "restable.h"
 #include "actsearch_w.h"
+#include "docseqdocs.h"
 
 using namespace std;
 
@@ -443,27 +444,16 @@ void RclMain::showActiveTypes()
 
 void RclMain::newDupsW(const Rcl::Doc, const vector<Rcl::Doc> dups)
 {
-    ListDialog dialog;
+    if (nullptr == m_dupsw) {
-    dialog.setWindowTitle(tr("Duplicate documents"));
+        m_dupsw = new ResTable(nullptr, {"ipath", "url"});
-
+        m_dupsw->setRclMain(this, false);
-    dialog.groupBox->setTitle(tr("These Urls ( | ipath) share the same"
-                                 " content:"));
-    // We replace the list with an editor so that the user can copy/paste
-    deleteZ(dialog.listWidget);
-    QTextEdit *editor = new QTextEdit(dialog.groupBox);
-    editor->setReadOnly(true);
-    dialog.horizontalLayout->addWidget(editor);
-
-    for (vector<Rcl::Doc>::const_iterator it = dups.begin(); 
-         it != dups.end(); it++) {
-        if (it->ipath.empty()) 
-            editor->append(path2qs(it->url));
-        else 
-            editor->append(path2qs(it->url) + " | " + u8s2qs(it->ipath));
     }
-    editor->moveCursor(QTextCursor::Start);
+    auto src = std::make_shared<DocSequenceDocs>(rcldb, dups, qs2utf8s(tr("Duplicates")));
-    editor->ensureCursorVisible();
+    src->setDescription(qs2utf8s(tr("Duplicates")));
-    dialog.exec();
+    auto source = std::make_shared<DocSource>(theconfig, src);
+    m_dupsw->setDocSource(source);
+    m_dupsw->readDocSource();
+    m_dupsw->show();
 }
 
 void RclMain::showSnippets(Rcl::Doc doc)

src/qtgui/rclmain_w.h

@@ -213,6 +213,7 @@ private:
     QTimer         *periodictimer{0};
     WebcacheEdit   *webcache{0};
     ResTable       *restable{0};
+    ResTable       *m_dupsw{0};
     bool            displayingTable{false};
     ActSearchW     *actsearchw{0};
     QAction        *m_idNoStem{0};

src/qtgui/restable.cpp

@@ -250,8 +250,7 @@ string RecollModel::baseField(const string& field)
         return field;
 }
 
-RecollModel::RecollModel(const QStringList fields, ResTable *tb,
+RecollModel::RecollModel(const QStringList fields, ResTable *tb, QObject *parent)
-                         QObject *parent)
     : QAbstractTableModel(parent), m_table(tb), m_ignoreSort(false)
 {
     // Initialize the translated map for column headers
@@ -286,8 +285,7 @@ RecollModel::RecollModel(const QStringList fields, ResTable *tb,
     }
 
     // Construct the actual list of column names
-    for (QStringList::const_iterator it = fields.begin();
+    for (QStringList::const_iterator it = fields.begin(); it != fields.end(); it++) {
-         it != fields.end(); it++) {
         m_fields.push_back((const char *)(it->toUtf8()));
         m_getters.push_back(chooseGetter(m_fields.back()));
     }
@@ -593,16 +591,21 @@ void ResTable::setDefRowHeight()
     }
 }
 
-void ResTable::init()
+void ResTable::init(QStringList _ifields)
 {
     QSettings settings;
-    auto restableFields = settings.value(settingskey_fieldlist).toStringList();
+    QStringList restableFields;
-    if (restableFields.empty()) {
+    if (_ifields.empty()) {
-        restableFields.push_back("date");
+        restableFields = settings.value(settingskey_fieldlist).toStringList();
-        restableFields.push_back("title");
+        if (restableFields.empty()) {
-        restableFields.push_back("filename");
+            restableFields.push_back("date");
-        restableFields.push_back("author");
+            restableFields.push_back("title");
-        restableFields.push_back("url");
+            restableFields.push_back("filename");
+            restableFields.push_back("author");
+            restableFields.push_back("url");
+        }
+    } else {
+        restableFields = _ifields;
     }
     if (!(m_model = new RecollModel(restableFields, this)))
         return;
@@ -626,26 +629,29 @@ void ResTable::init()
 
     QHeaderView *header = tableView->horizontalHeader();
     if (header) {
-        QString qw = settings.value(settingskey_fieldwiths).toString();
+        if (_ifields.empty()) {
-        vector<string> vw;
+            QString qw = settings.value(settingskey_fieldwiths).toString();
-        stringToStrings(qs2utf8s(qw), vw);
+            vector<string> vw;
-        vector<int> restableColWidths;
+            stringToStrings(qs2utf8s(qw), vw);
-        for (const auto& w : vw) {
+            vector<int> restableColWidths;
-            restableColWidths.push_back(atoi(w.c_str()));
+            for (const auto& w : vw) {
-        }
+                restableColWidths.push_back(atoi(w.c_str()));
-        if (int(restableColWidths.size()) == header->count()) {
-            for (int i = 0; i < header->count(); i++) {
-                header->resizeSection(i, restableColWidths[i]);
             }
+            if (int(restableColWidths.size()) == header->count()) {
+                for (int i = 0; i < header->count(); i++) {
+                    header->resizeSection(i, restableColWidths[i]);
+                }
+            }
+            header->setSortIndicatorShown(true);
+            header->setSortIndicator(-1, Qt::AscendingOrder);
+            header->setContextMenuPolicy(Qt::CustomContextMenu);
+            connect(header, SIGNAL(sectionResized(int,int,int)), this, SLOT(saveColState()));
+            connect(header, SIGNAL(customContextMenuRequested(const QPoint&)),
+                    this, SLOT(createHeaderPopupMenu(const QPoint&)));
+        } else {
+            header->setSortIndicatorShown(false);
         }
-        header->setSortIndicatorShown(true);
-        header->setSortIndicator(-1, Qt::AscendingOrder);
-        header->setContextMenuPolicy(Qt::CustomContextMenu);
         header->setStretchLastSection(1);
-        connect(header, SIGNAL(sectionResized(int,int,int)),
-                this, SLOT(saveColState()));
-        connect(header, SIGNAL(customContextMenuRequested(const QPoint&)),
-                this, SLOT(createHeaderPopupMenu(const QPoint&)));
     }
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
     header->setSectionsMovable(true);

src/qtgui/restable.h

@@ -137,10 +137,10 @@ class ResTable : public QWidget, public Ui::ResTable
     Q_OBJECT;
 
 public:
-    ResTable(QWidget* parent = 0) 
+    ResTable(QWidget* parent = 0, QStringList fields = QStringList()) 
         : QWidget(parent) {
             setupUi(this);
-            init();
+            init(fields);
         }
     
     virtual ~ResTable() {}
@@ -214,7 +214,7 @@ protected:
     bool eventFilter(QObject* obj, QEvent* event);
 
 private:
-    void init();
+    void init(QStringList fields);
 
     RecollModel   *m_model{nullptr};
     ResTablePager *m_pager{nullptr};