printer improvement

1 files changed, 128 insertions, 9 deletions

diff --git a/samba_wizard/samba.wiz b/samba_wizard/samba.wiz
index 6e8f4fa4..bd183fcd 100644
--- a/samba_wizard/samba.wiz
+++ b/samba_wizard/samba.wiz
@@ -10,14 +10,22 @@
 	rpm="samba-server"
 	summaryFunc="do_it"
 >
-
+	<Variable
+		name="box_list"
+		shellVariable="wiz_box_list"
+	>				
+	</Variable>
 	<Variable
 		name="doFileSharing"
 		comment="true if we do file sharing, false otherwise"
 		shellVariable="wiz_do_file_sharing"
 	>				
 	</Variable>
-
+	<Variable
+		name="all_printers"
+		shellVariable="wiz_all_printers"
+	>				
+	</Variable>
 	<Variable
 		name="doPrinterSharing"
 		comment="true if samba do printer sharing"
@@ -25,6 +33,12 @@
 	>
 	</Variable>
 	<Variable
+		name="printer"
+		comment="true if samba do printer sharing"
+		shellVariable="wiz_printer"
+	>
+	</Variable>
+	<Variable
 		name="doHomes"
 		comment="true if samba do printer sharing"
 		shellVariable="wiz_do_homes"
@@ -51,6 +65,18 @@
 	>
 	</Variable>
 
+	<Variable
+		name="write_list"
+		shellVariable="wiz_write_list"
+	>
+	</Variable>
+
+	<Variable
+		name="read_list"
+		shellVariable="wiz_read_list"
+	>
+	</Variable>
+
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="Welcome"
@@ -88,16 +114,21 @@
 
 		<Target
 			targetName="warn_smbpasswd"
-			jumpIndex="2"
+			jumpIndex="3"
 		>
 		</Target>
 
 		<Target
 			targetName="ask_dir"
-			jumpIndex="1"
+			jumpIndex="2"
 		>
 		</Target>
 
+		<Target
+			targetName="ask_printers"
+			jumpIndex="1"
+		>
+		</Target>
 
 		<Target
 			targetName="ask_workgroup"
@@ -145,7 +176,6 @@
 
 	</Page>
 
-
 	<Page
 		name="warn_smbpasswd"
 		comment="Warning"
@@ -159,6 +189,12 @@
 
 		<Target
 			targetName="ask_dir"
+			jumpIndex="2"
+		>
+		</Target>
+
+		<Target
+			targetName="ask_printers"
 			jumpIndex="1"
 		>
 		</Target>
@@ -178,6 +214,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_dir"
+		is="doFileSharing"
 		func="check_dir"
 		executionLevel="NORMAL"
 		nextFinish="false"
@@ -192,7 +229,7 @@
 		</Target>
 
 		<Target
-			targetName="ask_workgroup"
+			targetName="ask_access"
 			jumpIndex="10"
 		>
 		</Target>
@@ -218,6 +255,91 @@
 		</Freetext>
 	</Page>
 
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="ask_access"
+		is="doFileSharing"
+		func="check_user"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+		<Target
+			targetName="error_in_acces"
+			jumpIndex="2"
+		>
+		</Target>
+
+
+		<Target
+			targetName="ask_printers"
+			jumpIndex="1"
+		>
+		</Target>
+
+
+		<Target
+			targetName="ask_workgroup"
+			jumpIndex="0"
+		>
+		</Target>
+
+		<Info
+			helpText="File permissions"
+		>
+		</Info>
+
+
+		<Info
+			helpText="Type users or group separated by a coma (groups must be preceded by a \'@\') like this :\nroot, fred, @users, @wheel for each kind of permission."
+		>
+		</Info>
+
+		<Freetext
+			variableName="read_list"
+			helpText="read list:"
+			editable="true"
+			fillfunc="get_read"
+			help="root, fred, @users, @wheel"
+		>
+		</Freetext>
+		<Freetext
+			variableName="write_list"
+			helpText="write list:"
+			editable="true"
+			fillfunc="get_write"
+			help="root, fred, @users, @wheel"
+		>
+		</Freetext>
+	</Page>
+
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="ask_printers"
+		jumpPage="ask_workgroup"
+		is="doPrinterSharing"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+	<Boolean
+		variableName="all_printers"
+		helpText="Enable all printer"		
+	>
+	</Boolean>
+
+	<Boolean
+		is="all_printers=0"
+		variableName="box_list"
+		fillfunc="list_printers"
+	>
+	</Boolean>
+	</Page>
+
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_workgroup"
@@ -250,8 +372,6 @@
 			helpText="Samba need to know the Windows Workgroup it will serve."
 		>
 		</Info>
-
-
 		<Freetext
 			name="freetext2"
 			variableName="workgroup"
@@ -272,7 +392,6 @@
 		canBack="true"
 		canCancel="true"
 	>
-
 		<Info
 			helpText="The Workgroup is wrong"
 		>