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

Dont allow widgets other than the search bar to get input focus in the inset character dialog

Browse Source
This commit is contained in:
Kovid Goyal 2016-11-19 22:52:30 +05:30
parent 1b8d0db042
commit a8eb4b7f0f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,7 +735,7 @@ class CharSelect(Dialog):
self.initialized = False self.initialized = False
Dialog.__init__(self, _('Insert character'), 'charmap_dialog', parent) Dialog.__init__(self, _('Insert character'), 'charmap_dialog', parent)
self.setWindowIcon(QIcon(I('character-set.png'))) self.setWindowIcon(QIcon(I('character-set.png')))
self.focus_widget = None self.setFocusProxy(parent)
def setup_ui(self): def setup_ui(self):
self.l = l = QGridLayout(self) self.l = l = QGridLayout(self)
@ -749,6 +749,7 @@ class CharSelect(Dialog):
b.setDefault(True) b.setDefault(True)
self.splitter = s = QSplitter(self) self.splitter = s = QSplitter(self)
s.setFocusPolicy(Qt.NoFocus)
s.setChildrenCollapsible(False) s.setChildrenCollapsible(False)
self.search = h = HistoryLineEdit2(self) self.search = h = HistoryLineEdit2(self)
@ -759,17 +760,21 @@ class CharSelect(Dialog):
h.initialize('charmap_search') h.initialize('charmap_search')
h.setPlaceholderText(_('Search by name, nickname or character code')) h.setPlaceholderText(_('Search by name, nickname or character code'))
self.search_button = b = QPushButton(_('&Search')) self.search_button = b = QPushButton(_('&Search'))
b.setFocusPolicy(Qt.NoFocus)
h.returnPressed.connect(self.do_search) h.returnPressed.connect(self.do_search)
b.clicked.connect(self.do_search) b.clicked.connect(self.do_search)
self.clear_button = cb = QToolButton(self) self.clear_button = cb = QToolButton(self)
cb.setIcon(QIcon(I('clear_left.png'))) cb.setIcon(QIcon(I('clear_left.png')))
cb.setFocusPolicy(Qt.NoFocus)
cb.setText(_('Clear search')) cb.setText(_('Clear search'))
cb.clicked.connect(self.clear_search) cb.clicked.connect(self.clear_search)
l.addWidget(h), l.addWidget(b, 0, 1), l.addWidget(cb, 0, 2) l.addWidget(h), l.addWidget(b, 0, 1), l.addWidget(cb, 0, 2)
self.category_view = CategoryView(self) self.category_view = CategoryView(self)
self.category_view.setFocusPolicy(Qt.NoFocus)
l.addWidget(s, 1, 0, 1, 3) l.addWidget(s, 1, 0, 1, 3)
self.char_view = CharView(self) self.char_view = CharView(self)
self.char_view.setFocusPolicy(Qt.NoFocus)
self.rearrange_button.toggled[bool].connect(self.set_allow_drag_and_drop) self.rearrange_button.toggled[bool].connect(self.set_allow_drag_and_drop)
self.category_view.category_selected.connect(self.show_chars) self.category_view.category_selected.connect(self.show_chars)
self.char_view.show_name.connect(self.show_char_info) self.char_view.show_name.connect(self.show_char_info)