[rkward] rkward/plugins/00saveload/import: Minor refinements to Import CVS plugin. Mostly as suggested by JanD.

[Thomas Friedrichsmeier]

Git commit babfd73512b079f927692646baae104ed77eb1e5 by Thomas Friedrichsmeier.
Committed on 01/10/2015 at 19:43.
Pushed by tfry into branch 'master'.

Minor refinements to Import CVS plugin. Mostly as suggested by JanD.

M  +1    -1    rkward/plugins/00saveload/import/import_csv.rkh
M  +7    -8    rkward/plugins/00saveload/import/import_csv.xml

http://commits.kde.org/rkward/babfd73512b079f927692646baae104ed77eb1e5

diff --git a/rkward/plugins/00saveload/import/import_csv.rkh b/rkward/plugins/00saveload/import/import_csv.rkh
index 566acbf..878efb9 100644
--- a/rkward/plugins/00saveload/import/import_csv.rkh
+++ b/rkward/plugins/00saveload/import/import_csv.rkh
@@ -26,7 +26,7 @@ Choose the CSV file to import. An R object containing the data will be created.
 		<setting id="rownames">See above. A vector of row names  (e.g. c ("row1", "row2", ...,  "rown"), but you can also specify the name of an R object containing the names to use)</setting>
 
 		<caption id="tab_columns"/>
-		<setting id="colname">Use default column names (possibly read from first row of file), or use specific names?</setting>
+		<setting id="colname">Use automatic column names (possibly read from first row of file), or use manually specified names?</setting>
 		<setting id="colnames">See above. Specify a character vector of column names (e.g. c ("col1", "col2", ..., "coln"), but you can also specify the name of an R object containing the names to use)</setting>
 		<setting id="flush">Should additional columns (not specified above, and not within the first five rows of input) be skipped? See parameter flush in <link href="rkward://rhelp/read.table"/>.</setting>
 		<setting id="colclass">Should be class of each column be determined automatically, or specified?</setting>
diff --git a/rkward/plugins/00saveload/import/import_csv.xml b/rkward/plugins/00saveload/import/import_csv.xml
index 64aa0d0..17a5f9c 100644
--- a/rkward/plugins/00saveload/import/import_csv.xml
+++ b/rkward/plugins/00saveload/import/import_csv.xml
@@ -72,7 +72,7 @@
 				</dropdown>
 				<frame>
           <row>
-            <checkbox id="header" value="TRUE" value_unchecked="FALSE" checked="false" label="Column names in first row"/>
+            <checkbox id="header" value="TRUE" value_unchecked="FALSE" checked="false" label="Use first row as column names"/>
           </row>
 					<row>
 						<column>
@@ -98,10 +98,8 @@
 					</row>
 				</frame>
 				<frame>
-					<row>
-						<saveobject id="name" initial="my.csv.data" label="Object to save to"/>
-						<checkbox id="doedit" value="1" value_unchecked="0" label="Edit Object" checked="true" />
-					</row>
+					<saveobject id="name" initial="my.csv.data" label="Object to save to"/>
+					<checkbox id="doedit" value="1" value_unchecked="0" label="Open imported data for editing" checked="true" />
 				</frame>
 			</tab>
 			<tab id="tab_rows" label="Rows and Columns" >
@@ -122,16 +120,17 @@
 					<column>
 						<frame label="Column Specifications">
 							<radio id="colname" label="Column names" >
-								<option value="" label="Default" />
+								<option value="" label="Automatic" />
 								<option value="custoCol" label="Use a character vector" />
 							</radio>
 							<input id="colnames" label="Vector of column names (quoted)" required="true"/>
-						<checkbox id="flush" label="Skip any further fields" value=", flush=TRUE" value_unchecked="" />
+							<checkbox id="flush" label="Skip trailing fields" value=", flush=TRUE" value_unchecked="" />
 							<radio id="colclass" label="Classes of columns" >
-								<option value="" label="Default" />
+								<option value="" label="Automatic" />
 								<option value="custoClass" label="Use a character vector" />
 							</radio>
 							<input id="custoClasses" label="Vector of column classes (quoted)" required="true"/>
+							<stretch/>
 						</frame>
 					</column>
 				</row>