Ignore:
Timestamp:
07/04/19 17:39:03 (5 years ago)
Author:
István Váradi <ivaradi@…>
Branch:
python3
Phase:
public
Message:

Using 'GObject' instead of 'gobject' (re #347)

File:
1 edited

Legend:

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

    r994 r995  
    6363    def __init__(self, programDirectory, config):
    6464        """Construct the GUI."""
    65         gobject.threads_init()
     65        GObject.threads_init()
    6666
    6767        self._programDirectory = programDirectory
     
    360360    def takeoffAntiIceOn(self, value):
    361361        """Set the anti-ice on indicator."""
    362         gobject.idle_add(self._setTakeoffAntiIceOn, value)
     362        GObject.idle_add(self._setTakeoffAntiIceOn, value)
    363363
    364364    @property
     
    400400    def landingAntiIceOn(self, value):
    401401        """Set the anti-ice on indicator."""
    402         gobject.idle_add(self._setLandingAntiIceOn, value)
     402        GObject.idle_add(self._setLandingAntiIceOn, value)
    403403
    404404    @property
     
    470470    def updateDone(self):
    471471        """Called when the update is done (and there is no need to restart)."""
    472         gobject.idle_add(self._updateDone)
     472        GObject.idle_add(self._updateDone)
    473473
    474474    def connected(self, fsType, descriptor):
     
    479479        fs.sendMessage(const.MESSAGETYPE_INFORMATION,
    480480                       "Welcome to MAVA Logger X " + const.VERSION)
    481         gobject.idle_add(self._handleConnected, fsType, descriptor)
     481        GObject.idle_add(self._handleConnected, fsType, descriptor)
    482482
    483483    def _handleConnected(self, fsType, descriptor):
     
    494494        """Called when the connection failed."""
    495495        self._logger.untimedMessage("Connection to the simulator failed")
    496         gobject.idle_add(self._connectionFailed)
     496        GObject.idle_add(self._connectionFailed)
    497497
    498498    def _connectionFailed(self):
     
    527527            self._flight.disconnected()
    528528
    529         gobject.idle_add(self._disconnected)
     529        GObject.idle_add(self._disconnected)
    530530
    531531    def _disconnected(self):
     
    572572    def _bookFlightsCallback(self, returned, result):
    573573        """Called when the booking of flights has finished."""
    574         gobject.idle_add(self._handleBookFlightsResult, returned, result)
     574        GObject.idle_add(self._handleBookFlightsResult, returned, result)
    575575
    576576    def _handleBookFlightsResult(self, returned, result):
     
    653653    def insertFlightLogLine(self, index, timestampString, text, isFault):
    654654        """Insert the flight log line with the given data."""
    655         gobject.idle_add(self._insertFlightLogLine, index,
     655        GObject.idle_add(self._insertFlightLogLine, index,
    656656                         formatFlightLogLine(timestampString, text),
    657657                         isFault)
     
    668668    def removeFlightLogLine(self, index):
    669669        """Remove the flight log line with the given index."""
    670         gobject.idle_add(self._removeFlightLogLine, index)
     670        GObject.idle_add(self._removeFlightLogLine, index)
    671671
    672672    def addFault(self, id, timestampString, text):
    673673        """Add a fault to the list of faults."""
    674674        faultText = formatFlightLogLine(timestampString, text).strip()
    675         gobject.idle_add(self._flightInfo.addFault, id, faultText)
     675        GObject.idle_add(self._flightInfo.addFault, id, faultText)
    676676
    677677    def updateFault(self, id, timestampString, text):
    678678        """Update a fault in the list of faults."""
    679679        faultText = formatFlightLogLine(timestampString, text).strip()
    680         gobject.idle_add(self._flightInfo.updateFault, id, faultText)
     680        GObject.idle_add(self._flightInfo.updateFault, id, faultText)
    681681
    682682    def clearFault(self, id):
    683683        """Clear a fault in the list of faults."""
    684         gobject.idle_add(self._flightInfo.clearFault, id)
     684        GObject.idle_add(self._flightInfo.clearFault, id)
    685685
    686686    def _removeFlightLogLine(self, index):
     
    694694    def check(self, flight, aircraft, logger, oldState, state):
    695695        """Update the data."""
    696         gobject.idle_add(self._monitorWindow.setData, state)
    697         gobject.idle_add(self._statusbar.updateTime, state.timestamp)
     696        GObject.idle_add(self._monitorWindow.setData, state)
     697        GObject.idle_add(self._statusbar.updateTime, state.timestamp)
    698698
    699699    def resetFlightStatus(self):
     
    705705    def setStage(self, stage):
    706706        """Set the stage of the flight."""
    707         gobject.idle_add(self._setStage, stage)
     707        GObject.idle_add(self._setStage, stage)
    708708
    709709    def _setStage(self, stage):
     
    721721    def setRating(self, rating):
    722722        """Set the rating of the flight."""
    723         gobject.idle_add(self._setRating, rating)
     723        GObject.idle_add(self._setRating, rating)
    724724
    725725    def _setRating(self, rating):
     
    730730    def setNoGo(self, reason):
    731731        """Set the rating of the flight to No-Go with the given reason."""
    732         gobject.idle_add(self._setNoGo, reason)
     732        GObject.idle_add(self._setNoGo, reason)
    733733
    734734    def _setNoGo(self, reason):
     
    760760    def raiseCallback(self):
    761761        """Callback for the singleton handling code."""
    762         gobject.idle_add(self.raiseMainWindow)
     762        GObject.idle_add(self.raiseMainWindow)
    763763
    764764    def raiseMainWindow(self):
     
    848848            self._stdioText += text
    849849
    850         gobject.idle_add(self._writeStdIO)
     850        GObject.idle_add(self._writeStdIO)
    851851
    852852    def beginBusy(self, message):
     
    875875    def getFleetAsync(self, callback = None, force = None):
    876876        """Get the fleet asynchronously."""
    877         gobject.idle_add(self.getFleet, callback, force)
     877        GObject.idle_add(self.getFleet, callback, force)
    878878
    879879    def getFleet(self, callback = None, force = False, busyCallback = None):
     
    910910            self._wizard.updateRTO()
    911911        else:
    912             gobject.idle_add(self.updateRTO, True)
     912            GObject.idle_add(self.updateRTO, True)
    913913
    914914    def rtoToggled(self, indicated):
     
    918918    def _fleetResultCallback(self, returned, result):
    919919        """Called when the fleet has been queried."""
    920         gobject.idle_add(self._handleFleetResult, returned, result)
     920        GObject.idle_add(self._handleFleetResult, returned, result)
    921921
    922922    def _handleFleetResult(self, returned, result):
     
    961961    def _updatePlaneResultCallback(self, returned, result):
    962962        """Called when the status of a plane has been updated."""
    963         gobject.idle_add(self._handleUpdatePlaneResult, returned, result)
     963        GObject.idle_add(self._handleUpdatePlaneResult, returned, result)
    964964
    965965    def _handleUpdatePlaneResult(self, returned, result):
     
    12741274        """Called when the current page of the notebook has changed."""
    12751275        if page_num==0:
    1276             gobject.idle_add(self._wizard.grabDefault)
     1276            GObject.idle_add(self._wizard.grabDefault)
    12771277        else:
    12781278            self._mainWindow.set_default(None)
     
    13101310    def _timetableCallback(self, returned, result):
    13111311        """Called when the timetable has been received."""
    1312         gobject.idle_add(self._handleTimetable, returned, result)
     1312        GObject.idle_add(self._handleTimetable, returned, result)
    13131313
    13141314    def _handleTimetable(self, returned, result):
     
    13421342    def _acceptedFlightsCallback(self, returned, result):
    13431343        """Called when the accepted flights have been received."""
    1344         gobject.idle_add(self._handleAcceptedFlights, returned, result)
     1344        GObject.idle_add(self._handleAcceptedFlights, returned, result)
    13451345
    13461346    def _handleAcceptedFlights(self, returned, result):
     
    14281428    def _pirepUpdatedCallback(self, returned, result):
    14291429        """Callback for the PIREP updating result."""
    1430         gobject.idle_add(self._handlePIREPUpdated, returned, result)
     1430        GObject.idle_add(self._handlePIREPUpdated, returned, result)
    14311431
    14321432    def _handlePIREPUpdated(self, returned, result):
     
    16501650    def _pirepSentCallback(self, returned, result):
    16511651        """Callback for the PIREP sending result."""
    1652         gobject.idle_add(self._handlePIREPSent, returned, result)
     1652        GObject.idle_add(self._handlePIREPSent, returned, result)
    16531653
    16541654    def _handlePIREPSent(self, returned, result):
     
    17171717    def _bugReportSentCallback(self, returned, result):
    17181718        """Callback function for the bug report sending result."""
    1719         gobject.idle_add(self._handleBugReportSent, returned, result)
     1719        GObject.idle_add(self._handleBugReportSent, returned, result)
    17201720
    17211721    def _handleBugReportSent(self, returned, result):
     
    18591859            self._credentialsAvailable = False
    18601860
    1861             gobject.idle_add(self._getCredentials)
     1861            GObject.idle_add(self._getCredentials)
    18621862
    18631863            while not self._credentialsAvailable:
Note: See TracChangeset for help on using the changeset viewer.