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

Handle changing focus ed widget in parent while charmap is visible

Browse Source
This commit is contained in:
Kovid Goyal 2014-01-06 17:20:17 +05:30
parent 0012f5cc4b
commit 0a9825d39a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/gui2/tweak_book/char_select.py
View File

@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
import unicodedata, re, weakref import unicodedata, re
from bisect import bisect from bisect import bisect
from functools import partial from functools import partial
@ -716,10 +716,6 @@ class CharSelect(Dialog):
self.char_info.clear() self.char_info.clear()
def show(self): def show(self):
try:
self.focus_widget = weakref.ref(QApplication.focusWidget())
except TypeError:
self.focus_widget = None
self.initialize() self.initialize()
Dialog.show(self) Dialog.show(self)
self.raise_() self.raise_()
@ -727,17 +723,22 @@ class CharSelect(Dialog):
def char_selected(self, c): def char_selected(self, c):
if QApplication.keyboardModifiers() & Qt.CTRL: if QApplication.keyboardModifiers() & Qt.CTRL:
self.hide() self.hide()
if self.focus_widget is None or self.focus_widget() is None: if self.parent() is None or self.parent().focusWidget() is None:
QApplication.clipboard().setText(c) QApplication.clipboard().setText(c)
return return
w = self.focus_widget() self.parent().activateWindow()
w = self.parent().focusWidget()
if hasattr(w, 'textCursor'): if hasattr(w, 'textCursor'):
cr = w.textCursor() cr = w.textCursor()
cr.insertText(c) cr.insertText(c)
w.setTextCursor(cr) w.setTextCursor(cr)
elif hasattr(w, 'insert'): elif hasattr(w, 'insert'):
if hasattr(w, 'no_popup'):
oval = w.no_popup
w.no_popup = True
w.insert(c) w.insert(c)
if hasattr(w, 'no_popup'):
w.no_popup = oval
if __name__ == '__main__': if __name__ == '__main__':
app = QApplication([]) app = QApplication([])