diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-02-22 01:40:25 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-02-22 01:40:25 -0500 |
| commit | b5e2f805e6bdbaae629399fea92deb053f4ca7cd (patch) | |
| tree | 420f06c14d8b90a472aeea048bc400f1fed6fada /lib | |
| parent | git-gui: fix typo in lib/spellcheck.tcl (diff) | |
| parent | git-gui: Focus insertion point at end of strings in repository chooser (diff) | |
| download | tgif-b5e2f805e6bdbaae629399fea92deb053f4ca7cd.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Focus insertion point at end of strings in repository chooser
git-gui: Avoid hardcoded Windows paths in Cygwin package files
git-gui: Default TCL_PATH to same location as TCLTK_PATH
git-gui: Paper bag fix error dialogs opening over the main window
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/choose_repository.tcl | 4 | ||||
| -rw-r--r-- | lib/error.tcl | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/choose_repository.tcl b/lib/choose_repository.tcl index 86faf24cc8..0adcf9d958 100644 --- a/lib/choose_repository.tcl +++ b/lib/choose_repository.tcl @@ -11,6 +11,7 @@ field w_quit ; # Quit button field o_cons ; # Console object (if active) field w_types ; # List of type buttons in clone field w_recentlist ; # Listbox containing recent repositories +field w_localpath ; # Entry widget bound to local_path field done 0 ; # Finished picking the repository? field local_path {} ; # Where this repository is locally @@ -385,6 +386,7 @@ method _do_new {} { button $w_body.where.b \ -text [mc "Browse"] \ -command [cb _new_local_path] + set w_localpath $w_body.where.t pack $w_body.where.b -side right pack $w_body.where.l -side left @@ -416,6 +418,7 @@ method _new_local_path {} { return } set local_path $p + $w_localpath icursor end } method _do_new2 {} { @@ -481,6 +484,7 @@ method _do_clone {} { -text [mc "Browse"] \ -command [cb _new_local_path] grid $args.where_l $args.where_t $args.where_b -sticky ew + set w_localpath $args.where_t label $args.type_l -text [mc "Clone Type:"] frame $args.type_f diff --git a/lib/error.tcl b/lib/error.tcl index 45800d5493..08a24622c7 100644 --- a/lib/error.tcl +++ b/lib/error.tcl @@ -2,7 +2,11 @@ # Copyright (C) 2006, 2007 Shawn Pearce proc _error_parent {} { - return [grab current .] + set p [grab current .] + if {$p eq {}} { + return . + } + return $p } proc error_popup {msg} { |