diff --git a/Custom/ClickField.h b/Custom/ClickField.h index e7183ac8f..b9c36227c 100644 --- a/Custom/ClickField.h +++ b/Custom/ClickField.h @@ -1,8 +1,8 @@ /* ClickField */ #import -#import "RoundBackgroundField.h" -@interface ClickField : RoundBackgroundField + +@interface ClickField : NSTextField { } diff --git a/Custom/RoundBackgroundCell.h b/Custom/RoundBackgroundCell.h deleted file mode 100644 index 21a4e9503..000000000 --- a/Custom/RoundBackgroundCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// RoundBackgroundCell.h -// Cog -// -// Created by Zaphod Beeblebrox on 4/28/06. -// Copyright 2006 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface RoundBackgroundCell : NSTextFieldCell { - NSBezierPath *path; -} - -@end diff --git a/Custom/RoundBackgroundCell.m b/Custom/RoundBackgroundCell.m deleted file mode 100644 index 2880b62d6..000000000 --- a/Custom/RoundBackgroundCell.m +++ /dev/null @@ -1,82 +0,0 @@ -// -// BLRoundedTableCell.m -// -// Created by Fraser Speirs on Wed Mar 17 2004. -// -// This code is placed in the public domain. -// It is based on ideas presented by Apple Computer -// in sample code via ADC, extended to suit the context of -// NSTableViewCell - -#import "RoundBackgroundCell.h" - - -@implementation RoundBackgroundCell - -- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { - NSRect labelRect = [self drawingRectForBounds:cellFrame]; - float capRadius = NSHeight(labelRect) / 2.0; - - // Next, we hack up a slightly different rect for the superclass - // to draw in. This shifts the text to the right out of the - // highlight curve and makes sure the text doesn't jump around - // when the selection changes - float widthIndent = 5.0; - float heightIndent = 2.0; - NSRect newRect = NSMakeRect(cellFrame.origin.x+widthIndent, - cellFrame.origin.y+heightIndent, - cellFrame.size.width-widthIndent, - cellFrame.size.height-heightIndent); - - if([self isHighlighted]) { - [super drawInteriorWithFrame: newRect inView: controlView]; - } - else { - [super drawInteriorWithFrame: newRect inView: controlView]; - NSBezierPath *highlightPath = [[NSBezierPath alloc] init]; - - NSPoint startPoint = NSMakePoint(labelRect.origin.x+capRadius, - labelRect.origin.y+capRadius); - - NSPoint endPoint = NSMakePoint((labelRect.origin.x-capRadius)+(labelRect.size.width), - labelRect.origin.y+capRadius); - - [highlightPath appendBezierPathWithArcWithCenter: startPoint - radius: capRadius - startAngle: 90.0f - endAngle: 270.f - clockwise: NO]; - - [highlightPath appendBezierPathWithArcWithCenter: endPoint - radius: capRadius - startAngle: 270.0f - endAngle: 90.f - clockwise: NO]; - - [highlightPath closePath]; - - // Might want to change the text color here - // NSColor *originalTextColor = [self textColor]; - if (highlightPath) { - [[[NSColor controlAlternatingRowBackgroundColors] objectAtIndex:1] set]; - [highlightPath fill]; - - NSColor *strokeColor = [NSColor secondarySelectedControlColor]; - - [strokeColor set]; - [highlightPath stroke]; - [highlightPath release]; - } - - [super drawInteriorWithFrame: newRect inView: controlView]; - - // And change it back here - /* - if (originalTextColor) { - [self setTextColor:originalTextColor]; - } - - */ - } -} -@end diff --git a/Custom/RoundBackgroundField.h b/Custom/RoundBackgroundField.h deleted file mode 100644 index 81b10714f..000000000 --- a/Custom/RoundBackgroundField.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// RoundBackgroundField.h -// Cog -// -// Created by Zaphod Beeblebrox on 4/28/06. -// Copyright 2006 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface RoundBackgroundField : NSTextField { - -} - -@end diff --git a/Custom/RoundBackgroundField.m b/Custom/RoundBackgroundField.m deleted file mode 100644 index 5c0791b33..000000000 --- a/Custom/RoundBackgroundField.m +++ /dev/null @@ -1,41 +0,0 @@ -// -// RoundBackgroundField.m -// Cog -// -// Created by Zaphod Beeblebrox on 4/28/06. -// Copyright 2006 __MyCompanyName__. All rights reserved. -// - -#import "RoundBackgroundField.h" -#import "RoundBackgroundCell.h" - -@implementation RoundBackgroundField - -- (id)initWithCoder:(NSCoder *)decoder -{ - self = [super initWithCoder:decoder]; - if (self) - { - id cell = [[RoundBackgroundCell alloc] init]; - id oldcell = [self cell]; - - [cell setBackgroundColor: [self backgroundColor]]; - [cell setDrawsBackground: NO]; - - [cell setScrollable:[oldcell isScrollable]]; - [cell setAlignment:[oldcell alignment]]; - [cell setLineBreakMode:[oldcell lineBreakMode]]; - - [cell setAction: [oldcell action]]; - [cell setTarget: [oldcell target]]; - - [cell setStringValue: [oldcell stringValue]]; - - [self setCell: cell]; - [cell release]; - } - - return self; -} - -@end diff --git a/Custom/TrackingSlider.m b/Custom/TrackingSlider.m index 5427be3dc..2f18140a0 100644 --- a/Custom/TrackingSlider.m +++ b/Custom/TrackingSlider.m @@ -13,6 +13,7 @@ TrackingCell *trackingCell; trackingCell = [[TrackingCell alloc] init]; + [trackingCell setControlSize:[[self cell] controlSize]]; [trackingCell setAction:[[self cell] action]]; [trackingCell setContinuous:[[self cell] isContinuous]]; [trackingCell setTarget:[[self cell] target]]; diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings index 7f8d4af5f..697ad9bbd 100644 --- a/English.lproj/Localizable.strings +++ b/English.lproj/Localizable.strings @@ -13,8 +13,8 @@ "PrevButtonTooltip" = "Previous"; "NextButtonTooltip" = "Next"; -"TimeElapsed" = "Time: %i:%02i"; -"TimeRemaining" = "Time: -%i:%02i"; +"TimeElapsed" = "%i:%02i"; +"TimeRemaining" = "-%i:%02i"; "AddButtonTooltip" = "Add files"; "RemoveButtonTooltip" = "Remove selected files"; diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib index 68e562703..357aab90c 100644 --- a/English.lproj/MainMenu.nib/classes.nib +++ b/English.lproj/MainMenu.nib/classes.nib @@ -30,7 +30,7 @@ }; SUPERCLASS = NSObject; }, - {CLASS = ClickField; LANGUAGE = ObjC; SUPERCLASS = RoundBackgroundField; }, + {CLASS = ClickField; LANGUAGE = ObjC; SUPERCLASS = NSTextField; }, { CLASS = DNDArrayController; LANGUAGE = ObjC; diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib index 4cd5a855d..e998d12fe 100644 --- a/English.lproj/MainMenu.nib/info.nib +++ b/English.lproj/MainMenu.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 34 369 617 240 0 0 1024 746 + 141 329 617 240 0 0 1024 746 IBEditorPositions 29 @@ -28,11 +28,11 @@ 3 IBOpenObjects - 823 - 513 - 21 463 + 823 29 + 21 + 513 IBSystem Version 8I127 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index 39429861e..1ee53540a 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/English.lproj/Nib.strings b/English.lproj/Nib.strings index 368b3bf34..a903a9420 100644 Binary files a/English.lproj/Nib.strings and b/English.lproj/Nib.strings differ diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 9848892fb..160df2c8f 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -599,7 +599,7 @@ NSEnumerator *enumerator; PlaylistEntry *entry; - enumerator = [[self arrangedObjects] objectEnumerator]; + enumerator = [[self content] objectEnumerator]; while (entry = [enumerator nextObject]) { [filenames addObject:[entry filename]];