X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fmainwindow.py;h=1079fe00ed3430b92b0ae687a3fe9f36809520fd;hp=436756afa5ce537835dd19d9f5573e871daf4448;hb=312ec1d8972acfdd51b2bc6c26ba7f89b6096303;hpb=cc8ab984a1f9d51d61368b3602b5059bffbfa2a6 diff --git a/sface/mainwindow.py b/sface/mainwindow.py index 436756a..1079fe0 100644 --- 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. - sort_order = ["mainscreen", "configscreen", "helpscreen"] + sort_order = ["mainscreen", "userscreen", "configscreen", "helpscreen"] sort_order.reverse() for modname in sort_order: if modname in modnames: @@ -110,7 +110,7 @@ class Status(QLabel): creation_time = os.stat(rspec_file).st_ctime last_update = time.ctime(creation_time) - self.set("Slice data last updated on %s" % last_update, timeout=None) + self.set("Slice data last refreshed on %s" % last_update, timeout=None) def reset(self): self.setText("") @@ -121,8 +121,10 @@ class MainWindow(QWidget): 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)