From bcpierce at seas.upenn.edu Sat Jul 5 19:31:55 2014 From: bcpierce at seas.upenn.edu (bcpierce at seas.upenn.edu) Date: Sat, 5 Jul 2014 19:31:55 -0400 Subject: [Unison-hackers] [unison-svn] r528 - in trunk: doc src Message-ID: <201407052331.s65NVuPs030569@yaws.seas.upenn.edu> Author: bcpierce Date: 2014-07-05 19:31:55 -0400 (Sat, 05 Jul 2014) New Revision: 528 Modified: trunk/doc/docs.ml trunk/src/NEWS trunk/src/RECENTNEWS trunk/src/mkProjectInfo.ml trunk/src/strings.ml Log: * Fixed a bug in export procedure that was messing up documentation strings Modified: trunk/doc/docs.ml =================================================================== --- trunk/doc/docs.ml 2014-07-05 21:55:19 UTC (rev 527) +++ trunk/doc/docs.ml 2014-07-05 23:31:55 UTC (rev 528) @@ -20,10 +20,12 @@ let prsection ch = let name = input_line ch in let shortname = input_line ch in - let empty = input_line ch in - if empty<>"" then - (fprintf stderr "Second line after SNIP is '%s', not empty!\n" empty; - exit 1); + if shortname <> "" then begin + let empty = input_line ch in + if empty<>"" then + (fprintf stderr "Second line after SNIP is '%s', not empty!\n" empty; + exit 1) + end; fprintf ml " (\"%s\", (\"%s\", \n \"" shortname name; let rec loop () = let l = input_line ch in Modified: trunk/src/NEWS =================================================================== --- trunk/src/NEWS 2014-07-05 21:55:19 UTC (rev 527) +++ trunk/src/NEWS 2014-07-05 23:31:55 UTC (rev 528) @@ -1,48 +1,105 @@ -Changes in Version 2.40.16 +Changes in Version 2.47.1 + Changes since 2.40.63: + * New preference fastercheckUNSAFE, which can be used (with care!) to + achieve much faster update detection when all the common files in + the two replicas are known to be identical. See the manual for more + information. + This feature should still be considered experimental, but it's + ready for other people to try out. + * Added option clientHostName. If specified, it will be used to as + the client host name, overriding UNISONLOCALHOSTNAME and the actual + host name. + * OS X GUI: + + fix crash under Lion, because of problems with the toolbar, + using the fix suggested in + http://blitzbasic.com/Community/posts.php?topic=95778. + + uimacnew09 is now the standard graphical interface on OSX + + A small improvement to the uimacnew09 interface from Alan + Schmitt and Steve Kalkwarf: when Unison is run with the -batch + flag, the interface will now automatically propagate changes + and terminate, without waiting for user interaction. + + Show a modal warning window if there is no archive for the + hosts. The user can then choose to exit or proceed (proceed is + the default). The window is not shown if the batch preference + is true. + + file details panel selectable + * GTK GUI: + + New version of uigtk2.ml from Matt Zagrabelny that reorganizes + the icons in a slightly more intuitive way. + * Minor fixes: + + Setting the prefer preference to older or newer now propagates + deletions when there is no conflict. + + Correctly quote the path when running merge commands. + + Add quotes to paths when calling external file watcher + utility. + + Incorporate a patch to fsmonitor.py (the external filewatcher + utility) from Tomasz Zernicki to make it work better under + Windows. + + Incorporated new version of fsmonitor.py from Christophe Gohle + + Fixed incompatibility with OpenSSH 5.6. + + Fixed fingerprint cache: do not cache file properties + + Some spelling corrections in documentation and comments from + Stephane Glondu + + Fixed O_APPEND mode for open under Windows + + Fixed String.sub invalid argument error when an AppleDouble + file does not contain a finder information field + + Trim duplicate paths when using "-repeat watch" + + Unison now passes path arguments and -follow directives to + fsmonitor.py. This seems to work except for one small issue + with how fsmonitor.py treats -follow directives for + directories that don't exist (or maybe this is an issue with + how it treats any kind of monitoring when the thing being + monitored doesn't exist?). If we create a symlink to a + nonexistant directory, give Unison (hence fsmonitor.py) a + 'follow' directive for the symlink, start unison, and then + create the directory, fsmonitor.py misses the change. + + Lines added in profile files by unison always start at a new + line + Changes since 2.40.1: * Added "BelowPath" patterns, that match a path as well as all paths below (convenient to use with nodeletion,update,creationpartial preferences) * Added a "fat" preference that makes Unison use the right options when one of the replica is on a FAT filesystem. - * Allow "prefer/force=newer" even when not synchronizing - modification times. (The reconciler will not be aware of the - modification time of unchanged files, so the synchronization - choices of Unison can be different from when "times=true", but the - behavior remains sane: changed files with the most recent - modification time will be propagated.) + * Allow "prefer/force=newer" even when not synchronizing modification + times. (The reconciler will not be aware of the modification time + of unchanged files, so the synchronization choices of Unison can be + different from when "times=true", but the behavior remains sane: + changed files with the most recent modification time will be + propagated.) * Minor fixes and improvements: + Compare filenames up to decomposition in case sensitive mode when one host is running MacOSX and the unicode preference is set to true. + Rsync: somewhat faster compressor - + Make Unicode the default on all architectures (it was only - the default when a Mac OS X or Windows machine was involved). + + Make Unicode the default on all architectures (it was only the + default when a Mac OS X or Windows machine was involved). Changes since 2.32: * Major enhancement: Unicode support. + Unison should now handle unicode filenames correctly on all platforms. + This functionality is controlled by a new preference unicode. - + Unicode mode is now the default when one of the hosts is - under Windows or MacOS. This may make upgrades a bit more - painful (the archives cannot be reused), but this is a much - saner default. + + Unicode mode is now the default when one of the hosts is under + Windows or MacOS. This may make upgrades a bit more painful + (the archives cannot be reused), but this is a much saner + default. * Partial transfer of directories. If an error occurs while transferring a directory, the part transferred so far is copied into place (and the archives are updated accordingly). The - "maxerrors" preference controls how many transfer error Unison - will accept before stopping the transfer of a directory (by - default, only one). This makes it possible to transfer most of a - directory even if there are some errors. Currently, only the first - error is reported by the GUIs. - Also, allow partial transfer of a directory when there was an - error deep inside this directory during update detection. At the - moment, this is only activated with the text and GTK UIs, which - have been modified so that they show that the transfer is going to - be partial and so that they can display all errors. + "maxerrors" preference controls how many transfer error Unison will + accept before stopping the transfer of a directory (by default, + only one). This makes it possible to transfer most of a directory + even if there are some errors. Currently, only the first error is + reported by the GUIs. + Also, allow partial transfer of a directory when there was an error + deep inside this directory during update detection. At the moment, + this is only activated with the text and GTK UIs, which have been + modified so that they show that the transfer is going to be partial + and so that they can display all errors. * Improvement to the code for resuming directory transfers: + if a file was not correctly transferred (or the source has been modified since, with unchanged size), Unison performs a @@ -51,8 +108,8 @@ deleted on the source replica before resuming the transfer; not deleting the file would result in it reappearing on the target replica) - * Experimental streaming protocol for transferring file contents - (can be disabled by setting the directive "stream" to false): file + * Experimental streaming protocol for transferring file contents (can + be disabled by setting the directive "stream" to false): file contents is transfered asynchronously (without waiting for a response from the destination after each chunk sent) rather than using the synchronous RPC mechanism. As a consequence: @@ -62,9 +119,9 @@ + the transfer of large files uses the full available bandwidth and is not slowed done due to the connection latency anymore + we get performance improvement for small files as well by - scheduling many files simultaneously (as scheduling a file - for transfer consume little ressource: it does not mean - allocating a large buffer anymore) + scheduling many files simultaneously (as scheduling a file for + transfer consume little ressource: it does not mean allocating + a large buffer anymore) * Changes to the internal implementation of the rsync algorithm: + use longer blocks for large files (the size of a block is the square root of the size of the file for large files); @@ -100,29 +157,29 @@ efficient alternative to "maxthreads = 1"). * Renamed preference "pretendwin" to "ignoreinodenumbers" (an alias is kept for backwards compatibility). - * Ignore one-second differences when synchronizing modification - time. (Technically, this is an incompatible archive format change, - but it is backward compatible. To trigger a problem, a user would - have to synchronize modification times on a filesystem with a - two-second granularity and then downgrade to a previous version of - Unison, which does not work well in such a case. Thus, it does not - seem worthwhile to increment the archive format number, which - would impact all users.) - * Do not keep many files simultaneously opened anymore when the - rsync algorithm is in use. + * Ignore one-second differences when synchronizing modification time. + (Technically, this is an incompatible archive format change, but it + is backward compatible. To trigger a problem, a user would have to + synchronize modification times on a filesystem with a two-second + granularity and then downgrade to a previous version of Unison, + which does not work well in such a case. Thus, it does not seem + worthwhile to increment the archive format number, which would + impact all users.) + * Do not keep many files simultaneously opened anymore when the rsync + algorithm is in use. * Add "ignorearchives" preference to ignore existing archives (to avoid forcing users to delete them manually, in situations where one archive has gotten deleted or corrupted). * Mac OS - + fixed rsync bug which could result in an "index out of - bounds" error when transferring resource forks. + + fixed rsync bug which could result in an "index out of bounds" + error when transferring resource forks. + Fixed bug which made Unison ignore finder information and resource fork when compiled to 64bit on Mac OSX. + should now be 64 bit clean (the Growl framework is not up to date, though) - + Made the bridge between Objective C and Ocaml code GC - friendly (it was allocating ML values and putting them in an - array which was not registered with the GC) + + Made the bridge between Objective C and Ocaml code GC friendly + (it was allocating ML values and putting them in an array + which was not registered with the GC) + use darker grey arrows (patch contributed by Eric Y. Kow) * GTK user interface + assistant for creating profiles @@ -145,8 +202,8 @@ + Do not display "Looking for change" messages during propagation (when checking the targe is unchanged) but only during update detection - + Apply patch to fix some crashes in the OSX GUI, thanks to - Onne Gorter. + + Apply patch to fix some crashes in the OSX GUI, thanks to Onne + Gorter. * Text UI + During update detection, display status by updating a single line rather than generating a new line of output every so @@ -160,23 +217,23 @@ + Windows text UI: now put the console into UTF-8 output mode. This is the right thing to do when in Unicode mode, and is no worse than what we had previously otherwise (the console use - some esoteric encoding by default). This only works when - using a Unicode font instead of the default raster font. + some esoteric encoding by default). This only works when using + a Unicode font instead of the default raster font. + Don't get the home directory from environment variable HOME under Windows (except for Cygwin binaries): we don't want the behavior of Unison to depends on whether it is run from a Cygwin shell (where HOME is set) or in any other way (where HOME is usually not set). * Miscellaneous fixes and improvements - + Made a server waiting on a socket more resilient to - unexpected lost connections from the client. + + Made a server waiting on a socket more resilient to unexpected + lost connections from the client. + Small patch to property setting code suggested by Ulrich Gernkow. + Several fixes to the change transfer functions (both the internal ones and external transfers using rsync). In - particular, limit the number of simultaneous transfer using - an rsync (as the rsync algorithm can use a large amount of - memory when processing huge files) + particular, limit the number of simultaneous transfer using an + rsync (as the rsync algorithm can use a large amount of memory + when processing huge files) + Keep track of which file contents are being transferred, and delay the transfer of a file when another file with the same contents is currently being transferred. This way, the second @@ -187,12 +244,12 @@ on the next sync. + Fixed bug with case insensitive mode on a case sensitive filesystem: - o if file "a/a" is created on one replica and directory - "A" is created on the other, the file failed to be + o if file "a/a" is created on one replica and directory "A" + is created on the other, the file failed to be synchronized the first time Unison is run afterwards, as - Unison uses the wrong path "a/a" (if Unison is run - again, the directories are in the archive, so the right - path is used); + Unison uses the wrong path "a/a" (if Unison is run again, + the directories are in the archive, so the right path is + used); o if file "a" appears on one replica and file "A" appears on the other with different contents, Unison was unable to synchronize them. @@ -200,9 +257,8 @@ during synchronization: Unison now tells which file has been updated, and how. + Limit the length of temporary file names - + Case sensitivity information put in the archive (in a - backward compatible way) and checked when the archive is - loaded + + Case sensitivity information put in the archive (in a backward + compatible way) and checked when the archive is loaded + Got rid of the 16mb marshalling limit by marshalling to a bigarray. + Resume copy of partially transferred files. @@ -210,8 +266,8 @@ Changes since 2.31: * Small user interface changes + Small change to text UI "scanning..." messages, to print just - directories (hopefully making it clearer that individual - files are not necessarily being fingerprinted). + directories (hopefully making it clearer that individual files + are not necessarily being fingerprinted). * Minor fixes and improvements: + Ignore one hour differences when deciding whether a file may have been updated. This avoids slow update detection after @@ -220,15 +276,15 @@ enough. + Fix a small bug that was affecting mainly windows users. We need to commit the archives at the end of the sync even if - there are no updates to propagate because some files (in - fact, if we've just switched to DST on windows, a LOT of - files) might have new modtimes in the archive. (Changed the - text UI only. It's less clear where to change the GUI.) + there are no updates to propagate because some files (in fact, + if we've just switched to DST on windows, a LOT of files) + might have new modtimes in the archive. (Changed the text UI + only. It's less clear where to change the GUI.) + Don't delete the temp file when a transfer fails due to a - fingerprint mismatch (so that we can have a look and see - why!) We've also added more debugging code togive more - informative error messages when we encounter the dreaded and - longstanding "assert failed during file transfer" bug + fingerprint mismatch (so that we can have a look and see why!) + We've also added more debugging code togive more informative + error messages when we encounter the dreaded and longstanding + "assert failed during file transfer" bug + Incorrect paths ("path" directive) now result in an error update item rather than a fatal error. + Create parent directories (with correct permissions) during @@ -248,53 +304,51 @@ transfer protocol. Three new preferences have been added: + copyprog is a string giving the name (and command-line switches, if needed) of an external program that can be used - to copy large files efficiently. By default, rsync is - invoked, but other tools such as scp can be used instead by - changing the value of this preference. (Although this is not - its primary purpose, rsync is actually a pretty fast way of - copying files that don't already exist on the receiving - host.) For files that do already exist on (but that have been - changed in one replica), Unison will always use its built-in + to copy large files efficiently. By default, rsync is invoked, + but other tools such as scp can be used instead by changing + the value of this preference. (Although this is not its + primary purpose, rsync is actually a pretty fast way of + copying files that don't already exist on the receiving host.) + For files that do already exist on (but that have been changed + in one replica), Unison will always use its built-in implementation of the rsync algorithm. + Added a "copyprogrest" preference, so that we can give - different command lines for invoking the external copy - utility depending on whether a partially transferred file - already exists or not. (Rsync doesn't seem to care about - this, but other utilities may.) + different command lines for invoking the external copy utility + depending on whether a partially transferred file already + exists or not. (Rsync doesn't seem to care about this, but + other utilities may.) + copythreshold is an integer (-1 by default), indicating above what filesize (in megabytes) Unison should use the external - copying utility specified by copyprog. Specifying 0 will - cause ALL copies to use the external program; a negative - number will prevent any files from using it. (Default is -1.) + copying utility specified by copyprog. Specifying 0 will cause + ALL copies to use the external program; a negative number will + prevent any files from using it. (Default is -1.) Thanks to Alan Schmitt for a huge amount of hacking and to an anonymous sponsor for suggesting and underwriting this extension. * Small improvements: - + Added a new preference, dontchmod. By default, Unison uses - the chmod system call to set the permission bits of files - after it has copied them. But in some circumstances (and - under some operating systems), the chmod call always fails. - Setting this preference completely prevents Unison from ever - calling chmod. + + Added a new preference, dontchmod. By default, Unison uses the + chmod system call to set the permission bits of files after it + has copied them. But in some circumstances (and under some + operating systems), the chmod call always fails. Setting this + preference completely prevents Unison from ever calling chmod. + Don't ignore files that look like backup files if the backuplocation preference is set to central + Shortened the names of several preferences. The old names are - also still supported, for backwards compatibility, but they - do not appear in the documentation. + also still supported, for backwards compatibility, but they do + not appear in the documentation. + Lots of little documentation tidying. (In particular, - preferences are separated into Basic and Advanced! This - should hopefully make Unison a little more approachable for - new users. + preferences are separated into Basic and Advanced! This should + hopefully make Unison a little more approachable for new + users. + Unison can sometimes fail to transfer a file, giving the - unhelpful message "Destination updated during - synchronization" even though the file has not been changed. - This can be caused by programs that change either the file's - contents or the file's extended attributes without changing - its modification time. It's not clear what is the best fix - for this - it is not Unison's fault, but it makes Unison's - behavior puzzling - but at least Unison can be more helpful - about suggesting a workaround (running once with fastcheck - set to false). The failure message has been changed to give - this advice. + unhelpful message "Destination updated during synchronization" + even though the file has not been changed. This can be caused + by programs that change either the file's contents or the + file's extended attributes without changing its modification + time. It's not clear what is the best fix for this - it is not + Unison's fault, but it makes Unison's behavior puzzling - but + at least Unison can be more helpful about suggesting a + workaround (running once with fastcheck set to false). The + failure message has been changed to give this advice. + Further improvements to the OS X GUI (thanks to Alan Schmitt and Craig Federighi). * Very preliminary support for triggering Unison from an external @@ -308,33 +362,32 @@ + start Unison with the command-line flag "-repeat FOO", where FOO is name of a file where Unison should look for notifications of changes - + when it starts up, Unison will read the whole contents of - this file (on both hosts), which should be a - newline-separated list of paths (relative to the root of the - synchronization) and synchronize just these paths, as if it - had been started with the "-path=xxx" option for each one of - them + + when it starts up, Unison will read the whole contents of this + file (on both hosts), which should be a newline-separated list + of paths (relative to the root of the synchronization) and + synchronize just these paths, as if it had been started with + the "-path=xxx" option for each one of them + when it finishes, it will sleep for a few seconds and then examine the watchfile again; if anything has been added, it will read the new paths, synchronize them, and go back to sleep + that's it! To use this to drive Unison "incrementally," just start it in this - mode and start up a tool (on each host) to watch for new changes - to the filesystem and append the appropriate paths to the - watchfile. Hopefully such tools should not be too hard to write. + mode and start up a tool (on each host) to watch for new changes to + the filesystem and append the appropriate paths to the watchfile. + Hopefully such tools should not be too hard to write. * Bug fixes: + Fixed a bug that was causing new files to be created with permissions 0x600 instead of using a reasonable default (like - 0x644), if the 'perms' flag was set to 0. (Bug reported by - Ben Crowell.) + 0x644), if the 'perms' flag was set to 0. (Bug reported by Ben + Crowell.) + Follow maxthreads preference when transferring directories. Changes since 2.17: * Major rewrite and cleanup of the whole Mac OS X graphical user interface by Craig Federighi. Thanks, Craig!!! - * Small fix to ctime (non-)handling in update detection under - windows with fastcheck. + * Small fix to ctime (non-)handling in update detection under windows + with fastcheck. * Several small fixes to the GTK2 UI to make it work better under Windows [thanks to Karl M for these]. * The backup functionality has been completely rewritten. The @@ -361,19 +414,19 @@ path as an error, rather than treating the symlink itself as missing or deleted. This avoids a potentially dangerous situation where a followed symlink points to an external - filesystem that might be offline when Unison is run - (whereupon Unison would cheerfully delete the corresponding - files in the other replica!). + filesystem that might be offline when Unison is run (whereupon + Unison would cheerfully delete the corresponding files in the + other replica!). * Smaller changes: - + Added forcepartial and preferpartial preferences, which - behave like force and prefer but can be specified on a - per-path basis. [Thanks to Alan Schmitt for this.] + + Added forcepartial and preferpartial preferences, which behave + like force and prefer but can be specified on a per-path + basis. [Thanks to Alan Schmitt for this.] + A bare-bones self test feature was added, which runs unison through some of its paces and checks that the results are as - expected. The coverage of the tests is still very limited, - but the facility has already been very useful in debugging - the new backup functionality (especially in exposing some - subtle cross-platform issues). + expected. The coverage of the tests is still very limited, but + the facility has already been very useful in debugging the new + backup functionality (especially in exposing some subtle + cross-platform issues). + Refined debugging code so that the verbosity of individual modules can be controlled separately. Instead of just putting '-debug verbose' on the command line, you can put '-debug @@ -386,33 +439,31 @@ cooperation with external Harmony instances. + Changed the temp file prefix from .# to .unison. + Compressed the output from the text user interface - (particularly when run with the -terse flag) to make it - easier to interpret the results when Unison is run several - times in succession from a script. + (particularly when run with the -terse flag) to make it easier + to interpret the results when Unison is run several times in + succession from a script. + Diff and merge functions now work under Windows. - + Changed the order of arguments to the default diff command - (so that the + and - annotations in diff's output are - reversed). + + Changed the order of arguments to the default diff command (so + that the + and - annotations in diff's output are reversed). + Added .mpp files to the "never fastcheck" list (like .xls files). * Many small bugfixes, including: + Fixed a longstanding bug regarding fastcheck and daylight - saving time under Windows when Unison is set up to - synchronize modification times. (Modification times cannot be - updated in the archive in this case, so we have to ignore one - hour differences.) + saving time under Windows when Unison is set up to synchronize + modification times. (Modification times cannot be updated in + the archive in this case, so we have to ignore one hour + differences.) + Fixed a bug that would occasionally cause the archives to be left in non-identical states on the two hosts after synchronization. - + Fixed a bug that prevented Unison from communicating - correctly between 32- and 64-bit architectures. + + Fixed a bug that prevented Unison from communicating correctly + between 32- and 64-bit architectures. + On windows, file creation times are no longer used as a proxy - for inode numbers. (This is unfortunate, as it makes - fastcheck a little less safe. But it turns out that file - creation times are not reliable under Windows: if a file is - removed and a new file is created in its place, the new one - will sometimes be given the same creation date as the old - one!) + for inode numbers. (This is unfortunate, as it makes fastcheck + a little less safe. But it turns out that file creation times + are not reliable under Windows: if a file is removed and a new + file is created in its place, the new one will sometimes be + given the same creation date as the old one!) + Set read-only file to R/W on OSX before attempting to change other attributes. + Fixed bug resulting in spurious "Aborted" errors during @@ -430,8 +481,8 @@ fail with the message "Failed: Error in readWrite: Is a directory." + Replaced symlinks with copies of their targets in the Growl - framework in src/uimac. This should make the sources easier - to check out from the svn repository on WinXP systems. + framework in src/uimac. This should make the sources easier to + check out from the svn repository on WinXP systems. + Added a workaround (suggested by Karl M.) for the problem discussed on the unison users mailing list where, on the Windows platform, the server would hang when transferring @@ -439,14 +490,13 @@ mechanism, which was used to make a call back from the server to the client (inside the Trace.log function) so that the log message would be appended to the log file on the client. The - workaround is to dump these messages (about when - xferbycopying shortcuts are applied and whether they succeed) - just to the standard output of the Unison process, not to the - log file. + workaround is to dump these messages (about when xferbycopying + shortcuts are applied and whether they succeed) just to the + standard output of the Unison process, not to the log file. Changes since 2.13.0: - * The features for performing backups and for invoking external - merge programs have been completely rewritten by Stephane Lescuyer + * The features for performing backups and for invoking external merge + programs have been completely rewritten by Stephane Lescuyer (thanks, Stephane!). The user-visible functionality should not change, but the internals have been rationalized and there are a number of new features. See the manual (in particular, the @@ -486,13 +536,12 @@ + Improved workaround for button focus problem (GTK2 UI) + Put leading zeroes in date fields + More robust handling of character encodings in GTK2 UI - + Changed format of modification time displays, from modified - at hh:mm:ss on dd MMM, yyyy to modified on yyyy-mm-dd - hh:mm:ss - + Changed time display to include seconds (so that people on - FAT filesystems will not be confused when Unison tries to - update a file time to an odd number of seconds and the - filesystem truncates it to an even number!) + + Changed format of modification time displays, from modified at + hh:mm:ss on dd MMM, yyyy to modified on yyyy-mm-dd hh:mm:ss + + Changed time display to include seconds (so that people on FAT + filesystems will not be confused when Unison tries to update a + file time to an odd number of seconds and the filesystem + truncates it to an even number!) + Use the diff "-u" option by default when showing differences between files (the output is more readable) + In text mode, pipe the diff output to a pager if the @@ -520,13 +569,13 @@ + Disable multi-threading when both roots are local + Improved error handling code. In particular, make sure all files are closed in case of a transient failure - + Under Windows, use $UNISON for home directory as a last - resort (it was wrongly moved before $HOME and $USERPROFILE in - Unison 2.12.0) + + Under Windows, use $UNISON for home directory as a last resort + (it was wrongly moved before $HOME and $USERPROFILE in Unison + 2.12.0) + Reopen the logfile if its name changes (profile change) - + Double-check that permissions and modification times have - been properly set: there are some combination of OS and - filesystem on which setting them can fail in a silent way. + + Double-check that permissions and modification times have been + properly set: there are some combination of OS and filesystem + on which setting them can fail in a silent way. + Check for bad Windows filenames for pure Windows synchronization also (not just cross architecture synchronization). This way, filenames containing backslashes, @@ -538,8 +587,8 @@ + Ignore trailing dots in filenames in case insensitive mode + Proper quoting of paths, files and extensions ignored using the UI - + The strings CURRENT1 and CURRENT2 are now correctly - substitued when they occur in the diff preference + + The strings CURRENT1 and CURRENT2 are now correctly substitued + when they occur in the diff preference + Improvements to syncing resource forks between Macs via a non-Mac system. @@ -549,6 +598,7 @@ Subversion. One nice side-effect is that anonymous checkout is now possible, like this: svn co https://cvs.cis.upenn.edu:3690/svnroot/unison/ + We will also continue to export a "developer tarball" of the current (modulo one day) sources in the web export directory. To receive commit logs for changes to the sources, subscribe to the @@ -577,18 +627,17 @@ + Fixed assertion failure when resolving a conflict content change / permission changes in favor of the content change. + Workaround for transferring large files using rsync. - + Use buffered I/O for files (this is the only way to open - files in binary mode under Cygwin). - + On non-Cygwin Windows systems, the UNISON environment - variable is now checked first to determine where to look for - Unison's archive and preference files, followed by HOME and - USERPROFILE in that order. On Unix and Cygwin systems, HOME - is used. + + Use buffered I/O for files (this is the only way to open files + in binary mode under Cygwin). + + On non-Cygwin Windows systems, the UNISON environment variable + is now checked first to determine where to look for Unison's + archive and preference files, followed by HOME and USERPROFILE + in that order. On Unix and Cygwin systems, HOME is used. + Generalized diff preference so that it can be given either as - just the command name to be used for calculating diffs or - else a whole command line, containing the strings CURRENT1 - and CURRENT2, which will be replaced by the names of the - files to be diff'ed before the command is called. + just the command name to be used for calculating diffs or else + a whole command line, containing the strings CURRENT1 and + CURRENT2, which will be replaced by the names of the files to + be diff'ed before the command is called. + Recognize password prompts in some newer versions of ssh. Changes since 2.9.20: @@ -597,13 +646,13 @@ + Major tidying and enhancement of 'merge' functionality. The main user-visible change is that the external merge program may either write the merged output to a single new file, as - before, or it may modify one or both of its input files, or - it may write two new files. In the latter cases, its - modifications will be copied back into place on both the - local and the remote host, and (if the two files are now - equal) the archive will be updated appropriately. More - information can be found in the user manual. Thanks to Malo - Denielou and Alan Schmitt for these improvements. + before, or it may modify one or both of its input files, or it + may write two new files. In the latter cases, its + modifications will be copied back into place on both the local + and the remote host, and (if the two files are now equal) the + archive will be updated appropriately. More information can be + found in the user manual. Thanks to Malo Denielou and Alan + Schmitt for these improvements. Warning: the new merging functionality is not completely compatible with old versions! Check the manual for details. + Files larger than 2Gb are now supported. @@ -617,8 +666,8 @@ Unison's archives, preference files, etc., is now determined as follows: # if ~/.unison exists, use it - # otherwise, use ~/Library/Application - Support/Unison, creating it if necessary. + # otherwise, use ~/Library/Application Support/Unison, + creating it if necessary. o A preliminary native-Cocoa user interface is under construction. This still needs some work, and some users experience unpredictable crashes, so it is only for @@ -633,25 +682,24 @@ directory matches one of the patterns set in this preference, then update detection is skipped for files in this directory. (The purpose is to speed update detection for cases like Mail - folders, which contain lots and lots of immutable files.) - Also a preference assumeContentsAreImmutableNot, which - overrides the first, similarly to ignorenot. (Later - amendment: these preferences are now called immutable and - immutablenot.) + folders, which contain lots and lots of immutable files.) Also + a preference assumeContentsAreImmutableNot, which overrides + the first, similarly to ignorenot. (Later amendment: these + preferences are now called immutable and immutablenot.) + The ignorecase flag has been changed from a boolean to a three-valued preference. The default setting, called default, checks the operating systems running on the client and server - and ignores filename case if either of them is OSX or - Windows. Setting ignorecase to true or false overrides this - behavior. If you have been setting ignorecase on the command - line using -ignorecase=true or -ignorecase=false, you will - need to change to -ignorecase true or -ignorecase false. + and ignores filename case if either of them is OSX or Windows. + Setting ignorecase to true or false overrides this behavior. + If you have been setting ignorecase on the command line using + -ignorecase=true or -ignorecase=false, you will need to change + to -ignorecase true or -ignorecase false. + a new preference, 'repeat', for the text user interface (only). If 'repeat' is set to a number, then, after it - finishes synchronizing, Unison will wait for that many - seconds and then start over, continuing this way until it is - killed from outside. Setting repeat to true will - automatically set the batch preference to true. + finishes synchronizing, Unison will wait for that many seconds + and then start over, continuing this way until it is killed + from outside. Setting repeat to true will automatically set + the batch preference to true. + Excel files are now handled specially, so that the fastcheck optimization is skipped even if the fastcheck flag is set. (Excel does some naughty things with modtimes, making this @@ -666,16 +714,16 @@ + Added a new preference, 'repeat', for the text user interface (only, at the moment). If 'repeat' is set to a number, then, after it finishes synchronizing, Unison will wait for that - many seconds and then start over, continuing this way until - it is killed from outside. Setting repeat to true will + many seconds and then start over, continuing this way until it + is killed from outside. Setting repeat to true will automatically set the batch preference to true. + The 'rshargs' preference has been split into 'rshargs' and - 'sshargs' (mainly to make the documentation clearer). In - fact, 'rshargs' is no longer mentioned in the documentation - at all, since pretty much everybody uses ssh now anyway. + 'sshargs' (mainly to make the documentation clearer). In fact, + 'rshargs' is no longer mentioned in the documentation at all, + since pretty much everybody uses ssh now anyway. * Documentation - + The web pages have been completely redesigned and - reorganized. (Thanks to Alan Schmitt for help with this.) + + The web pages have been completely redesigned and reorganized. + (Thanks to Alan Schmitt for help with this.) * User interface improvements + Added a GTK2 user interface, capable (among other things) of displaying filenames in any locale encoding. Kudos to Stephen @@ -684,8 +732,8 @@ at the end of synchronization. + Restarting update detection from the graphical UI will reload the current profile (which in particular will reset the -path - preference, in case it has been narrowed by using the - "Recheck unsynchronized items" command). + preference, in case it has been narrowed by using the "Recheck + unsynchronized items" command). + Several small improvements to the text user interface, including a progress display. * Bug fixes (too numerous to count, actually, but here are some): @@ -719,8 +767,8 @@ Changes since 2.9.1: * Added a preference maxthreads that can be used to limit the number of simultaneous file transfers. - * Added a backupdir preference, which controls where backup files - are stored. + * Added a backupdir preference, which controls where backup files are + stored. * Basic support added for OSX. In particular, Unison now recognizes when one of the hosts being synchronized is running OSX and switches to a case-insensitive treatment of filenames (i.e., 'foo' @@ -744,15 +792,14 @@ tuning. * Makefile + Makefile.OCaml now sets UISTYLE=text or UISTYLE=gtk - automatically, depending on whether it finds lablgtk - installed + automatically, depending on whether it finds lablgtk installed + Unison should now compile "out of the box" under OSX Changes since 2.8.1: * Changing profile works again under Windows * File movement optimization: Unison now tries to use local copy - instead of transfer for moved or copied files. It is controled by - a boolean option "xferbycopying". + instead of transfer for moved or copied files. It is controled by a + boolean option "xferbycopying". * Network statistics window (transfer rate, amount of data transferred). [NB: not available in Windows-Cygwin version.] * symlinks work under the cygwin version (which is dynamically @@ -761,8 +808,8 @@ Unix * Small improvements: + If neither the USERPROFILE nor the HOME environment variables - are set, then Unison will put its temporary commit log - (called DANGER.README) into the directory named by the UNISON + are set, then Unison will put its temporary commit log (called + DANGER.README) into the directory named by the UNISON environment variable, if any; otherwise it will use C:. + alternative set of values for fastcheck: yes = true; no = false; default = auto. @@ -777,13 +824,13 @@ anymore. Changes since 2.7.78: - * Small bugfix to textual user interface under Unix (to avoid - leaving the terminal in a bad state where it would not echo inputs - after Unison exited). + * Small bugfix to textual user interface under Unix (to avoid leaving + the terminal in a bad state where it would not echo inputs after + Unison exited). Changes since 2.7.39: - * Improvements to the main web page (stable and beta version docs - are now both accessible). + * Improvements to the main web page (stable and beta version docs are + now both accessible). * User manual revised. * Added some new preferences: + "sshcmd" and "rshcmd" for specifying paths to ssh and rsh @@ -807,34 +854,34 @@ * User interface and Unison behavior: + Renamed `Proceed' to `Go' in the graphical UI. + Added exit status for the textual user interface. - + Paths that are not synchronized because of conflicts or - errors during update detection are now noted in the log file. + + Paths that are not synchronized because of conflicts or errors + during update detection are now noted in the log file. + [END] messages in log now use a briefer format - + Changed the text UI startup sequence so that ./unison -ui - text will use the default profile instead of failing. + + Changed the text UI startup sequence so that ./unison -ui text + will use the default profile instead of failing. + Made some improvements to the error messages. + Added some debugging messages to remote.ml. Changes since 2.7.7: - * Incorporated, once again, a multi-threaded transport sub-system. - It transfers several files at the same time, thereby making much - more effective use of available network bandwidth. Unlike the - earlier attempt, this time we do not rely on the native thread - library of OCaml. Instead, we implement a light-weight, - non-preemptive multi-thread library in OCaml directly. This - version appears stable. + * Incorporated, once again, a multi-threaded transport sub-system. It + transfers several files at the same time, thereby making much more + effective use of available network bandwidth. Unlike the earlier + attempt, this time we do not rely on the native thread library of + OCaml. Instead, we implement a light-weight, non-preemptive + multi-thread library in OCaml directly. This version appears + stable. Some adjustments to unison are made to accommodate the multi-threaded version. These include, in particular, changes to the user interface and logging, for example: + Two log entries for each transferring task, one for the beginning, one for the end. + Suppressed warning messages against removing temp files left - by a previous unison run, because warning does not work - nicely under multi-threading. The temp file names are made - less likely to coincide with the name of a file created by - the user. They take the form - .#..unison.tmp. [N.b. This was later - changed to .unison...unison.tmp.] + by a previous unison run, because warning does not work nicely + under multi-threading. The temp file names are made less + likely to coincide with the name of a file created by the + user. They take the form + .#..unison.tmp. [N.b. This was later changed + to .unison...unison.tmp.] * Added a new command to the GTK user interface: pressing 'f' causes Unison to start a new update detection phase, using as paths just those paths that have been detected as changed and not yet marked @@ -842,17 +889,16 @@ Unison on just the set of paths still needing attention after a previous run. * Made the ignorecase preference user-visible, and changed the - initialization code so that it can be manually set to true, even - if neither host is running Windows. (This may be useful, e.g., - when using Unison running on a Unix system with a FAT volume - mounted.) + initialization code so that it can be manually set to true, even if + neither host is running Windows. (This may be useful, e.g., when + using Unison running on a Unix system with a FAT volume mounted.) * Small improvements and bug fixes: + Errors in preference files now generate fatal errors rather than warnings at startup time. (I.e., you can't go on from - them.) Also, we fixed a bug that was preventing these - warnings from appearing in the text UI, so some users who - have been running (unsuspectingly) with garbage in their - prefs files may now get error reports. + them.) Also, we fixed a bug that was preventing these warnings + from appearing in the text UI, so some users who have been + running (unsuspectingly) with garbage in their prefs files may + now get error reports. + Error reporting for preference files now provides file name and line number. + More intelligible message in the case of identical change to @@ -872,8 +918,8 @@ 1.2.3 library (patched version used for compiling under Windows). + Added the option to compile unison on the Windows platform - with Cygwin GNU C compiler. This option only supports - building dynamically linked unison executables. + with Cygwin GNU C compiler. This option only supports building + dynamically linked unison executables. Changes since 2.7.4: * Fixed a silly (but debilitating) bug in the client startup @@ -885,10 +931,10 @@ added to. * Bug fix: read the initial connection header one byte at a time, so that we don't block if the header is shorter than expected. (This - bug did not affect normal operation -- it just made it hard to - tell when you were trying to use Unison incorrectly with an old - version of the server, since it would hang instead of giving an - error message.) + bug did not affect normal operation -- it just made it hard to tell + when you were trying to use Unison incorrectly with an old version + of the server, since it would hang instead of giving an error + message.) Changes since 2.6.59: * Changed fastcheck from a boolean to a string preference. Its legal @@ -898,16 +944,15 @@ default. * Several preferences have been renamed for consistency. All preference names are now spelled out in lowercase. For backward - compatibility, the old names still work, but they are not - mentioned in the manual any more. + compatibility, the old names still work, but they are not mentioned + in the manual any more. * The temp files created by the 'diff' and 'merge' commands are now named by prepending a new prefix to the file name, rather than - appending a suffix. This should avoid confusing diff/merge - programs that depend on the suffix to guess the type of the file - contents. + appending a suffix. This should avoid confusing diff/merge programs + that depend on the suffix to guess the type of the file contents. * We now set the keepalive option on the server socket, to make sure - that the server times out if the communication link is - unexpectedly broken. + that the server times out if the communication link is unexpectedly + broken. * Bug fixes: + When updating small files, Unison now closes the destination file. @@ -917,10 +962,10 @@ Changes since 2.6.38: * Major Windows performance improvement! - We've added a preference fastcheck that makes Unison look only at - a file's creation time and last-modified time to check whether it - has changed. This should result in a huge speedup when checking - for updates in large replicas. + We've added a preference fastcheck that makes Unison look only at a + file's creation time and last-modified time to check whether it has + changed. This should result in a huge speedup when checking for + updates in large replicas. When this switch is set, Unison will use file creation times as 'pseudo inode numbers' when scanning Windows replicas for updates, instead of reading the full contents of every file. This may cause @@ -939,30 +984,29 @@ * New functionality: centralized backups and merging + This version incorporates two pieces of major new functionality, implemented by Sylvain Roy during a summer - internship at Penn: a centralized backup facility that keeps - a full backup of (selected files in) each replica, and a - merging feature that allows Unison to invoke an external - file-merging tool to resolve conflicting changes to - individual files. + internship at Penn: a centralized backup facility that keeps a + full backup of (selected files in) each replica, and a merging + feature that allows Unison to invoke an external file-merging + tool to resolve conflicting changes to individual files. + Centralized backups: o Unison now maintains full backups of the - last-synchronized versions of (some of) the files in - each replica; these function both as backups in the - usual sense and as the "common version" when invoking - external merge programs. + last-synchronized versions of (some of) the files in each + replica; these function both as backups in the usual + sense and as the "common version" when invoking external + merge programs. o The backed up files are stored in a directory - /.unison/backup on each host. (The name of this - directory can be changed by setting the environment - variable UNISONBACKUPDIR.) + /.unison/backup on each host. (The name of this directory + can be changed by setting the environment variable + UNISONBACKUPDIR.) o The predicate backup controls which files are actually - backed up: giving the preference 'backup = Path *' - causes backing up of all files. + backed up: giving the preference 'backup = Path *' causes + backing up of all files. o Files are added to the backup directory whenever unison updates its archive. This means that # When unison reconstructs its archive from scratch - (e.g., because of an upgrade, or because the - archive files have been manually deleted), all - files will be backed up. + (e.g., because of an upgrade, or because the archive + files have been manually deleted), all files will be + backed up. # Otherwise, each file will be backed up the first time unison propagates an update for it. o The preference backupversions controls how many previous @@ -971,23 +1015,23 @@ o For backward compatibility, the backups preference is also still supported, but backup is now preferred. o It is OK to manually delete files from the backup - directory (or to throw away the directory itself). - Before unison uses any of these files for anything - important, it checks that its fingerprint matches the - one that it expects. + directory (or to throw away the directory itself). Before + unison uses any of these files for anything important, it + checks that its fingerprint matches the one that it + expects. + Merging: - o Both user interfaces offer a new 'merge' command, - invoked by pressing 'm' (with a changed file selected). + o Both user interfaces offer a new 'merge' command, invoked + by pressing 'm' (with a changed file selected). o The actual merging is performed by an external program. - The preferences merge and merge2 control how this - program is invoked. If a backup exists for this file - (see the backup preference), then the merge preference - is used for this purpose; otherwise merge2 is used. In - both cases, the value of the preference should be a - string representing the command that should be passed to - a shell to invoke the merge program. Within this string, - the special substrings CURRENT1, CURRENT2, NEW, and OLD - may appear at any point. Unison will substitute these as + The preferences merge and merge2 control how this program + is invoked. If a backup exists for this file (see the + backup preference), then the merge preference is used for + this purpose; otherwise merge2 is used. In both cases, + the value of the preference should be a string + representing the command that should be passed to a shell + to invoke the merge program. Within this string, the + special substrings CURRENT1, CURRENT2, NEW, and OLD may + appear at any point. Unison will substitute these as follows before invoking the command: # CURRENT1 is replaced by the name of the local copy of the file; @@ -995,18 +1039,18 @@ file, into which the contents of the remote copy of the file have been transferred by Unison prior to performing the merge; - # NEW is replaced by the name of a temporary file - that Unison expects to be written by the merge - program when it finishes, giving the desired new - contents of the file; and - # OLD is replaced by the name of the backed up copy - of the original version of the file (i.e., its - state at the end of the last successful run of - Unison), if one exists (applies only to merge, not - merge2). - For example, on Unix systems setting the merge - preference to + # NEW is replaced by the name of a temporary file that + Unison expects to be written by the merge program + when it finishes, giving the desired new contents of + the file; and + # OLD is replaced by the name of the backed up copy of + the original version of the file (i.e., its state at + the end of the last successful run of Unison), if + one exists (applies only to merge, not merge2). + For example, on Unix systems setting the merge preference + to merge = diff3 -m CURRENT1 OLD CURRENT2 > NEW + will tell Unison to use the external diff3 program for merging. A large number of external merging programs are @@ -1016,43 +1060,44 @@ nil "NEW")' merge = emacs -q --eval '(ediff-merge-files-with-ancestor "CURRENT1" "CURRENT2" "OLD" nil "NEW")' + (These commands are displayed here on two lines to avoid running off the edge of the page. In your preference file, each should be written on a single line.) - o If the external program exits without leaving any file - at the path NEW, Unison considers the merge to have - failed. If the merge program writes a file called NEW - but exits with a non-zero status code, then Unison - considers the merge to have succeeded but to have - generated conflicts. In this case, it attempts to invoke - an external editor so that the user can resolve the - conflicts. The value of the editor preference controls - what editor is invoked by Unison. The default is emacs. - o Please send us suggestions for other useful values of - the merge2 and merge preferences - we'd like to give - several examples in the manual. + o If the external program exits without leaving any file at + the path NEW, Unison considers the merge to have failed. + If the merge program writes a file called NEW but exits + with a non-zero status code, then Unison considers the + merge to have succeeded but to have generated conflicts. + In this case, it attempts to invoke an external editor so + that the user can resolve the conflicts. The value of the + editor preference controls what editor is invoked by + Unison. The default is emacs. + o Please send us suggestions for other useful values of the + merge2 and merge preferences - we'd like to give several + examples in the manual. * Smaller changes: + When one preference file includes another, unison no longer adds the suffix '.prf' to the included file by default. If a file with precisely the given name exists in the .unison - directory, it will be used; otherwise Unison will add .prf, - as it did before. (This change means that included preference + directory, it will be used; otherwise Unison will add .prf, as + it did before. (This change means that included preference files can be named blah.include instead of blah.prf, so that unison will not offer them in its 'choose a preference file' dialog.) - + For Linux systems, we now offer both a statically linked and - a dynamically linked executable. The static one is larger, - but will probably run on more systems, since it doesn't - depend on the same versions of dynamically linked library - modules being available. - + Fixed the force and prefer preferences, which were getting - the propagation direction exactly backwards. + + For Linux systems, we now offer both a statically linked and a + dynamically linked executable. The static one is larger, but + will probably run on more systems, since it doesn't depend on + the same versions of dynamically linked library modules being + available. + + Fixed the force and prefer preferences, which were getting the + propagation direction exactly backwards. + Fixed a bug in the startup code that would cause unison to crash when the default profile (~/.unison/default.prf) does not exist. - + Fixed a bug where, on the run when a profile is first - created, Unison would confusingly display the roots in - reverse order in the user interface. + + Fixed a bug where, on the run when a profile is first created, + Unison would confusingly display the roots in reverse order in + the user interface. * For developers: + We've added a module dependency diagram to the source distribution, in src/DEPENDENCIES.ps, to help new prospective @@ -1062,10 +1107,10 @@ * INCOMPATIBLE CHANGE: Archive format has changed. * INCOMPATIBLE CHANGE: The startup sequence has been completely rewritten and greatly simplified. The main user-visible change is - that the defaultpath preference has been removed. Its effect can - be approximated by using multiple profiles, with include - directives to incorporate common settings. All uses of defaultpath - in existing profiles should be changed to path. + that the defaultpath preference has been removed. Its effect can be + approximated by using multiple profiles, with include directives to + incorporate common settings. All uses of defaultpath in existing + profiles should be changed to path. Another change in startup behavior that will affect some users is that it is no longer possible to specify roots both in the profile and on the command line. @@ -1079,17 +1124,18 @@ common.prf = + Now do unison common root1 root2 + when you want to specify roots explicitly. - * The -prefer and -force options have been extended to allow users - to specify that files with more recent modtimes should be - propagated, writing either -prefer newer or -force newer. (For - symmetry, Unison will also accept -prefer older or -force older.) - The -force older/newer options can only be used when -times is - also set. - The graphical user interface provides access to these facilities - on a one-off basis via the Actions menu. + * The -prefer and -force options have been extended to allow users to + specify that files with more recent modtimes should be propagated, + writing either -prefer newer or -force newer. (For symmetry, Unison + will also accept -prefer older or -force older.) The -force + older/newer options can only be used when -times is also set. + The graphical user interface provides access to these facilities on + a one-off basis via the Actions menu. * Names of roots can now be "aliased" to allow replicas to be relocated without changing the name of the archive file where Unison stores information between runs. (This feature is for @@ -1103,25 +1149,24 @@ profiles. If a profile contains a preference of the form 'key = n', where n is a single digit, then pressing this key will cause Unison to immediately switch to this profile and begin - synchronization again from scratch. (Any actions that may - have been selected for a set of changes currently being - displayed will be discarded.) + synchronization again from scratch. (Any actions that may have + been selected for a set of changes currently being displayed + will be discarded.) + Each profile may include a preference 'label = ' giving a descriptive string that described the options selected in this profile. The string is listed along with the - profile name in the profile selection dialog, and displayed - in the top-right corner of the main Unison window. + profile name in the profile selection dialog, and displayed in + the top-right corner of the main Unison window. * Minor: + Fixed a bug that would sometimes cause the 'diff' display to - order the files backwards relative to the main user - interface. (Thanks to Pascal Brisset for this fix.) + order the files backwards relative to the main user interface. + (Thanks to Pascal Brisset for this fix.) + On Unix systems, the graphical version of Unison will check - the DISPLAY variable and, if it is not set, automatically - fall back to the textual user interface. + the DISPLAY variable and, if it is not set, automatically fall + back to the textual user interface. + Synchronization paths (path preferences) are now matched - against the ignore preferences. So if a path is both - specified in a path preference and ignored, it will be - skipped. + against the ignore preferences. So if a path is both specified + in a path preference and ignored, it will be skipped. + Numerous other bugfixes and small improvements. Changes since 2.6.1: @@ -1157,15 +1202,14 @@ * New functionality: + Unison now synchronizes file modtimes, user-ids, and group-ids. - These new features are controlled by a set of new - preferences, all of which are currently false by default. + These new features are controlled by a set of new preferences, + all of which are currently false by default. o When the times preference is set to true, file modification times are propaged. (Because the - representations of time may not have the same - granularity on both replicas, Unison may not always be - able to make the modtimes precisely equal, but it will - get them as close as the operating systems involved - allow.) + representations of time may not have the same granularity + on both replicas, Unison may not always be able to make + the modtimes precisely equal, but it will get them as + close as the operating systems involved allow.) o When the owner preference is set to true, file ownership information is synchronized. o When the group preference is set to true, group @@ -1183,34 +1227,33 @@ be synchronized. It is set by default to 0o1777: all bits but the set-uid and set-gid bits are synchronised (synchronizing theses latter bits can be a security hazard). If you want to - synchronize all bits, you can set the value of this - preference to -1. + synchronize all bits, you can set the value of this preference + to -1. + Added a log preference (default false), which makes Unison keep a complete record of the changes it makes to the replicas. By default, this record is written to a file called - unison.log in the user's home directory (the value of the - HOME environment variable). If you want it someplace else, - set the logfile preference to the full pathname you want - Unison to use. - + Added an ignorenot preference that maintains a set of - patterns for paths that should definitely not be ignored, - whether or not they match an ignore pattern. (That is, a path - will now be ignored iff it matches an ignore pattern and does - not match any ignorenot patterns.) + unison.log in the user's home directory (the value of the HOME + environment variable). If you want it someplace else, set the + logfile preference to the full pathname you want Unison to + use. + + Added an ignorenot preference that maintains a set of patterns + for paths that should definitely not be ignored, whether or + not they match an ignore pattern. (That is, a path will now be + ignored iff it matches an ignore pattern and does not match + any ignorenot patterns.) * User-interface improvements: + Roots are now displayed in the user interface in the same order as they were given on the command line or in the preferences file. - + When the batch preference is set, the graphical user - interface no longer waits for user confirmation when it - displays a warning message: it simply pops up an advisory - window with a Dismiss button at the bottom and keeps on - going. + + When the batch preference is set, the graphical user interface + no longer waits for user confirmation when it displays a + warning message: it simply pops up an advisory window with a + Dismiss button at the bottom and keeps on going. + Added a new preference for controlling how many status messages are printed during update detection: statusdepth controls the maximum depth for paths on the local machine - (longer paths are not displayed, nor are non-directory - paths). The value should be an integer; default is 1. + (longer paths are not displayed, nor are non-directory paths). + The value should be an integer; default is 1. + Removed the trace and silent preferences. They did not seem very useful, and there were too many preferences for controlling output in various ways. @@ -1222,11 +1265,11 @@ host (which is used, for example, in calculating the name of the archive file used to remember which files have been synchronized) normally uses the gethostname operating system - call. However, if the environment variable - UNISONLOCALHOSTNAME is set, its value will now be used - instead. This makes it easier to use Unison in situations - where a machine's name changes frequently (e.g., because it - is a laptop and gets moved around a lot). + call. However, if the environment variable UNISONLOCALHOSTNAME + is set, its value will now be used instead. This makes it + easier to use Unison in situations where a machine's name + changes frequently (e.g., because it is a laptop and gets + moved around a lot). + File owner and group are now displayed in the "detail window" at the bottom of the screen, when unison is configured to synchronize them. @@ -1248,11 +1291,11 @@ information that should be useful for identifying sources of problems. + The version number of the remote server is now checked right - away during the connection setup handshake, rather than - later. (Somebody sent a bug report of a server crash that - turned out to come from using inconsistent versions: better - to check this earlier and in a way that can't crash either - client or server.) + away during the connection setup handshake, rather than later. + (Somebody sent a bug report of a server crash that turned out + to come from using inconsistent versions: better to check this + earlier and in a way that can't crash either client or + server.) + Unison now runs correctly on 64-bit architectures (e.g. Alpha linux). We will not be distributing binaries for these architectures ourselves (at least for a while) but if someone @@ -1260,8 +1303,8 @@ link to them. * Bug fixes: + Pattern matching (e.g. for ignore) is now case-insensitive - when Unison is in case-insensitive mode (i.e., when one of - the replicas is on a windows machine). + when Unison is in case-insensitive mode (i.e., when one of the + replicas is on a windows machine). + Some people had trouble with mysterious failures during propagation of updates, where files would be falsely reported as having changed during synchronization. This should be @@ -1270,9 +1313,9 @@ Changes since 2.4.1: * Added a number of 'sorting modes' for the user interface. By - default, conflicting changes are displayed at the top, and the - rest of the entries are sorted in alphabetical order. This - behavior can be changed in the following ways: + default, conflicting changes are displayed at the top, and the rest + of the entries are sorted in alphabetical order. This behavior can + be changed in the following ways: + Setting the sortnewfirst preference to true causes newly created files to be displayed before changed files. + Setting sortbysize causes files to be displayed in increasing @@ -1303,15 +1346,15 @@ * Small changes: + Changed default answer to 'Yes' in all two-button dialogs in the graphical interface (this seems more intuitive). - + The rsync preference has been removed (it was used to - activate rsync compression for file transfers, but rsync - compression is now enabled by default). + + The rsync preference has been removed (it was used to activate + rsync compression for file transfers, but rsync compression is + now enabled by default). + In the text user interface, the arrows indicating which - direction changes are being propagated are printed - differently when the user has overridded Unison's default - recommendation (====> instead of ---->). This matches the - behavior of the graphical interface, which displays such - arrows in a different color. + direction changes are being propagated are printed differently + when the user has overridded Unison's default recommendation + (====> instead of ---->). This matches the behavior of the + graphical interface, which displays such arrows in a different + color. + Carriage returns (Control-M's) are ignored at the ends of lines in profiles, for Windows compatibility. + All preferences are now fully documented in the user manual. @@ -1322,8 +1365,8 @@ conflicts. The first sync after upgrading will be slow. * New/improved functionality: + A new preference -sortbysize controls the order in which - changes are displayed to the user: when it is set to true, - the smallest changed files are displayed first. (The default + changes are displayed to the user: when it is set to true, the + smallest changed files are displayed first. (The default setting is false.) + A new preference -sortnewfirst causes newly created files to be listed before other updates in the user interface. @@ -1334,16 +1377,16 @@ without an explicit protocol, we now assume it refers to a file. (Previously "//saul/foo" meant to use SSH to connect to saul, then access the foo directory. Now it means to access - saul via a remote file mechanism such as samba; the old - effect is now achieved by writing ssh://saul/foo.) + saul via a remote file mechanism such as samba; the old effect + is now achieved by writing ssh://saul/foo.) + Changed the startup sequence for the case where roots are given but no profile is given on the command line. The new - behavior is to use the default profile (creating it if it - does not exist), and temporarily override its roots. The - manual claimed that this case would work by reading no - profile at all, but AFAIK this was never true. - + In all user interfaces, files with conflicts are always - listed first + behavior is to use the default profile (creating it if it does + not exist), and temporarily override its roots. The manual + claimed that this case would work by reading no profile at + all, but AFAIK this was never true. + + In all user interfaces, files with conflicts are always listed + first + A new preference 'sshversion' can be used to control which version of ssh should be used to connect to the server. Legal values are 1 and 2. (Default is empty, which will make unison @@ -1354,32 +1397,31 @@ a spurious conflict) * Improvements for the Windows version: + The fact that filenames are treated case-insensitively under - Windows should now be handled correctly. The exact behavior - is described in the cross-platform section of the manual. + Windows should now be handled correctly. The exact behavior is + described in the cross-platform section of the manual. + It should be possible to synchronize with Windows shares, e.g., //host/drive/path. - + Workarounds to the bug in syncing root directories in - Windows. The most difficult thing to fix is an ocaml bug: - Unix.opendir fails on c: in some versions of Windows. + + Workarounds to the bug in syncing root directories in Windows. + The most difficult thing to fix is an ocaml bug: Unix.opendir + fails on c: in some versions of Windows. * Improvements to the GTK user interface (the Tk interface is no longer being maintained): + The UI now displays actions differently (in blue) when they - have been explicitly changed by the user from Unison's - default recommendation. + have been explicitly changed by the user from Unison's default + recommendation. + More colorful appearance. + The initial profile selection window works better. - + If any transfers failed, a message to this effect is - displayed along with 'Synchronization complete' at the end of - the transfer phase (in case they may have scrolled off the - top). + + If any transfers failed, a message to this effect is displayed + along with 'Synchronization complete' at the end of the + transfer phase (in case they may have scrolled off the top). + Added a global progress meter, displaying the percentage of total bytes that have been transferred so far. * Improvements to the text user interface: + The file details will be displayed automatically when a conflict is been detected. + when a warning is generated (e.g. for a temporary file left - over from a previous run of unison) Unison will no longer - wait for a response if it is running in -batch mode. + over from a previous run of unison) Unison will no longer wait + for a response if it is running in -batch mode. + The UI now displays a short list of possible inputs each time it waits for user interaction. + The UI now quits immediately (rather than looping back and @@ -1392,11 +1434,10 @@ + The manual now includes a FAQ, plus sections on common problems and on tricks contributed by users. + Both the download page and the download directory explicitly - say what are the current stable and beta-test version - numbers. - + The OCaml sources for the up-to-the-minute developers' - version (not guaranteed to be stable, or even to compile, at - any given time!) are now available from the download page. + say what are the current stable and beta-test version numbers. + + The OCaml sources for the up-to-the-minute developers' version + (not guaranteed to be stable, or even to compile, at any given + time!) are now available from the download page. + Added a subsection to the manual describing cross-platform issues (case conflicts, illegal filenames) * Many small bug fixes and random improvements. @@ -1407,22 +1448,22 @@ 'rename' error. Changes since 2.2: - * The multi-threaded transport system is now disabled by default. - (It is not stable enough yet.) + * The multi-threaded transport system is now disabled by default. (It + is not stable enough yet.) * Various bug fixes. * A new experimental feature: The final component of a -path argument may now be the wildcard specifier *. When Unison sees such a path, it expands this path on - the client into into the corresponding list of paths by listing - the contents of that directory. - Note that if you use wildcard paths from the command line, you - will probably need to use quotes or a backslash to prevent the * - from being interpreted by your shell. - If both roots are local, the contents of the first one will be - used for expanding wildcard paths. (Nb: this is the first one - after the canonization step - i.e., the one that is listed first - in the user interface - not the one listed first on the command - line or in the preferences file.) + the client into into the corresponding list of paths by listing the + contents of that directory. + Note that if you use wildcard paths from the command line, you will + probably need to use quotes or a backslash to prevent the * from + being interpreted by your shell. + If both roots are local, the contents of the first one will be used + for expanding wildcard paths. (Nb: this is the first one after the + canonization step - i.e., the one that is listed first in the user + interface - not the one listed first on the command line or in the + preferences file.) Changes since 2.1: * The transport subsystem now includes an implementation by Sylvain @@ -1430,15 +1471,15 @@ protocol. This protocol achieves much faster transfers when only a small part of a large file has been changed by sending just diffs. This feature is mainly helpful for transfers over slow links--on - fast local area networks it can actually degrade performance--so - we have left it off by default. Start unison with the -rsync - option (or put rsync=true in your preferences file) to turn it on. + fast local area networks it can actually degrade performance--so we + have left it off by default. Start unison with the -rsync option + (or put rsync=true in your preferences file) to turn it on. * "Progress bars" are now diplayed during remote file transfers, showing what percentage of each file has been transferred so far. * The version numbering scheme has changed. New releases will now be - have numbers like 2.2.30, where the second component is - incremented on every significant public release and the third - component is the "patch level." + have numbers like 2.2.30, where the second component is incremented + on every significant public release and the third component is the + "patch level." * Miscellaneous improvements to the GTK-based user interface. * The manual is now available in PDF format. * We are experimenting with using a multi-threaded transport @@ -1446,14 +1487,13 @@ more effective use of available network bandwidth. This feature is not completely stable yet, so by default it is disabled in the release version of Unison. - If you want to play with the multi-threaded version, you'll need - to recompile Unison from sources (as described in the - documentation), setting the THREADS flag in Makefile.OCaml to - true. Make sure that your OCaml compiler has been installed with - the -with-pthreads configuration option. (You can verify this by - checking whether the file threads/threads.cma in the OCaml - standard library directory contains the string -lpthread near the - end.) + If you want to play with the multi-threaded version, you'll need to + recompile Unison from sources (as described in the documentation), + setting the THREADS flag in Makefile.OCaml to true. Make sure that + your OCaml compiler has been installed with the -with-pthreads + configuration option. (You can verify this by checking whether the + file threads/threads.cma in the OCaml standard library directory + contains the string -lpthread near the end.) Changes since 1.292: * Reduced memory footprint (this is especially important during the @@ -1465,32 +1505,32 @@ interface (to avoid hitting them accidentally). Changes since 1.231: - * Tunneling over ssh is now supported in the Windows version. See - the installation section of the manual for detailed instructions. - * The transport subsystem now includes an implementation of the - rsync protocol, built by Sylvain Gommier and Norman Ramsey. This - protocol achieves much faster transfers when only a small part of - a large file has been changed by sending just diffs. The rsync - feature is off by default in the current version. Use the -rsync - switch to turn it on. (Nb. We still have a lot of tuning to do: - you may not notice much speedup yet.) + * Tunneling over ssh is now supported in the Windows version. See the + installation section of the manual for detailed instructions. + * The transport subsystem now includes an implementation of the rsync + protocol, built by Sylvain Gommier and Norman Ramsey. This protocol + achieves much faster transfers when only a small part of a large + file has been changed by sending just diffs. The rsync feature is + off by default in the current version. Use the -rsync switch to + turn it on. (Nb. We still have a lot of tuning to do: you may not + notice much speedup yet.) * We're experimenting with a multi-threaded transport subsystem, written by Jerome Vouillon. The downloadable binaries are still single-threaded: if you want to try the multi-threaded version, you'll need to recompile from sources. (Say make THREADS=true.) - Native thread support from the compiler is required. Use the - option -threads N to select the maximal number of concurrent - threads (default is 5). Multi-threaded and single-threaded - clients/servers can interoperate. + Native thread support from the compiler is required. Use the option + -threads N to select the maximal number of concurrent threads + (default is 5). Multi-threaded and single-threaded clients/servers + can interoperate. * A new GTK-based user interface is now available, thanks to Jacques Garrigue. The Tk user interface still works, but we'll be shifting development effort to the GTK interface from now on. * OCaml 3.00 is now required for compiling Unison from sources. The modules uitk and myfileselect have been changed to use labltk - instead of camltk. To compile the Tk interface in Windows, you - must have ocaml-3.00 and tk8.3. When installing tk8.3, put it in - c:\Tcl rather than the suggested c:\Program Files\Tcl, and be sure - to install the headers and libraries (which are not installed by + instead of camltk. To compile the Tk interface in Windows, you must + have ocaml-3.00 and tk8.3. When installing tk8.3, put it in c:\Tcl + rather than the suggested c:\Program Files\Tcl, and be sure to + install the headers and libraries (which are not installed by default). * Added a new -addversionno switch, which causes unison to use unison- instead of just unison as the remote @@ -1506,8 +1546,8 @@ + Some cases where propagation of file permissions was not working. + umask is now ignored when creating directories - + directories are create writable, so that a read-only - directory and its contents can be propagated. + + directories are create writable, so that a read-only directory + and its contents can be propagated. + Handling of warnings generated by the server. + Synchronizing a path whose parent is not a directory on both sides is now flagged as erroneous. @@ -1564,8 +1604,7 @@ causing spurious reports of different permissions when synchronizing between windows and unix systems. * Fixed one more non-tail-recursive list processing function, which - was causing stack overflows when synchronizing very large - replicas. + was causing stack overflows when synchronizing very large replicas. Changes since 1.169: * The text user interface now provides commands for ignoring files. @@ -1573,17 +1612,21 @@ functions. Some power users have reported success with very large replicas. * INCOMPATIBLE CHANGE: Files ending in .tmp are no longer ignored - automatically. If you want to ignore such files, put an - appropriate ignore pattern in your profile. + automatically. If you want to ignore such files, put an appropriate + ignore pattern in your profile. * INCOMPATIBLE CHANGE: The syntax of ignore and follow patterns has changed. Instead of putting a line of the form ignore = + in your profile (.unison/default.prf), you should put: - ignore = Regexp + ignore = Regex + Moreover, two other styles of pattern are also recognized: ignore = Name + matches any path in which one component matches , while ignore = Path + matches exactly the path . Standard "globbing" conventions can be used in and : + a ? matches any single character except / @@ -1633,6 +1676,7 @@ * You can now have different preference files in your .unison directory. If you start unison like this unison profilename + (i.e. with just one "anonymous" command-line argument), then the file ~/.unison/profilename.prf will be loaded instead of default.prf. @@ -1640,8 +1684,8 @@ * Added a switch -killServer that terminates the remote server process when the unison client is shutting down, even when using sockets for communication. (By default, a remote server created - using ssh/rsh is terminated automatically, while a socket server - is left running.) + using ssh/rsh is terminated automatically, while a socket server is + left running.) * When started in 'socket server' mode, unison prints 'server started' on stderr when it is ready to accept connections. (This may be useful for scripts that want to tell when a socket-mode Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2014-07-05 21:55:19 UTC (rev 527) +++ trunk/src/RECENTNEWS 2014-07-05 23:31:55 UTC (rev 528) @@ -1,3 +1,9 @@ +CHANGES FROM VERSION 2.47.1 + +* Fixed a bug in export procedure that was messing up documentation strings + + +------------------------------- CHANGES FROM VERSION 2.47.0 * Incorporated a refresh of the OSX GUI, contributed by Alan Shutko. Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2014-07-05 21:55:19 UTC (rev 527) +++ trunk/src/mkProjectInfo.ml 2014-07-05 23:31:55 UTC (rev 528) @@ -93,3 +93,4 @@ + Modified: trunk/src/strings.ml =================================================================== --- trunk/src/strings.ml 2014-07-05 21:55:19 UTC (rev 527) +++ trunk/src/strings.ml 2014-07-05 23:31:55 UTC (rev 528) @@ -4,8 +4,4481 @@ let docs = ("about", ("About Unison", "Unison File Synchronizer\n\ - Version 2.46.6\n\ + Version 2.47.1\n\ \n\ ")) -:: [] +:: + ("", ("Overview", + "Overview\n\ + \n\ + \032 Unison is a file-synchronization tool for Unix and Windows. It allows\n\ + \032 two replicas of a collection of files and directories to be stored on\n\ + \032 different hosts (or different disks on the same host), modified\n\ + \032 separately, and then brought up to date by propagating the changes in\n\ + \032 each replica to the other.\n\ + \n\ + \032 Unison shares a number of features with tools such as configuration\n\ + \032 management packages (CVS (http://www.cyclic.com/), PRCS\n\ + \032 (http://www.XCF.Berkeley.EDU/~jmacd/prcs.html), etc.), distributed\n\ + \032 filesystems (Coda (http://www.coda.cs.cmu.edu/), etc.), uni-directional\n\ + \032 mirroring utilities (rsync (http://samba.anu.edu.au/rsync/), etc.), and\n\ + \032 other synchronizers (Intellisync (http://www.pumatech.com), Reconcile\n\ + \032 (http://www.merl.com/reports/TR99-14/), etc). However, there are\n\ + \032 several points where it differs:\n\ + \032 * Unison runs on both Windows (95, 98, NT, 2k, and XP) and Unix (OSX,\n\ + \032 Solaris, Linux, etc.) systems. Moreover, Unison works across\n\ + \032 platforms, allowing you to synchronize a Windows laptop with a Unix\n\ + \032 server, for example.\n\ + \032 * Unlike a distributed filesystem, Unison is a user-level program:\n\ + \032 there is no need to modify the kernel or to have superuser\n\ + \032 privileges on either host.\n\ + \032 * Unlike simple mirroring or backup utilities, Unison can deal with\n\ + \032 updates to both replicas of a distributed directory structure.\n\ + \032 Updates that do not conflict are propagated automatically.\n\ + \032 Conflicting updates are detected and displayed.\n\ + \032 * Unison works between any pair of machines connected to the\n\ + \032 internet, communicating over either a direct socket link or\n\ + \032 tunneling over an encrypted ssh connection. It is careful with\n\ + \032 network bandwidth, and runs well over slow links such as PPP\n\ + \032 connections. Transfers of small updates to large files are\n\ + \032 optimized using a compression protocol similar to rsync.\n\ + \032 * Unison has a clear and precise specification, described below.\n\ + \032 * Unison is resilient to failure. It is careful to leave the replicas\n\ + \032 and its own private structures in a sensible state at all times,\n\ + \032 even in case of abnormal termination or communication failures.\n\ + \032 * Unison is free; full source code is available under the GNU Public\n\ + \032 License.\n\ + \n\ + ")) +:: + ("", ("Preface", + "Preface\n\ + \n\ + ")) +:: + ("people", ("People", + "People\n\ + \n\ + \032 Benjamin Pierce (http://www.cis.upenn.edu/~bcpierce/) leads the Unison\n\ + \032 project. The current version of Unison was designed and implemented by\n\ + \032 Trevor Jim (http://www.research.att.com/~trevor/), Benjamin Pierce\n\ + \032 (http://www.cis.upenn.edu/~bcpierce/), and J\233r\244me Vouillon\n\ + \032 (http://www.pps.jussieu.fr/~vouillon/), with Alan Schmitt\n\ + \032 (http://alan.petitepomme.net/), Malo Denielou, Zhe Yang\n\ + \032 (http://www.brics.dk/~zheyang/), Sylvain Gommier, and Matthieu Goulay.\n\ + \032 The Mac user interface was started by Trevor Jim and enormously\n\ + \032 improved by Ben Willmore. Our implementation of the rsync\n\ + \032 (http://samba.org/rsync/) protocol was built by Norman Ramsey\n\ + \032 (http://www.eecs.harvard.edu/~nr/) and Sylvain Gommier. It is based on\n\ + \032 Andrew Tridgell (http://samba.anu.edu.au/~tridge/)'s thesis work\n\ + \032 (http://samba.anu.edu.au/~tridge/phd_thesis.pdf) and inspired by his\n\ + \032 rsync (http://samba.org/rsync/) utility. The mirroring and merging\n\ + \032 functionality was implemented by Sylvain Roy, improved by Malo\n\ + \032 Denielou, and improved yet further by St\233phane Lescuyer. Jacques\n\ + \032 Garrigue (http://wwwfun.kurims.kyoto-u.ac.jp/~garrigue/) contributed\n\ + \032 the original Gtk version of the user interface; the Gtk2 version was\n\ + \032 built by Stephen Tse. Sundar Balasubramaniam helped build a prototype\n\ + \032 implementation of an earlier synchronizer in Java. Insik Shin\n\ + \032 (http://www.cis.upenn.edu/~ishin/) and Insup Lee\n\ + \032 (http://www.cis.upenn.edu/~lee/) contributed design ideas to this\n\ + \032 implementation. Cedric Fournet\n\ + \032 (http://research.microsoft.com/~fournet/) contributed to an even\n\ + \032 earlier prototype.\n\ + \n\ + ")) +:: + ("lists", ("Mailing Lists and Bug Reporting", + "Mailing Lists and Bug Reporting\n\ + \n\ + Mailing Lists:\n\ + \n\ + \032 Moderated mailing lists are available for bug reporting, announcements\n\ + \032 of new versions, discussions among users, and discussions among\n\ + \032 developers. See\n\ + \n\ + \032 http://www.cis.upenn.edu/~bcpierce/unison/lists.html\n\ + \n\ + \032 for more information.\n\ + \n\ + ")) +:: + ("status", ("Development Status", + "Development Status\n\ + \n\ + \032 Unison is no longer under active development as a research project.\n\ + \032 (Our research efforts are now focused on a follow-on project called\n\ + \032 Harmony, described at http://www.cis.upenn.edu/~bcpierce/harmony.) At\n\ + \032 this point, there is no one whose job it is to maintain Unison, fix\n\ + \032 bugs, or answer questions.\n\ + \n\ + \032 However, the original developers are all still using Unison daily. It\n\ + \032 will continue to be maintained and supported for the foreseeable\n\ + \032 future, and we will occasionally release new versions with bug fixes,\n\ + \032 small improvements, and contributed patches.\n\ + \n\ + \032 Reports of bugs affecting correctness or safety are of interest to many\n\ + \032 people and will generally get high priority. Other bug reports will be\n\ + \032 looked at as time permits. Bugs should be reported to the users list at\n\ + \032 unison-users at yahoogroups.com (mailto:unison-users at yahoogroups.com).\n\ + \n\ + \032 Feature requests are welcome, but will probably just be added to the\n\ + \032 ever-growing todo list. They should also be sent to\n\ + \032 unison-users at yahoogroups.com (mailto:unison-users at yahoogroups.com).\n\ + \n\ + \032 Patches are even more welcome. They should be sent to\n\ + \032 unison-hackers at lists.seas.upenn.edu\n\ + \032 (mailto:unison-hackers at lists.seas.upenn.edu). (Since safety and\n\ + \032 robustness are Unison's most important properties, patches will be held\n\ + \032 to high standards of clear design and clean coding.) If you want to\n\ + \032 contribute to Unison, start by downloading the developer tarball from\n\ + \032 the download page. For some details on how the code is organized, etc.,\n\ + \032 see the file CONTRIB.\n\ + \n\ + ")) +:: + ("copying", ("Copying", + "Copying\n\ + \n\ + \032 This file is part of Unison.\n\ + \n\ + \032 Unison is free software: you can redistribute it and/or modify it under\n\ + \032 the terms of the GNU General Public License as published by the Free\n\ + \032 Software Foundation, either version 3 of the License, or (at your\n\ + \032 option) any later version.\n\ + \n\ + \032 Unison is distributed in the hope that it will be useful, but WITHOUT\n\ + \032 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n\ + \032 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\n\ + \032 for more details.\n\ + \n\ + \032 The GNU Public License can be found at http://www.gnu.org/licenses. A\n\ + \032 copy is also included in the Unison source distribution in the file\n\ + \032 COPYING.\n\ + \n\ + ")) +:: + ("ack", ("Acknowledgements", + "Acknowledgements\n\ + \n\ + \032 Work on Unison has been supported by the National Science Foundation\n\ + \032 under grants CCR-9701826 and ITR-0113226, Principles and Practice of\n\ + \032 Synchronization, and by University of Pennsylvania's Institute for\n\ + \032 Research in Cognitive Science (IRCS).\n\ + \n\ + ")) +:: + ("install", ("Installation", + "Installation\n\ + \n\ + \032 Unison is designed to be easy to install. The following sequence of\n\ + \032 steps should get you a fully working installation in a few minutes. If\n\ + \032 you run into trouble, you may find the suggestions on the Frequently\n\ + \032 Asked Questions page\n\ + \032 (http://www.cis.upenn.edu/~bcpierce/unison/faq.html) helpful. Pre-built\n\ + \032 binaries are available for a variety of platforms.\n\ + \n\ + \032 Unison can be used with either of two user interfaces:\n\ + \032 1. a simple textual interface, suitable for dumb terminals (and\n\ + \032 running from scripts), and\n\ + \032 2. a more sophisticated grapical interface, based on Gtk2 (on\n\ + \032 Linux/Windows) or the native UI framework (on OSX).\n\ + \n\ + \032 You will need to install a copy of Unison on every machine that you\n\ + \032 want to synchronize. However, you only need the version with a\n\ + \032 graphical user interface (if you want a GUI at all) on the machine\n\ + \032 where you're actually going to display the interface (the CLIENT\n\ + \032 machine). Other machines that you synchronize with can get along just\n\ + \032 fine with the textual version.\n\ + \n\ + Downloading Unison\n\ + \n\ + \032 The Unison download site lives under\n\ + \032 http://www.cis.upenn.edu/~bcpierce/unison.\n\ + \n\ + \032 If a pre-built binary of Unison is available for the client machine's\n\ + \032 architecture, just download it and put it somewhere in your search path\n\ + \032 (if you're going to invoke it from the command line) or on your desktop\n\ + \032 (if you'll be click-starting it).\n\ + \n\ + \032 The executable file for the graphical version (with a name including\n\ + \032 gtkui) actually provides both interfaces: the graphical one appears by\n\ + \032 default, while the textual interface can be selected by including -ui\n\ + \032 text on the command line. The textui executable provides just the\n\ + \032 textual interface.\n\ + \n\ + \032 If you don't see a pre-built executable for your architecture, you'll\n\ + \032 need to build it yourself. See the section \"Building Unison\" . There\n\ + \032 are also a small number of contributed ports to other architectures\n\ + \032 that are not maintained by us. See the Contributed Ports page\n\ + \032 (http://www.cis.upenn.edu/~bcpierce/unison/download.html) to check\n\ + \032 what's available.\n\ + \n\ + \032 Check to make sure that what you have downloaded is really executable.\n\ + \032 Either click-start it, or type \"unison -version\" at the command line.\n\ + \n\ + \032 Unison can be used in three different modes: with different directories\n\ + \032 on a single machine, with a remote machine over a direct socket\n\ + \032 connection, or with a remote machine using ssh for authentication and\n\ + \032 secure transfer. If you intend to use the last option, you may need to\n\ + \032 install ssh; see the section \"Installing Ssh\" .\n\ + \n\ + Running Unison\n\ + \n\ + \032 Once you've got Unison installed on at least one system, read the\n\ + \032 section \"Tutorial\" of the user manual (or type \"unison -doc tutorial\")\n\ + \032 for instructions on how to get started.\n\ + \n\ + Upgrading\n\ + \n\ + \032 Upgrading to a new version of Unison is as simple as throwing away the\n\ + \032 old binary and installing the new one.\n\ + \n\ + \032 Before upgrading, it is a good idea to run the old version one last\n\ + \032 time, to make sure all your replicas are completely synchronized. A new\n\ + \032 version of Unison will sometimes introduce a different format for the\n\ + \032 archive files used to remember information about the previous state of\n\ + \032 the replicas. In this case, the old archive will be ignored (not\n\ + \032 deleted -- if you roll back to the previous version of Unison, you will\n\ + \032 find the old archives intact), which means that any differences between\n\ + \032 the replicas will show up as conflicts that need to be resolved\n\ + \032 manually.\n\ + \n\ + Building Unison from Scratch\n\ + \n\ + \032 If a pre-built image is not available, you will need to compile it from\n\ + \032 scratch; the sources are available from the same place as the binaries.\n\ + \n\ + \032 In principle, Unison should work on any platform to which OCaml has\n\ + \032 been ported and on which the Unix module is fully implemented. It has\n\ + \032 been tested on many flavors of Windows (98, NT, 2000, XP) and Unix (OS\n\ + \032 X, Solaris, Linux, FreeBSD), and on both 32- and 64-bit architectures.\n\ + \n\ + Unix\n\ + \n\ + \032 You'll need the Objective Caml compiler (version 3.11.2 or later),\n\ + \032 which is available from http://caml.inria.fr. Building and installing\n\ + \032 OCaml on Unix systems is very straightforward; just follow the\n\ + \032 instructions in the distribution. You'll probably want to build the\n\ + \032 native-code compiler in addition to the bytecode compiler, as Unison\n\ + \032 runs much faster when compiled to native code, but this is not\n\ + \032 absolutely necessary. (Quick start: on many systems, the following\n\ + \032 sequence of commands will get you a working and installed compiler:\n\ + \032 first do make world opt, then su to root and do make install.)\n\ + \n\ + \032 You'll also need the GNU make utility, standard on many Unix systems.\n\ + \032 (Type \"make -version\" to check that you've got the GNU version.)\n\ + \032 Unison's build system is not parallelizable, so don't use make flags\n\ + \032 which cause it to start processes in parallel, e.g. -j for GNU make.\n\ + \n\ + \032 Once you've got OCaml installed, grab a copy of the Unison sources,\n\ + \032 unzip and untar them, change to the new \"unison\" directory, and type\n\ + \032 \"make UISTYLE=text\". The result should be an executable file called\n\ + \032 \"unison\". Type \"./unison\" to make sure the program is executable. You\n\ + \032 should get back a usage message.\n\ + \n\ + \032 If you want to build the graphical user interface, you will need to\n\ + \032 install two additional things:\n\ + \032 * The Gtk2 libraries. These areavailable from http://www.gtk.org and\n\ + \032 are standard on many Unix installations.\n\ + \032 * The lablgtk2 OCaml library. Grab the developers' tarball from\n\ + \n\ + \032 http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html,\n\ + \032 untar it, and follow the instructions to build and install it.\n\ + \032 (Quick start: make configure, then make, then make opt, then su and\n\ + \032 make install.)\n\ + \n\ + \032 Now build unison. If your search paths are set up correctly, simply\n\ + \032 typing make again should build a unison executable with a Gtk2\n\ + \032 graphical interface. (In previous releases of Unison, it was necessary\n\ + \032 to add UISTYLE=gtk2 to the 'make' command above. This requirement has\n\ + \032 been removed: the makefile should detect automatically when lablgtk2 is\n\ + \032 present and set this flag automatically.)\n\ + \n\ + \032 Put the unison executable somewhere in your search path, either by\n\ + \032 adding the Unison directory to your PATH variable or by copying the\n\ + \032 executable to some standard directory where executables are stored.\n\ + \n\ + Mac OS X\n\ + \n\ + \032 To build the text-only user interface, follow the instructions above\n\ + \032 for building on Unix systems. You should do this first, even if you are\n\ + \032 also planning on building the GUI, just to make sure it works.\n\ + \n\ + \032 To build the basic GUI version, you'll first need to download and\n\ + \032 install the XCode developer tools from Apple. Once this is done, just\n\ + \032 type make UISTYLE=macnew in the src directory, and if things go well\n\ + \032 you should get an application that you can move from\n\ + \032 uimacnew/build/Default/Unison.app to wherever you want it.\n\ + \n\ + \032 There is also an experimental GUI with a somewhat smoother look and\n\ + \032 feel. To compile this one (once you've got the basic one working),\n\ + \032 proceed as follows:\n\ + \032 1. Go to the uimacnew09 directory and double-click the file\n\ + \032 BWToolkit.ibplugin.\n\ + \032 2. Go back up to the src directory and type make UISTYLE=macnew09.\n\ + \032 3. You should get an application built for you at\n\ + \032 uimacnew09/build/Default/Unison.app.\n\ + \n\ + Windows\n\ + \n\ + \032 Although the binary distribution should work on any version of Windows,\n\ + \032 some people may want to build Unison from scratch on those systems too.\n\ + \n\ + Bytecode version:\n\ + \n\ + \032 The simpler but slower compilation option to build a Unison executable\n\ + \032 is to build a bytecode version. You need first install Windows version\n\ + \032 of the OCaml compiler (version 3.07 or later, available from\n\ + \032 http://caml.inria.fr). Then grab a copy of Unison sources and type\n\ + \032 make NATIVE=false\n\ + \n\ + \032 to compile the bytecode. The result should be an executable file called\n\ + \032 unison.exe.\n\ + \n\ + Native version:\n\ + \n\ + \032 Building a more efficient, native version of Unison on Windows requires\n\ + \032 a little more work. See the file INSTALL.win32 in the source code\n\ + \032 distribution.\n\ + \n\ + Installation Options\n\ + \n\ + \032 The Makefile in the distribution includes several switches that can be\n\ + \032 used to control how Unison is built. Here are the most useful ones:\n\ + \032 * Building with NATIVE=true uses the native-code OCaml compiler,\n\ + \032 yielding an executable that will run quite a bit faster. We use\n\ + \032 this for building distribution versions.\n\ + \032 * Building with make DEBUGGING=true generates debugging symbols.\n\ + \032 * Building with make STATIC=true generates a (mostly) statically\n\ + \032 linked executable. We use this for building distribution versions,\n\ + \032 for portability.\n\ + \n\ + ")) +:: + ("tutorial", ("Tutorial", + "Tutorial\n\ + \n\ + Preliminaries\n\ + \n\ + \032 Unison can be used with either of two user interfaces:\n\ + \032 1. a straightforward textual interface and\n\ + \032 2. a more sophisticated graphical interface\n\ + \n\ + \032 The textual interface is more convenient for running from scripts and\n\ + \032 works on dumb terminals; the graphical interface is better for most\n\ + \032 interactive use. For this tutorial, you can use either. If you are\n\ + \032 running Unison from the command line, just typing unison will select\n\ + \032 either the text or the graphical interface, depending on which has been\n\ + \032 selected as default when the executable you are running was built. You\n\ + \032 can force the text interface even if graphical is the default by adding\n\ + \032 -ui text. The other command-line arguments to both versions are\n\ + \032 identical.\n\ + \n\ + \032 The graphical version can also be run directly by clicking on its icon,\n\ + \032 but this may require a little set-up (see the section \"Click-starting\n\ + \032 Unison\" ). For this tutorial, we assume that you're starting it from\n\ + \032 the command line.\n\ + \n\ + \032 Unison can synchronize files and directories on a single machine, or\n\ + \032 between two machines on a network. (The same program runs on both\n\ + \032 machines; the only difference is which one is responsible for\n\ + \032 displaying the user interface.) If you're only interested in a\n\ + \032 single-machine setup, then let's call that machine the CLIENT . If\n\ + \032 you're synchronizing two machines, let's call them CLIENT and SERVER .\n\ + \n\ + Local Usage\n\ + \n\ + \032 Let's get the client machine set up first and see how to synchronize\n\ + \032 two directories on a single machine.\n\ + \n\ + \032 Follow the instructions in the section \"Installation\" to either\n\ + \032 download or build an executable version of Unison, and install it\n\ + \032 somewhere on your search path. (If you just want to use the textual\n\ + \032 user interface, download the appropriate textui binary. If you just\n\ + \032 want to the graphical interface--or if you will use both interfaces\n\ + \032 [the gtkui binary actually has both compiled in]--then download the\n\ + \032 gtkui binary.)\n\ + \n\ + \032 Create a small test directory a.tmp containing a couple of files and/or\n\ + \032 subdirectories, e.g.,\n\ + \032 mkdir a.tmp\n\ + \032 touch a.tmp/a a.tmp/b\n\ + \032 mkdir a.tmp/d\n\ + \032 touch a.tmp/d/f\n\ + \n\ + \032 Copy this directory to b.tmp:\n\ + \032 cp -r a.tmp b.tmp\n\ + \n\ + \032 Now try synchronizing a.tmp and b.tmp. (Since they are identical,\n\ + \032 synchronizing them won't propagate any changes, but Unison will\n\ + \032 remember the current state of both directories so that it will be able\n\ + \032 to tell next time what has changed.) Type:\n\ + \032 unison a.tmp b.tmp\n\ + \n\ + \032 (You may need to add -ui text, depending how your unison binary was\n\ + \032 built.)\n\ + \n\ + \032 Textual Interface:\n\ + \032 * You should see a message notifying you that all the files are\n\ + \032 actually equal and then get returned to the command line.\n\ + \n\ + \032 Graphical Interface:\n\ + \032 * You should get a big empty window with a message at the bottom\n\ + \032 notifying you that all files are identical. Choose the Exit item\n\ + \032 from the File menu to get back to the command line.\n\ + \n\ + \032 Next, make some changes in a.tmp and/or b.tmp. For example:\n\ + \032 rm a.tmp/a\n\ + \032 echo \"Hello\" > a.tmp/b\n\ + \032 echo \"Hello\" > b.tmp/b\n\ + \032 date > b.tmp/c\n\ + \032 echo \"Hi there\" > a.tmp/d/h\n\ + \032 echo \"Hello there\" > b.tmp/d/h\n\ + \n\ + \032 Run Unison again:\n\ + \032 unison a.tmp b.tmp\n\ + \n\ + \032 This time, the user interface will display only the files that have\n\ + \032 changed. If a file has been modified in just one replica, then it will\n\ + \032 be displayed with an arrow indicating the direction that the change\n\ + \032 needs to be propagated. For example,\n\ + \032 <--- new file c [f]\n\ + \n\ + \032 indicates that the file c has been modified only in the second replica,\n\ + \032 and that the default action is therefore to propagate the new version\n\ + \032 to the first replica. To follow Unison's recommendation, press the \"f\"\n\ + \032 at the prompt.\n\ + \n\ + \032 If both replicas are modified and their contents are different, then\n\ + \032 the changes are in conflict: <-?-> is displayed to indicate that Unison\n\ + \032 needs guidance on which replica should override the other.\n\ + \032 new file <-?-> new file d/h []\n\ + \n\ + \032 By default, neither version will be propagated and both replicas will\n\ + \032 remain as they are.\n\ + \n\ + \032 If both replicas have been modified but their new contents are the same\n\ + \032 (as with the file b), then no propagation is necessary and nothing is\n\ + \032 shown. Unison simply notes that the file is up to date.\n\ + \n\ + \032 These display conventions are used by both versions of the user\n\ + \032 interface. The only difference lies in the way in which Unison's\n\ + \032 default actions are either accepted or overridden by the user.\n\ + \n\ + \032 Textual Interface:\n\ + \032 * The status of each modified file is displayed, in turn. When the\n\ + \032 copies of a file in the two replicas are not identical, the user\n\ + \032 interface will ask for instructions as to how to propagate the\n\ + \032 change. If some default action is indicated (by an arrow), you can\n\ + \032 simply press Return to go on to the next changed file. If you want\n\ + \032 to do something different with this file, press \"<\" or \">\" to force\n\ + \032 the change to be propagated from right to left or from left to\n\ + \032 right, or else press \"/\" to skip this file and leave both replicas\n\ + \032 alone. When it reaches the end of the list of modified files,\n\ + \032 Unison will ask you one more time whether it should proceed with\n\ + \032 the updates that have been selected.\n\ + \032 When Unison stops to wait for input from the user, pressing \"?\"\n\ + \032 will always give a list of possible responses and their meanings.\n\ + \n\ + \032 Graphical Interface:\n\ + \032 * The main window shows all the files that have been modified in\n\ + \032 either a.tmp or b.tmp. To override a default action (or to select\n\ + \032 an action in the case when there is no default), first select the\n\ + \032 file, either by clicking on its name or by using the up- and\n\ + \032 down-arrow keys. Then press either the left-arrow or \"<\" key (to\n\ + \032 cause the version in b.tmp to propagate to a.tmp) or the\n\ + \032 right-arrow or \">\" key (which makes the a.tmp version override\n\ + \032 b.tmp).\n\ + \032 Every keyboard command can also be invoked from the menus at the\n\ + \032 top of the user interface. (Conversely, each menu item is annotated\n\ + \032 with its keyboard equivalent, if it has one.)\n\ + \032 When you are satisfied with the directions for the propagation of\n\ + \032 changes as shown in the main window, click the \"Go\" button to set\n\ + \032 them in motion. A check sign will be displayed next to each\n\ + \032 filename when the file has been dealt with.\n\ + \n\ + Remote Usage\n\ + \n\ + \032 Next, we'll get Unison set up to synchronize replicas on two different\n\ + \032 machines.\n\ + \n\ + \032 Follow the instructions in the Installation section to download or\n\ + \032 build an executable version of Unison on the server machine, and\n\ + \032 install it somewhere on your search path. (It doesn't matter whether\n\ + \032 you install the textual or graphical version, since the copy of Unison\n\ + \032 on the server doesn't need to display any user interface at all.)\n\ + \n\ + \032 It is important that the version of Unison installed on the server\n\ + \032 machine is the same as the version of Unison on the client machine. But\n\ + \032 some flexibility on the version of Unison at the client side can be\n\ + \032 achieved by using the -addversionno option; see the section\n\ + \032 \"Preferences\" .\n\ + \n\ + \032 Now there is a decision to be made. Unison provides two methods for\n\ + \032 communicating between the client and the server:\n\ + \032 * Remote shell method: To use this method, you must have some way of\n\ + \032 invoking remote commands on the server from the client's command\n\ + \032 line, using a facility such as ssh. This method is more convenient\n\ + \032 (since there is no need to manually start a \"unison server\" process\n\ + \032 on the server) and also more secure (especially if you use ssh).\n\ + \032 * Socket method: This method requires only that you can get TCP\n\ + \032 packets from the client to the server and back. A draconian\n\ + \032 firewall can prevent this, but otherwise it should work anywhere.\n\ + \n\ + \032 Decide which of these you want to try, and continue with the section\n\ + \032 \"Remote Shell Method\" or the section \"Socket Method\" , as appropriate.\n\ + \n\ + Remote Shell Method\n\ + \n\ + \032 The standard remote shell facility on Unix systems is ssh, which\n\ + \032 provides the same functionality as the older rsh but much better\n\ + \032 security. Ssh is available from http://www.openssh.org. See\n\ + \032 section [1]A.2 for installation instructions for the Windows version.\n\ + \n\ + \032 Running ssh requires some coordination between the client and server\n\ + \032 machines to establish that the client is allowed to invoke commands on\n\ + \032 the server; please refer to the ssh documentation for information on\n\ + \032 how to set this up. The examples in this section use ssh, but you can\n\ + \032 substitute rsh for ssh if you wish.\n\ + \n\ + \032 First, test that we can invoke Unison on the server from the client.\n\ + \032 Typing\n\ + \032 ssh remotehostname unison -version\n\ + \n\ + \032 should print the same version information as running\n\ + \032 unison -version\n\ + \n\ + \032 locally on the client. If remote execution fails, then either something\n\ + \032 is wrong with your ssh setup (e.g., \"permission denied\") or else the\n\ + \032 search path that's being used when executing commands on the server\n\ + \032 doesn't contain the unison executable (e.g., \"command not found\").\n\ + \n\ + \032 Create a test directory a.tmp in your home directory on the client\n\ + \032 machine.\n\ + \n\ + \032 Test that the local unison client can start and connect to the remote\n\ + \032 server. Type\n\ + \032 unison -testServer a.tmp ssh://remotehostname/a.tmp\n\ + \n\ + \032 Now cd to your home directory and type:\n\ + \032 unison a.tmp ssh://remotehostname/a.tmp\n\ + \n\ + \032 The result should be that the entire directory a.tmp is propagated from\n\ + \032 the client to your home directory on the server.\n\ + \n\ + \032 After finishing the first synchronization, change a few files and try\n\ + \032 synchronizing again. You should see similar results as in the local\n\ + \032 case.\n\ + \n\ + \032 If your user name on the server is not the same as on the client, you\n\ + \032 need to specify it on the command line:\n\ + \032 unison a.tmp ssh://username at remotehostname/a.tmp\n\ + \n\ + \032 Notes:\n\ + \032 * If you want to put a.tmp some place other than your home directory\n\ + \032 on the remote host, you can give an absolute path for it by adding\n\ + \032 an extra slash between remotehostname and the beginning of the\n\ + \032 path:\n\ + \032 unison a.tmp ssh://remotehostname//absolute/path/to/a.tmp\n\ + \n\ + \032 * You can give an explicit path for the unison executable on the\n\ + \032 server by using the command-line option \"-servercmd\n\ + \032 /full/path/name/of/unison\" or adding\n\ + \032 \"servercmd=/full/path/name/of/unison\" to your profile (see the\n\ + \032 section \"Profile\" ). Similarly, you can specify a explicit path for\n\ + \032 the ssh program using the \"-sshcmd\" option. Extra arguments can be\n\ + \032 passed to ssh by setting the -sshargs preference.\n\ + \n\ + Socket Method\n\ + \n\ + \032 Warning: The socket method is insecure: not only are the texts of\n\ + \032 your changes transmitted over the network in unprotected form, it is\n\ + \032 also possible for anyone in the world to connect to the server\n\ + \032 process and read out the contents of your filesystem! (Of course, to\n\ + \032 do this they must understand the protocol that Unison uses to\n\ + \032 communicate between client and server, but all they need for this is\n\ + \032 a copy of the Unison sources.) The socket method is provided only\n\ + \032 for expert users with specific needs; everyone else should use the\n\ + \032 ssh method.\n\ + \n\ + \032 To run Unison over a socket connection, you must start a Unison daemon\n\ + \032 process on the server. This process runs continuously, waiting for\n\ + \032 connections over a given socket from client machines running Unison and\n\ + \032 processing their requests in turn.\n\ + \n\ + \032 To start the daemon, type\n\ + \032 unison -socket NNNN\n\ + \n\ + \032 on the server machine, where NNNN is the socket number that the daemon\n\ + \032 should listen on for connections from clients. (NNNN can be any large\n\ + \032 number that is not being used by some other program; if NNNN is already\n\ + \032 in use, Unison will exit with an error message.) Note that paths\n\ + \032 specified by the client will be interpreted relative to the directory\n\ + \032 in which you start the server process; this behavior is different from\n\ + \032 the ssh case, where the path is relative to your home directory on the\n\ + \032 server.\n\ + \n\ + \032 Create a test directory a.tmp in your home directory on the client\n\ + \032 machine. Now type:\n\ + \032 unison a.tmp socket://remotehostname:NNNN/a.tmp\n\ + \n\ + \032 The result should be that the entire directory a.tmp is propagated from\n\ + \032 the client to the server (a.tmp will be created on the server in the\n\ + \032 directory that the server was started from). After finishing the first\n\ + \032 synchronization, change a few files and try synchronizing again. You\n\ + \032 should see similar results as in the local case.\n\ + \n\ + \032 Since the socket method is not used by many people, its functionality\n\ + \032 is rather limited. For example, the server can only deal with one\n\ + \032 client at a time.\n\ + \n\ + Using Unison for All Your Files\n\ + \n\ + \032 Once you are comfortable with the basic operation of Unison, you may\n\ + \032 find yourself wanting to use it regularly to synchronize your commonly\n\ + \032 used files. There are several possible ways of going about this:\n\ + \032 1. Synchronize your whole home directory, using the Ignore facility\n\ + \032 (see the section \"Ignore\" ) to avoid synchronizing temporary files\n\ + \032 and things that only belong on one host.\n\ + \032 2. Create a subdirectory called shared (or current, or whatever) in\n\ + \032 your home directory on each host, and put all the files you want to\n\ + \032 synchronize into this directory.\n\ + \032 3. Create a subdirectory called shared (or current, or whatever) in\n\ + \032 your home directory on each host, and put links to all the files\n\ + \032 you want to synchronize into this directory. Use the follow\n\ + \032 preference (see the section \"Symbolic Links\" ) to make Unison treat\n\ + \032 these links as transparent.\n\ + \032 4. Make your home directory the root of the synchronization, but tell\n\ + \032 Unison to synchronize only some of the files and subdirectories\n\ + \032 within it on any given run. This can be accomplished by using the\n\ + \032 -path switch on the command line:\n\ + \032 unison /home/username ssh://remotehost//home/username -path shared\n\ + \n\ + \032 The -path option can be used as many times as needed, to\n\ + \032 synchronize several files or subdirectories:\n\ + \032 unison /home/username ssh://remotehost//home/username \\\n\ + \032 -path shared \\\n\ + \032 -path pub \\\n\ + \032 -path .netscape/bookmarks.html\n\ + \n\ + \032 These -path arguments can also be put in your preference file. See\n\ + \032 the section \"Preferences\" for an example.\n\ + \n\ + \032 Most people find that they only need to maintain a profile (or\n\ + \032 profiles) on one of the hosts that they synchronize, since Unison is\n\ + \032 always initiated from this host. (For example, if you're synchronizing\n\ + \032 a laptop with a fileserver, you'll probably always run Unison on the\n\ + \032 laptop.) This is a bit different from the usual situation with\n\ + \032 asymmetric mirroring programs like rdist, where the mirroring operation\n\ + \032 typically needs to be initiated from the machine with the most recent\n\ + \032 changes. the section \"Profile\" covers the syntax of Unison profiles,\n\ + \032 together with some sample profiles.\n\ + \n\ + \032 Some tips on improving Unison's performance can be found on the\n\ + \032 Frequently Asked Questions page\n\ + \032 (http://www.cis.upenn.edu/~bcpierce/unison/faq.html).\n\ + \n\ + Using Unison to Synchronize More Than Two Machines\n\ + \n\ + \032 Unison is designed for synchronizing pairs of replicas. However, it is\n\ + \032 possible to use it to keep larger groups of machines in sync by\n\ + \032 performing multiple pairwise synchronizations.\n\ + \n\ + \032 If you need to do this, the most reliable way to set things up is to\n\ + \032 organize the machines into a \"star topology,\" with one machine\n\ + \032 designated as the \"hub\" and the rest as \"spokes,\" and with each spoke\n\ + \032 machine synchronizing only with the hub. The big advantage of the star\n\ + \032 topology is that it eliminates the possibility of confusing \"spurious\n\ + \032 conflicts\" arising from the fact that a separate archive is maintained\n\ + \032 by Unison for every pair of hosts that it synchronizes.\n\ + \n\ + Going Further\n\ + \n\ + \032 On-line documentation for the various features of Unison can be\n\ + \032 obtained either by typing\n\ + \032 unison -doc topics\n\ + \n\ + \032 at the command line, or by selecting the Help menu in the graphical\n\ + \032 user interface. The same information is also available in a typeset\n\ + \032 User's Manual (HTML or PostScript format) through\n\ + \032 http://www.cis.upenn.edu/~bcpierce/unison.\n\ + \n\ + \032 If you use Unison regularly, you should subscribe to one of the mailing\n\ + \032 lists, to receive announcements of new versions. See the section\n\ + \032 \"Mailing Lists\" .\n\ + \n\ + ")) +:: + ("basics", ("Basic Concepts", + "Basic Concepts\n\ + \n\ + \032 To understand how Unison works, it is necessary to discuss a few\n\ + \032 straightforward concepts. These concepts are developed more rigorously\n\ + \032 and at more length in a number of papers, available at\n\ + \032 http://www.cis.upenn.edu/~bcpierce/papers. But the informal\n\ + \032 presentation here should be enough for most users.\n\ + \n\ + Roots\n\ + \n\ + \032 A replica's root tells Unison where to find a set of files to be\n\ + \032 synchronized, either on the local machine or on a remote host. For\n\ + \032 example,\n\ + \032 relative/path/of/root\n\ + \n\ + \032 specifies a local root relative to the directory where Unison is\n\ + \032 started, while\n\ + \032 /absolute/path/of/root\n\ + \n\ + \032 specifies a root relative to the top of the local filesystem,\n\ + \032 independent of where Unison is running. Remote roots can begin with\n\ + \032 ssh://, rsh:// to indicate that the remote server should be started\n\ + \032 with rsh or ssh:\n\ + \032 ssh://remotehost//absolute/path/of/root\n\ + \032 rsh://user at remotehost/relative/path/of/root\n\ + \n\ + \032 If the remote server is already running (in the socket mode), then the\n\ + \032 syntax\n\ + \032 socket://remotehost:portnum//absolute/path/of/root\n\ + \032 socket://remotehost:portnum/relative/path/of/root\n\ + \n\ + \032 is used to specify the hostname and the port that the client Unison\n\ + \032 should use to contact it.\n\ + \n\ + \032 The syntax for roots is based on that of URIs (described in RFC 2396).\n\ + \032 The full grammar is:\n\ + \032 replica ::= [protocol:]//[user@][host][:port][/path]\n\ + \032 | path\n\ + \n\ + \032 protocol ::= file\n\ + \032 | socket\n\ + \032 | ssh\n\ + \032 | rsh\n\ + \n\ + \032 user ::= [-_a-zA-Z0-9]+\n\ + \n\ + \032 host ::= [-_a-zA-Z0-9.]+\n\ + \n\ + \032 port ::= [0-9]+\n\ + \n\ + \032 When path is given without any protocol prefix, the protocol is assumed\n\ + \032 to be file:. Under Windows, it is possible to synchronize with a remote\n\ + \032 directory using the file: protocol over the Windows Network\n\ + \032 Neighborhood. For example,\n\ + \032 unison foo //host/drive/bar\n\ + \n\ + \032 synchronizes the local directory foo with the directory drive:\\bar on\n\ + \032 the machine host, provided that host is accessible via Network\n\ + \032 Neighborhood. When the file: protocol is used in this way, there is no\n\ + \032 need for a Unison server to be running on the remote host. However,\n\ + \032 running Unison this way is only a good idea if the remote host is\n\ + \032 reached by a very fast network connection, since the full contents of\n\ + \032 every file in the remote replica will have to be transferred to the\n\ + \032 local machine to detect updates.\n\ + \n\ + \032 The names of roots are canonized by Unison before it uses them to\n\ + \032 compute the names of the corresponding archive files, so\n\ + \032 //saul//home/bcpierce/common and //saul.cis.upenn.edu/common will be\n\ + \032 recognized as the same replica under different names.\n\ + \n\ + Paths\n\ + \n\ + \032 A path refers to a point within a set of files being synchronized; it\n\ + \032 is specified relative to the root of the replica.\n\ + \n\ + \032 Formally, a path is just a sequence of names, separated by /. Note that\n\ + \032 the path separator character is always a forward slash, no matter what\n\ + \032 operating system Unison is running on. Forward slashes are converted to\n\ + \032 backslashes as necessary when paths are converted to filenames in the\n\ + \032 local filesystem on a particular host. (For example, suppose that we\n\ + \032 run Unison on a Windows system, synchronizing the local root c:\\pierce\n\ + \032 with the root ssh://saul.cis.upenn.edu/home/bcpierce on a Unix server.\n\ + \032 Then the path current/todo.txt refers to the file\n\ + \032 c:\\pierce\\current\\todo.txt on the client and\n\ + \032 /home/bcpierce/current/todo.txt on the server.)\n\ + \n\ + \032 The empty path (i.e., the empty sequence of names) denotes the whole\n\ + \032 replica. Unison displays the empty path as \"[root].\"\n\ + \n\ + \032 If p is a path and q is a path beginning with p, then q is said to be a\n\ + \032 descendant of p. (Each path is also a descendant of itself.)\n\ + \n\ + What is an Update?\n\ + \n\ + \032 The contents of a path p in a particular replica could be a file, a\n\ + \032 directory, a symbolic link, or absent (if p does not refer to anything\n\ + \032 at all in that replica). More specifically:\n\ + \032 * If p refers to an ordinary file, then the contents of p are the\n\ + \032 actual contents of this file (a string of bytes) plus the current\n\ + \032 permission bits of the file.\n\ + \032 * If p refers to a symbolic link, then the contents of p are just the\n\ + \032 string specifying where the link points.\n\ + \032 * If p refers to a directory, then the contents of p are just the\n\ + \032 token \"DIRECTORY\" plus the current permission bits of the\n\ + \032 directory.\n\ + \032 * If p does not refer to anything in this replica, then the contents\n\ + \032 of p are the token \"ABSENT.\"\n\ + \n\ + \032 Unison keeps a record of the contents of each path after each\n\ + \032 successful synchronization of that path (i.e., it remembers the\n\ + \032 contents at the last moment when they were the same in the two\n\ + \032 replicas).\n\ + \n\ + \032 We say that a path is updated (in some replica) if its current contents\n\ + \032 are different from its contents the last time it was successfully\n\ + \032 synchronized. Note that whether a path is updated has nothing to do\n\ + \032 with its last modification time--Unison considers only the contents\n\ + \032 when determining whether an update has occurred. This means that\n\ + \032 touching a file without changing its contents will not be recognized as\n\ + \032 an update. A file can even be changed several times and then changed\n\ + \032 back to its original contents; as long as Unison is only run at the end\n\ + \032 of this process, no update will be recognized.\n\ + \n\ + \032 What Unison actually calculates is a close approximation to this\n\ + \032 definition; see the section \"Caveats and Shortcomings\" .\n\ + \n\ + What is a Conflict?\n\ + \n\ + \032 A path is said to be conflicting if the following conditions all hold:\n\ + \032 1. it has been updated in one replica,\n\ + \032 2. it or any of its descendants has been updated in the other replica,\n\ + \032 and\n\ + \032 3. its contents in the two replicas are not identical.\n\ + \n\ + Reconciliation\n\ + \n\ + \032 Unison operates in several distinct stages:\n\ + \032 1. On each host, it compares its archive file (which records the state\n\ + \032 of each path in the replica when it was last synchronized) with the\n\ + \032 current contents of the replica, to determine which paths have been\n\ + \032 updated.\n\ + \032 2. It checks for \"false conflicts\" -- paths that have been updated on\n\ + \032 both replicas, but whose current values are identical. These paths\n\ + \032 are silently marked as synchronized in the archive files in both\n\ + \032 replicas.\n\ + \032 3. It displays all the updated paths to the user. For updates that do\n\ + \032 not conflict, it suggests a default action (propagating the new\n\ + \032 contents from the updated replica to the other). Conflicting\n\ + \032 updates are just displayed. The user is given an opportunity to\n\ + \032 examine the current state of affairs, change the default actions\n\ + \032 for nonconflicting updates, and choose actions for conflicting\n\ + \032 updates.\n\ + \032 4. It performs the selected actions, one at a time. Each action is\n\ + \032 performed by first transferring the new contents to a temporary\n\ + \032 file on the receiving host, then atomically moving them into place.\n\ + \032 5. It updates its archive files to reflect the new state of the\n\ + \032 replicas.\n\ + \n\ + ")) +:: + ("failures", ("Invariants", + "Invariants\n\ + \n\ + \032 Given the importance and delicacy of the job that it performs, it is\n\ + \032 important to understand both what a synchronizer does under normal\n\ + \032 conditions and what can happen under unusual conditions such as system\n\ + \032 crashes and communication failures.\n\ + \n\ + \032 Unison is careful to protect both its internal state and the state of\n\ + \032 the replicas at every point in this process. Specifically, the\n\ + \032 following guarantees are enforced:\n\ + \032 * At every moment, each path in each replica has either (1) its\n\ + \032 original contents (i.e., no change at all has been made to this\n\ + \032 path), or (2) its correct final contents (i.e., the value that the\n\ + \032 user expected to be propagated from the other replica).\n\ + \032 * At every moment, the information stored on disk about Unison's\n\ + \032 private state can be either (1) unchanged, or (2) updated to\n\ + \032 reflect those paths that have been successfully synchronized.\n\ + \n\ + \032 The upshot is that it is safe to interrupt Unison at any time, either\n\ + \032 manually or accidentally. [Caveat: the above is almost true there are\n\ + \032 occasionally brief periods where it is not (and, because of shortcoming\n\ + \032 of the Posix filesystem API, cannot be); in particular, when it is\n\ + \032 copying a file onto a directory or vice versa, it must first move the\n\ + \032 original contents out of the way. If Unison gets interrupted during one\n\ + \032 of these periods, some manual cleanup may be required. In this case, a\n\ + \032 file called DANGER.README will be left in your home directory,\n\ + \032 containing information about the operation that was interrupted. The\n\ + \032 next time you try to run Unison, it will notice this file and warn you\n\ + \032 about it.]\n\ + \n\ + \032 If an interruption happens while it is propagating updates, then there\n\ + \032 may be some paths for which an update has been propagated but which\n\ + \032 have not been marked as synchronized in Unison's archives. This is no\n\ + \032 problem: the next time Unison runs, it will detect changes to these\n\ + \032 paths in both replicas, notice that the contents are now equal, and\n\ + \032 mark the paths as successfully updated when it writes back its private\n\ + \032 state at the end of this run.\n\ + \n\ + \032 If Unison is interrupted, it may sometimes leave temporary working\n\ + \032 files (with suffix .tmp) in the replicas. It is safe to delete these\n\ + \032 files. Also, if the backups flag is set, Unison will leave around old\n\ + \032 versions of files that it overwrites, with names like\n\ + \032 file.0.unison.bak. These can be deleted safely when they are no longer\n\ + \032 wanted.\n\ + \n\ + \032 Unison is not bothered by clock skew between the different hosts on\n\ + \032 which it is running. It only performs comparisons between timestamps\n\ + \032 obtained from the same host, and the only assumption it makes about\n\ + \032 them is that the clock on each system always runs forward.\n\ + \n\ + \032 If Unison finds that its archive files have been deleted (or that the\n\ + \032 archive format has changed and they cannot be read, or that they don't\n\ + \032 exist because this is the first run of Unison on these particular\n\ + \032 roots), it takes a conservative approach: it behaves as though the\n\ + \032 replicas had both been completely empty at the point of the last\n\ + \032 synchronization. The effect of this is that, on the first run, files\n\ + \032 that exist in only one replica will be propagated to the other, while\n\ + \032 files that exist in both replicas but are unequal will be marked as\n\ + \032 conflicting.\n\ + \n\ + \032 Touching a file without changing its contents should never affect\n\ + \032 whether or not Unison does an update. (When running with the fastcheck\n\ + \032 preference set to true--the default on Unix systems--Unison uses file\n\ + \032 modtimes for a quick first pass to tell which files have definitely not\n\ + \032 changed; then, for each file that might have changed, it computes a\n\ + \032 fingerprint of the file's contents and compares it against the\n\ + \032 last-synchronized contents. Also, the -times option allows you to\n\ + \032 synchronize file times, but it does not cause identical files to be\n\ + \032 changed; Unison will only modify the file times.)\n\ + \n\ + \032 It is safe to \"brainwash\" Unison by deleting its archive files on both\n\ + \032 replicas. The next time it runs, it will assume that all the files it\n\ + \032 sees in the replicas are new.\n\ + \n\ + \032 It is safe to modify files while Unison is working. If Unison discovers\n\ + \032 that it has propagated an out-of-date change, or that the file it is\n\ + \032 updating has changed on the target replica, it will signal a failure\n\ + \032 for that file. Run Unison again to propagate the latest change.\n\ + \n\ + \032 Changes to the ignore patterns from the user interface (e.g., using the\n\ + \032 `i' key) are immediately reflected in the current profile.\n\ + \n\ + Caveats and Shortcomings\n\ + \n\ + \032 Here are some things to be careful of when using Unison.\n\ + \032 * In the interests of speed, the update detection algorithm may\n\ + \032 (depending on which OS architecture that you run Unison on)\n\ + \032 actually use an approximation to the definition given in the\n\ + \032 section \"What is an Update?\" .\n\ + \032 In particular, the Unix implementation does not compare the actual\n\ + \032 contents of files to their previous contents, but simply looks at\n\ + \032 each file's inode number and modtime; if neither of these have\n\ + \032 changed, then it concludes that the file has not been changed.\n\ + \032 Under normal circumstances, this approximation is safe, in the\n\ + \032 sense that it may sometimes detect \"false updates\" but will never\n\ + \032 miss a real one. However, it is possible to fool it, for example by\n\ + \032 using retouch to change a file's modtime back to a time in the\n\ + \032 past.\n\ + \032 * If you synchronize between a single-user filesystem and a shared\n\ + \032 Unix server, you should pay attention to your permission bits: by\n\ + \032 default, Unison will synchronize permissions verbatim, which may\n\ + \032 leave group-writable files on the server that could be written over\n\ + \032 by a lot of people.\n\ + \032 You can control this by setting your umask on both computers to\n\ + \032 something like 022, masking out the \"world write\" and \"group write\"\n\ + \032 permission bits.\n\ + \032 Unison does not synchronize the setuid and setgid bits, for\n\ + \032 security.\n\ + \032 * The graphical user interface is single-threaded. This means that if\n\ + \032 Unison is performing some long-running operation, the display will\n\ + \032 not be repainted until it finishes. We recommend not trying to do\n\ + \032 anything with the user interface while Unison is in the middle of\n\ + \032 detecting changes or propagating files.\n\ + \032 * Unison does not understand hard links.\n\ + \032 * It is important to be a little careful when renaming directories\n\ + \032 containing ignored files.\n\ + \032 For example, suppose Unison is synchronizing directory A between\n\ + \032 the two machines called the \"local\" and the \"remote\" machine;\n\ + \032 suppose directory A contains a subdirectory D; and suppose D on the\n\ + \032 local machine contains a file or subdirectory P that matches an\n\ + \032 ignore directive in the profile used to synchronize. Thus path\n\ + \032 A/D/P exists on the local machine but not on the remote machine.\n\ + \032 If D is renamed to D' on the remote machine, and this change is\n\ + \032 propagated to the local machine, all such files or subdirectories P\n\ + \032 will be deleted. This is because Unison sees the rename as a delete\n\ + \032 and a separate create: it deletes the old directory (including the\n\ + \032 ignored files) and creates a new one (not including the ignored\n\ + \032 files, since they are completely invisible to it).\n\ + \n\ + ")) +:: + ("", ("Reference Guide", + "Reference Guide\n\ + \n\ + \032 This section covers the features of Unison in detail.\n\ + \n\ + ")) +:: + ("running", ("Running Unison", + "Running Unison\n\ + \n\ + \032 There are several ways to start Unison.\n\ + \032 * Typing \"unison profile\" on the command line. Unison will look for a\n\ + \032 file profile.prf in the .unison directory. If this file does not\n\ + \032 specify a pair of roots, Unison will prompt for them and add them\n\ + \032 to the information specified by the profile.\n\ + \032 * Typing \"unison profile root1 root2\" on the command line. In this\n\ + \032 case, Unison will use profile, which should not contain any root\n\ + \032 directives.\n\ + \032 * Typing \"unison root1 root2\" on the command line. This has the same\n\ + \032 effect as typing \"unison default root1 root2.\"\n\ + \032 * Typing just \"unison\" (or invoking Unison by clicking on a desktop\n\ + \032 icon). In this case, Unison will ask for the profile to use for\n\ + \032 synchronization (or create a new one, if necessary).\n\ + \n\ + The .unison Directory\n\ + \n\ + \032 Unison stores a variety of information in a private directory on each\n\ + \032 host. If the environment variable UNISON is defined, then its value\n\ + \032 will be used as the name of this directory. If UNISON is not defined,\n\ + \032 then the name of the directory depends on which operating system you\n\ + \032 are using. In Unix, the default is to use $HOME/.unison. In Windows, if\n\ + \032 the environment variable USERPROFILE is defined, then the directory\n\ + \032 will be $USERPROFILE\\.unison; otherwise if HOME is defined, it will be\n\ + \032 $HOME\\.unison; otherwise, it will be c:\\.unison.\n\ + \n\ + \032 The archive file for each replica is found in the .unison directory on\n\ + \032 that replica's host. Profiles (described below) are always taken from\n\ + \032 the .unison directory on the client host.\n\ + \n\ + \032 Note that Unison maintains a completely different set of archive files\n\ + \032 for each pair of roots.\n\ + \n\ + \032 We do not recommend synchronizing the whole .unison directory, as this\n\ + \032 will involve frequent propagation of large archive files. It should be\n\ + \032 safe to do it, though, if you really want to. Synchronizing just the\n\ + \032 profile files in the .unison directory is definitely OK.\n\ + \n\ + Archive Files\n\ + \n\ + \032 The name of the archive file on each replica is calculated from\n\ + \032 * the canonical names of all the hosts (short names like saul are\n\ + \032 converted into full addresses like saul.cis.upenn.edu),\n\ + \032 * the paths to the replicas on all the hosts (again, relative\n\ + \032 pathnames, symbolic links, etc. are converted into full, absolute\n\ + \032 paths), and\n\ + \032 * an internal version number that is changed whenever a new Unison\n\ + \032 release changes the format of the information stored in the\n\ + \032 archive.\n\ + \n\ + \032 This method should work well for most users. However, it is\n\ + \032 occasionally useful to change the way archive names are generated.\n\ + \032 Unison provides two ways of doing this.\n\ + \n\ + \032 The function that finds the canonical hostname of the local host (which\n\ + \032 is used, for example, in calculating the name of the archive file used\n\ + \032 to remember which files have been synchronized) normally uses the\n\ + \032 gethostname operating system call. However, if the environment variable\n\ + \032 UNISONLOCALHOSTNAME is set, its value will be used instead. This makes\n\ + \032 it easier to use Unison in situations where a machine's name changes\n\ + \032 frequently (e.g., because it is a laptop and gets moved around a lot).\n\ + \n\ + \032 A more powerful way of changing archive names is provided by the\n\ + \032 rootalias preference. The preference file may contain any number of\n\ + \032 lines of the form:\n\ + \032 rootalias = //hostnameA//path-to-replicaA -> //hostnameB/path-to-replicaB\n\ + \n\ + \032 When calculating the name of the archive files for a given pair of\n\ + \032 roots, Unison replaces any root that matches the left-hand side of any\n\ + \032 rootalias rule by the corresponding right-hand side.\n\ + \n\ + \032 So, if you need to relocate a root on one of the hosts, you can add a\n\ + \032 rule of the form:\n\ + \032 rootalias = //new-hostname//new-path -> //old-hostname/old-path\n\ + \n\ + \032 Note that root aliases are case-sensitive, even on case-insensitive\n\ + \032 file systems.\n\ + \n\ + \032 Warning: The rootalias option is dangerous and should only be used if\n\ + \032 you are sure you know what you're doing. In particular, it should only\n\ + \032 be used if you are positive that either (1) both the original root and\n\ + \032 the new alias refer to the same set of files, or (2) the files have\n\ + \032 been relocated so that the original name is now invalid and will never\n\ + \032 be used again. (If the original root and the alias refer to different\n\ + \032 sets of files, Unison's update detector could get confused.) After\n\ + \032 introducing a new rootalias, it is a good idea to run Unison a few\n\ + \032 times interactively (with the batch flag off, etc.) and carefully check\n\ + \032 that things look reasonable--in particular, that update detection is\n\ + \032 working as expected.\n\ + \n\ + Preferences\n\ + \n\ + \032 Many details of Unison's behavior are configurable by user-settable\n\ + \032 \"preferences.\"\n\ + \n\ + \032 Some preferences are boolean-valued; these are often called flags.\n\ + \032 Others take numeric or string arguments, indicated in the preferences\n\ + \032 list by n or xxx. Most of the string preferences can be given several\n\ + \032 times; the arguments are accumulated into a list internally.\n\ + \n\ + \032 There are two ways to set the values of preferences: temporarily, by\n\ + \032 providing command-line arguments to a particular run of Unison, or\n\ + \032 permanently, by adding commands to a profile in the .unison directory\n\ + \032 on the client host. The order of preferences (either on the command\n\ + \032 line or in preference files) is not significant. On the command line,\n\ + \032 preferences and other arguments (the profile name and roots) can be\n\ + \032 intermixed in any order.\n\ + \n\ + \032 To set the value of a preference p from the command line, add an\n\ + \032 argument -p (for a boolean flag) or -p n or -p xxx (for a numeric or\n\ + \032 string preference) anywhere on the command line. To set a boolean flag\n\ + \032 to false on the command line, use -p=false.\n\ + \n\ + \032 Here are all the preferences supported by Unison. This list can be\n\ + \032 obtained by typing unison -help.\n\ + \n\ + Usage: unison [options]\n\ + \032 or unison root1 root2 [options]\n\ + \032 or unison profilename [options]\n\ + \n\ + Basic options:\n\ + \032-auto automatically accept default (nonconflicting) actions\n\ + \032-batch batch mode: ask no questions at all\n\ + \032-doc xxx show documentation ('-doc topics' lists topics)\n\ + \032-fat use appropriate options for FAT filesystems\n\ + \032-group synchronize group attributes\n\ + \032-ignore xxx add a pattern to the ignore list\n\ + \032-ignorenot xxx add a pattern to the ignorenot list\n\ + \032-nocreation xxx prevent file creations on one replica\n\ + \032-nodeletion xxx prevent file deletions on one replica\n\ + \032-noupdate xxx prevent file updates and deletions on one replica\n\ + \032-owner synchronize owner\n\ + \032-path xxx path to synchronize\n\ + \032-perms n part of the permissions which is synchronized\n\ + \032-root xxx root of a replica (should be used exactly twice)\n\ + \032-silent print nothing except error messages\n\ + \032-terse suppress status messages\n\ + \032-testserver exit immediately after the connection to the server\n\ + \032-times synchronize modification times\n\ + \032-version print version and exit\n\ + \n\ + Advanced options:\n\ + \032-addprefsto xxx file to add new prefs to\n\ + \032-addversionno add version number to name of unison on server\n\ + \032-backup xxx add a pattern to the backup list\n\ + \032-backupcurr xxx add a pattern to the backupcurr list\n\ + \032-backupcurrnot xxx add a pattern to the backupcurrnot list\n\ + \032-backupdir xxx directory for storing centralized backups\n\ + \032-backuploc xxx where backups are stored ('local' or 'central')\n\ + \032-backupnot xxx add a pattern to the backupnot list\n\ + \032-backupprefix xxx prefix for the names of backup files\n\ + \032-backups keep backup copies of all files (see also 'backup')\n\ + \032-backupsuffix xxx a suffix to be added to names of backup files\n\ + \032-clientHostName xxx set host name of client\n\ + \032-confirmbigdel ask about whole-replica (or path) deletes (default true)\n\ + \032-confirmmerge ask for confirmation before committing results of a merge\n\ + \032-contactquietly suppress the 'contacting server' message during startup\n\ + \032-copymax n maximum number of simultaneous copyprog transfers\n\ + \032-copyonconflict keep copies of conflicting files\n\ + \032-copyprog xxx external program for copying large files\n\ + \032-copyprogrest xxx variant of copyprog for resuming partial transfers\n\ + \032-copyquoterem xxx add quotes to remote file name for copyprog (true/false/defa\n\ + ult)\n\ + \032-copythreshold n use copyprog on files bigger than this (if >=0, in Kb)\n\ + \032-debug xxx debug module xxx ('all' -> everything, 'verbose' -> more)\n\ + \032-diff xxx set command for showing differences between files\n\ + \032-dontchmod when set, never use the chmod system call\n\ + \032-dumbtty do not change terminal settings in text UI (default true)\n\ + \032-fastcheck xxx do fast update detection (true/false/default)\n\ + \032-fastercheckUNSAFE skip computing fingerprints for new files (experts only!)\n\ + \032-follow xxx add a pattern to the follow list\n\ + \032-force xxx force changes from this replica to the other\n\ + \032-forcepartial xxx add a pattern to the forcepartial list\n\ + \032-halfduplex force half-duplex communication with the server\n\ + \032-height n height (in lines) of main window in graphical interface\n\ + \032-host xxx bind the socket to this host name in server socket mode\n\ + \032-ignorearchives ignore existing archive files\n\ + \032-ignorecase xxx identify upper/lowercase filenames (true/false/default)\n\ + \032-ignoreinodenumbers ignore inode number changes when detecting updates\n\ + \032-ignorelocks ignore locks left over from previous run (dangerous!)\n\ + \032-immutable xxx add a pattern to the immutable list\n\ + \032-immutablenot xxx add a pattern to the immutablenot list\n\ + \032-key xxx define a keyboard shortcut for this profile (in some UIs)\n\ + \032-killserver kill server when done (even when using sockets)\n\ + \032-label xxx provide a descriptive string label for this profile\n\ + \032-links xxx allow the synchronization of symbolic links (true/false/defa\n\ + ult)\n\ + \032-log record actions in logfile (default true)\n\ + \032-logfile xxx logfile name\n\ + \032-maxbackups n number of backed up versions of a file\n\ + \032-maxerrors n maximum number of errors before a directory transfer is abor\n\ + ted\n\ + \032-maxsizethreshold n prevent transfer of files bigger than this (if >=0, in Kb)\n\ + \032-maxthreads n maximum number of simultaneous file transfers\n\ + \032-merge xxx add a pattern to the merge list\n\ + \032-mountpoint xxx abort if this path does not exist\n\ + \032-nocreationpartial xxx add a pattern to the nocreationpartial list\n\ + \032-nodeletionpartial xxx add a pattern to the nodeletionpartial list\n\ + \032-noupdatepartial xxx add a pattern to the noupdatepartial list\n\ + \032-numericids don't map uid/gid values by user/group names\n\ + \032-prefer xxx choose this replica's version for conflicting changes\n\ + \032-preferpartial xxx add a pattern to the preferpartial list\n\ + \032-repeat xxx synchronize repeatedly (text interface only)\n\ + \032-retry n re-try failed synchronizations N times (text ui only)\n\ + \032-rootalias xxx register alias for canonical root names\n\ + \032-rsrc xxx synchronize resource forks (true/false/default)\n\ + \032-rsync activate the rsync transfer mode (default true)\n\ + \032-selftest run internal tests and exit\n\ + \032-servercmd xxx name of unison executable on remote server\n\ + \032-showarchive show 'true names' (for rootalias) of roots and archive\n\ + \032-socket xxx act as a server on a socket\n\ + \032-sortbysize list changed files by size, not name\n\ + \032-sortfirst xxx add a pattern to the sortfirst list\n\ + \032-sortlast xxx add a pattern to the sortlast list\n\ + \032-sortnewfirst list new before changed files\n\ + \032-sshargs xxx other arguments (if any) for remote shell command\n\ + \032-sshcmd xxx path to the ssh executable\n\ + \032-stream use a streaming protocol for transferring file contents (def\n\ + ault true)\n\ + \032-ui xxx select UI ('text' or 'graphic'); command-line only\n\ + \032-unicode xxx assume Unicode encoding in case insensitive mode\n\ + \032-watch when set, use a file watcher process to detect changes (defa\n\ + ult true)\n\ + \032-xferbycopying optimize transfers using local copies (default true)\n\ + \n\ + \n\ + \032 Here, in more detail, is what they do. Many are discussed in greater\n\ + \032 detail in other sections of the manual.\n\ + \032 addprefsto xxx\n\ + \032 By default, new preferences added by Unison (e.g., new ignore\n\ + \032 clauses) will be appended to whatever preference file Unison was\n\ + \032 told to load at the beginning of the run. Setting the preference\n\ + \032 addprefsto filename makes Unison add new preferences to the file\n\ + \032 named filename instead.\n\ + \032 addversionno\n\ + \032 When this flag is set to true, Unison will use\n\ + \032 unison-currentversionnumber instead of just unison as the remote\n\ + \032 server command. This allows multiple binaries for different\n\ + \032 versions of unison to coexist conveniently on the same server:\n\ + \032 whichever version is run on the client, the same version will be\n\ + \032 selected on the server.\n\ + \032 auto\n\ + \032 When set to true, this flag causes the user interface to skip\n\ + \032 asking for confirmations on non-conflicting changes. (More\n\ + \032 precisely, when the user interface is done setting the\n\ + \032 propagation direction for one entry and is about to move to the\n\ + \032 next, it will skip over all non-conflicting entries and go\n\ + \032 directly to the next conflict.)\n\ + \032 backup xxx\n\ + \032 Including the preference -backup pathspec causes Unison to keep\n\ + \032 backup files for each path that matches pathspec. These backup\n\ + \032 files are kept in the directory specified by the backuplocation\n\ + \032 preference. The backups are named according to the backupprefix\n\ + \032 and backupsuffix preferences. The number of versions that are\n\ + \032 kept is determined by the maxbackups preference.\n\ + \032 The syntax of pathspec is described in the section \"Path\n\ + \032 Specification\" .\n\ + \032 backupcurr xxx\n\ + \032 Including the preference -backupcurr pathspec causes Unison to\n\ + \032 keep a backup of the current version of every file matching\n\ + \032 pathspec. This file will be saved as a backup with version\n\ + \032 number 000. Such backups can be used as inputs to external\n\ + \032 merging programs, for instance. See the documentatation for the\n\ + \032 merge preference. For more details, see the section \"Merging\n\ + \032 Conflicting Versions\" .\n\ + \032 The syntax of pathspec is described in the section \"Path\n\ + \032 Specification\" .\n\ + \032 backupcurrnot xxx\n\ + \032 Exceptions to backupcurr, like the ignorenot preference.\n\ + \032 backupdir xxx\n\ + \032 If this preference is set, Unison will use it as the name of the\n\ + \032 directory used to store backup files specified by the backup\n\ + \032 preference, when backuplocation is set to central. It is checked\n\ + \032 after the UNISONBACKUPDIR environment variable.\n\ + \032 backuploc xxx\n\ + \032 This preference determines whether backups should be kept\n\ + \032 locally, near the original files, or in a central directory\n\ + \032 specified by the backupdir preference. If set to local, backups\n\ + \032 will be kept in the same directory as the original files, and if\n\ + \032 set to central, backupdir will be used instead.\n\ + \032 backupnot xxx\n\ + \032 The values of this preference specify paths or individual files\n\ + \032 or regular expressions that should not be backed up, even if the\n\ + \032 backup preference selects them--i.e., it selectively overrides\n\ + \032 backup. The same caveats apply here as with ignore and\n\ + \032 ignorenot.\n\ + \032 backupprefix xxx\n\ + \032 When a backup for a file NAME is created, it is stored in a\n\ + \032 directory specified by backuplocation, in a file called\n\ + \032 backupprefixNAMEbackupsuffix. backupprefix can include a\n\ + \032 directory name (causing Unison to keep all backup files for a\n\ + \032 given directory in a subdirectory with this name), and both\n\ + \032 backupprefix and backupsuffix can contain the string$VERSION,\n\ + \032 which will be replaced by the age of the backup (1 for the most\n\ + \032 recent, 2 for the second most recent, and so on...). This\n\ + \032 keyword is ignored if it appears in a directory name in the\n\ + \032 prefix; if it does not appear anywhere in the prefix or the\n\ + \032 suffix, it will be automatically placed at the beginning of the\n\ + \032 suffix.\n\ + \032 One thing to be careful of: If the backuploc preference is set\n\ + \032 to local, Unison will automatically ignore all files whose\n\ + \032 prefix and suffix match backupprefix and backupsuffix. So be\n\ + \032 careful to choose values for these preferences that are\n\ + \032 sufficiently different from the names of your real files.\n\ + \032 backups\n\ + \032 Setting this flag to true is equivalent to setting\n\ + \032 backuplocation to local and backup to Name *.\n\ + \032 backupsuffix xxx\n\ + \032 See backupprefix for full documentation.\n\ + \032 batch\n\ + \032 When this is set to true, the user interface will ask no\n\ + \032 questions at all. Non-conflicting changes will be propagated;\n\ + \032 conflicts will be skipped.\n\ + \032 clientHostName xxx\n\ + \032 When specified, the host name of the client will not be\n\ + \032 guessedand the provided host name will be used to find the\n\ + \032 archive.\n\ + \032 confirmbigdel\n\ + \032 When this is set to true, Unison will request an extra\n\ + \032 confirmation if it appears that the entire replica has been\n\ + \032 deleted, before propagating the change. If the batch flag is\n\ + \032 also set, synchronization will be aborted. When the path\n\ + \032 preference is used, the same confirmation will be requested for\n\ + \032 top-level paths. (At the moment, this flag only affects the text\n\ + \032 user interface.) See also the mountpoint preference.\n\ + \032 confirmmerge\n\ + \032 Setting this preference causes both the text and graphical\n\ + \032 interfaces to ask the user if the results of a merge command may\n\ + \032 be committed to the replica or not. Since the merge command\n\ + \032 works on temporary files, the user can then cancel all the\n\ + \032 effects of applying the merge if it turns out that the result is\n\ + \032 not satisfactory. In batch-mode, this preference has no effect.\n\ + \032 Default is false.\n\ + \032 contactquietly\n\ + \032 If this flag is set, Unison will skip displaying the `Contacting\n\ + \032 server' message (which some users find annoying) during startup.\n\ + \032 copymax n\n\ + \032 A number indicating how many instances of the external copying\n\ + \032 utility Unison is allowed to run simultaneously (default to 1).\n\ + \032 copyonconflict\n\ + \032 When this flag is set, Unison will make a copy of files that\n\ + \032 would otherwise be overwritten or deleted in case of conflicting\n\ + \032 changes, and more generally whenever the default behavior is\n\ + \032 overriden. This makes it possible to automatically resolve\n\ + \032 conflicts in a fairly safe way when synchronizing continuously,\n\ + \032 in combination with the -repeat watch and -prefer newer\n\ + \032 preferences.\n\ + \032 copyprog xxx\n\ + \032 A string giving the name of an external program that can be used\n\ + \032 to copy large files efficiently (plus command-line switches\n\ + \032 telling it to copy files in-place). The default setting invokes\n\ + \032 rsync with appropriate options--most users should not need to\n\ + \032 change it.\n\ + \032 copyprogrest xxx\n\ + \032 A variant of copyprog that names an external program that should\n\ + \032 be used to continue the transfer of a large file that has\n\ + \032 already been partially transferred. Typically, copyprogrest will\n\ + \032 just be copyprog with one extra option (e.g., -partial, for\n\ + \032 rsync). The default setting invokes rsync with appropriate\n\ + \032 options--most users should not need to change it.\n\ + \032 copyquoterem xxx\n\ + \032 When set to true, this flag causes Unison to add an extra layer\n\ + \032 of quotes to the remote path passed to the external copy\n\ + \032 program. This is needed by rsync, for example, which internally\n\ + \032 uses an ssh connection requiring an extra level of quoting for\n\ + \032 paths containing spaces. When this flag is set to default, extra\n\ + \032 quotes are added if the value of copyprog contains the string\n\ + \032 rsync.\n\ + \032 copythreshold n\n\ + \032 A number indicating above what filesize (in kilobytes) Unison\n\ + \032 should use the external copying utility specified by copyprog.\n\ + \032 Specifying 0 will cause all copies to use the external program;\n\ + \032 a negative number will prevent any files from using it. The\n\ + \032 default is -1. See the section \"Making Unison Faster on Large\n\ + \032 Files\" for more information.\n\ + \032 debug xxx\n\ + \032 This preference is used to make Unison print various sorts of\n\ + \032 information about what it is doing internally on the standard\n\ + \032 error stream. It can be used many times, each time with the name\n\ + \032 of a module for which debugging information should be printed.\n\ + \032 Possible arguments for debug can be found by looking for calls\n\ + \032 to Util.debug in the sources (using, e.g., grep). Setting -debug\n\ + \032 all causes information from all modules to be printed (this mode\n\ + \032 of usage is the first one to try, if you are trying to\n\ + \032 understand something that Unison seems to be doing wrong);\n\ + \032 -debug verbose turns on some additional debugging output from\n\ + \032 some modules (e.g., it will show exactly what bytes are being\n\ + \032 sent across the network).\n\ + \032 diff xxx\n\ + \032 This preference can be used to control the name and command-line\n\ + \032 arguments of the system utility used to generate displays of\n\ + \032 file differences. The default is `diff -u CURRENT2 CURRENT1'. If\n\ + \032 the value of this preference contains the substrings CURRENT1\n\ + \032 and CURRENT2, these will be replaced by the names of the files\n\ + \032 to be diffed. If not, the two filenames will be appended to the\n\ + \032 command. In both cases, the filenames are suitably quoted.\n\ + \032 doc xxx\n\ + \032 The command-line argument -doc secname causes unison to display\n\ + \032 section secname of the manual on the standard output and then\n\ + \032 exit. Use -doc all to display the whole manual, which includes\n\ + \032 exactly the same information as the printed and HTML manuals,\n\ + \032 modulo formatting. Use -doc topics to obtain a list of the names\n\ + \032 of the various sections that can be printed.\n\ + \032 dontchmod\n\ + \032 By default, Unison uses the 'chmod' system call to set the\n\ + \032 permission bits of files after it has copied them. But in some\n\ + \032 circumstances (and under some operating systems), the chmod call\n\ + \032 always fails. Setting this preference completely prevents Unison\n\ + \032 from ever calling chmod.\n\ + \032 dumbtty\n\ + \032 When set to true, this flag makes the text mode user interface\n\ + \032 avoid trying to change any of the terminal settings. (Normally,\n\ + \032 Unison puts the terminal in `raw mode', so that it can do things\n\ + \032 like overwriting the current line.) This is useful, for example,\n\ + \032 when Unison runs in a shell inside of Emacs.\n\ + \032 When dumbtty is set, commands to the user interface need to be\n\ + \032 followed by a carriage return before Unison will execute them.\n\ + \032 (When it is off, Unison recognizes keystrokes as soon as they\n\ + \032 are typed.)\n\ + \032 This preference has no effect on the graphical user interface.\n\ + \032 dumparchives\n\ + \032 When this preference is set, Unison will create a file\n\ + \032 unison.dump on each host, containing a text summary of the\n\ + \032 archive, immediately after loading it.\n\ + \032 fastcheck xxx\n\ + \032 When this preference is set to true, Unison will use the\n\ + \032 modification time and length of a file as a `pseudo inode\n\ + \032 number' when scanning replicas for updates, instead of reading\n\ + \032 the full contents of every file. (This does not apply to the\n\ + \032 very first run, when Unison will always scan all files regarless\n\ + \032 of this switch). Under Windows, this may cause Unison to miss\n\ + \032 propagating an update if the modification time and length of the\n\ + \032 file are both unchanged by the update. However, Unison will\n\ + \032 never overwrite such an update with a change from the other\n\ + \032 replica, since it always does a safe check for updates just\n\ + \032 before propagating a change. Thus, it is reasonable to use this\n\ + \032 switch under Windows most of the time and occasionally run\n\ + \032 Unison once with fastcheck set to false, if you are worried that\n\ + \032 Unison may have overlooked an update. For backward\n\ + \032 compatibility, yes, no, and default can be used in place of\n\ + \032 true, false, and auto. See the section \"Fast Checking\" for more\n\ + \032 information.\n\ + \032 fastercheckUNSAFE\n\ + \032 THIS FEATURE IS STILL EXPERIMENTAL AND SHOULD BE USED WITH\n\ + \032 EXTREME CAUTION.\n\ + \032 When this flag is set to true, Unison will compute a\n\ + \032 'pseudo-fingerprint' the first time it sees a file (either\n\ + \032 because the file is new or because Unison is running for the\n\ + \032 first time). This enormously speeds update detection, but it\n\ + \032 must be used with care, as it can cause Unison to miss\n\ + \032 conflicts: If a given path in the filesystem contains files on\n\ + \032 both sides that Unison has not yet seen, and if those files have\n\ + \032 the same length but different contents, then Unison will not\n\ + \032 notice the presence of a conflict. If, later, one of the files\n\ + \032 is changed, the changed file will be propagated, overwriting the\n\ + \032 other.\n\ + \032 Moreover, even when the files are initially identical, setting\n\ + \032 this flag can lead to potentially confusing behavior: if a newly\n\ + \032 created file is later touched without being modified, Unison\n\ + \032 will treat this conservatively as a potential change (since it\n\ + \032 has no record of the earlier contents) and show it as needing to\n\ + \032 be propagated to the other replica.\n\ + \032 Most users should leave this flag off - the small time savings\n\ + \032 of not fingerprinting new files is not worth the cost in terms\n\ + \032 of safety. However, it can be very useful for power users with\n\ + \032 huge replicas that are known to be already synchronized (e.g.,\n\ + \032 because one replica is a newly created duplicate of the other,\n\ + \032 or because they have previously been synchronized with Unison\n\ + \032 but Unison's archives need to be rebuilt). In such situations,\n\ + \032 it is recommended that this flag be set only for the initial run\n\ + \032 of Unison, so that new archives can be created quickly, and then\n\ + \032 turned off for normal use.\n\ + \032 fat\n\ + \032 When this is set to true, Unison will use appropriate options to\n\ + \032 synchronize efficiently and without error a replica located on a\n\ + \032 FAT filesystem on a non-Windows machine: do not synchronize\n\ + \032 permissions (perms = 0); never use chmod ( t dontchmod = true);\n\ + \032 treat filenames as case insensitive (ignorecase = true); do not\n\ + \032 attempt to synchronize symbolic links (links = false); ignore\n\ + \032 inode number changes when detecting updates (ignoreinodenumbers\n\ + \032 = true). Any of these change can be overridden by explicitly\n\ + \032 setting the corresponding preference in the profile.\n\ + \032 follow xxx\n\ + \032 Including the preference -follow pathspec causes Unison to treat\n\ + \032 symbolic links matching pathspec as `invisible' and behave as if\n\ + \032 the object pointed to by the link had appeared literally at this\n\ + \032 position in the replica. See the section \"Symbolic Links\" for\n\ + \032 more details. The syntax of pathspec is described in the section\n\ + \032 \"Path Specification\" .\n\ + \032 force xxx\n\ + \032 Including the preference -force root causes Unison to resolve\n\ + \032 all differences (even non-conflicting changes) in favor of root.\n\ + \032 This effectively changes Unison from a synchronizer into a\n\ + \032 mirroring utility.\n\ + \032 You can also specify -force newer (or -force older) to force\n\ + \032 Unison to choose the file with the later (earlier) modtime. In\n\ + \032 this case, the -times preference must also be enabled.\n\ + \032 This preference is overridden by the forcepartial preference.\n\ + \032 This preference should be used only if you are sure you know\n\ + \032 what you are doing!\n\ + \032 forcepartial xxx\n\ + \032 Including the preference forcepartial = PATHSPEC -> root causes\n\ + \032 Unison to resolve all differences (even non-conflicting changes)\n\ + \032 in favor of root for the files in PATHSPEC (see the section\n\ + \032 \"Path Specification\" for more information). This effectively\n\ + \032 changes Unison from a synchronizer into a mirroring utility.\n\ + \032 You can also specify forcepartial PATHSPEC -> newer (or\n\ + \032 forcepartial PATHSPEC older) to force Unison to choose the file\n\ + \032 with the later (earlier) modtime. In this case, the -times\n\ + \032 preference must also be enabled.\n\ + \032 This preference should be used only if you are sure you know\n\ + \032 what you are doing!\n\ + \032 group\n\ + \032 When this flag is set to true, the group attributes of the files\n\ + \032 are synchronized. Whether the group names or the group\n\ + \032 identifiers are synchronized depends on the preference numerids.\n\ + \032 halfduplex\n\ + \032 When this flag is set to true, Unison network communication is\n\ + \032 forced to be half duplex (the client and the server never\n\ + \032 simultaneously emit data). If you experience unstabilities with\n\ + \032 your network link, this may help. The communication is always\n\ + \032 half-duplex when synchronizing with a Windows machine due to a\n\ + \032 limitation of Unison current implementation that could result in\n\ + \032 a deadlock.\n\ + \032 height n\n\ + \032 Used to set the height (in lines) of the main window in the\n\ + \032 graphical user interface.\n\ + \032 ignore xxx\n\ + \032 Including the preference -ignore pathspec causes Unison to\n\ + \032 completely ignore paths that match pathspec (as well as their\n\ + \032 children). This is useful for avoiding synchronizing temporary\n\ + \032 files, object files, etc. The syntax of pathspec is described in\n\ + \032 the section \"Path Specification\" , and further details on\n\ + \032 ignoring paths is found in the section \"Ignoring Paths\" .\n\ + \032 ignorearchives\n\ + \032 When this preference is set, Unison will ignore any existing\n\ + \032 archive files and behave as though it were being run for the\n\ + \032 first time on these replicas. It is not a good idea to set this\n\ + \032 option in a profile: it is intended for command-line use.\n\ + \032 ignorecase xxx\n\ + \032 When set to true, this flag causes Unison to treat filenames as\n\ + \032 case insensitive--i.e., files in the two replicas whose names\n\ + \032 differ in (upper- and lower-case) `spelling' are treated as the\n\ + \032 same file. When the flag is set to false, Unison will treat all\n\ + \032 filenames as case sensitive. Ordinarily, when the flag is set to\n\ + \032 default, filenames are automatically taken to be\n\ + \032 case-insensitive if either host is running Windows or OSX. In\n\ + \032 rare circumstances it may be useful to set the flag manually.\n\ + \032 ignoreinodenumbers\n\ + \032 When set to true, this preference makes Unison not take\n\ + \032 advantage of inode numbers during fast update detection. This\n\ + \032 switch should be used with care, as it is less safe than the\n\ + \032 standard update detection method, but it can be useful with\n\ + \032 filesystems which do not support inode numbers.\n\ + \032 ignorelocks\n\ + \032 When this preference is set, Unison will ignore any lock files\n\ + \032 that may have been left over from a previous run of Unison that\n\ + \032 was interrupted while reading or writing archive files; by\n\ + \032 default, when Unison sees these lock files it will stop and\n\ + \032 request manual intervention. This option should be set only if\n\ + \032 you are positive that no other instance of Unison might be\n\ + \032 concurrently accessing the same archive files (e.g., because\n\ + \032 there was only one instance of unison running and it has just\n\ + \032 crashed or you have just killed it). It is probably not a good\n\ + \032 idea to set this option in a profile: it is intended for\n\ + \032 command-line use.\n\ + \032 ignorenot xxx\n\ + \032 This preference overrides the preference ignore. It gives a list\n\ + \032 of patterns (in the same format as ignore) for paths that should\n\ + \032 definitely not be ignored, whether or not they happen to match\n\ + \032 one of the ignore patterns.\n\ + \032 Note that the semantics of ignore and ignorenot is a little\n\ + \032 counter-intuitive. When detecting updates, Unison examines paths\n\ + \032 in depth-first order, starting from the roots of the replicas\n\ + \032 and working downwards. Before examining each path, it checks\n\ + \032 whether it matches ignore and does not match ignorenot; in this\n\ + \032 case it skips this path and all its descendants. This means\n\ + \032 that, if some parent of a given path matches an ignore pattern,\n\ + \032 then it will be skipped even if the path itself matches an\n\ + \032 ignorenot pattern. In particular, putting ignore = Path * in\n\ + \032 your profile and then using ignorenot to select particular paths\n\ + \032 to be synchronized will not work. Instead, you should use the\n\ + \032 path preference to choose particular paths to synchronize.\n\ + \032 immutable xxx\n\ + \032 This preference specifies paths for directories whose immediate\n\ + \032 children are all immutable files -- i.e., once a file has been\n\ + \032 created, its contents never changes. When scanning for updates,\n\ + \032 Unison does not check whether these files have been modified;\n\ + \032 this can speed update detection significantly (in particular,\n\ + \032 for mail directories).\n\ + \032 immutablenot xxx\n\ + \032 This preference overrides immutable.\n\ + \032 key xxx\n\ + \032 Used in a profile to define a numeric key (0-9) that can be used\n\ + \032 in the graphical user interface to switch immediately to this\n\ + \032 profile.\n\ + \032 killserver\n\ + \032 When set to true, this flag causes Unison to kill the remote\n\ + \032 server process when the synchronization is finished. This\n\ + \032 behavior is the default for ssh connections, so this preference\n\ + \032 is not normally needed when running over ssh; it is provided so\n\ + \032 that socket-mode servers can be killed off after a single run of\n\ + \032 Unison, rather than waiting to accept future connections. (Some\n\ + \032 users prefer to start a remote socket server for each run of\n\ + \032 Unison, rather than leaving one running all the time.)\n\ + \032 label xxx\n\ + \032 Used in a profile to provide a descriptive string documenting\n\ + \032 its settings. (This is useful for users that switch between\n\ + \032 several profiles, especially using the `fast switch' feature of\n\ + \032 the graphical user interface.)\n\ + \032 links xxx\n\ + \032 When set to true, this flag causes Unison to synchronize\n\ + \032 symbolic links. When the flag is set to false, symbolic links\n\ + \032 will result in an error during update detection. Ordinarily,\n\ + \032 when the flag is set to default, symbolic links are synchronized\n\ + \032 except when one of the hosts is running Windows. In rare\n\ + \032 circumstances it may be useful to set the flag manually.\n\ + \032 log\n\ + \032 When this flag is set, Unison will log all changes to the\n\ + \032 filesystems on a file.\n\ + \032 logfile xxx\n\ + \032 By default, logging messages will be appended to the file\n\ + \032 unison.log in your HOME directory. Set this preference if you\n\ + \032 prefer another file.\n\ + \032 maxbackups n\n\ + \032 This preference specifies the number of backup versions that\n\ + \032 will be kept by unison, for each path that matches the predicate\n\ + \032 backup. The default is 2.\n\ + \032 maxerrors n\n\ + \032 This preference controls after how many errors Unison aborts a\n\ + \032 directory transfer. Setting it to a large number allows Unison\n\ + \032 to transfer most of a directory even when some files fail to be\n\ + \032 copied. The default is 1. If the preference is set too high,\n\ + \032 Unison may take a long time to abort in case of repeated\n\ + \032 failures (for instance, when the disk is full).\n\ + \032 maxsizethreshold n\n\ + \032 A number indicating above what filesize (in kilobytes) Unison\n\ + \032 should flag a conflict instead of transferring the file. This\n\ + \032 conflict remains even in the presence of force or prefer\n\ + \032 options. A negative number will allow every transfer\n\ + \032 independently of the size. The default is -1.\n\ + \032 maxthreads n\n\ + \032 This preference controls how much concurrency is allowed during\n\ + \032 the transport phase. Normally, it should be set reasonably high\n\ + \032 to maximize performance, but when Unison is used over a\n\ + \032 low-bandwidth link it may be helpful to set it lower (e.g. to 1)\n\ + \032 so that Unison doesn't soak up all the available bandwidth. The\n\ + \032 default is the special value 0, which mean 20 threads when file\n\ + \032 content streaming is desactivated and 1000 threads when it is\n\ + \032 activated.\n\ + \032 merge xxx\n\ + \032 This preference can be used to run a merge program which will\n\ + \032 create a new version for each of the files and the backup, with\n\ + \032 the last backup and the both replicas. Setting the merge\n\ + \032 preference for a path will also cause this path to be backed up,\n\ + \032 just like t backup. The syntax of pathspec>cmd is described in\n\ + \032 the section \"Path Specification\" , and further details on\n\ + \032 Merging functions are present in the section \"Merging files\" .\n\ + \032 mountpoint xxx\n\ + \032 Including the preference -mountpoint PATH causes Unison to\n\ + \032 double-check, at the end of update detection, that PATH exists\n\ + \032 and abort if it does not. This is useful when Unison is used to\n\ + \032 synchronize removable media. This preference can be given more\n\ + \032 than once. See the section \"Mount Points\" .\n\ + \032 nocreation xxx\n\ + \032 Including the preference -nocreation root prevents Unison from\n\ + \032 performing any file creation on root root.\n\ + \032 This preference can be included twice, once for each root, if\n\ + \032 you want to prevent any creation.\n\ + \032 nocreationpartial xxx\n\ + \032 Including the preference nocreationpartial = PATHSPEC -> root\n\ + \032 prevents Unison from performing any file creation in PATHSPEC on\n\ + \032 root root (see the section \"Path Specification\" for more\n\ + \032 information). It is recommended to use BelowPath patterns when\n\ + \032 selecting a directory and all its contents.\n\ + \032 nodeletion xxx\n\ + \032 Including the preference -nodeletion root prevents Unison from\n\ + \032 performing any file deletion on root root.\n\ + \032 This preference can be included twice, once for each root, if\n\ + \032 you want to prevent any deletion.\n\ + \032 nodeletionpartial xxx\n\ + \032 Including the preference nodeletionpartial = PATHSPEC -> root\n\ + \032 prevents Unison from performing any file deletion in PATHSPEC on\n\ + \032 root root (see the section \"Path Specification\" for more\n\ + \032 information). It is recommended to use BelowPath patterns when\n\ + \032 selecting a directory and all its contents.\n\ + \032 noupdate xxx\n\ + \032 Including the preference -noupdate root prevents Unison from\n\ + \032 performing any file update or deletion on root root.\n\ + \032 This preference can be included twice, once for each root, if\n\ + \032 you want to prevent any update.\n\ + \032 noupdatepartial xxx\n\ + \032 Including the preference noupdatepartial = PATHSPEC -> root\n\ + \032 prevents Unison from performing any file update or deletion in\n\ + \032 PATHSPEC on root root (see the section \"Path Specification\" for\n\ + \032 more information). It is recommended to use BelowPath patterns\n\ + \032 when selecting a directory and all its contents.\n\ + \032 numericids\n\ + \032 When this flag is set to true, groups and users are synchronized\n\ + \032 numerically, rather than by name.\n\ + \032 The special uid 0 and the special group 0 are never mapped via\n\ + \032 user/group names even if this preference is not set.\n\ + \032 owner\n\ + \032 When this flag is set to true, the owner attributes of the files\n\ + \032 are synchronized. Whether the owner names or the owner\n\ + \032 identifiers are synchronizeddepends on the preference numerids.\n\ + \032 path xxx\n\ + \032 When no path preference is given, Unison will simply synchronize\n\ + \032 the two entire replicas, beginning from the given pair of roots.\n\ + \032 If one or more path preferences are given, then Unison will\n\ + \032 synchronize only these paths and their children. (This is useful\n\ + \032 for doing a fast sync of just one directory, for example.) Note\n\ + \032 that path preferences are intepreted literally--they are not\n\ + \032 regular expressions.\n\ + \032 perms n\n\ + \032 The integer value of this preference is a mask indicating which\n\ + \032 permission bits should be synchronized. It is set by default to\n\ + \032 0o1777: all bits but the set-uid and set-gid bits are\n\ + \032 synchronised (synchronizing theses latter bits can be a security\n\ + \032 hazard). If you want to synchronize all bits, you can set the\n\ + \032 value of this preference to -1. If one of the replica is on a\n\ + \032 FAT [Windows] filesystem, you should consider using the t fat\n\ + \032 preference instead of this preference. If you need Unison not to\n\ + \032 set permissions at all, set the value of this preference to 0\n\ + \032 and set the preference t dontchmod to t true.\n\ + \032 prefer xxx\n\ + \032 Including the preference -prefer root causes Unison always to\n\ + \032 resolve conflicts in favor of root, rather than asking for\n\ + \032 guidance from the user. (The syntax of root is the same as for\n\ + \032 the root preference, plus the special values newer and older.)\n\ + \032 This preference is overridden by the preferpartial preference.\n\ + \032 This preference should be used only if you are sure you know\n\ + \032 what you are doing!\n\ + \032 preferpartial xxx\n\ + \032 Including the preference preferpartial = PATHSPEC -> root causes\n\ + \032 Unison always to resolve conflicts in favor of root, rather than\n\ + \032 asking for guidance from the user, for the files in PATHSPEC\n\ + \032 (see the section \"Path Specification\" for more information).\n\ + \032 (The syntax of root is the same as for the root preference, plus\n\ + \032 the special values newer and older.)\n\ + \032 This preference should be used only if you are sure you know\n\ + \032 what you are doing!\n\ + \032 repeat xxx\n\ + \032 Setting this preference causes the text-mode interface to\n\ + \032 synchronize repeatedly, rather than doing it just once and\n\ + \032 stopping. If the argument is a number, Unison will pause for\n\ + \032 that many seconds before beginning again. When the argument is\n\ + \032 watch, Unison relies on an external file monitoring process to\n\ + \032 synchronize whenever a change happens.\n\ + \032 retry n\n\ + \032 Setting this preference causes the text-mode interface to try\n\ + \032 again to synchronize updated paths where synchronization fails.\n\ + \032 Each such path will be tried N times.\n\ + \032 root xxx\n\ + \032 Each use of this preference names the root of one of the\n\ + \032 replicas for Unison to synchronize. Exactly two roots are\n\ + \032 needed, so normal modes of usage are either to give two values\n\ + \032 for root in the profile, or to give no values in the profile and\n\ + \032 provide two on the command line. Details of the syntax of roots\n\ + \032 can be found in the section \"Roots\" .\n\ + \032 The two roots can be given in either order; Unison will sort\n\ + \032 them into a canonical order before doing anything else. It also\n\ + \032 tries to `canonize' the machine names and paths that appear in\n\ + \032 the roots, so that, if Unison is invoked later with a slightly\n\ + \032 different name for the same root, it will be able to locate the\n\ + \032 correct archives.\n\ + \032 rootalias xxx\n\ + \032 When calculating the name of the archive files for a given pair\n\ + \032 of roots, Unison replaces any roots matching the left-hand side\n\ + \032 of any rootalias rule by the corresponding right-hand side.\n\ + \032 rshargs xxx\n\ + \032 The string value of this preference will be passed as additional\n\ + \032 arguments (besides the host name and the name of the Unison\n\ + \032 executable on the remote system) to the rsh command used to\n\ + \032 invoke the remote server.\n\ + \032 rshcmd xxx\n\ + \032 This preference can be used to explicitly set the name of the\n\ + \032 rsh executable (e.g., giving a full path name), if necessary.\n\ + \032 rsrc xxx\n\ + \032 When set to true, this flag causes Unison to synchronize\n\ + \032 resource forks and HFS meta-data. On filesystems that do not\n\ + \032 natively support resource forks, this data is stored in\n\ + \032 Carbon-compatible ._ AppleDouble files. When the flag is set to\n\ + \032 false, Unison will not synchronize these data. Ordinarily, the\n\ + \032 flag is set to default, and these data are automatically\n\ + \032 synchronized if either host is running OSX. In rare\n\ + \032 circumstances it is useful to set the flag manually.\n\ + \032 rsync\n\ + \032 Unison uses the 'rsync algorithm' for 'diffs-only' transfer of\n\ + \032 updates to large files. Setting this flag to false makes Unison\n\ + \032 use whole-file transfers instead. Under normal circumstances,\n\ + \032 there is no reason to do this, but if you are having trouble\n\ + \032 with repeated 'rsync failure' errors, setting it to false should\n\ + \032 permit you to synchronize the offending files.\n\ + \032 selftest\n\ + \032 Run internal tests and exit. This option is mostly for\n\ + \032 developers and must be used carefully: in particular, it will\n\ + \032 delete the contents of both roots, so that it can install its\n\ + \032 own files for testing. This flag only makes sense on the command\n\ + \032 line. When it is provided, no preference file is read: all\n\ + \032 preferences must be specified on thecommand line. Also, since\n\ + \032 the self-test procedure involves overwriting the roots and\n\ + \032 backup directory, the names of the roots and of the backupdir\n\ + \032 preference must include the string \"test\" or else the tests will\n\ + \032 be aborted. (If these are not given on the command line, dummy\n\ + \032 subdirectories in the current directory will be created\n\ + \032 automatically.)\n\ + \032 servercmd xxx\n\ + \032 This preference can be used to explicitly set the name of the\n\ + \032 Unison executable on the remote server (e.g., giving a full path\n\ + \032 name), if necessary.\n\ + \032 showarchive\n\ + \032 When this preference is set, Unison will print out the 'true\n\ + \032 names'of the roots, in the same form as is expected by the\n\ + \032 rootaliaspreference.\n\ + \032 silent\n\ + \032 When this preference is set to true, the textual user interface\n\ + \032 will print nothing at all, except in the case of errors. Setting\n\ + \032 silent to true automatically sets the batch preference to true.\n\ + \032 sortbysize\n\ + \032 When this flag is set, the user interface will list changed\n\ + \032 files by size (smallest first) rather than by name. This is\n\ + \032 useful, for example, for synchronizing over slow links, since it\n\ + \032 puts very large files at the end of the list where they will not\n\ + \032 prevent smaller files from being transferred quickly.\n\ + \032 This preference (as well as the other sorting flags, but not the\n\ + \032 sorting preferences that require patterns as arguments) can be\n\ + \032 set interactively and temporarily using the 'Sort' menu in the\n\ + \032 graphical user interface.\n\ + \032 sortfirst xxx\n\ + \032 Each argument to sortfirst is a pattern pathspec, which\n\ + \032 describes a set of paths. Files matching any of these patterns\n\ + \032 will be listed first in the user interface. The syntax of\n\ + \032 pathspec is described in the section \"Path Specification\" .\n\ + \032 sortlast xxx\n\ + \032 Similar to sortfirst, except that files matching one of these\n\ + \032 patterns will be listed at the very end.\n\ + \032 sortnewfirst\n\ + \032 When this flag is set, the user interface will list newly\n\ + \032 created files before all others. This is useful, for example,\n\ + \032 for checking that newly created files are not `junk', i.e., ones\n\ + \032 that should be ignored or deleted rather than synchronized.\n\ + \032 sshargs xxx\n\ + \032 The string value of this preference will be passed as additional\n\ + \032 arguments (besides the host name and the name of the Unison\n\ + \032 executable on the remote system) to the ssh command used to\n\ + \032 invoke the remote server.\n\ + \032 sshcmd xxx\n\ + \032 This preference can be used to explicitly set the name of the\n\ + \032 ssh executable (e.g., giving a full path name), if necessary.\n\ + \032 sshversion xxx\n\ + \032 This preference can be used to control which version of ssh\n\ + \032 should be used to connect to the server. Legal values are 1 and\n\ + \032 2, which will cause unison to try to use ssh1 orssh2 instead of\n\ + \032 just ssh to invoke ssh. The default value is empty, which will\n\ + \032 make unison use whatever version of ssh is installed as the\n\ + \032 default `ssh' command.\n\ + \032 stream\n\ + \032 When this preference is set, Unison will use an experimental\n\ + \032 streaming protocol for transferring file contents more\n\ + \032 efficiently. The default value is true.\n\ + \032 terse\n\ + \032 When this preference is set to true, the user interface will not\n\ + \032 print status messages.\n\ + \032 testserver\n\ + \032 Setting this flag on the command line causes Unison to attempt\n\ + \032 to connect to the remote server and, if successful, print a\n\ + \032 message and immediately exit. Useful for debugging installation\n\ + \032 problems. Should not be set in preference files.\n\ + \032 times\n\ + \032 When this flag is set to true, file modification times (but not\n\ + \032 directory modtimes) are propagated.\n\ + \032 ui xxx\n\ + \032 This preference selects either the graphical or the textual user\n\ + \032 interface. Legal values are graphic or text.\n\ + \032 Because this option is processed specially during Unison's\n\ + \032 start-up sequence, it can only be used on the command line. In\n\ + \032 preference files it has no effect.\n\ + \032 If the Unison executable was compiled with only a textual\n\ + \032 interface, this option has no effect. (The pre-compiled binaries\n\ + \032 are all compiled with both interfaces available.)\n\ + \032 unicode xxx\n\ + \032 When set to true, this flag causes Unison to perform case\n\ + \032 insensitive file comparisons assuming Unicode encoding. This is\n\ + \032 the default. When the flag is set to false, a Latin 1 encoding\n\ + \032 is assumed. When Unison runs in case sensitive mode, this flag\n\ + \032 only makes a difference if one host is running Windows or Mac OS\n\ + \032 X. Under Windows, the flag selects between using the Unicode or\n\ + \032 8bit Windows API for accessing the filesystem. Under Mac OS X,\n\ + \032 it selects whether comparing the filenames up to decomposition,\n\ + \032 or byte-for-byte.\n\ + \032 version\n\ + \032 Print the current version number and exit. (This option only\n\ + \032 makes sense on the command line.)\n\ + \032 watch\n\ + \032 Unison uses a file watcher process, when available, to detect\n\ + \032 filesystem changes; this is used to speed up update detection,\n\ + \032 and for continuous synchronization (-repeat watch preference.\n\ + \032 Setting this flag to false disable the use of this process.\n\ + \032 xferbycopying\n\ + \032 When this preference is set, Unison will try to avoid\n\ + \032 transferring file contents across the network by recognizing\n\ + \032 when a file with the required contents already exists in the\n\ + \032 target replica. This usually allows file moves to be propagated\n\ + \032 very quickly. The default value istrue.\n\ + \n\ + Profiles\n\ + \n\ + \032 A profile is a text file that specifies permanent settings for roots,\n\ + \032 paths, ignore patterns, and other preferences, so that they do not need\n\ + \032 to be typed at the command line every time Unison is run. Profiles\n\ + \032 should reside in the .unison directory on the client machine. If Unison\n\ + \032 is started with just one argument name on the command line, it looks\n\ + \032 for a profile called name.prf in the .unison directory. If it is\n\ + \032 started with no arguments, it scans the .unison directory for files\n\ + \032 whose names end in .prf and offers a menu (provided that the Unison\n\ + \032 executable is compiled with the graphical user interface). If a file\n\ + \032 named default.prf is found, its settings will be offered as the default\n\ + \032 choices.\n\ + \n\ + \032 To set the value of a preference p permanently, add to the appropriate\n\ + \032 profile a line of the form\n\ + \032 p = true\n\ + \n\ + \032 for a boolean flag or\n\ + \032 p = \n\ + \n\ + \032 for a preference of any other type.\n\ + \n\ + \032 Whitespaces around p and xxx are ignored. A profile may also include\n\ + \032 blank lines and lines beginning with #; both are ignored.\n\ + \n\ + \032 When Unison starts, it first reads the profile and then the command\n\ + \032 line, so command-line options will override settings from the profile.\n\ + \n\ + \032 Profiles may also include lines of the form include name, which will\n\ + \032 cause the file name (or name.prf, if name does not exist in the .unison\n\ + \032 directory) to be read at the point, and included as if its contents,\n\ + \032 instead of the include line, was part of the profile. Include lines\n\ + \032 allows settings common to several profiles to be stored in one place.\n\ + \n\ + \032 A profile may include a preference `label = desc' to provide a\n\ + \032 description of the options selected in this profile. The string desc is\n\ + \032 listed along with the profile name in the profile selection dialog, and\n\ + \032 displayed in the top-right corner of the main Unison window in the\n\ + \032 graphical user interface.\n\ + \n\ + \032 The graphical user-interface also supports one-key shortcuts for\n\ + \032 commonly used profiles. If a profile contains a preference of the form\n\ + \032 `key = n', where n is a single digit, then pressing this digit key will\n\ + \032 cause Unison to immediately switch to this profile and begin\n\ + \032 synchronization again from scratch. In this case, all actions that have\n\ + \032 been selected for a set of changes currently being displayed will be\n\ + \032 discarded.\n\ + \n\ + Sample Profiles\n\ + \n\ + A Minimal Profile\n\ + \n\ + \032 Here is a very minimal profile file, such as might be found in\n\ + \032 .unison/default.prf:\n\ + \032 # Roots of the synchronization\n\ + \032 root = /home/bcpierce\n\ + \032 root = ssh://saul//home/bcpierce\n\ + \n\ + \032 # Paths to synchronize\n\ + \032 path = current\n\ + \032 path = common\n\ + \032 path = .netscape/bookmarks.html\n\ + \n\ + A Basic Profile\n\ + \n\ + \032 Here is a more sophisticated profile, illustrating some other useful\n\ + \032 features.\n\ + \032 # Roots of the synchronization\n\ + \032 root = /home/bcpierce\n\ + \032 root = ssh://saul//home/bcpierce\n\ + \n\ + \032 # Paths to synchronize\n\ + \032 path = current\n\ + \032 path = common\n\ + \032 path = .netscape/bookmarks.html\n\ + \n\ + \032 # Some regexps specifying names and paths to ignore\n\ + \032 ignore = Name temp.*\n\ + \032 ignore = Name *~\n\ + \032 ignore = Name .*~\n\ + \032 ignore = Path */pilot/backup/Archive_*\n\ + \032 ignore = Name *.o\n\ + \032 ignore = Name *.tmp\n\ + \n\ + \032 # Window height\n\ + \032 height = 37\n\ + \n\ + \032 # Keep a backup copy of every file in a central location\n\ + \032 backuplocation = central\n\ + \032 backupdir = /home/bcpierce/backups\n\ + \032 backup = Name *\n\ + \032 backupprefix = $VERSION.\n\ + \032 backupsuffix =\n\ + \n\ + \032 # Use this command for displaying diffs\n\ + \032 diff = diff -y -W 79 --suppress-common-lines\n\ + \n\ + \032 # Log actions to the terminal\n\ + \032 log = true\n\ + \n\ + A Power-User Profile\n\ + \n\ + \032 When Unison is used with large replicas, it is often convenient to be\n\ + \032 able to synchronize just a part of the replicas on a given run (this\n\ + \032 saves the time of detecting updates in the other parts). This can be\n\ + \032 accomplished by splitting up the profile into several parts -- a common\n\ + \032 part containing most of the preference settings, plus one \"top-level\"\n\ + \032 file for each set of paths that need to be synchronized. (The include\n\ + \032 mechanism can also be used to allow the same set of preference settings\n\ + \032 to be used with different roots.)\n\ + \n\ + \032 The collection of profiles implementing this scheme might look as\n\ + \032 follows. The file default.prf is empty except for an include directive:\n\ + \032 # Include the contents of the file common\n\ + \032 include common\n\ + \n\ + \032 Note that the name of the common file is common, not common.prf; this\n\ + \032 prevents Unison from offering common as one of the list of profiles in\n\ + \032 the opening dialog (in the graphical UI).\n\ + \n\ + \032 The file common contains the real preferences:\n\ + \032 # Roots of the synchronization\n\ + \032 root = /home/bcpierce\n\ + \032 root = ssh://saul//home/bcpierce\n\ + \n\ + \032 # (... other preferences ...)\n\ + \n\ + \032 # If any new preferences are added by Unison (e.g. 'ignore'\n\ + \032 # preferences added via the graphical UI), then store them in the\n\ + \032 # file 'common' rathen than in the top-level preference file\n\ + \032 addprefsto = common\n\ + \n\ + \032 # Names and paths to ignore:\n\ + \032 ignore = Name temp.*\n\ + \032 ignore = Name *~\n\ + \032 ignore = Name .*~\n\ + \032 ignore = Path */pilot/backup/Archive_*\n\ + \032 ignore = Name *.o\n\ + \032 ignore = Name *.tmp\n\ + \n\ + \032 Note that there are no path preferences in common. This means that,\n\ + \032 when we invoke Unison with the default profile (e.g., by typing 'unison\n\ + \032 default' or just 'unison' on the command line), the whole replicas will\n\ + \032 be synchronized. (If we never want to synchronize the whole replicas,\n\ + \032 then default.prf would instead include settings for all the paths that\n\ + \032 are usually synchronized.)\n\ + \n\ + \032 To synchronize just part of the replicas, Unison is invoked with an\n\ + \032 alternate preference file--e.g., doing 'unison workingset', where the\n\ + \032 preference file workingset.prf contains\n\ + \032 path = current/papers\n\ + \032 path = Mail/inbox\n\ + \032 path = Mail/drafts\n\ + \032 include common\n\ + \n\ + \032 causes Unison to synchronize just the listed subdirectories.\n\ + \n\ + \032 The key preference can be used in combination with the graphical UI to\n\ + \032 quickly switch between different sets of paths. For example, if the\n\ + \032 file mail.prf contains\n\ + \032 path = Mail\n\ + \032 batch = true\n\ + \032 key = 2\n\ + \032 include common\n\ + \n\ + \032 then pressing 2 will cause Unison to look for updates in the Mail\n\ + \032 subdirectory and (because the batch flag is set) immediately propagate\n\ + \032 any that it finds.\n\ + \n\ + Keeping Backups\n\ + \n\ + \032 When Unison overwrites a file or directory by propagating a new version\n\ + \032 from the other replica, it can keep the old version around as a backup.\n\ + \032 There are several preferences that control precisely where these\n\ + \032 backups are stored and how they are named.\n\ + \n\ + \032 To enable backups, you must give one or more backup preferences. Each\n\ + \032 of these has the form\n\ + \032 backup = \n\ + \n\ + \032 where has the same form as for the ignore preference. For\n\ + \032 example,\n\ + \032 backup = Name *\n\ + \n\ + \032 causes Unison to keep backups of all files and directories. The\n\ + \032 backupnot preference can be used to give a few exceptions: it specifies\n\ + \032 which files and directories should not be backed up, even if they match\n\ + \032 the backup pathspec.\n\ + \n\ + \032 It is important to note that the pathspec is matched against the path\n\ + \032 that is being updated by Unison, not its descendants. For example, if\n\ + \032 you set backup = Name *.txt and then delete a whole directory named foo\n\ + \032 containing some text files, these files will not be backed up because\n\ + \032 Unison will just check that foo does not match *.txt. Similarly, if the\n\ + \032 directory itself happened to be called foo.txt, then the whole\n\ + \032 directory and all the files in it will be backed up, regardless of\n\ + \032 their names.\n\ + \n\ + \032 Backup files can be stored either centrally or locally. This behavior\n\ + \032 is controlled by the preference backuplocation, whose value must be\n\ + \032 either central or local. (The default is central.)\n\ + \n\ + \032 When backups are stored locally, they are kept in the same directory as\n\ + \032 the original.\n\ + \n\ + \032 When backups are stored centrally, the directory used to hold them is\n\ + \032 controlled by the preference backupdir and the environment variable\n\ + \032 UNISONBACKUPDIR. (The environment variable is checked first.) If\n\ + \032 neither of these are set, then the directory .unison/backup in the\n\ + \032 user's home directory is used.\n\ + \n\ + \032 The preference maxbackups controls how many previous versions of each\n\ + \032 file are kept (including the current version).\n\ + \n\ + \032 By default, backup files are named .bak.VERSION.FILENAME, where\n\ + \032 FILENAME is the original filename and VERSION is the backup number (1\n\ + \032 for the most recent, 2 for the next most recent, etc.). This can be\n\ + \032 changed by setting the preferences backupprefix and/or backupsuffix. If\n\ + \032 desired, backupprefix may include a directory prefix; this can be used\n\ + \032 with backuplocation = local to put all backup files for each directory\n\ + \032 into a single subdirectory. For example, setting\n\ + \032 backuplocation = local\n\ + \032 backupprefix = .unison/$VERSION.\n\ + \032 backupsuffix =\n\ + \n\ + \032 will put all backups in a local subdirectory named .unison. Also, note\n\ + \032 that the string $VERSION in either backupprefix or backupsuffix (it\n\ + \032 must appear in one or the other) is replaced by the version number.\n\ + \032 This can be used, for example, to ensure that backup files retain the\n\ + \032 same extension as the originals.\n\ + \n\ + \032 For backward compatibility, the backups preference is also supported.\n\ + \032 It simply means backup = Name * and backuplocation = local.\n\ + \n\ + Merging Conflicting Versions\n\ + \n\ + \032 Unison can invoke external programs to merge conflicting versions of a\n\ + \032 file. The preference merge controls this process.\n\ + \n\ + \032 The merge preference may be given once or several times in a preference\n\ + \032 file (it can also be given on the command line, of course, but this\n\ + \032 tends to be awkward because of the spaces and special characters\n\ + \032 involved). Each instance of the preference looks like this:\n\ + \032 merge = -> \n\ + \n\ + \032 The here has exactly the same format as for the ignore\n\ + \032 preference (see the section \"Path specification\" ). For example, using\n\ + \032 \"Name *.txt\" as the tells Unison that this command should be\n\ + \032 used whenever a file with extension .txt needs to be merged.\n\ + \n\ + \032 Many external merging programs require as inputs not just the two files\n\ + \032 that need to be merged, but also a file containing the last\n\ + \032 synchronized version. You can ask Unison to keep a copy of the last\n\ + \032 synchronized version for some files using the backupcurrent preference.\n\ + \032 This preference is used in exactly the same way as backup and its\n\ + \032 meaning is similar, except that it causes backups to be kept of the\n\ + \032 current contents of each file after it has been synchronized by Unison,\n\ + \032 rather than the previous contents that Unison overwrote. These backups\n\ + \032 are kept on both replicas in the same place as ordinary backup\n\ + \032 files--i.e. according to the backuplocation and backupdir preferences.\n\ + \032 They are named like the original files if backupslocation is set to\n\ + \032 'central' and otherwise, Unison uses the backupprefix and backupsuffix\n\ + \032 preferences and assumes a version number 000 for these backups.\n\ + \n\ + \032 The part of the preference specifies what external command\n\ + \032 should be invoked to merge files at paths matching the .\n\ + \032 Within this string, several special substrings are recognized; these\n\ + \032 will be substituted with appropriate values before invoking a sub-shell\n\ + \032 to execute the command.\n\ + \032 * CURRENT1 is replaced by the name of (a temporary copy of) the local\n\ + \032 variant of the file.\n\ + \032 * CURRENT2 is replaced by the name of a temporary file, into which\n\ + \032 the contents of the remote variant of the file have been\n\ + \032 transferred by Unison prior to performing the merge.\n\ + \032 * CURRENTARCH is replaced by the name of the backed up copy of the\n\ + \032 original version of the file (i.e., the file saved by Unison if the\n\ + \032 current filename matches the path specifications for the\n\ + \032 backupcurrent preference, as explained above), if one exists. If no\n\ + \032 archive exists and CURRENTARCH appears in the merge command, then\n\ + \032 an error is signalled.\n\ + \032 * CURRENTARCHOPT is replaced by the name of the backed up copy of the\n\ + \032 original version of the file (i.e., its state at the end of the\n\ + \032 last successful run of Unison), if one exists, or the empty string\n\ + \032 if no archive exists.\n\ + \032 * NEW is replaced by the name of a temporary file that Unison expects\n\ + \032 to be written by the merge program when it finishes, giving the\n\ + \032 desired new contents of the file.\n\ + \032 * PATH is replaced by the path (relative to the roots of the\n\ + \032 replicas) of the file being merged.\n\ + \032 * NEW1 and NEW2 are replaced by the names of temporary files that\n\ + \032 Unison expects to be written by the merge program when it is only\n\ + \032 able to partially merge the originals; in this case, NEW1 will be\n\ + \032 written back to the local replica and NEW2 to the remote replica;\n\ + \032 NEWARCH, if present, will be used as the \"last common state\" of the\n\ + \032 replicas. (These three options are provided for later compatibility\n\ + \032 with the Harmony data synchronizer.)\n\ + \n\ + \032 To accommodate the wide variety of programs that users might want to\n\ + \032 use for merging, Unison checks for several possible situations when the\n\ + \032 merge program exits:\n\ + \032 * If the merge program exits with a non-zero status, then merge is\n\ + \032 considered to have failed and the replicas are not changed.\n\ + \032 * If the file NEW has been created, it is written back to both\n\ + \032 replicas (and stored in the backup directory). Similarly, if just\n\ + \032 the file NEW1 has been created, it is written back to both\n\ + \032 replicas.\n\ + \032 * If neither NEW nor NEW1 have been created, then Unison examines the\n\ + \032 temporary files CURRENT1 and CURRENT2 that were given as inputs to\n\ + \032 the merge program. If either has been changed (or both have been\n\ + \032 changed in identical ways), then its new contents are written back\n\ + \032 to both replicas. If either CURRENT1 or CURRENT2 has been deleted,\n\ + \032 then the contents of the other are written back to both replicas.\n\ + \032 * If the files NEW1, NEW2, and NEWARCH have all been created, they\n\ + \032 are written back to the local replica, remote replica, and backup\n\ + \032 directory, respectively. If the files NEW1, NEW2 have been created,\n\ + \032 but NEWARCH has not, then these files are written back to the local\n\ + \032 replica and remote replica, respectively. Also, if NEW1 and NEW2\n\ + \032 have identical contents, then the same contents are stored as a\n\ + \032 backup (if the backupcurrent preference is set for this path) to\n\ + \032 reflect the fact that the path is currently in sync.\n\ + \032 * If NEW1 and NEW2 (resp. CURRENT1 and CURRENT2) are created (resp.\n\ + \032 overwritten) with different contents but the merge command did not\n\ + \032 fail (i.e., it exited with status code 0), then we copy NEW1 (resp.\n\ + \032 CURRENT1) to the other replica and to the archive.\n\ + \032 This behavior is a design choice made to handle the case where a\n\ + \032 merge command only synchronizes some specific contents between two\n\ + \032 files, skipping some irrelevant information (order between entries,\n\ + \032 for instance). We assume that, if the merge command exits normally,\n\ + \032 then the two resulting files are \"as good as equal.\" (The reason we\n\ + \032 copy one on top of the other is to avoid Unison detecting that the\n\ + \032 files are unequal the next time it is run and trying again to merge\n\ + \032 them when, in fact, the merge program has already made them as\n\ + \032 similar as it is able to.)\n\ + \n\ + \032 If the confirmmerge preference is set and Unison is not run in batch\n\ + \032 mode, then Unison will always ask for confirmation before actually\n\ + \032 committing the results of the merge to the replicas.\n\ + \n\ + \032 A large number of external merging programs are available. For example,\n\ + \032 on Unix systems setting the merge preference to\n\ + \032 merge = Name *.txt -> diff3 -m CURRENT1 CURRENTARCH CURRENT2\n\ + \032 > NEW || echo \"differences detected\"\n\ + \n\ + \032 will tell Unison to use the external diff3 program for merging.\n\ + \032 Alternatively, users of emacs may find the following settings\n\ + \032 convenient:\n\ + \032 merge = Name *.txt -> emacs -q --eval '(ediff-merge-files-with-ancestor\n\ + \032 \"CURRENT1\" \"CURRENT2\" \"CURRENTARCH\" nil \"NEW\")'\n\ + \n\ + \032 (These commands are displayed here on two lines to avoid running off\n\ + \032 the edge of the page. In your preference file, each command should be\n\ + \032 written on a single line.)\n\ + \n\ + \032 Users running emacs under windows may find something like this useful:\n\ + \032 merge = Name * -> C:\\Progra~1\\Emacs\\emacs\\bin\\emacs.exe -q --eval\n\ + \032 \"(ediff-files \"\"\"CURRENT1\"\"\" \"\"\"CURRENT2\"\"\")\"\n\ + \n\ + \032 Users running Mac OS X (you may need the Developer Tools installed to\n\ + \032 get the opendiff utility) may prefer\n\ + \032 merge = Name *.txt -> opendiff CURRENT1 CURRENT2 -ancestor CURRENTARCH -merg\n\ + e NEW\n\ + \n\ + \032 Here is a slightly more involved hack. The opendiff program can operate\n\ + \032 either with or without an archive file. A merge command of this form\n\ + \032 merge = Name *.txt ->\n\ + \032 if [ CURRENTARCHOPTx = x ];\n\ + \032 then opendiff CURRENT1 CURRENT2 -merge NEW;\n\ + \032 else opendiff CURRENT1 CURRENT2 -ancestor CURRENTARCHOPT -merge NE\n\ + W;\n\ + \032 fi\n\ + \n\ + \032 (still all on one line in the preference file!) will test whether an\n\ + \032 archive file exists and use the appropriate variant of the arguments to\n\ + \032 opendiff.\n\ + \n\ + \032 Linux users may enjoy this variant:\n\ + \032 merge = Name * -> kdiff3 -o NEW CURRENTARCHOPT CURRENT1 CURRENT2\n\ + \n\ + \032 Ordinarily, external merge programs are only invoked when Unison is not\n\ + \032 running in batch mode. To specify an external merge program that should\n\ + \032 be used no matter the setting of the batch flag, use the mergebatch\n\ + \032 preference instead of merge.\n\ + \n\ + \032 Please post suggestions for other useful values of the merge\n\ + \032 preference to the unison-users mailing list--we'd like to give\n\ + \032 several examples here.\n\ + \n\ + The User Interface\n\ + \n\ + \032 Both the textual and the graphical user interfaces are intended to be\n\ + \032 mostly self-explanatory. Here are just a few tricks:\n\ + \032 * By default, when running on Unix the textual user interface will\n\ + \032 try to put the terminal into the \"raw mode\" so that it reads the\n\ + \032 input a character at a time rather than a line at a time. (This\n\ + \032 means you can type just the single keystroke \">\" to tell Unison to\n\ + \032 propagate a file from left to right, rather than \"> Enter.\")\n\ + \032 There are some situations, though, where this will not work -- for\n\ + \032 example, when Unison is running in a shell window inside Emacs.\n\ + \032 Setting the dumbtty preference will force Unison to leave the\n\ + \032 terminal alone and process input a line at a time.\n\ + \n\ + Exit code\n\ + \n\ + \032 When running in the textual mode, Unison returns an exit status, which\n\ + \032 describes whether, and at which level, the synchronization was\n\ + \032 successful. The exit status could be useful when Unison is invoked from\n\ + \032 a script. Currently, there are four possible values for the exit\n\ + \032 status:\n\ + \032 * 0: successful synchronization; everything is up-to-date now.\n\ + \032 * 1: some files were skipped, but all file transfers were successful.\n\ + \032 * 2: non-fatal failures occurred during file transfer.\n\ + \032 * 3: a fatal error occurred, or the execution was interrupted.\n\ + \n\ + \032 The graphical interface does not return any useful information through\n\ + \032 the exit status.\n\ + \n\ + Path specification\n\ + \n\ + \032 Several Unison preferences (e.g., ignore/ignorenot, follow,\n\ + \032 sortfirst/sortlast, backup, merge, etc.) specify individual paths or\n\ + \032 sets of paths. These preferences share a common syntax based on\n\ + \032 regular-expressions. Each preference is associated with a list of path\n\ + \032 patterns; the paths specified are those that match any one of the path\n\ + \032 pattern.\n\ + \032 * Pattern preferences can be given on the command line, or, more\n\ + \032 often, stored in profiles, using the same syntax as other\n\ + \032 preferences. For example, a profile line of the form\n\ + \032 ignore = pattern\n\ + \n\ + \032 adds pattern to the list of patterns to be ignored.\n\ + \032 * Each pattern can have one of three forms. The most general form is\n\ + \032 a Posix extended regular expression introduced by the keyword\n\ + \032 Regex. (The collating sequences and character classes of full Posix\n\ + \032 regexps are not currently supported).\n\ + \032 Regex regexp\n\ + \n\ + \032 For convenience, three other styles of pattern are also recognized:\n\ + \032 Name name\n\ + \n\ + \032 matches any path in which the last component matches name,\n\ + \032 Path path\n\ + \n\ + \032 matches exactly the path path, and\n\ + \032 BelowPath path\n\ + \n\ + \032 matches the path path and any path below. The name and path\n\ + \032 arguments of the latter forms of patterns are not regular\n\ + \032 expressions. Instead, standard \"globbing\" conventions can be used\n\ + \032 in name and path:\n\ + \032 + a * matches any sequence of characters not including / (and\n\ + \032 not beginning with ., when used at the beginning of a name)\n\ + \032 + a ? matches any single character except / (and leading .)\n\ + \032 + [xyz] matches any character from the set {x, y, z }\n\ + \032 + {a,bb,ccc} matches any one of a, bb, or ccc. (Be careful not\n\ + \032 to put extra spaces after the commas: these will be\n\ + \032 interpreted literally as part of the strings to be matched!)\n\ + \032 * The path separator in path patterns is always the forward-slash\n\ + \032 character \"/\" -- even when the client or server is running under\n\ + \032 Windows, where the normal separator character is a backslash. This\n\ + \032 makes it possible to use the same set of path patterns for both\n\ + \032 Unix and Windows file systems.\n\ + \n\ + \032 Some examples of path patterns appear in the section \"Ignoring Paths\" .\n\ + \n\ + Ignoring Paths\n\ + \n\ + \032 Most users of Unison will find that their replicas contain lots of\n\ + \032 files that they don't ever want to synchronize -- temporary files, very\n\ + \032 large files, old stuff, architecture-specific binaries, etc. They can\n\ + \032 instruct Unison to ignore these paths using patterns introduced in the\n\ + \032 section \"Path Patterns\" .\n\ + \n\ + \032 For example, the following pattern will make Unison ignore any path\n\ + \032 containing the name CVS or a name ending in .cmo:\n\ + \032 ignore = Name {CVS,*.cmo}\n\ + \n\ + \032 The next pattern makes Unison ignore the path a/b:\n\ + \032 ignore = Path a/b\n\ + \n\ + \032 Path patterns do not skip filesnames beginning with . (as Name patterns\n\ + \032 do). For example,\n\ + \032 ignore = Path */tmp\n\ + \n\ + \032 will include .foo/tmp in the set of ignore directories, as it is a\n\ + \032 path, not a name, that is ignored.\n\ + \n\ + \032 The following pattern makes Unison ignore any path beginning with a/b\n\ + \032 and ending with a name ending by .ml.\n\ + \032 ignore = Regex a/b/.*\\.ml\n\ + \n\ + \032 Note that regular expression patterns are \"anchored\": they must match\n\ + \032 the whole path, not just a substring of the path.\n\ + \n\ + \032 Here are a few extra points regarding the ignore preference.\n\ + \032 * If a directory is ignored, all its descendents will be too.\n\ + \032 * The user interface provides some convenient commands for adding new\n\ + \032 patterns to be ignored. To ignore a particular file, select it and\n\ + \032 press \"i\". To ignore all files with the same extension, select it\n\ + \032 and press \"E\" (with the shift key). To ignore all files with the\n\ + \032 same name, no matter what directory they appear in, select it and\n\ + \032 press \"N\". These new patterns become permanent: they are\n\ + \032 immediately added to the current profile on disk.\n\ + \032 * If you use the include directive to include a common collection of\n\ + \032 preferences in several top-level preference files, you will\n\ + \032 probably also want to set the addprefsto preference to the name of\n\ + \032 this file. This will cause any new ignore patterns that you add\n\ + \032 from inside Unison to be appended to this file, instead of\n\ + \032 whichever top-level preference file you started Unison with.\n\ + \032 * Ignore patterns can also be specified on the command line, if you\n\ + \032 like (this is probably not very useful), using an option like\n\ + \032 -ignore 'Name temp.txt'.\n\ + \032 * Be careful about renaming directories containing ignored files.\n\ + \032 Because Unison understands the rename as a delete plus a create,\n\ + \032 any ignored files in the directory will be lost (since they are\n\ + \032 invisible to Unison and therefore they do not get recreated in the\n\ + \032 new version of the directory).\n\ + \032 * There is also an ignorenot preference, which specifies a set of\n\ + \032 patterns for paths that should not be ignored, even if they match\n\ + \032 an ignore pattern. However, the interaction of these two sets of\n\ + \032 patterns can be a little tricky. Here is exactly how it works:\n\ + \032 + Unison starts detecting updates from the root of the\n\ + \032 replicas--i.e., from the empty path. If the empty path matches\n\ + \032 an ignore pattern and does not match an ignorenot pattern,\n\ + \032 then the whole replica will be ignored. (For this reason, it\n\ + \032 is not a good idea to include Name * as an ignore pattern. If\n\ + \032 you want to ignore everything except a certain set of files,\n\ + \032 use Name ?*.)\n\ + \032 + If the root is a directory, Unison continues looking for\n\ + \032 updates in all the immediate children of the root. Again, if\n\ + \032 the name of some child matches an ignore pattern and does not\n\ + \032 match an ignorenot pattern, then this whole path including\n\ + \032 everything below it will be ignored.\n\ + \032 + If any of the non-ignored children are directories, then the\n\ + \032 process continues recursively.\n\ + \n\ + Symbolic Links\n\ + \n\ + \032 Ordinarily, Unison treats symbolic links in Unix replicas as \"opaque\":\n\ + \032 it considers the contents of the link to be just the string specifying\n\ + \032 where the link points, and it will propagate changes in this string to\n\ + \032 the other replica.\n\ + \n\ + \032 It is sometimes useful to treat a symbolic link \"transparently,\" acting\n\ + \032 as though whatever it points to were physically in the replica at the\n\ + \032 point where the symbolic link appears. To tell Unison to treat a link\n\ + \032 in this manner, add a line of the form\n\ + \032 follow = pathspec\n\ + \n\ + \032 to the profile, where pathspec is a path pattern as described in the\n\ + \032 section \"Path Patterns\" .\n\ + \n\ + \032 Windows file systems do not support symbolic links; Unison will refuse\n\ + \032 to propagate an opaque symbolic link from Unix to Windows and flag the\n\ + \032 path as erroneous. When a Unix replica is to be synchronized with a\n\ + \032 Windows system, all symbolic links should match either an ignore\n\ + \032 pattern or a follow pattern.\n\ + \n\ + Permissions\n\ + \n\ + \032 Synchronizing the permission bits of files is slightly tricky when two\n\ + \032 different filesytems are involved (e.g., when synchronizing a Windows\n\ + \032 client and a Unix server). In detail, here's how it works:\n\ + \032 * When the permission bits of an existing file or directory are\n\ + \032 changed, the values of those bits that make sense on both operating\n\ + \032 systems will be propagated to the other replica. The other bits\n\ + \032 will not be changed.\n\ + \032 * When a newly created file is propagated to a remote replica, the\n\ + \032 permission bits that make sense in both operating systems are also\n\ + \032 propagated. The values of the other bits are set to default values\n\ + \032 (they are taken from the current umask, if the receiving host is a\n\ + \032 Unix system).\n\ + \032 * For security reasons, the Unix setuid and setgid bits are not\n\ + \032 propagated.\n\ + \032 * The Unix owner and group ids are not propagated. (What would this\n\ + \032 mean, in general?) All files are created with the owner and group\n\ + \032 of the server process.\n\ + \n\ + Cross-Platform Synchronization\n\ + \n\ + \032 If you use Unison to synchronize files between Windows and Unix\n\ + \032 systems, there are a few special issues to be aware of.\n\ + \n\ + \032 Case conflicts. In Unix, filenames are case sensitive: foo and FOO can\n\ + \032 refer to different files. In Windows, on the other hand, filenames are\n\ + \032 not case sensitive: foo and FOO can only refer to the same file. This\n\ + \032 means that a Unix foo and FOO cannot be synchronized onto a Windows\n\ + \032 system -- Windows won't allow two different files to have the \"same\"\n\ + \032 name. Unison detects this situation for you, and reports that it cannot\n\ + \032 synchronize the files.\n\ + \n\ + \032 You can deal with a case conflict in a couple of ways. If you need to\n\ + \032 have both files on the Windows system, your only choice is to rename\n\ + \032 one of the Unix files to avoid the case conflict, and re-synchronize.\n\ + \032 If you don't need the files on the Windows system, you can simply\n\ + \032 disregard Unison's warning message, and go ahead with the\n\ + \032 synchronization; Unison won't touch those files. If you don't want to\n\ + \032 see the warning on each synchronization, you can tell Unison to ignore\n\ + \032 the files (see the section \"Ignore\" ).\n\ + \n\ + \032 Illegal filenames. Unix allows some filenames that are illegal in\n\ + \032 Windows. For example, colons (`:') are not allowed in Windows\n\ + \032 filenames, but they are legal in Unix filenames. This means that a Unix\n\ + \032 file foo:bar can't be synchronized to a Windows system. As with case\n\ + \032 conflicts, Unison detects this situation for you, and you have the same\n\ + \032 options: you can either rename the Unix file and re-synchronize, or you\n\ + \032 can ignore it.\n\ + \n\ + Slow Links\n\ + \n\ + \032 Unison is built to run well even over relatively slow links such as\n\ + \032 modems and DSL connections.\n\ + \n\ + \032 Unison uses the \"rsync protocol\" designed by Andrew Tridgell and Paul\n\ + \032 Mackerras to greatly speed up transfers of large files in which only\n\ + \032 small changes have been made. More information about the rsync protocol\n\ + \032 can be found at the rsync web site (http://samba.anu.edu.au/rsync/).\n\ + \n\ + \032 If you are using Unison with ssh, you may get some speed improvement by\n\ + \032 enabling ssh's compression feature. Do this by adding the option\n\ + \032 \"-sshargs -C\" to the command line or \"sshargs = -C\" to your profile.\n\ + \n\ + Making Unison Faster on Large Files\n\ + \n\ + \032 Unison's built-in implementation of the rsync algorithm makes\n\ + \032 transferring updates to existing files pretty fast. However, for\n\ + \032 whole-file copies of newly created files, the built-in transfer method\n\ + \032 is not highly optimized. Also, if Unison is interrupted in the middle\n\ + \032 of transferring a large file, it will attempt to retransfer the whole\n\ + \032 thing on the next run.\n\ + \n\ + \032 These shortcomings can be addressed with a little extra work by telling\n\ + \032 Unison to use an external file copying utility for whole-file\n\ + \032 transfers. The recommended one is the standalone rsync tool, which is\n\ + \032 available by default on most Unix systems and can easily be installed\n\ + \032 on Windows systems using Cygwin.\n\ + \n\ + \032 If you have rsync installed on both hosts, you can make Unison use it\n\ + \032 simply by setting the copythreshold flag to something non-negative. If\n\ + \032 you set it to 0, Unison will use the external copy utility for all\n\ + \032 whole-file transfers. (This is probably slower than letting Unison copy\n\ + \032 small files by itself, but can be useful for testing.) If you set it to\n\ + \032 a larger value, Unison will use the external utility for all files\n\ + \032 larger than this size (which is given in kilobytes, so setting it to\n\ + \032 1000 will cause the external tool to be used for all transfers larger\n\ + \032 than a megabyte).\n\ + \n\ + \032 If you want to use a different external copy utility, set both the\n\ + \032 copyprog and copyprogpartial preferences--the former is used for the\n\ + \032 first transfer of a file, while the latter is used when Unison sees a\n\ + \032 partially transferred temp file on the receiving host. Be careful here:\n\ + \032 Your external tool needs to be instructed to copy files in place\n\ + \032 (otherwise if the transfer is interrupted Unison will not notice that\n\ + \032 some of the data has already been transferred, the next time it tries).\n\ + \032 The default values are:\n\ + \032 copyprog = rsync --inplace --compress\n\ + \032 copyprogrest = rsync --partial --inplace --compress\n\ + \n\ + \032 You may also need to set the copyquoterem preference. When it is set to\n\ + \032 true, this causes Unison to add an extra layer of quotes to the remote\n\ + \032 path passed to the external copy program. This is is needed by rsync,\n\ + \032 for example, which internally uses an ssh connection, requiring an\n\ + \032 extra level of quoting for paths containing spaces. When this flag is\n\ + \032 set to default, extra quotes are added if the value of copyprog\n\ + \032 contains the string rsync. The default value is default, naturally.\n\ + \n\ + \032 If a directory transfer is interrupted, the next run of Unison will\n\ + \032 automatically skip any files that were completely transferred before\n\ + \032 the interruption. (This behavior is always on: it does not depend on\n\ + \032 the setting of the copythreshold preference.) Note, though, that the\n\ + \032 new directory will not appear in the destination filesystem until\n\ + \032 everything has been transferred--partially transferred directories are\n\ + \032 kept in a temporary location (with names like .unison.DIRNAME....)\n\ + \032 until the transfer is complete.\n\ + \n\ + Fast Update Detection\n\ + \n\ + \032 If your replicas are large and at least one of them is on a Windows\n\ + \032 system, you may find that Unison's default method for detecting changes\n\ + \032 (which involves scanning the full contents of every file on every\n\ + \032 sync--the only completely safe way to do it under Windows) is too slow.\n\ + \032 Unison provides a preference fastcheck that, when set to true, causes\n\ + \032 it to use file creation times as 'pseudo inode numbers' when scanning\n\ + \032 replicas for updates, instead of reading the full contents of every\n\ + \032 file.\n\ + \n\ + \032 When fastcheck is set to no, Unison will perform slow\n\ + \032 checking--re-scanning the contents of each file on each\n\ + \032 synchronization--on all replicas. When fastcheck is set to default\n\ + \032 (which, naturally, is the default), Unison will use fast checks on Unix\n\ + \032 replicas and slow checks on Windows replicas.\n\ + \n\ + \032 This strategy may cause Unison to miss propagating an update if the\n\ + \032 modification time and length of the file are both unchanged by the\n\ + \032 update. However, Unison will never overwrite such an update with a\n\ + \032 change from the other replica, since it always does a safe check for\n\ + \032 updates just before propagating a change. Thus, it is reasonable to use\n\ + \032 this switch most of the time and occasionally run Unison once with\n\ + \032 fastcheck set to no, if you are worried that Unison may have overlooked\n\ + \032 an update.\n\ + \n\ + \032 Fastcheck is (always) automatically disabled for files with extension\n\ + \032 .xls or .mpp, to prevent Unison from being confused by the habits of\n\ + \032 certain programs (Excel, in particular) of updating files without\n\ + \032 changing their modification times.\n\ + \n\ + Mount Points and Removable Media\n\ + \n\ + \032 Using Unison removable media such as USB drives can be dangerous unless\n\ + \032 you are careful. If you synchronize a directory that is stored on\n\ + \032 removable media when the media is not present, it will look to Unison\n\ + \032 as though the whole directory has been deleted, and it will proceed to\n\ + \032 delete the directory from the other replica--probably not what you\n\ + \032 want!\n\ + \n\ + \032 To prevent accidents, Unison provides a preference called mountpoint.\n\ + \032 Including a line like\n\ + \032 mountpoint = foo\n\ + \n\ + \032 in your preference file will cause Unison to check, after it finishes\n\ + \032 detecting updates, that something actually exists at the path foo on\n\ + \032 both replicas; if it does not, the Unison run will abort.\n\ + \n\ + Click-starting Unison\n\ + \n\ + \032 On Windows NT/2k/XP systems, the graphical version of Unison can be\n\ + \032 invoked directly by clicking on its icon. On Windows 95/98 systems,\n\ + \032 click-starting also works, as long as you are not using ssh. Due to an\n\ + \032 incompatibility with ocaml and Windows 95/98 that is not under our\n\ + \032 control, you must start Unison from a DOS window in Windows 95/98 if\n\ + \032 you want to use ssh.\n\ + \n\ + \032 When you click on the Unison icon, two windows will be created:\n\ + \032 Unison's regular window, plus a console window, which is used only for\n\ + \032 giving your password to ssh (if you do not use ssh to connect, you can\n\ + \032 ignore this window). When your password is requested, you'll need to\n\ + \032 activate the console window (e.g., by clicking in it) before typing. If\n\ + \032 you start Unison from a DOS window, Unison's regular window will appear\n\ + \032 and you will type your password in the DOS window you were using.\n\ + \n\ + \032 To use Unison in this mode, you must first create a profile (see the\n\ + \032 section \"Profile\" ). Use your favorite editor for this.\n\ + \n\ + ")) +:: + ("ssh", ("Installing Ssh", + "Installing Ssh\n\ + \n\ + \032 Warning: These instructions may be out of date. More current\n\ + \032 information can be found the Unison Wiki\n\ + \032 (http://alliance.seas.upenn.edu/ bcpierce/wiki/index.php?n=Main.UnisonF\n\ + \032 AQOSSpecific).\n\ + \n\ + \032 Your local host will need just an ssh client; the remote host needs an\n\ + \032 ssh server (or daemon), which is available on Unix systems. Unison is\n\ + \032 known to work with ssh version 1.2.27 (Unix) and version 1.2.14\n\ + \032 (Windows); other versions may or may not work.\n\ + \n\ + Unix\n\ + \n\ + \032 Most modern Unix installations come with ssh pre-installed.\n\ + \n\ + Windows\n\ + \n\ + \032 Many Windows implementations of ssh only provide graphical interfaces,\n\ + \032 but Unison requires an ssh client that it can invoke with a\n\ + \032 command-line interface. A suitable version of ssh can be installed as\n\ + \032 follows.\n\ + \032 1. Download an ssh executable.\n\ + \032 Warning: there are many implementations and ports of ssh for\n\ + \032 Windows, and not all of them will work with Unison. We have gotten\n\ + \032 Unison to work with Cygwin's port of openssh, and we suggest you\n\ + \032 try that one first. Here's how to install it:\n\ + \032 a. First, create a new folder on your desktop to hold temporary\n\ + \032 installation files. It can have any name you like, but in\n\ + \032 these instructions we'll assume that you call it Foo.\n\ + \032 b. Direct your web browser to www.cygwin.com, and click on the\n\ + \032 \"Install now!\" link. This will download a file, setup.exe;\n\ + \032 save it in the directory Foo. The file setup.exe is a small\n\ + \032 program that will download the actual install files from the\n\ + \032 Internet when you run it.\n\ + \032 c. Start setup.exe (by double-clicking). This brings up a series\n\ + \032 of dialogs that you will have to go through. Select \"Install\n\ + \032 from Internet.\" For \"Local Package Directory\" select the\n\ + \032 directory Foo. For \"Select install root directory\" we\n\ + \032 recommend that you use the default, C:\\cygwin. The next dialog\n\ + \032 asks you to select the way that you want to connect to the\n\ + \032 network to download the installation files; we have used \"Use\n\ + \032 IE5 Settings\" successfully, but you may need to make a\n\ + \032 different selection depending on your networking setup. The\n\ + \032 next dialog gives a list of mirrors; select one close to you.\n\ + \032 Next you are asked to select which packages to install. The\n\ + \032 default settings in this dialog download a lot of packages\n\ + \032 that are not strictly necessary to run Unison with ssh. If you\n\ + \032 don't want to install a package, click on it until \"skip\" is\n\ + \032 shown. For a minimum installation, select only the packages\n\ + \032 \"cygwin\" and \"openssh,\" which come to about 1900KB; the full\n\ + \032 installation is much larger.\n\ + \n\ + \032 Note that you are plan to build unison using the free CygWin GNU C\n\ + \032 compiler, you need to install essential development packages such as\n\ + \032 \"gcc\", \"make\", \"fileutil\", etc; we refer to the file\n\ + \032 \"INSTALL.win32-cygwin-gnuc\" in the source distribution for further\n\ + \032 details.\n\ + \032 After the packages are downloaded and installed, the next\n\ + \032 dialog allows you to choose whether to \"Create Desktop Icon\"\n\ + \032 and \"Add to Start Menu.\" You make the call.\n\ + \032 d. You can now delete the directory Foo and its contents.\n\ + \032 Some people have reported problems using Cygwin's ssh with Unison.\n\ + \032 If you have trouble, you might try other ones instead:\n\ + \032 http://linuxmafia.com/ssh/win32.html\n\ + \n\ + \032 2. You must set the environment variables HOME and PATH. Ssh will\n\ + \032 create a directory .ssh in the directory given by HOME, so that it\n\ + \032 has a place to keep data like your public and private keys. PATH\n\ + \032 must be set to include the Cygwin bin directory, so that Unison can\n\ + \032 find the ssh executable.\n\ + \032 + On Windows 95/98, add the lines\n\ + \032 set PATH=%PATH%;\n\ + \032 set HOME=\n\ + \n\ + \032 to the file C:\\AUTOEXEC.BAT, where is the directory\n\ + \032 where you want ssh to create its .ssh directory, and \n\ + \032 is the directory where the executable ssh.exe is stored; if\n\ + \032 you've installed Cygwin in the default location, this is\n\ + \032 C:\\cygwin\\bin. You will have to reboot your computer to take\n\ + \032 the changes into account.\n\ + \032 + On Windows NT/2k/XP, open the environment variables dialog\n\ + \032 box:\n\ + \032 o Windows NT: My Computer/Properties/Environment\n\ + \032 o Windows 2k: My Computer/Properties/Advanced/Environment\n\ + \032 variables\n\ + \032 then select Path and edit its value by appending ; to\n\ + \032 it, where is the full name of the directory that\n\ + \032 includes the ssh executable; if you've installed Cygwin in the\n\ + \032 default location, this is C:\\cygwin\\bin.\n\ + \032 3. Test ssh from a DOS shell by typing\n\ + \032 ssh -l \n\ + \n\ + \032 You should get a prompt for your password on ,\n\ + \032 followed by a working connection.\n\ + \032 4. Note that ssh-keygen may not work (fails with \"gethostname: no such\n\ + \032 file or directory\") on some systems. This is OK: you can use ssh\n\ + \032 with your regular password for the remote system.\n\ + \032 5. You should now be able to use Unison with an ssh connection. If you\n\ + \032 are logged in with a different user name on the local and remote\n\ + \032 hosts, provide your remote user name when providing the remote root\n\ + \032 (i.e., //username at host/path...).\n\ + \n\ + ")) +:: + ("news", ("Changes in Version 2.47.1", + "Changes in Version 2.47.1\n\ + \n\ + \032 Changes since 2.40.63:\n\ + \032 * New preference fastercheckUNSAFE, which can be used (with care!) to\n\ + \032 achieve much faster update detection when all the common files in\n\ + \032 the two replicas are known to be identical. See the manual for more\n\ + \032 information.\n\ + \032 This feature should still be considered experimental, but it's\n\ + \032 ready for other people to try out.\n\ + \032 * Added option clientHostName. If specified, it will be used to as\n\ + \032 the client host name, overriding UNISONLOCALHOSTNAME and the actual\n\ + \032 host name.\n\ + \032 * OS X GUI:\n\ + \032 + fix crash under Lion, because of problems with the toolbar,\n\ + \032 using the fix suggested in\n\ + \032 http://blitzbasic.com/Community/posts.php?topic=95778.\n\ + \032 + uimacnew09 is now the standard graphical interface on OSX\n\ + \032 + A small improvement to the uimacnew09 interface from Alan\n\ + \032 Schmitt and Steve Kalkwarf: when Unison is run with the -batch\n\ + \032 flag, the interface will now automatically propagate changes\n\ + \032 and terminate, without waiting for user interaction.\n\ + \032 + Show a modal warning window if there is no archive for the\n\ + \032 hosts. The user can then choose to exit or proceed (proceed is\n\ + \032 the default). The window is not shown if the batch preference\n\ + \032 is true.\n\ + \032 + file details panel selectable\n\ + \032 * GTK GUI:\n\ + \032 + New version of uigtk2.ml from Matt Zagrabelny that reorganizes\n\ + \032 the icons in a slightly more intuitive way.\n\ + \032 * Minor fixes:\n\ + \032 + Setting the prefer preference to older or newer now propagates\n\ + \032 deletions when there is no conflict.\n\ + \032 + Correctly quote the path when running merge commands.\n\ + \032 + Add quotes to paths when calling external file watcher\n\ + \032 utility.\n\ + \032 + Incorporate a patch to fsmonitor.py (the external filewatcher\n\ + \032 utility) from Tomasz Zernicki to make it work better under\n\ + \032 Windows.\n\ + \032 + Incorporated new version of fsmonitor.py from Christophe Gohle\n\ + \032 + Fixed incompatibility with OpenSSH 5.6.\n\ + \032 + Fixed fingerprint cache: do not cache file properties\n\ + \032 + Some spelling corrections in documentation and comments from\n\ + \032 Stephane Glondu\n\ + \032 + Fixed O_APPEND mode for open under Windows\n\ + \032 + Fixed String.sub invalid argument error when an AppleDouble\n\ + \032 file does not contain a finder information field\n\ + \032 + Trim duplicate paths when using \"-repeat watch\"\n\ + \032 + Unison now passes path arguments and -follow directives to\n\ + \032 fsmonitor.py. This seems to work except for one small issue\n\ + \032 with how fsmonitor.py treats -follow directives for\n\ + \032 directories that don't exist (or maybe this is an issue with\n\ + \032 how it treats any kind of monitoring when the thing being\n\ + \032 monitored doesn't exist?). If we create a symlink to a\n\ + \032 nonexistant directory, give Unison (hence fsmonitor.py) a\n\ + \032 'follow' directive for the symlink, start unison, and then\n\ + \032 create the directory, fsmonitor.py misses the change.\n\ + \032 + Lines added in profile files by unison always start at a new\n\ + \032 line\n\ + \n\ + \032 Changes since 2.40.1:\n\ + \032 * Added \"BelowPath\" patterns, that match a path as well as all paths\n\ + \032 below (convenient to use with nodeletion,update,creationpartial\n\ + \032 preferences)\n\ + \032 * Added a \"fat\" preference that makes Unison use the right options\n\ + \032 when one of the replica is on a FAT filesystem.\n\ + \032 * Allow \"prefer/force=newer\" even when not synchronizing modification\n\ + \032 times. (The reconciler will not be aware of the modification time\n\ + \032 of unchanged files, so the synchronization choices of Unison can be\n\ + \032 different from when \"times=true\", but the behavior remains sane:\n\ + \032 changed files with the most recent modification time will be\n\ + \032 propagated.)\n\ + \032 * Minor fixes and improvements:\n\ + \032 + Compare filenames up to decomposition in case sensitive mode\n\ + \032 when one host is running MacOSX and the unicode preference is\n\ + \032 set to true.\n\ + \032 + Rsync: somewhat faster compressor\n\ + \032 + Make Unicode the default on all architectures (it was only the\n\ + \032 default when a Mac OS X or Windows machine was involved).\n\ + \n\ + \032 Changes since 2.32:\n\ + \032 * Major enhancement: Unicode support.\n\ + \032 + Unison should now handle unicode filenames correctly on all\n\ + \032 platforms.\n\ + \032 + This functionality is controlled by a new preference unicode.\n\ + \032 + Unicode mode is now the default when one of the hosts is under\n\ + \032 Windows or MacOS. This may make upgrades a bit more painful\n\ + \032 (the archives cannot be reused), but this is a much saner\n\ + \032 default.\n\ + \032 * Partial transfer of directories. If an error occurs while\n\ + \032 transferring a directory, the part transferred so far is copied\n\ + \032 into place (and the archives are updated accordingly). The\n\ + \032 \"maxerrors\" preference controls how many transfer error Unison will\n\ + \032 accept before stopping the transfer of a directory (by default,\n\ + \032 only one). This makes it possible to transfer most of a directory\n\ + \032 even if there are some errors. Currently, only the first error is\n\ + \032 reported by the GUIs.\n\ + \032 Also, allow partial transfer of a directory when there was an error\n\ + \032 deep inside this directory during update detection. At the moment,\n\ + \032 this is only activated with the text and GTK UIs, which have been\n\ + \032 modified so that they show that the transfer is going to be partial\n\ + \032 and so that they can display all errors.\n\ + \032 * Improvement to the code for resuming directory transfers:\n\ + \032 + if a file was not correctly transferred (or the source has\n\ + \032 been modified since, with unchanged size), Unison performs a\n\ + \032 new transfer rather than failing\n\ + \032 + spurious files are deleted (this can happen if a file is\n\ + \032 deleted on the source replica before resuming the transfer;\n\ + \032 not deleting the file would result in it reappearing on the\n\ + \032 target replica)\n\ + \032 * Experimental streaming protocol for transferring file contents (can\n\ + \032 be disabled by setting the directive \"stream\" to false): file\n\ + \032 contents is transfered asynchronously (without waiting for a\n\ + \032 response from the destination after each chunk sent) rather than\n\ + \032 using the synchronous RPC mechanism. As a consequence:\n\ + \032 + Unison now transfers the contents of a single file at a time\n\ + \032 (Unison used to transfer several contents simultaneously in\n\ + \032 order to hide the connection latency.)\n\ + \032 + the transfer of large files uses the full available bandwidth\n\ + \032 and is not slowed done due to the connection latency anymore\n\ + \032 + we get performance improvement for small files as well by\n\ + \032 scheduling many files simultaneously (as scheduling a file for\n\ + \032 transfer consume little ressource: it does not mean allocating\n\ + \032 a large buffer anymore)\n\ + \032 * Changes to the internal implementation of the rsync algorithm:\n\ + \032 + use longer blocks for large files (the size of a block is the\n\ + \032 square root of the size of the file for large files);\n\ + \032 + transmit less checksum information per block (we still have\n\ + \032 less than one chance in a hundred million of transferring a\n\ + \032 file incorrectly, and Unison will catch any transfer error\n\ + \032 when fingerprinting the whole file)\n\ + \032 + avoid transfer overhead (which was 4 bytes per block)\n\ + \032 For a 1G file, the first optimization saves a factor 50 on the\n\ + \032 amount of data transferred from the target to the source (blocks\n\ + \032 are 32768 bytes rather than just 700 bytes). The two other\n\ + \032 optimizations save another factor of 2 (from 24 bytes per block\n\ + \032 down to 10).\n\ + \032 * Implemented an on-disk file fingerprint cache to speed-up update\n\ + \032 detection after a crash: this way, Unison does not have do\n\ + \032 recompute all the file fingerprints from scratch.\n\ + \032 + When Unison detects that the archive case-sensitivity mode\n\ + \032 does not match the current settings, it populates the\n\ + \032 fingerprint cache using the archive contents. This way,\n\ + \032 changing the case-sensitivity mode should be reasonably fast.\n\ + \032 * New preferences \"noupdate=root\", \"nodeletion=root\",\n\ + \032 \"nocreation=root\" that prevent Unison from performing files\n\ + \032 updates, deletions or creations on the given root. Also 'partial'\n\ + \032 versions of 'noupdate', 'nodeletion' and 'nocreation'\n\ + \032 * Limit the number of simultaneous external copy program (\"copymax\"\n\ + \032 preference)\n\ + \032 * New \"links\" preference. When set to false, Unison will report an\n\ + \032 error on symlinks during update detection. (This is the default\n\ + \032 when one host is running Windows but not Cygwin.) This is better\n\ + \032 than failing during propagation.\n\ + \032 * Added a preference \"halfduplex\" to force half-duplex communication\n\ + \032 with the server. This may be useful on unreliable links (as a more\n\ + \032 efficient alternative to \"maxthreads = 1\").\n\ + \032 * Renamed preference \"pretendwin\" to \"ignoreinodenumbers\" (an alias\n\ + \032 is kept for backwards compatibility).\n\ + \032 * Ignore one-second differences when synchronizing modification time.\n\ + \032 (Technically, this is an incompatible archive format change, but it\n\ + \032 is backward compatible. To trigger a problem, a user would have to\n\ + \032 synchronize modification times on a filesystem with a two-second\n\ + \032 granularity and then downgrade to a previous version of Unison,\n\ + \032 which does not work well in such a case. Thus, it does not seem\n\ + \032 worthwhile to increment the archive format number, which would\n\ + \032 impact all users.)\n\ + \032 * Do not keep many files simultaneously opened anymore when the rsync\n\ + \032 algorithm is in use.\n\ + \032 * Add \"ignorearchives\" preference to ignore existing archives (to\n\ + \032 avoid forcing users to delete them manually, in situations where\n\ + \032 one archive has gotten deleted or corrupted).\n\ + \032 * Mac OS\n\ + \032 + fixed rsync bug which could result in an \"index out of bounds\"\n\ + \032 error when transferring resource forks.\n\ + \032 + Fixed bug which made Unison ignore finder information and\n\ + \032 resource fork when compiled to 64bit on Mac OSX.\n\ + \032 + should now be 64 bit clean (the Growl framework is not up to\n\ + \032 date, though)\n\ + \032 + Made the bridge between Objective C and Ocaml code GC friendly\n\ + \032 (it was allocating ML values and putting them in an array\n\ + \032 which was not registered with the GC)\n\ + \032 + use darker grey arrows (patch contributed by Eric Y. Kow)\n\ + \032 * GTK user interface\n\ + \032 + assistant for creating profiles\n\ + \032 + profile editor\n\ + \032 + pop up a summary window when the replicas are not fully\n\ + \032 synchronized after transport\n\ + \032 + display estimated remaining time and transfer rate on the\n\ + \032 progress bar\n\ + \032 + allow simultaneous selection of several items\n\ + \032 + Do not reload the preference file before a new update\n\ + \032 detection if it is unchanged\n\ + \032 + disabled scrolling to the first unfinished item during\n\ + \032 transport. It goes way too fast when lot of small files are\n\ + \032 synchronized, and it makes it impossible to browse the file\n\ + \032 list during transport.\n\ + \032 + take into account the \"height\" preference again\n\ + \032 + the internal list of selected reconciler item was not always\n\ + \032 in sync with what was displayed (GTK bug?); workaround\n\ + \032 implemented\n\ + \032 + Do not display \"Looking for change\" messages during\n\ + \032 propagation (when checking the targe is unchanged) but only\n\ + \032 during update detection\n\ + \032 + Apply patch to fix some crashes in the OSX GUI, thanks to Onne\n\ + \032 Gorter.\n\ + \032 * Text UI\n\ + \032 + During update detection, display status by updating a single\n\ + \032 line rather than generating a new line of output every so\n\ + \032 often. Should be less confusing.\n\ + \032 * Windows\n\ + \032 + Fastcheck is now the default under Windows. People mostly use\n\ + \032 NTFS nowadays and the Unicode API provides an equivalent to\n\ + \032 inode numbers for this filesystem.\n\ + \032 + Only use long UNC path for accessing replicas (as '..' is not\n\ + \032 handled with this format of paths, but can be useful)\n\ + \032 + Windows text UI: now put the console into UTF-8 output mode.\n\ + \032 This is the right thing to do when in Unicode mode, and is no\n\ + \032 worse than what we had previously otherwise (the console use\n\ + \032 some esoteric encoding by default). This only works when using\n\ + \032 a Unicode font instead of the default raster font.\n\ + \032 + Don't get the home directory from environment variable HOME\n\ + \032 under Windows (except for Cygwin binaries): we don't want the\n\ + \032 behavior of Unison to depends on whether it is run from a\n\ + \032 Cygwin shell (where HOME is set) or in any other way (where\n\ + \032 HOME is usually not set).\n\ + \032 * Miscellaneous fixes and improvements\n\ + \032 + Made a server waiting on a socket more resilient to unexpected\n\ + \032 lost connections from the client.\n\ + \032 + Small patch to property setting code suggested by Ulrich\n\ + \032 Gernkow.\n\ + \032 + Several fixes to the change transfer functions (both the\n\ + \032 internal ones and external transfers using rsync). In\n\ + \032 particular, limit the number of simultaneous transfer using an\n\ + \032 rsync (as the rsync algorithm can use a large amount of memory\n\ + \032 when processing huge files)\n\ + \032 + Keep track of which file contents are being transferred, and\n\ + \032 delay the transfer of a file when another file with the same\n\ + \032 contents is currently being transferred. This way, the second\n\ + \032 transfer can be skipped and replaced by a local copy.\n\ + \032 + Experimental update detection optimization: do not read the\n\ + \032 contents of unchanged directories\n\ + \032 + When a file transfer fails, turn off fastcheck for this file\n\ + \032 on the next sync.\n\ + \032 + Fixed bug with case insensitive mode on a case sensitive\n\ + \032 filesystem:\n\ + \032 o if file \"a/a\" is created on one replica and directory \"A\"\n\ + \032 is created on the other, the file failed to be\n\ + \032 synchronized the first time Unison is run afterwards, as\n\ + \032 Unison uses the wrong path \"a/a\" (if Unison is run again,\n\ + \032 the directories are in the archive, so the right path is\n\ + \032 used);\n\ + \032 o if file \"a\" appears on one replica and file \"A\" appears\n\ + \032 on the other with different contents, Unison was unable\n\ + \032 to synchronize them.\n\ + \032 + Improved error reporting when the destination is updated\n\ + \032 during synchronization: Unison now tells which file has been\n\ + \032 updated, and how.\n\ + \032 + Limit the length of temporary file names\n\ + \032 + Case sensitivity information put in the archive (in a backward\n\ + \032 compatible way) and checked when the archive is loaded\n\ + \032 + Got rid of the 16mb marshalling limit by marshalling to a\n\ + \032 bigarray.\n\ + \032 + Resume copy of partially transferred files.\n\ + \n\ + \032 Changes since 2.31:\n\ + \032 * Small user interface changes\n\ + \032 + Small change to text UI \"scanning...\" messages, to print just\n\ + \032 directories (hopefully making it clearer that individual files\n\ + \032 are not necessarily being fingerprinted).\n\ + \032 * Minor fixes and improvements:\n\ + \032 + Ignore one hour differences when deciding whether a file may\n\ + \032 have been updated. This avoids slow update detection after\n\ + \032 daylight saving time changes under Windows. This makes Unison\n\ + \032 slightly more likely to miss an update, but it should be safe\n\ + \032 enough.\n\ + \032 + Fix a small bug that was affecting mainly windows users. We\n\ + \032 need to commit the archives at the end of the sync even if\n\ + \032 there are no updates to propagate because some files (in fact,\n\ + \032 if we've just switched to DST on windows, a LOT of files)\n\ + \032 might have new modtimes in the archive. (Changed the text UI\n\ + \032 only. It's less clear where to change the GUI.)\n\ + \032 + Don't delete the temp file when a transfer fails due to a\n\ + \032 fingerprint mismatch (so that we can have a look and see why!)\n\ + \032 We've also added more debugging code togive more informative\n\ + \032 error messages when we encounter the dreaded and longstanding\n\ + \032 \"assert failed during file transfer\" bug\n\ + \032 + Incorrect paths (\"path\" directive) now result in an error\n\ + \032 update item rather than a fatal error.\n\ + \032 + Create parent directories (with correct permissions) during\n\ + \032 transport for paths which point to non-existent locations in\n\ + \032 the destination replica.\n\ + \n\ + \032 Changes since 2.27:\n\ + \032 * If Unison is interrupted during a directory transfer, it will now\n\ + \032 leave the partially transferred directory intact in a temporary\n\ + \032 location. (This maintains the invariant that new files/directories\n\ + \032 are transferred either completely or not at all.) The next time\n\ + \032 Unison is run, it will continue filling in this temporary\n\ + \032 directory, skipping transferring files that it finds are already\n\ + \032 there.\n\ + \032 * We've added experimental support for invoking an external file\n\ + \032 transfer tool for whole-file copies instead of Unison's built-in\n\ + \032 transfer protocol. Three new preferences have been added:\n\ + \032 + copyprog is a string giving the name (and command-line\n\ + \032 switches, if needed) of an external program that can be used\n\ + \032 to copy large files efficiently. By default, rsync is invoked,\n\ + \032 but other tools such as scp can be used instead by changing\n\ + \032 the value of this preference. (Although this is not its\n\ + \032 primary purpose, rsync is actually a pretty fast way of\n\ + \032 copying files that don't already exist on the receiving host.)\n\ + \032 For files that do already exist on (but that have been changed\n\ + \032 in one replica), Unison will always use its built-in\n\ + \032 implementation of the rsync algorithm.\n\ + \032 + Added a \"copyprogrest\" preference, so that we can give\n\ + \032 different command lines for invoking the external copy utility\n\ + \032 depending on whether a partially transferred file already\n\ + \032 exists or not. (Rsync doesn't seem to care about this, but\n\ + \032 other utilities may.)\n\ + \032 + copythreshold is an integer (-1 by default), indicating above\n\ + \032 what filesize (in megabytes) Unison should use the external\n\ + \032 copying utility specified by copyprog. Specifying 0 will cause\n\ + \032 ALL copies to use the external program; a negative number will\n\ + \032 prevent any files from using it. (Default is -1.)\n\ + \032 Thanks to Alan Schmitt for a huge amount of hacking and to an\n\ + \032 anonymous sponsor for suggesting and underwriting this extension.\n\ + \032 * Small improvements:\n\ + \032 + Added a new preference, dontchmod. By default, Unison uses the\n\ + \032 chmod system call to set the permission bits of files after it\n\ + \032 has copied them. But in some circumstances (and under some\n\ + \032 operating systems), the chmod call always fails. Setting this\n\ + \032 preference completely prevents Unison from ever calling chmod.\n\ + \032 + Don't ignore files that look like backup files if the\n\ + \032 backuplocation preference is set to central\n\ + \032 + Shortened the names of several preferences. The old names are\n\ + \032 also still supported, for backwards compatibility, but they do\n\ + \032 not appear in the documentation.\n\ + \032 + Lots of little documentation tidying. (In particular,\n\ + \032 preferences are separated into Basic and Advanced! This should\n\ + \032 hopefully make Unison a little more approachable for new\n\ + \032 users.\n\ + \032 + Unison can sometimes fail to transfer a file, giving the\n\ + \032 unhelpful message \"Destination updated during synchronization\"\n\ + \032 even though the file has not been changed. This can be caused\n\ + \032 by programs that change either the file's contents or the\n\ + \032 file's extended attributes without changing its modification\n\ + \032 time. It's not clear what is the best fix for this - it is not\n\ + \032 Unison's fault, but it makes Unison's behavior puzzling - but\n\ + \032 at least Unison can be more helpful about suggesting a\n\ + \032 workaround (running once with fastcheck set to false). The\n\ + \032 failure message has been changed to give this advice.\n\ + \032 + Further improvements to the OS X GUI (thanks to Alan Schmitt\n\ + \032 and Craig Federighi).\n\ + \032 * Very preliminary support for triggering Unison from an external\n\ + \032 filesystem-watching utility. The current implementation is very\n\ + \032 simple, not efficient, and almost completely untested--not ready\n\ + \032 for real users. But if someone wants to help improve it (e.g., by\n\ + \032 writing a filesystem watcher for your favorite OS), please make\n\ + \032 yourself known!\n\ + \032 On the Unison side, the new behavior is very simple:\n\ + \032 + use the text UI\n\ + \032 + start Unison with the command-line flag \"-repeat FOO\", where\n\ + \032 FOO is name of a file where Unison should look for\n\ + \032 notifications of changes\n\ + \032 + when it starts up, Unison will read the whole contents of this\n\ + \032 file (on both hosts), which should be a newline-separated list\n\ + \032 of paths (relative to the root of the synchronization) and\n\ + \032 synchronize just these paths, as if it had been started with\n\ + \032 the \"-path=xxx\" option for each one of them\n\ + \032 + when it finishes, it will sleep for a few seconds and then\n\ + \032 examine the watchfile again; if anything has been added, it\n\ + \032 will read the new paths, synchronize them, and go back to\n\ + \032 sleep\n\ + \032 + that's it!\n\ + \032 To use this to drive Unison \"incrementally,\" just start it in this\n\ + \032 mode and start up a tool (on each host) to watch for new changes to\n\ + \032 the filesystem and append the appropriate paths to the watchfile.\n\ + \032 Hopefully such tools should not be too hard to write.\n\ + \032 * Bug fixes:\n\ + \032 + Fixed a bug that was causing new files to be created with\n\ + \032 permissions 0x600 instead of using a reasonable default (like\n\ + \032 0x644), if the 'perms' flag was set to 0. (Bug reported by Ben\n\ + \032 Crowell.)\n\ + \032 + Follow maxthreads preference when transferring directories.\n\ + \n\ + \032 Changes since 2.17:\n\ + \032 * Major rewrite and cleanup of the whole Mac OS X graphical user\n\ + \032 interface by Craig Federighi. Thanks, Craig!!!\n\ + \032 * Small fix to ctime (non-)handling in update detection under windows\n\ + \032 with fastcheck.\n\ + \032 * Several small fixes to the GTK2 UI to make it work better under\n\ + \032 Windows [thanks to Karl M for these].\n\ + \032 * The backup functionality has been completely rewritten. The\n\ + \032 external interface has not changed, but numerous bugs, irregular\n\ + \032 behaviors, and cross-platform inconsistencies have been corrected.\n\ + \032 * The Unison project now accepts donations via PayPal. If you'd like\n\ + \032 to donate, you can find a link to the donation page on the Unison\n\ + \032 home page (http://www.cis.upenn.edu/ bcpierce/unison/lists.html).\n\ + \032 * Some important safety improvements:\n\ + \032 + Added a new mountpoint preference, which can be used to\n\ + \032 specify a path that must exist in both replicas at the end of\n\ + \032 update detection (otherwise Unison aborts). This can be used\n\ + \032 to avoid potentially dangerous situations when Unison is used\n\ + \032 with removable media such as external hard drives and compact\n\ + \032 flash cards.\n\ + \032 + The confirmation of \"big deletes\" is now controlled by a\n\ + \032 boolean preference confirmbigdeletes. Default is true, which\n\ + \032 gives the same behavior as previously. (This functionality is\n\ + \032 at least partly superceded by the mountpoint preference, but\n\ + \032 it has been left in place in case it is useful to some\n\ + \032 people.)\n\ + \032 + If Unison is asked to \"follow\" a symbolic link but there is\n\ + \032 nothing at the other end of the link, it will now flag this\n\ + \032 path as an error, rather than treating the symlink itself as\n\ + \032 missing or deleted. This avoids a potentially dangerous\n\ + \032 situation where a followed symlink points to an external\n\ + \032 filesystem that might be offline when Unison is run (whereupon\n\ + \032 Unison would cheerfully delete the corresponding files in the\n\ + \032 other replica!).\n\ + \032 * Smaller changes:\n\ + \032 + Added forcepartial and preferpartial preferences, which behave\n\ + \032 like force and prefer but can be specified on a per-path\n\ + \032 basis. [Thanks to Alan Schmitt for this.]\n\ + \032 + A bare-bones self test feature was added, which runs unison\n\ + \032 through some of its paces and checks that the results are as\n\ + \032 expected. The coverage of the tests is still very limited, but\n\ + \032 the facility has already been very useful in debugging the new\n\ + \032 backup functionality (especially in exposing some subtle\n\ + \032 cross-platform issues).\n\ + \032 + Refined debugging code so that the verbosity of individual\n\ + \032 modules can be controlled separately. Instead of just putting\n\ + \032 '-debug verbose' on the command line, you can put '-debug\n\ + \032 update+', which causes all the extra messages in the Update\n\ + \032 module, but not other modules, to be printed. Putting '-debug\n\ + \032 verbose' causes all modules to print with maximum verbosity.\n\ + \032 + Removed mergebatch preference. (It never seemed very useful,\n\ + \032 and its semantics were confusing.)\n\ + \032 + Rewrote some of the merging functionality, for better\n\ + \032 cooperation with external Harmony instances.\n\ + \032 + Changed the temp file prefix from .# to .unison.\n\ + \032 + Compressed the output from the text user interface\n\ + \032 (particularly when run with the -terse flag) to make it easier\n\ + \032 to interpret the results when Unison is run several times in\n\ + \032 succession from a script.\n\ + \032 + Diff and merge functions now work under Windows.\n\ + \032 + Changed the order of arguments to the default diff command (so\n\ + \032 that the + and - annotations in diff's output are reversed).\n\ + \032 + Added .mpp files to the \"never fastcheck\" list (like .xls\n\ + \032 files).\n\ + \032 * Many small bugfixes, including:\n\ + \032 + Fixed a longstanding bug regarding fastcheck and daylight\n\ + \032 saving time under Windows when Unison is set up to synchronize\n\ + \032 modification times. (Modification times cannot be updated in\n\ + \032 the archive in this case, so we have to ignore one hour\n\ + \032 differences.)\n\ + \032 + Fixed a bug that would occasionally cause the archives to be\n\ + \032 left in non-identical states on the two hosts after\n\ + \032 synchronization.\n\ + \032 + Fixed a bug that prevented Unison from communicating correctly\n\ + \032 between 32- and 64-bit architectures.\n\ + \032 + On windows, file creation times are no longer used as a proxy\n\ + \032 for inode numbers. (This is unfortunate, as it makes fastcheck\n\ + \032 a little less safe. But it turns out that file creation times\n\ + \032 are not reliable under Windows: if a file is removed and a new\n\ + \032 file is created in its place, the new one will sometimes be\n\ + \032 given the same creation date as the old one!)\n\ + \032 + Set read-only file to R/W on OSX before attempting to change\n\ + \032 other attributes.\n\ + \032 + Fixed bug resulting in spurious \"Aborted\" errors during\n\ + \032 transport (thanks to Jerome Vouillon)\n\ + \032 + Enable diff if file contents have changed in one replica, but\n\ + \032 only properties in the other.\n\ + \032 + Removed misleading documentation for 'repeat' preference.\n\ + \032 + Fixed a bug in merging code where Unison could sometimes\n\ + \032 deadlock with the external merge program, if the latter\n\ + \032 produced large amounts of output.\n\ + \032 + Workaround for a bug compiling gtk2 user interface against\n\ + \032 current versions of gtk2+ libraries.\n\ + \032 + Added a better error message for \"ambiguous paths\".\n\ + \032 + Squashed a longstanding bug that would cause file transfer to\n\ + \032 fail with the message \"Failed: Error in readWrite: Is a\n\ + \032 directory.\"\n\ + \032 + Replaced symlinks with copies of their targets in the Growl\n\ + \032 framework in src/uimac. This should make the sources easier to\n\ + \032 check out from the svn repository on WinXP systems.\n\ + \032 + Added a workaround (suggested by Karl M.) for the problem\n\ + \032 discussed on the unison users mailing list where, on the\n\ + \032 Windows platform, the server would hang when transferring\n\ + \032 files. I conjecture that the problem has to do with the RPC\n\ + \032 mechanism, which was used to make a call back from the server\n\ + \032 to the client (inside the Trace.log function) so that the log\n\ + \032 message would be appended to the log file on the client. The\n\ + \032 workaround is to dump these messages (about when xferbycopying\n\ + \032 shortcuts are applied and whether they succeed) just to the\n\ + \032 standard output of the Unison process, not to the log file.\n\ + \n\ + \032 Changes since 2.13.0:\n\ + \032 * The features for performing backups and for invoking external merge\n\ + \032 programs have been completely rewritten by Stephane Lescuyer\n\ + \032 (thanks, Stephane!). The user-visible functionality should not\n\ + \032 change, but the internals have been rationalized and there are a\n\ + \032 number of new features. See the manual (in particular, the\n\ + \032 description of the backupXXX preferences) for details.\n\ + \032 * Incorporated patches for ipv6 support, contributed by Samuel\n\ + \032 Thibault. (Note that, due to a bug in the released OCaml 3.08.3\n\ + \032 compiler, this code will not actually work with ipv6 unless\n\ + \032 compiled with the CVS version of the OCaml compiler, where the bug\n\ + \032 has been fixed; however, ipv4 should continue to work normally.)\n\ + \032 * OSX interface:\n\ + \032 + Incorporated Ben Willmore's cool new icon for the Mac UI.\n\ + \032 * Small fixes:\n\ + \032 + Fixed off by one error in month numbers (in printed dates)\n\ + \032 reported by Bob Burger\n\ + \n\ + \032 Changes since 2.12.0:\n\ + \032 * New convention for release numbering: Releases will continue to be\n\ + \032 given numbers of the form X.Y.Z, but, from now on, just the major\n\ + \032 version number (X.Y) will be considered significant when checking\n\ + \032 compatibility between client and server versions. The third\n\ + \032 component of the version number will be used only to identify\n\ + \032 \"patch levels\" of releases.\n\ + \032 This change goes hand in hand with a change to the procedure for\n\ + \032 making new releases. Candidate releases will initially be given\n\ + \032 \"beta release\" status when they are announced for public\n\ + \032 consumption. Any bugs that are discovered will be fixed in a\n\ + \032 separate branch of the source repository (without changing the\n\ + \032 major version number) and new tarballs re-released as needed. When\n\ + \032 this process converges, the patched beta version will be dubbed\n\ + \032 stable.\n\ + \032 * Warning (failure in batch mode) when one path is completely\n\ + \032 emptied. This prevents Unison from deleting everything on one\n\ + \032 replica when the other disappear.\n\ + \032 * Fix diff bug (where no difference is shown the first time the diff\n\ + \032 command is given).\n\ + \032 * User interface changes:\n\ + \032 + Improved workaround for button focus problem (GTK2 UI)\n\ + \032 + Put leading zeroes in date fields\n\ + \032 + More robust handling of character encodings in GTK2 UI\n\ + \032 + Changed format of modification time displays, from modified at\n\ + \032 hh:mm:ss on dd MMM, yyyy to modified on yyyy-mm-dd hh:mm:ss\n\ + \032 + Changed time display to include seconds (so that people on FAT\n\ + \032 filesystems will not be confused when Unison tries to update a\n\ + \032 file time to an odd number of seconds and the filesystem\n\ + \032 truncates it to an even number!)\n\ + \032 + Use the diff \"-u\" option by default when showing differences\n\ + \032 between files (the output is more readable)\n\ + \032 + In text mode, pipe the diff output to a pager if the\n\ + \032 environment variable PAGER is set\n\ + \032 + Bug fixes and cleanups in ssh password prompting. Now works\n\ + \032 with the GTK2 UI under Linux. (Hopefully the Mac OS X one is\n\ + \032 not broken!)\n\ + \032 + Include profile name in the GTK2 window name\n\ + \032 + Added bindings ',' (same as '<') and '.' (same as '>') in the\n\ + \032 GTK2 UI\n\ + \032 * Mac GUI:\n\ + \032 + actions like < and > scroll to the next item as necessary.\n\ + \032 + Restart has a menu item and keyboard shortcut (command-R).\n\ + \032 + Added a command-line tool for Mac OS X. It can be installed\n\ + \032 from the Unison menu.\n\ + \032 + New icon.\n\ + \032 + Handle the \"help\" command-line argument properly.\n\ + \032 + Handle profiles given on the command line properly.\n\ + \032 + When a profile has been selected, the profile dialog is\n\ + \032 replaced by a \"connecting\" message while the connection is\n\ + \032 being made. This gives better feedback.\n\ + \032 + Size of left and right columns is now large enough so that\n\ + \032 \"PropsChanged\" is not cut off.\n\ + \032 * Minor changes:\n\ + \032 + Disable multi-threading when both roots are local\n\ + \032 + Improved error handling code. In particular, make sure all\n\ + \032 files are closed in case of a transient failure\n\ + \032 + Under Windows, use $UNISON for home directory as a last resort\n\ + \032 (it was wrongly moved before $HOME and $USERPROFILE in Unison\n\ + \032 2.12.0)\n\ + \032 + Reopen the logfile if its name changes (profile change)\n\ + \032 + Double-check that permissions and modification times have been\n\ + \032 properly set: there are some combination of OS and filesystem\n\ + \032 on which setting them can fail in a silent way.\n\ + \032 + Check for bad Windows filenames for pure Windows\n\ + \032 synchronization also (not just cross architecture\n\ + \032 synchronization). This way, filenames containing backslashes,\n\ + \032 which are not correctly handled by unison, are rejected right\n\ + \032 away.\n\ + \032 + Attempt to resolve issues with synchronizing modification\n\ + \032 times of read-only files under Windows\n\ + \032 + Ignore chmod failures when deleting files\n\ + \032 + Ignore trailing dots in filenames in case insensitive mode\n\ + \032 + Proper quoting of paths, files and extensions ignored using\n\ + \032 the UI\n\ + \032 + The strings CURRENT1 and CURRENT2 are now correctly substitued\n\ + \032 when they occur in the diff preference\n\ + \032 + Improvements to syncing resource forks between Macs via a\n\ + \032 non-Mac system.\n\ + \n\ + \032 Changes since 2.10.2:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed.\n\ + \032 * Source code availability: The Unison sources are now managed using\n\ + \032 Subversion. One nice side-effect is that anonymous checkout is now\n\ + \032 possible, like this:\n\ + \032 svn co https://cvs.cis.upenn.edu:3690/svnroot/unison/\n\ + \n\ + \032 We will also continue to export a \"developer tarball\" of the\n\ + \032 current (modulo one day) sources in the web export directory. To\n\ + \032 receive commit logs for changes to the sources, subscribe to the\n\ + \032 unison-hackers list\n\ + \032 (http://www.cis.upenn.edu/ bcpierce/unison/lists.html).\n\ + \032 * Text user interface:\n\ + \032 + Substantial reworking of the internal logic of the text UI to\n\ + \032 make it a bit easier to modify.\n\ + \032 + The dumbtty flag in the text UI is automatically set to true\n\ + \032 if the client is running on a Unix system and the EMACS\n\ + \032 environment variable is set to anything other than the empty\n\ + \032 string.\n\ + \032 * Native OS X gui:\n\ + \032 + Added a synchronize menu item with keyboard shortcut\n\ + \032 + Added a merge menu item, still needs to be debugged\n\ + \032 + Fixes to compile for Panther\n\ + \032 + Miscellaneous improvements and bugfixes\n\ + \032 * Small changes:\n\ + \032 + Changed the filename checking code to apply to Windows only,\n\ + \032 instead of OS X as well.\n\ + \032 + Finder flags now synchronized\n\ + \032 + Fallback in copy.ml for filesystem that do not support O_EXCL\n\ + \032 + Changed buffer size for local file copy (was highly\n\ + \032 inefficient with synchronous writes)\n\ + \032 + Ignore chmod failure when deleting a directory\n\ + \032 + Fixed assertion failure when resolving a conflict content\n\ + \032 change / permission changes in favor of the content change.\n\ + \032 + Workaround for transferring large files using rsync.\n\ + \032 + Use buffered I/O for files (this is the only way to open files\n\ + \032 in binary mode under Cygwin).\n\ + \032 + On non-Cygwin Windows systems, the UNISON environment variable\n\ + \032 is now checked first to determine where to look for Unison's\n\ + \032 archive and preference files, followed by HOME and USERPROFILE\n\ + \032 in that order. On Unix and Cygwin systems, HOME is used.\n\ + \032 + Generalized diff preference so that it can be given either as\n\ + \032 just the command name to be used for calculating diffs or else\n\ + \032 a whole command line, containing the strings CURRENT1 and\n\ + \032 CURRENT2, which will be replaced by the names of the files to\n\ + \032 be diff'ed before the command is called.\n\ + \032 + Recognize password prompts in some newer versions of ssh.\n\ + \n\ + \032 Changes since 2.9.20:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed.\n\ + \032 * Major functionality changes:\n\ + \032 + Major tidying and enhancement of 'merge' functionality. The\n\ + \032 main user-visible change is that the external merge program\n\ + \032 may either write the merged output to a single new file, as\n\ + \032 before, or it may modify one or both of its input files, or it\n\ + \032 may write two new files. In the latter cases, its\n\ + \032 modifications will be copied back into place on both the local\n\ + \032 and the remote host, and (if the two files are now equal) the\n\ + \032 archive will be updated appropriately. More information can be\n\ + \032 found in the user manual. Thanks to Malo Denielou and Alan\n\ + \032 Schmitt for these improvements.\n\ + \032 Warning: the new merging functionality is not completely\n\ + \032 compatible with old versions! Check the manual for details.\n\ + \032 + Files larger than 2Gb are now supported.\n\ + \032 + Added preliminary (and still somewhat experimental) support\n\ + \032 for the Apple OS X operating system.\n\ + \032 o Resource forks should be transferred correctly. (See the\n\ + \032 manual for details of how this works when synchronizing\n\ + \032 HFS with non-HFS volumes.) Synchronization of file type\n\ + \032 and creator information is also supported.\n\ + \032 o On OSX systems, the name of the directory for storing\n\ + \032 Unison's archives, preference files, etc., is now\n\ + \032 determined as follows:\n\ + \032 # if ~/.unison exists, use it\n\ + \032 # otherwise, use ~/Library/Application Support/Unison,\n\ + \032 creating it if necessary.\n\ + \032 o A preliminary native-Cocoa user interface is under\n\ + \032 construction. This still needs some work, and some users\n\ + \032 experience unpredictable crashes, so it is only for\n\ + \032 hackers for now. Run make with UISTYLE=mac to build this\n\ + \032 interface.\n\ + \032 * Minor functionality changes:\n\ + \032 + Added an ignorelocks preference, which forces Unison to\n\ + \032 override left-over archive locks. (Setting this preference is\n\ + \032 dangerous! Use it only if you are positive you know what you\n\ + \032 are doing.)\n\ + \032 + Added a new preference assumeContentsAreImmutable. If a\n\ + \032 directory matches one of the patterns set in this preference,\n\ + \032 then update detection is skipped for files in this directory.\n\ + \032 (The purpose is to speed update detection for cases like Mail\n\ + \032 folders, which contain lots and lots of immutable files.) Also\n\ + \032 a preference assumeContentsAreImmutableNot, which overrides\n\ + \032 the first, similarly to ignorenot. (Later amendment: these\n\ + \032 preferences are now called immutable and immutablenot.)\n\ + \032 + The ignorecase flag has been changed from a boolean to a\n\ + \032 three-valued preference. The default setting, called default,\n\ + \032 checks the operating systems running on the client and server\n\ + \032 and ignores filename case if either of them is OSX or Windows.\n\ + \032 Setting ignorecase to true or false overrides this behavior.\n\ + \032 If you have been setting ignorecase on the command line using\n\ + \032 -ignorecase=true or -ignorecase=false, you will need to change\n\ + \032 to -ignorecase true or -ignorecase false.\n\ + \032 + a new preference, 'repeat', for the text user interface\n\ + \032 (only). If 'repeat' is set to a number, then, after it\n\ + \032 finishes synchronizing, Unison will wait for that many seconds\n\ + \032 and then start over, continuing this way until it is killed\n\ + \032 from outside. Setting repeat to true will automatically set\n\ + \032 the batch preference to true.\n\ + \032 + Excel files are now handled specially, so that the fastcheck\n\ + \032 optimization is skipped even if the fastcheck flag is set.\n\ + \032 (Excel does some naughty things with modtimes, making this\n\ + \032 optimization unreliable and leading to failures during change\n\ + \032 propagation.)\n\ + \032 + The ignorecase flag has been changed from a boolean to a\n\ + \032 three-valued preference. The default setting, called\n\ + \032 'default', checks the operating systems running on the client\n\ + \032 and server and ignores filename case if either of them is OSX\n\ + \032 or Windows. Setting ignorecase to 'true' or 'false' overrides\n\ + \032 this behavior.\n\ + \032 + Added a new preference, 'repeat', for the text user interface\n\ + \032 (only, at the moment). If 'repeat' is set to a number, then,\n\ + \032 after it finishes synchronizing, Unison will wait for that\n\ + \032 many seconds and then start over, continuing this way until it\n\ + \032 is killed from outside. Setting repeat to true will\n\ + \032 automatically set the batch preference to true.\n\ + \032 + The 'rshargs' preference has been split into 'rshargs' and\n\ + \032 'sshargs' (mainly to make the documentation clearer). In fact,\n\ + \032 'rshargs' is no longer mentioned in the documentation at all,\n\ + \032 since pretty much everybody uses ssh now anyway.\n\ + \032 * Documentation\n\ + \032 + The web pages have been completely redesigned and reorganized.\n\ + \032 (Thanks to Alan Schmitt for help with this.)\n\ + \032 * User interface improvements\n\ + \032 + Added a GTK2 user interface, capable (among other things) of\n\ + \032 displaying filenames in any locale encoding. Kudos to Stephen\n\ + \032 Tse for contributing this code!\n\ + \032 + The text UI now prints a list of failed and skipped transfers\n\ + \032 at the end of synchronization.\n\ + \032 + Restarting update detection from the graphical UI will reload\n\ + \032 the current profile (which in particular will reset the -path\n\ + \032 preference, in case it has been narrowed by using the \"Recheck\n\ + \032 unsynchronized items\" command).\n\ + \032 + Several small improvements to the text user interface,\n\ + \032 including a progress display.\n\ + \032 * Bug fixes (too numerous to count, actually, but here are some):\n\ + \032 + The maxthreads preference works now.\n\ + \032 + Fixed bug where warning message about uname returning an\n\ + \032 unrecognized result was preventing connection to server. (The\n\ + \032 warning is no longer printed, and all systems where 'uname'\n\ + \032 returns anything other than 'Darwin' are assumed not to be\n\ + \032 running OS X.)\n\ + \032 + Fixed a problem on OS X that caused some valid file names\n\ + \032 (e.g., those including colons) to be considered invalid.\n\ + \032 + Patched Path.followLink to follow links under cygwin in\n\ + \032 addition to Unix (suggested by Matt Swift).\n\ + \032 + Small change to the storeRootsName function, suggested by\n\ + \032 bliviero at ichips.intel.com, to fix a problem in unison with\n\ + \032 the `rootalias' option, which allows you to tell unison that\n\ + \032 two roots contain the same files. Rootalias was being applied\n\ + \032 after the hosts were sorted, so it wouldn't work properly in\n\ + \032 all cases.\n\ + \032 + Incorporated a fix by Dmitry Bely for setting utimes of\n\ + \032 read-only files on Win32 systems.\n\ + \032 * Installation / portability:\n\ + \032 + Unison now compiles with OCaml version 3.07 and later out of\n\ + \032 the box.\n\ + \032 + Makefile.OCaml fixed to compile out of the box under OpenBSD.\n\ + \032 + a few additional ports (e.g. OpenBSD, Zaurus/IPAQ) are now\n\ + \032 mentioned in the documentation\n\ + \032 + Unison can now be installed easily on OSX systems using the\n\ + \032 Fink package manager\n\ + \n\ + \032 Changes since 2.9.1:\n\ + \032 * Added a preference maxthreads that can be used to limit the number\n\ + \032 of simultaneous file transfers.\n\ + \032 * Added a backupdir preference, which controls where backup files are\n\ + \032 stored.\n\ + \032 * Basic support added for OSX. In particular, Unison now recognizes\n\ + \032 when one of the hosts being synchronized is running OSX and\n\ + \032 switches to a case-insensitive treatment of filenames (i.e., 'foo'\n\ + \032 and 'FOO' are considered to be the same file). (OSX is not yet\n\ + \032 fully working, however: in particular, files with resource forks\n\ + \032 will not be synchronized correctly.)\n\ + \032 * The same hash used to form the archive name is now also added to\n\ + \032 the names of the temp files created during file transfer. The\n\ + \032 reason for this is that, during update detection, we are going to\n\ + \032 silently delete any old temp files that we find along the way, and\n\ + \032 we want to prevent ourselves from deleting temp files belonging to\n\ + \032 other instances of Unison that may be running in parallel, e.g.\n\ + \032 synchronizing with a different host. Thanks to Ruslan Ermilov for\n\ + \032 this suggestion.\n\ + \032 * Several small user interface improvements\n\ + \032 * Documentation\n\ + \032 + FAQ and bug reporting instructions have been split out as\n\ + \032 separate HTML pages, accessible directly from the unison web\n\ + \032 page.\n\ + \032 + Additions to FAQ, in particular suggestions about performance\n\ + \032 tuning.\n\ + \032 * Makefile\n\ + \032 + Makefile.OCaml now sets UISTYLE=text or UISTYLE=gtk\n\ + \032 automatically, depending on whether it finds lablgtk installed\n\ + \032 + Unison should now compile \"out of the box\" under OSX\n\ + \n\ + \032 Changes since 2.8.1:\n\ + \032 * Changing profile works again under Windows\n\ + \032 * File movement optimization: Unison now tries to use local copy\n\ + \032 instead of transfer for moved or copied files. It is controled by a\n\ + \032 boolean option \"xferbycopying\".\n\ + \032 * Network statistics window (transfer rate, amount of data\n\ + \032 transferred). [NB: not available in Windows-Cygwin version.]\n\ + \032 * symlinks work under the cygwin version (which is dynamically\n\ + \032 linked).\n\ + \032 * Fixed potential deadlock when synchronizing between Windows and\n\ + \032 Unix\n\ + \032 * Small improvements:\n\ + \032 + If neither the USERPROFILE nor the HOME environment variables\n\ + \032 are set, then Unison will put its temporary commit log (called\n\ + \032 DANGER.README) into the directory named by the UNISON\n\ + \032 environment variable, if any; otherwise it will use C:.\n\ + \032 + alternative set of values for fastcheck: yes = true; no =\n\ + \032 false; default = auto.\n\ + \032 + -silent implies -contactquietly\n\ + \032 * Source code:\n\ + \032 + Code reorganization and tidying. (Started breaking up some of\n\ + \032 the basic utility modules so that the non-unison-specific\n\ + \032 stuff can be made available for other projects.)\n\ + \032 + several Makefile and docs changes (for release);\n\ + \032 + further comments in \"update.ml\";\n\ + \032 + connection information is not stored in global variables\n\ + \032 anymore.\n\ + \n\ + \032 Changes since 2.7.78:\n\ + \032 * Small bugfix to textual user interface under Unix (to avoid leaving\n\ + \032 the terminal in a bad state where it would not echo inputs after\n\ + \032 Unison exited).\n\ + \n\ + \032 Changes since 2.7.39:\n\ + \032 * Improvements to the main web page (stable and beta version docs are\n\ + \032 now both accessible).\n\ + \032 * User manual revised.\n\ + \032 * Added some new preferences:\n\ + \032 + \"sshcmd\" and \"rshcmd\" for specifying paths to ssh and rsh\n\ + \032 programs.\n\ + \032 + \"contactquietly\" for suppressing the \"contacting server\"\n\ + \032 message during Unison startup (under the graphical UI).\n\ + \032 * Bug fixes:\n\ + \032 + Fixed small bug in UI that neglected to change the displayed\n\ + \032 column headers if loading a new profile caused the roots to\n\ + \032 change.\n\ + \032 + Fixed a bug that would put the text UI into an infinite loop\n\ + \032 if it encountered a conflict when run in batch mode.\n\ + \032 + Added some code to try to fix the display of non-Ascii\n\ + \032 characters in filenames on Windows systems in the GTK UI.\n\ + \032 (This code is currently untested--if you're one of the people\n\ + \032 that had reported problems with display of non-ascii\n\ + \032 filenames, we'd appreciate knowing if this actually fixes\n\ + \032 things.)\n\ + \032 + `-prefer/-force newer' works properly now. (The bug was\n\ + \032 reported by Sebastian Urbaniak and Sean Fulton.)\n\ + \032 * User interface and Unison behavior:\n\ + \032 + Renamed `Proceed' to `Go' in the graphical UI.\n\ + \032 + Added exit status for the textual user interface.\n\ + \032 + Paths that are not synchronized because of conflicts or errors\n\ + \032 during update detection are now noted in the log file.\n\ + \032 + [END] messages in log now use a briefer format\n\ + \032 + Changed the text UI startup sequence so that ./unison -ui text\n\ + \032 will use the default profile instead of failing.\n\ + \032 + Made some improvements to the error messages.\n\ + \032 + Added some debugging messages to remote.ml.\n\ + \n\ + \032 Changes since 2.7.7:\n\ + \032 * Incorporated, once again, a multi-threaded transport sub-system. It\n\ + \032 transfers several files at the same time, thereby making much more\n\ + \032 effective use of available network bandwidth. Unlike the earlier\n\ + \032 attempt, this time we do not rely on the native thread library of\n\ + \032 OCaml. Instead, we implement a light-weight, non-preemptive\n\ + \032 multi-thread library in OCaml directly. This version appears\n\ + \032 stable.\n\ + \032 Some adjustments to unison are made to accommodate the\n\ + \032 multi-threaded version. These include, in particular, changes to\n\ + \032 the user interface and logging, for example:\n\ + \032 + Two log entries for each transferring task, one for the\n\ + \032 beginning, one for the end.\n\ + \032 + Suppressed warning messages against removing temp files left\n\ + \032 by a previous unison run, because warning does not work nicely\n\ + \032 under multi-threading. The temp file names are made less\n\ + \032 likely to coincide with the name of a file created by the\n\ + \032 user. They take the form\n\ + \032 .#..unison.tmp. [N.b. This was later changed\n\ + \032 to .unison...unison.tmp.]\n\ + \032 * Added a new command to the GTK user interface: pressing 'f' causes\n\ + \032 Unison to start a new update detection phase, using as paths just\n\ + \032 those paths that have been detected as changed and not yet marked\n\ + \032 as successfully completed. Use this command to quickly restart\n\ + \032 Unison on just the set of paths still needing attention after a\n\ + \032 previous run.\n\ + \032 * Made the ignorecase preference user-visible, and changed the\n\ + \032 initialization code so that it can be manually set to true, even if\n\ + \032 neither host is running Windows. (This may be useful, e.g., when\n\ + \032 using Unison running on a Unix system with a FAT volume mounted.)\n\ + \032 * Small improvements and bug fixes:\n\ + \032 + Errors in preference files now generate fatal errors rather\n\ + \032 than warnings at startup time. (I.e., you can't go on from\n\ + \032 them.) Also, we fixed a bug that was preventing these warnings\n\ + \032 from appearing in the text UI, so some users who have been\n\ + \032 running (unsuspectingly) with garbage in their prefs files may\n\ + \032 now get error reports.\n\ + \032 + Error reporting for preference files now provides file name\n\ + \032 and line number.\n\ + \032 + More intelligible message in the case of identical change to\n\ + \032 the same files: \"Nothing to do: replicas have been changed\n\ + \032 only in identical ways since last sync.\"\n\ + \032 + Files with prefix '.#' excluded when scanning for preference\n\ + \032 files.\n\ + \032 + Rsync instructions are send directly instead of first\n\ + \032 marshaled.\n\ + \032 + Won't try forever to get the fingerprint of a continuously\n\ + \032 changing file: unison will give up after certain number of\n\ + \032 retries.\n\ + \032 + Other bug fixes, including the one reported by Peter Selinger\n\ + \032 (force=older preference not working).\n\ + \032 * Compilation:\n\ + \032 + Upgraded to the new OCaml 3.04 compiler, with the LablGtk\n\ + \032 1.2.3 library (patched version used for compiling under\n\ + \032 Windows).\n\ + \032 + Added the option to compile unison on the Windows platform\n\ + \032 with Cygwin GNU C compiler. This option only supports building\n\ + \032 dynamically linked unison executables.\n\ + \n\ + \032 Changes since 2.7.4:\n\ + \032 * Fixed a silly (but debilitating) bug in the client startup\n\ + \032 sequence.\n\ + \n\ + \032 Changes since 2.7.1:\n\ + \032 * Added addprefsto preference, which (when set) controls which\n\ + \032 preference file new preferences (e.g. new ignore patterns) are\n\ + \032 added to.\n\ + \032 * Bug fix: read the initial connection header one byte at a time, so\n\ + \032 that we don't block if the header is shorter than expected. (This\n\ + \032 bug did not affect normal operation -- it just made it hard to tell\n\ + \032 when you were trying to use Unison incorrectly with an old version\n\ + \032 of the server, since it would hang instead of giving an error\n\ + \032 message.)\n\ + \n\ + \032 Changes since 2.6.59:\n\ + \032 * Changed fastcheck from a boolean to a string preference. Its legal\n\ + \032 values are yes (for a fast check), no (for a safe check), or\n\ + \032 default (for a fast check--which also happens to be safe--when\n\ + \032 running on Unix and a safe check when on Windows). The default is\n\ + \032 default.\n\ + \032 * Several preferences have been renamed for consistency. All\n\ + \032 preference names are now spelled out in lowercase. For backward\n\ + \032 compatibility, the old names still work, but they are not mentioned\n\ + \032 in the manual any more.\n\ + \032 * The temp files created by the 'diff' and 'merge' commands are now\n\ + \032 named by prepending a new prefix to the file name, rather than\n\ + \032 appending a suffix. This should avoid confusing diff/merge programs\n\ + \032 that depend on the suffix to guess the type of the file contents.\n\ + \032 * We now set the keepalive option on the server socket, to make sure\n\ + \032 that the server times out if the communication link is unexpectedly\n\ + \032 broken.\n\ + \032 * Bug fixes:\n\ + \032 + When updating small files, Unison now closes the destination\n\ + \032 file.\n\ + \032 + File permissions are properly updated when the file is behind\n\ + \032 a followed link.\n\ + \032 + Several other small fixes.\n\ + \n\ + \032 Changes since 2.6.38:\n\ + \032 * Major Windows performance improvement!\n\ + \032 We've added a preference fastcheck that makes Unison look only at a\n\ + \032 file's creation time and last-modified time to check whether it has\n\ + \032 changed. This should result in a huge speedup when checking for\n\ + \032 updates in large replicas.\n\ + \032 When this switch is set, Unison will use file creation times as\n\ + \032 'pseudo inode numbers' when scanning Windows replicas for updates,\n\ + \032 instead of reading the full contents of every file. This may cause\n\ + \032 Unison to miss propagating an update if the create time,\n\ + \032 modification time, and length of the file are all unchanged by the\n\ + \032 update (this is not easy to achieve, but it can be done). However,\n\ + \032 Unison will never overwrite such an update with a change from the\n\ + \032 other replica, since it always does a safe check for updates just\n\ + \032 before propagating a change. Thus, it is reasonable to use this\n\ + \032 switch most of the time and occasionally run Unison once with\n\ + \032 fastcheck set to false, if you are worried that Unison may have\n\ + \032 overlooked an update.\n\ + \032 Warning: This change is has not yet been thoroughly field-tested.\n\ + \032 If you set the fastcheck preference, pay careful attention to what\n\ + \032 Unison is doing.\n\ + \032 * New functionality: centralized backups and merging\n\ + \032 + This version incorporates two pieces of major new\n\ + \032 functionality, implemented by Sylvain Roy during a summer\n\ + \032 internship at Penn: a centralized backup facility that keeps a\n\ + \032 full backup of (selected files in) each replica, and a merging\n\ + \032 feature that allows Unison to invoke an external file-merging\n\ + \032 tool to resolve conflicting changes to individual files.\n\ + \032 + Centralized backups:\n\ + \032 o Unison now maintains full backups of the\n\ + \032 last-synchronized versions of (some of) the files in each\n\ + \032 replica; these function both as backups in the usual\n\ + \032 sense and as the \"common version\" when invoking external\n\ + \032 merge programs.\n\ + \032 o The backed up files are stored in a directory\n\ + \032 /.unison/backup on each host. (The name of this directory\n\ + \032 can be changed by setting the environment variable\n\ + \032 UNISONBACKUPDIR.)\n\ + \032 o The predicate backup controls which files are actually\n\ + \032 backed up: giving the preference 'backup = Path *' causes\n\ + \032 backing up of all files.\n\ + \032 o Files are added to the backup directory whenever unison\n\ + \032 updates its archive. This means that\n\ + \032 # When unison reconstructs its archive from scratch\n\ + \032 (e.g., because of an upgrade, or because the archive\n\ + \032 files have been manually deleted), all files will be\n\ + \032 backed up.\n\ + \032 # Otherwise, each file will be backed up the first\n\ + \032 time unison propagates an update for it.\n\ + \032 o The preference backupversions controls how many previous\n\ + \032 versions of each file are kept. The default is 2 (i.e.,\n\ + \032 the last synchronized version plus one backup).\n\ + \032 o For backward compatibility, the backups preference is\n\ + \032 also still supported, but backup is now preferred.\n\ + \032 o It is OK to manually delete files from the backup\n\ + \032 directory (or to throw away the directory itself). Before\n\ + \032 unison uses any of these files for anything important, it\n\ + \032 checks that its fingerprint matches the one that it\n\ + \032 expects.\n\ + \032 + Merging:\n\ + \032 o Both user interfaces offer a new 'merge' command, invoked\n\ + \032 by pressing 'm' (with a changed file selected).\n\ + \032 o The actual merging is performed by an external program.\n\ + \032 The preferences merge and merge2 control how this program\n\ + \032 is invoked. If a backup exists for this file (see the\n\ + \032 backup preference), then the merge preference is used for\n\ + \032 this purpose; otherwise merge2 is used. In both cases,\n\ + \032 the value of the preference should be a string\n\ + \032 representing the command that should be passed to a shell\n\ + \032 to invoke the merge program. Within this string, the\n\ + \032 special substrings CURRENT1, CURRENT2, NEW, and OLD may\n\ + \032 appear at any point. Unison will substitute these as\n\ + \032 follows before invoking the command:\n\ + \032 # CURRENT1 is replaced by the name of the local copy\n\ + \032 of the file;\n\ + \032 # CURRENT2 is replaced by the name of a temporary\n\ + \032 file, into which the contents of the remote copy of\n\ + \032 the file have been transferred by Unison prior to\n\ + \032 performing the merge;\n\ + \032 # NEW is replaced by the name of a temporary file that\n\ + \032 Unison expects to be written by the merge program\n\ + \032 when it finishes, giving the desired new contents of\n\ + \032 the file; and\n\ + \032 # OLD is replaced by the name of the backed up copy of\n\ + \032 the original version of the file (i.e., its state at\n\ + \032 the end of the last successful run of Unison), if\n\ + \032 one exists (applies only to merge, not merge2).\n\ + \032 For example, on Unix systems setting the merge preference\n\ + \032 to\n\ + \032 merge = diff3 -m CURRENT1 OLD CURRENT2 > NEW\n\ + \n\ + \032 will tell Unison to use the external diff3 program for\n\ + \032 merging.\n\ + \032 A large number of external merging programs are\n\ + \032 available. For example, emacs users may find the\n\ + \032 following convenient:\n\ + \032 merge2 = emacs -q --eval '(ediff-merge-files \"CURRENT1\" \"CURRENT2\"\n\ + \032 nil \"NEW\")'\n\ + \032 merge = emacs -q --eval '(ediff-merge-files-with-ancestor\n\ + \032 \"CURRENT1\" \"CURRENT2\" \"OLD\" nil \"NEW\")'\n\ + \n\ + \032 (These commands are displayed here on two lines to avoid\n\ + \032 running off the edge of the page. In your preference\n\ + \032 file, each should be written on a single line.)\n\ + \032 o If the external program exits without leaving any file at\n\ + \032 the path NEW, Unison considers the merge to have failed.\n\ + \032 If the merge program writes a file called NEW but exits\n\ + \032 with a non-zero status code, then Unison considers the\n\ + \032 merge to have succeeded but to have generated conflicts.\n\ + \032 In this case, it attempts to invoke an external editor so\n\ + \032 that the user can resolve the conflicts. The value of the\n\ + \032 editor preference controls what editor is invoked by\n\ + \032 Unison. The default is emacs.\n\ + \032 o Please send us suggestions for other useful values of the\n\ + \032 merge2 and merge preferences - we'd like to give several\n\ + \032 examples in the manual.\n\ + \032 * Smaller changes:\n\ + \032 + When one preference file includes another, unison no longer\n\ + \032 adds the suffix '.prf' to the included file by default. If a\n\ + \032 file with precisely the given name exists in the .unison\n\ + \032 directory, it will be used; otherwise Unison will add .prf, as\n\ + \032 it did before. (This change means that included preference\n\ + \032 files can be named blah.include instead of blah.prf, so that\n\ + \032 unison will not offer them in its 'choose a preference file'\n\ + \032 dialog.)\n\ + \032 + For Linux systems, we now offer both a statically linked and a\n\ + \032 dynamically linked executable. The static one is larger, but\n\ + \032 will probably run on more systems, since it doesn't depend on\n\ + \032 the same versions of dynamically linked library modules being\n\ + \032 available.\n\ + \032 + Fixed the force and prefer preferences, which were getting the\n\ + \032 propagation direction exactly backwards.\n\ + \032 + Fixed a bug in the startup code that would cause unison to\n\ + \032 crash when the default profile (~/.unison/default.prf) does\n\ + \032 not exist.\n\ + \032 + Fixed a bug where, on the run when a profile is first created,\n\ + \032 Unison would confusingly display the roots in reverse order in\n\ + \032 the user interface.\n\ + \032 * For developers:\n\ + \032 + We've added a module dependency diagram to the source\n\ + \032 distribution, in src/DEPENDENCIES.ps, to help new prospective\n\ + \032 developers with navigating the code.\n\ + \n\ + \032 Changes since 2.6.11:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed.\n\ + \032 * INCOMPATIBLE CHANGE: The startup sequence has been completely\n\ + \032 rewritten and greatly simplified. The main user-visible change is\n\ + \032 that the defaultpath preference has been removed. Its effect can be\n\ + \032 approximated by using multiple profiles, with include directives to\n\ + \032 incorporate common settings. All uses of defaultpath in existing\n\ + \032 profiles should be changed to path.\n\ + \032 Another change in startup behavior that will affect some users is\n\ + \032 that it is no longer possible to specify roots both in the profile\n\ + \032 and on the command line.\n\ + \032 You can achieve a similar effect, though, by breaking your profile\n\ + \032 into two:\n\ + \n\ + \032 default.prf =\n\ + \032 root = blah\n\ + \032 root = foo\n\ + \032 include common\n\ + \n\ + \032 common.prf =\n\ + \032 \n\ + \n\ + \032 Now do\n\ + \032 unison common root1 root2\n\ + \n\ + \032 when you want to specify roots explicitly.\n\ + \032 * The -prefer and -force options have been extended to allow users to\n\ + \032 specify that files with more recent modtimes should be propagated,\n\ + \032 writing either -prefer newer or -force newer. (For symmetry, Unison\n\ + \032 will also accept -prefer older or -force older.) The -force\n\ + \032 older/newer options can only be used when -times is also set.\n\ + \032 The graphical user interface provides access to these facilities on\n\ + \032 a one-off basis via the Actions menu.\n\ + \032 * Names of roots can now be \"aliased\" to allow replicas to be\n\ + \032 relocated without changing the name of the archive file where\n\ + \032 Unison stores information between runs. (This feature is for\n\ + \032 experts only. See the \"Archive Files\" section of the manual for\n\ + \032 more information.)\n\ + \032 * Graphical user-interface:\n\ + \032 + A new command is provided in the Synchronization menu for\n\ + \032 switching to a new profile without restarting Unison from\n\ + \032 scratch.\n\ + \032 + The GUI also supports one-key shortcuts for commonly used\n\ + \032 profiles. If a profile contains a preference of the form 'key\n\ + \032 = n', where n is a single digit, then pressing this key will\n\ + \032 cause Unison to immediately switch to this profile and begin\n\ + \032 synchronization again from scratch. (Any actions that may have\n\ + \032 been selected for a set of changes currently being displayed\n\ + \032 will be discarded.)\n\ + \032 + Each profile may include a preference 'label = '\n\ + \032 giving a descriptive string that described the options\n\ + \032 selected in this profile. The string is listed along with the\n\ + \032 profile name in the profile selection dialog, and displayed in\n\ + \032 the top-right corner of the main Unison window.\n\ + \032 * Minor:\n\ + \032 + Fixed a bug that would sometimes cause the 'diff' display to\n\ + \032 order the files backwards relative to the main user interface.\n\ + \032 (Thanks to Pascal Brisset for this fix.)\n\ + \032 + On Unix systems, the graphical version of Unison will check\n\ + \032 the DISPLAY variable and, if it is not set, automatically fall\n\ + \032 back to the textual user interface.\n\ + \032 + Synchronization paths (path preferences) are now matched\n\ + \032 against the ignore preferences. So if a path is both specified\n\ + \032 in a path preference and ignored, it will be skipped.\n\ + \032 + Numerous other bugfixes and small improvements.\n\ + \n\ + \032 Changes since 2.6.1:\n\ + \032 * The synchronization of modification times has been disabled for\n\ + \032 directories.\n\ + \032 * Preference files may now include lines of the form include ,\n\ + \032 which will cause name.prf to be read at that point.\n\ + \032 * The synchronization of permission between Windows and Unix now\n\ + \032 works properly.\n\ + \032 * A binding CYGWIN=binmode in now added to the environment so that\n\ + \032 the Cygwin port of OpenSSH works properly in a non-Cygwin context.\n\ + \032 * The servercmd and addversionno preferences can now be used\n\ + \032 together: -addversionno appends an appropriate -NNN to the server\n\ + \032 command, which is found by using the value of the -servercmd\n\ + \032 preference if there is one, or else just unison.\n\ + \032 * Both '-pref=val' and '-pref val' are now allowed for boolean\n\ + \032 values. (The former can be used to set a preference to false.)\n\ + \032 * Lot of small bugs fixed.\n\ + \n\ + \032 Changes since 2.5.31:\n\ + \032 * The log preference is now set to true by default, since the log\n\ + \032 file seems useful for most users.\n\ + \032 * Several miscellaneous bugfixes (most involving symlinks).\n\ + \n\ + \032 Changes since 2.5.25:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed (again).\n\ + \032 * Several significant bugs introduced in 2.5.25 have been fixed.\n\ + \n\ + \032 Changes since 2.5.1:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed. Make sure you\n\ + \032 synchronize your replicas before upgrading, to avoid spurious\n\ + \032 conflicts. The first sync after upgrading will be slow.\n\ + \032 * New functionality:\n\ + \032 + Unison now synchronizes file modtimes, user-ids, and\n\ + \032 group-ids.\n\ + \032 These new features are controlled by a set of new preferences,\n\ + \032 all of which are currently false by default.\n\ + \032 o When the times preference is set to true, file\n\ + \032 modification times are propaged. (Because the\n\ + \032 representations of time may not have the same granularity\n\ + \032 on both replicas, Unison may not always be able to make\n\ + \032 the modtimes precisely equal, but it will get them as\n\ + \032 close as the operating systems involved allow.)\n\ + \032 o When the owner preference is set to true, file ownership\n\ + \032 information is synchronized.\n\ + \032 o When the group preference is set to true, group\n\ + \032 information is synchronized.\n\ + \032 o When the numericIds preference is set to true, owner and\n\ + \032 group information is synchronized numerically. By\n\ + \032 default, owner and group numbers are converted to names\n\ + \032 on each replica and these names are synchronized. (The\n\ + \032 special user id 0 and the special group 0 are never\n\ + \032 mapped via user/group names even if this preference is\n\ + \032 not set.)\n\ + \032 + Added an integer-valued preference perms that can be used to\n\ + \032 control the propagation of permission bits. The value of this\n\ + \032 preference is a mask indicating which permission bits should\n\ + \032 be synchronized. It is set by default to 0o1777: all bits but\n\ + \032 the set-uid and set-gid bits are synchronised (synchronizing\n\ + \032 theses latter bits can be a security hazard). If you want to\n\ + \032 synchronize all bits, you can set the value of this preference\n\ + \032 to -1.\n\ + \032 + Added a log preference (default false), which makes Unison\n\ + \032 keep a complete record of the changes it makes to the\n\ + \032 replicas. By default, this record is written to a file called\n\ + \032 unison.log in the user's home directory (the value of the HOME\n\ + \032 environment variable). If you want it someplace else, set the\n\ + \032 logfile preference to the full pathname you want Unison to\n\ + \032 use.\n\ + \032 + Added an ignorenot preference that maintains a set of patterns\n\ + \032 for paths that should definitely not be ignored, whether or\n\ + \032 not they match an ignore pattern. (That is, a path will now be\n\ + \032 ignored iff it matches an ignore pattern and does not match\n\ + \032 any ignorenot patterns.)\n\ + \032 * User-interface improvements:\n\ + \032 + Roots are now displayed in the user interface in the same\n\ + \032 order as they were given on the command line or in the\n\ + \032 preferences file.\n\ + \032 + When the batch preference is set, the graphical user interface\n\ + \032 no longer waits for user confirmation when it displays a\n\ + \032 warning message: it simply pops up an advisory window with a\n\ + \032 Dismiss button at the bottom and keeps on going.\n\ + \032 + Added a new preference for controlling how many status\n\ + \032 messages are printed during update detection: statusdepth\n\ + \032 controls the maximum depth for paths on the local machine\n\ + \032 (longer paths are not displayed, nor are non-directory paths).\n\ + \032 The value should be an integer; default is 1.\n\ + \032 + Removed the trace and silent preferences. They did not seem\n\ + \032 very useful, and there were too many preferences for\n\ + \032 controlling output in various ways.\n\ + \032 + The text UI now displays just the default command (the one\n\ + \032 that will be used if the user just types ) instead of\n\ + \032 all available commands. Typing ? will print the full list of\n\ + \032 possibilities.\n\ + \032 + The function that finds the canonical hostname of the local\n\ + \032 host (which is used, for example, in calculating the name of\n\ + \032 the archive file used to remember which files have been\n\ + \032 synchronized) normally uses the gethostname operating system\n\ + \032 call. However, if the environment variable UNISONLOCALHOSTNAME\n\ + \032 is set, its value will now be used instead. This makes it\n\ + \032 easier to use Unison in situations where a machine's name\n\ + \032 changes frequently (e.g., because it is a laptop and gets\n\ + \032 moved around a lot).\n\ + \032 + File owner and group are now displayed in the \"detail window\"\n\ + \032 at the bottom of the screen, when unison is configured to\n\ + \032 synchronize them.\n\ + \032 * For hackers:\n\ + \032 + Updated to Jacques Garrigue's new version of lablgtk, which\n\ + \032 means we can throw away our local patched version.\n\ + \032 If you're compiling the GTK version of unison from sources,\n\ + \032 you'll need to update your copy of lablgtk to the developers\n\ + \032 release. (Warning: installing lablgtk under Windows is\n\ + \032 currently a bit challenging.)\n\ + \032 + The TODO.txt file (in the source distribution) has been\n\ + \032 cleaned up and reorganized. The list of pending tasks should\n\ + \032 be much easier to make sense of, for people that may want to\n\ + \032 contribute their programming energies. There is also a\n\ + \032 separate file BUGS.txt for open bugs.\n\ + \032 + The Tk user interface has been removed (it was not being\n\ + \032 maintained and no longer compiles).\n\ + \032 + The debug preference now prints quite a bit of additional\n\ + \032 information that should be useful for identifying sources of\n\ + \032 problems.\n\ + \032 + The version number of the remote server is now checked right\n\ + \032 away during the connection setup handshake, rather than later.\n\ + \032 (Somebody sent a bug report of a server crash that turned out\n\ + \032 to come from using inconsistent versions: better to check this\n\ + \032 earlier and in a way that can't crash either client or\n\ + \032 server.)\n\ + \032 + Unison now runs correctly on 64-bit architectures (e.g. Alpha\n\ + \032 linux). We will not be distributing binaries for these\n\ + \032 architectures ourselves (at least for a while) but if someone\n\ + \032 would like to make them available, we'll be glad to provide a\n\ + \032 link to them.\n\ + \032 * Bug fixes:\n\ + \032 + Pattern matching (e.g. for ignore) is now case-insensitive\n\ + \032 when Unison is in case-insensitive mode (i.e., when one of the\n\ + \032 replicas is on a windows machine).\n\ + \032 + Some people had trouble with mysterious failures during\n\ + \032 propagation of updates, where files would be falsely reported\n\ + \032 as having changed during synchronization. This should be\n\ + \032 fixed.\n\ + \032 + Numerous smaller fixes.\n\ + \n\ + \032 Changes since 2.4.1:\n\ + \032 * Added a number of 'sorting modes' for the user interface. By\n\ + \032 default, conflicting changes are displayed at the top, and the rest\n\ + \032 of the entries are sorted in alphabetical order. This behavior can\n\ + \032 be changed in the following ways:\n\ + \032 + Setting the sortnewfirst preference to true causes newly\n\ + \032 created files to be displayed before changed files.\n\ + \032 + Setting sortbysize causes files to be displayed in increasing\n\ + \032 order of size.\n\ + \032 + Giving the preference sortfirst= (where is\n\ + \032 a path descriptor in the same format as 'ignore' and 'follow'\n\ + \032 patterns, causes paths matching this pattern to be displayed\n\ + \032 first.\n\ + \032 + Similarly, giving the preference sortlast= causes\n\ + \032 paths matching this pattern to be displayed last.\n\ + \032 The sorting preferences are described in more detail in the user\n\ + \032 manual. The sortnewfirst and sortbysize flags can also be accessed\n\ + \032 from the 'Sort' menu in the grpahical user interface.\n\ + \032 * Added two new preferences that can be used to change unison's\n\ + \032 fundamental behavior to make it more like a mirroring tool instead\n\ + \032 of a synchronizer.\n\ + \032 + Giving the preference prefer with argument (by adding\n\ + \032 -prefer to the command line or prefer=) to your\n\ + \032 profile) means that, if there is a conflict, the contents of\n\ + \032 should be propagated to the other replica (with no\n\ + \032 questions asked). Non-conflicting changes are treated as\n\ + \032 usual.\n\ + \032 + Giving the preference force with argument will make\n\ + \032 unison resolve all differences in favor of the given root,\n\ + \032 even if it was the other replica that was changed.\n\ + \032 These options should be used with care! (More information is\n\ + \032 available in the manual.)\n\ + \032 * Small changes:\n\ + \032 + Changed default answer to 'Yes' in all two-button dialogs in\n\ + \032 the graphical interface (this seems more intuitive).\n\ + \032 + The rsync preference has been removed (it was used to activate\n\ + \032 rsync compression for file transfers, but rsync compression is\n\ + \032 now enabled by default).\n\ + \032 + In the text user interface, the arrows indicating which\n\ + \032 direction changes are being propagated are printed differently\n\ + \032 when the user has overridded Unison's default recommendation\n\ + \032 (====> instead of ---->). This matches the behavior of the\n\ + \032 graphical interface, which displays such arrows in a different\n\ + \032 color.\n\ + \032 + Carriage returns (Control-M's) are ignored at the ends of\n\ + \032 lines in profiles, for Windows compatibility.\n\ + \032 + All preferences are now fully documented in the user manual.\n\ + \n\ + \032 Changes since 2.3.12:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed. Make sure you\n\ + \032 synchronize your replicas before upgrading, to avoid spurious\n\ + \032 conflicts. The first sync after upgrading will be slow.\n\ + \032 * New/improved functionality:\n\ + \032 + A new preference -sortbysize controls the order in which\n\ + \032 changes are displayed to the user: when it is set to true, the\n\ + \032 smallest changed files are displayed first. (The default\n\ + \032 setting is false.)\n\ + \032 + A new preference -sortnewfirst causes newly created files to\n\ + \032 be listed before other updates in the user interface.\n\ + \032 + We now allow the ssh protocol to specify a port.\n\ + \032 + Incompatible change: The unison: protocol is deprecated, and\n\ + \032 we added file: and socket:. You may have to modify your\n\ + \032 profiles in the .unison directory. If a replica is specified\n\ + \032 without an explicit protocol, we now assume it refers to a\n\ + \032 file. (Previously \"//saul/foo\" meant to use SSH to connect to\n\ + \032 saul, then access the foo directory. Now it means to access\n\ + \032 saul via a remote file mechanism such as samba; the old effect\n\ + \032 is now achieved by writing ssh://saul/foo.)\n\ + \032 + Changed the startup sequence for the case where roots are\n\ + \032 given but no profile is given on the command line. The new\n\ + \032 behavior is to use the default profile (creating it if it does\n\ + \032 not exist), and temporarily override its roots. The manual\n\ + \032 claimed that this case would work by reading no profile at\n\ + \032 all, but AFAIK this was never true.\n\ + \032 + In all user interfaces, files with conflicts are always listed\n\ + \032 first\n\ + \032 + A new preference 'sshversion' can be used to control which\n\ + \032 version of ssh should be used to connect to the server. Legal\n\ + \032 values are 1 and 2. (Default is empty, which will make unison\n\ + \032 use whatever version of ssh is installed as the default 'ssh'\n\ + \032 command.)\n\ + \032 + The situation when the permissions of a file was updated the\n\ + \032 same on both side is now handled correctly (we used to report\n\ + \032 a spurious conflict)\n\ + \032 * Improvements for the Windows version:\n\ + \032 + The fact that filenames are treated case-insensitively under\n\ + \032 Windows should now be handled correctly. The exact behavior is\n\ + \032 described in the cross-platform section of the manual.\n\ + \032 + It should be possible to synchronize with Windows shares,\n\ + \032 e.g., //host/drive/path.\n\ + \032 + Workarounds to the bug in syncing root directories in Windows.\n\ + \032 The most difficult thing to fix is an ocaml bug: Unix.opendir\n\ + \032 fails on c: in some versions of Windows.\n\ + \032 * Improvements to the GTK user interface (the Tk interface is no\n\ + \032 longer being maintained):\n\ + \032 + The UI now displays actions differently (in blue) when they\n\ + \032 have been explicitly changed by the user from Unison's default\n\ + \032 recommendation.\n\ + \032 + More colorful appearance.\n\ + \032 + The initial profile selection window works better.\n\ + \032 + If any transfers failed, a message to this effect is displayed\n\ + \032 along with 'Synchronization complete' at the end of the\n\ + \032 transfer phase (in case they may have scrolled off the top).\n\ + \032 + Added a global progress meter, displaying the percentage of\n\ + \032 total bytes that have been transferred so far.\n\ + \032 * Improvements to the text user interface:\n\ + \032 + The file details will be displayed automatically when a\n\ + \032 conflict is been detected.\n\ + \032 + when a warning is generated (e.g. for a temporary file left\n\ + \032 over from a previous run of unison) Unison will no longer wait\n\ + \032 for a response if it is running in -batch mode.\n\ + \032 + The UI now displays a short list of possible inputs each time\n\ + \032 it waits for user interaction.\n\ + \032 + The UI now quits immediately (rather than looping back and\n\ + \032 starting the interaction again) if the user presses 'q' when\n\ + \032 asked whether to propagate changes.\n\ + \032 + Pressing 'g' in the text user interface will proceed\n\ + \032 immediately with propagating updates, without asking any more\n\ + \032 questions.\n\ + \032 * Documentation and installation changes:\n\ + \032 + The manual now includes a FAQ, plus sections on common\n\ + \032 problems and on tricks contributed by users.\n\ + \032 + Both the download page and the download directory explicitly\n\ + \032 say what are the current stable and beta-test version numbers.\n\ + \032 + The OCaml sources for the up-to-the-minute developers' version\n\ + \032 (not guaranteed to be stable, or even to compile, at any given\n\ + \032 time!) are now available from the download page.\n\ + \032 + Added a subsection to the manual describing cross-platform\n\ + \032 issues (case conflicts, illegal filenames)\n\ + \032 * Many small bug fixes and random improvements.\n\ + \n\ + \032 Changes since 2.3.1:\n\ + \032 * Several bug fixes. The most important is a bug in the rsync module\n\ + \032 that would occasionally cause change propagation to fail with a\n\ + \032 'rename' error.\n\ + \n\ + \032 Changes since 2.2:\n\ + \032 * The multi-threaded transport system is now disabled by default. (It\n\ + \032 is not stable enough yet.)\n\ + \032 * Various bug fixes.\n\ + \032 * A new experimental feature:\n\ + \032 The final component of a -path argument may now be the wildcard\n\ + \032 specifier *. When Unison sees such a path, it expands this path on\n\ + \032 the client into into the corresponding list of paths by listing the\n\ + \032 contents of that directory.\n\ + \032 Note that if you use wildcard paths from the command line, you will\n\ + \032 probably need to use quotes or a backslash to prevent the * from\n\ + \032 being interpreted by your shell.\n\ + \032 If both roots are local, the contents of the first one will be used\n\ + \032 for expanding wildcard paths. (Nb: this is the first one after the\n\ + \032 canonization step - i.e., the one that is listed first in the user\n\ + \032 interface - not the one listed first on the command line or in the\n\ + \032 preferences file.)\n\ + \n\ + \032 Changes since 2.1:\n\ + \032 * The transport subsystem now includes an implementation by Sylvain\n\ + \032 Gommier and Norman Ramsey of Tridgell and Mackerras's rsync\n\ + \032 protocol. This protocol achieves much faster transfers when only a\n\ + \032 small part of a large file has been changed by sending just diffs.\n\ + \032 This feature is mainly helpful for transfers over slow links--on\n\ + \032 fast local area networks it can actually degrade performance--so we\n\ + \032 have left it off by default. Start unison with the -rsync option\n\ + \032 (or put rsync=true in your preferences file) to turn it on.\n\ + \032 * \"Progress bars\" are now diplayed during remote file transfers,\n\ + \032 showing what percentage of each file has been transferred so far.\n\ + \032 * The version numbering scheme has changed. New releases will now be\n\ + \032 have numbers like 2.2.30, where the second component is incremented\n\ + \032 on every significant public release and the third component is the\n\ + \032 \"patch level.\"\n\ + \032 * Miscellaneous improvements to the GTK-based user interface.\n\ + \032 * The manual is now available in PDF format.\n\ + \032 * We are experimenting with using a multi-threaded transport\n\ + \032 subsystem to transfer several files at the same time, making much\n\ + \032 more effective use of available network bandwidth. This feature is\n\ + \032 not completely stable yet, so by default it is disabled in the\n\ + \032 release version of Unison.\n\ + \032 If you want to play with the multi-threaded version, you'll need to\n\ + \032 recompile Unison from sources (as described in the documentation),\n\ + \032 setting the THREADS flag in Makefile.OCaml to true. Make sure that\n\ + \032 your OCaml compiler has been installed with the -with-pthreads\n\ + \032 configuration option. (You can verify this by checking whether the\n\ + \032 file threads/threads.cma in the OCaml standard library directory\n\ + \032 contains the string -lpthread near the end.)\n\ + \n\ + \032 Changes since 1.292:\n\ + \032 * Reduced memory footprint (this is especially important during the\n\ + \032 first run of unison, where it has to gather information about all\n\ + \032 the files in both repositories).\n\ + \032 * Fixed a bug that would cause the socket server under NT to fail\n\ + \032 after the client exits.\n\ + \032 * Added a SHIFT modifier to the Ignore menu shortcut keys in GTK\n\ + \032 interface (to avoid hitting them accidentally).\n\ + \n\ + \032 Changes since 1.231:\n\ + \032 * Tunneling over ssh is now supported in the Windows version. See the\n\ + \032 installation section of the manual for detailed instructions.\n\ + \032 * The transport subsystem now includes an implementation of the rsync\n\ + \032 protocol, built by Sylvain Gommier and Norman Ramsey. This protocol\n\ + \032 achieves much faster transfers when only a small part of a large\n\ + \032 file has been changed by sending just diffs. The rsync feature is\n\ + \032 off by default in the current version. Use the -rsync switch to\n\ + \032 turn it on. (Nb. We still have a lot of tuning to do: you may not\n\ + \032 notice much speedup yet.)\n\ + \032 * We're experimenting with a multi-threaded transport subsystem,\n\ + \032 written by Jerome Vouillon. The downloadable binaries are still\n\ + \032 single-threaded: if you want to try the multi-threaded version,\n\ + \032 you'll need to recompile from sources. (Say make THREADS=true.)\n\ + \032 Native thread support from the compiler is required. Use the option\n\ + \032 -threads N to select the maximal number of concurrent threads\n\ + \032 (default is 5). Multi-threaded and single-threaded clients/servers\n\ + \032 can interoperate.\n\ + \032 * A new GTK-based user interface is now available, thanks to Jacques\n\ + \032 Garrigue. The Tk user interface still works, but we'll be shifting\n\ + \032 development effort to the GTK interface from now on.\n\ + \032 * OCaml 3.00 is now required for compiling Unison from sources. The\n\ + \032 modules uitk and myfileselect have been changed to use labltk\n\ + \032 instead of camltk. To compile the Tk interface in Windows, you must\n\ + \032 have ocaml-3.00 and tk8.3. When installing tk8.3, put it in c:\\Tcl\n\ + \032 rather than the suggested c:\\Program Files\\Tcl, and be sure to\n\ + \032 install the headers and libraries (which are not installed by\n\ + \032 default).\n\ + \032 * Added a new -addversionno switch, which causes unison to use\n\ + \032 unison- instead of just unison as the remote\n\ + \032 server command. This allows multiple versions of unison to coexist\n\ + \032 conveniently on the same server: whichever version is run on the\n\ + \032 client, the same version will be selected on the server.\n\ + \n\ + \032 Changes since 1.219:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed. Make sure you\n\ + \032 synchronize your replicas before upgrading, to avoid spurious\n\ + \032 conflicts. The first sync after upgrading will be slow.\n\ + \032 * This version fixes several annoying bugs, including:\n\ + \032 + Some cases where propagation of file permissions was not\n\ + \032 working.\n\ + \032 + umask is now ignored when creating directories\n\ + \032 + directories are create writable, so that a read-only directory\n\ + \032 and its contents can be propagated.\n\ + \032 + Handling of warnings generated by the server.\n\ + \032 + Synchronizing a path whose parent is not a directory on both\n\ + \032 sides is now flagged as erroneous.\n\ + \032 + Fixed some bugs related to symnbolic links and nonexistant\n\ + \032 roots.\n\ + \032 o When a change (deletion or new contents) is propagated\n\ + \032 onto a 'follow'ed symlink, the file pointed to by the\n\ + \032 link is now changed. (We used to change the link itself,\n\ + \032 which doesn't fit our assertion that 'follow' means the\n\ + \032 link is completely invisible)\n\ + \032 o When one root did not exist, propagating the other root\n\ + \032 on top of it used to fail, becuase unison could not\n\ + \032 calculate the working directory into which to write\n\ + \032 changes. This should be fixed.\n\ + \032 * A human-readable timestamp has been added to Unison's archive\n\ + \032 files.\n\ + \032 * The semantics of Path and Name regular expressions now correspond\n\ + \032 better.\n\ + \032 * Some minor improvements to the text UI (e.g. a command for going\n\ + \032 back to previous items)\n\ + \032 * The organization of the export directory has changed -- should be\n\ + \032 easier to find / download things now.\n\ + \n\ + \032 Changes since 1.200:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed. Make sure you\n\ + \032 synchronize your replicas before upgrading, to avoid spurious\n\ + \032 conflicts. The first sync after upgrading will be slow.\n\ + \032 * This version has not been tested extensively on Windows.\n\ + \032 * Major internal changes designed to make unison safer to run at the\n\ + \032 same time as the replicas are being changed by the user.\n\ + \032 * Internal performance improvements.\n\ + \n\ + \032 Changes since 1.190:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed. Make sure you\n\ + \032 synchronize your replicas before upgrading, to avoid spurious\n\ + \032 conflicts. The first sync after upgrading will be slow.\n\ + \032 * A number of internal functions have been changed to reduce the\n\ + \032 amount of memory allocation, especially during the first\n\ + \032 synchronization. This should help power users with very big\n\ + \032 replicas.\n\ + \032 * Reimplementation of low-level remote procedure call stuff, in\n\ + \032 preparation for adding rsync-like smart file transfer in a later\n\ + \032 release.\n\ + \032 * Miscellaneous bug fixes.\n\ + \n\ + \032 Changes since 1.180:\n\ + \032 * INCOMPATIBLE CHANGE: Archive format has changed. Make sure you\n\ + \032 synchronize your replicas before upgrading, to avoid spurious\n\ + \032 conflicts. The first sync after upgrading will be slow.\n\ + \032 * Fixed some small bugs in the interpretation of ignore patterns.\n\ + \032 * Fixed some problems that were preventing the Windows version from\n\ + \032 working correctly when click-started.\n\ + \032 * Fixes to treatment of file permissions under Windows, which were\n\ + \032 causing spurious reports of different permissions when\n\ + \032 synchronizing between windows and unix systems.\n\ + \032 * Fixed one more non-tail-recursive list processing function, which\n\ + \032 was causing stack overflows when synchronizing very large replicas.\n\ + \n\ + \032 Changes since 1.169:\n\ + \032 * The text user interface now provides commands for ignoring files.\n\ + \032 * We found and fixed some more non-tail-recursive list processing\n\ + \032 functions. Some power users have reported success with very large\n\ + \032 replicas.\n\ + \032 * INCOMPATIBLE CHANGE: Files ending in .tmp are no longer ignored\n\ + \032 automatically. If you want to ignore such files, put an appropriate\n\ + \032 ignore pattern in your profile.\n\ + \032 * INCOMPATIBLE CHANGE: The syntax of ignore and follow patterns has\n\ + \032 changed. Instead of putting a line of the form\n\ + \032 ignore = \n\ + \n\ + \032 in your profile (.unison/default.prf), you should put:\n\ + \032 ignore = Regex \n\ + \n\ + \032 Moreover, two other styles of pattern are also recognized:\n\ + \032 ignore = Name \n\ + \n\ + \032 matches any path in which one component matches , while\n\ + \032 ignore = Path \n\ + \n\ + \032 matches exactly the path .\n\ + \032 Standard \"globbing\" conventions can be used in and :\n\ + \032 + a ? matches any single character except /\n\ + \032 + a * matches any sequence of characters not including /\n\ + \032 + [xyz] matches any character from the set {x, y, z }\n\ + \032 + {a,bb,ccc} matches any one of a, bb, or ccc.\n\ + \032 See the user manual for some examples.\n\ + \n\ + \032 Changes since 1.146:\n\ + \032 * Some users were reporting stack overflows when synchronizing huge\n\ + \032 directories. We found and fixed some non-tail-recursive list\n\ + \032 processing functions, which we hope will solve the problem. Please\n\ + \032 give it a try and let us know.\n\ + \032 * Major additions to the documentation.\n\ + \n\ + \032 Changes since 1.142:\n\ + \032 * Major internal tidying and many small bugfixes.\n\ + \032 * Major additions to the user manual.\n\ + \032 * Unison can now be started with no arguments - it will prompt\n\ + \032 automatically for the name of a profile file containing the roots\n\ + \032 to be synchronized. This makes it possible to start the graphical\n\ + \032 UI from a desktop icon.\n\ + \032 * Fixed a small bug where the text UI on NT was raising a 'no such\n\ + \032 signal' exception.\n\ + \n\ + \032 Changes since 1.139:\n\ + \032 * The precompiled windows binary in the last release was compiled\n\ + \032 with an old OCaml compiler, causing propagation of permissions not\n\ + \032 to work (and perhaps leading to some other strange behaviors we've\n\ + \032 heard reports about). This has been corrected. If you're using\n\ + \032 precompiled binaries on Windows, please upgrade.\n\ + \032 * Added a -debug command line flag, which controls debugging of\n\ + \032 various modules. Say -debug XXX to enable debug tracing for module\n\ + \032 XXX, or -debug all to turn on absolutely everything.\n\ + \032 * Fixed a small bug where the text UI on NT was raising a 'no such\n\ + \032 signal' exception.\n\ + \n\ + \032 Changes since 1.111:\n\ + \032 * INCOMPATIBLE CHANGE: The names and formats of the preference files\n\ + \032 in the .unison directory have changed. In particular:\n\ + \032 + the file \"prefs\" should be renamed to default.prf\n\ + \032 + the contents of the file \"ignore\" should be merged into\n\ + \032 default.prf. Each line of the form REGEXP in ignore should\n\ + \032 become a line of the form ignore = REGEXP in default.prf.\n\ + \032 * Unison now handles permission bits and symbolic links. See the\n\ + \032 manual for details.\n\ + \032 * You can now have different preference files in your .unison\n\ + \032 directory. If you start unison like this\n\ + \032 unison profilename\n\ + \n\ + \032 (i.e. with just one \"anonymous\" command-line argument), then the\n\ + \032 file ~/.unison/profilename.prf will be loaded instead of\n\ + \032 default.prf.\n\ + \032 * Some improvements to terminal handling in the text user interface\n\ + \032 * Added a switch -killServer that terminates the remote server\n\ + \032 process when the unison client is shutting down, even when using\n\ + \032 sockets for communication. (By default, a remote server created\n\ + \032 using ssh/rsh is terminated automatically, while a socket server is\n\ + \032 left running.)\n\ + \032 * When started in 'socket server' mode, unison prints 'server\n\ + \032 started' on stderr when it is ready to accept connections. (This\n\ + \032 may be useful for scripts that want to tell when a socket-mode\n\ + \032 server has finished initalization.)\n\ + \032 * We now make a nightly mirror of our current internal development\n\ + \032 tree, in case anyone wants an up-to-the-minute version to hack\n\ + \032 around with.\n\ + \032 * Added a file CONTRIB with some suggestions for how to help us make\n\ + \032 Unison better.\n\ + \n\ + ")) +:: + ("", ("Junk", + "Junk\n\ + \032 __________________________________________________________________\n\ + \n\ + \032 This document was translated from L^AT[E]X by [2]H^EV^EA.\n\ + \n\ + References\n\ + \n\ + \032 1. file:///Users/bcpierce/current/unison/trunk/doc/temp.html#ssh-win\n\ + \032 2. http://pauillac.inria.fr/~maranget/hevea/index.html\n\ + ")) +:: + [];; From bcpierce at seas.upenn.edu Sat Jul 5 17:55:21 2014 From: bcpierce at seas.upenn.edu (bcpierce at seas.upenn.edu) Date: Sat, 5 Jul 2014 17:55:21 -0400 Subject: [Unison-hackers] [unison-svn] r527 - in trunk/src: . lwt system ubase uimac14 uimac14/English.lproj uimac14/Frameworks uimac14/Frameworks/Growl.framework uimac14/Frameworks/Growl.framework/Headers uimac14/Frameworks/Growl.framework/Resources uimac14/Frameworks/Growl.framework/Versions uimac14/Frameworks/Growl.framework/Versions/A uimac14/Frameworks/Growl.framework/Versions/A/Headers uimac14/Frameworks/Growl.framework/Versions/A/Resources uimac14/Frameworks/Growl.framework/Versions/Current uimac14/Frameworks/Growl.framework/Versions/Current/Headers uimac14/Frameworks/Growl.framework/Versions/Current/Resources uimac14/progressicons uimac14/ssselectabletoolbar uimac14/tableicons uimac14/toolbar uimac14/uimacnew.xcodeproj uimacnew Message-ID: <201407052155.s65LtM4c027690@yaws.seas.upenn.edu> Author: bcpierce Date: 2014-07-05 17:55:19 -0400 (Sat, 05 Jul 2014) New Revision: 527 Added: trunk/src/uimac14/ trunk/src/uimac14/Bridge.h trunk/src/uimac14/Bridge.m trunk/src/uimac14/ColorGradientView.h trunk/src/uimac14/ColorGradientView.m trunk/src/uimac14/English.lproj/ trunk/src/uimac14/English.lproj/InfoPlist.strings trunk/src/uimac14/English.lproj/MainMenu.xib trunk/src/uimac14/Frameworks/ trunk/src/uimac14/Frameworks/Growl.framework/ trunk/src/uimac14/Frameworks/Growl.framework/Growl trunk/src/uimac14/Frameworks/Growl.framework/Headers/ trunk/src/uimac14/Frameworks/Growl.framework/Headers/Growl.h trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlApplicationBridge-Carbon.h trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlApplicationBridge.h trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlDefines.h trunk/src/uimac14/Frameworks/Growl.framework/Resources/ trunk/src/uimac14/Frameworks/Growl.framework/Resources/Info.plist trunk/src/uimac14/Frameworks/Growl.framework/Versions/ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Growl trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/Growl.h trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlDefines.h trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Resources/ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Resources/Info.plist trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Growl trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/Growl.h trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlApplicationBridge-Carbon.h trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlApplicationBridge.h trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlDefines.h trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Resources/ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Resources/Info.plist trunk/src/uimac14/ImageAndTextCell.h trunk/src/uimac14/ImageAndTextCell.m trunk/src/uimac14/Info.plist trunk/src/uimac14/Info.plist.template trunk/src/uimac14/MyController.h trunk/src/uimac14/MyController.m trunk/src/uimac14/NotificationController.h trunk/src/uimac14/NotificationController.m trunk/src/uimac14/PreferencesController.h trunk/src/uimac14/PreferencesController.m trunk/src/uimac14/ProfileController.h trunk/src/uimac14/ProfileController.m trunk/src/uimac14/ProfileTableView.h trunk/src/uimac14/ProfileTableView.m trunk/src/uimac14/ProgressCell.h trunk/src/uimac14/ProgressCell.m trunk/src/uimac14/ReconItem.h trunk/src/uimac14/ReconItem.m trunk/src/uimac14/ReconTableView.h trunk/src/uimac14/ReconTableView.m trunk/src/uimac14/TrevorsUnison.icns trunk/src/uimac14/Unison.icns trunk/src/uimac14/UnisonToolbar.h trunk/src/uimac14/UnisonToolbar.m trunk/src/uimac14/cltool.c trunk/src/uimac14/main.m trunk/src/uimac14/progressicons/ trunk/src/uimac14/progressicons/ProgressBarAdvanced.png trunk/src/uimac14/progressicons/ProgressBarBlue.png trunk/src/uimac14/progressicons/ProgressBarEndAdvanced.png trunk/src/uimac14/progressicons/ProgressBarEndBlue.png trunk/src/uimac14/progressicons/ProgressBarEndGray.png trunk/src/uimac14/progressicons/ProgressBarEndGreen.png trunk/src/uimac14/progressicons/ProgressBarEndWhite.png trunk/src/uimac14/progressicons/ProgressBarGray.png trunk/src/uimac14/progressicons/ProgressBarGreen.png trunk/src/uimac14/progressicons/ProgressBarLightGreen.png trunk/src/uimac14/progressicons/ProgressBarWhite.png trunk/src/uimac14/ssselectabletoolbar/ trunk/src/uimac14/ssselectabletoolbar/README trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbar.h trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbar.m trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbarItem.h trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbarItem.m trunk/src/uimac14/tableicons/ trunk/src/uimac14/tableicons/Change_Absent.png trunk/src/uimac14/tableicons/Change_Created.png trunk/src/uimac14/tableicons/Change_Deleted.png trunk/src/uimac14/tableicons/Change_Modified.png trunk/src/uimac14/tableicons/Change_PropsChanged.png trunk/src/uimac14/tableicons/Change_Unmodified.png trunk/src/uimac14/tableicons/Outline-Deep.png trunk/src/uimac14/tableicons/Outline-Flat.png trunk/src/uimac14/tableicons/Outline-Flattened.png trunk/src/uimac14/tableicons/table-conflict.tif trunk/src/uimac14/tableicons/table-error.tif trunk/src/uimac14/tableicons/table-left-blue.tif trunk/src/uimac14/tableicons/table-left-green.tif trunk/src/uimac14/tableicons/table-merge.tif trunk/src/uimac14/tableicons/table-mixed.tif trunk/src/uimac14/tableicons/table-right-blue.tif trunk/src/uimac14/tableicons/table-right-green.tif trunk/src/uimac14/tableicons/table-skip.tif trunk/src/uimac14/toolbar/ trunk/src/uimac14/toolbar/add.tif trunk/src/uimac14/toolbar/diff.tif trunk/src/uimac14/toolbar/go.tif trunk/src/uimac14/toolbar/left.tif trunk/src/uimac14/toolbar/merge.tif trunk/src/uimac14/toolbar/quit.tif trunk/src/uimac14/toolbar/rescan.tif trunk/src/uimac14/toolbar/restart.tif trunk/src/uimac14/toolbar/right.tif trunk/src/uimac14/toolbar/save.tif trunk/src/uimac14/toolbar/skip.tif trunk/src/uimac14/uimacnew.xcodeproj/ trunk/src/uimac14/uimacnew.xcodeproj/project.pbxproj Removed: trunk/src/uimac/ trunk/src/uimacnew09/ Modified: trunk/src/Makefile.OCaml trunk/src/RECENTNEWS trunk/src/abort.ml trunk/src/bytearray.ml trunk/src/bytearray.mli trunk/src/bytearray_stubs.c trunk/src/case.ml trunk/src/case.mli trunk/src/checksum.ml trunk/src/checksum.mli trunk/src/clroot.ml trunk/src/clroot.mli trunk/src/common.ml trunk/src/common.mli trunk/src/copy.ml trunk/src/external.ml trunk/src/external.mli trunk/src/fileinfo.ml trunk/src/fileinfo.mli trunk/src/files.ml trunk/src/files.mli trunk/src/fileutil.ml trunk/src/fileutil.mli trunk/src/fingerprint.ml trunk/src/fingerprint.mli trunk/src/fpcache.ml trunk/src/fpcache.mli trunk/src/fs.ml trunk/src/fs.mli trunk/src/fspath.ml trunk/src/fspath.mli trunk/src/fswatch.ml trunk/src/fswatch.mli trunk/src/fswatchold.ml trunk/src/globals.ml trunk/src/globals.mli trunk/src/linkgtk.ml trunk/src/linkgtk2.ml trunk/src/linktext.ml trunk/src/lock.ml trunk/src/lock.mli trunk/src/lwt/depend trunk/src/lwt/pqueue.ml trunk/src/lwt/pqueue.mli trunk/src/main.ml trunk/src/mkProjectInfo.ml trunk/src/name.ml trunk/src/name.mli trunk/src/os.ml trunk/src/os.mli trunk/src/osx.ml trunk/src/osx.mli trunk/src/path.ml trunk/src/path.mli trunk/src/pixmaps.ml trunk/src/pred.ml trunk/src/pred.mli trunk/src/props.ml trunk/src/props.mli trunk/src/recon.ml trunk/src/recon.mli trunk/src/remote.ml trunk/src/remote.mli trunk/src/sortri.ml trunk/src/sortri.mli trunk/src/stasher.ml trunk/src/strings.ml trunk/src/strings.mli trunk/src/system.ml trunk/src/system.mli trunk/src/system/system_generic.ml trunk/src/system/system_intf.ml trunk/src/system/system_win.ml trunk/src/terminal.ml trunk/src/test.ml trunk/src/test.mli trunk/src/transfer.ml trunk/src/transfer.mli trunk/src/transport.ml trunk/src/transport.mli trunk/src/tree.ml trunk/src/tree.mli trunk/src/ubase/depend trunk/src/ubase/proplist.ml trunk/src/ubase/proplist.mli trunk/src/ubase/rx.ml trunk/src/ubase/rx.mli trunk/src/ubase/safelist.ml trunk/src/ubase/safelist.mli trunk/src/ubase/trace.ml trunk/src/ubase/trace.mli trunk/src/ubase/uarg.ml trunk/src/ubase/util.ml trunk/src/ubase/util.mli trunk/src/ui.mli trunk/src/uicommon.ml trunk/src/uicommon.mli trunk/src/uigtk2.ml trunk/src/uigtk2.mli trunk/src/uimacbridgenew.ml trunk/src/uimacnew/Info.plist.template trunk/src/uitext.ml trunk/src/uitext.mli trunk/src/unicode.ml trunk/src/unicode.mli trunk/src/update.ml trunk/src/update.mli trunk/src/uutil.ml trunk/src/uutil.mli trunk/src/xferhint.ml trunk/src/xferhint.mli Log: * Incorporated a refresh of the OSX GUI, contributed by Alan Shutko. * Update dates in copyright notices * Tidying for beta-release Modified: trunk/src/Makefile.OCaml =================================================================== --- trunk/src/Makefile.OCaml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/Makefile.OCaml 2014-07-05 21:55:19 UTC (rev 527) @@ -71,7 +71,7 @@ # UISTYLE=gtk2 # UISTYLE=mac (old and limited, but working) # UISTYLE=macnew (spiffier) -# UISTYLE=macnew09 (even spiffier, but not yet extensively tested) +# UISTYLE=mac14 (even spiffier, but not yet extensively tested) # # This should be set to an appropriate value automatically, depending # on whether the lablgtk library is available @@ -80,7 +80,7 @@ ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well ## at the moment and we don't want to confuse people by building it by default ifeq ($(OSARCH),osx) - UISTYLE=macnew09 + UISTYLE=mac14 else ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB)) UISTYLE=gtk2 @@ -178,9 +178,9 @@ buildexecutable:: macexecutable UIMACDIR=uimacnew else -ifeq ($(UISTYLE),macnew09) +ifeq ($(UISTYLE),mac14) buildexecutable:: macexecutable - UIMACDIR=uimacnew09 + UIMACDIR=uimac14 else buildexecutable:: $(NAME)$(EXEC_EXT) endif @@ -263,8 +263,8 @@ INCLFLAGS+=-thread endif -## New Mac UI, 2009 version -ifeq ($(UISTYLE),macnew09) +## New Mac UI, 2014 version +ifeq ($(UISTYLE),mac14) OCAMLOBJS+=uimacbridgenew.cmo THREADS=true OCAMLLIBS+=threads.cma Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/RECENTNEWS 2014-07-05 21:55:19 UTC (rev 527) @@ -1,3 +1,12 @@ +CHANGES FROM VERSION 2.47.0 + +* Incorporated a refresh of the OSX GUI, contributed by Alan Shutko. + +* Update dates in copyright notices + +* Tidying for beta-release + +------------------------------- CHANGES FROM VERSION 2.46.20 * Incorporated patch from Ir??nyossy Knoblauch Art??r to make temp file Modified: trunk/src/abort.ml =================================================================== --- trunk/src/abort.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/abort.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/abort.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/bytearray.ml =================================================================== --- trunk/src/bytearray.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/bytearray.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/bytearray.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/bytearray.mli =================================================================== --- trunk/src/bytearray.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/bytearray.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/bytearray.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) type t = (char, Bigarray.int8_unsigned_elt, Bigarray.c_layout) Bigarray.Array1.t Modified: trunk/src/bytearray_stubs.c =================================================================== --- trunk/src/bytearray_stubs.c 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/bytearray_stubs.c 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ /* Unison file synchronizer: src/bytearray_stubs.c */ -/* Copyright 1999-2012 (see COPYING for details) */ +/* Copyright 1999-2014 (see COPYING for details) */ #include Modified: trunk/src/case.ml =================================================================== --- trunk/src/case.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/case.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/case.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/case.mli =================================================================== --- trunk/src/case.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/case.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/case.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) val caseInsensitiveMode : [`True|`False|`Default] Prefs.t val unicodeEncoding : bool Prefs.t Modified: trunk/src/checksum.ml =================================================================== --- trunk/src/checksum.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/checksum.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/checksum.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/checksum.mli =================================================================== --- trunk/src/checksum.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/checksum.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/checksum.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) type t = int type u = int array Modified: trunk/src/clroot.ml =================================================================== --- trunk/src/clroot.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/clroot.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/clroot.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/clroot.mli =================================================================== --- trunk/src/clroot.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/clroot.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/clroot.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Command-line roots *) type clroot = Modified: trunk/src/common.ml =================================================================== --- trunk/src/common.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/common.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/common.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/common.mli =================================================================== --- trunk/src/common.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/common.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/common.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (***************************************************************************) (* COMMON TYPES USED BY ALL MODULES *) Modified: trunk/src/copy.ml =================================================================== --- trunk/src/copy.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/copy.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/copy.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/external.ml =================================================================== --- trunk/src/external.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/external.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/external.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/external.mli =================================================================== --- trunk/src/external.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/external.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/external.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) val runExternalProgram : string -> (Unix.process_status * string) Lwt.t val readChannelTillEof : in_channel -> string Modified: trunk/src/fileinfo.ml =================================================================== --- trunk/src/fileinfo.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fileinfo.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fileinfo.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/fileinfo.mli =================================================================== --- trunk/src/fileinfo.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fileinfo.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fileinfo.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) type typ = [`ABSENT | `FILE | `DIRECTORY | `SYMLINK] val type2string : typ -> string Modified: trunk/src/files.ml =================================================================== --- trunk/src/files.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/files.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/files.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/files.mli =================================================================== --- trunk/src/files.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/files.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/files.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* As usual, these functions should only be called by the client (i.e., in *) (* the same address space as the user interface). *) Modified: trunk/src/fileutil.ml =================================================================== --- trunk/src/fileutil.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fileutil.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fileutil.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/fileutil.mli =================================================================== --- trunk/src/fileutil.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fileutil.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fileutil.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Convert backslashes in a string to forward slashes. Useful in Windows. *) val backslashes2forwardslashes : string -> string Modified: trunk/src/fingerprint.ml =================================================================== --- trunk/src/fingerprint.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fingerprint.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fingerprint.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/fingerprint.mli =================================================================== --- trunk/src/fingerprint.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fingerprint.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fingerprint.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) type t Modified: trunk/src/fpcache.ml =================================================================== --- trunk/src/fpcache.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fpcache.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fpcache.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/fpcache.mli =================================================================== --- trunk/src/fpcache.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fpcache.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fpcache.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Initialize the cache *) val init : bool -> bool -> System.fspath -> unit Modified: trunk/src/fs.ml =================================================================== --- trunk/src/fs.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fs.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fs.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/fs.mli =================================================================== --- trunk/src/fs.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fs.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fs.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Operations on fspaths *) Modified: trunk/src/fspath.ml =================================================================== --- trunk/src/fspath.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fspath.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fspath.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/fspath.mli =================================================================== --- trunk/src/fspath.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fspath.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fspath.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Defines an abstract type of absolute filenames (fspaths) *) Modified: trunk/src/fswatch.ml =================================================================== --- trunk/src/fswatch.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fswatch.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fswatch.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/fswatch.mli =================================================================== --- trunk/src/fswatch.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fswatch.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fswatch.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) type archiveHash = string Modified: trunk/src/fswatchold.ml =================================================================== --- trunk/src/fswatchold.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/fswatchold.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/fswatcherold.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/globals.ml =================================================================== --- trunk/src/globals.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/globals.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/globals.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/globals.mli =================================================================== --- trunk/src/globals.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/globals.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/globals.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Global variables and functions needed by top-level modules and user *) (* interfaces *) Modified: trunk/src/linkgtk.ml =================================================================== --- trunk/src/linkgtk.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/linkgtk.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/linkgtk.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/linkgtk2.ml =================================================================== --- trunk/src/linkgtk2.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/linkgtk2.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/linkgtk2.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/linktext.ml =================================================================== --- trunk/src/linktext.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/linktext.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/linktext.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/lock.ml =================================================================== --- trunk/src/lock.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/lock.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lock.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/lock.mli =================================================================== --- trunk/src/lock.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/lock.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lock.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* A simple utility module for setting and releasing inter-process locks using entries in the filesystem. *) Modified: trunk/src/lwt/depend =================================================================== --- trunk/src/lwt/depend 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/lwt/depend 2014-07-05 21:55:19 UTC (rev 527) @@ -1,12 +1,12 @@ -lwt.cmo: lwt.cmi -lwt.cmx: lwt.cmi -lwt_unix.cmo: lwt_unix.cmi -lwt_unix.cmx: lwt_unix.cmi -lwt_util.cmo: lwt.cmi lwt_util.cmi -lwt_util.cmx: lwt.cmx lwt_util.cmi -pqueue.cmo: pqueue.cmi -pqueue.cmx: pqueue.cmi -lwt.cmi: -lwt_unix.cmi: lwt.cmi -lwt_util.cmi: lwt.cmi -pqueue.cmi: +lwt.cmo : lwt.cmi +lwt.cmx : lwt.cmi +lwt_unix.cmo : lwt_unix.cmi +lwt_unix.cmx : lwt_unix.cmi +lwt_util.cmo : lwt.cmi lwt_util.cmi +lwt_util.cmx : lwt.cmx lwt_util.cmi +pqueue.cmo : pqueue.cmi +pqueue.cmx : pqueue.cmi +lwt.cmi : +lwt_unix.cmi : lwt.cmi +lwt_util.cmi : lwt.cmi +pqueue.cmi : Modified: trunk/src/lwt/pqueue.ml =================================================================== --- trunk/src/lwt/pqueue.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/lwt/pqueue.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lwt/pqueue.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/lwt/pqueue.mli =================================================================== --- trunk/src/lwt/pqueue.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/lwt/pqueue.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/lwt/pqueue.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) module type OrderedType = sig Modified: trunk/src/main.ml =================================================================== --- trunk/src/main.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/main.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/main.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -127,9 +127,9 @@ let catch_all f = try - Util.msg "Starting catch_all...\n"; + (* Util.msg "Starting catch_all...\n"; *) f (); - Util.msg "Done catch_all...\n"; + (* Util.msg "Done catch_all...\n"; *) with e -> Util.msg "Unison failed: %s\n" (Uicommon.exn2string e); exit 1;; Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/mkProjectInfo.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -5,8 +5,8 @@ let projectName = "unison" let majorVersion = 2 -let minorVersion = 46 -let pointVersionOrigin = 504 (* Revision that corresponds to point version 0 *) +let minorVersion = 47 +let pointVersionOrigin = 526 (* Revision that corresponds to point version 0 *) (* Documentation: This is a program to construct a version of the form Major.Minor.Point, @@ -92,3 +92,4 @@ + Modified: trunk/src/name.ml =================================================================== --- trunk/src/name.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/name.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/name.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/name.mli =================================================================== --- trunk/src/name.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/name.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/name.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) type t Modified: trunk/src/os.ml =================================================================== --- trunk/src/os.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/os.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/os.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/os.mli =================================================================== --- trunk/src/os.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/os.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/os.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) val myCanonicalHostName : unit -> string Modified: trunk/src/osx.ml =================================================================== --- trunk/src/osx.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/osx.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/osx.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/osx.mli =================================================================== --- trunk/src/osx.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/osx.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/osx.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) val init : bool -> unit val isMacOSX : bool Modified: trunk/src/path.ml =================================================================== --- trunk/src/path.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/path.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/path.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/path.mli =================================================================== --- trunk/src/path.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/path.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/path.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Abstract type of relative pathnames *) type 'a path Modified: trunk/src/pixmaps.ml =================================================================== --- trunk/src/pixmaps.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/pixmaps.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pixmaps.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/pred.ml =================================================================== --- trunk/src/pred.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/pred.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pred.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/pred.mli =================================================================== --- trunk/src/pred.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/pred.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/pred.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Predicates over paths. Modified: trunk/src/props.ml =================================================================== --- trunk/src/props.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/props.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/props.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/props.mli =================================================================== --- trunk/src/props.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/props.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/props.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* File properties: time, permission, length, etc. *) Modified: trunk/src/recon.ml =================================================================== --- trunk/src/recon.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/recon.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/recon.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/recon.mli =================================================================== --- trunk/src/recon.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/recon.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/recon.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) val reconcileAll : ?allowPartial:bool (* whether we allow partial synchronization Modified: trunk/src/remote.ml =================================================================== --- trunk/src/remote.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/remote.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/remote.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/remote.mli =================================================================== --- trunk/src/remote.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/remote.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/remote.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) module Thread : sig val unwindProtect : (unit -> 'a Lwt.t) -> (exn -> unit Lwt.t) -> 'a Lwt.t Modified: trunk/src/sortri.ml =================================================================== --- trunk/src/sortri.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/sortri.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/sortri.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/sortri.mli =================================================================== --- trunk/src/sortri.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/sortri.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/sortri.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Sort a list of recon items according to the current setting of various preferences (defined in sort.ml, and accessible from the Modified: trunk/src/stasher.ml =================================================================== --- trunk/src/stasher.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/stasher.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,6 +1,6 @@ (* Unison file synchronizer: src/stasher.ml *) (* $I2: Last modified by lescuyer *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/strings.ml =================================================================== --- trunk/src/strings.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/strings.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -7,4 +7,5 @@ Version 2.46.6\n\ \n\ ")) -:: +:: [] + Modified: trunk/src/strings.mli =================================================================== --- trunk/src/strings.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/strings.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/strings.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) val docs : (string * (string * string)) list Modified: trunk/src/system/system_generic.ml =================================================================== --- trunk/src/system/system_generic.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/system/system_generic.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_generic.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/system/system_intf.ml =================================================================== --- trunk/src/system/system_intf.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/system/system_intf.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_intf.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/system/system_win.ml =================================================================== --- trunk/src/system/system_win.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/system/system_win.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system/system_win.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/system.ml =================================================================== --- trunk/src/system.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/system.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/system.mli =================================================================== --- trunk/src/system.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/system.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/system.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Operations on filesystem path *) Modified: trunk/src/terminal.ml =================================================================== --- trunk/src/terminal.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/terminal.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/terminal.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/test.ml =================================================================== --- trunk/src/test.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/test.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/test.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/test.mli =================================================================== --- trunk/src/test.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/test.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/test.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Internal self-tests *) Modified: trunk/src/transfer.ml =================================================================== --- trunk/src/transfer.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/transfer.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transfer.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/transfer.mli =================================================================== --- trunk/src/transfer.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/transfer.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transfer.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Rsync : general algorithm description Modified: trunk/src/transport.ml =================================================================== --- trunk/src/transport.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/transport.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transport.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/transport.mli =================================================================== --- trunk/src/transport.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/transport.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/transport.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Executes the actions implied by the reconItem list. *) val transportItem : Modified: trunk/src/tree.ml =================================================================== --- trunk/src/tree.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/tree.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/tree.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/tree.mli =================================================================== --- trunk/src/tree.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/tree.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/tree.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* An ('a, 'b) t is a tree with 'a-labeled arcs and 'b-labeled nodes. *) (* Labeling for the internal nodes is optional *) Modified: trunk/src/ubase/depend =================================================================== --- trunk/src/ubase/depend 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/depend 2014-07-05 21:55:19 UTC (rev 527) @@ -1,27 +1,27 @@ -myMap.cmo: myMap.cmi -myMap.cmx: myMap.cmi -prefs.cmo: util.cmi uarg.cmi safelist.cmi prefs.cmi -prefs.cmx: util.cmx uarg.cmx safelist.cmx prefs.cmi -proplist.cmo: util.cmi proplist.cmi -proplist.cmx: util.cmx proplist.cmi -rx.cmo: rx.cmi -rx.cmx: rx.cmi -safelist.cmo: safelist.cmi -safelist.cmx: safelist.cmi -trace.cmo: util.cmi safelist.cmi prefs.cmi trace.cmi -trace.cmx: util.cmx safelist.cmx prefs.cmx trace.cmi -uarg.cmo: util.cmi safelist.cmi uarg.cmi -uarg.cmx: util.cmx safelist.cmx uarg.cmi -uprintf.cmo: uprintf.cmi -uprintf.cmx: uprintf.cmi -util.cmo: uprintf.cmi safelist.cmi util.cmi -util.cmx: uprintf.cmx safelist.cmx util.cmi -myMap.cmi: -prefs.cmi: util.cmi -proplist.cmi: -rx.cmi: -safelist.cmi: -trace.cmi: prefs.cmi -uarg.cmi: -uprintf.cmi: -util.cmi: +myMap.cmo : myMap.cmi +myMap.cmx : myMap.cmi +prefs.cmo : util.cmi uarg.cmi safelist.cmi prefs.cmi +prefs.cmx : util.cmx uarg.cmx safelist.cmx prefs.cmi +proplist.cmo : util.cmi proplist.cmi +proplist.cmx : util.cmx proplist.cmi +rx.cmo : rx.cmi +rx.cmx : rx.cmi +safelist.cmo : safelist.cmi +safelist.cmx : safelist.cmi +trace.cmo : util.cmi safelist.cmi prefs.cmi trace.cmi +trace.cmx : util.cmx safelist.cmx prefs.cmx trace.cmi +uarg.cmo : util.cmi safelist.cmi uarg.cmi +uarg.cmx : util.cmx safelist.cmx uarg.cmi +uprintf.cmo : uprintf.cmi +uprintf.cmx : uprintf.cmi +util.cmo : uprintf.cmi safelist.cmi util.cmi +util.cmx : uprintf.cmx safelist.cmx util.cmi +myMap.cmi : +prefs.cmi : util.cmi +proplist.cmi : +rx.cmi : +safelist.cmi : +trace.cmi : prefs.cmi +uarg.cmi : +uprintf.cmi : +util.cmi : Modified: trunk/src/ubase/proplist.ml =================================================================== --- trunk/src/ubase/proplist.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/proplist.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/proplist.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/ubase/proplist.mli =================================================================== --- trunk/src/ubase/proplist.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/proplist.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/proplist.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) type 'a key type t Modified: trunk/src/ubase/rx.ml =================================================================== --- trunk/src/ubase/rx.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/rx.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/rx.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/ubase/rx.mli =================================================================== --- trunk/src/ubase/rx.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/rx.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/rx.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) type t Modified: trunk/src/ubase/safelist.ml =================================================================== --- trunk/src/ubase/safelist.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/safelist.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/safelist.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/ubase/safelist.mli =================================================================== --- trunk/src/ubase/safelist.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/safelist.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/safelist.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* All functions here are tail recursive and will work for arbitrary sized lists (unlike some of the standard ones). The intention is that Modified: trunk/src/ubase/trace.ml =================================================================== --- trunk/src/ubase/trace.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/trace.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/trace.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/ubase/trace.mli =================================================================== --- trunk/src/ubase/trace.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/trace.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/trace.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* ---------------------------------------------------------------------- *) (* Debugging support *) Modified: trunk/src/ubase/uarg.ml =================================================================== --- trunk/src/ubase/uarg.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/uarg.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/uarg.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* by Xavier Leroy, projet Cristal, INRIA Rocquencourt *) (* Slightly modified by BCP, July 1999 *) Modified: trunk/src/ubase/util.ml =================================================================== --- trunk/src/ubase/util.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/util.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/util.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/ubase/util.mli =================================================================== --- trunk/src/ubase/util.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ubase/util.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ubase/util.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Miscellaneous utility functions and datatypes *) Modified: trunk/src/ui.mli =================================================================== --- trunk/src/ui.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/ui.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/ui.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* The module Ui provides only the user interface signature. Implementations are provided by Uitext and Uitk. *) Modified: trunk/src/uicommon.ml =================================================================== --- trunk/src/uicommon.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uicommon.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uicommon.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/uicommon.mli =================================================================== --- trunk/src/uicommon.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uicommon.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uicommon.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* Kinds of UI *) type interface = Modified: trunk/src/uigtk2.ml =================================================================== --- trunk/src/uigtk2.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uigtk2.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uigtk2.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/uigtk2.mli =================================================================== --- trunk/src/uigtk2.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uigtk2.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/uigtk2.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) module Body : Uicommon.UI Added: trunk/src/uimac14/Bridge.h =================================================================== --- trunk/src/uimac14/Bridge.h (rev 0) +++ trunk/src/uimac14/Bridge.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,58 @@ +// +// Bridge.h +// uimac +// +// Created by Craig Federighi on 4/25/07. +// Copyright 2007 __MyCompanyName__. All rights reserved. +// +#import + +/* + Bridge supports safe calling from C back to OCaml by using daemon threads + spawned from OCaml to make the actual calls and converting all argument / return values + in the OCaml thread (when in possession of the OCaml lock) +*/ + at interface Bridge : NSObject { +} ++ (void)startup:(const char **)argv; + at end + +/* + ocamlCall(sig, funcName, [args...]); + + Call ocaml function (via safe thread handoff mechanism). + Args/return values are converted to/from C/OCaml according to the + supplied type signture string. Type codes are: + x - void (for return type) + i - long + s - char * + S - NSString * + N - NSNumber * + @ - OCamlValue (see below) + + Examples: + long count = (long)ocamlCall("iS", "lengthOfString", @"Some String"); + + (void)ocamlCall("x", "someVoidOCamlFunction"); + + OCamlValue *v = (id)ocamlCall("@Si", "makeArray", @"Some String", 10); + NSString s = [v getField:0 withType:'S']; +*/ +extern void *ocamlCall(const char *argTypes, ...); + +// Wrapper/proxy for unconverted OCaml values + at interface OCamlValue : NSObject { + long _v; +} +- initWithValue:(long)v; + +- (void *)getField:(long)i withType:(char)t; + // get value by position. See ocamlCall for list of type conversion codes + +- (long)count; + // count of items in array + +- (long)value; + // returns Ocaml value directly -- not safe to use except in direct callback from OCaml + // (i.e. in the OCaml thread) + at end Added: trunk/src/uimac14/Bridge.m =================================================================== --- trunk/src/uimac14/Bridge.m (rev 0) +++ trunk/src/uimac14/Bridge.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,418 @@ +// +// Bridge.m +// uimac +// +// Created by Craig Federighi on 4/25/07. +// Copyright 1999-2008 (see COPYING for details) +// + +#import "Bridge.h" + +/* The following two define are a workaround for an incompatibility between + Ocaml 3.11.2 (and older) and the Mac OS X header files */ +#define uint64 uint64_caml +#define int64 int64_caml + +#define CAML_NAME_SPACE +#include +#include +#include +#include +#include +#import + +#include +#include + +/* + CMF, April 2007: Alternate strategy for solving UI crashes based on + http://alan.petitepomme.net/cwn/2005.03.08.html#9: + 1) Run OCaml in a separate thread from the Cocoa main run loop. + 2) Handle all calls to OCaml as callbacks -- have an OCaml thread + hang in C-land and use mutexes and conditions to pass control from the + C calling thread to the OCaml callback thread. + + Value Conversion Done in Bridge Thread: + Value creation/conversion (like calls to caml_named_value or caml_copy_string) + or access calls (like Field) need to occur in the OCaml thread. We do this by + passing C args for conversion to the bridgeThreadWait() thread. + + Example of vulnerability: + Field(caml_reconItems,j) could dereference caml_reconItems + when the GC (running independently in an OCaml thread) could be moving it. +*/ + +pthread_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t init_cond = PTHREAD_COND_INITIALIZER; +static BOOL doneInit = NO; + +pthread_mutex_t global_call_lock = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t global_call_cond = PTHREAD_COND_INITIALIZER; +pthread_mutex_t global_res_lock = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t global_res_cond = PTHREAD_COND_INITIALIZER; + + at implementation Bridge +static Bridge *_instance = NULL; + +const char **the_argv; + +- (void)_ocamlStartup:(id)ignore +{ + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + pthread_mutex_lock(&init_lock); + + /* Initialize ocaml gc, etc. */ + caml_startup((char **)the_argv); // cast to avoid warning, caml_startup assumes non-const, + // NSApplicationMain assumes const + + // Register these with the collector + // NSLog(@"*** _ocamlStartup - back from startup; signalling! (%d)", pthread_self()); + doneInit = TRUE; + pthread_cond_signal(&init_cond); + pthread_mutex_unlock(&init_lock); + + // now start the callback thread + // NSLog(@"*** _ocamlStartup - calling callbackThreadCreate (%d)", pthread_self()); + value *f = caml_named_value("callbackThreadCreate"); + (void)caml_callback_exn(*f,Val_unit); + [pool release]; +} + ++ (void)startup:(const char **)argv +{ + if (_instance) return; + + _instance = [[Bridge alloc] init]; + + [[NSExceptionHandler defaultExceptionHandler] setDelegate:_instance]; + [[NSExceptionHandler defaultExceptionHandler] setExceptionHandlingMask: + (NSLogUncaughtExceptionMask | NSLogTopLevelExceptionMask)]; + + // Init OCaml in another thread and wait for it to be ready + pthread_mutex_lock(&init_lock); + the_argv = argv; + [NSThread detachNewThreadSelector:@selector(_ocamlStartup:) + toTarget:_instance withObject:nil]; + + // NSLog(@"*** waiting for completion of caml_init"); + while (!doneInit) pthread_cond_wait(&init_cond, &init_lock); + pthread_mutex_unlock(&init_lock); + // NSLog(@"*** caml_init complete!"); +} + +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +typedef unsigned int NSUInteger; +#endif +- (BOOL)exceptionHandler:(NSExceptionHandler *)sender shouldLogException:(NSException *)exception mask:(NSUInteger)aMask +{ + // if (![[exception name] isEqual:@"OCamlException"]) return YES; + + NSString *msg = [NSString stringWithFormat:@"Uncaught exception: %@", [exception reason]]; + msg = [[msg componentsSeparatedByString:@"\n"] componentsJoinedByString:@" "]; + NSLog(@"%@", msg); + NSRunAlertPanel(@"Fatal error", msg, @"Exit", nil, nil); + exit(1); + return FALSE; +} + + at end + + +// CallState struct is allocated on the C thread stack and then handed +// to the OCaml callback thread to perform value conversion and issue the call +typedef struct { + enum { SafeCall, OldCall, FieldAccess } opCode; + + // New style calls + const char *argTypes; + va_list args; + + // Field access + value *valueP; + long fieldIndex; + char fieldType; + + // Return values + char *exception; + void *retV; + BOOL _autorelease; + + // for old style (unsafe) calls + value call, a1, a2, a3, ret; + int argCount; +} CallState; + +static CallState *_CallState = NULL; +static CallState *_RetState = NULL; + +// Our OCaml callback server thread -- waits for call then makes them +// Called from thread spawned from OCaml +CAMLprim value bridgeThreadWait(value ignore) +{ + CAMLparam0(); + CAMLlocal1 (args); + args = caml_alloc_tuple(3); + + // NSLog(@"*** bridgeThreadWait init! (%d) Taking lock...", pthread_self()); + while (TRUE) { + // unblock ocaml while we wait for work + caml_enter_blocking_section(); + + pthread_mutex_lock(&global_call_lock); + while (!_CallState) pthread_cond_wait(&global_call_cond, &global_call_lock); + + // pick up our work and free up the call lock for other threads + CallState *cs = _CallState; + _CallState = NULL; + pthread_mutex_unlock(&global_call_lock); + + // NSLog(@"*** bridgeThreadWait: have call -- leaving caml_blocking_section"); + + // we have a call to do -- get the ocaml lock + caml_leave_blocking_section(); + + // NSLog(@"*** bridgeThreadWait: doing call"); + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + char retType = 'v'; + value e = Val_unit; + if (cs->opCode == SafeCall) { + int i; + char *fname = va_arg(cs->args, char *); + value *f = caml_named_value(fname); + // varargs with C-based args -- convert them to OCaml values based on type code string + const char *p = cs->argTypes; + retType = *p++; + int argCount = 0; + for(; *p != '\0'; p++) { + const char *str; + switch (*p) { + case 's': + str = va_arg(cs->args, const char *); + Store_field (args, argCount, caml_copy_string(str)); + break; + case 'S': + str = [va_arg(cs->args, NSString *) UTF8String]; + Store_field (args, argCount, caml_copy_string(str)); + break; + case 'i': + Store_field (args, argCount, Val_long(va_arg(cs->args, long))); + break; + case '@': + Store_field (args, argCount, [va_arg(cs->args, OCamlValue *) value]); + break; + default: + NSCAssert1(0, @"Unknown input type '%c'", *p); + break; + } + argCount++; + NSCAssert(argCount <= 3, @"More than 3 arguments"); + } + // Call OCaml -- TODO: add support for > 3 args + if (argCount == 3) e = caml_callback3_exn(*f,Field(args,0),Field(args,1),Field(args,2)); + else if (argCount == 2) e = caml_callback2_exn(*f,Field(args,0),Field(args,1)); + else if (argCount == 1) e = caml_callback_exn(*f,Field(args,0)); + else e = caml_callback_exn(*f,Val_unit); + for (i = 0; i < argCount; i++) Store_field (args, i, Val_unit); + } else if (cs->opCode == OldCall) { + // old style (unsafe) version where OCaml values were passed directly from C thread + if (cs->argCount == 3) e = caml_callback3_exn(cs->call,cs->a1,cs->a2,cs->a3); + else if (cs->argCount == 2) e = caml_callback2_exn(cs->call,cs->a1,cs->a2); + else e = caml_callback_exn(cs->call,cs->a1); + retType = 'v'; + } else if (cs->opCode == FieldAccess) { + long index = cs->fieldIndex; + e = (index == -1) ? Val_long(Wosize_val(*cs->valueP)) : Field(*cs->valueP, index); + retType = cs->fieldType; + } + + // Process return value + cs->_autorelease = FALSE; + cs->ret = e; // OCaml return type -- unsafe... + if (!Is_exception_result(e)) { + switch (retType) { + case 'S': + *((NSString **)&cs->retV) = (e == Val_unit) ? NULL : [[NSString alloc] initWithUTF8String:String_val(e)]; + cs->_autorelease = TRUE; + break; + case 'N': + if (Is_long (e)) { + *((NSNumber **)&cs->retV) = [[NSNumber alloc] initWithLong:Long_val(e)]; + } else { + *((NSNumber **)&cs->retV) = [[NSNumber alloc] initWithDouble:Double_val(e)]; + } + cs->_autorelease = TRUE; + break; + case '@': + *((NSObject **)&cs->retV) = (e == Val_unit) ? NULL : [[OCamlValue alloc] initWithValue:e]; + cs->_autorelease = TRUE; + break; + case 'i': + *((long *)&cs->retV) = Long_val(e); + break; + case 'x': + break; + default: + NSCAssert1(0, @"Unknown return type '%c'", retType); + break; + } + } + + if (Is_exception_result(e)) { + // get exception string -- it will get thrown back in the calling thread + value *f = caml_named_value("unisonExnInfo"); + // We leak memory here... + cs->exception = strdup(String_val(caml_callback(*f,Extract_exception(e)))); + } + + [pool release]; + + // NSLog(@"*** bridgeThreadWait: returning"); + + // we're done, signal back + pthread_mutex_lock(&global_res_lock); + _RetState = cs; + pthread_cond_signal(&global_res_cond); + pthread_mutex_unlock(&global_res_lock); + } + // Never get here... + CAMLreturn (Val_unit); +} + +void *_passCall(CallState *cs) +{ + pthread_mutex_lock(&global_call_lock); + _CallState = cs; + + // signal so call can happen on other thread + pthread_mutex_lock(&global_res_lock); + pthread_cond_signal(&global_call_cond); + pthread_mutex_unlock(&global_call_lock); + + // NSLog(@"*** _passCall (%d) -- performing signal and waiting", pthread_self()); + + // wait until done -- make sure the result is for our call + while (_RetState != cs) pthread_cond_wait(&global_res_cond, &global_res_lock); + _RetState = NULL; + pthread_mutex_unlock(&global_res_lock); + + // NSLog(@"*** doCallback -- back with result"); + if (cs->exception) { + @throw [NSException exceptionWithName:@"OCamlException" + reason:[NSString stringWithUTF8String:cs->exception] + userInfo:nil]; + } + if (cs->_autorelease) [((id)cs->retV) autorelease]; + return cs->retV; +} + +void *ocamlCall(const char *argTypes, ...) +{ + CallState cs; + cs.opCode = SafeCall; + cs.exception = NULL; + cs.argTypes = argTypes; + va_start(cs.args, argTypes); + void * res = _passCall(&cs); + + va_end(cs.args); + return res; +} + +void *getField(value *vP, long index, char type) +{ + CallState cs; + cs.opCode = FieldAccess; + cs.valueP = vP; + cs.fieldIndex = index; + cs.fieldType = type; + cs.exception = NULL; + return _passCall(&cs); +} + + at implementation OCamlValue + +- initWithValue:(long)v +{ + [super init]; + _v = v; + caml_register_global_root((value *)&_v); + return self; +} + +- (long)count +{ + return (long)getField((value *) &_v, -1, 'i'); +} + +- (void *)getField:(long)i withType:(char)t +{ + return getField((value *)&_v, i, t); +} + +- (long)value +{ + // Unsafe to use! + return _v; +} + +- (void)dealloc +{ + _v = Val_unit; + caml_remove_global_root((value *)&_v); + [super dealloc]; +} + at end + + +// Legacy OCaml call API -- no longer needed +#if 0 + +extern value doCallback (value c, int argcount, value v1, value v2, value v3, BOOL exitOnException); +extern value Callback_checkexn(value c,value v); +extern value Callback2_checkexn(value c,value v1,value v2); +extern value Callback3_checkexn(value c,value v1,value v2,value v3); + +void reportExn(const char *msg) { + NSString *s = [NSString stringWithFormat:@"Uncaught exception: %s", msg]; + s = [[s componentsSeparatedByString:@"\n"] componentsJoinedByString:@" "]; + NSLog(@"%@",s); + NSRunAlertPanel(@"Fatal error",s,@"Exit",nil,nil); +} + +// FIXME! Claim is that value conversion must also happen in the OCaml thread... +value doCallback (value c, int argcount, value v1, value v2, value v3, BOOL exitOnException) { + // NSLog(@"*** doCallback: (%d) -- trying to acquire global lock", pthread_self()); + CallState cs; + cs.opCode = OldCall; + cs.exception = NULL; + cs.call = c; + cs.a1 = v1; + cs.a2 = v2; + cs.a3 = v3; + cs.argCount = argcount; + @try { + return _passCall(&cs); + } @catch (NSException *ex) { + if (exitOnException) { + reportExn(cs.exception); + exit(1); + } + @throw ex; + } +} + +value Callback_checkexn(value c,value v) { + return doCallback(c, 1, v, 0, 0, TRUE); +} + +value Callback2_checkexn(value c,value v1,value v2) { + return doCallback(c, 2, v1, v2, 0, TRUE); +} + +value Callback3_checkexn(value c,value v1,value v2,value v3) { + return doCallback(c, 3, v1, v2, v3, TRUE); +} +#endif Added: trunk/src/uimac14/ColorGradientView.h =================================================================== --- trunk/src/uimac14/ColorGradientView.h (rev 0) +++ trunk/src/uimac14/ColorGradientView.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,22 @@ +// +// ColorGradientView.h +// uimacnew +// +// From http://www.katoemba.net/makesnosenseatall/2008/01/09/nsview-with-gradient-background/ +// + +#import + + at interface ColorGradientView : NSView +{ + NSColor *startingColor; + NSColor *endingColor; + int angle; +} + +// Define the variables as properties + at property(nonatomic, retain) NSColor *startingColor; + at property(nonatomic, retain) NSColor *endingColor; + at property(assign) int angle; + + at end Added: trunk/src/uimac14/ColorGradientView.m =================================================================== --- trunk/src/uimac14/ColorGradientView.m (rev 0) +++ trunk/src/uimac14/ColorGradientView.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,46 @@ +// +// ColorGradientView.m +// uimacnew +// +// From http://www.katoemba.net/makesnosenseatall/2008/01/09/nsview-with-gradient-background/ +// +// + +#import "ColorGradientView.h" + + at implementation ColorGradientView + +// Automatically create accessor methods + at synthesize startingColor; + at synthesize endingColor; + at synthesize angle; + +- (id)initWithFrame:(NSRect)frame { + self = [super initWithFrame:frame]; + if (self) { + // Initialization code here. + [self setStartingColor:[NSColor gridColor]]; + [self setEndingColor:[NSColor controlShadowColor]]; + [self setAngle:270]; + } + return self; +} + +- (void)drawRect:(NSRect)rect { + if (endingColor == nil || [startingColor isEqual:endingColor]) { + // Fill view with a standard background color + [startingColor set]; + NSRectFill(rect); + } + else { + // Fill view with a top-down gradient + // from startingColor to endingColor + NSGradient* aGradient = [[NSGradient alloc] + initWithStartingColor:startingColor + endingColor:endingColor]; + [aGradient drawInRect:[self bounds] angle:angle]; + [aGradient release]; + } +} + + at end Added: trunk/src/uimac14/English.lproj/InfoPlist.strings =================================================================== (Binary files differ) Index: trunk/src/uimac14/English.lproj/InfoPlist.strings =================================================================== --- trunk/src/uimac14/English.lproj/InfoPlist.strings 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/English.lproj/InfoPlist.strings 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/English.lproj/InfoPlist.strings ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/English.lproj/MainMenu.xib =================================================================== --- trunk/src/uimac14/English.lproj/MainMenu.xib (rev 0) +++ trunk/src/uimac14/English.lproj/MainMenu.xib 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,6239 @@ + + + + 1050 + 10K549 + 851 + 1038.36 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 851 + + + YES + + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + YES + + + NSApplication + + + + FirstResponder + + + NSApplication + + + 4111 + 2 + {{0, 364}, {480, 360}} + 1881669632 + Unison + NSWindow + + View + + {1.79769e+308, 1.79769e+308} + {213, 107} + + + 256 + + YES + + + 296 + {{370, 317}, {83, 24}} + + YES + + 67239424 + 0 + + LucidaGrande + 13 + 1044 + + + + YES + + 24 + + NSImage + Outline-Flat + + + 1 + 2 + + + 25.333333969116211 + + NSImage + Outline-Flattened + + O + 2 + YES + 2 + + + 25.333333969116211 + + NSImage + Outline-Deep + + D + 3 + 2 + + + 1 + + + + {480, 360} + + {{0, 0}, {1440, 878}} + {213, 129} + {1.79769e+308, 1.79769e+308} + mainWindow + + + MainMenu + + YES + + + Unison + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + Unison + + YES + + + About Unison + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences... + , + 1048576 + 2147483647 + + + + + + Install command-line tool + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Hide Unison + h + 1048576 + 2147483647 + + + + + + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Quit Unison + q + 1048576 + 2147483647 + + + + + _NSAppleMenu + + + + + Edit + + 1048576 + 2147483647 + + + submenuAction: + + + Edit + + + YES + + + Cut + x + 1048576 + 2147483647 + + + + + + Copy + c + 1048576 + 2147483647 + + + + + + Paste + v + 1048576 + 2147483647 + + + + + + Select All + a + 1048576 + 2147483647 + + + + + + Select Conflicts + + 1048576 + 2147483647 + + + + + + + + + Actions + + 1048576 + 2147483647 + + + submenuAction: + + Actions + + YES + + + Propagate Left to Right + > + 1048576 + 2147483647 + + + + + + Propagate Right to Left + < + 1048576 + 2147483647 + + + + + + Propagate Newer to Older + + 1048576 + 2147483647 + + + + + + Propagate Older to Newer + + 1048576 + 2147483647 + + + + + + Leave Alone + / + 1048576 + 2147483647 + + + + + + Revert to Unison's Recommendation + + 1048576 + 2147483647 + + + + + + Merge + + 1048576 + 2147483647 + + + + + + Diff + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Restart + r + 1048576 + 2147483647 + + + + + + Rescan + + 2147483647 + + + + + + Synchronize all + g + 1048576 + 2147483647 + + + + + + + + + Ignore + + 1048576 + 2147483647 + + + submenuAction: + + Ignore + + YES + + + Ignore Path + i + 1048576 + 2147483647 + + + + + + Ignore Extension + e + 1048576 + 2147483647 + + + + + + Ignore Name + n + 1048576 + 2147483647 + + + + + + + + + Help + + 1048576 + 2147483647 + + + submenuAction: + + Help + + YES + + + Unison Online Help + ? + 1048576 + 2147483647 + + + + + + + + _NSMainMenu + + + + 256 + + YES + + + 266 + {{17, 236}, {329, 25}} + + YES + + 67239424 + 138412032 + UGxlYXNlIGNob29zZSBhIHByb2ZpbGUgb3IgY3JlYXRlIGEgbmV3IG9uZQo + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + + + + 256 + {{651, -524}, {84, 32}} + + YES + + 67239424 + 134217728 + Quit + + + -2038284033 + 1 + + + + + + 200 + 25 + + + + + 274 + + YES + + + 2304 + + YES + + + 274 + {306, 190} + + YES + + + 256 + {306, 17} + + + + + + 256 + {{307, 0}, {16, 17}} + + + + YES + + profiles + 303.47698974609375 + 47.477001190185547 + 1000 + + 75628096 + 2048 + Profiles + + LucidaGrande + 11 + 3100 + + + 3 + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + + + + + 338820672 + 1024 + + + + 3 + MQA + + + + 3 + YES + + + + 3 + 2 + + + 6 + System + gridColor + + 3 + MC41AA + + + 17 + -1035993088 + + + 4 + 15 + 0 + YES + 0 + + + {{1, 17}, {306, 190}} + + + + + 6 + System + controlBackgroundColor + + + 4 + + + + 256 + {{307, 17}, {15, 190}} + + + _doScroller: + 0.99473685026168823 + + + + -2147483392 + {{-100, -100}, {113, 15}} + + 1 + + _doScroller: + 0.99047619104385376 + + + + 2304 + + YES + + + {{1, 0}, {306, 17}} + + + + + 4 + + + + {{20, 20}, {323, 208}} + + + 18 + + + + + QSAAAEEgAABBmAAAQZgAAA + + + {363, 281} + NSView + NSResponder + + + + 274 + + YES + + + 274 + + YES + + + 274 + + YES + + + 2304 + + YES + + + 256 + {730, 411} + + YES + + + 256 + {730, 17} + + + + + + -2147483392 + {{-26, 0}, {16, 17}} + + + + YES + + path + 426 + 27.095703125 + 1000 + + 75628096 + 2048 + Path + + + 6 + System + headerColor + + + + + + 338820672 + 1024 + + LucidaGrande + 12 + 16 + + + + + + 3 + YES + + + pathSortKey + YES + compare: + + + + fileSizeString + 70 + 70 + 70 + + 75628096 + 134219776 + Size + + + + + + 338820672 + 67109888 + + + + + + 3 + YES + + + fileSize + NO + compare: + + + + leftIcon + 16 + 16 + 16 + + 75628096 + 2048 + < + + + 3 + MC4zMzMzMzI5OQA + + + + + 130560 + 33554432 + 0 + 0 + 0 + YES + + + + leftSortKey + YES + compare: + + + + percentTransferred + 76.63916015625 + 42.10107421875 + 100 + + 75628096 + 134219776 + Action + + + + + + 338820672 + 67109888 + + + + + + + + directionSortKey + YES + compare: + + + + rightIcon + 16 + 16 + 16 + + 75628096 + 2048 + > + + + + + + 130560 + 33554432 + 0 + 0 + 0 + YES + + + + rightSortKey + YES + compare: + + + + 3 + 2 + + + 18 + -635437056 + + + 4 + 15 + 0 + YES + 0 + + + {{0, 17}, {730, 411}} + + + + + 4 + + + + -2147483392 + {{-30, 17}, {15, 391}} + + + _doScroller: + 0.96419435739517212 + + + + -2147483392 + {{-100, -100}, {629, 15}} + + 1 + + _doScroller: + 0.99841266870498657 + + + + 2304 + + YES + + + {730, 17} + + + + + 4 + + + + {730, 428} + + + 528 + + + + + + AAAAAAAAAABBoAAAQaAAAA + + + + 274 + + YES + + + 274 + {{2, 5}, {726, 74}} + + YES + + 69336577 + 272760832 + Label + + + + + + + + {{0, 437}, {730, 85}} + + + + {{0, 24}, {730, 522}} + + + + + 1314 + + {{589, 6}, {122, 12}} + + 16652 + 100 + + + + 258 + {{3, 6}, {582, 14}} + + YES + + 67239488 + 272762880 + Idle + + + + + + + + {730, 546} + NSView + NSResponder + + + MyController + + + ProfileController + + + PreferencesController + + + NotificationController + + + + 256 + + YES + + + 258 + + YES + + + 256 + + YES + + + 256 + {{11, 20}, {30, 17}} + + YES + + 67239424 + 4194304 + RmlsZToKA + + + + + + + + + 258 + {{46, 18}, {427, 22}} + + YES + + -1804468671 + 4195328 + + + + YES + + 6 + System + textBackgroundColor + + + + 6 + System + textColor + + + + + + {{2, 2}, {493, 51}} + + + + {{20, 129}, {497, 71}} + + {0, 0} + + 67239424 + 0 + First root + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 3 + 0 + 2 + NO + + + + 258 + + YES + + + 256 + + YES + + + 256 + {{12, 39}, {70, 38}} + + YES + 2 + 1 + + YES + + -2080244224 + 0 + Remote + + + 1211912703 + 0 + + NSRadioButton + + + + + + 200 + 25 + + + 67239424 + 0 + Local + + + 1 + 1211912703 + 0 + + + + 200 + 25 + + + {70, 18} + {4, 2} + 1143472128 + NSActionCell + + 67239424 + 0 + Radio + + 1211912703 + 0 + + + 400 + 75 + + + + + + + + + 256 + {{97, 58}, {37, 17}} + + YES + + 67239424 + 4194304 + User: + + + + + + + + + 256 + {{134, 56}, {91, 22}} + + YES + + -1804468671 + 4195328 + + + + YES + + + + + + + 256 + {{236, 58}, {38, 17}} + + YES + + 67239424 + 4194304 + Host: + + + + + + + + + 258 + {{274, 56}, {199, 22}} + + YES + + -1804468671 + 4195328 + + + + YES + + + + + + + 256 + {{11, 16}, {30, 17}} + + YES + + 67239424 + 4194304 + File: + + + + + + + + + 258 + {{46, 14}, {427, 22}} + + YES + + -1804468671 + 4195328 + + + + YES + + + + + + {{2, 2}, {493, 86}} + + + + {{20, 16}, {497, 106}} + + {0, 0} + + 67239424 + 0 + Second root + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 3 + 0 + 2 + NO + + + + 256 + {{20, 213}, {87, 17}} + + YES + + 67239424 + 4194304 + Profile name: + + + + + + + + + 258 + {{106, 208}, {408, 22}} + + YES + + -1804468671 + 4195328 + + + + YES + + + + + + {534, 250} + + NSView + + NSResponder + + + + 256 + + YES + + + 1325 + + {{419, 263}, {32, 32}} + + 20490 + 100 + + + + 274 + + YES + + + 301 + {{304, 254}, {263, 19}} + + YES + + 68288064 + 138544128 + Connecting... + + LucidaGrande + 16 + 16 + + + + + + + + {871, 577} + + + + {871, 577} + + NSView + + NSResponder + + + 7 + 2 + {{2, 118}, {227, 128}} + 1886912512 + PasswordWindow + NSWindow + + View + + {1.79769e+308, 1.79769e+308} + {213, 107} + + + 256 + + YES + + + 256 + {{20, 60}, {187, 22}} + + YES + + -1804468671 + 4195328 + + + + YES + + + + + + + 256 + {{115, 12}, {98, 32}} + + YES + + 67239424 + 137887744 + Continue + + + -2038284033 + 1 + + Helvetica + 13 + 16 + + + + + + + + 200 + 25 + + + + + 256 + {{14, 12}, {84, 32}} + + YES + + 67239424 + 137887744 + Cancel + + + -2038284033 + 1 + + + + + + + + 200 + 25 + + + + + 256 + {{17, 90}, {193, 17}} + + YES + + 67239488 + 4196352 + UGxlYXNlIGVudGVyIHlvdXIgcGFzc3dvcmQKA + + + + + + + + {227, 128} + + {{0, 0}, {1440, 878}} + {213, 129} + {1.79769e+308, 1.79769e+308} + + + 3 + 2 + {{194, 458}, {262, 266}} + 1886912512 + + NSWindow + + View + + {1.79769e+308, 1.79769e+308} + {213, 107} + + + 256 + + YES + + + 256 + {{22, 152}, {220, 22}} + + YES + + -2079195584 + 138413056 + Unison + + LucidaGrande-Bold + 18 + 16 + + + + + + + + + 256 + {{22, 20}, {224, 52}} + + YES + + -2080244224 + 138412032 + wqkgQ29weXJpZ2h0IDE5OTktMjAwNi4KClRoaXMgc29mdHdhcmUgaXMgbGljZW5zZWQgdW5kZXIgdGhl +IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlLg + + LucidaGrande + 10 + 2843 + + + + + + + + + 256 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{20, 182}, {224, 64}} + + YES + + 130560 + 33554432 + + NSImage + Unison + + 0 + 0 + 0 + NO + + YES + + + + 256 + {{22, 101}, {224, 18}} + + YES + + -2079195584 + 138413056 + Sync you very much! + + Optima-Italic + 12 + 16 + + + + + + + + + 256 + {{22, 127}, {220, 17}} + + YES + + -2079195584 + 138413056 + ?.?.? + + + + + + + + {262, 266} + + {{0, 0}, {1440, 878}} + {213, 129} + {1.79769e+308, 1.79769e+308} + + + 15 + 2 + {{519, 382}, {505, 342}} + 1886912512 + Diff + + NSWindow + + + View + + {1.79769e+308, 1.79769e+308} + {213, 107} + + + 256 + + YES + + + 319 + + YES + + + 2304 + + YES + + + 2322 + {505, 14} + + + + + + + + + + + YES + + + 6 + + + + 505 + 1 + + + 11236 + 0 + + + + YES + + YES + NSBackgroundColor + NSColor + + + YES + + 6 + System + selectedTextBackgroundColor + + + + 6 + System + selectedTextColor + + + + + + + YES + + YES + NSColor + NSUnderline + + + YES + + 1 + MCAwIDEAA + + + + + + + 6 + {1010, 1e+07} + {114, 0} + + + + {505, 342} + + + + + + {1, -1} + 0 + + 4 + + + + -2147483392 + {{-30, 1}, {15, 356}} + + + _doScroller: + 1 + + + + -2147483392 + {{-100, -100}, {87, 18}} + + 1 + + _doScroller: + 1 + 0.94565218687057495 + + + {505, 342} + + + 528 + + + + + + {505, 342} + + {{0, 0}, {1440, 878}} + {213, 129} + {1.79769e+308, 1.79769e+308} + + + 1 + 2 + {{163, 135}, {400, 229}} + 1886912512 + Unison + NSWindow + + View + + {1.79769e+308, 1.79769e+308} + {213, 107} + + + 256 + + YES + + + 256 + {{302, 12}, {84, 32}} + + YES + + -2080244224 + 134217728 + Yes + + + -2038284033 + 1 + + + + + + 200 + 25 + + + + + 256 + {{20, 188}, {383, 21}} + + YES + + 67239424 + 4194304 + Would you like to install the Unison command-line tool? + + LucidaGrande-Bold + 12 + 16 + + + + + + + + + 256 + {{17, 36}, {145, 18}} + + YES + + 67239424 + 131072 + Don't ask me again + + + 1211912703 + 2 + + NSSwitch + + + + 200 + 25 + + + + + 256 + {{218, 12}, {84, 32}} + + YES + + 67239424 + 134217728 + No + + + -2038284033 + 1 + + + + + + 200 + 25 + + + + + 256 + {{17, 60}, {366, 120}} + + YES + + 67239424 + 272629760 + VGhlIGNvbW1hbmQtbGluZSB0b29sIGlzIGEgc21hbGwgcHJvZ3JhbSB0aGF0IGNhbiBiZSBpbnN0YWxs +ZWQgaW4gYSBzdGFuZGFyZCBwbGFjZSBvbiB5b3VyIGNvbXB1dGVyICgvdXNyL2Jpbi91bmlzb24pIHNv +IFVuaXNvbiBjYW4gZWFzaWx5IGJlIGZvdW5kLiBJZiB5b3Ugd2FudCB0byBiZSBhYmxlIHRvIHN5bmNo +cm9uaXplIGZpbGVzIG9uIHRoaXMgY29tcHV0ZXIgYnkgcnVubmluZyBVbmlzb24gb24gYSByZW1vdGUg +Y29tcHV0ZXIsIHlvdSBzaG91bGQgcHJvYmFibHkgaW5zdGFsbCBpdC4KCklmIHlvdSBkb24ndCBpbnN0 +YWxsIGl0IG5vdywgeW91IGNhbiBkbyBzbyBsYXRlciBieSBjaG9vc2luZyAnSW5zdGFsbCBjb21tYW5k +LWxpbmUgdG9vbCcgZnJvbSB0aGUgVW5pc29uIG1lbnUuCg + + + + + + + + {400, 229} + + {{0, 0}, {1440, 878}} + {213, 129} + {1.79769e+308, 1.79769e+308} + + + 3 + 2 + {{235, 475}, {446, 84}} + 1954022400 + General + NSWindow + + + 2780CC9C-D44A-4484-8D03-C65609351E57 + + + YES + YES + YES + NO + 1 + 1 + + YES + + YES + 4A97E608-13A1-41D8-B077-1360865DB1A4 + D5D59D5F-DFD1-4F67-8724-69D88EF5E355 + NSToolbarFlexibleSpaceItem + + + YES + + + 4A97E608-13A1-41D8-B077-1360865DB1A4 + + General + General + + + + NSImage + NSPreferencesGeneral + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + + D5D59D5F-DFD1-4F67-8724-69D88EF5E355 + + Fonts + Fonts + Show Font Panel + + + NSImage + NSFontPanel + + + + {0, 0} + {0, 0} + YES + YES + -1 + YES + 0 + + + NSToolbarFlexibleSpaceItem + + Flexible Space + + + + + + {1, 5} + {20000, 32} + YES + YES + -1 + YES + 0 + + YES + YES + + + 1048576 + 2147483647 + + + + + + + + YES + + + + + + YES + + + + + + YES + + + {1.79769e+308, 1.79769e+308} + + + 256 + {446, 84} + + + {{0, 0}, {1920, 1178}} + {1.79769e+308, 1.79769e+308} + + + YES + + + + 256 + + YES + + + 268 + {{18, 45}, {174, 18}} + + YES + + -2080244224 + 0 + Open profile on startup: + + + 1211912703 + 2 + + NSImage + NSSwitch + + + + + 200 + 25 + + + + + 268 + {{18, 18}, {410, 18}} + + YES + + 67239424 + 0 + Delete log-file (~/unison.log) automatically on complete sync + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 268 + {{198, 40}, {231, 26}} + + YES + + 72482368 + 272630784 + + + + YES + + + 5 + YES + YES + + + + 274 + {15, 0} + + + YES + + YES + + + 12 + 10 + 1000 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5ODU2AA + + + + + 338820672 + 1024 + + + YES + + + + 3 + YES + + + + 3 + 2 + + + 19 + tableViewAction: + -767524864 + + + + 1 + 15 + 0 + YES + 0 + + + + + {446, 84} + + + + 256 + + YES + + + 268 + {{125, 50}, {213, 17}} + + + YES + + 68288064 + 272630784 + xxxx + + + + + + + + + 268 + {{343, 45}, {59, 25}} + + + YES + + -2080244224 + 134217728 + choose + + + -2038152961 + 163 + + + 400 + 75 + + + + + 268 + {{125, 20}, {213, 17}} + + + YES + + 68288064 + 272630784 + xxxx + + + + + + + + + 268 + {{343, 15}, {59, 25}} + + + YES + + -2080244224 + 134217728 + choose + + + -2038152961 + 163 + + + 400 + 75 + + + + + 268 + {{17, 20}, {106, 17}} + + + YES + + 68288064 + 71304192 + Diff font: + + + + + + + + + 268 + {{17, 50}, {106, 17}} + + + YES + + 68288064 + 71304192 + Details font: + + + + + + + + {422, 87} + + + + + YES + + + terminate: + + + + 139 + + + + hideOtherApplications: + + + + 146 + + + + hide: + + + + 152 + + + + unhideAllApplications: + + + + 153 + + + + cut: + + + + 175 + + + + paste: + + + + 176 + + + + selectAll: + + + + 179 + + + + copy: + + + + 181 + + + + updatesView + + + + 210 + + + + chooseProfileView + + + + 211 + + + + mainWindow + + + + 216 + + + + tableView + + + + 218 + + + + dataSource + + + + 219 + + + + profileController + + + + 221 + + + + endPasswordWindow: + + + + 240 + + + + passwordWindow + + + + 241 + + + + passwordText + + + + 242 + + + + endPasswordWindow: + + + + 243 + + + + ignorePath: + + + + 258 + + + + ignoreExt: + + + + 259 + + + + ignoreName: + + + + 260 + + + + copyLR: + + + + 270 + + + + copyRL: + + + + 271 + + + + selectConflicts: + + + + 273 + + + + revert: + + + + 274 + + + + forceNewer: + + + + 282 + + + + forceOlder: + + + + 283 + + + + leaveAlone: + + + + 285 + + + + profileNameText + + + + 332 + + + + preferencesController + + + + 350 + + + + preferencesView + + + + 358 + + + + firstRootText + + + + 373 + + + + secondRootUser + + + + 374 + + + + secondRootHost + + + + 375 + + + + secondRootText + + + + 376 + + + + remoteButtonCell + + + + 377 + + + + localButtonCell + + + + 378 + + + + nextKeyView + + + + 379 + + + + nextKeyView + + + + 380 + + + + nextKeyView + + + + 381 + + + + nextKeyView + + + + 382 + + + + nextKeyView + + + + 383 + + + + remoteClick: + + + + 386 + + + + localClick: + + + + 387 + + + + passwordCancelButton + + + + 395 + + + + delegate + + + + 396 + + + + myController + + + + 400 + + + + aboutWindow + + + + 412 + + + + versionText + + + + 413 + + + + onlineHelp: + + + + 416 + + + + syncButton: + + + + 421 + + + + ConnectingView + + + + 425 + + + + restartButton: + + + + 431 + + + + passwordPrompt + + + + 436 + + + + notificationController + + + + 438 + + + + raiseAboutWindow: + + + + 462 + + + + diffWindow + + + + 479 + + + + diffView + + + + 480 + + + + merge: + + + + 482 + + + + showDiff: + + + + 483 + + + + rescan: + + + + 485 + + + + progressBar + + + + 487 + + + + cltoolPref + + + + 497 + + + + cltoolWindow + + + + 500 + + + + cltoolNoButton: + + + + 503 + + + + cltoolYesButton: + + + + 505 + + + + initialFirstResponder + + + + 506 + + + + raiseCltoolWindow: + + + + 507 + + + + tableModeSelector + + + + 516 + + + + tableModeChanged: + + + + 517 + + + + delegate + + + + 571 + + + + showPreferences: + + + + 572 + + + + connectingAnimation + + + + 578 + + + + statusText + + + + 585 + + + + delegate + + + + 605 + + + + dataSource + + + + 606 + + + + detailsTextView + + + + 609 + + + + tableView + + + + 610 + + + + preferencesWindow + + + + 659 + + + + detailsFontLabel + + + + 661 + + + + diffFontLabel + + + + 662 + + + + chooseFont: + + + + 672 + + + + chooseFont: + + + + 673 + + + + chooseDetailsFont + + + + 676 + + + + chooseDiffFont + + + + 677 + + + + splitView + + + + 684 + + + + connectingViewGradient + + + + 686 + + + + detailsTextViewGradient + + + + 687 + + + + value: values.deleteLogOnExit + + + + + + value: values.deleteLogOnExit + value + values.deleteLogOnExit + 2 + + + 706 + + + + value: values.openProfileAtStartup + + + + + + value: values.openProfileAtStartup + value + values.openProfileAtStartup + 2 + + + 707 + + + + value: values.profileToOpen + + + + + + value: values.profileToOpen + value + values.profileToOpen + 2 + + + 708 + + + + checkOpenProfileChanged: + + + + 709 + + + + window + + + + 756 + + + + linkedView + + + + 759 + + + + linkedView + + + + 760 + + + + + YES + + 0 + + YES + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 21 + + + YES + + + + Window + + + 2 + + + YES + + + + + + 515 + + + YES + + + + + + 29 + + + YES + + + + + + + + MainMenu + + + 56 + + + YES + + + + + + 57 + + + YES + + + + + + + + + + + + + + + 129 + + + + + 134 + + + + + 136 + + + + + 144 + + + + + 145 + + + + + 149 + + + + + 150 + + + + + 196 + + + + + 414 + + + + + 428 + + + + + 103 + + + YES + + + + + + 106 + + + YES + + + + + + 111 + + + + + 163 + + + YES + + + + + + 169 + + + YES + + + + + + + + + + 157 + + + + + 160 + + + + + 171 + + + + + 172 + + + + + 269 + + + + + 253 + + + YES + + + + + + 254 + + + YES + + + + + + + + 255 + + + + + 256 + + + + + 257 + + + + + 261 + + + YES + + + + + + 262 + + + YES + + + + + + + + + + + + + + + + + 263 + + + + + 266 + + + + + 267 + + + + + 268 + + + + + 281 + + + + + 284 + + + + + 417 + + + + + 419 + + + + + 420 + + + + + 430 + + + + + 481 + + + + + 484 + + + + + 197 + + + YES + + + + + + chooseProfileView + + + 199 + + + YES + + + + + + 201 + + + YES + + + + + + 203 + + + YES + + + + + + + + + 205 + + + YES + + + + + + 202 + + + YES + + + + + + 198 + + + YES + + + + + + updatesView + + + 209 + + + MyController + + + 217 + + + ProfileController + + + 234 + + + YES + + + + PasswordWindow + + + 235 + + + YES + + + + + + + + + 236 + + + YES + + + + + + 237 + + + YES + + + + + + 238 + + + YES + + + + + + 239 + + + YES + + + + + + 307 + + + YES + + + + + + + PreferencesView + + + 321 + + + YES + + + + + + + 323 + + + YES + + + + + + + + + + + + 329 + + + YES + + + + + + 330 + + + YES + + + + + + 331 + + + PreferencesController + + + 402 + + + YES + + + + AboutWindow + + + 401 + + + YES + + + + + + + + + + 406 + + + YES + + + + + + 407 + + + YES + + + + + + 409 + + + YES + + + + + + 410 + + + YES + + + + + + 411 + + + YES + + + + + + 437 + + + NotificationController + + + 475 + + + YES + + + + DiffWindow + + + 476 + + + YES + + + + + + 477 + + + YES + + + + + + + + 478 + + + + + 488 + + + YES + + + + CltoolWindow + + + 489 + + + YES + + + + + + + + + + 491 + + + YES + + + + + + 493 + + + YES + + + + + + 494 + + + YES + + + + + + 495 + + + YES + + + + + + 496 + + + YES + + + + + + 527 + + + + + 528 + + + + + 529 + + + + + 531 + + + + + 532 + + + + + 533 + + + + + 534 + + + + + 543 + + + + + 544 + + + + + 545 + + + + + 546 + + + + + 547 + + + + + 548 + + + + + 549 + + + + + 551 + + + + + 552 + + + + + 553 + + + + + 554 + + + + + 555 + + + + + 557 + + + + + 561 + + + + + 562 + + + + + 563 + + + + + 569 + + + + + 570 + + + + + 362 + + + YES + + + + + + 535 + + + + + 363 + + + YES + + + + + + 536 + + + + + 364 + + + YES + + + + + + + + 556 + + + + + 366 + + + + + 365 + + + + + 367 + + + YES + + + + + + 537 + + + + + 368 + + + YES + + + + + + 538 + + + + + 369 + + + YES + + + + + + 539 + + + + + 370 + + + YES + + + + + + 540 + + + + + 371 + + + YES + + + + + + 541 + + + + + 372 + + + YES + + + + + + 542 + + + + + 586 + + + YES + + + + + + + 589 + + + YES + + + + + + 607 + + + YES + + + + + + 608 + + + + + 486 + + + + + 590 + + + YES + + + + + + + + + 594 + + + YES + + + + + + + + + + 599 + + + YES + + + + + + 600 + + + + + 598 + + + YES + + + + + + 601 + + + + + 597 + + + YES + + + + + + 602 + + + + + 596 + + + YES + + + + + + 603 + + + + + 595 + + + YES + + + + + + 604 + + + + + 593 + + + + + 592 + + + + + 591 + + + + + 583 + + + YES + + + + + + 584 + + + + + 618 + + + YES + + + + + PreferencesWindow + + + 619 + + + YES + + + + + 423 + + + YES + + + + + ConnectingView + + + 576 + + + + + 653 + + + + + 681 + + + YES + + + + + + 682 + + + YES + + + + + + 683 + + + + + 699 + + + YES + + + + + + + + 700 + + + YES + + + + + + 701 + + + YES + + + + + + 702 + + + YES + + + + + + 703 + + + + + 704 + + + + + 705 + + + + + 678 + + + YES + + + + + + + + + Font View + + + 636 + + + YES + + + + + + 637 + + + YES + + + + + + 640 + + + YES + + + + + + 641 + + + YES + + + + + + 644 + + + YES + + + + + + 646 + + + YES + + + + + + 647 + + + + + 645 + + + + + 642 + + + + + 643 + + + + + 638 + + + + + 639 + + + + + 737 + + + YES + + + + + + + + 743 + + + + + 757 + + + + + 758 + + + + + + + YES + + YES + -3.IBPluginDependency + -3.ImportedFromIB2 + 103.IBPluginDependency + 103.ImportedFromIB2 + 106.IBEditorWindowLastContentRect + 106.IBPluginDependency + 106.ImportedFromIB2 + 111.IBPluginDependency + 111.ImportedFromIB2 + 129.IBPluginDependency + 129.ImportedFromIB2 + 134.IBPluginDependency + 134.ImportedFromIB2 + 136.IBPluginDependency + 136.ImportedFromIB2 + 144.IBPluginDependency + 144.ImportedFromIB2 + 145.IBPluginDependency + 145.ImportedFromIB2 + 149.IBPluginDependency + 149.ImportedFromIB2 + 150.IBPluginDependency + 150.ImportedFromIB2 + 157.IBPluginDependency + 157.ImportedFromIB2 + 160.IBPluginDependency + 160.ImportedFromIB2 + 163.IBPluginDependency + 163.ImportedFromIB2 + 169.IBEditorWindowLastContentRect + 169.IBPluginDependency + 169.ImportedFromIB2 + 171.IBPluginDependency + 171.ImportedFromIB2 + 172.IBPluginDependency + 172.ImportedFromIB2 + 196.IBPluginDependency + 196.ImportedFromIB2 + 197.IBEditorWindowLastContentRect + 197.IBPluginDependency + 197.ImportedFromIB2 + 198.IBEditorWindowLastContentRect + 198.IBPluginDependency + 198.ImportedFromIB2 + 199.IBPluginDependency + 199.ImportedFromIB2 + 2.IBPluginDependency + 2.ImportedFromIB2 + 201.IBPluginDependency + 201.ImportedFromIB2 + 202.IBPluginDependency + 202.ImportedFromIB2 + 203.IBPluginDependency + 203.ImportedFromIB2 + 205.CustomClassName + 205.IBPluginDependency + 205.ImportedFromIB2 + 209.ImportedFromIB2 + 21.IBEditorWindowLastContentRect + 21.IBPluginDependency + 21.IBWindowTemplateEditedContentRect + 21.ImportedFromIB2 + 21.windowTemplate.hasMinSize + 21.windowTemplate.minSize + 217.ImportedFromIB2 + 234.IBEditorWindowLastContentRect + 234.IBPluginDependency + 234.IBWindowTemplateEditedContentRect + 234.ImportedFromIB2 + 234.windowTemplate.hasMinSize + 234.windowTemplate.minSize + 235.IBPluginDependency + 235.ImportedFromIB2 + 236.CustomClassName + 236.IBPluginDependency + 236.ImportedFromIB2 + 237.IBPluginDependency + 237.ImportedFromIB2 + 238.IBPluginDependency + 238.ImportedFromIB2 + 239.IBPluginDependency + 239.ImportedFromIB2 + 253.IBPluginDependency + 253.ImportedFromIB2 + 254.IBEditorWindowLastContentRect + 254.IBPluginDependency + 254.ImportedFromIB2 + 255.IBPluginDependency + 255.ImportedFromIB2 + 256.IBPluginDependency + 256.ImportedFromIB2 + 257.IBPluginDependency + 257.ImportedFromIB2 + 261.IBPluginDependency + 261.ImportedFromIB2 + 262.IBEditorWindowLastContentRect + 262.IBPluginDependency + 262.ImportedFromIB2 + 263.IBPluginDependency + 263.ImportedFromIB2 + 266.IBPluginDependency + 266.ImportedFromIB2 + 267.IBPluginDependency + 267.ImportedFromIB2 + 268.IBPluginDependency + 268.ImportedFromIB2 + 269.IBPluginDependency + 269.ImportedFromIB2 + 281.IBPluginDependency + 281.ImportedFromIB2 + 284.IBPluginDependency + 284.ImportedFromIB2 + 29.IBEditorWindowLastContentRect + 29.IBPluginDependency + 29.ImportedFromIB2 + 307.IBEditorWindowLastContentRect + 307.IBPluginDependency + 307.ImportedFromIB2 + 321.IBPluginDependency + 321.ImportedFromIB2 + 323.IBPluginDependency + 323.ImportedFromIB2 + 329.IBPluginDependency + 329.ImportedFromIB2 + 330.IBPluginDependency + 330.ImportedFromIB2 + 331.ImportedFromIB2 + 362.IBPluginDependency + 362.ImportedFromIB2 + 363.IBPluginDependency + 363.ImportedFromIB2 + 364.IBPluginDependency + 364.ImportedFromIB2 + 365.IBPluginDependency + 365.ImportedFromIB2 + 366.IBPluginDependency + 366.ImportedFromIB2 + 367.IBPluginDependency + 367.ImportedFromIB2 + 368.IBPluginDependency + 368.ImportedFromIB2 + 369.IBPluginDependency + 369.ImportedFromIB2 + 370.IBPluginDependency + 370.ImportedFromIB2 + 371.IBPluginDependency + 371.ImportedFromIB2 + 372.IBPluginDependency + 372.ImportedFromIB2 + 401.IBPluginDependency + 401.ImportedFromIB2 + 402.IBEditorWindowLastContentRect + 402.IBPluginDependency + 402.IBWindowTemplateEditedContentRect + 402.ImportedFromIB2 + 402.windowTemplate.hasMinSize + 402.windowTemplate.minSize + 406.IBPluginDependency + 406.ImportedFromIB2 + 407.IBPluginDependency + 407.ImportedFromIB2 + 409.IBPluginDependency + 409.ImportedFromIB2 + 410.IBPluginDependency + 410.ImportedFromIB2 + 411.IBPluginDependency + 411.ImportedFromIB2 + 414.IBPluginDependency + 414.ImportedFromIB2 + 417.IBPluginDependency + 417.ImportedFromIB2 + 419.IBPluginDependency + 419.ImportedFromIB2 + 420.IBPluginDependency + 420.ImportedFromIB2 + 423.IBEditorWindowLastContentRect + 423.IBPluginDependency + 423.ImportedFromIB2 + 428.IBPluginDependency + 428.ImportedFromIB2 + 430.IBPluginDependency + 430.ImportedFromIB2 + 437.ImportedFromIB2 + 475.IBEditorWindowLastContentRect + 475.IBPluginDependency + 475.IBWindowTemplateEditedContentRect + 475.ImportedFromIB2 + 475.windowTemplate.hasMinSize + 475.windowTemplate.minSize + 476.IBPluginDependency + 476.ImportedFromIB2 + 477.IBPluginDependency + 477.ImportedFromIB2 + 478.IBPluginDependency + 478.ImportedFromIB2 + 481.IBPluginDependency + 481.ImportedFromIB2 + 484.IBPluginDependency + 484.ImportedFromIB2 + 486.IBPluginDependency + 486.ImportedFromIB2 + 488.IBEditorWindowLastContentRect + 488.IBPluginDependency + 488.IBWindowTemplateEditedContentRect + 488.ImportedFromIB2 + 488.windowTemplate.hasMinSize + 488.windowTemplate.minSize + 489.IBPluginDependency + 489.ImportedFromIB2 + 491.IBPluginDependency + 491.ImportedFromIB2 + 493.IBPluginDependency + 493.ImportedFromIB2 + 494.IBPluginDependency + 494.ImportedFromIB2 + 495.IBPluginDependency + 495.ImportedFromIB2 + 496.IBPluginDependency + 496.ImportedFromIB2 + 515.IBPluginDependency + 515.ImportedFromIB2 + 527.IBPluginDependency + 528.IBPluginDependency + 529.IBPluginDependency + 531.IBPluginDependency + 532.IBPluginDependency + 533.IBPluginDependency + 534.IBPluginDependency + 535.IBPluginDependency + 536.IBPluginDependency + 537.IBPluginDependency + 538.IBPluginDependency + 539.IBPluginDependency + 540.IBPluginDependency + 541.IBPluginDependency + 542.IBPluginDependency + 543.IBPluginDependency + 544.IBPluginDependency + 545.IBPluginDependency + 546.IBPluginDependency + 547.IBPluginDependency + 548.IBPluginDependency + 549.IBPluginDependency + 551.IBPluginDependency + 552.IBPluginDependency + 553.IBPluginDependency + 554.IBPluginDependency + 555.IBPluginDependency + 556.IBPluginDependency + 557.IBPluginDependency + 557.IBShouldRemoveOnLegacySave + 56.IBPluginDependency + 56.ImportedFromIB2 + 561.IBPluginDependency + 561.IBShouldRemoveOnLegacySave + 562.IBPluginDependency + 562.IBShouldRemoveOnLegacySave + 563.IBPluginDependency + 563.IBShouldRemoveOnLegacySave + 569.IBPluginDependency + 569.IBShouldRemoveOnLegacySave + 57.IBEditorWindowLastContentRect + 57.IBPluginDependency + 57.ImportedFromIB2 + 570.IBPluginDependency + 570.IBShouldRemoveOnLegacySave + 576.IBPluginDependency + 589.CustomClassName + 590.IBPluginDependency + 590.ImportedFromIB2 + 591.IBPluginDependency + 591.IBShouldRemoveOnLegacySave + 592.IBPluginDependency + 592.IBShouldRemoveOnLegacySave + 593.IBPluginDependency + 593.IBShouldRemoveOnLegacySave + 594.CustomClassName + 594.IBPluginDependency + 594.ImportedFromIB2 + 595.IBPluginDependency + 595.ImportedFromIB2 + 596.IBPluginDependency + 596.ImportedFromIB2 + 597.IBPluginDependency + 597.ImportedFromIB2 + 598.IBPluginDependency + 598.ImportedFromIB2 + 599.IBPluginDependency + 599.ImportedFromIB2 + 600.IBPluginDependency + 600.ImportedFromIB2 + 601.IBPluginDependency + 601.ImportedFromIB2 + 602.IBPluginDependency + 602.IBShouldRemoveOnLegacySave + 603.IBPluginDependency + 603.IBShouldRemoveOnLegacySave + 604.IBPluginDependency + 604.IBShouldRemoveOnLegacySave + 618.IBEditorWindowLastContentRect + 618.IBPluginDependency + 618.IBWindowTemplateEditedContentRect + 618.NSWindowTemplate.visibleAtLaunch + 619.IBPluginDependency + 619.IBViewBoundsToFrameTransform + 636.IBPluginDependency + 637.IBPluginDependency + 638.IBPluginDependency + 639.IBPluginDependency + 640.IBPluginDependency + 641.IBPluginDependency + 642.IBPluginDependency + 643.IBPluginDependency + 644.IBPluginDependency + 645.IBPluginDependency + 646.IBPluginDependency + 647.IBPluginDependency + 653.IBPluginDependency + 678.IBPluginDependency + 678.IBViewBoundsToFrameTransform + 681.CustomClassName + 681.IBViewIntegration.shadowColor + 699.IBPluginDependency + 699.IBViewBoundsToFrameTransform + 700.IBPluginDependency + 701.IBPluginDependency + 702.IBPluginDependency + 703.IBPluginDependency + 704.IBPluginDependency + 705.IBPluginDependency + 737.CustomClassName + 737.IBEditorWindowLastContentRect + 737.IBPluginDependency + 743.IBPluginDependency + 757.CustomClassName + 757.IBPluginDependency + 757.toolbarItem.selectable + 758.CustomClassName + 758.IBPluginDependency + 758.toolbarItem.selectable + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{582, 1091}, {202, 23}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{407, 1011}, {179, 103}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{345, 795}, {363, 281}} + com.apple.InterfaceBuilder.CocoaPlugin + + {{329, 310}, {730, 546}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + ProfileTableView + com.apple.InterfaceBuilder.CocoaPlugin + + + {{717, 719}, {480, 360}} + com.apple.InterfaceBuilder.CocoaPlugin + {{717, 719}, {480, 360}} + + + {213, 107} + + {{345, 994}, {227, 128}} + com.apple.InterfaceBuilder.CocoaPlugin + {{345, 994}, {227, 128}} + + + {213, 107} + com.apple.InterfaceBuilder.CocoaPlugin + + NSSecureTextField + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{520, 1051}, {191, 63}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{451, 881}, {323, 233}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{811, 836}, {317, 20}} + com.apple.InterfaceBuilder.CocoaPlugin + + {{345, 606}, {534, 250}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{345, 879}, {262, 266}} + com.apple.InterfaceBuilder.CocoaPlugin + {{345, 879}, {262, 266}} + + + {213, 107} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{443, 279}, {871, 577}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + {{345, 792}, {505, 342}} + com.apple.InterfaceBuilder.CocoaPlugin + {{345, 792}, {505, 342}} + + + {213, 107} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{345, 916}, {400, 229}} + com.apple.InterfaceBuilder.CocoaPlugin + {{345, 916}, {400, 229}} + + + {213, 107} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{338, 941}, {266, 173}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + ColorGradientView + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + ReconTableView + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{605, 124}, {446, 84}} + com.apple.InterfaceBuilder.CocoaPlugin + {{605, 124}, {446, 84}} + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ColorGradientView + + 6 + System + alternateSelectedControlColor + + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + SSSelectableToolbar + {{520, 208}, {616, 0}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + SSSelectableToolbarItem + com.apple.InterfaceBuilder.CocoaPlugin + + SSSelectableToolbarItem + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + YES + + + YES + + + + + YES + + + YES + + + + 760 + + + + YES + + ColorGradientView + NSView + + IBProjectSource + ColorGradientView.h + + + + FirstResponder + NSObject + + YES + + YES + copyLR: + copyRL: + forceNewer: + forceOlder: + ignoreExt: + ignoreName: + ignorePath: + leaveAlone: + merge: + revert: + selectConflicts: + showDiff: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + copyLR: + copyRL: + forceNewer: + forceOlder: + ignoreExt: + ignoreName: + ignorePath: + leaveAlone: + merge: + revert: + selectConflicts: + showDiff: + + + YES + + copyLR: + id + + + copyRL: + id + + + forceNewer: + id + + + forceOlder: + id + + + ignoreExt: + id + + + ignoreName: + id + + + ignorePath: + id + + + leaveAlone: + id + + + merge: + id + + + revert: + id + + + selectConflicts: + id + + + showDiff: + id + + + + + IBUserSource + + + + + MyController + NSObject + + YES + + YES + cancelProfileButton: + checkOpenProfileChanged: + chooseFont: + cltoolNoButton: + cltoolYesButton: + createButton: + endPasswordWindow: + installCommandLineTool: + onlineHelp: + openButton: + raiseAboutWindow: + raiseCltoolWindow: + raiseWindow: + rescan: + restartButton: + saveProfileButton: + showPreferences: + syncButton: + tableModeChanged: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + NSWindow + id + id + id + id + id + id + + + + YES + + YES + cancelProfileButton: + checkOpenProfileChanged: + chooseFont: + cltoolNoButton: + cltoolYesButton: + createButton: + endPasswordWindow: + installCommandLineTool: + onlineHelp: + openButton: + raiseAboutWindow: + raiseCltoolWindow: + raiseWindow: + rescan: + restartButton: + saveProfileButton: + showPreferences: + syncButton: + tableModeChanged: + + + YES + + cancelProfileButton: + id + + + checkOpenProfileChanged: + id + + + chooseFont: + id + + + cltoolNoButton: + id + + + cltoolYesButton: + id + + + createButton: + id + + + endPasswordWindow: + id + + + installCommandLineTool: + id + + + onlineHelp: + id + + + openButton: + id + + + raiseAboutWindow: + id + + + raiseCltoolWindow: + id + + + raiseWindow: + NSWindow + + + rescan: + id + + + restartButton: + id + + + saveProfileButton: + id + + + showPreferences: + id + + + syncButton: + id + + + tableModeChanged: + id + + + + + YES + + YES + ConnectingView + aboutWindow + checkOpenProfile + chooseDetailsFont + chooseDiffFont + chooseProfileView + cltoolPref + cltoolWindow + connectingAnimation + connectingViewGradient + detailsFontLabel + detailsTextView + detailsTextViewGradient + diffFontLabel + diffView + diffWindow + fontChangeTarget + mainWindow + notificationController + passwordCancelButton + passwordPrompt + passwordText + passwordWindow + preferencesController + preferencesView + preferencesWindow + profileBox + profileController + progressBar + splitView + statusText + tableModeSelector + tableView + updatesText + updatesView + versionText + + + YES + NSView + NSWindow + NSButton + NSButton + NSButton + NSView + NSButton + NSWindow + NSProgressIndicator + ColorGradientView + NSTextField + NSTextField + ColorGradientView + NSTextField + NSTextView + NSWindow + id + NSWindow + NotificationController + NSButton + NSTextField + NSTextField + NSWindow + PreferencesController + NSView + NSWindow + NSComboBox + ProfileController + NSProgressIndicator + NSSplitView + NSTextField + NSSegmentedControl + ReconTableView + NSTextField + NSView + NSTextField + + + + YES + + YES + ConnectingView + aboutWindow + checkOpenProfile + chooseDetailsFont + chooseDiffFont + chooseProfileView + cltoolPref + cltoolWindow + connectingAnimation + connectingViewGradient + detailsFontLabel + detailsTextView + detailsTextViewGradient + diffFontLabel + diffView + diffWindow + fontChangeTarget + mainWindow + notificationController + passwordCancelButton + passwordPrompt + passwordText + passwordWindow + preferencesController + preferencesView + preferencesWindow + profileBox + profileController + progressBar + splitView + statusText + tableModeSelector + tableView + updatesText + updatesView + versionText + + + YES + + ConnectingView + NSView + + + aboutWindow + NSWindow + + + checkOpenProfile + NSButton + + + chooseDetailsFont + NSButton + + + chooseDiffFont + NSButton + + + chooseProfileView + NSView + + + cltoolPref + NSButton + + + cltoolWindow + NSWindow + + + connectingAnimation + NSProgressIndicator + + + connectingViewGradient + ColorGradientView + + + detailsFontLabel + NSTextField + + + detailsTextView + NSTextField + + + detailsTextViewGradient + ColorGradientView + + + diffFontLabel + NSTextField + + + diffView + NSTextView + + + diffWindow + NSWindow + + + fontChangeTarget + id + + + mainWindow + NSWindow + + + notificationController + NotificationController + + + passwordCancelButton + NSButton + + + passwordPrompt + NSTextField + + + passwordText + NSTextField + + + passwordWindow + NSWindow + + + preferencesController + PreferencesController + + + preferencesView + NSView + + + preferencesWindow + NSWindow + + + profileBox + NSComboBox + + + profileController + ProfileController + + + progressBar + NSProgressIndicator + + + splitView + NSSplitView + + + statusText + NSTextField + + + tableModeSelector + NSSegmentedControl + + + tableView + ReconTableView + + + updatesText + NSTextField + + + updatesView + NSView + + + versionText + NSTextField + + + + + IBProjectSource + MyController.h + + + + MyController + NSObject + + IBUserSource + + + + + NSOutlineView + + IBProjectSource + ReconTableView.h + + + + NSOutlineView + NSTableView + + IBUserSource + + + + + NSSegmentedControl + NSControl + + IBUserSource + + + + + NotificationController + NSObject + + IBProjectSource + NotificationController.h + + + + NotificationController + NSObject + + IBUserSource + + + + + PreferencesController + NSObject + + YES + + YES + anyEnter: + localClick: + remoteClick: + + + YES + id + id + id + + + + YES + + YES + anyEnter: + localClick: + remoteClick: + + + YES + + anyEnter: + id + + + localClick: + id + + + remoteClick: + id + + + + + YES + + YES + firstRootText + localButtonCell + profileNameText + remoteButtonCell + secondRootHost + secondRootText + secondRootUser + + + YES + NSTextField + NSButtonCell + NSTextField + NSButtonCell + NSTextField + NSTextField + NSTextField + + + + YES + + YES + firstRootText + localButtonCell + profileNameText + remoteButtonCell + secondRootHost + secondRootText + secondRootUser + + + YES + + firstRootText + NSTextField + + + localButtonCell + NSButtonCell + + + profileNameText + NSTextField + + + remoteButtonCell + NSButtonCell + + + secondRootHost + NSTextField + + + secondRootText + NSTextField + + + secondRootUser + NSTextField + + + + + IBProjectSource + PreferencesController.h + + + + PreferencesController + NSObject + + IBUserSource + + + + + ProfileController + NSObject + + tableView + NSTableView + + + tableView + + tableView + NSTableView + + + + IBProjectSource + ProfileController.h + + + + ProfileController + NSObject + + IBUserSource + + + + + ProfileTableView + NSTableView + + myController + MyController + + + myController + + myController + MyController + + + + IBProjectSource + ProfileTableView.h + + + + ProfileTableView + NSTableView + + IBUserSource + + + + + ReconTableView + NSOutlineView + + YES + + YES + copyLR: + copyRL: + forceNewer: + forceOlder: + ignoreExt: + ignoreName: + ignorePath: + leaveAlone: + merge: + revert: + selectConflicts: + showDiff: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + copyLR: + copyRL: + forceNewer: + forceOlder: + ignoreExt: + ignoreName: + ignorePath: + leaveAlone: + merge: + revert: + selectConflicts: + showDiff: + + + YES + + copyLR: + id + + + copyRL: + id + + + forceNewer: + id + + + forceOlder: + id + + + ignoreExt: + id + + + ignoreName: + id + + + ignorePath: + id + + + leaveAlone: + id + + + merge: + id + + + revert: + id + + + selectConflicts: + id + + + showDiff: + id + + + + + + + ReconTableView + NSOutlineView + + IBUserSource + + + + + SSSelectableToolbar + NSToolbar + + window + NSWindow + + + window + + window + NSWindow + + + + IBProjectSource + ssselectabletoolbar/SSSelectableToolbar.h + + + + SSSelectableToolbarItem + NSToolbarItem + + linkedView + NSView + + + linkedView + + linkedView + NSView + + + + IBProjectSource + ssselectabletoolbar/SSSelectableToolbarItem.h + + + + + YES + + NSApplication + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h + + + + NSObject + + IBFrameworkSource + ExceptionHandling.framework/Headers/NSExceptionHandler.h + + + + NSObject + + IBFrameworkSource + Growl.framework/Headers/GrowlApplicationBridge.h + + + + NSView + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSView+BWAdditions.h + + + + NSWindow + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + ../uimacnew.xcodeproj + 3 + + YES + + YES + NSFontPanel + NSMenuCheckmark + NSMenuMixedState + NSPreferencesGeneral + NSSwitch + Outline-Deep + Outline-Flat + Outline-Flattened + Unison + + + YES + {32, 32} + {9, 8} + {7, 2} + {32, 32} + {15, 15} + {24, 16} + {24, 16} + {24, 16} + {128, 128} + + + + Added: trunk/src/uimac14/Frameworks/Growl.framework/Growl =================================================================== (Binary files differ) Index: trunk/src/uimac14/Frameworks/Growl.framework/Growl =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Growl 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/Frameworks/Growl.framework/Growl 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/Frameworks/Growl.framework/Growl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/src/uimac14/Frameworks/Growl.framework/Headers/Growl.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Headers/Growl.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Headers/Growl.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,6 @@ +#include "GrowlDefines.h" + +#ifdef __OBJC__ +# include "GrowlApplicationBridge.h" +#endif +#include "GrowlApplicationBridge-Carbon.h" Added: trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlApplicationBridge-Carbon.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlApplicationBridge-Carbon.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlApplicationBridge-Carbon.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,780 @@ +// +// GrowlApplicationBridge-Carbon.h +// Growl +// +// Created by Mac-arena the Bored Zo on Wed Jun 18 2004. +// Based on GrowlApplicationBridge.h by Evan Schoenberg. +// This source code is in the public domain. You may freely link it into any +// program. +// + +#ifndef _GROWLAPPLICATIONBRIDGE_CARBON_H_ +#define _GROWLAPPLICATIONBRIDGE_CARBON_H_ + +#include +#include + +#ifndef GROWL_EXPORT +#define GROWL_EXPORT __attribute__((visibility("default"))) DEPRECATED_ATTRIBUTE +#endif + +/*! @header GrowlApplicationBridge-Carbon.h + * @abstract Declares an API that Carbon applications can use to interact with Growl. + * @discussion GrowlApplicationBridge uses a delegate to provide information //XXX + * to Growl (such as your application's name and what notifications it may + * post) and to provide information to your application (such as that Growl + * is listening for notifications or that a notification has been clicked). + * + * You can set the Growldelegate with Growl_SetDelegate and find out the + * current delegate with Growl_GetDelegate. See struct Growl_Delegate for more + * information about the delegate. + */ + +__BEGIN_DECLS + +/*! @struct Growl_Delegate + * @abstract Delegate to supply GrowlApplicationBridge with information and respond to events. + * @discussion The Growl delegate provides your interface to + * GrowlApplicationBridge. When GrowlApplicationBridge needs information about + * your application, it looks for it in the delegate; when Growl or the user + * does something that you might be interested in, GrowlApplicationBridge + * looks for a callback in the delegate and calls it if present + * (meaning, if it is not NULL). + * XXX on all of that + * @field size The size of the delegate structure. + * @field applicationName The name of your application. + * @field registrationDictionary A dictionary describing your application and the notifications it can send out. + * @field applicationIconData Your application's icon. + * @field growlInstallationWindowTitle The title of the installation window. + * @field growlInstallationInformation Text to display in the installation window. + * @field growlUpdateWindowTitle The title of the update window. + * @field growlUpdateInformation Text to display in the update window. + * @field referenceCount A count of owners of the delegate. + * @field retain Called when GrowlApplicationBridge receives this delegate. + * @field release Called when GrowlApplicationBridge no longer needs this delegate. + * @field growlIsReady Called when GrowlHelperApp is listening for notifications. + * @field growlNotificationWasClicked Called when a Growl notification is clicked. + * @field growlNotificationTimedOut Called when a Growl notification timed out. + */ +struct Growl_Delegate { + /* @discussion This should be sizeof(struct Growl_Delegate). + */ + size_t size; + + /*All of these attributes are optional. + *Optional attributes can be NULL; required attributes that + * are NULL cause setting the Growl delegate to fail. + *XXX - move optional/required status into the discussion for each field + */ + + /* This name is used both internally and in the Growl preferences. + * + * This should remain stable between different versions and incarnations of + * your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + * + * This can be NULL if it is provided elsewhere, namely in an + * auto-discoverable plist file in your app bundle + * (XXX refer to more information on that) or in registrationDictionary. + */ + CFStringRef applicationName; + + /* + * Must contain at least these keys: + * GROWL_NOTIFICATIONS_ALL (CFArray): + * Contains the names of all notifications your application may post. + * + * Can also contain these keys: + * GROWL_NOTIFICATIONS_DEFAULT (CFArray): + * Names of notifications that should be enabled by default. + * If omitted, GROWL_NOTIFICATIONS_ALL will be used. + * GROWL_APP_NAME (CFString): + * Same as the applicationName member of this structure. + * If both are present, the applicationName member shall prevail. + * If this key is present, you may omit applicationName (set it to NULL). + * GROWL_APP_ICON (CFData): + * Same as the iconData member of this structure. + * If both are present, the iconData member shall prevail. + * If this key is present, you may omit iconData (set it to NULL). + * + * If you change the contents of this dictionary after setting the delegate, + * be sure to call Growl_Reregister. + * + * This can be NULL if you have an auto-discoverable plist file in your app + * bundle. (XXX refer to more information on that) + */ + CFDictionaryRef registrationDictionary; + + /* The data can be in any format supported by NSImage. As of + * Mac OS X 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and + * PICT formats. + * + * If this is not supplied, Growl will look up your application's icon by + * its application name. + */ + CFDataRef applicationIconData; + + /* Installer display attributes + * + * These four attributes are used by the Growl installer, if this framework + * supports it. + * For any of these being NULL, a localised default will be + * supplied. + */ + + /* If this is NULL, Growl will use a default, + * localized title. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlInstallationWindowTitle; + /* This information may be as long or short as desired (the + * window will be sized to fit it). If Growl is not installed, it will + * be displayed to the user as an explanation of what Growl is and what + * it can do in your application. + * It should probably note that no download is required to install. + * + * If this is NULL, Growl will use a default, localized + * explanation. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlInstallationInformation; + /* If this is NULL, Growl will use a default, + * localized title. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlUpdateWindowTitle; + /* This information may be as long or short as desired (the + * window will be sized to fit it). If an older version of Growl is + * installed, it will be displayed to the user as an explanation that an + * updated version of Growl is included in your application and + * no download is required. + * + * If this is NULL, Growl will use a default, localized + * explanation. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlUpdateInformation; + + /* This member is provided for use by your retain and release + * callbacks (see below). + * + * GrowlApplicationBridge never directly uses this member. Instead, it + * calls your retain callback (if non-NULL) and your release + * callback (if non-NULL). + */ + unsigned referenceCount; + + //Functions. Currently all of these are optional (any of them can be NULL). + + /* When you call Growl_SetDelegate(newDelegate), it will call + * oldDelegate->release(oldDelegate), and then it will call + * newDelegate->retain(newDelegate), and the return value from retain + * is what will be set as the delegate. + * (This means that this member works like CFRetain and -[NSObject retain].) + * This member is optional (it can be NULL). + * For a delegate allocated with malloc, this member would be + * NULL. + * @result A delegate to which GrowlApplicationBridge holds a reference. + */ + void *(*retain)(void *); + /* When you call Growl_SetDelegate(newDelegate), it will call + * oldDelegate->release(oldDelegate), and then it will call + * newDelegate->retain(newDelegate), and the return value from retain + * is what will be set as the delegate. + * (This means that this member works like CFRelease and + * -[NSObject release].) + * This member is optional (it can be NULL). + * For a delegate allocated with malloc, this member might be + * free(3). + */ + void (*release)(void *); + + /* Informs the delegate that Growl (specifically, the GrowlHelperApp) was + * launched successfully (or was already running). The application can + * take actions with the knowledge that Growl is installed and functional. + */ + void (*growlIsReady)(void); + + /* Informs the delegate that a Growl notification was clicked. It is only + * sent for notifications sent with a non-NULL clickContext, + * so if you want to receive a message when a notification is clicked, + * clickContext must not be NULL when calling + * Growl_PostNotification or + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext. + */ + void (*growlNotificationWasClicked)(CFPropertyListRef clickContext); + + /* Informs the delegate that a Growl notification timed out. It is only + * sent for notifications sent with a non-NULL clickContext, + * so if you want to receive a message when a notification is clicked, + * clickContext must not be NULL when calling + * Growl_PostNotification or + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext. + */ + void (*growlNotificationTimedOut)(CFPropertyListRef clickContext); +}; + +/*! @struct Growl_Notification + * @abstract Structure describing a Growl notification. + * @discussion XXX + * @field size The size of the notification structure. + * @field name Identifies the notification. + * @field title Short synopsis of the notification. + * @field description Additional text. + * @field iconData An icon for the notification. + * @field priority An indicator of the notification's importance. + * @field reserved Bits reserved for future usage. + * @field isSticky Requests that a notification stay on-screen until dismissed explicitly. + * @field clickContext An identifier to be passed to your click callback when a notification is clicked. + * @field clickCallback A callback to call when the notification is clicked. + */ +struct Growl_Notification { + /* This should be sizeof(struct Growl_Notification). + */ + size_t size; + + /* The notification name distinguishes one type of + * notification from another. The name should be human-readable, as it + * will be displayed in the Growl preference pane. + * + * The name is used in the GROWL_NOTIFICATIONS_ALL and + * GROWL_NOTIFICATIONS_DEFAULT arrays in the registration dictionary, and + * in this member of the Growl_Notification structure. + */ + CFStringRef name; + + /* A notification's title describes the notification briefly. + * It should be easy to read quickly by the user. + */ + CFStringRef title; + + /* The description supplements the title with more + * information. It is usually longer and sometimes involves a list of + * subjects. For example, for a 'Download complete' notification, the + * description might have one filename per line. GrowlMail in Growl 0.6 + * uses a description of '%d new mail(s)' (formatted with the number of + * messages). + */ + CFStringRef description; + + /* The notification icon usually indicates either what + * happened (it may have the same icon as e.g. a toolbar item that + * started the process that led to the notification), or what it happened + * to (e.g. a document icon). + * + * The icon data is optional, so it can be NULL. In that + * case, the application icon is used alone. Not all displays support + * icons. + * + * The data can be in any format supported by NSImage. As of Mac OS X + * 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and PICT form + * ats. + */ + CFDataRef iconData; + + /* Priority is new in Growl 0.6, and is represented as a + * signed integer from -2 to +2. 0 is Normal priority, -2 is Very Low + * priority, and +2 is Very High priority. + * + * Not all displays support priority. If you do not wish to assign a + * priority to your notification, assign 0. + */ + signed int priority; + + /* These bits are not used in Growl 0.6. Set them to 0. + */ + unsigned reserved: 31; + + /* When the sticky bit is clear, in most displays, + * notifications disappear after a certain amount of time. Sticky + * notifications, however, remain on-screen until the user dismisses them + * explicitly, usually by clicking them. + * + * Sticky notifications were introduced in Growl 0.6. Most notifications + * should not be sticky. Not all displays support sticky notifications, + * and the user may choose in Growl's preference pane to force the + * notification to be sticky or non-sticky, in which case the sticky bit + * in the notification will be ignored. + */ + unsigned isSticky: 1; + + /* If this is not NULL, and your click callback + * is not NULL either, this will be passed to the callback + * when your notification is clicked by the user. + * + * Click feedback was introduced in Growl 0.6, and it is optional. Not + * all displays support click feedback. + */ + CFPropertyListRef clickContext; + + /* If this is not NULL, it will be called instead + * of the Growl delegate's click callback when clickContext is + * non-NULL and the notification is clicked on by the user. + * + * Click feedback was introduced in Growl 0.6, and it is optional. Not + * all displays support click feedback. + * + * The per-notification click callback is not yet supported as of Growl + * 0.7. + */ + void (*clickCallback)(CFPropertyListRef clickContext); + + CFStringRef identifier; +}; + +#pragma mark - +#pragma mark Easy initialisers + +/*! @defined InitGrowlDelegate + * @abstract Callable macro. Initializes a Growl delegate structure to defaults. + * @discussion Call with a pointer to a struct Growl_Delegate. All of the + * members of the structure will be set to 0 or NULL, except for + * size (which will be set to sizeof(struct Growl_Delegate)) and + * referenceCount (which will be set to 1). + */ +#define InitGrowlDelegate(delegate) \ + do { \ + if (delegate) { \ + (delegate)->size = sizeof(struct Growl_Delegate); \ + (delegate)->applicationName = NULL; \ + (delegate)->registrationDictionary = NULL; \ + (delegate)->applicationIconData = NULL; \ + (delegate)->growlInstallationWindowTitle = NULL; \ + (delegate)->growlInstallationInformation = NULL; \ + (delegate)->growlUpdateWindowTitle = NULL; \ + (delegate)->growlUpdateInformation = NULL; \ + (delegate)->referenceCount = 1U; \ + (delegate)->retain = NULL; \ + (delegate)->release = NULL; \ + (delegate)->growlIsReady = NULL; \ + (delegate)->growlNotificationWasClicked = NULL; \ + (delegate)->growlNotificationTimedOut = NULL; \ + } \ + } while(0) + +/*! @defined InitGrowlNotification + * @abstract Callable macro. Initializes a Growl notification structure to defaults. + * @discussion Call with a pointer to a struct Growl_Notification. All of + * the members of the structure will be set to 0 or NULL, except + * for size (which will be set to + * sizeof(struct Growl_Notification)). + */ +#define InitGrowlNotification(notification) \ + do { \ + if (notification) { \ + (notification)->size = sizeof(struct Growl_Notification); \ + (notification)->name = NULL; \ + (notification)->title = NULL; \ + (notification)->description = NULL; \ + (notification)->iconData = NULL; \ + (notification)->priority = 0; \ + (notification)->reserved = 0U; \ + (notification)->isSticky = false; \ + (notification)->clickContext = NULL; \ + (notification)->clickCallback = NULL; \ + (notification)->identifier = NULL; \ + } \ + } while(0) + +#pragma mark - +#pragma mark Public API + +// @functiongroup Managing the Growl delegate + +/*! @function Growl_SetDelegate + * @abstract Replaces the current Growl delegate with a new one, or removes + * the Growl delegate. + * @param newDelegate + * @result Returns false and does nothing else if a pointer that was passed in + * is unsatisfactory (because it is non-NULL, but at least one + * required member of it is NULL). Otherwise, sets or unsets the + * delegate and returns true. + * @discussion When newDelegate is non-NULL, sets + * the delegate to newDelegate. When it is NULL, + * the current delegate will be unset, and no delegate will be in place. + * + * It is legal for newDelegate to be the current delegate; + * nothing will happen, and Growl_SetDelegate will return true. It is also + * legal for it to be NULL, as described above; again, it will + * return true. + * + * If there was a delegate in place before the call, Growl_SetDelegate will + * call the old delegate's release member if it was non-NULL. If + * newDelegate is non-NULL, Growl_SetDelegate will + * call newDelegate->retain, and set the delegate to its return + * value. + * + * If you are using Growl-WithInstaller.framework, and an older version of + * Growl is installed on the user's system, the user will automatically be + * prompted to update. + * + * GrowlApplicationBridge currently does not copy this structure, nor does it + * retain any of the CF objects in the structure (it regards the structure as + * a container that retains the objects when they are added and releases them + * when they are removed or the structure is destroyed). Also, + * GrowlApplicationBridge currently does not modify any member of the + * structure, except possibly the referenceCount by calling the retain and + * release members. + */ +GROWL_EXPORT Boolean Growl_SetDelegate(struct Growl_Delegate *newDelegate); + +/*! @function Growl_GetDelegate + * @abstract Returns the current Growl delegate, if any. + * @result The current Growl delegate. + * @discussion Returns the last pointer passed into Growl_SetDelegate, or + * NULL if no such call has been made. + * + * This function follows standard Core Foundation reference-counting rules. + * Because it is a Get function, not a Copy function, it will not retain the + * delegate on your behalf. You are responsible for retaining and releasing + * the delegate as needed. + */ +GROWL_EXPORT struct Growl_Delegate *Growl_GetDelegate(void); + +#pragma mark - + +// @functiongroup Posting Growl notifications + +/*! @function Growl_PostNotification + * @abstract Posts a Growl notification. + * @param notification The notification to post. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * NULL (or 0 or false as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. + * If the user cancels, this function will have no effect until the next + * application session, at which time when it is called the user will be + * prompted again. The user is also given the option to not be prompted again. + * If the user does choose to install Growl, the requested notification will + * be displayed once Growl is installed and running. + */ +GROWL_EXPORT void Growl_PostNotification(const struct Growl_Notification *notification); + +/*! @function Growl_PostNotificationWithDictionary +* @abstract Notifies using a userInfo dictionary suitable for passing to +* CFDistributedNotificationCenter. +* @param userInfo The dictionary to notify with. +* @discussion Before Growl 0.6, your application would have posted +* notifications using CFDistributedNotificationCenter by creating a userInfo +* dictionary with the notification data. This had the advantage of allowing +* you to add other data to the dictionary for programs besides Growl that +* might be listening. +* +* This function allows you to use such dictionaries without being restricted +* to using CFDistributedNotificationCenter. The keys for this dictionary + * can be found in GrowlDefines.h. +*/ +GROWL_EXPORT void Growl_PostNotificationWithDictionary(CFDictionaryRef userInfo); + +/*! @function Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext + * @abstract Posts a Growl notification using parameter values. + * @param title The title of the notification. + * @param description The description of the notification. + * @param notificationName The name of the notification as listed in the + * registration dictionary. + * @param iconData Data representing a notification icon. Can be NULL. + * @param priority The priority of the notification (-2 to +2, with -2 + * being Very Low and +2 being Very High). + * @param isSticky If true, requests that this notification wait for a + * response from the user. + * @param clickContext An object to pass to the clickCallback, if any. Can + * be NULL, in which case the clickCallback is not called. + * @discussion Creates a temporary Growl_Notification, fills it out with the + * supplied information, and calls Growl_PostNotification on it. + * See struct Growl_Notification and Growl_PostNotification for more + * information. + * + * The icon data can be in any format supported by NSImage. As of Mac OS X + * 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and PICT formats. + */ +GROWL_EXPORT void Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext( + /*inhale*/ + CFStringRef title, + CFStringRef description, + CFStringRef notificationName, + CFDataRef iconData, + signed int priority, + Boolean isSticky, + CFPropertyListRef clickContext); + +#pragma mark - + +// @functiongroup Registering + +/*! @function Growl_RegisterWithDictionary + * @abstract Register your application with Growl without setting a delegate. + * @discussion When you call this function with a dictionary, + * GrowlApplicationBridge registers your application using that dictionary. + * If you pass NULL, GrowlApplicationBridge will ask the delegate + * (if there is one) for a dictionary, and if that doesn't work, it will look + * in your application's bundle for an auto-discoverable plist. + * (XXX refer to more information on that) + * + * If you pass a dictionary to this function, it must include the + * GROWL_APP_NAME key, unless a delegate is set. + * + * This function is mainly an alternative to the delegate system introduced + * with Growl 0.6. Without a delegate, you cannot receive callbacks such as + * growlIsReady (since they are sent to the delegate). You can, + * however, set a delegate after registering without one. + * + * This function was introduced in Growl.framework 0.7. + * @result false if registration failed (e.g. if Growl isn't installed). + */ +GROWL_EXPORT Boolean Growl_RegisterWithDictionary(CFDictionaryRef regDict); + +/*! @function Growl_Reregister + * @abstract Updates your registration with Growl. + * @discussion If your application changes the contents of the + * GROWL_NOTIFICATIONS_ALL key in the registrationDictionary member of the + * Growl delegate, or if it changes the value of that member, or if it + * changes the contents of its auto-discoverable plist, call this function + * to have Growl update its registration information for your application. + * + * Otherwise, this function does not normally need to be called. If you're + * using a delegate, your application will be registered when you set the + * delegate if both the delegate and its registrationDictionary member are + * non-NULL. + * + * This function is now implemented using + * Growl_RegisterWithDictionary. + */ +GROWL_EXPORT void Growl_Reregister(void); + +#pragma mark - + +/*! @function Growl_SetWillRegisterWhenGrowlIsReady + * @abstract Tells GrowlApplicationBridge to register with Growl when Growl + * launches (or not). + * @discussion When Growl has started listening for notifications, it posts a + * GROWL_IS_READY notification on the Distributed Notification + * Center. GrowlApplicationBridge listens for this notification, using it to + * perform various tasks (such as calling your delegate's + * growlIsReady callback, if it has one). If this function is + * called with true, one of those tasks will be to reregister + * with Growl (in the manner of Growl_Reregister). + * + * This attribute is automatically set back to false + * (the default) after every GROWL_IS_READY notification. + * @param flag true if you want GrowlApplicationBridge to register with + * Growl when next it is ready; false if not. + */ +GROWL_EXPORT void Growl_SetWillRegisterWhenGrowlIsReady(Boolean flag); +/*! @function Growl_WillRegisterWhenGrowlIsReady + * @abstract Reports whether GrowlApplicationBridge will register with Growl + * when Growl next launches. + * @result true if GrowlApplicationBridge will register with + * Growl when next it posts GROWL_IS_READY; false if not. + */ +GROWL_EXPORT Boolean Growl_WillRegisterWhenGrowlIsReady(void); + +#pragma mark - + +// @functiongroup Obtaining registration dictionaries + +/*! @function Growl_CopyRegistrationDictionaryFromDelegate + * @abstract Asks the delegate for a registration dictionary. + * @discussion If no delegate is set, or if the delegate's + * registrationDictionary member is NULL, this + * function returns NULL. + * + * This function does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use + * Growl_CreateRegistrationDictionaryByFillingInDictionary or + * Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * to try to fill in missing keys. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CopyRegistrationDictionaryFromDelegate(void); + +/*! @function Growl_CopyRegistrationDictionaryFromBundle + * @abstract Looks in a bundle for a registration dictionary. + * @discussion This function looks in a bundle for an auto-discoverable + * registration dictionary file using CFBundleCopyResourceURL. + * If it finds one, it loads the file using CFPropertyList and + * returns the result. + * + * If you pass NULL as the bundle, the main bundle is examined. + * + * This function does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use + * Growl_CreateRegistrationDictionaryByFillingInDictionary: or + * Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * to try to fill in missing keys. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CopyRegistrationDictionaryFromBundle(CFBundleRef bundle); + +/*! @function Growl_CreateBestRegistrationDictionary + * @abstract Obtains a registration dictionary, filled out to the best of + * GrowlApplicationBridge's knowledge. + * @discussion This function creates a registration dictionary as best + * GrowlApplicationBridge knows how. + * + * First, GrowlApplicationBridge examines the Growl delegate (if there is + * one) and gets the registration dictionary from that. If no such dictionary + * was obtained, GrowlApplicationBridge looks in your application's main + * bundle for an auto-discoverable registration dictionary file. If that + * doesn't exist either, this function returns NULL. + * + * Second, GrowlApplicationBridge calls + * Growl_CreateRegistrationDictionaryByFillingInDictionary with + * whatever dictionary was obtained. The result of that function is the + * result of this function. + * + * GrowlApplicationBridge uses this function when you call + * Growl_SetDelegate, or when you call + * Growl_RegisterWithDictionary with NULL. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateBestRegistrationDictionary(void); + +#pragma mark - + +// @functiongroup Filling in registration dictionaries + +/*! @function Growl_CreateRegistrationDictionaryByFillingInDictionary + * @abstract Tries to fill in missing keys in a registration dictionary. + * @param regDict The dictionary to fill in. + * @result The dictionary with the keys filled in. + * @discussion This function examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Keys are only filled in if missing; if a key is present in the dictionary, + * its value will not be changed. + * + * This function was introduced in Growl.framework 0.7. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateRegistrationDictionaryByFillingInDictionary(CFDictionaryRef regDict); +/*! @function Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * @abstract Tries to fill in missing keys in a registration dictionary. + * @param regDict The dictionary to fill in. + * @param keys The keys to fill in. If NULL, any missing keys are filled in. + * @result The dictionary with the keys filled in. + * @discussion This function examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Only those keys that are listed in keys will be filled in. + * Other missing keys are ignored. Also, keys are only filled in if missing; + * if a key is present in the dictionary, its value will not be changed. + * + * This function was introduced in Growl.framework 0.7. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys(CFDictionaryRef regDict, CFSetRef keys); + +/*! @brief Tries to fill in missing keys in a notification dictionary. + * @param notifDict The dictionary to fill in. + * @return The dictionary with the keys filled in. This will be a separate instance from \a notifDict. + * @discussion This function examines the \a notifDict for missing keys, and + * tries to get them from the last known registration dictionary. As of 1.1, + * the keys that it will look for are: + * + * \li GROWL_APP_NAME + * \li GROWL_APP_ICON + * + * @since Growl.framework 1.1 + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateNotificationDictionaryByFillingInDictionary(CFDictionaryRef notifDict); + +#pragma mark - + +// @functiongroup Querying Growl's status + +/*! @function Growl_IsInstalled + * @abstract Determines whether the Growl prefpane and its helper app are + * installed. + * @result Returns true if Growl is installed, false otherwise. + */ +GROWL_EXPORT Boolean Growl_IsInstalled(void); + +/*! @function Growl_IsRunning + * @abstract Cycles through the process list to find whether GrowlHelperApp + * is running. + * @result Returns true if Growl is running, false otherwise. + */ +GROWL_EXPORT Boolean Growl_IsRunning(void); + +#pragma mark - + +// @functiongroup Launching Growl + +/*! @typedef GrowlLaunchCallback + * @abstract Callback to notify you that Growl is running. + * @param context The context pointer passed to Growl_LaunchIfInstalled. + * @discussion Growl_LaunchIfInstalled calls this callback function if Growl + * was already running or if it launched Growl successfully. + */ +typedef void (*GrowlLaunchCallback)(void *context); + +/*! @function Growl_LaunchIfInstalled + * @abstract Launches GrowlHelperApp if it is not already running. + * @param callback A callback function which will be called if Growl was successfully + * launched or was already running. Can be NULL. + * @param context The context pointer to pass to the callback. Can be NULL. + * @result Returns true if Growl was successfully launched or was already + * running; returns false and does not call the callback otherwise. + * @discussion Returns true and calls the callback (if the callback is not + * NULL) if the Growl helper app began launching or was already + * running. Returns false and performs no other action if Growl could not be + * launched (e.g. because the Growl preference pane is not properly installed). + * + * If Growl_CreateBestRegistrationDictionary returns + * non-NULL, this function will register with Growl atomically. + * + * The callback should take a single argument; this is to allow applications + * to have context-relevant information passed back. It is perfectly + * acceptable for context to be NULL. The callback itself can be + * NULL if you don't want one. + */ +GROWL_EXPORT Boolean Growl_LaunchIfInstalled(GrowlLaunchCallback callback, void *context); + +#pragma mark - +#pragma mark Constants + +/*! @defined GROWL_PREFPANE_BUNDLE_IDENTIFIER + * @abstract The CFBundleIdentifier of the Growl preference pane bundle. + * @discussion GrowlApplicationBridge uses this to determine whether Growl is + * currently installed, by searching for the Growl preference pane. Your + * application probably does not need to use this macro itself. + */ +#ifndef GROWL_PREFPANE_BUNDLE_IDENTIFIER +#define GROWL_PREFPANE_BUNDLE_IDENTIFIER CFSTR("com.growl.prefpanel") +#endif + +__END_DECLS + +#endif /* _GROWLAPPLICATIONBRIDGE_CARBON_H_ */ Added: trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlApplicationBridge.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlApplicationBridge.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlApplicationBridge.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,575 @@ +// +// GrowlApplicationBridge.h +// Growl +// +// Created by Evan Schoenberg on Wed Jun 16 2004. +// Copyright 2004-2006 The Growl Project. All rights reserved. +// + +/*! + * @header GrowlApplicationBridge.h + * @abstract Defines the GrowlApplicationBridge class. + * @discussion This header defines the GrowlApplicationBridge class as well as + * the GROWL_PREFPANE_BUNDLE_IDENTIFIER constant. + */ + +#ifndef __GrowlApplicationBridge_h__ +#define __GrowlApplicationBridge_h__ + +#import +#import +#import "GrowlDefines.h" + +//Forward declarations + at protocol GrowlApplicationBridgeDelegate; + +//Internal notification when the user chooses not to install (to avoid continuing to cache notifications awaiting installation) +#define GROWL_USER_CHOSE_NOT_TO_INSTALL_NOTIFICATION @"User chose not to install" + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @class GrowlApplicationBridge + * @abstract A class used to interface with Growl. + * @discussion This class provides a means to interface with Growl. + * + * Currently it provides a way to detect if Growl is installed and launch the + * GrowlHelperApp if it's not already running. + */ + at interface GrowlApplicationBridge : NSObject { + +} + +/*! + * @method isGrowlInstalled + * @abstract Detects whether Growl is installed. + * @discussion Determines if the Growl prefpane and its helper app are installed. + * @result Returns YES if Growl is installed, NO otherwise. + */ ++ (BOOL) isGrowlInstalled; + +/*! + * @method isGrowlRunning + * @abstract Detects whether GrowlHelperApp is currently running. + * @discussion Cycles through the process list to find whether GrowlHelperApp is running and returns its findings. + * @result Returns YES if GrowlHelperApp is running, NO otherwise. + */ ++ (BOOL) isGrowlRunning; + +#pragma mark - + +/*! + * @method setGrowlDelegate: + * @abstract Set the object which will be responsible for providing and receiving Growl information. + * @discussion This must be called before using GrowlApplicationBridge. + * + * The methods in the GrowlApplicationBridgeDelegate protocol are required + * and return the basic information needed to register with Growl. + * + * The methods in the GrowlApplicationBridgeDelegate_InformalProtocol + * informal protocol are individually optional. They provide a greater + * degree of interaction between the application and growl such as informing + * the application when one of its Growl notifications is clicked by the user. + * + * The methods in the GrowlApplicationBridgeDelegate_Installation_InformalProtocol + * informal protocol are individually optional and are only applicable when + * using the Growl-WithInstaller.framework which allows for automated Growl + * installation. + * + * When this method is called, data will be collected from inDelegate, Growl + * will be launched if it is not already running, and the application will be + * registered with Growl. + * + * If using the Growl-WithInstaller framework, if Growl is already installed + * but this copy of the framework has an updated version of Growl, the user + * will be prompted to update automatically. + * + * @param inDelegate The delegate for the GrowlApplicationBridge. It must conform to the GrowlApplicationBridgeDelegate protocol. + */ ++ (void) setGrowlDelegate:(NSObject *)inDelegate; + +/*! + * @method growlDelegate + * @abstract Return the object responsible for providing and receiving Growl information. + * @discussion See setGrowlDelegate: for details. + * @result The Growl delegate. + */ ++ (NSObject *) growlDelegate; + +#pragma mark - + +/*! + * @method notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext: + * @abstract Send a Growl notification. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * nil (or 0 or NO as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. If the user cancels, this method + * will have no effect until the next application session, at which time when + * it is called the user will be prompted again. The user is also given the + * option to not be prompted again. If the user does choose to install Growl, + * the requested notification will be displayed once Growl is installed and + * running. + * + * @param title The title of the notification displayed to the user. + * @param description The full description of the notification displayed to the user. + * @param notifName The internal name of the notification. Should be human-readable, as it will be displayed in the Growl preference pane. + * @param iconData NSData object to show with the notification as its icon. If nil, the application's icon will be used instead. + * @param priority The priority of the notification. The default value is 0; positive values are higher priority and negative values are lower priority. Not all Growl displays support priority. + * @param isSticky If YES, the notification will remain on screen until clicked. Not all Growl displays support sticky notifications. + * @param clickContext A context passed back to the Growl delegate if it implements -(void)growlNotificationWasClicked: and the notification is clicked. Not all display plugins support clicking. The clickContext must be plist-encodable (completely of NSString, NSArray, NSNumber, NSDictionary, and NSData types). + */ ++ (void) notifyWithTitle:(NSString *)title + description:(NSString *)description + notificationName:(NSString *)notifName + iconData:(NSData *)iconData + priority:(signed int)priority + isSticky:(BOOL)isSticky + clickContext:(id)clickContext; + +/*! + * @method notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:identifier: + * @abstract Send a Growl notification. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * nil (or 0 or NO as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. If the user cancels, this method + * will have no effect until the next application session, at which time when + * it is called the user will be prompted again. The user is also given the + * option to not be prompted again. If the user does choose to install Growl, + * the requested notification will be displayed once Growl is installed and + * running. + * + * @param title The title of the notification displayed to the user. + * @param description The full description of the notification displayed to the user. + * @param notifName The internal name of the notification. Should be human-readable, as it will be displayed in the Growl preference pane. + * @param iconData NSData object to show with the notification as its icon. If nil, the application's icon will be used instead. + * @param priority The priority of the notification. The default value is 0; positive values are higher priority and negative values are lower priority. Not all Growl displays support priority. + * @param isSticky If YES, the notification will remain on screen until clicked. Not all Growl displays support sticky notifications. + * @param clickContext A context passed back to the Growl delegate if it implements -(void)growlNotificationWasClicked: and the notification is clicked. Not all display plugins support clicking. The clickContext must be plist-encodable (completely of NSString, NSArray, NSNumber, NSDictionary, and NSData types). + * @param identifier An identifier for this notification. Notifications with equal identifiers are coalesced. + */ ++ (void) notifyWithTitle:(NSString *)title + description:(NSString *)description + notificationName:(NSString *)notifName + iconData:(NSData *)iconData + priority:(signed int)priority + isSticky:(BOOL)isSticky + clickContext:(id)clickContext + identifier:(NSString *)identifier; + +/*! @method notifyWithDictionary: + * @abstract Notifies using a userInfo dictionary suitable for passing to + * NSDistributedNotificationCenter. + * @param userInfo The dictionary to notify with. + * @discussion Before Growl 0.6, your application would have posted + * notifications using NSDistributedNotificationCenter by + * creating a userInfo dictionary with the notification data. This had the + * advantage of allowing you to add other data to the dictionary for programs + * besides Growl that might be listening. + * + * This method allows you to use such dictionaries without being restricted + * to using NSDistributedNotificationCenter. The keys for this dictionary + * can be found in GrowlDefines.h. + */ ++ (void) notifyWithDictionary:(NSDictionary *)userInfo; + +#pragma mark - + +/*! @method registerWithDictionary: + * @abstract Register your application with Growl without setting a delegate. + * @discussion When you call this method with a dictionary, + * GrowlApplicationBridge registers your application using that dictionary. + * If you pass nil, GrowlApplicationBridge will ask the delegate + * (if there is one) for a dictionary, and if that doesn't work, it will look + * in your application's bundle for an auto-discoverable plist. + * (XXX refer to more information on that) + * + * If you pass a dictionary to this method, it must include the + * GROWL_APP_NAME key, unless a delegate is set. + * + * This method is mainly an alternative to the delegate system introduced + * with Growl 0.6. Without a delegate, you cannot receive callbacks such as + * -growlIsReady (since they are sent to the delegate). You can, + * however, set a delegate after registering without one. + * + * This method was introduced in Growl.framework 0.7. + */ ++ (BOOL) registerWithDictionary:(NSDictionary *)regDict; + +/*! @method reregisterGrowlNotifications + * @abstract Reregister the notifications for this application. + * @discussion This method does not normally need to be called. If your + * application changes what notifications it is registering with Growl, call + * this method to have the Growl delegate's + * -registrationDictionaryForGrowl method called again and the + * Growl registration information updated. + * + * This method is now implemented using -registerWithDictionary:. + */ ++ (void) reregisterGrowlNotifications; + +#pragma mark - + +/*! @method setWillRegisterWhenGrowlIsReady: + * @abstract Tells GrowlApplicationBridge to register with Growl when Growl + * launches (or not). + * @discussion When Growl has started listening for notifications, it posts a + * GROWL_IS_READY notification on the Distributed Notification + * Center. GrowlApplicationBridge listens for this notification, using it to + * perform various tasks (such as calling your delegate's + * -growlIsReady method, if it has one). If this method is + * called with YES, one of those tasks will be to reregister + * with Growl (in the manner of -reregisterGrowlNotifications). + * + * This attribute is automatically set back to NO (the default) + * after every GROWL_IS_READY notification. + * @param flag YES if you want GrowlApplicationBridge to register with + * Growl when next it is ready; NO if not. + */ ++ (void) setWillRegisterWhenGrowlIsReady:(BOOL)flag; +/*! @method willRegisterWhenGrowlIsReady + * @abstract Reports whether GrowlApplicationBridge will register with Growl + * when Growl next launches. + * @result YES if GrowlApplicationBridge will register with Growl + * when next it posts GROWL_IS_READY; NO if not. + */ ++ (BOOL) willRegisterWhenGrowlIsReady; + +#pragma mark - + +/*! @method registrationDictionaryFromDelegate + * @abstract Asks the delegate for a registration dictionary. + * @discussion If no delegate is set, or if the delegate's + * -registrationDictionaryForGrowl method returns + * nil, this method returns nil. + * + * This method does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:] or + * +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:restrictToKeys:] to try + * to fill in missing keys. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) registrationDictionaryFromDelegate; + +/*! @method registrationDictionaryFromBundle: + * @abstract Looks in a bundle for a registration dictionary. + * @discussion This method looks in a bundle for an auto-discoverable + * registration dictionary file using -[NSBundle + * pathForResource:ofType:]. If it finds one, it loads the file using + * +[NSDictionary dictionaryWithContentsOfFile:] and returns the + * result. + * + * If you pass nil as the bundle, the main bundle is examined. + * + * This method does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:] or + * +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:restrictToKeys:] to try + * to fill in missing keys. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) registrationDictionaryFromBundle:(NSBundle *)bundle; + +/*! @method bestRegistrationDictionary + * @abstract Obtains a registration dictionary, filled out to the best of + * GrowlApplicationBridge's knowledge. + * @discussion This method creates a registration dictionary as best + * GrowlApplicationBridge knows how. + * + * First, GrowlApplicationBridge contacts the Growl delegate (if there is + * one) and gets the registration dictionary from that. If no such dictionary + * was obtained, GrowlApplicationBridge looks in your application's main + * bundle for an auto-discoverable registration dictionary file. If that + * doesn't exist either, this method returns nil. + * + * Second, GrowlApplicationBridge calls + * +registrationDictionaryByFillingInDictionary: with whatever + * dictionary was obtained. The result of that method is the result of this + * method. + * + * GrowlApplicationBridge uses this method when you call + * +setGrowlDelegate:, or when you call + * +registerWithDictionary: with nil. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) bestRegistrationDictionary; + +#pragma mark - + +/*! @method registrationDictionaryByFillingInDictionary: + * @abstract Tries to fill in missing keys in a registration dictionary. + * @discussion This method examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Keys are only filled in if missing; if a key is present in the dictionary, + * its value will not be changed. + * + * This method was introduced in Growl.framework 0.7. + * @param regDict The dictionary to fill in. + * @result The dictionary with the keys filled in. This is an autoreleased + * copy of regDict. + */ ++ (NSDictionary *) registrationDictionaryByFillingInDictionary:(NSDictionary *)regDict; +/*! @method registrationDictionaryByFillingInDictionary:restrictToKeys: + * @abstract Tries to fill in missing keys in a registration dictionary. + * @discussion This method examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Only those keys that are listed in keys will be filled in. + * Other missing keys are ignored. Also, keys are only filled in if missing; + * if a key is present in the dictionary, its value will not be changed. + * + * This method was introduced in Growl.framework 0.7. + * @param regDict The dictionary to fill in. + * @param keys The keys to fill in. If nil, any missing keys are filled in. + * @result The dictionary with the keys filled in. This is an autoreleased + * copy of regDict. + */ ++ (NSDictionary *) registrationDictionaryByFillingInDictionary:(NSDictionary *)regDict restrictToKeys:(NSSet *)keys; + +/*! @brief Tries to fill in missing keys in a notification dictionary. + * @param notifDict The dictionary to fill in. + * @return The dictionary with the keys filled in. This will be a separate instance from \a notifDict. + * @discussion This function examines the \a notifDict for missing keys, and + * tries to get them from the last known registration dictionary. As of 1.1, + * the keys that it will look for are: + * + * \li GROWL_APP_NAME + * \li GROWL_APP_ICON + * + * @since Growl.framework 1.1 + */ ++ (NSDictionary *) notificationDictionaryByFillingInDictionary:(NSDictionary *)regDict; + ++ (NSDictionary *) frameworkInfoDictionary; + at end + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @protocol GrowlApplicationBridgeDelegate + * @abstract Required protocol for the Growl delegate. + * @discussion The methods in this protocol are required and are called + * automatically as needed by GrowlApplicationBridge. See + * +[GrowlApplicationBridge setGrowlDelegate:]. + * See also GrowlApplicationBridgeDelegate_InformalProtocol. + */ + + at protocol GrowlApplicationBridgeDelegate + +// -registrationDictionaryForGrowl has moved to the informal protocol as of 0.7. + + at end + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @category NSObject(GrowlApplicationBridgeDelegate_InformalProtocol) + * @abstract Methods which may be optionally implemented by the GrowlDelegate. + * @discussion The methods in this informal protocol will only be called if implemented by the delegate. + */ + at interface NSObject (GrowlApplicationBridgeDelegate_InformalProtocol) + +/*! + * @method registrationDictionaryForGrowl + * @abstract Return the dictionary used to register this application with Growl. + * @discussion The returned dictionary gives Growl the complete list of + * notifications this application will ever send, and it also specifies which + * notifications should be enabled by default. Each is specified by an array + * of NSString objects. + * + * For most applications, these two arrays can be the same (if all sent + * notifications should be displayed by default). + * + * The NSString objects of these arrays will correspond to the + * notificationName: parameter passed in + * +[GrowlApplicationBridge + * notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:] calls. + * + * The dictionary should have the required key object pairs: + * key: GROWL_NOTIFICATIONS_ALL object: NSArray of NSString objects + * key: GROWL_NOTIFICATIONS_DEFAULT object: NSArray of NSString objects + * + * The dictionary may have the following key object pairs: + * key: GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES object: NSDictionary of key: notification name object: human-readable notification name + * + * You do not need to implement this method if you have an auto-discoverable + * plist file in your app bundle. (XXX refer to more information on that) + * + * @result The NSDictionary to use for registration. + */ +- (NSDictionary *) registrationDictionaryForGrowl; + +/*! + * @method applicationNameForGrowl + * @abstract Return the name of this application which will be used for Growl bookkeeping. + * @discussion This name is used both internally and in the Growl preferences. + * + * This should remain stable between different versions and incarnations of + * your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + * + * You do not need to implement this method if you are providing the + * application name elsewhere, meaning in an auto-discoverable plist file in + * your app bundle (XXX refer to more information on that) or in the result + * of -registrationDictionaryForGrowl. + * + * @result The name of the application using Growl. + */ +- (NSString *) applicationNameForGrowl; + +/*! + * @method applicationIconForGrowl + * @abstract Return the NSImage to treat as the application icon. + * @discussion The delegate may optionally return an NSImage + * object to use as the application icon. If this method is not implemented, + * {{{-applicationIconDataForGrowl}}} is tried. If that method is not + * implemented, the application's own icon is used. Neither method is + * generally needed. + * @result The NSImage to treat as the application icon. + */ +- (NSImage *) applicationIconForGrowl; + +/*! + * @method applicationIconDataForGrowl + * @abstract Return the NSData to treat as the application icon. + * @discussion The delegate may optionally return an NSData + * object to use as the application icon; if this is not implemented, the + * application's own icon is used. This is not generally needed. + * @result The NSData to treat as the application icon. + * @deprecated In version 1.1, in favor of {{{-applicationIconForGrowl}}}. + */ +- (NSData *) applicationIconDataForGrowl; + +/*! + * @method growlIsReady + * @abstract Informs the delegate that Growl has launched. + * @discussion Informs the delegate that Growl (specifically, the + * GrowlHelperApp) was launched successfully. The application can take actions + * with the knowledge that Growl is installed and functional. + */ +- (void) growlIsReady; + +/*! + * @method growlNotificationWasClicked: + * @abstract Informs the delegate that a Growl notification was clicked. + * @discussion Informs the delegate that a Growl notification was clicked. It + * is only sent for notifications sent with a non-nil + * clickContext, so if you want to receive a message when a notification is + * clicked, clickContext must not be nil when calling + * +[GrowlApplicationBridge notifyWithTitle: description:notificationName:iconData:priority:isSticky:clickContext:]. + * @param clickContext The clickContext passed when displaying the notification originally via +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:]. + */ +- (void) growlNotificationWasClicked:(id)clickContext; + +/*! + * @method growlNotificationTimedOut: + * @abstract Informs the delegate that a Growl notification timed out. + * @discussion Informs the delegate that a Growl notification timed out. It + * is only sent for notifications sent with a non-nil + * clickContext, so if you want to receive a message when a notification is + * clicked, clickContext must not be nil when calling + * +[GrowlApplicationBridge notifyWithTitle: description:notificationName:iconData:priority:isSticky:clickContext:]. + * @param clickContext The clickContext passed when displaying the notification originally via +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:]. + */ +- (void) growlNotificationTimedOut:(id)clickContext; + + at end + +#pragma mark - +/*! + * @category NSObject(GrowlApplicationBridgeDelegate_Installation_InformalProtocol) + * @abstract Methods which may be optionally implemented by the Growl delegate when used with Growl-WithInstaller.framework. + * @discussion The methods in this informal protocol will only be called if + * implemented by the delegate. They allow greater control of the information + * presented to the user when installing or upgrading Growl from within your + * application when using Growl-WithInstaller.framework. + */ + at interface NSObject (GrowlApplicationBridgeDelegate_Installation_InformalProtocol) + +/*! + * @method growlInstallationWindowTitle + * @abstract Return the title of the installation window. + * @discussion If not implemented, Growl will use a default, localized title. + * @result An NSString object to use as the title. + */ +- (NSString *)growlInstallationWindowTitle; + +/*! + * @method growlUpdateWindowTitle + * @abstract Return the title of the upgrade window. + * @discussion If not implemented, Growl will use a default, localized title. + * @result An NSString object to use as the title. + */ +- (NSString *)growlUpdateWindowTitle; + +/*! + * @method growlInstallationInformation + * @abstract Return the information to display when installing. + * @discussion This information may be as long or short as desired (the window + * will be sized to fit it). It will be displayed to the user as an + * explanation of what Growl is and what it can do in your application. It + * should probably note that no download is required to install. + * + * If this is not implemented, Growl will use a default, localized explanation. + * @result An NSAttributedString object to display. + */ +- (NSAttributedString *)growlInstallationInformation; + +/*! + * @method growlUpdateInformation + * @abstract Return the information to display when upgrading. + * @discussion This information may be as long or short as desired (the window + * will be sized to fit it). It will be displayed to the user as an + * explanation that an updated version of Growl is included in your + * application and no download is required. + * + * If this is not implemented, Growl will use a default, localized explanation. + * @result An NSAttributedString object to display. + */ +- (NSAttributedString *)growlUpdateInformation; + + at end + +//private + at interface GrowlApplicationBridge (GrowlInstallationPrompt_private) ++ (void) _userChoseNotToInstallGrowl; + at end + +#endif /* __GrowlApplicationBridge_h__ */ Added: trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlDefines.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlDefines.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Headers/GrowlDefines.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,348 @@ +// +// GrowlDefines.h +// + +#ifndef _GROWLDEFINES_H +#define _GROWLDEFINES_H + +#ifdef __OBJC__ +#define XSTR(x) (@x) +#define STRING_TYPE NSString * +#else +#define XSTR CFSTR +#define STRING_TYPE CFStringRef +#endif + +/*! @header GrowlDefines.h + * @abstract Defines all the notification keys. + * @discussion Defines all the keys used for registration with Growl and for + * Growl notifications. + * + * Most applications should use the functions or methods of Growl.framework + * instead of posting notifications such as those described here. + * @updated 2004-01-25 + */ + +// UserInfo Keys for Registration +#pragma mark UserInfo Keys for Registration + +/*! @group Registration userInfo keys */ +/* @abstract Keys for the userInfo dictionary of a GROWL_APP_REGISTRATION distributed notification. + * @discussion The values of these keys describe the application and the + * notifications it may post. + * + * Your application must register with Growl before it can post Growl + * notifications (and have them not be ignored). However, as of Growl 0.6, + * posting GROWL_APP_REGISTRATION notifications directly is no longer the + * preferred way to register your application. Your application should instead + * use Growl.framework's delegate system. + * See +[GrowlApplicationBridge setGrowlDelegate:] or Growl_SetDelegate for + * more information. + */ + +/*! @defined GROWL_APP_NAME + * @abstract The name of your application. + * @discussion The name of your application. This should remain stable between + * different versions and incarnations of your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + */ +#define GROWL_APP_NAME XSTR("ApplicationName") +/*! @defined GROWL_APP_ID + * @abstract The bundle identifier of your application. + * @discussion The bundle identifier of your application. This key should + * be unique for your application while there may be several applications + * with the same GROWL_APP_NAME. + * This key is optional. + */ +#define GROWL_APP_ID XSTR("ApplicationId") +/*! @defined GROWL_APP_ICON + * @abstract The image data for your application's icon. + * @discussion Image data representing your application's icon. This may be + * superimposed on a notification icon as a badge, used as the notification + * icon when a notification-specific icon is not supplied, or ignored + * altogether, depending on the display. Must be in a format supported by + * NSImage, such as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_APP_ICON XSTR("ApplicationIcon") +/*! @defined GROWL_NOTIFICATIONS_DEFAULT + * @abstract The array of notifications to turn on by default. + * @discussion These are the names of the notifications that should be enabled + * by default when your application registers for the first time. If your + * application reregisters, Growl will look here for any new notification + * names found in GROWL_NOTIFICATIONS_ALL, but ignore any others. + */ +#define GROWL_NOTIFICATIONS_DEFAULT XSTR("DefaultNotifications") +/*! @defined GROWL_NOTIFICATIONS_ALL + * @abstract The array of all notifications your application can send. + * @discussion These are the names of all of the notifications that your + * application may post. See GROWL_NOTIFICATION_NAME for a discussion of good + * notification names. + */ +#define GROWL_NOTIFICATIONS_ALL XSTR("AllNotifications") +/*! @defined GROWL_NOTIFICATIONS_HUMAN_READABLE_DESCRIPTIONS + * @abstract A dictionary of human-readable names for your notifications. + * @discussion By default, the Growl UI will display notifications by the names given in GROWL_NOTIFICATIONS_ALL + * which correspond to the GROWL_NOTIFICATION_NAME. This dictionary specifies the human-readable name to display. + * The keys of the dictionary are GROWL_NOTIFICATION_NAME strings; the objects are the human-readable versions. + * For any GROWL_NOTIFICATION_NAME not specific in this dictionary, the GROWL_NOTIFICATION_NAME will be displayed. + * + * This key is optional. + */ +#define GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES XSTR("HumanReadableNames") +/*! @defined GROWL_NOTIFICATIONS_DESCRIPTIONS +* @abstract A dictionary of descriptions of _when_ each notification occurs +* @discussion This is an NSDictionary whose keys are GROWL_NOTIFICATION_NAME strings and whose objects are +* descriptions of _when_ each notification occurs, such as "You received a new mail message" or +* "A file finished downloading". +* +* This key is optional. +*/ +#define GROWL_NOTIFICATIONS_DESCRIPTIONS XSTR("NotificationDescriptions") + +/*! @defined GROWL_TICKET_VERSION + * @abstract The version of your registration ticket. + * @discussion Include this key in a ticket plist file that you put in your + * application bundle for auto-discovery. The current ticket version is 1. + */ +#define GROWL_TICKET_VERSION XSTR("TicketVersion") +// UserInfo Keys for Notifications +#pragma mark UserInfo Keys for Notifications + +/*! @group Notification userInfo keys */ +/* @abstract Keys for the userInfo dictionary of a GROWL_NOTIFICATION distributed notification. + * @discussion The values of these keys describe the content of a Growl + * notification. + * + * Not all of these keys are supported by all displays. Only the name, title, + * and description of a notification are universal. Most of the built-in + * displays do support all of these keys, and most other visual displays + * probably will also. But, as of 0.6, the Log, MailMe, and Speech displays + * support only textual data. + */ + +/*! @defined GROWL_NOTIFICATION_NAME + * @abstract The name of the notification. + * @discussion The name of the notification. Note that if you do not define + * GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES when registering your ticket originally this name + * will the one displayed within the Growl preference pane and should be human-readable. + */ +#define GROWL_NOTIFICATION_NAME XSTR("NotificationName") +/*! @defined GROWL_NOTIFICATION_TITLE + * @abstract The title to display in the notification. + * @discussion The title of the notification. Should be very brief. + * The title usually says what happened, e.g. "Download complete". + */ +#define GROWL_NOTIFICATION_TITLE XSTR("NotificationTitle") +/*! @defined GROWL_NOTIFICATION_DESCRIPTION + * @abstract The description to display in the notification. + * @discussion The description should be longer and more verbose than the title. + * The description usually tells the subject of the action, + * e.g. "Growl-0.6.dmg downloaded in 5.02 minutes". + */ +#define GROWL_NOTIFICATION_DESCRIPTION XSTR("NotificationDescription") +/*! @defined GROWL_NOTIFICATION_ICON + * @discussion Image data for the notification icon. Must be in a format + * supported by NSImage, such as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_ICON XSTR("NotificationIcon") +/*! @defined GROWL_NOTIFICATION_APP_ICON + * @discussion Image data for the application icon, in case GROWL_APP_ICON does + * not apply for some reason. Must be in a format supported by NSImage, such + * as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_APP_ICON XSTR("NotificationAppIcon") +/*! @defined GROWL_NOTIFICATION_PRIORITY + * @discussion The priority of the notification as an integer number from + * -2 to +2 (+2 being highest). + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_PRIORITY XSTR("NotificationPriority") +/*! @defined GROWL_NOTIFICATION_STICKY + * @discussion A Boolean number controlling whether the notification is sticky. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_STICKY XSTR("NotificationSticky") +/*! @defined GROWL_NOTIFICATION_CLICK_CONTEXT + * @abstract Identifies which notification was clicked. + * @discussion An identifier for the notification for clicking purposes. + * + * This will be passed back to the application when the notification is + * clicked. It must be plist-encodable (a data, dictionary, array, number, or + * string object), and it should be unique for each notification you post. + * A good click context would be a UUID string returned by NSProcessInfo or + * CFUUID. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_CLICK_CONTEXT XSTR("NotificationClickContext") + +/*! @defined GROWL_DISPLAY_PLUGIN + * @discussion The name of a display plugin which should be used for this notification. + * Optional. If this key is not set or the specified display plugin does not + * exist, the display plugin stored in the application ticket is used. This key + * allows applications to use different default display plugins for their + * notifications. The user can still override those settings in the preference + * pane. + */ +#define GROWL_DISPLAY_PLUGIN XSTR("NotificationDisplayPlugin") + +/*! @defined GROWL_NOTIFICATION_IDENTIFIER + * @abstract An identifier for the notification for coalescing purposes. + * Notifications with the same identifier fall into the same class; only + * the last notification of a class is displayed on the screen. If a + * notification of the same class is currently being displayed, it is + * replaced by this notification. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_IDENTIFIER XSTR("GrowlNotificationIdentifier") + +/*! @defined GROWL_APP_PID + * @abstract The process identifier of the process which sends this + * notification. If this field is set, the application will only receive + * clicked and timed out notifications which originate from this process. + * + * Optional. + */ +#define GROWL_APP_PID XSTR("ApplicationPID") + +/*! @defined GROWL_NOTIFICATION_PROGRESS +* @abstract If this key is set, it should contain a double value wrapped +* in a NSNumber which describes some sort of progress (from 0.0 to 100.0). +* If this is key is not set, no progress bar is shown. +* +* Optional. Not supported by all display plugins. +*/ +#define GROWL_NOTIFICATION_PROGRESS XSTR("NotificationProgress") + +// Notifications +#pragma mark Notifications + +/*! @group Notification names */ +/* @abstract Names of distributed notifications used by Growl. + * @discussion These are notifications used by applications (directly or + * indirectly) to interact with Growl, and by Growl for interaction between + * its components. + * + * Most of these should no longer be used in Growl 0.6 and later, in favor of + * Growl.framework's GrowlApplicationBridge APIs. + */ + +/*! @defined GROWL_APP_REGISTRATION + * @abstract The distributed notification for registering your application. + * @discussion This is the name of the distributed notification that can be + * used to register applications with Growl. + * + * The userInfo dictionary for this notification can contain these keys: + *
    + *
  • GROWL_APP_NAME
    • + *
  • GROWL_APP_ICON
    • + *
  • GROWL_NOTIFICATIONS_ALL
    • + *
  • GROWL_NOTIFICATIONS_DEFAULT
    • + *
+ * + * No longer recommended as of Growl 0.6. An alternate method of registering + * is to use Growl.framework's delegate system. + * See +[GrowlApplicationBridge setGrowlDelegate:] or Growl_SetDelegate for + * more information. + */ +#define GROWL_APP_REGISTRATION XSTR("GrowlApplicationRegistrationNotification") +/*! @defined GROWL_APP_REGISTRATION_CONF + * @abstract The distributed notification for confirming registration. + * @discussion The name of the distributed notification sent to confirm the + * registration. Used by the Growl preference pane. Your application probably + * does not need to use this notification. + */ +#define GROWL_APP_REGISTRATION_CONF XSTR("GrowlApplicationRegistrationConfirmationNotification") +/*! @defined GROWL_NOTIFICATION + * @abstract The distributed notification for Growl notifications. + * @discussion This is what it all comes down to. This is the name of the + * distributed notification that your application posts to actually send a + * Growl notification. + * + * The userInfo dictionary for this notification can contain these keys: + *
    + *
  • GROWL_NOTIFICATION_NAME (required)
    • + *
  • GROWL_NOTIFICATION_TITLE (required)
    • + *
  • GROWL_NOTIFICATION_DESCRIPTION (required)
    • + *
  • GROWL_NOTIFICATION_ICON
    • + *
  • GROWL_NOTIFICATION_APP_ICON
    • + *
  • GROWL_NOTIFICATION_PRIORITY
    • + *
  • GROWL_NOTIFICATION_STICKY
    • + *
  • GROWL_NOTIFICATION_CLICK_CONTEXT
    • + *
  • GROWL_APP_NAME (required)
    • + *
+ * + * No longer recommended as of Growl 0.6. Three alternate methods of posting + * notifications are +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:], + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext, and + * Growl_PostNotification. + */ +#define GROWL_NOTIFICATION XSTR("GrowlNotification") +/*! @defined GROWL_SHUTDOWN +* @abstract The distributed notification name that tells Growl to shutdown. +* @discussion The Growl preference pane posts this notification when the +* "Stop Growl" button is clicked. +*/ +#define GROWL_SHUTDOWN XSTR("GrowlShutdown") +/*! @defined GROWL_PING + * @abstract A distributed notification to check whether Growl is running. + * @discussion This is used by the Growl preference pane. If it receives a + * GROWL_PONG, the preference pane takes this to mean that Growl is running. + */ +#define GROWL_PING XSTR("Honey, Mind Taking Out The Trash") +/*! @defined GROWL_PONG + * @abstract The distributed notification sent in reply to GROWL_PING. + * @discussion GrowlHelperApp posts this in reply to GROWL_PING. + */ +#define GROWL_PONG XSTR("What Do You Want From Me, Woman") +/*! @defined GROWL_IS_READY + * @abstract The distributed notification sent when Growl starts up. + * @discussion GrowlHelperApp posts this when it has begin listening on all of + * its sources for new notifications. GrowlApplicationBridge (in + * Growl.framework), upon receiving this notification, reregisters using the + * registration dictionary supplied by its delegate. + */ +#define GROWL_IS_READY XSTR("Lend Me Some Sugar; I Am Your Neighbor!") +/*! @defined GROWL_NOTIFICATION_CLICKED + * @abstract The distributed notification sent when a supported notification is clicked. + * @discussion When a Growl notification with a click context is clicked on by + * the user, Growl posts this distributed notification. + * The GrowlApplicationBridge responds to this notification by calling a + * callback in its delegate. + */ +#define GROWL_NOTIFICATION_CLICKED XSTR("GrowlClicked!") +#define GROWL_NOTIFICATION_TIMED_OUT XSTR("GrowlTimedOut!") + +/*! @group Other symbols */ +/* Symbols which don't fit into any of the other categories. */ + +/*! @defined GROWL_KEY_CLICKED_CONTEXT + * @abstract Used internally as the key for the clickedContext passed over DNC. + * @discussion This key is used in GROWL_NOTIFICATION_CLICKED, and contains the + * click context that was supplied in the original notification. + */ +#define GROWL_KEY_CLICKED_CONTEXT XSTR("ClickedContext") +/*! @defined GROWL_REG_DICT_EXTENSION + * @abstract The filename extension for registration dictionaries. + * @discussion The GrowlApplicationBridge in Growl.framework registers with + * Growl by creating a file with the extension of .(GROWL_REG_DICT_EXTENSION) + * and opening it in the GrowlHelperApp. This happens whether or not Growl is + * running; if it was stopped, it quits immediately without listening for + * notifications. + */ +#define GROWL_REG_DICT_EXTENSION XSTR("growlRegDict") + + +#define GROWL_POSITION_PREFERENCE_KEY @"GrowlSelectedPosition" + +#endif //ndef _GROWLDEFINES_H Added: trunk/src/uimac14/Frameworks/Growl.framework/Resources/Info.plist =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Resources/Info.plist (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Resources/Info.plist 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + Growl + CFBundleIdentifier + com.growl.growlframework + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.2.1 + CFBundleSignature + GRRR + CFBundleVersion + 1.2.1 + NSPrincipalClass + GrowlApplicationBridge + + Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Growl =================================================================== (Binary files differ) Index: trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Growl =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Growl 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Growl 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Growl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/Growl.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/Growl.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/Growl.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,6 @@ +#include "GrowlDefines.h" + +#ifdef __OBJC__ +# include "GrowlApplicationBridge.h" +#endif +#include "GrowlApplicationBridge-Carbon.h" Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge-Carbon.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,780 @@ +// +// GrowlApplicationBridge-Carbon.h +// Growl +// +// Created by Mac-arena the Bored Zo on Wed Jun 18 2004. +// Based on GrowlApplicationBridge.h by Evan Schoenberg. +// This source code is in the public domain. You may freely link it into any +// program. +// + +#ifndef _GROWLAPPLICATIONBRIDGE_CARBON_H_ +#define _GROWLAPPLICATIONBRIDGE_CARBON_H_ + +#include +#include + +#ifndef GROWL_EXPORT +#define GROWL_EXPORT __attribute__((visibility("default"))) DEPRECATED_ATTRIBUTE +#endif + +/*! @header GrowlApplicationBridge-Carbon.h + * @abstract Declares an API that Carbon applications can use to interact with Growl. + * @discussion GrowlApplicationBridge uses a delegate to provide information //XXX + * to Growl (such as your application's name and what notifications it may + * post) and to provide information to your application (such as that Growl + * is listening for notifications or that a notification has been clicked). + * + * You can set the Growldelegate with Growl_SetDelegate and find out the + * current delegate with Growl_GetDelegate. See struct Growl_Delegate for more + * information about the delegate. + */ + +__BEGIN_DECLS + +/*! @struct Growl_Delegate + * @abstract Delegate to supply GrowlApplicationBridge with information and respond to events. + * @discussion The Growl delegate provides your interface to + * GrowlApplicationBridge. When GrowlApplicationBridge needs information about + * your application, it looks for it in the delegate; when Growl or the user + * does something that you might be interested in, GrowlApplicationBridge + * looks for a callback in the delegate and calls it if present + * (meaning, if it is not NULL). + * XXX on all of that + * @field size The size of the delegate structure. + * @field applicationName The name of your application. + * @field registrationDictionary A dictionary describing your application and the notifications it can send out. + * @field applicationIconData Your application's icon. + * @field growlInstallationWindowTitle The title of the installation window. + * @field growlInstallationInformation Text to display in the installation window. + * @field growlUpdateWindowTitle The title of the update window. + * @field growlUpdateInformation Text to display in the update window. + * @field referenceCount A count of owners of the delegate. + * @field retain Called when GrowlApplicationBridge receives this delegate. + * @field release Called when GrowlApplicationBridge no longer needs this delegate. + * @field growlIsReady Called when GrowlHelperApp is listening for notifications. + * @field growlNotificationWasClicked Called when a Growl notification is clicked. + * @field growlNotificationTimedOut Called when a Growl notification timed out. + */ +struct Growl_Delegate { + /* @discussion This should be sizeof(struct Growl_Delegate). + */ + size_t size; + + /*All of these attributes are optional. + *Optional attributes can be NULL; required attributes that + * are NULL cause setting the Growl delegate to fail. + *XXX - move optional/required status into the discussion for each field + */ + + /* This name is used both internally and in the Growl preferences. + * + * This should remain stable between different versions and incarnations of + * your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + * + * This can be NULL if it is provided elsewhere, namely in an + * auto-discoverable plist file in your app bundle + * (XXX refer to more information on that) or in registrationDictionary. + */ + CFStringRef applicationName; + + /* + * Must contain at least these keys: + * GROWL_NOTIFICATIONS_ALL (CFArray): + * Contains the names of all notifications your application may post. + * + * Can also contain these keys: + * GROWL_NOTIFICATIONS_DEFAULT (CFArray): + * Names of notifications that should be enabled by default. + * If omitted, GROWL_NOTIFICATIONS_ALL will be used. + * GROWL_APP_NAME (CFString): + * Same as the applicationName member of this structure. + * If both are present, the applicationName member shall prevail. + * If this key is present, you may omit applicationName (set it to NULL). + * GROWL_APP_ICON (CFData): + * Same as the iconData member of this structure. + * If both are present, the iconData member shall prevail. + * If this key is present, you may omit iconData (set it to NULL). + * + * If you change the contents of this dictionary after setting the delegate, + * be sure to call Growl_Reregister. + * + * This can be NULL if you have an auto-discoverable plist file in your app + * bundle. (XXX refer to more information on that) + */ + CFDictionaryRef registrationDictionary; + + /* The data can be in any format supported by NSImage. As of + * Mac OS X 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and + * PICT formats. + * + * If this is not supplied, Growl will look up your application's icon by + * its application name. + */ + CFDataRef applicationIconData; + + /* Installer display attributes + * + * These four attributes are used by the Growl installer, if this framework + * supports it. + * For any of these being NULL, a localised default will be + * supplied. + */ + + /* If this is NULL, Growl will use a default, + * localized title. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlInstallationWindowTitle; + /* This information may be as long or short as desired (the + * window will be sized to fit it). If Growl is not installed, it will + * be displayed to the user as an explanation of what Growl is and what + * it can do in your application. + * It should probably note that no download is required to install. + * + * If this is NULL, Growl will use a default, localized + * explanation. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlInstallationInformation; + /* If this is NULL, Growl will use a default, + * localized title. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlUpdateWindowTitle; + /* This information may be as long or short as desired (the + * window will be sized to fit it). If an older version of Growl is + * installed, it will be displayed to the user as an explanation that an + * updated version of Growl is included in your application and + * no download is required. + * + * If this is NULL, Growl will use a default, localized + * explanation. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlUpdateInformation; + + /* This member is provided for use by your retain and release + * callbacks (see below). + * + * GrowlApplicationBridge never directly uses this member. Instead, it + * calls your retain callback (if non-NULL) and your release + * callback (if non-NULL). + */ + unsigned referenceCount; + + //Functions. Currently all of these are optional (any of them can be NULL). + + /* When you call Growl_SetDelegate(newDelegate), it will call + * oldDelegate->release(oldDelegate), and then it will call + * newDelegate->retain(newDelegate), and the return value from retain + * is what will be set as the delegate. + * (This means that this member works like CFRetain and -[NSObject retain].) + * This member is optional (it can be NULL). + * For a delegate allocated with malloc, this member would be + * NULL. + * @result A delegate to which GrowlApplicationBridge holds a reference. + */ + void *(*retain)(void *); + /* When you call Growl_SetDelegate(newDelegate), it will call + * oldDelegate->release(oldDelegate), and then it will call + * newDelegate->retain(newDelegate), and the return value from retain + * is what will be set as the delegate. + * (This means that this member works like CFRelease and + * -[NSObject release].) + * This member is optional (it can be NULL). + * For a delegate allocated with malloc, this member might be + * free(3). + */ + void (*release)(void *); + + /* Informs the delegate that Growl (specifically, the GrowlHelperApp) was + * launched successfully (or was already running). The application can + * take actions with the knowledge that Growl is installed and functional. + */ + void (*growlIsReady)(void); + + /* Informs the delegate that a Growl notification was clicked. It is only + * sent for notifications sent with a non-NULL clickContext, + * so if you want to receive a message when a notification is clicked, + * clickContext must not be NULL when calling + * Growl_PostNotification or + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext. + */ + void (*growlNotificationWasClicked)(CFPropertyListRef clickContext); + + /* Informs the delegate that a Growl notification timed out. It is only + * sent for notifications sent with a non-NULL clickContext, + * so if you want to receive a message when a notification is clicked, + * clickContext must not be NULL when calling + * Growl_PostNotification or + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext. + */ + void (*growlNotificationTimedOut)(CFPropertyListRef clickContext); +}; + +/*! @struct Growl_Notification + * @abstract Structure describing a Growl notification. + * @discussion XXX + * @field size The size of the notification structure. + * @field name Identifies the notification. + * @field title Short synopsis of the notification. + * @field description Additional text. + * @field iconData An icon for the notification. + * @field priority An indicator of the notification's importance. + * @field reserved Bits reserved for future usage. + * @field isSticky Requests that a notification stay on-screen until dismissed explicitly. + * @field clickContext An identifier to be passed to your click callback when a notification is clicked. + * @field clickCallback A callback to call when the notification is clicked. + */ +struct Growl_Notification { + /* This should be sizeof(struct Growl_Notification). + */ + size_t size; + + /* The notification name distinguishes one type of + * notification from another. The name should be human-readable, as it + * will be displayed in the Growl preference pane. + * + * The name is used in the GROWL_NOTIFICATIONS_ALL and + * GROWL_NOTIFICATIONS_DEFAULT arrays in the registration dictionary, and + * in this member of the Growl_Notification structure. + */ + CFStringRef name; + + /* A notification's title describes the notification briefly. + * It should be easy to read quickly by the user. + */ + CFStringRef title; + + /* The description supplements the title with more + * information. It is usually longer and sometimes involves a list of + * subjects. For example, for a 'Download complete' notification, the + * description might have one filename per line. GrowlMail in Growl 0.6 + * uses a description of '%d new mail(s)' (formatted with the number of + * messages). + */ + CFStringRef description; + + /* The notification icon usually indicates either what + * happened (it may have the same icon as e.g. a toolbar item that + * started the process that led to the notification), or what it happened + * to (e.g. a document icon). + * + * The icon data is optional, so it can be NULL. In that + * case, the application icon is used alone. Not all displays support + * icons. + * + * The data can be in any format supported by NSImage. As of Mac OS X + * 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and PICT form + * ats. + */ + CFDataRef iconData; + + /* Priority is new in Growl 0.6, and is represented as a + * signed integer from -2 to +2. 0 is Normal priority, -2 is Very Low + * priority, and +2 is Very High priority. + * + * Not all displays support priority. If you do not wish to assign a + * priority to your notification, assign 0. + */ + signed int priority; + + /* These bits are not used in Growl 0.6. Set them to 0. + */ + unsigned reserved: 31; + + /* When the sticky bit is clear, in most displays, + * notifications disappear after a certain amount of time. Sticky + * notifications, however, remain on-screen until the user dismisses them + * explicitly, usually by clicking them. + * + * Sticky notifications were introduced in Growl 0.6. Most notifications + * should not be sticky. Not all displays support sticky notifications, + * and the user may choose in Growl's preference pane to force the + * notification to be sticky or non-sticky, in which case the sticky bit + * in the notification will be ignored. + */ + unsigned isSticky: 1; + + /* If this is not NULL, and your click callback + * is not NULL either, this will be passed to the callback + * when your notification is clicked by the user. + * + * Click feedback was introduced in Growl 0.6, and it is optional. Not + * all displays support click feedback. + */ + CFPropertyListRef clickContext; + + /* If this is not NULL, it will be called instead + * of the Growl delegate's click callback when clickContext is + * non-NULL and the notification is clicked on by the user. + * + * Click feedback was introduced in Growl 0.6, and it is optional. Not + * all displays support click feedback. + * + * The per-notification click callback is not yet supported as of Growl + * 0.7. + */ + void (*clickCallback)(CFPropertyListRef clickContext); + + CFStringRef identifier; +}; + +#pragma mark - +#pragma mark Easy initialisers + +/*! @defined InitGrowlDelegate + * @abstract Callable macro. Initializes a Growl delegate structure to defaults. + * @discussion Call with a pointer to a struct Growl_Delegate. All of the + * members of the structure will be set to 0 or NULL, except for + * size (which will be set to sizeof(struct Growl_Delegate)) and + * referenceCount (which will be set to 1). + */ +#define InitGrowlDelegate(delegate) \ + do { \ + if (delegate) { \ + (delegate)->size = sizeof(struct Growl_Delegate); \ + (delegate)->applicationName = NULL; \ + (delegate)->registrationDictionary = NULL; \ + (delegate)->applicationIconData = NULL; \ + (delegate)->growlInstallationWindowTitle = NULL; \ + (delegate)->growlInstallationInformation = NULL; \ + (delegate)->growlUpdateWindowTitle = NULL; \ + (delegate)->growlUpdateInformation = NULL; \ + (delegate)->referenceCount = 1U; \ + (delegate)->retain = NULL; \ + (delegate)->release = NULL; \ + (delegate)->growlIsReady = NULL; \ + (delegate)->growlNotificationWasClicked = NULL; \ + (delegate)->growlNotificationTimedOut = NULL; \ + } \ + } while(0) + +/*! @defined InitGrowlNotification + * @abstract Callable macro. Initializes a Growl notification structure to defaults. + * @discussion Call with a pointer to a struct Growl_Notification. All of + * the members of the structure will be set to 0 or NULL, except + * for size (which will be set to + * sizeof(struct Growl_Notification)). + */ +#define InitGrowlNotification(notification) \ + do { \ + if (notification) { \ + (notification)->size = sizeof(struct Growl_Notification); \ + (notification)->name = NULL; \ + (notification)->title = NULL; \ + (notification)->description = NULL; \ + (notification)->iconData = NULL; \ + (notification)->priority = 0; \ + (notification)->reserved = 0U; \ + (notification)->isSticky = false; \ + (notification)->clickContext = NULL; \ + (notification)->clickCallback = NULL; \ + (notification)->identifier = NULL; \ + } \ + } while(0) + +#pragma mark - +#pragma mark Public API + +// @functiongroup Managing the Growl delegate + +/*! @function Growl_SetDelegate + * @abstract Replaces the current Growl delegate with a new one, or removes + * the Growl delegate. + * @param newDelegate + * @result Returns false and does nothing else if a pointer that was passed in + * is unsatisfactory (because it is non-NULL, but at least one + * required member of it is NULL). Otherwise, sets or unsets the + * delegate and returns true. + * @discussion When newDelegate is non-NULL, sets + * the delegate to newDelegate. When it is NULL, + * the current delegate will be unset, and no delegate will be in place. + * + * It is legal for newDelegate to be the current delegate; + * nothing will happen, and Growl_SetDelegate will return true. It is also + * legal for it to be NULL, as described above; again, it will + * return true. + * + * If there was a delegate in place before the call, Growl_SetDelegate will + * call the old delegate's release member if it was non-NULL. If + * newDelegate is non-NULL, Growl_SetDelegate will + * call newDelegate->retain, and set the delegate to its return + * value. + * + * If you are using Growl-WithInstaller.framework, and an older version of + * Growl is installed on the user's system, the user will automatically be + * prompted to update. + * + * GrowlApplicationBridge currently does not copy this structure, nor does it + * retain any of the CF objects in the structure (it regards the structure as + * a container that retains the objects when they are added and releases them + * when they are removed or the structure is destroyed). Also, + * GrowlApplicationBridge currently does not modify any member of the + * structure, except possibly the referenceCount by calling the retain and + * release members. + */ +GROWL_EXPORT Boolean Growl_SetDelegate(struct Growl_Delegate *newDelegate); + +/*! @function Growl_GetDelegate + * @abstract Returns the current Growl delegate, if any. + * @result The current Growl delegate. + * @discussion Returns the last pointer passed into Growl_SetDelegate, or + * NULL if no such call has been made. + * + * This function follows standard Core Foundation reference-counting rules. + * Because it is a Get function, not a Copy function, it will not retain the + * delegate on your behalf. You are responsible for retaining and releasing + * the delegate as needed. + */ +GROWL_EXPORT struct Growl_Delegate *Growl_GetDelegate(void); + +#pragma mark - + +// @functiongroup Posting Growl notifications + +/*! @function Growl_PostNotification + * @abstract Posts a Growl notification. + * @param notification The notification to post. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * NULL (or 0 or false as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. + * If the user cancels, this function will have no effect until the next + * application session, at which time when it is called the user will be + * prompted again. The user is also given the option to not be prompted again. + * If the user does choose to install Growl, the requested notification will + * be displayed once Growl is installed and running. + */ +GROWL_EXPORT void Growl_PostNotification(const struct Growl_Notification *notification); + +/*! @function Growl_PostNotificationWithDictionary +* @abstract Notifies using a userInfo dictionary suitable for passing to +* CFDistributedNotificationCenter. +* @param userInfo The dictionary to notify with. +* @discussion Before Growl 0.6, your application would have posted +* notifications using CFDistributedNotificationCenter by creating a userInfo +* dictionary with the notification data. This had the advantage of allowing +* you to add other data to the dictionary for programs besides Growl that +* might be listening. +* +* This function allows you to use such dictionaries without being restricted +* to using CFDistributedNotificationCenter. The keys for this dictionary + * can be found in GrowlDefines.h. +*/ +GROWL_EXPORT void Growl_PostNotificationWithDictionary(CFDictionaryRef userInfo); + +/*! @function Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext + * @abstract Posts a Growl notification using parameter values. + * @param title The title of the notification. + * @param description The description of the notification. + * @param notificationName The name of the notification as listed in the + * registration dictionary. + * @param iconData Data representing a notification icon. Can be NULL. + * @param priority The priority of the notification (-2 to +2, with -2 + * being Very Low and +2 being Very High). + * @param isSticky If true, requests that this notification wait for a + * response from the user. + * @param clickContext An object to pass to the clickCallback, if any. Can + * be NULL, in which case the clickCallback is not called. + * @discussion Creates a temporary Growl_Notification, fills it out with the + * supplied information, and calls Growl_PostNotification on it. + * See struct Growl_Notification and Growl_PostNotification for more + * information. + * + * The icon data can be in any format supported by NSImage. As of Mac OS X + * 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and PICT formats. + */ +GROWL_EXPORT void Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext( + /*inhale*/ + CFStringRef title, + CFStringRef description, + CFStringRef notificationName, + CFDataRef iconData, + signed int priority, + Boolean isSticky, + CFPropertyListRef clickContext); + +#pragma mark - + +// @functiongroup Registering + +/*! @function Growl_RegisterWithDictionary + * @abstract Register your application with Growl without setting a delegate. + * @discussion When you call this function with a dictionary, + * GrowlApplicationBridge registers your application using that dictionary. + * If you pass NULL, GrowlApplicationBridge will ask the delegate + * (if there is one) for a dictionary, and if that doesn't work, it will look + * in your application's bundle for an auto-discoverable plist. + * (XXX refer to more information on that) + * + * If you pass a dictionary to this function, it must include the + * GROWL_APP_NAME key, unless a delegate is set. + * + * This function is mainly an alternative to the delegate system introduced + * with Growl 0.6. Without a delegate, you cannot receive callbacks such as + * growlIsReady (since they are sent to the delegate). You can, + * however, set a delegate after registering without one. + * + * This function was introduced in Growl.framework 0.7. + * @result false if registration failed (e.g. if Growl isn't installed). + */ +GROWL_EXPORT Boolean Growl_RegisterWithDictionary(CFDictionaryRef regDict); + +/*! @function Growl_Reregister + * @abstract Updates your registration with Growl. + * @discussion If your application changes the contents of the + * GROWL_NOTIFICATIONS_ALL key in the registrationDictionary member of the + * Growl delegate, or if it changes the value of that member, or if it + * changes the contents of its auto-discoverable plist, call this function + * to have Growl update its registration information for your application. + * + * Otherwise, this function does not normally need to be called. If you're + * using a delegate, your application will be registered when you set the + * delegate if both the delegate and its registrationDictionary member are + * non-NULL. + * + * This function is now implemented using + * Growl_RegisterWithDictionary. + */ +GROWL_EXPORT void Growl_Reregister(void); + +#pragma mark - + +/*! @function Growl_SetWillRegisterWhenGrowlIsReady + * @abstract Tells GrowlApplicationBridge to register with Growl when Growl + * launches (or not). + * @discussion When Growl has started listening for notifications, it posts a + * GROWL_IS_READY notification on the Distributed Notification + * Center. GrowlApplicationBridge listens for this notification, using it to + * perform various tasks (such as calling your delegate's + * growlIsReady callback, if it has one). If this function is + * called with true, one of those tasks will be to reregister + * with Growl (in the manner of Growl_Reregister). + * + * This attribute is automatically set back to false + * (the default) after every GROWL_IS_READY notification. + * @param flag true if you want GrowlApplicationBridge to register with + * Growl when next it is ready; false if not. + */ +GROWL_EXPORT void Growl_SetWillRegisterWhenGrowlIsReady(Boolean flag); +/*! @function Growl_WillRegisterWhenGrowlIsReady + * @abstract Reports whether GrowlApplicationBridge will register with Growl + * when Growl next launches. + * @result true if GrowlApplicationBridge will register with + * Growl when next it posts GROWL_IS_READY; false if not. + */ +GROWL_EXPORT Boolean Growl_WillRegisterWhenGrowlIsReady(void); + +#pragma mark - + +// @functiongroup Obtaining registration dictionaries + +/*! @function Growl_CopyRegistrationDictionaryFromDelegate + * @abstract Asks the delegate for a registration dictionary. + * @discussion If no delegate is set, or if the delegate's + * registrationDictionary member is NULL, this + * function returns NULL. + * + * This function does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use + * Growl_CreateRegistrationDictionaryByFillingInDictionary or + * Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * to try to fill in missing keys. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CopyRegistrationDictionaryFromDelegate(void); + +/*! @function Growl_CopyRegistrationDictionaryFromBundle + * @abstract Looks in a bundle for a registration dictionary. + * @discussion This function looks in a bundle for an auto-discoverable + * registration dictionary file using CFBundleCopyResourceURL. + * If it finds one, it loads the file using CFPropertyList and + * returns the result. + * + * If you pass NULL as the bundle, the main bundle is examined. + * + * This function does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use + * Growl_CreateRegistrationDictionaryByFillingInDictionary: or + * Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * to try to fill in missing keys. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CopyRegistrationDictionaryFromBundle(CFBundleRef bundle); + +/*! @function Growl_CreateBestRegistrationDictionary + * @abstract Obtains a registration dictionary, filled out to the best of + * GrowlApplicationBridge's knowledge. + * @discussion This function creates a registration dictionary as best + * GrowlApplicationBridge knows how. + * + * First, GrowlApplicationBridge examines the Growl delegate (if there is + * one) and gets the registration dictionary from that. If no such dictionary + * was obtained, GrowlApplicationBridge looks in your application's main + * bundle for an auto-discoverable registration dictionary file. If that + * doesn't exist either, this function returns NULL. + * + * Second, GrowlApplicationBridge calls + * Growl_CreateRegistrationDictionaryByFillingInDictionary with + * whatever dictionary was obtained. The result of that function is the + * result of this function. + * + * GrowlApplicationBridge uses this function when you call + * Growl_SetDelegate, or when you call + * Growl_RegisterWithDictionary with NULL. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateBestRegistrationDictionary(void); + +#pragma mark - + +// @functiongroup Filling in registration dictionaries + +/*! @function Growl_CreateRegistrationDictionaryByFillingInDictionary + * @abstract Tries to fill in missing keys in a registration dictionary. + * @param regDict The dictionary to fill in. + * @result The dictionary with the keys filled in. + * @discussion This function examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Keys are only filled in if missing; if a key is present in the dictionary, + * its value will not be changed. + * + * This function was introduced in Growl.framework 0.7. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateRegistrationDictionaryByFillingInDictionary(CFDictionaryRef regDict); +/*! @function Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * @abstract Tries to fill in missing keys in a registration dictionary. + * @param regDict The dictionary to fill in. + * @param keys The keys to fill in. If NULL, any missing keys are filled in. + * @result The dictionary with the keys filled in. + * @discussion This function examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Only those keys that are listed in keys will be filled in. + * Other missing keys are ignored. Also, keys are only filled in if missing; + * if a key is present in the dictionary, its value will not be changed. + * + * This function was introduced in Growl.framework 0.7. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys(CFDictionaryRef regDict, CFSetRef keys); + +/*! @brief Tries to fill in missing keys in a notification dictionary. + * @param notifDict The dictionary to fill in. + * @return The dictionary with the keys filled in. This will be a separate instance from \a notifDict. + * @discussion This function examines the \a notifDict for missing keys, and + * tries to get them from the last known registration dictionary. As of 1.1, + * the keys that it will look for are: + * + * \li GROWL_APP_NAME + * \li GROWL_APP_ICON + * + * @since Growl.framework 1.1 + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateNotificationDictionaryByFillingInDictionary(CFDictionaryRef notifDict); + +#pragma mark - + +// @functiongroup Querying Growl's status + +/*! @function Growl_IsInstalled + * @abstract Determines whether the Growl prefpane and its helper app are + * installed. + * @result Returns true if Growl is installed, false otherwise. + */ +GROWL_EXPORT Boolean Growl_IsInstalled(void); + +/*! @function Growl_IsRunning + * @abstract Cycles through the process list to find whether GrowlHelperApp + * is running. + * @result Returns true if Growl is running, false otherwise. + */ +GROWL_EXPORT Boolean Growl_IsRunning(void); + +#pragma mark - + +// @functiongroup Launching Growl + +/*! @typedef GrowlLaunchCallback + * @abstract Callback to notify you that Growl is running. + * @param context The context pointer passed to Growl_LaunchIfInstalled. + * @discussion Growl_LaunchIfInstalled calls this callback function if Growl + * was already running or if it launched Growl successfully. + */ +typedef void (*GrowlLaunchCallback)(void *context); + +/*! @function Growl_LaunchIfInstalled + * @abstract Launches GrowlHelperApp if it is not already running. + * @param callback A callback function which will be called if Growl was successfully + * launched or was already running. Can be NULL. + * @param context The context pointer to pass to the callback. Can be NULL. + * @result Returns true if Growl was successfully launched or was already + * running; returns false and does not call the callback otherwise. + * @discussion Returns true and calls the callback (if the callback is not + * NULL) if the Growl helper app began launching or was already + * running. Returns false and performs no other action if Growl could not be + * launched (e.g. because the Growl preference pane is not properly installed). + * + * If Growl_CreateBestRegistrationDictionary returns + * non-NULL, this function will register with Growl atomically. + * + * The callback should take a single argument; this is to allow applications + * to have context-relevant information passed back. It is perfectly + * acceptable for context to be NULL. The callback itself can be + * NULL if you don't want one. + */ +GROWL_EXPORT Boolean Growl_LaunchIfInstalled(GrowlLaunchCallback callback, void *context); + +#pragma mark - +#pragma mark Constants + +/*! @defined GROWL_PREFPANE_BUNDLE_IDENTIFIER + * @abstract The CFBundleIdentifier of the Growl preference pane bundle. + * @discussion GrowlApplicationBridge uses this to determine whether Growl is + * currently installed, by searching for the Growl preference pane. Your + * application probably does not need to use this macro itself. + */ +#ifndef GROWL_PREFPANE_BUNDLE_IDENTIFIER +#define GROWL_PREFPANE_BUNDLE_IDENTIFIER CFSTR("com.growl.prefpanel") +#endif + +__END_DECLS + +#endif /* _GROWLAPPLICATIONBRIDGE_CARBON_H_ */ Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,575 @@ +// +// GrowlApplicationBridge.h +// Growl +// +// Created by Evan Schoenberg on Wed Jun 16 2004. +// Copyright 2004-2006 The Growl Project. All rights reserved. +// + +/*! + * @header GrowlApplicationBridge.h + * @abstract Defines the GrowlApplicationBridge class. + * @discussion This header defines the GrowlApplicationBridge class as well as + * the GROWL_PREFPANE_BUNDLE_IDENTIFIER constant. + */ + +#ifndef __GrowlApplicationBridge_h__ +#define __GrowlApplicationBridge_h__ + +#import +#import +#import "GrowlDefines.h" + +//Forward declarations + at protocol GrowlApplicationBridgeDelegate; + +//Internal notification when the user chooses not to install (to avoid continuing to cache notifications awaiting installation) +#define GROWL_USER_CHOSE_NOT_TO_INSTALL_NOTIFICATION @"User chose not to install" + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @class GrowlApplicationBridge + * @abstract A class used to interface with Growl. + * @discussion This class provides a means to interface with Growl. + * + * Currently it provides a way to detect if Growl is installed and launch the + * GrowlHelperApp if it's not already running. + */ + at interface GrowlApplicationBridge : NSObject { + +} + +/*! + * @method isGrowlInstalled + * @abstract Detects whether Growl is installed. + * @discussion Determines if the Growl prefpane and its helper app are installed. + * @result Returns YES if Growl is installed, NO otherwise. + */ ++ (BOOL) isGrowlInstalled; + +/*! + * @method isGrowlRunning + * @abstract Detects whether GrowlHelperApp is currently running. + * @discussion Cycles through the process list to find whether GrowlHelperApp is running and returns its findings. + * @result Returns YES if GrowlHelperApp is running, NO otherwise. + */ ++ (BOOL) isGrowlRunning; + +#pragma mark - + +/*! + * @method setGrowlDelegate: + * @abstract Set the object which will be responsible for providing and receiving Growl information. + * @discussion This must be called before using GrowlApplicationBridge. + * + * The methods in the GrowlApplicationBridgeDelegate protocol are required + * and return the basic information needed to register with Growl. + * + * The methods in the GrowlApplicationBridgeDelegate_InformalProtocol + * informal protocol are individually optional. They provide a greater + * degree of interaction between the application and growl such as informing + * the application when one of its Growl notifications is clicked by the user. + * + * The methods in the GrowlApplicationBridgeDelegate_Installation_InformalProtocol + * informal protocol are individually optional and are only applicable when + * using the Growl-WithInstaller.framework which allows for automated Growl + * installation. + * + * When this method is called, data will be collected from inDelegate, Growl + * will be launched if it is not already running, and the application will be + * registered with Growl. + * + * If using the Growl-WithInstaller framework, if Growl is already installed + * but this copy of the framework has an updated version of Growl, the user + * will be prompted to update automatically. + * + * @param inDelegate The delegate for the GrowlApplicationBridge. It must conform to the GrowlApplicationBridgeDelegate protocol. + */ ++ (void) setGrowlDelegate:(NSObject *)inDelegate; + +/*! + * @method growlDelegate + * @abstract Return the object responsible for providing and receiving Growl information. + * @discussion See setGrowlDelegate: for details. + * @result The Growl delegate. + */ ++ (NSObject *) growlDelegate; + +#pragma mark - + +/*! + * @method notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext: + * @abstract Send a Growl notification. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * nil (or 0 or NO as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. If the user cancels, this method + * will have no effect until the next application session, at which time when + * it is called the user will be prompted again. The user is also given the + * option to not be prompted again. If the user does choose to install Growl, + * the requested notification will be displayed once Growl is installed and + * running. + * + * @param title The title of the notification displayed to the user. + * @param description The full description of the notification displayed to the user. + * @param notifName The internal name of the notification. Should be human-readable, as it will be displayed in the Growl preference pane. + * @param iconData NSData object to show with the notification as its icon. If nil, the application's icon will be used instead. + * @param priority The priority of the notification. The default value is 0; positive values are higher priority and negative values are lower priority. Not all Growl displays support priority. + * @param isSticky If YES, the notification will remain on screen until clicked. Not all Growl displays support sticky notifications. + * @param clickContext A context passed back to the Growl delegate if it implements -(void)growlNotificationWasClicked: and the notification is clicked. Not all display plugins support clicking. The clickContext must be plist-encodable (completely of NSString, NSArray, NSNumber, NSDictionary, and NSData types). + */ ++ (void) notifyWithTitle:(NSString *)title + description:(NSString *)description + notificationName:(NSString *)notifName + iconData:(NSData *)iconData + priority:(signed int)priority + isSticky:(BOOL)isSticky + clickContext:(id)clickContext; + +/*! + * @method notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:identifier: + * @abstract Send a Growl notification. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * nil (or 0 or NO as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. If the user cancels, this method + * will have no effect until the next application session, at which time when + * it is called the user will be prompted again. The user is also given the + * option to not be prompted again. If the user does choose to install Growl, + * the requested notification will be displayed once Growl is installed and + * running. + * + * @param title The title of the notification displayed to the user. + * @param description The full description of the notification displayed to the user. + * @param notifName The internal name of the notification. Should be human-readable, as it will be displayed in the Growl preference pane. + * @param iconData NSData object to show with the notification as its icon. If nil, the application's icon will be used instead. + * @param priority The priority of the notification. The default value is 0; positive values are higher priority and negative values are lower priority. Not all Growl displays support priority. + * @param isSticky If YES, the notification will remain on screen until clicked. Not all Growl displays support sticky notifications. + * @param clickContext A context passed back to the Growl delegate if it implements -(void)growlNotificationWasClicked: and the notification is clicked. Not all display plugins support clicking. The clickContext must be plist-encodable (completely of NSString, NSArray, NSNumber, NSDictionary, and NSData types). + * @param identifier An identifier for this notification. Notifications with equal identifiers are coalesced. + */ ++ (void) notifyWithTitle:(NSString *)title + description:(NSString *)description + notificationName:(NSString *)notifName + iconData:(NSData *)iconData + priority:(signed int)priority + isSticky:(BOOL)isSticky + clickContext:(id)clickContext + identifier:(NSString *)identifier; + +/*! @method notifyWithDictionary: + * @abstract Notifies using a userInfo dictionary suitable for passing to + * NSDistributedNotificationCenter. + * @param userInfo The dictionary to notify with. + * @discussion Before Growl 0.6, your application would have posted + * notifications using NSDistributedNotificationCenter by + * creating a userInfo dictionary with the notification data. This had the + * advantage of allowing you to add other data to the dictionary for programs + * besides Growl that might be listening. + * + * This method allows you to use such dictionaries without being restricted + * to using NSDistributedNotificationCenter. The keys for this dictionary + * can be found in GrowlDefines.h. + */ ++ (void) notifyWithDictionary:(NSDictionary *)userInfo; + +#pragma mark - + +/*! @method registerWithDictionary: + * @abstract Register your application with Growl without setting a delegate. + * @discussion When you call this method with a dictionary, + * GrowlApplicationBridge registers your application using that dictionary. + * If you pass nil, GrowlApplicationBridge will ask the delegate + * (if there is one) for a dictionary, and if that doesn't work, it will look + * in your application's bundle for an auto-discoverable plist. + * (XXX refer to more information on that) + * + * If you pass a dictionary to this method, it must include the + * GROWL_APP_NAME key, unless a delegate is set. + * + * This method is mainly an alternative to the delegate system introduced + * with Growl 0.6. Without a delegate, you cannot receive callbacks such as + * -growlIsReady (since they are sent to the delegate). You can, + * however, set a delegate after registering without one. + * + * This method was introduced in Growl.framework 0.7. + */ ++ (BOOL) registerWithDictionary:(NSDictionary *)regDict; + +/*! @method reregisterGrowlNotifications + * @abstract Reregister the notifications for this application. + * @discussion This method does not normally need to be called. If your + * application changes what notifications it is registering with Growl, call + * this method to have the Growl delegate's + * -registrationDictionaryForGrowl method called again and the + * Growl registration information updated. + * + * This method is now implemented using -registerWithDictionary:. + */ ++ (void) reregisterGrowlNotifications; + +#pragma mark - + +/*! @method setWillRegisterWhenGrowlIsReady: + * @abstract Tells GrowlApplicationBridge to register with Growl when Growl + * launches (or not). + * @discussion When Growl has started listening for notifications, it posts a + * GROWL_IS_READY notification on the Distributed Notification + * Center. GrowlApplicationBridge listens for this notification, using it to + * perform various tasks (such as calling your delegate's + * -growlIsReady method, if it has one). If this method is + * called with YES, one of those tasks will be to reregister + * with Growl (in the manner of -reregisterGrowlNotifications). + * + * This attribute is automatically set back to NO (the default) + * after every GROWL_IS_READY notification. + * @param flag YES if you want GrowlApplicationBridge to register with + * Growl when next it is ready; NO if not. + */ ++ (void) setWillRegisterWhenGrowlIsReady:(BOOL)flag; +/*! @method willRegisterWhenGrowlIsReady + * @abstract Reports whether GrowlApplicationBridge will register with Growl + * when Growl next launches. + * @result YES if GrowlApplicationBridge will register with Growl + * when next it posts GROWL_IS_READY; NO if not. + */ ++ (BOOL) willRegisterWhenGrowlIsReady; + +#pragma mark - + +/*! @method registrationDictionaryFromDelegate + * @abstract Asks the delegate for a registration dictionary. + * @discussion If no delegate is set, or if the delegate's + * -registrationDictionaryForGrowl method returns + * nil, this method returns nil. + * + * This method does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:] or + * +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:restrictToKeys:] to try + * to fill in missing keys. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) registrationDictionaryFromDelegate; + +/*! @method registrationDictionaryFromBundle: + * @abstract Looks in a bundle for a registration dictionary. + * @discussion This method looks in a bundle for an auto-discoverable + * registration dictionary file using -[NSBundle + * pathForResource:ofType:]. If it finds one, it loads the file using + * +[NSDictionary dictionaryWithContentsOfFile:] and returns the + * result. + * + * If you pass nil as the bundle, the main bundle is examined. + * + * This method does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:] or + * +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:restrictToKeys:] to try + * to fill in missing keys. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) registrationDictionaryFromBundle:(NSBundle *)bundle; + +/*! @method bestRegistrationDictionary + * @abstract Obtains a registration dictionary, filled out to the best of + * GrowlApplicationBridge's knowledge. + * @discussion This method creates a registration dictionary as best + * GrowlApplicationBridge knows how. + * + * First, GrowlApplicationBridge contacts the Growl delegate (if there is + * one) and gets the registration dictionary from that. If no such dictionary + * was obtained, GrowlApplicationBridge looks in your application's main + * bundle for an auto-discoverable registration dictionary file. If that + * doesn't exist either, this method returns nil. + * + * Second, GrowlApplicationBridge calls + * +registrationDictionaryByFillingInDictionary: with whatever + * dictionary was obtained. The result of that method is the result of this + * method. + * + * GrowlApplicationBridge uses this method when you call + * +setGrowlDelegate:, or when you call + * +registerWithDictionary: with nil. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) bestRegistrationDictionary; + +#pragma mark - + +/*! @method registrationDictionaryByFillingInDictionary: + * @abstract Tries to fill in missing keys in a registration dictionary. + * @discussion This method examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Keys are only filled in if missing; if a key is present in the dictionary, + * its value will not be changed. + * + * This method was introduced in Growl.framework 0.7. + * @param regDict The dictionary to fill in. + * @result The dictionary with the keys filled in. This is an autoreleased + * copy of regDict. + */ ++ (NSDictionary *) registrationDictionaryByFillingInDictionary:(NSDictionary *)regDict; +/*! @method registrationDictionaryByFillingInDictionary:restrictToKeys: + * @abstract Tries to fill in missing keys in a registration dictionary. + * @discussion This method examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Only those keys that are listed in keys will be filled in. + * Other missing keys are ignored. Also, keys are only filled in if missing; + * if a key is present in the dictionary, its value will not be changed. + * + * This method was introduced in Growl.framework 0.7. + * @param regDict The dictionary to fill in. + * @param keys The keys to fill in. If nil, any missing keys are filled in. + * @result The dictionary with the keys filled in. This is an autoreleased + * copy of regDict. + */ ++ (NSDictionary *) registrationDictionaryByFillingInDictionary:(NSDictionary *)regDict restrictToKeys:(NSSet *)keys; + +/*! @brief Tries to fill in missing keys in a notification dictionary. + * @param notifDict The dictionary to fill in. + * @return The dictionary with the keys filled in. This will be a separate instance from \a notifDict. + * @discussion This function examines the \a notifDict for missing keys, and + * tries to get them from the last known registration dictionary. As of 1.1, + * the keys that it will look for are: + * + * \li GROWL_APP_NAME + * \li GROWL_APP_ICON + * + * @since Growl.framework 1.1 + */ ++ (NSDictionary *) notificationDictionaryByFillingInDictionary:(NSDictionary *)regDict; + ++ (NSDictionary *) frameworkInfoDictionary; + at end + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @protocol GrowlApplicationBridgeDelegate + * @abstract Required protocol for the Growl delegate. + * @discussion The methods in this protocol are required and are called + * automatically as needed by GrowlApplicationBridge. See + * +[GrowlApplicationBridge setGrowlDelegate:]. + * See also GrowlApplicationBridgeDelegate_InformalProtocol. + */ + + at protocol GrowlApplicationBridgeDelegate + +// -registrationDictionaryForGrowl has moved to the informal protocol as of 0.7. + + at end + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @category NSObject(GrowlApplicationBridgeDelegate_InformalProtocol) + * @abstract Methods which may be optionally implemented by the GrowlDelegate. + * @discussion The methods in this informal protocol will only be called if implemented by the delegate. + */ + at interface NSObject (GrowlApplicationBridgeDelegate_InformalProtocol) + +/*! + * @method registrationDictionaryForGrowl + * @abstract Return the dictionary used to register this application with Growl. + * @discussion The returned dictionary gives Growl the complete list of + * notifications this application will ever send, and it also specifies which + * notifications should be enabled by default. Each is specified by an array + * of NSString objects. + * + * For most applications, these two arrays can be the same (if all sent + * notifications should be displayed by default). + * + * The NSString objects of these arrays will correspond to the + * notificationName: parameter passed in + * +[GrowlApplicationBridge + * notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:] calls. + * + * The dictionary should have the required key object pairs: + * key: GROWL_NOTIFICATIONS_ALL object: NSArray of NSString objects + * key: GROWL_NOTIFICATIONS_DEFAULT object: NSArray of NSString objects + * + * The dictionary may have the following key object pairs: + * key: GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES object: NSDictionary of key: notification name object: human-readable notification name + * + * You do not need to implement this method if you have an auto-discoverable + * plist file in your app bundle. (XXX refer to more information on that) + * + * @result The NSDictionary to use for registration. + */ +- (NSDictionary *) registrationDictionaryForGrowl; + +/*! + * @method applicationNameForGrowl + * @abstract Return the name of this application which will be used for Growl bookkeeping. + * @discussion This name is used both internally and in the Growl preferences. + * + * This should remain stable between different versions and incarnations of + * your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + * + * You do not need to implement this method if you are providing the + * application name elsewhere, meaning in an auto-discoverable plist file in + * your app bundle (XXX refer to more information on that) or in the result + * of -registrationDictionaryForGrowl. + * + * @result The name of the application using Growl. + */ +- (NSString *) applicationNameForGrowl; + +/*! + * @method applicationIconForGrowl + * @abstract Return the NSImage to treat as the application icon. + * @discussion The delegate may optionally return an NSImage + * object to use as the application icon. If this method is not implemented, + * {{{-applicationIconDataForGrowl}}} is tried. If that method is not + * implemented, the application's own icon is used. Neither method is + * generally needed. + * @result The NSImage to treat as the application icon. + */ +- (NSImage *) applicationIconForGrowl; + +/*! + * @method applicationIconDataForGrowl + * @abstract Return the NSData to treat as the application icon. + * @discussion The delegate may optionally return an NSData + * object to use as the application icon; if this is not implemented, the + * application's own icon is used. This is not generally needed. + * @result The NSData to treat as the application icon. + * @deprecated In version 1.1, in favor of {{{-applicationIconForGrowl}}}. + */ +- (NSData *) applicationIconDataForGrowl; + +/*! + * @method growlIsReady + * @abstract Informs the delegate that Growl has launched. + * @discussion Informs the delegate that Growl (specifically, the + * GrowlHelperApp) was launched successfully. The application can take actions + * with the knowledge that Growl is installed and functional. + */ +- (void) growlIsReady; + +/*! + * @method growlNotificationWasClicked: + * @abstract Informs the delegate that a Growl notification was clicked. + * @discussion Informs the delegate that a Growl notification was clicked. It + * is only sent for notifications sent with a non-nil + * clickContext, so if you want to receive a message when a notification is + * clicked, clickContext must not be nil when calling + * +[GrowlApplicationBridge notifyWithTitle: description:notificationName:iconData:priority:isSticky:clickContext:]. + * @param clickContext The clickContext passed when displaying the notification originally via +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:]. + */ +- (void) growlNotificationWasClicked:(id)clickContext; + +/*! + * @method growlNotificationTimedOut: + * @abstract Informs the delegate that a Growl notification timed out. + * @discussion Informs the delegate that a Growl notification timed out. It + * is only sent for notifications sent with a non-nil + * clickContext, so if you want to receive a message when a notification is + * clicked, clickContext must not be nil when calling + * +[GrowlApplicationBridge notifyWithTitle: description:notificationName:iconData:priority:isSticky:clickContext:]. + * @param clickContext The clickContext passed when displaying the notification originally via +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:]. + */ +- (void) growlNotificationTimedOut:(id)clickContext; + + at end + +#pragma mark - +/*! + * @category NSObject(GrowlApplicationBridgeDelegate_Installation_InformalProtocol) + * @abstract Methods which may be optionally implemented by the Growl delegate when used with Growl-WithInstaller.framework. + * @discussion The methods in this informal protocol will only be called if + * implemented by the delegate. They allow greater control of the information + * presented to the user when installing or upgrading Growl from within your + * application when using Growl-WithInstaller.framework. + */ + at interface NSObject (GrowlApplicationBridgeDelegate_Installation_InformalProtocol) + +/*! + * @method growlInstallationWindowTitle + * @abstract Return the title of the installation window. + * @discussion If not implemented, Growl will use a default, localized title. + * @result An NSString object to use as the title. + */ +- (NSString *)growlInstallationWindowTitle; + +/*! + * @method growlUpdateWindowTitle + * @abstract Return the title of the upgrade window. + * @discussion If not implemented, Growl will use a default, localized title. + * @result An NSString object to use as the title. + */ +- (NSString *)growlUpdateWindowTitle; + +/*! + * @method growlInstallationInformation + * @abstract Return the information to display when installing. + * @discussion This information may be as long or short as desired (the window + * will be sized to fit it). It will be displayed to the user as an + * explanation of what Growl is and what it can do in your application. It + * should probably note that no download is required to install. + * + * If this is not implemented, Growl will use a default, localized explanation. + * @result An NSAttributedString object to display. + */ +- (NSAttributedString *)growlInstallationInformation; + +/*! + * @method growlUpdateInformation + * @abstract Return the information to display when upgrading. + * @discussion This information may be as long or short as desired (the window + * will be sized to fit it). It will be displayed to the user as an + * explanation that an updated version of Growl is included in your + * application and no download is required. + * + * If this is not implemented, Growl will use a default, localized explanation. + * @result An NSAttributedString object to display. + */ +- (NSAttributedString *)growlUpdateInformation; + + at end + +//private + at interface GrowlApplicationBridge (GrowlInstallationPrompt_private) ++ (void) _userChoseNotToInstallGrowl; + at end + +#endif /* __GrowlApplicationBridge_h__ */ Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlDefines.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlDefines.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Headers/GrowlDefines.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,348 @@ +// +// GrowlDefines.h +// + +#ifndef _GROWLDEFINES_H +#define _GROWLDEFINES_H + +#ifdef __OBJC__ +#define XSTR(x) (@x) +#define STRING_TYPE NSString * +#else +#define XSTR CFSTR +#define STRING_TYPE CFStringRef +#endif + +/*! @header GrowlDefines.h + * @abstract Defines all the notification keys. + * @discussion Defines all the keys used for registration with Growl and for + * Growl notifications. + * + * Most applications should use the functions or methods of Growl.framework + * instead of posting notifications such as those described here. + * @updated 2004-01-25 + */ + +// UserInfo Keys for Registration +#pragma mark UserInfo Keys for Registration + +/*! @group Registration userInfo keys */ +/* @abstract Keys for the userInfo dictionary of a GROWL_APP_REGISTRATION distributed notification. + * @discussion The values of these keys describe the application and the + * notifications it may post. + * + * Your application must register with Growl before it can post Growl + * notifications (and have them not be ignored). However, as of Growl 0.6, + * posting GROWL_APP_REGISTRATION notifications directly is no longer the + * preferred way to register your application. Your application should instead + * use Growl.framework's delegate system. + * See +[GrowlApplicationBridge setGrowlDelegate:] or Growl_SetDelegate for + * more information. + */ + +/*! @defined GROWL_APP_NAME + * @abstract The name of your application. + * @discussion The name of your application. This should remain stable between + * different versions and incarnations of your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + */ +#define GROWL_APP_NAME XSTR("ApplicationName") +/*! @defined GROWL_APP_ID + * @abstract The bundle identifier of your application. + * @discussion The bundle identifier of your application. This key should + * be unique for your application while there may be several applications + * with the same GROWL_APP_NAME. + * This key is optional. + */ +#define GROWL_APP_ID XSTR("ApplicationId") +/*! @defined GROWL_APP_ICON + * @abstract The image data for your application's icon. + * @discussion Image data representing your application's icon. This may be + * superimposed on a notification icon as a badge, used as the notification + * icon when a notification-specific icon is not supplied, or ignored + * altogether, depending on the display. Must be in a format supported by + * NSImage, such as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_APP_ICON XSTR("ApplicationIcon") +/*! @defined GROWL_NOTIFICATIONS_DEFAULT + * @abstract The array of notifications to turn on by default. + * @discussion These are the names of the notifications that should be enabled + * by default when your application registers for the first time. If your + * application reregisters, Growl will look here for any new notification + * names found in GROWL_NOTIFICATIONS_ALL, but ignore any others. + */ +#define GROWL_NOTIFICATIONS_DEFAULT XSTR("DefaultNotifications") +/*! @defined GROWL_NOTIFICATIONS_ALL + * @abstract The array of all notifications your application can send. + * @discussion These are the names of all of the notifications that your + * application may post. See GROWL_NOTIFICATION_NAME for a discussion of good + * notification names. + */ +#define GROWL_NOTIFICATIONS_ALL XSTR("AllNotifications") +/*! @defined GROWL_NOTIFICATIONS_HUMAN_READABLE_DESCRIPTIONS + * @abstract A dictionary of human-readable names for your notifications. + * @discussion By default, the Growl UI will display notifications by the names given in GROWL_NOTIFICATIONS_ALL + * which correspond to the GROWL_NOTIFICATION_NAME. This dictionary specifies the human-readable name to display. + * The keys of the dictionary are GROWL_NOTIFICATION_NAME strings; the objects are the human-readable versions. + * For any GROWL_NOTIFICATION_NAME not specific in this dictionary, the GROWL_NOTIFICATION_NAME will be displayed. + * + * This key is optional. + */ +#define GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES XSTR("HumanReadableNames") +/*! @defined GROWL_NOTIFICATIONS_DESCRIPTIONS +* @abstract A dictionary of descriptions of _when_ each notification occurs +* @discussion This is an NSDictionary whose keys are GROWL_NOTIFICATION_NAME strings and whose objects are +* descriptions of _when_ each notification occurs, such as "You received a new mail message" or +* "A file finished downloading". +* +* This key is optional. +*/ +#define GROWL_NOTIFICATIONS_DESCRIPTIONS XSTR("NotificationDescriptions") + +/*! @defined GROWL_TICKET_VERSION + * @abstract The version of your registration ticket. + * @discussion Include this key in a ticket plist file that you put in your + * application bundle for auto-discovery. The current ticket version is 1. + */ +#define GROWL_TICKET_VERSION XSTR("TicketVersion") +// UserInfo Keys for Notifications +#pragma mark UserInfo Keys for Notifications + +/*! @group Notification userInfo keys */ +/* @abstract Keys for the userInfo dictionary of a GROWL_NOTIFICATION distributed notification. + * @discussion The values of these keys describe the content of a Growl + * notification. + * + * Not all of these keys are supported by all displays. Only the name, title, + * and description of a notification are universal. Most of the built-in + * displays do support all of these keys, and most other visual displays + * probably will also. But, as of 0.6, the Log, MailMe, and Speech displays + * support only textual data. + */ + +/*! @defined GROWL_NOTIFICATION_NAME + * @abstract The name of the notification. + * @discussion The name of the notification. Note that if you do not define + * GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES when registering your ticket originally this name + * will the one displayed within the Growl preference pane and should be human-readable. + */ +#define GROWL_NOTIFICATION_NAME XSTR("NotificationName") +/*! @defined GROWL_NOTIFICATION_TITLE + * @abstract The title to display in the notification. + * @discussion The title of the notification. Should be very brief. + * The title usually says what happened, e.g. "Download complete". + */ +#define GROWL_NOTIFICATION_TITLE XSTR("NotificationTitle") +/*! @defined GROWL_NOTIFICATION_DESCRIPTION + * @abstract The description to display in the notification. + * @discussion The description should be longer and more verbose than the title. + * The description usually tells the subject of the action, + * e.g. "Growl-0.6.dmg downloaded in 5.02 minutes". + */ +#define GROWL_NOTIFICATION_DESCRIPTION XSTR("NotificationDescription") +/*! @defined GROWL_NOTIFICATION_ICON + * @discussion Image data for the notification icon. Must be in a format + * supported by NSImage, such as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_ICON XSTR("NotificationIcon") +/*! @defined GROWL_NOTIFICATION_APP_ICON + * @discussion Image data for the application icon, in case GROWL_APP_ICON does + * not apply for some reason. Must be in a format supported by NSImage, such + * as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_APP_ICON XSTR("NotificationAppIcon") +/*! @defined GROWL_NOTIFICATION_PRIORITY + * @discussion The priority of the notification as an integer number from + * -2 to +2 (+2 being highest). + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_PRIORITY XSTR("NotificationPriority") +/*! @defined GROWL_NOTIFICATION_STICKY + * @discussion A Boolean number controlling whether the notification is sticky. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_STICKY XSTR("NotificationSticky") +/*! @defined GROWL_NOTIFICATION_CLICK_CONTEXT + * @abstract Identifies which notification was clicked. + * @discussion An identifier for the notification for clicking purposes. + * + * This will be passed back to the application when the notification is + * clicked. It must be plist-encodable (a data, dictionary, array, number, or + * string object), and it should be unique for each notification you post. + * A good click context would be a UUID string returned by NSProcessInfo or + * CFUUID. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_CLICK_CONTEXT XSTR("NotificationClickContext") + +/*! @defined GROWL_DISPLAY_PLUGIN + * @discussion The name of a display plugin which should be used for this notification. + * Optional. If this key is not set or the specified display plugin does not + * exist, the display plugin stored in the application ticket is used. This key + * allows applications to use different default display plugins for their + * notifications. The user can still override those settings in the preference + * pane. + */ +#define GROWL_DISPLAY_PLUGIN XSTR("NotificationDisplayPlugin") + +/*! @defined GROWL_NOTIFICATION_IDENTIFIER + * @abstract An identifier for the notification for coalescing purposes. + * Notifications with the same identifier fall into the same class; only + * the last notification of a class is displayed on the screen. If a + * notification of the same class is currently being displayed, it is + * replaced by this notification. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_IDENTIFIER XSTR("GrowlNotificationIdentifier") + +/*! @defined GROWL_APP_PID + * @abstract The process identifier of the process which sends this + * notification. If this field is set, the application will only receive + * clicked and timed out notifications which originate from this process. + * + * Optional. + */ +#define GROWL_APP_PID XSTR("ApplicationPID") + +/*! @defined GROWL_NOTIFICATION_PROGRESS +* @abstract If this key is set, it should contain a double value wrapped +* in a NSNumber which describes some sort of progress (from 0.0 to 100.0). +* If this is key is not set, no progress bar is shown. +* +* Optional. Not supported by all display plugins. +*/ +#define GROWL_NOTIFICATION_PROGRESS XSTR("NotificationProgress") + +// Notifications +#pragma mark Notifications + +/*! @group Notification names */ +/* @abstract Names of distributed notifications used by Growl. + * @discussion These are notifications used by applications (directly or + * indirectly) to interact with Growl, and by Growl for interaction between + * its components. + * + * Most of these should no longer be used in Growl 0.6 and later, in favor of + * Growl.framework's GrowlApplicationBridge APIs. + */ + +/*! @defined GROWL_APP_REGISTRATION + * @abstract The distributed notification for registering your application. + * @discussion This is the name of the distributed notification that can be + * used to register applications with Growl. + * + * The userInfo dictionary for this notification can contain these keys: + *
    + *
  • GROWL_APP_NAME
    • + *
  • GROWL_APP_ICON
    • + *
  • GROWL_NOTIFICATIONS_ALL
    • + *
  • GROWL_NOTIFICATIONS_DEFAULT
    • + *
+ * + * No longer recommended as of Growl 0.6. An alternate method of registering + * is to use Growl.framework's delegate system. + * See +[GrowlApplicationBridge setGrowlDelegate:] or Growl_SetDelegate for + * more information. + */ +#define GROWL_APP_REGISTRATION XSTR("GrowlApplicationRegistrationNotification") +/*! @defined GROWL_APP_REGISTRATION_CONF + * @abstract The distributed notification for confirming registration. + * @discussion The name of the distributed notification sent to confirm the + * registration. Used by the Growl preference pane. Your application probably + * does not need to use this notification. + */ +#define GROWL_APP_REGISTRATION_CONF XSTR("GrowlApplicationRegistrationConfirmationNotification") +/*! @defined GROWL_NOTIFICATION + * @abstract The distributed notification for Growl notifications. + * @discussion This is what it all comes down to. This is the name of the + * distributed notification that your application posts to actually send a + * Growl notification. + * + * The userInfo dictionary for this notification can contain these keys: + *
    + *
  • GROWL_NOTIFICATION_NAME (required)
    • + *
  • GROWL_NOTIFICATION_TITLE (required)
    • + *
  • GROWL_NOTIFICATION_DESCRIPTION (required)
    • + *
  • GROWL_NOTIFICATION_ICON
    • + *
  • GROWL_NOTIFICATION_APP_ICON
    • + *
  • GROWL_NOTIFICATION_PRIORITY
    • + *
  • GROWL_NOTIFICATION_STICKY
    • + *
  • GROWL_NOTIFICATION_CLICK_CONTEXT
    • + *
  • GROWL_APP_NAME (required)
    • + *
+ * + * No longer recommended as of Growl 0.6. Three alternate methods of posting + * notifications are +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:], + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext, and + * Growl_PostNotification. + */ +#define GROWL_NOTIFICATION XSTR("GrowlNotification") +/*! @defined GROWL_SHUTDOWN +* @abstract The distributed notification name that tells Growl to shutdown. +* @discussion The Growl preference pane posts this notification when the +* "Stop Growl" button is clicked. +*/ +#define GROWL_SHUTDOWN XSTR("GrowlShutdown") +/*! @defined GROWL_PING + * @abstract A distributed notification to check whether Growl is running. + * @discussion This is used by the Growl preference pane. If it receives a + * GROWL_PONG, the preference pane takes this to mean that Growl is running. + */ +#define GROWL_PING XSTR("Honey, Mind Taking Out The Trash") +/*! @defined GROWL_PONG + * @abstract The distributed notification sent in reply to GROWL_PING. + * @discussion GrowlHelperApp posts this in reply to GROWL_PING. + */ +#define GROWL_PONG XSTR("What Do You Want From Me, Woman") +/*! @defined GROWL_IS_READY + * @abstract The distributed notification sent when Growl starts up. + * @discussion GrowlHelperApp posts this when it has begin listening on all of + * its sources for new notifications. GrowlApplicationBridge (in + * Growl.framework), upon receiving this notification, reregisters using the + * registration dictionary supplied by its delegate. + */ +#define GROWL_IS_READY XSTR("Lend Me Some Sugar; I Am Your Neighbor!") +/*! @defined GROWL_NOTIFICATION_CLICKED + * @abstract The distributed notification sent when a supported notification is clicked. + * @discussion When a Growl notification with a click context is clicked on by + * the user, Growl posts this distributed notification. + * The GrowlApplicationBridge responds to this notification by calling a + * callback in its delegate. + */ +#define GROWL_NOTIFICATION_CLICKED XSTR("GrowlClicked!") +#define GROWL_NOTIFICATION_TIMED_OUT XSTR("GrowlTimedOut!") + +/*! @group Other symbols */ +/* Symbols which don't fit into any of the other categories. */ + +/*! @defined GROWL_KEY_CLICKED_CONTEXT + * @abstract Used internally as the key for the clickedContext passed over DNC. + * @discussion This key is used in GROWL_NOTIFICATION_CLICKED, and contains the + * click context that was supplied in the original notification. + */ +#define GROWL_KEY_CLICKED_CONTEXT XSTR("ClickedContext") +/*! @defined GROWL_REG_DICT_EXTENSION + * @abstract The filename extension for registration dictionaries. + * @discussion The GrowlApplicationBridge in Growl.framework registers with + * Growl by creating a file with the extension of .(GROWL_REG_DICT_EXTENSION) + * and opening it in the GrowlHelperApp. This happens whether or not Growl is + * running; if it was stopped, it quits immediately without listening for + * notifications. + */ +#define GROWL_REG_DICT_EXTENSION XSTR("growlRegDict") + + +#define GROWL_POSITION_PREFERENCE_KEY @"GrowlSelectedPosition" + +#endif //ndef _GROWLDEFINES_H Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Resources/Info.plist =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Resources/Info.plist (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/A/Resources/Info.plist 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + Growl + CFBundleIdentifier + com.growl.growlframework + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.2.1 + CFBundleSignature + GRRR + CFBundleVersion + 1.2.1 + NSPrincipalClass + GrowlApplicationBridge + + Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Growl =================================================================== (Binary files differ) Index: trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Growl =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Growl 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Growl 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Growl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/Growl.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/Growl.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/Growl.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,6 @@ +#include "GrowlDefines.h" + +#ifdef __OBJC__ +# include "GrowlApplicationBridge.h" +#endif +#include "GrowlApplicationBridge-Carbon.h" Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlApplicationBridge-Carbon.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlApplicationBridge-Carbon.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlApplicationBridge-Carbon.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,780 @@ +// +// GrowlApplicationBridge-Carbon.h +// Growl +// +// Created by Mac-arena the Bored Zo on Wed Jun 18 2004. +// Based on GrowlApplicationBridge.h by Evan Schoenberg. +// This source code is in the public domain. You may freely link it into any +// program. +// + +#ifndef _GROWLAPPLICATIONBRIDGE_CARBON_H_ +#define _GROWLAPPLICATIONBRIDGE_CARBON_H_ + +#include +#include + +#ifndef GROWL_EXPORT +#define GROWL_EXPORT __attribute__((visibility("default"))) DEPRECATED_ATTRIBUTE +#endif + +/*! @header GrowlApplicationBridge-Carbon.h + * @abstract Declares an API that Carbon applications can use to interact with Growl. + * @discussion GrowlApplicationBridge uses a delegate to provide information //XXX + * to Growl (such as your application's name and what notifications it may + * post) and to provide information to your application (such as that Growl + * is listening for notifications or that a notification has been clicked). + * + * You can set the Growldelegate with Growl_SetDelegate and find out the + * current delegate with Growl_GetDelegate. See struct Growl_Delegate for more + * information about the delegate. + */ + +__BEGIN_DECLS + +/*! @struct Growl_Delegate + * @abstract Delegate to supply GrowlApplicationBridge with information and respond to events. + * @discussion The Growl delegate provides your interface to + * GrowlApplicationBridge. When GrowlApplicationBridge needs information about + * your application, it looks for it in the delegate; when Growl or the user + * does something that you might be interested in, GrowlApplicationBridge + * looks for a callback in the delegate and calls it if present + * (meaning, if it is not NULL). + * XXX on all of that + * @field size The size of the delegate structure. + * @field applicationName The name of your application. + * @field registrationDictionary A dictionary describing your application and the notifications it can send out. + * @field applicationIconData Your application's icon. + * @field growlInstallationWindowTitle The title of the installation window. + * @field growlInstallationInformation Text to display in the installation window. + * @field growlUpdateWindowTitle The title of the update window. + * @field growlUpdateInformation Text to display in the update window. + * @field referenceCount A count of owners of the delegate. + * @field retain Called when GrowlApplicationBridge receives this delegate. + * @field release Called when GrowlApplicationBridge no longer needs this delegate. + * @field growlIsReady Called when GrowlHelperApp is listening for notifications. + * @field growlNotificationWasClicked Called when a Growl notification is clicked. + * @field growlNotificationTimedOut Called when a Growl notification timed out. + */ +struct Growl_Delegate { + /* @discussion This should be sizeof(struct Growl_Delegate). + */ + size_t size; + + /*All of these attributes are optional. + *Optional attributes can be NULL; required attributes that + * are NULL cause setting the Growl delegate to fail. + *XXX - move optional/required status into the discussion for each field + */ + + /* This name is used both internally and in the Growl preferences. + * + * This should remain stable between different versions and incarnations of + * your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + * + * This can be NULL if it is provided elsewhere, namely in an + * auto-discoverable plist file in your app bundle + * (XXX refer to more information on that) or in registrationDictionary. + */ + CFStringRef applicationName; + + /* + * Must contain at least these keys: + * GROWL_NOTIFICATIONS_ALL (CFArray): + * Contains the names of all notifications your application may post. + * + * Can also contain these keys: + * GROWL_NOTIFICATIONS_DEFAULT (CFArray): + * Names of notifications that should be enabled by default. + * If omitted, GROWL_NOTIFICATIONS_ALL will be used. + * GROWL_APP_NAME (CFString): + * Same as the applicationName member of this structure. + * If both are present, the applicationName member shall prevail. + * If this key is present, you may omit applicationName (set it to NULL). + * GROWL_APP_ICON (CFData): + * Same as the iconData member of this structure. + * If both are present, the iconData member shall prevail. + * If this key is present, you may omit iconData (set it to NULL). + * + * If you change the contents of this dictionary after setting the delegate, + * be sure to call Growl_Reregister. + * + * This can be NULL if you have an auto-discoverable plist file in your app + * bundle. (XXX refer to more information on that) + */ + CFDictionaryRef registrationDictionary; + + /* The data can be in any format supported by NSImage. As of + * Mac OS X 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and + * PICT formats. + * + * If this is not supplied, Growl will look up your application's icon by + * its application name. + */ + CFDataRef applicationIconData; + + /* Installer display attributes + * + * These four attributes are used by the Growl installer, if this framework + * supports it. + * For any of these being NULL, a localised default will be + * supplied. + */ + + /* If this is NULL, Growl will use a default, + * localized title. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlInstallationWindowTitle; + /* This information may be as long or short as desired (the + * window will be sized to fit it). If Growl is not installed, it will + * be displayed to the user as an explanation of what Growl is and what + * it can do in your application. + * It should probably note that no download is required to install. + * + * If this is NULL, Growl will use a default, localized + * explanation. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlInstallationInformation; + /* If this is NULL, Growl will use a default, + * localized title. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlUpdateWindowTitle; + /* This information may be as long or short as desired (the + * window will be sized to fit it). If an older version of Growl is + * installed, it will be displayed to the user as an explanation that an + * updated version of Growl is included in your application and + * no download is required. + * + * If this is NULL, Growl will use a default, localized + * explanation. + * + * Only used if you're using Growl-WithInstaller.framework. Otherwise, + * this member is ignored. + */ + CFStringRef growlUpdateInformation; + + /* This member is provided for use by your retain and release + * callbacks (see below). + * + * GrowlApplicationBridge never directly uses this member. Instead, it + * calls your retain callback (if non-NULL) and your release + * callback (if non-NULL). + */ + unsigned referenceCount; + + //Functions. Currently all of these are optional (any of them can be NULL). + + /* When you call Growl_SetDelegate(newDelegate), it will call + * oldDelegate->release(oldDelegate), and then it will call + * newDelegate->retain(newDelegate), and the return value from retain + * is what will be set as the delegate. + * (This means that this member works like CFRetain and -[NSObject retain].) + * This member is optional (it can be NULL). + * For a delegate allocated with malloc, this member would be + * NULL. + * @result A delegate to which GrowlApplicationBridge holds a reference. + */ + void *(*retain)(void *); + /* When you call Growl_SetDelegate(newDelegate), it will call + * oldDelegate->release(oldDelegate), and then it will call + * newDelegate->retain(newDelegate), and the return value from retain + * is what will be set as the delegate. + * (This means that this member works like CFRelease and + * -[NSObject release].) + * This member is optional (it can be NULL). + * For a delegate allocated with malloc, this member might be + * free(3). + */ + void (*release)(void *); + + /* Informs the delegate that Growl (specifically, the GrowlHelperApp) was + * launched successfully (or was already running). The application can + * take actions with the knowledge that Growl is installed and functional. + */ + void (*growlIsReady)(void); + + /* Informs the delegate that a Growl notification was clicked. It is only + * sent for notifications sent with a non-NULL clickContext, + * so if you want to receive a message when a notification is clicked, + * clickContext must not be NULL when calling + * Growl_PostNotification or + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext. + */ + void (*growlNotificationWasClicked)(CFPropertyListRef clickContext); + + /* Informs the delegate that a Growl notification timed out. It is only + * sent for notifications sent with a non-NULL clickContext, + * so if you want to receive a message when a notification is clicked, + * clickContext must not be NULL when calling + * Growl_PostNotification or + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext. + */ + void (*growlNotificationTimedOut)(CFPropertyListRef clickContext); +}; + +/*! @struct Growl_Notification + * @abstract Structure describing a Growl notification. + * @discussion XXX + * @field size The size of the notification structure. + * @field name Identifies the notification. + * @field title Short synopsis of the notification. + * @field description Additional text. + * @field iconData An icon for the notification. + * @field priority An indicator of the notification's importance. + * @field reserved Bits reserved for future usage. + * @field isSticky Requests that a notification stay on-screen until dismissed explicitly. + * @field clickContext An identifier to be passed to your click callback when a notification is clicked. + * @field clickCallback A callback to call when the notification is clicked. + */ +struct Growl_Notification { + /* This should be sizeof(struct Growl_Notification). + */ + size_t size; + + /* The notification name distinguishes one type of + * notification from another. The name should be human-readable, as it + * will be displayed in the Growl preference pane. + * + * The name is used in the GROWL_NOTIFICATIONS_ALL and + * GROWL_NOTIFICATIONS_DEFAULT arrays in the registration dictionary, and + * in this member of the Growl_Notification structure. + */ + CFStringRef name; + + /* A notification's title describes the notification briefly. + * It should be easy to read quickly by the user. + */ + CFStringRef title; + + /* The description supplements the title with more + * information. It is usually longer and sometimes involves a list of + * subjects. For example, for a 'Download complete' notification, the + * description might have one filename per line. GrowlMail in Growl 0.6 + * uses a description of '%d new mail(s)' (formatted with the number of + * messages). + */ + CFStringRef description; + + /* The notification icon usually indicates either what + * happened (it may have the same icon as e.g. a toolbar item that + * started the process that led to the notification), or what it happened + * to (e.g. a document icon). + * + * The icon data is optional, so it can be NULL. In that + * case, the application icon is used alone. Not all displays support + * icons. + * + * The data can be in any format supported by NSImage. As of Mac OS X + * 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and PICT form + * ats. + */ + CFDataRef iconData; + + /* Priority is new in Growl 0.6, and is represented as a + * signed integer from -2 to +2. 0 is Normal priority, -2 is Very Low + * priority, and +2 is Very High priority. + * + * Not all displays support priority. If you do not wish to assign a + * priority to your notification, assign 0. + */ + signed int priority; + + /* These bits are not used in Growl 0.6. Set them to 0. + */ + unsigned reserved: 31; + + /* When the sticky bit is clear, in most displays, + * notifications disappear after a certain amount of time. Sticky + * notifications, however, remain on-screen until the user dismisses them + * explicitly, usually by clicking them. + * + * Sticky notifications were introduced in Growl 0.6. Most notifications + * should not be sticky. Not all displays support sticky notifications, + * and the user may choose in Growl's preference pane to force the + * notification to be sticky or non-sticky, in which case the sticky bit + * in the notification will be ignored. + */ + unsigned isSticky: 1; + + /* If this is not NULL, and your click callback + * is not NULL either, this will be passed to the callback + * when your notification is clicked by the user. + * + * Click feedback was introduced in Growl 0.6, and it is optional. Not + * all displays support click feedback. + */ + CFPropertyListRef clickContext; + + /* If this is not NULL, it will be called instead + * of the Growl delegate's click callback when clickContext is + * non-NULL and the notification is clicked on by the user. + * + * Click feedback was introduced in Growl 0.6, and it is optional. Not + * all displays support click feedback. + * + * The per-notification click callback is not yet supported as of Growl + * 0.7. + */ + void (*clickCallback)(CFPropertyListRef clickContext); + + CFStringRef identifier; +}; + +#pragma mark - +#pragma mark Easy initialisers + +/*! @defined InitGrowlDelegate + * @abstract Callable macro. Initializes a Growl delegate structure to defaults. + * @discussion Call with a pointer to a struct Growl_Delegate. All of the + * members of the structure will be set to 0 or NULL, except for + * size (which will be set to sizeof(struct Growl_Delegate)) and + * referenceCount (which will be set to 1). + */ +#define InitGrowlDelegate(delegate) \ + do { \ + if (delegate) { \ + (delegate)->size = sizeof(struct Growl_Delegate); \ + (delegate)->applicationName = NULL; \ + (delegate)->registrationDictionary = NULL; \ + (delegate)->applicationIconData = NULL; \ + (delegate)->growlInstallationWindowTitle = NULL; \ + (delegate)->growlInstallationInformation = NULL; \ + (delegate)->growlUpdateWindowTitle = NULL; \ + (delegate)->growlUpdateInformation = NULL; \ + (delegate)->referenceCount = 1U; \ + (delegate)->retain = NULL; \ + (delegate)->release = NULL; \ + (delegate)->growlIsReady = NULL; \ + (delegate)->growlNotificationWasClicked = NULL; \ + (delegate)->growlNotificationTimedOut = NULL; \ + } \ + } while(0) + +/*! @defined InitGrowlNotification + * @abstract Callable macro. Initializes a Growl notification structure to defaults. + * @discussion Call with a pointer to a struct Growl_Notification. All of + * the members of the structure will be set to 0 or NULL, except + * for size (which will be set to + * sizeof(struct Growl_Notification)). + */ +#define InitGrowlNotification(notification) \ + do { \ + if (notification) { \ + (notification)->size = sizeof(struct Growl_Notification); \ + (notification)->name = NULL; \ + (notification)->title = NULL; \ + (notification)->description = NULL; \ + (notification)->iconData = NULL; \ + (notification)->priority = 0; \ + (notification)->reserved = 0U; \ + (notification)->isSticky = false; \ + (notification)->clickContext = NULL; \ + (notification)->clickCallback = NULL; \ + (notification)->identifier = NULL; \ + } \ + } while(0) + +#pragma mark - +#pragma mark Public API + +// @functiongroup Managing the Growl delegate + +/*! @function Growl_SetDelegate + * @abstract Replaces the current Growl delegate with a new one, or removes + * the Growl delegate. + * @param newDelegate + * @result Returns false and does nothing else if a pointer that was passed in + * is unsatisfactory (because it is non-NULL, but at least one + * required member of it is NULL). Otherwise, sets or unsets the + * delegate and returns true. + * @discussion When newDelegate is non-NULL, sets + * the delegate to newDelegate. When it is NULL, + * the current delegate will be unset, and no delegate will be in place. + * + * It is legal for newDelegate to be the current delegate; + * nothing will happen, and Growl_SetDelegate will return true. It is also + * legal for it to be NULL, as described above; again, it will + * return true. + * + * If there was a delegate in place before the call, Growl_SetDelegate will + * call the old delegate's release member if it was non-NULL. If + * newDelegate is non-NULL, Growl_SetDelegate will + * call newDelegate->retain, and set the delegate to its return + * value. + * + * If you are using Growl-WithInstaller.framework, and an older version of + * Growl is installed on the user's system, the user will automatically be + * prompted to update. + * + * GrowlApplicationBridge currently does not copy this structure, nor does it + * retain any of the CF objects in the structure (it regards the structure as + * a container that retains the objects when they are added and releases them + * when they are removed or the structure is destroyed). Also, + * GrowlApplicationBridge currently does not modify any member of the + * structure, except possibly the referenceCount by calling the retain and + * release members. + */ +GROWL_EXPORT Boolean Growl_SetDelegate(struct Growl_Delegate *newDelegate); + +/*! @function Growl_GetDelegate + * @abstract Returns the current Growl delegate, if any. + * @result The current Growl delegate. + * @discussion Returns the last pointer passed into Growl_SetDelegate, or + * NULL if no such call has been made. + * + * This function follows standard Core Foundation reference-counting rules. + * Because it is a Get function, not a Copy function, it will not retain the + * delegate on your behalf. You are responsible for retaining and releasing + * the delegate as needed. + */ +GROWL_EXPORT struct Growl_Delegate *Growl_GetDelegate(void); + +#pragma mark - + +// @functiongroup Posting Growl notifications + +/*! @function Growl_PostNotification + * @abstract Posts a Growl notification. + * @param notification The notification to post. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * NULL (or 0 or false as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. + * If the user cancels, this function will have no effect until the next + * application session, at which time when it is called the user will be + * prompted again. The user is also given the option to not be prompted again. + * If the user does choose to install Growl, the requested notification will + * be displayed once Growl is installed and running. + */ +GROWL_EXPORT void Growl_PostNotification(const struct Growl_Notification *notification); + +/*! @function Growl_PostNotificationWithDictionary +* @abstract Notifies using a userInfo dictionary suitable for passing to +* CFDistributedNotificationCenter. +* @param userInfo The dictionary to notify with. +* @discussion Before Growl 0.6, your application would have posted +* notifications using CFDistributedNotificationCenter by creating a userInfo +* dictionary with the notification data. This had the advantage of allowing +* you to add other data to the dictionary for programs besides Growl that +* might be listening. +* +* This function allows you to use such dictionaries without being restricted +* to using CFDistributedNotificationCenter. The keys for this dictionary + * can be found in GrowlDefines.h. +*/ +GROWL_EXPORT void Growl_PostNotificationWithDictionary(CFDictionaryRef userInfo); + +/*! @function Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext + * @abstract Posts a Growl notification using parameter values. + * @param title The title of the notification. + * @param description The description of the notification. + * @param notificationName The name of the notification as listed in the + * registration dictionary. + * @param iconData Data representing a notification icon. Can be NULL. + * @param priority The priority of the notification (-2 to +2, with -2 + * being Very Low and +2 being Very High). + * @param isSticky If true, requests that this notification wait for a + * response from the user. + * @param clickContext An object to pass to the clickCallback, if any. Can + * be NULL, in which case the clickCallback is not called. + * @discussion Creates a temporary Growl_Notification, fills it out with the + * supplied information, and calls Growl_PostNotification on it. + * See struct Growl_Notification and Growl_PostNotification for more + * information. + * + * The icon data can be in any format supported by NSImage. As of Mac OS X + * 10.3, this includes the .icns, TIFF, JPEG, GIF, PNG, PDF, and PICT formats. + */ +GROWL_EXPORT void Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext( + /*inhale*/ + CFStringRef title, + CFStringRef description, + CFStringRef notificationName, + CFDataRef iconData, + signed int priority, + Boolean isSticky, + CFPropertyListRef clickContext); + +#pragma mark - + +// @functiongroup Registering + +/*! @function Growl_RegisterWithDictionary + * @abstract Register your application with Growl without setting a delegate. + * @discussion When you call this function with a dictionary, + * GrowlApplicationBridge registers your application using that dictionary. + * If you pass NULL, GrowlApplicationBridge will ask the delegate + * (if there is one) for a dictionary, and if that doesn't work, it will look + * in your application's bundle for an auto-discoverable plist. + * (XXX refer to more information on that) + * + * If you pass a dictionary to this function, it must include the + * GROWL_APP_NAME key, unless a delegate is set. + * + * This function is mainly an alternative to the delegate system introduced + * with Growl 0.6. Without a delegate, you cannot receive callbacks such as + * growlIsReady (since they are sent to the delegate). You can, + * however, set a delegate after registering without one. + * + * This function was introduced in Growl.framework 0.7. + * @result false if registration failed (e.g. if Growl isn't installed). + */ +GROWL_EXPORT Boolean Growl_RegisterWithDictionary(CFDictionaryRef regDict); + +/*! @function Growl_Reregister + * @abstract Updates your registration with Growl. + * @discussion If your application changes the contents of the + * GROWL_NOTIFICATIONS_ALL key in the registrationDictionary member of the + * Growl delegate, or if it changes the value of that member, or if it + * changes the contents of its auto-discoverable plist, call this function + * to have Growl update its registration information for your application. + * + * Otherwise, this function does not normally need to be called. If you're + * using a delegate, your application will be registered when you set the + * delegate if both the delegate and its registrationDictionary member are + * non-NULL. + * + * This function is now implemented using + * Growl_RegisterWithDictionary. + */ +GROWL_EXPORT void Growl_Reregister(void); + +#pragma mark - + +/*! @function Growl_SetWillRegisterWhenGrowlIsReady + * @abstract Tells GrowlApplicationBridge to register with Growl when Growl + * launches (or not). + * @discussion When Growl has started listening for notifications, it posts a + * GROWL_IS_READY notification on the Distributed Notification + * Center. GrowlApplicationBridge listens for this notification, using it to + * perform various tasks (such as calling your delegate's + * growlIsReady callback, if it has one). If this function is + * called with true, one of those tasks will be to reregister + * with Growl (in the manner of Growl_Reregister). + * + * This attribute is automatically set back to false + * (the default) after every GROWL_IS_READY notification. + * @param flag true if you want GrowlApplicationBridge to register with + * Growl when next it is ready; false if not. + */ +GROWL_EXPORT void Growl_SetWillRegisterWhenGrowlIsReady(Boolean flag); +/*! @function Growl_WillRegisterWhenGrowlIsReady + * @abstract Reports whether GrowlApplicationBridge will register with Growl + * when Growl next launches. + * @result true if GrowlApplicationBridge will register with + * Growl when next it posts GROWL_IS_READY; false if not. + */ +GROWL_EXPORT Boolean Growl_WillRegisterWhenGrowlIsReady(void); + +#pragma mark - + +// @functiongroup Obtaining registration dictionaries + +/*! @function Growl_CopyRegistrationDictionaryFromDelegate + * @abstract Asks the delegate for a registration dictionary. + * @discussion If no delegate is set, or if the delegate's + * registrationDictionary member is NULL, this + * function returns NULL. + * + * This function does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use + * Growl_CreateRegistrationDictionaryByFillingInDictionary or + * Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * to try to fill in missing keys. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CopyRegistrationDictionaryFromDelegate(void); + +/*! @function Growl_CopyRegistrationDictionaryFromBundle + * @abstract Looks in a bundle for a registration dictionary. + * @discussion This function looks in a bundle for an auto-discoverable + * registration dictionary file using CFBundleCopyResourceURL. + * If it finds one, it loads the file using CFPropertyList and + * returns the result. + * + * If you pass NULL as the bundle, the main bundle is examined. + * + * This function does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use + * Growl_CreateRegistrationDictionaryByFillingInDictionary: or + * Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * to try to fill in missing keys. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CopyRegistrationDictionaryFromBundle(CFBundleRef bundle); + +/*! @function Growl_CreateBestRegistrationDictionary + * @abstract Obtains a registration dictionary, filled out to the best of + * GrowlApplicationBridge's knowledge. + * @discussion This function creates a registration dictionary as best + * GrowlApplicationBridge knows how. + * + * First, GrowlApplicationBridge examines the Growl delegate (if there is + * one) and gets the registration dictionary from that. If no such dictionary + * was obtained, GrowlApplicationBridge looks in your application's main + * bundle for an auto-discoverable registration dictionary file. If that + * doesn't exist either, this function returns NULL. + * + * Second, GrowlApplicationBridge calls + * Growl_CreateRegistrationDictionaryByFillingInDictionary with + * whatever dictionary was obtained. The result of that function is the + * result of this function. + * + * GrowlApplicationBridge uses this function when you call + * Growl_SetDelegate, or when you call + * Growl_RegisterWithDictionary with NULL. + * + * This function was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateBestRegistrationDictionary(void); + +#pragma mark - + +// @functiongroup Filling in registration dictionaries + +/*! @function Growl_CreateRegistrationDictionaryByFillingInDictionary + * @abstract Tries to fill in missing keys in a registration dictionary. + * @param regDict The dictionary to fill in. + * @result The dictionary with the keys filled in. + * @discussion This function examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Keys are only filled in if missing; if a key is present in the dictionary, + * its value will not be changed. + * + * This function was introduced in Growl.framework 0.7. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateRegistrationDictionaryByFillingInDictionary(CFDictionaryRef regDict); +/*! @function Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys + * @abstract Tries to fill in missing keys in a registration dictionary. + * @param regDict The dictionary to fill in. + * @param keys The keys to fill in. If NULL, any missing keys are filled in. + * @result The dictionary with the keys filled in. + * @discussion This function examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Only those keys that are listed in keys will be filled in. + * Other missing keys are ignored. Also, keys are only filled in if missing; + * if a key is present in the dictionary, its value will not be changed. + * + * This function was introduced in Growl.framework 0.7. + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateRegistrationDictionaryByFillingInDictionaryRestrictedToKeys(CFDictionaryRef regDict, CFSetRef keys); + +/*! @brief Tries to fill in missing keys in a notification dictionary. + * @param notifDict The dictionary to fill in. + * @return The dictionary with the keys filled in. This will be a separate instance from \a notifDict. + * @discussion This function examines the \a notifDict for missing keys, and + * tries to get them from the last known registration dictionary. As of 1.1, + * the keys that it will look for are: + * + * \li GROWL_APP_NAME + * \li GROWL_APP_ICON + * + * @since Growl.framework 1.1 + */ +GROWL_EXPORT CFDictionaryRef Growl_CreateNotificationDictionaryByFillingInDictionary(CFDictionaryRef notifDict); + +#pragma mark - + +// @functiongroup Querying Growl's status + +/*! @function Growl_IsInstalled + * @abstract Determines whether the Growl prefpane and its helper app are + * installed. + * @result Returns true if Growl is installed, false otherwise. + */ +GROWL_EXPORT Boolean Growl_IsInstalled(void); + +/*! @function Growl_IsRunning + * @abstract Cycles through the process list to find whether GrowlHelperApp + * is running. + * @result Returns true if Growl is running, false otherwise. + */ +GROWL_EXPORT Boolean Growl_IsRunning(void); + +#pragma mark - + +// @functiongroup Launching Growl + +/*! @typedef GrowlLaunchCallback + * @abstract Callback to notify you that Growl is running. + * @param context The context pointer passed to Growl_LaunchIfInstalled. + * @discussion Growl_LaunchIfInstalled calls this callback function if Growl + * was already running or if it launched Growl successfully. + */ +typedef void (*GrowlLaunchCallback)(void *context); + +/*! @function Growl_LaunchIfInstalled + * @abstract Launches GrowlHelperApp if it is not already running. + * @param callback A callback function which will be called if Growl was successfully + * launched or was already running. Can be NULL. + * @param context The context pointer to pass to the callback. Can be NULL. + * @result Returns true if Growl was successfully launched or was already + * running; returns false and does not call the callback otherwise. + * @discussion Returns true and calls the callback (if the callback is not + * NULL) if the Growl helper app began launching or was already + * running. Returns false and performs no other action if Growl could not be + * launched (e.g. because the Growl preference pane is not properly installed). + * + * If Growl_CreateBestRegistrationDictionary returns + * non-NULL, this function will register with Growl atomically. + * + * The callback should take a single argument; this is to allow applications + * to have context-relevant information passed back. It is perfectly + * acceptable for context to be NULL. The callback itself can be + * NULL if you don't want one. + */ +GROWL_EXPORT Boolean Growl_LaunchIfInstalled(GrowlLaunchCallback callback, void *context); + +#pragma mark - +#pragma mark Constants + +/*! @defined GROWL_PREFPANE_BUNDLE_IDENTIFIER + * @abstract The CFBundleIdentifier of the Growl preference pane bundle. + * @discussion GrowlApplicationBridge uses this to determine whether Growl is + * currently installed, by searching for the Growl preference pane. Your + * application probably does not need to use this macro itself. + */ +#ifndef GROWL_PREFPANE_BUNDLE_IDENTIFIER +#define GROWL_PREFPANE_BUNDLE_IDENTIFIER CFSTR("com.growl.prefpanel") +#endif + +__END_DECLS + +#endif /* _GROWLAPPLICATIONBRIDGE_CARBON_H_ */ Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlApplicationBridge.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlApplicationBridge.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlApplicationBridge.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,575 @@ +// +// GrowlApplicationBridge.h +// Growl +// +// Created by Evan Schoenberg on Wed Jun 16 2004. +// Copyright 2004-2006 The Growl Project. All rights reserved. +// + +/*! + * @header GrowlApplicationBridge.h + * @abstract Defines the GrowlApplicationBridge class. + * @discussion This header defines the GrowlApplicationBridge class as well as + * the GROWL_PREFPANE_BUNDLE_IDENTIFIER constant. + */ + +#ifndef __GrowlApplicationBridge_h__ +#define __GrowlApplicationBridge_h__ + +#import +#import +#import "GrowlDefines.h" + +//Forward declarations + at protocol GrowlApplicationBridgeDelegate; + +//Internal notification when the user chooses not to install (to avoid continuing to cache notifications awaiting installation) +#define GROWL_USER_CHOSE_NOT_TO_INSTALL_NOTIFICATION @"User chose not to install" + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @class GrowlApplicationBridge + * @abstract A class used to interface with Growl. + * @discussion This class provides a means to interface with Growl. + * + * Currently it provides a way to detect if Growl is installed and launch the + * GrowlHelperApp if it's not already running. + */ + at interface GrowlApplicationBridge : NSObject { + +} + +/*! + * @method isGrowlInstalled + * @abstract Detects whether Growl is installed. + * @discussion Determines if the Growl prefpane and its helper app are installed. + * @result Returns YES if Growl is installed, NO otherwise. + */ ++ (BOOL) isGrowlInstalled; + +/*! + * @method isGrowlRunning + * @abstract Detects whether GrowlHelperApp is currently running. + * @discussion Cycles through the process list to find whether GrowlHelperApp is running and returns its findings. + * @result Returns YES if GrowlHelperApp is running, NO otherwise. + */ ++ (BOOL) isGrowlRunning; + +#pragma mark - + +/*! + * @method setGrowlDelegate: + * @abstract Set the object which will be responsible for providing and receiving Growl information. + * @discussion This must be called before using GrowlApplicationBridge. + * + * The methods in the GrowlApplicationBridgeDelegate protocol are required + * and return the basic information needed to register with Growl. + * + * The methods in the GrowlApplicationBridgeDelegate_InformalProtocol + * informal protocol are individually optional. They provide a greater + * degree of interaction between the application and growl such as informing + * the application when one of its Growl notifications is clicked by the user. + * + * The methods in the GrowlApplicationBridgeDelegate_Installation_InformalProtocol + * informal protocol are individually optional and are only applicable when + * using the Growl-WithInstaller.framework which allows for automated Growl + * installation. + * + * When this method is called, data will be collected from inDelegate, Growl + * will be launched if it is not already running, and the application will be + * registered with Growl. + * + * If using the Growl-WithInstaller framework, if Growl is already installed + * but this copy of the framework has an updated version of Growl, the user + * will be prompted to update automatically. + * + * @param inDelegate The delegate for the GrowlApplicationBridge. It must conform to the GrowlApplicationBridgeDelegate protocol. + */ ++ (void) setGrowlDelegate:(NSObject *)inDelegate; + +/*! + * @method growlDelegate + * @abstract Return the object responsible for providing and receiving Growl information. + * @discussion See setGrowlDelegate: for details. + * @result The Growl delegate. + */ ++ (NSObject *) growlDelegate; + +#pragma mark - + +/*! + * @method notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext: + * @abstract Send a Growl notification. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * nil (or 0 or NO as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. If the user cancels, this method + * will have no effect until the next application session, at which time when + * it is called the user will be prompted again. The user is also given the + * option to not be prompted again. If the user does choose to install Growl, + * the requested notification will be displayed once Growl is installed and + * running. + * + * @param title The title of the notification displayed to the user. + * @param description The full description of the notification displayed to the user. + * @param notifName The internal name of the notification. Should be human-readable, as it will be displayed in the Growl preference pane. + * @param iconData NSData object to show with the notification as its icon. If nil, the application's icon will be used instead. + * @param priority The priority of the notification. The default value is 0; positive values are higher priority and negative values are lower priority. Not all Growl displays support priority. + * @param isSticky If YES, the notification will remain on screen until clicked. Not all Growl displays support sticky notifications. + * @param clickContext A context passed back to the Growl delegate if it implements -(void)growlNotificationWasClicked: and the notification is clicked. Not all display plugins support clicking. The clickContext must be plist-encodable (completely of NSString, NSArray, NSNumber, NSDictionary, and NSData types). + */ ++ (void) notifyWithTitle:(NSString *)title + description:(NSString *)description + notificationName:(NSString *)notifName + iconData:(NSData *)iconData + priority:(signed int)priority + isSticky:(BOOL)isSticky + clickContext:(id)clickContext; + +/*! + * @method notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:identifier: + * @abstract Send a Growl notification. + * @discussion This is the preferred means for sending a Growl notification. + * The notification name and at least one of the title and description are + * required (all three are preferred). All other parameters may be + * nil (or 0 or NO as appropriate) to accept default values. + * + * If using the Growl-WithInstaller framework, if Growl is not installed the + * user will be prompted to install Growl. If the user cancels, this method + * will have no effect until the next application session, at which time when + * it is called the user will be prompted again. The user is also given the + * option to not be prompted again. If the user does choose to install Growl, + * the requested notification will be displayed once Growl is installed and + * running. + * + * @param title The title of the notification displayed to the user. + * @param description The full description of the notification displayed to the user. + * @param notifName The internal name of the notification. Should be human-readable, as it will be displayed in the Growl preference pane. + * @param iconData NSData object to show with the notification as its icon. If nil, the application's icon will be used instead. + * @param priority The priority of the notification. The default value is 0; positive values are higher priority and negative values are lower priority. Not all Growl displays support priority. + * @param isSticky If YES, the notification will remain on screen until clicked. Not all Growl displays support sticky notifications. + * @param clickContext A context passed back to the Growl delegate if it implements -(void)growlNotificationWasClicked: and the notification is clicked. Not all display plugins support clicking. The clickContext must be plist-encodable (completely of NSString, NSArray, NSNumber, NSDictionary, and NSData types). + * @param identifier An identifier for this notification. Notifications with equal identifiers are coalesced. + */ ++ (void) notifyWithTitle:(NSString *)title + description:(NSString *)description + notificationName:(NSString *)notifName + iconData:(NSData *)iconData + priority:(signed int)priority + isSticky:(BOOL)isSticky + clickContext:(id)clickContext + identifier:(NSString *)identifier; + +/*! @method notifyWithDictionary: + * @abstract Notifies using a userInfo dictionary suitable for passing to + * NSDistributedNotificationCenter. + * @param userInfo The dictionary to notify with. + * @discussion Before Growl 0.6, your application would have posted + * notifications using NSDistributedNotificationCenter by + * creating a userInfo dictionary with the notification data. This had the + * advantage of allowing you to add other data to the dictionary for programs + * besides Growl that might be listening. + * + * This method allows you to use such dictionaries without being restricted + * to using NSDistributedNotificationCenter. The keys for this dictionary + * can be found in GrowlDefines.h. + */ ++ (void) notifyWithDictionary:(NSDictionary *)userInfo; + +#pragma mark - + +/*! @method registerWithDictionary: + * @abstract Register your application with Growl without setting a delegate. + * @discussion When you call this method with a dictionary, + * GrowlApplicationBridge registers your application using that dictionary. + * If you pass nil, GrowlApplicationBridge will ask the delegate + * (if there is one) for a dictionary, and if that doesn't work, it will look + * in your application's bundle for an auto-discoverable plist. + * (XXX refer to more information on that) + * + * If you pass a dictionary to this method, it must include the + * GROWL_APP_NAME key, unless a delegate is set. + * + * This method is mainly an alternative to the delegate system introduced + * with Growl 0.6. Without a delegate, you cannot receive callbacks such as + * -growlIsReady (since they are sent to the delegate). You can, + * however, set a delegate after registering without one. + * + * This method was introduced in Growl.framework 0.7. + */ ++ (BOOL) registerWithDictionary:(NSDictionary *)regDict; + +/*! @method reregisterGrowlNotifications + * @abstract Reregister the notifications for this application. + * @discussion This method does not normally need to be called. If your + * application changes what notifications it is registering with Growl, call + * this method to have the Growl delegate's + * -registrationDictionaryForGrowl method called again and the + * Growl registration information updated. + * + * This method is now implemented using -registerWithDictionary:. + */ ++ (void) reregisterGrowlNotifications; + +#pragma mark - + +/*! @method setWillRegisterWhenGrowlIsReady: + * @abstract Tells GrowlApplicationBridge to register with Growl when Growl + * launches (or not). + * @discussion When Growl has started listening for notifications, it posts a + * GROWL_IS_READY notification on the Distributed Notification + * Center. GrowlApplicationBridge listens for this notification, using it to + * perform various tasks (such as calling your delegate's + * -growlIsReady method, if it has one). If this method is + * called with YES, one of those tasks will be to reregister + * with Growl (in the manner of -reregisterGrowlNotifications). + * + * This attribute is automatically set back to NO (the default) + * after every GROWL_IS_READY notification. + * @param flag YES if you want GrowlApplicationBridge to register with + * Growl when next it is ready; NO if not. + */ ++ (void) setWillRegisterWhenGrowlIsReady:(BOOL)flag; +/*! @method willRegisterWhenGrowlIsReady + * @abstract Reports whether GrowlApplicationBridge will register with Growl + * when Growl next launches. + * @result YES if GrowlApplicationBridge will register with Growl + * when next it posts GROWL_IS_READY; NO if not. + */ ++ (BOOL) willRegisterWhenGrowlIsReady; + +#pragma mark - + +/*! @method registrationDictionaryFromDelegate + * @abstract Asks the delegate for a registration dictionary. + * @discussion If no delegate is set, or if the delegate's + * -registrationDictionaryForGrowl method returns + * nil, this method returns nil. + * + * This method does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:] or + * +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:restrictToKeys:] to try + * to fill in missing keys. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) registrationDictionaryFromDelegate; + +/*! @method registrationDictionaryFromBundle: + * @abstract Looks in a bundle for a registration dictionary. + * @discussion This method looks in a bundle for an auto-discoverable + * registration dictionary file using -[NSBundle + * pathForResource:ofType:]. If it finds one, it loads the file using + * +[NSDictionary dictionaryWithContentsOfFile:] and returns the + * result. + * + * If you pass nil as the bundle, the main bundle is examined. + * + * This method does not attempt to clean up the dictionary in any way - for + * example, if it is missing the GROWL_APP_NAME key, the result + * will be missing it too. Use +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:] or + * +[GrowlApplicationBridge + * registrationDictionaryByFillingInDictionary:restrictToKeys:] to try + * to fill in missing keys. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) registrationDictionaryFromBundle:(NSBundle *)bundle; + +/*! @method bestRegistrationDictionary + * @abstract Obtains a registration dictionary, filled out to the best of + * GrowlApplicationBridge's knowledge. + * @discussion This method creates a registration dictionary as best + * GrowlApplicationBridge knows how. + * + * First, GrowlApplicationBridge contacts the Growl delegate (if there is + * one) and gets the registration dictionary from that. If no such dictionary + * was obtained, GrowlApplicationBridge looks in your application's main + * bundle for an auto-discoverable registration dictionary file. If that + * doesn't exist either, this method returns nil. + * + * Second, GrowlApplicationBridge calls + * +registrationDictionaryByFillingInDictionary: with whatever + * dictionary was obtained. The result of that method is the result of this + * method. + * + * GrowlApplicationBridge uses this method when you call + * +setGrowlDelegate:, or when you call + * +registerWithDictionary: with nil. + * + * This method was introduced in Growl.framework 0.7. + * @result A registration dictionary. + */ ++ (NSDictionary *) bestRegistrationDictionary; + +#pragma mark - + +/*! @method registrationDictionaryByFillingInDictionary: + * @abstract Tries to fill in missing keys in a registration dictionary. + * @discussion This method examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Keys are only filled in if missing; if a key is present in the dictionary, + * its value will not be changed. + * + * This method was introduced in Growl.framework 0.7. + * @param regDict The dictionary to fill in. + * @result The dictionary with the keys filled in. This is an autoreleased + * copy of regDict. + */ ++ (NSDictionary *) registrationDictionaryByFillingInDictionary:(NSDictionary *)regDict; +/*! @method registrationDictionaryByFillingInDictionary:restrictToKeys: + * @abstract Tries to fill in missing keys in a registration dictionary. + * @discussion This method examines the passed-in dictionary for missing keys, + * and tries to work out correct values for them. As of 0.7, it uses: + * + * Key Value + * --- ----- + * GROWL_APP_NAME CFBundleExecutableName + * GROWL_APP_ICON The icon of the application. + * GROWL_APP_LOCATION The location of the application. + * GROWL_NOTIFICATIONS_DEFAULT GROWL_NOTIFICATIONS_ALL + * + * Only those keys that are listed in keys will be filled in. + * Other missing keys are ignored. Also, keys are only filled in if missing; + * if a key is present in the dictionary, its value will not be changed. + * + * This method was introduced in Growl.framework 0.7. + * @param regDict The dictionary to fill in. + * @param keys The keys to fill in. If nil, any missing keys are filled in. + * @result The dictionary with the keys filled in. This is an autoreleased + * copy of regDict. + */ ++ (NSDictionary *) registrationDictionaryByFillingInDictionary:(NSDictionary *)regDict restrictToKeys:(NSSet *)keys; + +/*! @brief Tries to fill in missing keys in a notification dictionary. + * @param notifDict The dictionary to fill in. + * @return The dictionary with the keys filled in. This will be a separate instance from \a notifDict. + * @discussion This function examines the \a notifDict for missing keys, and + * tries to get them from the last known registration dictionary. As of 1.1, + * the keys that it will look for are: + * + * \li GROWL_APP_NAME + * \li GROWL_APP_ICON + * + * @since Growl.framework 1.1 + */ ++ (NSDictionary *) notificationDictionaryByFillingInDictionary:(NSDictionary *)regDict; + ++ (NSDictionary *) frameworkInfoDictionary; + at end + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @protocol GrowlApplicationBridgeDelegate + * @abstract Required protocol for the Growl delegate. + * @discussion The methods in this protocol are required and are called + * automatically as needed by GrowlApplicationBridge. See + * +[GrowlApplicationBridge setGrowlDelegate:]. + * See also GrowlApplicationBridgeDelegate_InformalProtocol. + */ + + at protocol GrowlApplicationBridgeDelegate + +// -registrationDictionaryForGrowl has moved to the informal protocol as of 0.7. + + at end + +//------------------------------------------------------------------------------ +#pragma mark - + +/*! + * @category NSObject(GrowlApplicationBridgeDelegate_InformalProtocol) + * @abstract Methods which may be optionally implemented by the GrowlDelegate. + * @discussion The methods in this informal protocol will only be called if implemented by the delegate. + */ + at interface NSObject (GrowlApplicationBridgeDelegate_InformalProtocol) + +/*! + * @method registrationDictionaryForGrowl + * @abstract Return the dictionary used to register this application with Growl. + * @discussion The returned dictionary gives Growl the complete list of + * notifications this application will ever send, and it also specifies which + * notifications should be enabled by default. Each is specified by an array + * of NSString objects. + * + * For most applications, these two arrays can be the same (if all sent + * notifications should be displayed by default). + * + * The NSString objects of these arrays will correspond to the + * notificationName: parameter passed in + * +[GrowlApplicationBridge + * notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:] calls. + * + * The dictionary should have the required key object pairs: + * key: GROWL_NOTIFICATIONS_ALL object: NSArray of NSString objects + * key: GROWL_NOTIFICATIONS_DEFAULT object: NSArray of NSString objects + * + * The dictionary may have the following key object pairs: + * key: GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES object: NSDictionary of key: notification name object: human-readable notification name + * + * You do not need to implement this method if you have an auto-discoverable + * plist file in your app bundle. (XXX refer to more information on that) + * + * @result The NSDictionary to use for registration. + */ +- (NSDictionary *) registrationDictionaryForGrowl; + +/*! + * @method applicationNameForGrowl + * @abstract Return the name of this application which will be used for Growl bookkeeping. + * @discussion This name is used both internally and in the Growl preferences. + * + * This should remain stable between different versions and incarnations of + * your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + * + * You do not need to implement this method if you are providing the + * application name elsewhere, meaning in an auto-discoverable plist file in + * your app bundle (XXX refer to more information on that) or in the result + * of -registrationDictionaryForGrowl. + * + * @result The name of the application using Growl. + */ +- (NSString *) applicationNameForGrowl; + +/*! + * @method applicationIconForGrowl + * @abstract Return the NSImage to treat as the application icon. + * @discussion The delegate may optionally return an NSImage + * object to use as the application icon. If this method is not implemented, + * {{{-applicationIconDataForGrowl}}} is tried. If that method is not + * implemented, the application's own icon is used. Neither method is + * generally needed. + * @result The NSImage to treat as the application icon. + */ +- (NSImage *) applicationIconForGrowl; + +/*! + * @method applicationIconDataForGrowl + * @abstract Return the NSData to treat as the application icon. + * @discussion The delegate may optionally return an NSData + * object to use as the application icon; if this is not implemented, the + * application's own icon is used. This is not generally needed. + * @result The NSData to treat as the application icon. + * @deprecated In version 1.1, in favor of {{{-applicationIconForGrowl}}}. + */ +- (NSData *) applicationIconDataForGrowl; + +/*! + * @method growlIsReady + * @abstract Informs the delegate that Growl has launched. + * @discussion Informs the delegate that Growl (specifically, the + * GrowlHelperApp) was launched successfully. The application can take actions + * with the knowledge that Growl is installed and functional. + */ +- (void) growlIsReady; + +/*! + * @method growlNotificationWasClicked: + * @abstract Informs the delegate that a Growl notification was clicked. + * @discussion Informs the delegate that a Growl notification was clicked. It + * is only sent for notifications sent with a non-nil + * clickContext, so if you want to receive a message when a notification is + * clicked, clickContext must not be nil when calling + * +[GrowlApplicationBridge notifyWithTitle: description:notificationName:iconData:priority:isSticky:clickContext:]. + * @param clickContext The clickContext passed when displaying the notification originally via +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:]. + */ +- (void) growlNotificationWasClicked:(id)clickContext; + +/*! + * @method growlNotificationTimedOut: + * @abstract Informs the delegate that a Growl notification timed out. + * @discussion Informs the delegate that a Growl notification timed out. It + * is only sent for notifications sent with a non-nil + * clickContext, so if you want to receive a message when a notification is + * clicked, clickContext must not be nil when calling + * +[GrowlApplicationBridge notifyWithTitle: description:notificationName:iconData:priority:isSticky:clickContext:]. + * @param clickContext The clickContext passed when displaying the notification originally via +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:]. + */ +- (void) growlNotificationTimedOut:(id)clickContext; + + at end + +#pragma mark - +/*! + * @category NSObject(GrowlApplicationBridgeDelegate_Installation_InformalProtocol) + * @abstract Methods which may be optionally implemented by the Growl delegate when used with Growl-WithInstaller.framework. + * @discussion The methods in this informal protocol will only be called if + * implemented by the delegate. They allow greater control of the information + * presented to the user when installing or upgrading Growl from within your + * application when using Growl-WithInstaller.framework. + */ + at interface NSObject (GrowlApplicationBridgeDelegate_Installation_InformalProtocol) + +/*! + * @method growlInstallationWindowTitle + * @abstract Return the title of the installation window. + * @discussion If not implemented, Growl will use a default, localized title. + * @result An NSString object to use as the title. + */ +- (NSString *)growlInstallationWindowTitle; + +/*! + * @method growlUpdateWindowTitle + * @abstract Return the title of the upgrade window. + * @discussion If not implemented, Growl will use a default, localized title. + * @result An NSString object to use as the title. + */ +- (NSString *)growlUpdateWindowTitle; + +/*! + * @method growlInstallationInformation + * @abstract Return the information to display when installing. + * @discussion This information may be as long or short as desired (the window + * will be sized to fit it). It will be displayed to the user as an + * explanation of what Growl is and what it can do in your application. It + * should probably note that no download is required to install. + * + * If this is not implemented, Growl will use a default, localized explanation. + * @result An NSAttributedString object to display. + */ +- (NSAttributedString *)growlInstallationInformation; + +/*! + * @method growlUpdateInformation + * @abstract Return the information to display when upgrading. + * @discussion This information may be as long or short as desired (the window + * will be sized to fit it). It will be displayed to the user as an + * explanation that an updated version of Growl is included in your + * application and no download is required. + * + * If this is not implemented, Growl will use a default, localized explanation. + * @result An NSAttributedString object to display. + */ +- (NSAttributedString *)growlUpdateInformation; + + at end + +//private + at interface GrowlApplicationBridge (GrowlInstallationPrompt_private) ++ (void) _userChoseNotToInstallGrowl; + at end + +#endif /* __GrowlApplicationBridge_h__ */ Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlDefines.h =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlDefines.h (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Headers/GrowlDefines.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,348 @@ +// +// GrowlDefines.h +// + +#ifndef _GROWLDEFINES_H +#define _GROWLDEFINES_H + +#ifdef __OBJC__ +#define XSTR(x) (@x) +#define STRING_TYPE NSString * +#else +#define XSTR CFSTR +#define STRING_TYPE CFStringRef +#endif + +/*! @header GrowlDefines.h + * @abstract Defines all the notification keys. + * @discussion Defines all the keys used for registration with Growl and for + * Growl notifications. + * + * Most applications should use the functions or methods of Growl.framework + * instead of posting notifications such as those described here. + * @updated 2004-01-25 + */ + +// UserInfo Keys for Registration +#pragma mark UserInfo Keys for Registration + +/*! @group Registration userInfo keys */ +/* @abstract Keys for the userInfo dictionary of a GROWL_APP_REGISTRATION distributed notification. + * @discussion The values of these keys describe the application and the + * notifications it may post. + * + * Your application must register with Growl before it can post Growl + * notifications (and have them not be ignored). However, as of Growl 0.6, + * posting GROWL_APP_REGISTRATION notifications directly is no longer the + * preferred way to register your application. Your application should instead + * use Growl.framework's delegate system. + * See +[GrowlApplicationBridge setGrowlDelegate:] or Growl_SetDelegate for + * more information. + */ + +/*! @defined GROWL_APP_NAME + * @abstract The name of your application. + * @discussion The name of your application. This should remain stable between + * different versions and incarnations of your application. + * For example, "SurfWriter" is a good app name, whereas "SurfWriter 2.0" and + * "SurfWriter Lite" are not. + */ +#define GROWL_APP_NAME XSTR("ApplicationName") +/*! @defined GROWL_APP_ID + * @abstract The bundle identifier of your application. + * @discussion The bundle identifier of your application. This key should + * be unique for your application while there may be several applications + * with the same GROWL_APP_NAME. + * This key is optional. + */ +#define GROWL_APP_ID XSTR("ApplicationId") +/*! @defined GROWL_APP_ICON + * @abstract The image data for your application's icon. + * @discussion Image data representing your application's icon. This may be + * superimposed on a notification icon as a badge, used as the notification + * icon when a notification-specific icon is not supplied, or ignored + * altogether, depending on the display. Must be in a format supported by + * NSImage, such as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_APP_ICON XSTR("ApplicationIcon") +/*! @defined GROWL_NOTIFICATIONS_DEFAULT + * @abstract The array of notifications to turn on by default. + * @discussion These are the names of the notifications that should be enabled + * by default when your application registers for the first time. If your + * application reregisters, Growl will look here for any new notification + * names found in GROWL_NOTIFICATIONS_ALL, but ignore any others. + */ +#define GROWL_NOTIFICATIONS_DEFAULT XSTR("DefaultNotifications") +/*! @defined GROWL_NOTIFICATIONS_ALL + * @abstract The array of all notifications your application can send. + * @discussion These are the names of all of the notifications that your + * application may post. See GROWL_NOTIFICATION_NAME for a discussion of good + * notification names. + */ +#define GROWL_NOTIFICATIONS_ALL XSTR("AllNotifications") +/*! @defined GROWL_NOTIFICATIONS_HUMAN_READABLE_DESCRIPTIONS + * @abstract A dictionary of human-readable names for your notifications. + * @discussion By default, the Growl UI will display notifications by the names given in GROWL_NOTIFICATIONS_ALL + * which correspond to the GROWL_NOTIFICATION_NAME. This dictionary specifies the human-readable name to display. + * The keys of the dictionary are GROWL_NOTIFICATION_NAME strings; the objects are the human-readable versions. + * For any GROWL_NOTIFICATION_NAME not specific in this dictionary, the GROWL_NOTIFICATION_NAME will be displayed. + * + * This key is optional. + */ +#define GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES XSTR("HumanReadableNames") +/*! @defined GROWL_NOTIFICATIONS_DESCRIPTIONS +* @abstract A dictionary of descriptions of _when_ each notification occurs +* @discussion This is an NSDictionary whose keys are GROWL_NOTIFICATION_NAME strings and whose objects are +* descriptions of _when_ each notification occurs, such as "You received a new mail message" or +* "A file finished downloading". +* +* This key is optional. +*/ +#define GROWL_NOTIFICATIONS_DESCRIPTIONS XSTR("NotificationDescriptions") + +/*! @defined GROWL_TICKET_VERSION + * @abstract The version of your registration ticket. + * @discussion Include this key in a ticket plist file that you put in your + * application bundle for auto-discovery. The current ticket version is 1. + */ +#define GROWL_TICKET_VERSION XSTR("TicketVersion") +// UserInfo Keys for Notifications +#pragma mark UserInfo Keys for Notifications + +/*! @group Notification userInfo keys */ +/* @abstract Keys for the userInfo dictionary of a GROWL_NOTIFICATION distributed notification. + * @discussion The values of these keys describe the content of a Growl + * notification. + * + * Not all of these keys are supported by all displays. Only the name, title, + * and description of a notification are universal. Most of the built-in + * displays do support all of these keys, and most other visual displays + * probably will also. But, as of 0.6, the Log, MailMe, and Speech displays + * support only textual data. + */ + +/*! @defined GROWL_NOTIFICATION_NAME + * @abstract The name of the notification. + * @discussion The name of the notification. Note that if you do not define + * GROWL_NOTIFICATIONS_HUMAN_READABLE_NAMES when registering your ticket originally this name + * will the one displayed within the Growl preference pane and should be human-readable. + */ +#define GROWL_NOTIFICATION_NAME XSTR("NotificationName") +/*! @defined GROWL_NOTIFICATION_TITLE + * @abstract The title to display in the notification. + * @discussion The title of the notification. Should be very brief. + * The title usually says what happened, e.g. "Download complete". + */ +#define GROWL_NOTIFICATION_TITLE XSTR("NotificationTitle") +/*! @defined GROWL_NOTIFICATION_DESCRIPTION + * @abstract The description to display in the notification. + * @discussion The description should be longer and more verbose than the title. + * The description usually tells the subject of the action, + * e.g. "Growl-0.6.dmg downloaded in 5.02 minutes". + */ +#define GROWL_NOTIFICATION_DESCRIPTION XSTR("NotificationDescription") +/*! @defined GROWL_NOTIFICATION_ICON + * @discussion Image data for the notification icon. Must be in a format + * supported by NSImage, such as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_ICON XSTR("NotificationIcon") +/*! @defined GROWL_NOTIFICATION_APP_ICON + * @discussion Image data for the application icon, in case GROWL_APP_ICON does + * not apply for some reason. Must be in a format supported by NSImage, such + * as TIFF, PNG, GIF, JPEG, BMP, PICT, or PDF. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_APP_ICON XSTR("NotificationAppIcon") +/*! @defined GROWL_NOTIFICATION_PRIORITY + * @discussion The priority of the notification as an integer number from + * -2 to +2 (+2 being highest). + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_PRIORITY XSTR("NotificationPriority") +/*! @defined GROWL_NOTIFICATION_STICKY + * @discussion A Boolean number controlling whether the notification is sticky. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_STICKY XSTR("NotificationSticky") +/*! @defined GROWL_NOTIFICATION_CLICK_CONTEXT + * @abstract Identifies which notification was clicked. + * @discussion An identifier for the notification for clicking purposes. + * + * This will be passed back to the application when the notification is + * clicked. It must be plist-encodable (a data, dictionary, array, number, or + * string object), and it should be unique for each notification you post. + * A good click context would be a UUID string returned by NSProcessInfo or + * CFUUID. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_CLICK_CONTEXT XSTR("NotificationClickContext") + +/*! @defined GROWL_DISPLAY_PLUGIN + * @discussion The name of a display plugin which should be used for this notification. + * Optional. If this key is not set or the specified display plugin does not + * exist, the display plugin stored in the application ticket is used. This key + * allows applications to use different default display plugins for their + * notifications. The user can still override those settings in the preference + * pane. + */ +#define GROWL_DISPLAY_PLUGIN XSTR("NotificationDisplayPlugin") + +/*! @defined GROWL_NOTIFICATION_IDENTIFIER + * @abstract An identifier for the notification for coalescing purposes. + * Notifications with the same identifier fall into the same class; only + * the last notification of a class is displayed on the screen. If a + * notification of the same class is currently being displayed, it is + * replaced by this notification. + * + * Optional. Not supported by all display plugins. + */ +#define GROWL_NOTIFICATION_IDENTIFIER XSTR("GrowlNotificationIdentifier") + +/*! @defined GROWL_APP_PID + * @abstract The process identifier of the process which sends this + * notification. If this field is set, the application will only receive + * clicked and timed out notifications which originate from this process. + * + * Optional. + */ +#define GROWL_APP_PID XSTR("ApplicationPID") + +/*! @defined GROWL_NOTIFICATION_PROGRESS +* @abstract If this key is set, it should contain a double value wrapped +* in a NSNumber which describes some sort of progress (from 0.0 to 100.0). +* If this is key is not set, no progress bar is shown. +* +* Optional. Not supported by all display plugins. +*/ +#define GROWL_NOTIFICATION_PROGRESS XSTR("NotificationProgress") + +// Notifications +#pragma mark Notifications + +/*! @group Notification names */ +/* @abstract Names of distributed notifications used by Growl. + * @discussion These are notifications used by applications (directly or + * indirectly) to interact with Growl, and by Growl for interaction between + * its components. + * + * Most of these should no longer be used in Growl 0.6 and later, in favor of + * Growl.framework's GrowlApplicationBridge APIs. + */ + +/*! @defined GROWL_APP_REGISTRATION + * @abstract The distributed notification for registering your application. + * @discussion This is the name of the distributed notification that can be + * used to register applications with Growl. + * + * The userInfo dictionary for this notification can contain these keys: + *
    + *
  • GROWL_APP_NAME
    • + *
  • GROWL_APP_ICON
    • + *
  • GROWL_NOTIFICATIONS_ALL
    • + *
  • GROWL_NOTIFICATIONS_DEFAULT
    • + *
+ * + * No longer recommended as of Growl 0.6. An alternate method of registering + * is to use Growl.framework's delegate system. + * See +[GrowlApplicationBridge setGrowlDelegate:] or Growl_SetDelegate for + * more information. + */ +#define GROWL_APP_REGISTRATION XSTR("GrowlApplicationRegistrationNotification") +/*! @defined GROWL_APP_REGISTRATION_CONF + * @abstract The distributed notification for confirming registration. + * @discussion The name of the distributed notification sent to confirm the + * registration. Used by the Growl preference pane. Your application probably + * does not need to use this notification. + */ +#define GROWL_APP_REGISTRATION_CONF XSTR("GrowlApplicationRegistrationConfirmationNotification") +/*! @defined GROWL_NOTIFICATION + * @abstract The distributed notification for Growl notifications. + * @discussion This is what it all comes down to. This is the name of the + * distributed notification that your application posts to actually send a + * Growl notification. + * + * The userInfo dictionary for this notification can contain these keys: + *
    + *
  • GROWL_NOTIFICATION_NAME (required)
    • + *
  • GROWL_NOTIFICATION_TITLE (required)
    • + *
  • GROWL_NOTIFICATION_DESCRIPTION (required)
    • + *
  • GROWL_NOTIFICATION_ICON
    • + *
  • GROWL_NOTIFICATION_APP_ICON
    • + *
  • GROWL_NOTIFICATION_PRIORITY
    • + *
  • GROWL_NOTIFICATION_STICKY
    • + *
  • GROWL_NOTIFICATION_CLICK_CONTEXT
    • + *
  • GROWL_APP_NAME (required)
    • + *
+ * + * No longer recommended as of Growl 0.6. Three alternate methods of posting + * notifications are +[GrowlApplicationBridge notifyWithTitle:description:notificationName:iconData:priority:isSticky:clickContext:], + * Growl_NotifyWithTitleDescriptionNameIconPriorityStickyClickContext, and + * Growl_PostNotification. + */ +#define GROWL_NOTIFICATION XSTR("GrowlNotification") +/*! @defined GROWL_SHUTDOWN +* @abstract The distributed notification name that tells Growl to shutdown. +* @discussion The Growl preference pane posts this notification when the +* "Stop Growl" button is clicked. +*/ +#define GROWL_SHUTDOWN XSTR("GrowlShutdown") +/*! @defined GROWL_PING + * @abstract A distributed notification to check whether Growl is running. + * @discussion This is used by the Growl preference pane. If it receives a + * GROWL_PONG, the preference pane takes this to mean that Growl is running. + */ +#define GROWL_PING XSTR("Honey, Mind Taking Out The Trash") +/*! @defined GROWL_PONG + * @abstract The distributed notification sent in reply to GROWL_PING. + * @discussion GrowlHelperApp posts this in reply to GROWL_PING. + */ +#define GROWL_PONG XSTR("What Do You Want From Me, Woman") +/*! @defined GROWL_IS_READY + * @abstract The distributed notification sent when Growl starts up. + * @discussion GrowlHelperApp posts this when it has begin listening on all of + * its sources for new notifications. GrowlApplicationBridge (in + * Growl.framework), upon receiving this notification, reregisters using the + * registration dictionary supplied by its delegate. + */ +#define GROWL_IS_READY XSTR("Lend Me Some Sugar; I Am Your Neighbor!") +/*! @defined GROWL_NOTIFICATION_CLICKED + * @abstract The distributed notification sent when a supported notification is clicked. + * @discussion When a Growl notification with a click context is clicked on by + * the user, Growl posts this distributed notification. + * The GrowlApplicationBridge responds to this notification by calling a + * callback in its delegate. + */ +#define GROWL_NOTIFICATION_CLICKED XSTR("GrowlClicked!") +#define GROWL_NOTIFICATION_TIMED_OUT XSTR("GrowlTimedOut!") + +/*! @group Other symbols */ +/* Symbols which don't fit into any of the other categories. */ + +/*! @defined GROWL_KEY_CLICKED_CONTEXT + * @abstract Used internally as the key for the clickedContext passed over DNC. + * @discussion This key is used in GROWL_NOTIFICATION_CLICKED, and contains the + * click context that was supplied in the original notification. + */ +#define GROWL_KEY_CLICKED_CONTEXT XSTR("ClickedContext") +/*! @defined GROWL_REG_DICT_EXTENSION + * @abstract The filename extension for registration dictionaries. + * @discussion The GrowlApplicationBridge in Growl.framework registers with + * Growl by creating a file with the extension of .(GROWL_REG_DICT_EXTENSION) + * and opening it in the GrowlHelperApp. This happens whether or not Growl is + * running; if it was stopped, it quits immediately without listening for + * notifications. + */ +#define GROWL_REG_DICT_EXTENSION XSTR("growlRegDict") + + +#define GROWL_POSITION_PREFERENCE_KEY @"GrowlSelectedPosition" + +#endif //ndef _GROWLDEFINES_H Added: trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Resources/Info.plist =================================================================== --- trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Resources/Info.plist (rev 0) +++ trunk/src/uimac14/Frameworks/Growl.framework/Versions/Current/Resources/Info.plist 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + Growl + CFBundleIdentifier + com.growl.growlframework + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.2.1 + CFBundleSignature + GRRR + CFBundleVersion + 1.2.1 + NSPrincipalClass + GrowlApplicationBridge + + Added: trunk/src/uimac14/ImageAndTextCell.h =================================================================== --- trunk/src/uimac14/ImageAndTextCell.h (rev 0) +++ trunk/src/uimac14/ImageAndTextCell.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,20 @@ +// +// ImageAndTextCell.h +// +// Copyright (c) 2001-2002, Apple. All rights reserved. +// + +#import + + at interface ImageAndTextCell : NSTextFieldCell { + at private + NSImage *image; +} + +- (void)setImage:(NSImage *)anImage; +- (NSImage *)image; + +- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView; +- (NSSize)cellSize; + + at end Added: trunk/src/uimac14/ImageAndTextCell.m =================================================================== --- trunk/src/uimac14/ImageAndTextCell.m (rev 0) +++ trunk/src/uimac14/ImageAndTextCell.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,131 @@ +/* + ImageAndTextCell.m + Copyright (c) 2001-2004, Apple Computer, Inc., all rights reserved. + Author: Chuck Pisula + + Milestones: + Initially created 3/1/01 + + Subclass of NSTextFieldCell which can display text and an image simultaneously. +*/ + +/* + IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in + consideration of your agreement to the following terms, and your use, installation, + modification or redistribution of this Apple software constitutes acceptance of these + terms. If you do not agree with these terms, please do not use, install, modify or + redistribute this Apple software. + + In consideration of your agreement to abide by the following terms, and subject to these + terms, Apple grants you a personal, non-exclusive license, under Apple?s copyrights in + this original Apple software (the "Apple Software"), to use, reproduce, modify and + redistribute the Apple Software, with or without modifications, in source and/or binary + forms; provided that if you redistribute the Apple Software in its entirety and without + modifications, you must retain this notice and the following text and disclaimers in all + such redistributions of the Apple Software. Neither the name, trademarks, service marks + or logos of Apple Computer, Inc. may be used to endorse or promote products derived from + the Apple Software without specific prior written permission from Apple. Except as expressly + stated in this notice, no other rights or licenses, express or implied, are granted by Apple + herein, including but not limited to any patent rights that may be infringed by your + derivative works or by other works in which the Apple Software may be incorporated. + + The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES, + EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS + USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS. + + IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, + REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND + WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR + OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#import "ImageAndTextCell.h" + + at implementation ImageAndTextCell + +- (void)dealloc { + [image release]; + image = nil; + [super dealloc]; +} + +- copyWithZone:(NSZone *)zone { + ImageAndTextCell *cell = (ImageAndTextCell *)[super copyWithZone:zone]; + cell->image = [image retain]; + return cell; +} + +- (void)setImage:(NSImage *)anImage { + if (anImage != image) { + [image release]; + image = [anImage retain]; + } +} + +- (NSImage *)image { + return image; +} + +- (NSRect)imageFrameForCellFrame:(NSRect)cellFrame { + if (image != nil) { + NSRect imageFrame; + imageFrame.size = [image size]; + imageFrame.origin = cellFrame.origin; + imageFrame.origin.x += 3; + imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2); + return imageFrame; + } + else + return NSZeroRect; +} + +- (void)editWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject event:(NSEvent *)theEvent { + NSRect textFrame, imageFrame; + NSDivideRect (aRect, &imageFrame, &textFrame, 3 + [image size].width, NSMinXEdge); + [super editWithFrame: textFrame inView: controlView editor:textObj delegate:anObject event: theEvent]; +} + +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +typedef int NSInteger; +#endif +- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength { + NSRect textFrame, imageFrame; + NSDivideRect (aRect, &imageFrame, &textFrame, 3 + [image size].width, NSMinXEdge); + [super selectWithFrame: textFrame inView: controlView editor:textObj delegate:anObject start:selStart length:selLength]; +} + +- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { + if (image != nil) { + NSSize imageSize; + NSRect imageFrame; + + imageSize = [image size]; + NSDivideRect(cellFrame, &imageFrame, &cellFrame, 3 + imageSize.width, NSMinXEdge); + if ([self drawsBackground]) { + [[self backgroundColor] set]; + NSRectFill(imageFrame); + } + imageFrame.origin.x += 3; + imageFrame.size = imageSize; + + if ([controlView isFlipped]) + imageFrame.origin.y += ceil((cellFrame.size.height + imageFrame.size.height) / 2); + else + imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2); + + [image compositeToPoint:imageFrame.origin operation:NSCompositeSourceOver]; + } + [super drawWithFrame:cellFrame inView:controlView]; +} + +- (NSSize)cellSize { + NSSize cellSize = [super cellSize]; + cellSize.width += (image ? [image size].width : 0) + 3; + return cellSize; +} + + at end + Added: trunk/src/uimac14/Info.plist =================================================================== --- trunk/src/uimac14/Info.plist (rev 0) +++ trunk/src/uimac14/Info.plist 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,32 @@ + + + + + CFBundleName + Unison + CFBundleDevelopmentRegion + English + CFBundleExecutable + Unison + CFBundleIconFile + Unison.icns + CFBundleIdentifier + edu.upenn.cis.Unison + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleGetInfoString + ${MARKETING_VERSION}, ??1999-2014, licensed under GNU GPL. + NSHumanReadableCopyright + ??1999-2014, licensed under GNU GPL v3. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + Added: trunk/src/uimac14/Info.plist.template =================================================================== --- trunk/src/uimac14/Info.plist.template (rev 0) +++ trunk/src/uimac14/Info.plist.template 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,34 @@ + + + + + CFBundleName + Unison + CFBundleDevelopmentRegion + English + CFBundleExecutable + Unison + CFBundleIconFile + Unison.icns + CFBundleIdentifier + edu.upenn.cis.Unison + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleVersion + @@VERSION@@ + CFBundleShortVersionString + @@VERSION@@ + CFBundleGetInfoString + @@VERSION@@. ??1999-2007, licensed under GNU GPL. + NSHumanReadableCopyright + ??1999-2006, licensed under GNU GPL. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + Added: trunk/src/uimac14/MyController.h =================================================================== --- trunk/src/uimac14/MyController.h (rev 0) +++ trunk/src/uimac14/MyController.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,147 @@ +/* MyController */ +/* Copyright (c) 2003, 2014, see file COPYING for details. */ + +#import + +#import "ProfileController.h" +#import "PreferencesController.h" +#import "NotificationController.h" +#import "ReconItem.h" +#import "ReconTableView.h" +#import "UnisonToolbar.h" +#import "ImageAndTextCell.h" +#import "ProgressCell.h" +#import "ColorGradientView.h" +#import "Bridge.h" + + at interface MyController : NSObject +{ + IBOutlet NSWindow *mainWindow; + UnisonToolbar *toolbar; + + IBOutlet NSWindow *cltoolWindow; + IBOutlet NSButton *cltoolPref; + + IBOutlet ProfileController *profileController; + IBOutlet NSView *chooseProfileView; + NSString *myProfile; + + IBOutlet PreferencesController *preferencesController; + IBOutlet NSView *preferencesView; + + IBOutlet NSView *updatesView; + IBOutlet NSView *ConnectingView; + IBOutlet ColorGradientView *connectingViewGradient; + + NSView *blankView; + + IBOutlet ReconTableView *tableView; + IBOutlet NSTextField *updatesText; + IBOutlet NSTextField *detailsTextView; + IBOutlet NSTextField *statusText; + IBOutlet ColorGradientView *detailsTextViewGradient; + + IBOutlet NSWindow *passwordWindow; + IBOutlet NSTextField *passwordPrompt; + IBOutlet NSTextField *passwordText; + IBOutlet NSButton *passwordCancelButton; + BOOL waitingForPassword; + + IBOutlet NSWindow *aboutWindow; + IBOutlet NSTextField *versionText; + + IBOutlet NSProgressIndicator *progressBar; + + IBOutlet NotificationController *notificationController; + + BOOL syncable; + BOOL duringSync; + BOOL afterSync; + + NSMutableArray *reconItems; + ParentReconItem *rootItem; + OCamlValue *preconn; + + BOOL doneFirstDiff; + IBOutlet NSWindow *diffWindow; + IBOutlet NSTextView *diffView; + IBOutlet NSSegmentedControl *tableModeSelector; + IBOutlet NSProgressIndicator *connectingAnimation; + + IBOutlet NSWindow *preferencesWindow; + IBOutlet NSButton* checkOpenProfile; + IBOutlet NSComboBox *profileBox; + IBOutlet NSTextField *detailsFontLabel; + IBOutlet NSTextField *diffFontLabel; + IBOutlet NSButton *chooseDetailsFont; + IBOutlet NSButton *chooseDiffFont; + + IBOutlet NSSplitView *splitView; + + id fontChangeTarget; + + BOOL isBatchSet; + NSTimer *_timer; + NSAlert *_timeoutAlert; + NSUInteger _secondsRemaining; + + BOOL shouldExitAfterWarning; +} + +- (id)init; +- (void)awakeFromNib; + +- (void)chooseProfiles; +- (IBAction)createButton:(id)sender; +- (IBAction)saveProfileButton:(id)sender; +- (IBAction)cancelProfileButton:(id)sender; +- (NSString *)profile; +- (void)profileSelected:(NSString *)aProfile; + +- (IBAction)showPreferences:(id)sender; +- (IBAction)restartButton:(id)sender; +- (IBAction)rescan:(id)sender; + +- (IBAction)openButton:(id)sender; +- (void)connect:(NSString *)profileName; +- (void)raisePasswordWindow:(NSString *)prompt; +- (void)controlTextDidEndEditing:(NSNotification *)notification; +- (IBAction)endPasswordWindow:(id)sender; +- (void)afterOpen; + +- (IBAction)syncButton:(id)sender; +- (IBAction)tableModeChanged:(id)sender; +- (void)initTableMode; + +- (NSMutableArray *)reconItems; +- (void)updateForChangedItems; +- (void)updateReconItems:(OCamlValue *)items; +- (id)updateForIgnore:(id)i; + +- (void)statusTextSet:(NSString *)s; +- (void)diffViewTextSet:(NSString *)title bodyText:(NSString *)body; +- (void)displayDetails:(ReconItem *)item; +- (void)clearDetails; + +- (IBAction)raiseCltoolWindow:(id)sender; +- (IBAction)cltoolYesButton:(id)sender; +- (IBAction)cltoolNoButton:(id)sender; + +- (IBAction)raiseAboutWindow:(id)sender; +- (IBAction)raiseWindow:(NSWindow *)theWindow; +- (IBAction)onlineHelp:(id)sender; +- (IBAction)installCommandLineTool:(id)sender; + +- (BOOL)validateItem:(SEL) action; +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem; +- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem; + +- (void)resizeWindowToSize:(NSSize)newSize; +- (float)toolbarHeightForWindow:(NSWindow *)window; + +- (IBAction) checkOpenProfileChanged:(id)sender; +- (IBAction) chooseFont:(id)sender; +- (void) updateFontDisplay; + + at end + Added: trunk/src/uimac14/MyController.m =================================================================== --- trunk/src/uimac14/MyController.m (rev 0) +++ trunk/src/uimac14/MyController.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,1227 @@ +/* Copyright (c) 2003, 2014, see file COPYING for details. */ + +#import "MyController.h" + +/* The following two define are a workaround for an incompatibility between +Ocaml 3.11.2 (and older) and the Mac OS X header files */ +#define uint64 uint64_caml +#define int64 int64_caml + +#define CAML_NAME_SPACE +#include +#include +#include +#include + + at interface NSString (_UnisonUtil) +- (NSString *)trim; + at end + + at implementation MyController + +static MyController *me; // needed by reloadTable and displayStatus, below + +// BCP (11/09): Added per Onne Gorter: +// if user closes main window, terminate app, instead of keeping an empty app around with no window +- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication { + return YES; +} + +- (id)init +{ + if (([super init])) { + + /* Initialize locals */ + me = self; + doneFirstDiff = NO; + + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: + /* By default, invite user to install cltool */ + @"YES", @"CheckCltool", + @"NO", @"openProfileAtStartup", + @"", @"profileToOpen", + @"NO", @"deleteLogOnExit", + @"", @"detailsFont", + @"", @"diffFont", + nil]; + + [defaults registerDefaults:appDefaults]; + fontChangeTarget = nil; + } + + return self; +} + +- (void) applicationWillTerminate:(NSNotification *)aNotification { + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + [defaults setObject:[NSArchiver archivedDataWithRootObject:[detailsTextView font]] forKey:@"detailsFont"]; + [defaults setObject:[NSArchiver archivedDataWithRootObject:[diffView font]] forKey:@"diffFont"]; + [defaults synchronize]; +} + +- (void)awakeFromNib +{ + [splitView setAutosaveName:@"splitView"]; + + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + NSFont *defaultFont = [NSFont fontWithName:@"Monaco" size:11]; + NSData *detailsFontData = [defaults dataForKey:@"detailsFont"]; + if (detailsFontData) { + NSFont *tmpFont = (NSFont*) [NSUnarchiver unarchiveObjectWithData:detailsFontData]; + if (tmpFont) + [detailsTextView setFont:tmpFont]; + else + [detailsTextView setFont:defaultFont]; + } else + [detailsTextView setFont:defaultFont]; + [detailsTextView.cell setBackgroundStyle:NSBackgroundStyleRaised]; + [detailsTextView.cell setBackgroundStyle:NSBackgroundStyleRaised]; + + NSColor *startColor = [NSColor colorWithCalibratedRed:0.613 green:0.665 blue:0.715 alpha:1.000]; + NSColor *endColor = [NSColor colorWithCalibratedRed:0.439 green:0.496 blue:0.548 alpha:1.000]; + + [detailsTextViewGradient setStartingColor:startColor]; + [detailsTextViewGradient setEndingColor:endColor]; + [detailsTextViewGradient setAngle:270]; + [connectingViewGradient setStartingColor:startColor]; + [connectingViewGradient setEndingColor:endColor]; + [connectingViewGradient setAngle:270]; + + NSData *diffFontData = [defaults dataForKey:@"diffFont"]; + if (diffFontData) { + NSFont *tmpFont = (NSFont*) [NSUnarchiver unarchiveObjectWithData:diffFontData]; + if (tmpFont) + [diffView setFont:tmpFont]; + else + [diffView setFont:defaultFont]; + } else + [diffView setFont:defaultFont]; + + blankView = [[NSView alloc] init]; + + /* Double clicking in the profile list will open the profile */ + [[profileController tableView] setTarget:self]; + [[profileController tableView] setDoubleAction:@selector(openButton:)]; + + [tableView setAutoresizesOutlineColumn:NO]; + + // use combo-cell for path + [[tableView tableColumnWithIdentifier:@"path"] setDataCell:[[[ImageAndTextCell alloc] init] autorelease]]; + + // Custom progress cell + ProgressCell *progressCell = [[[ProgressCell alloc] init] autorelease]; + [[tableView tableColumnWithIdentifier:@"percentTransferred"] setDataCell:progressCell]; + + /* Set up the version string in the about box. We use a custom + about box just because PRCS doesn't seem capable of getting the + version into the InfoPlist.strings file; otherwise we'd use the + standard about box. */ + [versionText setStringValue:ocamlCall("S", "unisonGetVersion")]; + + /* Command-line processing */ + OCamlValue *clprofile = (id)ocamlCall("@", "unisonInit0"); + + BOOL areRootsSet = (long)ocamlCall("i", "areRootsSet") ? YES : NO; + if (areRootsSet) { + NSLog(@"Roots are on the command line"); + } + else { + NSLog(@"Roots are not set on the command line"); + } + + /* Add toolbar */ + toolbar = [[[UnisonToolbar alloc] + initWithIdentifier: @"unisonToolbar" :self :tableView] autorelease]; + [mainWindow setToolbar: toolbar]; + [toolbar takeTableModeView:tableModeSelector]; + [self initTableMode]; + + + /* Set up the first window the user will see */ + if (clprofile) { + /* A profile name was given on the command line */ + NSString *profileName = [clprofile getField:0 withType:'S']; + [self profileSelected:profileName]; + + /* If invoked from terminal we need to bring the app to the front */ + [NSApp activateIgnoringOtherApps:YES]; + + /* Start the connection */ + [self connect:profileName]; + } + else if (areRootsSet) { + /* If invoked from terminal we need to bring the app to the front */ + [NSApp activateIgnoringOtherApps:YES]; + /* Start the connection with the empty profile name, indicating roots only */ + [self connect:@""]; + } + else { + /* If invoked from terminal we need to bring the app to the front */ + [NSApp activateIgnoringOtherApps:YES]; + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"openProfileAtStartup"]) { + NSString *profileToOpen = [[NSUserDefaults standardUserDefaults] + stringForKey:@"profileToOpen"]; + if ([[profileToOpen trim] compare:@""] != NSOrderedSame && + [[profileController getProfiles] indexOfObject:profileToOpen] != NSNotFound) { + [self profileSelected:profileToOpen]; + [self connect:profileToOpen]; + } else { + /* Bring up the dialog to choose a profile */ + [self chooseProfiles]; + } + } else { + /* Bring up the dialog to choose a profile */ + [self chooseProfiles]; + } + } + + [mainWindow display]; + [mainWindow makeKeyAndOrderFront:nil]; + + /* unless user has clicked Don't ask me again, ask about cltool */ + if ( ([[NSUserDefaults standardUserDefaults] boolForKey:@"CheckCltool"]) && + (![[NSFileManager defaultManager] + fileExistsAtPath:@"/usr/bin/unison"]) ) + [self raiseCltoolWindow:nil]; +} + +- (IBAction) checkOpenProfileChanged:(id)sender { + [profileBox setEnabled:[checkOpenProfile state]]; + if ([profileBox isEnabled] && [profileBox indexOfSelectedItem] < 0) { + [profileBox selectItemAtIndex:0]; + [[NSUserDefaults standardUserDefaults] setObject:[profileBox itemObjectValueAtIndex:0] forKey:@"profileToOpen"]; + } +} + +- (IBAction) chooseFont:(id)sender { + [[NSFontPanel sharedFontPanel] makeKeyAndOrderFront:self]; + [[NSFontManager sharedFontManager] setDelegate:self]; + fontChangeTarget = sender; +} + +- (void) changeFont:(id)sender { + NSFont *newFont = [sender convertFont:[detailsTextView font]]; + if (fontChangeTarget == chooseDetailsFont) + [detailsTextView setFont:newFont]; + else if (fontChangeTarget == chooseDiffFont) + [diffView setFont:newFont]; + [self updateFontDisplay]; +} + +- (void) updateFontDisplay { + NSFont *detailsFont = [detailsTextView font]; + NSFont *diffFont = [diffView font]; + [detailsFontLabel setStringValue:[NSString stringWithFormat:@"%@ : %d", [detailsFont displayName], (NSInteger) [detailsFont pointSize]]]; + [diffFontLabel setStringValue:[NSString stringWithFormat:@"%@ : %d", [diffFont displayName], (NSInteger) [diffFont pointSize]]]; +} + +- (void)chooseProfiles +{ + [mainWindow setContentView:blankView]; + [self resizeWindowToSize:[chooseProfileView frame].size]; + [mainWindow setContentMinSize: + NSMakeSize(NSWidth([[mainWindow contentView] frame]),150)]; + [mainWindow setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + [mainWindow setContentView:chooseProfileView]; + [toolbar setView:@"chooseProfileView"]; + [mainWindow setTitle:@"Unison"]; + + // profiles get keyboard input + [mainWindow makeFirstResponder:[profileController tableView]]; + [chooseProfileView display]; +} + +- (IBAction)createButton:(id)sender +{ + [preferencesController reset]; + [mainWindow setContentView:blankView]; + [self resizeWindowToSize:[preferencesView frame].size]; + [mainWindow setContentMinSize: + NSMakeSize(400,NSHeight([[mainWindow contentView] frame]))]; + [mainWindow setContentMaxSize: + NSMakeSize(FLT_MAX,NSHeight([[mainWindow contentView] frame]))]; + [mainWindow setContentView:preferencesView]; + [toolbar setView:@"preferencesView"]; +} + +- (IBAction)saveProfileButton:(id)sender +{ + if ([preferencesController validatePrefs]) { + // so the list contains the new profile + [profileController initProfiles]; + [self chooseProfiles]; + } +} + +- (IBAction)cancelProfileButton:(id)sender +{ + [self chooseProfiles]; +} + +/* Only valid once a profile has been selected */ +- (NSString *)profile { + return myProfile; +} + +- (void)profileSelected:(NSString *)aProfile +{ + [aProfile retain]; + [myProfile release]; + myProfile = aProfile; + [mainWindow setTitle: [NSString stringWithFormat:@"Unison: %@", myProfile]]; +} + +- (IBAction)showPreferences:(id)sender { + [profileBox removeAllItems]; + [profileBox addItemsWithObjectValues:[profileController getProfiles]]; + NSUInteger index = [[profileController getProfiles] indexOfObject: + [[NSUserDefaults standardUserDefaults] + stringForKey:@"profileToOpen"]]; + if (index == NSNotFound) { + [checkOpenProfile setState:NSOffState]; + [profileBox setStringValue:@""]; + } else + [profileBox selectItemAtIndex:index]; + + [profileBox setEnabled:[checkOpenProfile state]]; + if ([profileBox isEnabled] && [profileBox indexOfSelectedItem] < 0) + [profileBox selectItemAtIndex:0]; + + [self updateFontDisplay]; + + [self raiseWindow:preferencesWindow]; +} + +- (IBAction)restartButton:(id)sender +{ + [tableView setEditable:NO]; + [self chooseProfiles]; +} + +- (IBAction)rescan:(id)sender +{ + /* There is a delay between turning off the button and it + actually being disabled. Make sure we don't respond. */ + if ([self validateItem:@selector(rescan:)]) { + waitingForPassword = NO; + [self afterOpen]; + } +} + +- (IBAction)openButton:(id)sender +{ + NSString *profile = [profileController selected]; + [self profileSelected:profile]; + [self connect:profile]; + return; +} + +- (void)updateToolbar +{ + [toolbar validateVisibleItems]; + [tableModeSelector setEnabled:((syncable && !duringSync) || afterSync)]; + + // Why? + [updatesView setNeedsDisplay:YES]; +} + +- (void)updateTableViewWithReset:(BOOL)shouldResetSelection +{ + [tableView reloadData]; + if (shouldResetSelection) { + [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO]; + shouldResetSelection = NO; + } + [updatesView setNeedsDisplay:YES]; +} + +- (void)updateProgressBar:(NSNumber *)newProgress +{ + // NSLog(@"Updating progress bar: %i - %i", (int)[newProgress doubleValue], (int)[progressBar doubleValue]); + [progressBar incrementBy:([newProgress doubleValue] - [progressBar doubleValue])]; +} + +- (void)updateTableViewSelection +{ + int n = [tableView numberOfSelectedRows]; + if (n == 1) [self displayDetails:[tableView itemAtRow:[tableView selectedRow]]]; + else [self clearDetails]; +} + +- (void)outlineViewSelectionDidChange:(NSNotification *)note +{ + [self updateTableViewSelection]; +} + +- (void)connect:(NSString *)profileName +{ + // contact server, propagate prefs + NSLog(@"Connecting to %@...", profileName); + + // Switch to ConnectingView + [mainWindow setContentView:blankView]; + [self resizeWindowToSize:[updatesView frame].size]; + [mainWindow setContentMinSize:NSMakeSize(150,150)]; + [mainWindow setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + [mainWindow setContentView:ConnectingView]; + [toolbar setView:@"connectingView"]; + + // Update (almost) immediately + [ConnectingView display]; + [connectingAnimation startAnimation:self]; + + syncable = NO; + afterSync = NO; + + [self updateToolbar]; + + // will spawn thread on OCaml side and callback when complete + (void)ocamlCall("xS", "unisonInit1", profileName); +} + +CAMLprim value unisonInit1Complete(value v) +{ + id pool = [[NSAutoreleasePool alloc] init]; + if (v == Val_unit) { + NSLog(@"Connected."); + [me->connectingAnimation stopAnimation:me]; + [me->preconn release]; + me->preconn = NULL; + [me performSelectorOnMainThread:@selector(afterOpen:) withObject:nil waitUntilDone:FALSE]; + } else { + // prompting required + me->preconn = [[OCamlValue alloc] initWithValue:Field(v,0)]; // value of Some + [me performSelectorOnMainThread:@selector(unisonInit1Complete:) withObject:nil waitUntilDone:FALSE]; + } + [pool release]; + return Val_unit; +} + +- (void)unisonInit1Complete:(id)ignore +{ + @try { + OCamlValue *prompt = ocamlCall("@@", "openConnectionPrompt", preconn); + if (!prompt) { + // turns out, no prompt needed, but must finish opening connection + ocamlCall("x@", "openConnectionEnd", preconn); + NSLog(@"Connected."); + waitingForPassword = NO; + [self afterOpen]; + return; + } + waitingForPassword = YES; + + [self raisePasswordWindow:[prompt getField:0 withType:'S']]; + } @catch (NSException *ex) { + NSRunAlertPanel(@"Connection Error", [ex description], @"OK", nil, nil); + [self chooseProfiles]; + return; + } + + NSLog(@"Connected."); +} + +- (void)raisePasswordWindow:(NSString *)prompt +{ + // FIX: some prompts don't ask for password, need to look at it + NSLog(@"Got the prompt: '%@'",prompt); + if ((long)ocamlCall("iS", "unisonPasswordMsg", prompt)) { + [passwordPrompt setStringValue:@"Please enter your password"]; + [NSApp beginSheet:passwordWindow + modalForWindow:mainWindow + modalDelegate:nil + didEndSelector:nil + contextInfo:nil]; + return; + } + if ((long)ocamlCall("iS", "unisonPassphraseMsg", prompt)) { + [passwordPrompt setStringValue:@"Please enter your passphrase"]; + [NSApp beginSheet:passwordWindow + modalForWindow:mainWindow + modalDelegate:nil + didEndSelector:nil + contextInfo:nil]; + return; + } + if ((long)ocamlCall("iS", "unisonAuthenticityMsg", prompt)) { + int i = NSRunAlertPanel(@"New host",prompt,@"Yes",@"No",nil); + if (i == NSAlertDefaultReturn) { + ocamlCall("x at s", "openConnectionReply", preconn, "yes"); + prompt = ocamlCall("S@", "openConnectionPrompt", preconn); + if (!prompt) { + // all done with prompts, finish opening connection + ocamlCall("x@", "openConnectionEnd", preconn); + waitingForPassword = NO; + [self afterOpen]; + return; + } + else { + [self raisePasswordWindow:[NSString + stringWithUTF8String:String_val(Field(prompt,0))]]; + return; + } + } + if (i == NSAlertAlternateReturn) { + ocamlCall("x@", "openConnectionCancel", preconn); + return; + } + else { + NSLog(@"Unrecognized response '%d' from NSRunAlertPanel",i); + ocamlCall("x@", "openConnectionCancel", preconn); + return; + } + } + NSLog(@"Unrecognized message from ssh: %@",prompt); + ocamlCall("x@", "openConnectionCancel", preconn); +} + +// The password window will invoke this when Enter occurs, b/c we +// are the delegate. +- (void)controlTextDidEndEditing:(NSNotification *)notification +{ + NSNumber *reason = [[notification userInfo] objectForKey:@"NSTextMovement"]; + int code = [reason intValue]; + if (code == NSReturnTextMovement) + [self endPasswordWindow:self]; +} +// Or, the Continue button will invoke this when clicked +- (IBAction)endPasswordWindow:(id)sender +{ + [passwordWindow orderOut:self]; + [NSApp endSheet:passwordWindow]; + if ([sender isEqualTo:passwordCancelButton]) { + ocamlCall("x@", "openConnectionCancel", preconn); + [self chooseProfiles]; + return; + } + NSString *password = [passwordText stringValue]; + ocamlCall("x at S", "openConnectionReply", preconn, password); + + OCamlValue *prompt = ocamlCall("@@", "openConnectionPrompt", preconn); + if (!prompt) { + // all done with prompts, finish opening connection + ocamlCall("x@", "openConnectionEnd", preconn); + waitingForPassword = NO; + [self afterOpen]; + } + else { + [self raisePasswordWindow:[prompt getField:0 withType:'S']]; + } +} + +- (void)afterOpen:(id)ignore +{ + [self afterOpen]; +} + +- (void)afterOpen +{ + if (waitingForPassword) return; + // move to updates window after clearing it + [self updateReconItems:nil]; + [progressBar setDoubleValue:0.0]; + [progressBar stopAnimation:self]; + // [self clearDetails]; + [mainWindow setContentView:blankView]; + [self resizeWindowToSize:[updatesView frame].size]; + [mainWindow setContentMinSize: + NSMakeSize(NSWidth([[mainWindow contentView] frame]),200)]; + [mainWindow setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + [mainWindow setContentView:updatesView]; + [toolbar setView:@"updatesView"]; + + syncable = NO; + afterSync = NO; + + [tableView deselectAll:self]; + [self updateToolbar]; + [self updateProgressBar:[NSNumber numberWithDouble:0.0]]; + + // this should depend on the number of reconitems, and is now done + // in updateReconItems: + // reconItems table gets keyboard input + //[mainWindow makeFirstResponder:tableView]; + [tableView scrollRowToVisible:0]; + + [preconn release]; + preconn = nil; // so old preconn can be garbage collected + // This will run in another thread spawned in OCaml and will return immediately + // We'll get a call back to unisonInit2Complete() when it is complete + ocamlCall("x", "unisonInit2"); +} + +- (void)doSync +{ + [tableView setEditable:NO]; + syncable = NO; + duringSync = YES; + + [self updateToolbar]; + + // This will run in another thread spawned in OCaml and will return immediately + // We'll get a call back to syncComplete() when it is complete + ocamlCall("x", "unisonSynchronize"); +} + +- (IBAction)syncButton:(id)sender +{ + [self doSync]; +} + + +- (void)afterUpdate:(id)retainedReconItems +{ + // NSLog(@"In afterUpdate:..."); + [self updateReconItems:retainedReconItems]; + [retainedReconItems release]; + + [notificationController updateFinishedFor:[self profile]]; + + // label the left and right columns with the roots + NSString *leftHost = [(NSString *)ocamlCall("S", "unisonFirstRootString") trim]; + NSString *rightHost = [(NSString *)ocamlCall("S", "unisonSecondRootString") trim]; + /* + [[[tableView tableColumnWithIdentifier:@"left"] headerCell] setObjectValue:lefthost]; + [[[tableView tableColumnWithIdentifier:@"right"] headerCell] setObjectValue:rightHost]; + */ + [mainWindow setTitle: [NSString stringWithFormat:@"Unison: %@ (%@ <-> %@)", + [self profile], leftHost, rightHost]]; + + // initial sort + [tableView setSortDescriptors:[NSArray arrayWithObjects: + [[tableView tableColumnWithIdentifier:@"fileSizeString"] sortDescriptorPrototype], + [[tableView tableColumnWithIdentifier:@"path"] sortDescriptorPrototype], + nil]]; + + [self updateTableViewWithReset:([reconItems count] > 0)]; + [self updateToolbar]; + isBatchSet = (long)ocamlCall("i", "isBatchSet") ? YES : NO; + if (isBatchSet) { + NSLog(@"batch set on the command line"); + } + else { + NSLog(@"batch not set on the command line"); + } + + if (isBatchSet) { + [self doSync]; + } +} + +CAMLprim value unisonInit2Complete(value v) +{ + id pool = [[NSAutoreleasePool alloc] init]; + [me performSelectorOnMainThread:@selector(afterUpdate:) withObject:[[OCamlValue alloc] initWithValue:v] waitUntilDone:FALSE]; + [pool release]; + return Val_unit; +} + +- (void)afterSync:(id)ignore +{ + [notificationController syncFinishedFor:[self profile]]; + duringSync = NO; + afterSync = YES; + [self updateToolbar]; + + int i; + for (i = 0; i < [reconItems count]; i++) { + [[reconItems objectAtIndex:i] resetProgress]; + } + + [self updateTableViewSelection]; + + [self updateTableViewWithReset:FALSE]; +} + +- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +{ + [_timer invalidate]; + + switch (returnCode) { + case NSAlertAlternateReturn: + return; + break; + + default: + [[NSApplication sharedApplication] performSelector: @selector(terminate:) withObject: nil afterDelay: 0.0]; + break; + } +} + +- (void)updateCountdown +{ + if (_secondsRemaining == 0) { + [_timer invalidate]; + [[_timeoutAlert window] orderOut: nil]; + [self alertDidEnd: _timeoutAlert returnCode: NSAlertDefaultReturn contextInfo: nil]; + } else { + [_timeoutAlert setMessageText: [NSString stringWithFormat: @"Unison will quit in %lu seconds", _secondsRemaining]]; + _secondsRemaining--; + } +} + + +- (void)quitIfBatch:(id)ignore +{ + if (isBatchSet) { + NSLog(@"Automatically quitting because of -batch"); + _timeoutAlert = [NSAlert alertWithMessageText: @"" defaultButton: @"Quit" alternateButton: @"Cancel" otherButton: nil informativeTextWithFormat: @""]; + + _secondsRemaining = 10; + + _timer = [NSTimer scheduledTimerWithTimeInterval: 1 target: self selector: @selector(updateCountdown) userInfo: nil repeats: YES]; + + [_timeoutAlert beginSheetModalForWindow: mainWindow modalDelegate: self didEndSelector: @selector(alertDidEnd:returnCode:contextInfo:) contextInfo: NULL]; + } +} + +// TODO: (BCP, 3/2012) Note that the string literal "~/unison.log" here is wrong -- +// this is a user-settable preference (in ubase/trace.ml) and we should ask for its value. +CAMLprim value syncComplete() +{ + id pool = [[NSAutoreleasePool alloc] init]; + [me performSelectorOnMainThread:@selector(afterSync:) withObject:nil waitUntilDone:FALSE]; + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"deleteLogOnExit"]) + [[NSFileManager defaultManager] removeItemAtPath:[@"~/unison.log" stringByExpandingTildeInPath] error:nil]; + [pool release]; + + [me performSelectorOnMainThread:@selector(quitIfBatch:) withObject:nil waitUntilDone:FALSE]; + + return Val_unit; +} + +// A function called from ocaml +- (void)reloadTable:(NSNumber *)i +{ + // NSLog(@"*** ReloadTable: %i", [i intValue]); + + [[reconItems objectAtIndex:[i intValue]] resetProgress]; + [self updateTableViewWithReset:FALSE]; +} + +CAMLprim value reloadTable(value row) +{ + id pool = [[NSAutoreleasePool alloc] init]; + // NSLog(@"OCaml says... ReloadTable: %i", Int_val(row)); + NSNumber *num = [[NSNumber alloc] initWithInt:Int_val(row)]; + [me performSelectorOnMainThread:@selector(reloadTable:) withObject:num waitUntilDone:FALSE]; + [num release]; + [pool release]; + return Val_unit; +} + +- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { + if (item == nil) item = rootItem; + return [[item children] count]; +} + +- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item { + return [item isKindOfClass:[ParentReconItem class]]; +} + +- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item { + if (item == nil) item = rootItem; + return [[item children] objectAtIndex:index]; +} + +- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item { + NSString *identifier = [tableColumn identifier]; + if (item == nil) item = rootItem; + + if ([identifier isEqualToString:@"percentTransferred"] && (!duringSync && !afterSync)) return nil; + + return [item valueForKey:identifier]; +} + +static NSDictionary *_SmallGreyAttributes = nil; + +- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(NSCell *)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item { + NSString *identifier = [tableColumn identifier]; + if ([identifier isEqualToString:@"path"]) { + // The file icon + [(ImageAndTextCell*)cell setImage:[item fileIcon]]; + + // For parents, format the file count into the text + long fileCount = [item fileCount]; + if (fileCount > 1) { + NSString *countString = [NSString stringWithFormat:@" (%ld files)", fileCount]; + NSString *fullString = [(NSString *)[cell objectValue] stringByAppendingString:countString]; + NSMutableAttributedString *as = [[NSMutableAttributedString alloc] initWithString:fullString]; + + if (!_SmallGreyAttributes) { + NSColor *txtColor = [NSColor grayColor]; + NSFont *txtFont = [NSFont systemFontOfSize:9.0]; + _SmallGreyAttributes = [[NSDictionary dictionaryWithObjectsAndKeys:txtFont, + NSFontAttributeName, txtColor, NSForegroundColorAttributeName, nil] retain]; + } + [as setAttributes:_SmallGreyAttributes range:NSMakeRange([fullString length] - [countString length], [countString length])]; + [cell setAttributedStringValue:as]; + [as release]; + } + } else if ([identifier isEqualToString:@"percentTransferred"]) { + [(ProgressCell*)cell setIcon:[item direction]]; + [(ProgressCell*)cell setStatusString:[item progressString]]; + [(ProgressCell*)cell setIsActive:[item isKindOfClass:[LeafReconItem class]]]; + } +} + +- (void)outlineView:(NSOutlineView *)outlineView + sortDescriptorsDidChange:(NSArray *)oldDescriptors { + NSArray *originalSelection = [outlineView selectedObjects]; + + // do we want to catch case of object changes to allow resort in same direction for progress / direction? + // Could check if our objects change and if the first item at the head of new and old were the same + [rootItem sortUsingDescriptors:[outlineView sortDescriptors]]; + [outlineView reloadData]; + [outlineView setSelectedObjects:originalSelection]; +} + +// Delegate methods + +- (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item { + return NO; +} + +- (NSMutableArray *)reconItems // used in ReconTableView only +{ + return reconItems; +} + +- (int)tableMode +{ + return [tableModeSelector selectedSegment]; +} + +- (IBAction)tableModeChanged:(id)sender +{ + [[NSUserDefaults standardUserDefaults] setInteger:[self tableMode]+1 forKey:@"TableLayout"]; + [self updateForChangedItems]; +} + +- (void)initTableMode +{ + int mode = [[NSUserDefaults standardUserDefaults] integerForKey:@"TableLayout"] - 1; + if (mode == -1) mode = 1; + [tableModeSelector setSelectedSegment:mode]; +} + +- (void)updateReconItems:(OCamlValue *)caml_reconItems +{ + [reconItems release]; + reconItems = [[NSMutableArray alloc] init]; + long i, n =[caml_reconItems count]; + for (i=0; i0) { + [tableView setEditable:YES]; + + // reconItems table gets keyboard input + [mainWindow makeFirstResponder:tableView]; + + syncable = YES; + } + else { + [tableView setEditable:NO]; + afterSync = YES; // rescan should be enabled + + // reconItems table no longer gets keyboard input + [mainWindow makeFirstResponder:nil]; + } + [self updateToolbar]; +} + +- (id)updateForIgnore:(id)item +{ + long j = (long)ocamlCall("ii", "unisonUpdateForIgnore", [reconItems indexOfObjectIdenticalTo:item]); + NSLog(@"Updating for ignore..."); + [self updateReconItems:(OCamlValue *)ocamlCall("@", "unisonState")]; + return [reconItems objectAtIndex:j]; +} + +// A function called from ocaml +CAMLprim value displayStatus(value s) +{ + id pool = [[NSAutoreleasePool alloc] init]; + NSString *str = [[NSString alloc] initWithUTF8String:String_val(s)]; + // NSLog(@"displayStatus: %@", str); + [me performSelectorOnMainThread:@selector(statusTextSet:) withObject:str waitUntilDone:FALSE]; + [str release]; + [pool release]; + return Val_unit; +} + +- (void)statusTextSet:(NSString *)s { + /* filter out strings with # reconitems, and empty strings */ + if (!NSEqualRanges([s rangeOfString:@"reconitems"], + NSMakeRange(NSNotFound,0))) return; + [statusText setStringValue:s]; +} + +// Called from ocaml to dislpay progress bar +CAMLprim value displayGlobalProgress(value p) +{ + id pool = [[NSAutoreleasePool alloc] init]; + NSNumber *num = [[NSNumber alloc] initWithDouble:Double_val(p)]; + [me performSelectorOnMainThread:@selector(updateProgressBar:) + withObject:num waitUntilDone:FALSE]; + [num release]; + [pool release]; + return Val_unit; +} + +// Called from ocaml to display diff +CAMLprim value displayDiff(value s, value s2) +{ + id pool = [[NSAutoreleasePool alloc] init]; + [me performSelectorOnMainThread:@selector(diffViewTextSet:) + withObject:[NSArray arrayWithObjects:[NSString stringWithUTF8String:String_val(s)], + [NSString stringWithUTF8String:String_val(s2)], nil] + waitUntilDone:FALSE]; + [pool release]; + return Val_unit; +} + +// Called from ocaml to display diff error messages +CAMLprim value displayDiffErr(value s) +{ + id pool = [[NSAutoreleasePool alloc] init]; + NSString * str = [NSString stringWithUTF8String:String_val(s)]; + str = [[str componentsSeparatedByString:@"\n"] componentsJoinedByString:@" "]; + [me->statusText performSelectorOnMainThread:@selector(setStringValue:) + withObject:str waitUntilDone:FALSE]; + [pool release]; + return Val_unit; +} + +- (void)diffViewTextSet:(NSArray *)args +{ + [self diffViewTextSet:[args objectAtIndex:0] bodyText:[args objectAtIndex:1]]; +} + +- (void)diffViewTextSet:(NSString *)title bodyText:(NSString *)body { + if ([body length]==0) return; + [diffWindow setTitle:title]; + //[diffView setFont:diffFont]; + [diffView setString:body]; + if (!doneFirstDiff) { + /* On first open, position the diff window to the right of + the main window, but without going off the mainwindow's screen */ + float screenOriginX = [[mainWindow screen] visibleFrame].origin.x; + float screenWidth = [[mainWindow screen] visibleFrame].size.width; + float mainOriginX = [mainWindow frame].origin.x; + float mainOriginY = [mainWindow frame].origin.y; + float mainWidth = [mainWindow frame].size.width; + float mainHeight = [mainWindow frame].size.height; + float diffWidth = [diffWindow frame].size.width; + + float diffX = mainOriginX+mainWidth; + float maxX = screenOriginX+screenWidth-diffWidth; + if (diffX > maxX) diffX = maxX; + float diffY = mainOriginY + mainHeight; + + NSPoint diffOrigin = NSMakePoint(diffX,diffY); + [diffWindow cascadeTopLeftFromPoint:diffOrigin]; + + doneFirstDiff = YES; + } + [diffWindow orderFront:nil]; +} + +- (void)displayDetails:(ReconItem *)item +{ + //[detailsTextView setFont:diffFont]; + NSString *text = [item details]; + if (!text) text = @""; + [detailsTextView setStringValue:text]; +} + +- (void)clearDetails +{ + [detailsTextView setStringValue:@""]; +} + +- (IBAction)raiseCltoolWindow:(id)sender +{ + [cltoolPref setState:[[NSUserDefaults standardUserDefaults] boolForKey:@"CheckCltool"] ? NSOffState : NSOnState]; + [self raiseWindow: cltoolWindow]; +} + +- (IBAction)cltoolYesButton:(id)sender; +{ + [[NSUserDefaults standardUserDefaults] setBool:([cltoolPref state] != NSOnState) forKey:@"CheckCltool"]; + [self installCommandLineTool:self]; + [cltoolWindow close]; +} + +- (IBAction)cltoolNoButton:(id)sender; +{ + [[NSUserDefaults standardUserDefaults] setBool:([cltoolPref state] != NSOnState) forKey:@"CheckCltool"]; + [cltoolWindow close]; +} + +- (IBAction)raiseAboutWindow:(id)sender +{ + [self raiseWindow: aboutWindow]; +} + +- (void)raiseWindow:(NSWindow *)theWindow +{ + NSRect screenFrame = [[mainWindow screen] visibleFrame]; + NSRect mainWindowFrame = [mainWindow frame]; + NSRect theWindowFrame = [theWindow frame]; + + float winX = mainWindowFrame.origin.x + + (mainWindowFrame.size.width - theWindowFrame.size.width)/2; + float winY = mainWindowFrame.origin.y + + (mainWindowFrame.size.height + theWindowFrame.size.height)/2; + + if (winXmaxX) winX=maxX; + float minY = screenFrame.origin.y+theWindowFrame.size.height; + if (winYmaxY) winY=maxY; + + [theWindow cascadeTopLeftFromPoint: + NSMakePoint(winX,winY)]; + + [theWindow makeKeyAndOrderFront:nil]; +} + +- (IBAction)onlineHelp:(id)sender +{ + [[NSWorkspace sharedWorkspace] + openURL:[NSURL URLWithString:@"http://www.cis.upenn.edu/~bcpierce/unison/docs.html"]]; +} + +/* from http://developer.apple.com/documentation/Security/Conceptual/authorization_concepts/index.html */ +#include +#include +- (IBAction)installCommandLineTool:(id)sender +{ + /* Install the command-line tool in /usr/bin/unison. + Requires root privilege, so we ask for it and + pass the task off to /bin/sh. */ + + OSStatus myStatus; + + AuthorizationFlags myFlags = kAuthorizationFlagDefaults; + AuthorizationRef myAuthorizationRef; + myStatus = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, + myFlags, &myAuthorizationRef); + if (myStatus != errAuthorizationSuccess) return; + + { + AuthorizationItem myItems = {kAuthorizationRightExecute, 0, + NULL, 0}; + AuthorizationRights myRights = {1, &myItems}; + myFlags = kAuthorizationFlagDefaults | + kAuthorizationFlagInteractionAllowed | + kAuthorizationFlagPreAuthorize | + kAuthorizationFlagExtendRights; + myStatus = + AuthorizationCopyRights(myAuthorizationRef,&myRights,NULL,myFlags,NULL); + } + if (myStatus == errAuthorizationSuccess) { + NSBundle *bundle = [NSBundle mainBundle]; + NSString *bundle_path = [bundle bundlePath]; + NSString *exec_path = + [bundle_path stringByAppendingString:@"/Contents/MacOS/cltool"]; + // Not sure why but this doesn't work: + // [bundle pathForResource:@"cltool" ofType:nil]; + + if (exec_path == nil) return; + char *args[] = { "-f", (char *)[exec_path UTF8String], + "/usr/bin/unison", NULL }; + + myFlags = kAuthorizationFlagDefaults; + myStatus = AuthorizationExecuteWithPrivileges + (myAuthorizationRef, "/bin/cp", myFlags, args, + NULL); + } + AuthorizationFree (myAuthorizationRef, kAuthorizationFlagDefaults); + + /* + if (myStatus == errAuthorizationCanceled) + NSLog(@"The attempt was canceled\n"); + else if (myStatus) + NSLog(@"There was an authorization error: %ld\n", myStatus); + */ +} + +- (BOOL)validateItem:(SEL) action +{ + if (action == @selector(syncButton:)) return syncable; + // FIXME Restarting during sync is disabled because it causes UI corruption + else if (action == @selector(restartButton:)) return !duringSync; + else if (action == @selector(rescan:)) return ((syncable && !duringSync) || afterSync); + else return YES; +} + +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem +{ + return [self validateItem:[menuItem action]]; +} + +- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem +{ + return [self validateItem:[toolbarItem action]]; +} + +- (void)resizeWindowToSize:(NSSize)newSize +{ + NSRect aFrame; + + float newHeight = newSize.height+[self toolbarHeightForWindow:mainWindow]; + float newWidth = newSize.width; + + aFrame = [NSWindow contentRectForFrameRect:[mainWindow frame] + styleMask:[mainWindow styleMask]]; + + aFrame.origin.y += aFrame.size.height; + aFrame.origin.y -= newHeight; + aFrame.size.height = newHeight; + aFrame.size.width = newWidth; + + aFrame = [NSWindow frameRectForContentRect:aFrame + styleMask:[mainWindow styleMask]]; + + [mainWindow setFrame:aFrame display:YES animate:YES]; +} + +- (float)toolbarHeightForWindow:(NSWindow *)window +{ + NSToolbar *aToolbar; + float toolbarHeight = 0.0; + NSRect windowFrame; + + aToolbar = [window toolbar]; + if(aToolbar && [aToolbar isVisible]) + { + windowFrame = [NSWindow contentRectForFrameRect:[window frame] + styleMask:[window styleMask]]; + toolbarHeight = NSHeight(windowFrame) + - NSHeight([[window contentView] frame]); + } + return toolbarHeight; +} + +CAMLprim value fatalError(value s) +{ + NSString *str = [[NSString alloc] initWithUTF8String:String_val(s)]; + + [me performSelectorOnMainThread:@selector(fatalError:) withObject:str waitUntilDone:FALSE]; + [str release]; + return Val_unit; +} + +- (void)fatalError:(NSString *)msg { + NSRunAlertPanel(@"Fatal error", msg, @"Exit", nil, nil); + exit(1); +} + +/* Returns true if we need to exit, false if we proceed */ + +CAMLprim value warnPanel(value s) +{ + NSString *str = [[NSString alloc] initWithUTF8String:String_val(s)]; + + [me performSelectorOnMainThread:@selector(warnPanel:) withObject:str waitUntilDone:TRUE]; + [str release]; + if (me -> shouldExitAfterWarning) { + return Val_true; + } else { + return Val_false; + } +} + +- (void)warnPanel:(NSString *)msg { + int warnVal = NSRunAlertPanel(@"Warning", msg, @"Proceed", @"Exit", nil); + NSLog(@"Warning Panel Returned %d",warnVal); + if (warnVal == NSAlertAlternateReturn) { + shouldExitAfterWarning = YES; + } else { + shouldExitAfterWarning = FALSE; + } +} + + at end + + at implementation NSString (_UnisonUtil) +- (NSString *)trim +{ + NSCharacterSet *ws = [NSCharacterSet whitespaceCharacterSet]; + int len = [self length], i = len; + while (i && [ws characterIsMember:[self characterAtIndex:i-1]]) i--; + return (i == len) ? self : [self substringToIndex:i]; +} + at end Added: trunk/src/uimac14/NotificationController.h =================================================================== --- trunk/src/uimac14/NotificationController.h (rev 0) +++ trunk/src/uimac14/NotificationController.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,23 @@ +// +// NotificationController.h +// uimac +// +// Created by Alan Schmitt on 02/02/06. +// Copyright 2006, see file COPYING for details. All rights reserved. +// + +#import +#import + + at interface NotificationController : NSObject +{ +} + +- (void)updateFinishedFor: (NSString *)profile; +- (void)syncFinishedFor: (NSString *)profile; + +/* Implement the GrowlApplicationBridgeDelegate protocol */ +- (NSDictionary *)registrationDictionaryForGrowl; +- (NSString *)applicationNameForGrowl; + + at end Added: trunk/src/uimac14/NotificationController.m =================================================================== --- trunk/src/uimac14/NotificationController.m (rev 0) +++ trunk/src/uimac14/NotificationController.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,65 @@ +// +// NotificationController.m +// uimac +// +// Created by Alan Schmitt on 02/02/06. +// Copyright 2006, see file COPYING for details. All rights reserved. +// + +#import "NotificationController.h" + +#define NOTIFY_UPDATE @"Scan finished" +#define NOTIFY_SYNC @"Synchronization finished" + +/* Show a simple notification */ +static void simpleNotify(NSString *name, NSString *descFmt, NSString *profile); + + at implementation NotificationController + +- (void)awakeFromNib +{ + [GrowlApplicationBridge setGrowlDelegate:self]; +} + +- (void)updateFinishedFor: (NSString *)profile +{ + simpleNotify(NOTIFY_UPDATE, + @"Profile '%@' is finished scanning for updates", + profile); +} + +- (void)syncFinishedFor: (NSString *)profile { + simpleNotify(NOTIFY_SYNC, + @"Profile '%@' is finished synchronizing", + profile); +} + +- (NSDictionary *)registrationDictionaryForGrowl +{ + NSArray* notifications = [NSArray arrayWithObjects: + NOTIFY_UPDATE, + NOTIFY_SYNC, + nil]; + return [NSDictionary dictionaryWithObjectsAndKeys: + notifications, GROWL_NOTIFICATIONS_ALL, + notifications, GROWL_NOTIFICATIONS_DEFAULT, + nil]; +} + +- (NSString *)applicationNameForGrowl +{ + return @"Unison"; +} + + at end + +static void simpleNotify(NSString *name, NSString *descFmt, NSString *profile) +{ + [GrowlApplicationBridge notifyWithTitle:name + description:[NSString stringWithFormat:descFmt, profile] + notificationName:name + iconData:nil + priority:0 + isSticky:false + clickContext:nil]; +} \ No newline at end of file Added: trunk/src/uimac14/PreferencesController.h =================================================================== --- trunk/src/uimac14/PreferencesController.h (rev 0) +++ trunk/src/uimac14/PreferencesController.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,20 @@ +/* PreferencesController */ + +#import + + at interface PreferencesController : NSObject +{ + IBOutlet NSTextField *firstRootText; + IBOutlet NSButtonCell *localButtonCell; + IBOutlet NSTextField *profileNameText; + IBOutlet NSButtonCell *remoteButtonCell; + IBOutlet NSTextField *secondRootHost; + IBOutlet NSTextField *secondRootText; + IBOutlet NSTextField *secondRootUser; +} +- (IBAction)anyEnter:(id)sender; +- (IBAction)localClick:(id)sender; +- (IBAction)remoteClick:(id)sender; +- (BOOL)validatePrefs; +- (void)reset; + at end Added: trunk/src/uimac14/PreferencesController.m =================================================================== --- trunk/src/uimac14/PreferencesController.m (rev 0) +++ trunk/src/uimac14/PreferencesController.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,89 @@ +#import "PreferencesController.h" +#import "Bridge.h" + + at implementation PreferencesController + +- (void)reset +{ + [profileNameText setStringValue:@""]; + [firstRootText setStringValue:@""]; + [secondRootUser setStringValue:@""]; + [secondRootHost setStringValue:@""]; + [secondRootText setStringValue:@""]; + [remoteButtonCell setState:NSOnState]; + [localButtonCell setState:NSOffState]; + [secondRootUser setSelectable:YES]; + [secondRootUser setEditable:YES]; + [secondRootHost setSelectable:YES]; + [secondRootHost setEditable:YES]; +} + +- (BOOL)validatePrefs +{ + NSString *profileName = [profileNameText stringValue]; + if (profileName == nil | [profileName isEqualTo:@""]) { + // FIX: should check for already existing names too + NSRunAlertPanel(@"Error",@"You must enter a profile name",@"OK",nil,nil); + return NO; + } + NSString *firstRoot = [firstRootText stringValue]; + if (firstRoot == nil | [firstRoot isEqualTo:@""]) { + NSRunAlertPanel(@"Error",@"You must enter a first root",@"OK",nil,nil); + return NO; + } + NSString *secondRoot; + if ([remoteButtonCell state] == NSOnState) { + NSString *user = [secondRootUser stringValue]; + if (user == nil | [user isEqualTo:@""]) { + NSRunAlertPanel(@"Error",@"You must enter a user",@"OK",nil,nil); + return NO; + } + NSString *host = [secondRootHost stringValue]; + if (host == nil | [host isEqualTo:@""]) { + NSRunAlertPanel(@"Error",@"You must enter a host",@"OK",nil,nil); + return NO; + } + NSString *file = [secondRootText stringValue]; + // OK for empty file, e.g., ssh://foo at bar/ + secondRoot = [NSString stringWithFormat:@"ssh://%@@%@/%@",user,host,file]; + } + else { + secondRoot = [secondRootText stringValue]; + if (secondRoot == nil | [secondRoot isEqualTo:@""]) { + NSRunAlertPanel(@"Error",@"You must enter a second root file",@"OK",nil,nil); + return NO; + } + } + ocamlCall("xSSS", "unisonProfileInit", profileName, firstRoot, secondRoot); + return YES; +} + +/* The target when enter is pressed in any of the text fields */ +// FIX: this is broken, it takes tab, mouse clicks, etc. +- (IBAction)anyEnter:(id)sender +{ + NSLog(@"enter"); + [self validatePrefs]; +} + +- (IBAction)localClick:(id)sender +{ + NSLog(@"local"); + [secondRootUser setStringValue:@""]; + [secondRootHost setStringValue:@""]; + [secondRootUser setSelectable:NO]; + [secondRootUser setEditable:NO]; + [secondRootHost setSelectable:NO]; + [secondRootHost setEditable:NO]; +} + +- (IBAction)remoteClick:(id)sender +{ + NSLog(@"remote"); + [secondRootUser setSelectable:YES]; + [secondRootUser setEditable:YES]; + [secondRootHost setSelectable:YES]; + [secondRootHost setEditable:YES]; +} + + at end Added: trunk/src/uimac14/ProfileController.h =================================================================== --- trunk/src/uimac14/ProfileController.h (rev 0) +++ trunk/src/uimac14/ProfileController.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,20 @@ +/* ProfileController */ +/* Copyright (c) 2003, see file COPYING for details. */ + +#import + + at interface ProfileController : NSObject +{ + IBOutlet NSTableView *tableView; + NSMutableArray *profiles; + int defaultIndex; // -1 if no default, else the index in profiles of @"default" +} +- (void)initProfiles; +- (int)numberOfRowsInTableView:(NSTableView *)aTableView; +- (id)tableView:(NSTableView *)aTableView + objectValueForTableColumn:(NSTableColumn *)aTableColumn + row:(int)rowIndex; +- (NSString *)selected; +- (NSTableView *)tableView; // allows MyController to set up firstResponder +- (NSMutableArray*) getProfiles; + at end Added: trunk/src/uimac14/ProfileController.m =================================================================== --- trunk/src/uimac14/ProfileController.m (rev 0) +++ trunk/src/uimac14/ProfileController.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,84 @@ +/* Copyright (c) 2003, see file COPYING for details. */ + +#import "ProfileController.h" +#import "Bridge.h" + + at implementation ProfileController + +NSString *unisonDirectory() +{ + return (NSString *)ocamlCall("S", "unisonDirectory"); +} + +- (void)initProfiles +{ + NSString *directory = unisonDirectory(); +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 + NSArray *files = [[NSFileManager defaultManager] directoryContentsAtPath:directory]; +#else + NSArray *files = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:directory error:nil]; +#endif + unsigned int count = [files count]; + unsigned int i,j; + + [profiles release]; + profiles = [[NSMutableArray alloc] init]; + defaultIndex = -1; + + for (i = j = 0; i < count; i++) { + NSString *file = [files objectAtIndex:i]; + if ([[file pathExtension] isEqualTo:@"prf"]) { + NSString *withoutExtension = [file stringByDeletingPathExtension]; + [profiles insertObject:withoutExtension atIndex:j]; + if ([@"default" isEqualTo:withoutExtension]) defaultIndex = j; + j++; + } + } + if (j > 0) + [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO]; +} + +- (void)awakeFromNib +{ + // start with the default profile selected + [self initProfiles]; + if (defaultIndex >= 0) + [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:defaultIndex] byExtendingSelection:NO]; + // on awake the scroll bar is inactive, but after adding profiles we might need it; + // reloadData makes it happen. Q: is setNeedsDisplay more efficient? + [tableView reloadData]; +} + +- (int)numberOfRowsInTableView:(NSTableView *)aTableView +{ + if (!profiles) return 0; + else return [profiles count]; +} + +- (id)tableView:(NSTableView *)aTableView + objectValueForTableColumn:(NSTableColumn *)aTableColumn + row:(int)rowIndex +{ + if (rowIndex >= 0 && rowIndex < [profiles count]) + return [profiles objectAtIndex:rowIndex]; + else return @"[internal error!]"; +} + +- (NSString *)selected +{ + int rowIndex = [tableView selectedRow]; + if (rowIndex >= 0 && rowIndex < [profiles count]) + return [profiles objectAtIndex:rowIndex]; + else return @"[internal error!]"; +} + +- (NSTableView *)tableView +{ + return tableView; +} + +- (NSMutableArray*)getProfiles { + return profiles; +} + + at end Added: trunk/src/uimac14/ProfileTableView.h =================================================================== --- trunk/src/uimac14/ProfileTableView.h (rev 0) +++ trunk/src/uimac14/ProfileTableView.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,11 @@ +/* ProfileTableView */ + +#import + + at class MyController; + + at interface ProfileTableView : NSTableView +{ + IBOutlet MyController *myController; +} + at end Added: trunk/src/uimac14/ProfileTableView.m =================================================================== --- trunk/src/uimac14/ProfileTableView.m (rev 0) +++ trunk/src/uimac14/ProfileTableView.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,36 @@ +#import "MyController.h" +#import "ProfileTableView.h" + + at implementation ProfileTableView + +- (void)keyDown:(NSEvent *)event +{ + /* some keys return zero-length strings */ + if ([[event characters] length] == 0) { + [super keyDown:event]; + return; + } + + unichar c = [[event characters] characterAtIndex:0]; + switch (c) { + case '\r': + [myController openButton:self]; + break; + default: + [super keyDown:event]; + break; + } +} + +/* Override default highlight colour to match ReconTableView */ +- (id)_highlightColorForCell:(NSCell *)cell +{ + if(([[self window] firstResponder] == self) && + [[self window] isMainWindow] && + [[self window] isKeyWindow]) + + return [NSColor colorWithCalibratedRed:0.7 green:0.75 blue:0.8 alpha:1.0]; + else return [NSColor colorWithCalibratedRed:0.8 green:0.8 blue:0.8 alpha:1.0]; +} + + at end Added: trunk/src/uimac14/ProgressCell.h =================================================================== --- trunk/src/uimac14/ProgressCell.h (rev 0) +++ trunk/src/uimac14/ProgressCell.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,15 @@ +#import + + at interface ProgressCell : NSCell +{ + float _minVal, _maxVal; // defaults to 0.0, 100.0 + BOOL _isActive; + BOOL _useFullView; // default: NO + BOOL _isError; // default: NO + NSImage *_icon; + NSString *_statusString; +} +- (void)setStatusString:(NSString *)string; +- (void)setIcon:(NSImage *)image; +- (void)setIsActive:(BOOL)yn; + at end Added: trunk/src/uimac14/ProgressCell.m =================================================================== --- trunk/src/uimac14/ProgressCell.m (rev 0) +++ trunk/src/uimac14/ProgressCell.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,199 @@ +/****************************************************************************** + * Copyright 2008, 2014 (see file COPYING for more information) + * + * Loosely based on TorrentCell from Transmission (.png files are from + * the original). + *****************************************************************************/ + +#import "ProgressCell.h" + +#define BAR_HEIGHT 12.0 + +static NSImage *_ProgressWhite, *_ProgressBlue, *_ProgressGray, *_ProgressGreen, + *_ProgressAdvanced, *_ProgressEndWhite, *_ProgressEndBlue, + *_ProgressEndGray, *_ProgressEndGreen, *_ProgressLightGreen, + *_ProgressEndAdvanced, * _ErrorImage; +static NSSize ZeroSize; + + at implementation ProgressCell + ++ (void) initialize +{ + NSSize startSize = NSMakeSize(100.0, BAR_HEIGHT); + ZeroSize = NSMakeSize(0.0, 0.0); + + _ProgressWhite = [NSImage imageNamed: @"ProgressBarWhite.png"]; + [_ProgressWhite setScalesWhenResized: YES]; + + _ProgressBlue = [NSImage imageNamed: @"ProgressBarBlue.png"]; + [_ProgressBlue setScalesWhenResized: YES]; + [_ProgressBlue setSize: startSize]; + + _ProgressGray = [NSImage imageNamed: @"ProgressBarGray.png"]; + [_ProgressGray setScalesWhenResized: YES]; + [_ProgressGray setSize: startSize]; + + _ProgressGreen = [NSImage imageNamed: @"ProgressBarGreen.png"]; + [_ProgressGreen setScalesWhenResized: YES]; + + _ProgressLightGreen = [NSImage imageNamed: @"ProgressBarLightGreen.png"]; + [_ProgressLightGreen setScalesWhenResized: YES]; + + _ProgressAdvanced = [NSImage imageNamed: @"ProgressBarAdvanced.png"]; + [_ProgressAdvanced setScalesWhenResized: YES]; + + _ProgressEndWhite = [NSImage imageNamed: @"ProgressBarEndWhite.png"]; + _ProgressEndBlue = [NSImage imageNamed: @"ProgressBarEndBlue.png"]; + _ProgressEndGray = [NSImage imageNamed: @"ProgressBarEndGray.png"]; + _ProgressEndGreen = [NSImage imageNamed: @"ProgressBarEndGreen.png"]; + _ProgressEndAdvanced = [NSImage imageNamed: @"ProgressBarEndAdvanced.png"]; + + _ErrorImage = [[NSImage imageNamed: @"Error.tiff"] copy]; + [_ErrorImage setFlipped: YES]; +} + +- (id)init +{ + self = [super init]; + _minVal = 0.0; + _maxVal = 100.0; + _isActive = YES; + _statusString = @""; + + return self; +} + + - (void)dealloc + { + [_icon release]; + [_statusString release]; + [super dealloc]; + } + +- (void)setStatusString:(NSString *)string +{ + _statusString = [string retain]; +} + +- (void)setIcon:(NSImage *)image +{ + _icon = [image retain]; +} + +- (void)setIsActive:(BOOL)yn +{ + _isActive = yn; +} + +- (void)drawBarImage:(NSImage *)barImage width:(float)width point:(NSPoint)point +{ + if (width <= 0.0) + return; + + if ([barImage size].width < width) + [barImage setSize: NSMakeSize(width * 2.0, BAR_HEIGHT)]; + + [barImage compositeToPoint: point fromRect: NSMakeRect(0, 0, width, BAR_HEIGHT) operation: NSCompositeSourceOver]; +} + +- (void)drawBar:(float)width point:(NSPoint)point +{ + id objectValue = [self objectValue]; + if (!objectValue) return; + + float value = [objectValue floatValue]; + float progress = (value - _minVal)/ (_maxVal - _minVal); + + width -= 2.0; + float completedWidth, remainingWidth = 0.0; + + //bar images and widths + NSImage * barLeftEnd, * barRightEnd, * barComplete, * barRemaining; + if (progress >= 1.0) { + completedWidth = width; + barLeftEnd = _ProgressEndGreen; + barRightEnd = _ProgressEndGreen; + barComplete = _ProgressGreen; + barRemaining = _ProgressLightGreen; + } + else { + completedWidth = progress * width; + remainingWidth = width - completedWidth; + barLeftEnd = (remainingWidth == width) ? _ProgressEndWhite + : ((_isActive) ? _ProgressEndBlue : _ProgressEndGray); + barRightEnd = (completedWidth < width) ? _ProgressEndWhite + : ((_isActive) ? _ProgressEndBlue : _ProgressEndGray); + barComplete = _isActive ? _ProgressBlue : _ProgressGray; + barRemaining = _ProgressWhite; + } + + [barLeftEnd compositeToPoint: point operation: NSCompositeSourceOver]; + + point.x += 1.0; + [self drawBarImage: barComplete width: completedWidth point: point]; + + point.x += completedWidth; + [self drawBarImage: barRemaining width: remainingWidth point: point]; + + point.x += remainingWidth; + [barRightEnd compositeToPoint: point operation: NSCompositeSourceOver]; +} + +- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)view +{ + NSPoint pen = cellFrame.origin; + const float PADDING = 3.0; + + // progress bar + pen.y += PADDING + BAR_HEIGHT; + float mainWidth = cellFrame.size.width; + float barWidth = mainWidth; + [self drawBar: barWidth point: pen]; + + //icon + NSImage * image = _isError ? _ErrorImage : _icon; + if (image) { + NSSize imageSize = [image size]; + NSRect imageFrame; + imageFrame.origin = cellFrame.origin; + imageFrame.size = imageSize; + imageFrame.origin.x += ceil((cellFrame.size.width - imageSize.width) / 2); + imageFrame.origin.y += [view isFlipped] ? + ceil((cellFrame.size.height + imageSize.height) / 2) + : ceil((cellFrame.size.height - imageSize.height) / 2); + [image compositeToPoint:imageFrame.origin operation:NSCompositeSourceOver]; + } + + // status string + if (_statusString) { + BOOL highlighted = [self isHighlighted] && [[self highlightColorWithFrame: cellFrame inView: view] + isEqual: [NSColor alternateSelectedControlColor]]; + NSMutableParagraphStyle * paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail]; + + NSDictionary * statusAttributes = [[NSDictionary alloc] initWithObjectsAndKeys: + highlighted ? [NSColor whiteColor] : [NSColor darkGrayColor], NSForegroundColorAttributeName, + [NSFont boldSystemFontOfSize: 9.0], NSFontAttributeName, + paragraphStyle, NSParagraphStyleAttributeName, nil]; + [paragraphStyle release]; + + NSSize statusSize = [_statusString sizeWithAttributes: statusAttributes]; + pen = cellFrame.origin; + pen.x += (cellFrame.size.width - statusSize.width) * 0.5; + pen.y += (cellFrame.size.height - statusSize.height) * 0.5; + + [_statusString drawInRect: NSMakeRect(pen.x, pen.y, statusSize.width, statusSize.height) + withAttributes: statusAttributes]; + [statusAttributes release]; + } +} + +- (id)copyWithZone: (NSZone *)zone +{ + ProgressCell *newObj = [super copyWithZone: zone]; + newObj->_statusString = [_statusString retain]; + newObj->_icon = [_icon retain]; + return newObj; +} + + at end Added: trunk/src/uimac14/ReconItem.h =================================================================== --- trunk/src/uimac14/ReconItem.h (rev 0) +++ trunk/src/uimac14/ReconItem.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,80 @@ +/* ReconItem */ + +#import + + at class OCamlValue; + + at interface ReconItem : NSObject +{ + ReconItem *parent; + NSString *path; + NSString *fullPath; + BOOL selected; + NSImage *direction; + NSString *directionSortString; + double fileSize; + double bytesTransferred; + BOOL resolved; +} +- (BOOL)selected; +- (void)setSelected:(BOOL)x; +- (NSString *)path; +- (NSString *)fullPath; +- (NSString *)left; +- (NSString *)right; +- (NSImage *)direction; +- (NSImage *)fileIcon; +- (long)fileCount; +- (double)fileSize; +- (NSString *)fileSizeString; +- (double)bytesTransferred; +- (NSString *)bytesTransferredString; +- (void)setDirection:(char *)d; +- (void) doAction:(unichar)action; +- (void) doIgnore:(unichar)action; +- (NSString *)progress; +- (NSString *)progressString; +- (void)resetProgress; +- (NSString *)details; +- (NSString *)updateDetails; +- (BOOL)isConflict; +- (BOOL)changedFromDefault; +- (void)revertDirection; +- (BOOL)canDiff; +- (void)showDiffs; +- (NSString *)leftSortKey; +- (NSString *)rightSortKey; +- (NSString *)replicaSortKey:(NSString *)sortString; +- (NSString *)directionSortKey; +- (NSString *)progressSortKey; +- (NSString *)pathSortKey; +- (NSArray *)children; +- (ReconItem *)collapseParentsWithSingleChildren:(BOOL)isRoot; +- (ReconItem *)parent; +- (void)setPath:(NSString *)aPath; +- (void)setFullPath:(NSString *)p; +- (void)setParent:(ReconItem *)p; +- (void)willChange; + at end + + at interface LeafReconItem : ReconItem +{ + NSString *left; + NSString *right; + NSString *progress; + NSString *details; + OCamlValue *ri; // an ocaml Common.reconItem + long index; // index in Ri list +} +- initWithRiAndIndex:(OCamlValue *)v index:(long)i; + at end + + at interface ParentReconItem : ReconItem +{ + NSMutableArray *_children; + long fileCount; +} +- (void)addChild:(ReconItem *)item nested:(BOOL)useNesting; +- (void)sortUsingDescriptors:(NSArray *)sortDescriptors; +- (BOOL)hasConflictedChildren; + at end Added: trunk/src/uimac14/ReconItem.m =================================================================== --- trunk/src/uimac14/ReconItem.m (rev 0) +++ trunk/src/uimac14/ReconItem.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,862 @@ +#import "ReconItem.h" +#import "Bridge.h" + +#import + + at implementation ReconItem + +- init { + [super init]; + selected = NO; // NB only used/updated during sorts. Not a + // reliable indicator of whether item is selected + fileSize = -1.; + bytesTransferred = -1.; + return self; +} + +- (void)dealloc +{ + [path release]; + [fullPath release]; + // [direction release]; // assuming retained by cache, so not retained + // [directionSortString release]; // no retain/release necessary because is constant + [super dealloc]; +} + +- (ReconItem *)parent +{ + return parent; +} + +- (void)setParent:(ReconItem *)p +{ + parent = p; +} + +- (void)willChange +{ + // propagate up parent chain + [parent willChange]; +} + +- (NSArray *)children +{ + return nil; +} + +- (BOOL)selected +{ + return selected; +} + +- (void)setSelected:(BOOL)x +{ + selected = x; +} + +- (NSString *)path +{ + return path; +} + +- (void)setPath:(NSString *)aPath +{ + [path autorelease]; + path = [aPath retain]; + + // invalidate + [fullPath autorelease]; + fullPath = nil; +} + +- (NSString *)fullPath +{ + if (!fullPath) { + NSString *parentPath = [parent fullPath]; + [self setFullPath:(([parentPath length] > 0) ? [parentPath stringByAppendingFormat:@"/%@", path] : path)]; + } + + return fullPath; +} + +- (void)setFullPath:(NSString *)p +{ + [fullPath autorelease]; + fullPath = [p retain]; +} + +- (NSString *)left +{ + return nil; +} + +- (NSString *)right +{ + return nil; +} + +static NSMutableDictionary *_ChangeIconsByType = nil; + +- (NSImage *)changeIconFor:(NSString *)type other:(NSString *)other +{ + if (![type length]) { + if ([other isEqual:@"Created"]) { + type = @"Absent"; + } else if ([other length]) { + type = @"Unmodified"; + } else + return nil; + } + + NSImage *result = [_ChangeIconsByType objectForKey:type]; + if (!result) { + NSString *imageName = [NSString stringWithFormat:@"Change_%@.png", type]; + result = [NSImage imageNamed:imageName]; + if (!_ChangeIconsByType) _ChangeIconsByType = [[NSMutableDictionary alloc] init]; + [_ChangeIconsByType setObject:result forKey:type]; + } + return result; +} + +- (NSImage *)leftIcon +{ + return [self changeIconFor:[self left] other:[self right]]; +} + +- (NSImage *)rightIcon +{ + return [self changeIconFor:[self right] other:[self left]]; +} + + +- (double)computeFileSize +{ + return 0.; +} + +- (double)bytesTransferred +{ + return 0.; +} + +- (long)fileCount +{ + return 1; +} + +- (double)fileSize +{ + if (fileSize == -1.) fileSize = [self computeFileSize]; + return fileSize; +} + +- (NSString *)formatFileSize:(double)size +{ + if (size == 0) return @"--"; + if (size < 1024) return @"< 1KB"; // return [NSString stringWithFormat:@"%i bytes", size]; + size /= 1024; + if (size < 1024) return [NSString stringWithFormat:@"%i KB", (int)size]; + size /= 1024; + if (size < 1024) return [NSString stringWithFormat:@"%1.1f MB", size]; + size = size / 1024; + return [NSString stringWithFormat:@"%1.1f GB", size]; +} + +- (NSString *)fileSizeString +{ + return [self formatFileSize:[self fileSize]]; +} + +- (NSString *)bytesTransferredString +{ + return [self formatFileSize:[self bytesTransferred]]; +} + +- (NSNumber *)percentTransferred +{ + double size = [self computeFileSize]; + return (size > 0) ? [NSNumber numberWithDouble:([self bytesTransferred] / (size) * 100.0)] + : nil; +} + +static NSMutableDictionary *_iconsByExtension = nil; + +- (NSImage *)iconForExtension:(NSString *)extension +{ + NSImage *icon = [_iconsByExtension objectForKey:extension]; + if (!_iconsByExtension) _iconsByExtension = [[NSMutableDictionary alloc] init]; + if (!icon) { + icon = [[NSWorkspace sharedWorkspace] iconForFileType:extension]; + [icon setSize:NSMakeSize(16.0, 16.0)]; + [_iconsByExtension setObject:icon forKey:extension]; + } + return icon; +} + +- (NSImage *)fileIcon +{ + return [self iconForExtension:NSFileTypeForHFSTypeCode(kOpenFolderIcon)]; +} + +- (NSString *)dirString +{ + return @"<-?->"; +} + +- (NSImage *)direction +{ + if (direction) return direction; + NSString * dirString = [self dirString]; + + BOOL changedFromDefault = [self changedFromDefault]; + + if ([dirString isEqual:@"<-?->"]) { + if (changedFromDefault | resolved) { + direction = [NSImage imageNamed: @"table-skip.tif"]; + directionSortString = @"3"; + } + else { + direction = [NSImage imageNamed: @"table-conflict.tif"]; + directionSortString = @"2"; + } + } + + else if ([dirString isEqual:@"---->"]) { + if (changedFromDefault) { + direction = [NSImage imageNamed: @"table-right-blue.tif"]; + directionSortString = @"6"; + } + else { + direction = [NSImage imageNamed: @"table-right-green.tif"]; + directionSortString = @"8"; + } + } + + else if ([dirString isEqual:@"<----"]) { + if (changedFromDefault) { + direction = [NSImage imageNamed: @"table-left-blue.tif"]; + directionSortString = @"5"; + } + else { + direction = [NSImage imageNamed: @"table-left-green.tif"]; + directionSortString = @"7"; + } + } + + else if ([dirString isEqual:@"<-M->"]) { + direction = [NSImage imageNamed: @"table-merge.tif"]; + directionSortString = @"4"; + } + + else if ([dirString isEqual:@"<--->"]) { + direction = [NSImage imageNamed: @"table-mixed.tif"]; + directionSortString = @"9"; + } + + else { + direction = [NSImage imageNamed: @"table-error.tif"]; + directionSortString = @"1"; + } + + [direction retain]; + return direction; +} + +- (void)setDirection:(char *)d +{ + [direction autorelease]; + direction = nil; +} + +- (void)doAction:(unichar)action +{ + switch (action) { + case '>': + [self setDirection:"unisonRiSetRight"]; + break; + case '<': + [self setDirection:"unisonRiSetLeft"]; + break; + case '/': + [self setDirection:"unisonRiSetConflict"]; + resolved = YES; + break; + case '-': + [self setDirection:"unisonRiForceOlder"]; + break; + case '+': + [self setDirection:"unisonRiForceNewer"]; + break; + case 'm': + [self setDirection:"unisonRiSetMerge"]; + break; + case 'd': + [self showDiffs]; + break; + case 'R': + [self revertDirection]; + break; + default: + NSLog(@"ReconItem.doAction : unknown action"); + break; + } +} + +- (void)doIgnore:(unichar)action +{ + switch (action) { + case 'I': + ocamlCall("xS", "unisonIgnorePath", [self fullPath]); + break; + case 'E': + ocamlCall("xS", "unisonIgnoreExt", [self path]); + break; + case 'N': + ocamlCall("xS", "unisonIgnoreName", [self path]); + break; + default: + NSLog(@"ReconItem.doIgnore : unknown ignore"); + break; + } +} + +/* Sorting functions. These have names equal to + column identifiers + "SortKey", and return NSStrings that + can be automatically sorted with their compare method */ + +- (NSString *) leftSortKey +{ + return [self replicaSortKey:[self left]]; +} + +- (NSString *) rightSortKey +{ + return [self replicaSortKey:[self right]]; +} + +- (NSString *) replicaSortKey:(NSString *)sortString +{ + /* sort order for left and right replicas */ + + if ([sortString isEqualToString:@"Created"]) return @"1"; + else if ([sortString isEqualToString:@"Deleted"]) return @"2"; + else if ([sortString isEqualToString:@"Modified"]) return @"3"; + else if ([sortString isEqualToString:@""]) return @"4"; + else return @"5"; +} + +- (NSString *) directionSortKey +{ + /* Since the direction indicators are unsortable images, use + directionSortString instead */ + + if ([directionSortString isEqual:@""]) + [self direction]; + return directionSortString; +} + +- (NSString *) progressSortKey +{ + /* Percentages, "done" and "" are sorted OK without help, + but "start " should be sorted after "" and before "0%" */ + + NSString * progressString = [self progress]; + if ([progressString isEqualToString:@"start "]) progressString = @" "; + return progressString; +} + +- (NSString *) pathSortKey +{ + /* default alphanumeric sort is fine for paths */ + return [self path]; +} + +- (NSString *)progress +{ + return nil; +} + +- (BOOL)transferInProgress +{ + double soFar = [self bytesTransferred]; + return (soFar > 0) && (soFar < [self fileSize]); +} + +- (void)resetProgress +{ +} + +- (NSString *)progressString +{ + NSString *progress = [self progress]; + if ([progress length] == 0. || [progress hasSuffix:@"%"]) + progress = [self transferInProgress] ? [self bytesTransferredString] : @""; + else if ([progress isEqual:@"done"]) progress = @""; + return progress; +} + +- (NSString *)details +{ + return nil; +} + +- (NSString *)updateDetails +{ + return [self details]; +} + +- (BOOL)isConflict +{ + return NO; +} + +- (BOOL)changedFromDefault +{ + return NO; +} + +- (void)revertDirection +{ + [self willChange]; + [direction release]; + direction = nil; + resolved = NO; +} + +- (BOOL)canDiff +{ + return NO; +} + +- (void)showDiffs +{ +} + +- (ReconItem *)collapseParentsWithSingleChildren:(BOOL)isRoot +{ + return self; +} + +- (NSString *)description +{ + return [NSString stringWithFormat:@"ReconItem: %@ %@", fullPath, path]; +} + +- (NSString *)debugDescription +{ + return [self description]; +} + at end + + +// --- Leaf items -- actually corresponding to ReconItems in OCaml + at implementation LeafReconItem + +- initWithRiAndIndex:(OCamlValue *)v index:(long)i +{ + [super init]; + ri = [v retain]; + index = i; + resolved = NO; + directionSortString = @""; + return self; +} + +-(void)dealloc +{ + [ri release]; + [left release]; + [right release]; + [progress release]; + [details release]; + + [super dealloc]; +} + +- (NSString *)path +{ + if (!path) path = [(NSString *)ocamlCall("S@", "unisonRiToPath", ri) retain]; + return path; +} + +- (NSString *)left +{ + if (!left) left = [(NSString *)ocamlCall("S@", "unisonRiToLeft", ri) retain]; + return left; +} + +- (NSString *)right +{ + if (!right) right = [(NSString *)ocamlCall("S@", "unisonRiToRight", ri) retain]; + return right; +} + +- (double)computeFileSize +{ + return [(NSNumber *)ocamlCall("N@", "unisonRiToFileSize", ri) doubleValue]; +} + +- (double)bytesTransferred +{ + if (bytesTransferred == -1.) { + // need to force to fileSize if done, otherwise may not match up to 100% + bytesTransferred = ([[self progress] isEqual:@"done"]) ? [self fileSize] + : [(NSNumber*)ocamlCall("N@", "unisonRiToBytesTransferred", ri) doubleValue]; + } + return bytesTransferred; +} + +- (NSImage *)fileIcon +{ + NSString *extension = [[self path] pathExtension]; + + if ([@"" isEqual:extension]) { + NSString *type = (NSString *)ocamlCall("S@", "unisonRiToFileType", ri); + extension = [type isEqual:@"dir"] + ? NSFileTypeForHFSTypeCode(kGenericFolderIcon) + : NSFileTypeForHFSTypeCode(kGenericDocumentIcon); + } + return [self iconForExtension:extension]; +} + +- (NSString *)dirString +{ + return (NSString *)ocamlCall("S@", "unisonRiToDirection", ri); +} + +- (void)setDirection:(char *)d +{ + [self willChange]; + [super setDirection:d]; + ocamlCall("x@", d, ri); +} + +- (NSString *)progress +{ + if (!progress) { + progress = [(NSString *)ocamlCall("S@", "unisonRiToProgress", ri) retain]; + if ([progress isEqual:@"FAILED"]) [self updateDetails]; + } + return progress; +} + +- (void)resetProgress +{ + // Get rid of the memoized progress because we expect it to change + [self willChange]; + bytesTransferred = -1.; + [progress release]; + + // Force update now so we get the result while the OCaml thread is available + // [self progress]; + // [self bytesTransferred]; + progress = nil; +} + +- (NSString *)details +{ + if (details) return details; + return [self updateDetails]; +} + +- (NSString *)updateDetails +{ + [details autorelease]; + details = [(NSString *)ocamlCall("S@", "unisonRiToDetails", ri) retain]; + return details; +} + +- (BOOL)isConflict +{ + return ((long)ocamlCall("i@", "unisonRiIsConflict", ri) ? YES : NO); +} + +- (BOOL)changedFromDefault +{ + return ((long)ocamlCall("i@", "changedFromDefault", ri) ? YES : NO); +} + +- (void)revertDirection +{ + ocamlCall("x@", "unisonRiRevert", ri); + [super revertDirection]; +} + +- (BOOL)canDiff +{ + return ((long)ocamlCall("i@", "canDiff", ri) ? YES : NO); +} + +- (void)showDiffs +{ + ocamlCall("x at i", "runShowDiffs", ri, index); +} + + at end + + at interface NSImage (TintedImage) +- (NSImage *)tintedImageWithColor:(NSColor *) tint operation:(NSCompositingOperation) op; + at end + + at implementation NSImage (TintedImage) + +- (NSImage *)tintedImageWithColor:(NSColor *) tint operation:(NSCompositingOperation) op +{ + NSSize size = [self size]; + NSRect imageBounds = NSMakeRect(0, 0, size.width, size.height); + NSImage *newImage = [[NSImage alloc] initWithSize:size]; + + [newImage lockFocus]; + [self compositeToPoint:NSZeroPoint operation:NSCompositeSourceOver]; + [tint set]; + NSRectFillUsingOperation(imageBounds, op); + [newImage unlockFocus]; + + return [newImage autorelease]; +} + + at end + +// ---- Parent nodes in grouped items + at implementation ParentReconItem + +- init +{ + [super init]; + _children = [[NSMutableArray alloc] init]; + return self; +} + +- initWithPath:(NSString *)aPath +{ + [self init]; + path = [aPath retain]; + return self; +} + +- (void)dealloc +{ + [_children release]; + [super dealloc]; +} + +- (NSArray *)children; +{ + return _children; +} + +- (ReconItem *)findChildWithPath:(NSArray *)pathArray level:level{ + ReconItem *item; + NSString *element = [pathArray count] ? [pathArray objectAtIndex:level] : @""; + + for (item in _children) { + if ([item isKindOfClass:[ParentReconItem class]] && [[item path] isEqual:element]) { + return item; + } + } + return nil; +} + +- (void)addChild:(ReconItem *)item pathArray:(NSArray *)pathArray level:(int)level +{ + // NSLog(@"Adding child: %@", pathArray); + NSString *element = [pathArray count] ? [pathArray objectAtIndex:level] : @""; + + // if we're at the leaf of the path, then add the item + if (((0 == [pathArray count]) && (0 == level)) || (level == [pathArray count]-1)) { + [item setParent:self]; + [item setPath:element]; + [_children addObject:item]; + return; + } + + // find / add matching parent node + ReconItem *parentItem = [self findChildWithPath:pathArray level:level]; + if (parentItem == nil || ![parentItem isKindOfClass:[ParentReconItem class]]) { + parentItem = [[ParentReconItem alloc] initWithPath:element]; + [parentItem setParent:self]; + [_children addObject:parentItem]; + [parentItem release]; + } + + [(ParentReconItem *)parentItem addChild:item pathArray:pathArray level:level+1]; +} + +- (void)addChild:(ReconItem *)item nested:(BOOL)nested +{ + [item setPath:nil]; // invalidate/reset + + if (nested) { + [self addChild:item pathArray:[[item path] pathComponents] level:0]; + } else { + [item setParent:self]; + [_children addObject:item]; + } +} + +- (void)sortUsingDescriptors:(NSArray *)sortDescriptors +{ + // sort our children + [_children sortUsingDescriptors:sortDescriptors]; + + // then have them sort theirs + int i = [_children count]; + while (i--) { + id child = [_children objectAtIndex:i]; + if ([child isKindOfClass:[ParentReconItem class]]) [child sortUsingDescriptors:sortDescriptors]; + } +} + +- (ReconItem *)collapseParentsWithSingleChildren:(BOOL)isRoot +{ + // replace ourselves? + if (!isRoot && [_children count] == 1) { + ReconItem *child = [_children lastObject]; + [child setPath:[path stringByAppendingFormat:@"/%@", [child path]]]; + return [child collapseParentsWithSingleChildren:NO]; + } + + // recurse + int i = [_children count]; + while (i--) { + ReconItem *child = [_children objectAtIndex:i]; + ReconItem *replacement = [child collapseParentsWithSingleChildren:NO]; + if (child != replacement) { + [_children replaceObjectAtIndex:i withObject:replacement]; + [replacement setParent:self]; + } + } + return self; +} + +- (void)willChange +{ + // invalidate child-based state + // Assuming caches / constant, so not retained / released + // [direction autorelease]; + // [directionSortString autorelease]; + direction = nil; + directionSortString = nil; + bytesTransferred = -1.; + // fileSize = -1; + // resolved = NO; + + // propagate up parent chain + [parent willChange]; +} + +// Propagation methods +- (void)doAction:(unichar)action +{ + int i = [_children count]; + while (i--) { + ReconItem *child = [_children objectAtIndex:i]; + [child doAction:action]; + } +} + +- (void)doIgnore:(unichar)action +{ + // handle Path ignores at this level, name and extension at the child nodes + if (action == 'I') { + [super doIgnore:'I']; + } else { + int i = [_children count]; + while (i--) { + ReconItem *child = [_children objectAtIndex:i]; + [child doIgnore:action]; + } + } +} + +// Rollup methods +- (long)fileCount +{ + if (fileCount == 0) { + int i = [_children count]; + while (i--) { + ReconItem *child = [_children objectAtIndex:i]; + fileCount += [child fileCount]; + } + } + return fileCount; +} + +- (double)computeFileSize +{ + double size = 0; + int i = [_children count]; + while (i--) { + ReconItem *child = [_children objectAtIndex:i]; + size += [child fileSize]; + } + return size; +} + +- (double)bytesTransferred +{ + if (bytesTransferred == -1.) { + bytesTransferred = 0.; + int i = [_children count]; + while (i--) { + ReconItem *child = [_children objectAtIndex:i]; + bytesTransferred += [child bytesTransferred]; + } + } + return bytesTransferred; +} + + + +- (NSString *)dirString +{ + NSString *rollup = nil; + int i = [_children count]; + while (i--) { + ReconItem *child = [_children objectAtIndex:i]; + NSString *dirString = [child dirString]; + if (!rollup || [dirString isEqual:rollup]) { + rollup = dirString; + } else { + // conflict + if ([dirString isEqual:@"---->"] || [dirString isEqual:@"<----"] || [dirString isEqual:@"<--->"]) { + if ([rollup isEqual:@"---->"] || [rollup isEqual:@"<----"] || [rollup isEqual:@"<--->"]) { + rollup = @"<--->"; + } + } else { + rollup = @"<-?->"; + } + } + } + // NSLog(@"dirString for %@: %@", path, rollup); + return rollup; +} + +- (BOOL)hasConflictedChildren +{ + NSString *dirString = [self dirString]; + BOOL result = [dirString isEqual:@"<--->"] || [dirString isEqual:@"<-?->"]; + // NSLog(@"hasConflictedChildren (%@): %@: %i", [self path], dirString, result); + return result; +} + +static NSMutableDictionary *_parentImages = nil; +static NSColor *_veryLightGreyColor = nil; +- (NSImage *)direction +{ + if (!_parentImages) { + _parentImages = [[NSMutableDictionary alloc] init]; + _veryLightGreyColor = [[NSColor colorWithCalibratedRed:0.7 green:0.7 blue:0.7 alpha:1.0] retain]; + } + NSImage *baseImage = [super direction]; + NSImage *parentImage = [_parentImages objectForKey:baseImage]; + if (!parentImage) { + // make parent images a grey version of the leaf images + parentImage = [baseImage tintedImageWithColor:_veryLightGreyColor operation:NSCompositeSourceIn]; + [_parentImages setObject:parentImage forKey:baseImage]; + } + return parentImage; +} + + at end + Added: trunk/src/uimac14/ReconTableView.h =================================================================== --- trunk/src/uimac14/ReconTableView.h (rev 0) +++ trunk/src/uimac14/ReconTableView.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,43 @@ +// +// ReconTableView.h +// +// NSTableView extended to handle additional keyboard events for the reconcile window. +// The keyDown: method is redefined. +// +// Created by Trevor Jim on Wed Aug 27 2003. +// Copyright (c) 2003, 2014, licensed under GNU GPL. +// + +#import + + at interface ReconTableView : NSOutlineView { + BOOL editable; +} +- (BOOL)editable; +- (void)setEditable:(BOOL)x; +- (BOOL)validateItem:(SEL) action; +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem; +- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem; +- (IBAction)ignorePath:(id)sender; +- (IBAction)ignoreExt:(id)sender; +- (IBAction)ignoreName:(id)sender; +- (IBAction)copyLR:(id)sender; +- (IBAction)copyRL:(id)sender; +- (IBAction)leaveAlone:(id)sender; +- (IBAction)forceOlder:(id)sender; +- (IBAction)forceNewer:(id)sender; +- (IBAction)selectConflicts:(id)sender; +- (IBAction)revert:(id)sender; +- (IBAction)merge:(id)sender; +- (IBAction)showDiff:(id)sender; +- (BOOL)canDiffSelection; + at end + + at interface NSOutlineView (_UnisonExtras) +- (NSArray *)selectedObjects; +- (NSEnumerator *)selectedObjectEnumerator; +- (void)setSelectedObjects:(NSArray *)selection; + +- (void)expandChildrenIfSpace; + + at end Added: trunk/src/uimac14/ReconTableView.m =================================================================== --- trunk/src/uimac14/ReconTableView.m (rev 0) +++ trunk/src/uimac14/ReconTableView.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,298 @@ +// +// ReconTableView.m +// Unison +// +// Created by Trevor Jim on Wed Aug 27 2003. +// Copyright (c) 2003, 2014. See file COPYING for details. +// + +#import "ReconTableView.h" +#import "ReconItem.h" +#import "MyController.h" + + at implementation NSOutlineView (_UnisonExtras) + +- (NSArray *)selectedObjects +{ + NSMutableArray *result = [NSMutableArray array]; + NSIndexSet *set = [self selectedRowIndexes]; + NSUInteger index = [set firstIndex]; + while (index != NSNotFound) { + [result addObject:[self itemAtRow:index]]; + index = [set indexGreaterThanIndex: index]; + } + return result; +} + +- (void)setSelectedObjects:(NSArray *)selectedObjects +{ + NSMutableIndexSet *set = [NSMutableIndexSet indexSet]; + int i = [selectedObjects count]; + while (i--) { + int index = [self rowForItem:[selectedObjects objectAtIndex:i]]; + if (index >= 0) [set addIndex:index]; + } + [self selectRowIndexes:set byExtendingSelection:NO]; +} + +- (NSEnumerator *)selectedObjectEnumerator +{ + return [[self selectedObjects] objectEnumerator]; +} + +- (int)rowCapacityWithoutScrolling +{ + float bodyHeight = [self visibleRect].size.height; + bodyHeight -= [[self headerView] visibleRect].size.height; + return bodyHeight / ([self rowHeight] + 2.0); +} + +- (BOOL)_canAcceptRowCountWithoutScrolling:(int)rows +{ + return ([self numberOfRows] + rows) <= [self rowCapacityWithoutScrolling]; +} + +- (BOOL)_expandChildrenIfSpace:(id)parent level:(int)level +{ + BOOL didExpand = NO; + id dataSource = [self dataSource]; + int count = [dataSource outlineView:self numberOfChildrenOfItem:parent]; + if (level == 0) { + if (count && ([self isItemExpanded:parent] || [self _canAcceptRowCountWithoutScrolling:count])) { + [self expandItem:parent expandChildren:NO]; + didExpand = YES; + } + } else { + // try expanding each of our children. If all expand, then return YES, + // indicating that it may be worth trying the next level + int i; + for (i=0; i < count; i++) { + id child = [dataSource outlineView:self child:i ofItem:parent]; + didExpand = [self _expandChildrenIfSpace:child level:level-1] || didExpand; + } + } + + return didExpand; +} + +- (void)expandChildrenIfSpace +{ + int level = 1; + while ([self _expandChildrenIfSpace:nil level:level]) level++; +} + + at end + + at implementation ReconTableView + +- (BOOL)editable +{ + return editable; +} + +- (void)setEditable:(BOOL)x +{ + editable = x; +} + +- (BOOL)validateItem:(SEL) action +{ + if (action == @selector(selectAll:) + || action == @selector(selectConflicts:) + || action == @selector(copyLR:) + || action == @selector(copyRL:) + || action == @selector(leaveAlone:) + || action == @selector(forceNewer:) + || action == @selector(forceOlder:) + || action == @selector(revert:) + || action == @selector(ignorePath:) + || action == @selector(ignoreExt:) + || action == @selector(ignoreName:)) + return editable; + else if (action == @selector(merge:)) { + if (!editable) return NO; + else return [self canDiffSelection]; + } + else if (action == @selector(showDiff:)) { + if ((!editable) || (!([self numberOfSelectedRows]==1))) + return NO; + else return [self canDiffSelection]; + } + else return YES; +} + +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem +{ + return [self validateItem:[menuItem action]]; +} + +- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem +{ + return [self validateItem:[toolbarItem action]]; +} + +- (void)doIgnore:(unichar)c +{ + NSEnumerator *e = [self selectedObjectEnumerator]; + ReconItem *item, *last = nil; + while (item = [e nextObject]) { + [item doIgnore:c]; + last = item; + } + if (last) { // something was selected + MyController* controller = (MyController*) [self dataSource]; + last = [controller updateForIgnore:last]; + [self selectRowIndexes:[NSIndexSet indexSetWithIndex:[self rowForItem:last]] byExtendingSelection:NO]; + [self reloadData]; + } +} + +- (IBAction)ignorePath:(id)sender +{ + [self doIgnore:'I']; +} + +- (IBAction)ignoreExt:(id)sender +{ + [self doIgnore:'E']; +} + +- (IBAction)ignoreName:(id)sender +{ + [self doIgnore:'N']; +} + +- (void)doAction:(unichar)c +{ + int numSelected = 0; + NSEnumerator *e = [self selectedObjectEnumerator]; + ReconItem *item, *last = nil; + while (item = [e nextObject]) { + numSelected++; + [item doAction:c]; + last = item; + } + if (numSelected>0) { + int nextRow = [self rowForItem:last] + 1; + if (numSelected == 1 && [self numberOfRows] > nextRow && c!='d') { + // Move to next row, unless already at last row, or if more than one row selected + [self selectRowIndexes:[NSIndexSet indexSetWithIndex:nextRow] byExtendingSelection:NO]; + [self scrollRowToVisible:nextRow]; + } + [self reloadData]; + } +} + +- (IBAction)copyLR:(id)sender +{ + [self doAction:'>']; +} + +- (IBAction)copyRL:(id)sender +{ + [self doAction:'<']; +} + +- (IBAction)leaveAlone:(id)sender +{ + [self doAction:'/']; +} + +- (IBAction)forceOlder:(id)sender +{ + [self doAction:'-']; +} + +- (IBAction)forceNewer:(id)sender +{ + [self doAction:'+']; +} + +- (IBAction)selectConflicts:(id)sender +{ + [self deselectAll:self]; + MyController* controller = (MyController*) [self dataSource]; + NSMutableArray *reconItems = [controller reconItems]; + int i = 0; + for (; i < [reconItems count]; i++) { + ReconItem *item = [reconItems objectAtIndex:i]; + if ([item isConflict]) + [self selectRowIndexes:[NSIndexSet indexSetWithIndex:[self rowForItem:item]] byExtendingSelection:YES]; + } +} + +- (IBAction)revert:(id)sender +{ + [self doAction:'R']; +} + +- (IBAction)merge:(id)sender +{ + [self doAction:'m']; +} + +- (IBAction)showDiff:(id)sender +{ + [self doAction:'d']; +} + +/* There are menu commands for these, but we add some shortcuts so you don't + have to press the Command key */ +- (void)keyDown:(NSEvent *)event +{ + /* some keys return zero-length strings */ + if ([[event characters] length] == 0) { + [super keyDown:event]; + return; + } + + /* actions are disabled when when menu items are */ + if (!editable) { + [super keyDown:event]; + return; + } + + unichar c = [[event characters] characterAtIndex:0]; + switch (c) { + case '>': + case NSRightArrowFunctionKey: + [self doAction:'>']; + break; + case '<': + case NSLeftArrowFunctionKey: + [self doAction:'<']; + break; + case '?': + case '/': + [self doAction:'/']; + break; + default: + [super keyDown:event]; + break; + } +} + +- (BOOL)canDiffSelection +{ + BOOL canDiff = YES; + NSEnumerator *e = [self selectedObjectEnumerator]; + ReconItem *item; + while (item = [e nextObject]) { + if (![item canDiff]) canDiff= NO; + } + return canDiff; +} + +/* Override default highlight colour because it's hard to see the + conflict/resolution icons */ +- (id)_highlightColorForCell:(NSCell *)cell +{ + if(([[self window] firstResponder] == self) && + [[self window] isMainWindow] && + [[self window] isKeyWindow]) + + return [NSColor colorWithCalibratedRed:0.7 green:0.75 blue:0.8 alpha:1.0]; + else return [NSColor colorWithCalibratedRed:0.8 green:0.8 blue:0.8 alpha:1.0]; +} + + at end Added: trunk/src/uimac14/TrevorsUnison.icns =================================================================== (Binary files differ) Index: trunk/src/uimac14/TrevorsUnison.icns =================================================================== --- trunk/src/uimac14/TrevorsUnison.icns 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/TrevorsUnison.icns 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/TrevorsUnison.icns ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/Unison.icns =================================================================== (Binary files differ) Index: trunk/src/uimac14/Unison.icns =================================================================== --- trunk/src/uimac14/Unison.icns 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/Unison.icns 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/Unison.icns ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/UnisonToolbar.h =================================================================== --- trunk/src/uimac14/UnisonToolbar.h (rev 0) +++ trunk/src/uimac14/UnisonToolbar.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,33 @@ +// +// UnisonToolbar.h +// +// Extended NSToolbar with several views +// +// Created by Ben Willmore on Sun March 12 2006. +// Copyright (c) 2006, licensed under GNU GPL. +// + +#import + + at class ReconTableView, MyController; + + at interface UnisonToolbar : NSToolbar +#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) + +#endif +{ + ReconTableView* tableView; + MyController* myController; + NSString* currentView; + NSView* tableModeView; +} + +- initWithIdentifier:(NSString *) identifier :(MyController *) aController :(ReconTableView *) aTableView; +- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted; +- (NSArray *) itemIdentifiersForView: (NSString *) whichView; +- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar; +- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar; +- (void) setView: (NSString *) whichView; +- (void)takeTableModeView:(NSView *)view; + + at end Added: trunk/src/uimac14/UnisonToolbar.m =================================================================== --- trunk/src/uimac14/UnisonToolbar.m (rev 0) +++ trunk/src/uimac14/UnisonToolbar.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,216 @@ +// +// UnisonToolbar.h +// +// Extended NSToolbar with several views +// +// Created by Ben Willmore on Sun March 12 2006. +// Copyright (c) 2006, licensed under GNU GPL. +// + +#import "UnisonToolbar.h" +#import "MyController.h" + +static NSString* QuitItemIdentifier = @"Quit"; +static NSString* OpenItemIdentifier = @"Open"; +static NSString* NewItemIdentifier = @"New"; +static NSString* GoItemIdentifier = @"Go"; +static NSString* CancelItemIdentifier = @"Cancel"; +static NSString* SaveItemIdentifier = @"Save"; +static NSString* RestartItemIdentifier = @"Restart"; +static NSString* RescanItemIdentifier = @"Rescan"; +static NSString* RToLItemIdentifier = @"RToL"; +static NSString* MergeItemIdentifier = @"Merge"; +static NSString* LToRItemIdentifier = @"LToR"; +static NSString* SkipItemIdentifier = @"Skip"; +static NSString* DiffItemIdentifier = @"Diff"; +static NSString* TableModeIdentifier = @"TableMode"; + + at implementation UnisonToolbar + +- initWithIdentifier:(NSString *) identifier :(MyController *) aController :(ReconTableView *) aTableView { + + if ((self = [super initWithIdentifier: identifier])) { + [self setAllowsUserCustomization: NO]; + [self setAutosavesConfiguration: NO]; + [self setDelegate: self]; + myController = aController; + tableView = aTableView; + currentView = @""; + } + + return self; +} + +- (void)takeTableModeView:(NSView *)view +{ + tableModeView = [view retain]; + [view setHidden:YES]; +} + +- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdent willBeInsertedIntoToolbar:(BOOL) willBeInserted { + + NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease]; + if ([itemIdent isEqual: QuitItemIdentifier]) { + [toolbarItem setLabel: @"Quit"]; + [toolbarItem setImage: [NSImage imageNamed: @"quit.tif"]]; + [toolbarItem setTarget:NSApp]; + [toolbarItem setAction:@selector(terminate:)]; + } + else if ([itemIdent isEqual: OpenItemIdentifier]) { + [toolbarItem setLabel: @"Open"]; + [toolbarItem setImage: [NSImage imageNamed: @"go.tif"]]; + [toolbarItem setTarget:myController]; + [toolbarItem setAction:@selector(openButton:)]; + } + else if ([itemIdent isEqual: NewItemIdentifier]) { + [toolbarItem setLabel: @"New"]; + [toolbarItem setImage: [NSImage imageNamed: @"add.tif"]]; + [toolbarItem setTarget:myController]; + [toolbarItem setAction:@selector(createButton:)]; + } + else if ([itemIdent isEqual: CancelItemIdentifier]) { + [toolbarItem setLabel: @"Cancel"]; + [toolbarItem setImage: [NSImage imageNamed: @"restart.tif"]]; + [toolbarItem setTarget:myController]; + [toolbarItem setAction:@selector(chooseProfiles)]; + } + else if ([itemIdent isEqual: SaveItemIdentifier]) { + [toolbarItem setLabel: @"Save"]; + [toolbarItem setImage: [NSImage imageNamed: @"save.tif"]]; + [toolbarItem setTarget:myController]; + [toolbarItem setAction:@selector(saveProfileButton:)]; + } + else if ([itemIdent isEqual: GoItemIdentifier]) { + [toolbarItem setLabel: @"Go"]; + [toolbarItem setImage: [NSImage imageNamed: @"go.tif"]]; + [toolbarItem setTarget:myController]; + [toolbarItem setAction:@selector(syncButton:)]; + } + else if ([itemIdent isEqual: RestartItemIdentifier]) { + [toolbarItem setLabel: @"Restart"]; + [toolbarItem setImage: [NSImage imageNamed: @"restart.tif"]]; + [toolbarItem setTarget:myController]; + [toolbarItem setAction:@selector(restartButton:)]; + } + else if ([itemIdent isEqual: RescanItemIdentifier]) { + [toolbarItem setLabel: @"Rescan"]; + [toolbarItem setImage: [NSImage imageNamed: @"rescan.tif"]]; + [toolbarItem setTarget:myController]; + [toolbarItem setAction:@selector(rescan:)]; + } + else if ([itemIdent isEqual: RToLItemIdentifier]) { + [toolbarItem setLabel: @"Right to left"]; + [toolbarItem setImage: [NSImage imageNamed: @"left.tif"]]; + [toolbarItem setTarget:tableView]; + [toolbarItem setAction:@selector(copyRL:)]; + } + else if ([itemIdent isEqual: MergeItemIdentifier]) { + [toolbarItem setLabel: @"Merge"]; + [toolbarItem setImage: [NSImage imageNamed: @"merge.tif"]]; + [toolbarItem setTarget:tableView]; + [toolbarItem setAction:@selector(merge:)]; + } + else if ([itemIdent isEqual: LToRItemIdentifier]) { + [toolbarItem setLabel: @"Left to right"]; + [toolbarItem setImage: [NSImage imageNamed: @"right.tif"]]; + [toolbarItem setTarget:tableView]; + [toolbarItem setAction:@selector(copyLR:)]; + } + else if ([itemIdent isEqual: SkipItemIdentifier]) { + [toolbarItem setLabel: @"Skip"]; + [toolbarItem setImage: [NSImage imageNamed: @"skip.tif"]]; + [toolbarItem setTarget:tableView]; + [toolbarItem setAction:@selector(leaveAlone:)]; + } + else if ([itemIdent isEqual: DiffItemIdentifier]) { + [toolbarItem setLabel: @"Diff"]; + [toolbarItem setImage: [NSImage imageNamed: @"diff.tif"]]; + [toolbarItem setTarget:tableView]; + [toolbarItem setAction:@selector(showDiff:)]; + } + else if ([itemIdent isEqual: TableModeIdentifier]) { + [toolbarItem setLabel:@"Layout"]; + [toolbarItem setToolTip:@"Switch table nesting"]; + [tableModeView setHidden:NO]; + [toolbarItem setView:tableModeView]; + //[toolbarItem setMinSize:NSMakeSize(NSWidth([tableModeView frame]),NSHeight([tableModeView frame])+10)]; + //[toolbarItem setMaxSize:NSMakeSize(NSWidth([tableModeView frame]),NSHeight([tableModeView frame])+10)]; + } + + return toolbarItem; +} + +- (NSArray *) itemIdentifiersForView: (NSString *) whichView { + if ([whichView isEqual: @"chooseProfileView"]) { + return [NSArray arrayWithObjects: QuitItemIdentifier, NewItemIdentifier, OpenItemIdentifier, nil]; + } + else if ([whichView isEqual: @"preferencesView"]) { + return [NSArray arrayWithObjects: QuitItemIdentifier, SaveItemIdentifier, CancelItemIdentifier, nil]; + } + else if ([whichView isEqual: @"ConnectingView"]) { + return [NSArray arrayWithObjects: QuitItemIdentifier, nil]; + } + else if ([whichView isEqual: @"updatesView"]) { + return [NSArray arrayWithObjects: QuitItemIdentifier, + RestartItemIdentifier, + NSToolbarSpaceItemIdentifier, + GoItemIdentifier, + RescanItemIdentifier, + NSToolbarSpaceItemIdentifier, + RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, + SkipItemIdentifier, + NSToolbarSpaceItemIdentifier, + DiffItemIdentifier, + TableModeIdentifier, nil]; + } + else { + return [NSArray arrayWithObjects: QuitItemIdentifier, Nil]; + } +} + +- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar { + return [NSArray arrayWithObjects: QuitItemIdentifier, NewItemIdentifier, OpenItemIdentifier, nil]; +} + +- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar { + return [NSArray arrayWithObjects: QuitItemIdentifier, OpenItemIdentifier, NewItemIdentifier, + CancelItemIdentifier, SaveItemIdentifier, + GoItemIdentifier, RestartItemIdentifier, RescanItemIdentifier, + RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, + SkipItemIdentifier, DiffItemIdentifier, + NSToolbarSpaceItemIdentifier, nil]; +} + +- (void) setView: (NSString *) whichView { + if ([whichView isEqual:currentView]) return; + + currentView = whichView; + + int i; + NSArray *identifiers; + NSString *oldIdentifier; + NSString *newIdentifier; + + identifiers=[self itemIdentifiersForView:whichView]; + for (i=0; i<[identifiers count]; i++) { + newIdentifier = [identifiers objectAtIndex:i]; + if (i<[[self items] count]) { + oldIdentifier = [[[self items] objectAtIndex:i] itemIdentifier]; + if ([newIdentifier isEqual: oldIdentifier] ) { + [[[self items] objectAtIndex:i] setEnabled:YES]; + } + else { + [self removeItemAtIndex:i]; + [self insertItemWithItemIdentifier:newIdentifier atIndex:i]; + } + } + else { + [self insertItemWithItemIdentifier:newIdentifier atIndex:i]; + } + } + while ([[self items] count] > [identifiers count]) { + [self removeItemAtIndex:[identifiers count]]; + } +} + + at end Added: trunk/src/uimac14/cltool.c =================================================================== --- trunk/src/uimac14/cltool.c (rev 0) +++ trunk/src/uimac14/cltool.c 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,67 @@ +/* cltool.c + + This is a command-line tool for Mac OS X that looks up the unison + application, where ever it has been installed, and runs it. This + is intended to be installed in a standard place (e.g., + /usr/bin/unison) to make it easy to invoke unison as a server, or + to use unison from the command line when it has been installed with + a GUI. + + */ + +#import +#import +#include + +#define BUFSIZE 1024 +#define EXECPATH "/Contents/MacOS/Unison" + +int main(int argc, char **argv) { + + /* Look up the application by its bundle identifier, which is given + in the Info.plist file. This will continue to work even if the + user changes the name of the application, unlike + fullPathForApplication. */ + + FSRef fsref; + OSStatus status; + int len; + char buf[BUFSIZE]; + + status = LSFindApplicationForInfo(kLSUnknownCreator,CFSTR("edu.upenn.cis.Unison"),NULL,&fsref,NULL); + if (status) { + if (status == kLSApplicationNotFoundErr) { + fprintf(stderr,"Error: can't find the Unison application using the Launch Services database.\n"); + fprintf(stderr,"Try launching Unison from the Finder, and then try this again.\n",status); + } + else fprintf(stderr,"Error: can't find Unison application (%ld).\n",status); + exit(1); + } + + status = FSRefMakePath(&fsref,(UInt8 *)buf,BUFSIZE); + if (status) { + fprintf(stderr,"Error: problem building path to Unison application (%ld).\n",status); + exit(1); + } + + len = strlen(buf); + if (len + strlen(EXECPATH) + 1 > BUFSIZE) { + fprintf(stderr,"Error: path to Unison application exceeds internal buffer size (%d).\n",BUFSIZE); + exit(1); + } + strcat(buf,EXECPATH); + + /* It's important to pass the absolute path on to the GUI, + that's how it knows where to find the bundle, e.g., the + Info.plist file. */ + argv[0] = buf; + + // printf("The Unison executable is at %s\n",argv[0]); + // printf("Running...\n"); + + execv(argv[0],argv); + + /* If we get here the execv has failed; print an error message to stderr */ + perror("unison"); + exit(1); +} Added: trunk/src/uimac14/main.m =================================================================== --- trunk/src/uimac14/main.m (rev 0) +++ trunk/src/uimac14/main.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,53 @@ +// +// main.m +// uimac +// +// Created by Trevor Jim on Sun Aug 17 2003. +// Copyright (c) 2003, see file COPYING for details. +// + +#import +#import "Bridge.h" + +int main(int argc, const char *argv[]) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + int i; + + /* When you click-start or use the open command, the program is invoked with + a command-line arg of the form -psn_XXXXXXXXX. The XXXXXXXX is a "process + serial number" and it seems to be important for Carbon programs. We need + to get rid of it if it's there so the ocaml code won't exit. Note, the + extra arg is not added if the binary is invoked directly from the command + line without using the open command. */ + if (argc == 2 && strncmp(argv[1],"-psn_",5) == 0) { + argc--; + argv[1] = NULL; + } + + [Bridge startup:argv]; + + /* Check for invocations that don't start up the gui */ + for (i=1; i + + at interface SSSelectableToolbar : NSToolbar +{ + NSWindow* window; + NSView* blankView; + NSInteger defaultItemIndex; +} + at property (nonatomic, retain) IBOutlet NSWindow* window; + at property (nonatomic, assign) NSInteger defaultItemIndex; + +-(NSToolbarItem*)itemWithIdentifier:(NSString*)identifier; +// select the item with the given index, ordered as per the palette and ignoring +// all types of buttons except SSSelectableToolbarItem +-(void)selectItemWithIndex:(NSInteger)idx; +// Convert a selectable item index (ignoring all except selectable items in palette) +// to a main index which can be used for other purposes +-(NSInteger)selectableItemIndexToMainIndex:(NSInteger)idx; + at end Added: trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbar.m =================================================================== --- trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbar.m (rev 0) +++ trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbar.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,157 @@ +// +// SSToolbar.m +// SelectableToolbarHelper +// +// Created by Steven Streeting on 19/06/2011. +// Copyright 2011 Torus Knot Software Ltd. All rights reserved. +// + +#import "SSSelectableToolbar.h" +#import "SSSelectableToolbarItem.h" + + + at implementation SSSelectableToolbar + at synthesize window; + at synthesize defaultItemIndex; + +- (id) initWithIdentifier:(NSString *)identifier +{ + if (self = [super initWithIdentifier:identifier]) + { + blankView = [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]; + } + return self; +} + +- (void) dealloc +{ + [blankView release]; + [window release]; + [super dealloc]; + +} +-(IBAction)toolbarItemClicked:sender +{ + // this is really only here so I can set up a target / action which makes button clickable +} + +-(void)selectDefaultItem:sender +{ + // select the default item first time becomes key + [self selectItemWithIndex:defaultItemIndex]; + // Don't tell us again + [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeKeyNotification object:window]; + +} + +-(void) awakeFromNib +{ + // Set target / action on all buttons to make them clickable + NSArray* items = [self visibleItems]; + for (NSToolbarItem* item in items) + { + if ([item isKindOfClass:[SSSelectableToolbarItem class]]) + { + [item setTarget:self]; + [item setAction:@selector(toolbarItemClicked:)]; + } + } + + // Wait until window displayed before sizing (important for displaying in sheets) + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(selectDefaultItem:) + name:NSWindowDidBecomeKeyNotification + object:window]; + + +} + +-(NSToolbarItem*)itemWithIdentifier:(NSString*)identifier +{ + for (NSToolbarItem* item in [self items]) + { + if ([[item itemIdentifier] isEqual:identifier]) + return item; + } + return nil; +} + +- (void)setSelectedItemIdentifier:(NSString *)itemIdentifier +{ + [super setSelectedItemIdentifier:itemIdentifier]; + + NSToolbarItem* item = [self itemWithIdentifier:itemIdentifier]; + if ([item isKindOfClass:[SSSelectableToolbarItem class]]) + { + SSSelectableToolbarItem* ssitem = (SSSelectableToolbarItem*)item; + + NSView* view = [ssitem linkedView]; + if (view && window) + { + NSView* oldView = [window contentView]; + NSRect oldFrame = [oldView frame]; + NSRect newFrame = [view frame]; + NSRect oldWinFrame = [window frame]; + NSRect winFrame = oldWinFrame; + float toolbarHeight = NSHeight(oldWinFrame) - NSHeight(oldFrame); + + // resize + winFrame.size.width = newFrame.size.width; + winFrame.size.height = newFrame.size.height + toolbarHeight; + winFrame.origin.y -= NSHeight(winFrame) - NSHeight(oldWinFrame); + [window setContentView:blankView]; + [window setFrame:winFrame display:YES animate:YES]; + [window setContentView:view]; + + // change title + [window setTitle:[ssitem label]]; + + // tab to first control (if nextKeyView connected) + NSView* keyView = [view nextKeyView]; + if (keyView) + [window makeFirstResponder:keyView]; + + + } + } +} + +-(void)selectItemWithIndex:(NSInteger)idx +{ + NSInteger currIdx = 0; + for (NSToolbarItem* item in [self items]) + { + if ([item isKindOfClass:[SSSelectableToolbarItem class]]) + { + if (currIdx == idx) + { + [self setSelectedItemIdentifier:[item itemIdentifier]]; + return; + } + // We're only counting these types, ignore spacing and other default items + ++currIdx; + } + } + +} + +-(NSInteger)selectableItemIndexToMainIndex:(NSInteger)idx +{ + NSInteger selIdx = 0; + NSInteger mainIdx = 0; + for (NSToolbarItem* item in [self items]) + { + if ([item isKindOfClass:[SSSelectableToolbarItem class]]) + { + if (selIdx == idx) + { + return mainIdx; + } + ++selIdx; + } + ++mainIdx; + } + + return -1; +} + at end Added: trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbarItem.h =================================================================== --- trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbarItem.h (rev 0) +++ trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbarItem.h 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,19 @@ +// +// SSToolbarItem.h +// SelectableToolbarHelper +// +// Created by Steven Streeting on 19/06/2011. +// Copyright 2011 Torus Knot Software Ltd. All rights reserved. +// + +#import + + + at interface SSSelectableToolbarItem : NSToolbarItem +{ + NSView* linkedView; +} + + at property (nonatomic, retain) IBOutlet NSView* linkedView; + + at end Added: trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbarItem.m =================================================================== --- trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbarItem.m (rev 0) +++ trunk/src/uimac14/ssselectabletoolbar/SSSelectableToolbarItem.m 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,22 @@ +// +// SSToolbarItem.m +// SelectableToolbarHelper +// +// Created by Steven Streeting on 19/06/2011. +// Copyright 2011 Torus Knot Software Ltd. All rights reserved. +// + +#import "SSSelectableToolbarItem.h" + + + at implementation SSSelectableToolbarItem + + at synthesize linkedView; + +-(void) dealloc +{ + [linkedView release]; + [super dealloc]; +} + + at end Added: trunk/src/uimac14/tableicons/Change_Absent.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Change_Absent.png =================================================================== --- trunk/src/uimac14/tableicons/Change_Absent.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Change_Absent.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Change_Absent.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/Change_Created.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Change_Created.png =================================================================== --- trunk/src/uimac14/tableicons/Change_Created.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Change_Created.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Change_Created.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/Change_Deleted.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Change_Deleted.png =================================================================== --- trunk/src/uimac14/tableicons/Change_Deleted.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Change_Deleted.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Change_Deleted.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/Change_Modified.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Change_Modified.png =================================================================== --- trunk/src/uimac14/tableicons/Change_Modified.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Change_Modified.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Change_Modified.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/Change_PropsChanged.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Change_PropsChanged.png =================================================================== --- trunk/src/uimac14/tableicons/Change_PropsChanged.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Change_PropsChanged.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Change_PropsChanged.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/Change_Unmodified.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Change_Unmodified.png =================================================================== --- trunk/src/uimac14/tableicons/Change_Unmodified.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Change_Unmodified.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Change_Unmodified.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/Outline-Deep.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Outline-Deep.png =================================================================== --- trunk/src/uimac14/tableicons/Outline-Deep.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Outline-Deep.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Outline-Deep.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/Outline-Flat.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Outline-Flat.png =================================================================== --- trunk/src/uimac14/tableicons/Outline-Flat.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Outline-Flat.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Outline-Flat.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/Outline-Flattened.png =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/Outline-Flattened.png =================================================================== --- trunk/src/uimac14/tableicons/Outline-Flattened.png 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/Outline-Flattened.png 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/Outline-Flattened.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-conflict.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-conflict.tif =================================================================== --- trunk/src/uimac14/tableicons/table-conflict.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-conflict.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-conflict.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-error.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-error.tif =================================================================== --- trunk/src/uimac14/tableicons/table-error.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-error.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-error.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-left-blue.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-left-blue.tif =================================================================== --- trunk/src/uimac14/tableicons/table-left-blue.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-left-blue.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-left-blue.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-left-green.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-left-green.tif =================================================================== --- trunk/src/uimac14/tableicons/table-left-green.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-left-green.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-left-green.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-merge.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-merge.tif =================================================================== --- trunk/src/uimac14/tableicons/table-merge.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-merge.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-merge.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-mixed.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-mixed.tif =================================================================== --- trunk/src/uimac14/tableicons/table-mixed.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-mixed.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-mixed.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-right-blue.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-right-blue.tif =================================================================== --- trunk/src/uimac14/tableicons/table-right-blue.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-right-blue.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-right-blue.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-right-green.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-right-green.tif =================================================================== --- trunk/src/uimac14/tableicons/table-right-green.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-right-green.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-right-green.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/tableicons/table-skip.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/tableicons/table-skip.tif =================================================================== --- trunk/src/uimac14/tableicons/table-skip.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/tableicons/table-skip.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/tableicons/table-skip.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/add.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/add.tif =================================================================== --- trunk/src/uimac14/toolbar/add.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/add.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/add.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/diff.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/diff.tif =================================================================== --- trunk/src/uimac14/toolbar/diff.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/diff.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/diff.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/go.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/go.tif =================================================================== --- trunk/src/uimac14/toolbar/go.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/go.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/go.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/left.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/left.tif =================================================================== --- trunk/src/uimac14/toolbar/left.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/left.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/left.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/merge.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/merge.tif =================================================================== --- trunk/src/uimac14/toolbar/merge.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/merge.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/merge.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/quit.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/quit.tif =================================================================== --- trunk/src/uimac14/toolbar/quit.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/quit.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/quit.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/rescan.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/rescan.tif =================================================================== --- trunk/src/uimac14/toolbar/rescan.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/rescan.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/rescan.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/restart.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/restart.tif =================================================================== --- trunk/src/uimac14/toolbar/restart.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/restart.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/restart.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/right.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/right.tif =================================================================== --- trunk/src/uimac14/toolbar/right.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/right.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/right.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/save.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/save.tif =================================================================== --- trunk/src/uimac14/toolbar/save.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/save.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/save.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/toolbar/skip.tif =================================================================== (Binary files differ) Index: trunk/src/uimac14/toolbar/skip.tif =================================================================== --- trunk/src/uimac14/toolbar/skip.tif 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimac14/toolbar/skip.tif 2014-07-05 21:55:19 UTC (rev 527) Property changes on: trunk/src/uimac14/toolbar/skip.tif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/src/uimac14/uimacnew.xcodeproj/project.pbxproj =================================================================== --- trunk/src/uimac14/uimacnew.xcodeproj/project.pbxproj (rev 0) +++ trunk/src/uimac14/uimacnew.xcodeproj/project.pbxproj 2014-07-05 21:55:19 UTC (rev 527) @@ -0,0 +1,796 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXAggregateTarget section */ + 2A124E780DE1C48400524237 /* Create ExternalSettings */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 2A124E7C0DE1C4A200524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */; + buildPhases = ( + 2A124E7E0DE1C4BE00524237 /* Run Script (version, ocaml lib dir) */, + ); + dependencies = ( + ); + name = "Create ExternalSettings"; + productName = "Create ExternalSettings"; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A3C3F7B09922D4900E404E9 /* NotificationController.m */; }; + 2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E282CC70D9AE2B000439D01 /* unison-blob.o */; }; + 44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */; }; + 44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */; }; + 44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */; }; + 44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */; }; + 44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */; }; + 44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */; }; + 44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */; }; + 44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */; }; + 44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */; }; + 44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */; }; + 44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */; }; + 44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */; }; + 440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */; }; + 440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */; }; + 440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */; }; + 440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in Resources */ = {isa = PBXBuildFile; fileRef = 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */; }; + 445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */; }; + 445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A29260BFA5C1200E4E641 /* Outline-Flat.png */; }; + 445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources */ = {isa = PBXBuildFile; fileRef = 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */; }; + 445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */; }; + 449F03E10BE00DE9003F15C8 /* Bridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 449F03DF0BE00DE9003F15C8 /* Bridge.m */; }; + 44A794A10BE16C380069680C /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44A794A00BE16C380069680C /* ExceptionHandling.framework */; }; + 44A797F40BE3F9B70069680C /* table-mixed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 44A797F10BE3F9B70069680C /* table-mixed.tif */; }; + 44F472B10C0DB735006428EF /* Change_Absent.png in Resources */ = {isa = PBXBuildFile; fileRef = 44F472AF0C0DB735006428EF /* Change_Absent.png */; }; + 44F472B20C0DB735006428EF /* Change_Unmodified.png in Resources */ = {isa = PBXBuildFile; fileRef = 44F472B00C0DB735006428EF /* Change_Unmodified.png */; }; + 69C625E70664EC3300B3C46A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; + 69C625E80664EC3300B3C46A /* Unison.icns in Resources */ = {isa = PBXBuildFile; fileRef = 69C625CA0664E94E00B3C46A /* Unison.icns */; }; + 69C625EA0664EC3300B3C46A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; + 69C625EB0664EC3300B3C46A /* MyController.m in Sources */ = {isa = PBXBuildFile; fileRef = 69660DC704F08CC100CF23A4 /* MyController.m */; }; + 69C625EC0664EC3300B3C46A /* ProfileController.m in Sources */ = {isa = PBXBuildFile; fileRef = 690F564504F11EC300CF23A4 /* ProfileController.m */; }; + 69C625ED0664EC3300B3C46A /* ReconItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */; }; + 69C625EE0664EC3300B3C46A /* ReconTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 69BA7DA904FD695200CF23A4 /* ReconTableView.m */; }; + 69C625EF0664EC3300B3C46A /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 697985CE050CFA2D00CF23A4 /* PreferencesController.m */; }; + 69C625F00664EC3300B3C46A /* ProfileTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 691CE181051BB44A00CF23A4 /* ProfileTableView.m */; }; + 69C625F20664EC3300B3C46A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + 69E407BA07EB95AA00D37AA1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69E407B907EB95AA00D37AA1 /* Security.framework */; }; + 8450B1381918859E00A2C4D6 /* ColorGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8450B1371918859E00A2C4D6 /* ColorGradientView.m */; }; + 849BE4FF191AC10E001B6FBF /* README in Resources */ = {isa = PBXBuildFile; fileRef = 849BE4FA191AC10E001B6FBF /* README */; }; + 849BE500191AC10E001B6FBF /* SSSelectableToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */; }; + 849BE501191AC10E001B6FBF /* SSSelectableToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */; }; + B518071C09D6652100B1B21F /* add.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071209D6652100B1B21F /* add.tif */; }; + B518071D09D6652100B1B21F /* diff.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071309D6652100B1B21F /* diff.tif */; }; + B518071E09D6652100B1B21F /* go.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071409D6652100B1B21F /* go.tif */; }; + B518071F09D6652100B1B21F /* left.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071509D6652100B1B21F /* left.tif */; }; + B518072009D6652100B1B21F /* merge.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071609D6652100B1B21F /* merge.tif */; }; + B518072109D6652100B1B21F /* quit.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071709D6652100B1B21F /* quit.tif */; }; + B518072209D6652100B1B21F /* restart.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071809D6652100B1B21F /* restart.tif */; }; + B518072309D6652100B1B21F /* right.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071909D6652100B1B21F /* right.tif */; }; + B518072409D6652100B1B21F /* save.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071A09D6652100B1B21F /* save.tif */; }; + B518072509D6652100B1B21F /* skip.tif in Resources */ = {isa = PBXBuildFile; fileRef = B518071B09D6652100B1B21F /* skip.tif */; }; + B554004109C4E5AA0089E1C3 /* UnisonToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */; }; + B5B44C1909DF61A4000DC7AF /* table-conflict.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1109DF61A4000DC7AF /* table-conflict.tif */; }; + B5B44C1A09DF61A4000DC7AF /* table-error.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1209DF61A4000DC7AF /* table-error.tif */; }; + B5B44C1B09DF61A4000DC7AF /* table-left-blue.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */; }; + B5B44C1C09DF61A4000DC7AF /* table-left-green.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1409DF61A4000DC7AF /* table-left-green.tif */; }; + B5B44C1D09DF61A4000DC7AF /* table-merge.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1509DF61A4000DC7AF /* table-merge.tif */; }; + B5B44C1E09DF61A4000DC7AF /* table-right-blue.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */; }; + B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1709DF61A4000DC7AF /* table-right-green.tif */; }; + B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5B44C1809DF61A4000DC7AF /* table-skip.tif */; }; + B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */ = {isa = PBXBuildFile; fileRef = B5E03B3809E38B9E0058C7B9 /* rescan.tif */; }; + BB1ADE26114AEB1100575BFC /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBE2BCAC11355CDD00B187F2 /* Growl.framework */; }; + BBE2BCAE11355CDD00B187F2 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBE2BCAC11355CDD00B187F2 /* Growl.framework */; }; + DE2444D610C294EA007E1546 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DE2444D410C294EA007E1546 /* MainMenu.xib */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 2A124E7F0DE1C4E400524237 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 2A124E780DE1C48400524237; + remoteInfo = "Create ExternalSettings"; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 2A3C3F3709922AA600E404E9 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + BB1ADE26114AEB1100575BFC /* Growl.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + BB6E50CF10CAA57600E23F8A /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 2A3C3F7A09922D4900E404E9 /* NotificationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationController.h; sourceTree = ""; }; + 2A3C3F7B09922D4900E404E9 /* NotificationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationController.m; sourceTree = ""; }; + 2E282CC70D9AE2B000439D01 /* unison-blob.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = "unison-blob.o"; path = "../unison-blob.o"; sourceTree = SOURCE_ROOT; }; + 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ExternalSettings.xcconfig; sourceTree = ""; }; + 44042CB30BE4FC9B00A6BBB2 /* ProgressCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProgressCell.h; sourceTree = ""; }; + 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProgressCell.m; sourceTree = ""; }; + 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarAdvanced.png; path = progressicons/ProgressBarAdvanced.png; sourceTree = ""; }; + 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarBlue.png; path = progressicons/ProgressBarBlue.png; sourceTree = ""; }; + 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndAdvanced.png; path = progressicons/ProgressBarEndAdvanced.png; sourceTree = ""; }; + 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndBlue.png; path = progressicons/ProgressBarEndBlue.png; sourceTree = ""; }; + 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGray.png; path = progressicons/ProgressBarEndGray.png; sourceTree = ""; }; + 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndGreen.png; path = progressicons/ProgressBarEndGreen.png; sourceTree = ""; }; + 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarEndWhite.png; path = progressicons/ProgressBarEndWhite.png; sourceTree = ""; }; + 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarGray.png; path = progressicons/ProgressBarGray.png; sourceTree = ""; }; + 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarGreen.png; path = progressicons/ProgressBarGreen.png; sourceTree = ""; }; + 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarLightGreen.png; path = progressicons/ProgressBarLightGreen.png; sourceTree = ""; }; + 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ProgressBarWhite.png; path = progressicons/ProgressBarWhite.png; sourceTree = ""; }; + 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Created.png; sourceTree = ""; }; + 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Deleted.png; sourceTree = ""; }; + 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Modified.png; sourceTree = ""; }; + 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_PropsChanged.png; sourceTree = ""; }; + 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Deep.png"; sourceTree = ""; }; + 445A29260BFA5C1200E4E641 /* Outline-Flat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Flat.png"; sourceTree = ""; }; + 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Outline-Flattened.png"; sourceTree = ""; }; + 445A2A5B0BFAB6A100E4E641 /* ImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageAndTextCell.h; sourceTree = ""; }; + 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ImageAndTextCell.m; sourceTree = ""; }; + 449F03DE0BE00DE9003F15C8 /* Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bridge.h; sourceTree = ""; }; + 449F03DF0BE00DE9003F15C8 /* Bridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Bridge.m; sourceTree = ""; }; + 44A794A00BE16C380069680C /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = ""; }; + 44A797F10BE3F9B70069680C /* table-mixed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-mixed.tif"; sourceTree = ""; }; + 44F472AF0C0DB735006428EF /* Change_Absent.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Absent.png; sourceTree = ""; }; + 44F472B00C0DB735006428EF /* Change_Unmodified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Change_Unmodified.png; sourceTree = ""; }; + 690F564404F11EC300CF23A4 /* ProfileController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProfileController.h; sourceTree = ""; }; + 690F564504F11EC300CF23A4 /* ProfileController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProfileController.m; sourceTree = ""; }; + 691CE180051BB44A00CF23A4 /* ProfileTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ProfileTableView.h; sourceTree = ""; }; + 691CE181051BB44A00CF23A4 /* ProfileTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ProfileTableView.m; sourceTree = ""; }; + 69660DC604F08CC100CF23A4 /* MyController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyController.h; sourceTree = ""; }; + 69660DC704F08CC100CF23A4 /* MyController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MyController.m; sourceTree = ""; }; + 697985CD050CFA2D00CF23A4 /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = ""; }; + 697985CE050CFA2D00CF23A4 /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = ""; }; + 69BA7DA804FD695200CF23A4 /* ReconTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReconTableView.h; sourceTree = ""; }; + 69BA7DA904FD695200CF23A4 /* ReconTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReconTableView.m; sourceTree = ""; }; + 69C625CA0664E94E00B3C46A /* Unison.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Unison.icns; sourceTree = ""; }; + 69C625F40664EC3300B3C46A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 69C625F50664EC3300B3C46A /* Unison.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Unison.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ReconItem.m; sourceTree = ""; }; + 69D3C6FA04F1CC3700CF23A4 /* ReconItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ReconItem.h; sourceTree = ""; }; + 69E407B907EB95AA00D37AA1 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = ""; }; + 8450B1361918859E00A2C4D6 /* ColorGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorGradientView.h; sourceTree = ""; }; + 8450B1371918859E00A2C4D6 /* ColorGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColorGradientView.m; sourceTree = ""; }; + 849BE4FA191AC10E001B6FBF /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; + 849BE4FB191AC10E001B6FBF /* SSSelectableToolbar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSSelectableToolbar.h; sourceTree = ""; }; + 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSSelectableToolbar.m; sourceTree = ""; }; + 849BE4FD191AC10E001B6FBF /* SSSelectableToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSSelectableToolbarItem.h; sourceTree = ""; }; + 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSSelectableToolbarItem.m; sourceTree = ""; }; + B518071209D6652100B1B21F /* add.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = add.tif; sourceTree = ""; }; + B518071309D6652100B1B21F /* diff.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = diff.tif; sourceTree = ""; }; + B518071409D6652100B1B21F /* go.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = go.tif; sourceTree = ""; }; + B518071509D6652100B1B21F /* left.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = left.tif; sourceTree = ""; }; + B518071609D6652100B1B21F /* merge.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = merge.tif; sourceTree = ""; }; + B518071709D6652100B1B21F /* quit.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = quit.tif; sourceTree = ""; }; + B518071809D6652100B1B21F /* restart.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = restart.tif; sourceTree = ""; }; + B518071909D6652100B1B21F /* right.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = right.tif; sourceTree = ""; }; + B518071A09D6652100B1B21F /* save.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = save.tif; sourceTree = ""; }; + B518071B09D6652100B1B21F /* skip.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = skip.tif; sourceTree = ""; }; + B554003E09C4E5A00089E1C3 /* UnisonToolbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UnisonToolbar.h; sourceTree = ""; }; + B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UnisonToolbar.m; sourceTree = ""; }; + B5B44C1109DF61A4000DC7AF /* table-conflict.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-conflict.tif"; sourceTree = ""; }; + B5B44C1209DF61A4000DC7AF /* table-error.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-error.tif"; sourceTree = ""; }; + B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-left-blue.tif"; sourceTree = ""; }; + B5B44C1409DF61A4000DC7AF /* table-left-green.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-left-green.tif"; sourceTree = ""; }; + B5B44C1509DF61A4000DC7AF /* table-merge.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-merge.tif"; sourceTree = ""; }; + B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-right-blue.tif"; sourceTree = ""; }; + B5B44C1709DF61A4000DC7AF /* table-right-green.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-right-green.tif"; sourceTree = ""; }; + B5B44C1809DF61A4000DC7AF /* table-skip.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "table-skip.tif"; sourceTree = ""; }; + B5E03B3809E38B9E0058C7B9 /* rescan.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = rescan.tif; sourceTree = ""; }; + BBE2BCAC11355CDD00B187F2 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = Frameworks/Growl.framework; sourceTree = ""; }; + DE2444D510C294EA007E1546 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 69C625F10664EC3300B3C46A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 69C625F20664EC3300B3C46A /* Cocoa.framework in Frameworks */, + 69E407BA07EB95AA00D37AA1 /* Security.framework in Frameworks */, + 44A794A10BE16C380069680C /* ExceptionHandling.framework in Frameworks */, + 2E282CC80D9AE2B000439D01 /* unison-blob.o in Frameworks */, + BBE2BCAE11355CDD00B187F2 /* Growl.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 19C28FACFE9D520D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 69C625F50664EC3300B3C46A /* Unison.app */, + ); + name = Products; + sourceTree = ""; + }; + 29B97314FDCFA39411CA2CEA /* uimac */ = { + isa = PBXGroup; + children = ( + 44042D0F0BE52AD700A6BBB2 /* progressicons */, + B5B44C1009DF61A4000DC7AF /* tableicons */, + B518071109D6652000B1B21F /* toolbar */, + 44A795C90BE2B91B0069680C /* Classes */, + 29B97315FDCFA39411CA2CEA /* Other Sources */, + 29B97317FDCFA39411CA2CEA /* Resources */, + 29B97323FDCFA39411CA2CEA /* Frameworks */, + 19C28FACFE9D520D11CA2CBB /* Products */, + 69C625F40664EC3300B3C46A /* Info.plist */, + 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */, + 2E282CB80D9AE16300439D01 /* External objects */, + ); + name = uimac; + sourceTree = ""; + }; + 29B97315FDCFA39411CA2CEA /* Other Sources */ = { + isa = PBXGroup; + children = ( + 29B97316FDCFA39411CA2CEA /* main.m */, + ); + name = "Other Sources"; + sourceTree = ""; + }; + 29B97317FDCFA39411CA2CEA /* Resources */ = { + isa = PBXGroup; + children = ( + DE2444D410C294EA007E1546 /* MainMenu.xib */, + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, + 69C625CA0664E94E00B3C46A /* Unison.icns */, + ); + name = Resources; + sourceTree = ""; + }; + 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, + BBE2BCAC11355CDD00B187F2 /* Growl.framework */, + 44A794A00BE16C380069680C /* ExceptionHandling.framework */, + 69E407B907EB95AA00D37AA1 /* Security.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 2E282CB80D9AE16300439D01 /* External objects */ = { + isa = PBXGroup; + children = ( + 2E282CC70D9AE2B000439D01 /* unison-blob.o */, + ); + name = "External objects"; + sourceTree = ""; + }; + 44042D0F0BE52AD700A6BBB2 /* progressicons */ = { + isa = PBXGroup; + children = ( + 44042D100BE52AED00A6BBB2 /* ProgressBarAdvanced.png */, + 44042D110BE52AED00A6BBB2 /* ProgressBarBlue.png */, + 44042D120BE52AED00A6BBB2 /* ProgressBarEndAdvanced.png */, + 44042D130BE52AED00A6BBB2 /* ProgressBarEndBlue.png */, + 44042D140BE52AED00A6BBB2 /* ProgressBarEndGray.png */, + 44042D150BE52AED00A6BBB2 /* ProgressBarEndGreen.png */, + 44042D160BE52AED00A6BBB2 /* ProgressBarEndWhite.png */, + 44042D170BE52AED00A6BBB2 /* ProgressBarGray.png */, + 44042D180BE52AED00A6BBB2 /* ProgressBarGreen.png */, + 44042D190BE52AED00A6BBB2 /* ProgressBarLightGreen.png */, + 44042D1A0BE52AED00A6BBB2 /* ProgressBarWhite.png */, + ); + name = progressicons; + sourceTree = ""; + }; + 44A795C90BE2B91B0069680C /* Classes */ = { + isa = PBXGroup; + children = ( + 849BE4F9191AC10E001B6FBF /* ssselectabletoolbar */, + 8450B1361918859E00A2C4D6 /* ColorGradientView.h */, + 8450B1371918859E00A2C4D6 /* ColorGradientView.m */, + 69660DC604F08CC100CF23A4 /* MyController.h */, + 69660DC704F08CC100CF23A4 /* MyController.m */, + 2A3C3F7A09922D4900E404E9 /* NotificationController.h */, + 2A3C3F7B09922D4900E404E9 /* NotificationController.m */, + 69BA7DA804FD695200CF23A4 /* ReconTableView.h */, + 69BA7DA904FD695200CF23A4 /* ReconTableView.m */, + 69D3C6FA04F1CC3700CF23A4 /* ReconItem.h */, + 69D3C6F904F1CC3700CF23A4 /* ReconItem.m */, + 445A2A5B0BFAB6A100E4E641 /* ImageAndTextCell.h */, + 445A2A5D0BFAB6C300E4E641 /* ImageAndTextCell.m */, + 44042CB30BE4FC9B00A6BBB2 /* ProgressCell.h */, + 44042CB40BE4FC9B00A6BBB2 /* ProgressCell.m */, + 690F564404F11EC300CF23A4 /* ProfileController.h */, + 690F564504F11EC300CF23A4 /* ProfileController.m */, + 697985CD050CFA2D00CF23A4 /* PreferencesController.h */, + 697985CE050CFA2D00CF23A4 /* PreferencesController.m */, + 691CE180051BB44A00CF23A4 /* ProfileTableView.h */, + 691CE181051BB44A00CF23A4 /* ProfileTableView.m */, + B554003E09C4E5A00089E1C3 /* UnisonToolbar.h */, + B554004009C4E5AA0089E1C3 /* UnisonToolbar.m */, + 449F03DE0BE00DE9003F15C8 /* Bridge.h */, + 449F03DF0BE00DE9003F15C8 /* Bridge.m */, + ); + name = Classes; + sourceTree = ""; + }; + 849BE4F9191AC10E001B6FBF /* ssselectabletoolbar */ = { + isa = PBXGroup; + children = ( + 849BE4FA191AC10E001B6FBF /* README */, + 849BE4FB191AC10E001B6FBF /* SSSelectableToolbar.h */, + 849BE4FC191AC10E001B6FBF /* SSSelectableToolbar.m */, + 849BE4FD191AC10E001B6FBF /* SSSelectableToolbarItem.h */, + 849BE4FE191AC10E001B6FBF /* SSSelectableToolbarItem.m */, + ); + path = ssselectabletoolbar; + sourceTree = ""; + }; + B518071109D6652000B1B21F /* toolbar */ = { + isa = PBXGroup; + children = ( + B5E03B3809E38B9E0058C7B9 /* rescan.tif */, + B518071209D6652100B1B21F /* add.tif */, + B518071309D6652100B1B21F /* diff.tif */, + B518071409D6652100B1B21F /* go.tif */, + B518071509D6652100B1B21F /* left.tif */, + B518071609D6652100B1B21F /* merge.tif */, + B518071709D6652100B1B21F /* quit.tif */, + B518071809D6652100B1B21F /* restart.tif */, + B518071909D6652100B1B21F /* right.tif */, + B518071A09D6652100B1B21F /* save.tif */, + B518071B09D6652100B1B21F /* skip.tif */, + ); + path = toolbar; + sourceTree = ""; + }; + B5B44C1009DF61A4000DC7AF /* tableicons */ = { + isa = PBXGroup; + children = ( + 44F472AF0C0DB735006428EF /* Change_Absent.png */, + 44F472B00C0DB735006428EF /* Change_Unmodified.png */, + 440EEAF60C03F0B800ACAAB0 /* Change_Deleted.png */, + 440EEAF70C03F0B800ACAAB0 /* Change_Modified.png */, + 440EEAF80C03F0B800ACAAB0 /* Change_PropsChanged.png */, + 440EEAF20C03EC3D00ACAAB0 /* Change_Created.png */, + 44A797F10BE3F9B70069680C /* table-mixed.tif */, + B5B44C1109DF61A4000DC7AF /* table-conflict.tif */, + B5B44C1209DF61A4000DC7AF /* table-error.tif */, + B5B44C1309DF61A4000DC7AF /* table-left-blue.tif */, + B5B44C1409DF61A4000DC7AF /* table-left-green.tif */, + B5B44C1509DF61A4000DC7AF /* table-merge.tif */, + B5B44C1609DF61A4000DC7AF /* table-right-blue.tif */, + B5B44C1709DF61A4000DC7AF /* table-right-green.tif */, + B5B44C1809DF61A4000DC7AF /* table-skip.tif */, + 445A291A0BFA5B3300E4E641 /* Outline-Deep.png */, + 445A29260BFA5C1200E4E641 /* Outline-Flat.png */, + 445A29280BFA5C1B00E4E641 /* Outline-Flattened.png */, + ); + path = tableicons; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 69C625DD0664EC3300B3C46A /* uimac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2A3C3F280992245300E404E9 /* Build configuration list for PBXNativeTarget "uimac" */; + buildPhases = ( + 2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */, + 69C625E50664EC3300B3C46A /* Resources */, + 69C625E90664EC3300B3C46A /* Sources */, + 69C625F10664EC3300B3C46A /* Frameworks */, + 2A3C3F3709922AA600E404E9 /* CopyFiles */, + BB6E50CF10CAA57600E23F8A /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 2A124E800DE1C4E400524237 /* PBXTargetDependency */, + ); + name = uimac; + productInstallPath = "$(HOME)/Applications"; + productName = uimac; + productReference = 69C625F50664EC3300B3C46A /* Unison.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0410; + }; + buildConfigurationList = 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 29B97314FDCFA39411CA2CEA /* uimac */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 69C625DD0664EC3300B3C46A /* uimac */, + 2A124E780DE1C48400524237 /* Create ExternalSettings */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 69C625E50664EC3300B3C46A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 69C625E70664EC3300B3C46A /* InfoPlist.strings in Resources */, + 69C625E80664EC3300B3C46A /* Unison.icns in Resources */, + B518071C09D6652100B1B21F /* add.tif in Resources */, + B518071D09D6652100B1B21F /* diff.tif in Resources */, + B518071E09D6652100B1B21F /* go.tif in Resources */, + B518071F09D6652100B1B21F /* left.tif in Resources */, + B518072009D6652100B1B21F /* merge.tif in Resources */, + B518072109D6652100B1B21F /* quit.tif in Resources */, + B518072209D6652100B1B21F /* restart.tif in Resources */, + B518072309D6652100B1B21F /* right.tif in Resources */, + B518072409D6652100B1B21F /* save.tif in Resources */, + B518072509D6652100B1B21F /* skip.tif in Resources */, + B5B44C1909DF61A4000DC7AF /* table-conflict.tif in Resources */, + B5B44C1A09DF61A4000DC7AF /* table-error.tif in Resources */, + B5B44C1B09DF61A4000DC7AF /* table-left-blue.tif in Resources */, + B5B44C1C09DF61A4000DC7AF /* table-left-green.tif in Resources */, + B5B44C1D09DF61A4000DC7AF /* table-merge.tif in Resources */, + B5B44C1E09DF61A4000DC7AF /* table-right-blue.tif in Resources */, + B5B44C1F09DF61A4000DC7AF /* table-right-green.tif in Resources */, + B5B44C2009DF61A4000DC7AF /* table-skip.tif in Resources */, + B5E03B3909E38B9E0058C7B9 /* rescan.tif in Resources */, + 44A797F40BE3F9B70069680C /* table-mixed.tif in Resources */, + 44042D1B0BE52AED00A6BBB2 /* ProgressBarAdvanced.png in Resources */, + 44042D1C0BE52AEE00A6BBB2 /* ProgressBarBlue.png in Resources */, + 44042D1D0BE52AEE00A6BBB2 /* ProgressBarEndAdvanced.png in Resources */, + 44042D1E0BE52AEE00A6BBB2 /* ProgressBarEndBlue.png in Resources */, + 44042D1F0BE52AEE00A6BBB2 /* ProgressBarEndGray.png in Resources */, + 44042D200BE52AEE00A6BBB2 /* ProgressBarEndGreen.png in Resources */, + 44042D210BE52AEE00A6BBB2 /* ProgressBarEndWhite.png in Resources */, + 44042D220BE52AEE00A6BBB2 /* ProgressBarGray.png in Resources */, + 44042D230BE52AEE00A6BBB2 /* ProgressBarGreen.png in Resources */, + 44042D240BE52AEE00A6BBB2 /* ProgressBarLightGreen.png in Resources */, + 44042D250BE52AEE00A6BBB2 /* ProgressBarWhite.png in Resources */, + 445A291B0BFA5B3300E4E641 /* Outline-Deep.png in Resources */, + 445A29270BFA5C1200E4E641 /* Outline-Flat.png in Resources */, + 445A29290BFA5C1B00E4E641 /* Outline-Flattened.png in Resources */, + 440EEAF30C03EC3D00ACAAB0 /* Change_Created.png in Resources */, + 440EEAF90C03F0B800ACAAB0 /* Change_Deleted.png in Resources */, + 440EEAFA0C03F0B800ACAAB0 /* Change_Modified.png in Resources */, + 440EEAFB0C03F0B800ACAAB0 /* Change_PropsChanged.png in Resources */, + 44F472B10C0DB735006428EF /* Change_Absent.png in Resources */, + 44F472B20C0DB735006428EF /* Change_Unmodified.png in Resources */, + DE2444D610C294EA007E1546 /* MainMenu.xib in Resources */, + 849BE4FF191AC10E001B6FBF /* README in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 2A124E7E0DE1C4BE00524237 /* Run Script (version, ocaml lib dir) */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script (version, ocaml lib dir)"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ -x /usr/libexec/path_helper ]; then\n eval `/usr/libexec/path_helper -s`\nfi\nif [ ! -x ${PROJECT_DIR}/../Makefile.ProjectInfo ]; then\n if [ ! -x ${PROJECT_DIR}/../mkProjectInfo ]; then\n cd ${PROJECT_DIR}/..; ocamlc -o mkProjectInfo unix.cma str.cma mkProjectInfo.ml\n fi\n cd ${PROJECT_DIR}/..; ./mkProjectInfo > Makefile.ProjectInfo\nfi\nOCAMLLIBDIR=`ocamlc -v | tail -n -1 | sed -e 's/.* //g' | sed -e 's/\\\\\\/\\\\//g' | tr -d '\\r'`\nsource ${PROJECT_DIR}/../Makefile.ProjectInfo\necho MARKETING_VERSION = $VERSION > ${PROJECT_DIR}/ExternalSettings.xcconfig\necho OCAMLLIBDIR = $OCAMLLIBDIR >> ${PROJECT_DIR}/ExternalSettings.xcconfig"; + }; + 2E282CBA0D9AE17300439D01 /* Run Script (make unison-blob.o) */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script (make unison-blob.o)"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"Building unison-blob.o...\"\nif [ -x /usr/libexec/path_helper ]; then\n eval `/usr/libexec/path_helper -s`\nfi\ncd ${PROJECT_DIR}/..\nmake unison-blob.o\necho \"done\""; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 69C625E90664EC3300B3C46A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 69C625EA0664EC3300B3C46A /* main.m in Sources */, + 69C625EB0664EC3300B3C46A /* MyController.m in Sources */, + 69C625EC0664EC3300B3C46A /* ProfileController.m in Sources */, + 69C625ED0664EC3300B3C46A /* ReconItem.m in Sources */, + 69C625EE0664EC3300B3C46A /* ReconTableView.m in Sources */, + 69C625EF0664EC3300B3C46A /* PreferencesController.m in Sources */, + 69C625F00664EC3300B3C46A /* ProfileTableView.m in Sources */, + 2A3C3F7D09922D4900E404E9 /* NotificationController.m in Sources */, + B554004109C4E5AA0089E1C3 /* UnisonToolbar.m in Sources */, + 449F03E10BE00DE9003F15C8 /* Bridge.m in Sources */, + 44042CB60BE4FC9B00A6BBB2 /* ProgressCell.m in Sources */, + 445A2A5E0BFAB6C300E4E641 /* ImageAndTextCell.m in Sources */, + 8450B1381918859E00A2C4D6 /* ColorGradientView.m in Sources */, + 849BE500191AC10E001B6FBF /* SSSelectableToolbar.m in Sources */, + 849BE501191AC10E001B6FBF /* SSSelectableToolbarItem.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 2A124E800DE1C4E400524237 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 2A124E780DE1C48400524237 /* Create ExternalSettings */; + targetProxy = 2A124E7F0DE1C4E400524237 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 089C165DFE840E0CC02AAC07 /* English */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + DE2444D410C294EA007E1546 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + DE2444D510C294EA007E1546 /* English */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 2A124E790DE1C48400524237 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = "Create ExternalSettings"; + }; + name = Development; + }; + 2A124E7A0DE1C48400524237 /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + PRODUCT_NAME = "Create ExternalSettings"; + ZERO_LINK = NO; + }; + name = Deployment; + }; + 2A124E7B0DE1C48400524237 /* Default */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "Create ExternalSettings"; + }; + name = Default; + }; + 2A3C3F290992245300E404E9 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(FRAMEWORK_SEARCH_PATHS)", + "$(SRCROOT)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "\"$(SRCROOT)/Frameworks\"", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ""; + NSZombieEnabled = YES; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ( + "-L$(OCAMLLIBDIR)", + "-lunix", + "-lthreadsnat", + "-lcamlstr", + "-lbigarray", + "-lasmrun", + ); + PRODUCT_NAME = Unison; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = app; + ZERO_LINK = YES; + }; + name = Development; + }; + 2A3C3F2A0992245300E404E9 /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COPY_PHASE_STRIP = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(FRAMEWORK_SEARCH_PATHS)", + "$(SRCROOT)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "\"$(SRCROOT)/Frameworks\"", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\""; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ( + "-L$(OCAMLLIBDIR)", + "-lunix", + "-lthreadsnat", + "-lcamlstr", + "-lbigarray", + "-lasmrun", + ); + PRODUCT_NAME = Unison; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = app; + ZERO_LINK = NO; + }; + name = Deployment; + }; + 2A3C3F2B0992245300E404E9 /* Default */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(FRAMEWORK_SEARCH_PATHS)", + "$(SRCROOT)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "\"$(SRCROOT)/Frameworks\"", + ); + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\""; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ( + "-L$(OCAMLLIBDIR)", + "-lunix", + "-lthreadsnat", + "-lcamlstr", + "-lbigarray", + "-lasmrun", + ); + PRODUCT_NAME = Unison; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + WRAPPER_EXTENSION = app; + ZERO_LINK = NO; + }; + name = Default; + }; + 2A3C3F2D0992245300E404E9 /* Development */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; + buildSettings = { + FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; + LIBRARY_SEARCH_PATHS = ""; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; + }; + name = Development; + }; + 2A3C3F2E0992245300E404E9 /* Deployment */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; + buildSettings = { + FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; + LIBRARY_SEARCH_PATHS = ""; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; + }; + name = Deployment; + }; + 2A3C3F2F0992245300E404E9 /* Default */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */; + buildSettings = { + FRAMEWORK_SEARCH_PATHS = "Frameworks/**"; + LIBRARY_SEARCH_PATHS = ""; + SDKROOT = macosx; + USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR; + }; + name = Default; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 2A124E7C0DE1C4A200524237 /* Build configuration list for PBXAggregateTarget "Create ExternalSettings" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2A124E790DE1C48400524237 /* Development */, + 2A124E7A0DE1C48400524237 /* Deployment */, + 2A124E7B0DE1C48400524237 /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; + 2A3C3F280992245300E404E9 /* Build configuration list for PBXNativeTarget "uimac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2A3C3F290992245300E404E9 /* Development */, + 2A3C3F2A0992245300E404E9 /* Deployment */, + 2A3C3F2B0992245300E404E9 /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; + 2A3C3F2C0992245300E404E9 /* Build configuration list for PBXProject "uimacnew" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2A3C3F2D0992245300E404E9 /* Development */, + 2A3C3F2E0992245300E404E9 /* Deployment */, + 2A3C3F2F0992245300E404E9 /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; +/* End XCConfigurationList section */ + }; + rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; +} Modified: trunk/src/uimacbridgenew.ml =================================================================== --- trunk/src/uimacbridgenew.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimacbridgenew.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -443,7 +443,7 @@ Callback.register "unisonRiToFileType" unisonRiToFileType;; let direction2niceString = function (* from Uicommon where it's not exported *) - Conflict -> "<-?->" + Conflict _ -> "<-?->" | Replica1ToReplica2 -> "---->" | Replica2ToReplica1 -> "<----" | Merge -> "<-M->" @@ -466,7 +466,7 @@ let unisonRiSetConflict ri = match ri.ri.replicas with Problem _ -> () - | Different diff -> diff.direction <- Conflict;; + | Different diff -> diff.direction <- Conflict "skip requested";; Callback.register "unisonRiSetConflict" unisonRiSetConflict;; let unisonRiSetMerge ri = match ri.ri.replicas with @@ -484,7 +484,7 @@ match (ri.statusMessage, ri.whatHappened,ri.ri.replicas) with (None,None,_) -> "" | (Some s,None,_) -> Unicode.protect s - | (_,_,Different {direction = Conflict}) -> "" + | (_,_,Different {direction = Conflict "files differed"}) -> "" | (_,_,Problem _) -> "" | (_,Some Util.Succeeded,_) -> "done" | (_,Some (Util.Failed s),_) -> "FAILED";; @@ -664,9 +664,9 @@ match si.ri.replicas with Problem err -> (si, [err], "error during update detection") :: l - | Different diff when diff.direction = Conflict -> + | Different diff when (isConflict diff.direction) -> (si, [], - if diff.default_direction = Conflict then + if (isConflict diff.default_direction) then "conflict" else "skipped") :: l | _ -> @@ -758,7 +758,7 @@ the current setting is Conflict *) let unisonRiIsConflict ri = match ri.ri.replicas with - | Different {default_direction = Conflict} -> true + | Different {default_direction = Conflict "files differ"} -> true | _ -> false;; Callback.register "unisonRiIsConflict" unisonRiIsConflict;; Modified: trunk/src/uimacnew/Info.plist.template =================================================================== --- trunk/src/uimacnew/Info.plist.template 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uimacnew/Info.plist.template 2014-07-05 21:55:19 UTC (rev 527) @@ -23,9 +23,9 @@ CFBundleShortVersionString @@VERSION@@ CFBundleGetInfoString - @@VERSION@@. ??1999-2007, licensed under GNU GPL. + @@VERSION@@. ??1999-2014, licensed under GNU GPL. NSHumanReadableCopyright - ??1999-2006, licensed under GNU GPL. + ??1999-2014, licensed under GNU GPL. NSMainNibFile MainMenu NSPrincipalClass Modified: trunk/src/uitext.ml =================================================================== --- trunk/src/uitext.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uitext.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uitext.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/uitext.mli =================================================================== --- trunk/src/uitext.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uitext.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,4 +1,4 @@ (* Unison file synchronizer: src/uitext.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) module Body : Uicommon.UI Modified: trunk/src/unicode.ml =================================================================== --- trunk/src/unicode.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/unicode.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/unicode.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/unicode.mli =================================================================== --- trunk/src/unicode.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/unicode.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/unicode.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) exception Invalid Modified: trunk/src/update.ml =================================================================== --- trunk/src/update.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/update.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/update.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/update.mli =================================================================== --- trunk/src/update.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/update.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/update.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) module NameMap : MyMap.S with type key = Name.t Modified: trunk/src/uutil.ml =================================================================== --- trunk/src/uutil.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uutil.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uutil.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/uutil.mli =================================================================== --- trunk/src/uutil.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/uutil.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/uutil.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* This module collects a number of low-level, Unison-specific utility functions. It is kept separate from the Util module so that that module Modified: trunk/src/xferhint.ml =================================================================== --- trunk/src/xferhint.ml 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/xferhint.ml 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/xferhint.ml *) -(* Copyright 1999-2012, Benjamin C. Pierce +(* Copyright 1999-2014, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/src/xferhint.mli =================================================================== --- trunk/src/xferhint.mli 2014-01-21 22:58:27 UTC (rev 526) +++ trunk/src/xferhint.mli 2014-07-05 21:55:19 UTC (rev 527) @@ -1,5 +1,5 @@ (* Unison file synchronizer: src/xferhint.mli *) -(* Copyright 1999-2012, Benjamin C. Pierce (see COPYING for details) *) +(* Copyright 1999-2014, Benjamin C. Pierce (see COPYING for details) *) (* This module maintains a cache that can be used to map an Os.fullfingerprint to a (Fspath.t * Path.t) naming a file that *may* From bcpierce at cis.upenn.edu Sun Jul 6 18:48:47 2014 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Sun, 6 Jul 2014 18:48:47 -0400 Subject: [Unison-hackers] Mac update In-Reply-To: <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> Message-ID: <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> OK, I?ve committed a new version to the svn repo that incorporates your new GUI, Alan. (The commit message was rejected by the mailing list server because it was too big!) Unless I hear about any problems in the next couple days, I?ll make a new beta-release out of it. - Benjamin On Jun 10, 2014, at 11:56 PM, Alan Shutko wrote: > >> On how to do it, it might be useful to rely on the git mirror of the svn >> repository. If you can create a commit against it (as a single commit), >> then send it using git format-patch, I can then apply it on svn through >> git svn. >> >> I don't know how many details you have on the git mirror, so I'll let >> you ask for the information you need. > > Good news. Where is the repo so that I can do a pull? I can definitely send a single commit with format-patch. > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From alan.schmitt at polytechnique.org Mon Jul 7 03:58:31 2014 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Mon, 07 Jul 2014 09:58:31 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> (Benjamin C. Pierce's message of "Sun, 6 Jul 2014 18:48:47 -0400") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> Message-ID: On 2014-07-07 00:48, "Benjamin C. Pierce" writes: > OK, I?ve committed a new version to the svn repo that incorporates > your new GUI, Alan. (The commit message was rejected by the mailing > list server because it was too big!) > > Unless I hear about any problems in the next couple days, I?ll make > a new beta-release out of it. I just compiled it out of the svn repo and it works well. Tiny nitpick: the copyright information in the GUI "About" window mentions 2006 and not 2014. Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 494 bytes Desc: not available URL: From bcpierce at cis.upenn.edu Mon Jul 7 06:57:53 2014 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Mon, 7 Jul 2014 06:57:53 -0400 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> Message-ID: <4C0061B2-1F7B-4784-BBFE-727F1AE923C8@cis.upenn.edu> > Tiny nitpick: the copyright information in the GUI "About" window > mentions 2006 and not 2014. > I know ? any idea how to change that? - B From schmitta at seas.upenn.edu Mon Jul 7 07:21:59 2014 From: schmitta at seas.upenn.edu (schmitta at seas.upenn.edu) Date: Mon, 7 Jul 2014 07:21:59 -0400 Subject: [Unison-hackers] [unison-svn] r529 - trunk/src/uimac14/English.lproj Message-ID: <201407071122.s67BM0wV027069@yaws.seas.upenn.edu> Author: schmitta Date: 2014-07-07 07:21:59 -0400 (Mon, 07 Jul 2014) New Revision: 529 Modified: trunk/src/uimac14/English.lproj/MainMenu.xib Log: uimac: Changing the copyrightdate on the about window Modified: trunk/src/uimac14/English.lproj/MainMenu.xib =================================================================== --- trunk/src/uimac14/English.lproj/MainMenu.xib 2014-07-05 23:31:55 UTC (rev 528) +++ trunk/src/uimac14/English.lproj/MainMenu.xib 2014-07-07 11:21:59 UTC (rev 529) @@ -1,6239 +1,1057 @@ - - - - 1050 - 10K549 - 851 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 851 - - - YES - - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - - NSApplication - - - - FirstResponder - - - NSApplication - - - 4111 - 2 - {{0, 364}, {480, 360}} - 1881669632 - Unison - NSWindow - - View - - {1.79769e+308, 1.79769e+308} - {213, 107} - - - 256 - - YES - - - 296 - {{370, 317}, {83, 24}} - - YES - - 67239424 - 0 - - LucidaGrande - 13 - 1044 - - - - YES - - 24 - - NSImage - Outline-Flat - - - 1 - 2 - - - 25.333333969116211 - - NSImage - Outline-Flattened - - O - 2 - YES - 2 - - - 25.333333969116211 - - NSImage - Outline-Deep - - D - 3 - 2 - - - 1 - - - - {480, 360} - - {{0, 0}, {1440, 878}} - {213, 129} - {1.79769e+308, 1.79769e+308} - mainWindow - - - MainMenu - - YES - - - Unison - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - Unison - - YES - - - About Unison - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences... - , - 1048576 - 2147483647 - - - - - - Install command-line tool - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide Unison - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit Unison - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - - Edit - - - YES - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - Select Conflicts - - 1048576 - 2147483647 - - - - - - - - - Actions - - 1048576 - 2147483647 - - - submenuAction: - - Actions - - YES - - - Propagate Left to Right - > - 1048576 - 2147483647 - - - - - - Propagate Right to Left - < - 1048576 - 2147483647 - - - - - - Propagate Newer to Older - - 1048576 - 2147483647 - - - - - - Propagate Older to Newer - - 1048576 - 2147483647 - - - - - - Leave Alone - / - 1048576 - 2147483647 - - - - - - Revert to Unison's Recommendation - - 1048576 - 2147483647 - - - - - - Merge - - 1048576 - 2147483647 - - - - - - Diff - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Restart - r - 1048576 - 2147483647 - - - - - - Rescan - - 2147483647 - - - - - - Synchronize all - g - 1048576 - 2147483647 - - - - - - - - - Ignore - - 1048576 - 2147483647 - - - submenuAction: - - Ignore - - YES - - - Ignore Path - i - 1048576 - 2147483647 - - - - - - Ignore Extension - e - 1048576 - 2147483647 - - - - - - Ignore Name - n - 1048576 - 2147483647 - - - - - - - - - Help - - 1048576 - 2147483647 - - - submenuAction: - - Help - - YES - - - Unison Online Help - ? - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - - 256 - - YES - - - 266 - {{17, 236}, {329, 25}} - - YES - - 67239424 - 138412032 - UGxlYXNlIGNob29zZSBhIHByb2ZpbGUgb3IgY3JlYXRlIGEgbmV3IG9uZQo - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{651, -524}, {84, 32}} - - YES - - 67239424 - 134217728 - Quit - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 274 - - YES - - - 2304 - - YES - - - 274 - {306, 190} - - YES - - - 256 - {306, 17} - - - - - - 256 - {{307, 0}, {16, 17}} - - - - YES - - profiles - 303.47698974609375 - 47.477001190185547 - 1000 - - 75628096 - 2048 - Profiles - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - - - - 338820672 - 1024 - - - - 3 - MQA - - - - 3 - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -1035993088 - - - 4 - 15 - 0 - YES - 0 - - - {{1, 17}, {306, 190}} - - - - - 6 - System - controlBackgroundColor - - - 4 - - - - 256 - {{307, 17}, {15, 190}} - - - _doScroller: - 0.99473685026168823 - - - - -2147483392 - {{-100, -100}, {113, 15}} - - 1 - - _doScroller: - 0.99047619104385376 - - - - 2304 - - YES - - - {{1, 0}, {306, 17}} - - - - - 4 - - - - {{20, 20}, {323, 208}} - - - 18 - - - - - QSAAAEEgAABBmAAAQZgAAA - - - {363, 281} - NSView - NSResponder - - - - 274 - - YES - - - 274 - - YES - - - 274 - - YES - - - 2304 - - YES - - - 256 - {730, 411} - - YES - - - 256 - {730, 17} - - - - - - -2147483392 - {{-26, 0}, {16, 17}} - - - - YES - - path - 426 - 27.095703125 - 1000 - - 75628096 - 2048 - Path - - - 6 - System - headerColor - - - - - - 338820672 - 1024 - - LucidaGrande - 12 - 16 - - - - - - 3 - YES - - - pathSortKey - YES - compare: - - - - fileSizeString - 70 - 70 - 70 - - 75628096 - 134219776 - Size - - - - - - 338820672 - 67109888 - - - - - - 3 - YES - - - fileSize - NO - compare: - - - - leftIcon - 16 - 16 - 16 - - 75628096 - 2048 - < - - - 3 - MC4zMzMzMzI5OQA - - - - - 130560 - 33554432 - 0 - 0 - 0 - YES - - - - leftSortKey - YES - compare: - - - - percentTransferred - 76.63916015625 - 42.10107421875 - 100 - - 75628096 - 134219776 - Action - - - - - - 338820672 - 67109888 - - - - - - - - directionSortKey - YES - compare: - - - - rightIcon - 16 - 16 - 16 - - 75628096 - 2048 - > - - - - - - 130560 - 33554432 - 0 - 0 - 0 - YES - - - - rightSortKey - YES - compare: - - - - 3 - 2 - - - 18 - -635437056 - - - 4 - 15 - 0 - YES - 0 - - - {{0, 17}, {730, 411}} - - - - - 4 - - - - -2147483392 - {{-30, 17}, {15, 391}} - - - _doScroller: - 0.96419435739517212 - - - - -2147483392 - {{-100, -100}, {629, 15}} - - 1 - - _doScroller: - 0.99841266870498657 - - - - 2304 - - YES - - - {730, 17} - - - - - 4 - - - - {730, 428} - - - 528 - - - - - - AAAAAAAAAABBoAAAQaAAAA - - - - 274 - - YES - - - 274 - {{2, 5}, {726, 74}} - - YES - - 69336577 - 272760832 - Label - - - - - - - - {{0, 437}, {730, 85}} - - - - {{0, 24}, {730, 522}} - - - - - 1314 - - {{589, 6}, {122, 12}} - - 16652 - 100 - - - - 258 - {{3, 6}, {582, 14}} - - YES - - 67239488 - 272762880 - Idle - - - - - - - - {730, 546} - NSView - NSResponder - - - MyController - - - ProfileController - - - PreferencesController - - - NotificationController - - - - 256 - - YES - - - 258 - - YES - - - 256 - - YES - - - 256 - {{11, 20}, {30, 17}} - - YES - - 67239424 - 4194304 - RmlsZToKA - - - - - - - - - 258 - {{46, 18}, {427, 22}} - - YES - - -1804468671 - 4195328 - - - - YES - - 6 - System - textBackgroundColor - - - - 6 - System - textColor - - - - - - {{2, 2}, {493, 51}} - - - - {{20, 129}, {497, 71}} - - {0, 0} - - 67239424 - 0 - First root - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 258 - - YES - - - 256 - - YES - - - 256 - {{12, 39}, {70, 38}} - - YES - 2 - 1 - - YES - - -2080244224 - 0 - Remote - - - 1211912703 - 0 - - NSRadioButton - - - - - - 200 - 25 - - - 67239424 - 0 - Local - - - 1 - 1211912703 - 0 - - - - 200 - 25 - - - {70, 18} - {4, 2} - 1143472128 - NSActionCell - - 67239424 - 0 - Radio - - 1211912703 - 0 - - - 400 - 75 - - - - - - - - - 256 - {{97, 58}, {37, 17}} - - YES - - 67239424 - 4194304 - User: - - - - - - - - - 256 - {{134, 56}, {91, 22}} - - YES - - -1804468671 - 4195328 - - - - YES - - - - - - - 256 - {{236, 58}, {38, 17}} - - YES - - 67239424 - 4194304 - Host: - - - - - - - - - 258 - {{274, 56}, {199, 22}} - - YES - - -1804468671 - 4195328 - - - - YES - - - - - - - 256 - {{11, 16}, {30, 17}} - - YES - - 67239424 - 4194304 - File: - - - - - - - - - 258 - {{46, 14}, {427, 22}} - - YES - - -1804468671 - 4195328 - - - - YES - - - - - - {{2, 2}, {493, 86}} - - - - {{20, 16}, {497, 106}} - - {0, 0} - - 67239424 - 0 - Second root - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{20, 213}, {87, 17}} - - YES - - 67239424 - 4194304 - Profile name: - - - - - - - - - 258 - {{106, 208}, {408, 22}} - - YES - - -1804468671 - 4195328 - - - - YES - - - - - - {534, 250} - - NSView - - NSResponder - - - - 256 - - YES - - - 1325 - - {{419, 263}, {32, 32}} - - 20490 - 100 - - - - 274 - - YES - - - 301 - {{304, 254}, {263, 19}} - - YES - - 68288064 - 138544128 - Connecting... - - LucidaGrande - 16 - 16 - - - - - - - - {871, 577} - - - - {871, 577} - - NSView - - NSResponder - - - 7 - 2 - {{2, 118}, {227, 128}} - 1886912512 - PasswordWindow - NSWindow - - View - - {1.79769e+308, 1.79769e+308} - {213, 107} - - - 256 - - YES - - - 256 - {{20, 60}, {187, 22}} - - YES - - -1804468671 - 4195328 - - - - YES - - - - - - - 256 - {{115, 12}, {98, 32}} - - YES - - 67239424 - 137887744 - Continue - - - -2038284033 - 1 - - Helvetica - 13 - 16 - - - - - - - - 200 - 25 - - - - - 256 - {{14, 12}, {84, 32}} - - YES - - 67239424 - 137887744 - Cancel - - - -2038284033 - 1 - - - - - - - - 200 - 25 - - - - - 256 - {{17, 90}, {193, 17}} - - YES - - 67239488 - 4196352 - UGxlYXNlIGVudGVyIHlvdXIgcGFzc3dvcmQKA - - - - - - - - {227, 128} - - {{0, 0}, {1440, 878}} - {213, 129} - {1.79769e+308, 1.79769e+308} - - - 3 - 2 - {{194, 458}, {262, 266}} - 1886912512 - - NSWindow - - View - - {1.79769e+308, 1.79769e+308} - {213, 107} - - - 256 - - YES - - - 256 - {{22, 152}, {220, 22}} - - YES - - -2079195584 - 138413056 - Unison - - LucidaGrande-Bold - 18 - 16 - - - - - - - - - 256 - {{22, 20}, {224, 52}} - - YES - - -2080244224 - 138412032 - wqkgQ29weXJpZ2h0IDE5OTktMjAwNi4KClRoaXMgc29mdHdhcmUgaXMgbGljZW5zZWQgdW5kZXIgdGhl -IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlLg - - LucidaGrande - 10 - 2843 - - - - - - - - - 256 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{20, 182}, {224, 64}} - - YES - - 130560 - 33554432 - - NSImage - Unison - - 0 - 0 - 0 - NO - - YES - - - - 256 - {{22, 101}, {224, 18}} - - YES - - -2079195584 - 138413056 - Sync you very much! - - Optima-Italic - 12 - 16 - - - - - - - - - 256 - {{22, 127}, {220, 17}} - - YES - - -2079195584 - 138413056 - ?.?.? - - - - - - - - {262, 266} - - {{0, 0}, {1440, 878}} - {213, 129} - {1.79769e+308, 1.79769e+308} - - - 15 - 2 - {{519, 382}, {505, 342}} - 1886912512 - Diff - - NSWindow - - - View - - {1.79769e+308, 1.79769e+308} - {213, 107} - - - 256 - - YES - - - 319 - - YES - - - 2304 - - YES - - - 2322 - {505, 14} - - - - - - - - - - - YES - - - 6 - - - - 505 - 1 - - - 11236 - 0 - - - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - 6 - System - selectedTextBackgroundColor - - - - 6 - System - selectedTextColor - - - - - - - YES - - YES - NSColor - NSUnderline - - - YES - - 1 - MCAwIDEAA - - - - - - - 6 - {1010, 1e+07} - {114, 0} - - - - {505, 342} - - - - - - {1, -1} - 0 - - 4 - - - - -2147483392 - {{-30, 1}, {15, 356}} - - - _doScroller: - 1 - - - - -2147483392 - {{-100, -100}, {87, 18}} - - 1 - - _doScroller: - 1 - 0.94565218687057495 - - - {505, 342} - - - 528 - - - - - - {505, 342} - - {{0, 0}, {1440, 878}} - {213, 129} - {1.79769e+308, 1.79769e+308} - - - 1 - 2 - {{163, 135}, {400, 229}} - 1886912512 - Unison - NSWindow - - View - - {1.79769e+308, 1.79769e+308} - {213, 107} - - - 256 - - YES - - - 256 - {{302, 12}, {84, 32}} - - YES - - -2080244224 - 134217728 - Yes - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 256 - {{20, 188}, {383, 21}} - - YES - - 67239424 - 4194304 - Would you like to install the Unison command-line tool? - - LucidaGrande-Bold - 12 - 16 - - - - - - - - - 256 - {{17, 36}, {145, 18}} - - YES - - 67239424 - 131072 - Don't ask me again - - - 1211912703 - 2 - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{218, 12}, {84, 32}} - - YES - - 67239424 - 134217728 - No - - - -2038284033 - 1 - - - - - - 200 - 25 - - - - - 256 - {{17, 60}, {366, 120}} - - YES - - 67239424 - 272629760 - VGhlIGNvbW1hbmQtbGluZSB0b29sIGlzIGEgc21hbGwgcHJvZ3JhbSB0aGF0IGNhbiBiZSBpbnN0YWxs -ZWQgaW4gYSBzdGFuZGFyZCBwbGFjZSBvbiB5b3VyIGNvbXB1dGVyICgvdXNyL2Jpbi91bmlzb24pIHNv -IFVuaXNvbiBjYW4gZWFzaWx5IGJlIGZvdW5kLiBJZiB5b3Ugd2FudCB0byBiZSBhYmxlIHRvIHN5bmNo -cm9uaXplIGZpbGVzIG9uIHRoaXMgY29tcHV0ZXIgYnkgcnVubmluZyBVbmlzb24gb24gYSByZW1vdGUg -Y29tcHV0ZXIsIHlvdSBzaG91bGQgcHJvYmFibHkgaW5zdGFsbCBpdC4KCklmIHlvdSBkb24ndCBpbnN0 -YWxsIGl0IG5vdywgeW91IGNhbiBkbyBzbyBsYXRlciBieSBjaG9vc2luZyAnSW5zdGFsbCBjb21tYW5k -LWxpbmUgdG9vbCcgZnJvbSB0aGUgVW5pc29uIG1lbnUuCg - - - - - - - - {400, 229} - - {{0, 0}, {1440, 878}} - {213, 129} - {1.79769e+308, 1.79769e+308} - - - 3 - 2 - {{235, 475}, {446, 84}} - 1954022400 - General - NSWindow - - - 2780CC9C-D44A-4484-8D03-C65609351E57 - - - YES - YES - YES - NO - 1 - 1 - - YES - - YES - 4A97E608-13A1-41D8-B077-1360865DB1A4 - D5D59D5F-DFD1-4F67-8724-69D88EF5E355 - NSToolbarFlexibleSpaceItem - - - YES - - - 4A97E608-13A1-41D8-B077-1360865DB1A4 - - General - General - - - - NSImage - NSPreferencesGeneral - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - - D5D59D5F-DFD1-4F67-8724-69D88EF5E355 - - Fonts - Fonts - Show Font Panel - - - NSImage - NSFontPanel - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - NSToolbarFlexibleSpaceItem - - Flexible Space - - - - - - {1, 5} - {20000, 32} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - - - - - - - YES - - - - - - YES - - - - - - YES - - - {1.79769e+308, 1.79769e+308} - - - 256 - {446, 84} - - - {{0, 0}, {1920, 1178}} - {1.79769e+308, 1.79769e+308} - - - YES - - - - 256 - - YES - - - 268 - {{18, 45}, {174, 18}} - - YES - - -2080244224 - 0 - Open profile on startup: - - - 1211912703 - 2 - - NSImage - NSSwitch - - - - - 200 - 25 - - - - - 268 - {{18, 18}, {410, 18}} - - YES - - 67239424 - 0 - Delete log-file (~/unison.log) automatically on complete sync - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 268 - {{198, 40}, {231, 26}} - - YES - - 72482368 - 272630784 - - - - YES - - - 5 - YES - YES - - - - 274 - {15, 0} - - - YES - - YES - - - 12 - 10 - 1000 - - 75628032 - 0 - - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 338820672 - 1024 - - - YES - - - - 3 - YES - - - - 3 - 2 - - - 19 - tableViewAction: - -767524864 - - - - 1 - 15 - 0 - YES - 0 - - - - - {446, 84} - - - - 256 - - YES - - - 268 - {{125, 50}, {213, 17}} - - - YES - - 68288064 - 272630784 - xxxx - - - - - - - - - 268 - {{343, 45}, {59, 25}} - - - YES - - -2080244224 - 134217728 - choose - - - -2038152961 - 163 - - - 400 - 75 - - - - - 268 - {{125, 20}, {213, 17}} - - - YES - - 68288064 - 272630784 - xxxx - - - - - - - - - 268 - {{343, 15}, {59, 25}} - - - YES - - -2080244224 - 134217728 - choose - - - -2038152961 - 163 - - - 400 - 75 - - - - - 268 - {{17, 20}, {106, 17}} - - - YES - - 68288064 - 71304192 - Diff font: - - - - - - - - - 268 - {{17, 50}, {106, 17}} - - - YES - - 68288064 - 71304192 - Details font: - - - - - - - - {422, 87} - - - - - YES - - - terminate: - - - - 139 - - - - hideOtherApplications: - - - - 146 - - - - hide: - - - - 152 - - - - unhideAllApplications: - - - - 153 - - - - cut: - - - - 175 - - - - paste: - - - - 176 - - - - selectAll: - - - - 179 - - - - copy: - - - - 181 - - - - updatesView - - - - 210 - - - - chooseProfileView - - - - 211 - - - - mainWindow - - - - 216 - - - - tableView - - - - 218 - - - - dataSource - - - - 219 - - - - profileController - - - - 221 - - - - endPasswordWindow: - - - - 240 - - - - passwordWindow - - - - 241 - - - - passwordText - - - - 242 - - - - endPasswordWindow: - - - - 243 - - - - ignorePath: - - - - 258 - - - - ignoreExt: - - - - 259 - - - - ignoreName: - - - - 260 - - - - copyLR: - - - - 270 - - - - copyRL: - - - - 271 - - - - selectConflicts: - - - - 273 - - - - revert: - - - - 274 - - - - forceNewer: - - - - 282 - - - - forceOlder: - - - - 283 - - - - leaveAlone: - - - - 285 - - - - profileNameText - - - - 332 - - - - preferencesController - - - - 350 - - - - preferencesView - - - - 358 - - - - firstRootText - - - - 373 - - - - secondRootUser - - - - 374 - - - - secondRootHost - - - - 375 - - - - secondRootText - - - - 376 - - - - remoteButtonCell - - - - 377 - - - - localButtonCell - - - - 378 - - - - nextKeyView - - - - 379 - - - - nextKeyView - - - - 380 - - - - nextKeyView - - - - 381 - - - - nextKeyView - - - - 382 - - - - nextKeyView - - - - 383 - - - - remoteClick: - - - - 386 - - - - localClick: - - - - 387 - - - - passwordCancelButton - - - - 395 - - - - delegate - - - - 396 - - - - myController - - - - 400 - - - - aboutWindow - - - - 412 - - - - versionText - - - - 413 - - - - onlineHelp: - - - - 416 - - - - syncButton: - - - - 421 - - - - ConnectingView - - - - 425 - - - - restartButton: - - - - 431 - - - - passwordPrompt - - - - 436 - - - - notificationController - - - - 438 - - - - raiseAboutWindow: - - - - 462 - - - - diffWindow - - - - 479 - - - - diffView - - - - 480 - - - - merge: - - - - 482 - - - - showDiff: - - - - 483 - - - - rescan: - - - - 485 - - - - progressBar - - - - 487 - - - - cltoolPref - - - - 497 - - - - cltoolWindow - - - - 500 - - - - cltoolNoButton: - - - - 503 - - - - cltoolYesButton: - - - - 505 - - - - initialFirstResponder - - - - 506 - - - - raiseCltoolWindow: - - - - 507 - - - - tableModeSelector - - - - 516 - - - - tableModeChanged: - - - - 517 - - - - delegate - - - - 571 - - - - showPreferences: - - - - 572 - - - - connectingAnimation - - - - 578 - - - - statusText - - - - 585 - - - - delegate - - - - 605 - - - - dataSource - - - - 606 - - - - detailsTextView - - - - 609 - - - - tableView - - - - 610 - - - - preferencesWindow - - - - 659 - - - - detailsFontLabel - - - - 661 - - - - diffFontLabel - - - - 662 - - - - chooseFont: - - - - 672 - - - - chooseFont: - - - - 673 - - - - chooseDetailsFont - - - - 676 - - - - chooseDiffFont - - - - 677 - - - - splitView - - - - 684 - - - - connectingViewGradient - - - - 686 - - - - detailsTextViewGradient - - - - 687 - - - - value: values.deleteLogOnExit - - - - - - value: values.deleteLogOnExit - value - values.deleteLogOnExit - 2 - - - 706 - - - - value: values.openProfileAtStartup - - - - - - value: values.openProfileAtStartup - value - values.openProfileAtStartup - 2 - - - 707 - - - - value: values.profileToOpen - - - - - - value: values.profileToOpen - value - values.profileToOpen - 2 - - - 708 - - - - checkOpenProfileChanged: - - - - 709 - - - - window - - - - 756 - - - - linkedView - - - - 759 - - - - linkedView - - - - 760 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 21 - - - YES - - - - Window - - - 2 - - - YES - - - - - - 515 - - - YES - - - - - - 29 - - - YES - - - - - - - - MainMenu - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - 129 - - - - - 134 - - - - - 136 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 196 - - - - - 414 - - - - - 428 - - - - - 103 - - - YES - - - - - - 106 - - - YES - - - - - - 111 - - - - - 163 - - - YES - - - - - - 169 - - - YES - - - - - - - - - - 157 - - - - - 160 - - - - - 171 - - - - - 172 - - - - - 269 - - - - - 253 - - - YES - - - - - - 254 - - - YES - - - - - - - - 255 - - - - - 256 - - - - - 257 - - - - - 261 - - - YES - - - - - - 262 - - - YES - - - - - - - - - - - - - - - - - 263 - - - - - 266 - - - - - 267 - - - - - 268 - - - - - 281 - - - - - 284 - - - - - 417 - - - - - 419 - - - - - 420 - - - - - 430 - - - - - 481 - - - - - 484 - - - - - 197 - - - YES - - - - - - chooseProfileView - - - 199 - - - YES - - - - - - 201 - - - YES - - - - - - 203 - - - YES - - - - - - - - - 205 - - - YES - - - - - - 202 - - - YES - - - - - - 198 - - - YES - - - - - - updatesView - - - 209 - - - MyController - - - 217 - - - ProfileController - - - 234 - - - YES - - - - PasswordWindow - - - 235 - - - YES - - - - - - - - - 236 - - - YES - - - - - - 237 - - - YES - - - - - - 238 - - - YES - - - - - - 239 - - - YES - - - - - - 307 - - - YES - - - - - - - PreferencesView - - - 321 - - - YES - - - - - - - 323 - - - YES - - - - - - - - - - - - 329 - - - YES - - - - - - 330 - - - YES - - - - - - 331 - - - PreferencesController - - - 402 - - - YES - - - - AboutWindow - - - 401 - - - YES - - - - - - - - - - 406 - - - YES - - - - - - 407 - - - YES - - - - - - 409 - - - YES - - - - - - 410 - - - YES - - - - - - 411 - - - YES - - - - - - 437 - - - NotificationController - - - 475 - - - YES - - - - DiffWindow - - - 476 - - - YES - - - - - - 477 - - - YES - - - - - - - - 478 - - - - - 488 - - - YES - - - - CltoolWindow - - - 489 - - - YES - - - - - - - - - - 491 - - - YES - - - - - - 493 - - - YES - - - - - - 494 - - - YES - - - - - - 495 - - - YES - - - - - - 496 - - - YES - - - - - - 527 - - - - - 528 - - - - - 529 - - - - - 531 - - - - - 532 - - - - - 533 - - - - - 534 - - - - - 543 - - - - - 544 - - - - - 545 - - - - - 546 - - - - - 547 - - - - - 548 - - - - - 549 - - - - - 551 - - - - - 552 - - - - - 553 - - - - - 554 - - - - - 555 - - - - - 557 - - - - - 561 - - - - - 562 - - - - - 563 - - - - - 569 - - - - - 570 - - - - - 362 - - - YES - - - - - - 535 - - - - - 363 - - - YES - - - - - - 536 - - - - - 364 - - - YES - - - - - - - - 556 - - - - - 366 - - - - - 365 - - - - - 367 - - - YES - - - - - - 537 - - - - - 368 - - - YES - - - - - - 538 - - - - - 369 - - - YES - - - - - - 539 - - - - - 370 - - - YES - - - - - - 540 - - - - - 371 - - - YES - - - - - - 541 - - - - - 372 - - - YES - - - - - - 542 - - - - - 586 - - - YES - - - - - - - 589 - - - YES - - - - - - 607 - - - YES - - - - - - 608 - - - - - 486 - - - - - 590 - - - YES - - - - - - - - - 594 - - - YES - - - - - - - - - - 599 - - - YES - - - - - - 600 - - - - - 598 - - - YES - - - - - - 601 - - - - - 597 - - - YES - - - - - - 602 - - - - - 596 - - - YES - - - - - - 603 - - - - - 595 - - - YES - - - - - - 604 - - - - - 593 - - - - - 592 - - - - - 591 - - - - - 583 - - - YES - - - - - - 584 - - - - - 618 - - - YES - - - - - PreferencesWindow - - - 619 - - - YES - - - - - 423 - - - YES - - - - - ConnectingView - - - 576 - - - - - 653 - - - - - 681 - - - YES - - - - - - 682 - - - YES - - - - - - 683 - - - - - 699 - - - YES - - - - - - - - 700 - - - YES - - - - - - 701 - - - YES - - - - - - 702 - - - YES - - - - - - 703 - - - - - 704 - - - - - 705 - - - - - 678 - - - YES - - - - - - - - - Font View - - - 636 - - - YES - - - - - - 637 - - - YES - - - - - - 640 - - - YES - - - - - - 641 - - - YES - - - - - - 644 - - - YES - - - - - - 646 - - - YES - - - - - - 647 - - - - - 645 - - - - - 642 - - - - - 643 - - - - - 638 - - - - - 639 - - - - - 737 - - - YES - - - - - - - - 743 - - - - - 757 - - - - - 758 - - - - - - - YES - - YES - -3.IBPluginDependency - -3.ImportedFromIB2 - 103.IBPluginDependency - 103.ImportedFromIB2 - 106.IBEditorWindowLastContentRect - 106.IBPluginDependency - 106.ImportedFromIB2 - 111.IBPluginDependency - 111.ImportedFromIB2 - 129.IBPluginDependency - 129.ImportedFromIB2 - 134.IBPluginDependency - 134.ImportedFromIB2 - 136.IBPluginDependency - 136.ImportedFromIB2 - 144.IBPluginDependency - 144.ImportedFromIB2 - 145.IBPluginDependency - 145.ImportedFromIB2 - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBPluginDependency - 150.ImportedFromIB2 - 157.IBPluginDependency - 157.ImportedFromIB2 - 160.IBPluginDependency - 160.ImportedFromIB2 - 163.IBPluginDependency - 163.ImportedFromIB2 - 169.IBEditorWindowLastContentRect - 169.IBPluginDependency - 169.ImportedFromIB2 - 171.IBPluginDependency - 171.ImportedFromIB2 - 172.IBPluginDependency - 172.ImportedFromIB2 - 196.IBPluginDependency - 196.ImportedFromIB2 - 197.IBEditorWindowLastContentRect - 197.IBPluginDependency - 197.ImportedFromIB2 - 198.IBEditorWindowLastContentRect - 198.IBPluginDependency - 198.ImportedFromIB2 - 199.IBPluginDependency - 199.ImportedFromIB2 - 2.IBPluginDependency - 2.ImportedFromIB2 - 201.IBPluginDependency - 201.ImportedFromIB2 - 202.IBPluginDependency - 202.ImportedFromIB2 - 203.IBPluginDependency - 203.ImportedFromIB2 - 205.CustomClassName - 205.IBPluginDependency - 205.ImportedFromIB2 - 209.ImportedFromIB2 - 21.IBEditorWindowLastContentRect - 21.IBPluginDependency - 21.IBWindowTemplateEditedContentRect - 21.ImportedFromIB2 - 21.windowTemplate.hasMinSize - 21.windowTemplate.minSize - 217.ImportedFromIB2 - 234.IBEditorWindowLastContentRect - 234.IBPluginDependency - 234.IBWindowTemplateEditedContentRect - 234.ImportedFromIB2 - 234.windowTemplate.hasMinSize - 234.windowTemplate.minSize - 235.IBPluginDependency - 235.ImportedFromIB2 - 236.CustomClassName - 236.IBPluginDependency - 236.ImportedFromIB2 - 237.IBPluginDependency - 237.ImportedFromIB2 - 238.IBPluginDependency - 238.ImportedFromIB2 - 239.IBPluginDependency - 239.ImportedFromIB2 - 253.IBPluginDependency - 253.ImportedFromIB2 - 254.IBEditorWindowLastContentRect - 254.IBPluginDependency - 254.ImportedFromIB2 - 255.IBPluginDependency - 255.ImportedFromIB2 - 256.IBPluginDependency - 256.ImportedFromIB2 - 257.IBPluginDependency - 257.ImportedFromIB2 - 261.IBPluginDependency - 261.ImportedFromIB2 - 262.IBEditorWindowLastContentRect - 262.IBPluginDependency - 262.ImportedFromIB2 - 263.IBPluginDependency - 263.ImportedFromIB2 - 266.IBPluginDependency - 266.ImportedFromIB2 - 267.IBPluginDependency - 267.ImportedFromIB2 - 268.IBPluginDependency - 268.ImportedFromIB2 - 269.IBPluginDependency - 269.ImportedFromIB2 - 281.IBPluginDependency - 281.ImportedFromIB2 - 284.IBPluginDependency - 284.ImportedFromIB2 - 29.IBEditorWindowLastContentRect - 29.IBPluginDependency - 29.ImportedFromIB2 - 307.IBEditorWindowLastContentRect - 307.IBPluginDependency - 307.ImportedFromIB2 - 321.IBPluginDependency - 321.ImportedFromIB2 - 323.IBPluginDependency - 323.ImportedFromIB2 - 329.IBPluginDependency - 329.ImportedFromIB2 - 330.IBPluginDependency - 330.ImportedFromIB2 - 331.ImportedFromIB2 - 362.IBPluginDependency - 362.ImportedFromIB2 - 363.IBPluginDependency - 363.ImportedFromIB2 - 364.IBPluginDependency - 364.ImportedFromIB2 - 365.IBPluginDependency - 365.ImportedFromIB2 - 366.IBPluginDependency - 366.ImportedFromIB2 - 367.IBPluginDependency - 367.ImportedFromIB2 - 368.IBPluginDependency - 368.ImportedFromIB2 - 369.IBPluginDependency - 369.ImportedFromIB2 - 370.IBPluginDependency - 370.ImportedFromIB2 - 371.IBPluginDependency - 371.ImportedFromIB2 - 372.IBPluginDependency - 372.ImportedFromIB2 - 401.IBPluginDependency - 401.ImportedFromIB2 - 402.IBEditorWindowLastContentRect - 402.IBPluginDependency - 402.IBWindowTemplateEditedContentRect - 402.ImportedFromIB2 - 402.windowTemplate.hasMinSize - 402.windowTemplate.minSize - 406.IBPluginDependency - 406.ImportedFromIB2 - 407.IBPluginDependency - 407.ImportedFromIB2 - 409.IBPluginDependency - 409.ImportedFromIB2 - 410.IBPluginDependency - 410.ImportedFromIB2 - 411.IBPluginDependency - 411.ImportedFromIB2 - 414.IBPluginDependency - 414.ImportedFromIB2 - 417.IBPluginDependency - 417.ImportedFromIB2 - 419.IBPluginDependency - 419.ImportedFromIB2 - 420.IBPluginDependency - 420.ImportedFromIB2 - 423.IBEditorWindowLastContentRect - 423.IBPluginDependency - 423.ImportedFromIB2 - 428.IBPluginDependency - 428.ImportedFromIB2 - 430.IBPluginDependency - 430.ImportedFromIB2 - 437.ImportedFromIB2 - 475.IBEditorWindowLastContentRect - 475.IBPluginDependency - 475.IBWindowTemplateEditedContentRect - 475.ImportedFromIB2 - 475.windowTemplate.hasMinSize - 475.windowTemplate.minSize - 476.IBPluginDependency - 476.ImportedFromIB2 - 477.IBPluginDependency - 477.ImportedFromIB2 - 478.IBPluginDependency - 478.ImportedFromIB2 - 481.IBPluginDependency - 481.ImportedFromIB2 - 484.IBPluginDependency - 484.ImportedFromIB2 - 486.IBPluginDependency - 486.ImportedFromIB2 - 488.IBEditorWindowLastContentRect - 488.IBPluginDependency - 488.IBWindowTemplateEditedContentRect - 488.ImportedFromIB2 - 488.windowTemplate.hasMinSize - 488.windowTemplate.minSize - 489.IBPluginDependency - 489.ImportedFromIB2 - 491.IBPluginDependency - 491.ImportedFromIB2 - 493.IBPluginDependency - 493.ImportedFromIB2 - 494.IBPluginDependency - 494.ImportedFromIB2 - 495.IBPluginDependency - 495.ImportedFromIB2 - 496.IBPluginDependency - 496.ImportedFromIB2 - 515.IBPluginDependency - 515.ImportedFromIB2 - 527.IBPluginDependency - 528.IBPluginDependency - 529.IBPluginDependency - 531.IBPluginDependency - 532.IBPluginDependency - 533.IBPluginDependency - 534.IBPluginDependency - 535.IBPluginDependency - 536.IBPluginDependency - 537.IBPluginDependency - 538.IBPluginDependency - 539.IBPluginDependency - 540.IBPluginDependency - 541.IBPluginDependency - 542.IBPluginDependency - 543.IBPluginDependency - 544.IBPluginDependency - 545.IBPluginDependency - 546.IBPluginDependency - 547.IBPluginDependency - 548.IBPluginDependency - 549.IBPluginDependency - 551.IBPluginDependency - 552.IBPluginDependency - 553.IBPluginDependency - 554.IBPluginDependency - 555.IBPluginDependency - 556.IBPluginDependency - 557.IBPluginDependency - 557.IBShouldRemoveOnLegacySave - 56.IBPluginDependency - 56.ImportedFromIB2 - 561.IBPluginDependency - 561.IBShouldRemoveOnLegacySave - 562.IBPluginDependency - 562.IBShouldRemoveOnLegacySave - 563.IBPluginDependency - 563.IBShouldRemoveOnLegacySave - 569.IBPluginDependency - 569.IBShouldRemoveOnLegacySave - 57.IBEditorWindowLastContentRect - 57.IBPluginDependency - 57.ImportedFromIB2 - 570.IBPluginDependency - 570.IBShouldRemoveOnLegacySave - 576.IBPluginDependency - 589.CustomClassName - 590.IBPluginDependency - 590.ImportedFromIB2 - 591.IBPluginDependency - 591.IBShouldRemoveOnLegacySave - 592.IBPluginDependency - 592.IBShouldRemoveOnLegacySave - 593.IBPluginDependency - 593.IBShouldRemoveOnLegacySave - 594.CustomClassName - 594.IBPluginDependency - 594.ImportedFromIB2 - 595.IBPluginDependency - 595.ImportedFromIB2 - 596.IBPluginDependency - 596.ImportedFromIB2 - 597.IBPluginDependency - 597.ImportedFromIB2 - 598.IBPluginDependency - 598.ImportedFromIB2 - 599.IBPluginDependency - 599.ImportedFromIB2 - 600.IBPluginDependency - 600.ImportedFromIB2 - 601.IBPluginDependency - 601.ImportedFromIB2 - 602.IBPluginDependency - 602.IBShouldRemoveOnLegacySave - 603.IBPluginDependency - 603.IBShouldRemoveOnLegacySave - 604.IBPluginDependency - 604.IBShouldRemoveOnLegacySave - 618.IBEditorWindowLastContentRect - 618.IBPluginDependency - 618.IBWindowTemplateEditedContentRect - 618.NSWindowTemplate.visibleAtLaunch - 619.IBPluginDependency - 619.IBViewBoundsToFrameTransform - 636.IBPluginDependency - 637.IBPluginDependency - 638.IBPluginDependency - 639.IBPluginDependency - 640.IBPluginDependency - 641.IBPluginDependency - 642.IBPluginDependency - 643.IBPluginDependency - 644.IBPluginDependency - 645.IBPluginDependency - 646.IBPluginDependency - 647.IBPluginDependency - 653.IBPluginDependency - 678.IBPluginDependency - 678.IBViewBoundsToFrameTransform - 681.CustomClassName - 681.IBViewIntegration.shadowColor - 699.IBPluginDependency - 699.IBViewBoundsToFrameTransform - 700.IBPluginDependency - 701.IBPluginDependency - 702.IBPluginDependency - 703.IBPluginDependency - 704.IBPluginDependency - 705.IBPluginDependency - 737.CustomClassName - 737.IBEditorWindowLastContentRect - 737.IBPluginDependency - 743.IBPluginDependency - 757.CustomClassName - 757.IBPluginDependency - 757.toolbarItem.selectable - 758.CustomClassName - 758.IBPluginDependency - 758.toolbarItem.selectable - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{582, 1091}, {202, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{407, 1011}, {179, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{345, 795}, {363, 281}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{329, 310}, {730, 546}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - ProfileTableView - com.apple.InterfaceBuilder.CocoaPlugin - - - {{717, 719}, {480, 360}} - com.apple.InterfaceBuilder.CocoaPlugin - {{717, 719}, {480, 360}} - - - {213, 107} - - {{345, 994}, {227, 128}} - com.apple.InterfaceBuilder.CocoaPlugin - {{345, 994}, {227, 128}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - NSSecureTextField - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{520, 1051}, {191, 63}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{451, 881}, {323, 233}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{811, 836}, {317, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{345, 606}, {534, 250}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{345, 879}, {262, 266}} - com.apple.InterfaceBuilder.CocoaPlugin - {{345, 879}, {262, 266}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{443, 279}, {871, 577}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - {{345, 792}, {505, 342}} - com.apple.InterfaceBuilder.CocoaPlugin - {{345, 792}, {505, 342}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{345, 916}, {400, 229}} - com.apple.InterfaceBuilder.CocoaPlugin - {{345, 916}, {400, 229}} - - - {213, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{338, 941}, {266, 173}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - ColorGradientView - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - ReconTableView - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{605, 124}, {446, 84}} - com.apple.InterfaceBuilder.CocoaPlugin - {{605, 124}, {446, 84}} - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ColorGradientView - - 6 - System - alternateSelectedControlColor - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - SSSelectableToolbar - {{520, 208}, {616, 0}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - SSSelectableToolbarItem - com.apple.InterfaceBuilder.CocoaPlugin - - SSSelectableToolbarItem - com.apple.InterfaceBuilder.CocoaPlugin - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please choose a profile or create a new one + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + File: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please enter your password + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? Copyright 1999-2014. - - - YES - - - YES - - - - - YES - - - YES - - - - 760 - - - - YES - - ColorGradientView - NSView - - IBProjectSource - ColorGradientView.h - - - - FirstResponder - NSObject - - YES - - YES - copyLR: - copyRL: - forceNewer: - forceOlder: - ignoreExt: - ignoreName: - ignorePath: - leaveAlone: - merge: - revert: - selectConflicts: - showDiff: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - copyLR: - copyRL: - forceNewer: - forceOlder: - ignoreExt: - ignoreName: - ignorePath: - leaveAlone: - merge: - revert: - selectConflicts: - showDiff: - - - YES - - copyLR: - id - - - copyRL: - id - - - forceNewer: - id - - - forceOlder: - id - - - ignoreExt: - id - - - ignoreName: - id - - - ignorePath: - id - - - leaveAlone: - id - - - merge: - id - - - revert: - id - - - selectConflicts: - id - - - showDiff: - id - - - - - IBUserSource - - - - - MyController - NSObject - - YES - - YES - cancelProfileButton: - checkOpenProfileChanged: - chooseFont: - cltoolNoButton: - cltoolYesButton: - createButton: - endPasswordWindow: - installCommandLineTool: - onlineHelp: - openButton: - raiseAboutWindow: - raiseCltoolWindow: - raiseWindow: - rescan: - restartButton: - saveProfileButton: - showPreferences: - syncButton: - tableModeChanged: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - NSWindow - id - id - id - id - id - id - - - - YES - - YES - cancelProfileButton: - checkOpenProfileChanged: - chooseFont: - cltoolNoButton: - cltoolYesButton: - createButton: - endPasswordWindow: - installCommandLineTool: - onlineHelp: - openButton: - raiseAboutWindow: - raiseCltoolWindow: - raiseWindow: - rescan: - restartButton: - saveProfileButton: - showPreferences: - syncButton: - tableModeChanged: - - - YES - - cancelProfileButton: - id - - - checkOpenProfileChanged: - id - - - chooseFont: - id - - - cltoolNoButton: - id - - - cltoolYesButton: - id - - - createButton: - id - - - endPasswordWindow: - id - - - installCommandLineTool: - id - - - onlineHelp: - id - - - openButton: - id - - - raiseAboutWindow: - id - - - raiseCltoolWindow: - id - - - raiseWindow: - NSWindow - - - rescan: - id - - - restartButton: - id - - - saveProfileButton: - id - - - showPreferences: - id - - - syncButton: - id - - - tableModeChanged: - id - - - - - YES - - YES - ConnectingView - aboutWindow - checkOpenProfile - chooseDetailsFont - chooseDiffFont - chooseProfileView - cltoolPref - cltoolWindow - connectingAnimation - connectingViewGradient - detailsFontLabel - detailsTextView - detailsTextViewGradient - diffFontLabel - diffView - diffWindow - fontChangeTarget - mainWindow - notificationController - passwordCancelButton - passwordPrompt - passwordText - passwordWindow - preferencesController - preferencesView - preferencesWindow - profileBox - profileController - progressBar - splitView - statusText - tableModeSelector - tableView - updatesText - updatesView - versionText - - - YES - NSView - NSWindow - NSButton - NSButton - NSButton - NSView - NSButton - NSWindow - NSProgressIndicator - ColorGradientView - NSTextField - NSTextField - ColorGradientView - NSTextField - NSTextView - NSWindow - id - NSWindow - NotificationController - NSButton - NSTextField - NSTextField - NSWindow - PreferencesController - NSView - NSWindow - NSComboBox - ProfileController - NSProgressIndicator - NSSplitView - NSTextField - NSSegmentedControl - ReconTableView - NSTextField - NSView - NSTextField - - - - YES - - YES - ConnectingView - aboutWindow - checkOpenProfile - chooseDetailsFont - chooseDiffFont - chooseProfileView - cltoolPref - cltoolWindow - connectingAnimation - connectingViewGradient - detailsFontLabel - detailsTextView - detailsTextViewGradient - diffFontLabel - diffView - diffWindow - fontChangeTarget - mainWindow - notificationController - passwordCancelButton - passwordPrompt - passwordText - passwordWindow - preferencesController - preferencesView - preferencesWindow - profileBox - profileController - progressBar - splitView - statusText - tableModeSelector - tableView - updatesText - updatesView - versionText - - - YES - - ConnectingView - NSView - - - aboutWindow - NSWindow - - - checkOpenProfile - NSButton - - - chooseDetailsFont - NSButton - - - chooseDiffFont - NSButton - - - chooseProfileView - NSView - - - cltoolPref - NSButton - - - cltoolWindow - NSWindow - - - connectingAnimation - NSProgressIndicator - - - connectingViewGradient - ColorGradientView - - - detailsFontLabel - NSTextField - - - detailsTextView - NSTextField - - - detailsTextViewGradient - ColorGradientView - - - diffFontLabel - NSTextField - - - diffView - NSTextView - - - diffWindow - NSWindow - - - fontChangeTarget - id - - - mainWindow - NSWindow - - - notificationController - NotificationController - - - passwordCancelButton - NSButton - - - passwordPrompt - NSTextField - - - passwordText - NSTextField - - - passwordWindow - NSWindow - - - preferencesController - PreferencesController - - - preferencesView - NSView - - - preferencesWindow - NSWindow - - - profileBox - NSComboBox - - - profileController - ProfileController - - - progressBar - NSProgressIndicator - - - splitView - NSSplitView - - - statusText - NSTextField - - - tableModeSelector - NSSegmentedControl - - - tableView - ReconTableView - - - updatesText - NSTextField - - - updatesView - NSView - - - versionText - NSTextField - - - - - IBProjectSource - MyController.h - - - - MyController - NSObject - - IBUserSource - - - - - NSOutlineView - - IBProjectSource - ReconTableView.h - - - - NSOutlineView - NSTableView - - IBUserSource - - - - - NSSegmentedControl - NSControl - - IBUserSource - - - - - NotificationController - NSObject - - IBProjectSource - NotificationController.h - - - - NotificationController - NSObject - - IBUserSource - - - - - PreferencesController - NSObject - - YES - - YES - anyEnter: - localClick: - remoteClick: - - - YES - id - id - id - - - - YES - - YES - anyEnter: - localClick: - remoteClick: - - - YES - - anyEnter: - id - - - localClick: - id - - - remoteClick: - id - - - - - YES - - YES - firstRootText - localButtonCell - profileNameText - remoteButtonCell - secondRootHost - secondRootText - secondRootUser - - - YES - NSTextField - NSButtonCell - NSTextField - NSButtonCell - NSTextField - NSTextField - NSTextField - - - - YES - - YES - firstRootText - localButtonCell - profileNameText - remoteButtonCell - secondRootHost - secondRootText - secondRootUser - - - YES - - firstRootText - NSTextField - - - localButtonCell - NSButtonCell - - - profileNameText - NSTextField - - - remoteButtonCell - NSButtonCell - - - secondRootHost - NSTextField - - - secondRootText - NSTextField - - - secondRootUser - NSTextField - - - - - IBProjectSource - PreferencesController.h - - - - PreferencesController - NSObject - - IBUserSource - - - - - ProfileController - NSObject - - tableView - NSTableView - - - tableView - - tableView - NSTableView - - - - IBProjectSource - ProfileController.h - - - - ProfileController - NSObject - - IBUserSource - - - - - ProfileTableView - NSTableView - - myController - MyController - - - myController - - myController - MyController - - - - IBProjectSource - ProfileTableView.h - - - - ProfileTableView - NSTableView - - IBUserSource - - - - - ReconTableView - NSOutlineView - - YES - - YES - copyLR: - copyRL: - forceNewer: - forceOlder: - ignoreExt: - ignoreName: - ignorePath: - leaveAlone: - merge: - revert: - selectConflicts: - showDiff: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - copyLR: - copyRL: - forceNewer: - forceOlder: - ignoreExt: - ignoreName: - ignorePath: - leaveAlone: - merge: - revert: - selectConflicts: - showDiff: - - - YES - - copyLR: - id - - - copyRL: - id - - - forceNewer: - id - - - forceOlder: - id - - - ignoreExt: - id - - - ignoreName: - id - - - ignorePath: - id - - - leaveAlone: - id - - - merge: - id - - - revert: - id - - - selectConflicts: - id - - - showDiff: - id - - - - - - - ReconTableView - NSOutlineView - - IBUserSource - - - - - SSSelectableToolbar - NSToolbar - - window - NSWindow - - - window - - window - NSWindow - - - - IBProjectSource - ssselectabletoolbar/SSSelectableToolbar.h - - - - SSSelectableToolbarItem - NSToolbarItem - - linkedView - NSView - - - linkedView - - linkedView - NSView - - - - IBProjectSource - ssselectabletoolbar/SSSelectableToolbarItem.h - - - - - YES - - NSApplication - - IBFrameworkSource - BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h - - - - NSObject - - IBFrameworkSource - ExceptionHandling.framework/Headers/NSExceptionHandler.h - - - - NSObject - - IBFrameworkSource - Growl.framework/Headers/GrowlApplicationBridge.h - - - - NSView - - IBFrameworkSource - BWToolkitFramework.framework/Headers/NSView+BWAdditions.h - - - - NSWindow - - IBFrameworkSource - BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - ../uimacnew.xcodeproj - 3 - - YES - - YES - NSFontPanel - NSMenuCheckmark - NSMenuMixedState - NSPreferencesGeneral - NSSwitch - Outline-Deep - Outline-Flat - Outline-Flattened - Unison - - - YES - {32, 32} - {9, 8} - {7, 2} - {32, 32} - {15, 15} - {24, 16} - {24, 16} - {24, 16} - {128, 128} - - - - +This software is licensed under the GNU General Public License. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The command-line tool is a small program that can be installed in a standard place on your computer (/usr/bin/unison) so Unison can easily be found. If you want to be able to synchronize files on this computer by running Unison on a remote computer, you should probably install it. + +If you don't install it now, you can do so later by choosing 'Install command-line tool' from the Unison menu. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From alan.schmitt at polytechnique.org Mon Jul 7 07:23:22 2014 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Mon, 07 Jul 2014 13:23:22 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <4C0061B2-1F7B-4784-BBFE-727F1AE923C8@cis.upenn.edu> (Benjamin C. Pierce's message of "Mon, 7 Jul 2014 06:57:53 -0400") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <4C0061B2-1F7B-4784-BBFE-727F1AE923C8@cis.upenn.edu> Message-ID: On 2014-07-07 12:57, "Benjamin C. Pierce" writes: >> Tiny nitpick: the copyright information in the GUI "About" window >> mentions 2006 and not 2014. >> > > I know ? any idea how to change that? I fired up XCode and it was just a matter of digging into the resources to find the about window. Best, Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 494 bytes Desc: not available URL: From bcpierce at cis.upenn.edu Mon Jul 7 08:02:07 2014 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Mon, 7 Jul 2014 08:02:07 -0400 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <4C0061B2-1F7B-4784-BBFE-727F1AE923C8@cis.upenn.edu> Message-ID: <6EB3B34E-338E-4956-9A9B-8FCBEEF283D9@cis.upenn.edu> Cool ? thanks. - B On Jul 7, 2014, at 7:23 AM, Alan Schmitt wrote: > On 2014-07-07 12:57, "Benjamin C. Pierce" writes: > >>> Tiny nitpick: the copyright information in the GUI "About" window >>> mentions 2006 and not 2014. >>> >> >> I know ? any idea how to change that? > > I fired up XCode and it was just a matter of digging into the resources > to find the about window. > > Best, > > Alan > > -- > OpenPGP Key ID : 040D0A3B4ED2E5C7 > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From crestani at informatik.uni-tuebingen.de Tue Jul 8 03:22:30 2014 From: crestani at informatik.uni-tuebingen.de (Marcus Crestani) Date: Tue, 08 Jul 2014 09:22:30 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> (Benjamin C. Pierce's message of "Sun, 6 Jul 2014 18:48:47 -0400") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> Message-ID: >>>>>"BCP" == Benjamin C Pierce writes: BCP> Unless I hear about any problems in the next couple days, I?ll make BCP> a new beta-release out of it. Thanks, it builds and works fine, except the problem with the new OS X port (UISTYLE=uimac14) I've reported earlier: http://lists.seas.upenn.edu/pipermail/unison-hackers/2014-May/001704.html As expected, the crash is identical and 100% reproducible for me and does not occur when using the UISTYLE=gtk2 or the UISTYLE=text builds. Keep up the good work, -- Marcus From ats at acm.org Tue Jul 8 20:33:41 2014 From: ats at acm.org (Alan Shutko) Date: Tue, 8 Jul 2014 19:33:41 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> Message-ID: <8A50BB68-D99A-41C6-9087-183758AE1605@acm.org> I?m convinced that the reason it?s failing has to be some race condition between the UI and the OCaml code, which runs in a separate thread. But I?m at a loss to how to sort it out. Anyone with more experience with OCaml have any ideas? > On Jul 8, 2014, at 2:22 AM, Marcus Crestani wrote: > >>>>>> "BCP" == Benjamin C Pierce writes: > BCP> Unless I hear about any problems in the next couple days, I?ll make > BCP> a new beta-release out of it. > > Thanks, it builds and works fine, except the problem with the new OS X > port (UISTYLE=uimac14) I've reported earlier: > > http://lists.seas.upenn.edu/pipermail/unison-hackers/2014-May/001704.html > > As expected, the crash is identical and 100% reproducible for me and > does not occur when using the UISTYLE=gtk2 or the UISTYLE=text builds. > > Keep up the good work, > > -- > Marcus > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From ats at acm.org Thu Jul 17 10:58:33 2014 From: ats at acm.org (Alan Shutko) Date: Thu, 17 Jul 2014 09:58:33 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> Message-ID: <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> I?ve done some research on this. This seems like it might be possibly relevant: http://stackoverflow.com/questions/20114920/can-an-exec-bad-instruction-sigill-on-dyld-my-fault Marcus, how is your build setup? Is it possible there is a difference between the way certain libraries were built? It seems like we might get a SIGILL as shown in your crash if we have some parts compiled for 32-bit and others for 64-bit (or other arch differences). In UISTYLE=text, all the build arguments are controlled by the makefile. In UISTYLE=uimac* the flags for compiling the objective C stuff is in the xcode project. Three questions: could you send me a log of your compilation? Are you using the new version on both the local and remote system? If so, is it crashing on the local system, the remote, or both? > On Jul 8, 2014, at 2:22 AM, Marcus Crestani wrote: > >>>>>> "BCP" == Benjamin C Pierce writes: > BCP> Unless I hear about any problems in the next couple days, I?ll make > BCP> a new beta-release out of it. > > Thanks, it builds and works fine, except the problem with the new OS X > port (UISTYLE=uimac14) I've reported earlier: > > http://lists.seas.upenn.edu/pipermail/unison-hackers/2014-May/001704.html > > As expected, the crash is identical and 100% reproducible for me and > does not occur when using the UISTYLE=gtk2 or the UISTYLE=text builds. > > Keep up the good work, > > -- > Marcus > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers -------------- next part -------------- An HTML attachment was scrubbed... URL: From crestani at informatik.uni-tuebingen.de Thu Jul 17 11:51:25 2014 From: crestani at informatik.uni-tuebingen.de (Marcus Crestani) Date: Thu, 17 Jul 2014 17:51:25 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> (Alan Shutko's message of "Thu, 17 Jul 2014 09:58:33 -0500") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> Message-ID: >>>>>"AS" == Alan Shutko writes: AS> Marcus, how is your build setup? Is it possible there is a difference AS> between the way certain libraries were built? It seems like we might AS> get a SIGILL as shown in your crash if we have some parts compiled for AS> 32-bit and others for 64-bit (or other arch differences). In AS> UISTYLE=text, all the build arguments are controlled by the AS> makefile. In UISTYLE=uimac* the flags for compiling the objective C AS> stuff is in the xcode project. otool -L /Applications/Unison.app/Contents/MacOS/Unison shows that the binary is only linked to Frameworks or dylibs that come with OS X, no libraries that I have custom built: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa (compatibility version 1.0.0, current version 20.0.0) /System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 55471.14.0) /System/Library/Frameworks/ExceptionHandling.framework/Versions/A/ExceptionHandling (compatibility version 1.0.0, current version 10.0.0) @executable_path/../Frameworks/Growl.framework/Versions/A/Growl (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (compatibility version 300.0.0, current version 1056.13.0) /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1) /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 1265.19.0) /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 855.14.0) These built-in libraries are all fat binaries: # otool -L /Applications/Unison.app/Contents/MacOS/Unison | cut -d ' ' -f 1 | grep -v "^Unison" | xargs file /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: Mach-O universal binary with 2 architectures /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa (for architecture i386): Mach-O dynamically linked shared library i386 /System/Library/Frameworks/Security.framework/Versions/A/Security: Mach-O universal binary with 2 architectures /System/Library/Frameworks/Security.framework/Versions/A/Security (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /System/Library/Frameworks/Security.framework/Versions/A/Security (for architecture i386): Mach-O dynamically linked shared library i386 /System/Library/Frameworks/ExceptionHandling.framework/Versions/A/ExceptionHandling: Mach-O universal binary with 2 architectures /System/Library/Frameworks/ExceptionHandling.framework/Versions/A/ExceptionHandling (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /System/Library/Frameworks/ExceptionHandling.framework/Versions/A/ExceptionHandling (for architecture i386): Mach-O dynamically linked shared library i386 @executable_path/../Frameworks/Growl.framework/Versions/A/Growl: cannot open `@executable_path/../Frameworks/Growl.framework/Versions/A/Growl' (No such file or directory) /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation: Mach-O universal binary with 2 architectures /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (for architecture i386): Mach-O dynamically linked shared library i386 /usr/lib/libobjc.A.dylib: Mach-O universal binary with 2 architectures /usr/lib/libobjc.A.dylib (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /usr/lib/libobjc.A.dylib (for architecture i386): Mach-O dynamically linked shared library i386 /usr/lib/libSystem.B.dylib: Mach-O universal binary with 2 architectures /usr/lib/libSystem.B.dylib (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /usr/lib/libSystem.B.dylib (for architecture i386): Mach-O dynamically linked shared library i386 /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit: Mach-O universal binary with 2 architectures /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (for architecture i386): Mach-O dynamically linked shared library i386 /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation: Mach-O universal binary with 2 architectures /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (for architecture i386): Mach-O dynamically linked shared library i386 The path to Growl in the above output is broken. But it is also a fat binary: # file /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl: Mach-O universal binary with 3 architectures /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl (for architecture i386): Mach-O dynamically linked shared library i386 /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl (for architecture ppc): Mach-O dynamically linked shared library ppc AS> Three questions: could you send me a log of your compilation? Sure, it is attached. AS> Are you using the new version on both the local and remote system? I always use the new version on both systems (otherwise, Unison would fail with a version mismatch, I guess). AS> If so, is it crashing on the local system, the remote, or both? It crashes only on the local system. Thanks for looking into it, hope this helps, Marcus -------------- next part -------------- A non-text attachment was scrubbed... Name: build.log Type: application/octet-stream Size: 153030 bytes Desc: not available URL: From ats at acm.org Thu Jul 17 12:12:55 2014 From: ats at acm.org (Alan Shutko) Date: Thu, 17 Jul 2014 11:12:55 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> Message-ID: <0BBBB217-DD0B-4A03-BEE4-EC8381E13B8E@acm.org> Thanks. Could you send me the output of ocamlopt -config > On Jul 17, 2014, at 10:51 AM, Marcus Crestani wrote: > >>>>>> "AS" == Alan Shutko writes: > AS> Marcus, how is your build setup? Is it possible there is a difference > AS> between the way certain libraries were built? It seems like we might > AS> get a SIGILL as shown in your crash if we have some parts compiled for > AS> 32-bit and others for 64-bit (or other arch differences). In > AS> UISTYLE=text, all the build arguments are controlled by the > AS> makefile. In UISTYLE=uimac* the flags for compiling the objective C > AS> stuff is in the xcode project. > > otool -L /Applications/Unison.app/Contents/MacOS/Unison shows that the > binary is only linked to Frameworks or dylibs that come with OS X, no > libraries that I have custom built: > > /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa (compatibility version 1.0.0, current version 20.0.0) > /System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 55471.14.0) > /System/Library/Frameworks/ExceptionHandling.framework/Versions/A/ExceptionHandling (compatibility version 1.0.0, current version 10.0.0) > @executable_path/../Frameworks/Growl.framework/Versions/A/Growl (compatibility version 1.0.0, current version 1.0.0) > /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (compatibility version 300.0.0, current version 1056.13.0) > /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0) > /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1197.1.1) > /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 1265.19.0) > /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 855.14.0) > > These built-in libraries are all fat binaries: > > # otool -L /Applications/Unison.app/Contents/MacOS/Unison | cut -d ' ' -f 1 | grep -v "^Unison" | xargs file > /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: Mach-O universal binary with 2 architectures > /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa (for architecture i386): Mach-O dynamically linked shared library i386 > /System/Library/Frameworks/Security.framework/Versions/A/Security: Mach-O universal binary with 2 architectures > /System/Library/Frameworks/Security.framework/Versions/A/Security (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /System/Library/Frameworks/Security.framework/Versions/A/Security (for architecture i386): Mach-O dynamically linked shared library i386 > /System/Library/Frameworks/ExceptionHandling.framework/Versions/A/ExceptionHandling: Mach-O universal binary with 2 architectures > /System/Library/Frameworks/ExceptionHandling.framework/Versions/A/ExceptionHandling (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /System/Library/Frameworks/ExceptionHandling.framework/Versions/A/ExceptionHandling (for architecture i386): Mach-O dynamically linked shared library i386 > @executable_path/../Frameworks/Growl.framework/Versions/A/Growl: cannot open `@executable_path/../Frameworks/Growl.framework/Versions/A/Growl' (No such file or directory) > /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation: Mach-O universal binary with 2 architectures > /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (for architecture i386): Mach-O dynamically linked shared library i386 > /usr/lib/libobjc.A.dylib: Mach-O universal binary with 2 architectures > /usr/lib/libobjc.A.dylib (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /usr/lib/libobjc.A.dylib (for architecture i386): Mach-O dynamically linked shared library i386 > /usr/lib/libSystem.B.dylib: Mach-O universal binary with 2 architectures > /usr/lib/libSystem.B.dylib (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /usr/lib/libSystem.B.dylib (for architecture i386): Mach-O dynamically linked shared library i386 > /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit: Mach-O universal binary with 2 architectures > /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (for architecture i386): Mach-O dynamically linked shared library i386 > /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation: Mach-O universal binary with 2 architectures > /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (for architecture i386): Mach-O dynamically linked shared library i386 > > The path to Growl in the above output is broken. But it is also a fat > binary: > > # file /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl > /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl: Mach-O universal binary with 3 architectures > /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 > /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl (for architecture i386): Mach-O dynamically linked shared library i386 > /Applications/Unison.app/Contents/Frameworks/Growl.framework/Growl (for architecture ppc): Mach-O dynamically linked shared library ppc > > AS> Three questions: could you send me a log of your compilation? > > Sure, it is attached. > > AS> Are you using the new version on both the local and remote system? > > I always use the new version on both systems (otherwise, Unison would > fail with a version mismatch, I guess). > > AS> If so, is it crashing on the local system, the remote, or both? > > It crashes only on the local system. > > Thanks for looking into it, hope this helps, > Marcus > > From crestani at informatik.uni-tuebingen.de Thu Jul 17 13:12:41 2014 From: crestani at informatik.uni-tuebingen.de (Marcus Crestani) Date: Thu, 17 Jul 2014 19:12:41 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <0BBBB217-DD0B-4A03-BEE4-EC8381E13B8E@acm.org> (Alan Shutko's message of "Thu, 17 Jul 2014 11:12:55 -0500") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> <0BBBB217-DD0B-4A03-BEE4-EC8381E13B8E@acm.org> Message-ID: >>>>>"AS" == Alan Shutko writes: AS> ocamlopt -config version: 4.01.0 standard_library_default: /afs/informatik.uni-tuebingen.de/macx130/ocaml-4.01.0/lib/ocaml standard_library: /afs/informatik.uni-tuebingen.de/macx130/ocaml-4.01.0/lib/ocaml standard_runtime: /afs/informatik.uni-tuebingen.de/macx130/ocaml-4.01.0/bin/ocamlrun ccomp_type: cc bytecomp_c_compiler: gcc -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT bytecomp_c_libraries: -lcurses -lpthread native_c_compiler: gcc -D_FILE_OFFSET_BITS=64 -D_REENTRANT native_c_libraries: native_pack_linker: ld -r -arch x86_64 -o ranlib: ranlib cc_profile: -pg architecture: amd64 model: default system: macosx asm: clang -arch x86_64 -c asm_cfi_supported: true with_frame_pointers: false ext_obj: .o ext_asm: .s ext_lib: .a ext_dll: .so os_type: Unix default_executable_name: a.out systhread_supported: true exec_magic_number: Caml1999X008 cmi_magic_number: Caml1999I015 cmo_magic_number: Caml1999O007 cma_magic_number: Caml1999A008 cmx_magic_number: Caml1999Y011 cmxa_magic_number: Caml1999Z010 ast_impl_magic_number: Caml1999M016 ast_intf_magic_number: Caml1999N015 cmxs_magic_number: Caml2007D001 cmt_magic_number: Caml2012T002 -- Marcus From ats at acm.org Thu Jul 17 15:02:27 2014 From: ats at acm.org (Alan Shutko) Date: Thu, 17 Jul 2014 14:02:27 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> <0BBBB217-DD0B-4A03-BEE4-EC8381E13B8E@acm.org> Message-ID: <591087D6-0BCF-49AD-BA57-354B33B529BE@acm.org> Thanks. The only differences between yours and mine are file paths, you are using GCC and I am using clang, and you have a -arch x86_64 in native_pack_linker. I?ve got some things to dig into, but I don?t have a solution yet. :( > On Jul 17, 2014, at 12:12 PM, Marcus Crestani wrote: > > version: 4.01.0 > standard_library_default: /afs/informatik.uni-tuebingen.de/macx130/ocaml-4.01.0/lib/ocaml > standard_library: /afs/informatik.uni-tuebingen.de/macx130/ocaml-4.01.0/lib/ocaml > standard_runtime: /afs/informatik.uni-tuebingen.de/macx130/ocaml-4.01.0/bin/ocamlrun > ccomp_type: cc > bytecomp_c_compiler: gcc -Wall -D_FILE_OFFSET_BITS=64 -D_REENTRANT > bytecomp_c_libraries: -lcurses -lpthread > native_c_compiler: gcc -D_FILE_OFFSET_BITS=64 -D_REENTRANT > native_c_libraries: > native_pack_linker: ld -r -arch x86_64 -o > ranlib: ranlib > cc_profile: -pg > architecture: amd64 > model: default > system: macosx > asm: clang -arch x86_64 -c > asm_cfi_supported: true > with_frame_pointers: false > ext_obj: .o > ext_asm: .s > ext_lib: .a > ext_dll: .so > os_type: Unix > default_executable_name: a.out > systhread_supported: true > exec_magic_number: Caml1999X008 > cmi_magic_number: Caml1999I015 > cmo_magic_number: Caml1999O007 > cma_magic_number: Caml1999A008 > cmx_magic_number: Caml1999Y011 > cmxa_magic_number: Caml1999Z010 > ast_impl_magic_number: Caml1999M016 > ast_intf_magic_number: Caml1999N015 > cmxs_magic_number: Caml2007D001 > cmt_magic_number: Caml2012T002 > > -- -------------- next part -------------- An HTML attachment was scrubbed... URL: From crestani at informatik.uni-tuebingen.de Thu Jul 17 15:10:36 2014 From: crestani at informatik.uni-tuebingen.de (Marcus Crestani) Date: Thu, 17 Jul 2014 21:10:36 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <591087D6-0BCF-49AD-BA57-354B33B529BE@acm.org> (Alan Shutko's message of "Thu, 17 Jul 2014 14:02:27 -0500") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> <0BBBB217-DD0B-4A03-BEE4-EC8381E13B8E@acm.org> <591087D6-0BCF-49AD-BA57-354B33B529BE@acm.org> Message-ID: >>>>>"AS" == Alan Shutko writes: AS> Thanks. The only differences between yours and mine are file paths, AS> you are using GCC and I am using clang, and you have a -arch x86_64 in AS> native_pack_linker. I?ve got some things to dig into, but I don?t have AS> a solution yet. :( I've been hitting this bug as well with the binary that you have built. Thus, differences in the build process are probably not causing the problem, IMHO. -- Marcus From ats at acm.org Thu Jul 17 15:12:43 2014 From: ats at acm.org (Alan Shutko) Date: Thu, 17 Jul 2014 14:12:43 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> <0BBBB217-DD0B-4A03-BEE4-EC8381E13B8E@acm.org> <591087D6-0BCF-49AD-BA57-354B33B529BE@acm.org> Message-ID: Thanks for the disappointing news! I?ll keep looking. > On Jul 17, 2014, at 2:10 PM, Marcus Crestani wrote: > >>>>>> "AS" == Alan Shutko writes: > AS> Thanks. The only differences between yours and mine are file paths, > AS> you are using GCC and I am using clang, and you have a -arch x86_64 in > AS> native_pack_linker. I?ve got some things to dig into, but I don?t have > AS> a solution yet. :( > > I've been hitting this bug as well with the binary that you have built. > Thus, differences in the build process are probably not causing the > problem, IMHO. > > -- > Marcus From crestani at informatik.uni-tuebingen.de Fri Jul 18 01:54:14 2014 From: crestani at informatik.uni-tuebingen.de (Marcus Crestani) Date: Fri, 18 Jul 2014 07:54:14 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: (Alan Shutko's message of "Thu, 17 Jul 2014 14:12:43 -0500") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> <46F71EEA-E528-4B22-869E-8679DB06E8A0@cis.upenn.edu> <50C5CC58-7450-4E45-BADB-94C0B952241B@acm.org> <0BBBB217-DD0B-4A03-BEE4-EC8381E13B8E@acm.org> <591087D6-0BCF-49AD-BA57-354B33B529BE@acm.org> Message-ID: >>>>>"AS" == Alan Shutko writes: AS> Thanks for the disappointing news! I?ll keep looking. The news shouldn't be that surprising, since my first report of the problem was with your first testing build. Chin up, and as always, please let me know how I can help. :-) Thanks for your work, Marcus