[PD-cvs] packages/patches help_browser-0.39.2.patch,1.1,1.2
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Wed Sep 20 17:41:53 CEST 2006
Update of /cvsroot/pure-data/packages/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25360
Modified Files:
help_browser-0.39.2.patch
Log Message:
added sensible double-click actions for files, directory browsing still happens with single-clicks
Index: help_browser-0.39.2.patch
===================================================================
RCS file: /cvsroot/pure-data/packages/patches/help_browser-0.39.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** help_browser-0.39.2.patch 22 Feb 2006 04:44:04 -0000 1.1
--- help_browser-0.39.2.patch 20 Sep 2006 15:41:51 -0000 1.2
***************
*** 1,4 ****
! --- u_main.tk 2006-02-21 23:31:26.000000000 -0500
! +++ ../../pd-MAIN/src/u_main.tk 2005-12-31 15:55:25.000000000 -0500
@@ -89,6 +89,8 @@
}
--- 1,9 ----
! 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 @@
}
***************
*** 52,56 ****
global pd_guidir
! @@ -439,27 +406,62 @@
}
}
--- 57,61 ----
global pd_guidir
! @@ -439,26 +406,74 @@
}
}
***************
*** 58,78 ****
-proc doc_submenu {helpmenu subdir} {
- global help_top_directory pd_tearoff
- -
- - set menudir $help_top_directory/$subdir
! - regsub -all "\\\." $subdir "" submenu
! -
! - 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"
+################## help browser and support functions #########################
+proc menu_doc_browser {dir} {
--- 63,68 ----
-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} {
***************
*** 89,105 ****
+ pack .help_browser.frame -side top -fill both
+ doc_make_listbox .help_browser.frame $dir 0
! }
! }
! +
+proc doc_make_listbox {base dir count} {
- + global pd_guidir
- + if {![file isdirectory $dir]} {
- + regsub -- $pd_guidir [file dirname $dir] "" subdir
- + set file [file tail $dir]
- + if { [catch {menu_doc_open $subdir $file} fid] } {
- + puts stderr "Could not open $pd_guidir/$subdir/$file\n"
- + }
- + return;
- + }
+ # check for [file readable]?
+ if { [info tclversion] >= 8.5 } {
--- 79,87 ----
+ 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 } {
***************
*** 122,137 ****
+ $current_listbox insert end "[file tail $item][expr {[file isdirectory $item] ? {/} : {}}]"
+ }
! + bind $current_listbox <Button-1> [list doc_navigate $dir [incr count] %W %x %y]
+}
! +
+proc doc_navigate {dir count width x y} {
! + if {[set subdir [$width get [$width index "@$x,$y"]]] eq {}} {
+ return
+ }
! + doc_make_listbox [winfo parent $width] [file join $dir $subdir] $count
}
! ############# routine to add media, help, and apple menu items ###############
! @@ -526,7 +528,7 @@
$mbar.help add command -label {Html ...} \
-command {menu_doc_open doc/1.manual index.htm}
--- 104,152 ----
+ $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}
More information about the Pd-cvs
mailing list