Revision: 13575
http://sourceforge.net/p/skim-app/code/13575
Author: hofman
Date: 2023-08-14 15:31:06 +0000 (Mon, 14 Aug 2023)
Log Message:
-----------
different image for ink note tool in presentation
Modified Paths:
--------------
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/SKNavigationWindow.m
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2023-08-13 10:21:39 UTC (rev 13574)
+++ trunk/NSImage_SKExtensions.h 2023-08-14 15:31:06 UTC (rev 13575)
@@ -181,6 +181,7 @@
extern NSString *SKImageNameFindViewAdorn;
extern NSString *SKImageNameGroupedFindViewAdorn;
extern NSString *SKImageNameTextToolAdorn;
+extern NSString *SKImageNameInkToolAdorn;
extern NSString *SKImageNameTextAlignLeft;
extern NSString *SKImageNameTextAlignCenter;
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2023-08-13 10:21:39 UTC (rev 13574)
+++ trunk/NSImage_SKExtensions.m 2023-08-14 15:31:06 UTC (rev 13575)
@@ -187,6 +187,7 @@
NSString *SKImageNameFindViewAdorn = @"FindViewAdorn";
NSString *SKImageNameGroupedFindViewAdorn = @"GroupedFindViewAdorn";
NSString *SKImageNameTextToolAdorn = @"TextToolAdorn";
+NSString *SKImageNameInkToolAdorn = @"InkToolAdorn";
NSString *SKImageNameTextAlignLeft = @"TextAlignLeft";
NSString *SKImageNameTextAlignCenter = @"TextAlignCenter";
@@ -1442,7 +1443,7 @@
+ (void)makeAdornImages {
- MAKE_IMAGE(SKImageNameOutlineViewAdorn, YES, 25.0, 14.0,
+ MAKE_IMAGE(SKImageNameOutlineViewAdorn, YES, 25.0, 14.0,
[[NSColor blackColor] setStroke];
NSBezierPath *path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(7.0, 2.5)];
@@ -1547,6 +1548,18 @@
[path fill];
);
+ MAKE_IMAGE(SKImageNameInkToolAdorn, YES, 24.0, 24.0,
+ NSAffineTransform *t = [NSAffineTransform transform];
+ [t translateXBy:1.5 yBy:5.5];
+ [t concat];
+ drawTextNote();
+ t = [NSAffineTransform transform];
+ [t rotateByDegrees:-45.0];
+ [t translateXBy:-4 yBy:-2];
+ [t concat];
+ drawInkNote();
+ );
+
}
+ (void)makeTextAlignImages {
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2023-08-13 10:21:39 UTC (rev 13574)
+++ trunk/SKNavigationWindow.m 2023-08-14 15:31:06 UTC (rev 13575)
@@ -47,6 +47,8 @@
#import "NSShadow_SKExtensions.h"
#import "NSView_SKExtensions.h"
#import "NSImage_SKExtensions.h"
+#import "NSString_SKExtensions.h"
+#import <SkimNotes/SkimNotes.h>
#define BUTTON_WIDTH 50.0
#define BUTTON_HEIGHT 50.0
@@ -314,12 +316,13 @@
[drawButton setSegmentCount:1];
[drawButton setTrackingMode:NSSegmentSwitchTrackingSelectAny];
[drawButton setWidth:24.0 forSegment:0];
- [drawButton setImage:[NSImage imageNamed:SKImageNameInkNote]
forSegment:0];
+ [drawButton setImage:[NSImage imageNamed:SKImageNameInkToolAdorn]
forSegment:0];
[drawButton setSelected:[pdfView drawInPresentation] forSegment:0];
[drawButton setTarget:pdfView];
[drawButton setAction:@selector(toggleDrawInPresentation:)];
if (RUNNING_BEFORE(10_14))
[[drawButton cell] setBackgroundStyle:NSBackgroundStyleDark];
+ [[[NSAccessibilityUnignoredDescendant(drawButton)
accessibilityChildren] firstObject] setAccessibilityLabel:[SKNInkString
typeName]];
[drawButton sizeToFit];
rect.size.width = NSWidth([drawButton frame]);
[[self contentView] addSubview:drawButton];
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
