Revision: 3602
http://skim-app.svn.sourceforge.net/skim-app/?rev=3602&view=rev
Author: hofman
Date: 2008-04-02 16:40:55 -0700 (Wed, 02 Apr 2008)
Log Message:
-----------
Use unsigned long for 4-char codes. Translate only scripting settings.
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKDocument.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2008-04-02 23:34:15 UTC (rev 3601)
+++ trunk/SKApplicationController.m 2008-04-02 23:40:55 UTC (rev 3602)
@@ -534,8 +534,8 @@
return;
NSMutableDictionary *setup = [NSMutableDictionary dictionary];
[setup addEntriesFromDictionary:[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultPDFDisplaySettingsKey]];
- [setup addEntriesFromDictionary:settings];
- [[NSUserDefaults standardUserDefaults] setObject:[setup
PDFViewSettingsFromAppleScriptPDFViewSettings]
forKey:SKDefaultPDFDisplaySettingsKey];
+ [setup addEntriesFromDictionary:[settings
PDFViewSettingsFromAppleScriptPDFViewSettings]];
+ [[NSUserDefaults standardUserDefaults] setObject:setup
forKey:SKDefaultPDFDisplaySettingsKey];
}
- (NSDictionary *)defaultFullScreenPdfViewSettings {
@@ -549,9 +549,9 @@
if ([settings count]) {
[setup addEntriesFromDictionary:[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultPDFDisplaySettingsKey]];
[setup addEntriesFromDictionary:[[NSUserDefaults standardUserDefaults]
dictionaryForKey:SKDefaultFullScreenPDFDisplaySettingsKey]];
- [setup addEntriesFromDictionary:settings];
+ [setup addEntriesFromDictionary:[settings
PDFViewSettingsFromAppleScriptPDFViewSettings]];
}
- [[NSUserDefaults standardUserDefaults] setObject:[setup
PDFViewSettingsFromAppleScriptPDFViewSettings]
forKey:SKDefaultFullScreenPDFDisplaySettingsKey];
+ [[NSUserDefaults standardUserDefaults] setObject:setup
forKey:SKDefaultFullScreenPDFDisplaySettingsKey];
}
- (NSColor *)backgroundColor {
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2008-04-02 23:34:15 UTC (rev 3601)
+++ trunk/SKDocument.m 2008-04-02 23:40:55 UTC (rev 3602)
@@ -1913,7 +1913,7 @@
- (NSDictionary *)AppleScriptPDFViewSettingsFromPDFViewSettings {
NSMutableDictionary *setup = [[self mutableCopy] autorelease];
- int displayMode = 0;
+ unsigned long displayMode = 0;
switch ([[setup objectForKey:@"displayMode"] intValue]) {
case kPDFDisplaySinglePage: displayMode = SKASDisplaySinglePage; break;
case kPDFDisplaySinglePageContinuous: displayMode =
SKASDisplaySinglePageContinuous; break;
@@ -1922,7 +1922,7 @@
}
[setup setObject:[NSNumber numberWithInt:displayMode]
forKey:@"displayMode"];
- int displayBox = 0;
+ unsigned long displayBox = 0;
switch ([[setup objectForKey:@"displayBox"] intValue]) {
case kPDFDisplayBoxMediaBox: displayBox = SKASMediaBox; break;
case kPDFDisplayBoxCropBox: displayBox = SKASCropBox; break;
@@ -1938,7 +1938,7 @@
if (number = [setup objectForKey:@"displayMode"]) {
int displayMode = 0;
- switch ([number intValue]) {
+ switch ([number unsignedLongValue]) {
case SKASDisplaySinglePage: displayMode = kPDFDisplaySinglePage;
break;
case SKASDisplaySinglePageContinuous: displayMode =
kPDFDisplaySinglePageContinuous; break;
case SKASDisplayTwoUp: displayMode = kPDFDisplayTwoUp; break;
@@ -1949,7 +1949,7 @@
if (number = [setup objectForKey:@"displayBox"]) {
int displayBox = 0;
- switch ([number intValue]) {
+ switch ([number unsignedLongValue]) {
case SKASMediaBox: displayBox = kPDFDisplayBoxMediaBox; break;
case SKASCropBox: displayBox = kPDFDisplayBoxCropBox; break;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
