(#402 #14 #15) Drag & Drop / Amount values custom painting bug

This commit fixes the issue with painting amount values by _not_ calling
the base class paint method in instances where a value painter is present.
This removes the need to suppress the table model from hiding that display
information.  The usage of customized ItemFlags which facilitated that
suppression of the model was removed.  Fixes #402 issue with drag and drop
because now the model provides the DisplayRole data again.

qt/controller/table.py

@@ -8,7 +8,7 @@
 
 from PyQt4.QtGui import QFontMetrics
 
-from qtlib.table import Table as TableBase, ItemFlags
+from qtlib.table import Table as TableBase
 
 from ..support.completable_edit import DescriptionEdit, PayeeEdit, AccountEdit
 from ..support.column_view import AmountPainter
@@ -79,10 +79,5 @@ def _updateFontSize(self):
         # in the custom drawing for the amount field.
         self.view.resize(self.view.sizeHint())
 
-    def _getFlags(self, row, column):
-        has_painter = ItemFlags.ItemHasValuePainter if column.painter else 0
-        return TableBase._getFlags(self, row, column) | has_painter
-
     def appPrefsChanged(self):
         self._updateFontSize()
-

qt/support/item_delegate.py

@@ -119,15 +119,8 @@ def paint(self, painter, option, index):
             option.decorationSize = QSize(decorationWidth, decorationHeight)
             option.features |= QStyleOptionViewItemV4.HasDecoration
         self._prepare_paint_options(option, index)
-        QStyledItemDelegate.paint(self, painter, option, index)
+
         xOffset = 0
-        for dec in decorations:
-            pixmap = dec.pixmap
-            x = option.rect.right() - pixmap.width() - xOffset
-            y = option.rect.center().y() - (pixmap.height() // 2)
-            rect = QRect(x, y, pixmap.width(), pixmap.height())
-            painter.drawPixmap(rect, pixmap)
-            xOffset += pixmap.width()
         # First added for #15, the painting of custom amount information.  This can
         # be used as a pattern for painting any column of information.
         value_painter = self._get_value_painter(index)
@@ -137,6 +130,17 @@ def paint(self, painter, option, index):
             rect = QRect(rect.left(), rect.top(), rect.width() - xOffset, rect.height())
             value_option.rect = rect
             value_painter.paint(painter, value_option, index)
+        else:
+            QStyledItemDelegate.paint(self, painter, option, index)
+
+        for dec in decorations:
+            pixmap = dec.pixmap
+            x = option.rect.right() - pixmap.width() - xOffset
+            y = option.rect.center().y() - (pixmap.height() // 2)
+            rect = QRect(x, y, pixmap.width(), pixmap.height())
+            painter.drawPixmap(rect, pixmap)
+            xOffset += pixmap.width()
+
 
     def setModelData(self, editor, model, index):
         # This call below is to give a chance to the editor to tweak its content a little bit before

qtlib/table.py

@@ -12,10 +12,6 @@
 from .column import Columns
 
 
-class ItemFlags(Qt.ItemFlags):
-    ItemHasValuePainter = 128
-
-
 class Table(QAbstractTableModel):
     # Flags you want when index.isValid() is False. In those cases, _getFlags() is never called.
     INVALID_INDEX_FLAGS = Qt.ItemIsEnabled
@@ -58,13 +54,7 @@ def _updateViewSelection(self):
     # Virtual
     def _getData(self, row, column, role):
 
-        # See moneyguru #14, #15 added to do custom painting of amounts
-        # but can be used as a pattern to paint custom values of other model attribute data.
-        has_custom_painter = self._getFlags(row, column) & ItemFlags.ItemHasValuePainter
-
-        if role == Qt.DisplayRole and has_custom_painter:
-            return None
-        elif role in (Qt.DisplayRole, Qt.EditRole):
+        if role in (Qt.DisplayRole, Qt.EditRole):
             attrname = column.name
             return row.get_cell_value(attrname)
         elif role == Qt.TextAlignmentRole: