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

Fix #6589 (calibre crashes when trying to switch databases with device attached)

Browse Source
This commit is contained in:
Kovid Goyal 2010-08-24 13:14:42 -06:00
parent 1a38a4b35c
commit 0a7835a000
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/gui2/actions/choose_library.py
View File

@ -8,12 +8,12 @@ __docformat__ = 'restructuredtext en'
import os
from functools import partial
from PyQt4.Qt import QMenu
from PyQt4.Qt import QMenu, Qt
from calibre import isbytestring
from calibre.constants import filesystem_encoding
from calibre.utils.config import prefs
from calibre.gui2 import gprefs, warning_dialog
from calibre.gui2 import gprefs, warning_dialog, Dispatcher
from calibre.gui2.actions import InterfaceAction
class LibraryUsageStats(object):
@ -76,12 +76,14 @@ class ChooseLibraryAction(InterfaceAction):
def genesis(self):
self.count_changed(0)
self.qaction.triggered.connect(self.choose_library)
self.qaction.triggered.connect(self.choose_library,
type=Qt.QueuedConnection)
self.stats = LibraryUsageStats()
self.create_action(spec=(_('Switch to library...'), 'lt.png', None,
None), attr='action_choose')
self.action_choose.triggered.connect(self.choose_library)
self.action_choose.triggered.connect(self.choose_library,
type=Qt.QueuedConnection)
self.choose_menu = QMenu(self.gui)
self.choose_menu.addAction(self.action_choose)
self.qaction.setMenu(self.choose_menu)
@ -95,7 +97,8 @@ class ChooseLibraryAction(InterfaceAction):
attr='switch_action%d'%i)
self.switch_actions.append(ac)
ac.setVisible(False)
ac.triggered.connect(partial(self.qs_requested, i))
ac.triggered.connect(partial(self.qs_requested, i),
type=Qt.QueuedConnection)
self.choose_menu.addAction(ac)
def library_name(self):
@ -121,8 +124,8 @@ class ChooseLibraryAction(InterfaceAction):
self.quick_menu.clear()
self.qs_locations = [i[1] for i in locations]
for name, loc in locations:
self.quick_menu.addAction(name, partial(self.switch_requested,
loc))
self.quick_menu.addAction(name, Dispatcher(partial(self.switch_requested,
loc)))
for i, x in enumerate(locations[:len(self.switch_actions)]):
name, loc = x