diff options
author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-12-23 07:53:31 +0000 |
---|---|---|
committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-12-23 07:53:31 +0000 |
commit | e213c74dad16887c4b79aeef047877203e084b07 (patch) | |
tree | ae588764149e960b61ab924772ba04f04b240746 /packages/patches/help_browser-0.39.2.patch | |
parent | 79303b6fb91be89b810c16dee8c99e51daf6fdb1 (diff) |
updated patch collection to apply and build against stable_0_40, which is currently at 0.40.1
svn path=/trunk/; revision=7049
Diffstat (limited to 'packages/patches/help_browser-0.39.2.patch')
-rw-r--r-- | packages/patches/help_browser-0.39.2.patch | 158 |
1 files changed, 0 insertions, 158 deletions
diff --git a/packages/patches/help_browser-0.39.2.patch b/packages/patches/help_browser-0.39.2.patch deleted file mode 100644 index e7de403a..00000000 --- a/packages/patches/help_browser-0.39.2.patch +++ /dev/null @@ -1,158 +0,0 @@ -Index: u_main.tk -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v -retrieving revision 1.17 -diff -u -w -r1.17 u_main.tk ---- u_main.tk 15 Oct 2005 23:14:28 -0000 1.17 -+++ u_main.tk 20 Sep 2006 15:41:10 -0000 -@@ -89,6 +89,8 @@ - } - } - -+set help_top_directory $pd_guidir/doc -+ - # it's unfortunate but we seem to have to turn off global bindings - # for Text objects to get control-s and control-t to do what we want for - # "text" dialogs below. Also we have to get rid of tab's changing the focus. -@@ -389,41 +391,6 @@ - } - } - --set help_directory $pd_guidir/doc --set help_top_directory $pd_guidir/doc -- --proc menu_documentation {} { -- global help_directory -- global pd_nt -- global pd_guidir -- -- if {$pd_nt == 2} { -- exec rm -rf /tmp/pd-documentation -- exec cp -pr $pd_guidir/doc /tmp/pd-documentation -- set filename [tk_getOpenFile -defaultextension .pd \ -- -filetypes { {{documentation} {.pd .txt .htm}} } \ -- -initialdir /tmp/pd-documentation] -- } else { -- set filename [tk_getOpenFile -defaultextension .pd \ -- -filetypes { {{documentation} {.pd .txt .htm}} } \ -- -initialdir $help_directory] -- } -- if {$filename != ""} { -- if {[string first .txt $filename] >= 0} { -- menu_opentext $filename -- } elseif {[string first .htm $filename] >= 0} { -- menu_openhtml $filename -- } else { -- set help_directory [string range $filename 0 \ -- [expr [string last / $filename ] - 1]] -- set basename [string range $filename \ -- [expr [string last / $filename ] + 1] end] -- pd [concat pd open [pdtk_enquote $basename] \ -- [pdtk_enquote $help_directory] \;] -- } -- } --} -- - proc menu_doc_open {subdir basename} { - global pd_guidir - -@@ -439,26 +406,74 @@ - } - } - --proc doc_submenu {helpmenu subdir} { -- global help_top_directory pd_tearoff - -- set menudir $help_top_directory/$subdir -+################## help browser and support functions ######################### -+proc menu_doc_browser {dir} { -+ global .mbar -+ if {![file isdirectory $dir]} { -+ puts stderr "menu_doc_browser non-directory $dir\n" -+ } -+ if { [winfo exists .help_browser.frame] } { -+ raise .help_browser -+ } else { -+ toplevel .help_browser -menu .mbar -+ wm title .help_browser "Pd Documentation Browser" -+ frame .help_browser.frame -+ pack .help_browser.frame -side top -fill both -+ doc_make_listbox .help_browser.frame $dir 0 -+ } -+ } - -- regsub -all "\\\." $subdir "" submenu -+proc doc_make_listbox {base dir count} { -+ # check for [file readable]? -+ if { [info tclversion] >= 8.5 } { -+ # requires Tcl 8.5 but probably deals with special chars better -+# destroy {expand}[lrange [winfo children $base] [expr {2 * $count}] end] -+ } else { -+ if { [catch { eval destroy [lrange [winfo children $base] \ -+ [expr { 2 * $count }] end] } \ -+ errorMessage] } { -+ puts stderr "doc_make_listbox: error listing $dir\n" -+ } -+ } -+ # exportselection 0 looks good, but selection gets easily out-of-sync -+ set current_listbox [listbox "[set b "$base.listbox$count"]-list" -yscrollcommand \ -+ [list "$b-scroll" set] -height 20 -exportselection 0] -+ pack $current_listbox [scrollbar "$b-scroll" -command [list $current_listbox yview]] \ -+ -side left -expand 1 -fill y -anchor w -+ foreach item [concat [lsort -dictionary [glob -directory $dir -nocomplain -types {d} -- *]] \ -+ [lsort -dictionary [glob -directory $dir -nocomplain -types {f} -- *]]] { -+ $current_listbox insert end "[file tail $item][expr {[file isdirectory $item] ? {/} : {}}]" -+ } -+ bind $current_listbox <Button-1> [list doc_navigate $dir $count %W %x %y] -+ bind $current_listbox <Double-Button-1> [list doc_double_button $dir $count %W %x %y] -+} - -- menu $helpmenu.$submenu -tearoff $pd_tearoff -- regsub -all "\\\." $subdir " " submenuname -- $helpmenu add cascade -label $submenuname \ -- -menu $helpmenu.$submenu -- catch { --# use this glob pattern to exclude the supporting files --# foreach file [ lsort [ glob -dir $menudir {*[0-9][0-9]*} ] ] -- foreach file [ lsort [ glob -dir $menudir * ] ] { -- set filename "" -- regsub {.*/(.*\..+$)} $file {\1} filename -- $helpmenu.$submenu add command -label $filename \ -- -command "menu_doc_open doc/$subdir $filename" -+proc doc_navigate {dir count width x y} { -+ if {[set newdir [$width get [$width index "@$x,$y"]]] eq {}} { -+ return -+ } -+ set dir_to_open [file join $dir $newdir] -+ if {[file isdirectory $dir_to_open]} { -+ doc_make_listbox [winfo parent $width] $dir_to_open [incr count] -+ } -+} -+ -+proc doc_double_button {dir count width x y} { -+ global pd_guidir -+ if {[set newdir [$width get [$width index "@$x,$y"]]] eq {}} { -+ return -+ } -+ set dir_to_open [file join $dir $newdir] -+ if {[file isdirectory $dir_to_open]} { -+ doc_navigate $dir $count $width $x $y -+ } else { -+ regsub -- $pd_guidir [file dirname $dir_to_open] "" subdir -+ set file [file tail $dir_to_open] -+ if { [catch {menu_doc_open $subdir $file} fid] } { -+ puts stderr "Could not open $pd_guidir/$subdir/$file\n" - } -+ return; - } - } - -@@ -526,7 +541,7 @@ - $mbar.help add command -label {Html ...} \ - -command {menu_doc_open doc/1.manual index.htm} - $mbar.help add command -label {Browser ...} \ -- -command {menu_documentation} -+ -command {menu_doc_browser $help_top_directory} - } - - #################### the "File" menu for the Pd window ############## |