X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=e68ca21077aaeb2e2f1c663f6810495a798c13a6;hp=00710a38e87c7f928d4e9eb22eefbc502220b361;hb=e0f5698d85a9079446e04780751acf62e6ee7e61;hpb=225f44c6dd0ced8e880a5a106f0563d390af54ee

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 00710a3..e68ca21 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -13,29 +13,50 @@ class NodeView(QTreeView):
     def __init__(self, parent):
         QTreeView.__init__(self, parent)
 
+        self.setAnimated(True)
         self.setItemsExpandable(True)
         self.setRootIsDecorated(True)
         self.setAlternatingRowColors(True)
-        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.setAttribute(Qt.WA_MacShowFocusRect, 0)
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+class SelectDelegate(QStyledItemDelegate):
+    pass
 
-class ItemDelegate(QStyledItemDelegate):
+class NodeNameDelegate(QStyledItemDelegate):
     def __init__(self, parent):
         QStyledItemDelegate.__init__(self)
 
     def paint(self, painter, option, index):
         data = "%s" % index.data().toString()
 
+#         model = index.model()
+#         select_index = model.index(index.row(), 2, index.parent())
+#         select_data = select_index.data().toString()
+#         if select_data == "true":
+#             print select_data
+#             model.setData(select_index, QString("TEST"), Qt.DisplayRole)
+#             model.emit(SIGNAL('dataChanged(QModelIndex, QModelIndex)'),
+#                        select_index, select_index)
+
+
         if data.startswith("*"): # already in the sliver
             data = " %s " % data[1:]
 
-            rect = option.rect
             fm = QFontMetrics(option.font)
-            w = fm.width(QString(data))
-            rect.setWidth(w)
+            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.fillRect(rect, QColor.fromRgb(0, 250, 0))
+            painter.setRenderHint(QPainter.Antialiasing)
+            painter.drawRoundedRect(rect, 4, 4)
+            painter.fillPath(path, QColor.fromRgb(0, 250, 0))
             painter.setPen(QColor.fromRgb(0, 0, 0))
             painter.drawText(option.rect, 0, QString(data))
             painter.restore()
@@ -169,31 +190,35 @@ class SliceWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
 
-        refresh = QLabel("<a href='refresh'>Update Slice Data</a>", self)
-        refresh.setScaledContents(False)
         slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
         slicename.setScaledContents(False)
 
-        hlayout = QHBoxLayout()
-        hlayout.addWidget(slicename)
-        hlayout.addStretch()
-        hlayout.addWidget(refresh)
-
         self.nodeView = NodeView(self)
         self.nodeModel = NodeModel(self)
         self.nodeView.setModel(self.nodeModel)
+        self.nodeNameDelegate = NodeNameDelegate(self)
+        self.selectDelegate = SelectDelegate(self)
+
 
+        refresh = QPushButton("Update Slice Data", self)
+        refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
         submit = QPushButton("Submit", self)
         submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
 
+        hlayout = QHBoxLayout()
+        hlayout.addWidget(refresh, 0, Qt.AlignLeft)
+        hlayout.addStretch()
+        hlayout.addWidget(submit, 0, Qt.AlignRight)
+
         layout = QVBoxLayout()
-        layout.addLayout(hlayout)
+        layout.addWidget(slicename)
         layout.addWidget(self.nodeView)
-        layout.addWidget(submit, 0, Qt.AlignRight)
+        layout.addLayout(hlayout)
+
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-        self.connect(refresh, SIGNAL('linkActivated(QString)'), self.refresh)
+        self.connect(refresh, SIGNAL('clicked()'), self.refresh)
         self.connect(submit, SIGNAL('clicked()'), self.submit)
 
         rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
@@ -208,7 +233,7 @@ class SliceWidget(QWidget):
         xml = open(rspec_file).read()
         return xml
 
-    def refresh(self, link=None):
+    def refresh(self):
         if not config.getSlice():
             self.parent().setStatus("<font color='red'>Slice not set yet!</font>", timeout=None)
             return
@@ -237,11 +262,11 @@ class SliceWidget(QWidget):
             available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
 
             for node in sliver_nodes:
-                nodeItem = TreeItem([QString(""), QString("*%s" % node), QString("Implement Checkbox")], networkItem)
+                nodeItem = TreeItem([QString(""), QString("*%s" % node), QString("true")], networkItem)
                 networkItem.appendChild(nodeItem)
 
             for node in available_nodes:
-                nodeItem = TreeItem([QString(""), QString(node), QString("Implement Checkbox")], networkItem)
+                nodeItem = TreeItem([QString(""), QString(node), QString("false")], networkItem)
                 networkItem.appendChild(nodeItem)
 
             self.nodeModel.rootItem.appendChild(networkItem)
@@ -249,8 +274,8 @@ class SliceWidget(QWidget):
         self.nodeView.expandAll()
         self.nodeView.resizeColumnToContents(1)
 
-        self.delegate = ItemDelegate(self)
-        self.nodeView.setItemDelegateForColumn(1, self.delegate)
+        self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate)
+        self.nodeView.setItemDelegateForColumn(2, self.selectDelegate)
 
 
 class MainScreen(SfaScreen):