Changeset 215:bff7327b2da0 for src

Timestamp:

06/01/12 17:24:26 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for flying without logging in

Location:

src/mlx

Files:

• acft.py (modified) (2 diffs)
• flight.py (modified) (1 diff)
• gui/flight.py (modified) (10 diffs)
• gui/gui.py (modified) (2 diffs)
• i18n.py (modified) (1 diff)

src/mlx/acft.py

@@ -89 +89 @@
         # queried from it, so the model should have a reference to the GUI as
         # well and access such data via the GUI!
-        if config.onlineACARS and not flight.entranceExam:
+        if config.onlineACARS and flight.loggedIn and not flight.entranceExam:
             self._checkers.append(checks.ACARSSender(flight._gui))
 
@@ -214 +214 @@
                 config = flight.config
                 if config.onlineGateSystem and \
+                   flight.loggedIn and \
                    not flight.entranceExam and \
                    bookedFlight.arrivalICAO=="LHBP" and \

src/mlx/flight.py

@@ -66 +66 @@
         """Get the flight stage."""
         return self._stage
+
+    @property
+    def loggedIn(self):
+        """Indicate if the user has logged in properly."""
+        return self._gui.loggedIn
 
     @property

src/mlx/gui/flight.py

@@ -260 +260 @@
         table.attach(self._entranceExam, 1, 2, 3, 4, ypadding = 12)
 
+        self.addButton(xstr("button_offline"),
+                       clicked = self._offlineClicked,
+                       tooltip = xstr("button_offline_tooltip"))
+
         self._loginButton = self.addButton(xstr("button_login"), default = True)
         self._loginButton.connect("clicked", self._loginClicked)
@@ -270 +274 @@
         return self._entranceExam.get_active() and \
                self._pilotID.get_text()!=""
+
+    @property
+    def pilotID(self):
+        """Get the pilot ID, if given."""
+        return self._pilotID.get_text()
 
     def activate(self):
@@ -301 +310 @@
         self._loginButton.set_sensitive(pilotID!="" and
                                         (password!="" or entranceExam))
+
+    def _offlineClicked(self, button):
+        """Called when the offline button was clicked."""
+        self._wizard.nextPage()
 
     def _loginClicked(self, button):
@@ -414 +427 @@
         self._flights = []
         self._listStore.clear()
-        for flight in self._wizard.loginResult.flights:
-            self._addFlight(flight)
+        if self._wizard.loggedIn:
+            for flight in self._wizard.loginResult.flights:
+                self._addFlight(flight)
 
     def _addFlight(self, flight):
@@ -525 +539 @@
         flight = self._wizard._bookedFlight
         if self._wizard.gui.config.onlineGateSystem and \
-           not self._wizard.entranceExam:
+           self._wizard.loggedIn and not self._wizard.entranceExam:
             if flight.departureICAO=="LHBP":
                 self._wizard.getFleet(self._fleetRetrieved)
@@ -2221 +2235 @@
         """Called when the forward button is clicked."""
         if self._wizard.gui.config.onlineGateSystem and \
-           not self._completed and \
+           self._wizard.loggedIn and not self._completed and \
            self._wizard.bookedFlight.arrivalICAO=="LHBP" and \
            not self._wizard.entranceExam:
@@ -2433 +2447 @@
 
         self._flightType.set_active(-1)
-        self._onlineFlight.set_active(True)
+        self._onlineFlight.set_active(self._wizard.loggedIn)
 
         self._gatesModel.clear()
         if self._wizard.gui.config.onlineGateSystem and \
+           self._wizard.loggedIn and \
            self._wizard.bookedFlight.arrivalICAO=="LHBP" and \
            not self._wizard.entranceExam:
@@ -2497 +2512 @@
         bookedFlight = gui.bookedFlight
         tm = time.gmtime()
-        
-        fileName = "%s %s %02d%02d %s-%s.pirep" % \
-                   (gui.loginResult.pilotID,
-                    str(bookedFlight.departureTime.date()),
+
+        pilotID = self._wizard.pilotID
+        if pilotID: pilotID += " "
+        fileName = "%s%s %02d%02d %s-%s.pirep" % \
+                   (pilotID, str(bookedFlight.departureTime.date()),
                     tm.tm_hour, tm.tm_min,
                     bookedFlight.departureICAO,
@@ -2584 +2600 @@
         self._pirepSent = returned and result.success
         if self._wizard.gui.config.onlineGateSystem and \
-           not self._wizard.entranceExam and \
+           self._wizard.loggedIn and not self._wizard.entranceExam and \
            returned and result.success:
             bookedFlight = self._wizard.bookedFlight
@@ -2660 +2676 @@
 
     @property
+    def pilotID(self):
+        """Get the pilot ID, if given."""
+        return self._loginPage.pilotID
+
+    @property
     def entranceExam(self):
         """Get whether an entrance exam is about to be taken."""
         return self._loginPage.entranceExam
+
+    @property
+    def loggedIn(self):
+        """Indicate if there was a successful login."""
+        return self._loginResult is not None
         
     @property

src/mlx/gui/gui.py

@@ -186 +186 @@
         """Get whether an entrance exam is about to be taken."""
         return self._wizard.entranceExam
+
+    @property
+    def loggedIn(self):
+        """Indicate if the user has logged in properly."""
+        return self._wizard.loggedIn
         
     @property
@@ -432 +437 @@
         self._logView.get_buffer().set_text("")
 
-        self._wizard.reloadFlights(self._handleReloadResult)
+        if self.loggedIn:
+            self._wizard.reloadFlights(self._handleReloadResult)
+        else:
+            self._wizard.reset(None)
 
     def _handleReloadResult(self, returned, result):

src/mlx/i18n.py

@@ -229 +229 @@
         self.add("login_entranceExam_tooltip",
                  "Check this to log in to take your entrance exam.")
+        self.add("button_offline", "Fl_y offline")
+        self.add("button_offline_tooltip",
+                 "Click this button to fly offline, without logging in "
+                 "to the MAVA website.")
         self.add("button_login", "Logi_n")
         self.add("login_button_tooltip", "Click to log in.")