Switched from pack to grid; Demos are put in a namespace; No more name aliases for fonts

1 files changed, 10 insertions, 6 deletions

diff --git a/demos/lines.tcl b/demos/lines.tcl
index a3f875b..a974e07 100644
--- a/demos/lines.tcl
+++ b/demos/lines.tcl
@@ -15,15 +15,16 @@ namespace eval linesDemo {
     grid [button $w.dismiss -text Dismiss -command "destroy $w"] -row 2 -column 0 -pady 10
     grid [button $w.code -text "See Code" -command "showCode $w"] -row 2 -column 1 -pady 10
     
-    variable defaultfont [font create -family Helvetica -size 10 -weight bold]
+    variable defaultfont [font create -family Helvetica -size 14 -weight normal]
     
-    grid [zinc $w.zinc -width 700 -height 600 -font 10x20 -borderwidth 3 \
+    grid [zinc $w.zinc -width 700 -height 600 -font $defaultfont -borderwidth 3 \
 	      -relief sunken] -row 1 -column 0 -columnspan 2 -sticky news
     grid columnconfigure $w 0 -weight 1
     grid columnconfigure $w 1 -weight 1
     grid rowconfigure $w 1 -weight 2
     
-    $w.zinc add text 1 -font $defaultfont -text "A set of lines with different styles of lines and termination\nNB: some attributes such as line styles are not necessarily\navailable with an openGL rendering system" -anchor nw -position {20 20}
+    $w.zinc add text 1 -font $defaultfont -anchor nw -position {20 20} \
+-text "A set of lines with different styles of lines and termination\nNB: some attributes such as line styles are not necessarily\navailable with an openGL rendering system"
     
     $w.zinc add curve 1 {20 100 320 100}
     $w.zinc add curve 1 {20 120 320 120} -linewidth 20
@@ -45,10 +46,13 @@ namespace eval linesDemo {
     $w.zinc add curve 1 {340 220 680 220} -linewidth 2 -linestyle dotted
     
     
-    $w.zinc add curve 1 {20 300 140 360 320 300 180 260} -closed 1 -filled 1 -fillpattern "" -fillcolor grey60 -linecolor red -marker AtcSymbol7 -markercolor blue
+    $w.zinc add curve 1 {20 300 140 360 320 300 180 260} -closed 1 -filled 1 -fillpattern "" \
+	-fillcolor grey60 -linecolor red -marker AtcSymbol7 -markercolor blue
     
     
-    $w.zinc add curve 1 {340 300 440 360 620 300 480 260} -closed 1 -linewidth 10 -joinstyle miter -linecolor red
+    $w.zinc add curve 1 {340 300 440 360 620 300 480 260} -closed 1 -linewidth 10 -joinstyle miter \
+	-linecolor red
     
-    $w.zinc add curve 1 {400 300 440 330 560 300 480 280} -closed 1 -linewidth 10 -joinstyle round -tile "" -fillcolor grey60 -filled 1 -linecolor red
+    $w.zinc add curve 1 {400 300 440 330 560 300 480 280} -closed 1 -linewidth 10 -joinstyle round \
+	-tile "" -fillcolor grey60 -filled 1 -linecolor red
 }