diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index d3dc3c91a..b5aecb7c1 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -8,6 +8,7 @@ 352.00 YES + @@ -3428,28 +3429,6 @@ zJLMsszTzPPNFM00zVXNdc2GzabNx83nzgjOKM5JzmnOis6qzrrO2877zxzPPM9dz33Pns++z9/P79AA - - - 258 - {{0, -2}, {400, 5}} - - {0, 0} - - 67239424 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxAA - - - 3 - 2 - 0 - NO - 257 @@ -3654,7 +3633,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSView - + 266 YES @@ -3722,28 +3701,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 255 - - - 258 - {{0, -2}, {457, 5}} - - {0, 0} - - 67239424 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxAA - - - 3 - 2 - 0 - NO - 268 @@ -3961,6 +3918,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {457, 23} + StatusBarView NSView @@ -7516,7 +7474,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - @@ -7544,24 +7501,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - 2066 - - - YES - - - 256 - {{2, 2}, {125, 1}} - - - - - - 2067 - - - 2410 @@ -7613,7 +7552,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - @@ -7634,24 +7572,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - 2076 - - - YES - - - 256 - {{2, 2}, {125, 1}} - - - - - - 2077 - - - 2208 @@ -8524,6 +8444,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 1591.ImportedFromIB2 160.IBPluginDependency 160.ImportedFromIB2 + 1603.IBEditorWindowLastContentRect 1603.IBPluginDependency 1603.ImportedFromIB2 1603.editorWindowContentRectSynchronizationRect @@ -8725,16 +8646,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 2061.ImportedFromIB2 2062.IBPluginDependency 2062.ImportedFromIB2 - 2066.IBPluginDependency - 2066.ImportedFromIB2 - 2067.IBPluginDependency - 2067.ImportedFromIB2 2071.IBPluginDependency 2071.ImportedFromIB2 - 2076.IBPluginDependency - 2076.ImportedFromIB2 - 2077.IBPluginDependency - 2077.ImportedFromIB2 21.IBEditorWindowLastContentRect 21.IBPluginDependency 21.IBWindowTemplateEditedContentRect @@ -9098,6 +9011,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin + {{0, 972}, {457, 23}} com.apple.InterfaceBuilder.CocoaPlugin {{0, 972}, {457, 23}} @@ -9301,14 +9215,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{52, 684}, {468, 196}} com.apple.InterfaceBuilder.CocoaPlugin {{52, 684}, {468, 196}} diff --git a/macosx/StatusBarView.h b/macosx/StatusBarView.h index 997c3e35c..3848c3d12 100644 --- a/macosx/StatusBarView.h +++ b/macosx/StatusBarView.h @@ -29,8 +29,6 @@ @interface StatusBarView : NSView { BOOL fShow; - - CTGradient * fGradient; } - (void) setShowOnTiger: (BOOL) show; diff --git a/macosx/StatusBarView.m b/macosx/StatusBarView.m index 9877f593a..5c71f70bf 100644 --- a/macosx/StatusBarView.m +++ b/macosx/StatusBarView.m @@ -33,17 +33,12 @@ if ((self = [super initWithFrame: rect])) { fShow = [NSApp isOnLeopardOrBetter]; - - NSColor * startingColor = [NSColor colorWithCalibratedRed: 208.0/255.0 green: 208.0/255.0 blue: 208.0/255.0 alpha: 1.0]; - NSColor * endingColor = [NSColor colorWithCalibratedRed: 233.0/255.0 green: 233.0/255.0 blue: 233.0/255.0 alpha: 1.0]; - fGradient = [[CTGradient gradientWithBeginningColor: startingColor endingColor: endingColor] retain]; } return self; } - (void) dealloc { - [fGradient release]; [super dealloc]; } @@ -60,7 +55,24 @@ - (void) drawRect: (NSRect) rect { if (fShow) - [fGradient fillRect: rect angle: 90]; + { + [[NSColor controlColor] set]; + NSRectFill(rect); + + NSRect whiteBorderRect = NSMakeRect([self bounds].origin.x, NSMaxY([self bounds]) - 1, [self bounds].size.width, 1); + if (NSIntersectsRect(whiteBorderRect, rect)) + { + [[NSColor whiteColor] set]; + NSRectFill(whiteBorderRect); + } + + NSRect grayBorderRect = NSMakeRect([self bounds].origin.x, 0, [self bounds].size.width, 1); + if (NSIntersectsRect(grayBorderRect, rect)) + { + [[NSColor colorWithCalibratedRed: 188.0/255.0 green: 188.0/255.0 blue: 188.0/255.0 alpha: 1.0] set]; + NSRectFill(grayBorderRect); + } + } } @end diff --git a/macosx/version.sh b/macosx/version.sh index 3175fba33..4688c2f26 100755 --- a/macosx/version.sh +++ b/macosx/version.sh @@ -8,7 +8,7 @@ # "0" for stable, supported releases # these should be the only two lines you need to change PEERID_PREFIX="-TR106Z-" -USERAGENT_PREFIX="1.06+" +USERAGENT_PREFIX="1.10 Test Release 1" SVN_REVISION=`find ./ -name "*\.[chmp]" -o -name "*\.cpp" -o -name "*\.po" -o -name "*\.sh" | \