This commit is contained in:
Kovid Goyal 2014-08-23 23:54:26 +05:30
parent 3f290112a2
commit 52522d5714

View File

@ -137,6 +137,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
SavedSearchBoxMixin, SearchRestrictionMixin, LayoutMixin, UpdateMixin, SavedSearchBoxMixin, SearchRestrictionMixin, LayoutMixin, UpdateMixin,
EbookDownloadMixin EbookDownloadMixin
): ):
'The main GUI' 'The main GUI'
proceed_requested = pyqtSignal(object, object) proceed_requested = pyqtSignal(object, object)
@ -326,24 +327,24 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
action=self.alt_esc_action) action=self.alt_esc_action)
self.alt_esc_action.triggered.connect(self.clear_additional_restriction) self.alt_esc_action.triggered.connect(self.clear_additional_restriction)
####################### Start spare job server ######################## # ###################### Start spare job server ########################
QTimer.singleShot(1000, self.add_spare_server) QTimer.singleShot(1000, self.add_spare_server)
####################### Location Manager ######################## # ###################### Location Manager ########################
self.location_manager.location_selected.connect(self.location_selected) self.location_manager.location_selected.connect(self.location_selected)
self.location_manager.unmount_device.connect(self.device_manager.umount_device) self.location_manager.unmount_device.connect(self.device_manager.umount_device)
self.location_manager.configure_device.connect(self.configure_connected_device) self.location_manager.configure_device.connect(self.configure_connected_device)
self.location_manager.update_device_metadata.connect(self.update_metadata_on_device) self.location_manager.update_device_metadata.connect(self.update_metadata_on_device)
self.eject_action.triggered.connect(self.device_manager.umount_device) self.eject_action.triggered.connect(self.device_manager.umount_device)
#################### Update notification ################### # ################### Update notification ###################
UpdateMixin.init_update_mixin(self, opts) UpdateMixin.init_update_mixin(self, opts)
####################### Search boxes ######################## # ###################### Search boxes ########################
SearchRestrictionMixin.init_search_restirction_mixin(self) SearchRestrictionMixin.init_search_restirction_mixin(self)
SavedSearchBoxMixin.init_saved_seach_box_mixin(self) SavedSearchBoxMixin.init_saved_seach_box_mixin(self)
####################### Library view ######################## # ###################### Library view ########################
LibraryViewMixin.init_library_view_mixin(self, db) LibraryViewMixin.init_library_view_mixin(self, db)
SearchBoxMixin.init_search_box_mixin(self) # Requires current_db SearchBoxMixin.init_search_box_mixin(self) # Requires current_db
@ -372,15 +373,15 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
self.library_view.model().database_changed.connect(self.bars_manager.database_changed, self.library_view.model().database_changed.connect(self.bars_manager.database_changed,
type=Qt.QueuedConnection) type=Qt.QueuedConnection)
########################### Tags Browser ############################## # ########################## Tags Browser ##############################
TagBrowserMixin.init_tag_browser_mixin(self, db) TagBrowserMixin.init_tag_browser_mixin(self, db)
######################### Search Restriction ########################## # ######################## Search Restriction ##########################
if db.prefs['virtual_lib_on_startup']: if db.prefs['virtual_lib_on_startup']:
self.apply_virtual_library(db.prefs['virtual_lib_on_startup']) self.apply_virtual_library(db.prefs['virtual_lib_on_startup'])
self.rebuild_vl_tabs() self.rebuild_vl_tabs()
########################### Cover Flow ################################ # ########################## Cover Flow ################################
CoverFlowMixin.init_cover_flow_mixin(self) CoverFlowMixin.init_cover_flow_mixin(self)
@ -460,9 +461,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
traceback.print_exc() traceback.print_exc()
if message: if message:
if not self.device_manager.is_running('Wireless Devices'): if not self.device_manager.is_running('Wireless Devices'):
error_dialog(self, _('Problem starting the wireless device'), error_dialog(self, _('Problem starting the wireless device'),
_('The wireless device driver had problems starting. ' _('The wireless device driver had problems starting. '
'It said "%s"')%message, show=True) 'It said "%s"')%message, show=True)
self.iactions['Connect Share'].set_smartdevice_action_state() self.iactions['Connect Share'].set_smartdevice_action_state()
def start_content_server(self, check_started=True): def start_content_server(self, check_started=True):
@ -667,7 +668,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
self.search.clear() self.search.clear()
self.saved_search.clear() self.saved_search.clear()
self.book_details.reset_info() self.book_details.reset_info()
#self.library_view.model().count_changed() # self.library_view.model().count_changed()
db = self.library_view.model().db db = self.library_view.model().db
self.iactions['Choose Library'].count_changed(db.count()) self.iactions['Choose Library'].count_changed(db.count())
self.set_window_title() self.set_window_title()
@ -953,4 +954,3 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
e.ignore() e.ignore()
# }}} # }}}