Manpower

Check-in [6418da5aa9]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fixes for Catalina
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:6418da5aa93f8b9704f250e99a99089a82c3a26f
User & Date: kevin 2019-10-17 01:14:55
Context
2019-11-07
14:04
7.1 Leaf check-in: adef03287d user: kevin tags: trunk
2019-10-17
01:14
Fixes for Catalina check-in: 6418da5aa9 user: kevin tags: trunk
2019-10-16
06:15
Fix breaking dylibs check-in: 418c1f4264 user: kevin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Scripts/AppMain.tcl.








1







package require manpower
>
>
>
>
>
>
>

1
2
3
4
5
6
7
8

#remove system frameworks from Catalina, causes too many conflicts

foreach item [lsearch -regexp -all $auto_path /System] {
    set auto_path [lreplace $auto_path $item $item]
}

package require manpower

Deleted libs/launcher1.1/liblauncher1.1.dylib.

cannot compute difference between binary files

Deleted libs/launcher1.1/pkgIndex.tcl.

1
2
3
4
5
6
7
#
# Tcl package index file
#
package ifneeded launcher 1.1 "
    package require Tk 8.5-
    if {\"AppKit\" ni \[winfo server .\]} {error {TkAqua Cocoa required}}
        load [list [file join $dir liblauncher1.1.dylib]] launcher"
<
<
<
<
<
<
<














Changes to libs/machelp/help.tcl.

270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
#
# ::Help::Click -- Handles clicking a link on the help page
#
proc ::Help::Click {w x y} {
    set range [$w tag prevrange link "[$w index @$x,$y] + 1 char"]

    if {[tk windowingsystem] eq "aqua"} {
	package require launcher
    	if {[llength $range] && [regexp "http*" [eval $w get $range]]} { 
    	    launcher::launchurl [eval $w get $range]
    	    return
    	}
    	if {[llength $range] &&  [regexp "@" [eval $w get $range]]} {

    	    set mail [eval $w get $range]
    	    launcher::launchurl "mailto:$mail"
    	    return
    	}
    }

    if {[llength $range]} {::Help::Show [eval $w get $range]}
    
}







<

|





|







270
271
272
273
274
275
276

277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
#
# ::Help::Click -- Handles clicking a link on the help page
#
proc ::Help::Click {w x y} {
    set range [$w tag prevrange link "[$w index @$x,$y] + 1 char"]

    if {[tk windowingsystem] eq "aqua"} {

    	if {[llength $range] && [regexp "http*" [eval $w get $range]]} { 
    	    exec open [eval $w get $range]
    	    return
    	}
    	if {[llength $range] &&  [regexp "@" [eval $w get $range]]} {

    	    set mail [eval $w get $range]
    	    exec open "mailto:$mail"
    	    return
    	}
    }

    if {[llength $range]} {::Help::Show [eval $w get $range]}
    
}

Changes to libs/machelp/machelp.tcl.

1
2
3
4
5
6
7
8
9
10
11
..
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
package provide machelp 1.0 

package require launcher

namespace eval machelp {


    if {![info exists library]} {
	variable library [file dirname [info script]]
    }

................................................................................

    #e-mail developer for assistance
    proc usermail {} { 

	variable appname
	variable appversion

	launcher::launchurl mailto:kw@codebykevin.com?subject=$appname
    }


    #e-mail developer for assistance
    proc appweb {} { 

	variable appname
	variable appversion

	launcher::launchurl http://www.codebykevin.com/$appname.html

    }


    namespace export *

}


<
<







 







|









|







1
2


3
4
5
6
7
8
9
..
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
package provide machelp 1.0 



namespace eval machelp {


    if {![info exists library]} {
	variable library [file dirname [info script]]
    }

................................................................................

    #e-mail developer for assistance
    proc usermail {} { 

	variable appname
	variable appversion

	exec open mailto:kw@codebykevin.com?subject=$appname
    }


    #e-mail developer for assistance
    proc appweb {} { 

	variable appname
	variable appversion

	exec open http://www.codebykevin.com/$appname.html

    }


    namespace export *

}

Changes to libs/manpower/manpower-main.tcl.

349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
...
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
    .middle.right add .middle.right.upper
    .middle.right add .middle.right.lower

    .middle add .middle.left
    .middle add .middle.right

    toplevel .bookmarks
    tk::unsupported::MacWindowStyle style .bookmarks utility
    wm title .bookmarks "Bookmarks"
    
    #draw drawer window offscreen
    ttk::label .bookmarks.header -text "Bookmarks" 
    pack .bookmarks.header -side top -fill both -expand yes

    ttk::frame .bookmarks.top
................................................................................
    global appversion
    global datadir
    global rmanpath
    global cachedir
    global searchterm
    global mynode
    
    appname::setAppName Manpower 6.0 


    set rmanpath [file join [file dirname [info script]] rman]

    
    #check for app support directory
    set appdir [file join $::env(HOME) "Library" "Application Support" "Manpower"]







|







 







|







349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
...
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
    .middle.right add .middle.right.upper
    .middle.right add .middle.right.lower

    .middle add .middle.left
    .middle add .middle.right

    toplevel .bookmarks
    tk::unsupported::MacWindowStyle style .bookmarks floating
    wm title .bookmarks "Bookmarks"
    
    #draw drawer window offscreen
    ttk::label .bookmarks.header -text "Bookmarks" 
    pack .bookmarks.header -side top -fill both -expand yes

    ttk::frame .bookmarks.top
................................................................................
    global appversion
    global datadir
    global rmanpath
    global cachedir
    global searchterm
    global mynode
    
    appname::setAppName Manpower 7.0 


    set rmanpath [file join [file dirname [info script]] rman]

    
    #check for app support directory
    set appdir [file join $::env(HOME) "Library" "Application Support" "Manpower"]