If the %(col)s column %(action)s value: %(val)s') % dict(
+ col=c, action=action_name, val=prepare_string_for_xml(v)))
# }}}
@@ -824,20 +848,27 @@ class EditRules(QWidget): # {{{
self.fm = fm
self.mi = mi
if pref_name == 'column_color_rules':
- self.l1.setText(''+_(
+ text = _(
'You can control the color of columns in the'
' book list by creating "rules" that tell calibre'
' what color to use. Click the Add Rule button below'
' to get started.
You can change an existing rule by'
- ' double clicking it.'))
- else:
- self.l1.setText('
'+_(
+ ' double clicking it.')
+ elif pref_name == 'column_icon_rules':
+ text = _(
'You can add icons to columns in the'
' book list by creating "rules" that tell calibre'
' what icon to use. Click the Add Rule button below'
' to get started.
You can change an existing rule by'
- ' double clicking it.'))
+ ' double clicking it.')
+ elif pref_name == 'cover_grid_icon_rules':
+ text = _('You can add emblems (small icons) that are displayed on the side of covers'
+ ' in the cover grid by creating "rules" that tell calibre'
+ ' what image to use. Click the Add Rule button below'
+ ' to get started.
You can change an existing rule by'
+ ' double clicking it.')
# self.add_advanced_button.setVisible(False)
+ self.l1.setText('
'+ text)
def add_rule(self):
d = RuleEditor(self.model.fm, self.pref_name)
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 87b2564c95..2e31f9410f 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -11,7 +11,7 @@ from functools import partial
from PyQt4.Qt import (
QApplication, QFont, QFontInfo, QFontDialog, QColorDialog, QPainter,
QAbstractListModel, Qt, QIcon, QKeySequence, QColor, pyqtSignal,
- QWidget, QSizePolicy, QBrush, QPixmap, QSize, QPushButton)
+ QWidget, QSizePolicy, QBrush, QPixmap, QSize, QPushButton, QVBoxLayout)
from calibre import human_readable
from calibre.gui2.preferences import ConfigWidgetBase, test_widget, CommaSeparatedList
@@ -240,6 +240,11 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.tabWidget.addTab(self.icon_rules,
QIcon(I('icon_choose.png')), _('Column icons'))
+ self.grid_rules = EditRules(self.emblems_tab)
+ self.grid_rules.changed.connect(self.changed_signal)
+ self.emblems_tab.setLayout(QVBoxLayout())
+ self.emblems_tab.layout().addWidget(self.grid_rules)
+
self.tabWidget.setCurrentIndex(0)
keys = [QKeySequence('F11', QKeySequence.PortableText), QKeySequence(
'Ctrl+Shift+F', QKeySequence.PortableText)]
@@ -320,6 +325,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
mi=None
self.edit_rules.initialize(db.field_metadata, db.prefs, mi, 'column_color_rules')
self.icon_rules.initialize(db.field_metadata, db.prefs, mi, 'column_icon_rules')
+ self.grid_rules.initialize(db.field_metadata, db.prefs, mi, 'cover_grid_icon_rules')
self.set_cg_color(gprefs['cover_grid_color'])
self.set_cg_texture(gprefs['cover_grid_texture'])
self.update_aspect_ratio()
@@ -365,6 +371,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.display_model.restore_defaults()
self.edit_rules.clear()
self.icon_rules.clear()
+ self.grid_rules.clear()
self.changed_signal.emit()
self.set_cg_color(gprefs.defaults['cover_grid_color'])
self.set_cg_texture(gprefs.defaults['cover_grid_texture'])
@@ -453,6 +460,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.display_model.commit()
self.edit_rules.commit(self.gui.current_db.prefs)
self.icon_rules.commit(self.gui.current_db.prefs)
+ self.grid_rules.commit(self.gui.current_db.prefs)
gprefs['cover_grid_color'] = tuple(self.cg_bg_widget.bcol.getRgb())[:3]
gprefs['cover_grid_texture'] = self.cg_bg_widget.btex
return rr
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index f99204c001..c0cab1f787 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -233,375 +233,417 @@
-
-
-
- Control the cover grid view. You can enable this view by clicking the grid button in the bottom right corner of the main calibre window.
+
+
+ QTabWidget::West
-
- true
+
+ 0
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 20
- 10
-
-
-
-
- -
-
-
- Show a field (such as title) &under the covers
-
-
-
- -
-
-
-
-
-
- &Field to show under the covers:
-
-
- opt_field_under_covers_in_grid
-
-
-
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- &Spacing between covers:
-
-
- opt_cover_grid_spacing
-
-
-
- -
-
-
- The spacing between covers. A value of zero means calculate automatically based on cover size.
-
-
- Automatic
-
-
- cm
-
-
- 2
-
-
- 0.100000000000000
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- Background for the cover grid
-
-
-
-
- -
-
-
- Cover size
-
-
-
-
-
-
-
-
-
-
- -
-
-
- Cover &Width:
-
-
- opt_cover_grid_width
-
-
-
- -
-
-
- The width of displayed covers.
+
+
+ Main
+
+
+
-
+
+
+ Control the cover grid view. You can enable this view by clicking the grid button in the bottom right corner of the main calibre window.
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 10
+
+
+
+
+ -
+
+
+ Show a field (such as title) &under the covers
+
+
+
+ -
+
+
-
+
+
+ &Field to show under the covers:
+
+
+ opt_field_under_covers_in_grid
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ &Spacing between covers:
+
+
+ opt_cover_grid_spacing
+
+
+
+ -
+
+
+ The spacing between covers. A value of zero means calculate automatically based on cover size.
+
+
+ Automatic
+
+
+ cm
+
+
+ 2
+
+
+ 0.100000000000000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Background for the cover grid
+
+
+
+
+ -
+
+
+ Cover size
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+ Cover &Width:
+
+
+ opt_cover_grid_width
+
+
+
+ -
+
+
+ The width of displayed covers.
A value of zero means calculate automatically.
-
-
- Automatic
-
-
- cm
-
-
- 1
-
-
-
- -
-
-
- Make the covers larger, maintaining current aspect ratio.
-
-
- &Larger covers
-
-
-
- :/images/plus.png:/images/plus.png
-
-
-
- -
-
-
- Cover &Height:
-
-
- opt_cover_grid_height
-
-
-
- -
-
-
- The height of displayed covers.
+
+
+ Automatic
+
+
+ cm
+
+
+ 1
+
+
+
+ -
+
+
+ Make the covers larger, maintaining current aspect ratio.
+
+
+ &Larger covers
+
+
+
+ :/images/plus.png:/images/plus.png
+
+
+
+ -
+
+
+ Cover &Height:
+
+
+ opt_cover_grid_height
+
+
+
+ -
+
+
+ The height of displayed covers.
A value of zero means calculate automatically.
-
-
- Automatic
-
-
- cm
-
-
- 1
-
-
-
- -
-
-
- Make the covers smaller, maintaining current aspect ratio.
-
-
- &Smaller covers
-
-
-
- :/images/minus.png:/images/minus.png
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- By default, calibre chooses a cover size based on your computer's screen size. You can change the cover size here:
-
-
- true
-
-
-
- -
-
-
- Reset size to automatic
-
-
- &Reset size
-
-
-
-
+
+
+ Automatic
+
+
+ cm
+
+
+ 1
+
+
+
+ -
+
+
+ Make the covers smaller, maintaining current aspect ratio.
+
+
+ &Smaller covers
+
+
+
+ :/images/minus.png:/images/minus.png
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ By default, calibre chooses a cover size based on your computer's screen size. You can change the cover size here:
+
+
+ true
+
+
+
+ -
+
+
+ Reset size to automatic
+
+
+ &Reset size
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 170
+
+
+
+
+
+
+
+
+ Emblems
+
+
+
+
+ Performance
+
+
+ -
+
+
+ Caching of covers for improved performance
+
+
+
-
+
+
+ Disable
+
+
+ MB
+
+
+ 100
+
+
+ 100
+
+
+
+ -
+
+
+ Open cache directory
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ There are two kinds of caches that calibre uses to improve performance when rendering covers in the grid view. A disk cache that is kept on your hard disk and stores the cover thumbnails and an in memory cache used to ensure flicker free rendering of covers. For best results, keep the memory cache small and the disk cache large, unless you have a lot of extra RAM in your computer and dont mind it being used by the memory cache.
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 310
+ 20
+
+
+
+
+ -
+
+
+ Number of covers to cache in &memory (keep this small):
+
+
+ opt_cover_grid_cache_size
+
+
+
+ -
+
+
+ Maximum amount of disk space to use for caching thumbnails:
+
+
+
+ -
+
+
+ Empty disk cache
+
+
+
+ -
+
+
+ The maximum number of covers to keep in memory. Increasing this will make rendering faster, at the cost of more memory usage.
+
+
+ 50000
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+
- -
-
-
- Caching of covers for improved performance
-
-
-
-
-
-
- There are two kinds of caches that calibre uses to improve performance when rendering covers in the grid view. A disk cache that is kept on your hard disk and stores the cover thumbnails and an in memory cache used to ensure flicker free rendering of covers. For best results, keep the memory cache small and the disk cache large, unless you have a lot of extra RAM in your computer and dont mind it being used by the memory cache.
-
-
- true
-
-
-
- -
-
-
- Number of covers to cache in &memory (keep this small):
-
-
- opt_cover_grid_cache_size
-
-
-
- -
-
-
- The maximum number of covers to keep in memory. Increasing this will make rendering faster, at the cost of more memory usage.
-
-
- 50000
-
-
-
- -
-
-
- Maximum amount of disk space to use for caching thumbnails:
-
-
-
- -
-
-
- Disable
-
-
- MB
-
-
- 100
-
-
- 100
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Empty disk cache
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 310
- 20
-
-
-
-
- -
-
-
- Open cache directory
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-