Revision: 12660
http://sourceforge.net/p/skim-app/code/12660
Author: hofman
Date: 2021-12-29 10:22:02 +0000 (Wed, 29 Dec 2021)
Log Message:
-----------
Add freehand note segment to add note control in toolbar and touch bar
Modified Paths:
--------------
trunk/MainToolbar.xib
trunk/SKMainToolbarController.m
trunk/SKMainTouchBarController.m
trunk/de.lproj/Localizable.strings
trunk/en.lproj/Localizable.strings
trunk/es.lproj/Localizable.strings
trunk/fr.lproj/Localizable.strings
trunk/it.lproj/Localizable.strings
trunk/ja.lproj/Localizable.strings
trunk/nl.lproj/Localizable.strings
trunk/pl.lproj/Localizable.strings
trunk/ru.lproj/Localizable.strings
trunk/zh_CN.lproj/Localizable.strings
trunk/zh_TW.lproj/Localizable.strings
Modified: trunk/MainToolbar.xib
===================================================================
--- trunk/MainToolbar.xib 2021-12-28 22:30:11 UTC (rev 12659)
+++ trunk/MainToolbar.xib 2021-12-29 10:22:02 UTC (rev 12660)
@@ -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"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -513,7 +513,7 @@
</connections>
</segmentedControl>
<segmentedControl verticalHuggingPriority="750"
fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="34">
- <rect key="frame" x="20" y="73" width="225" height="25"/>
+ <rect key="frame" x="19" y="73" width="289" height="23"/>
<autoresizingMask key="autoresizingMask"/>
<segmentedCell key="cell" borderStyle="border"
alignment="left" segmentDistribution="fill" style="texturedSquare"
trackingMode="momentary" id="45">
<font key="font" metaFont="system"/>
@@ -526,6 +526,9 @@
<segment image="ToolbarAddUnderlineNote"
imageScaling="none" width="27" tag="5"/>
<segment image="ToolbarAddStrikeOutNote"
imageScaling="none" width="27" tag="6"/>
<segment image="ToolbarAddLineNote"
imageScaling="none" width="27" tag="7"/>
+ <segment image="ToolbarAddInkNote"
imageScaling="none" width="27" tag="8">
+ <nil key="label"/>
+ </segment>
</segments>
</segmentedCell>
<connections>
@@ -730,6 +733,7 @@
<image name="ToolbarAddCircleNoteMenu" width="128" height="128"/>
<image name="ToolbarAddHighlightNote" width="128" height="128"/>
<image name="ToolbarAddHighlightNoteMenu" width="128" height="128"/>
+ <image name="ToolbarAddInkNote" width="128" height="128"/>
<image name="ToolbarAddLineNote" width="128" height="128"/>
<image name="ToolbarAddSquareNote" width="128" height="128"/>
<image name="ToolbarAddStrikeOutNote" width="128" height="128"/>
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2021-12-28 22:30:11 UTC (rev 12659)
+++ trunk/SKMainToolbarController.m 2021-12-29 10:22:02 UTC (rev 12660)
@@ -539,6 +539,7 @@
[menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewNote:) target:mainController tag:SKUnderlineNote];
[menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewNote:) target:mainController tag:SKStrikeOutNote];
[menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewNote:) target:mainController tag:SKLineNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewNote:) target:mainController tag:SKInkNote];
[item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip
message")];
@@ -550,6 +551,7 @@
[noteButton setHelp:NSLocalizedString(@"Add New Underline", @"Tool
tip message") forSegment:SKUnderlineNote];
[noteButton setHelp:NSLocalizedString(@"Add New Strike Out",
@"Tool tip message") forSegment:SKStrikeOutNote];
[noteButton setHelp:NSLocalizedString(@"Add New Line", @"Tool tip
message") forSegment:SKLineNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Freehand", @"Tool
tip message") forSegment:SKInkNote];
[noteButton setSegmentStyle:NSSegmentStyleSeparated];
[item setViewWithSizes:noteButton];
[item setMenuFormRepresentation:menuItem];
Modified: trunk/SKMainTouchBarController.m
===================================================================
--- trunk/SKMainTouchBarController.m 2021-12-28 22:30:11 UTC (rev 12659)
+++ trunk/SKMainTouchBarController.m 2021-12-29 10:22:02 UTC (rev 12660)
@@ -241,7 +241,8 @@
[NSImage
imageNamed:SKImageNameTouchBarAddHighlightNote],
[NSImage
imageNamed:SKImageNameTouchBarAddUnderlineNote],
[NSImage
imageNamed:SKImageNameTouchBarAddStrikeOutNote],
- [NSImage
imageNamed:SKImageNameTouchBarAddLineNote], nil];
+ [NSImage
imageNamed:SKImageNameTouchBarAddLineNote],
+ [NSImage
imageNamed:SKImageNameTouchBarAddInkNote], nil];
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
noteButton = [[NSSegmentedControl
segmentedControlWithImages:images trackingMode:NSSegmentSwitchTrackingMomentary
target:self action:@selector(createNewNote:)] retain];
Modified: trunk/de.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/en.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/es.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/fr.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/it.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/ja.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/nl.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/pl.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_CN.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_TW.lproj/Localizable.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
