[GRASS-SVN] r35028 - grass/branches/releasebranch_6_4/gui/tcltk/gis.m

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2008-12-26 02:12:32 -0500 (Fri, 26 Dec 2008)
New Revision: 35028

Modified:
   grass/branches/releasebranch_6_4/gui/tcltk/gis.m/mapcanvas.tcl
   grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maptool.tcl
   grass/branches/releasebranch_6_4/gui/tcltk/gis.m/runandoutput.tcl
Log:
mapcanvas.tcl: minor cosmetics, starts in 'explore mode' for faster rendering and nicer displays.
maptool.tcl: fixed menu buttons menus from unposting erratically because of deprecated bwidgets balloon help.
runandoutput.tcl: fixed button text

Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/mapcanvas.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/mapcanvas.tcl	2008-12-26 06:50:22 UTC (rev 35027)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/mapcanvas.tcl	2008-12-26 07:12:32 UTC (rev 35028)
@@ -165,7 +165,7 @@
 	set env(GRASS_HEIGHT) 480.0
 	set drawprog 0
 	# Explore mode is off by default
-	set exploremode($mon) 0
+	set exploremode($mon) 1
 
 	# Make sure that we are using the WIND file for everything except displays
 	if {[info exists env(WIND_OVERRIDE)]} {unset env(WIND_OVERRIDE)}
@@ -677,7 +677,7 @@
 
 	# Do me again in a short period of time.
 	# vwait might be appropriate here
-	after 100 MapCanvas::display_server
+	after 300 MapCanvas::display_server
 }
 
 # Request a redraw on a monitor
@@ -1061,7 +1061,7 @@
 	set nsres [lindex $region 4]
 	set ewres [lindex $region 5]
 
-	if { $nsres == $ewres } {
+	if { $nsres == $ewres || $exploremode($mon) } {
 	    set MapCanvas::regionstr [format [G_msg "Display: rows=%d columns=%d  resolution=%g $mapunits"] \
 		$rows $cols $nsres]
 	} else {

Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maptool.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maptool.tcl	2008-12-26 06:50:22 UTC (rev 35027)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maptool.tcl	2008-12-26 07:12:32 UTC (rev 35028)
@@ -166,10 +166,11 @@
 
 	set mapzoom [menubutton $tb.mapzoom	 \
 		-image [image create photo -file "$iconpath/gui-mapzoom.gif"] \
-		-highlightthickness 0 -takefocus 0 -relief flat -borderwidth 1 \
+		-highlightthickness 0 -takefocus 0 -relief flat -borderwidth 0 \
 		-highlightbackground $bgcolor -activebackground honeydew \
 		-bg $bgcolor -width 32 -indicatoron 0 -direction below]
-	DynamicHelp::register $mapzoom balloon [G_msg "Zoom to..."]
+	# DynamicHelp from Bwidgets 1.2.1 is buggy with menubuttons, at least on Mac
+	#DynamicHelp::register $mapzoom balloon [G_msg "Zoom to..."]
 
 	# menu zooming display
 	set zoommenu [menu $mapzoom.zm -type normal]
@@ -275,7 +276,8 @@
 		-highlightthickness 0 -takefocus 0 -relief flat -borderwidth 1 \
 		-highlightbackground $bgcolor -activebackground honeydew \
 		-bg $bgcolor -width 32 -indicatoron 0 -direction below]
-	DynamicHelp::register $mapsave balloon [G_msg "Export display to graphics file"]
+	# DynamicHelp from Bwidgets 1.2.1 is buggy with menubuttons, at least on Mac
+	#DynamicHelp::register $mapsave balloon [G_msg "Export display to graphics file"]
 
 	pack $mapsave -side left -anchor w -expand no -fill y
 	pack $bbox4 -side left -anchor w

Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/runandoutput.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/runandoutput.tcl	2008-12-26 06:50:22 UTC (rev 35027)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/runandoutput.tcl	2008-12-26 07:12:32 UTC (rev 35028)
@@ -126,9 +126,9 @@
 		-highlightbackground $bgcolor \
 		-command "$gronsole run_xterm \[string trim \[$cmdtext get 1.0 end\]\] {}"]
 	set outpane [frame $where.output -bg $bgcolor]
-	set savebutton [button $outpane.save -text [G_msg "Save"] -command "$gronsole save" \
+	set savebutton [button $outpane.save -text [G_msg " Save "] -command "$gronsole save" \
 		-bd 1 -padx 10 -highlightbackground $bgcolor]
-	set clearbutton [button $outpane.clear -text [G_msg "Clear"] -command "$gronsole clear" \
+	set clearbutton [button $outpane.clear -text [G_msg " Clear "] -command "$gronsole clear" \
 		-bd 1 -padx 10 -highlightbackground $bgcolor]
 
 	pack $runbutton $run2button $runuibutton $runxterm \