Navigation

← Previous Changeset
Next Changeset →

Changeset 3403

Timestamp:

01/03/06 21:18:14 (3 years ago)

Author:

morris

Message:

Sync with WiredAdditions?

Files:

WiredServer/trunk/PreferencePane/WPWired.m (modified) (1 diff)
WiredServer/trunk/PreferencePane/prefix.pch (modified) (1 diff)
WiredServer/trunk/WCAccountsController.m (modified) (2 diffs)
WiredServer/trunk/WCConfigController.m (modified) (2 diffs)
WiredServer/trunk/WCSettings.h (modified) (1 diff)
WiredServer/trunk/WCStatusController.h (modified) (1 diff)
WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj (modified) (24 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

WiredServer/trunk/PreferencePane/WPWired.m

r3193	r3403
47	47
48	48	+ (void)load {
49		NSBundle bundle, ~~zanka~~Bundle;
	49	NSBundle bundle, wiredBundle;
50	50	NSString *path;
51	51
52	52	bundle = [NSBundle bundleForClass:[self class]];
53		path = [[bundle privateFrameworksPath] stringByAppendingPathComponent:@"~~Zanka~~Additions.framework"];
54		~~zanka~~Bundle = [NSBundle bundleWithPath:path];
	53	path = [[bundle privateFrameworksPath] stringByAppendingPathComponent:@"WiredAdditions.framework"];
	54	wiredBundle = [NSBundle bundleWithPath:path];
55	55
56		if(!~~zanka~~Bundle)
57		NSLog(@"Failed to load ~~Zanka~~Additions.framework from %@", path);
	56	if(!wiredBundle)
	57	NSLog(@"Failed to load WiredAdditions.framework from %@", path);
58	58
59		if(![~~zanka~~Bundle load])
60		NSLog(@"Failed to load %@", ~~zanka~~Bundle);
	59	if(![wiredBundle load])
	60	NSLog(@"Failed to load %@", wiredBundle);
61	61
62	62	[WCSettings loadWithIdentifier:[bundle bundleIdentifier]];

WiredServer/trunk/PreferencePane/prefix.pch

r3199	r3403
32	32	#import <Security/Authorization.h>
33	33	#import <Security/AuthorizationTags.h>
34		#import <~~ZankaAdditions/Zanka~~Additions.h>
	34	#import <WiredAdditions/WiredAdditions.h>
35	35
36	36	// --- BSD layer

WiredServer/trunk/WCAccountsController.m

r3191	r3403
70	70
71	71	- (void)awakeFromNib {
72		ZAIconCell *cell;
	72	WIIconCell *cell;
73	73
74	74	_accounts = [[NSMutableArray alloc] init];
75	75
76		cell = [[ZAIconCell alloc] init];
	76	cell = [[WIIconCell alloc] init];
77	77	[cell setImageWidth:16.0];
78	78	[cell setDrawsWhitespace:YES];
…	…
582	582	return [NSDictionary dictionaryWithObjectsAndKeys:
583	583	[account name],
584		ZAIconCellTitleKey,
	584	WIIconCellTitleKey,
585	585	[account type] == WCAccountUser ? _userImage : _groupImage,
586		ZAIconCellIconKey,
	586	WIIconCellIconKey,
587	587	NULL];
588	588	}

WiredServer/trunk/WCConfigController.m

r3199	r3403
945	945	- (id)tableView:(NSTableView )tableView objectValueForTableColumn:(NSTableColumn )tableColumn row:(int)row {
946	946	NSString tracker, host, *category;
947		ZAURL *url;
	947	WIURL *url;
948	948
949	949	tracker = [[_config arrayForKey:@"tracker"] objectAtIndex:row];
950		url = [ZAURL URLWithString:tracker];
	950	url = [WIURL URLWithString:tracker];
951	951
952	952	if(url) {
…	…
970	970	- (void)tableView:(NSTableView )tableView setObjectValue:(id)object forTableColumn:(NSTableColumn )tableColumn row:(int)row {
971	971	NSString tracker, value = NULL;
972		ZAURL *url;
	972	WIURL *url;
973	973
974	974	tracker = [[_config arrayForKey:@"tracker"] objectAtIndex:row];
975		url = [ZAURL URLWithString:tracker];
	975	url = [WIURL URLWithString:tracker];
976	976
977	977	if(tableColumn == _trackerTableColumn) {

WiredServer/trunk/WCSettings.h

r3193	r3403
27	27	*/
28	28
29		@interface WCSettings : ZASettings
	29	@interface WCSettings : WISettings
30	30
31	31	#define WCPrefixPath @"WCPrefixPath"

WiredServer/trunk/WCStatusController.h

r3011	r3403
43	43	IBOutlet NSTextField *_dataOutPerSecTextField;
44	44
45		IBOutlet ZAGraphView *_usersGraphView;
46		IBOutlet ZAGraphView *_transfersGraphView;
47		IBOutlet ZAGraphView *_bandwidthGraphView;
	45	IBOutlet WIGraphView *_usersGraphView;
	46	IBOutlet WIGraphView *_transfersGraphView;
	47	IBOutlet WIGraphView *_bandwidthGraphView;
48	48
49	49	NSTimer *_timer;

WiredServer/trunk/WiredServer.xcodeproj/project.pbxproj

r3394	r3403
33	33	productName = "Wired Server";
34	34	};
35		A5BE6D2D0864B63000DA5C89 /* ~~Zanka~~ Additions */ = {
	35	A5BE6D2D0864B63000DA5C89 /* Wired Additions */ = {
36	36	isa = PBXAggregateTarget;
37		buildConfigurationList = A5BE6D3E0864B64300DA5C89 /* Build configuration list for PBXAggregateTarget "~~Zanka~~ Additions" */;
	37	buildConfigurationList = A5BE6D3E0864B64300DA5C89 /* Build configuration list for PBXAggregateTarget "Wired Additions" */;
38	38	buildPhases = (
39		A5BE6D2C0864B63000DA5C89 /* Run Script (~~Zanka~~ Additions) */,
	39	A5BE6D2C0864B63000DA5C89 /* Run Script (Wired Additions) */,
40	40	);
41	41	buildSettings = {
…	…
44	44	OTHER_LDFLAGS = "";
45	45	OTHER_REZFLAGS = "";
46		PRODUCT_NAME = "~~Zanka~~ Additions";
	46	PRODUCT_NAME = "Wired Additions";
47	47	SECTORDER_FLAGS = "";
48	48	WARNING_CFLAGS = (
…	…
54	54	dependencies = (
55	55	);
56		name = "~~Zanka~~ Additions";
57		productName = "~~Zanka~~ Additions";
	56	name = "Wired Additions";
	57	productName = "Wired Additions";
58	58	};
59	59	A5D97273078E375B00CD982E /* Localization */ = {
…	…
133	133	A5A3494207298A1600A16E9A /* OK.tiff in Resources / = {isa = PBXBuildFile; fileRef = A5A3493C07298A1600A16E9A / OK.tiff */; };
134	134	A5A3494A07298A2700A16E9A /* Wired.nib in Resources / = {isa = PBXBuildFile; fileRef = A5A3494607298A2700A16E9A / Wired.nib */; };
135		A5BE6D8B0864B6C800DA5C89 /* ~~ZankaAdditions.framework in Copy Files (Frameworks) / = {isa = PBXBuildFile; fileRef = A5BE6D250864B62000DA5C89 / Zanka~~Additions.framework */; };
	135	A5BE6D8B0864B6C800DA5C89 /* WiredAdditions.framework in Copy Files (Frameworks) / = {isa = PBXBuildFile; fileRef = A5BE6D250864B62000DA5C89 / WiredAdditions.framework */; };
136	136	A5E4A9640794799900FA127F /* WCDashboardController.m in Sources / = {isa = PBXBuildFile; fileRef = A5E4A9610794792600FA127F / WCDashboardController.m */; };
137	137	/* End PBXBuildFile section */
…	…
189	189	proxyType = 1;
190	190	remoteGlobalIDString = A5BE6D2D0864B63000DA5C89;
191		remoteInfo = "~~Zanka~~ Additions";
	191	remoteInfo = "Wired Additions";
192	192	};
193	193	A50335E40864CC6600CE6911 /* PBXContainerItemProxy */ = {
…	…
207	207	A5BE6D240864B62000DA5C89 /* PBXContainerItemProxy */ = {
208	208	isa = PBXContainerItemProxy;
209		containerPortal = A5BE6D1C0864B62000DA5C89 /* ~~Zanka~~Additions.xcodeproj */;
	209	containerPortal = A5BE6D1C0864B62000DA5C89 /* WiredAdditions.xcodeproj */;
210	210	proxyType = 2;
211	211	remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
212		remoteInfo = "~~Zanka~~ Additions";
	212	remoteInfo = "Wired Additions";
213	213	};
214	214	A5BE6D260864B62000DA5C89 /* PBXContainerItemProxy */ = {
215	215	isa = PBXContainerItemProxy;
216		containerPortal = A5BE6D1C0864B62000DA5C89 /* ~~Zanka~~Additions.xcodeproj */;
	216	containerPortal = A5BE6D1C0864B62000DA5C89 /* WiredAdditions.xcodeproj */;
217	217	proxyType = 2;
218	218	remoteGlobalIDString = A5E4B39E07A9797200BD6812;
…	…
221	221	A5BE6D280864B62000DA5C89 /* PBXContainerItemProxy */ = {
222	222	isa = PBXContainerItemProxy;
223		containerPortal = A5BE6D1C0864B62000DA5C89 /* ~~Zanka~~Additions.xcodeproj */;
	223	containerPortal = A5BE6D1C0864B62000DA5C89 /* WiredAdditions.xcodeproj */;
224	224	proxyType = 2;
225	225	remoteGlobalIDString = A553B5E007AAF56E005EE3E5;
…	…
228	228	A5BE6D2A0864B62000DA5C89 /* PBXContainerItemProxy */ = {
229	229	isa = PBXContainerItemProxy;
230		containerPortal = A5BE6D1C0864B62000DA5C89 /* ~~Zanka~~Additions.xcodeproj */;
	230	containerPortal = A5BE6D1C0864B62000DA5C89 /* WiredAdditions.xcodeproj */;
231	231	proxyType = 2;
232	232	remoteGlobalIDString = A5E4B55207A98AEE00BD6812;
…	…
252	252	dstSubfolderSpec = 10;
253	253	files = (
254		A5BE6D8B0864B6C800DA5C89 /* ~~Zanka~~Additions.framework in Copy Files (Frameworks) */,
	254	A5BE6D8B0864B6C800DA5C89 /* WiredAdditions.framework in Copy Files (Frameworks) */,
255	255	);
256	256	name = "Copy Files (Frameworks)";
…	…
311	311	A5A3494707298A2700A16E9A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PreferencePane/English.lproj/Wired.nib; sourceTree = "<group>"; };
312	312	A5BE6D1A0864B5FB00DA5C89 /* WiredServer.xcconfig */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xcconfig; path = WiredServer.xcconfig; sourceTree = "<group>"; };
313		A5BE6D1C0864B62000DA5C89 /* ~~ZankaAdditions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ZankaAdditions.xcodeproj; path = ../ZankaAdditions/Zanka~~Additions.xcodeproj; sourceTree = SOURCE_ROOT; };
	313	A5BE6D1C0864B62000DA5C89 /* WiredAdditions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WiredAdditions.xcodeproj; path = ../WiredAdditions/WiredAdditions.xcodeproj; sourceTree = SOURCE_ROOT; };
314	314	A5D972E6078F017100CD982E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; name = Info.plist; path = Package/Info.plist; sourceTree = "<group>"; };
315	315	A5E4A9600794792600FA127F /* WCDashboardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCDashboardController.h; sourceTree = "<group>"; };
316	316	A5E4A9610794792600FA127F /* WCDashboardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCDashboardController.m; sourceTree = "<group>"; };
317		A5E4AAE30794812C00FA127F /* ~~ZankaAdditions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ZankaAdditions.framework; path = ../ZankaAdditions/build/Zanka~~Additions.framework; sourceTree = SOURCE_ROOT; };
	317	A5E4AAE30794812C00FA127F /* WiredAdditions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WiredAdditions.framework; path = ../WiredAdditions/build/WiredAdditions.framework; sourceTree = SOURCE_ROOT; };
318	318	F506C035013D953901CA16C8 /* PreferencePanes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PreferencePanes.framework; path = /System/Library/Frameworks/PreferencePanes.framework; sourceTree = "<absolute>"; };
319	319	/* End PBXFileReference section */
…	…
364	364	F506C035013D953901CA16C8 /* PreferencePanes.framework */,
365	365	A540687705CDC46100068FBB /* Security.framework */,
366		A5E4AAE30794812C00FA127F /* ~~Zanka~~Additions.framework */,
	366	A5E4AAE30794812C00FA127F /* WiredAdditions.framework */,
367	367	);
368	368	name = "Linked Frameworks";
…	…
528	528	isa = PBXGroup;
529	529	children = (
530		A5BE6D250864B62000DA5C89 /* ~~Zanka~~Additions.framework */,
531		A5BE6D270864B62000DA5C89 /* ZAAutoreleasePool Test.app */,
532		A5BE6D290864B62000DA5C89 /* ZANotificationCenter Test.app */,
533		A5BE6D2B0864B62000DA5C89 /* ZAObject Test.app */,
	530	A5BE6D250864B62000DA5C89 /* WiredAdditions.framework */,
	531	A5BE6D270864B62000DA5C89 /* WIAutoreleasePool Test.app */,
	532	A5BE6D290864B62000DA5C89 /* WINotificationCenter Test.app */,
	533	A5BE6D2B0864B62000DA5C89 /* WIObject Test.app */,
534	534	);
535	535	name = Products;
…	…
539	539	isa = PBXGroup;
540	540	children = (
541		A5BE6D1C0864B62000DA5C89 /* ~~Zanka~~Additions.xcodeproj */,
	541	A5BE6D1C0864B62000DA5C89 /* WiredAdditions.xcodeproj */,
542	542	);
543	543	name = Subprojects;
…	…
570	570	);
571	571	buildSettings = {
572		FRAMEWORK_SEARCH_PATHS = ../~~Zanka~~Additions/build;
	572	FRAMEWORK_SEARCH_PATHS = ../WiredAdditions/build;
573	573	GCC_PRECOMPILE_PREFIX_HEADER = YES;
574	574	GCC_PREFIX_HEADER = PreferencePane/prefix.pch;
…	…
623	623	{
624	624	ProductGroup = A5BE6D1D0864B62000DA5C89 /* Products */;
625		ProjectRef = A5BE6D1C0864B62000DA5C89 /* ~~Zanka~~Additions.xcodeproj */;
	625	ProjectRef = A5BE6D1C0864B62000DA5C89 /* WiredAdditions.xcodeproj */;
626	626	},
627	627	);
…	…
629	629	8D202CE80486D31800D8A456 /* Wired Preference Pane */,
630	630	A50335AD0864C98900CE6911 /* Wired Server */,
631		A5BE6D2D0864B63000DA5C89 /* ~~Zanka~~ Additions */,
	631	A5BE6D2D0864B63000DA5C89 /* Wired Additions */,
632	632	A5D97273078E375B00CD982E /* Localization */,
633	633	A5D97284078E387200CD982E /* Distribution */,
…	…
637	637
638	638	/* Begin PBXReferenceProxy section */
639		A5BE6D250864B62000DA5C89 /* ~~Zanka~~Additions.framework */ = {
	639	A5BE6D250864B62000DA5C89 /* WiredAdditions.framework */ = {
640	640	isa = PBXReferenceProxy;
641	641	fileType = wrapper.framework;
642		path = ~~Zanka~~Additions.framework;
	642	path = WiredAdditions.framework;
643	643	remoteRef = A5BE6D240864B62000DA5C89 /* PBXContainerItemProxy */;
644	644	sourceTree = BUILT_PRODUCTS_DIR;
645	645	};
646		A5BE6D270864B62000DA5C89 /* ZAAutoreleasePool Test.app */ = {
	646	A5BE6D270864B62000DA5C89 /* WIAutoreleasePool Test.app */ = {
647	647	isa = PBXReferenceProxy;
648	648	fileType = wrapper.application;
649		path = "ZAAutoreleasePool Test.app";
	649	path = "WIAutoreleasePool Test.app";
650	650	remoteRef = A5BE6D260864B62000DA5C89 /* PBXContainerItemProxy */;
651	651	sourceTree = BUILT_PRODUCTS_DIR;
652	652	};
653		A5BE6D290864B62000DA5C89 /* ZANotificationCenter Test.app */ = {
	653	A5BE6D290864B62000DA5C89 /* WINotificationCenter Test.app */ = {
654	654	isa = PBXReferenceProxy;
655	655	fileType = wrapper.application;
656		path = "ZANotificationCenter Test.app";
	656	path = "WINotificationCenter Test.app";
657	657	remoteRef = A5BE6D280864B62000DA5C89 /* PBXContainerItemProxy */;
658	658	sourceTree = BUILT_PRODUCTS_DIR;
659	659	};
660		A5BE6D2B0864B62000DA5C89 /* ZAObject Test.app */ = {
	660	A5BE6D2B0864B62000DA5C89 /* WIObject Test.app */ = {
661	661	isa = PBXReferenceProxy;
662	662	fileType = wrapper.application;
663		path = "ZAObject Test.app";
	663	path = "WIObject Test.app";
664	664	remoteRef = A5BE6D2A0864B62000DA5C89 /* PBXContainerItemProxy */;
665	665	sourceTree = BUILT_PRODUCTS_DIR;
…	…
718	718	shellScript = "PATH=\"$PATH:/usr/local/bin/\" perl version.pl \|\| exit 1";
719	719	};
720		A5BE6D2C0864B63000DA5C89 /* Run Script (~~Zanka~~ Additions) */ = {
	720	A5BE6D2C0864B63000DA5C89 /* Run Script (Wired Additions) */ = {
721	721	isa = PBXShellScriptBuildPhase;
722	722	buildActionMask = 2147483647;
…	…
725	725	inputPaths = (
726	726	);
727		name = "Run Script (~~Zanka~~ Additions)";
	727	name = "Run Script (Wired Additions)";
728	728	outputPaths = (
729	729	);
730	730	runOnlyForDeploymentPostprocessing = 0;
731	731	shellPath = /bin/sh;
732		shellScript = "cd ../~~ZankaAdditions/\n/usr/bin/xcodebuild -target \"Zanka~~ Additions\" -configuration \"$BUILD_STYLE\" SYMROOT=\"$SYMROOT\" OBJROOT=\"$OBJROOT\" $ACTION \|\| exit 1";
	732	shellScript = "cd ../WiredAdditions/\n/usr/bin/xcodebuild -target \"Wired Additions\" -configuration \"$BUILD_STYLE\" SYMROOT=\"$SYMROOT\" OBJROOT=\"$OBJROOT\" $ACTION \|\| exit 1";
733	733	};
734	734	A5D97272078E375B00CD982E /* Run Script (Localize) */ = {
…	…
790	790	A50335580864C22200CE6911 /* PBXTargetDependency */ = {
791	791	isa = PBXTargetDependency;
792		target = A5BE6D2D0864B63000DA5C89 /* ~~Zanka~~ Additions */;
	792	target = A5BE6D2D0864B63000DA5C89 /* Wired Additions */;
793	793	targetProxy = A50335570864C22200CE6911 /* PBXContainerItemProxy */;
794	794	};
…	…
1133	1133	OTHER_LDFLAGS = "";
1134	1134	OTHER_REZFLAGS = "";
1135		PRODUCT_NAME = "~~Zanka~~ Additions";
	1135	PRODUCT_NAME = "Wired Additions";
1136	1136	SECTORDER_FLAGS = "";
1137	1137	WARNING_CFLAGS = (
…	…
1150	1150	OTHER_LDFLAGS = "";
1151	1151	OTHER_REZFLAGS = "";
1152		PRODUCT_NAME = "~~Zanka~~ Additions";
	1152	PRODUCT_NAME = "Wired Additions";
1153	1153	SECTORDER_FLAGS = "";
1154	1154	WARNING_CFLAGS = (
…	…
1169	1169	OTHER_LDFLAGS = "";
1170	1170	OTHER_REZFLAGS = "";
1171		PRODUCT_NAME = "~~Zanka~~ Additions";
	1171	PRODUCT_NAME = "Wired Additions";
1172	1172	SECTORDER_FLAGS = "";
1173	1173	WARNING_CFLAGS = (
…	…
1232	1232	defaultConfigurationName = "Debug (Native)";
1233	1233	};
1234		A5BE6D3E0864B64300DA5C89 /* Build configuration list for PBXAggregateTarget "~~Zanka~~ Additions" */ = {
	1234	A5BE6D3E0864B64300DA5C89 /* Build configuration list for PBXAggregateTarget "Wired Additions" */ = {
1235	1235	isa = XCConfigurationList;
1236	1236	buildConfigurations = (

Download in other formats: