Revision: 12659
http://sourceforge.net/p/skim-app/code/12659
Author: hofman
Date: 2021-12-28 22:30:11 +0000 (Tue, 28 Dec 2021)
Log Message:
-----------
Temporary tool mode to draw a freehand note
Modified Paths:
--------------
trunk/Base.lproj/MainMenu.xib
trunk/SKMainToolbarController.m
trunk/SKPDFView.h
trunk/SKPDFView.m
trunk/de.lproj/MainMenu.strings
trunk/en.lproj/MainMenu.strings
trunk/es.lproj/MainMenu.strings
trunk/fr.lproj/MainMenu.strings
trunk/it.lproj/MainMenu.strings
trunk/ja.lproj/MainMenu.strings
trunk/nl.lproj/MainMenu.strings
trunk/pl.lproj/MainMenu.strings
trunk/ru.lproj/MainMenu.strings
trunk/zh_CN.lproj/MainMenu.strings
trunk/zh_TW.lproj/MainMenu.strings
Modified: trunk/Base.lproj/MainMenu.xib
===================================================================
--- trunk/Base.lproj/MainMenu.xib 2021-12-28 16:43:52 UTC (rev 12658)
+++ trunk/Base.lproj/MainMenu.xib 2021-12-28 22:30:11 UTC (rev 12659)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="19455" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="19455"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="19529"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner"
customClass="NSApplication">
@@ -557,6 +557,15 @@
<menuItem isSeparatorItem="YES" id="735">
<modifierMask key="keyEquivalentModifierMask"
command="YES"/>
</menuItem>
+ <menuItem title="New Freehand" tag="8"
keyEquivalent="i" id="lca-f6-0U6">
+ <modifierMask key="keyEquivalentModifierMask"
option="YES" command="YES"/>
+ <connections>
+ <action selector="createNewNote:"
target="-1" id="zRo-A3-nrb"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="Rz2-R1-S3M">
+ <modifierMask key="keyEquivalentModifierMask"
command="YES"/>
+ </menuItem>
<menuItem title="Edit Note" id="691">
<connections>
<action selector="editNote:" target="-1"
id="692"/>
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2021-12-28 16:43:52 UTC (rev 12658)
+++ trunk/SKMainToolbarController.m 2021-12-28 22:30:11 UTC (rev 12659)
@@ -1356,6 +1356,7 @@
case SKHighlightToolMode : name = SKImageNameToolbarAddHighlightNote;
break;
case SKUnderlineToolMode : name = SKImageNameToolbarAddUnderlineNote;
break;
case SKStrikeOutToolMode : name = SKImageNameToolbarAddStrikeOutNote;
break;
+ case SKInkToolMode : name = SKImageNameToolbarAddInkNote;
break;
case SKNoToolMode:
switch (toolMode) {
case SKTextToolMode : name = SKImageNameToolbarTextTool;
break;
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2021-12-28 16:43:52 UTC (rev 12658)
+++ trunk/SKPDFView.h 2021-12-28 22:30:11 UTC (rev 12659)
@@ -90,7 +90,8 @@
SKSnapshotToolMode,
SKHighlightToolMode = SKHighlightNote,
SKUnderlineToolMode = SKUnderlineNote,
- SKStrikeOutToolMode = SKStrikeOutNote
+ SKStrikeOutToolMode = SKStrikeOutNote,
+ SKInkToolMode = SKInkNote
};
enum {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2021-12-28 16:43:52 UTC (rev 12658)
+++ trunk/SKPDFView.m 2021-12-28 22:30:11 UTC (rev 12659)
@@ -1762,26 +1762,25 @@
[self updateMagnifyWithEvent:nil];
} else if ((area & kPDFPageArea) == 0) {
[self doDragWithEvent:theEvent];
- } else if (temporaryToolMode == SKZoomToolMode && (modifiers &
NSCommandKeyMask) == 0) {
+ } else if (temporaryToolMode != SKNoToolMode && (modifiers &
NSCommandKeyMask) == 0) {
BOOL wantsLoupe = [self hideLoupeWindow];
- [self doMarqueeZoomWithEvent:theEvent];
+ if (temporaryToolMode == SKZoomToolMode) {
+ [self doMarqueeZoomWithEvent:theEvent];
+ } else if (temporaryToolMode == SKSnapshotToolMode) {
+ [self doSelectSnapshotWithEvent:theEvent];
+ } else if (temporaryToolMode == SKInkToolMode) {
+ [self doDrawFreehandNoteWithEvent:theEvent];
+ } else {
+ [self setActiveAnnotation:nil];
+ [super mouseDown:theEvent];
+ if ([[self currentSelection] hasCharacters]) {
+ [self addAnnotationWithType:(SKNoteType)temporaryToolMode];
+ [self setCurrentSelection:nil];
+ }
+ }
[self setTemporaryToolMode:SKNoToolMode];
if (wantsLoupe)
[self updateMagnifyWithEvent:nil];
- } else if (temporaryToolMode == SKSnapshotToolMode && (modifiers &
NSCommandKeyMask) == 0) {
- BOOL wantsLoupe = [self hideLoupeWindow];
- [self doSelectSnapshotWithEvent:theEvent];
- [self setTemporaryToolMode:SKNoToolMode];
- if (wantsLoupe)
- [self updateMagnifyWithEvent:nil];
- } else if (temporaryToolMode != SKNoToolMode && (modifiers &
NSCommandKeyMask) == 0) {
- [self setActiveAnnotation:nil];
- [super mouseDown:theEvent];
- if ([[self currentSelection] hasCharacters]) {
- [self addAnnotationWithType:(SKNoteType)temporaryToolMode];
- [self setCurrentSelection:nil];
- }
- [self setTemporaryToolMode:SKNoToolMode];
} else if (toolMode == SKMoveToolMode) {
[self setCurrentSelection:nil];
if ((area & kPDFLinkArea))
@@ -2615,7 +2614,7 @@
}
- (void)addAnnotationWithType:(SKNoteType)annotationType {
- if ((toolMode == SKTextToolMode || toolMode == SKNoteToolMode) &&
annotationType >= SKHighlightNote && annotationType <= SKStrikeOutNote &&
[[self currentSelection] hasCharacters] == NO) {
+ if ((toolMode == SKTextToolMode || toolMode == SKNoteToolMode) &&
(annotationType == SKInkNote || (annotationType >= SKHighlightNote &&
annotationType <= SKStrikeOutNote && [[self currentSelection] hasCharacters] ==
NO))) {
[self setTemporaryToolMode:(SKTemporaryToolMode)annotationType];
} else {
[self addAnnotationWithType:annotationType context:nil];
Modified: trunk/de.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/en.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/es.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/fr.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/it.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/ja.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/nl.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/pl.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_CN.lproj/MainMenu.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_TW.lproj/MainMenu.strings
===================================================================
(Binary files differ)
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
