diff --git a/macosx/English.lproj/PrefsWindow.nib/info.nib b/macosx/English.lproj/PrefsWindow.nib/info.nib index 6167f80ca..f4ad2f2e6 100644 --- a/macosx/English.lproj/PrefsWindow.nib/info.nib +++ b/macosx/English.lproj/PrefsWindow.nib/info.nib @@ -11,9 +11,9 @@ 28 22 331 577 290 0 0 1024 746 41 - 294 420 563 317 0 0 1152 842 + 213 415 563 317 0 0 1152 842 66 - 72 601 563 159 0 0 1152 842 + 294 499 563 159 0 0 1152 842 IBFramework Version 446.1 @@ -24,7 +24,6 @@ IBOpenObjects 66 - 41 IBSystem Version 8J135 diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib index 0db917121..327b224eb 100644 Binary files a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib and b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib differ diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index c1b6e0abd..b2345bf37 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -51,12 +51,12 @@ IBOutlet NSButton * fUploadCheck, * fDownloadCheck, * fSpeedLimitAutoCheck; - IBOutlet NSTextField * fPortField, * fNatStatusField, * fPortStatusField; - IBOutlet NSButton * fNatCheck; - IBOutlet NSImageView * fNatStatusImage, * fPortStatusImage; - IBOutlet NSProgressIndicator * fPortStatusProgress; - NSTimer * fNatStatusTimer; - int fNatStatus; + IBOutlet NSTextField * fPortField, * fNatStatusField, * fPortStatusField; + IBOutlet NSButton * fNatCheck; + IBOutlet NSImageView * fNatStatusImage, * fPortStatusImage; + IBOutlet NSProgressIndicator * fPortStatusProgress; + NSTimer * fNatStatusTimer; + int fNatStatus; IBOutlet NSButton * fRatioCheck; IBOutlet NSTextField * fRatioField; diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index 3485b8016..cb736c98d 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -123,6 +123,7 @@ int bindPort = [fDefaults integerForKey: @"BindPort"]; [fPortField setIntValue: bindPort]; tr_setBindPort(fHandle, bindPort); + [self updatePortStatus]; //set NAT @@ -893,6 +894,10 @@ - (void) showNetworkPref: (id) sender { [self setPrefView: fNetworkView]; + + //get around bug in apple code + if ([fPortStatusImage image]) + [fPortStatusProgress setDisplayedWhenStopped: NO]; } - (void) setPrefView: (NSView *) view