mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge from trunk
This commit is contained in:
commit
64d1b9560c
@ -357,7 +357,6 @@ class Preferences(QMainWindow):
|
|||||||
bytearray(self.saveGeometry()))
|
bytearray(self.saveGeometry()))
|
||||||
if self.committed:
|
if self.committed:
|
||||||
self.gui.must_restart_before_config = self.must_restart
|
self.gui.must_restart_before_config = self.must_restart
|
||||||
self.gui.tags_view.set_new_model() # in case columns changed
|
|
||||||
self.gui.tags_view.recount()
|
self.gui.tags_view.recount()
|
||||||
self.gui.create_device_menu()
|
self.gui.create_device_menu()
|
||||||
self.gui.set_device_menu_items_state(bool(self.gui.device_connected))
|
self.gui.set_device_menu_items_state(bool(self.gui.device_connected))
|
||||||
|
@ -173,7 +173,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
|
|||||||
def refresh_gui(self, gui):
|
def refresh_gui(self, gui):
|
||||||
gui.set_highlight_only_button_icon()
|
gui.set_highlight_only_button_icon()
|
||||||
if self.muc_changed:
|
if self.muc_changed:
|
||||||
gui.tags_view.set_new_model()
|
gui.tags_view.recount()
|
||||||
gui.search.search_as_you_type(config['search_as_you_type'])
|
gui.search.search_as_you_type(config['search_as_you_type'])
|
||||||
gui.search.do_search()
|
gui.search.do_search()
|
||||||
|
|
||||||
|
@ -571,9 +571,10 @@ class TagsView(QTreeView): # {{{
|
|||||||
def show_item_at_index(self, idx, box=False,
|
def show_item_at_index(self, idx, box=False,
|
||||||
position=QTreeView.PositionAtCenter):
|
position=QTreeView.PositionAtCenter):
|
||||||
if idx.isValid() and idx.data(Qt.UserRole).toPyObject() is not self._model.root_item:
|
if idx.isValid() and idx.data(Qt.UserRole).toPyObject() is not self._model.root_item:
|
||||||
self.setCurrentIndex(idx)
|
self.setExpanded(idx, True) # Needed otherwise Qt segfaults if the
|
||||||
|
# node is buried in a collapsed, off
|
||||||
|
# screen hierarchy
|
||||||
self.scrollTo(idx, position)
|
self.scrollTo(idx, position)
|
||||||
self.setCurrentIndex(idx)
|
|
||||||
if box:
|
if box:
|
||||||
self._model.set_boxed(idx)
|
self._model.set_boxed(idx)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user