Revision: 6746
http://skim-app.svn.sourceforge.net/skim-app/?rev=6746&view=rev
Author: hofman
Date: 2010-08-27 17:09:34 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
support drop on whole transition style table to set all transitions to the same
value
Modified Paths:
--------------
trunk/SKPresentationOptionsSheetController.m
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2010-08-27 14:29:42 UTC
(rev 6745)
+++ trunk/SKPresentationOptionsSheetController.m 2010-08-27 17:09:34 UTC
(rev 6746)
@@ -59,6 +59,7 @@
#define TRANSITIONSTYLE_KEY @"transitionStyle"
#define DURATION_KEY @"duration"
#define SHOULDRESTRICT_KEY @"shouldRestrict"
+#define PROPERTIES_KEY @"properties"
#define CONTENTOBJECT_BINDINGNAME @"contentObject"
static NSString *SKTransitionPboardType = @"SKTransitionPboardType";
@@ -302,7 +303,7 @@
- (NSArray *)pageTransitions {
if (separate && [transitions count])
- return [transitions valueForKey:@"properties"];
+ return [transitions valueForKey:PROPERTIES_KEY];
else
return nil;
}
@@ -378,16 +379,21 @@
}
- (NSDragOperation)tableView:(NSTableView *)tv validateDrop:(id <
NSDraggingInfo >)info proposedRow:(NSInteger)row
proposedDropOperation:(NSTableViewDropOperation)operation {
- if (row >= 0 && row < (NSInteger)[transitions count] && operation ==
NSTableViewDropOn &&
- nil != [[info draggingPasteboard] availableTypeFromArray:[NSArray
arrayWithObject:SKTransitionPboardType]])
+ if (nil != [[info draggingPasteboard] availableTypeFromArray:[NSArray
arrayWithObject:SKTransitionPboardType]]) {
+ if (operation == NSTableViewDropAbove)
+ [tv setDropRow:-1 dropOperation:NSTableViewDropOn];
return NSDragOperationEvery;
+ }
return NSDragOperationNone;
}
- (BOOL)tableView:(NSTableView *)tv acceptDrop:(id < NSDraggingInfo >)info
row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation {
NSPasteboard *pboard = [info draggingPasteboard];
- if ([pboard availableTypeFromArray:[NSArray
arrayWithObject:SKTransitionPboardType]]) {
- [[transitions objectAtIndex:row] setProperties:[pboard
propertyListForType:SKTransitionPboardType]];
+ if (operation == NSTableViewDropOn && [pboard
availableTypeFromArray:[NSArray arrayWithObject:SKTransitionPboardType]]) {
+ if (row == -1)
+ [transitions setValue:[pboard
propertyListForType:SKTransitionPboardType] forKey:PROPERTIES_KEY];
+ else
+ [[transitions objectAtIndex:row] setProperties:[pboard
propertyListForType:SKTransitionPboardType]];
return YES;
}
return NO;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit