colorize remove and add actions

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index ae18c9d..160883b 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -17,6 +17,7 @@ class NodeView(QTreeView):
         self.setItemsExpandable(True)
         self.setRootIsDecorated(True)
         self.setAlternatingRowColors(True)
+#        self.setSelectionMode(self.MultiSelection)
         self.setAttribute(Qt.WA_MacShowFocusRect, 0)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
@@ -32,32 +33,43 @@ class NodeNameDelegate(QStyledItemDelegate):
         model = index.model()
         select_index = model.index(index.row(), 2, index.parent())
         select_data = select_index.data().toString()
-#         if select_data == "false":
-#             print select_data
-#             model.setData(index, QString("*%s" % data), Qt.EditRole)
-#             model.setData(select_index, QString("true"), Qt.EditRole)
-
-
-        if select_data == "true": # already in the sliver
-            fm = QFontMetrics(option.font)
-            rect = option.rect
-            rect.setWidth(fm.width(QString(data)))
-            rect.setHeight(rect.height() - 2)
-            rect.setX(rect.x() + 1)
-            x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
-
-            path = QPainterPath()
-            path.addRoundedRect(x, y, w, h, 4, 4)
-
-            painter.save()
-            painter.setRenderHint(QPainter.Antialiasing)
-            painter.drawRoundedRect(rect, 4, 4)
+
+        if select_data not in ("true", "add", "remove"): # default view
+            QStyledItemDelegate.paint(self, painter, option, index)
+            return
+
+        fm = QFontMetrics(option.font)
+        rect = option.rect
+        rect.setWidth(fm.width(QString(data)) + 8)
+        rect.setHeight(rect.height() - 2)
+        rect.setX(rect.x() + 4)
+        x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width() 
+
+        path = QPainterPath()
+        path.addRoundedRect(x, y, w, h, 4, 4)
+
+        painter.save()
+        painter.setRenderHint(QPainter.Antialiasing)
+        painter.drawRoundedRect(rect, 4, 4)
+
+        if select_data == "true": # already in the slice
             painter.fillPath(path, QColor.fromRgb(0, 250, 0))
             painter.setPen(QColor.fromRgb(0, 0, 0))
             painter.drawText(option.rect, 0, QString(data))
-            painter.restore()
-        else: # others, fall back to default view
-            QStyledItemDelegate.paint(self, painter, option, index)
+
+        elif select_data == "add": # newly added to the slice
+            painter.fillPath(path, QColor.fromRgb(0, 250, 0))
+            painter.setPen(QColor.fromRgb(0, 0, 0))
+            painter.drawText(option.rect, 0, QString(data))
+            painter.fillRect(x + w + 10, y + 3, 10, 10, QColor.fromRgb(0, 250, 0))
+
+        elif select_data == "remove": # removed from the slice
+            painter.fillPath(path, QColor.fromRgb(250, 0, 0))
+            painter.setPen(QColor.fromRgb(0, 0, 0))
+            painter.drawText(option.rect, 0, QString(data))
+            painter.fillRect(x + w + 10, y + 3, 10, 10, QColor.fromRgb(250, 0, 0))
+
+        painter.restore()
 
 class TreeItem:
     def __init__(self, data, parent=None):
@@ -121,14 +133,6 @@ class TreeItem:
 
         self.itemData[column] = value
         return True
-
-    def row(self):
-        if (self.parentItem):
-            try:
-                return self.parentItem.childItems.index(self)
-            except ValueError:
-                return 0
-        return 0
     
     def parent(self):
         return self.parentItem
@@ -147,7 +151,6 @@ class NodeModel(QAbstractItemModel):
     def __initRoot(self):
         self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")])
 
-
     def getItem(self, index):
         if index.isValid():
             item = index.internalPointer()
@@ -155,7 +158,7 @@ class NodeModel(QAbstractItemModel):
         return self.rootItem
 
     def headerData(self, section, orientation, role):
-        if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+        if orientation == Qt.Horizontal and role in (Qt.DisplayRole, Qt.EditRole):
             return self.rootItem.data(section)
         return QVariant()
 
@@ -164,7 +167,6 @@ class NodeModel(QAbstractItemModel):
             return QModelIndex()
 
         parentItem = self.getItem(parent)
-            
         childItem = parentItem.child(row)
         if childItem:
             return self.createIndex(row, column, childItem)
@@ -190,11 +192,10 @@ class NodeModel(QAbstractItemModel):
 
         childItem = self.getItem(index)
         parentItem = childItem.parent()
-
         if parentItem is self.rootItem:
             return QModelIndex()
 
-        return self.createIndex(parentItem.row(), 0, parentItem)
+        return self.createIndex(parentItem.childNumber(), 0, parentItem)
 
     def rowCount(self, parent=QModelIndex()):
         parentItem = self.getItem(parent)
@@ -253,6 +254,7 @@ class SliceWidget(QWidget):
         self.filterModel.setSourceModel(self.nodeModel)
         self.nodeView.setModel(self.filterModel)
         self.filterModel.setDynamicSortFilter(True)
+#        self.nodeView.setModel(self.filterModel)
         self.nodeView.setModel(self.nodeModel)
 
         self.nodeNameDelegate = NodeNameDelegate(self)
@@ -282,6 +284,7 @@ class SliceWidget(QWidget):
         self.updateView()
 
     def filter(self, filter):
+        print self.filterModel.rowCount(), self.nodeModel.rowCount()
         self.filterModel.setFilterRegExp(QRegExp(filter))
 
     def submit(self):
@@ -338,6 +341,7 @@ class SliceWidget(QWidget):
         self.nodeView.resizeColumnToContents(1)
         self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate)
         self.nodeView.setItemDelegateForColumn(2, self.selectDelegate)
+        self.filterModel.setFilterKeyColumn(1)
 
 
 class MainScreen(SfaScreen):