Revision: 12204
http://sourceforge.net/p/skim-app/code/12204
Author: hofman
Date: 2021-03-15 18:46:07 +0000 (Mon, 15 Mar 2021)
Log Message:
-----------
Add pacer toolbar item as a group of separate items for sub controls
Modified Paths:
--------------
trunk/MainToolbar.xib
trunk/SKMainToolbarController.m
Modified: trunk/MainToolbar.xib
===================================================================
--- trunk/MainToolbar.xib 2021-03-15 18:12:24 UTC (rev 12203)
+++ trunk/MainToolbar.xib 2021-03-15 18:46:07 UTC (rev 12204)
@@ -608,6 +608,9 @@
<subviews>
<textField verticalHuggingPriority="750"
preferredMaxLayoutWidth="36" translatesAutoresizingMaskIntoConstraints="NO"
id="jHc-Bm-dWJ">
<rect key="frame" x="37" y="2" width="30"
height="21"/>
+ <constraints>
+ <constraint firstAttribute="width"
constant="30" id="vHA-D8-mGk"/>
+ </constraints>
<textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="9cD-jS-bcm">
<numberFormatter key="formatter"
formatterBehavior="default10_4" numberStyle="decimal" formatWidth="-1"
minimumIntegerDigits="1" maximumIntegerDigits="2000000000"
maximumFractionDigits="3" id="cUi-co-kf3">
<real key="minimum" value="1"/>
@@ -641,7 +644,6 @@
</segmentedControl>
</subviews>
<constraints>
- <constraint firstAttribute="width" constant="88"
id="0ln-f5-t3T"/>
<constraint firstAttribute="bottom"
secondItem="Veq-Br-EFG" secondAttribute="bottom" constant="2" id="Aba-cd-Bpz"/>
<constraint firstAttribute="trailing"
secondItem="jYx-ER-Exi" secondAttribute="trailing" constant="3"
id="IXI-A4-r33"/>
<constraint firstItem="jHc-Bm-dWJ"
firstAttribute="centerY" secondItem="Veq-Br-EFG" secondAttribute="centerY"
id="KLi-r5-tDF"/>
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2021-03-15 18:12:24 UTC (rev 12203)
+++ trunk/SKMainToolbarController.m 2021-03-15 18:46:07 UTC (rev 12204)
@@ -99,6 +99,9 @@
#define SKDocumentToolbarColorSwatchItemIdentifier
@"SKDocumentToolbarColorSwatchItemIdentifier"
#define SKDocumentToolbarShareItemIdentifier
@"SKDocumentToolbarShareItemIdentifier"
#define SKDocumentToolbarPacerItemIdentifier
@"SKDocumentToolbarPacerItemIdentifier"
+#define SKDocumentToolbarPacerButtonItemIdentifier
@"SKDocumentToolbarPacerButtonItemIdentifier"
+#define SKDocumentToolbarPacerSpeedFieldItemIdentifier
@"SKDocumentToolbarPacerSpeedFieldItemIdentifier"
+#define SKDocumentToolbarPacerSpeedStepperItemIdentifier
@"SKDocumentToolbarPacerSpeedStepperItemIdentifier"
#define SKDocumentToolbarColorsItemIdentifier
@"SKDocumentToolbarColorsItemIdentifier"
#define SKDocumentToolbarFontsItemIdentifier
@"SKDocumentToolbarFontsItemIdentifier"
#define SKDocumentToolbarLinesItemIdentifier
@"SKDocumentToolbarLinesItemIdentifier"
@@ -736,6 +739,10 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPacerItemIdentifier]) {
+ NSToolbarItemGroup *group = [[[NSToolbarItemGroup alloc]
initWithItemIdentifier:identifier] autorelease];
+ [toolbarItems setObject:group forKey:identifier];
+ item = (id)group;
+
[pacerButton sizeToFit];
NSRect frame;
frame = [pacerButton frame];
@@ -760,14 +767,22 @@
[menu addItemWithTitle:NSLocalizedString(@"Faster", @"Menu item
title") action:@selector(changePacerSpeed:) target:mainController tag:0];
[menu addItemWithTitle:NSLocalizedString(@"Slower", @"Menu item
title") action:@selector(changePacerSpeed:) target:mainController tag:-1];
- [item setLabels:NSLocalizedString(@"Pacer", @"Toolbar item
label")];
+ [item setLabel:NSLocalizedString(@"Pacer", @"Toolbar item label")];
+ [item setPaletteLabel:NSLocalizedString(@"Pacer", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Pacer", @"Tool tip message")];
[pacerButton setHelp:NSLocalizedString(@"Pacer", @"Tool tip
message") forSegment:0];
[pacerSpeedField setToolTip:NSLocalizedString(@"Pacer Speed",
@"Tool tip message")];
[pacerSpeedStepper setToolTip:NSLocalizedString(@"Pacer Speed",
@"Tool tip message")];
- [item setViewWithSizes:pacerView];
[item setMenuFormRepresentation:menuItem];
+ SKToolbarItem *item1 = [[[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarPacerButtonItemIdentifier] autorelease];
+ [item1 setViewWithSizes:pacerButton];
+ SKToolbarItem *item2 = [[[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarPacerSpeedFieldItemIdentifier]
autorelease];
+ [item2 setViewWithSizes:pacerSpeedField];
+ SKToolbarItem *item3 = [[[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarPacerSpeedStepperItemIdentifier]
autorelease];
+ [item3 setViewWithSizes:pacerSpeedStepper];
+ [group setSubitems:[NSArray arrayWithObjects:item1, item2, item3,
nil]];
+
} else if ([identifier
isEqualToString:SKDocumentToolbarColorsItemIdentifier]) {
menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Colors", @"Menu item title")
action:@selector(orderFrontColorPanel:) target:nil];
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
