From b80ca397ad20ae291e17e7bad69fce78abfe89fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Teuli=C3=A8re?= <ipkiss@gmail.com>
Date: Sun, 6 Jan 2013 19:55:59 +0100
Subject: [PATCH] Topping: implement sorting properly

---
 qt/topping_widget.cpp   | 45 ++++++++++++++++++++++++-----------------
 qt/topping_widget.h     |  2 +-
 qt/ui/topping_widget.ui |  6 ++++++
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/qt/topping_widget.cpp b/qt/topping_widget.cpp
index ac174c8..2802517 100644
--- a/qt/topping_widget.cpp
+++ b/qt/topping_widget.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Eliot
- * Copyright (C) 2010-2012 Olivier Teulière
+ * Copyright (C) 2012-2013 Olivier Teulière
  * Authors: Olivier Teulière <ipkiss @@ gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,11 +21,11 @@
 #include <QtGui/QStandardItemModel>
 #include <QtGui/QMenu>
 #include <QtGui/QHeaderView>
+#include <QtGui/QSortFilterProxyModel>
 
 #include "topping_widget.h"
 #include "qtcommon.h"
 #include "play_word_mediator.h"
-#include "validator_factory.h"
 
 #include "player.h"
 #include "dic.h"
@@ -59,16 +59,22 @@ ToppingWidget::ToppingWidget(QWidget *parent, PlayModel &iPlayModel, PublicGame
     QObject::connect(m_mediator, SIGNAL(notifyProblem(QString)),
                      this, SIGNAL(notifyProblem(QString)));
 
-    // Associate the model to the view
+    // Associate the model to the view.
+    // We use a proxy for easy sorting.
     m_model = new QStandardItemModel(this);
-    tableViewMoves->setModel(m_model);
-    m_model->setColumnCount(3);
-    m_model->setHeaderData(0, Qt::Horizontal, _q("Word"), Qt::DisplayRole);
-    m_model->setHeaderData(1, Qt::Horizontal, _q("Ref"), Qt::DisplayRole);
-    m_model->setHeaderData(2, Qt::Horizontal, _q("Points"), Qt::DisplayRole);
+    QSortFilterProxyModel * proxyModel = new QSortFilterProxyModel(this);
+    proxyModel->setDynamicSortFilter(true);
+    proxyModel->setSourceModel(m_model);
+    tableViewMoves->setModel(proxyModel);
 
-    QObject::connect(lineEditRack, SIGNAL(returnPressed()),
-                     this, SLOT(search()));
+    m_model->setColumnCount(4);
+    m_model->setHeaderData(0, Qt::Horizontal, _q("#"), Qt::DisplayRole);
+    m_model->setHeaderData(1, Qt::Horizontal, _q("Word"), Qt::DisplayRole);
+    m_model->setHeaderData(2, Qt::Horizontal, _q("Ref"), Qt::DisplayRole);
+    m_model->setHeaderData(3, Qt::Horizontal, _q("Points"), Qt::DisplayRole);
+    tableViewMoves->sortByColumn(3);
+    // XXX: why is this needed? It is not needed in the ArbitrationWidget class
+    tableViewMoves->horizontalHeader()->setSortIndicator(3, Qt::DescendingOrder);
 
     // Add a context menu to the table header
     QAction *lockSizesAction = new QAction(_q("Lock columns sizes"), this);
@@ -82,6 +88,8 @@ ToppingWidget::ToppingWidget(QWidget *parent, PlayModel &iPlayModel, PublicGame
     // Allow very thin columns
     tableViewMoves->horizontalHeader()->setMinimumSectionSize(1);
 
+    tableViewMoves->horizontalHeader()->resizeSection(1, 140);
+
     refresh();
 }
 
@@ -115,9 +123,6 @@ void ToppingWidget::updateModel()
     // Clear the table
     m_model->removeRows(0, m_model->rowCount());
 
-    // Force the sort column
-    tableViewMoves->sortByColumn(2);
-
     if (m_game == NULL)
         return;
 
@@ -127,26 +132,28 @@ void ToppingWidget::updateModel()
         const Move &m = triedMoves[i];
         int rowNum = m_model->rowCount();
         m_model->insertRow(rowNum);
+        m_model->setData(m_model->index(rowNum, 0), i);
         if (m.isValid())
         {
-            m_model->setData(m_model->index(rowNum, 0), qfw(m.getRound().getWord()));
-            m_model->setData(m_model->index(rowNum, 1),
+            m_model->setData(m_model->index(rowNum, 1), qfw(m.getRound().getWord()));
+            m_model->setData(m_model->index(rowNum, 2),
                              qfw(m.getRound().getCoord().toString()));
         }
         else
         {
             ASSERT(m.isInvalid(), "Unhandled move type");
-            m_model->setData(m_model->index(rowNum, 0), qfw(m.getBadWord()));
-            m_model->setData(m_model->index(rowNum, 1), qfw(m.getBadCoord()));
+            m_model->setData(m_model->index(rowNum, 1), qfw(m.getBadWord()));
+            m_model->setData(m_model->index(rowNum, 2), qfw(m.getBadCoord()));
         }
-        m_model->setData(m_model->index(rowNum, 2), m.getScore());
+        m_model->setData(m_model->index(rowNum, 3), m.getScore());
     }
 
     if (m_autoResizeColumns)
     {
         tableViewMoves->resizeColumnToContents(0);
-        tableViewMoves->resizeColumnToContents(1);
+        // tableViewMoves->resizeColumnToContents(1);
         tableViewMoves->resizeColumnToContents(2);
+        tableViewMoves->resizeColumnToContents(3);
     }
 }
 
diff --git a/qt/topping_widget.h b/qt/topping_widget.h
index 7e52b96..4c5a6c1 100644
--- a/qt/topping_widget.h
+++ b/qt/topping_widget.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Eliot
- * Copyright (C) 2008-2012 Olivier Teulière
+ * Copyright (C) 2012-2013 Olivier Teulière
  * Authors: Olivier Teulière <ipkiss @@ gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/qt/ui/topping_widget.ui b/qt/ui/topping_widget.ui
index 0d6c126..f7fa101 100644
--- a/qt/ui/topping_widget.ui
+++ b/qt/ui/topping_widget.ui
@@ -142,9 +142,15 @@
       <property name="sortingEnabled">
        <bool>true</bool>
       </property>
+      <attribute name="horizontalHeaderHighlightSections">
+       <bool>false</bool>
+      </attribute>
       <attribute name="horizontalHeaderStretchLastSection">
        <bool>true</bool>
       </attribute>
+      <attribute name="verticalHeaderVisible">
+       <bool>false</bool>
+      </attribute>
      </widget>
     </widget>
    </item>