diff --git a/recipes/grrm.recipe b/recipes/grrm.recipe new file mode 100644 index 0000000000..a315aa9f32 --- /dev/null +++ b/recipes/grrm.recipe @@ -0,0 +1,36 @@ + +__license__ = 'GPL v3' +__copyright__ = '2011, Darko Miletic ' +''' +grrm.livejournal.com +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class NotABlog(BasicNewsRecipe): + title = 'Not A Blog - George R.R. Martin' + __author__ = 'Darko Miletic' + description = 'George R.R. Martin' + oldest_article = 15 + max_articles_per_feed = 100 + language = 'en' + encoding = 'utf-8' + no_stylesheets = True + use_embedded_content = True + publication_type = 'blog' + + conversion_options = { + 'comment' : description + , 'tags' : 'sf, fantasy, game of thrones' + , 'publisher': 'George R.R. Martin' + , 'language' : language + } + + feeds = [(u'Posts', u'http://grrm.livejournal.com/data/rss')] + + def preprocess_html(self, soup): + for item in soup.findAll(style=True): + del item['style'] + return self.adeify_images(soup) + + diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index 7692a8aba7..483934825d 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -208,8 +208,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): for i in range(1, self.column_color_count): r('column_color_name_'+str(i), db.prefs, choices=choices) r('column_color_template_'+str(i), db.prefs) - temp = getattr(self, 'opt_column_color_template_'+str(i)) - temp.set_tags(tags) + tpl = getattr(self, 'opt_column_color_template_'+str(i)) + tpl.set_tags(tags) + toolbutton = getattr(self, 'opt_column_color_wizard_'+str(i)) + toolbutton.clicked.connect(tpl.tag_wizard) all_colors = [unicode(s) for s in list(QColor.colorNames())] self.colors_box.setText(', '.join(all_colors)) diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui index 31fa0df234..a67a3585cb 100644 --- a/src/calibre/gui2/preferences/look_feel.ui +++ b/src/calibre/gui2/preferences/look_feel.ui @@ -436,30 +436,70 @@ then the tags will be displayed each on their own line. + + + + + :/images/wizard.png:/images/wizard.png + + + + + + + + :/images/wizard.png:/images/wizard.png + + + + + + + + :/images/wizard.png:/images/wizard.png + + + + + + + + :/images/wizard.png:/images/wizard.png + + + + + + + + :/images/wizard.png:/images/wizard.png + + + @@ -467,7 +507,7 @@ then the tags will be displayed each on their own line. - + @@ -505,7 +545,7 @@ then the tags will be displayed each on their own line. - +