X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=ccbe8ddeaf38d3dd1cf3e1fb09cfe57d2b8dd5f5;hp=96ec7eda567c58d81d089761bf39febdf31279a0;hb=c8a31d5f8c07dd3ebb6d622752fab424a72c0c2f;hpb=8cfbfbd5c19fcab179e037efacd608e3b4c64b6e
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 96ec7ed..ccbe8dd 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -70,7 +70,7 @@ class NodeModel(QAbstractItemModel):
self.__initRoot()
def __initRoot(self):
- self.rootItem = TreeItem([QString("Testbed"), QString("Hostname")])
+ self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")])
def columnCount(self, parent):
if parent.isValid():
@@ -96,7 +96,7 @@ class NodeModel(QAbstractItemModel):
def flags(self, index):
if not index.isValid():
return 0
- return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+ return Qt.ItemIsEnabled | Qt.ItemIsSelectable # | Qt.ItemIsEditable
def index(self, row, column, parent):
if not self.hasIndex(row, column, parent):
@@ -146,7 +146,7 @@ class SliceWidget(QWidget):
def __init__(self, parent):
QWidget.__init__(self, parent)
- refresh = QLabel("Refresh", self)
+ refresh = QLabel("Update Slice Data", self)
refresh.setScaledContents(False)
slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
slicename.setScaledContents(False)
@@ -207,23 +207,24 @@ class SliceWidget(QWidget):
networks = rspec_get_networks(rspec_string)
for network in networks:
- networkItem = TreeItem([QString(network), QString("")], self.nodeModel.rootItem)
+ networkItem = TreeItem([QString(network), QString(""), QString("")], self.nodeModel.rootItem)
all_nodes = rspec_get_nodes_from_network(rspec_string, network)
sliver_nodes = rspec_get_sliver_nodes_from_network(rspec_string, network)
available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
for node in sliver_nodes:
- nodeItem = TreeItem([QString(""), QString("%s (selected)" % node)], networkItem)
+ nodeItem = TreeItem([QString(""), QString(node), QString("True")], networkItem)
networkItem.appendChild(nodeItem)
for node in available_nodes:
- nodeItem = TreeItem([QString(""), QString(node)], networkItem)
+ nodeItem = TreeItem([QString(""), QString(node), QString("False")], networkItem)
networkItem.appendChild(nodeItem)
self.nodeModel.rootItem.appendChild(networkItem)
self.nodeView.expandAll()
+ self.nodeView.resizeColumnToContents(1)
class MainScreen(SfaScreen):