# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: lex@onm.su-20081204204905-1ag0mk8z09sliu9a
# target_branch: ../main
# testament_sha1: ae758cf945dc139dac69446fc2a68d34a20d6793
# timestamp: 2008-12-04 23:28:14 +0200
# base_revision_id: jamie@jantrid.net-20081204121745-tnq6be9mor0jwmfl
#
# Begin patch
=== modified file 'source/speech.py'
|
|
|
|
| 284 | 284 | if text and not text.isspace(): |
| 285 | 285 | getSynth().speakText(text,index=index) |
| 286 | 286 | |
| | 287 | def speakSelectionChangeHelper(text,unselected=False): |
| | 288 | if len(text) < 512: |
| | 289 | speakMessage(text) |
| | 290 | else: |
| | 291 | speakMessage(_("Selected %d characters") % len(text) if not unselected else _("unselected %d characters")%len(text)) |
| | 292 | |
| 287 | 293 | def speakSelectionChange(oldInfo,newInfo,speakSelected=True,speakUnselected=True,generalize=False): |
| 288 | 294 | """Speaks a change in selection, either selected or unselected text. |
| 289 | 295 | @param oldInfo: a TextInfo instance representing what the selection was before |
| … |
… |
|
| 333 | 339 | for text in selectedTextList: |
| 334 | 340 | if len(text)==1: |
| 335 | 341 | text=processSymbol(text) |
| 336 | | speakMessage(_("selecting %s")%text) |
| | 342 | speakSelectionChangeHelper(_("selecting %s")%text) |
| 337 | 343 | elif len(selectedTextList)>0: |
| 338 | 344 | text=newInfo.text |
| 339 | 345 | if len(text)==1: |
| 340 | 346 | text=processSymbol(text) |
| 341 | | speakMessage(_("selected %s")%text) |
| | 347 | speakSelectionChangeHelper(_("selected %s")%text) |
| 342 | 348 | if speakUnselected: |
| 343 | 349 | if not generalize: |
| 344 | 350 | for text in unselectedTextList: |
| 345 | 351 | if len(text)==1: |
| 346 | 352 | text=processSymbol(text) |
| 347 | | speakMessage(_("unselecting %s")%text) |
| | 353 | speakSelectionChangeHelper(_("unselecting %s")%text,True) |
| 348 | 354 | elif len(unselectedTextList)>0: |
| 349 | 355 | speakMessage(_("selection removed")) |
| 350 | 356 | if not newInfo.isCollapsed: |
| 351 | 357 | text=newInfo.text |
| 352 | 358 | if len(text)==1: |
| 353 | 359 | text=processSymbol(text) |
| 354 | | speakMessage(_("selected %s")%text) |
| | 360 | speakSelectionChangeHelper(_("selected %s")%text) |
| 355 | 361 | |
| 356 | 362 | def speakTypedCharacters(ch): |
| 357 | 363 | global curWordChars; |