From 36a0689eb82eb9a0c31b554abccbc7c63481c220 Mon Sep 17 00:00:00 2001
From: Arnaud Desmons <adesmons@mandriva.com>
Date: Thu, 29 Aug 2002 12:06:53 +0000
Subject: fixed variableName and shellVariable conflicts and removed the clock
 step

---
 time_wizard/time.wiz | 56 +++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'time_wizard')

diff --git a/time_wizard/time.wiz b/time_wizard/time.wiz
index 54043786..d6f546d9 100644
--- a/time_wizard/time.wiz
+++ b/time_wizard/time.wiz
@@ -16,28 +16,18 @@
 	</Variable>
 
 	<Variable
-		name="server1"
+		name="varserver1"
 		shellVariable="server1"
 	>
 	</Variable>
 
-	<Variable
-		name="typedserver1"
-		shellVariable="typedserver1"
-	>
-	</Variable>
 
 	<Variable
-		name="server2"
+		name="varserver2"
 		shellVariable="server2"
 	>
 	</Variable>
 
-	<Variable
-		name="typedserver2"
-		shellVariable="typedserver2"
-	>
-	</Variable>
 
 	<Variable
 		name="chooser4"
@@ -337,8 +327,8 @@
 
 
 		<Chooser
-			name="server1"
-			variableName="server1"
+			name="chooserserver1"
+			variableName="varserver1"
 			helpText="Primary Time Server:"
 			helpFontName="Default"
 			helpFontStyle="plain"
@@ -516,8 +506,8 @@
 		</Chooser>
 
 		<Chooser
-			name="server2"
-			variableName="server2"
+			name="chooserserver2"
+			variableName="varserver2"
 			helpText="Secondary Time Server:"
 			helpFontName="Default"
 			helpFontStyle="plain"
@@ -692,23 +682,26 @@
 				description="Loria, Nancy, France"
 			>
 			</Option>
-		</Chooser>
+			<Option
+				value="ntp.u-psud.fr"
+				description="CRI, Campus d'Orsay, Universite Paris Sud, France"
+			>
+			</Option>
 
+			<Option
+				value="ntp.loria.fr"
+				description="Loria, Nancy, France"
+			>
+			</Option>
 
-		<TDline
-			name="line"
-		>
-		</TDline>
+		</Chooser>
 
 		<Chooser
-			name="wiz_timezone"
+			name="chooserwiz_timezone"
 			variableName="wiz_timezone"
 			defaultOptionScript="get_var wiz_timezone"
 			fillScript="__WIZ_HOME__/time_wizard/scripts/compute_liste.sh"
 			helpText="Choose a time zone:"
-			helpFontName="Default"
-			helpFontStyle="plain"
-			helpFontSize="12"
 			editable="false"
 		>
 		</Chooser>
@@ -756,7 +749,7 @@
 
 		<Freetext
 			name="freetext1"
-			fillScript="echo $server1"
+			variableName="varserver1"
 			helpText="Primary Time Server:"
 			editable="false"
 		>
@@ -764,11 +757,20 @@
 
 		<Freetext
 			name="freetext2"
-			fillScript="echo $server2"
+			variableName="varserver2"
 			helpText="Secondary Time Server:"
 			editable="false"
 		>
 		</Freetext>
+		
+		<Freetext
+			name="freetext3"
+			variableName="wiz_timezone"
+			helpText="Time zone:"
+			editable="false"
+		>
+		</Freetext>
+
 	</Page>
 
 	<Page
-- 
cgit v1.2.1