X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=c3908e1b52711c69cb085b6d412cf1d73b4a348f;hp=32d984901fccb4c4b05ad227426d0e5ea13d1c5e;hb=4d4d8e5fd0711655ac0906d880857ff9d9d3bd16;hpb=a8f5d8a8a1fc3baf55c85d8af3243944a2dca26c

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 32d9849..c3908e1 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -5,7 +5,7 @@ from PyQt4.QtGui import *
 
 from sfa.util.rspecHelper import RSpec
 from sface.sfahelper import *
-from sface.sficonfig import config
+from sface.config import config
 from sface.sfiprocess import SfiProcess
 from sface.screens.sfascreen import SfaScreen
 
@@ -29,13 +29,20 @@ class ItemDelegate(QStyledItemDelegate):
         if data.startswith("*"): # already in the sliver
             data = " %s " % data[1:]
 
-            rect = option.rect
             fm = QFontMetrics(option.font)
-            w = fm.width(QString(data))
-            rect.setWidth(w)
+            rect = option.rect
+            rect.setWidth(fm.width(QString(data)))
+            rect.setHeight(rect.height() - 2)
+            rect.setX(rect.x() + 1)
+            x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
+
+            path = QPainterPath()
+            path.addRoundedRect(x, y, w, h, 4, 4)
 
             painter.save()
-            painter.fillRect(rect, QColor.fromRgb(0, 250, 0))
+            painter.setRenderHint(QPainter.Antialiasing)
+            painter.drawRoundedRect(rect, 4, 4)
+            painter.fillPath(path, QColor.fromRgb(0, 250, 0))
             painter.setPen(QColor.fromRgb(0, 0, 0))
             painter.drawText(option.rect, 0, QString(data))
             painter.restore()
@@ -169,31 +176,32 @@ class SliceWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
 
-        refresh = QLabel("<a href='refresh'>Update Slice Data</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)
-
         self.nodeView = NodeView(self)
         self.nodeModel = NodeModel(self)
         self.nodeView.setModel(self.nodeModel)
 
+        refresh = QPushButton("Update Slice Data", self)
+        refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
         submit = QPushButton("Submit", self)
         submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
 
+        hlayout = QHBoxLayout()
+        hlayout.addWidget(refresh, 0, Qt.AlignLeft)
+        hlayout.addStretch()
+        hlayout.addWidget(submit, 0, Qt.AlignRight)
+
         layout = QVBoxLayout()
-        layout.addLayout(hlayout)
+        layout.addWidget(slicename)
         layout.addWidget(self.nodeView)
-        layout.addWidget(submit, 0, Qt.AlignRight)
+        layout.addLayout(hlayout)
+
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-        self.connect(refresh, SIGNAL('linkActivated(QString)'), self.refresh)
+        self.connect(refresh, SIGNAL('clicked()'), self.refresh)
         self.connect(submit, SIGNAL('clicked()'), self.submit)
 
         rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
@@ -208,7 +216,7 @@ class SliceWidget(QWidget):
         xml = open(rspec_file).read()
         return xml
 
-    def refresh(self, link=None):
+    def refresh(self):
         if not config.getSlice():
             self.parent().setStatus("<font color='red'>Slice not set yet!</font>", timeout=None)
             return