diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-09-13 20:13:59 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-09-13 20:13:59 -0400 |
| commit | 4baba57f8d7bfee85ca1e521e1f6069923504799 (patch) | |
| tree | 51ab8513fd89d61af163e47e73e9fef64d433134 /lib/option.tcl | |
| parent | Merge branch 'maint' (diff) | |
| parent | git-gui: Paper bag fix "Commit->Revert" format arguments (diff) | |
| download | tgif-4baba57f8d7bfee85ca1e521e1f6069923504799.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Paper bag fix "Commit->Revert" format arguments
git-gui: Provide 'uninstall' Makefile target to undo an installation
git-gui: Font chooser to handle a large number of font families
Diffstat (limited to 'lib/option.tcl')
| -rw-r--r-- | lib/option.tcl | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/lib/option.tcl b/lib/option.tcl index 31c7d47f35..03bc08f128 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -254,17 +254,23 @@ proc do_options {} { frame $w.global.$name label $w.global.$name.l -text "$text:" - pack $w.global.$name.l -side left -anchor w -fill x - eval tk_optionMenu $w.global.$name.family \ - global_config_new(gui.$font^^family) \ - $all_fonts - spinbox $w.global.$name.size \ - -textvariable global_config_new(gui.$font^^size) \ - -from 2 -to 80 -increment 1 \ - -width 3 - bind $w.global.$name.size <FocusIn> {%W selection range 0 end} - pack $w.global.$name.size -side right -anchor e - pack $w.global.$name.family -side right -anchor e + button $w.global.$name.b \ + -text [mc "Change Font"] \ + -command [list \ + choose_font::pick \ + $w \ + [mc "Choose %s" $text] \ + global_config_new(gui.$font^^family) \ + global_config_new(gui.$font^^size) \ + ] + label $w.global.$name.f -textvariable global_config_new(gui.$font^^family) + label $w.global.$name.s -textvariable global_config_new(gui.$font^^size) + label $w.global.$name.pt -text [mc "pt."] + pack $w.global.$name.l -side left -anchor w + pack $w.global.$name.b -side right -anchor e + pack $w.global.$name.pt -side right -anchor w + pack $w.global.$name.s -side right -anchor w + pack $w.global.$name.f -side right -anchor w pack $w.global.$name -side top -anchor w -fill x } |