[orca] Fix for bgo#574344 - Support for different progress bar "verbosity levels" should be implemented
- From: Joanmarie Diggs <joanied src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [orca] Fix for bgo#574344 - Support for different progress bar "verbosity levels" should be implemented
- Date: Mon, 3 Aug 2009 17:45:17 +0000 (UTC)
commit 623e52e8b4595ba523976410820d79e36eabbf53
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date: Sun Aug 2 00:36:57 2009 -0400
Fix for bgo#574344 - Support for different progress bar "verbosity levels" should be implemented
This adds a new setting, progressBarVerbosity, which specifies when
progres bar updates should be spoken, assuming they are enabled.
ALL means that any progress bar update will be spoken. APPLICATION
means that progress bar updates from the active application will be
spoken, even if they are not in the active window. WINDOW means that
the progress bar must be contained in the active window in order to
be spoken. The default verbosity level is APPLICATION, which was Orca's
behavior prior to this fix.
This also adds an option to the Orca Preferences dialog so that users
can choose a verbosity level without having to hand-edit their config
files.
src/orca/default.py | 17 ++-
src/orca/orca-setup.ui | 411 ++++++++++++++++++++++----------------------
src/orca/orca_gui_prefs.py | 71 ++++++++
src/orca/orca_prefs.py | 19 ++
src/orca/script.py | 6 +
src/orca/settings.py | 13 ++
6 files changed, 332 insertions(+), 205 deletions(-)
---
diff --git a/src/orca/default.py b/src/orca/default.py
index a5903fb..33cbb3d 100644
--- a/src/orca/default.py
+++ b/src/orca/default.py
@@ -2788,7 +2788,8 @@ class Script(script.Script):
"""Determine whether this progress bar event should be spoken or not.
It should be spoken if:
1/ settings.enableProgressBarUpdates is True.
- 2/ The application with the progress bar has focus.
+ 2/ settings.progressBarVerbosity matches the current location of the
+ progress bar.
3/ The time of this event exceeds the
settings.progressBarUpdateInterval value. This value
indicates the time (in seconds) between potential spoken
@@ -2802,8 +2803,18 @@ class Script(script.Script):
"""
if settings.enableProgressBarUpdates:
- if orca_state.locusOfFocus and \
- orca_state.locusOfFocus.getApplication() == obj.getApplication():
+ makeAnnouncment = False
+ if settings.progressBarVerbosity == settings.PROGRESS_BAR_ALL:
+ makeAnnouncement = True
+ elif settings.progressBarVerbosity == settings.PROGRESS_BAR_WINDOW:
+ makeAnnouncement = self.isSameObject( \
+ self.getTopLevel(obj), self.findActiveWindow())
+ elif orca_state.locusOfFocus:
+ makeAnnouncement = self.isSameObject( \
+ obj.getApplication(),
+ orca_state.locusOfFocus.getApplication())
+
+ if makeAnnouncement:
currentTime = time.time()
# Check for defunct progress bars. Get rid of them if they
diff --git a/src/orca/orca-setup.ui b/src/orca/orca-setup.ui
index fb8e57c..74de019 100644
--- a/src/orca/orca-setup.ui
+++ b/src/orca/orca-setup.ui
@@ -226,6 +226,22 @@
</row>
</data>
</object>
+ <object class="GtkListStore" id="model7">
+ <columns>
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">All</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Application</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Window</col>
+ </row>
+ </data>
+ </object>
<object class="GtkDialog" id="orcaSetupWindow">
<property name="title" translatable="yes">Orca Preferences</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -1367,130 +1383,8 @@
<child>
<object class="GtkTable" id="checkBoxTable">
<property name="visible">True</property>
- <property name="n_rows">4</property>
+ <property name="n_rows">5</property>
<property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <child>
- <object class="GtkHBox" id="hbox43">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <child>
- <object class="GtkCheckButton" id="speechProgressBarCheckbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Speak progress bar _updates</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal handler="speechProgressBarChecked" last_modification_time="Mon, 18 Jun 2007 16:59:36 GMT" name="toggled"/>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="speakUpdateIntervalHBox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkLabel" id="speakProgressBarLabel">
- <property name="visible">True</property>
- <property comments="Translators: Here 'every' labels a spin button through which a user can customize the frequency in seconds an announcement should be made. (The spin button is followed by the label 'seconds'.) Thus if a user chooses 5 in the spin button, the complete phrase would be 'every 5 seconds'." name="label" translatable="yes">every</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">speakProgressBarSpinButton</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <relation target="speakProgressBarSpinButton" type="label-for"/>
- </accessibility>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="speakProgressBarSpinButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">adjustment4</property>
- <accessibility>
- <relation target="speakProgressBarUnitsLabel" type="labelled-by"/>
- <relation target="speakProgressBarLabel" type="labelled-by"/>
- </accessibility>
- <signal handler="speakProgressBarValueChanged" last_modification_time="Thu, 14 Jun 2007 15:09:00 GMT" name="value_changed"/>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="speakProgressBarUnitsLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">seconds</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <relation target="speakProgressBarSpinButton" type="label-for"/>
- </accessibility>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
<child>
<object class="GtkCheckButton" id="speechIndentationCheckbutton">
<property name="visible">True</property>
@@ -1505,10 +1399,8 @@
<signal handler="speechIndentationChecked" last_modification_time="Mon, 19 Jun 2006 15:46:40 GMT" name="toggled"/>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -1524,12 +1416,6 @@
<property name="draw_indicator">True</property>
<signal handler="speakBlankLinesChecked" last_modification_time="Wed, 01 Nov 2006 01:09:29 GMT" name="toggled"/>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
</child>
<child>
<object class="GtkCheckButton" id="speakMultiCaseAsWordsCheckButton">
@@ -1547,8 +1433,6 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -1565,10 +1449,8 @@
<signal handler="speakTutorialMessagesToggled" last_modification_time="Mon, 04 Aug 2008 17:11:04 GMT" name="toggled"/>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -1581,14 +1463,13 @@
<property name="focus_on_click">True</property>
<property name="active">True</property>
<property name="inconsistent">False</property>
+ <property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal handler="pauseBreaksToggled" last_modification_time="Mon, 04 Aug 2008 17:11:04 GMT" name="toggled"/>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -1600,15 +1481,14 @@
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">True</property>
- <property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal handler="speakPositionToggled" last_modification_time="Mon, 27 Jul 2009 09:34:04 GMT" name="toggled"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
@@ -1627,90 +1507,217 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox39">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">3</property>
<child>
- <object class="GtkLabel" id="sayAllLabel">
+ <object class="GtkHBox" id="hbox39">
<property name="visible">True</property>
- <property comments="Translators: Say all by refers to the way that Orca will say (speak) an amount of text -- in particular, where Orca where insert pauses. There are currently two choices (supplied by a combo box to the right of this label): say all by sentence and say all by line. If Orca were speaking a work of fiction, it's probably best to do say all by sentence so it sound more natural. If Orca were speaking something like a page of computer commands, doing a say all by line would work better." name="label" translatable="yes">Say All B_y:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">sayAllStyle</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <relation target="sayAllStyle" type="label-for"/>
- </accessibility>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="sayAllLabel">
+ <property name="visible">True</property>
+ <property comments="Translators: Say all by refers to the way that Orca will say (speak) an amount of text -- in particular, where Orca where insert pauses. There are currently two choices (supplied by a combo box to the right of this label): say all by sentence and say all by line. If Orca were speaking a work of fiction, it's probably best to do say all by sentence so it sound more natural. If Orca were speaking something like a page of computer commands, doing a say all by line would work better." name="label" translatable="yes">Say All B_y:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">sayAllStyle</property>
+ <accessibility>
+ <relation type="label-for" target="sayAllStyle"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="sayAllStyle">
+ <property name="visible">True</property>
+ <property name="model">model2</property>
+ <accessibility>
+ <relation type="labelled-by" target="sayAllLabel"/>
+ </accessibility>
+ <signal name="changed" handler="sayAllStyleChanged"/>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="sayAllStyle">
+ <object class="GtkHBox" id="hbox43">
<property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- <accessibility>
- <relation target="sayAllLabel" type="labelled-by"/>
- </accessibility>
- <signal handler="sayAllStyleChanged" last_modification_time="Mon, 16 Apr 2007 17:10:02 GMT" name="changed"/>
- <property name="model">model2</property>
<child>
- <object class="GtkCellRendererText" id="renderer2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <object class="GtkCheckButton" id="speechProgressBarCheckbutton">
+ <property name="label" translatable="yes">Speak progress bar _updates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="speechProgressBarChecked"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="speakUpdateIntervalHBox">
+ <property name="visible">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="speakProgressBarLabel">
+ <property name="visible">True</property>
+ <property name="label" comments="Translators: Here 'every' labels a spin button through which a user can customize the frequency in seconds an announcement should be made. (The spin button is followed by the label 'seconds'.) Thus if a user chooses 5 in the spin button, the complete phrase would be 'every 5 seconds'." translatable="yes">every</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">speakProgressBarSpinButton</property>
+ <accessibility>
+ <relation type="label-for" target="speakProgressBarSpinButton"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="speakProgressBarSpinButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="adjustment">adjustment4</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="speakProgressBarLabel"/>
+ <relation type="labelled-by" target="speakProgressBarUnitsLabel"/>
+ </accessibility>
+ <signal name="value_changed" handler="speakProgressBarValueChanged"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="speakProgressBarUnitsLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">seconds</property>
+ <accessibility>
+ <relation type="label-for" target="speakProgressBarSpinButton"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="padding">3</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="progressBarVerbosityHBox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="progressBarVerbosityLabel">
+ <property name="visible">True</property>
+ <property name="label" comments="Translators: Orca has a setting which determines which progress bar updates should be announced. The options are all progress bars, only progress bars in the active application, or only progress bars in the current window." translatable="yes">Restrict progress bar updates to:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="progressBarVerbosity">
+ <property name="visible">True</property>
+ <property name="model">model7</property>
+ <accessibility>
+ <relation type="labelled-by" target="progressBarVerbosityLabel"/>
+ </accessibility>
+ <signal name="changed" handler="progressBarVerbosityChanged"/>
+ <child>
+ <object class="GtkCellRendererText" id="renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_padding">20</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="tab_expand">False</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="speechTabLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Speech</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
diff --git a/src/orca/orca_gui_prefs.py b/src/orca/orca_gui_prefs.py
index fe518c8..fe625ba 100644
--- a/src/orca/orca_gui_prefs.py
+++ b/src/orca/orca_gui_prefs.py
@@ -1551,6 +1551,40 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
interval = prefs["progressBarUpdateInterval"]
self.get_widget("speakProgressBarSpinButton").set_value(interval)
+ # Translators: Orca has a setting which determines which progress
+ # bar updates should be announced. The options are all progress
+ # bars, only progress bars in the active application, or only
+ # progress bars in the current window.
+ #
+ label = _("Restrict progress bar updates to:")
+ # TODO - JD: I did the above because GtkBuilder translator notes
+ # (which we have for the above string) are not getting sucked in
+ # to orca.pot. :-(
+ #
+ comboBox = self.get_widget("progressBarVerbosity")
+ levels = []
+ # Translators: Orca has a setting which determines which progress
+ # bar updates should be announced. Choosing "All" means that Orca
+ # will present progress bar updates regardless of what application
+ # and window they happen to be in.
+ #
+ levels.append(C_("ProgressBar", "All"))
+ # Translators: Orca has a setting which determines which progress
+ # bar updates should be announced. Choosing "Application" means
+ # that Orca will present progress bar updates as long as the
+ # progress bar is in the active application (but not necessarily
+ # in the current window).
+ #
+ levels.append(C_("ProgressBar", "Application"))
+ # Translators: Orca has a setting which determines which progress
+ # bar updates should be announced. Choosing "Window" means that
+ # Orca will present progress bar updates as long as the progress
+ # bar is in the active window.
+ #
+ levels.append(C_("ProgressBar", "Window"))
+ self.populateComboBox(comboBox, levels)
+ comboBox.set_active(prefs["progressBarVerbosity"])
+
enable = prefs["enableMouseReview"]
self.get_widget("speakUnderMouseCheckButton").set_active(enable)
@@ -2956,6 +2990,42 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
self.prefsDict["verbalizePunctuationStyle"] = \
settings.PUNCTUATION_STYLE_ALL
+ def progressBarVerbosityChanged(self, widget):
+ """Signal handler for the changed signal for the progressBarVerbosity
+ GtkComboBox widget. Set the 'progressBarVerbosity' preference to
+ the new value.
+
+ Arguments:
+ - widget: the component that generated the signal.
+ """
+
+ progressBarVerbosity = widget.get_active_text()
+ # Translators: Orca has a setting which determines which progress
+ # bar updates should be announced. Choosing "All" means that Orca
+ # will present progress bar updates regardless of what application
+ # and window they happen to be in.
+ #
+ if progressBarVerbosity == C_("ProgressBar", "All"):
+ self.prefsDict["progressBarVerbosity"] = \
+ settings.PROGRESS_BAR_ALL
+ # Translators: Orca has a setting which determines which progress
+ # bar updates should be announced. Choosing "Window" means that
+ # Orca will present progress bar updates as long as the progress
+ # bar is in the active window.
+ #
+ elif progressBarVerbosity == C_("ProgressBar", "Window"):
+ self.prefsDict["progressBarVerbosity"] = \
+ settings.PROGRESS_BAR_WINDOW
+ # Translators: Orca has a setting which determines which progress
+ # bar updates should be announced. Choosing "Application" means
+ # that Orca will present progress bar updates as long as the
+ # progress bar is in the active application (but not necessarily
+ # in the current window).
+ #
+ else:
+ self.prefsDict["progressBarVerbosity"] = \
+ settings.PROGRESS_BAR_APPLICATION
+
def sayAllStyleChanged(self, widget):
"""Signal handler for the "changed" signal for the sayAllStyle
GtkComboBox widget. Set the 'sayAllStyle' preference to the
@@ -3040,6 +3110,7 @@ class OrcaSetupGUI(orca_gtkbuilder.GtkBuilderWrapper):
enable = widget.get_active()
self.prefsDict["enableProgressBarUpdates"] = enable
self.get_widget("speakUpdateIntervalHBox").set_sensitive(enable)
+ self.get_widget("progressBarVerbosityHBox").set_sensitive(enable)
def speakProgressBarValueChanged(self, widget):
"""Signal handler for the "value_changed" signal for the
diff --git a/src/orca/orca_prefs.py b/src/orca/orca_prefs.py
index d21ea86..6d34df9 100644
--- a/src/orca/orca_prefs.py
+++ b/src/orca/orca_prefs.py
@@ -482,6 +482,23 @@ class OrcaPrefs:
else:
return "orca.settings.MAG_ZOOMER_TYPE_FULL_SCREEN"
+ def _getProgressBarVerbosityString(self, verbosityLevel):
+ """Returns a string that represents the progress bar verbosity level
+ passed in.
+
+ Arguments:
+ - verbosityLevel: verbosity level for progress bars.
+
+ Returns a string suitable for the preferences file.
+ """
+
+ if verbosityLevel == settings.PROGRESS_BAR_ALL:
+ return "orca.settings.PROGRESS_BAR_ALL"
+ elif verbosityLevel == settings.PROGRESS_BAR_WINDOW:
+ return "orca.settings.PROGRESS_BAR_WINDOW"
+ else:
+ return "orca.settings.PROGRESS_BAR_APPLICATION"
+
def _writeKeyBindingsPreamble(self, prefs):
"""Writes the preamble to the user-settings.py keyBindings section."""
@@ -718,6 +735,8 @@ class OrcaPrefs:
elif key == "textAttributesBrailleIndicator":
value = self._getTextAttributesBrailleIndicatorString( \
prefsDict[key])
+ elif key == "progressBarVerbosity":
+ value = self._getProgressBarVerbosityString(prefsDict[key])
elif key == "brailleContractionTable":
value = "'%s'" % prefsDict[key]
elif key == "brailleEOLIndicator":
diff --git a/src/orca/script.py b/src/orca/script.py
index e7b9c52..5aae7d0 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -39,6 +39,8 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2009 Sun Microsystems Inc."
__license__ = "LGPL"
+import pyatspi
+
import braille_generator
import debug
import flat_review
@@ -337,6 +339,10 @@ class Script:
#
processEvent = (orca_state.activeScript == self \
or self.presentIfInactive)
+ if event.source.getRole() == pyatspi.ROLE_PROGRESS_BAR \
+ and not processEvent \
+ and settings.progressBarVerbosity == settings.PROGRESS_BAR_ALL:
+ processEvent = True
if not processEvent:
return
diff --git a/src/orca/settings.py b/src/orca/settings.py
index 1672ee5..a8e352f 100644
--- a/src/orca/settings.py
+++ b/src/orca/settings.py
@@ -172,6 +172,7 @@ userCustomizableSettings = [
"textAttributesBrailleIndicator",
"enableProgressBarUpdates",
"progressBarUpdateInterval",
+ "progressBarVerbosity",
"enableContractedBraille",
"brailleContractionTable",
"enableMouseReview",
@@ -667,6 +668,18 @@ enableProgressBarUpdates = True
#
progressBarUpdateInterval = 10
+# When progress bar updates should be spoken, assuming they are enabled.
+# ALL means that any progress bar update will be spoken. APPLICATION
+# means that progress bar updates from the active application will be
+# spoken, even if they are not in the active window. WINDOW means that
+# the progress bar must be contained in the active window in order to
+# be spoken. The default verbosity level is APPLICATION.
+#
+PROGRESS_BAR_ALL = 0
+PROGRESS_BAR_APPLICATION = 1
+PROGRESS_BAR_WINDOW = 2
+progressBarVerbosity = PROGRESS_BAR_APPLICATION
+
# Whether or not to present the 'read only' attribute of text areas
# if we can detect they are read only or not.
#
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
