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

Edit Book: Fix drag and drop of text replacing non-breaking spaces with normal spaces

Browse Source 
With modern Qt/PyQt one can just override createMimeDataFromSelection
instead of the convoluted fixes used earlier
This commit is contained in:
Kovid Goyal 2016-08-23 19:51:43 +05:30
parent 908b098912
commit 6f3c8109d4
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/calibre/gui2/tweak_book/widgets.py
View File

@ -16,7 +16,7 @@ from PyQt5.Qt import (
QPainter, QStaticText, pyqtSignal, QTextOption, QAbstractListModel, QPainter, QStaticText, pyqtSignal, QTextOption, QAbstractListModel,
QModelIndex, QStyledItemDelegate, QStyle, QCheckBox, QListView, QModelIndex, QStyledItemDelegate, QStyle, QCheckBox, QListView,
QTextDocument, QSize, QComboBox, QFrame, QCursor, QGroupBox, QSplitter, QTextDocument, QSize, QComboBox, QFrame, QCursor, QGroupBox, QSplitter,
QPixmap, QRect, QPlainTextEdit, pyqtSlot, QMimeData, QKeySequence) QPixmap, QRect, QPlainTextEdit, QMimeData)
from calibre import prepare_string_for_xml, human_readable from calibre import prepare_string_for_xml, human_readable
from calibre.ebooks.oeb.polish.utils import lead_text, guess_type from calibre.ebooks.oeb.polish.utils import lead_text, guess_type
@ -1122,7 +1122,6 @@ class PlainTextEdit(QPlainTextEdit): # {{{
def __init__(self, parent=None): def __init__(self, parent=None):
QPlainTextEdit.__init__(self, parent) QPlainTextEdit.__init__(self, parent)
self.selectionChanged.connect(self.selection_changed)
self.syntax = None self.syntax = None
def toPlainText(self): def toPlainText(self):
@ -1138,22 +1137,6 @@ class PlainTextEdit(QPlainTextEdit): # {{{
# non BMP characters such as 0x1f431 are present. # non BMP characters such as 0x1f431 are present.
return ans.rstrip('\0') return ans.rstrip('\0')
@pyqtSlot()
def copy(self):
# Workaround Qt replacing nbsp with normal spaces on copy
c = self.textCursor()
if not c.hasSelection():
return
md = QMimeData()
md.setText(self.selected_text)
QApplication.clipboard().setMimeData(md)
@pyqtSlot()
def cut(self):
# Workaround Qt replacing nbsp with normal spaces on copy
self.copy()
self.textCursor().removeSelectedText()
def selected_text_from_cursor(self, cursor): def selected_text_from_cursor(self, cursor):
return unicodedata.normalize('NFC', unicode(cursor.selectedText()).replace(PARAGRAPH_SEPARATOR, '\n').rstrip('\0')) return unicodedata.normalize('NFC', unicode(cursor.selectedText()).replace(PARAGRAPH_SEPARATOR, '\n').rstrip('\0'))
@ -1161,20 +1144,10 @@ class PlainTextEdit(QPlainTextEdit): # {{{
def selected_text(self): def selected_text(self):
return self.selected_text_from_cursor(self.textCursor()) return self.selected_text_from_cursor(self.textCursor())
def selection_changed(self): def createMimeDataFromSelection(self):
# Workaround Qt replacing nbsp with normal spaces on copy ans = QMimeData()
clipboard = QApplication.clipboard() ans.setText(self.selected_text)
if clipboard.supportsSelection() and self.textCursor().hasSelection(): return ans
md = QMimeData()
md.setText(self.selected_text)
clipboard.setMimeData(md, clipboard.Selection)
def event(self, ev):
if ev.type() == ev.ShortcutOverride and ev in (QKeySequence.Copy, QKeySequence.Cut):
ev.accept()
(self.copy if ev == QKeySequence.Copy else self.cut)()
return True
return QPlainTextEdit.event(self, ev)
# }}} # }}}
if __name__ == '__main__': if __name__ == '__main__':