[GRASS-SVN] r44354 -
grass/branches/develbranch_6/visualization/nviz/scripts
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Nov 18 09:41:45 EST 2010
Author: marisn
Date: 2010-11-18 06:41:45 -0800 (Thu, 18 Nov 2010)
New Revision: 44354
Modified:
grass/branches/develbranch_6/visualization/nviz/scripts/nviz2.2_script
grass/branches/develbranch_6/visualization/nviz/scripts/panel_main.tcl
grass/branches/develbranch_6/visualization/nviz/scripts/panel_vect.tcl
grass/branches/develbranch_6/visualization/nviz/scripts/panel_vol.tcl
grass/branches/develbranch_6/visualization/nviz/scripts/panel_vquery.tcl
grass/branches/develbranch_6/visualization/nviz/scripts/script_file_tools
grass/branches/develbranch_6/visualization/nviz/scripts/script_get_line
grass/branches/develbranch_6/visualization/nviz/scripts/script_play
grass/branches/develbranch_6/visualization/nviz/scripts/script_tools
grass/branches/develbranch_6/visualization/nviz/scripts/site_attr.tcl
grass/branches/develbranch_6/visualization/nviz/scripts/widgets.tcl
grass/branches/develbranch_6/visualization/nviz/scripts/wirecolorPopup.tcl
Log:
Export TCL/Tk NVIZ strings for translation
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/nviz2.2_script
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/nviz2.2_script 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/nviz2.2_script 2010-11-18 14:41:45 UTC (rev 44354)
@@ -45,8 +45,18 @@
lappend auto_path $env(GISBASE)/bwidget
package require -exact BWidget 1.2.1
-# internationalization procedures
-source $env(GISBASE)/etc/gtcltk/gmsg.tcl
+# Overloading internationalization procedures
+# gui.tcl is not used to have separate translation file for NVIZ
+if [catch {package require msgcat}] {
+ proc G_msg {message} {
+ return $message
+ }
+} else {
+ ::msgcat::mcload $env(GISBASE)/etc/nviz2.2/msgs
+ proc G_msg {message} {
+ return [::msgcat::mc $message]
+ }
+}
global Nv_ ScriptState ScriptFile ScriptPlaying NvizLoadState
@@ -197,14 +207,14 @@
$Nv_(PAREA).canvas configure -width 0
$Nv_(PAREA).f1.b1 configure -bitmap @$bit_map_path/right \
-width 12 -height 18 -command "hide_menus"
- help $Nv_(PAREA).f1.b1 balloon "Show Panels"
+ help $Nv_(PAREA).f1.b1 balloon [G_msg "Show Panels"]
#$Nv_(AREA).menu.config.m entryconfigure 1 -label "Show Panels" -command "show_menus"
} else {
set Nv_(hidemenus) 1
$Nv_(PAREA).canvas configure -width [winfo width $Nv_(P_AREA)]
$Nv_(PAREA).f1.b1 configure -bitmap @$bit_map_path/left \
-width 12 -height 18 -command "hide_menus"
- help $Nv_(PAREA).f1.b1 balloon "Hide Panels"
+ help $Nv_(PAREA).f1.b1 balloon [G_msg "Hide Panels"]
#$Nv_(AREA).menu.config.m entryconfigure 1 -label "Hide Panels" -command "hide_menus"
}
update
@@ -246,7 +256,7 @@
# make informational text widget
###########################################################################
- set Nv_(text) "Start"
+ set Nv_(text) [G_msg "Start"]
set Nv_(height) 720
#panel area frame
@@ -267,21 +277,21 @@
if {$cwidth > 0 && $cheight > 0} {
if { [catch {togl $Nv_(TOP).canvas -rgba true -double true -depth true \
-width $cwidth -height $cheight} ] } {
- tk_messageBox -type ok -message { Togl canvas initialization failed. Is Your OpenGL working fine? }
+ tk_messageBox -type ok -message [G_msg "Togl canvas initialization failed. Is Your OpenGL working fine?"]
return 1
}
pack $Nv_(TOP).canvas -side top -expand no
} elseif {$cwidth == "" && $cheight > 0} {
if { [catch {togl $Nv_(TOP).canvas -rgba true -double true -depth true \
-height $cheight} ] } {
- tk_messageBox -type ok -message { Togl canvas initialization failed. Is Your OpenGL working fine? }
+ tk_messageBox -type ok -message [G_msg "Togl canvas initialization failed. Is Your OpenGL working fine?"]
return 1
}
pack $Nv_(TOP).canvas -side top -fill x -expand yes
} elseif {$cheight == "" && $cwidth > 0} {
if { [catch {togl $Nv_(TOP).canvas -rgba true -double true -depth true \
-width $cwidth} ] } {
- tk_messageBox -type ok -message { Togl canvas initialization failed. Is Your OpenGL working fine? }
+ tk_messageBox -type ok -message [G_msg "Togl canvas initialization failed. Is Your OpenGL working fine?"]
return 1
}
pack $Nv_(TOP).canvas -side top -fill y -expand yes
@@ -290,7 +300,7 @@
set constrained 1
if { [catch {togl $Nv_(TOP).canvas -rgba true -double true -depth true
pack $Nv_(TOP).canvas -side top -fill both -expand yes} ] } {
- tk_messageBox -type ok -message { Togl canvas initialization failed. Is Your OpenGL working fine? }
+ tk_messageBox -type ok -message [G_msg "Togl canvas initialization failed. Is Your OpenGL working fine?"]
return 1
}
}
@@ -327,7 +337,7 @@
bind all <MouseWheel> {$Nv_(PAREA).canvas yview scroll [expr -1 * %D] units}
button $Nv_(PAREA).f1.b1 -bitmap @$bit_map_path/left \
-width 12 -height 18 -command "hide_menus"
- help $Nv_(PAREA).f1.b1 balloon "Hide Panels"
+ help $Nv_(PAREA).f1.b1 balloon [G_msg "Hide Panels"]
frame $Nv_(P_AREA) -relief flat
@@ -349,14 +359,14 @@
pack $Nv_(P_AREA) -side top -fill y -expand yes
# Make label with invisible text to hold "Please wait..." message
- label $Nv_(AREA).menu.wait_pls -text "Please Wait..." -fg red -bg black
+ label $Nv_(AREA).menu.wait_pls -text [G_msg "Please Wait..."] -fg red -bg black
#Bind menu area to canvas and scrollbars
$Nv_(PAREA).canvas create window 0 0 -window $Nv_(P_AREA) -anchor nw
bind $Nv_(P_AREA) <Configure> "set_scrollsize"
- set helpmenu [Nv_mkMenu $Nv_(AREA).menu.help "Help " \
- {"NVIZ Help" "About NVIZ" "NVIZ - Bugs / ToDo"} \
+ set helpmenu [Nv_mkMenu $Nv_(AREA).menu.help [G_msg "Help"] \
+ [list [G_msg "NVIZ Help"] [G_msg "About NVIZ"] [G_msg "NVIZ - Bugs / ToDo"]] \
{0 0 0} \
{"nviz_browse nviz_toc.html" "nviz_browse nviz_desc.html" "nviz_browse bugs_todo.html"} ]
@@ -368,16 +378,16 @@
#set Nv_(AREA).menu [frame $Nv_(AREA).menu.left -relief flat -bd 0]
# file menu
- set filemenu [Nv_mkMenu $Nv_(AREA).menu.file "File " \
- {"Load State ..." "Save State ..." \
- "" \
- "Set Canvas Size ..."
- "" \
- "Load 3d Settings ..." "Save 3d Settings ..." \
- "" \
- "Save image as ..." \
- "" \
- "Reset" "Quit" } \
+ set filemenu [Nv_mkMenu $Nv_(AREA).menu.file [G_msg "File"] \
+ [list [G_msg "Load State"] [G_msg "Save State"] \
+ {} \
+ [G_msg "Set Canvas Size"] \
+ {} \
+ [G_msg "Load 3d Settings"] [G_msg "Save 3d Settings"] \
+ {} \
+ [G_msg "Save image as..."] \
+ {} \
+ [G_msg "Reset"] [G_msg "Quit"] ] \
{0 0 0 0 0 0 0 0 0 0 0 0} \
{ "load_state" "save_state" \
"Separator" \
@@ -410,36 +420,36 @@
# Make a menu entry for scripting
- set scriptingbtn [menubutton $Nv_(AREA).menu.scripting -text "Scripting " \
+ set scriptingbtn [menubutton $Nv_(AREA).menu.scripting -text [G_msg "Scripting"] \
-menu $Nv_(AREA).menu.scripting.m -underline 0 ]
set scriptingmenu [menu $Nv_(AREA).menu.scripting.m]
- $scriptingmenu add checkbutton -label "On" \
+ $scriptingmenu add checkbutton -label [G_msg "On"] \
-onvalue 1 -offvalue 0 -variable ScriptState \
-command "script_handle_on"
$scriptingmenu add separator
- $scriptingmenu add command -label "Create New Scriptfile" \
+ $scriptingmenu add command -label [G_msg "Create New Scriptfile"] \
-underline 0 -command SetScriptFile
- $scriptingmenu add command -label "Open and Play Script" \
+ $scriptingmenu add command -label [G_msg "Open and Play Script"] \
-underline 0 -command {set ScriptPlaying 1 ; exec nviz -f $default_panel_path/script_play &}
- $scriptingmenu add command -label "Close Script" \
+ $scriptingmenu add command -label [G_msg "Close Script"] \
-underline 1 -command Nv_close_scripting
$scriptingmenu add separator
- $scriptingmenu add command -label "Add Script Line" \
+ $scriptingmenu add command -label [G_msg "Add Script Line"] \
-underline 0 -command AddScriptLine
- $scriptingmenu add command -label "Add Script Command" \
+ $scriptingmenu add command -label [G_msg "Add Script Command"] \
-underline 1 -command AddScriptCmd
$scriptingmenu add separator
- $scriptingmenu add command -label "Script Tools" \
+ $scriptingmenu add command -label [G_msg "Script Tools"] \
-underline 1 -command {exec nviz -f $default_panel_path/script_tools -q &}
set configmenu [Nv_mkConfigMenu $Nv_(AREA).menu.config]
@@ -484,9 +494,9 @@
-tearoff 0
$menu add command \
- -command dump_ppm -underline 0 -label "PPM Image"
+ -command dump_ppm -underline 0 -label [G_msg "PPM Image"]
$menu add command \
- -command dump_tif -underline 0 -label "TIFF Image"
+ -command dump_tif -underline 0 -label [G_msg "TIFF Image"]
$menu add command \
-command {set fname [create_file_browser .file_browser 1]
if {$fname != -1} then {
@@ -500,7 +510,7 @@
Nstart_zoom $fname $wid $ht
appNotBusy
}
- } -underline 0 -label "Maximum Resolution PPM"
+ } -underline 0 -label [G_msg "Maximum Resolution PPM"]
}
proc dump_ppm { } {
@@ -677,7 +687,7 @@
############################################################################
# procedure to make CONFIG pulldown menu
###########################################################################
-proc Nv_mkConfigMenu { P { name "Appearance " } } {
+proc Nv_mkConfigMenu { P { name "Appearance" } } {
global Nv_ DEBUG
menubutton $P -text $name -menu $P.m -underline 0
@@ -686,7 +696,7 @@
if {$DEBUG} {puts "Nv_mkConfigMenu 1"}
set j 0
- $P.m add command -label "Hide Panels" -command "hide_menus"
+ $P.m add command -label [G_msg "Hide Panels"] -command "hide_menus"
$P.m add separator
foreach i $Nv_(config) {
@@ -798,18 +808,18 @@
pack .canvas_size.f3 .canvas_size.f1 .canvas_size.f2 -side top \
-fill both -expand yes
- label .canvas_size.f3.l1 -text "Set Size of Display Canvas"
+ label .canvas_size.f3.l1 -text [G_msg "Set Size of Display Canvas"]
pack .canvas_size.f3.l1 -side top -fill both -expand no
- label .canvas_size.f1.l1 -text "Width"
+ label .canvas_size.f1.l1 -text [G_msg "Width"]
entry .canvas_size.f1.e1 -textvariable cwidth -width 6
- label .canvas_size.f1.l2 -text "Height"
+ label .canvas_size.f1.l2 -text [G_msg "Height"]
entry .canvas_size.f1.e2 -textvariable cheight -width 6
pack .canvas_size.f1.l1 .canvas_size.f1.e1 \
.canvas_size.f1.l2 .canvas_size.f1.e2 \
-side left -fill y
- checkbutton .canvas_size.f2.c1 -text "Unconstrained" -variable constrained \
+ checkbutton .canvas_size.f2.c1 -text [G_msg "Unconstrained"] -variable constrained \
-onvalue 1 -offvalue 0 -command {
if {$constrained} {
.canvas_size.f1.e1 configure -state disabled -bg grey
@@ -819,7 +829,7 @@
.canvas_size.f1.e2 configure -state normal -bg white
}
}
- button .canvas_size.f2.b1 -text "Close" \
+ button .canvas_size.f2.b1 -text [G_msg "Close"] \
-command {
if {$constrained} {
pack $Nv_(TOP).canvas -side top -fill both -expand yes
@@ -871,7 +881,7 @@
global Nv_
if {[catch {set file_hook [open $new_file r]} error_code] != 0} then {
- display_error "While opening file: $error_code"
+ display_error [G_msg "Error while opening file: %s" $error_code]
return
}
@@ -923,8 +933,8 @@
global Nv_
# Query user to verify this choice
- if {[tk_dialog .reset_all "Reset" \
- "Really reset Nviz?" {} 1 "Ok" "Cancel"] == 1} then return
+ if {[tk_dialog .reset_all [G_msg "Reset"] \
+ [G_msg "Really reset Nviz?"] {} 1 [G_msg "Ok"] [G_msg "Cancel"]] == 1} then return
# Show that we are busy
appBusy
@@ -1025,7 +1035,7 @@
}
if {[catch {set file_hook [open $new_file w]} error_code] != 0} then {
- display_error "While opening file: $error_code"
+ display_error [G_msg "Error while opening file: %s", $error_code]
return
}
@@ -1053,8 +1063,8 @@
# Routine to display error
###################################################
proc display_error { err_string } {
- tk_dialog .file_error "File Error" "$err_string" \
- error 0 "Dismiss"
+ tk_dialog .file_error [G_msg "File Error"] "$err_string" \
+ error 0 [G_msg "Dismiss"]
}
# Set the cancel function for drawing
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/panel_main.tcl
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/panel_main.tcl 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/panel_main.tcl 2010-11-18 14:41:45 UTC (rev 44354)
@@ -83,7 +83,7 @@
# Initialize panel info
if [catch {set Nv_($BASE)}] {
- set panel [St_create {window name size priority} $BASE "Main" 1 10]
+ set panel [St_create {window name size priority} $BASE [G_msg "Main"] 1 10]
} else {
set panel $Nv_($BASE)
}
@@ -104,64 +104,64 @@
set drawbtn [button $BASE.redrawf.f2.exec -text DRAW -bd 1 -fg "darkgreen"]
bind $drawbtn <1> "Nset_cancel 0"
bind $drawbtn <B1-ButtonRelease> {Ndraw_all}
- help $drawbtn balloon "Draw selected features"
+ help $drawbtn balloon [G_msg "Draw selected features"]
set clearbtn [button $BASE.redrawf.f2.clear -text Clear -bd 1 -command {do_clear}]
- help $clearbtn balloon "Clear NVIZ display"
+ help $clearbtn balloon [G_msg "Clear NVIZ display"]
set cancelbtn [button $BASE.redrawf.f2.cancel -text Cancel -bd 1 -command {Nset_cancel 1}]
- help $cancelbtn balloon "Cancel current draw"
+ help $cancelbtn balloon [G_msg "Cancel current draw"]
pack $drawbtn $clearbtn $cancelbtn \
-side left -expand 1 -fill x
# Auto check boxes
- set labl1 [label $BASE.redrawf.f1.label1 -text "Automatically render display:" -anchor w]
+ set labl1 [label $BASE.redrawf.f1.label1 -text [G_msg "Automatically render display:"] -anchor w]
set auto_d [checkbutton $BASE.redrawf.f1.autodraw \
-onvalue 1 -offvalue 0 -variable Nauto_draw \
-justify left -anchor center -padx 5]
- help $BASE.redrawf.f1.autodraw balloon "Automatically render display after changing parameters"
+ help $BASE.redrawf.f1.autodraw balloon [G_msg "Automatically render display after changing parameters"]
$auto_d select
pack $labl1 $auto_d -side left -expand 0 -fill x -pady 3
#checkbuttons for features to draw
- set labl2 [label $BASE.redrawf.f11.label1 -text "Show features:" -anchor w]
+ set labl2 [label $BASE.redrawf.f11.label1 -text [G_msg "Show features:"] -anchor w]
menubutton $BASE.redrawf.f11.m1 -menu $BASE.redrawf.f11.m1.m \
- -text "Main features..." -underline 0 -justify left \
+ -text [G_msg "Main features..."] -underline 0 -justify left \
-indicator on -anchor center -relief raised -bd 1
#help $BASE.redrawf.f11.m1 balloon "Select main draw features"
menubutton $BASE.redrawf.f11.m2 -menu $BASE.redrawf.f11.m2.m \
- -text "Decorations..." -underline 0 -justify left \
+ -text [G_msg "Decorations..."] -underline 0 -justify left \
-indicator on -anchor center -relief raised -bd 1
#help $BASE.redrawf.f11.m2 balloon "Select misc. draw features"
menu $BASE.redrawf.f11.m1.m
- $BASE.redrawf.f11.m1.m add checkbutton -label "Surface" \
+ $BASE.redrawf.f11.m1.m add checkbutton -label [G_msg "Surface"] \
-onvalue 1 -offvalue 0 -variable surface
- $BASE.redrawf.f11.m1.m add checkbutton -label "Vectors" \
+ $BASE.redrawf.f11.m1.m add checkbutton -label [G_msg "Vectors"] \
-onvalue 1 -offvalue 0 -variable vector
- $BASE.redrawf.f11.m1.m add checkbutton -label "Sites" \
+ $BASE.redrawf.f11.m1.m add checkbutton -label [G_msg "Sites"] \
-onvalue 1 -offvalue 0 -variable sites
- $BASE.redrawf.f11.m1.m add checkbutton -label "Volumes" \
+ $BASE.redrawf.f11.m1.m add checkbutton -label [G_msg "Volumes"] \
-onvalue 1 -offvalue 0 -variable volume
menu $BASE.redrawf.f11.m2.m
- $BASE.redrawf.f11.m2.m add checkbutton -label "Legend" \
+ $BASE.redrawf.f11.m2.m add checkbutton -label [G_msg "Legend"] \
-onvalue 1 -offvalue 0 -variable legend
- $BASE.redrawf.f11.m2.m add checkbutton -label "Labels" \
+ $BASE.redrawf.f11.m2.m add checkbutton -label [G_msg "Labels"] \
-onvalue 1 -offvalue 0 -variable labels
- $BASE.redrawf.f11.m2.m add checkbutton -label "North Arrow" \
+ $BASE.redrawf.f11.m2.m add checkbutton -label [G_msg "North Arrow"] \
-onvalue 1 -offvalue 0 -variable n_arrow
- $BASE.redrawf.f11.m2.m add checkbutton -label "Scale Bar" \
+ $BASE.redrawf.f11.m2.m add checkbutton -label [G_msg "Scale Bar"] \
-onvalue 1 -offvalue 0 -variable scalebar
- $BASE.redrawf.f11.m2.m add checkbutton -label "Fringe" \
+ $BASE.redrawf.f11.m2.m add checkbutton -label [G_msg "Fringe"] \
-onvalue 1 -offvalue 0 -variable fringe
pack $labl2 $BASE.redrawf.f11.m1 $BASE.redrawf.f11.m2 -side left \
@@ -172,13 +172,13 @@
pack [frame $BASE.midf -relief flat -bd 0] -side left -expand 1 -padx 5
# set view method radiobuttons
- set draw_lab [label $BASE.midt.lablev1 -text "View method:" -anchor w]
+ set draw_lab [label $BASE.midt.lablev1 -text [G_msg "View method:"] -anchor w]
- set draw_var1 [radiobutton $BASE.midt.b1 -text "eye" \
+ set draw_var1 [radiobutton $BASE.midt.b1 -text [G_msg "eye"] \
-variable draw_option -value 0 -width 4 \
-command "change_display 1" ]
- set draw_var2 [radiobutton $BASE.midt.b2 -text "center" \
+ set draw_var2 [radiobutton $BASE.midt.b2 -text [G_msg "center"] \
-variable draw_option -value 1 -width 6 \
-command "change_display 0" ]
@@ -187,9 +187,9 @@
-command "C2C 1" ]
$draw_var1 select
- help $BASE.midt.b1 balloon "Change view by moving eye position"
- help $BASE.midt.b2 balloon "Change view by moving scene center position"
- help $BASE.midt.b4 balloon "Click to change scene center position, scroll to zoom in and out"
+ help $BASE.midt.b1 balloon [G_msg "Change view by moving eye position"]
+ help $BASE.midt.b2 balloon [G_msg "Change view by moving scene center position"]
+ help $BASE.midt.b4 balloon [G_msg "Click to change scene center position, scroll to zoom in and out"]
if {$Nv_(FlyThrough)} {
mkFlyButtons $BASE "midt" $draw_lab $draw_var1 $draw_var2 $draw_var4
@@ -197,7 +197,7 @@
# original code
pack $draw_lab $draw_var1 $draw_var2 $draw_var4 -side left -expand 0
}
- help $BASE.midt.b3 balloon "Change view using mouse to control fly-through"
+ help $BASE.midt.b3 balloon [G_msg "Change view using mouse to control fly-through"]
# make position "widget"
set XY [Nv_mkXYScale $BASE.midf.pos puck XY_POS 125 125 105 105 update_eye_position]
@@ -206,28 +206,28 @@
set H [mk_hgt_slider $BASE.midf]
set E [mk_exag_slider $BASE.midf]
- help $E.scale balloon "Set vertical exaggeration"
- help $E.entry balloon "Set vertical exaggeration"
- help $H.scale balloon "Set eye height"
- help $H.entry balloon "Set eye height"
+ help $E.scale balloon [G_msg "Set vertical exaggeration"]
+ help $E.entry balloon [G_msg "Set vertical exaggeration"]
+ help $H.scale balloon [G_msg "Set eye height"]
+ help $H.entry balloon [G_msg "Set eye height"]
# make lookat buttons
frame $BASE.midf.lookat -relief flat -borderwidth 0
- Label $BASE.midf.lookat.l -text "Look"
- Button $BASE.midf.lookat.here -text "here" -bd 1 \
- -helptext "Center view at point marked with mouse click" \
+ Label $BASE.midf.lookat.l -text [G_msg "Look"]
+ Button $BASE.midf.lookat.here -text [G_msg "here"] -bd 1 \
+ -helptext [G_msg "Center view at point marked with mouse click"] \
-command {bind $Nv_(TOP).canvas <Button> {look_here %W %x %y
if {$Nauto_draw == 1} {Ndraw_all}
}}
- Button $BASE.midf.lookat.center -text "center" -bd 1 \
- -helptext "Center view at center of displayed surface" \
+ Button $BASE.midf.lookat.center -text [G_msg "center"] -bd 1 \
+ -helptext [G_msg "Center view at center of displayed surface"] \
-command { look_center
if {$Nauto_draw == 1} {Ndraw_all}
}
- Button $BASE.midf.lookat.top -text "top" -bd 1 \
- -helptext "View directly from above" \
+ Button $BASE.midf.lookat.top -text [G_msg "top"] -bd 1 \
+ -helptext [G_msg "View directly from above"] \
-command {
# Nv_itemDrag $Nv_(main_BASE).midf.pos $Nv_(XY_POS) 62.5 62.5
# note: below value is somewhat strange, but with 0.5 0.5 the map rotates:
@@ -250,13 +250,13 @@
set P [Nv_mkScale $BASE.bframe.cframe.pers h perspective 120 3 40 Nchange_persp 0]
set T [Nv_mkScale $BASE.bframe.cframe.tw h twist -180 180 0 Nchange_twist 0]
- help $BASE.bframe.cframe.pers balloon "Set field of view size (degrees)"
- help $BASE.bframe.cframe.tw balloon "Set twist angle (degrees)"
+ help $BASE.bframe.cframe.pers balloon [G_msg "Set field of view size (degrees)"]
+ help $BASE.bframe.cframe.tw balloon [G_msg "Set twist angle (degrees)"]
# reset button goes here so it can reference P
- Button $BASE.midf.lookat.reset -text "reset" \
+ Button $BASE.midf.lookat.reset -text [G_msg "reset"] \
-bd 1 -command "do_reset $XY $H $E $P $T" \
- -helptext "Reset view to default"
+ -helptext [G_msg "Reset view to default"]
pack $BASE.midf.lookat.l $BASE.midf.lookat.here \
$BASE.midf.lookat.center $BASE.midf.lookat.top \
@@ -519,12 +519,12 @@
if {$flag == 1} {
#draw eye position
- inform "Set eye position"
+ inform [G_msg "Set eye position"]
set XY [Nv_mkXYScale $NAME puck XY_POS 125 125 105 105 update_eye_position]
} elseif {$flag == 0} {
#draw center position
- inform "Set center of view position"
+ inform [G_msg "Set center of view position"]
set XY [Nv_mkXYScale $NAME cross XY_POS 125 125 109 109 update_center_position]
}
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/panel_vect.tcl
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/panel_vect.tcl 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/panel_vect.tcl 2010-11-18 14:41:45 UTC (rev 44354)
@@ -52,22 +52,22 @@
# Initialize panel info
if [catch {set Nv_($BASE)}] {
- set panel [St_create {window name size priority} $BASE "Vector Lines/3D Polygons" 2 5]
+ set panel [St_create {window name size priority} $BASE [G_msg "Vector Lines/3D Polygons"] 2 5]
} else {
set panel $Nv_($BASE)
}
frame $BASE -relief flat -borderwidth 0
- Nv_mkPanelname $BASE "Vector Lines Panel"
+ Nv_mkPanelname $BASE [G_msg "Vector Lines Panel"]
#create top frame
###### make widgets that control which is current surface (menu, new delete)###
set tmp [frame $BASE.top]
- Label $tmp.current -text "Current:" -anchor w
+ Label $tmp.current -text [G_msg "Current:"] -anchor w
mkMapList $tmp.list vect
- button $tmp.new -text New -anchor center -command "add_map vect" -bd 1
- button $tmp.delete -text Delete -anchor center -command "delete_map vect" -bd 1
+ button $tmp.new -text [G_msg "New"] -anchor center -command "add_map vect" -bd 1
+ button $tmp.delete -text [G_msg "Delete"] -anchor center -command "delete_map vect" -bd 1
pack $tmp.current $tmp.list -side left
pack $tmp.list -side left
@@ -79,7 +79,7 @@
set tmp [frame $BASE.f]
button $tmp.close -text Close -command "Nv_closePanel $BASE" -anchor s -bd 1
pack $tmp.close -side right
- button $tmp.draw_current -text "DRAW CURRENT" -bd 1 -fg darkgreen \
+ button $tmp.draw_current -text [G_msg "DRAW CURRENT"] -bd 1 -fg darkgreen \
-command {Nvect_draw_one [Nget_current vect]}
pack $tmp.draw_current -side left
pack $tmp -side bottom -fill x -expand 1 -padx 3
@@ -92,7 +92,7 @@
set row4 [frame $tmp.row4]
set tmp1a [frame $row1.b]
- set wlabel [label $row1.wlabel -text "line width" \
+ set wlabel [label $row1.wlabel -text [G_msg "line width"] \
-font $nviztxtfont -fg black]
set vlinewidth [SpinBox $row1.linewidth -range {1 50 1}\
@@ -103,18 +103,18 @@
-entrybg white]
# checkbutton $tmp.load -relief flat -text "Load to memory"
- set vcolor [button $row1.color -text Color -bd 1\
+ set vcolor [button $row1.color -text [G_msg "Color"] -bd 1\
-command "change_color vect $row1.color"]
bind $row1.color <Expose> "$row1.color configure -bg \[get_curr_sv_color vect\]"
- set rb1 [radiobutton $row2.label2 -text "display flat" \
+ set rb1 [radiobutton $row2.label2 -text [G_msg "display flat"] \
-variable flat_state -value 1 -command "check_list $row3.list"]
- set rb2 [radiobutton $row2.label1 -text "display on surface(s):" \
+ set rb2 [radiobutton $row2.label1 -text [G_msg "display on surface(s):"] \
-variable flat_state -value 0 \
-command "check_list $row3.list"]
- set htscale [Nv_mkScale $row4.scale h "vector height\nabove surface" 0 10000 $height set_ht 1]
+ set htscale [Nv_mkScale $row4.scale h [G_msg "vector height\nabove surface"] 0 10000 $height set_ht 1]
pack $wlabel $vlinewidth -side left
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/panel_vol.tcl
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/panel_vol.tcl 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/panel_vol.tcl 2010-11-18 14:41:45 UTC (rev 44354)
@@ -18,8 +18,8 @@
##########################################################################
namespace eval NV_panel_vol {
- variable res # polygon resolution
- variable viztype # isosurfaces or slices
+ variable res ;# polygon resolution
+ variable viztype ;# isosurfaces or slices
}
# initial visualization type
@@ -37,18 +37,18 @@
# Initialize panel info
if [catch {set Nv_($BASE)}] {
- set panel [St_create {window name size priority} $BASE "Volumes" 2 5]
+ set panel [St_create {window name size priority} $BASE [G_msg "Volumes"] 2 5]
} else {
set panel $Nv_($BASE)
}
frame $BASE -relief flat -borderwidth 0
- Nv_mkPanelname $BASE "Volume Panel"
+ Nv_mkPanelname $BASE [G_msg "Volume Panel"]
###### make widgets that control which is current volume #############
set tmp [frame $BASE.volcontrol]
- label $tmp.current -text "Current:" -anchor w
+ label $tmp.current -text [G_msg "Current:"] -anchor w
mkMapList $tmp.list vol
button $tmp.new -text New -anchor center -bd 1 -command new_vol
button $tmp.delete -text Delete -anchor center -bd 1 -command delete_vol
@@ -60,7 +60,7 @@
set tmp [frame $BASE.vistype]
#label $tmp.title -text "Visualization type: " -relief flat
- menubutton $tmp.list -menu $tmp.list.m -text "Visualization type..." -relief raised \
+ menubutton $tmp.list -menu $tmp.list.m -text [G_msg "Visualization type..."] -relief raised \
-indicator 1 -bd 1
set pname [menu $tmp.list.m]
$pname add radiobutton -label "isosurfaces" \
@@ -70,22 +70,22 @@
-command "shuffle_vistype $BASE slice" \
-variable viztype -value "slice"
- menubutton $tmp.shading -text "Shading..." -menu $tmp.shading.m \
+ menubutton $tmp.shading -text [G_msg "Shading..."] -menu $tmp.shading.m \
-relief raised -underline 0 -indicatoron 1 -bd 1
menu $tmp.shading.m
- $tmp.shading.m add radiobutton -label Flat -value flat \
+ $tmp.shading.m add radiobutton -label [G_msg "Flat"] -value flat \
-variable Nv_(ShadeStyle) -command {all_set_drawmode $viztype $Nv_(ShadeStyle)}
- $tmp.shading.m add radiobutton -label Gouraud -value gouraud \
+ $tmp.shading.m add radiobutton -label [G_msg "Gouraud"] -value gouraud \
-variable Nv_(ShadeStyle) -command {all_set_drawmode $viztype $Nv_(ShadeStyle)}
# position button
- button $tmp.position -text "Position" -command "mkVolPositionPanel .pos_vol" -bd 1
+ button $tmp.position -text [G_msg "Position"] -command "mkVolPositionPanel .pos_vol" -bd 1
pack $tmp.list $tmp.shading $tmp.position -side left -expand 1 -fill both
######## control for volume polygon resolution ###############
set tmp [frame $BASE.res]
- set reslabel [label $tmp.reslabel -text "Polygon resolution: "]
+ set reslabel [label $tmp.reslabel -text [G_msg "Polygon resolution: "]]
set sbres [SpinBox $tmp.sbres -range {1 100 1}\
-textvariable res \
-modifycmd {all_set_res $viztype $res} \
@@ -112,7 +112,7 @@
########## make button to close panel ################################
set tmp [frame $BASE.f]
button $tmp.close -text Close -command "Nv_closePanel $BASE" -bd 1
- button $tmp.draw_current -text "DRAW CURRENT" -bd 1 -fg darkgreen
+ button $tmp.draw_current -text [G_msg "DRAW CURRENT"] -bd 1 -fg darkgreen
bind $tmp.draw_current <1> "Nset_cancel 1"
bind $tmp.draw_current <B1-ButtonRelease> "Nvol_draw_one [Nget_current vol]"
@@ -438,27 +438,27 @@
# slice axes
set tmp [frame $pname.t2.t -borderwidth 0 -relief flat]
- radiobutton $tmp.xaxis -text "X-axis" -state disabled -anchor nw -value 0 \
+ radiobutton $tmp.xaxis -text [G_msg "X-axis"] -state disabled -anchor nw -value 0 \
-variable Nv_(SliceAxis) -command "slice_set_pos $pname"
- radiobutton $tmp.yaxis -text "Y-axis" -state disabled -anchor nw -value 1 \
+ radiobutton $tmp.yaxis -text [G_msg "Y-axis"] -state disabled -anchor nw -value 1 \
-variable Nv_(SliceAxis) -command "slice_set_pos $pname"
- radiobutton $tmp.zaxis -text "Z-axis" -state disabled -anchor nw -value 2 \
+ radiobutton $tmp.zaxis -text [G_msg "Z-axis"] -state disabled -anchor nw -value 2 \
-variable Nv_(SliceAxis) -command "slice_set_pos $pname"
pack $tmp.xaxis $tmp.yaxis $tmp.zaxis -expand 1 -side left
- button $tmp.transp -text "Transparency" -command "slice_set_transp" \
+ button $tmp.transp -text [G_msg "Transparency"] -command "slice_set_transp" \
-state disabled -bd 1
pack $tmp.transp -fill both -side right
# slice position
if {$Nv_(SliceAxis) == 2 } {
- set xtitle "azimuth"
- set ytitle "length"
- set ztitle "height"
+ set xtitle [G_msg "azimuth"]
+ set ytitle [G_msg "length"]
+ set ztitle [G_msg "height"]
} else {
- set xtitle "tilt"
- set ytitle "height"
- set ztitle "length"
+ set xtitle [G_msg "tilt"]
+ set ytitle [G_msg "height"]
+ set ztitle [G_msg "length"]
}
set tmp [frame $pname.t2.b1 -borderwidth 0 -relief flat]
@@ -489,15 +489,15 @@
set top [frame $tmp.top]
set bottom [frame $tmp.bottom]
- Button $top.add -text "Add" -command "slice_add $pname" -bd 1 \
- -helptext "Add new slice"
- Button $top.delete -text "Delete" -command "slice_del $pname" -bd 1\
- -helptext "Delete selected slice"
+ Button $top.add -text [G_msg "Add"] -command "slice_add $pname" -bd 1 \
+ -helptext [G_msg "Add new slice"]
+ Button $top.delete -text [G_msg "Delete"] -command "slice_del $pname" -bd 1\
+ -helptext [G_msg "Delete selected slice"]
- Button $bottom.up -text "Move Up" -command "slice_up $pname" -bd 1\
- -helptext "Move slice up in list"
- Button $bottom.down -text "Move Down" -command "slice_down $pname" -bd 1\
- -helptext "Move slice down in list"
+ Button $bottom.up -text [G_msg "Move Up"] -command "slice_up $pname" -bd 1\
+ -helptext [G_msg "Move slice up in list"]
+ Button $bottom.down -text [G_msg "Move Down"] -command "slice_down $pname" -bd 1\
+ -helptext [G_msg "Move slice down in list"]
pack $top.add $top.delete -side top -expand 1 -fill x
pack $bottom.down $bottom.up -side bottom -expand 1 -fill x
@@ -730,13 +730,13 @@
# update slice scale titles
proc set_scale_title { dir } {
if {$dir == 2 } {
- set xtitle "azimuth"
- set ytitle "length"
- set ztitle "height"
+ set xtitle [G_msg "azimuth"]
+ set ytitle [G_msg "length"]
+ set ztitle [G_msg "height"]
} else {
- set xtitle "tilt"
- set ytitle "height"
- set ztitle "length"
+ set xtitle [G_msg "tilt"]
+ set ytitle [G_msg "height"]
+ set ztitle [G_msg "length"]
}
set scaletitle [list $xtitle $ytitle $ztitle]
return $scaletitle
@@ -827,7 +827,7 @@
set tmp [frame $pname.t2 -relief flat -borderwidth 0]
# isosurface attributes
- menubutton $tmp.menu1 -menu $tmp.menu1.m -text "Isosurface attributes..." -relief raised \
+ menubutton $tmp.menu1 -menu $tmp.menu1.m -text [G_msg "Isosurface attributes..."] -relief raised \
-indicatoron 1 -bd 1 -state disabled
pack $tmp.menu1 -side left -fill y -padx 3 -pady 3
menu $tmp.menu1.m
@@ -836,7 +836,7 @@
}
# inout flag
- checkbutton $tmp.inout -text "toggle normal direction" -state disabled \
+ checkbutton $tmp.inout -text [G_msg "toggle normal direction"] -state disabled \
-variable Nv_(InoutFlag) -command "isosurf_set_flags $pname" \
-font $nviztxtfont
@@ -857,15 +857,15 @@
set top [frame $tmp.top]
set bottom [frame $tmp.bottom]
- Button $top.add -text "Add" -command "isosurf_add $pname" -bd 1 \
- -helptext "Add new isosurface"
- Button $top.delete -text "Delete" -command "isosurf_del $pname" -bd 1\
- -helptext "Delete selected isosurface"
+ Button $top.add -text [G_msg "Add"] -command "isosurf_add $pname" -bd 1 \
+ -helptext [G_msg "Add new isosurface"]
+ Button $top.delete -text [G_msg "Delete"] -command "isosurf_del $pname" -bd 1\
+ -helptext [G_msg "Delete selected isosurface"]
- Button $bottom.up -text "Move Up" -command "isosurf_up $pname" -bd 1\
- -helptext "Move isosurface up in list"
- Button $bottom.down -text "Move Down" -command "isosurf_down $pname" -bd 1\
- -helptext "Move isosurface own in list"
+ Button $bottom.up -text [G_msg "Move Up"] -command "isosurf_up $pname" -bd 1\
+ -helptext [G_msg "Move isosurface up in list"]
+ Button $bottom.down -text [G_msg "Move Down"] -command "isosurf_down $pname" -bd 1\
+ -helptext [G_msg "Move isosurface own in list"]
pack $top.add $top.delete -side top -expand 1 -fill x
pack $bottom.down $bottom.up -side bottom -expand 1 -fill x
@@ -1111,8 +1111,8 @@
# Create toplevel widget to hold everything
toplevel $w -class Dialog
- wm title $w "Position Volume"
- wm iconname $w "Attribute"
+ wm title $w [G_msg "Position Volume"]
+ wm iconname $w [G_msg "Attribute"]
# Get current surface attributes
set curr_vol [Nget_current vol]
@@ -1142,9 +1142,9 @@
# Create X, Y, and Z entry widgets along with Reset and Close buttons
frame $w.coords
- label $w.coords.z_lbl -text "Z:"
- label $w.coords.x_lbl -text "X:"
- label $w.coords.y_lbl -text "Y:"
+ label $w.coords.z_lbl -text [G_msg "Z:"]
+ label $w.coords.x_lbl -text [G_msg "X:"]
+ label $w.coords.y_lbl -text [G_msg "Y:"]
entry $w.coords.z_ent -width 5 -relief sunken
entry $w.coords.x_ent -width 5 -relief sunken
entry $w.coords.y_ent -width 5 -relief sunken
@@ -1166,8 +1166,8 @@
pack $w.coords -side top -in $w.bottom -fill both
frame $w.commands
- button $w.commands.reset -text "Reset" -command "$w.zslide set 0; Nv_itemDrag $w.pos $Nv_(VOL_POS) 63 63; Nv_xyCallback $update_routine 126 126 63 63"
- button $w.commands.close -text "Close" -command "destroy $w"
+ button $w.commands.reset -text [G_msg "Reset"] -command "$w.zslide set 0; Nv_itemDrag $w.pos $Nv_(VOL_POS) 63 63; Nv_xyCallback $update_routine 126 126 63 63"
+ button $w.commands.close -text [G_msg "Close"] -command "destroy $w"
pack $w.commands.reset $w.commands.close \
-side left -fill both -padx 3 -pady 3 -expand yes
pack $w.commands -in $w.bottom -fill both
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/panel_vquery.tcl
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/panel_vquery.tcl 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/panel_vquery.tcl 2010-11-18 14:41:45 UTC (rev 44354)
@@ -48,13 +48,13 @@
# Initialize panel info
if [catch {set Nv_($BASE)}] {
set panel [St_create {window name size priority} \
- $BASE "Vector Query" 1 5]
+ $BASE [G_msg "Vector Query"] 1 5]
} else {
set panel $Nv_($BASE)
}
frame $BASE -relief flat -bd 0
- Nv_mkPanelname $BASE "Vector Query Panel"
+ Nv_mkPanelname $BASE [G_msg "Vector Query Panel"]
# set highlight defaults
set highlight(COLOR) 1
@@ -80,12 +80,12 @@
frame $query.row1
set Nv_(PICK) 0
checkbutton $query.row1.on -variable Nv_(PICK) \
- -text "query on/off" \
+ -text [G_msg "query on/off"] \
-command "pick_set Nv_(PICK) $Nv_(TOP).canvas"
- Button $query.row1.addremovemap -text "Choose map(s)" \
+ Button $query.row1.addremovemap -text [G_msg "Choose map(s)"] \
-command "pick_GUI_addremovemap" -bd 1 \
- -helptext "Select/unselect vector map(s) to query"
+ -helptext [G_msg "Select/unselect vector map(s) to query"]
pack $query.row1.on $query.row1.addremovemap -side left -padx 3
pack $query.row1 -side top -expand 1 -fill both -pady 3 -padx 3
@@ -95,13 +95,13 @@
-editable 1 \
-textvariable maxdist \
-width 5 -entrybg white \
- -helptext "Set threshold distance for selecting objects"]
+ -helptext [G_msg "Set threshold distance for selecting objects"]]
label $query.row2.l -text "threshold dist" -fg black -font $nviztxtfont
rc_load_res "hyperlink.display.maxNumber" maxnumber 20
set Nv_(PICK_SHOW_HL) 0
- checkbutton $query.row2.hl -text "show hyperlink" \
+ checkbutton $query.row2.hl -text [G_msg "show hyperlink"] \
-variable Nv_(PICK_SHOW_HL) \
-command "pick_highlight_hyperlinks Nv_(PICK_SHOW_HL) $Nv_(TOP).canvas [expr $maxnumber - 1]"
@@ -110,38 +110,38 @@
# make frame and widgets for highlighting vector points
frame $ptsel.row1
- label $ptsel.row1.l -text "Highlight queried vector points with..."
+ label $ptsel.row1.l -text [G_msg "Highlight queried vector points with..."]
pack $ptsel.row1.l -side left -expand 0
pack $ptsel.row1 -side top -fill both -pady 3 -padx 3
frame $ptsel.row2
- checkbutton $ptsel.row2.color -text "color " -variable highlight(COLOR) \
+ checkbutton $ptsel.row2.color -text [G_msg "color"] -variable highlight(COLOR) \
-command {Nsite_highlight_set_default color $highlight(COLOR)}
Button $ptsel.row2.color_value -command "highlight_set_color $ptsel.row2.color_value" \
-bg $highlight(COLOR_VALUE) -width 0 -height 0 \
- -bd 1 -helptext "Choose color to indicate point queried"
+ -bd 1 -helptext [G_msg "Choose color to indicate point queried"]
- checkbutton $ptsel.row2.size -text "icon size X" -variable highlight(SIZE) \
+ checkbutton $ptsel.row2.size -text [G_msg "icon size X"] -variable highlight(SIZE) \
-command {Nsite_highlight_set_default size $highlight(SIZE)}
set ptsize [SpinBox $ptsel.row2.size_value \
-range {.5 5 .1} \
-textvariable highlight(SIZE_VALUE) \
-modifycmd {Nsite_highlight_set_default_value size $highlight(SIZE_VALUE)} \
- -width 4 -helptext "Choose size in multiples of default to indicate point queried"]
+ -width 4 -helptext [G_msg "Choose size in multiples of default to indicate point queried"]]
pack $ptsel.row2.color $ptsel.row2.color_value -side left -expand 0
pack $ptsel.row2.size_value $ptsel.row2.size -side right -expand 0
pack $ptsel.row2 -side top -expand 1 -fill both -pady 3 -padx 3
frame $ptsel.row3
- checkbutton $ptsel.row3.marker -text "specific icon " -variable highlight(MARKER) \
+ checkbutton $ptsel.row3.marker -text [G_msg "specific icon"] -variable highlight(MARKER) \
-command {Nsite_highlight_set_default marker $highlight(MARKER)}
highlight_set_marker_button $ptsel.row3.marker_value
pack $ptsel.row3.marker $ptsel.row3.marker_value -side left -expand 0
pack $ptsel.row3 -side top -expand 1 -fill both -pady 3 -padx 3
# make frame and widgets for panel bottom
- button $bottom.close -text Close \
+ button $bottom.close -text [G_msg "Close"] \
-command "Nv_closePanel $BASE" -bd 1
pack $bottom.close -side right
@@ -205,8 +205,8 @@
set rname [list]
foreach ele $r {lappend rname [$ele get_att map]}
- if {[addremove_list_create2 "Select vectors to query" \
- "vectors displayed" "vectors to query" lname rname l r]} {
+ if {[addremove_list_create2 [G_msg "Select vectors to query"] \
+ [G_msg "vectors displayed"] [G_msg "vectors to query"] lname rname l r]} {
# now r is modified and we have to set the differences from pick(MAP_LIST)
# add new pickable elements
@@ -423,7 +423,7 @@
set pick($sf.ROW) 0
- button $w.b -text "clear" -command "pick_clear_window $win $sf $_map" -bd 1
+ button $w.b -text [G_msg "clear"] -command "pick_clear_window $win $sf $_map" -bd 1
grid $w.b -row $pick($sf.ROW) -column 0 -columnspan 2 -sticky nsw
incr pick($sf.ROW)
@@ -493,7 +493,7 @@
}
proc pick_clear_window {w sf _map} {
- if {![confirm_ask "Clear Window?" "Yes" "No"]} {return}
+ if {![confirm_ask [G_msg "Clear Window?"] [G_msg "Yes"] [G_msg "No"]]} {return}
# catch {destroy $w}
pick_erase_records $sf
pick_delete_records $sf
@@ -610,12 +610,12 @@
proc highlight_set_marker_button {_w} {
global highlight
- set highlight(MARKERS_NAME) {"x" "sphere" "diamond" "cube" "box" "gyro" "aster"}
+ set highlight(MARKERS_NAME) [list {x} [G_msg "sphere"] [G_msg "diamond"] [G_msg "cube"] [G_msg "box"] [G_msg "gyro"] [G_msg "aster"]]
set highlight(MARKERS_INDEX) {"1" "3" "5" "4" "2" "9" "8"}
set m $_w
menubutton $m -menu $m.m -relief raised -indicatoron 1 \
- -bd 1 -text "set icon" -width 10
+ -bd 1 -text [G_msg "set icon"] -width 10
#pack $m -side left -fill y -padx 3 -pady 3
menu $m.m -tearoff 0
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/script_file_tools
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/script_file_tools 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/script_file_tools 2010-11-18 14:41:45 UTC (rev 44354)
@@ -33,29 +33,29 @@
wm resizable . true false
# Titlebar
-label .title -text "Map Object File Sequencing" -relief raised
+label .title -text [G_msg "Map Object File Sequencing"] -relief raised
pack .title -side top -fill x -expand yes
frame .controls
# Create buttons for adding fields
frame .controls.fields -relief groove -bd 2
set rname .controls.fields
-label $rname.title -text "Fields:"
-button $rname.add -text "Add" -command "add_field"
-button $rname.delete -text "Delete" -command "delete_field"
-button $rname.state -text "State File: None" -command "change_state_file"
+label $rname.title -text [G_msg "Fields:"]
+button $rname.add -text [G_msg "Add"] -command "add_field"
+button $rname.delete -text [G_msg "Delete"] -command "delete_field"
+button $rname.state -text [G_msg "State File: None"] -command "change_state_file"
pack $rname.title $rname.add $rname.delete $rname.state \
-fill x -expand no -padx 2 -pady 2
# Create buttons for cancelling or accepting
frame .controls.options -relief groove -bd 2
set rname .controls.options
-label $rname.title -text "Options:"
-button $rname.cancel -text "Done" -command "done_script"
-button $rname.accept -text "Add To Script" -command "build_script"
-button $rname.build -text "Build Script..." -command "build_standalone_script"
-button $rname.load -text "Load Fields..." -command "load_fields"
-button $rname.save -text "Save Fields..." -command "save_fields"
+label $rname.title -text [G_msg "Options:"]
+button $rname.cancel -text [G_msg "Done"] -command "done_script"
+button $rname.accept -text [G_msg "Add To Script"] -command "build_script"
+button $rname.build -text [G_msg "Build Script..."] -command "build_standalone_script"
+button $rname.load -text [G_msg "Load Fields..."] -command "load_fields"
+button $rname.save -text [G_msg "Save Fields..."] -command "save_fields"
pack $rname.title $rname.cancel $rname.accept \
$rname.build $rname.load $rname.save\
@@ -72,7 +72,7 @@
# This frame created to display frame numbers next to the list of
# files in fields
frame .fields.display_area.frames -relief groove -bd 2 -width 2c -height 6c
-label .fields.display_area.frames.l1 -text "Frame"
+label .fields.display_area.frames.l1 -text [G_msg "Frame"]
label .fields.display_area.frames.l2 -text " "
listbox .fields.display_area.frames.frame_list \
-yscrollcommand ".fields.scrolly set" -height 9
@@ -108,9 +108,9 @@
# First make sure we're not overwriting something...
if {$FieldsChanged} then {
- if {[tk_dialog .verify "Verify" "Current fields have not been saved, really load new fields?" \
+ if {[tk_dialog .verify [G_msg "Verify"] [G_msg "Current fields have not been saved, really load new fields?"] \
@/usr/local/lib/tk/bitmaps/warning \
- 1 "Ok" "Cance'"] == 1} then {
+ 1 [G_msg "Ok"] [G_msg "Cancel"]] == 1} then {
# Cancel the exit
return
}
@@ -123,7 +123,7 @@
# Read in each of the file fields one at a time, and create
# Field_Data as appropriate
if {[catch {set file_hook [open $new_file r]} error_code] != 0} then {
- display_error "While opening file: $error_code"
+ display_error [G_msg "Error while opening file: %s", $error_code]
return
}
@@ -132,14 +132,14 @@
# Read in state file
if {[catch {gets $file_hook state_file} error_code] != 0} then {
- display_error "While reading state_file: $error_code"
+ display_error [G_msg "While reading state_file: %s", $error_code]
return
}
set_new_state_file $state_file
# Get number of fields
if {[catch {gets $file_hook num_fields} error_code] != 0} then {
- display_error "While reading number of fields: $error_code"
+ display_error [G_msg "While reading number of fields: %s", $error_code]
return
}
@@ -148,13 +148,13 @@
for {set i 0} {$i < $num_fields} {incr i} {
# Input field type
if {[catch {gets $file_hook field_type} error_code] != 0} then {
- display_error "While reading field type: $error_code"
+ display_error [G_msg "While reading field type: %s", $error_code]
return
}
# Input field attribute
if {[catch {gets $file_hook field_att} error_code] != 0} then {
- display_error "While reading field attribute: $error_code"
+ display_error [G_msg "While reading field attribute: %s", $error_code]
return
}
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/script_get_line
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/script_get_line 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/script_get_line 2010-11-18 14:41:45 UTC (rev 44354)
@@ -12,11 +12,11 @@
# Create a simple label and entry widget
set done -1
-label .l -text "Add Script Line"
+label .l -text [G_msg "Add Script Line"]
entry .e -width 80 -relief sunken
frame .f
-button .f.bok -text "Ok" -command {set done 1}
-button .f.bcancel -text "Cancel" -command {set done 0}
+button .f.bok -text [G_msg "Ok"] -command {set done 1}
+button .f.bcancel -text [G_msg "Cancel"] -command {set done 0}
pack .f.bok .f.bcancel -side left -fill both -expand yes
pack .l .e .f -fill x
tkwait variable done
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/script_play
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/script_play 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/script_play 2010-11-18 14:41:45 UTC (rev 44354)
@@ -27,9 +27,9 @@
if {[file isfile $NvizPlayScript]} {
set new_file "$NvizPlayScript"
} else {
- tk_dialog .file_error "File Error" \
- "Script file $NvizPlayScript does not exist" \
- error 0 "Dismiss"
+ tk_dialog .file_error [G_msg "File Error"] \
+ [G_msg "Script file %s does not exist", $NvizPlayScript] \
+ error 0 [G_msg "Dismiss"]
exit
}
} else {
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/script_tools
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/script_tools 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/script_tools 2010-11-18 14:41:45 UTC (rev 44354)
@@ -29,22 +29,22 @@
set floop_names [list]
# Tools for vanilla looping
-button .loop_start -text "Open Loop" -command open_loop -bg aquamarine
-button .loop_end -text "Close Loop" -command close_loop -bg aquamarine
+button .loop_start -text [G_msg "Open Loop"] -command open_loop -bg aquamarine
+button .loop_end -text [G_msg "Close Loop"] -command close_loop -bg aquamarine
pack .loop_start .loop_end -side top -fill both -expand 1
# Tools for file sequence looping
-button .floop_start -text "Open File Seq. Loop" -command fopen_loop -bg burlywood
-button .floop_end -text "Close File Seq. Loop" -command fclose_loop -bg burlywood
+button .floop_start -text [G_msg "Open File Seq. Loop"] -command fopen_loop -bg burlywood
+button .floop_end -text [G_msg "Close File Seq. Loop"] -command fclose_loop -bg burlywood
pack .floop_start .floop_end -side top -fill both -expand 1
# Tools for more general file sequence looping
-button .file_sequence_tools -text "File Sequence Tool" \
+button .file_sequence_tools -text [G_msg "File Sequence Tool"] \
-command fopen_tools -bg cornflowerblue
pack .file_sequence_tools -side top -fill both -expand 1
# Quit button
-button .quit -text "Close" -command "exit"
+button .quit -text [G_msg "Close"] -command "exit"
pack .quit -side top -fill both -expand 1
# File Sequence Tools open function
@@ -101,14 +101,14 @@
# Determine how many iterations the loop should go through
set loop_flag 0
toplevel .loop_data
- label .loop_data.start_val_l -text "Loop Start Value"
+ label .loop_data.start_val_l -text [G_msg "Loop Start Value"]
entry .loop_data.start_val -relief sunken
- label .loop_data.end_val_l -text "Loop End Value"
+ label .loop_data.end_val_l -text [G_msg "Loop End Value"]
entry .loop_data.end_val -relief sunken
- label .loop_data.incr_val_l -text "Loop Increment Value"
+ label .loop_data.incr_val_l -text [G_msg "Loop Increment Value"]
entry .loop_data.incr_val -relief sunken
- button .loop_data.ok -text "Accept" -command "set loop_flag 1"
- button .loop_data.cancel -text "Cancel" -command "set loop_flag -1"
+ button .loop_data.ok -text [G_msg "Accept"] -command "set loop_flag 1"
+ button .loop_data.cancel -text [G_msg "Cancel"] -command "set loop_flag -1"
pack .loop_data.start_val_l .loop_data.start_val \
.loop_data.end_val_l .loop_data.end_val \
.loop_data.incr_val_l .loop_data.incr_val \
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/site_attr.tcl
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/site_attr.tcl 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/site_attr.tcl 2010-11-18 14:41:45 UTC (rev 44354)
@@ -74,7 +74,7 @@
{{All files} * }
}
- set site_attr(MARKERS_NAME) {"histogram" "x" "sphere" "cube" "box" "diamond" "gyro" "aster"}
+ set site_attr(MARKERS_NAME) [list [G_msg "histogram"] {x} [G_msg "sphere"] [G_msg "cube"] [G_msg "box"] [G_msg "diamond"] [G_msg "gyro"] [G_msg "aster"]]
set site_attr(MARKERS_INDEX) {"10" "1" "3" "4" "2" "5" "9" "8"}
set site_attr(FIRST_ROW) 1
@@ -408,24 +408,24 @@
"size" {
set which "entries"
set apply_msg \
- "Fill 2 or more entry fields with \
+ [G_msg "Fill 2 or more entry fields with \
desired min and max values,\
then press \[Apply\]. \
Or press \[Auto\] to automatically \
- generate a range of symbol sizes."
+ generate a range of symbol sizes."]
}
"color" {
set which "colors"
set apply_msg \
- "Fill 2 or more entry fields with desired\
+ [G_msg "Fill 2 or more entry fields with desired\
colors, then press \[Apply\].\
Or press \[Auto\] to automatically\
- generate a color table."
+ generate a color table."]
}
default {
- puts "WARNING: No thematic mapping preferences set for $site_attr($_idx.ATTR)!"
+ puts [G_msg "WARNING: No thematic mapping preferences set for %s!", $site_attr($_idx.ATTR)]
}
}
@@ -444,11 +444,11 @@
set site_attr($_idx.WIN_CMD) $w
# Attribute
- label $w.attr -text "Vary point $site_attr($_idx.ATTR)"
+ label $w.attr -text [G_msg "Vary point %s", $site_attr($_idx.ATTR)]
pack $w.attr -pady 1 -padx 0 -fill x -side top
# Field
- label $w.field -text "GIS attribute: $site_attr($_idx.NAME)"
+ label $w.field -text [G_msg "GIS attribute: %s", $site_attr($_idx.NAME)]
pack $w.field -padx 0 -fill x -side top
# Type
@@ -457,7 +457,7 @@
} else {
set type "numeric"
}
- label $w.type -text "Attribute type: $type"
+ label $w.type -text [G_msg "Attribute type: %s", $type]
pack $w.type -padx 0 -fill x -side top
# Instructions
@@ -469,20 +469,20 @@
frame $w.buttons -borderwidth 0 -relief flat
# Apply
- Button $w.buttons.apply -text "Apply" -bd 1 -width 6 \
+ Button $w.buttons.apply -text [G_msg "Apply"] -bd 1 -width 6 \
-command "site_attr_set_$which $_idx" \
- -helptext "Apply current thematic preferences to point display"
+ -helptext [G_msg "Apply current thematic preferences to point display"]
# Auto
- Button $w.buttons.auto -text "Auto" -bd 1 -width 6\
+ Button $w.buttons.auto -text [G_msg "Auto"] -bd 1 -width 6\
-command "site_attr_set_auto_$which $_idx" \
- -helptext "Automatically generate a color \
- table distributed across range of attribute values"
+ -helptext [G_msg "Automatically generate a color \
+ table distributed across range of attribute values"]
# Clear
- Button $w.buttons.reset -text "Reset" -bd 1 -width 6\
+ Button $w.buttons.reset -text [G_msg "Reset"] -bd 1 -width 6\
-command "site_attr_clear_lut_win $_idx" \
- -helptext "Clear all thematic settings"
+ -helptext [G_msg "Clear all thematic settings"]
#pack $w.reset.set -side top -pady 5
pack $w.buttons.apply $w.buttons.auto $w.buttons.reset \
@@ -492,7 +492,7 @@
# Theme prefs management
set site_attr($_idx.EXTERNAL_LUT_PANEL) 0
frame $w.external_lut -borderwidth 0 -relief flat
- checkbutton $w.external_lut.set -text "Load/save theme preferences" \
+ checkbutton $w.external_lut.set -text [G_msg "Load/save theme preferences"] \
-variable site_attr($_idx.EXTERNAL_LUT_PANEL) -command "site_attr_external_lut $_idx $w.external_lut"
pack $w.external_lut.set -side top
pack $w.external_lut -padx 0 -fill x -side top
@@ -525,21 +525,21 @@
# External LUT manipulation
frame $w.lut_choice -borderwidth 0
frame $w.lut_choice.a -borderwidth 0
- label $w.lut_choice.a.title -text "Select thematic prefs to use"
+ label $w.lut_choice.a.title -text [G_msg "Select thematic prefs to use"]
pack $w.lut_choice.a.title -side top -pady 1
- radiobutton $w.lut_choice.a.local -relief flat -text "current prefs" \
+ radiobutton $w.lut_choice.a.local -relief flat -text [G_msg "current prefs"] \
-value 0 -anchor nw -variable site_attr($_idx.USE_EXTERNAL_VALUES) \
-command "site_attr_lut_local $_idx"
pack $w.lut_choice.a.local -fill x -expand 1 -side top
- radiobutton $w.lut_choice.a.external -relief flat -text "prefs. from file" \
+ radiobutton $w.lut_choice.a.external -relief flat -text [G_msg "prefs. from file"] \
-value 1 -anchor nw -variable site_attr($_idx.USE_EXTERNAL_VALUES)
bind $w.lut_choice.a.external <ButtonRelease> "site_attr_lut_external $_idx %X %Y"
pack $w.lut_choice.a.external -fill x -expand 1 -side top
label $w.lut_choice.a.external_lab -fg black -font $nviztxtfont \
- -text "(preserves current prefs.)"
+ -text [G_msg "(preserves current prefs.)"]
pack $w.lut_choice.a.external_lab -side top
pack $w.lut_choice.a -side top -pady 3 -fill x
@@ -550,12 +550,12 @@
set lut_label $site_attr($lut_id.NAME)
set lut_command "site_attr_lut_open_win $lut_id"
} else {
- set lut_label "no prefs loaded"
+ set lut_label [G_msg "no prefs loaded"]
set lut_command ""
}
frame $w.lut_choice.b -borderwidth 0
- label $w.lut_choice.b.ext_lab -text "View loaded thematic prefs"
+ label $w.lut_choice.b.ext_lab -text [G_msg "View loaded thematic prefs"]
pack $w.lut_choice.b.ext_lab -side top
set site_attr($_idx.EXTERNAL_LUT_BUTTON) \
@@ -567,19 +567,19 @@
frame $w.io -borderwidth 0
frame $w.io.import_lut -borderwidth 0
- label $w.io.import_lut.a -text "Load and save prefs."
+ label $w.io.import_lut.a -text [G_msg "Load and save prefs."]
pack $w.io.import_lut.a -side top
- Button $w.io.import_lut.b -text "Load prefs" -width 15 -bd 1 \
+ Button $w.io.import_lut.b -text [G_msg "Load prefs"] -width 15 -bd 1 \
-command "site_attr_lut_import $_idx" \
- -helptext "Replace current themes with prefs loaded from file"
+ -helptext [G_msg "Replace current themes with prefs loaded from file"]
pack $w.io.import_lut.b -side top
bind $w.io.import_lut.b <ButtonPress> "site_attr_pick_mouse_XY %X %Y"
pack $w.io.import_lut -pady 3 -padx 0 -side top -fill x
frame $w.io.export_lut -borderwidth 0
- Button $w.io.export_lut.b -text "Save prefs" -width 15 -bd 1 \
+ Button $w.io.export_lut.b -text [G_msg "Save prefs"] -width 15 -bd 1 \
-command "site_attr_lut_export $_idx" \
- -helptext "Copy current themes to prefs loaded from file"
+ -helptext [G_msg "Copy current themes to prefs loaded from file"]
pack $w.io.export_lut.b -side top
bind $w.io.export_lut.b <ButtonPress> "site_attr_pick_mouse_XY %X %Y"
pack $w.io.export_lut -pady 3 -padx 0 -side top -fill x
@@ -857,7 +857,7 @@
set len [llength $site_attr($_idx.YLIST)]
if {$len < 2} {
- tk_messageBox -icon warning -message "Too few values: at least 2!" -type ok -parent $site_attr($_idx.WIN_CMD)
+ tk_messageBox -icon warning -message [G_msg "Too few values: at least 2!"] -type ok -parent $site_attr($_idx.WIN_CMD)
} else {
site_attr_update_entries $_idx
}
@@ -912,7 +912,7 @@
global site_attr
if {[site_attr_read_gui_colors $_idx] < 2} {
- tk_messageBox -icon warning -message "Too few values: at least 2!" -type ok -parent $site_attr($_idx.WIN_CMD)
+ tk_messageBox -icon warning -message [G_msg "Too few values: at least 2!"] -type ok -parent $site_attr($_idx.WIN_CMD)
} else {
site_attr_update_colors $_idx
site_attr_update_gui_colors $_idx
@@ -1104,7 +1104,7 @@
switch [llength $site_attr(LUT_LIST)] {
0 {
- tk_messageBox -icon warning -message "No prefs file loaded" -type ok -parent $site_attr($_idx.WIN_CMD)
+ tk_messageBox -icon warning -message [G_msg "No prefs file loaded"] -type ok -parent $site_attr($_idx.WIN_CMD)
set site_attr($_idx.USE_EXTERNAL_VALUES) 0
}
1 {site_attr_lut_set_external $_idx [lindex $site_attr(LUT_LIST) 0]}
@@ -1143,7 +1143,7 @@
global site_attr
if {$site_attr($_idx.TYPE) != $site_attr($_lut_id.TYPE)} {
- tk_messageBox -icon warning -message "Thematic prefs and attribute have different types" -type ok -parent $site_attr($_idx.WIN_CMD)
+ tk_messageBox -icon warning -message [G_msg "Thematic prefs and attribute have different types"] -type ok -parent $site_attr($_idx.WIN_CMD)
set site_attr($_idx.USE_EXTERNAL_VALUES) $site_attr($_idx.USING_EXTERNAL_VALUES)
return
}
@@ -1194,7 +1194,7 @@
global site_attr
switch [llength $site_attr(LUT_LIST)] {
- 0 {tk_messageBox -icon warning -message "No prefs file loaded" -type ok -parent $site_attr($_idx.WIN_CMD)}
+ 0 {tk_messageBox -icon warning -message [G_msg "No prefs file loaded"] -type ok -parent $site_attr($_idx.WIN_CMD)}
1 {site_attr_lut_import_attr $_idx [lindex $site_attr(LUT_LIST) 0]}
default {site_attr_lut_popup $_idx site_attr_lut_import_attr}
}
@@ -1204,7 +1204,7 @@
global site_attr
if {$site_attr($_idx.TYPE) != $site_attr($_lut_id.TYPE)} {
- tk_messageBox -icon warning -message "Thematic prefs and attributes have different types" -type ok -parent $site_attr($_idx.WIN_CMD)
+ tk_messageBox -icon warning -message [G_msg "Thematic prefs and attributes have different types"] -type ok -parent $site_attr($_idx.WIN_CMD)
return
}
@@ -1268,7 +1268,7 @@
catch {destroy $m}
menu $m -tearoff 0
- if {$_new != "no" } {$m add command -label "New" -command "$_command $_idx $_new"}
+ if {$_new != "no" } {$m add command -label [G_msg "New"] -command "$_command $_idx $_new"}
foreach lut_id $site_attr(LUT_LIST) {
$m add command -label "$site_attr($lut_id.NAME)" -command "$_command $_idx $lut_id"
@@ -1405,7 +1405,7 @@
set row_val "label \$w.l\$row -bg \$val -width 3 -borderwidth 1 -relief raised"
}
default {
- puts "WARNING: No attribute behaviour for $site_attr($_lut_id.ATTR)!"
+ puts [G_msg "WARNING: No attribute behaviour for %s!", $site_attr($_lut_id.ATTR)]
return
}
}
@@ -1415,11 +1415,11 @@
catch {destroy $win}
toplevel $win
wm resizable $win true true
- wm title $win "Thematic prefs file $_lut_id"
+ wm title $win [G_msg "Thematic prefs file %s", $_lut_id]
bind $win <Destroy> "site_attr_lut_destroy_win $_lut_id $win %W"
set w [frame $win.left]
- label $w.name -text "Name: $site_attr($_lut_id.NAME)" -pady 2
+ label $w.name -text [G_msg "Name: %s", $site_attr($_lut_id.NAME)] -pady 2
pack $w.name -pady 1 -fill x -side top
if {$site_attr($_lut_id.TYPE) == "s"} {
@@ -1431,12 +1431,12 @@
pack $w.type -pady 1 -padx 0 -fill x -side top
frame $w.buttons
- Button $w.buttons.save -text "Save" -bd 1 -width 6 \
+ Button $w.buttons.save -text [G_msg "Save"] -bd 1 -width 6 \
-command "site_attr_lut_save $_lut_id" \
- -helptext "Save thematic prefs in file"
- Button $w.buttons.delete -text "Clear" -bd 1 -width 6 \
+ -helptext [G_msg "Save thematic prefs in file"]
+ Button $w.buttons.delete -text [G_msg "Clear"] -bd 1 -width 6 \
-command "site_attr_lut_destroy $_lut_id" \
- -helptext "Clear current thematic prefs"
+ -helptext [G_msg "Clear current thematic prefs"]
pack $w.buttons.save -side left -expand 0 -fill x
pack $w.buttons.delete -side right -expand 0 -fill x
@@ -1490,11 +1490,11 @@
set m $_win.lut_menu
catch {destroy $m}
- menubutton $m -menu $m.m -relief raised -indicatoron 1 -bd 1 -text "Load Thematic Prefs"
+ menubutton $m -menu $m.m -relief raised -indicatoron 1 -bd 1 -text [G_msg "Load Thematic Prefs"]
bind $m <Destroy> "site_attr_lut_menu_destroy %W"
menu $m.m -tearoff 0
- $m.m add command -label "Load file" -command "site_attr_lut_create_win \[site_attr_lut_load\]"
+ $m.m add command -label [G_msg "Load file"] -command "site_attr_lut_create_win \[site_attr_lut_load\]"
foreach lut_id $site_attr(LUT_LIST) {
site_attr_lut_menu_add $lut_id
@@ -1574,12 +1574,12 @@
proc site_attr_lut_save {_lut_id} {
global site_attr
- set filename [tk_getSaveFile -initialdir $site_attr(LUT_DIR) -initialfile $site_attr($_lut_id.NAME) -filetypes $site_attr(LUT_FILETYPES) -title "Save thematic prefs"]
+ set filename [tk_getSaveFile -initialdir $site_attr(LUT_DIR) -initialfile $site_attr($_lut_id.NAME) -filetypes $site_attr(LUT_FILETYPES) -title [G_msg "Save thematic prefs"]]
if {$filename != ""} {
if {[file exists $filename]} {
file delete -force -- $filename
- puts "Old LUT \"$filename\" deleted"
+ puts [G_msg "Old LUT \"%s\" deleted", $filename]
}
# file is new
site_attr_lut_write $_lut_id [site_attr_lut_file_from_name $filename]
@@ -1604,7 +1604,7 @@
close $fileId
set site_attr($_lut_id.NAME) [site_attr_lut_name_from_file $_filename]
- puts "Thematic preferences file \"$name\" saved"
+ puts [G_msg "Thematic preferences file \"%s\" saved", $name]
}
@@ -1613,18 +1613,18 @@
global site_attr
if {$filename == ""} {
- set filename [tk_getOpenFile -initialdir $site_attr(LUT_DIR) -filetypes $site_attr(LUT_FILETYPES) -title "Load thematic prefs"]
+ set filename [tk_getOpenFile -initialdir $site_attr(LUT_DIR) -filetypes $site_attr(LUT_FILETYPES) -title [G_msg "Load thematic prefs"]]
}
if {$filename == ""} {return}
if {![file exists $filename]} {
- puts "*** WARNING *** File $filename is unavailable"
+ puts [G_msg "*** WARNING *** File \"%s\" is unavailable", $filename]
return ""
}
if {[site_attr_lut_read $filename] < 5} {
- puts "*** ERROR *** Some thematic pref component are missing in file \"$filename\""
+ puts [G_msg "*** ERROR *** Some thematic pref component are missing in file \"%s\"", $filename]
return ""
}
@@ -1697,7 +1697,7 @@
}
}
default {
- puts "WARNING: Unknown Tag \"$tag_name\" in file \"$_filename\""
+ puts [G_msg "WARNING: Unknown Tag \"%s\" in file \"%s\"", $tag_name, $_filename]
}
}
# foreach elt $tag_list {puts "*** $elt ***"}
@@ -1767,7 +1767,7 @@
"size" {set st_att [Nsite_attr_get_value "ST_ATT_SIZE"]}
"color" {set st_att [Nsite_attr_get_value "ST_ATT_COLOR"]}
"marker" {set st_att [Nsite_attr_get_value "ST_ATT_MARKER"]}
- default {puts "WARNING: Unknown attribute $_attr!"; return $ret_list}
+ default {puts [G_msg "WARNING: Unknown attribute %s!", $_attr]; return $ret_list}
}
set max [Nsite_attr_get_value "GPT_MAX_ATTR"]
@@ -1788,14 +1788,14 @@
incr index
}
}
- if {$not_found} {puts "WARNING: field $_field NOT FOUND"; return}
+ if {$not_found} {puts [G_msg "WARNING: field %s NOT FOUND", $_field]; return}
# verify if lut with this name is already loaded
set lut_id [site_attr_lut_id_from_name [site_attr_lut_name_from_file $_lut_name]]
if {$lut_id == "NO_LUT"} {
# if not, load it!
set lut_id [site_attr_lut_load [file join $site_attr(LUT_DIR) [site_attr_lut_file_from_name $_lut_name]]]
- if {$lut_id == ""} {puts "WARNING: lut file [site_attr_lut_file_from_name $_lut_name] NOT FOUND"; return}
+ if {$lut_id == ""} {puts [G_msg "WARNING: lut file %s NOT FOUND", [site_attr_lut_file_from_name $_lut_name]]; return}
}
# FROM HERE ON EVERITHING SHOULD BE OK
@@ -1849,7 +1849,7 @@
"size" {set st_att [Nsite_attr_get_value "ST_ATT_SIZE"]}
"color" {set st_att [Nsite_attr_get_value "ST_ATT_COLOR"]}
"marker" {set st_att [Nsite_attr_get_value "ST_ATT_MARKER"]}
- default {puts "WARNING: Unknown attribute $_attr!"; return $ret_list}
+ default {puts "WARNING: Unknown attribute %s!", $_attr]; return $ret_list}
}
for {set nattr 0} {$nattr < $max} {incr nattr} {
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/widgets.tcl
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/widgets.tcl 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/widgets.tcl 2010-11-18 14:41:45 UTC (rev 44354)
@@ -593,7 +593,7 @@
set name [Nget_current $type]
if {[llength $list] == 0} {
- set name "None Loaded "
+ set name [G_msg "None Loaded"]
} else {
set n [lsearch $list $name]
set list [lreplace $list $n $n]
Modified: grass/branches/develbranch_6/visualization/nviz/scripts/wirecolorPopup.tcl
===================================================================
--- grass/branches/develbranch_6/visualization/nviz/scripts/wirecolorPopup.tcl 2010-11-18 09:35:53 UTC (rev 44353)
+++ grass/branches/develbranch_6/visualization/nviz/scripts/wirecolorPopup.tcl 2010-11-18 14:41:45 UTC (rev 44354)
@@ -27,7 +27,7 @@
catch {destroy $w}
toplevel $w -class Dialog
- wm title $w "Select Wire Color"
+ wm title $w [G_msg "Select Wire Color"]
wm iconname $w "Color"
wm geometry $w 300x450
wm minsize $w 50 100
@@ -54,7 +54,7 @@
frame $w.top -relief raised -border 1
frame $w.bot -relief raised -border 1
- checkbutton $w.usemap -text "use surface color" -onvalue UseMap \
+ checkbutton $w.usemap -text [G_msg "use surface color"] -onvalue UseMap \
-offvalue 0 -variable CurrWireColor
frame $w.top.left
Nv_mkWireColorScale $w.top.left Red $r red $w.top.color
@@ -77,7 +77,7 @@
tkwait visibility $w
frame $w.bot.buttonframe
- button $w.bot.buttonframe.ok -text OK -width 6 \
+ button $w.bot.buttonframe.ok -text [G_msg "Ok"] -width 6 \
-command "destroy $w" -bd 1
button $w.bot.buttonframe.cancel -bd 1 -width 6\
-text Cancel -command "set CurrWireColor $tmp; destroy $w"
More information about the grass-commit
mailing list