Changeset 3401
- Timestamp:
- 01/03/06 21:08:11 (3 years ago)
- Files:
-
- Tuna/trunk/TNMainController.h (modified) (1 diff)
- Tuna/trunk/TNNode.h (modified) (1 diff)
- Tuna/trunk/TNParser.h (modified) (1 diff)
- Tuna/trunk/TNProfilerController.h (modified) (1 diff)
- Tuna/trunk/TNSessionController.h (modified) (1 diff)
- Tuna/trunk/TNSessionController.m (modified) (2 diffs)
- Tuna/trunk/TNSettings.h (modified) (1 diff)
- Tuna/trunk/TNSub.h (modified) (1 diff)
- Tuna/trunk/TNTree.h (modified) (1 diff)
- Tuna/trunk/Tuna.xcodeproj/project.pbxproj (modified) (24 diffs)
- Tuna/trunk/prefix.pch (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Tuna/trunk/TNMainController.h
r2839 r3401 27 27 */ 28 28 29 @interface TNMainController : ZAObject {29 @interface TNMainController : WIObject { 30 30 IBOutlet NSWindow *_releaseNotesWindow; 31 31 IBOutlet NSTextView *_releaseNotesTextView; Tuna/trunk/TNNode.h
r3375 r3401 29 29 @class TNSub; 30 30 31 @interface TNNode : ZAObject <NSCopying> {31 @interface TNNode : WIObject <NSCopying> { 32 32 @public 33 33 NSMutableArray *_children; Tuna/trunk/TNParser.h
r3375 r3401 29 29 @class TNTree; 30 30 31 @interface TNParser : ZAObject {31 @interface TNParser : WIObject { 32 32 NSString *_string; 33 33 Tuna/trunk/TNProfilerController.h
r2814 r3401 27 27 */ 28 28 29 @interface TNProfilerController : ZAWindowController {29 @interface TNProfilerController : WIWindowController { 30 30 IBOutlet NSComboBox *_scriptComboBox; 31 31 IBOutlet NSButton *_setButton; Tuna/trunk/TNSessionController.h
r2814 r3401 36 36 @class TNTree; 37 37 38 @interface TNSessionController : ZAWindowController {38 @interface TNSessionController : WIWindowController { 39 39 IBOutlet NSTextField *_dataMiningTextField; 40 40 41 IBOutlet ZAOutlineView *_treeOutlineView;41 IBOutlet WIOutlineView *_treeOutlineView; 42 42 IBOutlet NSTableColumn *_selfTableColumn; 43 43 IBOutlet NSTableColumn *_totalTableColumn; Tuna/trunk/TNSessionController.m
r2913 r3401 75 75 76 76 [_treeOutlineView setDefaultHighlightedTableColumnIdentifier:@"Total"]; 77 [_treeOutlineView setDefaultSortOrder: ZASortDescending];77 [_treeOutlineView setDefaultSortOrder:WISortDescending]; 78 78 [_treeOutlineView setOutlineTableColumn:_subTableColumn]; 79 79 [_treeOutlineView setAutosaveName:@"Tree"]; 80 80 [_treeOutlineView setAutosaveTableColumns:YES]; 81 [_treeOutlineView setHighlightedTableColumn:_totalTableColumn sortOrder: ZASortDescending];81 [_treeOutlineView setHighlightedTableColumn:_totalTableColumn sortOrder:WISortDescending]; 82 82 [_treeOutlineView setMenu:[[[NSApp mainMenu] itemWithTag:1] submenu]]; 83 83 … … 476 476 item = [_tree rootNode]; 477 477 478 i = ([_treeOutlineView sortOrder] == ZASortDescending)478 i = ([_treeOutlineView sortOrder] == WISortDescending) 479 479 ? [(TNNode *) item children] - (unsigned int) index - 1 480 480 : (unsigned int) index; Tuna/trunk/TNSettings.h
r2814 r3401 27 27 */ 28 28 29 @interface TNSettings : ZASettings29 @interface TNSettings : WISettings 30 30 31 31 #define TNScriptsHistory @"TNScriptsHistory" Tuna/trunk/TNSub.h
r2814 r3401 27 27 */ 28 28 29 @interface TNSub : ZAObject <NSCopying> {29 @interface TNSub : WIObject <NSCopying> { 30 30 @public 31 31 NSString *_package; Tuna/trunk/TNTree.h
r2814 r3401 29 29 @class TNNode; 30 30 31 @interface TNTree : ZAObject {31 @interface TNTree : WIObject { 32 32 @public 33 33 NSMutableArray *_rootNodes; Tuna/trunk/Tuna.xcodeproj/project.pbxproj
r3390 r3401 23 23 productName = Distribution; 24 24 }; 25 A54D70DD08636C7700441C97 /* ZankaAdditions */ = {25 A54D70DD08636C7700441C97 /* Wired Additions */ = { 26 26 isa = PBXAggregateTarget; 27 buildConfigurationList = A54D711E08636C9700441C97 /* Build configuration list for PBXAggregateTarget " ZankaAdditions" */;27 buildConfigurationList = A54D711E08636C9700441C97 /* Build configuration list for PBXAggregateTarget "Wired Additions" */; 28 28 buildPhases = ( 29 A54D70DC08636C7700441C97 /* Run Script ( ZankaAdditions) */,29 A54D70DC08636C7700441C97 /* Run Script (Wired Additions) */, 30 30 ); 31 31 buildSettings = { … … 34 34 OTHER_LDFLAGS = ""; 35 35 OTHER_REZFLAGS = ""; 36 PRODUCT_NAME = " ZankaAdditions";36 PRODUCT_NAME = "Wired Additions"; 37 37 SECTORDER_FLAGS = ""; 38 38 WARNING_CFLAGS = ( … … 44 44 dependencies = ( 45 45 ); 46 name = " ZankaAdditions";47 productName = " ZankaAdditions";46 name = "Wired Additions"; 47 productName = "Wired Additions"; 48 48 }; 49 49 A5555100083668450044855A /* Localization */ = { … … 71 71 A5092D120836B25E006646D1 /* Tuna.icns in Resources */ = {isa = PBXBuildFile; fileRef = A5092D110836B25E006646D1 /* Tuna.icns */; }; 72 72 A5092D180836B6C9006646D1 /* Document.icns in Resources */ = {isa = PBXBuildFile; fileRef = A5092D170836B6C9006646D1 /* Document.icns */; }; 73 A54D716508636CB600441C97 /* ZankaAdditions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A54D70D008636C6900441C97 /* ZankaAdditions.framework */; };74 A54D716708636CBB00441C97 /* ZankaAdditions.framework in Copy Files (Frameworks) */ = {isa = PBXBuildFile; fileRef = A54D70D008636C6900441C97 /* ZankaAdditions.framework */; };73 A54D716508636CB600441C97 /* WiredAdditions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A54D70D008636C6900441C97 /* WiredAdditions.framework */; }; 74 A54D716708636CBB00441C97 /* WiredAdditions.framework in Copy Files (Frameworks) */ = {isa = PBXBuildFile; fileRef = A54D70D008636C6900441C97 /* WiredAdditions.framework */; }; 75 75 A5554EA5083633FF0044855A /* NSDocumentController-TNAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A5554EA3083633FF0044855A /* NSDocumentController-TNAdditions.m */; }; 76 76 A555512D083668B30044855A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A555512B083668B30044855A /* Localizable.strings */; }; … … 130 130 A54D70CF08636C6900441C97 /* PBXContainerItemProxy */ = { 131 131 isa = PBXContainerItemProxy; 132 containerPortal = A57F85C30833E1BC00DEFE69 /* ZankaAdditions.xcodeproj */;132 containerPortal = A57F85C30833E1BC00DEFE69 /* WiredAdditions.xcodeproj */; 133 133 proxyType = 2; 134 134 remoteGlobalIDString = 8DC2EF5B0486A6940098B216; 135 remoteInfo = " ZankaAdditions";135 remoteInfo = "Wired Additions"; 136 136 }; 137 137 A54D70D108636C6900441C97 /* PBXContainerItemProxy */ = { 138 138 isa = PBXContainerItemProxy; 139 containerPortal = A57F85C30833E1BC00DEFE69 /* ZankaAdditions.xcodeproj */;139 containerPortal = A57F85C30833E1BC00DEFE69 /* WiredAdditions.xcodeproj */; 140 140 proxyType = 2; 141 141 remoteGlobalIDString = A5E4B39E07A9797200BD6812; … … 144 144 A54D70D308636C6900441C97 /* PBXContainerItemProxy */ = { 145 145 isa = PBXContainerItemProxy; 146 containerPortal = A57F85C30833E1BC00DEFE69 /* ZankaAdditions.xcodeproj */;146 containerPortal = A57F85C30833E1BC00DEFE69 /* WiredAdditions.xcodeproj */; 147 147 proxyType = 2; 148 148 remoteGlobalIDString = A553B5E007AAF56E005EE3E5; … … 151 151 A54D70D508636C6900441C97 /* PBXContainerItemProxy */ = { 152 152 isa = PBXContainerItemProxy; 153 containerPortal = A57F85C30833E1BC00DEFE69 /* ZankaAdditions.xcodeproj */;153 containerPortal = A57F85C30833E1BC00DEFE69 /* WiredAdditions.xcodeproj */; 154 154 proxyType = 2; 155 155 remoteGlobalIDString = A5E4B55207A98AEE00BD6812; … … 161 161 proxyType = 1; 162 162 remoteGlobalIDString = A54D70DD08636C7700441C97; 163 remoteInfo = " ZankaAdditions";163 remoteInfo = "Wired Additions"; 164 164 }; 165 165 /* End PBXContainerItemProxy section */ … … 172 172 dstSubfolderSpec = 10; 173 173 files = ( 174 A54D716708636CBB00441C97 /* ZankaAdditions.framework in Copy Files (Frameworks) */,174 A54D716708636CBB00441C97 /* WiredAdditions.framework in Copy Files (Frameworks) */, 175 175 ); 176 176 name = "Copy Files (Frameworks)"; … … 191 191 77E09EDB0839F58F002A4FE2 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/ReleaseNotes.rtf; sourceTree = "<group>"; }; 192 192 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 193 8D1107320486CEB800E47090 /* Tuna.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tuna.app; sourceTree = BUILT_PRODUCTS_DIR; };193 8D1107320486CEB800E47090 /* Tuna.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Tuna.app; sourceTree = BUILT_PRODUCTS_DIR; }; 194 194 A5092D110836B25E006646D1 /* Tuna.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Tuna.icns; sourceTree = "<group>"; }; 195 195 A5092D170836B6C9006646D1 /* Document.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Document.icns; sourceTree = "<group>"; }; … … 198 198 A5554EA3083633FF0044855A /* NSDocumentController-TNAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDocumentController-TNAdditions.m"; sourceTree = "<group>"; }; 199 199 A555512C083668B30044855A /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; 200 A57F85C30833E1BC00DEFE69 /* ZankaAdditions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ZankaAdditions.xcodeproj; path = ../ZankaAdditions/ZankaAdditions.xcodeproj; sourceTree = SOURCE_ROOT; };200 A57F85C30833E1BC00DEFE69 /* WiredAdditions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = WiredAdditions.xcodeproj; path = ../WiredAdditions/WiredAdditions.xcodeproj; sourceTree = SOURCE_ROOT; }; 201 201 A57F862F0833EA9700DEFE69 /* TNDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TNDocument.h; sourceTree = "<group>"; }; 202 202 A57F86300833EA9700DEFE69 /* TNDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TNDocument.m; sourceTree = "<group>"; }; … … 227 227 files = ( 228 228 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 229 A54D716508636CB600441C97 /* ZankaAdditions.framework in Frameworks */,229 A54D716508636CB600441C97 /* WiredAdditions.framework in Frameworks */, 230 230 ); 231 231 runOnlyForDeploymentPostprocessing = 0; … … 331 331 isa = PBXGroup; 332 332 children = ( 333 A54D70D008636C6900441C97 /* ZankaAdditions.framework */,334 A54D70D208636C6900441C97 /* ZAAutoreleasePool Test.app */,335 A54D70D408636C6900441C97 /* ZANotificationCenter Test.app */,336 A54D70D608636C6900441C97 /* ZAObject Test.app */,333 A54D70D008636C6900441C97 /* WiredAdditions.framework */, 334 A54D70D208636C6900441C97 /* WIAutoreleasePool Test.app */, 335 A54D70D408636C6900441C97 /* WINotificationCenter Test.app */, 336 A54D70D608636C6900441C97 /* WIObject Test.app */, 337 337 ); 338 338 name = Products; … … 359 359 isa = PBXGroup; 360 360 children = ( 361 A57F85C30833E1BC00DEFE69 /* ZankaAdditions.xcodeproj */,361 A57F85C30833E1BC00DEFE69 /* WiredAdditions.xcodeproj */, 362 362 ); 363 363 name = Subprojects; … … 419 419 ); 420 420 buildSettings = { 421 FRAMEWORK_SEARCH_PATHS = ../ ZankaAdditions/build;421 FRAMEWORK_SEARCH_PATHS = ../WiredAdditions/build; 422 422 GCC_GENERATE_DEBUGGING_SYMBOLS = NO; 423 423 GCC_PRECOMPILE_PREFIX_HEADER = YES; … … 469 469 { 470 470 ProductGroup = A54D70C808636C6900441C97 /* Products */; 471 ProjectRef = A57F85C30833E1BC00DEFE69 /* ZankaAdditions.xcodeproj */;471 ProjectRef = A57F85C30833E1BC00DEFE69 /* WiredAdditions.xcodeproj */; 472 472 }, 473 473 ); 474 474 targets = ( 475 475 8D1107260486CEB800E47090 /* Tuna */, 476 A54D70DD08636C7700441C97 /* ZankaAdditions */,476 A54D70DD08636C7700441C97 /* Wired Additions */, 477 477 A5555100083668450044855A /* Localization */, 478 478 77E09E3D0839EBE1002A4FE2 /* Distribution */, … … 482 482 483 483 /* Begin PBXReferenceProxy section */ 484 A54D70D008636C6900441C97 /* ZankaAdditions.framework */ = {484 A54D70D008636C6900441C97 /* WiredAdditions.framework */ = { 485 485 isa = PBXReferenceProxy; 486 486 fileType = wrapper.framework; 487 path = ZankaAdditions.framework;487 path = WiredAdditions.framework; 488 488 remoteRef = A54D70CF08636C6900441C97 /* PBXContainerItemProxy */; 489 489 sourceTree = BUILT_PRODUCTS_DIR; 490 490 }; 491 A54D70D208636C6900441C97 /* ZAAutoreleasePool Test.app */ = {491 A54D70D208636C6900441C97 /* WIAutoreleasePool Test.app */ = { 492 492 isa = PBXReferenceProxy; 493 493 fileType = wrapper.application; 494 path = " ZAAutoreleasePool Test.app";494 path = "WIAutoreleasePool Test.app"; 495 495 remoteRef = A54D70D108636C6900441C97 /* PBXContainerItemProxy */; 496 496 sourceTree = BUILT_PRODUCTS_DIR; 497 497 }; 498 A54D70D408636C6900441C97 /* ZANotificationCenter Test.app */ = {498 A54D70D408636C6900441C97 /* WINotificationCenter Test.app */ = { 499 499 isa = PBXReferenceProxy; 500 500 fileType = wrapper.application; 501 path = " ZANotificationCenter Test.app";501 path = "WINotificationCenter Test.app"; 502 502 remoteRef = A54D70D308636C6900441C97 /* PBXContainerItemProxy */; 503 503 sourceTree = BUILT_PRODUCTS_DIR; 504 504 }; 505 A54D70D608636C6900441C97 /* ZAObject Test.app */ = {505 A54D70D608636C6900441C97 /* WIObject Test.app */ = { 506 506 isa = PBXReferenceProxy; 507 507 fileType = wrapper.application; 508 path = " ZAObject Test.app";508 path = "WIObject Test.app"; 509 509 remoteRef = A54D70D508636C6900441C97 /* PBXContainerItemProxy */; 510 510 sourceTree = BUILT_PRODUCTS_DIR; … … 559 559 shellScript = "PATH=\"/usr/local/bin:$PATH\" perl version.pl || exit 1\n"; 560 560 }; 561 A54D70DC08636C7700441C97 /* Run Script ( ZankaAdditions) */ = {561 A54D70DC08636C7700441C97 /* Run Script (Wired Additions) */ = { 562 562 isa = PBXShellScriptBuildPhase; 563 563 buildActionMask = 2147483647; … … 566 566 inputPaths = ( 567 567 ); 568 name = "Run Script ( ZankaAdditions)";568 name = "Run Script (Wired Additions)"; 569 569 outputPaths = ( 570 570 ); 571 571 runOnlyForDeploymentPostprocessing = 0; 572 572 shellPath = /bin/sh; 573 shellScript = "cd ../ ZankaAdditions/\n/usr/bin/xcodebuild -target \"ZankaAdditions\" -configuration \"$BUILD_STYLE\" SYMROOT=\"$SYMROOT\" OBJROOT=\"$OBJROOT\" $ACTION || exit 1";573 shellScript = "cd ../WiredAdditions/\n/usr/bin/xcodebuild -target \"Wired Additions\" -configuration \"$BUILD_STYLE\" SYMROOT=\"$SYMROOT\" OBJROOT=\"$OBJROOT\" $ACTION || exit 1"; 574 574 }; 575 575 A55550FF083668450044855A /* Run Script (Localize) */ = { … … 618 618 A54D70E308636C8000441C97 /* PBXTargetDependency */ = { 619 619 isa = PBXTargetDependency; 620 target = A54D70DD08636C7700441C97 /* ZankaAdditions */;620 target = A54D70DD08636C7700441C97 /* Wired Additions */; 621 621 targetProxy = A54D70E208636C8000441C97 /* PBXContainerItemProxy */; 622 622 }; … … 820 820 OTHER_LDFLAGS = ""; 821 821 OTHER_REZFLAGS = ""; 822 PRODUCT_NAME = " ZankaAdditions";822 PRODUCT_NAME = "Wired Additions"; 823 823 SECTORDER_FLAGS = ""; 824 824 WARNING_CFLAGS = ( … … 837 837 OTHER_LDFLAGS = ""; 838 838 OTHER_REZFLAGS = ""; 839 PRODUCT_NAME = " ZankaAdditions";839 PRODUCT_NAME = "Wired Additions"; 840 840 SECTORDER_FLAGS = ""; 841 841 WARNING_CFLAGS = ( … … 856 856 OTHER_LDFLAGS = ""; 857 857 OTHER_REZFLAGS = ""; 858 PRODUCT_NAME = " ZankaAdditions";858 PRODUCT_NAME = "Wired Additions"; 859 859 SECTORDER_FLAGS = ""; 860 860 WARNING_CFLAGS = ( … … 909 909 defaultConfigurationName = "Debug (Native)"; 910 910 }; 911 A54D711E08636C9700441C97 /* Build configuration list for PBXAggregateTarget " ZankaAdditions" */ = {911 A54D711E08636C9700441C97 /* Build configuration list for PBXAggregateTarget "Wired Additions" */ = { 912 912 isa = XCConfigurationList; 913 913 buildConfigurations = ( Tuna/trunk/prefix.pch
r3201 r3401 29 29 // --- Frameworks 30 30 #import <Cocoa/Cocoa.h> 31 #import < ZankaAdditions/ZankaAdditions.h>31 #import <WiredAdditions/WiredAdditions.h> 32 32 33 33 // --- Macros
