diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py index 7321ec54..30159971 100644 --- a/calibre-plugin/config.py +++ b/calibre-plugin/config.py @@ -60,7 +60,6 @@ except NameError: # out of the _() strings. # I'm tempted to override _() to include them... no_trans = { 'pini':'personal.ini', - 'imgset':'\n\n[epub]\ninclude_images:true\nkeep_summary_html:true\nmake_firstimage_cover:true\n\n', 'gcset':'generate_cover_settings', 'ccset':'custom_columns_settings', 'gc':'Generate Cover', @@ -251,7 +250,6 @@ class ConfigWidget(QWidget): prefs['updatedefault'] = self.basic_tab.updatedefault.isChecked() prefs['deleteotherforms'] = self.basic_tab.deleteotherforms.isChecked() prefs['adddialogstaysontop'] = self.basic_tab.adddialogstaysontop.isChecked() - prefs['includeimages'] = self.basic_tab.includeimages.isChecked() prefs['lookforurlinhtml'] = self.basic_tab.lookforurlinhtml.isChecked() prefs['checkforseriesurlid'] = self.basic_tab.checkforseriesurlid.isChecked() prefs['checkforurlchange'] = self.basic_tab.checkforurlchange.isChecked() @@ -505,12 +503,6 @@ class BasicTab(QWidget): self.l = QVBoxLayout() groupbox.setLayout(self.l) - # this is a cheat to make it easier for users to realize there's a new include_images features. - self.includeimages = QCheckBox(_("Include images in EPUBs?"),self) - self.includeimages.setToolTip(_("Download and include images in EPUB stories. This is equivalent to adding:%(imgset)s ...to the top of %(pini)s. Your settings in %(pini)s will override this.")%no_trans) - self.includeimages.setChecked(prefs['includeimages']) - self.l.addWidget(self.includeimages) - self.injectseries = QCheckBox(_("Inject calibre Series when none found?"),self) self.injectseries.setToolTip(_("If no series is found, inject the calibre series (if there is one) so \nit appears on the FanFicFare title page(not cover).")) self.injectseries.setChecked(prefs['injectseries']) diff --git a/calibre-plugin/fff_util.py b/calibre-plugin/fff_util.py index d7b04331..b1e8a4dc 100644 --- a/calibre-plugin/fff_util.py +++ b/calibre-plugin/fff_util.py @@ -18,15 +18,7 @@ from calibre_plugins.fanficfare_plugin.fanficfare.configurable import Configurat from calibre_plugins.fanficfare_plugin.prefs import prefs def get_fff_personalini(): - if prefs['includeimages']: - # this is a cheat to make it easier for users. - return '''[epub] -include_images:true -keep_summary_html:true -make_firstimage_cover:true -''' + prefs['personal.ini'] - else: - return prefs['personal.ini'] + return prefs['personal.ini'] def get_fff_config(url,fileform="epub",personalini=None): if not personalini: diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index 507d0be3..358e1ad9 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -451,12 +451,12 @@ output_css: ## include images from img tags in the body and summary of ## stories. Images will be converted to jpg for size if possible. ## include_images is *only* available in epub and html output format. -#include_images:false +include_images:true ## If set, the first image found will be made the cover image. If ## keep_summary_html is true, any images in summary will be before any ## in chapters. -#make_firstimage_cover: false +make_firstimage_cover: true ## If set, the epub will never have a cover, even include_images is on ## and the site has specific cover images. diff --git a/calibre-plugin/prefs.py b/calibre-plugin/prefs.py index 3db589c1..639e1be1 100644 --- a/calibre-plugin/prefs.py +++ b/calibre-plugin/prefs.py @@ -71,7 +71,6 @@ default_prefs['fileform'] = 'epub' default_prefs['collision'] = SAVE_UPDATE default_prefs['deleteotherforms'] = False default_prefs['adddialogstaysontop'] = False -default_prefs['includeimages'] = True default_prefs['lookforurlinhtml'] = False default_prefs['checkforseriesurlid'] = True default_prefs['checkforurlchange'] = True