Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

1) fix behavior difference between editing standard series columns and custom series columns.

Browse Source 
2) merge from trunk
This commit is contained in:
Charles Haley 2013-01-07 14:03:24 +01:00
commit 6dd8e10e3c
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
recipes/tidbits.recipe
View File

@ -16,8 +16,9 @@ class TidBITS(BasicNewsRecipe):
oldest_article = 2 oldest_article = 2
max_articles_per_feed = 100 max_articles_per_feed = 100
no_stylesheets = True no_stylesheets = True
#auto_cleanup = True
encoding = 'utf-8' encoding = 'utf-8'
use_embedded_content = True use_embedded_content = False
language = 'en' language = 'en'
remove_empty_feeds = True remove_empty_feeds = True
masthead_url = 'http://db.tidbits.com/images/tblogo9.gif' masthead_url = 'http://db.tidbits.com/images/tblogo9.gif'
@ -30,9 +31,11 @@ class TidBITS(BasicNewsRecipe):
, 'language' : language , 'language' : language
} }
remove_attributes = ['width','height'] #remove_attributes = ['width','height']
remove_tags = [dict(name='small')] #remove_tags = [dict(name='small')]
remove_tags_after = dict(name='small') #remove_tags_after = dict(name='small')
keep_only_tags = [dict(name='div', attrs={'id':'center_ajax_sub'})]
remove_tags = [dict(name='div', attrs={'id':'social-media'})]
feeds = [ feeds = [
(u'Business Apps' , u'http://db.tidbits.com/feeds/business.rss' ) (u'Business Apps' , u'http://db.tidbits.com/feeds/business.rss' )

20
src/calibre/gui2/custom_column_widgets.py
View File

@ -369,6 +369,7 @@ class Series(Base):
w.setMinimumContentsLength(25) w.setMinimumContentsLength(25)
self.name_widget = w self.name_widget = w
self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w] self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w]
w.editTextChanged.connect(self.series_changed)
self.widgets.append(QLabel('&'+self.col_metadata['name']+_(' index:'), parent)) self.widgets.append(QLabel('&'+self.col_metadata['name']+_(' index:'), parent))
w = QDoubleSpinBox(parent) w = QDoubleSpinBox(parent)
@ -389,26 +390,33 @@ class Series(Base):
self.initial_index = s_index self.initial_index = s_index
self.initial_val = val self.initial_val = val
val = self.normalize_db_val(val) val = self.normalize_db_val(val)
self.name_widget.blockSignals(True)
self.name_widget.update_items_cache(values) self.name_widget.update_items_cache(values)
self.name_widget.show_initial_value(val) self.name_widget.show_initial_value(val)
self.name_widget.blockSignals(False)
def getter(self): def getter(self):
n = unicode(self.name_widget.currentText()).strip() n = unicode(self.name_widget.currentText()).strip()
i = self.idx_widget.value() i = self.idx_widget.value()
return n, i return n, i
def series_changed(self, val):
val, s_index = self.gui_val
if tweaks['series_index_auto_increment'] == 'no_change':
pass
elif tweaks['series_index_auto_increment'] == 'const':
s_index = 1.0
else:
s_index = self.db.get_next_cc_series_num_for(val,
num=self.col_id)
self.idx_widget.setValue(s_index)
def commit(self, book_id, notify=False): def commit(self, book_id, notify=False):
val, s_index = self.gui_val val, s_index = self.gui_val
val = self.normalize_ui_val(val) val = self.normalize_ui_val(val)
if val != self.initial_val or s_index != self.initial_index: if val != self.initial_val or s_index != self.initial_index:
if val == '': if val == '':
val = s_index = None val = s_index = None
elif s_index == 0.0:
if tweaks['series_index_auto_increment'] != 'const':
s_index = self.db.get_next_cc_series_num_for(val,
num=self.col_id)
else:
s_index = None
return self.db.set_custom(book_id, val, extra=s_index, num=self.col_id, return self.db.set_custom(book_id, val, extra=s_index, num=self.col_id,
notify=notify, commit=False, allow_case_change=True) notify=notify, commit=False, allow_case_change=True)
else: else: