diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py index 91dc40e9..59282746 100644 --- a/calibre-plugin/config.py +++ b/calibre-plugin/config.py @@ -1279,6 +1279,70 @@ class OtherTab(QWidget): self.l = QVBoxLayout() self.setLayout(self.l) + groupbox = QGroupBox() + self.l.addWidget(groupbox) + + groupl = QVBoxLayout() + groupbox.setLayout(groupl) + + label = QLabel("

"+ + _("Background Job Settings")+ + "

"+ + "

"+ + _("These settings change the way FanFicFare handles background processing. "+ + "In past, FFF split story downloads into separate processes in the background Job. "+ + "Now, each site will launch separate background Job.")+ + "

"+ + "

"+ + _("Advantages of new version:")+ + "

") + label.setWordWrap(True) + groupl.addWidget(label) + + self.single_proc_jobs = QCheckBox(_('Use new, single process background jobs'),self) + self.single_proc_jobs.setToolTip(_("Uncheck to go back to old multi-process BG jobs.")) + self.single_proc_jobs.setChecked(prefs['single_proc_jobs']) + groupl.addWidget(self.single_proc_jobs) + + label = QLabel("

"+ + _("Options with the new version:")+ + "

"+ + "

" + ) + label.setWordWrap(True) + groupl.addWidget(label) + + self.site_split_jobs = QCheckBox(_('Split downloads into separate background jobs by site'),self) + self.site_split_jobs.setToolTip(_("Launches a separate background Job for each site in the list of stories to download/update. Otherwise, there will be only one background job.")) + self.site_split_jobs.setChecked(prefs['site_split_jobs']) + groupl.addWidget(self.site_split_jobs) + + self.reconsolidate_jobs = QCheckBox(_('Reconsolidate split downloads before updating library'),self) + self.reconsolidate_jobs.setToolTip(_("Hold all downloads/updates launched together until they all finish. Otherwise, there will be a 'Proceed to update' dialog for each site.")) + self.reconsolidate_jobs.setChecked(prefs['reconsolidate_jobs']) + groupl.addWidget(self.reconsolidate_jobs) + + self.l.addSpacing(5) + label = QLabel(_("These controls aren't plugin settings as such, but convenience buttons for setting Keyboard shortcuts and getting all the FanFicFare confirmation dialogs back again.")) label.setWordWrap(True) self.l.addWidget(label) @@ -1299,39 +1363,6 @@ class OtherTab(QWidget): view_prefs_button.clicked.connect(self.view_prefs) self.l.addWidget(view_prefs_button) - label = QLabel("

Temporary Settings

" - "

These are experimental settings that change the way FanFicFare " - "handles background processing.

" - "

In past, FFF split story downloads into separate " - "processes in the background job.

" - "

Advantages of new version:

" - "

Disadvantages of new version:

" - ) - label.setWordWrap(True) - self.l.addWidget(label) - - self.single_proc_jobs = QCheckBox(_('Use New Single Process Background Jobs'),self) - self.single_proc_jobs.setToolTip(_("Uncheck to go back to old multi-process BG jobs")) - self.single_proc_jobs.setChecked(prefs['single_proc_jobs']) - self.l.addWidget(self.single_proc_jobs) - - self.site_split_jobs = QCheckBox(_('Split downloads into separate background jobs by site'),self) - self.site_split_jobs.setToolTip(_("Launches a separate background Job for each site in the list of stories to download/update.")) - self.site_split_jobs.setChecked(prefs['site_split_jobs']) - self.l.addWidget(self.site_split_jobs) - - self.reconsolidate_jobs = QCheckBox(_('Reconsolidate split downloads before updating library'),self) - self.reconsolidate_jobs.setToolTip(_("Hold all downloads/updates launched together until they all finish. Otherwise, there will be a 'Proceed to update' dialog for each site.")) - self.reconsolidate_jobs.setChecked(prefs['reconsolidate_jobs']) - self.l.addWidget(self.reconsolidate_jobs) - self.l.insertStretch(-1) def reset_dialogs(self): diff --git a/calibre-plugin/prefs.py b/calibre-plugin/prefs.py index 95c930b3..12afd01f 100644 --- a/calibre-plugin/prefs.py +++ b/calibre-plugin/prefs.py @@ -198,8 +198,8 @@ default_prefs['update_existing_only_from_email'] = False default_prefs['download_from_email_immediately'] = False default_prefs['single_proc_jobs'] = True -default_prefs['site_split_jobs'] = False -default_prefs['reconsolidate_jobs'] = False +default_prefs['site_split_jobs'] = True +default_prefs['reconsolidate_jobs'] = True def set_library_config(library_config,db,setting=PREFS_KEY_SETTINGS): db.prefs.set_namespaced(PREFS_NAMESPACE,