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

Workaround for Qt 5 regression that broke selecting multiple icons in Preferences->Column icon rules

Browse Source
This commit is contained in:
Kovid Goyal 2014-09-13 16:14:47 +05:30
parent 5c80c68a43
commit 850170ca8b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/preferences/coloring.py
View File

@ -14,7 +14,7 @@ from PyQt5.Qt import (QWidget, QDialog, QLabel, QGridLayout, QComboBox, QSize,
QLineEdit, QIntValidator, QDoubleValidator, QFrame, Qt, QIcon, QLineEdit, QIntValidator, QDoubleValidator, QFrame, Qt, QIcon,
QScrollArea, QPushButton, QVBoxLayout, QDialogButtonBox, QToolButton, QScrollArea, QPushButton, QVBoxLayout, QDialogButtonBox, QToolButton,
QListView, QAbstractListModel, pyqtSignal, QSizePolicy, QSpacerItem, QListView, QAbstractListModel, pyqtSignal, QSizePolicy, QSpacerItem,
QApplication, QStandardItem, QStandardItemModel, QCheckBox, QMenu) QApplication, QStandardItem, QStandardItemModel, QCheckBox, QMenu, QPixmap)
from calibre import prepare_string_for_xml, sanitize_file_name_unicode from calibre import prepare_string_for_xml, sanitize_file_name_unicode
from calibre.constants import config_dir from calibre.constants import config_dir
@ -35,7 +35,6 @@ icon_rule_kinds = [(_('icon with text'), 'icon'),
(_('composed icons w/text'), 'icon_composed'), (_('composed icons w/text'), 'icon_composed'),
(_('composed icons w/no text'), 'icon_only_composed'),] (_('composed icons w/no text'), 'icon_only_composed'),]
class ConditionEditor(QWidget): # {{{ class ConditionEditor(QWidget): # {{{
ACTION_MAP = { ACTION_MAP = {
@ -341,6 +340,10 @@ class RuleEditor(QDialog): # {{{
def create_filename_box(): def create_filename_box():
self.filename_box = f = QComboBox() self.filename_box = f = QComboBox()
self.filenamebox_view = v = QListView()
v.setIconSize(QSize(32, 32))
self.filename_box.setView(v)
self.orig_filenamebox_view = f.view()
f.setMinimumContentsLength(20), f.setSizeAdjustPolicy(f.AdjustToMinimumContentsLengthWithIcon) f.setMinimumContentsLength(20), f.setSizeAdjustPolicy(f.AdjustToMinimumContentsLengthWithIcon)
self.populate_icon_filenames() self.populate_icon_filenames()
@ -463,8 +466,10 @@ class RuleEditor(QDialog): # {{{
self.icon_file_names.sort(key=sort_key) self.icon_file_names.sort(key=sort_key)
if doing_multiple: if doing_multiple:
item = QStandardItem(_('Open to see checkboxes')) item = QStandardItem(_('Open to see checkboxes'))
item.setIcon(QIcon(I('blank.png')))
else: else:
item = QStandardItem('') item = QStandardItem('')
item.setFlags(Qt.ItemFlag(0))
model.appendRow(item) model.appendRow(item)
for i,filename in enumerate(self.icon_file_names): for i,filename in enumerate(self.icon_file_names):
@ -474,7 +479,7 @@ class RuleEditor(QDialog): # {{{
item.setData(Qt.Unchecked, Qt.CheckStateRole) item.setData(Qt.Unchecked, Qt.CheckStateRole)
else: else:
item.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable) item.setFlags(Qt.ItemIsEnabled | Qt.ItemIsSelectable)
icon = QIcon(os.path.join(self.icon_folder, filename)) icon = QIcon(QPixmap(os.path.join(self.icon_folder, filename)).scaled(self.filenamebox_view.iconSize(), transformMode=Qt.SmoothTransformation))
item.setIcon(icon) item.setIcon(icon)
model.appendRow(item) model.appendRow(item)
@ -1041,7 +1046,7 @@ if __name__ == '__main__':
db = db() db = db()
if True: if True:
d = RuleEditor(db.field_metadata, 'column_color_rules') d = RuleEditor(db.field_metadata, 'column_icon_rules')
d.add_blank_condition() d.add_blank_condition()
d.exec_() d.exec_()