From Jerome.Vouillon at pps.jussieu.fr Tue Mar 9 07:16:24 2010 From: Jerome.Vouillon at pps.jussieu.fr (Jerome Vouillon) Date: Tue, 9 Mar 2010 13:16:24 +0100 Subject: [Unison-hackers] [unison-svn] r413 - in trunk/src: . lwt ubase uimacnew uimacnew/English.lproj/MainMenu.nib uimacnew09 In-Reply-To: <201002230259.o1N2xQ7O026040@yaws.seas.upenn.edu> References: <201002230259.o1N2xQ7O026040@yaws.seas.upenn.edu> Message-ID: <20100309121623.GB20912@pps.jussieu.fr> On Mon, Feb 22, 2010 at 09:59:25PM -0500, bcpierce at seas.upenn.edu wrote: > * Make MyController a delegate of Application in OSX GUI, as > suggested by Jerome. I thought Alan had already done that (revision 405)! -- Jerome From bcpierce at cis.upenn.edu Fri Mar 12 17:13:15 2010 From: bcpierce at cis.upenn.edu (Benjamin Pierce) Date: Fri, 12 Mar 2010 17:13:15 -0500 Subject: [Unison-hackers] [unison-svn] r400 - in trunk/src: . system system/win ubase uimacnew uimacnew09 In-Reply-To: <25ec8ca61002240632l43c5095aj108b9605e3b30308@mail.gmail.com> References: <201001102253.o0AMr3a1026196@yaws.seas.upenn.edu> <39207FF6-4FBA-4720-9391-6CFADB2EDCEA@cis.upenn.edu> <7350E55C-F892-4676-BA8F-B055E0D5F9A2@informatik.uni-bremen.de> <922E47A3-822E-4DCF-966F-B8DA9089D707@cis.upenn.edu> <25ec8ca61002232226x48d92710r7753c5ecef540ee2@mail.gmail.com> <25ec8ca61002240632l43c5095aj108b9605e3b30308@mail.gmail.com> Message-ID: <043C25CA-43CD-439F-B70C-D729E7CC9459@cis.upenn.edu> OK, I finally got one of my machines upgraded to 10.6 and mostly working again after the upgrade (ugh), and I can now confirm that this works for me too. I've added the .ibplugin file to the svn repo and included it in the install instructions. I'm having one problem with compiling both versions of the GUI: uimacnew09/cltool.c: In function 'main': uimacnew09/cltool.c:37: warning: format '%d' expects type 'int', but argument 3 has type 'OSStatus' uimacnew09/cltool.c:43: warning: format '%d' expects type 'int', but argument 3 has type 'OSStatus' Have others seen this? - B On Feb 24, 2010, at 9:32 AM, Alan Schmitt wrote: >>> Should I try to build uimacnew09 here? >> >> Sure. I'm just committing a version with the updated frameworks >> and .xcodeproj file... > > Here is what I had to do: > - go to http://www.brandonwalkin.com/bwtoolkit/, download the .zip, > extract it, put the BWToolkit.ibplugin somewhere (in uimacnew09), > double click it to install it > => I suggest we add it to svn and have either an automatic way to > install it, or say in the install file that the person should first > install it (by double clicking on it) > - in Xcode, choose: Targets -> uimac -> Info -> Build and change the > Architectures to 64 bits intel > => We should find a way to change this from the command line ... > > I get a Unison that runs and I'm trying it right now. > > By the way, there were some warning when compiling MyController.m. > > /Users/schmitta/src/unison/trunk/src/uimacnew09/MyController.m: In > function ?-[MyController outlineView:numberOfChildrenOfItem:]?: > /Users/schmitta/src/unison/trunk/src/uimacnew09/MyController.m:625: > warning: conflicting types for ?-(int)outlineView:(NSOutlineView > *)outlineView numberOfChildrenOfItem:(id)item? > /Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSOutlineView.h:199: > warning: previous declaration of > ?-(NSInteger)outlineView:(NSOutlineView *)outlineView > numberOfChildrenOfItem:(id)item? > /Users/schmitta/src/unison/trunk/src/uimacnew09/MyController.m: In > function ?-[MyController outlineView:child:ofItem:]?: > /Users/schmitta/src/unison/trunk/src/uimacnew09/MyController.m:634: > warning: conflicting types for ?-(id)outlineView:(NSOutlineView > *)outlineView child:(int)index ofItem:(id)item? > /Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/AppKit.framework/Headers/NSOutlineView.h:197: > warning: previous declaration of ?-(id)outlineView:(NSOutlineView > *)outlineView child:(NSInteger)index ofItem:(id)item? > > Alan > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers > From bcpierce at seas.upenn.edu Fri Mar 12 17:47:19 2010 From: bcpierce at seas.upenn.edu (bcpierce@seas.upenn.edu) Date: Fri, 12 Mar 2010 17:47:19 -0500 Subject: [Unison-hackers] [unison-svn] r419 - in trunk: doc src src/uimacnew09 src/uimacnew09/BWToolkit.ibplugin src/uimacnew09/BWToolkit.ibplugin/Contents src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources src/uimacnew09/BWToolkit.ibplugin/Contents/MacOS src/uimacnew09/BWToolkit.ibplugin/Contents/Resources src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/English.lproj src/uimacnew09/uimacnew.xcodeproj Message-ID: <201003122247.o2CMlKXg007398@yaws.seas.upenn.edu> Author: bcpierce Date: 2010-03-12 17:47:16 -0500 (Fri, 12 Mar 2010) New Revision: 419 Added: trunk/src/uimacnew09/BWToolkit.ibplugin/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/BWToolkitFramework trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Headers trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Resources trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/BWToolkitFramework trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButton.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButtonBar.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButtonCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredPopUpButton.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredPopUpButtonCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWGradientBox.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWHyperlinkButton.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWHyperlinkButtonCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWInsetTextField.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSelectableToolbar.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSheetController.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSplitView.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWStyledTextField.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWStyledTextFieldCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSlider.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSliderCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenAttachmentCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenField.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenFieldCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarItem.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarShowColorsItem.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarShowFontsItem.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolkitFramework.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentButton.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentButtonCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentCheckbox.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentCheckboxCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentPopUpButton.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentPopUpButtonCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentScrollView.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentScroller.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentSlider.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentSliderCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTableView.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTableViewCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTextFieldCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWUnanchoredButton.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWUnanchoredButtonCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSApplication+BWAdditions.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSColor+BWAdditions.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSImage+BWAdditions.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSTokenAttachment.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSTokenAttachmentCell.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSView+BWAdditions.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSWindow+BWAdditions.h trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ButtonBarPullDownArrow.pdf trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/GradientSplitViewDimpleBitmap.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/GradientSplitViewDimpleVector.pdf trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Info.plist trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Library-SheetController.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/License.rtf trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Release Notes.rtf trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderPhotoLarge.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderPhotoSmall.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderSpeakerLoud.png trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderSpeakerQuiet.png trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderThumbN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderThumbP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackFill.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackLeft.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackRight.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ToolbarItemColors.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ToolbarItemFonts.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonFillN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonFillP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonLeftN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonLeftP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonRightN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonRightP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOffN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOffP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOnN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOnP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpFillN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpFillP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpLeftN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpLeftP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpPullDownRightN.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpPullDownRightP.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpRightN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpRightP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobBottom.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobHorizontalFill.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobLeft.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobRight.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobTop.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobVerticalFill.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotBottom.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotHorizontalFill.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotLeft.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotRight.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotTop.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotVerticalFill.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderThumbN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderThumbP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackFill.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackLeft.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackRight.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTriangleThumbN.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTriangleThumbP.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/Current trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Info.plist trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/MacOS/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/MacOS/BWToolkit trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddMiniBottomBar.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddRegularBottomBar.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddSmallBottomBar.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButton.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButtonBar.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButtonBarInspector.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredPopUpButton.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWBottomBarLibrary.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWButtonBarLibrary.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWControllersLibrary.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWGradientBoxInspector.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWHyperlinkButtonInspector.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWInsetTextField.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWRemoveBottomBar.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSelectableToolbar.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSelectableToolbarInspector.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSheetController.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitView.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitViewInspector.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitViewLibrary.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWStyledTextFieldInspector.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSlider.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSliderCell.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSliderInspector.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTokenField.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTokenFieldCell.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItem.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItemInspector.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItemsLibrary.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarShowColorsItem.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarShowFontsItem.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentButton.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentButtonCell.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentCheckbox.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentCheckboxCell.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentControlsLibrary.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentPopUpButton.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentPopUpButtonCell.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentScroller.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentSlider.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentSliderCell.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTableView.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTableViewCell.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTextFieldCell.classdescription trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/English.lproj/ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/English.lproj/BWToolkitLibrary.nib trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/English.lproj/InfoPlist.strings trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/GradientWellPattern.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode1.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode1Pressed.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode2.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode2Pressed.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode3.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode3Pressed.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarModeSelection.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowBlueLeft.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowBlueRight.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedFill.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedLeft.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedRight.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewBackground.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddMiniBottomBar.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddRegularBottomBar.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddSheetBottomBar.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddSmallBottomBar.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredButton.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredButtonBar.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredPopUpButton.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-GradientBox.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-GradientSplitView.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-HorizontalSplitView.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-InsetTextField.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-RemoveBottomBar.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-SelectableToolbar.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-SheetController.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ShowColors.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ShowFonts.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-StyledTextField.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedAddButton.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedRemoveButton.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedSlider.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TokenField.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ToolbarItem.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentButton.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentCheckbox.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentCheckboxCell.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentLabel.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentPopUpButton.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentSlider.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentTableView.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentTextView.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-VerticalSplitView.tif trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/ToolbarItemColors.tiff trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/ToolbarItemFonts.tiff Modified: trunk/doc/unison-manual.tex trunk/src/INSTALL trunk/src/INSTALL.win32-cygwin-gnuc trunk/src/RECENTNEWS trunk/src/TODO.txt trunk/src/mkProjectInfo.ml trunk/src/uimacnew09/uimacnew.xcodeproj/project.pbxproj Log: * Updated the Cygwin install instructions per Uwe Mayer (thanks!) * Added interface builder files for BWToolkit framework to uimacnew09 directory, to make the distribution self-contained, and added instructions for installing it to the INSTALL section of the manual. Modified: trunk/doc/unison-manual.tex =================================================================== --- trunk/doc/unison-manual.tex 2010-02-24 14:34:18 UTC (rev 418) +++ trunk/doc/unison-manual.tex 2010-03-12 22:47:16 UTC (rev 419) @@ -104,7 +104,7 @@ \URL{http://samba.org/rsync/}{rsync} protocol was built by \URL{http://www.eecs.harvard.edu/\home{nr}/}{Norman Ramsey} - and Sylvain Gommier. It is is based on + and Sylvain Gommier. It is based on \URL{http://samba.anu.edu.au/\home{tridge}/}{Andrew Tridgell}'s \URL{http://samba.anu.edu.au/\home{tridge}/phd\_thesis.pdf}{thesis work} and inspired by his @@ -203,7 +203,8 @@ \begin{enumerate} \item a simple textual interface, suitable for dumb terminals (and running from scripts), and -\item a more sophisticated grapical interface, based on Gtk2. +\item a more sophisticated grapical interface, based on Gtk2 (on + Linux/Windows) or the native UI framework (on OSX). \end{enumerate} You will need to install a copy of Unison on every machine that you @@ -282,7 +283,7 @@ \SUBSUBSECTION{Unix}{build-unix} -You'll need the Objective Caml compiler (version 3.07 or later), which is +You'll need the Objective Caml compiler (version 3.11.2 or later), which is available from \ONEURL{http://caml.inria.fr}. Building and installing OCaml on Unix systems is very straightforward; just follow the instructions in the distribution. You'll probably want to build the native-code compiler in @@ -333,6 +334,31 @@ by adding the Unison directory to your PATH variable or by copying the executable to some standard directory where executables are stored. +\SUBSUBSECTION{Mac OS X}{build-osx} + +To build the text-only user interface, follow the instructions above for +building on Unix systems. You should do this first, even if you are also +planning on building the GUI, just to make sure it works. + +To build the basic GUI version, you'll first need to download and install +the XCode developer tools from Apple. Once this is done, just type {\tt + make UISTYLE=macnew} in the {\tt src} directory, and if things go well you +should get an application that you can move from {\tt + uimacnew/build/Default/Unison.app} to wherever you want it. + +There is also an experimental GUI with a somewhat smoother look and feel. +To compile this one (once you've got the basic one working), proceed as +follows: +\begin{enumerate} +\item Go to the {\tt uimacnew09} directory and double-click the file {\tt + BWToolkit.ibplugin}. +\item Go back up to the {\tt src} directory and type {\tt make + UISTYLE=macnew09}. +\item You should get an application built for you at {\tt + uimacnew09/build/Default/Unison.app}. +\end{enumerate} + + \SUBSUBSECTION{Windows}{build-win} Although the binary distribution should work on any version of Windows, @@ -583,7 +609,7 @@ Running \verb|ssh| requires some coordination between the client and server machines to establish that the client is allowed to invoke commands on -the server; please refer to the or \verb|ssh| documentation +the server; please refer to the \verb|ssh| documentation for information on how to set this up. The examples in this section use \verb|ssh|, but you can substitute \verb|rsh| for \verb|ssh| if you wish. @@ -1125,7 +1151,7 @@ file has not been changed. Under normal circumstances, this approximation is safe, in the sense - that it may sometimes detect ``false updates'' will never miss a real + that it may sometimes detect ``false updates'' but will never miss a real one. However, it is possible to fool it, for example by using \verb|retouch| to change a file's modtime back to a time in the past. \finishlater{One user---Marcus Mottl---claimed that it could also @@ -1154,7 +1180,7 @@ \item Unison does not understand hard links. \item It is important to be a little careful when renaming directories -containing ``ignore''d files. +containing {\tt ignore}d files. For example, suppose Unison is synchronizing directory A between the two machines called the ``local'' and the ``remote'' machine; suppose directory Modified: trunk/src/INSTALL =================================================================== --- trunk/src/INSTALL 2010-02-24 14:34:18 UTC (rev 418) +++ trunk/src/INSTALL 2010-03-12 22:47:16 UTC (rev 419) @@ -1,207 +1,3 @@ +For installation instructions, see the the INSTALLATION section of the +user manual. -Installation - - Unison is designed to be easy to install. The following sequence of - steps should get you a fully working installation in a few minutes. - (If you run into trouble, you may find the suggestions in the section - ``FAQ'' helpful.) - - Unison can be used with either of two user interfaces: - 1. a simple textual interface, suitable for dumb terminals (and - running from scripts), and - 2. a more sophisticated grapical interface, based on Gtk. - - You will need to install a copy of Unison on every machine that you - want to synchronize. However, you only need the version with a - graphical user interface (if you want a GUI at all) on the machine - where you're actually going to display the interface (the CLIENT - machine). Other machines that you synchronize with can get along just - fine with the textual version. - - Downloading Unison - - If a pre-built binary of Unison is available for the client machine's - architecture, just download it and put it somewhere in your search - path (if you're going to invoke it from the command line) or on your - desktop (if you'll be click-starting it). - - The executable file for the graphical version (with a name including - gtkui) actually provides both interfaces: the graphical one appears by - default, while the textual interface can be selected by including -ui - text on the command line. The textui executable provides just the - textual interface. - - If you don't see a pre-built executable for your architecture, you'll - need to build it yourself. See the section ``Building Unison'' . - (There are also a small number of ``contributed ports'' to other - architectures that are not maintained by us. See the section - ``Contributed Ports'' to check what's available.) - - Check to make sure that what you have downloaded is really executable. - Either click-start it, or type "unison -version" at the command line. - - Unison can be used in several different modes: with different - directories on a single machine, with a remote machine over a direct - socket connection, with a remote machine using rsh (on Unix systems), - or with a remote Unix system (from either a Unix or a Windows client) - using ssh for authentication and secure transfer. If you intend to use - the last option, you may need to install ssh; see the section - ``Installing Ssh'' . - - Running Unison - - Once you've got Unison installed on at least one system, read the - section ``Tutorial'' of the user manual (or type "unison -doc - tutorial") for instructions on how to get started. - - Upgrading - - Upgrading to a new version of Unison should be as simple as throwing - away the old binary and installing the new one. - - Before upgrading, it is a good idea to use the old version to make - sure all your replicas are completely synchronized. A new version of - Unison will sometimes introduce a different format for the archive - files used to remember information about the previous state of the - replicas. In this case, the old archive will be ignored (not deleted - --- if you roll back to the previous version of Unison, you will find - the old archives intact), which means that any differences between the - replicas will show up as conflicts and need to be resolved manually. - - Contributed Ports - - A few people have offered to maintain pre-built executables, easy - installation scripts, etc., for particular architectures. They are not - maintained by us and are not guaranteed to work, be kept up to date - with our latest releases, etc., but you may find them useful. Here's - what's available at the moment: - - * Dan Pelleg (mailto:daniel+upenn at pelleg.org) has ported unison to - FreeBSD. This means that any FreeBSD user with an up-to-date - ``ports'' collection can install unison by doing: cd - /usr/ports/net/unison; make && make install. (Make sure your - ``ports'' collection is fully up to date before doing this, to - ensure that you get the most recent Unison version that has been - compiled for FreeBSD.) - FreeBSD binaries can also be obtained directly from - - http://www.freebsd.org/cgi/ports.cgi?query=unison&stype=all. - * Andrew Pitts has built binaries for some versions of Unison for - the Linux-PPC platform. They can be found in - ftp://ftp.cl.cam.ac.uk/papers/amp12/unison/. - * Robert McQueen (mailto:robot101 at debian.org) maintains a Debian - package for Unison. The homepage is located at - - http://packages.debian.org/testing/non-us/unison.html. - * Chris Cocosco (mailto:crisco+unison at bic.mni.mcgill.ca) provides - binaries for Unison under SGI IRIX (6.5). They can be found in - - www.bic.mni.mcgill.ca/users/crisco/unison.irix/. - - Building Unison from Scratch - - If a pre-built image is not available, you will need to compile it - from scratch; the sources are available from the same place as the - binaries. - - In principle, Unison should work on any platform to which OCaml has - been ported and on which the Unix module is fully implemented. In - particular, it has been tested on many flavors of Windows (98, NT, - 2000) and Unix (Solaris, Linux, FreeBSD), and on both 32- and 64-bit - architectures. Unison partly works on Mac OSX (see the section ``FAQ'' - for caveats); it does not work on earlier MacOS systems. - - Unix - - You'll need the Objective Caml compiler (version 3.04 or later[1]1), - which is available from its official site http://caml.inria.fr. - Building and installing OCaml on Unix systems is very straightforward; - follow the instructions in the distribution. You'll probably want to - build the native-code compiler in addition to the bytecode compiler, - but this is not absolutely necessary. (Quick start: on many systems, - the following sequence of commands will get you a working and - installed compiler: first do make world opt, then su to root, then do - make install.) - - You'll also need the GNU make utility, standard on many Unix systems. - (Type "make --version" to check that you've got the GNU version.) - - Once you've got OCaml installed, grab a copy of the Unison sources, - unzip and untar them, change to the new "unison" directory, and type - make UISTYLE=text - - The result should be an executable file called "unison". - - Type "./unison" to make sure the program is executable. You should get - back a usage message. - - If you want to build a graphical user interface, choose one of the - following: - * Gtk interface: - You will need Gtk (version 1.2 or later, available from - http://www.gtk.org and standard on many Unix installations). - You also need the get LablGtk (version 1.1.3 is known to work). - Grab the developers' tarball from - - http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html, - untar it, and follow the instructions to build and install it. - (Quick start: make configure, then make, then make opt, then su - and make install.) - Now build unison. If your search paths are set up correctly, - typing - make UISTYLE=gtk2 - should build a unison executable with a Gtk graphical interface. - - If this step does not work, don't worry: Unison works fine with the - textual interface. - - Put the unison executable somewhere in your search path, either by - adding the Unison directory to your PATH variable or by copying the - executable to some standard directory where executables are stored. - - Windows - - Although the binary distribution should work on any version of - Windows, some people may want to build Unison from scratch on those - systems too. - - Bytecode version: - - The simpler but slower compilation option to build a Unison executable - is to build a bytecode version. You need first install Windows version - of the OCaml compiler (version 3.04 or later, available from - http://caml.inria.fr). Then grab a copy of Unison sources and type - make UISTYLE=text NATIVE=false - - to compile the bytecode. The result should be an executable file - called unison.exe. - - Native version: - - To build a more efficient, native version of Unison on Windows, you - can choose between two options. Both options require the OCaml - distribution version 3.04 as well as the Cygwin layer, which provides - certain GNU tools. The two options differ in the C compiler employed: - MS Visual C++ (MSVC) vs. Cygwin GNU C. - - The tradeoff? - * Only the MSVC option can produce statically linked Unison - executable. - * The Cygwin GNU C option requires only free software. - - The files ``INSTALL.win32-msvc'' and ``INSTALL.win32-cygwin-gnuc'' - describe the building procedures for the respective options. - - Installation Options - - The Makefile in the distribution includes several switches that can be - used to control how Unison is built. Here are the most useful ones: - * Building with NATIVE=true uses the native-code OCaml compiler, - yielding an executable that will run quite a bit faster. We use - this for building distribution versions. - * Building with make DEBUGGING=true generates debugging symbols. - * Building with make STATIC=true generates a (mostly) statically - linked executable. We use this for building distribution versions, - for portability. - - Modified: trunk/src/INSTALL.win32-cygwin-gnuc =================================================================== --- trunk/src/INSTALL.win32-cygwin-gnuc 2010-02-24 14:34:18 UTC (rev 418) +++ trunk/src/INSTALL.win32-cygwin-gnuc 2010-03-12 22:47:16 UTC (rev 419) @@ -1,7 +1,7 @@ Installation notes to build Unison on Windows systems, with Cygwin GNU C (unison-help at cis.upenn.edu) -[The following instructions were tested for Unison 2.9.1 on a Windows +[The following instructions were tested for Unison 2.32.52 on a Windows XP machine running OCaml 3.08.] Since OCaml is now included in Cygwin, things have gotten pretty @@ -16,17 +16,94 @@ - Download the desired version of the Unison source tarball from the Unison home page and unpack it, or else grab the sources - using svn. + using svn. Make sure the directory path name has no space in it or + the OCaml compiler will get confused later. - - In the main directory, type "make" + - In the main directory, type "make". + - If a text-only version is desired, build with "make UISTYLE=text" + regardless of whether the graphics libraries are installed or not. + - The result should be an executable file called "unison" (or, if you grabbed the whole svn repository, perhaps "src/unison"). Put this somewhere on your search path and you should be good to go. (You'll need to do something about setting up ssh, etc., but that's beyond the scope of this document.) + - The text-only version can be run on any system that has cygwin installed: + $ cygcheck ./unison.exe + C:\cygwin\tmp\unison-2.32.52\unison.exe + C:\cygwin\bin\cygwin1.dll + C:\WINDOWS\system32\ADVAPI32.DLL + C:\WINDOWS\system32\KERNEL32.dll + C:\WINDOWS\system32\ntdll.dll + C:\WINDOWS\system32\RPCRT4.dll + C:\WINDOWS\system32\Secur32.dll + + - For this to build with a graphical user interface under Cygwin you + need obviously X windows installed, together with some other + not-so-common packages (from Gnome, versions 2.0 as of the time of + this writing): + libgtk2.0-devel: Multi-platform GUI toolkit (development) + liblgtk2: OCaml interface to GTK2 + Installing these packages with the Cygwin setup program will force the + installation of a large slew of other gnome and graphics packages. + + - Then build Unison with "make UISTYLE=gtk2", or just "make" + since by default "make" builds with a graphics interface if the + necessary graphics libraries are installed. + + - The graphics version needs many more libraries to run and hence is a + lot less portable: + + $ cygcheck ./unison.exe + C:\cygwin\tmp\unison-2.32.52\unison.exe + C:\cygwin\bin\cygwin1.dll + C:\WINDOWS\system32\ADVAPI32.DLL + C:\WINDOWS\system32\KERNEL32.dll + C:\WINDOWS\system32\ntdll.dll + C:\WINDOWS\system32\RPCRT4.dll + C:\WINDOWS\system32\Secur32.dll + C:\cygwin\bin\cyggdk-x11-2.0-0.dll + C:\cygwin\bin\cyggdk_pixbuf-2.0-0.dll + C:\cygwin\bin\cyggcc_s-1.dll + C:\cygwin\bin\cyggio-2.0-0.dll + C:\cygwin\bin\cygglib-2.0-0.dll + C:\cygwin\bin\cygiconv-2.dll + C:\cygwin\bin\cygintl-8.dll + C:\cygwin\bin\cygpcre-0.dll + C:\cygwin\bin\cyggmodule-2.0-0.dll + C:\cygwin\bin\cyggobject-2.0-0.dll + C:\cygwin\bin\cygX11-6.dll + C:\cygwin\bin\cygxcb-1.dll + C:\cygwin\bin\cygXau-6.dll + C:\cygwin\bin\cygXdmcp-6.dll + C:\cygwin\bin\cygXcomposite-1.dll + C:\cygwin\bin\cygXcursor-1.dll + C:\cygwin\bin\cygXfixes-3.dll + C:\cygwin\bin\cygXrender-1.dll + C:\cygwin\bin\cygXdamage-1.dll + C:\cygwin\bin\cygXext-6.dll + C:\cygwin\bin\cygXi-6.dll + C:\cygwin\bin\cygXinerama-1.dll + C:\cygwin\bin\cygXrandr-2.dll + C:\cygwin\bin\cygcairo-2.dll + C:\cygwin\bin\cygfontconfig-1.dll + C:\cygwin\bin\cygexpat-1.dll + C:\cygwin\bin\cygfreetype-6.dll + C:\cygwin\bin\cygz.dll + C:\cygwin\bin\cygglitz-1.dll + C:\cygwin\bin\cygpixman-1-0.dll + C:\cygwin\bin\cygpng12.dll + C:\cygwin\bin\cygxcb-render-util-0.dll + C:\cygwin\bin\cygxcb-render-0.dll + C:\cygwin\bin\cygpango-1.0-0.dll + C:\cygwin\bin\cygpangocairo-1.0-0.dll + C:\cygwin\bin\cygpangoft2-1.0-0.dll + C:\cygwin\bin\cyggtk-x11-2.0-0.dll + C:\cygwin\bin\cygatk-1.0-0.dll + ------------------------------------------------------------------------- AN OLDER VERSION: Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2010-02-24 14:34:18 UTC (rev 418) +++ trunk/src/RECENTNEWS 2010-03-12 22:47:16 UTC (rev 419) @@ -1,5 +1,23 @@ CHANGES FROM VERSION 2.40.1 +* Updated the Cygwin install instructions per Uwe Mayer (thanks!) + +* Added interface builder files for BWToolkit framework to uimacnew09 + directory, to make the distribution self-contained, and added + instructions for installing it to the INSTALL section of the manual. + +------------------------------- +CHANGES FROM VERSION 2.40.1 + +* Updated the Cygwin install instructions per Uwe Mayer (thanks!) + +* Added interface builder files for BWToolkit framework to uimacnew09 + directory, to make the distribution self-contained, and added + instructions for installing it to the INSTALL section of the manual. + +------------------------------- +CHANGES FROM VERSION 2.40.1 + * Fix compilation problem in mkProjectInfo Modified: trunk/src/TODO.txt =================================================================== --- trunk/src/TODO.txt 2010-02-24 14:34:18 UTC (rev 418) +++ trunk/src/TODO.txt 2010-03-12 22:47:16 UTC (rev 419) @@ -194,6 +194,26 @@ ** Peter Selinger has built an SHA256 implementation that should be usable as a drop-in replacement for MD5, if we ever need to do that +* There is no way of selecting files with wildchar. I had to use + ignorenot = Name opt/root/.unison/*.prf + ignore = Name opt/root/.unison/* + But this is inconvinent, but the worse is that it gets complicated very + fast and I cannot make it for more complicated scenarios. I would expect + something like (suggestion): + Files = opt/root/.unison/*.prf + +* If a directory does not exist in one of the host, unison (for + security reasons, which I like) pops up a window and Quit is the only + option. I would expect a message stating mere clearly on which host and + direcory and an option to create that directory. I had recently to make + a lot of reinstalls and new pendrives and it took a long time to create + all those dirs. Someone in the list even made a script to do the job!!! + +* When synchronizing FAT32, there could be an explicit command for + ignoring attributes. The problem happens when one side is FAT32 but the + other is not, or when mounting parameters are different. + + * BUILDING AND INSTALLING * ======================= Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2010-02-24 14:34:18 UTC (rev 418) +++ trunk/src/mkProjectInfo.ml 2010-03-12 22:47:16 UTC (rev 419) @@ -110,3 +110,5 @@ + + Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/BWToolkitFramework =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/BWToolkitFramework (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/BWToolkitFramework 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1 @@ +link Versions/Current/BWToolkitFramework \ No newline at end of file Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/BWToolkitFramework ___________________________________________________________________ Added: svn:special + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Headers =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Headers (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Headers 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1 @@ +link Versions/Current/Headers \ No newline at end of file Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Headers ___________________________________________________________________ Added: svn:special + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Resources =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Resources (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Resources 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1 @@ +link Versions/Current/Resources \ No newline at end of file Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Resources ___________________________________________________________________ Added: svn:special + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/BWToolkitFramework =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/BWToolkitFramework ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButton.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButton.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButton.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,21 @@ +// +// BWAnchoredButton.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWAnchoredButton : NSButton +{ + BOOL isAtLeftEdgeOfBar; + BOOL isAtRightEdgeOfBar; + NSPoint topAndLeftInset; +} + + at property BOOL isAtLeftEdgeOfBar; + at property BOOL isAtRightEdgeOfBar; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButtonBar.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButtonBar.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButtonBar.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,27 @@ +// +// BWAnchoredButtonBar.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWAnchoredButtonBar : NSView +{ + BOOL isResizable, isAtBottom, handleIsRightAligned; + int selectedIndex; + id splitViewDelegate; +} + + at property BOOL isResizable, isAtBottom, handleIsRightAligned; + at property int selectedIndex; + +// The mode of this bar with a resize handle makes use of some NSSplitView delegate methods. Use the splitViewDelegate for any custom delegate implementations +// you'd like to provide. + at property (assign) id splitViewDelegate; + ++ (BOOL)wasBorderedBar; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButtonCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButtonCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredButtonCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWAnchoredButtonCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWAnchoredButtonCell : NSButtonCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredPopUpButton.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredPopUpButton.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredPopUpButton.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,21 @@ +// +// BWAnchoredPopUpButton.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWAnchoredPopUpButton : NSPopUpButton +{ + BOOL isAtLeftEdgeOfBar; + BOOL isAtRightEdgeOfBar; + NSPoint topAndLeftInset; +} + + at property BOOL isAtLeftEdgeOfBar; + at property BOOL isAtRightEdgeOfBar; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredPopUpButtonCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredPopUpButtonCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWAnchoredPopUpButtonCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWAnchoredPopUpButtonCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWAnchoredPopUpButtonCell : NSPopUpButtonCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWGradientBox.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWGradientBox.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWGradientBox.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,24 @@ +// +// BWGradientBox.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWGradientBox : NSView +{ + NSColor *fillStartingColor, *fillEndingColor, *fillColor; + NSColor *topBorderColor, *bottomBorderColor; + float topInsetAlpha, bottomInsetAlpha; + + BOOL hasTopBorder, hasBottomBorder, hasGradient, hasFillColor; +} + + at property (nonatomic, retain) NSColor *fillStartingColor, *fillEndingColor, *fillColor, *topBorderColor, *bottomBorderColor; + at property float topInsetAlpha, bottomInsetAlpha; + at property BOOL hasTopBorder, hasBottomBorder, hasGradient, hasFillColor; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWHyperlinkButton.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWHyperlinkButton.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWHyperlinkButton.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,18 @@ +// +// BWHyperlinkButton.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWHyperlinkButton : NSButton +{ + NSString *urlString; +} + + at property (copy, nonatomic) NSString *urlString; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWHyperlinkButtonCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWHyperlinkButtonCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWHyperlinkButtonCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWHyperlinkButtonCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWHyperlinkButtonCell : NSButtonCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWInsetTextField.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWInsetTextField.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWInsetTextField.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWInsetTextField.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWInsetTextField : NSTextField +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSelectableToolbar.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSelectableToolbar.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSelectableToolbar.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,36 @@ +// +// BWSelectableToolbar.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at class BWSelectableToolbarHelper; + +// Notification that gets sent when a toolbar item has been clicked. You can get the button that was clicked by getting the object +// for the key @"BWClickedItem" in the supplied userInfo dictionary. +extern NSString * const BWSelectableToolbarItemClickedNotification; + + at interface BWSelectableToolbar : NSToolbar +{ + BWSelectableToolbarHelper *helper; + NSMutableArray *itemIdentifiers; + NSMutableDictionary *itemsByIdentifier, *enabledByIdentifier; + BOOL inIB; + + // For the IB inspector + int selectedIndex; + BOOL isPreferencesToolbar; +} + +// Call one of these methods to set the active tab. +- (void)setSelectedItemIdentifier:(NSString *)itemIdentifier; // Use if you want an action in the tabbed window to change the tab. +- (void)setSelectedItemIdentifierWithoutAnimation:(NSString *)itemIdentifier; // Use if you want to show the window with a certain item selected. + +// Programmatically disable or enable a toolbar item. +- (void)setEnabled:(BOOL)flag forIdentifier:(NSString *)itemIdentifier; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSheetController.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSheetController.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSheetController.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,31 @@ +// +// BWSheetController.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWSheetController : NSObject +{ + NSWindow *sheet; + NSWindow *parentWindow; + id delegate; +} + + at property (nonatomic, retain) IBOutlet NSWindow *sheet, *parentWindow; + at property (nonatomic, retain) IBOutlet id delegate; + +- (IBAction)openSheet:(id)sender; +- (IBAction)closeSheet:(id)sender; +- (IBAction)messageDelegateAndCloseSheet:(id)sender; + +// The optional delegate should implement the method: +// - (BOOL)shouldCloseSheet:(id)sender +// Return YES if you want the sheet to close after the button click, NO if it shouldn't close. The sender +// object is the button that requested the close. This is helpful because in the event that there are multiple buttons +// hooked up to the messageDelegateAndCloseSheet: method, you can distinguish which button called the method. + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSplitView.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSplitView.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWSplitView.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,45 @@ +// +// BWSplitView.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) and Fraser Kuyvenhoven. +// All code is provided under the New BSD license. +// + +#import + + at interface BWSplitView : NSSplitView +{ + NSColor *color; + BOOL colorIsEnabled, checkboxIsEnabled, dividerCanCollapse, collapsibleSubviewCollapsed; + id secondaryDelegate; + NSMutableDictionary *minValues, *maxValues, *minUnits, *maxUnits; + NSMutableDictionary *resizableSubviewPreferredProportion, *nonresizableSubviewPreferredSize; + NSArray *stateForLastPreferredCalculations; + int collapsiblePopupSelection; + float uncollapsedSize; + + // Collapse button + NSButton *toggleCollapseButton; + BOOL isAnimating; +} + + at property (retain) NSMutableDictionary *minValues, *maxValues, *minUnits, *maxUnits; + at property (retain) NSMutableDictionary *resizableSubviewPreferredProportion, *nonresizableSubviewPreferredSize; + at property (retain) NSArray *stateForLastPreferredCalculations; + at property (retain) NSButton *toggleCollapseButton; + at property (assign) id secondaryDelegate; + at property BOOL collapsibleSubviewCollapsed; + at property int collapsiblePopupSelection; + at property BOOL dividerCanCollapse; + +// The split view divider color + at property (copy) NSColor *color; + +// Flag for whether a custom divider color is enabled. If not, the standard divider color is used. + at property BOOL colorIsEnabled; + +// Call this method to collapse or expand a subview configured as collapsible in the IB inspector. +- (IBAction)toggleCollapse:(id)sender; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWStyledTextField.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWStyledTextField.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWStyledTextField.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,33 @@ +// +// BWStyledTextField.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWStyledTextField : NSTextField +{ + +} + +- (BOOL)hasGradient; +- (void)setHasGradient:(BOOL)flag; +- (NSColor *)startingColor; +- (void)setStartingColor:(NSColor *)color; +- (NSColor *)endingColor; +- (void)setEndingColor:(NSColor *)color; + +- (NSColor *)solidColor; +- (void)setSolidColor:(NSColor *)color; + +- (BOOL)hasShadow; +- (void)setHasShadow:(BOOL)flag; +- (BOOL)shadowIsBelow; +- (void)setShadowIsBelow:(BOOL)flag; +- (NSColor *)shadowColor; +- (void)setShadowColor:(NSColor *)color; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWStyledTextFieldCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWStyledTextFieldCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWStyledTextFieldCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,23 @@ +// +// BWStyledTextFieldCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWStyledTextFieldCell : NSTextFieldCell +{ + BOOL shadowIsBelow, hasShadow, hasGradient; + NSColor *shadowColor, *startingColor, *endingColor, *solidColor; + + NSShadow *shadow; + NSMutableDictionary *previousAttributes; +} + + at property BOOL shadowIsBelow, hasShadow, hasGradient; + at property (nonatomic, retain) NSColor *shadowColor, *startingColor, *endingColor, *solidColor; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSlider.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSlider.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSlider.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,25 @@ +// +// BWTexturedSlider.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTexturedSlider : NSSlider +{ + int trackHeight, indicatorIndex; + NSRect sliderCellRect; + NSButton *minButton, *maxButton; +} + + at property int indicatorIndex; + at property (retain) NSButton *minButton; + at property (retain) NSButton *maxButton; + +- (int)trackHeight; +- (void)setTrackHeight:(int)newTrackHeight; + + at end Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSlider.h ___________________________________________________________________ Added: svn:executable + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSliderCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSliderCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSliderCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,19 @@ +// +// BWTexturedSliderCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTexturedSliderCell : NSSliderCell +{ + BOOL isPressed; + int trackHeight; +} + + at property int trackHeight; + + at end Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTexturedSliderCell.h ___________________________________________________________________ Added: svn:executable + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenAttachmentCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenAttachmentCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenAttachmentCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,17 @@ +// +// BWTokenAttachmentCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import +#import "NSTokenAttachmentCell.h" + + at interface BWTokenAttachmentCell : NSTokenAttachmentCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenField.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenField.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenField.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTokenField.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTokenField : NSTokenField +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenFieldCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenFieldCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTokenFieldCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTokenFieldCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTokenFieldCell : NSTokenFieldCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarItem.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarItem.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarItem.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWToolbarItem.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWToolbarItem : NSToolbarItem +{ + NSString *identifierString; +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarShowColorsItem.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarShowColorsItem.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarShowColorsItem.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWToolbarShowColorsItem.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWToolbarShowColorsItem : NSToolbarItem +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarShowFontsItem.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarShowFontsItem.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolbarShowFontsItem.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWToolbarShowFontsItem.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWToolbarShowFontsItem : NSToolbarItem +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolkitFramework.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolkitFramework.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWToolkitFramework.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,47 @@ +// +// BWToolkitFramework.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +// This is a convenience header for importing the BWToolkit framework into your classes. + +#import "BWAnchoredButton.h" +#import "BWAnchoredButtonBar.h" +#import "BWAnchoredButtonCell.h" +#import "BWAnchoredPopUpButton.h" +#import "BWAnchoredPopUpButtonCell.h" +#import "BWGradientBox.h" +#import "BWHyperlinkButton.h" +#import "BWHyperlinkButtonCell.h" +#import "BWInsetTextField.h" +#import "BWSelectableToolbar.h" +#import "BWSheetController.h" +#import "BWSplitView.h" +#import "BWStyledTextField.h" +#import "BWStyledTextFieldCell.h" +#import "BWTexturedSlider.h" +#import "BWTexturedSliderCell.h" +#import "BWTokenAttachmentCell.h" +#import "BWTokenField.h" +#import "BWTokenFieldCell.h" +#import "BWToolbarItem.h" +#import "BWToolbarShowColorsItem.h" +#import "BWToolbarShowFontsItem.h" +#import "BWTransparentButton.h" +#import "BWTransparentButtonCell.h" +#import "BWTransparentCheckbox.h" +#import "BWTransparentCheckboxCell.h" +#import "BWTransparentPopUpButton.h" +#import "BWTransparentPopUpButtonCell.h" +#import "BWTransparentScroller.h" +#import "BWTransparentScrollView.h" +#import "BWTransparentSlider.h" +#import "BWTransparentSliderCell.h" +#import "BWTransparentTableView.h" +#import "BWTransparentTableViewCell.h" +#import "BWTransparentTextFieldCell.h" +#import "BWUnanchoredButton.h" +#import "BWUnanchoredButtonCell.h" Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentButton.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentButton.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentButton.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentButton.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentButton : NSButton +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentButtonCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentButtonCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentButtonCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,17 @@ +// +// BWTransparentButtonCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import +#import "BWTransparentButton.h" + + at interface BWTransparentButtonCell : NSButtonCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentCheckbox.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentCheckbox.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentCheckbox.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentCheckbox.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentCheckbox : NSButton +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentCheckboxCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentCheckboxCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentCheckboxCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,17 @@ +// +// BWTransparentCheckboxCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import +#import "BWTransparentCheckbox.h" + + at interface BWTransparentCheckboxCell : NSButtonCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentPopUpButton.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentPopUpButton.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentPopUpButton.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentPopUpButton.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentPopUpButton : NSPopUpButton +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentPopUpButtonCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentPopUpButtonCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentPopUpButtonCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentPopUpButtonCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentPopUpButtonCell : NSPopUpButtonCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentScrollView.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentScrollView.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentScrollView.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentScrollView.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentScrollView : NSScrollView +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentScroller.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentScroller.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentScroller.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentScroller.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentScroller : NSScroller +{ + BOOL isVertical; +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentSlider.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentSlider.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentSlider.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentSlider.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentSlider : NSSlider +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentSliderCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentSliderCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentSliderCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentSliderCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentSliderCell : NSSliderCell +{ + BOOL isPressed; +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTableView.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTableView.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTableView.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentTableView.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentTableView : NSTableView +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTableViewCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTableViewCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTableViewCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentTableViewCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentTableViewCell : NSTextFieldCell +{ + BOOL mIsEditingOrSelecting; +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTextFieldCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTextFieldCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWTransparentTextFieldCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWTransparentTextFieldCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWTransparentTextFieldCell : NSTextFieldCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWUnanchoredButton.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWUnanchoredButton.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWUnanchoredButton.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// BWUnanchoredButton.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface BWUnanchoredButton : NSButton +{ + NSPoint topAndLeftInset; +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWUnanchoredButtonCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWUnanchoredButtonCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/BWUnanchoredButtonCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,17 @@ +// +// BWUnanchoredButtonCell.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import +#import "BWAnchoredButtonCell.h" + + at interface BWUnanchoredButtonCell : BWAnchoredButtonCell +{ + +} + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSApplication+BWAdditions.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSApplication+BWAdditions.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSApplication+BWAdditions.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,15 @@ +// +// NSApplication+BWAdditions.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface NSApplication (BWAdditions) + ++ (BOOL)bwIsOnLeopard; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSColor+BWAdditions.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSColor+BWAdditions.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSColor+BWAdditions.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// NSColor+BWAdditions.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface NSColor (BWAdditions) + +// Use this method to draw 1 px wide lines independent of scale factor. Handy for resolution independent drawing. Still needs some work - there are issues with drawing at the edges of views. +- (void)bwDrawPixelThickLineAtPosition:(int)posInPixels withInset:(int)insetInPixels inRect:(NSRect)aRect inView:(NSView *)view horizontal:(BOOL)isHorizontal flip:(BOOL)shouldFlip; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSImage+BWAdditions.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSImage+BWAdditions.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSImage+BWAdditions.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,19 @@ +// +// NSImage+BWAdditions.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface NSImage (BWAdditions) + +// Draw a solid color over an image - taking into account alpha. Useful for coloring template images. +- (NSImage *)bwTintedImageWithColor:(NSColor *)tint; + +// Rotate an image 90 degrees clockwise or counterclockwise +- (NSImage *)bwRotateImage90DegreesClockwise:(BOOL)clockwise; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSTokenAttachment.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSTokenAttachment.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSTokenAttachment.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,22 @@ +/* + * Generated by class-dump 3.1.2. + * + * class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2007 by Steve Nygard. + */ + +#import + + at interface NSTokenAttachment : NSTextAttachment +{ + id _delegate; +} + +- (id)initWithDelegate:(id)fp8; +- (void)encodeWithCoder:(id)fp8; +- (id)initWithCoder:(id)fp8; +- (id)attachmentCell; +- (id)delegate; +- (void)setDelegate:(id)fp8; + + at end + Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSTokenAttachmentCell.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSTokenAttachmentCell.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSTokenAttachmentCell.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,52 @@ +/* + * Generated by class-dump 3.1.2. + * + * class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2007 by Steve Nygard. + */ + +#import + + at interface NSTokenAttachmentCell : NSTextAttachmentCell +{ + id _representedObject; + id _textColor; + id _reserved; + struct { + unsigned int _selected:1; + unsigned int _edgeStyle:2; + unsigned int _reserved:29; + } _tacFlags; +} + ++ (void)initialize; +- (id)initTextCell:(id)fp8; +- (id)init; +- (void)dealloc; +- (id)representedObject; +- (void)setRepresentedObject:(id)fp8; +- (int)interiorBackgroundStyle; +- (BOOL)_hasMenu; +- (id)tokenForegroundColor; +- (id)tokenBackgroundColor; +- (id)textColor; +- (void)setTextColor:(id)fp8; +- (id)pullDownImage; +- (id)menu; +- (NSSize)cellSizeForBounds:(NSRect)fp8; +- (NSSize)cellSize; +- (NSRect)drawingRectForBounds:(NSRect)fp8; +- (NSRect)titleRectForBounds:(NSRect)fp8; +- (NSRect)cellFrameForTextContainer:(id)fp8 proposedLineFragment:(NSRect)fp12 glyphPosition:(NSPoint)fp28 characterIndex:(unsigned int)fp36; +- (NSPoint)cellBaselineOffset; +- (NSRect)pullDownRectForBounds:(NSRect)fp8; +- (void)drawTokenWithFrame:(NSRect)fp8 inView:(id)fp24; +- (void)drawInteriorWithFrame:(NSRect)fp8 inView:(id)fp24; +- (void)drawWithFrame:(NSRect)fp8 inView:(id)fp24; +- (void)drawWithFrame:(NSRect)fp8 inView:(id)fp24 characterIndex:(unsigned int)fp28 layoutManager:(id)fp32; +- (void)encodeWithCoder:(id)fp8; +- (id)initWithCoder:(id)fp8; +- (BOOL)wantsToTrackMouseForEvent:(id)fp8 inRect:(NSRect)fp12 ofView:(id)fp28 atCharacterIndex:(unsigned int)fp32; +- (BOOL)trackMouse:(id)fp8 inRect:(NSRect)fp12 ofView:(id)fp28 atCharacterIndex:(unsigned int)fp32 untilMouseUp:(BOOL)fp36; + + at end + Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSView+BWAdditions.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSView+BWAdditions.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSView+BWAdditions.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,18 @@ +// +// NSView+BWAdditions.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface NSView (BWAdditions) + +- (void)bwBringToFront; + +// Returns animator proxy and calls setWantsLayer:NO on the view when the animation completes +- (id)bwAnimator; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSWindow+BWAdditions.h =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSWindow+BWAdditions.h (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Headers/NSWindow+BWAdditions.h 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,16 @@ +// +// NSWindow+BWAdditions.h +// BWToolkit +// +// Created by Brandon Walkin (www.brandonwalkin.com) +// All code is provided under the New BSD license. +// + +#import + + at interface NSWindow (BWAdditions) + +- (void)bwResizeToSize:(NSSize)newSize animate:(BOOL)animateFlag; +- (BOOL)bwIsTextured; + + at end Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ButtonBarPullDownArrow.pdf =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ButtonBarPullDownArrow.pdf (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ButtonBarPullDownArrow.pdf 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,179 @@ +%PDF-1.7 +%âãÏÓ +1 0 obj +<> +endobj +12 0 obj +<>stream + + + + + application/pdf + + + Adobe Photoshop CS3 Macintosh + 2008-06-14T20:29:08-04:00 + 2008-06-14T20:29:31-04:00 + 2008-06-14T20:29:31-04:00 + + + + JPEG + 3 + 5 + /9j/4AAQSkZJRgABAgAASABIAAD/7QAMQWRvYmVfQ00AAf/uAA5BZG9iZQBkgAAAAAH/2wCEAAwI CAgJCAwJCQwRCwoLERUPDAwPFRgTExUTExgRDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM DAwMDAwBDQsLDQ4NEA4OEBQODg4UFA4ODg4UEQwMDAwMEREMDAwMDAwRDAwMDAwMDAwMDAwMDAwM DAwMDAwMDAwMDAwMDP/AABEIAAMABQMBIgACEQEDEQH/3QAEAAH/xAE/AAABBQEBAQEBAQAAAAAA AAADAAECBAUGBwgJCgsBAAEFAQEBAQEBAAAAAAAAAAEAAgMEBQYHCAkKCxAAAQQBAwIEAgUHBggF AwwzAQACEQMEIRIxBUFRYRMicYEyBhSRobFCIyQVUsFiMzRygtFDByWSU/Dh8WNzNRaisoMmRJNU ZEXCo3Q2F9JV4mXys4TD03Xj80YnlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vY3R1dnd4eXp7fH 1+f3EQACAgECBAQDBAUGBwcGBTUBAAIRAyExEgRBUWFxIhMFMoGRFKGxQiPBUtHwMyRi4XKCkkNT FWNzNPElBhaisoMHJjXC0kSTVKMXZEVVNnRl4vKzhMPTdePzRpSkhbSVxNTk9KW1xdXl9VZmdoaW prbG1ub2JzdHV2d3h5ent8f/2gAMAwEAAhEDEQA/AMyv7J+2b4/YW79s0z/Sdm708jbz7Ps3qb/5 v9X+2/zv6r6KS89SSU//2Q== + + + + + + uuid:3233F5DEE23BDD1188A5F807AAD5B5AB + uuid:d364bcf4-ecbc-9348-b5a9-7f85a6b611f5 + + uuid:72448EAFE13BDD1188A5F807AAD5B5AB + uuid:72448EAFE13BDD1188A5F807AAD5B5AB + + + + 1 + 720000/10000 + 720000/10000 + 2 + 256,257,258,259,262,274,277,284,530,531,282,283,296,301,318,319,529,532,306,270,271,272,305,315,33432;5F3E335AFF780C9D7CD7E1ADA05DBE38 + + + 5 + 3 + 1 + 36864,40960,40961,37121,37122,40962,40963,37510,40964,36867,36868,33434,33437,34850,34852,34855,34856,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37396,41483,41484,41486,41487,41488,41492,41493,41495,41728,41729,41730,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,42016,0,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,26,27,28,30;DECD3C4701D62E29B6EB81157F585A9F + + + + 3 + sRGB IEC61966-2.1 + + + Adobe Photoshop for Macintosh + + + + + + + + + + + + + + + + + + + + + + + + + +endstream +endobj +2 0 obj +<> +endobj +5 0 obj +<> +endobj +7 0 obj +<>stream +q +q +5 0 0 3 0 0 cm +q +0.5000026 -0.0002287 m +0.0000771 1.0002303 l +0.9999280 1.0002303 l +0.5000026 -0.0002287 l +h +W +n +/Im0 Do +Q + +Q +Q + +endstream +endobj +8 0 obj +<>/ColorSpace<>/ProcSet[/PDF/Text/ImageB/ImageC/ImageI]/ExtGState<>>>>> +endobj +10 0 obj +[/ICCBased 9 0 R] +endobj +9 0 obj +<>stream +H‰œ–yTSwÇoÉž•°Ãc +[€°5, ‹ì ˆBHBK!aPªVÊX·Ñ=uº¸Žµ:X÷©KÔè£ãÐZ\;v^àõ´™N¿üÞçÜß½÷ý~÷Þw΀.MÑh«a+SAßè:ü +½ó>Sº7åÁâT¥rc¥3ÕMQ]YmÔcµ:¹B… :Ä¿9ð—Ïá©*UéUZ<"Ÿ2V·[«Ô4ÕZL£ýOMüa?Ñü\ã⎽¼"ÀºÈÈ?.+£¾n~ÏôY &à+`œ;ÂA4ˆI +dƒ|°(@¨zPZ@;è=`=؆Áv0vƒýà ƒàÏà<ø\·À$˜Á x +^AD‚²‚ WÈ ò‡ÄP$¥@™P>T ©!-d„Z PÔ +C; ÝС£Ð èt ú +š‚@ßA/a¦Ã<Øvƒ}a1'ÃÙðX +×ÀMp'¼‚Gá}ðaø|¾OÂáY 4„8"BDŒH4¤+î +î÷ wšGä x2^9¯‡÷{ÞoÆœchžkÞ`>bþ‰ù$á»ñeüJ~ÿ ÿ:ÿ¥…EŒ…ÊbÅ~‹ËÏ,m,£-U–Ý–,¯Y¾´Â¬â­*¬6X[ݱF­=­3¬ë­·YŸ±~dó ·QØtÛ´¹i ÛzÚfÚ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}¹ý€ý§ö¸‘‡‡ÏþŽ™c1X%6„Æfm¥ŽFÇŽŽ¯œN9NNœî8SÅÎ¥ÎÎ'g\\R]Z\öºÜt¥¸Š]Ë\7»žu}æ&pËs[å6îv_`) š{·ÝîQî5î£îW=ˆb +­_zžAžež#ž½`¯`/×V¯KÞïPo­÷¨÷ +!]#¬îNùð}R|:|Æ}ûºøønð=ëûÚ/ȯÒoÌï–ˆ#JuˆŽ‰¾ó÷ôWøø_ +`$´ ø6Ð+P¸-ð¯AÜ Ô UA'ƒþ¬Þü Ä%¤8ä½bž8]Ü+þ<”Úúqè‹°à0CØÁ°† Ã+Â÷„ß_ X Z0¶àn„S„PE¨úU÷J#JûKï«#ÔÕÊ¢ÊËi$šaÍ·åÒòíåÏ*Ò*>¬ø±2¯ò@¹ª¸ê¨–£­Ðž®¶¯n¨¾¤óÒué&kÂj6ÕÌè“õ;k¡Ú%µG <ügê‚ÑݸÒ8UY7R÷¼>·þP»AÛp¡Ñ³qM㽦„¦ß5£ÍŠæ“-Ž-í-SËb–íh…ZKZO¶9·u¶M/O\¾«Ú^Ñþ—¿ŽþŽïWä­8Öi×¹¼óîÊÄ•{»Ìºô]7V…¯Ú¾]­Y=±&`Í–5¯»•Ý_ôøõ öüЫèýb­híÐÚו®›è îÛ¶ž¸^»þú†¨ +»úÙýMýw7¦n<<€ +t|¿©hÓ¹ÁÀÁ훩››'‡þ +¥ZþL˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°+¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢! ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ +æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ++0000000016 00000 n +0000006676 00000 n +0000000004 00001 f +0000000000 00000 f +0000006727 00000 n +0000009859 00000 n +0000006851 00000 n +0000007032 00000 n +0000007211 00000 n +0000007177 00000 n +0000010121 00000 n +0000000077 00000 n +trailer +<<10B89CB6AA9C4EF8AF41B07220157CA1>]>> +startxref +10293 +%%EOF Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/GradientSplitViewDimpleBitmap.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/GradientSplitViewDimpleBitmap.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/GradientSplitViewDimpleVector.pdf =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/GradientSplitViewDimpleVector.pdf (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/GradientSplitViewDimpleVector.pdf 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,180 @@ +%PDF-1.7 +%âãÏÓ +1 0 obj +<> +endobj +12 0 obj +<>stream + + + + + application/pdf + + + Adobe Photoshop CS3 Macintosh + 2008-02-16T21:30:46-05:00 + 2008-02-16T21:30:59-05:00 + 2008-02-16T21:30:59-05:00 + + + + JPEG + 16 + 16 + /9j/4AAQSkZJRgABAgAASABIAAD/7QAMQWRvYmVfQ00AAf/uAA5BZG9iZQBkgAAAAAH/2wCEAAwI CAgJCAwJCQwRCwoLERUPDAwPFRgTExUTExgRDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM DAwMDAwBDQsLDQ4NEA4OEBQODg4UFA4ODg4UEQwMDAwMEREMDAwMDAwRDAwMDAwMDAwMDAwMDAwM DAwMDAwMDAwMDAwMDP/AABEIABAAEAMBIgACEQEDEQH/3QAEAAH/xAE/AAABBQEBAQEBAQAAAAAA AAADAAECBAUGBwgJCgsBAAEFAQEBAQEBAAAAAAAAAAEAAgMEBQYHCAkKCxAAAQQBAwIEAgUHBggF AwwzAQACEQMEIRIxBUFRYRMicYEyBhSRobFCIyQVUsFiMzRygtFDByWSU/Dh8WNzNRaisoMmRJNU ZEXCo3Q2F9JV4mXys4TD03Xj80YnlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vY3R1dnd4eXp7fH 1+f3EQACAgECBAQDBAUGBwcGBTUBAAIRAyExEgRBUWFxIhMFMoGRFKGxQiPBUtHwMyRi4XKCkkNT FWNzNPElBhaisoMHJjXC0kSTVKMXZEVVNnRl4vKzhMPTdePzRpSkhbSVxNTk9KW1xdXl9VZmdoaW prbG1ub2JzdHV2d3h5ent8f/2gAMAwEAAhEDEQA/AOpzLsjqlznPeRjgkV1DQR+8795zksO7J6Xc xzHk45IFlR1EfvN/dc1XLcN+FY5rmn0STseOI8ClVhvzbGta0+kCC954jwCSn//Z + + + + + + uuid:7750097D68DEDC11BB92BDC6FD4C7FBA + uuid:d55aa6fe-4f87-9045-bedc-eced5d1cc5dd + + uuid:7650097D68DEDC11BB92BDC6FD4C7FBA + uuid:7650097D68DEDC11BB92BDC6FD4C7FBA + + + + 1 + 720000/10000 + 720000/10000 + 2 + 256,257,258,259,262,274,277,284,530,531,282,283,296,301,318,319,529,532,306,270,271,272,305,315,33432;6484DE694EED10FCB1360A97BFC32F0A + + + 16 + 16 + 1 + 36864,40960,40961,37121,37122,40962,40963,37510,40964,36867,36868,33434,33437,34850,34852,34855,34856,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37396,41483,41484,41486,41487,41488,41492,41493,41495,41728,41729,41730,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,42016,0,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,26,27,28,30;26EC271C894309D0BBA2E3379EE65237 + + + + 3 + sRGB IEC61966-2.1 + + + Adobe Photoshop for Macintosh + + + + + + + + + + + + + + + + + + + + + + + + + +endstream +endobj +2 0 obj +<> +endobj +5 0 obj +<> +endobj +7 0 obj +<>stream +q +q +16 0 0 16 0 0 cm +q +0.4999998 1.0000093 m +0.7761371 1.0000093 1.0000090 0.7761374 1.0000090 0.5000001 c +1.0000090 0.2238628 0.7761371 -0.0000091 0.4999998 -0.0000091 c +0.2238625 -0.0000091 -0.0000094 0.2238628 -0.0000094 0.5000001 c +-0.0000094 0.7761374 0.2238625 1.0000093 0.4999998 1.0000093 c +h +W* +n +/Im0 Do +Q + +Q +Q + +endstream +endobj +8 0 obj +<>/ColorSpace<>/ProcSet[/PDF/Text/ImageB/ImageC/ImageI]/ExtGState<>>>>> +endobj +10 0 obj +[/ICCBased 9 0 R] +endobj +9 0 obj +<>stream +H‰œ–yTSwÇoÉž•°Ãc +[€°5, ‹ì ˆBHBK!aPªVÊX·Ñ=uº¸Žµ:X÷©KÔè£ãÐZ\;v^àõ´™N¿üÞçÜß½÷ý~÷Þw΀.MÑh«a+SAßè:ü +½ó>Sº7åÁâT¥rc¥3ÕMQ]YmÔcµ:¹B… :Ä¿9ð—Ïá©*UéUZ<"Ÿ2V·[«Ô4ÕZL£ýOMüa?Ñü\ã⎽¼"ÀºÈÈ?.+£¾n~ÏôY &à+`œ;ÂA4ˆI +dƒ|°(@¨zPZ@;è=`=؆Áv0vƒýà ƒàÏà<ø\·À$˜Á x +^AD‚²‚ WÈ ò‡ÄP$¥@™P>T ©!-d„Z PÔ +C; ÝС£Ð èt ú +š‚@ßA/a¦Ã<Øvƒ}a1'ÃÙðX +×ÀMp'¼‚Gá}ðaø|¾OÂáY 4„8"BDŒH4¤+î +î÷ wšGä x2^9¯‡÷{ÞoÆœchžkÞ`>bþ‰ù$á»ñeüJ~ÿ ÿ:ÿ¥…EŒ…ÊbÅ~‹ËÏ,m,£-U–Ý–,¯Y¾´Â¬â­*¬6X[ݱF­=­3¬ë­·YŸ±~dó ·QØtÛ´¹i ÛzÚfÚ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}¹ý€ý§ö¸‘‡‡ÏþŽ™c1X%6„Æfm¥ŽFÇŽŽ¯œN9NNœî8SÅÎ¥ÎÎ'g\\R]Z\öºÜt¥¸Š]Ë\7»žu}æ&pËs[å6îv_`) š{·ÝîQî5î£îW=ˆb +­_zžAžež#ž½`¯`/×V¯KÞïPo­÷¨÷ +!]#¬îNùð}R|:|Æ}ûºøønð=ëûÚ/ȯÒoÌï–ˆ#JuˆŽ‰¾ó÷ôWøø_ +`$´ ø6Ð+P¸-ð¯AÜ Ô UA'ƒþ¬Þü Ä%¤8ä½bž8]Ü+þ<”Úúqè‹°à0CØÁ°† Ã+Â÷„ß_ X Z0¶àn„S„PE¨úU÷J#JûKï«#ÔÕÊ¢ÊËi$šaÍ·åÒòíåÏ*Ò*>¬ø±2¯ò@¹ª¸ê¨–£­Ðž®¶¯n¨¾¤óÒué&kÂj6ÕÌè“õ;k¡Ú%µG <ügê‚ÑݸÒ8UY7R÷¼>·þP»AÛp¡Ñ³qM㽦„¦ß5£ÍŠæ“-Ž-í-SËb–íh…ZKZO¶9·u¶M/O\¾«Ú^Ñþ—¿ŽþŽïWä­8Öi×¹¼óîÊÄ•{»Ìºô]7V…¯Ú¾]­Y=±&`Í–5¯»•Ý_ôøõ öüЫèýb­híÐÚו®›è îÛ¶ž¸^»þú†¨ +»úÙýMýw7¦n<<€ +t|¿©hÓ¹ÁÀÁ훩››'‡þ +¥ZþL˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°+¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢! ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ +æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ +rrruuuyyy~~~‚‚‚†††‰‰‰ŠŠŠŠŠŠ‰‰‰†††‚‚‚~~~yyyuuurrrwww|||‚‚‚ˆˆˆŽŽŽ“““–––˜˜˜˜˜˜–––“““ŽŽŽˆˆˆ‚‚‚|||www}}}„„„ŒŒŒ“““ššš   ¤¤¤¦¦¦¦¦¦¤¤¤   ššš“““ŒŒŒ„„„}}}„„„ŒŒŒ–––žžž¦¦¦«««¯¯¯±±±±±±¯¯¯«««¦¦¦žžž–––ŒŒŒ„„„‹‹‹–––   ©©©±±±···ººº»»»»»»ººº···±±±©©©   –––‹‹‹“““ŸŸŸªªª³³³ººº¿¿¿ÂÂÂÃÃÃÃÃÿ¿¿ººº³³³ªªªŸŸŸ“““ššš¦¦¦±±±ºººÁÁÁÆÆÆÈÈÈÈÈÈÈÈÈÈÈÈÅÅÅÁÁÁººº±±±¦¦¦šššŸŸŸ¬¬¬···ÀÀÀÆÆÆÊÊÊËËËÌÌÌÌÌÌËËËÊÊÊÆÆÆÀÀÀ···¬¬¬ŸŸŸ£££°°°»»»ÃÃÃÉÉÉÌÌÌÎÎÎÎÎÎÎÎÎÎÎÎÌÌÌÉÉÉÃÃúºº°°°¢¢¢¤¤¤±±±¼¼¼ÅÅÅËËËÎÎÎÐÐÐÐÐÐÐÐÐÐÐÐÎÎÎËËËÅÅż¼¼±±±¤¤¤¤¤¤±±±¼¼¼ÅÅÅÌÌÌÐÐÐÑÑÑÒÒÒÒÒÒÑÑÑÐÐÐÌÌÌÅÅż¼¼±±±¤¤¤¢¢¢®®®ºººÄÄÄËËËÐÐÐÒÒÒÒÒÒÒÒÒÒÒÒÐÐÐËËËÄÄĺºº®®®¡¡¡ªªª¶¶¶¿¿¿ÇÇÇÍÍÍÐÐÐÑÑÑÑÑÑÐÐÐÍÍÍÇÇÇ¿¿¿µµµªªª———£££®®®¸¸¸ÀÀÀÆÆÆÊÊÊÌÌÌÌÌÌÊÊÊÆÆÆÀÀÀ¸¸¸®®®£££———’’’œœœ¦¦¦¯¯¯¸¸¸¾¾¾ÂÂÂÄÄÄÄÄľ¾¾¸¸¸¯¯¯¦¦¦œœœ’’’ŒŒŒ”””¥¥¥­­­´´´¸¸¸»»»»»»¸¸¸´´´­­­¥¥¥”””ŒŒŒ +endstream +endobj +11 0 obj +<> +endobj +xref +0 13 +0000000003 65535 f +0000000016 00000 n +0000006720 00000 n +0000000004 00001 f +0000000000 00000 f +0000006771 00000 n +0000010096 00000 n +0000006899 00000 n +0000007269 00000 n +0000007448 00000 n +0000007414 00000 n +0000011086 00000 n +0000000077 00000 n +trailer +<<4866DB5336014798BED9528D03CDD3B2>]>> +startxref +11258 +%%EOF Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Info.plist =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Info.plist (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Info.plist 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + BWToolkitFramework + CFBundleIdentifier + com.brandonwalkin.BWToolkitFramework + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + FMWK + CFBundleSignature + ???? + CFBundleVersion + 1.2.5 + NSPrincipalClass + BWToolkit + + Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Library-SheetController.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Library-SheetController.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/License.rtf =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/License.rtf (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/License.rtf 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,18 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 +{\fonttbl\f0\fnil\fcharset0 Verdana;\f1\fnil\fcharset0 LucidaGrande;} +{\colortbl;\red255\green255\blue255;\red73\green73\blue73;} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}} +\deftab720 +\pard\pardeftab720\sl400\sa280\ql\qnatural + +\f0\fs24 \cf2 Copyright (c) 2010, Brandon Walkin +\f1 \uc0\u8232 +\f0 All rights reserved.\ +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\ +\pard\tx220\tx720\pardeftab720\li720\fi-720\sl400\sa20\ql\qnatural +\ls1\ilvl0\cf2 {\listtext \'95 }Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\ +{\listtext \'95 }Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\ +{\listtext \'95 }Neither the name of the Brandon Walkin nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\ +\pard\pardeftab720\sl400\sa280\ql\qnatural +\cf2 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.} \ No newline at end of file Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Release Notes.rtf =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Release Notes.rtf (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/Release Notes.rtf 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,65 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;} +{\colortbl;\red255\green255\blue255;\red100\green56\blue32;\red196\green26\blue22;} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1} +{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2} +{\list\listtemplateid3\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid201\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid3}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}} +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural + +\f0\b\fs54 \cf0 BWToolkit +\fs36 \ + +\b0 Plugin for Interface Builder 3\ + +\b \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural + +\b0\fs30 \cf0 Version 1.2.5\ +January 20, 2010\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural + +\fs32 \cf0 \ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural + +\b\fs36 \cf0 Installation +\b0\fs28 \ +\ +Note: If you're building on 10.5, you'll need to build BWToolkit from source.\ +\ +Step 1. Double click the BWToolkit.ibplugin file to load the plugin into Interface Builder\ +\ +Note: Interface Builder will reference this file rather than copy it to another location. Keep the .ibplugin file in a location where it won't be deleted.\ +\ +Step 2. In the Xcode project you want to use the plugin in:\ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\ql\qnatural\pardirnatural +\ls1\ilvl0\cf0 {\listtext \'95 }Right click the Linked Frameworks folder and click Add -> Existing Frameworks. Select the BWToolkitFramework.framework directory.\ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\ql\qnatural\pardirnatural +\ls2\ilvl0\cf0 {\listtext \'95 }Right click your target and click Add -> New Build Phase -> New Copy Files Build Phase. For destination, select Frameworks, leave the path field blank, and close the window.\ +\pard\tx220\tx720\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\li720\fi-720\ql\qnatural\pardirnatural +\ls3\ilvl0\cf0 {\listtext \'95 }Drag the BWToolkit framework from Linked Frameworks to the Copy Files build phase you just added.\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural +\cf0 \ +Note: You'll have to repeat step 2 for each project you want to use BWToolkit in.\ +\ +If you need to reference BWToolkit objects in your classes, you can import the main header like so:\ +\ +\pard\tx560\pardeftab560\ql\qnatural\pardirnatural + +\f1\fs24 \cf2 \CocoaLigature0 #import \cf3 +\f0\fs28 \cf0 \CocoaLigature1 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural + +\fs32 \cf0 \ +\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural + +\b\fs36 \cf0 License\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural + +\b0\fs28 \cf0 \ +All source code is provided under the three clause BSD license. Attribution is appreciated but by no means required.\ +\ +\ +} \ No newline at end of file Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderPhotoLarge.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderPhotoLarge.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderPhotoSmall.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderPhotoSmall.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderSpeakerLoud.png =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderSpeakerLoud.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderSpeakerQuiet.png =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderSpeakerQuiet.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderThumbN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderThumbN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderThumbP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderThumbP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackFill.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackFill.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackLeft.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackLeft.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackRight.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TexturedSliderTrackRight.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ToolbarItemColors.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ToolbarItemColors.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ToolbarItemFonts.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/ToolbarItemFonts.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonFillN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonFillN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonFillP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonFillP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonLeftN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonLeftN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonLeftP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonLeftP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonRightN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonRightN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonRightP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentButtonRightP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOffN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOffN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOffP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOffP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOnN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOnN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOnP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentCheckboxOnP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpFillN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpFillN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpFillP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpFillP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpLeftN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpLeftN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpLeftP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpLeftP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpPullDownRightN.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpPullDownRightN.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpPullDownRightP.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpPullDownRightP.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpRightN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpRightN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpRightP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentPopUpRightP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobBottom.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobBottom.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobHorizontalFill.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobHorizontalFill.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobLeft.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobLeft.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobRight.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobRight.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobTop.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobTop.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobVerticalFill.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerKnobVerticalFill.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotBottom.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotBottom.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotHorizontalFill.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotHorizontalFill.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotLeft.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotLeft.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotRight.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotRight.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotTop.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotTop.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotVerticalFill.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentScrollerSlotVerticalFill.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderThumbN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderThumbN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderThumbP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderThumbP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackFill.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackFill.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackLeft.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackLeft.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackRight.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTrackRight.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTriangleThumbN.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTriangleThumbN.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTriangleThumbP.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/TransparentSliderTriangleThumbP.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/Current =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/Current (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/Current 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1 @@ +link A \ No newline at end of file Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Frameworks/BWToolkitFramework.framework/Versions/Current ___________________________________________________________________ Added: svn:special + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Info.plist =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Info.plist (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Info.plist 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + BWToolkit + CFBundleIdentifier + com.brandonwalkin.BWToolkit + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + BWToolkit + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.2.5 + CFBundleSignature + ???? + CFBundleVersion + 1.2.5 + NSPrincipalClass + BWToolkit + + Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/MacOS/BWToolkit =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/MacOS/BWToolkit ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddMiniBottomBar.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddMiniBottomBar.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddMiniBottomBar.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWAddMiniBottomBar; + SuperClass = NSView; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddRegularBottomBar.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddRegularBottomBar.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddRegularBottomBar.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWAddRegularBottomBar; + SuperClass = NSView; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddSmallBottomBar.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddSmallBottomBar.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAddSmallBottomBar.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWAddSmallBottomBar; + SuperClass = NSView; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButton.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButton.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButton.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWAnchoredButton; + SuperClass = NSButton; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButtonBar.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButtonBar.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButtonBar.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWAnchoredButtonBar; + SuperClass = NSView; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButtonBarInspector.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredButtonBarInspector.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredPopUpButton.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredPopUpButton.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWAnchoredPopUpButton.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWAnchoredPopUpButton; + SuperClass = NSPopUpButton; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWBottomBarLibrary.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWBottomBarLibrary.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWButtonBarLibrary.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWButtonBarLibrary.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWControllersLibrary.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWControllersLibrary.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWGradientBoxInspector.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWGradientBoxInspector.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWHyperlinkButtonInspector.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWHyperlinkButtonInspector.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWInsetTextField.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWInsetTextField.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWInsetTextField.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWInsetTextField; + SuperClass = NSTextField; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWRemoveBottomBar.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWRemoveBottomBar.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWRemoveBottomBar.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWRemoveBottomBar; + SuperClass = NSView; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSelectableToolbar.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSelectableToolbar.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSelectableToolbar.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWSelectableToolbar; + SuperClass = NSToolbar; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSelectableToolbarInspector.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSelectableToolbarInspector.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSheetController.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSheetController.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSheetController.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,14 @@ +{ + Actions = { + "openSheet:" = id; + "closeSheet:" = id; + "messageDelegateAndCloseSheet:" = id; + }; + Outlets = { + sheet = NSWindow; + parentWindow = NSWindow; + delegate = id; + }; + ClassName = BWSheetController; + SuperClass = NSObject; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitView.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitView.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitView.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,11 @@ +{ + Actions = + { + "toggleCollapse:" = id; + }; + Outlets = + { + }; + ClassName = BWSplitView; + SuperClass = NSSplitView; +} Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitView.classdescription ___________________________________________________________________ Added: svn:executable + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitViewInspector.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitViewInspector.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitViewLibrary.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWSplitViewLibrary.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWStyledTextFieldInspector.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWStyledTextFieldInspector.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSlider.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSlider.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSlider.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTexturedSlider; + SuperClass = NSSlider; +} Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSlider.classdescription ___________________________________________________________________ Added: svn:executable + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSliderCell.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSliderCell.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSliderCell.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTexturedSliderCell; + SuperClass = NSSliderCell; +} Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSliderCell.classdescription ___________________________________________________________________ Added: svn:executable + * Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSliderInspector.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTexturedSliderInspector.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTokenField.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTokenField.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTokenField.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTokenField; + SuperClass = NSTokenField; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTokenFieldCell.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTokenFieldCell.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTokenFieldCell.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTokenFieldCell; + SuperClass = NSTokenFieldCell; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItem.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItem.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItem.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWToolbarItem; + SuperClass = NSToolbarItem; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItemInspector.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItemInspector.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItemsLibrary.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarItemsLibrary.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarShowColorsItem.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarShowColorsItem.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarShowColorsItem.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWToolbarShowColorsItem; + SuperClass = NSToolbarItem; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarShowFontsItem.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarShowFontsItem.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWToolbarShowFontsItem.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWToolbarShowFontsItem; + SuperClass = NSToolbarItem; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentButton.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentButton.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentButton.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentButton; + SuperClass = NSButton; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentButtonCell.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentButtonCell.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentButtonCell.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentButtonCell; + SuperClass = NSButtonCell; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentCheckbox.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentCheckbox.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentCheckbox.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentCheckbox; + SuperClass = NSButton; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentCheckboxCell.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentCheckboxCell.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentCheckboxCell.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentCheckboxCell; + SuperClass = NSButtonCell; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentControlsLibrary.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentControlsLibrary.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentPopUpButton.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentPopUpButton.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentPopUpButton.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentPopUpButton; + SuperClass = NSPopUpButton; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentPopUpButtonCell.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentPopUpButtonCell.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentPopUpButtonCell.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentPopUpButtonCell; + SuperClass = NSPopUpButtonCell; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentScroller.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentScroller.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentScroller.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentScroller; + SuperClass = NSScroller; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentSlider.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentSlider.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentSlider.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentSlider; + SuperClass = NSSlider; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentSliderCell.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentSliderCell.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentSliderCell.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentSliderCell; + SuperClass = NSSliderCell; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTableView.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTableView.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTableView.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentTableView; + SuperClass = NSTableView; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTableViewCell.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTableViewCell.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTableViewCell.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentTableViewCell; + SuperClass = NSTextFieldCell; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTextFieldCell.classdescription =================================================================== --- trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTextFieldCell.classdescription (rev 0) +++ trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/BWTransparentTextFieldCell.classdescription 2010-03-12 22:47:16 UTC (rev 419) @@ -0,0 +1,12 @@ +{ + Actions = { + // Define action descriptions here, for example + // "myAction:" = id; + }; + Outlets = { + // Define outlet descriptions here, for example + // myOutlet = NSView; + }; + ClassName = BWTransparentTextFieldCell; + SuperClass = NSTextFieldCell; +} Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/English.lproj/BWToolkitLibrary.nib =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/English.lproj/BWToolkitLibrary.nib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/English.lproj/InfoPlist.strings =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/English.lproj/InfoPlist.strings ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/GradientWellPattern.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/GradientWellPattern.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode1.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode1.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode1Pressed.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode1Pressed.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode2.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode2.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode2Pressed.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode2Pressed.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode3.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode3.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode3Pressed.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarMode3Pressed.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarModeSelection.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-ButtonBarModeSelection.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowBlueLeft.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowBlueLeft.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowBlueRight.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowBlueRight.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedFill.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedFill.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedLeft.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedLeft.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedRight.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewArrowRedRight.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewBackground.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Inspector-SplitViewBackground.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddMiniBottomBar.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddMiniBottomBar.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddRegularBottomBar.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddRegularBottomBar.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddSheetBottomBar.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddSheetBottomBar.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddSmallBottomBar.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AddSmallBottomBar.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredButton.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredButton.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredButtonBar.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredButtonBar.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredPopUpButton.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-AnchoredPopUpButton.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-GradientBox.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-GradientBox.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-GradientSplitView.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-GradientSplitView.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-HorizontalSplitView.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-HorizontalSplitView.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-InsetTextField.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-InsetTextField.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-RemoveBottomBar.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-RemoveBottomBar.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-SelectableToolbar.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-SelectableToolbar.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-SheetController.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-SheetController.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ShowColors.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ShowColors.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ShowFonts.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ShowFonts.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-StyledTextField.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-StyledTextField.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedAddButton.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedAddButton.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedRemoveButton.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedRemoveButton.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedSlider.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TexturedSlider.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TokenField.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TokenField.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ToolbarItem.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-ToolbarItem.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentButton.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentButton.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentCheckbox.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentCheckbox.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentCheckboxCell.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentCheckboxCell.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentLabel.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentLabel.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentPopUpButton.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentPopUpButton.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentSlider.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentSlider.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentTableView.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentTableView.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentTextView.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-TransparentTextView.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-VerticalSplitView.tif =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/Library-VerticalSplitView.tif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/ToolbarItemColors.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/ToolbarItemColors.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/ToolbarItemFonts.tiff =================================================================== (Binary files differ) Property changes on: trunk/src/uimacnew09/BWToolkit.ibplugin/Contents/Resources/ToolbarItemFonts.tiff ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/uimacnew09/uimacnew.xcodeproj/project.pbxproj =================================================================== --- trunk/src/uimacnew09/uimacnew.xcodeproj/project.pbxproj 2010-02-24 14:34:18 UTC (rev 418) +++ trunk/src/uimacnew09/uimacnew.xcodeproj/project.pbxproj 2010-03-12 22:47:16 UTC (rev 419) @@ -79,10 +79,10 @@ 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 */; }; + BB1ADE25114AEB1100575BFC /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBE2BCAB11355CDD00B187F2 /* BWToolkitFramework.framework */; }; + BB1ADE26114AEB1100575BFC /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBE2BCAC11355CDD00B187F2 /* Growl.framework */; }; BBE2BCAD11355CDD00B187F2 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBE2BCAB11355CDD00B187F2 /* BWToolkitFramework.framework */; }; BBE2BCAE11355CDD00B187F2 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBE2BCAC11355CDD00B187F2 /* Growl.framework */; }; - BBE2BCE611355CF600B187F2 /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBE2BCAB11355CDD00B187F2 /* BWToolkitFramework.framework */; }; - BBE2BCE711355CF600B187F2 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBE2BCAC11355CDD00B187F2 /* Growl.framework */; }; DE2444D610C294EA007E1546 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DE2444D410C294EA007E1546 /* MainMenu.xib */; }; /* End PBXBuildFile section */ @@ -103,8 +103,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - BBE2BCE611355CF600B187F2 /* BWToolkitFramework.framework in CopyFiles */, - BBE2BCE711355CF600B187F2 /* Growl.framework in CopyFiles */, + BB1ADE25114AEB1100575BFC /* BWToolkitFramework.framework in CopyFiles */, + BB1ADE26114AEB1100575BFC /* Growl.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; From alan.schmitt at polytechnique.org Sat Mar 13 05:14:36 2010 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Sat, 13 Mar 2010 11:14:36 +0100 Subject: [Unison-hackers] [unison-svn] r400 - in trunk/src: . system system/win ubase uimacnew uimacnew09 In-Reply-To: <043C25CA-43CD-439F-B70C-D729E7CC9459@cis.upenn.edu> References: <201001102253.o0AMr3a1026196@yaws.seas.upenn.edu> <39207FF6-4FBA-4720-9391-6CFADB2EDCEA@cis.upenn.edu> <7350E55C-F892-4676-BA8F-B055E0D5F9A2@informatik.uni-bremen.de> <922E47A3-822E-4DCF-966F-B8DA9089D707@cis.upenn.edu> <25ec8ca61002232226x48d92710r7753c5ecef540ee2@mail.gmail.com> <25ec8ca61002240632l43c5095aj108b9605e3b30308@mail.gmail.com> <043C25CA-43CD-439F-B70C-D729E7CC9459@cis.upenn.edu> Message-ID: <25ec8ca61003130214m1507933ajf184a0d15b028bb2@mail.gmail.com> On Fri, Mar 12, 2010 at 11:13 PM, Benjamin Pierce wrote: > OK, I finally got one of my machines upgraded to 10.6 and mostly working again after the upgrade (ugh), and I can now confirm that this works for me too. ?I've added the .ibplugin file to the svn repo and included it in the install instructions. > > I'm having one problem with compiling both versions of the GUI: > > uimacnew09/cltool.c: In function 'main': > uimacnew09/cltool.c:37: warning: format '%d' expects type 'int', but argument 3 has type 'OSStatus' > uimacnew09/cltool.c:43: warning: format '%d' expects type 'int', but argument 3 has type 'OSStatus' > > Have others seen this? I think I remember seeing this. We could try this: > To get an idea about what an OSStatus represent, you can use thoses 2 > functions (from CarbonCore): > > const char* GetMacOSStatusErrorString(OSStatus err); > const char* GetMacOSStatusCommentString(OSStatus err); (but we need to make sure we have access to them with the current includes). According to what I found, an OSStatus is a 4 bytes int. Alan From Jerome.Vouillon at pps.jussieu.fr Sat Mar 13 06:41:36 2010 From: Jerome.Vouillon at pps.jussieu.fr (Jerome Vouillon) Date: Sat, 13 Mar 2010 12:41:36 +0100 Subject: [Unison-hackers] [unison-svn] r400 - in trunk/src: . system system/win ubase uimacnew uimacnew09 In-Reply-To: <043C25CA-43CD-439F-B70C-D729E7CC9459@cis.upenn.edu> References: <201001102253.o0AMr3a1026196@yaws.seas.upenn.edu> <39207FF6-4FBA-4720-9391-6CFADB2EDCEA@cis.upenn.edu> <7350E55C-F892-4676-BA8F-B055E0D5F9A2@informatik.uni-bremen.de> <922E47A3-822E-4DCF-966F-B8DA9089D707@cis.upenn.edu> <25ec8ca61002232226x48d92710r7753c5ecef540ee2@mail.gmail.com> <25ec8ca61002240632l43c5095aj108b9605e3b30308@mail.gmail.com> <043C25CA-43CD-439F-B70C-D729E7CC9459@cis.upenn.edu> Message-ID: <20100313114136.GA32334@pps.jussieu.fr> On Fri, Mar 12, 2010 at 05:13:15PM -0500, Benjamin Pierce wrote: > OK, I finally got one of my machines upgraded to 10.6 and mostly working again after the upgrade (ugh), and I can now confirm that this works for me too. I've added the .ibplugin file to the svn repo and included it in the install instructions. > > I'm having one problem with compiling both versions of the GUI: > > uimacnew09/cltool.c: In function 'main': > uimacnew09/cltool.c:37: warning: format '%d' expects type 'int', but argument 3 has type 'OSStatus' > uimacnew09/cltool.c:43: warning: format '%d' expects type 'int', but argument 3 has type 'OSStatus' This is harmless: OSStatus is a 32 bit signed integer and the type 'int' is also 32 bits. The reason for the warning is that type OSStatus is defined as 'long' when compiling to 32 bit... Using format '%ld' should silence the compiler in all cases. -- Jerome From bcpierce at seas.upenn.edu Sat Mar 13 14:13:43 2010 From: bcpierce at seas.upenn.edu (bcpierce@seas.upenn.edu) Date: Sat, 13 Mar 2010 14:13:43 -0500 Subject: [Unison-hackers] [unison-svn] r420 - in trunk/src: . uimacnew uimacnew09 Message-ID: <201003131913.o2DJDi42005832@yaws.seas.upenn.edu> Author: bcpierce Date: 2010-03-13 14:13:41 -0500 (Sat, 13 Mar 2010) New Revision: 420 Modified: trunk/src/RECENTNEWS trunk/src/mkProjectInfo.ml trunk/src/uimacnew/cltool.c trunk/src/uimacnew09/cltool.c Log: * Silence compiler warnings on cltool.c (in OSX build) Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2010-03-12 22:47:16 UTC (rev 419) +++ trunk/src/RECENTNEWS 2010-03-13 19:13:41 UTC (rev 420) @@ -1,56 +1,43 @@ CHANGES FROM VERSION 2.40.1 -* Updated the Cygwin install instructions per Uwe Mayer (thanks!) +* Silence compiler warnings on cltool.c (in OSX build) -* Added interface builder files for BWToolkit framework to uimacnew09 - directory, to make the distribution self-contained, and added - instructions for installing it to the INSTALL section of the manual. -------------------------------- -CHANGES FROM VERSION 2.40.1 -* Updated the Cygwin install instructions per Uwe Mayer (thanks!) - -* Added interface builder files for BWToolkit framework to uimacnew09 - directory, to make the distribution self-contained, and added - instructions for installing it to the INSTALL section of the manual. - ------------------------------- CHANGES FROM VERSION 2.40.1 -* Fix compilation problem in mkProjectInfo +* Silence compiler warnings on cltool.c (in OSX build) ------------------------------- CHANGES FROM VERSION 2.40.1 -* Adding updated frameworks +* Silence compiler warnings on cltool.c (in OSX build) -------------------------------- -CHANGES FROM VERSION 2.40.1 -* Removing old frameworks to make space for new ones in new OSX GUI - ------------------------------- CHANGES FROM VERSION 2.40.1 -* Removing old frameworks to make space for new ones in new OSX GUI +* Silence compiler warnings on cltool.c (in OSX build) +* Updated the Cygwin install instructions per Uwe Mayer (thanks!) -------------------------------- -CHANGES FROM VERSION 2.40.1 +* Added interface builder files for BWToolkit framework to uimacnew09 + directory, to make the distribution self-contained, and added + instructions for installing it to the INSTALL section of the manual. -* Removing old frameworks to make space for new ones in new OSX GUI +* Fix compilation problem in mkProjectInfo +* Adding updated frameworks -------------------------------- -CHANGES FROM VERSION 2.40.1 - * Update copyright string in OSX GUI + * Make MyController a delegate of Application in OSX GUI, as suggested by Jerome. + ------------------------------- CHANGES FROM VERSION 2.40.1 Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2010-03-12 22:47:16 UTC (rev 419) +++ trunk/src/mkProjectInfo.ml 2010-03-13 19:13:41 UTC (rev 420) @@ -99,16 +99,3 @@ - - - - - - - - - - - - - Modified: trunk/src/uimacnew/cltool.c =================================================================== --- trunk/src/uimacnew/cltool.c 2010-03-12 22:47:16 UTC (rev 419) +++ trunk/src/uimacnew/cltool.c 2010-03-13 19:13:41 UTC (rev 420) @@ -34,13 +34,13 @@ 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 (%d).\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 (%d).\n",status); + fprintf(stderr,"Error: problem building path to Unison application (%ld).\n",status); exit(1); } Modified: trunk/src/uimacnew09/cltool.c =================================================================== --- trunk/src/uimacnew09/cltool.c 2010-03-12 22:47:16 UTC (rev 419) +++ trunk/src/uimacnew09/cltool.c 2010-03-13 19:13:41 UTC (rev 420) @@ -34,13 +34,13 @@ 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 (%d).\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 (%d).\n",status); + fprintf(stderr,"Error: problem building path to Unison application (%ld).\n",status); exit(1); } From bcpierce at cis.upenn.edu Sat Mar 13 14:13:06 2010 From: bcpierce at cis.upenn.edu (Benjamin Pierce) Date: Sat, 13 Mar 2010 14:13:06 -0500 Subject: [Unison-hackers] [unison-svn] r400 - in trunk/src: . system system/win ubase uimacnew uimacnew09 In-Reply-To: <20100313114136.GA32334@pps.jussieu.fr> References: <201001102253.o0AMr3a1026196@yaws.seas.upenn.edu> <39207FF6-4FBA-4720-9391-6CFADB2EDCEA@cis.upenn.edu> <7350E55C-F892-4676-BA8F-B055E0D5F9A2@informatik.uni-bremen.de> <922E47A3-822E-4DCF-966F-B8DA9089D707@cis.upenn.edu> <25ec8ca61002232226x48d92710r7753c5ecef540ee2@mail.gmail.com> <25ec8ca61002240632l43c5095aj108b9605e3b30308@mail.gmail.com> <043C25CA-43CD-439F-B70C-D729E7CC9459@cis.upenn.edu> <20100313114136.GA32334@pps.jussieu.fr> Message-ID: Thanks -- fixed. - B On Mar 13, 2010, at 6:41 AM, Jerome Vouillon wrote: > On Fri, Mar 12, 2010 at 05:13:15PM -0500, Benjamin Pierce wrote: >> OK, I finally got one of my machines upgraded to 10.6 and mostly >> working again after the upgrade (ugh), and I can now confirm that >> this works for me too. I've added the .ibplugin file to the svn >> repo and included it in the install instructions. >> >> I'm having one problem with compiling both versions of the GUI: >> >> uimacnew09/cltool.c: In function 'main': >> uimacnew09/cltool.c:37: warning: format '%d' expects type 'int', >> but argument 3 has type 'OSStatus' >> uimacnew09/cltool.c:43: warning: format '%d' expects type 'int', >> but argument 3 has type 'OSStatus' > > This is harmless: OSStatus is a 32 bit signed integer and the type > 'int' is also 32 bits. The reason for the warning is that type > OSStatus is defined as 'long' when compiling to 32 bit... > > Using format '%ld' should silence the compiler in all cases. > > -- Jerome > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From vouillon at seas.upenn.edu Wed Mar 17 18:34:37 2010 From: vouillon at seas.upenn.edu (vouillon@seas.upenn.edu) Date: Wed, 17 Mar 2010 18:34:37 -0400 Subject: [Unison-hackers] [unison-svn] r421 - in trunk/src: . ubase Message-ID: <201003172234.o2HMYdqm003400@yaws.seas.upenn.edu> Author: vouillon Date: 2010-03-17 18:34:35 -0400 (Wed, 17 Mar 2010) New Revision: 421 Modified: trunk/src/RECENTNEWS trunk/src/case.ml trunk/src/case.mli trunk/src/fileinfo.mli trunk/src/globals.ml trunk/src/globals.mli trunk/src/mkProjectInfo.ml trunk/src/props.ml trunk/src/props.mli trunk/src/recon.ml trunk/src/ubase/prefs.ml trunk/src/ubase/prefs.mli trunk/src/uicommon.ml trunk/src/uigtk2.ml trunk/src/update.ml Log: * 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.) * Automatic archive conversion to case sensitive mode (useful when Unison default is case sensitive and the user switches after the fact to case insensitive, for instance by setting the "fat" preference). * Make Unicode the default on all architectures (it was only the default when a Mac OS X or Windows machine was involved). * GTK UI: added "Change Profile" toolbar button. Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/RECENTNEWS 2010-03-17 22:34:35 UTC (rev 421) @@ -1,5 +1,24 @@ CHANGES FROM VERSION 2.40.1 +* 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.) +* Automatic archive conversion to case sensitive mode (useful when + Unison default is case sensitive and the user switches after the + fact to case insensitive, for instance by setting the "fat" + preference). +* Make Unicode the default on all architectures (it was only the + default when a Mac OS X or Windows machine was involved). +* GTK UI: added "Change Profile" toolbar button. + +------------------------------- +CHANGES FROM VERSION 2.40.1 + * Silence compiler warnings on cltool.c (in OSX build) Modified: trunk/src/case.ml =================================================================== --- trunk/src/case.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/case.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -44,21 +44,20 @@ Prefs.createBoolWithDefault "unicode" "!assume Unicode encoding in case insensitive mode" "When set to {\\tt true}, this flag causes Unison to perform \ - case insensitive file comparisons assuming Unicode encoding" + case insensitive file comparisons assuming Unicode encoding. \ + This is the default. When the flag is set to {\\tt false}, \ + a Latin 1 encoding is assumed. This flag has no effect when \ + Unison runs in case sensitive mode." let unicodeEncoding = Prefs.createBool "unicodeEnc" false "*Pseudo-preference for internal use only" "" -(* Whether we default to Unicode encoding on OSX and Windows *) -let defaultToUnicode = true - -let useUnicode b = +let useUnicode () = let pref = Prefs.read unicode in - pref = `True || - (defaultToUnicode && pref = `Default && b) + pref = `True || pref = `Default -let useUnicodeAPI () = useUnicode true +let useUnicodeAPI = useUnicode (* During startup the client determines the case sensitivity of each root. *) (* If any root is case insensitive, all roots must know it; we ensure this *) @@ -68,7 +67,7 @@ Prefs.set someHostIsInsensitive (Prefs.read caseInsensitiveMode = `True || (Prefs.read caseInsensitiveMode = `Default && b)); - Prefs.set unicodeEncoding (useUnicode b) + Prefs.set unicodeEncoding (useUnicode ()) (****) @@ -174,3 +173,5 @@ insensitiveOps end else sensitiveOps + +let caseSensitiveModeDesc = sensitiveOps#modeDesc Modified: trunk/src/case.mli =================================================================== --- trunk/src/case.mli 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/case.mli 2010-03-17 22:34:35 UTC (rev 421) @@ -1,6 +1,7 @@ (* Unison file synchronizer: src/case.mli *) (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) +val caseInsensitiveMode : [`True|`False|`Default] Prefs.t val unicodeEncoding : bool Prefs.t val useUnicodeAPI : unit -> bool @@ -25,3 +26,5 @@ the correct encoding *) val init : bool -> unit + +val caseSensitiveModeDesc : string Modified: trunk/src/fileinfo.mli =================================================================== --- trunk/src/fileinfo.mli 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/fileinfo.mli 2010-03-17 22:34:35 UTC (rev 421) @@ -27,3 +27,5 @@ (****) val init : bool -> unit +val allowSymlinks : [`True|`False|`Default] Prefs.t +val ignoreInodeNumbers : bool Prefs.t Modified: trunk/src/globals.ml =================================================================== --- trunk/src/globals.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/globals.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -287,3 +287,17 @@ let allHostsAreRunningWindows = Prefs.createBool "allHostsAreRunningWindows" false "*" "" + +let fatFilesystem = + Prefs.createBool "fat" ~local:true false + "use appropriate options for FAT filesystems" + ("When this is set to {\\tt true}, Unison will use appropriate options \ + to synchronize efficiently and without error a replica located on a \ + FAT filesystem on a non-Windows machine: \ + only synchronize the write permission bit ({\\tt perms = 0o200}); \ + treat filenames as case insensitive ({\\tt ignorecase = true}); \ + do not attempt to synchronize symbolic links ({\\tt links = false}); \ + ignore inode number changes when detecting updates \ + ({\\tt ignoreinodenumbers = true}). \ + Any of these change can be overridden by explicitely setting \ + the corresponding preference in the profile.") Modified: trunk/src/globals.mli =================================================================== --- trunk/src/globals.mli 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/globals.mli 2010-03-17 22:34:35 UTC (rev 421) @@ -87,3 +87,4 @@ (* Internal prefs, needed to know whether to do filenames checks *) val someHostIsRunningWindows : bool Prefs.t val allHostsAreRunningWindows : bool Prefs.t +val fatFilesystem : bool Prefs.t Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/mkProjectInfo.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -99,3 +99,4 @@ + Modified: trunk/src/props.ml =================================================================== --- trunk/src/props.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/props.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -46,6 +46,7 @@ val extract : t -> int val check : Fspath.t -> Path.local -> Unix.LargeFile.stats -> t -> unit val validatePrefs : unit -> unit + val permMask : int Prefs.t end = struct (* We introduce a type, Perm.t, that holds a file's permissions along with *) @@ -227,7 +228,9 @@ "Failed to set permissions of file %s to %s: \ the permissions was set to %s instead. \ The filesystem probably does not support all permission bits. \ - You should probably set the \"perms\" option to 0o%o \ + If this is a FAT filesystem, you should set the \"fat\" option \ + to true. \ + Otherwise, you should probably set the \"perms\" option to 0o%o \ (or to 0 if you don't need to synchronize permissions)." (Fspath.toPrintString (Fspath.concat fspath path)) (syncedPartsToString (fp, mask)) @@ -762,6 +765,7 @@ let perms p = Perm.extract p.perm let syncModtimes = Time.sync +let permMask = Perm.permMask let validatePrefs = Perm.validatePrefs Modified: trunk/src/props.mli =================================================================== --- trunk/src/props.mli 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/props.mli 2010-03-17 22:34:35 UTC (rev 421) @@ -29,6 +29,7 @@ val dirDefault : t val syncModtimes : bool Prefs.t +val permMask : int Prefs.t (* We are reusing the directory length to store a flag indicating that the directory is unchanged *) @@ -39,4 +40,4 @@ val dirMarkedUnchanged : t -> dirChangedStamp -> int -> bool val validatePrefs: unit -> unit - + Modified: trunk/src/recon.ml =================================================================== --- trunk/src/recon.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/recon.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -276,8 +276,8 @@ (* errors *) let checkThatPreferredRootIsValid () = let test_root predname = function - | "" -> () - | ("newer" | "older") as r -> + | "" | "newer" -> () + | "older" as r -> if not (Prefs.read Props.syncModtimes) then raise (Util.Transient (Printf.sprintf "The '%s=%s' preference can only be used with 'times=true'" Modified: trunk/src/ubase/prefs.ml =================================================================== --- trunk/src/ubase/prefs.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/ubase/prefs.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -3,16 +3,24 @@ let debug = Util.debug "prefs" -type 'a t = ('a * string list) ref +type 'a t = + { mutable value : 'a; defaultValue : 'a; mutable names : string list; + mutable setInProfile : bool } -let read p = fst !p +let read p = p.value -let set p v = p:=(v, snd !p) +let set p v = p.setInProfile <- true; p.value <- v -let name p = snd !p +let overrideDefault p v = if not p.setInProfile then p.value <- v -let rawPref default = ref default +let name p = p.names +let readDefault p = p.defaultValue + +let rawPref default name = + { value = default; defaultValue = default; names = [name]; + setInProfile = false } + (* ------------------------------------------------------------------------- *) let profileName = ref None @@ -161,7 +169,7 @@ let (_,pspec,_) = Util.StringMap.find (Safelist.hd (name pref)) !prefs in prefs := Util.StringMap.add newname ("*", pspec, "") !prefs; aliasMap := Util.StringMap.add newname (Safelist.hd (name pref)) !aliasMap; - pref := (fst !pref, newname::(snd !pref)) + pref.names <- newname :: pref.names let registerPref name typ pspec doc fulldoc = if Util.StringMap.mem name !prefs then @@ -172,17 +180,23 @@ prefType := Util.StringMap.add name typ !prefType let createPrefInternal name typ local default doc fulldoc printer parsefn = - let newCell = rawPref (default, [name]) in + let newCell = rawPref default name in registerPref name typ (parsefn newCell) doc fulldoc; - adddumper name local (fun () -> Marshal.to_string !newCell []); - addprinter name (fun () -> printer (fst !newCell)); - addresetter (fun () -> newCell := (default, [name])); - addloader name (fun s -> newCell := Marshal.from_string s 0); + adddumper name local + (fun () -> Marshal.to_string (newCell.value, newCell.names) []); + addprinter name (fun () -> printer newCell.value); + addresetter + (fun () -> + newCell.setInProfile <- false; newCell.value <- newCell.defaultValue); + addloader name + (fun s -> + let (value, names) = Marshal.from_string s 0 in + newCell.value <- value); newCell let create name ?(local=false) default doc fulldoc intern printer = createPrefInternal name `CUSTOM local default doc fulldoc printer - (fun cell -> Uarg.String (fun s -> set cell (intern (fst !cell) s))) + (fun cell -> Uarg.String (fun s -> set cell (intern (read cell) s))) let createBool name ?(local=false) default doc fulldoc = let doc = if default then doc ^ " (default true)" else doc in @@ -208,7 +222,7 @@ let createStringList name ?(local=false) doc fulldoc = createPrefInternal name `STRING_LIST local [] doc fulldoc (fun v -> v) - (fun cell -> Uarg.String (fun s -> set cell (s::(fst !cell)))) + (fun cell -> Uarg.String (fun s -> set cell (s:: read cell))) let createBoolWithDefault name ?(local=false) doc fulldoc = createPrefInternal name `BOOLDEF local `Default doc fulldoc Modified: trunk/src/ubase/prefs.mli =================================================================== --- trunk/src/ubase/prefs.mli 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/ubase/prefs.mli 2010-03-17 22:34:35 UTC (rev 421) @@ -6,6 +6,8 @@ val read : 'a t -> 'a val set : 'a t -> 'a -> unit val name : 'a t -> string list +val overrideDefault : 'a t -> 'a -> unit +val readDefault : 'a t -> 'a (* Convenient functions for registering simple kinds of preferences. Note *) (* that createStringPref creates a preference that can only be set once, *) Modified: trunk/src/uicommon.ml =================================================================== --- trunk/src/uicommon.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/uicommon.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -457,6 +457,12 @@ Safelist.exists (fun (_, isOSX, _) -> isOSX) archs in let someHostIsCaseInsensitive = someHostIsRunningWindows || someHostRunningOsX in + if Prefs.read Globals.fatFilesystem then begin + Prefs.overrideDefault Props.permMask 0o200; + Prefs.overrideDefault Case.caseInsensitiveMode `True; + Prefs.overrideDefault Fileinfo.allowSymlinks `False; + Prefs.overrideDefault Fileinfo.ignoreInodeNumbers true + end; Case.init someHostIsCaseInsensitive; Props.init someHostIsRunningWindows; Osx.init someHostRunningOsX; Modified: trunk/src/uigtk2.ml =================================================================== --- trunk/src/uigtk2.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/uigtk2.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -1570,13 +1570,7 @@ if React.state unicode then Printf.fprintf ch "unicode = true\n"; *) - if React.state fat then begin - Printf.fprintf ch "ignorecase = true\n"; - Printf.fprintf ch "unicode = true\n"; - Printf.fprintf ch "ignoreinodenumbers = true\n"; - Printf.fprintf ch "links = false\n"; - Printf.fprintf ch "perms = 0o200\n" - end; + if React.state fat then Printf.fprintf ch "fat = true\n"; close_out ch; profileName := Some (React.state name) with Sys_error _ as e -> @@ -3915,13 +3909,6 @@ ~tooltip:"Compare the two files at each replica" ~callback:diffCmd ()); -(* actionBar#insert_space ();*) -(* - grAdd grDiff (actionBar#insert_button ~text:"Merge" - ~icon:((GMisc.image ~stock:`DIALOG_QUESTION ())#coerce) - ~tooltip:"Merge the two items at each replica" - ~callback:mergeCmd ()); - *) (********************************************************************* Detail button *********************************************************************) @@ -3933,6 +3920,20 @@ ~callback:showDetCommand ()); (********************************************************************* + Profile change button + *********************************************************************) + actionBar#insert_space (); + let profileChange _ = + match getProfile false with + None -> () + | Some p -> clearMainWindow (); loadProfile p false; detectCmd () + in + grAdd grRescan (actionBar#insert_button ~text:"Change Profile" + ~icon:((GMisc.image ~stock:`OPEN ())#coerce) + ~tooltip:"Select a different profile" + ~callback:profileChange ()); + + (********************************************************************* Keyboard commands *********************************************************************) ignore @@ -3983,13 +3984,6 @@ left#add_accelerator ~group:accel_group ~modi:[`SHIFT] GdkKeysyms._greater; left#add_accelerator ~group:accel_group GdkKeysyms._period; - let merge = - actionMenu#add_image_item ~key:GdkKeysyms._m ~callback:mergeAction - ~image:((GMisc.image ~stock:`ADD ~icon_size:`MENU ())#coerce) - "_Merge the Files" in - grAdd grAction merge; - (* merge#add_accelerator ~group:accel_group ~modi:[`SHIFT] GdkKeysyms._m; *) - let def_descl = "Right to Left" in let descl = if init || loc1 = loc2 then def_descr else @@ -4008,6 +4002,13 @@ ~image:((GMisc.image ~stock:`NO ~icon_size:`MENU ())#coerce) "Do _Not Propagate Changes"); + let merge = + actionMenu#add_image_item ~key:GdkKeysyms._m ~callback:mergeAction + ~image:((GMisc.image ~stock:`ADD ~icon_size:`MENU ())#coerce) + "_Merge the Files" in + grAdd grAction merge; + (* merge#add_accelerator ~group:accel_group ~modi:[`SHIFT] GdkKeysyms._m; *) + (* Override actions *) ignore (actionMenu#add_separator ()); grAdd grAction Modified: trunk/src/update.ml =================================================================== --- trunk/src/update.ml 2010-03-13 19:13:41 UTC (rev 420) +++ trunk/src/update.ml 2010-03-17 22:34:35 UTC (rev 421) @@ -274,21 +274,34 @@ System.file_exists (Os.fileInUnisonDir name))) let compatibleCaseMode magic = - if magic = "" then `YES else + if magic = "" then `YES (* Newly created archive *) else try let archMode = String.sub magic 0 (String.index magic '\000') in let curMode = (Case.ops ())#modeDesc in if curMode <> archMode then - `NO (curMode, archMode) + `NO (archMode = Case.caseSensitiveModeDesc, curMode, archMode) else `YES with Not_found -> + (* Legacy format. Cannot be Unicode case insensitive. *) if (Case.ops ())#mode = Case.UnicodeInsensitive then let curMode = (Case.ops ())#modeDesc in - `NO (curMode, "some non-Unicode") + `NO (false, curMode, "some non-Unicode") else `YES +(* HACK: we use this as just a flag. Should delete this when Unison minor + version is bumped. *) + +let rootCanMakeCaseSensitive + = Remote.registerRootCmd "canMakeCaseSensitive" (fun _ -> Lwt.return ()) + +let didMakeCaseSensitive () = + Globals.allRootsMap + (fun r -> Remote.commandAvailable r "canMakeCaseSensitive") >>= fun l -> + Lwt.return (List.for_all (fun x -> x) l) + + let checkArchiveCaseSensitivity l = let error curMode archMode = (* We cannot compute the archive name locally as it @@ -317,8 +330,16 @@ match l with Some (_, magic) :: _ -> begin match compatibleCaseMode magic with - `NO (curMode, archMode) -> error curMode archMode - | `YES -> Lwt.return () + `NO (conv, curMode, archMode) -> + begin if conv then + didMakeCaseSensitive () + else + Lwt.return false + end >>= fun converted -> + if converted then Lwt.return () else + error curMode archMode + | `YES -> + Lwt.return () end | _ -> Lwt.return () @@ -578,6 +599,51 @@ let dumpArchiveOnRoot : Common.root -> unit -> unit Lwt.t = Remote.registerRootCmd "dumpArchive" dumpArchiveLocal +(*****************************************************************************) +(* ARCHIVE CASE CONVERSION *) +(*****************************************************************************) + +(* Turn a case sensitive archive into a case insensitive archive. + Directory children are resorted and duplicates are removed. +*) +let rec makeCaseSensitiveRec arch = + match arch with + ArchiveDir (desc, children) -> + let dups = ref [] in + let children = + NameMap.fold + (fun nm ch chs -> + if NameMap.mem nm chs then dups := nm :: !dups; + NameMap.add nm (makeCaseSensitiveRec ch) chs) + children NameMap.empty + in + let children = + List.fold_left (fun chs nm -> NameMap.remove nm chs) children !dups in + ArchiveDir (desc, children) + | ArchiveFile _ | ArchiveSymlink _ | NoArchive -> + arch + +let makeCaseSensitive thisRoot = + setArchiveLocal thisRoot (makeCaseSensitiveRec (getArchive thisRoot)) + +let rec populateCacheFromArchiveRec path arch = + match arch with + ArchiveDir (_, children) -> + NameMap.iter + (fun nm ch -> populateCacheFromArchiveRec (Path.child path nm) ch) + children + | ArchiveFile (desc, dig, stamp, ress) -> + Fpcache.save path (desc, dig, stamp, ress) + | ArchiveSymlink _ | NoArchive -> + () + +let populateCacheFromArchive fspath arch = + let (cacheFilename, _) = archiveName fspath FPCache in + let cacheFile = Os.fileInUnisonDir cacheFilename in + Fpcache.init true cacheFile; + populateCacheFromArchiveRec Path.empty arch; + Fpcache.finish () + (*************************************************************************) (* Loading archives *) (*************************************************************************) @@ -591,27 +657,16 @@ ^ "not a good idea to set this option in a profile: it is intended for " ^ "command-line use.") -let rec populateCacheFromArchive path arch = - match arch with - ArchiveDir (_, children) -> - NameMap.iter - (fun nm ch -> populateCacheFromArchive (Path.child path nm) ch) - children - | ArchiveFile (desc, dig, stamp, ress) -> - Fpcache.save path (desc, dig, stamp, ress) - | ArchiveSymlink _ | NoArchive -> - () - let setArchiveData thisRoot fspath (arch, hash, magic, properties) info = setArchiveLocal thisRoot arch; setArchivePropsLocal thisRoot properties; Hashtbl.replace archiveInfoCache thisRoot info; - if compatibleCaseMode magic <> `YES then begin - let (cacheFilename, _) = archiveName fspath FPCache in - let cacheFile = Os.fileInUnisonDir cacheFilename in - Fpcache.init true cacheFile; - populateCacheFromArchive Path.empty arch; - Fpcache.finish () + begin match compatibleCaseMode magic with + `YES -> + () + | `NO (conv, _, _) -> + if conv then makeCaseSensitive thisRoot; + populateCacheFromArchive fspath arch end; Lwt.return (Some (hash, magic)) @@ -629,9 +684,10 @@ let (arcName,thisRoot) = archiveName fspath MainArch in let arcFspath = Os.fileInUnisonDir arcName in - if Prefs.read ignoreArchives then + if Prefs.read ignoreArchives then begin + foundArchives := false; clearArchiveData thisRoot - else if optimistic then begin + end else if optimistic then begin let (newArcName, _) = archiveName fspath NewArch in if (* If the archive is not in a stable state, we need to From vouillon at seas.upenn.edu Tue Mar 23 11:07:14 2010 From: vouillon at seas.upenn.edu (vouillon@seas.upenn.edu) Date: Tue, 23 Mar 2010 11:07:14 -0400 Subject: [Unison-hackers] [unison-svn] r422 - in trunk/src: . lwt system Message-ID: <201003231507.o2NF7FZ0026719@yaws.seas.upenn.edu> Author: vouillon Date: 2010-03-23 11:07:12 -0400 (Tue, 23 Mar 2010) New Revision: 422 Modified: trunk/src/RECENTNEWS trunk/src/lwt/lwt_unix_stubs.c trunk/src/mkProjectInfo.ml trunk/src/system/system_win_stubs.c Log: * Windows: fix C includes for compilation with MSVC * Windows: implement somewhat the O_APPEND flag, so that appending lines to a profile (ignored files, for instance) works instead of overwriting the beginning of the file (the file pointer is moved to the end when the file is opened, rather that each time something is written, which is good enough here) Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2010-03-17 22:34:35 UTC (rev 421) +++ trunk/src/RECENTNEWS 2010-03-23 15:07:12 UTC (rev 422) @@ -1,5 +1,15 @@ CHANGES FROM VERSION 2.40.1 +* Windows: fix C includes for compilation with MSVC +* Windows: implement somewhat the O_APPEND flag, so that appending + lines to a profile (ignored files, for instance) works instead of + overwriting the beginning of the file (the file pointer is moved to + the end when the file is opened, rather that each time something is + written, which is good enough here) + +------------------------------- +CHANGES FROM VERSION 2.40.1 + * 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 Modified: trunk/src/lwt/lwt_unix_stubs.c =================================================================== --- trunk/src/lwt/lwt_unix_stubs.c 2010-03-17 22:34:35 UTC (rev 421) +++ trunk/src/lwt/lwt_unix_stubs.c 2010-03-23 15:07:12 UTC (rev 422) @@ -1,7 +1,5 @@ -#include -#include -#include #include +#include #include #include @@ -113,10 +111,10 @@ D(printf("Queueing action %s: id %ld -> len %ld / err %d (errCode %ld)\n", action_name[action], id, len, errno, errCode)); if (compN + 1 > complQueueSize) { + completionInfo * queue; int n = complQueueSize * 2 + 1; D(printf("Resizing queue to %d\n", n)); - completionInfo * queue = - (completionInfo *) GlobalAlloc(GPTR, n * sizeof(completionInfo)); + queue = (completionInfo *) GlobalAlloc(GPTR, n * sizeof(completionInfo)); if (complQueue != NULL) CopyMemory (queue, complQueue, complQueueSize * sizeof(completionInfo)); complQueue = queue; Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2010-03-17 22:34:35 UTC (rev 421) +++ trunk/src/mkProjectInfo.ml 2010-03-23 15:07:12 UTC (rev 422) @@ -100,3 +100,4 @@ + Modified: trunk/src/system/system_win_stubs.c =================================================================== --- trunk/src/system/system_win_stubs.c 2010-03-17 22:34:35 UTC (rev 421) +++ trunk/src/system/system_win_stubs.c 2010-03-23 15:07:12 UTC (rev 422) @@ -5,23 +5,9 @@ #define WINVER 0x0500 -#include -#include +#include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #define NT_MAX_PATH 32768 @@ -62,11 +48,6 @@ 0, 0, 0, 0, 0, O_CREAT, O_TRUNC, O_EXCL, 0, 0, 0, 0 }; -static int open_flag_table[12] = { - _O_RDONLY, _O_WRONLY, _O_RDWR, 0, _O_APPEND, _O_CREAT, _O_TRUNC, - _O_EXCL, 0, 0, 0, 0 -}; - /****/ CAMLprim value win_rmdir(value path, value wpath) @@ -244,6 +225,8 @@ uerror("open", path); } + if (createflags & O_APPEND) SetFilePointer (h, 0, NULL, FILE_END); + CAMLreturn(win_alloc_handle(h)); } From vouillon at seas.upenn.edu Thu Mar 25 10:43:01 2010 From: vouillon at seas.upenn.edu (vouillon@seas.upenn.edu) Date: Thu, 25 Mar 2010 10:43:01 -0400 Subject: [Unison-hackers] [unison-svn] r423 - in trunk/src: . system Message-ID: <201003251443.o2PEh20s006861@yaws.seas.upenn.edu> Author: vouillon Date: 2010-03-25 10:43:01 -0400 (Thu, 25 Mar 2010) New Revision: 423 Modified: trunk/src/Makefile.OCaml trunk/src/RECENTNEWS trunk/src/case.ml trunk/src/fileinfo.ml trunk/src/globals.ml trunk/src/mkProjectInfo.ml trunk/src/props.ml trunk/src/props.mli trunk/src/system/system_win.ml trunk/src/transfer.ml trunk/src/uicommon.ml trunk/src/unicode.ml Log: * Windows: more fixes for compilation with MSVC * Rsync: somewhat faster compressor * Changed "fat" option to not use chmod, to be on the safe side (perms = 0 + dontchmod = true) * Some preference documentation updates * Fail more gracefully when converting a non Unicode string to UTF-16 (transient error with clear error message) Modified: trunk/src/Makefile.OCaml =================================================================== --- trunk/src/Makefile.OCaml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/Makefile.OCaml 2010-03-25 14:43:01 UTC (rev 423) @@ -97,6 +97,7 @@ # Win32 system EXEC_EXT=.exe OBJ_EXT=.obj + OUTPUT_SEL=/Fo CWD=. # Fix suggested by Karl M, Jan 2009: # "The new flexlink wrapper that OCaml 3.11 uses was gagging on the res @@ -108,13 +109,14 @@ COBJS+=system/system_win_stubs$(OBJ_EXT) lwt/lwt_unix_stubs$(OBJ_EXT) WINOBJS=system/system_win.cmo SYSTEM=win - CLIBS+=-cclib "-link win32rc/unison.res" - STATICLIBS+=-cclib "-link win32rc/unison.res" + CLIBS+=-cclib "-link win32rc/unison.res" shell32.lib + STATICLIBS+=-cclib "-link win32rc/unison.res" shell32.lib buildexecutable:: @echo Building for Windows else # Unix system, or Cygwin with GNU C compiler OBJ_EXT=.o + OUTPUT_SEL="-o " ifeq ($(OSARCH),win32gnuc) CWD=. EXEC_EXT=.exe @@ -413,7 +415,7 @@ %.o %.obj: %.c @echo "$(OCAMLOPT): $< ---> $@" - $(CAMLC) $(CAMLFLAGS) -ccopt -o -ccopt $(CWD)/$@ -c $(CWD)/$< + $(CAMLC) $(CAMLFLAGS) -ccopt $(OUTPUT_SEL)$(CWD)/$@ -c $(CWD)/$< $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS) @echo Linking $@ Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/RECENTNEWS 2010-03-25 14:43:01 UTC (rev 423) @@ -1,5 +1,16 @@ CHANGES FROM VERSION 2.40.1 +* Windows: more fixes for compilation with MSVC +* Rsync: somewhat faster compressor +* Changed "fat" option to not use chmod, to be on the safe side + (perms = 0 + dontchmod = true) +* Some preference documentation updates +* Fail more gracefully when converting a non Unicode string to UTF-16 + (transient error with clear error message) + +------------------------------- +CHANGES FROM VERSION 2.40.1 + * Windows: fix C includes for compilation with MSVC * Windows: implement somewhat the O_APPEND flag, so that appending lines to a profile (ignored files, for instance) works instead of Modified: trunk/src/case.ml =================================================================== --- trunk/src/case.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/case.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -30,9 +30,8 @@ ^ "will treat all filenames as case sensitive. Ordinarily, when the flag is " ^ "set to {\\tt default}, " ^ "filenames are automatically taken to be case-insensitive if " - ^ "either host is running Windows or OSX. In rare circumstances it is " - ^ "useful to set the flag manually (e.g. when running Unison on a " - ^ "Unix system with a FAT [Windows] volume mounted).") + ^ "either host is running Windows or OSX. In rare circumstances it may be " + ^ "useful to set the flag manually.") (* Defining this variable as a preference ensures that it will be propagated to the other host during initialization *) Modified: trunk/src/fileinfo.ml =================================================================== --- trunk/src/fileinfo.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/fileinfo.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -26,9 +26,8 @@ links will result in an error during update detection. \ Ordinarily, when the flag is set to {\\tt default}, symbolic \ links are synchronized except when one of the hosts is running \ - Windows. In rare circumstances it is useful to set the flag \ - manually (e.g. when running Unison on a Unix system with a FAT \ - [Windows] volume mounted).") + Windows. In rare circumstances it may be useful to set the flag \ + manually.") let symlinksAllowed = Prefs.createBool "links-aux" true @@ -155,8 +154,7 @@ of inode numbers during fast update detection. \ This switch should be used with care, as it \ is less safe than the standard update detection method, but it \ - can be useful for synchronizing VFAT filesystems (which do not \ - support inode numbers) mounted on Unix systems.") + can be useful with filesystems which do not support inode numbers.") let _ = Prefs.alias ignoreInodeNumbers "pretendwin" let stamp info = Modified: trunk/src/globals.ml =================================================================== --- trunk/src/globals.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/globals.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -294,7 +294,8 @@ ("When this is set to {\\tt true}, Unison will use appropriate options \ to synchronize efficiently and without error a replica located on a \ FAT filesystem on a non-Windows machine: \ - only synchronize the write permission bit ({\\tt perms = 0o200}); \ + do not synchronize permissions ({\\tt perms = 0}); \ + never use chmod ({\tt dontchmod = true}); \ treat filenames as case insensitive ({\\tt ignorecase = true}); \ do not attempt to synchronize symbolic links ({\\tt links = false}); \ ignore inode number changes when detecting updates \ Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/mkProjectInfo.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -101,3 +101,4 @@ + Modified: trunk/src/props.ml =================================================================== --- trunk/src/props.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/props.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -47,6 +47,7 @@ val check : Fspath.t -> Path.local -> Unix.LargeFile.stats -> t -> unit val validatePrefs : unit -> unit val permMask : int Prefs.t + val dontChmod : bool Prefs.t end = struct (* We introduce a type, Perm.t, that holds a file's permissions along with *) @@ -84,7 +85,11 @@ $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$." + value of this preference to $-1$. If one of the replica is on \ + a FAT [Windows] filesystem, you should consider using the \ + {\tt fat} preference instead of this preference. If you need \ + Unison not to set permissions at all, set the value of this \ + preference to $0$ and set the preference {\tt dontchmod} to {\tt true}." (* Os-specific local conventions on file permissions *) let (fileDefault, dirDefault, fileSafe, dirSafe) = @@ -215,7 +220,18 @@ Util.msg "Setting permissions for %s to %s (%s)\n" (Fspath.toDebugString abspath) (toString (fileperm2perm fp)) (Printf.sprintf "%o/%o" fp mask)); - Fs.chmod abspath fp) + try + Fs.chmod abspath fp + with Unix.Unix_error (Unix.EOPNOTSUPP, _, _) as e -> + try + Util.convertUnixErrorsToTransient "setting permissions" + (fun () -> raise e) + with Util.Transient msg -> + raise (Util.Transient + (msg ^ + ". You can use preference \"fat\",\ + or else set preference \"perms\" to 0 and \ + preference \"dontchmod\" to true to avoid this error"))) let get stats _ = (stats.Unix.LargeFile.st_perm, Prefs.read permMask) @@ -766,6 +782,7 @@ let syncModtimes = Time.sync let permMask = Perm.permMask +let dontChmod = Perm.dontChmod let validatePrefs = Perm.validatePrefs Modified: trunk/src/props.mli =================================================================== --- trunk/src/props.mli 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/props.mli 2010-03-25 14:43:01 UTC (rev 423) @@ -30,6 +30,7 @@ val syncModtimes : bool Prefs.t val permMask : int Prefs.t +val dontChmod : bool Prefs.t (* We are reusing the directory length to store a flag indicating that the directory is unchanged *) Modified: trunk/src/system/system_win.ml =================================================================== --- trunk/src/system/system_win.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/system/system_win.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -54,11 +54,26 @@ else f +let encodingError p = + raise + (Sys_error + (Format.sprintf "The file path '%s' is not encoded in Unicode." p)) + let utf8 = Unicode.from_utf_16 -let utf16 = Unicode.to_utf_16 +let utf16 s = + try + Unicode.to_utf_16 s + with Unicode.Invalid -> + raise (Sys_error + (Format.sprintf "The text '%' is not encoded in Unicode" s)) let path8 = Unicode.from_utf_16(*_filename*) -let path16 = Unicode.to_utf_16(*_filename*) -let epath f = path16 (extendedPath f) +let path16 f = + try Unicode.to_utf_16(*_filename*) f with Unicode.Invalid -> encodingError f +let epath f = + try + Unicode.to_utf_16(*_filename*) (extendedPath f) + with + Unicode.Invalid -> encodingError f let sys_error e = match e with Modified: trunk/src/transfer.ml =================================================================== --- trunk/src/transfer.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/transfer.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -479,7 +479,7 @@ let hash checksum = checksum (* Compute the hash table length as a function of the number of blocks *) - let hashTableLength signatures = + let computeHashTableLength signatures = 2 * (upperPowerOfTwo signatures.blockCount 32) (* Hash the block signatures into the hash table *) @@ -495,8 +495,28 @@ (* Given a key, retrieve the corresponding entry in the table *) let findEntry hashTable hashTableLength checksum : (int * Checksum.t) list = - hashTable.((hash checksum) land (hashTableLength - 1)) + Array.unsafe_get hashTable ((hash checksum) land (hashTableLength - 1)) + let sigFilter hashTableLength signatures = + let len = hashTableLength lsl 2 in + let filter = String.make len '\000' in + for k = 0 to signatures.blockCount - 1 do + let cs = Int32.to_int signatures.weakChecksum.{k} land 0x7fffffff in + let h1 = cs lsr 28 in + assert (h1 >= 0 && h1 < 8); + let h2 = (cs lsr 5) land (len - 1) in + let mask = 1 lsl h1 in + filter.[h2] <- Char.chr (Char.code filter.[h2] lor mask) + done; + filter + + let filterMem filter hashTableLength checksum = + let len = hashTableLength lsl 2 in + let h2 = (checksum lsr 5) land (len - 1) in + let h1 = checksum lsr 28 in + let mask = 1 lsl h1 in + Char.code (String.unsafe_get filter h2) land mask <> 0 + (* Log the values of the parameters associated with the hash table *) let logHash hashTable hashTableLength = let rec probe empty collision i = @@ -522,19 +542,20 @@ type probes = { mutable hitHit : int; mutable hitMiss : int; + mutable missMiss : int; mutable nbBlock : int; mutable nbString : int; mutable stringSize : int } let logMeasures pb = -((* debugLog (fun() -> Util.msg - "hit-hit = %d, hit-miss = %d, hit rate = %d%%\n" - pb.hitHit pb.hitMiss + "hit-hit = %d, hit-miss = %d, miss-miss = %d, hit rate = %d%%\n" + pb.hitHit pb.hitMiss pb.missMiss (if pb.hitHit <> 0 then pb.hitHit * 100 / (pb.hitHit + pb.hitMiss) - else 0)); + else 0)) +(* debugLog (fun() -> Util.msg "%d strings (%d bytes), %d blocks\n" pb.nbString pb.stringSize pb.nbBlock); @@ -544,7 +565,7 @@ generic); debug (fun() -> Util.msg "compression rate = %d%%\n" ((pb.stringSize * 100) / generic)) -*)) +*) (*** COMPRESSION ***) @@ -553,6 +574,17 @@ (* MUST be >= 2 * blockSize *) let minComprBufSize = 8192 + type compressorState = + { (* Rolling checksum data *) + mutable checksum : int; + mutable cksumOutgoing : char; + (* Buffering *) + mutable offset : int; + mutable toBeSent : int; + mutable length : int; + (* Position in file *) + mutable absolutePos : Uutil.Filesize.t } + (* Compress the file using the algorithm described in the header *) let rsyncCompress sigs infd srcLength showProgress transmit = debug (fun() -> Util.msg "compressing\n"); @@ -567,7 +599,8 @@ (* Measures *) let pb = - { hitHit = 0; hitMiss = 0; nbBlock = 0; nbString = 0; stringSize = 0 } in + { hitHit = 0; hitMiss = 0; missMiss = 0; + nbBlock = 0; nbString = 0; stringSize = 0 } in (* let transmit tokenList = Safelist.iter @@ -596,10 +629,12 @@ let transmit token = queueToken tokenQueue showProgress transmit token in (* Set up the hash table for fast checksum look-up *) - let hashTableLength = ref (hashTableLength sigs) in - let blockTable = hashSig !hashTableLength sigs in - logHash blockTable !hashTableLength; + let hashTableLength = computeHashTableLength sigs in + let blockTable = hashSig hashTableLength sigs in + logHash blockTable hashTableLength; + let filter = sigFilter hashTableLength sigs in + let rec fingerprintMatchRec checksums pos fp i = let i = i - 1 in i < 0 || @@ -623,107 +658,123 @@ in (* Set up the rolling checksum data *) - let checksum = ref 0 in - let cksumOutgoing = ref ' ' in - let cksumTable = ref (Checksum.init blockSize) in + let cksumTable = Checksum.init blockSize in - let absolutePos = ref Uutil.Filesize.zero in + let initialState = + { checksum = 0; cksumOutgoing = ' '; + offset = comprBufSize; toBeSent = comprBufSize; length = comprBufSize; + absolutePos = Uutil.Filesize.zero } + in (* Check the new window position and update the compression buffer if its end has been reached *) - let rec slideWindow newOffset toBeSent length miss : unit Lwt.t = - if newOffset + blockSize <= length then - computeChecksum newOffset toBeSent length miss - else if length = comprBufSize then begin - transmitString toBeSent newOffset >>= (fun () -> - let chunkSize = length - newOffset in + let rec slideWindow st miss : unit Lwt.t = + if st.offset + blockSize <= st.length then + computeChecksum st miss + else if st.length = comprBufSize then begin + transmitString st.toBeSent st.offset >>= (fun () -> + let chunkSize = st.length - st.offset in if chunkSize > 0 then begin assert(comprBufSize >= blockSize); - String.blit comprBuf newOffset comprBuf 0 chunkSize + String.blit comprBuf st.offset comprBuf 0 chunkSize end; - let rem = Uutil.Filesize.sub srcLength !absolutePos in + let rem = Uutil.Filesize.sub srcLength st.absolutePos in let avail = comprBufSize - chunkSize in let l = reallyRead infd comprBuf chunkSize (if rem > comprBufSizeFS then avail else min (Uutil.Filesize.toInt rem) avail) in - absolutePos := - Uutil.Filesize.add !absolutePos (Uutil.Filesize.ofInt l); - let length = chunkSize + l in + st.absolutePos <- + Uutil.Filesize.add st.absolutePos (Uutil.Filesize.ofInt l); + st.offset <- 0; + st.toBeSent <- 0; + st.length <- chunkSize + l; debugToken (fun() -> Util.msg "updating the compression buffer\n"); - debugToken (fun() -> Util.msg "new length = %d bytes\n" length); - slideWindow 0 0 length miss) + debugToken (fun() -> Util.msg "new length = %d bytes\n" st.length); + slideWindow st miss) end else - transmitString toBeSent length >>= (fun () -> + transmitString st.toBeSent st.length >>= (fun () -> transmit EOF) (* Compute the window contents checksum, in a rolling fashion if there was a miss *) - and computeChecksum newOffset toBeSent length miss = + and computeChecksum st miss = + if miss then + rollChecksum st + else begin + let cksum = Checksum.substring comprBuf st.offset blockSize in + st.checksum <- cksum; + st.cksumOutgoing <- String.unsafe_get comprBuf st.offset; + processBlock st + end + + and rollChecksum st = + let ingoingChar = + String.unsafe_get comprBuf (st.offset + blockSize - 1) in let cksum = - if miss then - Checksum.roll !cksumTable !checksum !cksumOutgoing - (String.unsafe_get comprBuf (newOffset + blockSize - 1)) - else - Checksum.substring comprBuf newOffset blockSize - in - checksum := cksum; - cksumOutgoing := String.unsafe_get comprBuf newOffset; - processBlock newOffset toBeSent length cksum + Checksum.roll cksumTable st.checksum st.cksumOutgoing ingoingChar in + st.checksum <- cksum; + st.cksumOutgoing <- String.unsafe_get comprBuf st.offset; + if filterMem filter hashTableLength cksum then + processBlock st + else + miss st (* Try to match the current block with one existing in the old file *) - and processBlock offset toBeSent length checksum = - if Trace.enabled "transfer+" then - debugV (fun() -> Util.msg - "processBlock offset=%d toBeSent=%d length=%d blockSize = %d\n" - offset toBeSent length blockSize); - if Trace.enabled "rsynctoken" then assert - (0 <= toBeSent && toBeSent <= offset && offset + blockSize <= length); - match findEntry blockTable !hashTableLength checksum with - | [] -> miss offset toBeSent length + and processBlock st = + let checksum = st.checksum in + match findEntry blockTable hashTableLength checksum with + | [] -> + pb.missMiss <- pb.missMiss + 1; + miss st | entry -> - let blockNum = findBlock offset checksum entry None in + let blockNum = findBlock st checksum entry None in if blockNum = -1 then begin pb.hitMiss <- pb.hitMiss + 1; - miss offset toBeSent length + miss st end else begin pb.hitHit <- pb.hitHit + 1; - hit offset toBeSent length blockNum + hit st blockNum end (* In the hash table entry, find nodes with the right checksum and match fingerprints *) - and findBlock offset checksum entry fingerprint = + and findBlock st checksum entry fingerprint = match entry, fingerprint with | [], _ -> -1 | (k, cs) :: tl, None when cs = checksum -> - let fingerprint = Digest.substring comprBuf offset blockSize in - findBlock offset checksum entry (Some fingerprint) + let fingerprint = Digest.substring comprBuf st.offset blockSize in + findBlock st checksum entry (Some fingerprint) | (k, cs) :: tl, Some fingerprint when cs = checksum && fingerprintMatch k fingerprint -> k | _ :: tl, _ -> - findBlock offset checksum tl fingerprint + findBlock st checksum tl fingerprint (* Miss : slide the window one character ahead *) - and miss offset toBeSent length = - slideWindow (offset + 1) toBeSent length true + and miss st = + st.offset <- st.offset + 1; + if st.offset + blockSize <= st.length then + rollChecksum st + else + slideWindow st true (* Hit : send the data waiting and a BLOCK token, then slide the window one block ahead *) - and hit offset toBeSent length blockNum = - transmitString toBeSent offset >>= (fun () -> - let sent = offset in - let toBeSent = sent + blockSize in + and hit st blockNum = + transmitString st.toBeSent st.offset >>= (fun () -> + let sent = st.offset in + st.toBeSent <- sent + blockSize; transmit (BLOCK blockNum) >>= (fun () -> - slideWindow (offset + blockSize) toBeSent length false)) + st.offset <- st.offset + blockSize; + slideWindow st false)) in (* Initialization and termination *) - slideWindow comprBufSize comprBufSize comprBufSize false >>= (fun () -> + slideWindow initialState false >>= (fun () -> flushTokenQueue () >>= (fun () -> logMeasures pb; Trace.showTimer timer; Modified: trunk/src/uicommon.ml =================================================================== --- trunk/src/uicommon.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/uicommon.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -458,7 +458,8 @@ let someHostIsCaseInsensitive = someHostIsRunningWindows || someHostRunningOsX in if Prefs.read Globals.fatFilesystem then begin - Prefs.overrideDefault Props.permMask 0o200; + Prefs.overrideDefault Props.permMask 0; + Prefs.overrideDefault Props.dontChmod true; Prefs.overrideDefault Case.caseInsensitiveMode `True; Prefs.overrideDefault Fileinfo.allowSymlinks `False; Prefs.overrideDefault Fileinfo.ignoreInodeNumbers true Modified: trunk/src/unicode.ml =================================================================== --- trunk/src/unicode.ml 2010-03-23 15:07:12 UTC (rev 422) +++ trunk/src/unicode.ml 2010-03-25 14:43:01 UTC (rev 423) @@ -1733,7 +1733,7 @@ let c3 = get s (i + 3) in (c1 lor c2 lor c3) land 0xc0 = 0x80 && let v = c lsl 18 + c1 lsl 12 + c2 lsl 6 + c3 - 0x03c82080 in - v >= 0x10000 && v < 0x10ffff && + v >= 0x10000 && v <= 0x10ffff && scan s (i + 4) l end From vouillon at seas.upenn.edu Fri Mar 26 10:24:04 2010 From: vouillon at seas.upenn.edu (vouillon@seas.upenn.edu) Date: Fri, 26 Mar 2010 10:24:04 -0400 Subject: [Unison-hackers] [unison-svn] r424 - in trunk: doc src Message-ID: <201003261424.o2QEO4jJ017610@yaws.seas.upenn.edu> Author: vouillon Date: 2010-03-26 10:24:04 -0400 (Fri, 26 Mar 2010) New Revision: 424 Modified: trunk/doc/unison-manual.tex trunk/src/RECENTNEWS trunk/src/globals.ml trunk/src/globals.mli trunk/src/mkProjectInfo.ml trunk/src/pred.ml trunk/src/recon.ml trunk/src/update.ml Log: * Added "BelowPath" patterns, that match a path as well as all paths below (convenient to use with no{deletion,update,creation}partial preferences) * Always check archive case sensivity mode before update detection, even when the archive is already cached in memory, in case the profile has been changed without restarting Unison. Modified: trunk/doc/unison-manual.tex =================================================================== --- trunk/doc/unison-manual.tex 2010-03-25 14:43:01 UTC (rev 423) +++ trunk/doc/unison-manual.tex 2010-03-26 14:24:04 UTC (rev 424) @@ -1838,15 +1838,19 @@ \begin{alltt} Regex \ARG{regexp} \end{alltt} -For convenience, two other styles of pattern are also recognized: +For convenience, three other styles of pattern are also recognized: \begin{alltt} Name \ARG{name} \end{alltt} -matches any path in which the last component matches \ARG{name}, while +matches any path in which the last component matches \ARG{name}, \begin{alltt} Path \ARG{path} \end{alltt} -matches exactly the path \ARG{path}. +matches exactly the path \ARG{path}, and +\begin{alltt} + BelowPath \ARG{path} +\end{alltt} +matches the path \ARG{path} and any path below. % The \ARG{name} and \ARG{path} arguments of the latter forms of patterns are {\em not} regular expressions. Instead, Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2010-03-25 14:43:01 UTC (rev 423) +++ trunk/src/RECENTNEWS 2010-03-26 14:24:04 UTC (rev 424) @@ -1,3 +1,12 @@ +CHANGES FROM VERSION 2.40.15 + +* Added "BelowPath" patterns, that match a path as well as all paths below + (convenient to use with no{deletion,update,creation}partial preferences) +* Always check archive case sensivity mode before update detection, + even when the archive is already cached in memory, in case the + profile has been changed without restarting Unison. + +------------------------------- CHANGES FROM VERSION 2.40.1 * Windows: more fixes for compilation with MSVC Modified: trunk/src/globals.ml =================================================================== --- trunk/src/globals.ml 2010-03-25 14:43:01 UTC (rev 423) +++ trunk/src/globals.ml 2010-03-26 14:24:04 UTC (rev 424) @@ -86,6 +86,8 @@ let rootsInCanonicalOrder() = Common.sortRoots (!theroots) +let localRoot () = List.hd (rootsInCanonicalOrder ()) + let reorderCanonicalListToUsersOrder l = if rootsList() = rootsInCanonicalOrder() then l else Safelist.rev l Modified: trunk/src/globals.mli =================================================================== --- trunk/src/globals.mli 2010-03-25 14:43:01 UTC (rev 423) +++ trunk/src/globals.mli 2010-03-26 14:24:04 UTC (rev 424) @@ -27,6 +27,9 @@ (* comes first *) val rootsInCanonicalOrder : unit -> Common.root list +(* a local root *) +val localRoot : unit -> Common.root + (* Run a command on all roots *) val allRootsIter : (Common.root -> unit Lwt.t) -> unit Lwt.t Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2010-03-25 14:43:01 UTC (rev 423) +++ trunk/src/mkProjectInfo.ml 2010-03-26 14:24:04 UTC (rev 424) @@ -42,7 +42,7 @@ (* ---------------------------------------------------------------------- *) (* You shouldn't need to edit below. *) -let revisionString = "$Rev: 410$";; +let revisionString = "$Rev: 424$";; (* BCP (1/10): This bit was added to help with getting Unison via bazaar, but it was never used much and I'm not confident it's working. I'll comment it out @@ -102,3 +102,5 @@ + + Modified: trunk/src/pred.ml =================================================================== --- trunk/src/pred.ml 2010-03-25 14:43:01 UTC (rev 423) +++ trunk/src/pred.ml 2010-03-26 14:24:04 UTC (rev 424) @@ -36,7 +36,7 @@ let error_msg s = Printf.sprintf "bad pattern: %s\n\ A pattern must be introduced by one of the following keywords:\n\ - \032 Name, Path, or Regex." s + \032 Name, Path, BelowPath or Regex." s (* [select str [(p1, f1), ..., (pN, fN)] fO]: (roughly) *) (* match str with *) @@ -80,6 +80,14 @@ ^ "'Path' patterns may not begin with a slash; " ^ "only relative paths are allowed.")); Rx.globx str); + ("BelowPath ", fun str -> + if str<>"" && str.[0] = '/' then + raise (Prefs.IllegalValue + ("Malformed pattern: " + ^ "\"" ^ p ^ "\"\n" + ^ "'BelowPath' patterns may not begin with a slash; " + ^ "only relative paths are allowed.")); + Rx.seq [Rx.globx str; Rx.rx "(/.*)?"]); ("Regex ", Rx.rx)] (fun str -> raise (Prefs.IllegalValue (error_msg p))) with Modified: trunk/src/recon.ml =================================================================== --- trunk/src/recon.ml 2010-03-25 14:43:01 UTC (rev 423) +++ trunk/src/recon.ml 2010-03-26 14:24:04 UTC (rev 424) @@ -187,7 +187,8 @@ \\texttt{nodeletionpartial = \\ARG{PATHSPEC} -> \\ARG{root}} prevents \ Unison from performing any file deletion in \\ARG{PATHSPEC} \ on root \\ARG{root} (see \\sectionref{pathspec}{Path Specification} \ - for more information).") + for more information). It is recommended to use {\\tt BelowPath} \ + patterns when selecting a directory and all its contents.") let noUpdatePartial = Pred.create "noupdatepartial" ~advanced:true @@ -195,7 +196,9 @@ \\texttt{noupdatepartial = \\ARG{PATHSPEC} -> \\ARG{root}} prevents \ Unison from performing any file update or deletion in \ \\ARG{PATHSPEC} on root \\ARG{root} (see \ - \\sectionref{pathspec}{Path Specification} for more information).") + \\sectionref{pathspec}{Path Specification} for more information). \ + It is recommended to use {\\tt BelowPath} \ + patterns when selecting a directory and all its contents.") let noCreationPartial = Pred.create "nocreationpartial" ~advanced:true @@ -203,7 +206,9 @@ \\texttt{nocreationpartial = \\ARG{PATHSPEC} -> \\ARG{root}} prevents \ Unison from performing any file creation in \\ARG{PATHSPEC} \ on root \\ARG{root} (see \\sectionref{pathspec}{Path Specification} \ - for more information).") + for more information). \ + It is recommended to use {\\tt BelowPath} \ + patterns when selecting a directory and all its contents.") let partialCancelPref actionKind = match actionKind with Modified: trunk/src/update.ml =================================================================== --- trunk/src/update.ml 2010-03-25 14:43:01 UTC (rev 423) +++ trunk/src/update.ml 2010-03-26 14:24:04 UTC (rev 424) @@ -273,77 +273,7 @@ Os.myCanonicalHostName, System.file_exists (Os.fileInUnisonDir name))) -let compatibleCaseMode magic = - if magic = "" then `YES (* Newly created archive *) else - try - let archMode = String.sub magic 0 (String.index magic '\000') in - let curMode = (Case.ops ())#modeDesc in - if curMode <> archMode then - `NO (archMode = Case.caseSensitiveModeDesc, curMode, archMode) - else - `YES - with Not_found -> - (* Legacy format. Cannot be Unicode case insensitive. *) - if (Case.ops ())#mode = Case.UnicodeInsensitive then - let curMode = (Case.ops ())#modeDesc in - `NO (false, curMode, "some non-Unicode") - else - `YES -(* HACK: we use this as just a flag. Should delete this when Unison minor - version is bumped. *) - -let rootCanMakeCaseSensitive - = Remote.registerRootCmd "canMakeCaseSensitive" (fun _ -> Lwt.return ()) - -let didMakeCaseSensitive () = - Globals.allRootsMap - (fun r -> Remote.commandAvailable r "canMakeCaseSensitive") >>= fun l -> - Lwt.return (List.for_all (fun x -> x) l) - - -let checkArchiveCaseSensitivity l = - let error curMode archMode = - (* We cannot compute the archive name locally as it - currently depends on the os type *) - Globals.allRootsMap - (fun r -> archiveNameOnRoot r MainArch) >>= fun names -> - let l = - List.map - (fun (name, host, _) -> - Format.sprintf " archive %s on host %s" name host) - names - in - Lwt.fail - (Util.Fatal - (String.concat "\n" - ("Warning: incompatible case sensitivity settings." :: - Format.sprintf "Unison is currently in %s mode," curMode :: - Format.sprintf - "while the archives were created in %s mode." archMode :: - "You should either change Unison's setup or delete" :: - "the following archives from the .unison directories:" :: - l @ - ["(or invoke Unison once with -ignorearchives flag)."; - "Then, try again."]))) - in - match l with - Some (_, magic) :: _ -> - begin match compatibleCaseMode magic with - `NO (conv, curMode, archMode) -> - begin if conv then - didMakeCaseSensitive () - else - Lwt.return false - end >>= fun converted -> - if converted then Lwt.return () else - error curMode archMode - | `YES -> - Lwt.return () - end - | _ -> - Lwt.return () - (*****************************************************************************) (* LOADING AND SAVING ARCHIVES *) (*****************************************************************************) @@ -603,6 +533,13 @@ (* ARCHIVE CASE CONVERSION *) (*****************************************************************************) +(* Stamp for marking unchange directories *) +let dirStampKey : Props.dirChangedStamp Proplist.key = + Proplist.register "unchanged directory stamp" + +(* Property containing a description of the archive case sensitivity mode *) +let caseKey : string Proplist.key = Proplist.register "case mode" + (* Turn a case sensitive archive into a case insensitive archive. Directory children are resorted and duplicates are removed. *) @@ -613,8 +550,10 @@ let children = NameMap.fold (fun nm ch chs -> - if NameMap.mem nm chs then dups := nm :: !dups; - NameMap.add nm (makeCaseSensitiveRec ch) chs) + if Name.badEncoding nm then chs else begin + if NameMap.mem nm chs then dups := nm :: !dups; + NameMap.add nm (makeCaseSensitiveRec ch) chs + end) children NameMap.empty in let children = @@ -624,8 +563,81 @@ arch let makeCaseSensitive thisRoot = - setArchiveLocal thisRoot (makeCaseSensitiveRec (getArchive thisRoot)) + setArchiveLocal thisRoot (makeCaseSensitiveRec (getArchive thisRoot)); + (* We need to recheck all directories, so we mark them possibly changed *) + setArchivePropsLocal thisRoot + (Proplist.add dirStampKey (Props.freshDirStamp ()) + (Proplist.add caseKey (Case.ops ())#modeDesc + (getArchiveProps thisRoot))) +let makeCaseSensitiveOnRoot = + Remote.registerRootCmd "makeCaseSensitive" + (fun (fspath, ()) -> + makeCaseSensitive (thisRootsGlobalName fspath); + Lwt.return ()) + +let canMakeCaseSensitive () = + Globals.allRootsMap (fun r -> Remote.commandAvailable r "makeCaseSensitive") + >>= fun l -> + Lwt.return (List.for_all (fun x -> x) l) + +(****) + +(* Get the archive case sensitivity mode from the archive magic. *) +let archiveMode magic = + let currentMode = (Case.ops ())#modeDesc in + if magic = "" then currentMode (* Newly created archive *) else + try + String.sub magic 0 (String.index magic '\000') + with Not_found -> + (* Legacy format. Cannot be Unicode case insensitive. *) + if (Case.ops ())#mode = Case.UnicodeInsensitive then + "some non-Unicode" + else + currentMode + +let checkArchiveCaseSensitivity l = + let root = thisRootsGlobalName (snd (Globals.localRoot ())) in + let curMode = (Case.ops ())#modeDesc in + let archMode = Proplist.find caseKey (getArchiveProps root) in + if curMode = archMode then + Lwt.return () + else begin + begin if archMode = Case.caseSensitiveModeDesc then + canMakeCaseSensitive () + else + Lwt.return false + end >>= fun convert -> + if convert then + Globals.allRootsIter (fun r -> makeCaseSensitiveOnRoot r ()) + else begin + (* We cannot compute the archive name locally as it + currently depends on the os type *) + Globals.allRootsMap + (fun r -> archiveNameOnRoot r MainArch) >>= fun names -> + let l = + List.map + (fun (name, host, _) -> + Format.sprintf " archive %s on host %s" name host) + names + in + Lwt.fail + (Util.Fatal + (String.concat "\n" + ("Warning: incompatible case sensitivity settings." :: + Format.sprintf "Unison is currently in %s mode," curMode :: + Format.sprintf + "while the archives were created in %s mode." archMode :: + "You should either change Unison's setup or delete" :: + "the following archives from the .unison directories:" :: + l @ + ["(or invoke Unison once with -ignorearchives flag)."; + "Then, try again."]))) + end + end + +(****) + let rec populateCacheFromArchiveRec path arch = match arch with ArchiveDir (_, children) -> @@ -658,21 +670,19 @@ ^ "command-line use.") let setArchiveData thisRoot fspath (arch, hash, magic, properties) info = + let archMode = archiveMode magic in + let curMode = (Case.ops ())#modeDesc in + let properties = Proplist.add caseKey archMode properties in setArchiveLocal thisRoot arch; setArchivePropsLocal thisRoot properties; Hashtbl.replace archiveInfoCache thisRoot info; - begin match compatibleCaseMode magic with - `YES -> - () - | `NO (conv, _, _) -> - if conv then makeCaseSensitive thisRoot; - populateCacheFromArchive fspath arch - end; + if archMode <> curMode then populateCacheFromArchive fspath arch; Lwt.return (Some (hash, magic)) let clearArchiveData thisRoot = setArchiveLocal thisRoot NoArchive; - setArchivePropsLocal thisRoot Proplist.empty; + setArchivePropsLocal thisRoot + (Proplist.add caseKey (Case.ops ())#modeDesc Proplist.empty); Hashtbl.remove archiveInfoCache thisRoot; Lwt.return (Some (0, "")) @@ -1044,12 +1054,6 @@ Remote.registerRootCmd "translatePath" (fun (fspath, path) -> Lwt.return (translatePathLocal fspath path)) -let isDir fspath path = - let fullFspath = Fspath.concat fspath path in - try - (Fs.stat fullFspath).Unix.LargeFile.st_kind = Unix.S_DIR - with Unix.Unix_error _ -> false - (*********************************************************************** MOUNT POINTS ************************************************************************) @@ -1721,8 +1725,6 @@ let predKey : (string * string list) list Proplist.key = Proplist.register "update predicates" let rsrcKey : bool Proplist.key = Proplist.register "rsrc pref" -let dirStampKey : Props.dirChangedStamp Proplist.key = - Proplist.register "unchanged directory stamp" let checkNoUpdatePredicateChange thisRoot = let props = getArchiveProps thisRoot in @@ -2304,7 +2306,7 @@ sizeOne children let updateSize path ui = - let rootLocal = List.hd (Globals.rootsInCanonicalOrder ()) in + let rootLocal = Globals.localRoot () in let fspathLocal = snd rootLocal in let root = thisRootsGlobalName fspathLocal in let archive = getArchive root in From vouillon at seas.upenn.edu Fri Mar 26 10:49:43 2010 From: vouillon at seas.upenn.edu (vouillon@seas.upenn.edu) Date: Fri, 26 Mar 2010 10:49:43 -0400 Subject: [Unison-hackers] [unison-svn] r425 - in trunk/src: . system Message-ID: <201003261449.o2QEnhuF018404@yaws.seas.upenn.edu> Author: vouillon Date: 2010-03-26 10:49:42 -0400 (Fri, 26 Mar 2010) New Revision: 425 Modified: trunk/src/RECENTNEWS trunk/src/mkProjectInfo.ml trunk/src/system/system_win.ml trunk/src/unicode.mli Log: * Fix Windows compilation bug introduced in previous commit Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2010-03-26 14:24:04 UTC (rev 424) +++ trunk/src/RECENTNEWS 2010-03-26 14:49:42 UTC (rev 425) @@ -1,3 +1,8 @@ +CHANGES FROM VERSION 2.40.16 + +* Fix Windows compilation bug introduced in previous commit + +------------------------------- CHANGES FROM VERSION 2.40.15 * Added "BelowPath" patterns, that match a path as well as all paths below Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2010-03-26 14:24:04 UTC (rev 424) +++ trunk/src/mkProjectInfo.ml 2010-03-26 14:49:42 UTC (rev 425) @@ -42,7 +42,7 @@ (* ---------------------------------------------------------------------- *) (* You shouldn't need to edit below. *) -let revisionString = "$Rev: 424$";; +let revisionString = "$Rev: 425$";; (* BCP (1/10): This bit was added to help with getting Unison via bazaar, but it was never used much and I'm not confident it's working. I'll comment it out @@ -104,3 +104,4 @@ + Modified: trunk/src/system/system_win.ml =================================================================== --- trunk/src/system/system_win.ml 2010-03-26 14:24:04 UTC (rev 424) +++ trunk/src/system/system_win.ml 2010-03-26 14:49:42 UTC (rev 425) @@ -65,7 +65,7 @@ Unicode.to_utf_16 s with Unicode.Invalid -> raise (Sys_error - (Format.sprintf "The text '%' is not encoded in Unicode" s)) + (Format.sprintf "The text '%s' is not encoded in Unicode" s)) let path8 = Unicode.from_utf_16(*_filename*) let path16 f = try Unicode.to_utf_16(*_filename*) f with Unicode.Invalid -> encodingError f Modified: trunk/src/unicode.mli =================================================================== --- trunk/src/unicode.mli 2010-03-26 14:24:04 UTC (rev 424) +++ trunk/src/unicode.mli 2010-03-26 14:49:42 UTC (rev 425) @@ -1,6 +1,7 @@ (* Unison file synchronizer: src/unicode.mli *) (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) +exception Invalid (* Case-insensitive comparison. If two strings are equal according to Mac OS X (Darwin, actually, but the algorithm has hopefully From vouillon at seas.upenn.edu Mon Mar 29 18:03:43 2010 From: vouillon at seas.upenn.edu (vouillon@seas.upenn.edu) Date: Mon, 29 Mar 2010 18:03:43 -0400 Subject: [Unison-hackers] [unison-svn] r426 - trunk/src Message-ID: <201003292203.o2TM3hp4025843@yaws.seas.upenn.edu> Author: vouillon Date: 2010-03-29 18:03:43 -0400 (Mon, 29 Mar 2010) New Revision: 426 Modified: trunk/src/RECENTNEWS trunk/src/mkProjectInfo.ml trunk/src/update.ml Log: * Fix Not_found error when no archives are found (recently introduced bug). Modified: trunk/src/RECENTNEWS =================================================================== --- trunk/src/RECENTNEWS 2010-03-26 14:49:42 UTC (rev 425) +++ trunk/src/RECENTNEWS 2010-03-29 22:03:43 UTC (rev 426) @@ -1,5 +1,10 @@ CHANGES FROM VERSION 2.40.16 +* Fix Not_found error when no archives are found (recently introduced bug). + +------------------------------- +CHANGES FROM VERSION 2.40.16 + * Fix Windows compilation bug introduced in previous commit ------------------------------- Modified: trunk/src/mkProjectInfo.ml =================================================================== --- trunk/src/mkProjectInfo.ml 2010-03-26 14:49:42 UTC (rev 425) +++ trunk/src/mkProjectInfo.ml 2010-03-29 22:03:43 UTC (rev 426) @@ -105,3 +105,4 @@ + Modified: trunk/src/update.ml =================================================================== --- trunk/src/update.ml 2010-03-26 14:49:42 UTC (rev 425) +++ trunk/src/update.ml 2010-03-29 22:03:43 UTC (rev 426) @@ -748,7 +748,7 @@ ^ "after loading it.") (* For all roots (local or remote), load the archive and cache *) -let loadArchives (optimistic: bool) : bool Lwt.t = +let loadArchives (optimistic: bool) = Globals.allRootsMap (fun r -> loadArchiveOnRoot r optimistic) >>= (fun checksums -> let identicals = archivesIdentical checksums in @@ -770,11 +770,7 @@ ^ " arXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n" ^ " where the X's are a hexidecimal number .\n" ^ " c) Run unison again to synchronize from scratch.\n")); - checkArchiveCaseSensitivity checksums >>= fun () -> - if Prefs.read dumpArchives then - Globals.allRootsMap (fun r -> dumpArchiveOnRoot r ()) - >>= (fun _ -> Lwt.return identicals) - else Lwt.return identicals) + Lwt.return (identicals, checksums)) (*****************************************************************************) @@ -1814,17 +1810,24 @@ let findUpdatesOnPaths pathList = Lwt_unix.run - (loadArchives true >>= (fun ok -> - begin if ok then Lwt.return () else begin + (loadArchives true >>= (fun (ok, checksums) -> + begin if ok then Lwt.return checksums else begin lockArchives () >>= (fun () -> Remote.Thread.unwindProtect (fun () -> doArchiveCrashRecovery () >>= (fun () -> loadArchives false)) (fun _ -> - unlockArchives ()) >>= (fun _ -> - unlockArchives ())) - end end >>= (fun () -> + unlockArchives ()) >>= (fun (_, checksums) -> + unlockArchives () >>= fun () -> + Lwt.return checksums)) + end end >>= (fun checksums -> + checkArchiveCaseSensitivity checksums >>= fun () -> + begin if Prefs.read dumpArchives then + Globals.allRootsIter (fun r -> dumpArchiveOnRoot r ()) + else + Lwt.return () + end >>= fun () -> let t = Trace.startTimer "Collecting changes" in Globals.allRootsMapWithWaitingAction (fun r -> debug (fun() -> Util.msg "findOnRoot %s\n" (root2string r));