Revision: 4582
http://skim-app.svn.sourceforge.net/skim-app/?rev=4582&view=rev
Author: hofman
Date: 2008-09-08 12:09:55 +0000 (Mon, 08 Sep 2008)
Log Message:
-----------
Use functions instead of a category to translate between PDF and scripting
settings.
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKPDFDocument.h
trunk/SKPDFDocument.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2008-09-08 11:33:38 UTC (rev 4581)
+++ trunk/SKApplicationController.m 2008-09-08 12:09:55 UTC (rev 4582)
@@ -488,7 +488,7 @@
}
- (NSDictionary *)defaultPdfViewSettings {
- return [[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultPDFDisplaySettingsKey]
AppleScriptPDFViewSettingsFromPDFViewSettings];
+ return SKScriptingPDFViewSettingsFromPDFViewSettings([[NSUserDefaults
standardUserDefaults] dictionaryForKey:SKDefaultPDFDisplaySettingsKey]);
}
- (void)setDefaultPdfViewSettings:(NSDictionary *)settings {
@@ -496,12 +496,12 @@
return;
NSMutableDictionary *setup = [NSMutableDictionary dictionary];
[setup addEntriesFromDictionary:[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultPDFDisplaySettingsKey]];
- [setup addEntriesFromDictionary:[settings
PDFViewSettingsFromAppleScriptPDFViewSettings]];
+ [setup
addEntriesFromDictionary:SKPDFViewSettingsFromScriptingPDFViewSettings(settings)];
[[NSUserDefaults standardUserDefaults] setObject:setup
forKey:SKDefaultPDFDisplaySettingsKey];
}
- (NSDictionary *)defaultFullScreenPdfViewSettings {
- return [[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultFullScreenPDFDisplaySettingsKey]
AppleScriptPDFViewSettingsFromPDFViewSettings];
+ return SKScriptingPDFViewSettingsFromPDFViewSettings([[NSUserDefaults
standardUserDefaults]
dictionaryForKey:SKDefaultFullScreenPDFDisplaySettingsKey]);
}
- (void)setDefaultFullScreenPdfViewSettings:(NSDictionary *)settings {
@@ -511,7 +511,7 @@
if ([settings count]) {
[setup addEntriesFromDictionary:[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultPDFDisplaySettingsKey]];
[setup addEntriesFromDictionary:[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultFullScreenPDFDisplaySettingsKey]];
- [setup addEntriesFromDictionary:[settings
PDFViewSettingsFromAppleScriptPDFViewSettings]];
+ [setup
addEntriesFromDictionary:SKPDFViewSettingsFromScriptingPDFViewSettings(settings)];
}
[[NSUserDefaults standardUserDefaults] setObject:setup
forKey:SKDefaultFullScreenPDFDisplaySettingsKey];
}
Modified: trunk/SKPDFDocument.h
===================================================================
--- trunk/SKPDFDocument.h 2008-09-08 11:33:38 UTC (rev 4581)
+++ trunk/SKPDFDocument.h 2008-09-08 12:09:55 UTC (rev 4582)
@@ -54,6 +54,10 @@
};
+extern NSDictionary
*SKScriptingPDFViewSettingsFromPDFViewSettings(NSDictionary *settings);
+extern NSDictionary
*SKPDFViewSettingsFromScriptingPDFViewSettings(NSDictionary *settings);
+
+
@class PDFDocument, SKMainWindowController, SKPDFView, SKPDFSynchronizer,
SKLine, SKProgressController;
@interface SKPDFDocument : NSDocument
@@ -149,9 +153,3 @@
@interface NSWindow (SKScriptingExtensions)
- (void)handleRevertScriptCommand:(NSScriptCommand *)command;
@end
-
-
[EMAIL PROTECTED] NSDictionary (SKScriptingExtensions)
-- (NSDictionary *)AppleScriptPDFViewSettingsFromPDFViewSettings;
-- (NSDictionary *)PDFViewSettingsFromAppleScriptPDFViewSettings;
[EMAIL PROTECTED]
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-09-08 11:33:38 UTC (rev 4581)
+++ trunk/SKPDFDocument.m 2008-09-08 12:09:55 UTC (rev 4582)
@@ -1825,11 +1825,11 @@
}
- (NSDictionary *)pdfViewSettings {
- return [[[self mainWindowController] currentPDFSettings]
AppleScriptPDFViewSettingsFromPDFViewSettings];
+ return SKScriptingPDFViewSettingsFromPDFViewSettings([[self
mainWindowController] currentPDFSettings]);
}
- (void)setPdfViewSettings:(NSDictionary *)pdfViewSettings {
- [[self mainWindowController] applyPDFSettings:[pdfViewSettings
PDFViewSettingsFromAppleScriptPDFViewSettings]];
+ [[self mainWindowController]
applyPDFSettings:SKPDFViewSettingsFromScriptingPDFViewSettings(pdfViewSettings)];
}
- (NSDictionary *)documentAttributes {
@@ -2024,10 +2024,8 @@
@end
[EMAIL PROTECTED] NSDictionary (SKScriptingExtensions)
-
-- (NSDictionary *)AppleScriptPDFViewSettingsFromPDFViewSettings {
- NSMutableDictionary *setup = [[self mutableCopy] autorelease];
+NSDictionary *SKScriptingPDFViewSettingsFromPDFViewSettings(NSDictionary
*settings) {
+ NSMutableDictionary *setup = [[settings mutableCopy] autorelease];
FourCharCode displayMode = 0;
switch ([[setup objectForKey:@"displayMode"] intValue]) {
@@ -2048,8 +2046,8 @@
return setup;
}
-- (NSDictionary *)PDFViewSettingsFromAppleScriptPDFViewSettings {
- NSMutableDictionary *setup = [[self mutableCopy] autorelease];
+NSDictionary *SKPDFViewSettingsFromScriptingPDFViewSettings(NSDictionary
*settings) {
+ NSMutableDictionary *setup = [[settings mutableCopy] autorelease];
NSNumber *number;
if (number = [setup objectForKey:@"displayMode"]) {
@@ -2074,5 +2072,3 @@
return setup;
}
-
[EMAIL PROTECTED]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
