Revision: 14553
http://sourceforge.net/p/skim-app/code/14553
Author: hofman
Date: 2024-10-13 22:56:42 +0000 (Sun, 13 Oct 2024)
Log Message:
-----------
Return array of localized style names instead of enumeerating, store popup
titles in static variable
Modified Paths:
--------------
trunk/SKPresentationOptionsSheetController.h
trunk/SKPresentationOptionsSheetController.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
Modified: trunk/SKPresentationOptionsSheetController.h
===================================================================
--- trunk/SKPresentationOptionsSheetController.h 2024-10-13 22:39:48 UTC
(rev 14552)
+++ trunk/SKPresentationOptionsSheetController.h 2024-10-13 22:56:42 UTC
(rev 14553)
@@ -53,7 +53,6 @@
NSLayoutConstraint *boxLeadingConstraint;
NSLayoutConstraint *tableWidthConstraint;
NSArrayController *arrayController;
- NSArray<NSString *> *availableTransitions;
BOOL separate;
SKLabeledTransitionInfo *transition;
NSArray<SKLabeledTransitionInfo *> *transitions;
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2024-10-13 22:39:48 UTC
(rev 14552)
+++ trunk/SKPresentationOptionsSheetController.m 2024-10-13 22:56:42 UTC
(rev 14553)
@@ -89,7 +89,8 @@
@implementation SKPresentationOptionsSheetController
-@synthesize notesDocumentPopUpButton, tableView, stylePopUpButton, okButton,
cancelButton, previewButton, tableWidthConstraint, boxLeadingConstraint,
arrayController, availableTransitions, separate, transitions;
+@synthesize notesDocumentPopUpButton, tableView, stylePopUpButton, okButton,
cancelButton, previewButton, tableWidthConstraint, boxLeadingConstraint,
arrayController, separate, transitions;
+@dynamic availableTransitions;
+ (void)initialize {
SKINITIALIZE;
@@ -114,12 +115,6 @@
separate = NO;
}
- NSMutableArray *titles = [NSMutableArray
arrayWithObject:NSLocalizedString(@"Multiple effects", @"Menu item title")];
- [SKTransitionInfo enumerateTransitionsUsingBlock:^(SKTransitionStyle
style, NSString *name, NSString *localizedName){
- [titles addObject:localizedName];
- }];
- availableTransitions = [titles copy];
-
[self startObservingTransitions:transitions];
}
return self;
@@ -436,6 +431,16 @@
}];
}
+- (NSArray *)availableTransitions {
+ static NSArray *availableTransitions = nil;
+ if (availableTransitions == nil) {
+ NSMutableArray *titles = [NSMutableArray
arrayWithObject:NSLocalizedString(@"Multiple effects", @"Menu item title")];
+ [titles addObjectsFromArray:[SKTransitionInfo localizedStyleNames]];
+ availableTransitions = [titles copy];
+ }
+ return availableTransitions;
+}
+
- (void)setSeparate:(BOOL)newSeparate {
if (separate != newSeparate) {
separate = newSeparate;
Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h 2024-10-13 22:39:48 UTC (rev 14552)
+++ trunk/SKTransitionInfo.h 2024-10-13 22:56:42 UTC (rev 14553)
@@ -63,7 +63,7 @@
@property (nonatomic, nullable, readonly) NSString *styleName;
-+ (void)enumerateTransitionsUsingBlock:(void (^)(SKTransitionStyle style,
NSString *name, NSString *localizedName))block;
+@property (class, nonatomic, readonly) NSArray<NSString *>
*localizedStyleNames;
@end
Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m 2024-10-13 22:39:48 UTC (rev 14552)
+++ trunk/SKTransitionInfo.m 2024-10-13 22:56:42 UTC (rev 14553)
@@ -100,11 +100,11 @@
return transitionNames;
}
-+ (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]);
- }];
++ (NSArray *)localizedStyleNames {
+ NSMutableArray *names = [NSMutableArray
arrayWithObject:NSLocalizedString(@"No Transition", @"Transition name")];
+ for (NSString *name in [self transitionNames])
+ [names addObject:[CIFilter localizedNameForFilterName:name] ?: name];
+ return names;
}
- (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
