Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-08 14:53:06 +02:00
Code Issues Projects Releases Wiki Activity

E-book viewer: Remove soft-hyphens when copying text to clipboard

Browse source
This commit is contained in:
Kovid Goyal 2015-02-08 21:48:28 +05:30
parent e8f1f3079f
commit df780dd8e0
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/calibre/gui2/viewer/documentview.py
View file

@ -10,7 +10,7 @@
from PyQt5.Qt import (QSize, QSizePolicy, QUrl, Qt, pyqtProperty,
QPainter, QPalette, QBrush, QDialog, QColor, QPoint, QImage, QRegion,
QIcon, QAction, QMenu, pyqtSignal, QApplication, pyqtSlot)
QIcon, QAction, QMenu, pyqtSignal, QApplication, pyqtSlot, QKeySequence)
from PyQt5.QtWebKitWidgets import QWebPage, QWebView
from PyQt5.QtWebKit import QWebSettings, QWebElement
@ -558,8 +558,9 @@ def initialize_view(self, debug_javascript=False):
self.document.selectionChanged[()].connect(self.selection_changed)
self.document.animated_scroll_done_signal.connect(self.animated_scroll_done, type=Qt.QueuedConnection)
self.document.page_turn.connect(self.page_turn_requested)
copy_action = self.pageAction(self.document.Copy)
copy_action = self.copy_action
copy_action.setIcon(QIcon(I('convert.png')))
copy_action.triggered.connect(self.copy, Qt.QueuedConnection)
d = self.document
self.unimplemented_actions = list(map(self.pageAction,
[d.DownloadImageToDisk, d.OpenLinkInNewWindow, d.DownloadLinkToDisk,
@ -668,9 +669,16 @@ def load_theme(self, theme_id):
def bookmark(self):
return self.document.bookmark()
@property
def selected_text(self):
return self.document.selectedText().replace(u'\u00ad', u'').strip()
def copy(self):
QApplication.clipboard().setText(self.selected_text)
def selection_changed(self):
if self.manager is not None:
self.manager.selection_changed(unicode(self.document.selectedText()))
self.manager.selection_changed(self.selected_text)
def _selectedText(self):
t = unicode(self.selectedText()).strip()
@ -1330,6 +1338,8 @@ def handle_key_press(self, event):
elif key == 'Forward':
if self.manager is not None:
self.manager.forward(None)
elif event.matches(QKeySequence.Copy):
self.copy()
else:
handled = False
return handled