style

diff --git a/sface.py b/sface.py
index ae4770d..eca288b 100644 (file)
--- a/sface.py
+++ b/sface.py
@@ -18,17 +18,20 @@ QTreeView, QLineEdit {
   margin: 2px;
 }
 
   margin: 2px;
 }
 

- QPushButton {
-   background-color: white;
-   border: 2px solid gray;
-   border-radius: 4px;
-   padding: 6px;
-   margin: 5px;
- }
-
- QPushButton:pressed {
-   background-color: #5599FF;
- }
+QPushButton {
+  background-color: white;
+  border: 2px solid gray;
+  border-radius: 4px;
+  padding: 6px;
+}
+
+QPushButton:pressed {
+  background-color: #5599FF;
+}
+
+QLabel {
+  font-size: 14px;
+}

 
 ''')
 
 
 ''')
 

diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index 56391f1..bed2ce7 100644 (file)
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -32,6 +32,7 @@ class ConfigWidget(QWidget):
             button=QPushButton(label, self)
             button.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
             hlayout.addWidget(button, 0, Qt.AlignRight)
             button=QPushButton(label, self)
             button.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
             hlayout.addWidget(button, 0, Qt.AlignRight)

+            hlayout.addSpacing(10)

             self.connect(button, SIGNAL('clicked()'), getattr(self,action))
         layout.addLayout(hlayout)
         self.setLayout(layout)
             self.connect(button, SIGNAL('clicked()'), getattr(self,action))
         layout.addLayout(hlayout)
         self.setLayout(layout)

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index e8e2763..c3908e1 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -176,31 +176,32 @@ class SliceWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
 
     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)
 
         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)
 
         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)
 
         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 = QVBoxLayout()

-        layout.addLayout(hlayout)
+        layout.addWidget(slicename)

         layout.addWidget(self.nodeView)
         layout.addWidget(self.nodeView)

-        layout.addWidget(submit, 0, Qt.AlignRight)
+        layout.addLayout(hlayout)
+

         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
         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())
         self.connect(submit, SIGNAL('clicked()'), self.submit)
 
         rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())


@@ -215,7 +216,7 @@ class SliceWidget(QWidget):
         xml = open(rspec_file).read()
         return xml
 
         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
         if not config.getSlice():
             self.parent().setStatus("<font color='red'>Slice not set yet!</font>", timeout=None)
             return