Ignore:
Timestamp:
03/05/13 19:05:56 (12 years ago)
Author:
István Váradi <ivaradi@…>
Branch:
xplane
Parents:
431:207f92566e4f (diff), 449:7ee0679c217b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merged with the main branch

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/mlx/gui/gui.py

    r430 r450  
    493493            self.reset()
    494494
    495     def enableFlightInfo(self):
     495    def enableFlightInfo(self, aircraftType):
    496496        """Enable the flight info tab."""
    497         self._flightInfo.enable()
     497        self._flightInfo.enable(aircraftType)
    498498
    499499    def cancelFlight(self):
  • src/mlx/gui/gui.py

    r436 r450  
    6868        self._flight = None
    6969        self._simulator = None
     70        self._fsType = None
    7071        self._monitoring = False
    7172
     
    205206
    206207    @property
     208    def fsType(self):
     209        """Get the flight simulator type."""
     210        return self._fsType
     211
     212    @property
    207213    def entranceExam(self):
    208214        """Get whether an entrance exam is about to be taken."""
     
    425431            self._wizard.connected(fsType, descriptor)
    426432        self._reconnecting = False
     433        self._fsType = fsType
    427434        self._listenHotkeys()
    428435
Note: See TracChangeset for help on using the changeset viewer.