This commit is contained in:
Kovid Goyal 2010-06-09 09:52:20 -06:00
parent 1b828d5f33
commit 80fae845ba
2 changed files with 8 additions and 3 deletions

View File

@ -599,7 +599,10 @@ class Emailer(Thread): # {{{
# }}} # }}}
class DeviceGUI(object): class DeviceMixin(object):
def __init__(self):
self.db_book_uuid_cache = set()
def dispatch_sync_event(self, dest, delete, specific): def dispatch_sync_event(self, dest, delete, specific):
rows = self.library_view.selectionModel().selectedRows() rows = self.library_view.selectionModel().selectedRows()

View File

@ -44,7 +44,7 @@ from calibre.gui2.dialogs.scheduler import Scheduler
from calibre.gui2.update import CheckForUpdates from calibre.gui2.update import CheckForUpdates
from calibre.gui2.main_window import MainWindow from calibre.gui2.main_window import MainWindow
from calibre.gui2.main_ui import Ui_MainWindow from calibre.gui2.main_ui import Ui_MainWindow
from calibre.gui2.device import DeviceManager, DeviceMenu, DeviceGUI, Emailer from calibre.gui2.device import DeviceManager, DeviceMenu, DeviceMixin, Emailer
from calibre.gui2.jobs import JobManager, JobsDialog, JobsButton from calibre.gui2.jobs import JobManager, JobsDialog, JobsButton
from calibre.gui2.dialogs.metadata_single import MetadataSingleDialog from calibre.gui2.dialogs.metadata_single import MetadataSingleDialog
from calibre.gui2.dialogs.metadata_bulk import MetadataBulkDialog from calibre.gui2.dialogs.metadata_bulk import MetadataBulkDialog
@ -105,7 +105,7 @@ class SystemTrayIcon(QSystemTrayIcon): # {{{
# }}} # }}}
class Main(MainWindow, Ui_MainWindow, DeviceGUI, ToolbarMixin, class Main(MainWindow, Ui_MainWindow, DeviceMixin, ToolbarMixin,
TagBrowserMixin, CoverFlowMixin, LibraryViewMixin): TagBrowserMixin, CoverFlowMixin, LibraryViewMixin):
'The main GUI' 'The main GUI'
@ -228,6 +228,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI, ToolbarMixin,
QObject.connect(self.advanced_search_button, SIGNAL('clicked(bool)'), QObject.connect(self.advanced_search_button, SIGNAL('clicked(bool)'),
self.do_advanced_search) self.do_advanced_search)
DeviceMixin.__init__(self)
####################### Start spare job server ######################## ####################### Start spare job server ########################
QTimer.singleShot(1000, self.add_spare_server) QTimer.singleShot(1000, self.add_spare_server)