Revision: 14514
http://sourceforge.net/p/skim-app/code/14514
Author: hofman
Date: 2024-10-04 14:23:21 +0000 (Fri, 04 Oct 2024)
Log Message:
-----------
rename properties
Modified Paths:
--------------
trunk/Base.lproj/TransitionSheet.xib
trunk/SKMainWindowController.m
trunk/SKPresentationOptionsSheetController.m
trunk/SKPresentationView.m
trunk/SKTransitionController.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
Modified: trunk/Base.lproj/TransitionSheet.xib
===================================================================
--- trunk/Base.lproj/TransitionSheet.xib 2024-10-03 22:38:52 UTC (rev
14513)
+++ trunk/Base.lproj/TransitionSheet.xib 2024-10-04 14:23:21 UTC (rev
14514)
@@ -113,7 +113,7 @@
<connections>
<accessibilityConnection
property="link" destination="30" id="458"/>
<accessibilityConnection
property="title" destination="9" id="49"/>
- <binding destination="127"
name="selectedTag" keyPath="selection.transitionStyle" id="505">
+ <binding destination="127"
name="selectedTag" keyPath="selection.style" id="1Ft-0h-GCx">
<dictionary key="options">
<real
key="NSMultipleValuesPlaceholder" value="-1"/>
<real
key="NSNoSelectionPlaceholder" value="-1"/>
@@ -349,9 +349,9 @@
<color
key="backgroundColor" name="controlColor" catalog="System"
colorSpace="catalog"/>
</textFieldCell>
<connections>
+ <binding
destination="Ak4-gE-KVg" name="fontBold" keyPath="objectValue.style"
id="sKA-nC-zOf"/>
<binding
destination="Ak4-gE-KVg" name="value" keyPath="objectValue.label"
id="QOb-NM-lZB"/>
- <binding
destination="Ak4-gE-KVg" name="fontBold" keyPath="objectValue.transitionStyle"
id="HAc-6M-JP4"/>
- <binding
destination="Ak4-gE-KVg" name="toolTip"
keyPath="objectValue.localizedTransitionName" id="PlU-bc-Rc8"/>
+ <binding
destination="Ak4-gE-KVg" name="toolTip"
keyPath="objectValue.localizedStyleName" id="Fex-pB-B9I"/>
</connections>
</textField>
</subviews>
@@ -396,7 +396,7 @@
</buttonCell>
<connections>
<action selector="preview:" target="-2"
id="cKe-lQ-LNg"/>
- <binding destination="127" name="enabled"
keyPath="selection.transitionStyle" id="aa2-Qa-dvg">
+ <binding destination="127" name="enabled"
keyPath="selection.style" id="iz1-g7-7MH">
<dictionary key="options">
<integer key="NSMultipleValuesPlaceholder"
value="0"/>
<integer key="NSNoSelectionPlaceholder"
value="0"/>
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2024-10-03 22:38:52 UTC (rev 14513)
+++ trunk/SKMainWindowController.m 2024-10-04 14:23:21 UTC (rev 14514)
@@ -1435,7 +1435,7 @@
SKTransitionInfo *transition = [transitions transition];
NSArray *pageTransitions = [transitions pageTransitions];
NSMutableDictionary *options = nil;
- if ([transition transitionStyle] != SKNoTransition || [pageTransitions
count]) {
+ if ([transition style] != SKNoTransition || [pageTransitions count]) {
options = [NSMutableDictionary dictionaryWithDictionary:[(transition
?: [[SKTransitionInfo alloc] init]) properties]];
[options setValue:pageTransitions forKey:PAGETRANSITIONS_KEY];
}
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2024-10-03 22:38:52 UTC
(rev 14513)
+++ trunk/SKPresentationOptionsSheetController.m 2024-10-04 14:23:21 UTC
(rev 14514)
@@ -59,7 +59,7 @@
#define IMAGE_COLUMNID @"image"
#define TOIMAGE_COLUMNID @"toImage"
-#define TRANSITIONSTYLE_KEY @"transitionStyle"
+#define STYLE_KEY @"style"
#define DURATION_KEY @"duration"
#define SHOULDRESTRICT_KEY @"shouldRestrict"
#define PROPERTIES_KEY @"properties"
@@ -162,7 +162,7 @@
SKTransitionController *transitionController = [controller
transitionControllerCreating:NO];
SKTransitionInfo *info = [transitionController transition];
if (info) {
- [transition setTransitionStyle:[info transitionStyle]];
+ [transition setStyle:[info style]];
[transition setDuration:[info duration]];
[transition setShouldRestrict:[info shouldRestrict]];
}
@@ -252,7 +252,7 @@
} else if ([arrayController commitEditing]) {
// don't make changes when nothing was changed
if ([undoManager canUndo]) {
- SKTransitionController *transitionController = [controller
transitionControllerCreating:separate || [transition transitionStyle] !=
SKNoTransition];
+ SKTransitionController *transitionController = [controller
transitionControllerCreating:separate || [transition style] != SKNoTransition];
if (transitionController) {
[transitionController setTransition:transition];
[transitionController setPageTransitions:[self
pageTransitions]];
@@ -279,7 +279,7 @@
} else {
idx = 0;
}
- if ([info transitionStyle] == SKNoTransition)
+ if ([info style] == SKNoTransition)
return;
NSRect rect = [[[self window] screen] frame];
@@ -329,7 +329,7 @@
[previewView setPage:[[controller pdfDocument] pageAtIndex:idx]];
[[previewView transitionController] setTransition:info];
- [previewWindow setTitle:[info localizedTransitionName]];
+ [previewWindow setTitle:[info localizedStyleName]];
CGFloat titleHeight = NSHeight([previewWindow frame]) -
NSHeight([previewWindow contentLayoutRect]);
rect.size.height += titleHeight - 28.0;
[previewWindow setFrame:rect display:NO];
@@ -496,7 +496,7 @@
- (void)startObservingTransitions:(NSArray *)infos {
for (SKTransitionInfo *info in infos) {
- [info addObserver:self forKeyPath:TRANSITIONSTYLE_KEY
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:&SKTransitionPropertiesObservationContext];
+ [info addObserver:self forKeyPath:STYLE_KEY
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:&SKTransitionPropertiesObservationContext];
[info addObserver:self forKeyPath:DURATION_KEY
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:&SKTransitionPropertiesObservationContext];
[info addObserver:self forKeyPath:SHOULDRESTRICT_KEY
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:&SKTransitionPropertiesObservationContext];
}
@@ -504,7 +504,7 @@
- (void)stopObservingTransitions:(NSArray *)infos {
for (SKTransitionInfo *info in infos) {
- [info removeObserver:self forKeyPath:TRANSITIONSTYLE_KEY
context:&SKTransitionPropertiesObservationContext];
+ [info removeObserver:self forKeyPath:STYLE_KEY
context:&SKTransitionPropertiesObservationContext];
[info removeObserver:self forKeyPath:DURATION_KEY
context:&SKTransitionPropertiesObservationContext];
[info removeObserver:self forKeyPath:SHOULDRESTRICT_KEY
context:&SKTransitionPropertiesObservationContext];
}
Modified: trunk/SKPresentationView.m
===================================================================
--- trunk/SKPresentationView.m 2024-10-03 22:38:52 UTC (rev 14513)
+++ trunk/SKPresentationView.m 2024-10-04 14:23:21 UTC (rev 14514)
@@ -188,7 +188,7 @@
- (BOOL)animateTransitionFromIndex:(NSUInteger)idx toPage:(PDFPage *)toPage
atIndex:(NSUInteger)toIdx {
if ([transitionController pageTransitions] == nil &&
- ([[transitionController transition] transitionStyle] == SKNoTransition
|| equalStrings([page label], [toPage label])))
+ ([[transitionController transition] style] == SKNoTransition ||
equalStrings([page label], [toPage label])))
return NO;
[transitionController animateForRect:[self pageRect] from:idx to:toIdx
change:^{
[self setPage:toPage];
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2024-10-03 22:38:52 UTC (rev 14513)
+++ trunk/SKTransitionController.m 2024-10-04 14:23:21 UTC (rev 14514)
@@ -182,7 +182,7 @@
if (fromIndex != NSNotFound && toIndex != NSNotFound && idx <
[pageTransitions count])
currentTransition = [[SKTransitionInfo alloc]
initWithProperties:[pageTransitions objectAtIndex:idx]];
- if ([currentTransition transitionStyle] == SKNoTransition) {
+ if ([currentTransition style] == SKNoTransition) {
change();
@@ -200,7 +200,7 @@
CGRect cgRect =
CGRectIntegral(scaleRect(NSIntersectionRect(NSUnionRect(rect, toRect), bounds),
imageScale));
CGRect cgBounds = scaleRect(bounds, imageScale);
CGRect extent = [currentTransition shouldRestrict] ? cgRect : cgBounds;
- NSString *filterName = [currentTransition transitionName];
+ NSString *filterName = [currentTransition styleName];
CGFloat scale = shouldScale ? imageScale * NSHeight(bounds) /
NSHeight([[[view window] screen] frame]) : imageScale;
CIFilter *transitionFilter = [self transitionFilterWithName:filterName
rect:cgRect
Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h 2024-10-03 22:38:52 UTC (rev 14513)
+++ trunk/SKTransitionInfo.h 2024-10-04 14:23:21 UTC (rev 14514)
@@ -48,7 +48,7 @@
};
@interface SKTransitionInfo : NSObject <NSPasteboardReading,
NSPasteboardWriting> {
- SKTransitionStyle transitionStyle;
+ SKTransitionStyle style;
CGFloat duration;
BOOL shouldRestrict;
}
@@ -57,16 +57,16 @@
@property (nonatomic, copy) NSDictionary *properties;
-@property (nonatomic) SKTransitionStyle transitionStyle;
+@property (nonatomic) SKTransitionStyle style;
@property (nonatomic) CGFloat duration;
@property (nonatomic) BOOL shouldRestrict;
-@property (nonatomic, nullable, readonly) NSString *transitionName;
-@property (nonatomic, nullable, readonly) NSString *localizedTransitionName;
+@property (nonatomic, nullable, readonly) NSString *styleName;
+@property (nonatomic, nullable, readonly) NSString *localizedStyleName;
@property (nonatomic, nullable, readonly) NSString *label;
-+ (void)enumerateTransitionsUsingBlock:(void (^)(SKTransitionStyle style,
NSString *name, NSString *lcocalizedName))block;
++ (void)enumerateTransitionsUsingBlock:(void (^)(SKTransitionStyle style,
NSString *name, NSString *localizedName))block;
@end
Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m 2024-10-03 22:38:52 UTC (rev 14513)
+++ trunk/SKTransitionInfo.m 2024-10-04 14:23:21 UTC (rev 14514)
@@ -50,8 +50,8 @@
@implementation SKTransitionInfo
-@synthesize transitionStyle, duration, shouldRestrict;
-@dynamic properties, transitionName, localizedTransitionName, label;
+@synthesize style, duration, shouldRestrict;
+@dynamic properties, styleName, localizedStyleName, label;
static NSDictionary *oldStyleNames = nil;
@@ -100,7 +100,7 @@
return transitionNames;
}
-+ (void)enumerateTransitionsUsingBlock:(void (^)(SKTransitionStyle style,
NSString *name, NSString *lcocalizedName))block {
++ (void)enumerateTransitionsUsingBlock:(void (^)(SKTransitionStyle style,
NSString *name, NSString *localizedName))block {
block(SKNoTransition, @"", NSLocalizedString(@"No Transition",
@"Transition name"));
[[self transitionNames] enumerateObjectsUsingBlock:^(NSString *name,
NSUInteger i, BOOL *stop){
block(i + 1, name, [CIFilter localizedNameForFilterName:name]);
@@ -110,7 +110,7 @@
- (instancetype)init {
self = [super init];
if (self) {
- transitionStyle = SKNoTransition;
+ style = SKNoTransition;
duration = 1.0;
shouldRestrict = YES;
}
@@ -157,7 +157,7 @@
}
- (NSDictionary *)properties {
- return @{SKStyleNameKey:([self transitionName] ?: @""),
+ return @{SKStyleNameKey:([self styleName] ?: @""),
SKDurationKey:[NSNumber numberWithDouble:duration],
SKShouldRestrictKey:[NSNumber numberWithBool:shouldRestrict]};
}
@@ -165,18 +165,14 @@
- (void)setProperties:(NSDictionary *)dictionary {
id value;
if ((value = [dictionary objectForKey:SKStyleNameKey])) {
- SKTransitionStyle style = SKNoTransition;
+ NSUInteger idx = NSNotFound;
if ([value length]) {
NSArray *names = [[self class] transitionNames];
- NSUInteger idx = [names indexOfObject:value];
- if (idx == NSNotFound) {
- if ((value = [oldStyleNames objectForKey:value]))
- idx = [names indexOfObject:value];
- }
- if (idx != NSNotFound)
- style = idx + 1;
+ idx = [names indexOfObject:value];
+ if (idx == NSNotFound && (value = [oldStyleNames
objectForKey:value]))
+ idx = [names indexOfObject:value];
}
- [self setTransitionStyle:style];
+ [self setStyle:idx == NSNotFound ? SKNoTransition : idx + 1];
}
if ((value = [dictionary objectForKey:SKDurationKey])) {
[self setDuration:[value doubleValue]];
@@ -186,17 +182,17 @@
}
}
-- (NSString *)transitionName {
- if (transitionStyle > SKNoTransition) {
+- (NSString *)styleName {
+ if (style > SKNoTransition) {
NSArray *names = [[self class] transitionNames];
- if (transitionStyle <= [names count])
- return [names objectAtIndex:transitionStyle - 1];
+ if (style <= [names count])
+ return [names objectAtIndex:style - 1];
}
return nil;
}
-- (NSString *)localizedTransitionName {
- NSString *name = [self transitionName];
+- (NSString *)localizedStyleName {
+ NSString *name = [self styleName];
if (name)
return [CIFilter localizedNameForFilterName:name];
return NSLocalizedString(@"No Transition", @"Transition name");
@@ -216,8 +212,8 @@
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
- if ([key isEqualToString:@"localizedTransitionName"])
- keyPaths = [keyPaths setByAddingObjectsFromSet:[NSSet
setWithObjects:@"transitionStyle", nil]];
+ if ([key isEqualToString:@"localizedStyleName"])
+ keyPaths = [keyPaths setByAddingObjectsFromSet:[NSSet
setWithObjects:@"style", nil]];
else if ([key isEqualToString:@"label"])
keyPaths = [keyPaths setByAddingObjectsFromSet:[NSSet
setWithObjects:@"thumbnail.label", @"toThumbnail.label", nil]];
return keyPaths;
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
