diff options
| -rw-r--r-- | library/demos/bind.tcl | 12 | ||||
| -rw-r--r-- | library/demos/goldberg.tcl | 8 | ||||
| -rw-r--r-- | library/demos/knightstour.tcl | 6 | ||||
| -rw-r--r-- | library/demos/pendulum.tcl | 4 | ||||
| -rw-r--r-- | library/demos/toolbar.tcl | 2 | ||||
| -rw-r--r-- | library/demos/ttkbut.tcl | 2 | ||||
| -rw-r--r-- | library/demos/ttkprogress.tcl | 2 | ||||
| -rw-r--r-- | library/demos/unicodeout.tcl | 49 |
8 files changed, 33 insertions, 52 deletions
diff --git a/library/demos/bind.tcl b/library/demos/bind.tcl index 9146362..8b56639 100644 --- a/library/demos/bind.tcl +++ b/library/demos/bind.tcl @@ -67,12 +67,12 @@ foreach tag {d1 d2 d3 d4 d5 d6} { $w.text tag bind $tag <Leave> "$w.text tag configure $tag $normal" } # Main widget program sets variable tk_demoDirectory -$w.text tag bind d1 <Button-1> {source [file join $tk_demoDirectory items.tcl]} -$w.text tag bind d2 <Button-1> {source [file join $tk_demoDirectory plot.tcl]} -$w.text tag bind d3 <Button-1> {source [file join $tk_demoDirectory ctext.tcl]} -$w.text tag bind d4 <Button-1> {source [file join $tk_demoDirectory arrow.tcl]} -$w.text tag bind d5 <Button-1> {source [file join $tk_demoDirectory ruler.tcl]} -$w.text tag bind d6 <Button-1> {source [file join $tk_demoDirectory cscroll.tcl]} +$w.text tag bind d1 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory items.tcl]} +$w.text tag bind d2 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory plot.tcl]} +$w.text tag bind d3 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ctext.tcl]} +$w.text tag bind d4 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory arrow.tcl]} +$w.text tag bind d5 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ruler.tcl]} +$w.text tag bind d6 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory cscroll.tcl]} $w.text mark set insert 0.0 $w.text configure -state disabled diff --git a/library/demos/goldberg.tcl b/library/demos/goldberg.tcl index 1cc52c6..14ddb0b 100644 --- a/library/demos/goldberg.tcl +++ b/library/demos/goldberg.tcl @@ -113,9 +113,9 @@ proc DoDisplay {w} { DoCtrlFrame $w DoDetailFrame $w if {[tk windowingsystem] ne "aqua"} { - ttk::button $w.show -text "\u00bb" -command [list ShowCtrl $w] -width 2 + ttk::button $w.show -text "»" -command [list ShowCtrl $w] -width 2 } else { - button $w.show -text "\u00bb" -command [list ShowCtrl $w] -width 2 -highlightbackground $C(bg) + button $w.show -text "»" -command [list ShowCtrl $w] -width 2 -highlightbackground $C(bg) } place $w.show -in $w.c -relx 1 -rely 0 -anchor ne update @@ -204,10 +204,10 @@ proc DoDetailFrame {w} { proc ShowCtrl {w} { if {[winfo ismapped $w.ctrl]} { pack forget $w.ctrl - $w.show config -text "\u00bb" + $w.show config -text "»" } else { pack $w.ctrl -side right -fill both -ipady 5 - $w.show config -text "\u00ab" + $w.show config -text "»" } } diff --git a/library/demos/knightstour.tcl b/library/demos/knightstour.tcl index 11b3b5c..09ceff0 100644 --- a/library/demos/knightstour.tcl +++ b/library/demos/knightstour.tcl @@ -1,4 +1,4 @@ -# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net> +# Copyright © 2008 Pat Thoyts <patthoyts@users.sourceforge.net> # # Calculate a Knight's tour of a chessboard. # @@ -205,10 +205,10 @@ proc CreateGUI {} { } if {[tk windowingsystem] ne "x11"} { catch {eval font create KnightFont -size -24} - $c create text 0 0 -font KnightFont -text "\u265e" \ + $c create text 0 0 -font KnightFont -text "♞" \ -anchor nw -tags knight -fill black -activefill "#600000" } else { - # On X11 we cannot reliably tell if the \u265e glyph is available + # On X11 we cannot reliably tell if the ♞ glyph is available # so just use a polygon set pts { 2 25 24 25 21 19 20 8 14 0 10 0 0 13 0 16 diff --git a/library/demos/pendulum.tcl b/library/demos/pendulum.tcl index 9833e8f..04f276b 100644 --- a/library/demos/pendulum.tcl +++ b/library/demos/pendulum.tcl @@ -50,8 +50,8 @@ for {set i 90} {$i>=0} {incr i -10} { $w.k create line 0 0 1 1 -smooth true -tags graph$i -fill grey$i } -$w.k create text 0 0 -anchor ne -text "\u03b8" -tags label_theta -$w.k create text 0 0 -anchor ne -text "\u03b4\u03b8" -tags label_dtheta +$w.k create text 0 0 -anchor ne -text "θ" -tags label_theta +$w.k create text 0 0 -anchor ne -text "δθ" -tags label_dtheta pack $w.k -in $w.p.l2 -fill both -expand true # Initialize some variables diff --git a/library/demos/toolbar.tcl b/library/demos/toolbar.tcl index cb2a495..a53e390 100644 --- a/library/demos/toolbar.tcl +++ b/library/demos/toolbar.tcl @@ -17,7 +17,7 @@ positionWindow $w ttk::label $w.msg -wraplength 4i -text "This is a demonstration of how to do\ a toolbar that is styled correctly and which can be torn off. The\ - buttons are configured to be \u201Ctoolbar style\u201D buttons by\ + buttons are configured to be “toolbar style” buttons by\ telling them that they are to use the Toolbutton style. At the left\ end of the toolbar is a simple marker that the cursor changes to a\ movement icon over; drag that away from the toolbar to tear off the\ diff --git a/library/demos/ttkbut.tcl b/library/demos/ttkbut.tcl index ab49cf4..f6d94ac 100644 --- a/library/demos/ttkbut.tcl +++ b/library/demos/ttkbut.tcl @@ -17,7 +17,7 @@ wm title $w "Simple Ttk Widgets" wm iconname $w "ttkbut" positionWindow $w -ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Ttk is the new Tk themed widget set. This is a Ttk themed label, and below are three groups of Ttk widgets in Ttk labelframes. The first group are all buttons that set the current application theme when pressed. The second group contains three sets of checkbuttons, with a separator widget between the sets. Note that the \u201cEnabled\u201d button controls whether all the other themed widgets in this toplevel are in the disabled state. The third group has a collection of linked radiobuttons." +ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Ttk is the new Tk themed widget set. This is a Ttk themed label, and below are three groups of Ttk widgets in Ttk labelframes. The first group are all buttons that set the current application theme when pressed. The second group contains three sets of checkbuttons, with a separator widget between the sets. Note that the “Enabled” button controls whether all the other themed widgets in this toplevel are in the disabled state. The third group has a collection of linked radiobuttons." pack $w.msg -side top -fill x ## See Code / Dismiss diff --git a/library/demos/ttkprogress.tcl b/library/demos/ttkprogress.tcl index 8a72cf9..29ac508 100644 --- a/library/demos/ttkprogress.tcl +++ b/library/demos/ttkprogress.tcl @@ -15,7 +15,7 @@ wm title $w "Progress Bar Demonstration" wm iconname $w "ttkprogress" positionWindow $w -ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Below are two progress bars. The top one is a \u201Cdeterminate\u201D progress bar, which is used for showing how far through a defined task the program has got. The bottom one is an \u201Cindeterminate\u201D progress bar, which is used to show that the program is busy but does not know how long for. Both are run here in self-animated mode, which can be turned on and off using the buttons underneath." +ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Below are two progress bars. The top one is a “determinate” progress bar, which is used for showing how far through a defined task the program has got. The bottom one is an “indeterminate” progress bar, which is used to show that the program is busy but does not know how long for. Both are run here in self-animated mode, which can be turned on and off using the buttons underneath." pack $w.msg -side top -fill x ## See Code / Dismiss buttons diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl index ca325a4..9e7180c 100644 --- a/library/demos/unicodeout.tcl +++ b/library/demos/unicodeout.tcl @@ -21,9 +21,7 @@ label $w.msg -font $font -wraplength 4i -anchor w -justify left \ non-Western character sets. However, what you will actually see\ below depends largely on what character sets you have installed,\ and what you see for characters that are not present varies greatly\ - between platforms as well. The strings are written in Tcl using\ - UNICODE characters using the \\uXXXX (or \\UXXXXXX) escape so as to\ - do so in a portable fashion." + between platforms as well." pack $w.msg -side top ## See Code / Dismiss buttons @@ -98,47 +96,30 @@ update ## Add the samples... if {[usePresentationFormsFor Arabic]} { # Using presentation forms (pre-layouted) - addSample $w Arabic \ - "\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D " \ - "\uFE94\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D" + addSample $w Arabic "ﺔﻴﺑﺮﻌﻟﺍ ﺔﻤﻠﻜﻟﺍ" } else { # Using standard text characters - addSample $w Arabic \ - "\u0627\u0644\u0643\u0644\u0645\u0629 " \ - "\u0627\u0644\u0639\u0631\u0628\u064A\u0629" + addSample $w Arabic "الكلمة العربية" } -addSample $w "Trad. Chinese" "\u4E2D\u570B\u7684\u6F22\u5B57" -addSample $w "Simpl. Chinese" "\u6C49\u8BED" -addSample $w French "Langue fran\xE7aise" +addSample $w "Trad. Chinese" "中國的漢字" +addSample $w "Simpl. Chinese" "汉语" +addSample $w French "Langue française" addSample $w Greek \ - "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \ - "\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1" + "Ελληνική γλώσσα" if {[usePresentationFormsFor Hebrew]} { # Visual order (pre-layouted) - addSample $w Hebrew \ - "\u05EA\u05D9\u05E8\u05D1\u05E2 \u05D1\u05EA\u05DB" + addSample $w Hebrew "תירבע בתכ" } else { # Standard logical order - addSample $w Hebrew \ - "\u05DB\u05EA\u05D1 \u05E2\u05D1\u05E8\u05D9\u05EA" + addSample $w Hebrew "כתב עברית" } -addSample $w Hindi \ - "\u0939\u093F\u0928\u094D\u0926\u0940 \u092D\u093E\u0937\u093E" -addSample $w Icelandic "\xCDslenska" -addSample $w Japanese \ - "\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \ - "\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA" -addSample $w Korean "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00" -addSample $w Russian \ - "\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A" +addSample $w Hindi "हिन्दी भाषा" +addSample $w Icelandic "Íslenska" +addSample $w Japanese "日本語のひらがな, 漢字とカタカナ" +addSample $w Korean "대한민국의 한글" +addSample $w Russian "Русский язык" if {([tk windowingsystem] ne "x11") || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))} { - if {[package vsatisfies [package provide Tcl] 8.7-]} { - addSample $w Emoji \ - "\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1" - } else { - addSample $w Emoji \ - "\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1" - } + addSample $w Emoji "😀💩👍🇳🇱" } ## We're done processing, so change things back to normal running... |