diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index de75dbf7f..d331788b2 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -2,18 +2,18 @@ 1050 - 9C31 - 644 + 9C7010 + 652 949.26 352.00 YES - - + - + + YES @@ -180,7 +180,7 @@ {{0, 14}, {96, 15}} YES - 604110336 + 604372736 131072 @@ -755,6 +755,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ YES + {3.40282e+38, 3.40282e+38} 256 @@ -1272,6 +1273,7 @@ MDA4AA {{0, 0}, {1680, 1028}} + {3.40282e+38, 3.40282e+38} Cog @@ -2359,6 +2361,8 @@ MDA4AA View + {3.40282e+38, 3.40282e+38} + {213, 107} 256 @@ -2649,6 +2653,8 @@ MDA4AA View + {3.40282e+38, 3.40282e+38} + {213, 107} 256 @@ -7919,6 +7925,7 @@ MDA4AA 1549.CustomClassName 1549.IBPluginDependency 1549.ImportedFromIB2 + 1550.CustomClassName 1550.IBPluginDependency 1550.ImportedFromIB2 1551.IBPluginDependency @@ -8077,7 +8084,6 @@ MDA4AA 21.ImportedFromIB2 21.NSWindowTemplate.visibleAtLaunch 21.editorWindowContentRectSynchronizationRect - 21.lastResizeAction 218.CustomClassName 218.IBPluginDependency 218.ImportedFromIB2 @@ -8170,7 +8176,6 @@ MDA4AA 463.IBPluginDependency 463.ImportedFromIB2 463.editorWindowContentRectSynchronizationRect - 463.lastResizeAction 5.IBPluginDependency 5.ImportedFromIB2 513.IBEditorWindowLastContentRect @@ -8442,6 +8447,7 @@ MDA4AA TrackingSlider com.apple.InterfaceBuilder.CocoaPlugin + TrackingCell com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -8600,19 +8606,6 @@ MDA4AA {{25, 14}, {683, 396}} - - YES - - YES - IBResizeActionFinalFrame - IBResizeActionInitialFrame - - - YES - {{355, 127}, {683, 396}} - {{355, 127}, {683, 396}} - - PlaylistController com.apple.InterfaceBuilder.CocoaPlugin @@ -8705,19 +8698,6 @@ MDA4AA com.apple.InterfaceBuilder.CocoaPlugin {{195, 555}, {321, 103}} - - YES - - YES - IBResizeActionFinalFrame - IBResizeActionInitialFrame - - - YES - {{0, 881}, {321, 103}} - {{0, 881}, {321, 103}} - - com.apple.InterfaceBuilder.CocoaPlugin {{193, 397}, {164, 143}} @@ -9462,6 +9442,14 @@ MDA4AA Spotlight/SpotlightWindowController.h + + TrackingCell + NSSliderCell + + IBProjectSource + Utils/TrackingCell.h + + TrackingSlider NSSlider diff --git a/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj b/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj index a8e8f2c59..bac17b1f6 100644 --- a/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj +++ b/Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj @@ -172,10 +172,12 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Shorten" */; + compatibilityVersion = "Xcode 2.4"; hasScannedForEncodings = 1; mainGroup = 0867D691FE84028FC02AAC07 /* Shorten */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; + projectRoot = ""; targets = ( 8DC2EF4F0486A6940098B216 /* Shorten Framework */, ); diff --git a/Utils/TrackingSlider.h b/Utils/TrackingSlider.h index 54087843e..eddaa8ed7 100644 --- a/Utils/TrackingSlider.h +++ b/Utils/TrackingSlider.h @@ -1,4 +1,11 @@ -/* TrackingSlider */ +/* TrackingSlider + This is an ubersimple subclass of NSSlider that + exposes a tracking method on the cell which can + be used to tell if the user is currently dragging the slider. + This is used in the action of the slider (the slider action is + sent continuously) so the position text label is updated, + without actually seeking the song until the mouse is released. + */ #import diff --git a/Utils/TrackingSlider.m b/Utils/TrackingSlider.m index 2f18140a0..b6d2a63fc 100644 --- a/Utils/TrackingSlider.m +++ b/Utils/TrackingSlider.m @@ -3,34 +3,6 @@ @implementation TrackingSlider -- (id)initWithCoder:(NSCoder *)decoder -{ - self = [super initWithCoder:decoder]; - if (self) - { - if (![[self cell] isKindOfClass:[TrackingCell class]]) - { - 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]]; - [self setCell:trackingCell]; - - [trackingCell release]; - } - } - - return self; -} - -+ (Class) cellClass -{ - return [TrackingCell class]; -} - -(BOOL)tracking { return [[self cell] tracking];