set maximum width of status messages to prevent main window from getting really wide

[sface.git] / sface / mainwindow.py

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index 153336f..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.
 
-    sort_order = ["mainscreen", "configscreen", "helpscreen"]
+    sort_order = ["mainscreen", "userscreen", "configscreen", "helpscreen"]
     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)
+        self.setMaximumWidth(640)
         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)
-        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 +122,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)
 
@@ -230,3 +233,17 @@ class MainWindow(QWidget):
     def nodeSelectionChanged(self, hostname):
         if self.rspecWindow.isVisible():
             self.rspecWindow.showNode(hostname)
+
+    def closeEvent(self, event):
+        # give the screens an opportunity to veto the close
+        for screen in self.screenWidgets:
+            if not screen.canClose():
+                event.ignore()
+                return
+
+        # give the screens an opportunity to close gracefully
+        for screen in self.screenWidgets:
+            screen.mainWindowClose()
+
+        QWidget.closeEvent(self, event)
+