From 0fd62344bb573895dce3d5d4a91b7f0c3437d390 Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Sun, 26 Apr 2020 11:32:34 +0100
Subject: [PATCH] Fix for #1875030: QuickView didn't always change the selected
 item when moving between books.

Related enhancement: if in GridView, automatically switch to the authors column if the current item is empty in the selected book.
---
 src/calibre/gui2/dialogs/quickview.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/dialogs/quickview.py b/src/calibre/gui2/dialogs/quickview.py
index c72c65af2d..4ae7bf79e6 100644
--- a/src/calibre/gui2/dialogs/quickview.py
+++ b/src/calibre/gui2/dialogs/quickview.py
@@ -450,7 +450,6 @@ class Quickview(QDialog, Ui_Quickview):
         label_text = _('&Item: {0} ({1})')
         if self.is_pane:
             label_text = label_text.replace('&', '')
-        self.items_label.setText(label_text.format(self.fm[key]['name'], key))
 
         self.items.blockSignals(True)
         self.items.clear()
@@ -459,6 +458,24 @@ class Quickview(QDialog, Ui_Quickview):
         mi = self.db.get_metadata(book_id, index_is_id=True, get_user_categories=False)
         vals = mi.get(key, None)
 
+        try:
+            # Check if we are in the GridView and there are no values for the
+            # selected column. In this case switch the column to 'authors'
+            # because there isn't an easy way to switch columns in GridView
+            # when the QV box is empty.
+            if not vals:
+                is_grid_view = (self.gui.current_view().alternate_views.current_view !=
+                                self.gui.current_view().alternate_views.main_view)
+                if is_grid_view:
+                    key = 'authors'
+                    vals = mi.get(key, None)
+        except:
+            traceback.print_exc()
+
+        self.current_book_id = book_id
+        self.current_key = key
+        self.items_label.setText(label_text.format(self.fm[key]['name'], key))
+
         if vals:
             self.no_valid_items = False
             if self.fm[key]['datatype'] == 'rating':
@@ -475,9 +492,6 @@ class Quickview(QDialog, Ui_Quickview):
                 self.items.addItem(a)
             self.items.setCurrentRow(0)
 
-            self.current_book_id = book_id
-            self.current_key = key
-
             self.fill_in_books_box(vals[0])
         else:
             self.indicate_no_items()