Revision: 7556
http://skim-app.svn.sourceforge.net/skim-app/?rev=7556&view=rev
Author: hofman
Date: 2011-12-04 16:27:52 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
rename global strings
Modified Paths:
--------------
trunk/SKBookmarkController.m
trunk/SKTextWithIconCell.h
trunk/SKTextWithIconCell.m
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2011-12-04 12:47:40 UTC (rev 7555)
+++ trunk/SKBookmarkController.m 2011-12-04 16:27:52 UTC (rev 7556)
@@ -588,7 +588,7 @@
- (id)outlineView:(NSOutlineView *)ov objectValueForTableColumn:(NSTableColumn
*)tableColumn byItem:(id)item {
NSString *tcID = [tableColumn identifier];
if ([tcID isEqualToString:LABEL_COLUMNID]) {
- return [NSDictionary dictionaryWithObjectsAndKeys:[item label],
SKTextWithIconCellStringKey, [item icon], SKTextWithIconCellImageKey, nil];
+ return [NSDictionary dictionaryWithObjectsAndKeys:[item label],
SKTextWithIconStringKey, [item icon], SKTextWithIconImageKey, nil];
} else if ([tcID isEqualToString:FILE_COLUMNID]) {
if ([item bookmarkType] == SKBookmarkTypeFolder || [item bookmarkType]
== SKBookmarkTypeSession) {
NSInteger count = [item countOfChildren];
@@ -605,7 +605,7 @@
- (void)outlineView:(NSOutlineView *)ov setObjectValue:(id)object
forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
NSString *tcID = [tableColumn identifier];
if ([tcID isEqualToString:LABEL_COLUMNID]) {
- NSString *newlabel = [object valueForKey:SKTextWithIconCellStringKey]
?: @"";
+ NSString *newlabel = [object valueForKey:SKTextWithIconStringKey] ?:
@"";
if ([newlabel isEqualToString:[item label]] == NO)
[item setLabel:newlabel];
} else if ([tcID isEqualToString:PAGE_COLUMNID]) {
Modified: trunk/SKTextWithIconCell.h
===================================================================
--- trunk/SKTextWithIconCell.h 2011-12-04 12:47:40 UTC (rev 7555)
+++ trunk/SKTextWithIconCell.h 2011-12-04 16:27:52 UTC (rev 7556)
@@ -38,8 +38,8 @@
#import <Cocoa/Cocoa.h>
-extern NSString *SKTextWithIconCellStringKey;
-extern NSString *SKTextWithIconCellImageKey;
+extern NSString *SKTextWithIconStringKey;
+extern NSString *SKTextWithIconImageKey;
@interface SKTextWithIconCell : NSTextFieldCell {
NSImageCell *imageCell;
Modified: trunk/SKTextWithIconCell.m
===================================================================
--- trunk/SKTextWithIconCell.m 2011-12-04 12:47:40 UTC (rev 7555)
+++ trunk/SKTextWithIconCell.m 2011-12-04 16:27:52 UTC (rev 7556)
@@ -41,8 +41,8 @@
#import "NSGeometry_SKExtensions.h"
#import "NSEvent_SKExtensions.h"
-NSString *SKTextWithIconCellStringKey = @"string";
-NSString *SKTextWithIconCellImageKey = @"image";
+NSString *SKTextWithIconStringKey = @"string";
+NSString *SKTextWithIconImageKey = @"image";
#define BORDER_BETWEEN_EDGE_AND_IMAGE (1.0)
#define BORDER_BETWEEN_IMAGE_AND_TEXT (0.0)
@@ -157,17 +157,17 @@
@implementation SKTextWithIconFormatter
- (NSImage *)imageForObjectValue:(id)obj {
- return [obj isKindOfClass:[NSString class]] ? nil : [obj
valueForKey:SKTextWithIconCellImageKey];
+ return [obj isKindOfClass:[NSString class]] ? nil : [obj
valueForKey:SKTextWithIconImageKey];
}
- (NSString *)stringForObjectValue:(id)obj {
- return [obj isKindOfClass:[NSString class]] ? obj : [obj
valueForKey:SKTextWithIconCellStringKey];
+ return [obj isKindOfClass:[NSString class]] ? obj : [obj
valueForKey:SKTextWithIconStringKey];
}
- (BOOL)getObjectValue:(id *)obj forString:(NSString *)string
errorDescription:(NSString **)error {
// even though 'string' is reported as immutable, it's actually changed
after this method returns and before it's returned by the control!
string = [[string copy] autorelease];
- *obj = [NSDictionary dictionaryWithObjectsAndKeys:string,
SKTextWithIconCellStringKey, nil];
+ *obj = [NSDictionary dictionaryWithObjectsAndKeys:string,
SKTextWithIconStringKey, nil];
return YES;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
