[Skim-app-commit] SF.net SVN: skim-app:[12845] trunk

[hofman--- via Skim-app-commit]

Revision: 12845
          http://sourceforge.net/p/skim-app/code/12845
Author:   hofman
Date:     2022-04-20 08:47:12 +0000 (Wed, 20 Apr 2022)
Log Message:
-----------
Save skim notes in plist format by default. New hidden pref to save as archive, 
remove hidden pref to save as plist.

Modified Paths:
--------------
    trunk/NSDocument_SKExtensions.m
    trunk/SKMainDocument.m
    trunk/SKStringConstants.h
    trunk/SKStringConstants.m

Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m     2022-04-15 14:50:12 UTC (rev 12844)
+++ trunk/NSDocument_SKExtensions.m     2022-04-20 08:47:12 UTC (rev 12845)
@@ -215,7 +215,7 @@
 
 - (NSData *)notesData {
     NSArray *array = [self SkimNoteProperties];
-    return SKNDataFromSkimNotes(array, [[NSUserDefaults standardUserDefaults] 
boolForKey:SKWriteSkimNotesAsPlistKey]);
+    return SKNDataFromSkimNotes(array, [[NSUserDefaults standardUserDefaults] 
boolForKey:SKWriteLegacySkimNotesKey] == NO && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKWriteSkimNotesAsArchiveKey] == NO);
 }
 
 - (NSString *)notesStringForTemplateType:(NSString *)typeName {

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2022-04-15 14:50:12 UTC (rev 12844)
+++ trunk/SKMainDocument.m      2022-04-20 08:47:12 UTC (rev 12845)
@@ -459,10 +459,10 @@
     SKNXattrFlags flags = kSKNXattrDefault;
     if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKWriteLegacySkimNotesKey] == NO) {
         writeOptions = SKNSkimNotesWritingSyncable;
+        if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKWriteSkimNotesAsArchiveKey] == NO)
+            writeOptions |= SKNSkimNotesWritingPlist;
         flags = kSKNXattrSyncable;
     }
-    if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKWriteSkimNotesAsPlistKey])
-        writeOptions |= SKNSkimNotesWritingPlist;
     
     BOOL success = [fm writeSkimNotes:[self SkimNoteProperties] 
textNotes:[self notesString] richTextNotes:[self notesRTFData] 
toExtendedAttributesAtURL:absoluteURL options:writeOptions error:NULL];
     
@@ -712,7 +712,7 @@
     } else if ([ws type:SKArchiveDocumentType conformsToType:typeName]) {
         didWrite = [self writeArchiveToURL:absoluteURL error:&error];
     } else if ([ws type:SKNotesDocumentType conformsToType:typeName]) {
-        SKNSkimNotesWritingOptions options = [[NSUserDefaults 
standardUserDefaults] boolForKey:SKWriteSkimNotesAsPlistKey] ? 
SKNSkimNotesWritingPlist : 0;
+        SKNSkimNotesWritingOptions options = [[NSUserDefaults 
standardUserDefaults] boolForKey:SKWriteLegacySkimNotesKey] || [[NSUserDefaults 
standardUserDefaults] boolForKey:SKWriteSkimNotesAsArchiveKey] ? 0 : 
SKNSkimNotesWritingPlist;
         didWrite = [[NSFileManager defaultManager] writeSkimNotes:[self 
SkimNoteProperties] toSkimFileAtURL:absoluteURL options:options error:&error];
     } else if ([ws type:SKNotesRTFDocumentType conformsToType:typeName]) {
         NSData *data = [self notesRTFData];

Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h   2022-04-15 14:50:12 UTC (rev 12844)
+++ trunk/SKStringConstants.h   2022-04-20 08:47:12 UTC (rev 12845)
@@ -53,7 +53,7 @@
 extern NSString *SKRememberLastPageViewedKey;
 extern NSString *SKRememberSnapshotsKey;
 extern NSString *SKWriteLegacySkimNotesKey;
-extern NSString *SKWriteSkimNotesAsPlistKey;
+extern NSString *SKWriteSkimNotesAsArchiveKey;
 extern NSString *SKAutoSaveSkimNotesKey;
 extern NSString *SKSnapshotsOnTopKey;
 extern NSString *SKSnapshotThumbnailSizeKey;

Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m   2022-04-15 14:50:12 UTC (rev 12844)
+++ trunk/SKStringConstants.m   2022-04-20 08:47:12 UTC (rev 12845)
@@ -54,7 +54,7 @@
 NSString *SKRememberLastPageViewedKey = @"SKRememberLastPageViewed";
 NSString *SKRememberSnapshotsKey = @"SKRememberSnapshots";
 NSString *SKWriteLegacySkimNotesKey = @"SKWriteLegacySkimNotes";
-NSString *SKWriteSkimNotesAsPlistKey = @"SKWriteSkimNotesAsPlist";
+NSString *SKWriteSkimNotesAsArchiveKey = @"SKWriteSkimNotesAsArchive";
 NSString *SKAutoSaveSkimNotesKey = @"SKAutoSaveSkimNotes";
 NSString *SKSnapshotsOnTopKey = @"SKSnapshotsOnTop";
 NSString *SKSnapshotThumbnailSizeKey = @"SKSnapshotThumbnailSize";

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