Changeset 2518

Show
Ignore:
Timestamp:
11/20/08 09:06:11 (7 weeks ago)
Author:
bzr
Message:

*When NVDA is configured to speak both typed words and characters at the same time, NVDA will now announce the completed word before the character that signaled the end of the word e.g. dog and then a space, NVDA will announce the word dog before saying space. Previously the space was announced first.
*Typing characters such as tab and enter in password fields no longer causes NVDA to announce an asterisk if NVDA is configured to speak typed characters.
*If configured to speak typed words, NVDA forgets the currently typed word if something other than typed characters is spoken. E.g. typing the word cat and then navigating away from the edit field, will no longer mean that cat gets announce the next time you press space etc somewhere else.

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2008-11-20 14:40:18.513999939 +1000 
        2 committer: James Teh <jamie@jantrid.net> 
         1timestamp: 2008-11-20 20:04:51.733999968 +1100 
         2committer: Michael Curran <mick@kulgan.net> 
        33properties:  
        44        branch-nick: main 
    • Property bzr:revision-id:v3-list-QlpoOTFBWSZTWbrL2vUAAB1VgAAQABCAQDrrnqAgAFCgaaGRkxBoTIJ6mmaNRwhndFAoNhZjh_YY4a01fOg1ulgNNC2UrzPdXXEnDpX8XckU4UJC6y9r1A..

      •  

        old new  
        2872872315 jamie@jantrid.net-20081119143202-ybvjifczhpjl9ldo 
        2882882316 jamie@jantrid.net-20081120044018-ubawgup09fsqgp0i 
         2892317 mick@kulgan.net-20081120090451-65o7yltx25z0k1i9 
    • Property bzr:file-ids

      •  

        old new  
        1 source/api.py   46@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fapi.py 
        2 source/braille.py       braille.py-20080908070240-tjwqjsv7drp1kt8c-1 
         1source/speech.py        503@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Fspeech.py 
    • Property bzr:text-parents

      •  

        old new  
        1 source/api.py   jamie@jantrid.net-20081111000130-ogbjmubm7hbp2w8b 
        2 source/braille.py       mick@kulgan.net-20081117132147-0s0gw63lue1v5xar 
         1source/speech.py        jamie@jantrid.net-20081118073309-8zv0dy0iepb9yo3v 

  • trunk/source/speech.py

    r2510 r2518  
    3131beenCanceled=True 
    3232isPaused=False 
    33 typedWord="" 
     33curWordChars=[] 
    3434REASON_FOCUS=1 
    3535REASON_MOUSE=2 
    … …  
    271271@type index: int 
    272272""" 
    273         global beenCanceled 
     273        global beenCanceled, curWordChars 
     274        curWordChars=[] 
    274275        if speechMode==speechMode_off: 
    275276                return 
    … …  
    354355 
    355356def speakTypedCharacters(ch): 
    356         global typedWord 
     357        global curWordChars; 
    357358        if api.isTypingProtected(): 
    358                 ch="*" 
     359                realChar="*" 
     360        else: 
     361                realChar=ch 
     362        if ch.isalnum(): 
     363                curWordChars.append(realChar) 
     364        elif len(curWordChars)>0: 
     365                typedWord="".join(curWordChars) 
     366                curWordChars=[] 
     367                if log.isEnabledFor(log.IO): 
     368                        log.io("typed word: %s"%typedWord) 
     369                if config.conf["keyboard"]["speakTypedWords"]:  
     370                        speakText(typedWord) 
    359371        if config.conf["keyboard"]["speakTypedCharacters"] and ord(ch)>=32: 
    360                 speakSpelling(ch) 
    361         if config.conf["keyboard"]["speakTypedWords"]:  
    362                 if ch.isalnum(): 
    363                         typedWord="".join([typedWord,ch]) 
    364                 elif len(typedWord)>0: 
    365                         speakText(typedWord) 
    366                         if log.isEnabledFor(log.IO): log.io("typedword: %s"%typedWord) 
    367                         typedWord="" 
    368         else: 
    369                 typedWord="" 
     372                speakSpelling(realChar) 
    370373 
    371374silentRolesOnFocus=set([