diff --git a/macosx/Controller.h b/macosx/Controller.h index c2f3a37a0..17b625df4 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -65,7 +65,6 @@ typedef enum IBOutlet NSMenuItem * fOpenIgnoreDownloadFolder; - IBOutlet StatusBarView * fBottomTigerBar; IBOutlet NSBox * fBottomTigerLine; IBOutlet NSButton * fActionButton, * fSpeedLimitButton; NSTimer * fSpeedLimitTimer; diff --git a/macosx/Controller.m b/macosx/Controller.m index 2d1cc7961..1034ed9b4 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -275,17 +275,12 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy [[[fActionButton menu] itemAtIndex: 0] setImage: [NSImage imageNamed: NSImageNameActionTemplate]]; //set in nib if Leopard-only - [fBottomTigerBar removeFromSuperview]; [fBottomTigerLine removeFromSuperview]; [fStatusTigerField removeFromSuperview]; [fStatusTigerImageView removeFromSuperview]; } else { - //bottom bar - [fBottomTigerBar setHidden: NO]; - [fBottomTigerLine setHidden: NO]; - [fActionButton setBezelStyle: NSSmallSquareBezelStyle]; [fSpeedLimitButton setBezelStyle: NSSmallSquareBezelStyle]; diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index 8af886229..e8a8ad1ae 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -8,7 +8,7 @@ 352.00 YES - + YES @@ -42,13 +42,6 @@ 256 YES - - - -2147483358 - {468, 23} - - StatusBarView - 292 @@ -217,7 +210,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - -2147483358 + 290 {{0, 20}, {468, 5}} {0, 0} @@ -1837,7 +1830,7 @@ zJLMsszTzPPNFM00zVXNdc2GzabNx83nzgjOKM5JzmnOis6qzrrO2877zxzPPM9dz33Pns++z9/P79AA Group - 2.800000e+02 + 2.830000e+02 4.800000e+01 3.402823e+38 @@ -5857,14 +5850,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 2757 - - - fBottomTigerBar - - - - 2783 - fBottomTigerLine @@ -6354,7 +6339,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - @@ -8258,16 +8242,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - 2782 - - - - - 2785 - - - 3124 @@ -8378,6 +8352,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + 2785 + + + @@ -8827,8 +8806,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 2731.ImportedFromIB2 2743.IBPluginDependency 2743.ImportedFromIB2 - 2782.IBPluginDependency - 2782.ImportedFromIB2 2785.IBPluginDependency 2785.ImportedFromIB2 2839.IBPluginDependency @@ -9416,8 +9393,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{558, 631}, {183, 33}} com.apple.InterfaceBuilder.CocoaPlugin @@ -9718,7 +9693,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES fActionButton fActiveFilterButton - fBottomTigerBar fBottomTigerLine fCheckRatioItem fDockMenu @@ -9765,7 +9739,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES NSButton FilterButton - StatusBarView NSBox NSMenuItem NSMenu diff --git a/macosx/English.lproj/PrefsWindow.xib b/macosx/English.lproj/PrefsWindow.xib index c2baaf529..0ae789015 100644 --- a/macosx/English.lproj/PrefsWindow.xib +++ b/macosx/English.lproj/PrefsWindow.xib @@ -8,9 +8,9 @@ 352.00 YES - + YES @@ -2934,7 +2934,7 @@ AAABAAAAAQ 256 - {{249, 20}, {96, 22}} + {{249, 20}, {152, 22}} YES