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
retrieve all records when listing authority, and filter the user ones
[sface.git]
/
sface
/
mainwindow.py
diff --git
a/sface/mainwindow.py
b/sface/mainwindow.py
index
436756a
..
a8e7d33
100644
(file)
--- a/
sface/mainwindow.py
+++ b/
sface/mainwindow.py
@@
-35,7
+35,7
@@
def load_screens(dirname):
# we want the stock screens to show up in a specific order. plugins can
# show up in any order afterward.
# we want the stock screens to show up in a specific order. plugins can
# show up in any order afterward.
- sort_order = ["mainscreen", "configscreen", "helpscreen"]
+ sort_order = ["mainscreen", "
userscreen", "
configscreen", "helpscreen"]
sort_order.reverse()
for modname in sort_order:
if modname in modnames:
sort_order.reverse()
for modname in sort_order:
if modname in modnames:
@@
-96,6
+96,7
@@
class Nav(QWidget):
class Status(QLabel):
def __init__(self, parent=None):
QLabel.__init__(self, "", parent)
class Status(QLabel):
def __init__(self, parent=None):
QLabel.__init__(self, "", parent)
+ self.setMaximumWidth(640)
self.sliceUpdateDate()
def set(self, msg, timeout):
self.sliceUpdateDate()
def set(self, msg, timeout):
@@
-110,7
+111,7
@@
class Status(QLabel):
creation_time = os.stat(rspec_file).st_ctime
last_update = time.ctime(creation_time)
creation_time = os.stat(rspec_file).st_ctime
last_update = time.ctime(creation_time)
- self.set("Slice data last
updat
ed on %s" % last_update, timeout=None)
+ self.set("Slice data last
refresh
ed on %s" % last_update, timeout=None)
def reset(self):
self.setText("")
def reset(self):
self.setText("")
@@
-121,8
+122,10
@@
class MainWindow(QWidget):
def __init__(self, parent=None):
QWidget.__init__(self, parent)
def __init__(self, parent=None):
QWidget.__init__(self, parent)
- self.logWindow = LogWindow(self)
- self.rspecWindow = RSpecWindow(self)
+ # These are top-level windows and should be initialized with parent set
+ # to our parent. Otherwise, getting a segfault on exit in Ubuntu.
+ self.logWindow = LogWindow(parent)
+ self.rspecWindow = RSpecWindow(parent)
self.pix = QLabel(self)
self.pix = QLabel(self)