[rkward] rkward/plugins/plots: Better positioning of varslots

[Thomas Friedrichsmeier]

Git commit 1ed61116d8f3d0ce7b1c74401342aff62d39a85b by Thomas Friedrichsmeier.
Committed on 04/10/2015 at 19:34.
Pushed by tfry into branch 'master'.

Better positioning of varslots

M  +4    -1    rkward/plugins/plots/barplot.xml
M  +9    -5    rkward/plugins/plots/box_plot.xml

http://commits.kde.org/rkward/1ed61116d8f3d0ce7b1c74401342aff62d39a85b

diff --git a/rkward/plugins/plots/barplot.xml b/rkward/plugins/plots/barplot.xml
index c950616..29ac067 100644
--- a/rkward/plugins/plots/barplot.xml
+++ b/rkward/plugins/plots/barplot.xml
@@ -34,11 +34,14 @@
 					<row>
 						<varselector id="vars"/>
 						<column>
+							<varslot min_vars="1" id="x" source="vars" required="true" label="Matrix, Vector or Factor"/>
+							<row>
+								<stretch/><text> - or - </text><stretch/>
+							</row>
 							<frame id="tabulate" label="Tabulate data before plotting" checkable="true" checked="false">
 								<embed id="tabulate_options" component="rkward::one_var_tabulation" as_button="false" label="Tabulation Options"/>
 							</frame>
 
-							<varslot min_vars="1" id="x" source="vars" required="true" label="Matrix, Vector or Factor"/>
 							<stretch/>
 							<preview id="preview"/>
 						</column>
diff --git a/rkward/plugins/plots/box_plot.xml b/rkward/plugins/plots/box_plot.xml
index 130809c..7edf756 100644
--- a/rkward/plugins/plots/box_plot.xml
+++ b/rkward/plugins/plots/box_plot.xml
@@ -32,16 +32,20 @@
 	<tabbook>
 		<tab label="Variable(s)" id="tab_variables">
 			<row>
-				<varselector id="vars" />
 				<column>
 					<radio id="data_mode" label="Data format">
 						<option value="separate_vars" label="Separate variables" checked="true"/>
 						<option value="grouped_outcome" label="Single (grouped) variable"/>
 					</radio>
-					<varslot multi="true" type="numeric" source="vars" id="x" label="Variable(s):" required="true"/>
-					<varslot type="numeric" source="vars" id="outcome" label="Outcome variable:" required="true"/>
-					<varslot multi="true" source="vars" id="groups" label="Group variable(s):" required="true"/>
-					<spinbox type="integer" id="dodges" label="Dodged groups" min="0" initial="0"/>
+					<row>
+						<varselector id="vars" />
+						<column>
+							<varslot multi="true" type="numeric" source="vars" id="x" label="Variable(s):" required="true"/>
+							<varslot type="numeric" source="vars" id="outcome" label="Outcome variable:" required="true"/>
+							<varslot multi="true" source="vars" id="groups" label="Group variable(s):" required="true"/>
+							<spinbox type="integer" id="dodges" label="Dodged groups" min="0" initial="0"/>
+						</column>
+					</row>
 				</column>
 				<column>
 					<frame label="Labels">