X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=4b636bc0249dd09dfe2e93eec3634200d8afe929;hp=fb0e99d0a5054956d6b8b436c8265b026b7c1d43;hb=e5eb62ef022ab41be7f2eb0b3ac8723874d1601a;hpb=22d956177232d17404a067a8c1875f592fcc2419
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index fb0e99d..4b636bc 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)
@@ -178,27 +178,27 @@ class SliceWidget(QWidget):
self.updateView()
def submit(self):
- self.parent().setStatus("TODO: Submit not implemented yet!")
+ self.parent().setStatus("TODO: Submit not implemented yet!", 3000)
def readSliceRSpec(self):
- rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
+ rspec_file = config.getSliceRSpecFile()
xml = open(rspec_file).read()
return xml
def refresh(self, link=None):
if not config.getSlice():
- self.parent().setStatus("Slice not set yet!")
+ self.parent().setStatus("Slice not set yet!", timeout=None)
return
self.process = SfiProcess()
outfile = self.process.getRSpecFromSM()
- self.parent().setStatus("Updating slice data. This may take some time...")
+ self.parent().setStatus("Updating slice data. This may take some time...", timeout=None)
self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
def refreshFinished(self):
del self.process
- self.parent().setStatus("Slice data updated.")
+ self.parent().setStatus("Slice data updated.", timeout=5000)
self.updateView()
def updateView(self):
@@ -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):
@@ -231,4 +232,4 @@ class MainScreen(SfaScreen):
SfaScreen.__init__(self, parent)
slice = SliceWidget(self)
- self.init(slice, "Main Window", "PlanetLab Federation GUI")
+ self.init(slice, "Main Window", "OneLab Federation GUI")