From f49b47145420fa4d2306d2bd813dca345a1c915d Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Fri, 18 Jul 2008 04:54:11 +0000 Subject: [PATCH] the mac app now includes and works with the web ui --- Transmission.xcodeproj/project.pbxproj | 4 ++ libtransmission/platform.c | 16 ++++- macosx/en.lproj/PrefsWindow.xib | 95 +++++++++++++++++++------- 3 files changed, 88 insertions(+), 27 deletions(-) diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 6630a798b..6da393aae 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -110,6 +110,7 @@ A24B65600D3F30870079EA4D /* QuitBadge.png in Resources */ = {isa = PBXBuildFile; fileRef = A24B655F0D3F30870079EA4D /* QuitBadge.png */; }; A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; }; A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; }; + A250EEB60E2ED87B00A688E6 /* web in Resources */ = {isa = PBXBuildFile; fileRef = A250EE800E2ED87B00A688E6 /* web */; }; A256588D0A9A695400E8A03B /* MessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A256588B0A9A695400E8A03B /* MessageWindowController.m */; }; A257C1820CAD3003004E121C /* PeerTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = A257C1800CAD3003004E121C /* PeerTableView.m */; }; A25892640CF1F7E800CCCDDF /* StatsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A25892630CF1F7E800CCCDDF /* StatsWindowController.m */; }; @@ -517,6 +518,7 @@ A24621360C769CF400088E81 /* trevent.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = trevent.c; path = libtransmission/trevent.c; sourceTree = ""; }; A24B655F0D3F30870079EA4D /* QuitBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = QuitBadge.png; path = macosx/Images/QuitBadge.png; sourceTree = ""; }; A24F19070A3A790800C9C145 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = macosx/Sparkle.framework; sourceTree = ""; }; + A250EE800E2ED87B00A688E6 /* web */ = {isa = PBXFileReference; lastKnownFileType = folder; path = web; sourceTree = ""; }; A256588A0A9A695400E8A03B /* MessageWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MessageWindowController.h; path = macosx/MessageWindowController.h; sourceTree = ""; }; A256588B0A9A695400E8A03B /* MessageWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MessageWindowController.m; path = macosx/MessageWindowController.m; sourceTree = ""; }; A257C17F0CAD3003004E121C /* PeerTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PeerTableView.h; path = macosx/PeerTableView.h; sourceTree = ""; }; @@ -994,6 +996,7 @@ A259316A0A73B2CC002F4FE7 /* TransmissionHelp */, A2F8951E0A2D4BA500ED2127 /* Credits.rtf */, A2CB38AE0E1E6896002B514C /* COPYING */, + A250EE800E2ED87B00A688E6 /* web */, 4DE5CCCA0981D9BE00BE280E /* Defaults.plist */, 8D1107310486CEB800E47090 /* Info.plist */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, @@ -1813,6 +1816,7 @@ A26146E10DD4A0160060F033 /* GroupsNoneTemplate.png in Resources */, A2C0C5030E02CB6100D95339 /* Remote.png in Resources */, A2CB38AF0E1E6896002B514C /* COPYING in Resources */, + A250EEB60E2ED87B00A688E6 /* web in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/libtransmission/platform.c b/libtransmission/platform.c index 93ab389d4..bc6d83296 100644 --- a/libtransmission/platform.c +++ b/libtransmission/platform.c @@ -32,6 +32,10 @@ #include #include /* for CSIDL_APPDATA, CSIDL_PROFILE */ #else + #ifdef SYS_DARWIN + #include + #endif + #define _XOPEN_SOURCE 500 /* needed for recursive locks. */ #ifndef __USE_UNIX98 #define __USE_UNIX98 /* some older Linuxes need it spelt out for them */ @@ -540,8 +544,16 @@ tr_getClutchDir( const tr_session * session UNUSED ) else { #ifdef SYS_DARWIN - - #warning hey BentMyWookie can this be implemented here without passing anything into initFull() + + CFURLRef appURL = CFBundleCopyBundleURL( CFBundleGetMainBundle() ); + CFStringRef appRef = CFURLCopyPath( appURL ); + const char * appString = CFStringGetCStringPtr( appRef, CFStringGetFastestEncoding( appRef ) ); + + /*CFURLRef resourcesDirURL = CFBundleCopyResourcesDirectoryURL( CFBundleGetMainBundle() ); + CFStringRef resourcesDirRef = CFURLCopyPath( resourcesDirURL ); + const char * resourcesDirString = CFStringGetCStringPtr( resourcesDirRef, CFStringGetFastestEncoding( resourcesDirRef ) );*/ + + sprintf( path, "%s%s", appString, "Contents/Resources/web" ); #elif defined(WIN32) diff --git a/macosx/en.lproj/PrefsWindow.xib b/macosx/en.lproj/PrefsWindow.xib index 517ff3201..0cca5a0bd 100644 --- a/macosx/en.lproj/PrefsWindow.xib +++ b/macosx/en.lproj/PrefsWindow.xib @@ -8,8 +8,7 @@ 352.00 YES - - + YES @@ -2126,6 +2125,7 @@ AAABAAAAAQ 256 {{151, 94}, {184, 18}} + YES 67239424 @@ -2148,6 +2148,7 @@ AAABAAAAAQ 256 {{54, 115}, {75, 17}} + YES 67239424 @@ -2164,6 +2165,7 @@ AAABAAAAAQ 256 {{132, 114}, {165, 18}} + YES 67239424 @@ -2186,6 +2188,7 @@ AAABAAAAAQ 256 {{42, 218}, {87, 17}} + YES 67239424 @@ -2202,6 +2205,7 @@ AAABAAAAAQ 256 {{131, 218}, {196, 17}} + YES 67239424 @@ -2218,6 +2222,7 @@ AAABAAAAAQ 256 {{332, 216}, {50, 22}} + YES -1804468671 @@ -2284,6 +2289,7 @@ AAABAAAAAQ 256 {{387, 218}, {39, 17}} + YES 67239424 @@ -2300,6 +2306,7 @@ AAABAAAAAQ 256 {{454, 192}, {39, 17}} + YES 67239424 @@ -2316,6 +2323,7 @@ AAABAAAAAQ 256 {{399, 190}, {50, 22}} + YES -1804468671 @@ -2382,6 +2390,7 @@ AAABAAAAAQ 256 {{131, 192}, {263, 17}} + YES 67239424 @@ -2398,6 +2407,7 @@ AAABAAAAAQ 256 {{132, 150}, {280, 18}} + YES 67239424 @@ -2420,6 +2430,7 @@ AAABAAAAAQ 256 {{131, 172}, {259, 14}} + YES 67239424 @@ -2436,6 +2447,7 @@ AAABAAAAAQ 256 {{132, 58}, {289, 18}} + YES 67239424 @@ -2458,6 +2470,7 @@ AAABAAAAAQ 256 {{68, 59}, {61, 17}} + YES 67239424 @@ -2474,6 +2487,7 @@ AAABAAAAAQ 256 {{212, 36}, {306, 17}} + YES 67239488 @@ -2490,6 +2504,7 @@ AAABAAAAAQ 256 {{128, 26}, {85, 32}} + YES 67239424 @@ -2510,6 +2525,7 @@ AAABAAAAAQ 256 {{497, 12}, {21, 23}} + YES 67239424 @@ -2531,6 +2547,7 @@ AAABAAAAAQ {535, 258} + NSView NSResponder @@ -2544,6 +2561,7 @@ AAABAAAAAQ 256 {{497, 12}, {21, 23}} + YES 67239424 @@ -2567,6 +2585,7 @@ AAABAAAAAQ 256 {{38, 34}, {90, 17}} + YES 67239424 @@ -2583,6 +2602,7 @@ AAABAAAAAQ 256 {{131, 33}, {357, 18}} + YES 67239424 @@ -2606,6 +2626,7 @@ AAABAAAAAQ {{315, 253}, {16, 16}} + 28938 1.000000e+02 @@ -2626,6 +2647,7 @@ AAABAAAAAQ {{316, 254}, {14, 14}} + YES 130560 @@ -2646,6 +2668,7 @@ AAABAAAAAQ 256 {{130, 253}, {124, 17}} + YES 67239424 @@ -2662,6 +2685,7 @@ AAABAAAAAQ 256 {{131, 229}, {171, 18}} + YES 67239424 @@ -2684,6 +2708,7 @@ AAABAAAAAQ 256 {{131, 174}, {271, 18}} + YES 67239424 @@ -2706,6 +2731,7 @@ AAABAAAAAQ 256 {{259, 251}, {50, 22}} + YES -1804468671 @@ -2772,6 +2798,7 @@ AAABAAAAAQ 256 {{444, 145}, {50, 22}} + YES -1804468671 @@ -2838,6 +2865,7 @@ AAABAAAAAQ 256 {{130, 213}, {238, 14}} + YES 67239424 @@ -2854,6 +2882,7 @@ AAABAAAAAQ 256 {{335, 253}, {162, 17}} + YES 67239424 @@ -2870,6 +2899,7 @@ AAABAAAAAQ 256 {{67, 254}, {61, 17}} + YES 67239424 @@ -2886,6 +2916,7 @@ AAABAAAAAQ 256 {{84, 175}, {44, 17}} + YES 67239424 @@ -2902,6 +2933,7 @@ AAABAAAAAQ 256 {{201, 145}, {228, 22}} + YES -1804468671 @@ -2919,6 +2951,7 @@ AAABAAAAAQ 256 {{172, 73}, {68, 17}} + YES 67239424 @@ -2935,6 +2968,7 @@ AAABAAAAAQ 256 {{169, 99}, {71, 17}} + YES 67239424 @@ -2951,6 +2985,7 @@ AAABAAAAAQ 256 {{149, 147}, {47, 17}} + YES 67239424 @@ -2967,6 +3002,7 @@ AAABAAAAAQ 256 {{428, 147}, {13, 17}} + YES 67239424 @@ -2983,6 +3019,7 @@ AAABAAAAAQ 256 {{150, 123}, {187, 18}} + YES 67239424 @@ -3005,6 +3042,7 @@ AAABAAAAAQ 256 {{245, 71}, {184, 22}} + YES 343014976 @@ -3026,6 +3064,7 @@ AAABAAAAAQ 256 {{245, 97}, {184, 22}} + YES -1804468671 @@ -3043,6 +3082,7 @@ AAABAAAAAQ 256 {{405, 169}, {92, 26}} + YES -2076049856 @@ -3106,18 +3146,19 @@ AAABAAAAAQ {535, 293} + NSView NSResponder - + 256 YES 256 - {{99, 221}, {96, 17}} + {{100, 221}, {96, 17}} YES @@ -3133,7 +3174,7 @@ AAABAAAAAQ 256 - {{122, 263}, {68, 17}} + {{123, 263}, {68, 17}} YES @@ -3149,7 +3190,7 @@ AAABAAAAAQ 256 - {{119, 291}, {71, 17}} + {{120, 291}, {71, 17}} YES @@ -3165,7 +3206,7 @@ AAABAAAAAQ 256 - {{201, 219}, {50, 22}} + {{202, 219}, {50, 22}} YES @@ -3231,7 +3272,7 @@ AAABAAAAAQ 256 - {{81, 367}, {158, 18}} + {{82, 367}, {158, 18}} YES @@ -3253,7 +3294,7 @@ AAABAAAAAQ 256 - {{100, 315}, {165, 18}} + {{101, 315}, {165, 18}} YES @@ -3275,13 +3316,13 @@ AAABAAAAAQ 256 - {{99, 351}, {285, 14}} + {{100, 351}, {318, 14}} YES 67239424 272760832 - This allows requests from transmission-remote, etc. + This enables the web interface and allows remote requests @@ -3291,7 +3332,7 @@ AAABAAAAAQ 256 - {{195, 261}, {184, 22}} + {{196, 261}, {184, 22}} YES @@ -3312,7 +3353,7 @@ AAABAAAAAQ 256 - {{99, 182}, {123, 17}} + {{100, 182}, {123, 17}} YES @@ -3338,20 +3379,20 @@ AAABAAAAAQ 256 - {332, 95} + {331, 95} YES 256 - {332, 17} + {331, 17} 256 - {{333, 0}, {16, 17}} + {{332, 0}, {16, 17}} @@ -3393,7 +3434,7 @@ AAABAAAAAQ Permission - 8.000000e+01 + 7.900000e+01 4.000000e+01 1.000000e+03 @@ -3476,8 +3517,9 @@ AAABAAAAAQ NO - {{1, 17}, {332, 95}} + {{1, 17}, {331, 95}} + 4 @@ -3485,7 +3527,7 @@ AAABAAAAAQ 256 - {{333, 17}, {15, 95}} + {{332, 17}, {15, 95}} _doScroller: @@ -3508,16 +3550,18 @@ AAABAAAAAQ YES - {{1, 0}, {332, 17}} + {{1, 0}, {331, 17}} + 4 - {{102, 63}, {349, 113}} + {{103, 63}, {348, 113}} + 18 @@ -3529,7 +3573,7 @@ AAABAAAAAQ 292 - {{102, 35}, {67, 23}} + {{103, 35}, {67, 23}} YES @@ -3567,7 +3611,7 @@ AAABAAAAAQ 256 - {{174, 39}, {275, 14}} + {{175, 39}, {275, 14}} YES @@ -3583,7 +3627,7 @@ AAABAAAAAQ 256 - {{195, 289}, {184, 22}} + {{196, 289}, {184, 22}} YES @@ -3619,6 +3663,7 @@ AAABAAAAAQ {535, 403} + NSView NSResponder @@ -9524,7 +9569,7 @@ AAABAAAAAQ - 1714 + 1716