diff --git a/macosx/Controller.m b/macosx/Controller.m index 60530f947..9ea065eaf 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -263,7 +263,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy } tr_benc settings; - tr_bencInitDict(&settings, 36); + tr_bencInitDict(&settings, 37); const char * configDir = tr_getDefaultConfigDir("Transmission"); tr_sessionGetDefaultSettings(configDir, &settings); @@ -314,9 +314,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy tr_bencDictAddInt(&settings, TR_PREFS_KEY_PROXY_PORT, [fDefaults integerForKey: @"ProxyPort"]); tr_bencDictAddStr(&settings, TR_PREFS_KEY_PROXY, [[fDefaults stringForKey: @"ProxyAddress"] UTF8String]); tr_bencDictAddStr(&settings, TR_PREFS_KEY_PROXY_USERNAME, [[fDefaults stringForKey: @"ProxyUsername"] UTF8String]); - tr_bencDictAddBool(&settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, [fDefaults boolForKey: @"RPCAuthorize"]); tr_bencDictAddReal(&settings, TR_PREFS_KEY_RATIO, [fDefaults floatForKey: @"RatioLimit"]); tr_bencDictAddBool(&settings, TR_PREFS_KEY_RATIO_ENABLED, [fDefaults boolForKey: @"RatioCheck"]); + tr_bencDictAddBool(&settings, TR_PREFS_KEY_RENAME_PARTIAL_FILES, [fDefaults boolForKey: @"RenamePartialFiles"]); + tr_bencDictAddBool(&settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, [fDefaults boolForKey: @"RPCAuthorize"]); tr_bencDictAddBool(&settings, TR_PREFS_KEY_RPC_ENABLED, [fDefaults boolForKey: @"RPC"]); tr_bencDictAddInt(&settings, TR_PREFS_KEY_RPC_PORT, [fDefaults integerForKey: @"RPCPort"]); tr_bencDictAddStr(&settings, TR_PREFS_KEY_RPC_USERNAME, [[fDefaults stringForKey: @"RPCUsername"] UTF8String]); diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist index 5e8c81361..ae9f1bd49 100644 --- a/macosx/Defaults.plist +++ b/macosx/Defaults.plist @@ -128,6 +128,8 @@ RatioLimit 2 + RenamePartialFiles + RPC RPCAuthorize diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h index 53e235534..834ee2fb3 100644 --- a/macosx/PrefsController.h +++ b/macosx/PrefsController.h @@ -109,6 +109,8 @@ - (void) incompleteFolderSheetShow: (id) sender; - (void) setUseIncompleteFolder: (id) sender; +- (void) setRenamePartialFiles: (id) sender; + - (void) applyRatioSetting: (id) sender; - (void) updateRatioStopField; - (void) setRatioStop: (id) sender; diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index f833a2a7a..f4cc66b64 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -760,6 +760,11 @@ tr_session * fHandle; tr_sessionSetIncompleteDirEnabled(fHandle, [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]); } +- (void) setRenamePartialFiles: (id) sender +{ + tr_sessionSetIncompleteFileNamingEnabled(fHandle, [fDefaults boolForKey: @"RenamePartialFiles"]); +} + - (void) setAutoImport: (id) sender { NSString * path; @@ -1119,6 +1124,9 @@ tr_session * fHandle; const BOOL useIncomplete = tr_sessionIsIncompleteDirEnabled(fHandle); [fDefaults setBool: useIncomplete forKey: @"UseIncompleteDownloadFolder"]; + const BOOL usePartialFileRanaming = tr_sessionIsIncompleteFileNamingEnabled(fHandle); + [fDefaults setBool: usePartialFileRanaming forKey: @"RenamePartialFiles"]; + //peers const uint16_t peersTotal = tr_sessionGetPeerLimit(fHandle); [fDefaults setInteger: peersTotal forKey: @"PeersTotal"]; diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib index cca3f4322..4af32d10e 100644 --- a/macosx/en.lproj/PrefsWindow.xib +++ b/macosx/en.lproj/PrefsWindow.xib @@ -12,9 +12,7 @@ YES - - - + YES @@ -52,16 +50,15 @@ {1.79769e+308, 1.79769e+308} - + 256 {542, 107} - {{0, 0}, {1680, 1028}} {1.79769e+308, 1.79769e+308} - + 256 YES @@ -432,19 +429,18 @@ {542, 331} - NSView NSResponder - + 256 YES 256 - {{13, 10}, {516, 272}} + {{13, 10}, {516, 294}} YES @@ -457,7 +453,7 @@ 256 - {{219, 192}, {182, 26}} + {{219, 214}, {182, 26}} YES @@ -560,7 +556,7 @@ 256 - {{108, 198}, {109, 17}} + {{108, 220}, {109, 17}} YES @@ -576,7 +572,7 @@ 256 - {{44, 198}, {62, 17}} + {{44, 220}, {62, 17}} YES @@ -592,7 +588,7 @@ 256 - {{109, 129}, {188, 18}} + {{109, 151}, {188, 18}} YES @@ -611,10 +607,32 @@ 25 + + + 256 + {{109, 131}, {226, 18}} + + YES + + 67239424 + 0 + Append .part to incomplete files + + + 1211912703 + 2 + + + + + 200 + 25 + + 256 - {{109, 19}, {181, 18}} + {{109, 18}, {181, 18}} YES @@ -636,7 +654,7 @@ 256 - {{293, 14}, {182, 26}} + {{293, 13}, {182, 26}} YES @@ -708,7 +726,7 @@ 256 - {{40, 20}, {66, 17}} + {{40, 19}, {66, 17}} YES @@ -724,7 +742,7 @@ 256 - {{109, 172}, {178, 18}} + {{109, 194}, {178, 18}} YES @@ -746,7 +764,7 @@ 256 - {{290, 167}, {182, 26}} + {{290, 189}, {182, 26}} YES @@ -818,7 +836,7 @@ 256 - {{109, 93}, {283, 18}} + {{109, 95}, {283, 18}} YES @@ -840,7 +858,7 @@ 256 - {{109, 149}, {192, 18}} + {{109, 171}, {192, 18}} YES @@ -862,7 +880,7 @@ 256 - {{128, 53}, {197, 18}} + {{128, 55}, {197, 18}} YES @@ -884,7 +902,7 @@ 256 - {{21, 94}, {86, 17}} + {{21, 96}, {86, 17}} YES @@ -900,7 +918,7 @@ 256 - {{128, 73}, {235, 18}} + {{128, 75}, {235, 18}} YES @@ -920,7 +938,7 @@ - {{10, 33}, {496, 226}} + {{10, 33}, {496, 248}} Adding @@ -936,7 +954,7 @@ 256 - {{311, 134}, {35, 22}} + {{311, 156}, {35, 22}} YES @@ -1019,7 +1037,7 @@ 256 - {{41, 136}, {56, 17}} + {{41, 158}, {56, 17}} YES @@ -1035,7 +1053,7 @@ 256 - {{351, 136}, {101, 17}} + {{351, 158}, {101, 17}} YES @@ -1051,7 +1069,7 @@ 256 - {{100, 195}, {157, 18}} + {{100, 217}, {157, 18}} YES @@ -1073,7 +1091,7 @@ 256 - {{263, 194}, {50, 22}} + {{263, 216}, {50, 22}} YES @@ -1139,7 +1157,7 @@ 256 - {{24, 196}, {73, 17}} + {{24, 218}, {73, 17}} YES @@ -1155,7 +1173,7 @@ 256 - {{118, 176}, {269, 14}} + {{118, 198}, {269, 14}} YES @@ -1183,7 +1201,7 @@ 256 - {{100, 135}, {205, 18}} + {{100, 157}, {205, 18}} YES @@ -1205,7 +1223,7 @@ 256 - {{297, 108}, {35, 22}} + {{297, 130}, {35, 22}} YES @@ -1268,7 +1286,7 @@ 256 - {{337, 110}, {101, 17}} + {{337, 132}, {101, 17}} YES @@ -1284,7 +1302,7 @@ 256 - {{100, 109}, {191, 18}} + {{100, 131}, {191, 18}} YES @@ -1306,7 +1324,7 @@ 256 - {{374, 82}, {41, 22}} + {{374, 104}, {41, 22}} YES @@ -1368,7 +1386,7 @@ 256 - {{420, 84}, {55, 17}} + {{420, 106}, {55, 17}} YES @@ -1384,7 +1402,7 @@ 256 - {{100, 83}, {268, 18}} + {{100, 105}, {268, 18}} YES @@ -1406,7 +1424,7 @@ 256 - {{20, 44}, {77, 17}} + {{20, 66}, {77, 17}} YES @@ -1422,7 +1440,7 @@ 256 - {{298, 38}, {130, 26}} + {{298, 60}, {130, 26}} YES @@ -1474,7 +1492,7 @@ 256 - {{100, 18}, {183, 18}} + {{100, 40}, {183, 18}} YES @@ -1496,7 +1514,7 @@ 256 - {{298, 13}, {130, 26}} + {{298, 35}, {130, 26}} YES @@ -1544,7 +1562,7 @@ 256 - {{100, 43}, {195, 18}} + {{100, 65}, {195, 18}} YES @@ -1564,7 +1582,7 @@ - {{10, 33}, {496, 226}} + {{10, 33}, {496, 248}} Management @@ -1582,7 +1600,8 @@ - {542, 288} + {542, 307} + NSView NSResponder @@ -1925,7 +1944,6 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA {{1, 1}, {141, 169}} - 4 @@ -1953,7 +1971,6 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA {{20, 49}, {143, 171}} - 530 @@ -2232,6 +2249,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{302, 185}, {50, 22}} + YES -1804468671 @@ -2294,6 +2312,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{178, 160}, {100, 18}} + YES 67239424 @@ -2316,6 +2335,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{302, 159}, {50, 22}} + YES -1804468671 @@ -2378,6 +2398,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{178, 186}, {118, 18}} + YES 67239424 @@ -2400,6 +2421,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{357, 186}, {34, 17}} + YES 67239424 @@ -2416,6 +2438,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{357, 160}, {34, 17}} + YES 67239424 @@ -2432,6 +2455,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{17, 187}, {158, 17}} + YES 67239424 @@ -2448,6 +2472,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{302, 117}, {50, 22}} + YES -1804468671 @@ -2510,6 +2535,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{302, 91}, {50, 22}} + YES -1804468671 @@ -2572,6 +2598,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{357, 118}, {34, 17}} + YES 67239424 @@ -2588,6 +2615,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{357, 92}, {34, 17}} + YES 67239424 @@ -2604,6 +2632,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{53, 119}, {122, 17}} + YES 67239424 @@ -2620,6 +2649,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{177, 93}, {82, 17}} + YES 67239424 @@ -2636,6 +2666,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{177, 119}, {100, 17}} + YES 67239424 @@ -2652,6 +2683,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{177, 73}, {348, 14}} + YES 67239424 @@ -2680,6 +2712,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA {{35, 119}, {20, 14}} + YES 130560 @@ -2700,6 +2733,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{178, 49}, {160, 18}} + YES 67239424 @@ -2722,6 +2756,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{402, 23}, {17, 17}} + YES 67239424 @@ -2738,6 +2773,7 @@ AAC/05GAAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA256 {{314, 20}, {86, 27}} + YES 71433728 @@ -2786,6 +2822,7 @@ AAABAAAAAQ 256 {{424, 20}, {86, 27}} + YES 71433728 @@ -2808,6 +2845,7 @@ AAABAAAAAQ 256 {{196, 17}, {113, 26}} + YES -2076049856 @@ -2971,6 +3009,7 @@ AAABAAAAAQ {542, 227} + NSView NSResponder @@ -7836,6 +7875,30 @@ AAABAAAAAQ 1935 + + + value: values.RenamePartialFiles + + + + + + value: values.RenamePartialFiles + value + values.RenamePartialFiles + 2 + + + 1942 + + + + setRenamePartialFiles: + + + + 1944 + @@ -8077,8 +8140,9 @@ AAABAAAAAQ - + + @@ -10608,6 +10672,20 @@ AAABAAAAAQ + + 1939 + + + YES + + + + + + 1940 + + + @@ -11001,8 +11079,11 @@ AAABAAAAAQ 1932.IBPluginDependency 1932.ImportedFromIB2 1933.IBPluginDependency + 1939.IBPluginDependency + 1939.ImportedFromIB2 194.IBPluginDependency 194.ImportedFromIB2 + 1940.IBPluginDependency 195.IBPluginDependency 195.ImportedFromIB2 196.IBPluginDependency @@ -11603,6 +11684,9 @@ AAABAAAAAQ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -11712,7 +11796,7 @@ AAABAAAAAQ com.apple.InterfaceBuilder.CocoaPlugin - {{333, 406}, {542, 288}} + {{333, 387}, {542, 307}} com.apple.InterfaceBuilder.CocoaPlugin {{429, 310}, {539, 288}} @@ -11830,7 +11914,7 @@ AAABAAAAAQ - 1935 + 1944 @@ -12026,6 +12110,7 @@ AAABAAAAAQ setRPCWebUIDiscovery: setRandomPortOnStart: setRatioStop: + setRenamePartialFiles: setSound: setSpeedLimit: setStalled: @@ -12090,6 +12175,7 @@ AAABAAAAAQ id id id + id