Revision: 14513
http://sourceforge.net/p/skim-app/code/14513
Author: hofman
Date: 2024-10-03 22:38:52 +0000 (Thu, 03 Oct 2024)
Log Message:
-----------
Enumeration method rather than array of names for transitions
Modified Paths:
--------------
trunk/SKPresentationOptionsSheetController.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2024-10-03 14:35:07 UTC
(rev 14512)
+++ trunk/SKPresentationOptionsSheetController.m 2024-10-03 22:38:52 UTC
(rev 14513)
@@ -144,11 +144,11 @@
// add the filter names to the popup
NSMutableSet *titles = [NSMutableSet set];
[stylePopUpButton removeAllItems];
- [[SKTransitionInfo localizedTransitionNames]
enumerateObjectsUsingBlock:^(NSString *title, SKTransitionStyle style, BOOL
*stop){
- while ([titles containsObject:title])
- title = [title stringByAppendingString:@" "];
- [titles addObject:title];
- [stylePopUpButton addItemWithTitle:title];
+ [SKTransitionInfo enumerateTransitionsUsingBlock:^(SKTransitionStyle
style, NSString *name, NSString *localizedName){
+ while ([titles containsObject:localizedName])
+ localizedName = [localizedName stringByAppendingString:@" "];
+ [titles addObject:localizedName];
+ [stylePopUpButton addItemWithTitle:localizedName];
[[stylePopUpButton lastItem] setTag:style];
}];
[stylePopUpButton addItemWithTitle:NSLocalizedString(@"Multiple effects",
@"Menu item title")];
Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h 2024-10-03 14:35:07 UTC (rev 14512)
+++ trunk/SKTransitionInfo.h 2024-10-03 22:38:52 UTC (rev 14513)
@@ -66,7 +66,7 @@
@property (nonatomic, nullable, readonly) NSString *label;
-@property (class, nonatomic, readonly) NSArray<NSString *>
*localizedTransitionNames;
++ (void)enumerateTransitionsUsingBlock:(void (^)(SKTransitionStyle style,
NSString *name, NSString *lcocalizedName))block;
@end
Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m 2024-10-03 14:35:07 UTC (rev 14512)
+++ trunk/SKTransitionInfo.m 2024-10-03 22:38:52 UTC (rev 14513)
@@ -100,11 +100,11 @@
return transitionNames;
}
-+ (NSArray *)localizedTransitionNames {
- NSMutableArray *names = [NSMutableArray
arrayWithObject:NSLocalizedString(@"No Transition", @"Transition name")];
- for (NSString *name in [self transitionNames])
- [names addObject:[CIFilter localizedNameForFilterName:name]];
- return names;
++ (void)enumerateTransitionsUsingBlock:(void (^)(SKTransitionStyle style,
NSString *name, NSString *lcocalizedName))block {
+ block(SKNoTransition, @"", NSLocalizedString(@"No Transition",
@"Transition name"));
+ [[self transitionNames] enumerateObjectsUsingBlock:^(NSString *name,
NSUInteger i, BOOL *stop){
+ block(i + 1, name, [CIFilter localizedNameForFilterName:name]);
+ }];
}
- (instancetype)init {
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
