Changeset 92:1ca250ec2aa0 for src/mlx

Timestamp:

04/19/12 15:10:20 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Further work on the reset

Location:

src/mlx/gui

Files:

• flight.py (modified) (6 diffs)
• gui.py (modified) (6 diffs)

src/mlx/gui/flight.py

@@ -209 +209 @@
         self._loginButton.set_sensitive(False)
         self._loginButton.connect("clicked", self._loginClicked)
-        self._loginButton.set_tooltip_text("Click to log in.")
-        
+        self._loginButton.set_tooltip_text("Click to log in.")        
+
+    def activate(self):
+        """Activate the page."""
         config = self._wizard.gui.config
         self._pilotID.set_text(config.pilotID)
@@ -747 +749 @@
         self._cargoWeight.set_sensitive(True)
         self._mailWeight.set_text(str(bookedFlight.mailWeight))
+        self._simulatorZFW.set_text("-")
+        self._simulatorZFWValue = None
         self._zfwButton.set_sensitive(True)
         self._updateCalculatedZFW()
@@ -873 +877 @@
         self._departure.set_text(str(bookedFlight.departureTime.time()))
         self._arrival.set_text(str(bookedFlight.arrivalTime.time()))
+        self._simulatorTime.set_text("-")
 
     def finalize(self):
@@ -950 +955 @@
         self._cruiseLevel.set_increments(step = 10, page = 100)
         self._cruiseLevel.set_range(min = 50, max = 500)
-        self._cruiseLevel.set_value(240)
         self._cruiseLevel.set_tooltip_text("The cruise flight level.")
         self._cruiseLevel.set_numeric(True)
@@ -1009 +1013 @@
         """Setup the route from the booked flight."""
         self._route.set_sensitive(True)
+        self._cruiseLevel.set_value(240)
         self._cruiseLevel.set_sensitive(True)
         self._route.get_buffer().set_text(self._wizard._bookedFlight.route)
@@ -1188 +1193 @@
         if notams is None:
             buffer.set_text("Could not download NOTAMs")
+        elif not notams:
+            buffer.set_text("Could not download NOTAM for this airport")
         else:
             s = ""

src/mlx/gui/gui.py

@@ -60 +60 @@
         window.add(mainVBox)
 
-        notebook = gtk.Notebook()
-        mainVBox.add(notebook)
+        self._notebook = gtk.Notebook()
+        mainVBox.add(self._notebook)
 
         self._wizard = Wizard(self)
@@ -67 +67 @@
         label.set_use_underline(True)
         label.set_tooltip_text("Flight wizard")
-        notebook.append_page(self._wizard, label)
+        self._notebook.append_page(self._wizard, label)
 
         self._flightInfo = FlightInfo(self)
@@ -73 +73 @@
         label.set_use_underline(True)
         label.set_tooltip_text("Flight information")
-        notebook.append_page(self._flightInfo, label)
+        self._notebook.append_page(self._flightInfo, label)
 
         logVBox = gtk.VBox()
@@ -79 +79 @@
         label.set_use_underline(True)
         label.set_tooltip_text("Flight log")
-        notebook.append_page(logVBox, label)
+        self._notebook.append_page(logVBox, label)
         
         logFrame = self._buildLogFrame()
@@ -90 +90 @@
         mainVBox.pack_start(self._statusbar, False, False, 0)
 
-        notebook.connect("switch-page", self._notebookPageSwitch)
+        self._notebook.connect("switch-page", self._notebookPageSwitch)
 
         self._monitorWindow = MonitorWindow(self, iconDirectory)
@@ -240 +240 @@
         """Reset the GUI."""
         self._disconnect()
-        self._wizard.reset()
+
         self._flightInfo.reset()
         self.resetFlightStatus()
 
+        self._wizard.reset()
+        self._notebook.set_current_page(0)
+
+        self._logView.get_buffer().set_text("")
+
     def _disconnect(self):
         """Disconnect from the simulator if connected."""
+        self.stopMonitoring()
+
         if self._connected:
-            self.stopMonitoring()
             self._flight.simulator.disconnect()
             self._connected = False