[GRASS-SVN] r44887 -
grass/branches/releasebranch_6_4/gui/tcltk/gis.m
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Jan 5 13:17:23 EST 2011
Author: marisn
Date: 2011-01-05 10:17:23 -0800 (Wed, 05 Jan 2011)
New Revision: 44887
Modified:
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/chart.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/dtext.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gridline.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/histogram.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/legend.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maplabels.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/mapprint.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maptext.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/rastarrows.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/raster.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/rastnums.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/thematic.tcl
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/vector.tcl
Log:
gis.m Use translations-friendly ComboBox (merge r44885 and r44587 from develbranch6)
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/chart.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/chart.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/chart.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -68,11 +68,13 @@
set opt($count,1,type_area) 0
set opt($count,1,layer) 1
set opt($count,1,ctype) "pie"
+ set opt($count,1,ctypelv) ""
set opt($count,1,columns) ""
set opt($count,1,sizecol) ""
set opt($count,1,csize) 40
set opt($count,1,cscale) 1
set opt($count,1,ocolor) "black"
+ set opt($count,1,ocolorlv) ""
set opt($count,1,fcolors) ""
set opt($count,1,mod) 1
@@ -275,7 +277,7 @@
set row [ frame $frm.chopt1 ]
Label $row.a -text [G_msg "Chart type:"]
ComboBox $row.b -padx 2 -width 4 -textvariable GmChart::opt($id,1,ctype) \
- -values {"pie" "bar"}
+ -values {"pie" "bar"} -labels [list [G_msg "pie"] [G_msg "bar"]] -labelsvariable GmChart::opt($id,1,ctypelv)
Label $row.c -text [G_msg "\tfixed chart size (if size column not used)"]
LabelEntry $row.d -textvariable GmChart::opt($id,1,csize) -width 4
pack $row.a $row.b $row.c $row.d -side left
@@ -286,7 +288,8 @@
Label $row.a -text [G_msg "\tchart outline color:"]
ComboBox $row.b -padx 0 -width 10 -textvariable GmChart::opt($id,1,ocolor) \
-values {"none" "white" "grey" "gray" "black" "brown" "red" "orange" \
- "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"}
+ "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"} \
+ -labels [list [G_msg "none"] [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"]] -labelsvariable GmChart::opt($id,1,ocolorlv)
pack $row.a $row.b -side left
pack $row -side top -fill both -expand yes
}
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/dtext.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/dtext.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/dtext.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -68,8 +68,10 @@
set opt($count,1,text) ""
set opt($count,1,at) "10,10"
set opt($count,1,coordinates) "percent"
+ set opt($count,1,coordinateslv) ""
set opt($count,1,mouseset) 0
set opt($count,1,align) "lower_left"
+ set opt($count,1,alignlv) ""
set opt($count,1,line) 10
set opt($count,1,rotate) 0
set opt($count,1,font) ""
@@ -193,7 +195,9 @@
set row [ frame $frm.textcoord2 ]
Label $row.a -text [G_msg " coordinate type for text placement "]
ComboBox $row.b -padx 2 -width 10 -textvariable GmDtext::opt($id,1,coordinates) \
- -values {"pixels" "percent" "geographic" } -modifycmd "GmDtext::mouseset $id"
+ -values {"pixels" "percent" "geographic" } -modifycmd "GmDtext::mouseset $id" \
+ -labels [list [G_msg "pixels"] [G_msg "percent"] [G_msg "geographic"]] \
+ -labelsvariable GmDtext::opt($id,1,coordinateslv)
checkbutton $row.c -text [G_msg "place with mouse"] \
-variable GmDtext::opt($id,1,mouseset) \
-command "GmDtext::mouseset $id"
@@ -205,7 +209,9 @@
Label $row.a -text [G_msg " align text with coordinate point "]
ComboBox $row.b -padx 2 -width 12 -textvariable GmDtext::opt($id,1,align) \
-values {"lower_left" "bottom_center" "lower_right" "center_left" "center"
- "center_right" "upper_left" "top_center" "upper_right" }
+ "center_right" "upper_left" "top_center" "upper_right" } \
+ -labels [list [G_msg "lower left"] [G_msg "bottom center"] [G_msg "lower right"] [G_msg "center left"] [G_msg "center"] [G_msg "center right"] [G_msg "upper left"] [G_msg "top center"] [G_msg "upper right"]] \
+ -labelsvariable GmDtext::opt($id,1,alignlv)
pack $row.a $row.b -side left
pack $row -side top -fill both -expand yes
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gridline.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gridline.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gridline.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -61,6 +61,7 @@
set opt($count,1,opacity) 1.0
set opt($count,1,gridline) "gridline"
+ set opt($count,1,gridlinelv) ""
set opt($count,1,gridcolor) \#AAAAAA
set opt($count,1,gridborder) \#000000
set opt($count,1,gridsize) 1000
@@ -76,11 +77,14 @@
set opt($count,1,rhumbdraw) 0
set opt($count,1,rhumbcoor) ""
set opt($count,1,rhumbcolor) "black"
+ set opt($count,1,rhumbcolorlv) ""
set opt($count,1,geoddraw) 0
set opt($count,1,geodcoor) ""
set opt($count,1,geodcolor) "black"
+ set opt($count,1,geodcolorlv) ""
set opt($count,1,geodtxtcolor) "none"
+ set opt($count,1,geodtxtcolorlv) ""
set first 1
set opt($count,1,mod) 1
@@ -219,11 +223,15 @@
Label $row.d -text [G_msg " line color"]
ComboBox $row.e -padx 2 -width 7 -textvariable GmGridline::opt($id,1,geodcolor) \
-values {"white" "grey" "gray" "black" "brown" "red" "orange" \
- "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"}
+ "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"] ] \
+ -labelsvariable GmGridline::opt($id,1,geodcolorlv)
Label $row.f -text [G_msg " text color"]
ComboBox $row.g -padx 2 -width 7 -textvariable GmGridline::opt($id,1,geodtxtcolor) \
-values {"white" "grey" "gray" "black" "brown" "red" "orange" \
- "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"}
+ "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"] ] \
+ -labelsvariable GmGridline::opt($id,1,geodtxtcolorlv)
pack $row.a $row.b $row.c $row.d $row.e $row.f $row.g -side left
pack $row -side top -fill both -expand yes
@@ -246,7 +254,9 @@
Label $row.d -text [G_msg " line color"]
ComboBox $row.e -padx 2 -width 7 -textvariable GmGridline::opt($id,1,rhumbcolor) \
-values {"white" "grey" "gray" "black" "brown" "red" "orange" \
- "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"}
+ "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"] ] \
+ -labelsvariable GmGridline::opt($id,1,rhumbcolorlv)
pack $row.a $row.b $row.c $row.d $row.e -side left
pack $row -side top -fill both -expand yes
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/histogram.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/histogram.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/histogram.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -64,7 +64,8 @@
set opt($count,1,color) #000000
set opt($count,1,bgcolor) #ffffff
set opt($count,1,bgcolor_none) 0
- set opt($count,1,style) "bar"
+ set opt($count,1,style) "bar"
+ set opt($count,1,stylelv) ""
set opt($count,1,font) ""
set opt($count,1,nsteps) 255
set opt($count,1,nulls) 0
@@ -169,8 +170,9 @@
# graph style
set row [ frame $frm.style ]
Label $row.a -text [G_msg "Graph style"]
- ComboBox $row.b -padx 2 -width 4 -textvariable GmHist::opt($id,1,style) \
- -values {"bar" "pie"}
+ ComboBox $row.b -padx 2 -width 6 -textvariable GmHist::opt($id,1,style) \
+ -values {"bar" "pie"} \
+ -labels [list [G_msg "bar"] [G_msg "pie"]] -labelsvariable GmHist::opt($id,1,stylelv)
Label $row.c -text [G_msg "\ttext font "]
Button $row.d -image [image create photo -file "$iconpath/gui-font.gif"] \
-highlightthickness 0 -takefocus 0 -relief raised -borderwidth 1 \
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/legend.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/legend.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/legend.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -63,7 +63,8 @@
set opt($count,1,map) ""
set opt($count,1,opacity) 1.0
- set opt($count,1,color) "black"
+ set opt($count,1,color) "black"
+ set opt($count,1,colorlv) ""
set opt($count,1,lines) 0
set opt($count,1,thin) 1
set opt($count,1,font) ""
@@ -257,7 +258,8 @@
Label $row.a -text [G_msg "Legend appearance: text color"]
ComboBox $row.b -padx 0 -width 10 -textvariable GmLegend::opt($id,1,color) \
-values {"white" "grey" "gray" "black" "brown" "red" "orange" \
- "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"}
+ "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"]] -labelsvariable GmLegend::opt($id,1,colorlv)
Label $row.c -text [G_msg " legend text font "]
Button $row.d -highlightthickness 0 -takefocus 0 -relief raised -borderwidth 1 \
-helptext [G_msg "select font for text"] \
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maplabels.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maplabels.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maplabels.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -85,8 +85,10 @@
set opt($count,1,lfontoverstrike) 0
set opt($count,1,lfill) \#000000
set opt($count,1,lwidth) 100
- set opt($count,1,lanchor) "center_left"
+ set opt($count,1,lanchor) "center left"
+ set opt($count,1,lanchorlv) ""
set opt($count,1,ljust) "left"
+ set opt($count,1,ljustlv) ""
set opt($count,1,ltxt) ""
set opt($count,1,lhoffset) 2 ;# space between label and enclosing box
set opt($count,1,lvoffset) 2 ;# space between label and enclosing box
@@ -194,7 +196,8 @@
Label $row.a -text [G_msg "Align label with vector object: "]
ComboBox $row.b -padx 2 -width 12 -textvariable GmCLabels::opt($id,1,lanchor) \
-values {"lower left" "lower center" "lower right" "center left" "center"
- "center right" "upper left" "upper center" "upper right" }
+ "center right" "upper left" "upper center" "upper right" } \
+ -labels [list [G_msg "lower left"] [G_msg "lower center"] [G_msg "lower right"] [G_msg "center left"] [G_msg "center"] [G_msg "center right"] [G_msg "upper left"] [G_msg "upper center"] [G_msg "upper right"]] -labelsvariable GmCLabels::opt($id,1,lanchorlv)
pack $row.a $row.b -side left
pack $row -side top -fill both -expand yes
@@ -214,7 +217,8 @@
set row [ frame $frm.lbltopt2 ]
Label $row.a -text [G_msg "Justification: "]
ComboBox $row.b -padx 2 -width 7 -textvariable GmCLabels::opt($id,1,ljust) \
- -values {"left" "center" "right"}
+ -values {"left" "center" "right"} \
+ -labels [list [G_msg "left"] [G_msg "center"] [G_msg "right"]] -labelsvariable GmCLabels::opt($id,1,ljustlv)
Label $row.c -text [G_msg " Label line max length: "]
LabelEntry $row.d -textvariable GmCLabels::opt($id,1,lwidth) -width 5
pack $row.a $row.b $row.c $row.d -side left
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/mapprint.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/mapprint.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/mapprint.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -28,6 +28,7 @@
variable orient
variable paper
variable paper_preset
+ variable paper_presetlv
variable pdffile
variable pght
variable pgwd
@@ -54,6 +55,7 @@
variable docht
variable paper
variable paper_preset
+ variable paper_presetlv
variable printmode
variable printer
variable gsexists
@@ -75,6 +77,7 @@
set psprint::docht 10
set psprint::paper "preset"
set psprint::paper_preset "letter"
+ set psprint::paper_presetlv ""
set psprint::printer ""
set psprint::gsexists 1
set psprint::orient "landscape"
@@ -218,6 +221,7 @@
variable pght
variable paper
variable paper_preset
+ variable paper_presetlv
variable printmode
variable printer
variable gsexists
@@ -264,7 +268,9 @@
Label $row.b -anchor w -text [G_msg "Preset paper type"]
ComboBox $row.c -label "" -width 20 -textvariable psprint::paper_preset \
-values {"letter" "a4" "legal" "11x17" "a3" "ledger" "a0" "a1" "a2" } \
- -modifycmd psprint::paper
+ -modifycmd psprint::paper \
+ -labels [list [G_msg "letter"] [G_msg "A4"] [G_msg "legal"] [G_msg "11x17"] [G_msg "A3"] [G_msg "ledger"] [G_msg "A0"] [G_msg "A1"] [G_msg "A2"]] \
+ -labelsvariable psprint::paper_presetlv
pack $row.a $row.b $row.c -side left;
pack $row -side top -fill x -expand no -anchor n
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maptext.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maptext.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/maptext.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -10,8 +10,8 @@
##########################################################################
namespace eval GmCtext {
- variable array opt # ctext options
- variable placement #entry widget for x,y coordinates
+ variable array opt ;# ctext options
+ variable placement ;#entry widget for x,y coordinates
variable count 1
variable optlist
}
@@ -58,8 +58,11 @@
set opt($count,1,fill) \#000000
set opt($count,1,width) 100
set opt($count,1,anchor) "center_left"
- set opt($count,1,justify) "left"
- set opt($count,1,coordinates) "pixels"
+ set opt($count,1,anchorlv) ""
+ set opt($count,1,justify) "left"
+ set opt($count,1,justifylv) ""
+ set opt($count,1,coordinates) "pixels"
+ set opt($count,1,coordinateslv) ""
set opt($count,1,mouseset) 0
set optlist { _check opacity text at font fill width anchor justify coordinates mouseset}
@@ -77,7 +80,7 @@
global mon
variable opt
- set fon [SelectFont $frm.fontset -type dialog -sampletext [G_msg "This is font sample text."] -title [G_msg "Select label font"]]
+ set fon [SelectFont $frm.fontset -type dialog -sampletext [G_msg "This is font sample text."] -title [G_msg "Select label font"] -font $opt($id,1,font) ]
if { $fon != "" } {set opt($id,1,font) $fon}
}
@@ -146,7 +149,8 @@
set row [ frame $frm.textcoord2 ]
Label $row.a -text [G_msg " coordinate type for text placement "]
ComboBox $row.b -padx 2 -width 10 -textvariable GmCtext::opt($id,1,coordinates) \
- -values {"pixels" "percent" "geographic" } -modifycmd "GmCtext::mouseset $id"
+ -values {"pixels" "percent" "geographic" } -modifycmd "GmCtext::mouseset $id" \
+ -labels [list [G_msg "pixels"] [G_msg "percent"] [G_msg "geographic"]] -labelsvariable GmCtext::opt($id,1,coordinateslv)
checkbutton $row.c -text [G_msg "place with mouse"] \
-variable GmCtext::opt($id,1,mouseset) \
-command "GmCtext::mouseset $id"
@@ -156,17 +160,19 @@
# text options1
set row [ frame $frm.textopt1 ]
Label $row.a -text [G_msg " align text with coordinate point "]
- ComboBox $row.b -padx 2 -width 12 -textvariable GmCtext::opt($id,1,anchor) \
+ ComboBox $row.b -padx 2 -width 16 -textvariable GmCtext::opt($id,1,anchor) \
-values {"lower_left" "bottom_center" "lower_right" "center_left" "center"
- "center_right" "upper_left" "top_center" "upper_right" }
+ "center_right" "upper_left" "top_center" "upper_right" } \
+ -labels [list [G_msg "lower left"] [G_msg "bottom center"] [G_msg "lower right"] [G_msg "center left"] [G_msg "center"] [G_msg "center right"] [G_msg "upper left"] [G_msg "top center"] [G_msg "upper right"]] -labelsvariable GmCtext::opt($id,1,anchorlv)
pack $row.a $row.b -side left
pack $row -side top -fill both -expand yes
# text options2
set row [ frame $frm.textopt2 ]
Label $row.a -text [G_msg " justification"]
- ComboBox $row.b -padx 2 -width 7 -textvariable GmCtext::opt($id,1,justify) \
- -values {"left" "center" "right"}
+ ComboBox $row.b -padx 2 -width 10 -textvariable GmCtext::opt($id,1,justify) \
+ -values {"left" "center" "right"} \
+ -labels [list [G_msg "left"] [G_msg "center"] [G_msg "right"]] -labelsvariable GmCtext::opt($id,1,justifylv)
Label $row.c -text [G_msg " line width"]
LabelEntry $row.d -textvariable GmCtext::opt($id,1,width) -width 5
pack $row.a $row.b $row.c $row.d -side left
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/rastarrows.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/rastarrows.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/rastarrows.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -61,10 +61,15 @@
set opt($count,1,map) ""
set opt($count,1,opacity) 1.0
set opt($count,1,type) "grass"
+ set opt($count,1,typelv) ""
set opt($count,1,arrow_color) "green"
+ set opt($count,1,arrow_colorlv) ""
set opt($count,1,grid_color) "grey"
+ set opt($count,1,grid_colorlv) ""
set opt($count,1,x_color) "black"
+ set opt($count,1,x_colorlv) ""
set opt($count,1,unknown_color) "red"
+ set opt($count,1,unknown_colorlv) ""
set opt($count,1,skip) 1
set opt($count,1,magnitude_map) ""
set opt($count,1,scale) 1.0
@@ -172,7 +177,9 @@
set row [ frame $frm.type ]
Label $row.a -text [G_msg " aspect value type"]
ComboBox $row.b -padx 2 -width 8 -textvariable GmArrows::opt($id,1,type) \
- -values {"grass" "compass" "agnps" "answers"}
+ -values {"grass" "compass" "agnps" "answers"} \
+ -labels [list [G_msg "grass"] [G_msg "compass"] [G_msg "agnps"] [G_msg "answers"]] \
+ -labelsvariable GmArrows::opt($id,1,typelv)
pack $row.a $row.b -side left
pack $row -side top -fill both -expand yes
@@ -190,12 +197,16 @@
ComboBox $row.b -padx 2 -width 10 -textvariable GmArrows::opt($id,1,arrow_color) \
-values {"white" "grey" "gray" "black" "brown" "red" "orange" \
"yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" \
- "magenta"}
+ "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"]] \
+ -labelsvariable GmArrows::opt($id,1,arrow_colorlv)
Label $row.c -text [G_msg " cell grid color"]
ComboBox $row.d -padx 2 -width 10 -textvariable GmArrows::opt($id,1,grid_color) \
-values {"none" "white" "grey" "gray" "black" "brown" "red" "orange" \
"yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" \
- "magenta"}
+ "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"]] \
+ -labelsvariable GmArrows::opt($id,1,grid_colorlv)
pack $row.a $row.b $row.c $row.d -side left
pack $row -side top -fill both -expand yes
@@ -205,12 +216,16 @@
ComboBox $row.b -padx 2 -width 10 -textvariable GmArrows::opt($id,1,x_color) \
-values {"white" "grey" "gray" "black" "brown" "red" "orange" \
"yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" \
- "magenta"}
+ "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"]] \
+ -labelsvariable GmArrows::opt($id,1,x_colorlv)
Label $row.c -text { 'unknowns' color}
ComboBox $row.d -padx 2 -width 10 -textvariable GmArrows::opt($id,1,unknown_color) \
-values {"none" "white" "grey" "gray" "black" "brown" "red" "orange" \
"yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" \
- "magenta"}
+ "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"]] \
+ -labelsvariable GmArrows::opt($id,1,unknown_colorlv)
pack $row.a $row.b $row.c $row.d -side left
pack $row -side top -fill both -expand yes
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/raster.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/raster.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/raster.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -70,6 +70,7 @@
set opt($count,1,rastquery) ""
set opt($count,1,rasttype) ""
set opt($count,1,bkcolor) ""
+ set opt($count,1,bkcolorlv) ""
set opt($count,1,overlay) 1
set opt($count,1,mod) 1
@@ -268,8 +269,8 @@
set row [ frame $frm.bg ]
Label $row.a -text [G_msg " Set background color (colored null value cells)"]
ComboBox $row.b -padx 2 -width 10 -textvariable GmRaster::opt($id,1,bkcolor) \
- -values {"white" "grey" "gray" "black" "brown" "red" "orange" \
- "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"}
+ -values {"white" "grey" "gray" "black" "brown" "red" "orange" "yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"]] -labelsvariable GmRaster::opt($id,1,bkcolorlv)
pack $row.a $row.b -side left
pack $row -side top -fill both -expand yes
}
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/rastnums.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/rastnums.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/rastnums.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -62,7 +62,9 @@
set opt($count,1,map) ""
set opt($count,1,opacity) 1.0
set opt($count,1,grid_color) "grey"
+ set opt($count,1,grid_colorlv) ""
set opt($count,1,text_color) "black"
+ set opt($count,1,text_colorlv) ""
set opt($count,1,cellcolor) 0
set opt($count,1,font) ""
set opt($count,1,mod) 1
@@ -173,7 +175,9 @@
ComboBox $row.b -padx 2 -width 10 -textvariable GmRnums::opt($id,1,grid_color) \
-values {"white" "grey" "gray" "black" "brown" "red" "orange" \
"yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" \
- "magenta"}
+ "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"] ] \
+ -labelsvariable GmRnums::opt($id,1,grid_colorlv)
Label $row.c -text [G_msg " cell values font "]
Button $row.d -image [image create photo -file "$iconpath/gui-font.gif"] \
-highlightthickness 0 -takefocus 0 -relief raised -borderwidth 1 \
@@ -188,7 +192,9 @@
ComboBox $row.b -padx 2 -width 10 -textvariable GmRnums::opt($id,1,text_color) \
-values {"white" "grey" "gray" "black" "brown" "red" "orange" \
"yellow" "green" "aqua" "cyan" "indigo" "blue" "purple" "violet" \
- "magenta"}
+ "magenta"} \
+ -labels [list [G_msg "white"] [G_msg "grey"] [G_msg "gray"] [G_msg "black"] [G_msg "brown"] [G_msg "red"] [G_msg "orange"] [G_msg "yellow"] [G_msg "green"] [G_msg "aqua"] [G_msg "cyan"] [G_msg "indigo"] [G_msg "blue"] [G_msg "purple"] [G_msg "violet"] [G_msg "magenta"] ] \
+ -labelsvariable GmRnums::opt($id,1,text_colorlv)
checkbutton $row.c -text [G_msg "use raster colors for cell values"] \
-variable GmRnums::opt($id,1,cellcolor)
pack $row.a $row.b $row.c -side left
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/thematic.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/thematic.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/thematic.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -65,9 +65,12 @@
set opt($count,1,map) ""
set opt($count,1,opacity) 1.0
set opt($count,1,type) "area"
+ set opt($count,1,typelv) ""
set opt($count,1,column) ""
set opt($count,1,themetype) "graduated_colors"
+ set opt($count,1,themetypelv) ""
set opt($count,1,themecalc) "interval"
+ set opt($count,1,themecalclv) ""
set opt($count,1,breakpoints) ""
set opt($count,1,where) ""
set opt($count,1,layer) 1
@@ -76,6 +79,7 @@
set opt($count,1,maxsize) 20
set opt($count,1,nint) 4
set opt($count,1,colorscheme) "blue-red"
+ set opt($count,1,colorschemelv) ""
set opt($count,1,pointcolor) \#FF0000
set opt($count,1,linecolor) \#000000
set opt($count,1,startcolor) \#FF0000
@@ -138,20 +142,20 @@
proc GmThematic::select_tfont { id frm} {
variable opt
- set fon [SelectFont $frm.font -type dialog -sampletext [G_msg "This is font sample text."] -title [G_msg "Select font"]]
+ set fon [SelectFont $frm.font -type dialog -sampletext [G_msg "This is font sample text."] -title [G_msg "Select font"] -font $opt($id,1,titlefont)]
if { $fon != "" } {set opt($id,1,titlefont) $fon}
}
proc GmThematic::select_stfont { id frm} {
variable opt
- set fon [SelectFont $frm.font -type dialog -sampletext [G_msg "This is font sample text."] -title [G_msg "Select font"]]
+ set fon [SelectFont $frm.font -type dialog -sampletext [G_msg "This is font sample text."] -title [G_msg "Select font"] -font $opt($id,1,subtitlefont)]
if { $fon != "" } {set opt($id,1,subtitlefont) $fon}
}
proc GmThematic::select_lfont { id frm} {
variable opt
- set fon [SelectFont $frm.font -type dialog -sampletext [G_msg "This is font sample text."] -title [G_msg "Select font"]]
+ set fon [SelectFont $frm.font -type dialog -sampletext [G_msg "This is font sample text."] -title [G_msg "Select font"] -font $opt($id,1,labelfont)]
if { $fon != "" } {set opt($id,1,labelfont) $fon}
}
@@ -274,7 +278,9 @@
set row [ frame $frm.vtype ]
Label $row.a -text [G_msg " vector type"]
ComboBox $row.b -padx 2 -width 10 -textvariable GmThematic::opt($id,1,type) \
- -values {"area" "point" "centroid" "line" "boundary"}
+ -values {"area" "point" "centroid" "line" "boundary"} \
+ -labels [list [G_msg "area"] [G_msg "point"] [G_msg "centroid"] [G_msg "line"] [G_msg "boundary"]] \
+ -labelsvariable GmThematic::opt($id,1,typelv)
Label $row.c -text [G_msg " attribute layer"]
LabelEntry $row.d -textvariable GmThematic::opt($id,1,layer) -width 3
pack $row.a $row.b $row.c $row.d -side left
@@ -308,11 +314,14 @@
set row [ frame $frm.ttype ]
Label $row.a -text [G_msg "Thematic map: type"]
ComboBox $row.b -padx 2 -width 16 -textvariable GmThematic::opt($id,1,themetype) \
- -values {"graduated_colors" "graduated_points" "graduated_lines"}
+ -values {"graduated_colors" "graduated_points" "graduated_lines"} \
+ -labels [list [G_msg "graduated colors"] [G_msg "graduated points"] [G_msg "graduated lines"]] \
+ -labelsvariable GmThematic::opt($id,1,themetypelv)
Label $row.c -text [G_msg " map by"]
ComboBox $row.d -padx 2 -width 15 -textvariable GmThematic::opt($id,1,themecalc) \
- -values {"interval" "std_deviation" "quartiles" \
- "custom_breaks"}
+ -values {"interval" "std_deviation" "quartiles" "custom_breaks"} \
+ -labels [list [G_msg "interval"] [G_msg "std deviation"] [G_msg "quartiles"] [G_msg "custom breaks"]] \
+ -labelsvariable GmThematic::opt($id,1,themecalclv)
pack $row.a $row.b $row.c $row.d -side left
pack $row -side top -fill both -expand yes
@@ -367,9 +376,9 @@
set row [ frame $frm.color1 ]
Label $row.a -text [G_msg "Graduated colors: preset color schemes"]
ComboBox $row.b -padx 2 -width 18 -textvariable GmThematic::opt($id,1,colorscheme) \
- -values {"blue-red" "red-blue" "green-red" "red-green" \
- "blue-green" "green-blue" "cyan-yellow" "yellow-cyan" "custom_gradient" \
- "single_color" }
+ -values {"blue-red" "red-blue" "green-red" "red-green" "blue-green" "green-blue" "cyan-yellow" "yellow-cyan" "custom_gradient" "single_color" } \
+ -labels [list [G_msg "blue red"] [G_msg "red blue"] [G_msg "green red"] [G_msg "red green"] [G_msg "blue green"] [G_msg "green blue"] [G_msg "cyan yellow"] [G_msg "yellow cyan"] [G_msg "custom gradient"] [G_msg "single color"]] \
+ -labelsvariable GmThematic::opt($id,1,colorschemelv)
pack $row.a $row.b -side left
pack $row -side top -fill both -expand yes
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/vector.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/vector.tcl 2011-01-05 18:13:19 UTC (rev 44886)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/vector.tcl 2011-01-05 18:17:23 UTC (rev 44887)
@@ -165,7 +165,9 @@
set opt($count,1,attribute) ""
set opt($count,1,xref) "left"
+ set opt($count,1,xreflv) ""
set opt($count,1,yref) "center"
+ set opt($count,1,yreflv) ""
set opt($count,1,lsize) 8
set opt($count,1,minreg) ""
@@ -464,16 +466,17 @@
# label alignment
set row [ frame $frm.label2 ]
- Label $row.a -text " "
- ComboBox $row.b -label [G_msg "Label part to align with vector point"] \
- -width 6 -textvariable GmVector::opt($id,1,xref) \
+ ComboBox $row.b -label [G_msg "Label part to align with vector point "] \
+ -width 10 -textvariable GmVector::opt($id,1,xref) \
-values {"left" "center" "right"} \
- -modifycmd "GmVector::legend $id"
+ -labels [list [G_msg "left"] [G_msg "center"] [G_msg "right"]] -labelsvariable GmVector::opt($id,1,xreflv) \
+ -modifycmd "GmVector::legend $id" -editable 0
ComboBox $row.c -label [G_msg " Justification"] \
- -width 6 -textvariable GmVector::opt($id,1,yref) \
+ -width 10 -textvariable GmVector::opt($id,1,yref) \
-values {"top" "center" "bottom"} \
- -modifycmd "GmVector::legend $id"
- pack $row.a $row.b $row.c -side left
+ -labels [list [G_msg "top"] [G_msg "center"] [G_msg "bottom"]] -labelsvariable GmVector::opt($id,1,yreflv) \
+ -modifycmd "GmVector::legend $id" -editable 0
+ pack $row.b $row.c -side left
pack $row -side top -fill both -expand yes
# labels layer and attribute column
More information about the grass-commit
mailing list