X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-demo.glade2;h=609e51012a47d66ee3aff904b8ab63d1f4d6d0b9;hb=4ade52359b6eba3621566dac79793a33aa4c915f;hp=66de564da8283505e5b3421257049fc8e239fa33;hpb=50be9bb40dc60130c99ffa568e6677779904ff70;p=xscreensaver

diff --git a/driver/xscreensaver-demo.glade2 b/driver/xscreensaver-demo.glade2
index 66de564d..609e5101 100644
--- a/driver/xscreensaver-demo.glade2
+++ b/driver/xscreensaver-demo.glade2
@@ -253,7 +253,7 @@
 			  <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"/>
@@ -285,7 +285,7 @@
 			  <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"/>
@@ -320,7 +320,7 @@
 			  <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"/>
@@ -1135,7 +1135,7 @@ This probably means that the &quot;xscreensaver-extras&quot; and
 			      <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>
@@ -1191,7 +1191,7 @@ This probably means that the &quot;xscreensaver-extras&quot; and
 				  <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>
@@ -1237,6 +1237,31 @@ This probably means that the &quot;xscreensaver-extras&quot; and
 				  <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>
@@ -1944,7 +1969,7 @@ This probably means that the &quot;xscreensaver-extras&quot; and
 				      <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"/>
@@ -1977,7 +2002,7 @@ This probably means that the &quot;xscreensaver-extras&quot; and
 				      <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"/>
@@ -2010,7 +2035,7 @@ This probably means that the &quot;xscreensaver-extras&quot; and
 				      <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"/>
@@ -2034,10 +2059,32 @@ This probably means that the &quot;xscreensaver-extras&quot; and
 				</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>
@@ -2243,7 +2290,7 @@ This probably means that the &quot;xscreensaver-extras&quot; and
 				      <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"/>