Revision: 14565
          http://sourceforge.net/p/skim-app/code/14565
Author:   hofman
Date:     2024-10-21 21:23:51 +0000 (Mon, 21 Oct 2024)
Log Message:
-----------
non separate default for drawsImage flag

Modified Paths:
--------------
    trunk/SKNPDFAnnotationNote_SKExtensions.m
    trunk/SKStringConstants.h
    trunk/SKStringConstants.m

Modified: trunk/SKNPDFAnnotationNote_SKExtensions.m
===================================================================
--- trunk/SKNPDFAnnotationNote_SKExtensions.m   2024-10-21 17:30:43 UTC (rev 
14564)
+++ trunk/SKNPDFAnnotationNote_SKExtensions.m   2024-10-21 21:23:51 UTC (rev 
14565)
@@ -65,8 +65,14 @@
 
 - (void)setDefaultSkimNoteProperties {
     [self setColor:[[NSUserDefaults standardUserDefaults] 
colorForKey:SKAnchoredNoteColorKey]];
-    [self setIconType:[[NSUserDefaults standardUserDefaults] 
integerForKey:SKAnchoredNoteIconTypeKey]];
-    [self setDrawsImage:[[NSUserDefaults standardUserDefaults] 
boolForKey:SKAnchoredNoteDrawsImageKey]];
+    PDFTextAnnotationIconType iconType = [[NSUserDefaults 
standardUserDefaults] integerForKey:SKAnchoredNoteIconTypeKey];
+    if (iconType == kSKNPDFTextAnnotationIconImage) {
+        [self setIconType:iconType];
+        [self setDrawsImage:YES];
+    } else {
+        [self setIconType:kPDFTextAnnotationIconNote];
+        [self setDrawsImage:NO];
+    }
     [self setTexts:@[[[SKNoteText alloc] initWithNote:self]]];
     [self setPopup:nil];
 }

Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h   2024-10-21 17:30:43 UTC (rev 14564)
+++ trunk/SKStringConstants.h   2024-10-21 21:23:51 UTC (rev 14565)
@@ -84,7 +84,6 @@
 extern NSString *SKFreeTextNoteFontColorKey;
 extern NSString *SKFreeTextNoteAlignmentKey;
 extern NSString *SKAnchoredNoteIconTypeKey;
-extern NSString *SKAnchoredNoteDrawsImageKey;
 extern NSString *SKFreeTextNoteLineWidthKey;
 extern NSString *SKFreeTextNoteLineStyleKey;
 extern NSString *SKFreeTextNoteDashPatternKey;

Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m   2024-10-21 17:30:43 UTC (rev 14564)
+++ trunk/SKStringConstants.m   2024-10-21 21:23:51 UTC (rev 14565)
@@ -85,7 +85,6 @@
 NSString *SKFreeTextNoteAlignmentKey = @"SKFreeTextNoteAlignment";
 NSString *SKFreeTextNoteLineWidthKey = @"SKFreeTextNoteLineWidth";
 NSString *SKAnchoredNoteIconTypeKey = @"SKAnchoredNoteIconType";
-NSString *SKAnchoredNoteDrawsImageKey = @"SKAnchoredDrawsImageType";
 NSString *SKFreeTextNoteLineStyleKey = @"SKFreeTextNoteLineStyle";
 NSString *SKFreeTextNoteDashPatternKey = @"SKFreeTextNoteDashPattern";
 NSString *SKCircleNoteLineWidthKey = @"SKCircleNoteLineWidth";

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

Reply via email to