From 1f312d8532e6a441c94820ba1749ba9894e454d3 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 19 Mar 2012 16:20:51 -0400
Subject: [PATCH] Fixed renaming under Qt which was broken since the addition
 of the 'marked' column.

---
 qt/base/result_window.py | 6 +++++-
 qt/base/results_model.py | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/qt/base/result_window.py b/qt/base/result_window.py
index dab7f2aa..f1ddfc1e 100644
--- a/qt/base/result_window.py
+++ b/qt/base/result_window.py
@@ -285,7 +285,11 @@ class ResultWindow(QMainWindow):
         self.app.model.remove_selected()
     
     def renameTriggered(self):
-        self.resultsView.edit(self.resultsView.selectionModel().currentIndex())
+        index = self.resultsView.selectionModel().currentIndex()
+        # Our index is the current row, with column set to 0. Our filename column is 1 and that's
+        # what we want.
+        index = index.sibling(index.row(), 1)
+        self.resultsView.edit(index)
     
     def reprioritizeTriggered(self):
         dlg = PrioritizeDialog(self, self.app)
diff --git a/qt/base/results_model.py b/qt/base/results_model.py
index 0d6450d8..b8f614ee 100644
--- a/qt/base/results_model.py
+++ b/qt/base/results_model.py
@@ -46,9 +46,10 @@ class ResultsModel(Table):
     def _getFlags(self, row, column):
         flags = Qt.ItemIsEnabled | Qt.ItemIsSelectable
         if column.name == 'marked':
-            flags |= Qt.ItemIsEditable
             if row.markable:
                 flags |= Qt.ItemIsUserCheckable
+        elif column.name == 'name':
+            flags |= Qt.ItemIsEditable
         return flags
     
     def _setData(self, row, column, value, role):