Changeset 91:c3fc045d7aeb

Timestamp:

04/19/12 14:46:07 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Reworked the GUI reset

Location:

src/mlx/gui

Files:

• flight.py (modified) (1 diff)
• gui.py (modified) (4 diffs)

src/mlx/gui/flight.py

@@ -1798 +1798 @@
         self.nextPage()
 
-    def connectionFailed(self):
-        """Called when the connection could not be made to the simulator."""
-        self._initialize()
-
-    def disconnected(self):
-        """Called when we have disconnected from the simulator."""
+    def reset(self):
+        """Resets the wizard to go back to the login page."""
         self._initialize()
 

src/mlx/gui/gui.py

@@ -157 +157 @@
         gtk.main()
 
-        if self._flight is not None and self._connected:
-            self.stopMonitoring()
-            self._flight.simulator.disconnect()                        
+        self._disconnect()
 
     def connected(self, fsType, descriptor):
@@ -203 +201 @@
             self._simulator.reconnect()
         else:
-            self._connecting = False
-            self._reconnecting = False
-            self._statusbar.updateConnection(self._connecting, self._connected)
-            self._wizard.connectionFailed()
-            self._flightInfo.reset()
+            self.reset()
         
     def disconnected(self):
@@ -241 +235 @@
             self._simulator.reconnect()
         else:
-            self._connecting = False
-            self._reconnecting = False
-            self._statusbar.updateConnection(self._connecting, self._connected)
-            self._wizard.disconnected()
-            self._flightInfo.reset()
-
+            self.reset()
+
+    def reset(self):
+        """Reset the GUI."""
+        self._disconnect()
+        self._wizard.reset()
+        self._flightInfo.reset()
+        self.resetFlightStatus()
+
+    def _disconnect(self):
+        """Disconnect from the simulator if connected."""
+        if self._connected:
+            self.stopMonitoring()
+            self._flight.simulator.disconnect()
+            self._connected = False
+
+        self._connecting = False
+        self._reconnecting = False
+        self._statusbar.updateConnection(False, False)
+            
     def write(self, msg):
         """Write the given message to the log."""
@@ -272 +280 @@
         self._wizard.setStage(stage)
         if stage==const.STAGE_END:
-            self.stopMonitoring()
-            self.simulator.disconnect()
-            self._connecting = False
-            self._connected = False
-            self._statusbar.updateConnection(self._connecting, self._connected)
+            self._disconnect()
 
     def setRating(self, rating):