Changeset 13870
- Timestamp:
- Jan 26, 2013, 7:17:58 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Transmission.xcodeproj/project.pbxproj
r13828 r13870 270 270 A2AB883E16A399A6008FAD50 /* VDKQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AB883C16A399A6008FAD50 /* VDKQueue.m */; }; 271 271 A2AF1C390A3D0F6200F1575D /* FileOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */; }; 272 A2AF23C816B44FA0003BC59E /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = A2AF23C616B44FA0003BC59E /* log.c */; }; 273 A2AF23C916B44FA0003BC59E /* log.h in Headers */ = {isa = PBXBuildFile; fileRef = A2AF23C716B44FA0003BC59E /* log.h */; }; 272 274 A2B3FB460E5901E700FF78FB /* cli.c in Sources */ = {isa = PBXBuildFile; fileRef = A2B3FB450E5901E700FF78FB /* cli.c */; }; 273 275 A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; … … 975 977 A2AF1C360A3D0F6200F1575D /* FileOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileOutlineView.h; path = macosx/FileOutlineView.h; sourceTree = "<group>"; }; 976 978 A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileOutlineView.m; path = macosx/FileOutlineView.m; sourceTree = "<group>"; }; 979 A2AF23C616B44FA0003BC59E /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = log.c; path = libtransmission/log.c; sourceTree = "<group>"; }; 980 A2AF23C716B44FA0003BC59E /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = libtransmission/log.h; sourceTree = "<group>"; }; 977 981 A2B3FB450E5901E700FF78FB /* cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cli.c; path = cli/cli.c; sourceTree = "<group>"; }; 978 982 A2B5BB7A0D9C7C2300FCB650 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = macosx/es.lproj/AddWindow.xib; sourceTree = "<group>"; }; … … 1729 1733 A2EA522F1686AC0D00180493 /* quark.c */, 1730 1734 A2EA52301686AC0D00180493 /* quark.h */, 1735 A2AF23C616B44FA0003BC59E /* log.c */, 1736 A2AF23C716B44FA0003BC59E /* log.h */, 1731 1737 A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */, 1732 1738 A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */, … … 2070 2076 A25BFD6E167BED3B0039D1AA /* variant.h in Headers */, 2071 2077 A2EA52321686AC0D00180493 /* quark.h in Headers */, 2078 A2AF23C916B44FA0003BC59E /* log.h in Headers */, 2072 2079 ); 2073 2080 runOnlyForDeploymentPostprocessing = 0; … … 2677 2684 A25BFD6D167BED3B0039D1AA /* variant.c in Sources */, 2678 2685 A2EA52311686AC0D00180493 /* quark.c in Sources */, 2686 A2AF23C816B44FA0003BC59E /* log.c in Sources */, 2679 2687 ); 2680 2688 runOnlyForDeploymentPostprocessing = 0; -
trunk/macosx/Controller.m
r13833 r13870 280 280 tr_variantDictAddBool(&settings, TR_KEY_incomplete_dir_enabled, [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]); 281 281 tr_variantDictAddBool(&settings, TR_KEY_lpd_enabled, [fDefaults boolForKey: @"LocalPeerDiscoveryGlobal"]); 282 tr_variantDictAddInt(&settings, TR_KEY_message_level, TR_ MSG_DBG);282 tr_variantDictAddInt(&settings, TR_KEY_message_level, TR_LOG_DEBUG); 283 283 tr_variantDictAddInt(&settings, TR_KEY_peer_limit_global, [fDefaults integerForKey: @"PeersTotal"]); 284 284 tr_variantDictAddInt(&settings, TR_KEY_peer_limit_per_torrent, [fDefaults integerForKey: @"PeersTorrent"]); -
trunk/macosx/MessageWindowController.m
r13868 r13870 28 28 #import "NSMutableArrayAdditions.h" 29 29 #import "NSStringAdditions.h" 30 #import <log.h> 30 31 #import <transmission.h> 31 #import <utils.h>32 32 33 33 #define LEVEL_ERROR 0 … … 115 115 switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"]) 116 116 { 117 case TR_ MSG_ERR:117 case TR_LOG_ERROR: 118 118 [fLevelButton selectItemAtIndex: LEVEL_ERROR]; 119 119 break; 120 case TR_ MSG_INF:120 case TR_LOG_INFO: 121 121 [fLevelButton selectItemAtIndex: LEVEL_INFO]; 122 122 break; 123 case TR_ MSG_DBG:123 case TR_LOG_DEBUG: 124 124 [fLevelButton selectItemAtIndex: LEVEL_DEBUG]; 125 125 break; 126 126 default: //safety 127 [[NSUserDefaults standardUserDefaults] setInteger: TR_ MSG_ERR forKey: @"MessageLevel"];127 [[NSUserDefaults standardUserDefaults] setInteger: TR_LOG_ERROR forKey: @"MessageLevel"]; 128 128 [fLevelButton selectItemAtIndex: LEVEL_ERROR]; 129 129 } … … 271 271 switch (level) 272 272 { 273 case TR_ MSG_ERR:273 case TR_LOG_ERROR: 274 274 return [NSImage imageNamed: @"RedDot"]; 275 case TR_ MSG_INF:275 case TR_LOG_INFO: 276 276 return [NSImage imageNamed: @"YellowDot"]; 277 case TR_ MSG_DBG:277 case TR_LOG_DEBUG: 278 278 return [NSImage imageNamed: @"PurpleDot"]; 279 279 default: … … 343 343 { 344 344 case LEVEL_ERROR: 345 level = TR_ MSG_ERR;345 level = TR_LOG_ERROR; 346 346 break; 347 347 case LEVEL_INFO: 348 level = TR_ MSG_INF;348 level = TR_LOG_INFO; 349 349 break; 350 350 case LEVEL_DEBUG: 351 level = TR_ MSG_DBG;351 level = TR_LOG_DEBUG; 352 352 break; 353 353 default: … … 536 536 switch (level) 537 537 { 538 case TR_ MSG_ERR:538 case TR_LOG_ERROR: 539 539 levelString = NSLocalizedString(@"Error", "Message window -> level"); 540 540 break; 541 case TR_ MSG_INF:541 case TR_LOG_INFO: 542 542 levelString = NSLocalizedString(@"Info", "Message window -> level"); 543 543 break; 544 case TR_ MSG_DBG:544 case TR_LOG_DEBUG: 545 545 levelString = NSLocalizedString(@"Debug", "Message window -> level"); 546 546 break; -
trunk/macosx/Torrent.m
r13845 r13870 29 29 #import "TrackerNode.h" 30 30 31 #import "log.h" 31 32 #import "transmission.h" // required by utils.h 32 33 #import "utils.h" // tr_new() … … 99 100 NSString * oldPath = [NSString stringWithUTF8String: oldPathCharString]; 100 101 NSString * path = [oldPath stringByDeletingLastPathComponent]; 101 NSString * oldName = [oldPath lastPathComponent];102 102 NSString * newName = [NSString stringWithUTF8String: newNameCharString]; 103 103 104 104 if (error == 0) 105 105 { 106 NSString * oldName = [oldPath lastPathComponent]; 106 107 void (^__block updateNodeAndChildrenForRename)(FileListNode *) = ^(FileListNode * node) { 107 108 [node updateFromOldName: oldName toNewName: newName inPath: path]; … … 379 380 if (fResumeOnWake) 380 381 { 381 tr_ ninf( fInfo->name, "restarting because of wakeUp" );382 tr_logAddNamedInfo( fInfo->name, "restarting because of wakeUp" ); 382 383 tr_torrentStart(fHandle); 383 384 } … … 855 856 - (void) renameFileNode: (FileListNode *) node withName: (NSString *) newName completionHandler: (void (^)(BOOL didRename)) completionHandler 856 857 { 857 NSParameterAssert(node != nil);858 858 NSParameterAssert([node torrent] == self); 859 859 NSParameterAssert(newName != nil);
Note: See TracChangeset
for help on using the changeset viewer.