← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-security

« back to all changes in this revision

Viewing changes to git-gui/lib/option.tcl

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-10-04 08:27:01 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20071004082701-rsd058ontoqz4i30
Tags: 1:1.5.3.4-1
http://bugs.debian.org/445188
new upstream point release (closes: #445188).

Show diffs side-by-side

added added

removed removed

Lines of Context:
git-gui/lib/option.tcl
55
55
}
56
56
 
57
57
proc do_about {} {
58
 
        global appvers copyright
 
58
        global appvers copyright oguilib
59
59
        global tcl_patchLevel tk_patchLevel
60
60
 
61
61
        set w .about_dialog
94
94
                append v ", Tk version $tk_patchLevel"
95
95
        }
96
96
 
 
97
        set d {}
 
98
        append d "git wrapper: $::_git\n"
 
99
        append d "git exec dir: [gitexec]\n"
 
100
        append d "git-gui lib: $oguilib"
 
101
 
97
102
        label $w.vers \
98
103
                -text $v \
99
104
                -padx 5 -pady 5 \
103
108
                -relief solid
104
109
        pack $w.vers -side top -fill x -padx 5 -pady 5
105
110
 
 
111
        label $w.dirs \
 
112
                -text $d \
 
113
                -padx 5 -pady 5 \
 
114
                -justify left \
 
115
                -anchor w \
 
116
                -borderwidth 1 \
 
117
                -relief solid
 
118
        pack $w.dirs -side top -fill x -padx 5 -pady 5
 
119
 
106
120
        menu $w.ctxm -tearoff 0
107
121
        $w.ctxm add command \
108
122
                -label {Copy} \
174
188
 
175
189
                {b merge.summary {Summarize Merge Commits}}
176
190
                {i-1..5 merge.verbosity {Merge Verbosity}}
 
191
                {b merge.diffstat {Show Diffstat After Merge}}
177
192
 
178
193
                {b gui.trustmtime  {Trust File Modification Timestamps}}
 
194
                {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
 
195
                {b gui.matchtrackingbranch {Match Tracking Branches}}
179
196
                {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
180
197
                {t gui.newbranchtemplate {New Branch Name Template}}
181
198
                } {
238
255
 
239
256
                frame $w.global.$name
240
257
                label $w.global.$name.l -text "$text:"
241
 
                pack $w.global.$name.l -side left -anchor w -fill x
242
 
                eval tk_optionMenu $w.global.$name.family \
243
 
                        global_config_new(gui.$font^^family) \
244
 
                        $all_fonts
245
 
                spinbox $w.global.$name.size \
246
 
                        -textvariable global_config_new(gui.$font^^size) \
247
 
                        -from 2 -to 80 -increment 1 \
248
 
                        -width 3
249
 
                bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
250
 
                pack $w.global.$name.size -side right -anchor e
251
 
                pack $w.global.$name.family -side right -anchor e
 
258
                button $w.global.$name.b \
 
259
                        -text [mc "Change Font"] \
 
260
                        -command [list \
 
261
                                choose_font::pick \
 
262
                                $w \
 
263
                                [mc "Choose %s" $text] \
 
264
                                global_config_new(gui.$font^^family) \
 
265
                                global_config_new(gui.$font^^size) \
 
266
                                ]
 
267
                label $w.global.$name.f -textvariable global_config_new(gui.$font^^family)
 
268
                label $w.global.$name.s -textvariable global_config_new(gui.$font^^size)
 
269
                label $w.global.$name.pt -text [mc "pt."]
 
270
                pack $w.global.$name.l -side left -anchor w
 
271
                pack $w.global.$name.b -side right -anchor e
 
272
                pack $w.global.$name.pt -side right -anchor w
 
273
                pack $w.global.$name.s -side right -anchor w
 
274
                pack $w.global.$name.f -side right -anchor w
252
275
                pack $w.global.$name -side top -anchor w -fill x
253
276
        }
254
277