Revision: 12705
http://sourceforge.net/p/skim-app/code/12705
Author: hofman
Date: 2022-01-11 17:57:44 +0000 (Tue, 11 Jan 2022)
Log Message:
-----------
Define transitionStyle type in transition info class, make properties keys local
Modified Paths:
--------------
trunk/SKPresentationOptionsSheetController.m
trunk/SKTransitionController.h
trunk/SKTransitionController.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2022-01-11 17:26:48 UTC
(rev 12704)
+++ trunk/SKPresentationOptionsSheetController.m 2022-01-11 17:57:44 UTC
(rev 12705)
@@ -508,7 +508,7 @@
- (void)tableView:(NSTableView *)tv deleteRowsWithIndexes:(NSIndexSet
*)rowIndexes {
NSArray *selTransitions = [transitions objectsAtIndexes:rowIndexes];
- NSDictionary *empty = [NSDictionary dictionaryWithObjectsAndKeys:@"",
SKStyleNameKey, [NSNumber numberWithDouble:1.0], SKDurationKey, [NSNumber
numberWithBool:NO], SKShouldRestrictKey, nil];
+ NSDictionary *empty = [[[[SKTransitionInfo alloc] init] autorelease]
properties];
[selTransitions setValue:empty forKey:PROPERTIES_KEY];
}
Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h 2022-01-11 17:26:48 UTC (rev 12704)
+++ trunk/SKTransitionController.h 2022-01-11 17:57:44 UTC (rev 12705)
@@ -37,17 +37,8 @@
*/
#import <Cocoa/Cocoa.h>
+#import "SKTransitionInfo.h"
-extern NSString *SKStyleNameKey;
-extern NSString *SKDurationKey;
-extern NSString *SKShouldRestrictKey;
-
-// this corresponds to the CGSTransitionType enum
-typedef NS_ENUM(NSUInteger, SKTransitionStyle) {
- SKNoTransition
-};
-
-@class CIImage, SKTransitionInfo;
@protocol SKTransitionView;
@interface SKTransitionController : NSObject {
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2022-01-11 17:26:48 UTC (rev 12704)
+++ trunk/SKTransitionController.m 2022-01-11 17:57:44 UTC (rev 12705)
@@ -42,7 +42,6 @@
*/
#import "SKTransitionController.h"
-#import "SKTransitionInfo.h"
#import "NSBitmapImageRep_SKExtensions.h"
#import "NSView_SKExtensions.h"
#import "SKStringConstants.h"
@@ -53,10 +52,6 @@
#import <Metal/Metal.h>
#import <MetalKit/MetalKit.h>
-NSString *SKStyleNameKey = @"styleName";
-NSString *SKDurationKey = @"duration";
-NSString *SKShouldRestrictKey = @"shouldRestrict";
-
#define kCIInputBacksideImageKey @"inputBacksideImage"
#define TRANSITIONS_PLUGIN @"SkimTransitions.plugin"
Modified: trunk/SKTransitionInfo.h
===================================================================
--- trunk/SKTransitionInfo.h 2022-01-11 17:26:48 UTC (rev 12704)
+++ trunk/SKTransitionInfo.h 2022-01-11 17:57:44 UTC (rev 12705)
@@ -37,10 +37,14 @@
*/
#import <Cocoa/Cocoa.h>
-#import "SKTransitionController.h"
extern NSString *SKPasteboardTypeTransition;
+// further values are defined at runtime by SKTransitionController
+typedef NS_ENUM(NSUInteger, SKTransitionStyle) {
+ SKNoTransition
+};
+
@interface SKTransitionInfo : NSObject <NSPasteboardReading,
NSPasteboardWriting> {
SKTransitionStyle transitionStyle;
CGFloat duration;
Modified: trunk/SKTransitionInfo.m
===================================================================
--- trunk/SKTransitionInfo.m 2022-01-11 17:26:48 UTC (rev 12704)
+++ trunk/SKTransitionInfo.m 2022-01-11 17:57:44 UTC (rev 12705)
@@ -38,7 +38,12 @@
#import "SKTransitionInfo.h"
#import "SKThumbnail.h"
+#import "SKTransitionController.h"
+#define SKStyleNameKey @"styleName"
+#define SKDurationKey @"duration"
+#define SKShouldRestrictKey @"shouldRestrict"
+
NSString *SKPasteboardTypeTransition =
@"net.sourceforge.skim-app.pasteboard.transition";
@implementation SKTransitionInfo
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
