[rkward-cvs] rkward/rkward/plugins/plots histogram.xml,1.3,1.4 plot_options.xml,1.1,1.2

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/plugins/plots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13677/rkward/plugins/plots

Modified Files:
	histogram.xml plot_options.xml 
Log Message:
Embedding a wizard (or dialog) inside a wizard works

Index: histogram.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugins/plots/histogram.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** histogram.xml	20 Mar 2006 20:30:58 -0000	1.3
--- histogram.xml	21 Mar 2006 15:41:24 -0000	1.4
***************
*** 31,33 ****
--- 31,56 ----
      </tabbook>
    </dialog>
+   <wizard>
+ 	<page><text>This wizard is for testing purposes only. Remove it!</text></page>
+ 	<page label="Variable(s)" >
+ 		<row>
+ 			<varselector id="vars" />
+ 			<varslot multi="false" type="numeric" id="x" source="vars" label="variable(s):" required="true" />
+ 		</row>
+ 	</page>
+ 	<embed id="plotoptions" component="rkward::plot_options" />
+ 	<page label="Options" >
+ 		<column>
+ 			<radio id="scale" label="Scale" >
+ 				<option value="FALSE" label="No Frequency" />
+ 				<option value="TRUE" label="Frequency" />
+ 			</radio>
+ 			<column>
+ 				<checkbox value_unchecked="0" checked="false" value="1" id="rug" label="Rug" />
+ 				<checkbox value_unchecked="0" checked="false" value="1" id="jitter" label="Jitter" />
+ 			</column>
+ 		</column>
+ 	</page>
+ 	<page><embed id="plotoptionsb" component="rkward::plot_options" as_button="true" label="Just a test" /></page>
+   </wizard>
  </document>

Index: plot_options.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugins/plots/plot_options.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plot_options.xml	20 Mar 2006 19:33:58 -0000	1.1
--- plot_options.xml	21 Mar 2006 15:41:24 -0000	1.2
***************
*** 61,63 ****
--- 61,103 ----
  		</tabbook>
  	</dialog>
+ 	<wizard>
+ 		<page>
+ 			<text>This wizard is for test purposes only! Remove it!</text>
+ 		</page>
+ 		<page>
+ 			<column>
+ 				<frame id="axistypes" label="Axis types">
+ 					<row>
+ 						<checkbox id="xaxt" label="Draw X axis" checked="true" value="" value_unchecked="n" />
+ 						<checkbox id="yaxt" label="Draw Y axis" checked="true" value="" value_unchecked="n" />
+ 					</row>
+ 					<row>
+ 						<checkbox id="xlog" label="X axis logarithmic" checked="false" value="x" value_unchecked="" />
+ 						<checkbox id="ylog" label="Y axis logarithmic" checked="false" value="y" value_unchecked="" />
+ 					</row>
+ 				</frame>
+ 				<frame id="axislabels" label="Labels (leave empty for default)">
+ 					<row>
+ 						<input id="xlab" label="X axis label" />
+ 						<input id="ylab" label="Y axis label" />
+ 					</row>
+ 					<text>Interpret these labels be as R expressions (as opposed to string literals)?</text>
+ 					<row>
+ 						<checkbox id="xlabisexp" label="interpret as expression" value="1" />
+ 						<checkbox id="ylabisexp" label="interpret as expression" value="1" />
+ 					</row>
+ 				</frame>
+ 				<frame id="scale" label="Scale (Minimum/Maximum values for X/Y). Leave blank for automatic">
+ 					<row>
+ 						<input id="xminvalue" label="Min X value" />
+ 						<input id="yminvalue" label="Min Y value" />
+ 					</row>
+ 					<row>
+ 						<input id="xmaxvalue" label="Max X value" />
+ 						<input id="ymaxvalue" label="Max Y value" />
+ 					</row>
+ 				</frame>
+ 			</column>
+ 		</page>
+ 	</wizard>
  </document>