Revision: 14522
http://sourceforge.net/p/skim-app/code/14522
Author: hofman
Date: 2024-10-07 09:40:30 +0000 (Mon, 07 Oct 2024)
Log Message:
-----------
rename property
Modified Paths:
--------------
trunk/SKPresentationOptionsSheetController.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2024-10-05 23:03:07 UTC
(rev 14521)
+++ trunk/SKPresentationOptionsSheetController.m 2024-10-07 09:40:30 UTC
(rev 14522)
@@ -63,7 +63,7 @@
#define DURATION_KEY @"duration"
#define SHOULDRESTRICT_KEY @"shouldRestrict"
#define PROPERTIES_KEY @"properties"
-#define TRANSITION_KEY @"transition"
+#define INFO_KEY @"info"
#define SEPARATE_KEY @"separate"
#define TRANSITION_KEY @"transition"
#define TRANSITIONS_KEY @"transitions"
@@ -163,7 +163,7 @@
SKTransitionController *transitionController = [controller
transitionControllerCreating:NO];
SKTransitionInfo *info = [transitionController transition];
if (info)
- [transition setTransition:info];
+ [transition setInfo:info];
[self startObservingTransitions:@[transition]];
// collapse the table, it is already hidden
@@ -598,9 +598,9 @@
if ([infos count] > 0) {
SKTransitionInfo *info = [infos objectAtIndex:0];
if (row == -1)
- [transitions setValue:info forKey:TRANSITION_KEY];
+ [transitions setValue:info forKey:INFO_KEY];
else
- [(SKTransitionInfo *)[transitions objectAtIndex:row]
setTransition:info];
+ [(SKTransitionInfo *)[transitions objectAtIndex:row]
setInfo:info];
return YES;
}
}
@@ -633,7 +633,7 @@
- (void)tableView:(NSTableView *)tv pasteFromPasteboard:(NSPasteboard *)pboard
{
NSArray *infos = [pboard readObjectsForClasses:@[[SKTransitionInfo class]]
options:@{}];
if ([infos count] > 0)
- [[transitions objectsAtIndexes:[tableView selectedRowIndexes]]
setValue:[infos objectAtIndex:0] forKey:TRANSITION_KEY];
+ [[transitions objectsAtIndexes:[tableView selectedRowIndexes]]
setValue:[infos objectAtIndex:0] forKey:INFO_KEY];
}
- (BOOL)tableView:(NSTableView *)tv canPasteFromPasteboard:(NSPasteboard
*)pboard {
@@ -643,7 +643,7 @@
- (void)tableView:(NSTableView *)tv deleteRowsWithIndexes:(NSIndexSet
*)rowIndexes {
NSArray *selTransitions = [transitions objectsAtIndexes:rowIndexes];
SKTransitionInfo *empty = [[SKTransitionInfo alloc] init];
- [selTransitions setValue:empty forKey:TRANSITION_KEY];
+ [selTransitions setValue:empty forKey:INFO_KEY];
}
- (void)tableViewQuickLookPreviewItems:(NSTableView *)tv {
Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h 2024-10-05 23:03:07 UTC (rev 14521)
+++ trunk/SKTransitionInfo.h 2024-10-07 09:40:30 UTC (rev 14522)
@@ -59,7 +59,7 @@
@property (nonatomic) CGFloat duration;
@property (nonatomic) BOOL shouldRestrict;
-@property (nonatomic, copy) SKTransitionInfo *transition;
+@property (nonatomic, copy) SKTransitionInfo *info;
@property (nonatomic, nullable, readonly) NSString *styleName;
@property (nonatomic, nullable, readonly) NSString *localizedStyleName;
Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m 2024-10-05 23:03:07 UTC (rev 14521)
+++ trunk/SKTransitionInfo.m 2024-10-07 09:40:30 UTC (rev 14522)
@@ -51,7 +51,7 @@
@implementation SKTransitionInfo
@synthesize style, duration, shouldRestrict;
-@dynamic properties, transition, styleName, localizedStyleName, label;
+@dynamic properties, info, styleName, localizedStyleName, label;
static NSDictionary *oldStyleNames = nil;
@@ -151,14 +151,14 @@
return [NSString stringWithFormat:@"<%@ %p> %@", [self class], self, [self
properties]];
}
-- (SKTransitionInfo *)transition {
+- (SKTransitionInfo *)info {
return self;
}
-- (void)setTransition:(SKTransitionInfo *)transition {
- [self setStyle:[transition style]];
- [self setDuration:[transition duration]];
- [self setShouldRestrict:[transition shouldRestrict]];
+- (void)setInfo:(SKTransitionInfo *)info {
+ [self setStyle:[info style]];
+ [self setDuration:[info duration]];
+ [self setShouldRestrict:[info shouldRestrict]];
}
- (NSDictionary *)properties {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
