[GRASS-SVN] r58919 - grass/branches/develbranch_6/raster/r.li/r.li.setup

[svn_grass at osgeo.org]

Author: hamish
Date: 2014-02-06 20:47:39 -0800 (Thu, 06 Feb 2014)
New Revision: 58919

Modified:
   grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html
   grass/branches/develbranch_6/raster/r.li/r.li.setup/r.li.setup.main
Log:
clearer vector map descriptions; deletion box cosmetics

Modified: grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html	2014-02-07 02:59:16 UTC (rev 58918)
+++ grass/branches/develbranch_6/raster/r.li/r.li.setup/description.html	2014-02-07 04:47:39 UTC (rev 58919)
@@ -68,9 +68,9 @@
 	  of new configuration file
 	  <li> <em>Raster map name</em> (required): the name of raster
 	  map to use for setting
-	  <li> <em>Vector map to overlay</em> (optional): name of a vector 
+	  <li> <em>Vector areas map to overlay</em> (optional): name of a vector 
 	  map to overlay in setting
-	  <li> <em>Site file to overlay</em> (optional): name of vector map 
+	  <li> <em>Vector points map to overlay</em> (optional): name of vector map 
 	  of points type to overlay in setting
 	</ul>
 

Modified: grass/branches/develbranch_6/raster/r.li/r.li.setup/r.li.setup.main
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.setup/r.li.setup.main	2014-02-07 02:59:16 UTC (rev 58918)
+++ grass/branches/develbranch_6/raster/r.li/r.li.setup/r.li.setup.main	2014-02-07 04:47:39 UTC (rev 58919)
@@ -172,8 +172,8 @@
 	frame .newConf.frame -relief flat
 	pack .newConf.frame -side top -fill y -anchor center
 
-	set names {{} {Configuration file name:} {Raster map to use to select areas:} {[Vector map to overlay:]}\
-	 {[Site file to overlay:]} }
+	set names {{} {Configuration file name:} {Raster map to use to select areas:} {[Vector areas map to overlay:]}\
+	 {[Vector points map to overlay:]} }
 	label .newConf.frame.label1 -text [lindex $names 1] -anchor e
 	entry .newConf.frame.entry1 -width 35 -textvariable env(CONF)
 	grid .newConf.frame.label1 .newConf.frame.entry1 -sticky ew -pady 2 -padx 1
@@ -367,8 +367,8 @@
 	wm title .removeconf "\[r.li.setup\] Remove Window"
 	
 	# new top label
-	label .removeconf.topLabel -text "Are You sure to remove the ' $selection ' file ?"
-        pack .removeconf.topLabel -side top
+	label .removeconf.topLabel -text "Are you sure you want to remove\nthe '$selection' configuration file ?"
+        pack .removeconf.topLabel -side top -pady 10 -padx 10
 	
 	# create new frame
 	frame .removeconf.buttons -relief flat
@@ -378,8 +378,7 @@
 	button .removeconf.buttons.y -text "Yes" -width 8 -command { 
 	      if { [ catch { exec rm $env(HOME)/.r.li/history/$selection } ] } then { 
 		tk_messageBox -message "'$selection' Not deleted" -type ok -icon error} else {
-		#annoying "deleted" messageBox
-		#tk_messageBox -message "$selection  deleted" -type ok
+		tk_messageBox -message "$selection  deleted" -type ok
 		openDir .files "~/.r.li/history"
 		destroy .removeconf}
 	}
@@ -387,7 +386,7 @@
 	# create no button
 	button .removeconf.buttons.n -text "No" -width 8 -command { destroy .removeconf
 	openDir .files "~/.r.li/history"}
-	grid .removeconf.buttons.y  .removeconf.buttons.n
+	grid .removeconf.buttons.y  .removeconf.buttons.n -padx 2 -pady 10
 	}
 }