Revision: 12661
http://sourceforge.net/p/skim-app/code/12661
Author: hofman
Date: 2021-12-29 15:24:17 +0000 (Wed, 29 Dec 2021)
Log Message:
-----------
Add freehand note to menu of add line toolbar button
Modified Paths:
--------------
trunk/MainToolbar.xib
trunk/SKMainToolbarController.h
trunk/SKMainToolbarController.m
Modified: trunk/MainToolbar.xib
===================================================================
--- trunk/MainToolbar.xib 2021-12-29 10:22:02 UTC (rev 12660)
+++ trunk/MainToolbar.xib 2021-12-29 15:24:17 UTC (rev 12661)
@@ -126,12 +126,12 @@
</connections>
</segmentedControl>
<segmentedControl verticalHuggingPriority="750"
fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7">
- <rect key="frame" x="132" y="101" width="29" height="25"/>
+ <rect key="frame" x="130" y="101" width="33" height="23"/>
<autoresizingMask key="autoresizingMask"/>
<segmentedCell key="cell" borderStyle="border"
alignment="left" segmentDistribution="fill" style="texturedSquare"
trackingMode="momentary" id="72">
<font key="font" metaFont="system"/>
<segments>
- <segment image="ToolbarAddLineNote"
imageScaling="none" width="27" tag="7"/>
+ <segment image="ToolbarAddLineNoteMenu"
imageScaling="none" width="27" tag="7"/>
</segments>
</segmentedCell>
<connections>
@@ -139,7 +139,7 @@
</connections>
</segmentedControl>
<segmentedControl verticalHuggingPriority="750"
fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8">
- <rect key="frame" x="94" y="101" width="29" height="25"/>
+ <rect key="frame" x="92" y="101" width="33" height="23"/>
<autoresizingMask key="autoresizingMask"/>
<segmentedCell key="cell" borderStyle="border"
alignment="left" segmentDistribution="fill" style="texturedSquare"
trackingMode="momentary" id="71">
<font key="font" metaFont="system"/>
@@ -735,6 +735,7 @@
<image name="ToolbarAddHighlightNoteMenu" width="128" height="128"/>
<image name="ToolbarAddInkNote" width="128" height="128"/>
<image name="ToolbarAddLineNote" width="128" height="128"/>
+ <image name="ToolbarAddLineNoteMenu" width="128" height="128"/>
<image name="ToolbarAddSquareNote" width="128" height="128"/>
<image name="ToolbarAddStrikeOutNote" width="128" height="128"/>
<image name="ToolbarAddTextNote" width="128" height="128"/>
Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h 2021-12-29 10:22:02 UTC (rev 12660)
+++ trunk/SKMainToolbarController.h 2021-12-29 15:24:17 UTC (rev 12661)
@@ -134,6 +134,7 @@
- (void)createNewTextNote:(id)sender;
- (void)createNewCircleNote:(id)sender;
- (void)createNewMarkupNote:(id)sender;
+- (void)createNewLineNote:(id)sender;
- (IBAction)createNewNote:(id)sender;
- (IBAction)changeToolMode:(id)sender;
- (IBAction)selectColor:(id)sender;
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2021-12-29 10:22:02 UTC (rev 12660)
+++ trunk/SKMainToolbarController.m 2021-12-29 15:24:17 UTC (rev 12661)
@@ -519,11 +519,18 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNewLineItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Add
Line", @"Toolbar item label") action:@selector(createNewNote:)
target:mainController tag:SKLineNote];
+ menu = [NSMenu menu];
+ [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewLineNote:) target:self tag:SKLineNote];
+ [menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewLineNote:) target:self tag:SKInkNote];
+ [lineNoteButton setMenu:menu forSegment:0];
+ menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Line", @"Toolbar item
label")];
+ menu = [menuItem submenu];
+ [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 Line", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Line", @"Tool tip
message")];
- [item setTag:SKLineNote];
[item setViewWithSizes:lineNoteButton];
[item setMenuFormRepresentation:menuItem];
@@ -1267,6 +1274,10 @@
[self createNewNoteWithType:[sender tag] forButton:markupNoteButton];
}
+- (void)createNewLineNote:(id)sender {
+ [self createNewNoteWithType:[sender tag] forButton:lineNoteButton];
+}
+
- (IBAction)createNewNote:(id)sender {
if ([mainController.pdfView hideNotes] == NO &&
[mainController.pdfView.document allowsNotes]) {
NSInteger type = [sender selectedTag];
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
