[GRASS-SVN] r38708 - in grass/trunk/raster/r.li: r.li.daemon r.li.setup

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-08-13 05:25:23 -0400 (Thu, 13 Aug 2009)
New Revision: 38708

Modified:
   grass/trunk/raster/r.li/r.li.daemon/daemon.c
   grass/trunk/raster/r.li/r.li.setup/r.li.setup.html
   grass/trunk/raster/r.li/r.li.setup/r.li.setup.main
Log:
use more reasonable config directory

Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c	2009-08-13 09:15:54 UTC (rev 38707)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c	2009-08-13 09:25:23 UTC (rev 38708)
@@ -102,7 +102,7 @@
        ######################################################### */
 
     /* TODO: check if this path is portable */
-    sprintf(pathSetup, "%s/.r.li/history/%s", getenv("HOME"), file);
+    sprintf(pathSetup, "%s/.grass7/r.li/%s", getenv("HOME"), file);
     parsed = parseSetup(pathSetup, l, g, raster);
 
     /*########################################################

Modified: grass/trunk/raster/r.li/r.li.setup/r.li.setup.html
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/r.li.setup.html	2009-08-13 09:15:54 UTC (rev 38707)
+++ grass/trunk/raster/r.li/r.li.setup/r.li.setup.html	2009-08-13 09:25:23 UTC (rev 38708)
@@ -47,7 +47,7 @@
 red for the sample 
 frame and blue for the sample areas), and other notes (disposition of 
 sample areas etc).
-The configuration file is saved in <tt>~/.r.li/history/my_conf</tt>.
+The configuration file is saved in <tt>~/.grass7/r.li/my_conf</tt>.
 <!-- NOT REALLY CLEAR: -->
 Configuration output files are raster if moving window disposition was
 selected, otherwise they are in ~/.r.li/output folder.

Modified: grass/trunk/raster/r.li/r.li.setup/r.li.setup.main
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/r.li.setup.main	2009-08-13 09:15:54 UTC (rev 38707)
+++ grass/trunk/raster/r.li/r.li.setup/r.li.setup.main	2009-08-13 09:25:23 UTC (rev 38708)
@@ -163,7 +163,7 @@
 	exec rm -f $env(TMP).set
 	exec rm -f *.tmp
 	destroy .newConf
-	openDir  .files "~/.r.li/history"
+	openDir  .files "~/.grass7/r.li"
 	}
 	# insert top label
 	label .newConf.topLabel -text "Insert new sampling area settings"
@@ -317,8 +317,7 @@
 #MAIN WINDOW
 ##################################################
  # create directories
- catch { exec mkdir $env(HOME)/.r.li } 
-catch {  exec mkdir $env(HOME)/.r.li/history } 
+ catch { exec mkdir $env(HOME)/.grass7/r.li } 
  bind . <Control-c> {
  	exec rm -f $env(TMP).set
 	destroy .
@@ -336,8 +335,8 @@
  	      
 pack .files -side right -expand 1 -fill both -padx 7 -pady 7 
 
- # show configuration files in ~/.r.li/history
- openDir  .files "~/.r.li/history"
+ # show configuration files in ~/.grass7/r.li
+ openDir  .files "~/.grass7/r.li"
  
  #create load button
  
@@ -376,16 +375,16 @@
 		
 	# create yes button
 	button .removeconf.buttons.y -text "Yes" -width 8 -command { 
-	      if { [ catch { exec rm $env(HOME)/.r.li/history/$selection } ] } then { 
+	      if { [ catch { exec rm $env(HOME)/.grass7/r.li/$selection } ] } then { 
 		tk_messageBox -message "'$selection' Not deleted" -type ok -icon error} else {
 		tk_messageBox -message "$selection  deleted" -type ok
-		openDir .files "~/.r.li/history"
+		openDir .files "~/.grass7/r.li"
 		destroy .removeconf}
 	}
 	
 	# create no button
 	button .removeconf.buttons.n -text "No" -width 8 -command { destroy .removeconf
-	openDir .files "~/.r.li/history"}
+	openDir .files "~/.grass7/r.li"}
 	grid .removeconf.buttons.y  .removeconf.buttons.n
 	}
 }