[Skim-app-commit] SF.net SVN: skim-app:[14530] trunk

[hofman--- via Skim-app-commit]

Revision: 14530
          http://sourceforge.net/p/skim-app/code/14530
Author:   hofman
Date:     2024-10-08 08:58:16 +0000 (Tue, 08 Oct 2024)
Log Message:
-----------
implement localizedStylename in labeled subclass

Modified Paths:
--------------
    trunk/SKPresentationOptionsSheetController.m
    trunk/SKTransitionInfo.h
    trunk/SKTransitionInfo.m

Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m        2024-10-07 22:18:31 UTC 
(rev 14529)
+++ trunk/SKPresentationOptionsSheetController.m        2024-10-08 08:58:16 UTC 
(rev 14530)
@@ -267,7 +267,7 @@
 }
 
 - (void)preview:(id)sender {
-    SKTransitionInfo *info = transition;
+    SKLabeledTransitionInfo *info = transition;
     NSInteger idx = -1;
     if (separate) {
         if (sender == tableView)

Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h    2024-10-07 22:18:31 UTC (rev 14529)
+++ trunk/SKTransitionInfo.h    2024-10-08 08:58:16 UTC (rev 14530)
@@ -62,7 +62,6 @@
 @property (nonatomic, readonly) NSDictionary *properties;
 
 @property (nonatomic, nullable, readonly) NSString *styleName;
-@property (nonatomic, nullable, readonly) NSString *localizedStyleName;
 
 + (void)enumerateTransitionsUsingBlock:(void (^)(SKTransitionStyle style, 
NSString *name, NSString *localizedName))block;
 
@@ -81,6 +80,8 @@
 
 @property (nonatomic, nullable, readonly) NSString *label;
 
+@property (nonatomic, nullable, readonly) NSString *localizedStyleName;
+
 @property (nonatomic, copy) SKTransitionInfo *info;
 
 @end

Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m    2024-10-07 22:18:31 UTC (rev 14529)
+++ trunk/SKTransitionInfo.m    2024-10-08 08:58:16 UTC (rev 14530)
@@ -51,7 +51,7 @@
 @implementation SKTransitionInfo
 
 @synthesize style, duration, shouldRestrict;
-@dynamic properties, styleName, localizedStyleName;
+@dynamic properties, styleName;
 
 static NSDictionary *oldStyleNames = nil;
 
@@ -200,13 +200,6 @@
     return nil;
 }
 
-- (NSString *)localizedStyleName {
-    NSString *name = [self styleName];
-    if (name)
-        return [CIFilter localizedNameForFilterName:name];
-    return NSLocalizedString(@"No Transition", @"Transition name");
-}
-
 @end
 
 #pragma mark -
@@ -214,7 +207,7 @@
 @implementation SKLabeledTransitionInfo
 
 @synthesize thumbnail, toThumbnail;
-@dynamic label, info;
+@dynamic label, localizedStyleName, info;
 
 + (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
     NSSet *keyPaths = [super keyPathsForValuesAffectingValueForKey:key];
@@ -239,6 +232,13 @@
     [self setShouldRestrict:[info shouldRestrict]];
 }
 
+- (NSString *)localizedStyleName {
+    NSString *name = [self styleName];
+    if (name)
+        return [CIFilter localizedNameForFilterName:name];
+    return NSLocalizedString(@"No Transition", @"Transition name");
+}
+
 - (NSString *)label {
     if ([self thumbnail] && [self toThumbnail])
         return [NSString stringWithFormat:@"%@\u2192%@", [[self thumbnail] 
label], [[self toThumbnail] label]];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit