diff --git a/src/calibre/gui2/actions/catalog.py b/src/calibre/gui2/actions/catalog.py index 9903801c6e..fadb140be6 100644 --- a/src/calibre/gui2/actions/catalog.py +++ b/src/calibre/gui2/actions/catalog.py @@ -17,7 +17,7 @@ from calibre.gui2.actions import InterfaceAction class GenerateCatalogAction(InterfaceAction): name = 'Generate Catalog' - action_spec = (_('Create catalog of books in your calibre library'), None, None, None) + action_spec = (_('Create a catalog of the books in your calibre library'), None, None, None) dont_add_to = frozenset(['toolbar-device', 'context-menu-device']) def generate_catalog(self): diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py index 821ebcd37f..caf65932d8 100644 --- a/src/calibre/gui2/actions/convert.py +++ b/src/calibre/gui2/actions/convert.py @@ -31,7 +31,7 @@ class ConvertAction(InterfaceAction): partial(self.convert_ebook, False, bulk=True)) cm.addSeparator() ac = cm.addAction( - _('Create catalog of books in your calibre library')) + _('Create a catalog of the books in your calibre library')) ac.triggered.connect(self.gui.iactions['Generate Catalog'].generate_catalog) self.qaction.setMenu(cm) self.qaction.triggered.connect(self.convert_ebook) diff --git a/src/calibre/gui2/dialogs/catalog.py b/src/calibre/gui2/dialogs/catalog.py index 7bb288ed20..7360d2ea5f 100644 --- a/src/calibre/gui2/dialogs/catalog.py +++ b/src/calibre/gui2/dialogs/catalog.py @@ -125,6 +125,10 @@ class Catalog(QDialog, Ui_Dialog): self.apply) self.show_plugin_tab(None) + geom = dynamic.get('catalog_window_geom', None) + if geom is not None: + self.restoreGeometry(bytes(geom)) + def show_plugin_tab(self, idx): cf = unicode(self.format.currentText()).lower() while self.tabs.count() > 1: @@ -157,6 +161,7 @@ class Catalog(QDialog, Ui_Dialog): dynamic.set('catalog_last_used_title', self.catalog_title) self.catalog_sync = bool(self.sync.isChecked()) dynamic.set('catalog_sync_to_device', self.catalog_sync) + dynamic.set('catalog_window_geom', bytearray(self.saveGeometry())) def apply(self): # Store current values without building catalog @@ -167,3 +172,8 @@ class Catalog(QDialog, Ui_Dialog): def accept(self): self.save_catalog_settings() return QDialog.accept(self) + + def reject(self): + dynamic.set('catalog_window_geom', bytearray(self.saveGeometry())) + QDialog.reject(self) +