Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2025-12-15 21:32:28 +01:00
Code Issues Projects Releases Wiki Activity

Suppress display of 'Update from Saved' when savemetacol not set, other fixes.

Browse source
This commit is contained in:
Jim Miller 2015-05-13 12:27:24 -05:00
parent e61371d5c4
commit b2411d5888
3 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
calibre-plugin/config.py
View file

@ -1247,7 +1247,7 @@ class CustomColumnsTab(QWidget):
horz.addWidget(label)
self.savemetacol = QComboBox(self)
self.savemetacol.setToolTip(tooltip)
self.savemetacol.addItem('','none')
self.savemetacol.addItem('','')
for key, column in custom_columns.iteritems():
if column['datatype'] in ('comments'):
self.savemetacol.addItem(column['name'],key)

45
calibre-plugin/dialogs.py
View file

@ -307,7 +307,7 @@ class AddNewDialog(SizePersistedDialog):
self.collision.setToolTip("CollisionToolTip")
# add collision options
self.set_collisions()
i = self.collision.findText(save_collisions[prefs['collision']])
i = self.collision.findText(save_collisions[self.prefs['collision']])
if i > -1:
self.collision.setCurrentIndex(i)
self.collisionlabel.setBuddy(self.collision)
@ -321,14 +321,14 @@ class AddNewDialog(SizePersistedDialog):
horz = QHBoxLayout()
self.updatemeta = QCheckBox(_('Update Calibre &Metadata?'),self)
self.updatemeta.setToolTip(_("Update metadata for existing stories in Calibre from web site?\n(Columns set to 'New Only' in the column tabs will only be set for new books.)"))
self.updatemeta.setChecked(prefs['updatemeta'])
self.updatemeta.setChecked(self.prefs['updatemeta'])
horz.addWidget(self.updatemeta)
self.mergehide.append(self.updatemeta)
self.mergeupdateshow.append(self.updatemeta)
self.updateepubcover = QCheckBox(_('Update EPUB Cover?'),self)
self.updateepubcover.setToolTip(_('Update book cover image from site or defaults (if found) <i>inside</i> the EPUB when EPUB is updated.'))
self.updateepubcover.setChecked(prefs['updateepubcover'])
self.updateepubcover.setChecked(self.prefs['updateepubcover'])
horz.addWidget(self.updateepubcover)
self.mergehide.append(self.updateepubcover)
@ -431,12 +431,19 @@ class AddNewDialog(SizePersistedDialog):
prev=self.collision.currentText()
self.collision.clear()
if self.merge:
order = anthology_collision_order
order = list(anthology_collision_order)
else:
order = collision_order
order = list(collision_order)
## Remove options that aren't valid.
if self.fileform.currentText() != 'epub':
order.remove(UPDATE)
order.remove(UPDATEALWAYS)
if self.prefs['savemetacol'] == '':
order.remove(CALIBREONLYSAVECOL)
for o in order:
if self.merge or self.fileform.currentText() == 'epub' or o not in [UPDATE,UPDATEALWAYS]:
self.collision.addItem(o)
self.collision.addItem(o)
i = self.collision.findText(prev)
if i > -1:
self.collision.setCurrentIndex(i)
@ -787,7 +794,7 @@ class UpdateExistingDialog(SizePersistedDialog):
self.fileform.addItem('mobi')
self.fileform.addItem('html')
self.fileform.addItem('txt')
self.fileform.setCurrentIndex(self.fileform.findText(prefs['fileform']))
self.fileform.setCurrentIndex(self.fileform.findText(self.prefs['fileform']))
self.fileform.setToolTip(_('Choose output format to create. May set default from plugin configuration.'))
self.fileform.activated.connect(self.set_collisions)
label.setBuddy(self.fileform)
@ -799,7 +806,7 @@ class UpdateExistingDialog(SizePersistedDialog):
self.collision.setToolTip(_("What sort of update to perform. May set default from plugin configuration."))
# add collision options
self.set_collisions()
i = self.collision.findText(save_collisions[prefs['collision']])
i = self.collision.findText(save_collisions[self.prefs['collision']])
if i > -1:
self.collision.setCurrentIndex(i)
label.setBuddy(self.collision)
@ -807,12 +814,12 @@ class UpdateExistingDialog(SizePersistedDialog):
self.updatemeta = QCheckBox(_('Update Calibre &Metadata?'),self)
self.updatemeta.setToolTip(_("Update metadata for existing stories in Calibre from web site?\n(Columns set to 'New Only' in the column tabs will only be set for new books.)"))
self.updatemeta.setChecked(prefs['updatemeta'])
self.updatemeta.setChecked(self.prefs['updatemeta'])
gbl.addWidget(self.updatemeta)
self.updateepubcover = QCheckBox(_('Update EPUB Cover?'),self)
self.updateepubcover.setToolTip(_('Update book cover image from site or defaults (if found) <i>inside</i> the EPUB when EPUB is updated.'))
self.updateepubcover.setChecked(prefs['updateepubcover'])
self.updateepubcover.setChecked(self.prefs['updateepubcover'])
gbl.addWidget(self.updateepubcover)
@ -831,10 +838,18 @@ class UpdateExistingDialog(SizePersistedDialog):
def set_collisions(self):
prev=self.collision.currentText()
self.collision.clear()
for o in collision_order:
if o not in [ADDNEW,SKIP] and \
(self.fileform.currentText() == 'epub' or o not in [UPDATE,UPDATEALWAYS]):
self.collision.addItem(o)
order = list(collision_order)
order.remove(ADDNEW)
order.remove(SKIP)
if self.fileform.currentText() != 'epub':
order.remove(UPDATE)
order.remove(UPDATEALWAYS)
if self.prefs['savemetacol'] == '':
order.remove(CALIBREONLYSAVECOL)
for o in order:
self.collision.addItem(o)
i = self.collision.findText(prev)
if i > -1:
self.collision.setCurrentIndex(i)

5
fanficfare/story.py
View file

@ -558,6 +558,11 @@ class Story(Configurable):
val = v.isoformat()
elif isinstance(v,list):
classes.append("list")
if '' in v:
v.remove('')
if None in v:
v.remove(None)
#logger.debug("k:%s v:%s"%(k,v))
val = "<ul>\n<li>%s</li>\n</ul>"%"</li>\n<li>".join(v)
elif isinstance(v, (int)):
classes.append("int")