Revision: 6399
http://skim-app.svn.sourceforge.net/skim-app/?rev=6399&view=rev
Author: hofman
Date: 2010-03-31 12:42:07 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
convenience accessors for tag for segment of segmented control
Modified Paths:
--------------
trunk/NSSegmentedControl_SKExtensions.h
trunk/NSSegmentedControl_SKExtensions.m
trunk/SKMainToolbarController.m
Modified: trunk/NSSegmentedControl_SKExtensions.h
===================================================================
--- trunk/NSSegmentedControl_SKExtensions.h 2010-03-31 12:14:58 UTC (rev
6398)
+++ trunk/NSSegmentedControl_SKExtensions.h 2010-03-31 12:42:07 UTC (rev
6399)
@@ -44,5 +44,7 @@
- (NSInteger)selectedTag;
- (void)setEnabledForAllSegments:(BOOL)enabled;
- (void)setToolTip:(NSString *)toolTip forSegment:(NSInteger)segment;
+- (NSInteger)tagForSegment:(NSInteger)segment;
+- (void)setTag:(NSInteger)tag forSegment:(NSInteger)segment;
@end
Modified: trunk/NSSegmentedControl_SKExtensions.m
===================================================================
--- trunk/NSSegmentedControl_SKExtensions.m 2010-03-31 12:14:58 UTC (rev
6398)
+++ trunk/NSSegmentedControl_SKExtensions.m 2010-03-31 12:42:07 UTC (rev
6399)
@@ -57,4 +57,12 @@
[[accessibilitySegments objectAtIndex:segment]
accessibilitySetOverrideValue:toolTip
forAttribute:NSAccessibilityDescriptionAttribute];
}
+- (NSInteger)tagForSegment:(NSInteger)segment {
+ return [[self cell] tagForSegment:segment];
+}
+
+- (void)setTag:(NSInteger)tag forSegment:(NSInteger)segment {
+ [[self cell] setTag:tag forSegment:segment];
+}
+
@end
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2010-03-31 12:14:58 UTC (rev 6398)
+++ trunk/SKMainToolbarController.m 2010-03-31 12:42:07 UTC (rev 6399)
@@ -747,13 +747,13 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
SEL action = [menuItem action];
if (action == @selector(createNewTextNote:)) {
- [menuItem setState:[[textNoteButton cell] tagForSegment:0] ==
[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[textNoteButton tagForSegment:0] == [menuItem tag]
? NSOnState : NSOffState];
return [mainController isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO;
} else if (action == @selector(createNewCircleNote:)) {
- [menuItem setState:[[circleNoteButton cell] tagForSegment:0] ==
[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[circleNoteButton tagForSegment:0] == [menuItem
tag] ? NSOnState : NSOffState];
return [mainController isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO;
} else if (action == @selector(createNewMarkupNote:)) {
- [menuItem setState:[[markupNoteButton cell] tagForSegment:0] ==
[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[markupNoteButton tagForSegment:0] == [menuItem
tag] ? NSOnState : NSOffState];
return [mainController isPresentation] == NO && ([pdfView toolMode] ==
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes]
== NO && [[pdfView currentSelection] hasCharacters];
}
return YES;
@@ -919,8 +919,8 @@
if ([pdfView hideNotes] == NO) {
NSInteger type = [sender tag];
[pdfView addAnnotationWithType:type];
- if (type != [[textNoteButton cell] tagForSegment:0]) {
- [[textNoteButton cell] setTag:type forSegment:0];
+ if (type != [textNoteButton tagForSegment:0]) {
+ [textNoteButton setTag:type forSegment:0];
NSString *imgName = type == SKFreeTextNote ?
SKImageNameToolbarAddTextNoteMenu : SKImageNameToolbarAddAnchoredNoteMenu;
[textNoteButton setImage:[NSImage imageNamed:imgName]
forSegment:0];
}
@@ -931,8 +931,8 @@
if ([pdfView hideNotes] == NO) {
NSInteger type = [sender tag];
[pdfView addAnnotationWithType:type];
- if (type != [[circleNoteButton cell] tagForSegment:0]) {
- [[circleNoteButton cell] setTag:type forSegment:0];
+ if (type != [circleNoteButton tagForSegment:0]) {
+ [circleNoteButton setTag:type forSegment:0];
NSString *imgName = type == SKCircleNote ?
SKImageNameToolbarAddCircleNoteMenu : SKImageNameToolbarAddSquareNoteMenu;
[circleNoteButton setImage:[NSImage imageNamed:imgName]
forSegment:0];
}
@@ -943,8 +943,8 @@
if ([pdfView hideNotes] == NO) {
NSInteger type = [sender tag];
[pdfView addAnnotationWithType:type];
- if (type != [[markupNoteButton cell] tagForSegment:0]) {
- [[markupNoteButton cell] setTag:type forSegment:0];
+ if (type != [markupNoteButton tagForSegment:0]) {
+ [markupNoteButton setTag:type forSegment:0];
NSString *imgName = type == SKHighlightNote ?
SKImageNameToolbarAddHighlightNoteMenu : SKUnderlineNote ?
SKImageNameToolbarAddUnderlineNoteMenu : SKImageNameToolbarAddStrikeOutNoteMenu;
[markupNoteButton setImage:[NSImage imageNamed:imgName]
forSegment:0];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit