X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-demo.glade2;h=609e51012a47d66ee3aff904b8ab63d1f4d6d0b9;hb=dba664f31aa87285db4d76cf8c5e66335299703a;hp=07861e586e53fdc92ee02d201e3ffb1382d8652b;hpb=3f438031d610c7e15fd33876a879b97e290e05fb;p=xscreensaver

diff --git a/driver/xscreensaver-demo.glade2 b/driver/xscreensaver-demo.glade2
index 07861e58..609e5101 100644
--- a/driver/xscreensaver-demo.glade2
+++ b/driver/xscreensaver-demo.glade2
@@ -2,6 +2,7 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="xscreensaver_demo">
   <property name="title" translatable="yes">XScreenSaver</property>
@@ -15,6 +16,8 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child>
     <widget class="GtkVBox" id="outer_vbox">
@@ -25,6 +28,8 @@
       <child>
 	<widget class="GtkMenuBar" id="menubar">
 	  <property name="visible">True</property>
+	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
 	  <child>
 	    <widget class="GtkMenuItem" id="file">
@@ -180,6 +185,14 @@
 			  <property name="xpad">8</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">cycle_spinbutton</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>
+			    <atkrelation target="cycle_spinbutton" type="label-for"/>
+			    <atkrelation target="cycle_spinbutton" type="flows-to"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
@@ -209,6 +222,12 @@
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
+			      <accessibility>
+				<atkproperty name="AtkObject::accessible_name" translatable="yes">Lock Screen</atkproperty>
+				<atkrelation target="lock_spinbutton" type="controller-for"/>
+				<atkrelation target="lock_spinbutton" type="label-for"/>
+				<atkrelation target="lock_spinbutton" type="flows-to"/>
+			      </accessibility>
 			      <signal name="toggled" handler="pref_changed_cb"/>
 			    </widget>
 			  </child>
@@ -234,7 +253,13 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">True</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">1 1 720 1 15 15</property>
+			  <property name="adjustment">1 1 720 1 15 0</property>
+			  <accessibility>
+			    <atkrelation target="timeout_label" type="labelled-by"/>
+			    <atkrelation target="timeout_mlabel" type="labelled-by"/>
+			    <atkrelation target="timeout_label" type="flows-from"/>
+			    <atkrelation target="timeout_mlabel" type="flows-to"/>
+			  </accessibility>
 			  <signal name="activate" handler="pref_changed_cb"/>
 			  <signal name="focus_out_event" handler="pref_changed_event_cb"/>
 			  <signal name="value_changed" handler="pref_changed_cb"/>
@@ -260,7 +285,15 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">True</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">0 0 720 1 15 15</property>
+			  <property name="adjustment">0 0 720 1 15 0</property>
+			  <accessibility>
+			    <atkproperty name="AtkObject::accessible_name" translatable="yes">Lock Screen After</atkproperty>
+			    <atkrelation target="lock_button" type="controlled-by"/>
+			    <atkrelation target="lock_button" type="labelled-by"/>
+			    <atkrelation target="lock_mlabel" type="labelled-by"/>
+			    <atkrelation target="lock_button" type="flows-from"/>
+			    <atkrelation target="lock_mlabel" type="flows-to"/>
+			  </accessibility>
 			  <signal name="activate" handler="pref_changed_cb"/>
 			  <signal name="focus_out_event" handler="pref_changed_event_cb"/>
 			  <signal name="value_changed" handler="pref_changed_cb"/>
@@ -287,7 +320,13 @@
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">True</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">0 0 720 1 15 15</property>
+			  <property name="adjustment">0 0 720 1 15 0</property>
+			  <accessibility>
+			    <atkrelation target="cycle_label" type="labelled-by"/>
+			    <atkrelation target="cycle_mlabel" type="labelled-by"/>
+			    <atkrelation target="cycle_label" type="flows-from"/>
+			    <atkrelation target="cycle_mlabel" type="flows-to"/>
+			  </accessibility>
 			  <signal name="activate" handler="pref_changed_cb"/>
 			  <signal name="focus_out_event" handler="pref_changed_event_cb"/>
 			  <signal name="value_changed" handler="pref_changed_cb"/>
@@ -315,6 +354,14 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">8</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>
+			    <atkrelation target="lock_spinbutton" type="label-for"/>
+			    <atkrelation target="lock_spinbutton" type="flows-to"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="left_attach">3</property>
@@ -338,6 +385,14 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">8</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>
+			    <atkrelation target="cycle_spinbutton" type="label-for"/>
+			    <atkrelation target="cycle_spinbutton" type="flows-from"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="left_attach">3</property>
@@ -349,49 +404,65 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="timeout_mlabel">
+			<widget class="GtkLabel" id="timeout_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">minutes</property>
-			  <property name="use_underline">False</property>
+			  <property name="label" translatable="yes">_Blank After</property>
+			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
+			  <property name="xalign">1</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">8</property>
 			  <property name="ypad">0</property>
+			  <property name="mnemonic_widget">timeout_spinbutton</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>
+			    <atkrelation target="timeout_spinbutton" type="label-for"/>
+			    <atkrelation target="timeout_spinbutton" type="flows-to"/>
+			  </accessibility>
 			</widget>
 			<packing>
-			  <property name="left_attach">3</property>
-			  <property name="right_attach">4</property>
+			  <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="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="timeout_label">
+			<widget class="GtkLabel" id="timeout_mlabel">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Blank After</property>
-			  <property name="use_underline">True</property>
+			  <property name="label" translatable="yes">minutes</property>
+			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">1</property>
+			  <property name="xalign">0</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">8</property>
 			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">timeout_spinbutton</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>
+			    <atkrelation target="timeout_spinbutton" type="label-for"/>
+			    <atkrelation target="timeout_spinbutton" type="flows-from"/>
+			  </accessibility>
 			</widget>
 			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
+			  <property name="left_attach">3</property>
+			  <property name="right_attach">4</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -477,6 +548,13 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">mode_menu</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>
+				<atkrelation target="mode_menu_popup" type="label-for"/>
+			      </accessibility>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -490,6 +568,9 @@
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="history">0</property>
+			      <accessibility>
+				<atkrelation target="mode_label" type="labelled-by"/>
+			      </accessibility>
 
 			      <child internal-child="menu">
 				<widget class="GtkMenu" id="mode_menu_popup">
@@ -573,6 +654,9 @@
 			      <property name="rules_hint">True</property>
 			      <property name="reorderable">False</property>
 			      <property name="enable_search">True</property>
+			      <property name="fixed_height_mode">False</property>
+			      <property name="hover_selection">False</property>
+			      <property name="hover_expand">False</property>
 			    </widget>
 			  </child>
 			</widget>
@@ -681,6 +765,9 @@
 		      <property name="label_xalign">0</property>
 		      <property name="label_yalign">0.5</property>
 		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		      <accessibility>
+			<atkrelation target="label1" type="labelled-by"/>
+		      </accessibility>
 
 		      <child>
 			<widget class="GtkNotebook" id="preview_notebook">
@@ -701,7 +788,7 @@
 			      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0.5</property>
-			      <property name="ratio">1.33</property>
+			      <property name="ratio">1.33000004292</property>
 			      <property name="obey_child">False</property>
 
 			      <child>
@@ -729,6 +816,10 @@
 			      <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>
 			    </widget>
 			    <packing>
 			      <property name="type">tab</property>
@@ -749,6 +840,10 @@ Available</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>
 			    </widget>
 			    <packing>
 			      <property name="tab_expand">False</property>
@@ -769,6 +864,10 @@ Available</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>
 			    </widget>
 			    <packing>
 			      <property name="type">tab</property>
@@ -789,6 +888,10 @@ Installed</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>
 			    </widget>
 			    <packing>
 			      <property name="tab_expand">False</property>
@@ -809,6 +912,60 @@ Installed</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>
+			    </widget>
+			    <packing>
+			      <property name="type">tab</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="nothing_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Very few (or no) screen savers appear to be available.
+
+This probably means that the &quot;xscreensaver-extras&quot; and
+&quot;xscreensaver-gl-extras&quot; packages are not installed.</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_CENTER</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>
+			    </widget>
+			    <packing>
+			      <property name="tab_expand">False</property>
+			      <property name="tab_fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="nothing_tab">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">nothing</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>
 			    </widget>
 			    <packing>
 			      <property name="type">tab</property>
@@ -830,6 +987,13 @@ Installed</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>
+			    <atkrelation target="preview_frame" type="label-for"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
@@ -867,6 +1031,10 @@ Installed</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">notebook</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>
 		</widget>
 		<packing>
 		  <property name="type">tab</property>
@@ -889,6 +1057,9 @@ Installed</property>
 		      <property name="label_xalign">0</property>
 		      <property name="label_yalign">0.5</property>
 		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		      <accessibility>
+			<atkrelation target="label2" type="labelled-by"/>
+		      </accessibility>
 
 		      <child>
 			<widget class="GtkHBox" id="grab_hbox">
@@ -964,7 +1135,7 @@ Installed</property>
 			      <child>
 				<widget class="GtkCheckButton" id="grab_image_button">
 				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether the image-manipulating modes should operate on random images loaded from disk.</property>
+				  <property name="tooltip" translatable="yes">Whether the image-manipulating modes should load image files.</property>
 				  <property name="can_focus">True</property>
 				  <property name="label" translatable="yes">Choose _Random Image:</property>
 				  <property name="use_underline">True</property>
@@ -973,6 +1144,10 @@ Installed</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
+				  <accessibility>
+				    <atkrelation target="image_text" type="controller-for"/>
+				    <atkrelation target="image_browse_button" type="controller-for"/>
+				  </accessibility>
 				  <signal name="toggled" handler="pref_changed_cb"/>
 				</widget>
 				<packing>
@@ -1001,6 +1176,10 @@ Installed</property>
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">8</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>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1012,15 +1191,19 @@ Installed</property>
 				  <child>
 				    <widget class="GtkEntry" id="image_text">
 				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">The directory from which images will be randomly chosen.</property>
+				      <property name="tooltip" translatable="yes">The local directory, RSS feed or Atom feed from which images will be randomly chosen.</property>
 				      <property name="can_focus">True</property>
 				      <property name="editable">True</property>
 				      <property name="visibility">True</property>
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
+				      <accessibility>
+					<atkrelation target="grab_image_button" type="labelled-by"/>
+					<atkrelation target="grab_image_button" type="controlled-by"/>
+				      </accessibility>
 				      <signal name="activate" handler="pref_changed_cb"/>
 				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
 				    </widget>
@@ -1054,6 +1237,31 @@ Installed</property>
 				  <property name="fill">False</property>
 				</packing>
 			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label8">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Local directory, or RSS feed URL.</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</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">20</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>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -1077,6 +1285,13 @@ Installed</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>
+			    <atkrelation target="grab_frame" type="label-for"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
@@ -1098,6 +1313,9 @@ Installed</property>
 		      <property name="label_xalign">0</property>
 		      <property name="label_yalign">0.5</property>
 		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		      <accessibility>
+			<atkrelation target="label3" type="labelled-by"/>
+		      </accessibility>
 
 		      <child>
 			<widget class="GtkHBox" id="diag_hbox">
@@ -1143,6 +1361,10 @@ Installed</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
+				  <accessibility>
+				    <atkrelation target="text_entry" type="controller-for"/>
+				    <atkrelation target="text_entry" type="label-for"/>
+				  </accessibility>
 				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:44 GMT"/>
 				</widget>
 				<packing>
@@ -1168,6 +1390,10 @@ Installed</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
 				  <property name="group">text_radio</property>
+				  <accessibility>
+				    <atkrelation target="text_file_entry" type="label-for"/>
+				    <atkrelation target="text_file_entry" type="controller-for"/>
+				  </accessibility>
 				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:31:55 GMT"/>
 				</widget>
 				<packing>
@@ -1193,6 +1419,11 @@ Installed</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
 				  <property name="group">text_radio</property>
+				  <accessibility>
+				    <atkrelation target="text_program_entry" type="label-for"/>
+				    <atkrelation target="text_program_entry" type="controller-for"/>
+				    <atkrelation target="text_program_browse" type="controller-for"/>
+				  </accessibility>
 				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:07 GMT"/>
 				</widget>
 				<packing>
@@ -1218,6 +1449,10 @@ Installed</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
 				  <property name="group">text_radio</property>
+				  <accessibility>
+				    <atkrelation target="text_url_entry" type="label-for"/>
+				    <atkrelation target="text_url_entry" type="controller-for"/>
+				  </accessibility>
 				  <signal name="toggled" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:17 GMT"/>
 				</widget>
 				<packing>
@@ -1265,8 +1500,11 @@ Installed</property>
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
+				  <accessibility>
+				    <atkrelation target="text_url_radio" type="controlled-by"/>
+				  </accessibility>
 				  <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:33:10 GMT"/>
 				  <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:34:26 GMT"/>
 				</widget>
@@ -1287,6 +1525,9 @@ Installed</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
+				  <accessibility>
+				    <atkrelation target="text_file_radio" type="controlled-by"/>
+				  </accessibility>
 				  <signal name="clicked" handler="browse_text_file_cb" last_modification_time="Sun, 20 Mar 2005 01:24:38 GMT"/>
 				</widget>
 				<packing>
@@ -1309,8 +1550,12 @@ Installed</property>
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
+				  <accessibility>
+				    <atkrelation target="text_program_radio" type="labelled-by"/>
+				    <atkrelation target="text_program_radio" type="controlled-by"/>
+				  </accessibility>
 				  <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:42 GMT"/>
 				  <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:33:43 GMT"/>
 				</widget>
@@ -1333,8 +1578,12 @@ Installed</property>
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
+				  <accessibility>
+				    <atkrelation target="text_program_radio" type="labelled-by"/>
+				    <atkrelation target="text_program_radio" type="controlled-by"/>
+				  </accessibility>
 				  <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:33:02 GMT"/>
 				  <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:34:15 GMT"/>
 				</widget>
@@ -1355,6 +1604,9 @@ Installed</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
+				  <accessibility>
+				    <atkrelation target="text_program_radio" type="controller-for"/>
+				  </accessibility>
 				  <signal name="clicked" handler="browse_text_program_cb" last_modification_time="Sun, 20 Mar 2005 01:24:51 GMT"/>
 				</widget>
 				<packing>
@@ -1377,8 +1629,12 @@ Installed</property>
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
+				  <accessibility>
+				    <atkrelation target="text_file_radio" type="labelled-by"/>
+				    <atkrelation target="text_file_radio" type="controlled-by"/>
+				  </accessibility>
 				  <signal name="activate" handler="pref_changed_cb" last_modification_time="Sun, 20 Mar 2005 21:32:53 GMT"/>
 				  <signal name="focus_out_event" handler="pref_changed_event_cb" last_modification_time="Sun, 20 Mar 2005 21:33:55 GMT"/>
 				</widget>
@@ -1413,6 +1669,13 @@ Installed</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>
+			    <atkrelation target="diag_frame" type="label-for"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
@@ -1477,6 +1740,11 @@ Installed</property>
 				  <property name="active">True</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
+				  <accessibility>
+				    <atkrelation target="dpms_suspend_spinbutton" type="controller-for"/>
+				    <atkrelation target="dpms_standby_spinbutton" type="controller-for"/>
+				    <atkrelation target="dpms_off_spinbutton" type="controller-for"/>
+				  </accessibility>
 				  <signal name="toggled" handler="pref_changed_cb"/>
 				</widget>
 				<packing>
@@ -1509,6 +1777,14 @@ Installed</property>
 				      <property name="xpad">10</property>
 				      <property name="ypad">0</property>
 				      <property name="mnemonic_widget">dpms_standby_spinbutton</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>
+					<atkrelation target="dpms_standby_spinbutton" type="label-for"/>
+					<atkrelation target="dpms_standby_spinbutton" type="flows-to"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">0</property>
@@ -1534,6 +1810,14 @@ Installed</property>
 				      <property name="xpad">10</property>
 				      <property name="ypad">0</property>
 				      <property name="mnemonic_widget">dpms_suspend_spinbutton</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>
+					<atkrelation target="dpms_suspend_spinbutton" type="label-for"/>
+					<atkrelation target="dpms_suspend_spinbutton" type="flows-to"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">0</property>
@@ -1559,6 +1843,14 @@ Installed</property>
 				      <property name="xpad">10</property>
 				      <property name="ypad">0</property>
 				      <property name="mnemonic_widget">dpms_off_spinbutton</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>
+					<atkrelation target="dpms_off_spinbutton" type="label-for"/>
+					<atkrelation target="dpms_off_spinbutton" type="flows-to"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">0</property>
@@ -1583,6 +1875,14 @@ Installed</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>
+					<atkrelation target="dpms_standby_spinbutton" type="label-for"/>
+					<atkrelation target="dpms_standby_spinbutton" type="flows-from"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">2</property>
@@ -1607,6 +1907,14 @@ Installed</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>
+					<atkrelation target="dpms_suspend_spinbutton" type="label-for"/>
+					<atkrelation target="dpms_suspend_spinbutton" type="flows-from"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">2</property>
@@ -1631,6 +1939,14 @@ Installed</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>
+					<atkrelation target="dpms_off_spinbutton" type="label-for"/>
+					<atkrelation target="dpms_off_spinbutton" type="flows-from"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">2</property>
@@ -1653,7 +1969,14 @@ Installed</property>
 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				      <property name="snap_to_ticks">True</property>
 				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 1440 1 15 15</property>
+				      <property name="adjustment">0 0 1440 1 15 0</property>
+				      <accessibility>
+					<atkrelation target="dpms_button" type="controlled-by"/>
+					<atkrelation target="dpms_off_label" type="labelled-by"/>
+					<atkrelation target="dpms_off_mlabel" type="labelled-by"/>
+					<atkrelation target="dpms_off_label" type="flows-from"/>
+					<atkrelation target="dpms_off_mlabel" type="flows-to"/>
+				      </accessibility>
 				      <signal name="activate" handler="pref_changed_cb"/>
 				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
 				      <signal name="value_changed" handler="pref_changed_cb"/>
@@ -1679,7 +2002,14 @@ Installed</property>
 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				      <property name="snap_to_ticks">True</property>
 				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 1440 1 15 15</property>
+				      <property name="adjustment">0 0 1440 1 15 0</property>
+				      <accessibility>
+					<atkrelation target="dpms_button" type="controlled-by"/>
+					<atkrelation target="dpms_suspend_label" type="labelled-by"/>
+					<atkrelation target="dpms_suspend_mlabel" type="labelled-by"/>
+					<atkrelation target="dpms_suspend_label" type="flows-from"/>
+					<atkrelation target="dpms_suspend_mlabel" type="flows-to"/>
+				      </accessibility>
 				      <signal name="activate" handler="pref_changed_cb"/>
 				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
 				      <signal name="value_changed" handler="pref_changed_cb"/>
@@ -1705,7 +2035,14 @@ Installed</property>
 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				      <property name="snap_to_ticks">True</property>
 				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 1440 1 15 15</property>
+				      <property name="adjustment">0 0 1440 1 15 0</property>
+				      <accessibility>
+					<atkrelation target="dpms_button" type="controlled-by"/>
+					<atkrelation target="dpms_standby_label" type="labelled-by"/>
+					<atkrelation target="dpms_standby_mlabel" type="labelled-by"/>
+					<atkrelation target="dpms_standby_label" type="flows-from"/>
+					<atkrelation target="dpms_standby_mlabel" type="flows-to"/>
+				      </accessibility>
 				      <signal name="activate" handler="pref_changed_cb"/>
 				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
 				      <signal name="value_changed" handler="pref_changed_cb"/>
@@ -1722,10 +2059,32 @@ Installed</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
-				  <property name="expand">True</property>
+				  <property name="expand">False</property>
 				  <property name="fill">True</property>
 				</packing>
 			      </child>
+
+			      <child>
+				<widget class="GtkCheckButton" id="dpms_quickoff_button">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Whether the monitor should be powered off immediately in "Blank Screen Only" mode, regardless of the above power-management timeouts.</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">_Quick Power-off in Blank Only Mode</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				  <signal name="toggled" handler="pref_changed_cb"/>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -1749,6 +2108,13 @@ Installed</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>
+			    <atkrelation target="dpms_frame" type="label-for"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
@@ -1771,6 +2137,9 @@ Installed</property>
 		      <property name="label_xalign">0</property>
 		      <property name="label_yalign">0.5</property>
 		      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		      <accessibility>
+			<atkrelation target="label5" type="labelled-by"/>
+		      </accessibility>
 
 		      <child>
 			<widget class="GtkHBox" id="cmap_hbox">
@@ -1813,6 +2182,9 @@ Installed</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
+				  <accessibility>
+				    <atkrelation target="fade_spinbutton" type="controller-for"/>
+				  </accessibility>
 				  <signal name="toggled" handler="pref_changed_cb"/>
 				</widget>
 				<packing>
@@ -1834,6 +2206,9 @@ Installed</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
+				  <accessibility>
+				    <atkrelation target="fade_spinbutton" type="controller-for"/>
+				  </accessibility>
 				  <signal name="toggled" handler="pref_changed_cb"/>
 				</widget>
 				<packing>
@@ -1862,6 +2237,10 @@ Installed</property>
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">3</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>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1884,6 +2263,14 @@ Installed</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
 				      <property name="mnemonic_widget">fade_spinbutton</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>
+					<atkrelation target="fade_spinbutton" type="label-for"/>
+					<atkrelation target="fade_spinbutton" type="flows-to"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="padding">14</property>
@@ -1903,7 +2290,15 @@ Installed</property>
 				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				      <property name="snap_to_ticks">True</property>
 				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 10 1 1 1</property>
+				      <property name="adjustment">0 0 10 1 1 0</property>
+				      <accessibility>
+					<atkrelation target="unfade_button" type="controlled-by"/>
+					<atkrelation target="fade_button" type="controlled-by"/>
+					<atkrelation target="fade_label" type="labelled-by"/>
+					<atkrelation target="fade_sec_label" type="labelled-by"/>
+					<atkrelation target="fade_label" type="flows-from"/>
+					<atkrelation target="fade_sec_label" type="flows-to"/>
+				      </accessibility>
 				      <signal name="activate" handler="pref_changed_cb"/>
 				      <signal name="focus_out_event" handler="pref_changed_event_cb"/>
 				      <signal name="value_changed" handler="pref_changed_cb"/>
@@ -1928,6 +2323,14 @@ Installed</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>
+					<atkrelation target="fade_spinbutton" type="label-for"/>
+					<atkrelation target="fade_spinbutton" type="flows-from"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="padding">2</property>
@@ -1997,6 +2400,13 @@ Installed</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>
+			    <atkrelation target="cmap_frame" type="label-for"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="type">label_item</property>
@@ -2033,6 +2443,10 @@ Installed</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">notebook</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>
 		</widget>
 		<packing>
 		  <property name="type">tab</property>
@@ -2108,6 +2522,8 @@ Installed</property>
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -2149,6 +2565,20 @@ Installed</property>
 	    </widget>
 	  </child>
 
+	  <child>
+	    <widget class="GtkButton" id="reset_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">_Reset to Defaults</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="settings_reset_cb"/>
+	    </widget>
+	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="cancel_button">
 	      <property name="visible">True</property>
@@ -2186,17 +2616,20 @@ Installed</property>
       </child>
 
       <child>
-	<widget class="GtkHBox" id="hbox1">
+	<widget class="GtkVBox" id="vbox1">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">8</property>
+	  <property name="spacing">0</property>
 
 	  <child>
 	    <widget class="GtkFrame" id="opt_frame">
 	      <property name="visible">True</property>
 	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
+	      <property name="label_yalign">0</property>
 	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	      <accessibility>
+		<atkrelation target="label6" type="labelled-by"/>
+	      </accessibility>
 
 	      <child>
 		<widget class="GtkNotebook" id="opt_notebook">
@@ -2221,8 +2654,9 @@ Installed</property>
 		      </child>
 		    </widget>
 		    <packing>
-		      <property name="tab_expand">False</property>
+		      <property name="tab_expand">True</property>
 		      <property name="tab_fill">True</property>
+		      <property name="tab_pack">GTK_PACK_END</property>
 		    </packing>
 		  </child>
 
@@ -2239,6 +2673,10 @@ Installed</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>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -2287,6 +2725,13 @@ Installed</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">cmd_text</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>
+			    <atkrelation target="cmd_text" type="label-for"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
@@ -2307,8 +2752,11 @@ Installed</property>
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
+			  <accessibility>
+			    <atkrelation target="cmd_label" type="labelled-by"/>
+			  </accessibility>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
@@ -2339,6 +2787,13 @@ Installed</property>
 			      <property name="xpad">3</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">visual_entry</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>
+				<atkrelation target="visual_combo" type="label-for"/>
+			      </accessibility>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2355,6 +2810,9 @@ Installed</property>
 			      <property name="case_sensitive">False</property>
 			      <property name="enable_arrow_keys">True</property>
 			      <property name="enable_arrows_always">False</property>
+			      <accessibility>
+				<atkrelation target="visual" type="labelled-by"/>
+			      </accessibility>
 
 			      <child internal-child="entry">
 				<widget class="GtkEntry" id="visual_entry">
@@ -2365,7 +2823,7 @@ Installed</property>
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				</widget>
 			      </child>
@@ -2483,8 +2941,8 @@ Installed</property>
 			    </widget>
 			    <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>
 			    </packing>
 			  </child>
 			</widget>
@@ -2517,6 +2975,10 @@ Installed</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>
 		    </widget>
 		    <packing>
 		      <property name="type">tab</property>
@@ -2538,6 +3000,13 @@ Installed</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>
+		    <atkrelation target="opt_frame" type="label-for"/>
+		  </accessibility>
 		</widget>
 		<packing>
 		  <property name="type">label_item</property>
@@ -2555,8 +3024,8 @@ Installed</property>
 	    <widget class="GtkFrame" id="doc_frame">
 	      <property name="visible">True</property>
 	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	      <property name="label_yalign">0</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 	      <child>
 		<widget class="GtkVBox" id="doc_vbox">
@@ -2575,31 +3044,14 @@ Installed</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">True</property>
 		      <property name="selectable">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="spacer">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></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="xalign">0</property>
+		      <property name="yalign">0</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>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -2609,14 +3061,28 @@ Installed</property>
 		  </child>
 
 		  <child>
-		    <widget class="GtkButton" id="manual">
+		    <widget class="GtkHBox" id="hbox1">
 		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Documentation...</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="manual_cb"/>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkButton" id="manual">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Documentation...</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="manual_cb"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			  <property name="pack_type">GTK_PACK_END</property>
+			</packing>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -2630,7 +3096,7 @@ Installed</property>
 	      <child>
 		<widget class="GtkLabel" id="label7">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Description</property>
+		  <property name="label" translatable="yes"></property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2640,6 +3106,10 @@ Installed</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>
 		</widget>
 		<packing>
 		  <property name="type">label_item</property>
@@ -2648,8 +3118,8 @@ Installed</property>
 	    </widget>
 	    <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>
 	    </packing>
 	  </child>
 	</widget>