Merge lp:~maco.m/ubiquity/bug749653 into lp:ubiquity

[Mackenzie Morgan]

Make the partitioning page more screen-reader-friendly by linking the radio buttons and labels together. Result is the label is read out loud.

Unfortunately, the variable name is still read, but since this means the "there's no information about what happens" problem (that makes it High importance) is fixed, I think the papercut of it still saying the variable name can be ignored.

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-13 18:25:33 +0000
+++ debian/changelog	2011-04-14 20:53:58 +0000
@@ -94,6 +94,7 @@
   [ Colin Watson ]
   * Switch to xz compression for the source package, saving nearly a
     megabyte.
+<<<<<<< TREE
   * Update translations from Launchpad.
   * Update imported translations from gtk+2.0 2.24.4-0ubuntu1.
   * Automatic update of included source packages: apt-setup 1:0.49ubuntu4,
@@ -103,6 +104,13 @@
   * Update artwork gui/qt/images/squares.png
 
  -- Colin Watson <[e-mail]>  Sun, 10 Apr 2011 01:47:19 +0100
+=======
+
+  [ Mackenzie Morgan ]
+  * Make radio buttons use label wording for screen reader (LP: #749653)
+
+ -- Mackenzie Morgan <[e-mail]>  Thu, 07 Apr 2011 00:02:21 -0400
+>>>>>>> MERGE-SOURCE
 
 ubiquity (2.5.34) natty; urgency=low
 

=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2011-04-13 12:53:25 +0000
+++ ubiquity/plugins/ubi-partman.py	2011-04-14 20:53:58 +0000
@@ -125,6 +125,28 @@
             self.custom_partitioning_title = builder.get_object('custom_partitioning_title')
             self.custom_partitioning_desc = builder.get_object('custom_partitioning_desc')
 
+            # Ask page accessibility
+            self.atk_use_device = self.use_device.get_accessible()
+            self.atk_use_device_title = self.use_device_title.get_accessible()
+            self.atk_use_device_title.add_relationship(atk.RELATION_LABEL_FOR, self.atk_use_device)
+            self.atk_use_device.add_relationship(atk.RELATION_LABELLED_BY, self.atk_use_device_title)
+            self.atk_replace_partition = self.replace_partition.get_accessible()
+            self.atk_replace_partition_title = self.replace_partition_title.get_accessible()
+            self.atk_replace_partition_title.add_relationship(atk.RELATION_LABEL_FOR, self.atk_replace_partition)
+            self.atk_replace_partition.add_relationship(atk.RELATION_LABELLED_BY, self.atk_replace_partition_title)
+            self.atk_reuse_partition = self.reuse_partition.get_accessible()
+            self.atk_reuse_partition_title = self.reuse_partition_title.get_accessible()
+            self.atk_reuse_partition_title.add_relationship(atk.RELATION_LABEL_FOR, self.atk_reuse_partition)
+            self.atk_reuse_partition.add_relationship(atk.RELATION_LABELLED_BY, self.atk_reuse_partition_title)
+            self.atk_resize_use_free = self.resize_use_free.get_accessible()
+            self.atk_resize_use_free_title = self.resize_use_free_title.get_accessible()
+            self.atk_resize_use_free_title.add_relationship(atk.RELATION_LABEL_FOR, self.atk_resize_use_free)
+            self.atk_resize_use_free.add_relationship(atk.RELATION_LABELLED_BY, self.atk_resize_use_free_title)
+            self.atk_custom_partitioning = self.custom_partitioning.get_accessible()
+            self.atk_custom_partitioning_title = self.custom_partitioning_title.get_accessible()
+            self.atk_custom_partitioning_title.add_relationship(atk.RELATION_LABEL_FOR, self.atk_custom_partitioning)
+            self.atk_custom_partitioning.add_relationship(atk.RELATION_LABELLED_BY, self.atk_custom_partitioning_title)
+
             # Advanced page
             self.partition_create_mount_combo = builder.get_object('partition_create_mount_combo')
             self.partition_edit_mount_combo = builder.get_object('partition_edit_mount_combo')