From c8a31d5f8c07dd3ebb6d622752fab424a72c0c2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Fri, 10 Sep 2010 16:12:22 +0200 Subject: [PATCH] show selected --- sface/screens/mainscreen.py | 13 +++++++------ sface/sfawindow.py | 14 +++++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) 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): diff --git a/sface/sfawindow.py b/sface/sfawindow.py index 21f17c5..976b184 100644 --- a/sface/sfawindow.py +++ b/sface/sfawindow.py @@ -33,21 +33,25 @@ class Nav(QWidget): class Status(QLabel): def __init__(self, parent=None): QLabel.__init__(self, "", parent) + self.sliceUpdateDate() def set(self, msg, timeout): self.setText(msg) if timeout: - QTimer.singleShot(timeout, self, SLOT("clear()")) + QTimer.singleShot(timeout, self.reset) def sliceUpdateDate(self): rspec_file = config.getSliceRSpecFile() + if not os.path.exists(rspec_file): + return + creation_time = os.stat(rspec_file).st_ctime last_update = time.ctime(creation_time) - self.set(last_update, timeout=None) + self.set("Slice data last updated on %s" % last_update, timeout=None) - def clear(self): -# self.setText("") - self.sliceUpdateDate() + def reset(self): + self.setText("") + QTimer.singleShot(1500, self.sliceUpdateDate) class SfaWindow(QWidget): -- 2.43.0