Changeset 666
- Timestamp:
- Jul 23, 2006, 2:22:01 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 16 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/AUTHORS
r620 r666 12 12 + GTK+ interface 13 13 14 Mitchell Livingston <livings124@gmail.com> 15 + OS X interface 16 14 17 Bryan Varner <bryan@varnernet.com> 15 18 + BeOS interface … … 17 20 Michael Demars <keul@m0k.org> 18 21 + OS X interface (Growl notifications, AppleScript) 19 20 Mitchell Livingston <livings124@gmail.com>21 + OS X interface22 22 23 23 … … 63 63 + Badging images, Progress Bar images 64 64 65 Nick Pucius 66 + Mac OS X Help documentation 67 65 68 Rashid Eissing 66 69 + Transfers preferences icon -
trunk/Transmission.xcodeproj/project.pbxproj
r661 r666 108 108 A253F72B0A699373008EE24F /* FilterButtonSelectedMain.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7280A699373008EE24F /* FilterButtonSelectedMain.png */; }; 109 109 A253F72C0A699373008EE24F /* FilterButtonSelectedRight.png in Resources */ = {isa = PBXBuildFile; fileRef = A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */; }; 110 A259317E0A73B2CC002F4FE7 /* Transmission Help in Resources */ = {isa = PBXBuildFile; fileRef = A259316A0A73B2CC002F4FE7 /* Transmission Help */; }; 110 111 A25FCDDF0A37695F002BCBBE /* PauseSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A25FCDDD0A37695F002BCBBE /* PauseSelected.png */; }; 111 112 A25FCDE00A37695F002BCBBE /* ResumeSelected.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */; }; … … 119 120 A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */; }; 120 121 A289EB0C0A33C56D00B082A3 /* ButtonBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */; }; 121 A28C43F40A4A5D700091A302 /* Transmission Help in Resources */ = {isa = PBXBuildFile; fileRef = A28C43EB0A4A5D700091A302 /* Transmission Help */; };122 122 A28DBADC0A33C1D800F4B4A7 /* ActionButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */; }; 123 123 A2912C540A2956E80097A0CA /* PrefsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A2912C520A2956E80097A0CA /* PrefsWindow.nib */; }; … … 255 255 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; }; 256 256 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; }; 257 4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };257 4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; }; 258 258 4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; }; 259 259 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; }; … … 309 309 A253F7280A699373008EE24F /* FilterButtonSelectedMain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedMain.png; path = macosx/Images/FilterButtonSelectedMain.png; sourceTree = "<group>"; }; 310 310 A253F7290A699373008EE24F /* FilterButtonSelectedRight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterButtonSelectedRight.png; path = macosx/Images/FilterButtonSelectedRight.png; sourceTree = "<group>"; }; 311 A259316A0A73B2CC002F4FE7 /* Transmission Help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Transmission Help"; path = "macosx/Transmission Help"; sourceTree = "<group>"; }; 311 312 A25FCDDD0A37695F002BCBBE /* PauseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PauseSelected.png; path = macosx/Images/PauseSelected.png; sourceTree = "<group>"; }; 312 313 A25FCDDE0A37695F002BCBBE /* ResumeSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ResumeSelected.png; path = macosx/Images/ResumeSelected.png; sourceTree = "<group>"; }; … … 319 320 A27ABC220A6ADE410020EC71 /* ImageBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ImageBackgroundView.m; path = macosx/ImageBackgroundView.m; sourceTree = "<group>"; }; 320 321 A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ButtonBorder.png; path = macosx/Images/ButtonBorder.png; sourceTree = "<group>"; }; 321 A28C43EB0A4A5D700091A302 /* Transmission Help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Transmission Help"; path = "macosx/Transmission Help"; sourceTree = "<group>"; };322 322 A28DBADB0A33C1D800F4B4A7 /* ActionButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ActionButton.png; path = macosx/Images/ActionButton.png; sourceTree = "<group>"; }; 323 323 A2912C530A2956E80097A0CA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/PrefsWindow.nib; sourceTree = "<group>"; }; … … 424 424 isa = PBXGroup; 425 425 children = ( 426 A2 8C43EB0A4A5D700091A302/* Transmission Help */,426 A259316A0A73B2CC002F4FE7 /* Transmission Help */, 427 427 A2F8951E0A2D4BA500ED2127 /* Credits.rtf */, 428 428 A2305AA40A3DCCEF00AB2D77 /* ProgressBarEndAdvanced.png */, … … 735 735 A2305AAC0A3DCCEF00AB2D77 /* ProgressBarEndGreen.png in Resources */, 736 736 A2305AAD0A3DCCEF00AB2D77 /* ProgressBarEndGray.png in Resources */, 737 A28C43F40A4A5D700091A302 /* Transmission Help in Resources */,738 737 A2D0E0490A54A97C003C72CF /* Bandwidth.png in Resources */, 739 738 A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */, … … 754 753 A232D29E0A70903E00973B12 /* Filter.png in Resources */, 755 754 A29597350A72A9E10057248B /* StatusBarBackground.png in Resources */, 755 A259317E0A73B2CC002F4FE7 /* Transmission Help in Resources */, 756 756 ); 757 757 runOnlyForDeploymentPostprocessing = 0; -
trunk/macosx/Controller.m
r664 r666 50 50 #define FORUM_URL @"http://transmission.m0k.org/forum/" 51 51 52 static void sleepCallBack(void * controller, io_service_t y, 53 natural_t messageType, void * messageArgument) 52 static void sleepCallBack(void * controller, io_service_t y, natural_t messageType, void * messageArgument) 54 53 { 55 54 Controller * c = controller; … … 2116 2115 : [self windowFrameForAmount: [fFilteredTorrents count]]; 2117 2116 2118 frame.size.width = [fDefaults boolForKey: @"SmallView"] ? [fWindow minSize].width : 4 50.0;2117 frame.size.width = [fDefaults boolForKey: @"SmallView"] ? [fWindow minSize].width : 468.0; 2119 2118 return frame; 2120 2119 } … … 2188 2187 //hide search filter if it overlaps filter buttons 2189 2188 NSRect buttonFrame = [fPauseFilterButton frame]; 2190 BOOL overlap = buttonFrame.origin.x + buttonFrame.size.width + 2.0 > [fSearchFilterField frame].origin.x; 2191 2192 if (![fSearchFilterField isHidden]) 2193 { 2194 if (overlap) 2189 if (buttonFrame.origin.x + buttonFrame.size.width + 2.0 > [fSearchFilterField frame].origin.x) 2190 { 2191 if (![fSearchFilterField isHidden]) 2195 2192 [fSearchFilterField setHidden: YES]; 2196 2193 } 2197 2194 else 2198 2195 { 2199 if ( !overlap)2196 if ([fSearchFilterField isHidden]) 2200 2197 [fSearchFilterField setHidden: NO]; 2201 2198 } -
trunk/macosx/PrefsController.m
r663 r666 67 67 + (void) initialize 68 68 { 69 [[NSUserDefaults standardUserDefaults] registerDefaults: 70 [NSDictionary dictionaryWithContentsOfFile: 69 [[NSUserDefaults standardUserDefaults] registerDefaults: [NSDictionary dictionaryWithContentsOfFile: 71 70 [[NSBundle mainBundle] pathForResource: @"Defaults" ofType: @"plist"]]]; 72 71 }
Note: See TracChangeset
for help on using the changeset viewer.