From 4d581060ed92d9e407f40abd03ad19004fe07d35 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 6 May 2011 12:55:34 +0100
Subject: [PATCH] Improvements to manage authors dialog. 1) Add sort indicators
2) Add a Search facility
---
.../gui2/dialogs/edit_authors_dialog.py | 76 ++++++++++++++++++-
.../gui2/dialogs/edit_authors_dialog.ui | 51 +++++++++++++
2 files changed, 124 insertions(+), 3 deletions(-)
diff --git a/src/calibre/gui2/dialogs/edit_authors_dialog.py b/src/calibre/gui2/dialogs/edit_authors_dialog.py
index bc1b83cfc9..ea16a863e9 100644
--- a/src/calibre/gui2/dialogs/edit_authors_dialog.py
+++ b/src/calibre/gui2/dialogs/edit_authors_dialog.py
@@ -3,7 +3,8 @@ __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
__license__ = 'GPL v3'
-from PyQt4.Qt import Qt, QDialog, QTableWidgetItem, QAbstractItemView
+from PyQt4.Qt import (Qt, QDialog, QTableWidgetItem, QAbstractItemView, QIcon,
+ QString, QDialogButtonBox, QFrame, QLabel, QTimer)
from calibre.ebooks.metadata import author_to_author_sort
from calibre.gui2 import error_dialog
@@ -30,14 +31,23 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
self.buttonBox.accepted.connect(self.accepted)
+ # Set up the column headings
self.table.setSelectionMode(QAbstractItemView.SingleSelection)
self.table.setColumnCount(2)
- self.table.setHorizontalHeaderLabels([_('Author'), _('Author sort')])
+ self.down_arrow_icon = QIcon(I('arrow-down.png'))
+ self.up_arrow_icon = QIcon(I('arrow-up.png'))
+ self.blank_icon = QIcon(I('blank.png'))
+ self.auth_col = QTableWidgetItem(_('Author'))
+ self.table.setHorizontalHeaderItem(0, self.auth_col)
+ self.auth_col.setIcon(self.blank_icon)
+ self.aus_col = QTableWidgetItem(_('Author sort'))
+ self.table.setHorizontalHeaderItem(1, self.aus_col)
+ self.aus_col.setIcon(self.up_arrow_icon)
+ # Add the data
self.authors = {}
auts = db.get_authors_with_ids()
self.table.setRowCount(len(auts))
- setattr(self.table, '__lt__', lambda x, y: True if strcmp(x, y) < 0 else False)
select_item = None
for row, (id, author, sort) in enumerate(auts):
author = author.replace('|', ',')
@@ -72,23 +82,83 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog):
self.recalc_author_sort.clicked.connect(self.do_recalc_author_sort)
self.auth_sort_to_author.clicked.connect(self.do_auth_sort_to_author)
+ # Position on the desired item
if select_item is not None:
self.table.setCurrentItem(select_item)
self.table.editItem(select_item)
+ self.start_find_pos = select_item.row() * 2 + select_item.column()
else:
self.table.setCurrentCell(0, 0)
+ self.start_find_pos = -1
+
+ # set up the search box
+ self.find_box.initialize('manage_authors_search')
+ self.find_box.lineEdit().returnPressed.connect(self.do_find)
+ self.find_box.editTextChanged.connect(self.find_text_changed)
+ self.find_button.clicked.connect(self.do_find)
+
+ l = QLabel(self.table)
+ self.not_found_label = l
+ l.setFrameStyle(QFrame.StyledPanel)
+ l.setAutoFillBackground(True)
+ l.setText(_('No matches found'))
+ l.setAlignment(Qt.AlignVCenter)
+ l.resize(l.sizeHint())
+ l.move(10,20)
+ l.setVisible(False)
+ self.not_found_label.move(40, 40)
+ self.not_found_label_timer = QTimer()
+ self.not_found_label_timer.setSingleShot(True)
+ self.not_found_label_timer.timeout.connect(
+ self.not_found_label_timer_event, type=Qt.QueuedConnection)
+
+ def not_found_label_timer_event(self):
+ self.not_found_label.setVisible(False)
+
+ def find_text_changed(self):
+ self.start_find_pos = -1
+
+ def do_find(self):
+ self.not_found_label.setVisible(False)
+ # For some reason the button box keeps stealing the RETURN shortcut.
+ # Steal it back
+ self.buttonBox.button(QDialogButtonBox.Ok).setDefault(False)
+ self.buttonBox.button(QDialogButtonBox.Ok).setAutoDefault(False)
+ self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(False)
+ self.buttonBox.button(QDialogButtonBox.Cancel).setAutoDefault(False)
+ st = icu_lower(unicode(self.find_box.currentText()))
+
+ for i in range(0, self.table.rowCount()*2):
+ self.start_find_pos = (self.start_find_pos + 1) % (self.table.rowCount()*2)
+ r = (self.start_find_pos/2)%self.table.rowCount()
+ c = self.start_find_pos % 2
+ item = self.table.item(r, c)
+ text = icu_lower(unicode(item.text()))
+ if st in text:
+ self.table.setCurrentItem(item)
+ self.table.setFocus(True)
+ return
+ # Nothing found. Pop up the little dialog for 1.5 seconds
+ self.not_found_label.setVisible(True)
+ self.not_found_label_timer.start(1500)
def do_sort_by_author(self):
self.author_order = 1 if self.author_order == 0 else 0
self.table.sortByColumn(0, self.author_order)
self.sort_by_author.setChecked(True)
self.sort_by_author_sort.setChecked(False)
+ self.auth_col.setIcon(self.down_arrow_icon if self.author_order
+ else self.up_arrow_icon)
+ self.aus_col.setIcon(self.blank_icon)
def do_sort_by_author_sort(self):
self.author_sort_order = 1 if self.author_sort_order == 0 else 0
self.table.sortByColumn(1, self.author_sort_order)
self.sort_by_author.setChecked(False)
self.sort_by_author_sort.setChecked(True)
+ self.aus_col.setIcon(self.down_arrow_icon if self.author_sort_order
+ else self.up_arrow_icon)
+ self.auth_col.setIcon(self.blank_icon)
def accepted(self):
self.result = []
diff --git a/src/calibre/gui2/dialogs/edit_authors_dialog.ui b/src/calibre/gui2/dialogs/edit_authors_dialog.ui
index 3280245959..35abc5dac5 100644
--- a/src/calibre/gui2/dialogs/edit_authors_dialog.ui
+++ b/src/calibre/gui2/dialogs/edit_authors_dialog.ui
@@ -20,6 +20,50 @@
Manage authors
+ -
+
+
-
+
+
+ &Search for:
+
+
+ find_box
+
+
+
+ -
+
+
+
+ 200
+ 0
+
+
+
+
+ -
+
+
+ F&ind
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
-
@@ -143,4 +187,11 @@ after changing Preferences->Advanced->Tweaks->Author sort name algorith
+
+
+ HistoryLineEdit
+ QComboBox
+
+
+