Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge books from top level of context menu

Browse Source
This commit is contained in:
Kovid Goyal 2010-04-26 17:25:57 -06:00
parent df1dd67cd1
commit 10e28f5d9f
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/library.py
View File

@ -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:

7
src/calibre/gui2/ui.py
View File

@ -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)'),