From fbf9da0c768c681549207f0b2c732f668d37073e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 4 Jul 2010 08:07:11 -0600 Subject: [PATCH 1/2] Add .doc files to the list of supported formats, as of Boox firmware 1.4 20100625 --- src/calibre/devices/hanlin/driver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/devices/hanlin/driver.py b/src/calibre/devices/hanlin/driver.py index 6f98186fbb..f19135a7e7 100644 --- a/src/calibre/devices/hanlin/driver.py +++ b/src/calibre/devices/hanlin/driver.py @@ -109,7 +109,8 @@ class BOOX(HANLINV3): METADATA_CACHE = '.metadata.calibre' # Ordered list of supported formats - FORMATS = ['epub', 'fb2', 'djvu', 'pdf', 'html', 'txt', 'rtf', 'mobi', 'prc', 'chm'] + FORMATS = ['epub', 'fb2', 'djvu', 'pdf', 'html', 'txt', 'rtf', 'mobi', + 'prc', 'chm', 'doc'] VENDOR_ID = [0x0525] PRODUCT_ID = [0xa4a5] From 6b3fba80c3f83dac2d60149637dcebe84d302c29 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 4 Jul 2010 08:07:43 -0600 Subject: [PATCH 2/2] Fixes to delete matching from device dialog --- .../gui2/dialogs/delete_matching_from_device.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/dialogs/delete_matching_from_device.py b/src/calibre/gui2/dialogs/delete_matching_from_device.py index dbac2fe4ad..f30f2e00c7 100644 --- a/src/calibre/gui2/dialogs/delete_matching_from_device.py +++ b/src/calibre/gui2/dialogs/delete_matching_from_device.py @@ -25,6 +25,12 @@ class tableItem(QTableWidgetItem): def __lt__(self, other): return self.sort < other.sort +class centeredTableItem(tableItem): + + def __init__(self, text): + tableItem.__init__(self, text) + self.setTextAlignment(Qt.AlignCenter) + class titleTableItem(tableItem): def __init__(self, text): @@ -64,10 +70,10 @@ class DeleteMatchingFromDeviceDialog(QDialog, Ui_DeleteMatchingFromDeviceDialog) self.buttonBox.accepted.connect(self.accepted) self.table.cellClicked.connect(self.cell_clicked) self.table.setSelectionMode(QAbstractItemView.NoSelection) - self.table.setColumnCount(5) + self.table.setColumnCount(7) self.table.setHorizontalHeaderLabels( - ['', _('Location'), _('Title'), - _('Author'), _('Date'), _('Format')]) + ['', _('Location'), _('Title'), _('Author'), + _('Date'), _('Format'), _('Path')]) rows = 0 for card in items: rows += len(items[card][1]) @@ -85,7 +91,8 @@ class DeleteMatchingFromDeviceDialog(QDialog, Ui_DeleteMatchingFromDeviceDialog) self.table.setItem(row, 2, titleTableItem(book.title)) self.table.setItem(row, 3, authorTableItem(book)) self.table.setItem(row, 4, dateTableItem(book.datetime)) - self.table.setItem(row, 5, tableItem(book.path.rpartition('.')[2])) + self.table.setItem(row, 5, centeredTableItem(book.path.rpartition('.')[2])) + self.table.setItem(row, 6, tableItem(book.path)) row += 1 self.table.setCurrentCell(0, 1) self.table.resizeColumnsToContents()