Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement editing for open with applications

Browse Source
This commit is contained in:
Kovid Goyal 2015-02-27 15:36:12 +05:30
parent c3dda0d901
commit fd5dad9bce
2 changed files with 82 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/gui2/book_details.py
View File

@ -205,7 +205,7 @@ class CoverView(QWidget): # {{{
)
def contextMenuEvent(self, ev):
from calibre.gui2.open_with import populate_menu
from calibre.gui2.open_with import populate_menu, edit_programs
cm = QMenu(self)
paste = cm.addAction(_('Paste Cover'))
copy = cm.addAction(_('Copy Cover'))
@ -218,13 +218,14 @@ class CoverView(QWidget): # {{{
remove.triggered.connect(self.remove_cover)
gc.triggered.connect(self.generate_cover)
m = QMenu(_('Open with...'))
m = QMenu(_('Open cover with...'))
populate_menu(m, self.open_with, 'jpeg')
if len(m.actions()) == 0:
cm.addAction(_('Open with...'), self.choose_open_with)
cm.addAction(_('Open cover with...'), self.choose_open_with)
else:
m.addSeparator()
m.addAction(_('Choose other program...'), self.choose_open_with)
m.addAction(_('Add another application to open cover...'), self.choose_open_with)
m.addAction(_('Edit Open With applications...'), partial(edit_programs, 'jpeg', self))
cm.addMenu(m)
cm.exec_(ev.globalPos())
@ -430,14 +431,15 @@ class BookInfo(QWebView):
ac.setText(t)
menu.addAction(ac)
if not fmt.upper().startswith('ORIGINAL_'):
from calibre.gui2.open_with import populate_menu
m = QMenu(_('Open with...'))
from calibre.gui2.open_with import populate_menu, edit_programs
m = QMenu(_('Open %s with...') % fmt.upper())
populate_menu(m, partial(self.open_with, book_id, fmt), fmt)
if len(m.actions()) == 0:
menu.addAction(_('Open with...'), partial(self.choose_open_with, book_id, fmt))
menu.addAction(_('Open %s with...') % fmt.upper(), partial(self.choose_open_with, book_id, fmt))
else:
m.addSeparator()
m.addAction(_('Choose other program...'), partial(self.choose_open_with, book_id, fmt))
m.addAction(_('Add other application for %s files...') % fmt.upper(), partial(self.choose_open_with, book_id, fmt))
m.addAction(_('Edit Open With applications...'), partial(edit_programs, fmt, self))
menu.addMenu(m)
else:
el = r.linkElement()

74
src/calibre/gui2/open_with.py
View File

@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
__license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import os
import os, uuid
from threading import Thread
from functools import partial
@ -17,7 +17,7 @@ from PyQt5.Qt import (
from calibre import as_unicode
from calibre.constants import iswindows, isosx
from calibre.gui2 import error_dialog, choose_files
from calibre.gui2 import error_dialog, choose_files, choose_images
from calibre.gui2.widgets2 import Dialog
from calibre.gui2.progress_indicator import ProgressIndicator
from calibre.utils.config import JSONConfig
@ -180,12 +180,14 @@ class ChooseProgram(Dialog): # {{{
oprefs.defaults['entries'] = {}
def choose_program(file_type='jpeg', parent=None, prefs=oprefs):
file_type = file_type.lower()
d = ChooseProgram(file_type, parent, prefs)
d.exec_()
entry = choose_manually(file_type, parent) if d.select_manually else d.selected_entry
if entry is not None:
entry = finalize_entry(entry)
entry['keyboard_shortcut'] = None
entry['uuid'] = type('')(uuid.uuid4())
entries = oprefs['entries']
if file_type not in entries:
entries[file_type] = []
@ -195,6 +197,7 @@ def choose_program(file_type='jpeg', parent=None, prefs=oprefs):
return entry
def populate_menu(menu, receiver, file_type):
file_type = file_type.lower()
for entry in oprefs['entries'].get(file_type, ()):
ac = menu.addAction(*entry_to_icon_text(entry))
ac.triggered.connect(partial(receiver, entry))
@ -202,6 +205,73 @@ def populate_menu(menu, receiver, file_type):
# }}}
class EditPrograms(Dialog):
def __init__(self, file_type='jpeg', parent=None):
self.file_type = file_type.lower()
Dialog.__init__(self, _('Edit the applications for %s files') % file_type.upper(), 'edit-open-with-programs', parent=parent)
def setup_ui(self):
self.l = l = QVBoxLayout(self)
self.plist = pl = QListWidget(self)
pl.setIconSize(QSize(48, 48)), pl.setSpacing(5)
l.addWidget(pl)
self.bb.clear(), self.bb.setStandardButtons(self.bb.Close)
self.rb = b = self.bb.addButton(_('&Remove'), self.bb.ActionRole)
b.clicked.connect(self.remove), b.setIcon(QIcon(I('list_remove.png')))
self.cb = b = self.bb.addButton(_('Change &Icon'), self.bb.ActionRole)
b.clicked.connect(self.change_icon), b.setIcon(QIcon(I('icon_choose.png')))
l.addWidget(self.bb)
self.populate()
def sizeHint(self):
return QSize(600, 400)
def populate(self):
self.plist.clear()
for entry in oprefs['entries'].get(self.file_type, ()):
entry_to_item(entry, self.plist)
def change_icon(self):
ci = self.plist.currentItem()
if ci is None:
return error_dialog(self, _('No selection'), _(
'No application selected'), show=True)
paths = choose_images(self, 'choose-new-icon-for-open-with-program', _(
'Choose new icon'))
if paths:
ic = QIcon(paths[0])
if ic.isNull():
return error_dialog(self, _('Invalid icon'), _(
'Could not load image from %s') % paths[0], show=True)
pmap = ic.pixmap(48, 48)
if not pmap.isNull():
entry = ci.data(ENTRY_ROLE)
entry['icon_data'] = pixmap_to_data(pmap)
ci.setData(ENTRY_ROLE, entry)
self.update_stored_config()
ci.setIcon(ic)
def remove(self):
ci = self.plist.currentItem()
if ci is None:
return error_dialog(self, _('No selection'), _(
'No application selected'), show=True)
row = self.plist.row(ci)
self.plist.takeItem(row)
self.update_stored_config()
def update_stored_config(self):
entries = [self.plist.item(i).data(ENTRY_ROLE) for i in xrange(self.plist.count())]
oprefs['entries'][self.file_type] = entries
oprefs['entries'] = oprefs['entries']
def edit_programs(file_type, parent):
d = EditPrograms(file_type, parent)
d.exec_()
if __name__ == '__main__':
from pprint import pprint
app = QApplication([])