Changeset 2434

Show
Ignore:
Timestamp:
10/17/08 08:17:03 (3 months ago)
Author:
bzr
Message:
  • NVDAObjects.IAccessible.Dialog: Remove the overridden foreground, focusEntered and gainFocus events which previously spoke getDialogText(). Instead, override the description property to return getDialogText(), which avoids special case output code.
  • base NVDAObject's foreground event: Speak the description so that dialog text will be spoken.
Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk

    • Property bzr:revision-info

      •  

        old new  
        1 timestamp: 2008-10-16 22:21:24.260999918 +0200 
        2 committer: Peter Vágner <peterb.v@datagate.sk> 
         1timestamp: 2008-10-17 16:22:42.651999950 +1000 
         2committer: James Teh <jamie@jantrid.net> 
        33properties:  
        44        branch-nick: main 
    • Property bzr:revision-id:v3-list-QlpoOTFBWSZTWbrL2vUAAB1VgAAQABCAQDrrnqAgAFCgaaGRkxBoTIJ6mmaNRwhndFAoNhZjh_YY4a01fOg1ulgNNC2UrzPdXXEnDpX8XckU4UJC6y9r1A..

      •  

        old new  
        2032032231 jamie@jantrid.net-20081016000742-4n5a7q6tyzztpdun 
        2042042232 peterb.v@datagate.sk-20081016202124-82z07ddvi5lla90z 
         2052233 jamie@jantrid.net-20081017062242-58oc9d002nihw3hu 
    • Property bzr:file-ids

      •  

        old new  
        1 source/locale/it/LC_MESSAGES/nvda.po    439@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2Flocale%2Fit%2FLC_MESSAGES%2Fnvda.po 
        2 user_docs/it/readme.txt 1359@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:user_docs%2Fit%2Freadme.txt 
         1source/NVDAObjects/IAccessible/__init__.py      683@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FNVDAObjects%2FIAccessible%2F__init__.py 
         2source/NVDAObjects/__init__.py  683@dbe06fc7-9119-0410-a01d-9dbf589ecbba:trunk:source%2FNVDAObjects%2F__init__.py 

  • trunk/source/NVDAObjects/IAccessible/__init__.py

    r2432 r2434  
    911911                return " ".join(textList) 
    912912 
    913         def event_foreground(self): 
    914                 super(IAccessible,self).event_foreground() 
    915                 text=self.getDialogText(self) 
    916                 if text and not text.isspace(): 
    917                         speech.speakText(text) 
    918  
    919         def event_focusEntered(self): 
    920                 super(IAccessible,self).event_focusEntered() 
    921                 text=self.getDialogText(self) 
    922                 if text and not text.isspace(): 
    923                         speech.speakText(text) 
    924  
    925         def event_gainFocus(self): 
    926                 super(IAccessible,self).event_gainFocus() 
    927                 text=self.getDialogText(self) 
    928                 if text and not text.isspace(): 
    929                         speech.speakText(text) 
     913        def _get_description(self): 
     914                return self.getDialogText(self) 
    930915 
    931916class PropertyPage(Dialog): 

  • trunk/source/NVDAObjects/__init__.py

    r2415 r2434  
    657657                speech.cancelSpeech() 
    658658                api.setNavigatorObject(self) 
    659                 speech.speakObjectProperties(self,name=True,role=True,reason=speech.REASON_FOCUS) 
     659                speech.speakObjectProperties(self,name=True,role=True,description=True,reason=speech.REASON_FOCUS) 
    660660 
    661661        def event_valueChange(self):