git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix save_config for fields that were not in sfi_config before saving
[sface.git]
/
sface
/
screens
/
mainscreen.py
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.add
Layout(hlayout
)
+ layout.add
Widget(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