[PD-cvs] packages/patches extended-help-menu.patch,1.2,1.3
Hans-Christoph Steiner
eighthave at users.sourceforge.net
Mon Nov 28 16:37:30 CET 2005
- Previous message: [PD-cvs] externals Makefile,1.9,1.10 Makefile.buildlayout,1.7,1.8
- Next message: [PD-cvs] externals/smlib/examples beattracker.pd, 1.1.1.1, 1.2 normalizer.pd, 1.1.1.1, 1.2 resonate-beat.pd, 1.1.1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pure-data/packages/patches
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9112
Modified Files:
extended-help-menu.patch
Log Message:
linux/win menu fixes, discovered during linux RC5 build
Index: extended-help-menu.patch
===================================================================
RCS file: /cvsroot/pure-data/packages/patches/extended-help-menu.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extended-help-menu.patch 26 Nov 2005 01:51:35 -0000 1.2
--- extended-help-menu.patch 28 Nov 2005 15:37:28 -0000 1.3
***************
*** 5,9 ****
diff -u -w -r1.7.2.4 u_main.tk
--- u_main.tk 21 Feb 2005 04:20:20 -0000 1.7.2.4
! +++ u_main.tk 25 Nov 2005 22:47:06 -0000
@@ -24,6 +24,14 @@
# Tearoff is set to true by default:
--- 5,9 ----
diff -u -w -r1.7.2.4 u_main.tk
--- u_main.tk 21 Feb 2005 04:20:20 -0000 1.7.2.4
! +++ u_main.tk 28 Nov 2005 15:27:03 -0000
@@ -24,6 +24,14 @@
# Tearoff is set to true by default:
***************
*** 70,74 ****
+ # one "docs" <hans at at.or.at>
+ set help_menu_name "docs"
! +
# tk::mac::OpenDocument is called with the filenames put into the
--- 70,74 ----
+ # one "docs" <hans at at.or.at>
+ set help_menu_name "docs"
! +
# tk::mac::OpenDocument is called with the filenames put into the
***************
*** 84,91 ****
puts stderr {setting pd_guidir to '.'}
set pd_guidir .
- + set help_top_directory $pd_guidir/doc
- + # init last help directory browsed
- + set help_directory $help_top_directory
}
}
--- 84,91 ----
puts stderr {setting pd_guidir to '.'}
set pd_guidir .
}
+ + set help_top_directory $pd_guidir/doc
+ + # init last help directory browsed
+ + set help_directory $help_top_directory
}
***************
*** 141,149 ****
- 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}} } \
+ -filetypes { {{documentation} {.pd .txt .htm .html}} } \
--- 141,149 ----
- 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}} } \
+ -filetypes { {{documentation} {.pd .txt .htm .html}} } \
***************
*** 181,185 ****
- global help_top_directory pd_tearoff
+################## menu_doc_submenu #########################
! +
+# this is a recursive function to generation a nested menu in the help menu
+# which shows the complete contents of the doc directory <hans at at.or.at>
--- 181,186 ----
- global help_top_directory pd_tearoff
+################## menu_doc_submenu #########################
!
! - set menudir $help_top_directory/$subdir
+# this is a recursive function to generation a nested menu in the help menu
+# which shows the complete contents of the doc directory <hans at at.or.at>
***************
*** 187,192 ****
+ global pd_tearoff
+ global help_top_directory
!
! - set menudir $help_top_directory/$subdir
+ set menu_dir $help_top_directory/$base_dir/$sub_dir
--- 188,192 ----
+ global pd_tearoff
+ global help_top_directory
! +
+ set menu_dir $help_top_directory/$base_dir/$sub_dir
***************
*** 239,246 ****
$mbar.audio add command -label {audio ON} -accelerator [accel_munge "Ctrl+/"] \
-command {menu_audio 1}
! @@ -494,30 +554,15 @@
!
!
! # the "Help" menu
- if {$pd_nt != 2} {
-# a menu on the main menubar named "$whatever.help" while be treated
--- 239,250 ----
$mbar.audio add command -label {audio ON} -accelerator [accel_munge "Ctrl+/"] \
-command {menu_audio 1}
! @@ -490,34 +550,17 @@
! -command {pd pd audio-properties \;}
! $mbar.apple.preferences add command -label "MIDI settings..." \
! -command {pd pd midi-properties \;}
! - }
! -
! -
! -# the "Help" menu
- if {$pd_nt != 2} {
-# a menu on the main menubar named "$whatever.help" while be treated
***************
*** 250,267 ****
- -command {menu_doc_open doc/1.manual 1.introduction.txt}
- $mbar.help add command -label {Pure Documentation...} \
! + puts stderr "Starting Menu crap"
! + $mbar.$help_menu_name add command -label {Browse Documentation...} \
! -command {menu_documentation}
- # add menu items for each section instead of using Pd patches
- $mbar.help add separator
- set helpmenuname help
! - } else {
-# Apple doesn't allow cascading menus in their Help so I had to call this
-# one "docs" <hans at at.or.at>
- set helpmenuname docs
! - }
! -
- $mbar.$helpmenuname add command -label {1 manual...} \
! + # the help menu only really works well on Mac OS X <hans at at.or.at>
+ $mbar.$help_menu_name add command -label {Pd HTML Manual...} \
-command {menu_doc_open doc/1.manual index.htm}
--- 254,272 ----
- -command {menu_doc_open doc/1.manual 1.introduction.txt}
- $mbar.help add command -label {Pure Documentation...} \
! - -command {menu_documentation}
- # add menu items for each section instead of using Pd patches
- $mbar.help add separator
- set helpmenuname help
! } else {
-# Apple doesn't allow cascading menus in their Help so I had to call this
-# one "docs" <hans at at.or.at>
- set helpmenuname docs
! + $mbar.$help_menu_name add command -label "About Pd..." -command \
! + {menu_doc_open doc/1.manual 1.introduction.txt}
! }
!
- $mbar.$helpmenuname add command -label {1 manual...} \
! + $mbar.$help_menu_name add command -label {Browse Documentation...} \
! + -command {menu_documentation}
+ $mbar.$help_menu_name add command -label {Pd HTML Manual...} \
-command {menu_doc_open doc/1.manual index.htm}
***************
*** 273,281 ****
+ $mbar.$help_menu_name add separator
+ menu_doc_submenu $mbar.$help_menu_name "." "."
- + puts stderr "Finishing Menu crap"
}
#################### the "File" menu for the Pd window ##############
! @@ -820,6 +865,7 @@
global pd_opendir
global pd_tearoff
--- 278,285 ----
+ $mbar.$help_menu_name add separator
+ menu_doc_submenu $mbar.$help_menu_name "." "."
}
#################### the "File" menu for the Pd window ##############
! @@ -820,6 +863,7 @@
global pd_opendir
global pd_tearoff
***************
*** 285,289 ****
toplevel $name -menu $name.m
# puts stderr [concat geometry: $geometry]
! @@ -1078,13 +1124,11 @@
# as a special menu with specific behaviors on different platforms.
# See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm
--- 289,293 ----
toplevel $name -menu $name.m
# puts stderr [concat geometry: $geometry]
! @@ -1078,13 +1122,11 @@
# as a special menu with specific behaviors on different platforms.
# See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm
- Previous message: [PD-cvs] externals Makefile,1.9,1.10 Makefile.buildlayout,1.7,1.8
- Next message: [PD-cvs] externals/smlib/examples beattracker.pd, 1.1.1.1, 1.2 normalizer.pd, 1.1.1.1, 1.2 resonate-beat.pd, 1.1.1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Pd-cvs
mailing list