X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=6d32a80e1b71d52149f82613b9fe352c72d0cca0;hp=f566b9913e44c064eba556eba9b81a485aefef00;hb=afea939e2c58ee09739f8856943f90c36e93782a;hpb=e095c7423002644d129cef273f3a63646903b788

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index f566b99..6d32a80 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -1,9 +1,8 @@
 
-from PyQt4.QtCore import Qt, QString, SIGNAL
-from PyQt4.QtGui import QWidget, QLabel, QTreeView, QStandardItemModel, QVBoxLayout, QSizePolicy
-
-from sfa.util.rspecHelper import RSpec
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
 
+from sface.sfahelper import *
 from sface.sficonfig import config
 from sface.screens.sfascreen import SfaScreen
 
@@ -24,34 +23,24 @@ class SliceWidget(QWidget):
 
         self.nodeView.setModel(self.nodeModel)
 
-        label = QLabel("<a href='refresh'>Refresh</a>", self)
-        label.setScaledContents(False)
-        self.connect(label, SIGNAL('linkActivated(QString)'), self.refresh)
-
+        refresh = QLabel("<a href='refresh'>Refresh</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)
 
         layout = QVBoxLayout()
-        layout.addWidget(label)
-        layout.addWidget(slicename)
+        layout.addLayout(hlayout)
         layout.addWidget(self.nodeView)
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+        self.connect(refresh, SIGNAL('linkActivated(QString)'), self.refresh)
         
-    
-    # TODO: use the methods from sfa-trunk
-    def rspec_get_networks(self, rspec_string):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name]/@name")
-    def rspec_get_xml_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name='%s']/site/node" % network)
-    def rspec_get_sliver_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name='%s']/site/node[sliver]/hostname/text()" % network)
-    def rspec_get_other_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        # xxx todo - could not find the xpath syntax for 'does not have the sliver attribute'
-        return rspec.rspec.xpath("./network[@name='%s']/site/node[~sliver]/hostname/text()" % network)
 
     def refresh(self, link=None):
         data = SfaData()
@@ -94,7 +83,6 @@ class SliceWidget(QWidget):
         self.nodeModel.setData(self.nodeModel.index(0,2), QString(msg))
 
 
-
 class MainScreen(SfaScreen):
     def __init__(self, parent=None):
         SfaScreen.__init__(self, parent)