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)

Location:
src/mlx/gui
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • src/mlx/gui/callouts.py

    r994 r995  
    239239        Makes the treeview to edit the altitude in the given row."""
    240240        if self._addingFile:
    241             gobject.idle_add(self._selectFile)
     241            GObject.idle_add(self._selectFile)
    242242            self._fileList.grab_focus()
    243243            self.grab_focus()

  • src/mlx/gui/cef.py

    r945 r995  
    101101    def call(self, plan, getCredentials, updateProgress, htmlFilePath):
    102102        """Call SimBrief with the given plan."""
    103         self._timeoutID = gobject.timeout_add(120*1000, self._timedOut)
     103        self._timeoutID = GObject.timeout_add(120*1000, self._timedOut)
    104104
    105105        self._plan = plan
    … …  
    196196        if results!=SIMBRIEF_RESULT_NONE:
    197197            if self._timeoutID is not None:
    198                 gobject.source_remove(self._timeoutID)
     198                GObject.source_remove(self._timeoutID)
    199199            self._plan = None
    200200
    … …  
    251251            f.write(availableInfo["plan_html"])
    252252
    253         gobject.idle_add(self._resultsAvailable, flightInfo)
     253        GObject.idle_add(self._resultsAvailable, flightInfo)
    254254
    255255#------------------------------------------------------------------------------
    … …  
    260260    _toQuit = False
    261261
    262     gobject.threads_init()
     262    GObject.threads_init()
    263263
    264264    _simBriefHandler = SimBriefHandler()
    … …  
    297297    cefpython.Initialize(settings, switches)
    298298
    299     gobject.timeout_add(10, _handleTimeout)
     299    GObject.timeout_add(10, _handleTimeout)
    300300
    301301    print("Initialized, executing callback...")

  • src/mlx/gui/common.py

    r994 r995  
    416416#------------------------------------------------------------------------------
    417417
    418 gobject.signal_new("integer-changed", IntegerEntry, gobject.SIGNAL_RUN_FIRST,
     418GObject.signal_new("integer-changed", IntegerEntry, GObject.SIGNAL_RUN_FIRST,
    419419                   None, (object,))
    420420

  • src/mlx/gui/delaycodes.py

    r994 r995  
    4343                             "The vertical scrolling policy",
    4444                             gtk.ScrollablePolicy.MINIMUM,
    45                              gobject.PARAM_READWRITE ),
     45                             GObject.PARAM_READWRITE ),
    4646        "vadjustment" : ( gtk.Adjustment,
    4747                          "vadjustment",
    4848                          "The vertical adjustment",
    49                           gobject.PARAM_READWRITE ),
     49                          GObject.PARAM_READWRITE ),
    5050        "hscroll-policy" : ( gtk.ScrollablePolicy,
    5151                             "hscroll-policy",
    5252                             "The horizontal scrolling policy",
    5353                             gtk.ScrollablePolicy.MINIMUM,
    54                              gobject.PARAM_READWRITE ),
     54                             GObject.PARAM_READWRITE ),
    5555        "hadjustment" : ( gtk.Adjustment,
    5656                          "hadjustment",
    5757                          "The horizontal adjustment",
    58                           gobject.PARAM_READWRITE )  }
     58                          GObject.PARAM_READWRITE )  }
    5959
    6060

  • src/mlx/gui/faultexplain.py

    r994 r995  
    114114#-------------------------------------------------------------------------------
    115115
    116 gobject.signal_new("explanation-changed", FaultFrame, gobject.SIGNAL_RUN_FIRST,
     116GObject.signal_new("explanation-changed", FaultFrame, GObject.SIGNAL_RUN_FIRST,
    117117                   None, (bool,))
    118118
    … …  
    297297#-------------------------------------------------------------------------------
    298298
    299 gobject.signal_new("explanations-changed", FaultExplainWidget,
    300                    gobject.SIGNAL_RUN_FIRST, None, (bool,))
     299GObject.signal_new("explanations-changed", FaultExplainWidget,
     300                   GObject.SIGNAL_RUN_FIRST, None, (bool,))

  • src/mlx/gui/flight.py

    r994 r995  
    5757#-----------------------------------------------------------------------------
    5858
    59 comboModel = gtk.ListStore(gobject.TYPE_STRING)
     59comboModel = gtk.ListStore(GObject.TYPE_STRING)
    6060comboModel.append(("N/A",))
    6161comboModel.append(("VECTORS",))
    … …  
    878878    def _deleteResultCallback(self, returned, result):
    879879        """Called when the deletion result is available."""
    880         gobject.idle_add(self._handleDeleteResult, returned, result)
     880        GObject.idle_add(self._handleDeleteResult, returned, result)
    881881
    882882    def _handleDeleteResult(self, returned, result):
    … …  
    16321632    def _registerResultCallback(self, returned, result):
    16331633        """Called when the registration result is available."""
    1634         gobject.idle_add(self._handleRegisterResult, returned, result)
     1634        GObject.idle_add(self._handleRegisterResult, returned, result)
    16351635
    16361636    def _handleRegisterResult(self, returned, result):
    … …  
    18411841        """Initiate the query of the entry exam status after the interval."""
    18421842        if not self._getEntryExamStatusCancelled:
    1843             gobject.timeout_add(StudentPage._entryExamStatusQueryInterval,
     1843            GObject.timeout_add(StudentPage._entryExamStatusQueryInterval,
    18441844                                lambda: self._wizard.gui.webHandler. \
    18451845                                getEntryExamStatus(self._entryExamStatusCallback))
    … …  
    18471847    def _entryExamStatusCallback(self, returned, result):
    18481848        """Called when the entry exam status is available."""
    1849         gobject.idle_add(self._handleEntryExamStatus, returned, result)
     1849        GObject.idle_add(self._handleEntryExamStatus, returned, result)
    18501850
    18511851    def _handleEntryExamStatus(self, returned, result):
    … …  
    22982298    def _handleZFW(self, zfw):
    22992299        """Called when the ZFW value is retrieved."""
    2300         gobject.idle_add(self._processZFW, zfw)
     2300        GObject.idle_add(self._processZFW, zfw)
    23012301
    23022302    def _processZFW(self, zfw):
    … …  
    23882388    def _handleTime(self, timestamp):
    23892389        """Handle the result of a time retrieval."""
    2390         gobject.idle_add(self._processTime, timestamp)
     2390        GObject.idle_add(self._processTime, timestamp)
    23912391
    23922392    def _processTime(self, timestamp):
    … …  
    24322432    def _handleFuel(self, fuelData):
    24332433        """Callback for the fuel query operation."""
    2434         gobject.idle_add(self._processFuel, fuelData)
     2434        GObject.idle_add(self._processFuel, fuelData)
    24352435
    24362436    def _processFuel(self, fuelData):
    … …  
    35473547            self._wizard.gui.simulator.setFuelLevel([(fuelTank.fuelTank,
    35483548                                                      currentLevel)])
    3549             gobject.timeout_add(50, self._pump)
     3549            GObject.timeout_add(50, self._pump)
    35503550
    35513551    def _notamsCallback(self, returned, result):
    35523552        """Callback for the NOTAMs."""
    3553         gobject.idle_add(self._handleNOTAMs, returned, result)
     3553        GObject.idle_add(self._handleNOTAMs, returned, result)
    35543554
    35553555    def _handleNOTAMs(self, returned, result):
    … …  
    35703570    def _metarsCallback(self, returned, result):
    35713571        """Callback for the METARs."""
    3572         gobject.idle_add(self._handleMETARs, returned, result)
     3572        GObject.idle_add(self._handleMETARs, returned, result)
    35733573
    35743574    def _handleMETARs(self, returned, result):
    … …  
    53385338    def _checkFlightPassedSetCallback(self, returned, result):
    53395339        """Called when the check flight status has been set."""
    5340         gobject.idle_add(self._checkFlightPassedSet, returned, result)
     5340        GObject.idle_add(self._checkFlightPassedSet, returned, result)
    53415341
    53425342    def _checkFlightPassedSet(self, returned, result):
    … …  
    58645864    def _loginResultCallback(self, returned, result):
    58655865        """The login result callback, called in the web handler's thread."""
    5866         gobject.idle_add(self._handleLoginResult, returned, result)
     5866        GObject.idle_add(self._handleLoginResult, returned, result)
    58675867
    58685868    def _handleLoginResult(self, returned, result):
    … …  
    59645964    def _arrivalMETARCallback(self, returned, result):
    59655965        """Called when the METAR of the arrival airport is retrieved."""
    5966         gobject.idle_add(self._handleArrivalMETAR, returned, result)
     5966        GObject.idle_add(self._handleArrivalMETAR, returned, result)
    59675967
    59685968    def _handleArrivalMETAR(self, returned, result):

  • src/mlx/gui/flightlist.py

    r994 r995  
    227227#-------------------------------------------------------------------------------
    228228
    229 gobject.signal_new("row-activated", FlightList, gobject.SIGNAL_RUN_FIRST,
     229GObject.signal_new("row-activated", FlightList, GObject.SIGNAL_RUN_FIRST,
    230230                   None, (int,))
    231231
    232 gobject.signal_new("selection-changed", FlightList, gobject.SIGNAL_RUN_FIRST,
     232GObject.signal_new("selection-changed", FlightList, GObject.SIGNAL_RUN_FIRST,
    233233                   None, (object,))
    234234
    … …  
    355355    def _pirepResultCallback(self, returned, result):
    356356        """Called when the PIREP query result is available."""
    357         gobject.idle_add(self._handlePIREPResult, returned, result)
     357        GObject.idle_add(self._handlePIREPResult, returned, result)
    358358
    359359    def _handlePIREPResult(self, returned, result):
    … …  
    387387    def _reflyResultCallback(self, returned, result):
    388388        """Called when the refly result is available."""
    389         gobject.idle_add(self._handleReflyResult, returned, result)
     389        GObject.idle_add(self._handleReflyResult, returned, result)
    390390
    391391    def _handleReflyResult(self, returned, result):
    … …  
    430430    def _deleteResultCallback(self, returned, result):
    431431        """Called when the deletion result is available."""
    432         gobject.idle_add(self._handleDeleteResult, returned, result)
     432        GObject.idle_add(self._handleDeleteResult, returned, result)
    433433
    434434    def _handleDeleteResult(self, returned, result):
    … …  
    741741    def _pirepResultCallback(self, returned, result):
    742742        """Called when the PIREP query result is available."""
    743         gobject.idle_add(self._handlePIREPResult, returned, result)
     743        GObject.idle_add(self._handlePIREPResult, returned, result)
    744744
    745745    def _handlePIREPResult(self, returned, result):

  • 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:

  • src/mlx/gui/prefs.py

    r954 r995  
    161161#------------------------------------------------------------------------------
    162162
    163 gobject.signal_new("hotkey-changed", Hotkey, gobject.SIGNAL_RUN_FIRST,
     163GObject.signal_new("hotkey-changed", Hotkey, GObject.SIGNAL_RUN_FIRST,
    164164                   None, (int,))
    165165

  • src/mlx/gui/timetable.py

    r994 r995  
    244244#-----------------------------------------------------------------------------
    245245
    246 gobject.signal_new("row-activated", Timetable, gobject.SIGNAL_RUN_FIRST,
     246GObject.signal_new("row-activated", Timetable, GObject.SIGNAL_RUN_FIRST,
    247247                   None, (int,))
    248248
    249 gobject.signal_new("selection-changed", Timetable, gobject.SIGNAL_RUN_FIRST,
     249GObject.signal_new("selection-changed", Timetable, GObject.SIGNAL_RUN_FIRST,
    250250                   None, (object,))
    251251
    … …  
    300300            return True
    301301
    302 gobject.signal_new("date-selected", CalendarWindow, gobject.SIGNAL_RUN_FIRST,
     302GObject.signal_new("date-selected", CalendarWindow, GObject.SIGNAL_RUN_FIRST,
    303303                   None, ())
    304304

  • src/mlx/gui/update.py

    r994 r995  
    117117    def run(self):
    118118        """Execute the thread's operation."""
    119         gobject.idle_add(self._startUpdate)
     119        GObject.idle_add(self._startUpdate)
    120120        update(self._programDirectory, self._updateURL, self, fromGUI = True)
    121121        if not self._waitAfterFinish:
    122             gobject.idle_add(self._progressWindow.hide)
     122            GObject.idle_add(self._progressWindow.hide)
    123123            self._gui.updateDone()
    124124
    125125    def downloadingManifest(self):
    126126        """Called when the downloading of the manifest has started."""
    127         gobject.idle_add(self._downloadingManifest)
     127        GObject.idle_add(self._downloadingManifest)
    128128
    129129    def _downloadingManifest(self):
    … …  
    134134    def downloadedManifest(self):
    135135        """Called when the downloading of the manifest has finished."""
    136         gobject.idle_add(self._downloadedManifest)
     136        GObject.idle_add(self._downloadedManifest)
    137137
    138138    def _downloadedManifest(self):
    … …  
    144144        """Called when the program is interested in whether we want to run a
    145145        program with administrator rights to do the update."""
    146         gobject.idle_add(self._needSudo)
     146        GObject.idle_add(self._needSudo)
    147147        with self._sudoCondition:
    148148            while self._sudoReply is None:
    … …  
    184184        """Called when a certain number of bytes are downloaded."""
    185185        self._downloaded = downloaded
    186         gobject.idle_add(self._setDownloaded, downloaded)
     186        GObject.idle_add(self._setDownloaded, downloaded)
    187187
    188188    def _setDownloaded(self, downloaded):
    … …  
    194194    def startRenaming(self):
    195195        """Called when the renaming of files has started."""
    196         gobject.idle_add(self._startRenaming)
     196        GObject.idle_add(self._startRenaming)
    197197
    198198    def _startRenaming(self):
    … …  
    203203        """Called when a file has been renamed."""
    204204        self._numModifiedOrNew = count
    205         gobject.idle_add(self._renamed, path, count)
     205        GObject.idle_add(self._renamed, path, count)
    206206
    207207    def _renamed(self, path, count):
    … …  
    212212    def startRemoving(self):
    213213        """Called when the removing of files has started."""
    214         gobject.idle_add(self._startRemoving)
     214        GObject.idle_add(self._startRemoving)
    215215
    216216    def _startRemoving(self):
    … …  
    221221        """Called when a file has been removed."""
    222222        self._numRemoved = count
    223         gobject.idle_add(self._removed, path, count)
     223        GObject.idle_add(self._removed, path, count)
    224224
    225225    def _removed(self, path, count):
    … …  
    230230    def writingManifest(self):
    231231        """Called when the writing of the new manifest file has started."""
    232         gobject.idle_add(self._writingManifest)
     232        GObject.idle_add(self._writingManifest)
    233233
    234234    def _writingManifest(self):
    … …  
    238238    def done(self):
    239239        """Called when the update has been done."""
    240         gobject.idle_add(self._done)
     240        GObject.idle_add(self._done)
    241241        self._restart = self._waitAfterFinish
    242242
    … …  
    261261        """Called when the downloading has failed."""
    262262        self._waitAfterFinish = True
    263         gobject.idle_add(self._failed, what)
     263        GObject.idle_add(self._failed, what)
    264264
    265265    def _failed(self, what):

  • src/mlx/gui/weighthelp.py

    r994 r995  
    466466    def _handleWeights(self, dow, payload, zfw, grossWeight):
    467467        """Handle the given weights."""
    468         gobject.idle_add(self._processWeights, dow, payload, zfw, grossWeight)
     468        GObject.idle_add(self._processWeights, dow, payload, zfw, grossWeight)
    469469
    470470    def _processWeights(self, dow, payload, zfw, grossWeight):
Note: See TracChangeset for help on using the changeset viewer.