Changeset 105:d1c3dd71da77 for src/mlx/gui/gui.py

Timestamp:

04/22/12 14:21:23 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The dialogs now have a proper parent window and title

File:

• src/mlx/gui/gui.py (modified) (5 diffs)

src/mlx/gui/gui.py

@@ -57 +57 @@
         
         window = gtk.Window()
-        window.set_title("MAVA Logger X " + const.VERSION)
+        window.set_title(WINDOW_TITLE_BASE)
         window.set_icon_from_file(os.path.join(iconDirectory, "logo.ico"))
         window.connect("delete-event",
@@ -119 +119 @@
                                       else gdk.WATCH)
 
+    @property
+    def mainWindow(self):
+        """Get the main window of the GUI."""
+        return self._mainWindow
+        
     @property
     def logger(self):
@@ -286 +291 @@
         self._statusbar.updateConnection(self._connecting, self._connected)
 
-        dialog = gtk.MessageDialog(type = MESSAGETYPE_ERROR,
+        dialog = gtk.MessageDialog(parent = self._mainWindow,
+                                   type = MESSAGETYPE_ERROR,
                                    message_format =
-                                   "Cannot connect to the simulator.",
-                                   parent = self._mainWindow)
+                                   "Cannot connect to the simulator.")
+        dialog.set_title(WINDOW_TITLE_BASE)
         dialog.format_secondary_markup("Rectify the situation, and press <b>Try again</b> "
                                        "to try the connection again, " 
@@ -321 +327 @@
                                    "The connection to the simulator failed unexpectedly.",
                                    parent = self._mainWindow)
+        dialog.set_title(WINDOW_TITLE_BASE)
         dialog.format_secondary_markup("If the simulator has crashed, restart it "
                                        "and restore your flight as much as possible "
-                                       "to the state it was in before the crash.\n"
+                                       "to the state it was in before the crash. "
                                        "Then press <b>Reconnect</b> to reconnect.\n\n"
                                        "If you want to cancel the flight, press <b>Cancel</b>.")
@@ -674 +681 @@
             result=RESPONSETYPE_YES
         else:
-            dialog = gtk.MessageDialog(type = MESSAGETYPE_QUESTION,
+            dialog = gtk.MessageDialog(parent = self._mainWindow,
+                                       type = MESSAGETYPE_QUESTION,
                                        buttons = BUTTONSTYPE_YES_NO,
                                        message_format =
                                        "Are you sure to quit the logger?")
+            dialog.set_title(WINDOW_TITLE_BASE)
             result = dialog.run()
             dialog.hide()