mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-06-23 15:30:45 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
ec1237f9fd
@ -437,11 +437,6 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
|
|||||||
gc.collect()
|
gc.collect()
|
||||||
|
|
||||||
self.listener.start_listening()
|
self.listener.start_listening()
|
||||||
# Once the gui is initialized we can restore the quickview state
|
|
||||||
# The same thing will be true for any action-based operation with a
|
|
||||||
# layout button. We need to let a book be selected in the book list
|
|
||||||
# before initializing quickview, so run it after an event loop tick
|
|
||||||
self.start_quickview()
|
|
||||||
if do_hide_windows:
|
if do_hide_windows:
|
||||||
self.hide_windows()
|
self.hide_windows()
|
||||||
if show_gui:
|
if show_gui:
|
||||||
@ -451,6 +446,12 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
|
|||||||
# up with the wrong size. I don't know why.
|
# up with the wrong size. I don't know why.
|
||||||
self.bd_splitter.repaint()
|
self.bd_splitter.repaint()
|
||||||
|
|
||||||
|
# Once the gui is initialized we can restore the quickview state
|
||||||
|
# The same thing will be true for any action-based operation with a
|
||||||
|
# layout button. We need to let a book be selected in the book list
|
||||||
|
# before initializing quickview, so run it after an event loop tick
|
||||||
|
QTimer.singleShot(0, self.start_quickview)
|
||||||
|
|
||||||
# Start the smartdevice later so that the network time doesn't affect
|
# Start the smartdevice later so that the network time doesn't affect
|
||||||
# the gui repaint debouncing. Wait 3 seconds before starting to be sure
|
# the gui repaint debouncing. Wait 3 seconds before starting to be sure
|
||||||
# that all other initialization (plugins etc) has completed. Yes, 3
|
# that all other initialization (plugins etc) has completed. Yes, 3
|
||||||
@ -462,8 +463,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
|
|||||||
from calibre.gui2.actions.show_quickview import get_quickview_action_plugin
|
from calibre.gui2.actions.show_quickview import get_quickview_action_plugin
|
||||||
qv = get_quickview_action_plugin()
|
qv = get_quickview_action_plugin()
|
||||||
if qv:
|
if qv:
|
||||||
timed_print('Starting QuickView')
|
timed_print('QuickView starting')
|
||||||
qv.qv_button.restore_state()
|
qv.qv_button.restore_state()
|
||||||
|
timed_print('QuickView started')
|
||||||
self.save_layout_state()
|
self.save_layout_state()
|
||||||
self.focus_library_view()
|
self.focus_library_view()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user