X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FXScreenSaver_ad.h;h=24f82dc6877a3b8162478633e890c00ddeefb528;hp=4c6497306fe8a44e665d63316ad733fc141c016b;hb=0bd2eabab3e404c6769fe8f59b639275e960c415;hpb=c6b273ef7292ba10943694df1656b05203d7b62f

diff --git a/driver/XScreenSaver_ad.h b/driver/XScreenSaver_ad.h
index 4c649730..24f82dc6 100644
--- a/driver/XScreenSaver_ad.h
+++ b/driver/XScreenSaver_ad.h
@@ -11,8 +11,8 @@
 "*fadeTicks:		20",
 "*captureStderr: 	True",
 "*captureStdout: 	True",
-"*overlayTextForeground:	Yellow",
-"*overlayTextBackground:	Black",
+"*overlayTextForeground:	#FFFF00",
+"*overlayTextBackground:	#000000",
 "*overlayStderr:		True",
 "*font:			*-medium-r-*-140-*-m-*",
 "*installColormap:	True",
@@ -85,6 +85,8 @@
 		interference -root					\\n\
 		truchet -root -randomize				\\n\
 		bsod -root						\\n\
+		crystal -root						\\n\
+		discrete -root						\\n\
 									  \
 	mono:	rocks -root						\\n\
 	color:	rocks -root -fg darksalmon				\\n\
@@ -121,14 +123,14 @@
 "*XmTextField.fontList:             *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1",
 "*passwdDialog.passwdText.fontList: *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1",
 "XScreenSaver*XmList.fontList:      *-courier-medium-r-*-*-*-120-*-*-*-iso8859-1",
-"*XmDialogShell*foreground:		black",
-"*XmDialogShell*background:		gray90",
-"*XmDialogShell*XmTextField.foreground:	black",
-"*XmDialogShell*XmTextField.background:	white",
-"*XmDialogShell*demoList.foreground:	black",
-"*XmDialogShell*demoList.background:	white",
-"XScreenSaver*XmDialogShell*rogerLabel.foreground:	red3",
-"XScreenSaver*XmDialogShell*rogerLabel.background:	white",
+"*XmDialogShell*foreground:		#000000",
+"*XmDialogShell*background:		#E5E5E5",
+"*XmDialogShell*XmTextField.foreground:	#000000",
+"*XmDialogShell*XmTextField.background:	#FFFFFF",
+"*XmDialogShell*demoList.foreground:	#000000",
+"*XmDialogShell*demoList.background:	#FFFFFF",
+"XScreenSaver*XmDialogShell*rogerLabel.foreground:	#CD0000",
+"XScreenSaver*XmDialogShell*rogerLabel.background:	#FFFFFF",
 "*XmDialogShell.title:		XScreenSaver",
 "*allowShellResize:		True",
 "*autoUnmanage:			False",
@@ -157,13 +159,13 @@
 "*fadeToggle.labelString:	Fade Colormap",
 "*unfadeToggle.labelString:	Unfade Colormap",
 "*lockToggle.labelString:	Require Password",
-"*resourcesDone.labelString:	Done",
+"*resourcesDone.labelString:	OK",
 "*resourcesCancel.labelString:	Cancel",
 "*passwdDialog.title:		Password",
 "*passwdLabel1.labelString:	XScreenSaver %s",
 "*passwdLabel2.labelString:	This display is locked.",
 "*passwdLabel3.labelString:	Please type %s's password to unlock it.",
-"*passwdDone.labelString:	Done",
+"*passwdDone.labelString:	OK",
 "*passwdCancel.labelString:	Cancel",
 "*passwdLabel1.alignment:	ALIGNMENT_BEGINNING",
 "*passwdLabel2.alignment:	ALIGNMENT_BEGINNING",
@@ -176,23 +178,27 @@
 "*passwd_dialog*font:		*-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1",
 "*demo_dialog*label1.font:	*-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1",
 "*resources_dialog*label1.font:	*-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1",
-"*demo_dialog*List.font:		*-courier-medium-r-*-*-*-120-*-*-*-iso8859-1",
-"*passwd_dialog*passwd_form.value*font:		*nil*",
-"*demo_dialog*foreground:			black",
-"*demo_dialog*background:			gray90",
-"*demo_dialog*List.background:			white",
-"*demo_dialog*Scrollbar.background:		gray85",
-"*demo_dialog*Command.background:		gray85",
-"*resources_dialog*foreground:			black",
-"*resources_dialog*background:			gray90",
-"*resources_dialog*Command.background:		gray85",
-"*resources_dialog*Toggle.background:		gray85",
-"*resources_dialog*Text*background:		white",
+"XScreenSaver.demo_dialog*List.font: \
+				*-courier-medium-r-*-*-*-120-*-*-*-iso8859-1",
+"XScreenSaver.passwd_dialog*passwd_form.value*font:	*nil*",
+"XScreenSaver.demo_dialog*foreground:			#000000",
+"XScreenSaver.demo_dialog*background:			#E5E5E5",
+"XScreenSaver.demo_dialog*List.background:		#FFFFFF",
+"XScreenSaver.demo_dialog*Scrollbar.background:		#D9D9D9",
+"XScreenSaver.demo_dialog*Command.background:		#D9D9D9",
+"XScreenSaver.resources_dialog*foreground:		#000000",
+"XScreenSaver.resources_dialog*background:		#E5E5E5",
+"XScreenSaver.resources_dialog*Command.background:	#D9D9D9",
+"XScreenSaver.resources_dialog*Toggle.background:	#D9D9D9",
+"XScreenSaver.resources_dialog*Text*background:		#FFFFFF",
 "*resources_dialog*Dialog.value.translations: #override\\n\
 	<Key>Return: beginning-of-line()\\n",
-"*passwd_dialog*foreground:			black",
-"*passwd_dialog*background:			gray90",
-"*passwd_dialog*Text*background:			white",
+"XScreenSaver.passwd_dialog*foreground:			#000000",
+"XScreenSaver.passwd_dialog*background:			#E5E5E5",
+"XScreenSaver.passwd_dialog*Command.background:		#D9D9D9",
+"XScreenSaver.passwd_dialog*Text*background:		#FFFFFF",
+"XScreenSaver.passwd_dialog*roger.foreground:		#CD0000",
+"XScreenSaver.passwd_dialog*roger.background:		#FFFFFF",
 "*demo_dialog*viewport.width:			400",
 "*demo_dialog*viewport.height:			200",
 "*Form.borderWidth:				0",
@@ -216,20 +222,18 @@
 "*resources_dialog*buttonbox.fade.label:		Fade Colormap",
 "*resources_dialog*buttonbox.unfade.label:	Unfade Colormap",
 "*resources_dialog*buttonbox.lock.label:		Require Password",
-"*resources_dialog*done.label:			Done",
+"*resources_dialog*done.label:			OK",
 "*resources_dialog*cancel.label:			Cancel",
 "*passwd_dialog*label1.label:			XScreenSaver %s",
 "*passwd_dialog*label2.label:			This display is locked.",
 "*passwd_dialog*label3.label:		Please type %s's password to unlock it.",
-"*passwd_dialog*ok.label:			Done",
+"*passwd_dialog*ok.label:			OK",
 "*passwd_dialog*cancel.label:			Cancel",
 "*passwd_dialog*passwd_form*label.label:		Enter password:",
 "*passwd_dialog*Dialog.label:			Enter password:",
 "*passwd_dialog*passwd_form*Text.width:		200",
 "*passwd_dialog*roger.width:			150",
 "*passwd_dialog*roger.height:			150",
-"*passwd_dialog*roger.foreground:		red3",
-"*passwd_dialog*roger.background:		white",
 "*passwd_dialog*roger.borderWidth:		1",
 "XScreenSaver.pointerPollTime:		5",
 "XScreenSaver.initialDelay:		0",