Revision: 15818
http://sourceforge.net/p/skim-app/code/15818
Author: hofman
Date: 2025-11-23 15:19:11 +0000 (Sun, 23 Nov 2025)
Log Message:
-----------
use current methods to load dictionary from file
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKMainDocument.m
trunk/SKPreferenceController.m
trunk/SKSyncPreferences.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2025-11-23 10:11:52 UTC (rev 15817)
+++ trunk/SKApplicationController.m 2025-11-23 15:19:11 UTC (rev 15818)
@@ -129,7 +129,7 @@
// load the default values for the user defaults
NSURL *initialUserDefaultsURL = [[NSBundle mainBundle]
URLForResource:INITIAL_USER_DEFAULTS_FILENAME withExtension:@"plist"];
- NSDictionary *initialUserDefaultsDict = [NSDictionary
dictionaryWithContentsOfURL:initialUserDefaultsURL];
+ NSDictionary *initialUserDefaultsDict = [NSDictionary
dictionaryWithContentsOfURL:initialUserDefaultsURL error:NULL];
NSMutableDictionary *initialValuesDict = [[initialUserDefaultsDict
objectForKey:REGISTERED_DEFAULTS_KEY] mutableCopy];
NSArray *resettableUserDefaultsKeys;
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2025-11-23 10:11:52 UTC (rev 15817)
+++ trunk/SKMainDocument.m 2025-11-23 15:19:11 UTC (rev 15818)
@@ -985,7 +985,7 @@
NSArray *array = nil;
NSNumber *number = nil;
if ([docType isEqualToString:SKDocumentTypePDFBundle]) {
- NSDictionary *info = [NSDictionary
dictionaryWithContentsOfURL:[[absoluteURL
URLByAppendingPathComponent:BUNDLE_DATA_FILENAME isDirectory:NO]
URLByAppendingPathExtension:@"plist"]];
+ NSDictionary *info = [NSDictionary
dictionaryWithContentsOfURL:[[absoluteURL
URLByAppendingPathComponent:BUNDLE_DATA_FILENAME isDirectory:NO]
URLByAppendingPathExtension:@"plist"] error:NULL];
if ([info isKindOfClass:[NSDictionary class]]) {
dictionary = [info objectForKey:SKPresentationOptionsKey];
array = [info objectForKey:SKTagsKey];
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2025-11-23 10:11:52 UTC (rev 15817)
+++ trunk/SKPreferenceController.m 2025-11-23 15:19:11 UTC (rev 15818)
@@ -262,7 +262,7 @@
[alert beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse returnCode){
if (returnCode == NSAlertFirstButtonReturn) {
NSURL *initialUserDefaultsURL = [[NSBundle mainBundle]
URLForResource:INITIALUSERDEFAULTS_KEY withExtension:@"plist"];
- NSArray *resettableKeys = [[[NSDictionary
dictionaryWithContentsOfURL:initialUserDefaultsURL]
objectForKey:RESETTABLEKEYS_KEY] objectForKey:[currentPane nibName]];
+ NSArray *resettableKeys = [[[NSDictionary
dictionaryWithContentsOfURL:initialUserDefaultsURL error:NULL]
objectForKey:RESETTABLEKEYS_KEY] objectForKey:[currentPane nibName]];
[[NSUserDefaultsController sharedUserDefaultsController]
revertToInitialValuesForKeys:resettableKeys];
if ([currentPane respondsToSelector:@selector(defaultsDidRevert)])
[currentPane defaultsDidRevert];
Modified: trunk/SKSyncPreferences.m
===================================================================
--- trunk/SKSyncPreferences.m 2025-11-23 10:11:52 UTC (rev 15817)
+++ trunk/SKSyncPreferences.m 2025-11-23 15:19:11 UTC (rev 15818)
@@ -65,7 +65,7 @@
NSMutableArray *editors = [NSMutableArray array];
NSWorkspace *ws = [NSWorkspace sharedWorkspace];
NSInteger i = 0;
- for (NSDictionary *editor in [[NSDictionary
dictionaryWithContentsOfURL:initialUserDefaultsURL]
objectForKey:TEXEDITORS_KEY]) {
+ for (NSDictionary *editor in [[NSDictionary
dictionaryWithContentsOfURL:initialUserDefaultsURL error:NULL]
objectForKey:TEXEDITORS_KEY]) {
if ([ws fullPathForApplication:[editor objectForKey:NAME_KEY]])
[editors insertObject:editor atIndex:i++];
else
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
