Changeset 419 for trunk/expgui

Timestamp:

Dec 4, 2009 5:05:51 PM (13 years ago)

Author:

toby

Message:

# on 2001/09/04 22:08:10, toby did:
adjustable font support

File:

• trunk/expgui (modified) (18 diffs, 3 props)

trunk/expgui

@@ -78 +78 @@
 # misc constants 
 set txtvw(font) "Courier"
-set expgui(coordfont) "-*-courier-bold-r-normal--12-*"
-set expgui(histfont) "-*-courier-bold-r-normal--12-*"
+set expgui(font) 14
 set liveplot(hst) 1
 set liveplot(legend) 1
@@ -126 +125 @@
 if {!$expgui(haveBW)} {source [file join $expgui(scriptdir) notebook.tcl]}
 #----------------------------------------------------------------
-if [file exists [file join $expgui(scriptdir) opts.tcl]] {
-    source [file join $expgui(scriptdir) opts.tcl]
-}
+source [file join $expgui(scriptdir) opts.tcl]
 # fetch EXP file processing routines 
 source [file join $expgui(scriptdir) readexp.tcl]
@@ -147 +144 @@
     source [file join ~ .gsas_config]
 }
+SetTkDefaultOptions $expgui(font)
 #---------------------------------------------------------------------------
 # platform-specific code
@@ -509 +507 @@
     global expgui env tcl_platform
     set fp [open [file join ~ .gsas_config] a]
-    foreach item {archive asorttype hsorttype filesort disaglSeparateBox} {
+    foreach item {archive asorttype hsorttype filesort disaglSeparateBox font autoexpload autoiconify} {
         puts $fp "set expgui($item) $expgui($item)"
     }
@@ -515 +513 @@
         puts $fp "set env(GSASBACKSPACE) $env(GSASBACKSPACE)"
     }
-    puts $fp "set expgui(archive) $expgui(archive)"
-    puts $fp "set expgui(autoexpload) $expgui(autoexpload)"
-    puts $fp "set expgui(autoiconify) $expgui(autoiconify)"
     close $fp
 }
@@ -602 +597 @@
     frame $w.bot
     pack $w.bot -side bottom
-    frame $w.top
+    frame $w.top -class FixedFont
     pack $w.top -side top -fill both -expand 1
     label $w.top.msg -justify left \
@@ -1252 +1247 @@
     bind $frm.mode <Button-3> {set expgui(globalmode) 0; sethistlist}
     grid [listbox $frm.title -height 1 -relief flat \
-            -exportselection 0 \
-            -font $expgui(histfont) ] -row 1 -column 0 -sticky ew
+            -exportselection 0 ] -row 1 -column 0 -sticky ew
     grid [listbox $frm.lbox -height 10 -width 25 \
             -exportselection 0 \
-            -font $expgui(histfont) \
             -xscrollcommand "$frm.x set" \
             -yscrollcommand "$frm.y set" \
@@ -2747 +2740 @@
 if $expgui(haveBW) {
     pack [NoteBook .n -bd 2] -expand yes -fill both
+    # this should not be needed, but for some reason NoteBook is not 
+    # using the optionDB
+    catch {.n configure -font [option get .n font Canvas]}
     foreach item $expgui(notebookpagelist) {
         set frm [lindex $item 0]
@@ -2823 +2819 @@
     #  This is a big frame in the Phase notebook pane to hold atomic data.
     set fbig [frame $expgui(phaseFrame).fbig -width 180 \
-            -relief raised -borderwidth 4]
+            -relief raised -borderwidth 4 -class Coord]
     #  This is a frame just below the big frame: for edits
     set frame3 [frame $expgui(phaseFrame).frame3 -width 100 \
@@ -2858 +2854 @@
     incr row
     foreach col {2 4 6} var {alpha beta gamma} lbl {a b g} {
-        grid [label $frameLatt.l$var -text $lbl -font symbol] \
+        grid [label $frameLatt.l$var -text $lbl] \
                 -column $col -row $row -padx 5 -sticky e
+        set font [$frameLatt.l$var cget -font]
+        $frameLatt.l$var config -font "Symbol [lrange $font 1 end]"
+
         incr col
         grid [entry $frameLatt.e$var -textvariable entryvar($var) -width 10] \
@@ -2895 +2894 @@
     bind $expgui(atomtitle) <Button-3> {set expgui(asorttype) number; DisplayAllAtoms}
 
-    $expgui(atomtitle) configure -font $expgui(coordfont) -selectmode extended 
+    $expgui(atomtitle) configure -selectmode extended 
     grid [listbox   $fbig.lbox -height 10 \
             -exportselection 0 \
@@ -2902 +2901 @@
             ] -row 1 -column 0 -sticky news
     set expgui(atomlistbox) $fbig.lbox 
-    $expgui(atomlistbox) configure -font $expgui(coordfont) -selectmode extended 
+    $expgui(atomlistbox) configure -selectmode extended 
     grid [scrollbar $fbig.bscr -orient horizontal \
             -command "move2boxes \" $fbig.title $fbig.lbox \" " \
@@ -3013 +3012 @@
 
 proc move2boxes {boxlist args} {
-    foreach listbox $boxlist { 
-        eval $listbox xview $args
+    foreach lbox $boxlist { 
+        eval $lbox xview $args
     }
 }
@@ -3027 +3026 @@
     grid rowconfigure $expgui(histFrame) 3 -weight 1
 
-    grid [frame $expgui(histFrame).hs] \
+    grid [frame $expgui(histFrame).hs -class HistList] \
             -column 0 -row 0 -rowspan 10 -sticky nsew
     MakeHistBox $expgui(histFrame).hs
@@ -3102 +3101 @@
     global expgui entryvar entrybox
 
-    pack [frame $expgui(fracFrame).hs] -side left -expand y -fill both
+    pack [frame $expgui(fracFrame).hs -class HistList] \
+            -side left -expand y -fill both
     MakeHistBox $expgui(fracFrame).hs
     bind $expgui(fracFrame).hs.lbox <ButtonRelease-1> {
@@ -3186 +3186 @@
     global expgui
     # v v v v v v v v v v BEGINNING OF PROFILE PANE CODE v v v v v v v v v v v
-    pack [frame $expgui(profFrame).hs] -side left -expand y -fill both
+    pack [frame $expgui(profFrame).hs -class HistList] \
+            -side left -expand y -fill both
     MakeHistBox $expgui(profFrame).hs
     bind $expgui(profFrame).hs.lbox <ButtonRelease-1> {
@@ -3236 +3237 @@
     9 "Print zero/unit pole figure constraint terms"
 }
-pack [frame $expgui(lsFrame).hs] -side left -expand y -fill both
+pack [frame $expgui(lsFrame).hs -class HistList] \
+        -side left -expand y -fill both
 MakeHistBox $expgui(lsFrame).hs
 bind $expgui(lsFrame).hs.lbox <ButtonRelease-1> {
@@ -3503 +3505 @@
 }
 
+$expgui(fm).option.menu add cascade -menu  $expgui(fm).option.menu.font \
+        -label "Screen font"
+menu $expgui(fm).option.menu.font
+foreach f {10 11 12 13 14 16 18 20} {
+    $expgui(fm).option.menu.font add radiobutton \
+            -command {SetTkDefaultOptions $expgui(font); ResizeFont .; ResizeNotebook} \
+        -label $f -value $f -variable expgui(font) -font "Helvetica -$f"
+}
+
 $expgui(fm).option.menu  add checkbutton -label "Show EXPTOOL output" \
         -variable expgui(showexptool)