From 10e28f5d9f7dd6d198e7d559ba2cd40b46ff8fb9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 26 Apr 2010 17:25:57 -0600 Subject: [PATCH] Remove merge books from top level of context menu --- src/calibre/gui2/library.py | 4 +--- src/calibre/gui2/ui.py | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py index e8630969f5..3fe1cbc908 100644 --- a/src/calibre/gui2/library.py +++ b/src/calibre/gui2/library.py @@ -777,7 +777,7 @@ class BooksView(TableView): self.setItemDelegateForColumn(cm.index('series'), self.series_delegate) def set_context_menu(self, edit_metadata, send_to_device, convert, view, - save, open_folder, book_details, merge, delete, similar_menu=None): + save, open_folder, book_details, delete, similar_menu=None): self.setContextMenuPolicy(Qt.DefaultContextMenu) self.context_menu = QMenu(self) if edit_metadata is not None: @@ -790,8 +790,6 @@ class BooksView(TableView): self.context_menu.addAction(save) if open_folder is not None: self.context_menu.addAction(open_folder) - if merge is not None: - self.context_menu.addAction(merge) if delete is not None: self.context_menu.addAction(delete) if book_details is not None: diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 1acfbd7840..3cbd130b66 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -478,16 +478,15 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): self.action_save, self.action_open_containing_folder, self.action_show_book_details, - self.action_merge, self.action_del, similar_menu=similar_menu) self.memory_view.set_context_menu(None, None, None, - self.action_view, self.action_save, None, None, None, self.action_del) + self.action_view, self.action_save, None, None, self.action_del) self.card_a_view.set_context_menu(None, None, None, - self.action_view, self.action_save, None, None, None, self.action_del) + self.action_view, self.action_save, None, None, self.action_del) self.card_b_view.set_context_menu(None, None, None, - self.action_view, self.action_save, None, None, None, self.action_del) + self.action_view, self.action_save, None, None, self.action_del) QObject.connect(self.library_view, SIGNAL('files_dropped(PyQt_PyObject)'),