From 9f0c5fe527abe31103fa97eeead6166a3968cd56 Mon Sep 17 00:00:00 2001 From: Olivier Keshavjee Date: Thu, 24 Mar 2016 11:37:18 +0100 Subject: [PATCH] Display bug corrected in outline view --- manuskript/models/characterModel.py | 6 ++++++ manuskript/ui/views/outlineDelegates.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/manuskript/models/characterModel.py b/manuskript/models/characterModel.py index d6f7016..d53457d 100644 --- a/manuskript/models/characterModel.py +++ b/manuskript/models/characterModel.py @@ -42,6 +42,12 @@ class characterModel(QAbstractItemModel): else: return "" + elif role == Qt.DecorationRole: + if index.column() == C.name.value: + return c.icon + else: + return QVariant() + elif type(c) == CharacterInfo: if role == Qt.DisplayRole or role == Qt.EditRole: if index.column() == 0: diff --git a/manuskript/ui/views/outlineDelegates.py b/manuskript/ui/views/outlineDelegates.py index 2e8c88d..818718d 100644 --- a/manuskript/ui/views/outlineDelegates.py +++ b/manuskript/ui/views/outlineDelegates.py @@ -278,7 +278,7 @@ class outlineStatusDelegate(QStyledItemDelegate): def paint(self, painter, option, index): QStyledItemDelegate.paint(self, painter, option, index) - if index.isValid() and index.internalPointer().data(Outline.status.value) not in ["", None, "0"]: + if index.isValid() and index.internalPointer().data(Outline.status.value) not in ["", None, "0", 0]: opt = QStyleOptionComboBox() opt.rect = option.rect r = qApp.style().subControlRect(QStyle.CC_ComboBox, opt, QStyle.SC_ComboBoxArrow) @@ -344,7 +344,7 @@ class outlineLabelDelegate(QStyledItemDelegate): qApp.style().drawControl(QStyle.CE_ItemViewItem, opt, painter) # Drop down indicator - if index.isValid() and index.internalPointer().data(Outline.label.value) not in ["", None, "0"]: + if index.isValid() and index.internalPointer().data(Outline.label.value) not in ["", None, "0", 0]: opt = QStyleOptionComboBox() opt.rect = option.rect r = qApp.style().subControlRect(QStyle.CC_ComboBox, opt, QStyle.SC_ComboBoxArrow)