X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-demo.glade2;h=02e796fc2a39b7a8921a03b0cc0c33135f391dc3;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hp=ae5a73fcb36b5107a488b477534d1bac435d5761;hpb=c28aecf9fc41e3a03494bacf7279745425e2fa18;p=xscreensaver

diff --git a/driver/xscreensaver-demo.glade2 b/driver/xscreensaver-demo.glade2
index ae5a73fc..02e796fc 100644
--- a/driver/xscreensaver-demo.glade2
+++ b/driver/xscreensaver-demo.glade2
@@ -8,10 +8,13 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="wmclass_name">xscreensaver</property>
-  <property name="wmclass_class">XScreenSaver</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <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>
 
   <child>
     <widget class="GtkVBox" id="outer_vbox">
@@ -140,8 +143,6 @@
 	      <property name="show_border">True</property>
 	      <property name="tab_pos">GTK_POS_TOP</property>
 	      <property name="scrollable">False</property>
-	      <property name="tab_hborder">2</property>
-	      <property name="tab_vborder">2</property>
 	      <property name="enable_popup">False</property>
 	      <signal name="switch_page" handler="switch_page_cb"/>
 
@@ -193,6 +194,8 @@
 			<widget class="GtkEventBox" id="lock_button_eventbox">
 			  <property name="visible">True</property>
 			  <property name="tooltip" translatable="yes">Whether a password should be required to un-blank the screen.</property>
+			  <property name="visible_window">True</property>
+			  <property name="above_child">False</property>
 
 			  <child>
 			    <widget class="GtkCheckButton" id="lock_button">
@@ -201,6 +204,7 @@
 			      <property name="label" translatable="yes">_Lock Screen After</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>
@@ -416,6 +420,7 @@
 			  <property name="label" translatable="yes">_Preview</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="run_this_cb"/>
 			</widget>
 		      </child>
@@ -429,6 +434,7 @@
 			  <property name="label" translatable="yes">_Settings...</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="settings_cb"/>
 			</widget>
 		      </child>
@@ -581,6 +587,7 @@
 				  <property name="tooltip" translatable="yes">Run the next screen saver in the list in full-screen mode (click the mouse to return.)</property>
 				  <property name="can_focus">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 				  <signal name="clicked" handler="run_next_cb"/>
 
 				  <child>
@@ -608,6 +615,7 @@
 				  <property name="tooltip" translatable="yes">Run the previous screen saver in the list in full-screen mode (click the mouse to return.)</property>
 				  <property name="can_focus">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 				  <signal name="clicked" handler="run_prev_cb"/>
 
 				  <child>
@@ -668,8 +676,6 @@
 			  <property name="show_border">False</property>
 			  <property name="tab_pos">GTK_POS_BOTTOM</property>
 			  <property name="scrollable">False</property>
-			  <property name="tab_hborder">2</property>
-			  <property name="tab_vborder">2</property>
 			  <property name="enable_popup">False</property>
 
 			  <child>
@@ -880,7 +886,7 @@ Installed</property>
 			  <child>
 			    <widget class="GtkImage" id="image2">
 			      <property name="visible">True</property>
-			      <property name="pixbuf">screensaver-snap.xpm</property>
+			      <property name="pixbuf">screensaver-snap.png</property>
 			      <property name="xalign">0</property>
 			      <property name="yalign">0</property>
 			      <property name="xpad">4</property>
@@ -907,6 +913,7 @@ Installed</property>
 				  <property name="label" translatable="yes">Grab Desktop _Images</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>
@@ -927,6 +934,7 @@ Installed</property>
 				  <property name="label" translatable="yes">Grab _Video Frames</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>
@@ -947,6 +955,7 @@ Installed</property>
 				  <property name="label" translatable="yes">Choose _Random Image:</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>
@@ -1015,6 +1024,7 @@ Installed</property>
 				      <property name="label" translatable="yes">_Browse</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="browse_image_dir_cb"/>
 				    </widget>
 				    <packing>
@@ -1085,7 +1095,7 @@ Installed</property>
 			  <child>
 			    <widget class="GtkImage" id="diag_logo">
 			      <property name="visible">True</property>
-			      <property name="pixbuf">screensaver-diagnostic.xpm</property>
+			      <property name="pixbuf">screensaver-diagnostic.png</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0</property>
 			      <property name="xpad">0</property>
@@ -1112,6 +1122,7 @@ Installed</property>
 				  <property name="label" translatable="yes">_Verbose Diagnostics</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>
@@ -1132,6 +1143,7 @@ Installed</property>
 				  <property name="label" translatable="yes">Display Subprocess _Errors</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>
@@ -1152,6 +1164,7 @@ Installed</property>
 				  <property name="label" translatable="yes">Display _Splash Screen at Startup</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>
@@ -1218,7 +1231,7 @@ Installed</property>
 			  <child>
 			    <widget class="GtkImage" id="dpms_logo">
 			      <property name="visible">True</property>
-			      <property name="pixbuf">screensaver-power.xpm</property>
+			      <property name="pixbuf">screensaver-power.png</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0</property>
 			      <property name="xpad">0</property>
@@ -1245,6 +1258,7 @@ Installed</property>
 				  <property name="label" translatable="yes">_Power Management Enabled</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>
@@ -1553,7 +1567,7 @@ Installed</property>
 			  <child>
 			    <widget class="GtkImage" id="image5">
 			      <property name="visible">True</property>
-			      <property name="pixbuf">screensaver-colorselector.xpm</property>
+			      <property name="pixbuf">screensaver-colorselector.png</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0</property>
 			      <property name="xpad">0</property>
@@ -1580,6 +1594,7 @@ Installed</property>
 				  <property name="label" translatable="yes">Install _Colormap</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>
@@ -1611,6 +1626,7 @@ Installed</property>
 				  <property name="label" translatable="yes">Fade to Black when _Blanking</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>
@@ -1631,6 +1647,7 @@ Installed</property>
 				  <property name="label" translatable="yes">Fade from Black When _Unblanking</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>
@@ -1820,6 +1837,46 @@ Installed</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
+
+      <child>
+	<widget class="GtkHButtonBox" id="hbuttonbox2">
+	  <property name="border_width">5</property>
+	  <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+	  <property name="spacing">10</property>
+
+	  <child>
+	    <widget class="GtkButton" id="helpbutton">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="doc_menu_cb"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="closebutton">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="exit_menu_cb"/>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
     </widget>
   </child>
 </widget>
@@ -1831,6 +1888,11 @@ Installed</property>
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</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="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -1852,6 +1914,7 @@ Installed</property>
 	      <property name="label" translatable="yes">_Advanced &gt;&gt;</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_adv_cb"/>
 	    </widget>
@@ -1865,6 +1928,7 @@ Installed</property>
 	      <property name="label" translatable="yes">_Standard &lt;&lt;</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_std_cb"/>
 	    </widget>
@@ -1878,6 +1942,7 @@ Installed</property>
 	      <property name="label">gtk-cancel</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
 	      <signal name="clicked" handler="settings_cancel_cb"/>
 	    </widget>
@@ -1891,6 +1956,7 @@ Installed</property>
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
 	      <signal name="clicked" handler="settings_ok_cb"/>
 	    </widget>
@@ -1926,8 +1992,6 @@ Installed</property>
 		  <property name="show_border">False</property>
 		  <property name="tab_pos">GTK_POS_BOTTOM</property>
 		  <property name="scrollable">False</property>
-		  <property name="tab_hborder">2</property>
-		  <property name="tab_vborder">2</property>
 		  <property name="enable_popup">False</property>
 		  <signal name="switch_page" handler="settings_switch_page_cb"/>
 
@@ -1978,7 +2042,7 @@ Installed</property>
 		      <child>
 			<widget class="GtkImage" id="cmd_logo">
 			  <property name="visible">True</property>
-			  <property name="pixbuf">screensaver-cmndln.xpm</property>
+			  <property name="pixbuf">screensaver-cmndln.png</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">4</property>
@@ -2301,6 +2365,27 @@ Installed</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="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">True</property>
@@ -2315,6 +2400,7 @@ Installed</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>