minor tweaks

[sface.git] / sface / screens / mainscreen.py

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 5507294..547baec 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -46,6 +46,13 @@ class NodeView(QTreeView):
             else: model.setData(status_index, QString(node_status['out']))
 
         model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), hostname_index, hostname_index)
+
+    def currentChanged(self, current, previous):
+        model = current.model()
+        hostname_index = model.index(current.row(), 1, current.parent())
+        hostname_data = hostname_index.data().toString()
+        self.emit(SIGNAL('hostnameClicked(QString)'), hostname_data)
+        
                 
 
 class NodeNameDelegate(QStyledItemDelegate):
@@ -314,14 +321,11 @@ class SliceWidget(QWidget):
         self.connect(refresh, SIGNAL('clicked()'), self.refresh)
         self.connect(submit, SIGNAL('clicked()'), self.submit)
         self.connect(searchbox, SIGNAL('textChanged(QString)'), self.filter)
-        self.connect(self.process, SIGNAL('readyReadStandardOutput()'), self.processOutputReady)
-        self.connect(self.process, SIGNAL('readyReadStandardError()'), self.processOutputReady)
+        self.connect(self.nodeView, SIGNAL('hostnameClicked(QString)'),
+                     self.nodeSelectionChanged)
 
         self.updateView()
 
-    def processOutputReady(self):
-        self.parent().logWindow.setText(self.process.readOutput())
-
     def submitFinished(self):
         self.setStatus("<font color='green'>Slice data submitted.</font>")
         QTimer.singleShot(1000, self.refresh)
@@ -384,7 +388,7 @@ class SliceWidget(QWidget):
         self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
 
         self.process.applyRSpec(rspec)
-        self.setStatus("Sending slice data (RSpec). This may take some time...")
+        self.setStatus("Sending slice data (RSpec). This will take some time...")
         
 
     def refresh(self):
@@ -400,7 +404,7 @@ class SliceWidget(QWidget):
         self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
 
         self.process.getRSpecFromSM()
-        self.setStatus("Updating slice data. This may take some time...")
+        self.setStatus("Updating slice data. This will take some time...")
 
     def updateView(self):
         global already_in_nodes
@@ -445,15 +449,23 @@ class SliceWidget(QWidget):
     def updateSliceName(self):
         self.slicename.setText("Slice : %s" % (config.getSlice() or "None"))
 
+    def nodeSelectionChanged(self, hostname):
+        self.parent().nodeSelectionChanged(hostname)
 
 class MainScreen(SfaScreen):
     def __init__(self, parent):
         SfaScreen.__init__(self, parent)
 
         slice = SliceWidget(self)
-        self.init(slice, "Main Window", "OneLab Federation GUI")
+        self.init(slice, "Main Window", "OneLab SFA crawler")
 
+    def rspecUpdated(self):
+        self.mainwin.rspecWindow.updateView()
+        
     def configurationChanged(self):
         self.widget.updateSliceName()
         self.widget.updateView()
+        self.mainwin.rspecWindow.updateView()
 
+    def nodeSelectionChanged(self, hostname):
+        self.mainwin.nodeSelectionChanged(hostname)