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

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index e8e2763..e68ca21 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -13,19 +13,33 @@ 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 ItemDelegate(QStyledItemDelegate):
+class SelectDelegate(QStyledItemDelegate):
+    pass
+
+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:]
 
@@ -176,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())
@@ -215,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
@@ -244,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)
@@ -256,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):