DELETED libs/authorize/authorize.tcl Index: libs/authorize/authorize.tcl ================================================================== --- libs/authorize/authorize.tcl +++ libs/authorize/authorize.tcl @@ -1,95 +0,0 @@ -#authorize, (c) 2008 by Kevin Walzer. Proprietary to WordTech Communications LLC. - -package provide authorize 1.2 - -namespace eval authorize { - - - if {![info exists library]} { - variable library [file dirname [info script]] - } - - proc setAppName {appname} { - variable app - set app $appname - return $app - } - - - proc authorize {cmd} { - - variable app - variable password - variable command - set command $cmd - - set password "" - - image create photo lock -file [file join $authorize::library lock.png] - - - toplevel .password - wm title .password "Authorization Required" - wm resizable .password 0 0 - - ttk::frame .password.top -padding 10 - pack .password.top -side top -fill both -expand yes - ttk::entry .password.top.entry -show \u2022 -textvariable authorize::password - ttk::label .password.top.label -text "$app requires that you enter your password." -image lock -compound top - - pack .password.top.label .password.top.entry -side top -fill x -expand yes - - ttk::frame .password.bottom -padding 10 - pack .password.bottom -side bottom -fill both -expand yes - - ttk::frame .password.bottom.upper - pack .password.bottom.upper -side top -fill both -expand yes - - - ttk::frame .password.bottom.lower - pack .password.bottom.lower -side bottom -fill both -expand no - - - ttk::button .password.bottom.lower.install -text "OK" -default active -command "authorize::runCmd $command; destroy .password" - ttk::button .password.bottom.lower.cancel -text "Cancel" -command "destroy .password" - pack .password.bottom.lower.install .password.bottom.lower.cancel -side right -fill both -expand no - - - bind .password "authorize::runCmd $command; destroy .password" - - focus -force .password.top.entry - } - - proc runCmd {cmd} { - variable password - variable app - variable command - - set command $cmd - eval $command - } - - - proc demo {} { - variable password - variable command - variable app - - authorize::setAppName MyApp - authorize::authorize "authorize::printCmd" - } - - proc printCmd {} { - variable password - variable app - variable command - - puts $app - puts $command - puts $password - - tk_messageBox -message "Your password is: $password" - } - - namespace export * -} DELETED libs/authorize/lock.png Index: libs/authorize/lock.png ================================================================== --- libs/authorize/lock.png +++ libs/authorize/lock.png cannot compute difference between binary files DELETED libs/authorize/pkgIndex.tcl Index: libs/authorize/pkgIndex.tcl ================================================================== --- libs/authorize/pkgIndex.tcl +++ libs/authorize/pkgIndex.tcl @@ -1,1 +0,0 @@ -package ifneeded authorize 1.2 [list source [file join $dir authorize.tcl]] DELETED libs/fullscreen1.2/fullscreen.tcl Index: libs/fullscreen1.2/fullscreen.tcl ================================================================== --- libs/fullscreen1.2/fullscreen.tcl +++ libs/fullscreen1.2/fullscreen.tcl @@ -1,87 +0,0 @@ -#fullscreen: provides Cocoa-native fullscreen windows for Tk apps on OS X in a manner consistent with wm attributes api's. - - -namespace eval fullscreen { - - if {![info exists library]} { - variable library [file dirname [info script]] - } - - load [file join $library libfullscreen1.2.dylib] - - image create photo _resize -data { - - R0lGODlhEAAQAIABALm5uf///yH5BAEKAAEALAAAAAAQABAAAAIhjI+gim3LXIMy - 0RpglBfghU1h5o3kNnkXp4Wtu1ZaaZoFADs= - - } - - - proc fullscreen {windowname} { - - variable w - set w $windowname - - fullscreen::addfullscreenbutton $w - } - - proc togglefullscreen {} { - - variable w - - if {[wm attributes $w -fullscreen] == 1} { - fullscreen::restorewindow - } else { - fullscreen::makefullscreen - } - fullscreen::fullscreen $w - } - - proc makefullscreen {} { - - variable originalsize - variable title - variable w - - set originalsize [wm geometry $w] - set title [wm title $w] - - wm withdraw $w - wm attributes $w -fullscreen 1 - - set m [$w cget -menu] - - menu $m._resize - $m add cascade -image _resize -menu $m._resize - $m._resize add command -label "Restore Normal Window" -command fullscreen::restorewindow - wm deiconify $w - - } - - proc restorewindow {} { - - variable originalsize - variable w - variable title - - set m [$w cget -menu] - $m delete end - destroy $m._resize - - wm attributes $w -fullscreen 0 - - wm geometry . $originalsize - wm title $w $title - - } - - bind all <> fullscreen::togglefullscreen - namespace export * - -} - - - - - - DELETED libs/fullscreen1.2/libfullscreen1.2.dylib Index: libs/fullscreen1.2/libfullscreen1.2.dylib ================================================================== --- libs/fullscreen1.2/libfullscreen1.2.dylib +++ libs/fullscreen1.2/libfullscreen1.2.dylib cannot compute difference between binary files DELETED libs/fullscreen1.2/pkgIndex.tcl Index: libs/fullscreen1.2/pkgIndex.tcl ================================================================== --- libs/fullscreen1.2/pkgIndex.tcl +++ libs/fullscreen1.2/pkgIndex.tcl @@ -1,7 +0,0 @@ -# -# Tcl package index file -# -package ifneeded fullscreen 1.2 " - package require Tk 8.5- - if {\"AppKit\" ni \[winfo server .\]} {error {TkAqua Cocoa required}} - source [list [file join $dir fullscreen.tcl]]" Index: libs/machelp/help.txt ================================================================== --- libs/machelp/help.txt +++ libs/machelp/help.txt @@ -142,10 +142,13 @@ ------------------- title: Manpower Version History alias: Version History + +'''6.6 (December 1, 2017):''' + * UI enhancements. '''6.5 (May 1, 2017):''' * Improved scrolling performance, security support on macOS. '''6.4 (February 1, 2017):''' Index: libs/manpower/manpower-main.tcl ================================================================== --- libs/manpower/manpower-main.tcl +++ libs/manpower/manpower-main.tcl @@ -11,16 +11,14 @@ package require aquahig package require tablelist_tile package require softwareupdate package require regproc package require machelp -package require windowlist package require appname package require tclservices package require cocoaprint package require Tclapplescript -package require fullscreen package require launcher package require tooltip package require aem package require xplat @@ -112,12 +110,11 @@ global datadir set manitem "" set searchterm "" set manterm "" - - ::fullscreen::fullscreen . + #set up menu menu .mb #apple menu @@ -153,11 +150,12 @@ .mb.bookmarks add command -label "Delete Bookmark" -command deleteBookMark .mb add cascade -label "Bookmarks" -menu .mb.bookmarks #window menu - windowlist::windowMenu .mb + menu .mb.window + .mb add cascade -label Window -menu .mb.window #help menu menu .mb.help -tearoff 0 .mb.help add command -label "Contact Code by Kevin" -command machelp::usermail .mb.help add command -label "Web Site" -command machelp::appweb @@ -414,10 +412,14 @@ bind all manSearch bind all manSearch bind all printFile bind all printFile + bind . {wm state . withdrawn} + bind . {wm state . withdrawn} + wm protocol . WM_DELETE_WINDOW {wm withdraw .} + } proc toggleBookmarks {} { @@ -1238,11 +1240,11 @@ global rmanpath global cachedir global searchterm global mynode - appname::setAppName Manpower 6.5 + appname::setAppName Manpower 6.6 set rmanpath [file join [file dirname [info script]] rman] @@ -1343,10 +1345,24 @@ #custom "about" dialog proc aboutWindow {} { - tk_messageBox -parent . -icon info -title "About Manpower" -message "Manpower: Man Page Viewer" -detail "Version 6.5\n(c)2017 WordTech Communications LLC" + tk_messageBox -parent . -icon info -title "About Manpower" -message "Manpower: Man Page Viewer" -detail "Version 6.6\n(c)2017 WordTech Communications LLC" + +} + +#raise window if closed--dock click +proc ::tk::mac::ReopenApplication {} { + + if { [wm state .] == "withdrawn"} { + wm state . normal + raise . + } else { + wm deiconify . + raise . + } } + startUp Index: libs/manpower/manpower.tcl ================================================================== --- libs/manpower/manpower.tcl +++ libs/manpower/manpower.tcl @@ -1,3 +1,3 @@ -package provide manpower 6.5 +package provide manpower 6.6 source [file join [file dirname [info script]] manpower-main.tcl] Index: libs/manpower/pkgIndex.tcl ================================================================== --- libs/manpower/pkgIndex.tcl +++ libs/manpower/pkgIndex.tcl @@ -1,3 +1,3 @@ - package ifneeded manpower 6.5 [list source [file join $dir manpower.tcl]] + package ifneeded manpower 6.6 [list source [file join $dir manpower.tcl]] DELETED libs/windowlist/pkgIndex.tcl Index: libs/windowlist/pkgIndex.tcl ================================================================== --- libs/windowlist/pkgIndex.tcl +++ libs/windowlist/pkgIndex.tcl @@ -1,11 +0,0 @@ -# Tcl package index file, version 1.1 -# This file is generated by the "pkg_mkIndex" command -# and sourced either when an application starts up or -# by a "package unknown" script. It invokes the -# "package ifneeded" command to set up package-related -# information so that packages will be loaded automatically -# in response to "package require" commands. When this -# script is sourced, the variable $dir must contain the -# full path name of this file's directory. - -package ifneeded windowlist 1.4 [list source [file join $dir windowlist.tcl]] DELETED libs/windowlist/windowlist.tcl Index: libs/windowlist/windowlist.tcl ================================================================== --- libs/windowlist/windowlist.tcl +++ libs/windowlist/windowlist.tcl @@ -1,130 +0,0 @@ -#windowlist.tcl: provides routines for managing windows from menu, i.e. minimize, raise, bring all to front; standard menu item on Mac OS X. - -#(c) 2011 WordTech Communications LLC. License: standard Tcl license, http://www.tcl.tk/software/tcltk/license.html - -#includes code from http://wiki.tcl.tk/1461 - -##"cycle through windows" code courtesy of Tom Hennigan, tomhennigan@gmail.com, (c) 2009 - -package provide windowlist 1.4 - -namespace eval windowlist { - - #make the window menu - proc windowMenu {mainmenu} { - - menu $mainmenu.windowlist - - $mainmenu.windowlist add command -label "Minimize" -command [namespace current]::minimizeFrontWindow -accelerator Command-M - $mainmenu.windowlist add separator - $mainmenu.windowlist add command -label "Bring All to Front" -command [namespace current]::raiseAllWindows - $mainmenu.windowlist add separator - $mainmenu.windowlist add command -label "Cycle Through Windows" \ - -command {raise [lindex [wm stackorder .] 0]} \ - -accelerator "Command-`" - bind all {raise [lindex [wm stackorder .] 0]} - $mainmenu.windowlist add separator - $mainmenu.windowlist add command -label "Main Window" -command ::tk::mac::ReopenApplication - $mainmenu.windowlist add separator - $mainmenu.windowlist add command -label [wm title .] -command ::tk::mac::ReopenApplication - - $mainmenu add cascade -label "Window" -menu $mainmenu.windowlist - - #bind the window menu to update whenever a new window is added, on menu selection - bind all <> +[list [namespace current]::updateWindowMenu $mainmenu.windowlist] - bind all [namespace current]::minimizeFrontWindow - bind all [namespace current]::minimizeFrontWindow - bind . {wm state . withdrawn} - bind . {wm state . withdrawn} - wm protocol . WM_DELETE_WINDOW {wm state . withdrawn} - - } - - - #update the window menu with windows - proc updateWindowMenu {windowmenu} { - - set windowlist [wm stackorder .] - - if {$windowlist == {}} { - return - } - - $windowmenu delete 8 end - foreach item $windowlist { - $windowmenu add command -label "[wm title $item]" -command [list raise $item] - - } - } - - - - #make all windows visible - proc raiseAllWindows {} { - - #get list of mapped windows - - if {![winfo ismapped .]} { - - wm deiconify . - - } - - set windowlist [wm stackorder .] - - #do nothing if all windows are minimized - if {$windowlist == {}} { - return - } - - #use [winfo children .] here to get windows that are minimized - foreach item [winfo children .] { - - #get all toplevel windows, exclude menubar windows - if { [string equal [winfo toplevel $item] $item] && [catch {$item cget -tearoff}]} { - wm deiconify $item - } - } - #be sure to deiconify ., since the above command only gets the child toplevels - wm deiconify . - } - - #minimize the selected window - proc minimizeFrontWindow {} { - - #get list of mapped windows - set windowlist [wm stackorder .] - - #do nothing if all windows are minimized - if {$windowlist == {}} { - return - } else { - - #minimize topmost window - set topwindow [lindex $windowlist end] - wm iconify $topwindow - - } - } - - namespace export * -} - -#raise window if closed--dock click -proc ::tk::mac::ReopenApplication {} { - - if { [wm state .] == "withdrawn"} { - wm state . normal - raise . - } else { - wm deiconify . - raise . - } - -} - - - - - -