From 1cac94afc4f8e87e6292e90e62b59699e073b798 Mon Sep 17 00:00:00 2001 From: znek Date: Mon, 3 Jan 2005 18:14:17 +0000 Subject: [PATCH] Applications start on arbitrary ports (once again) + other convenience git-svn-id: http://svn.opengroupware.org/SOPE/trunk@476 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sopex/SOPEX/ChangeLog | 21 + sopex/SOPEX/English.lproj/InfoPlist.strings | Bin 516 -> 536 bytes .../SOPEXBrowserController.nib/info.nib | 4 +- .../keyedobjects.nib | 5654 ++++++++--------- sopex/SOPEX/Info.plist | 2 +- sopex/SOPEX/SOPEXAppController.h | 5 + sopex/SOPEX/SOPEXAppController.m | 69 +- sopex/SOPEX/SOPEXBrowserController.h | 2 + sopex/SOPEX/SOPEXBrowserController.m | 11 + sopex/SOPEX/SOPEXConsole.h | 3 + sopex/SOPEX/SOPEXConsole.m | 6 + sopex/SOPEX/SOPEXStatisticsController.h | 4 + sopex/SOPEX/SOPEXStatisticsController.m | 20 +- sopex/SOPEX/Version | 2 +- 14 files changed, 2935 insertions(+), 2868 deletions(-) diff --git a/sopex/SOPEX/ChangeLog b/sopex/SOPEX/ChangeLog index ff9760af..aa41810f 100644 --- a/sopex/SOPEX/ChangeLog +++ b/sopex/SOPEX/ChangeLog @@ -1,3 +1,24 @@ +2005-01-03 Marcus Mueller + + * v2.0.1 + + * SOPEXAppController.[hm]: applications start on arbitrary port now. + This is managed by some "convenience" insight into WOApplication. + Applications are also restartable now - this might help debugging + a bit. When the last browser window was closed, other windows are + closed automatically - this means the app will terminate then + (even in RAD mode). + + * SOPEXBrowserController.m: notify SOPEXAppController of controller + shutdown during window close. + + * SOPEXConsole.[hm]: new API to close console programmatically and + to ask whether it is visible currently - this is used by + SOPEXAppController to automatically close the console when it's the + last interesting window around. + + * SOPEXStatisticsController.[hm]: same as in SOPEXConsole (s.a.) + 2004-11-23 Marcus Mueller * v2.0.0 diff --git a/sopex/SOPEX/English.lproj/InfoPlist.strings b/sopex/SOPEX/English.lproj/InfoPlist.strings index a2360e083dab266d2b4945b28d7aeb74d78d0e86..32ac9488b56b33c843e2a4afc9ea437a04a520e8 100644 GIT binary patch delta 45 ocmZo+nZYvQB%{&9Q<02DlT{dXIdvI~7z}{WbaDV=Ckjso01HzI^Z)<= delta 37 rcmbQi(!w&~B%|TPQ<0p840;R(3_1)7llL*IPJYX%J-LlB7DNL8))@ IBDocumentLocation - 12 144 356 241 0 0 1152 848 + 24 222 356 241 0 0 1920 1178 IBFramework Version 364.0 IBGroupedObjects @@ -23,7 +23,7 @@ 21 IBSystem Version - 7R28 + 7S215 IBUsesTextArchiving diff --git a/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/keyedobjects.nib b/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/keyedobjects.nib index 18f27582..08ce795a 100644 --- a/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/keyedobjects.nib +++ b/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/keyedobjects.nib @@ -11,22 +11,22 @@ $class CF$UID - 554 + 553 NSClassesKeys CF$UID - 479 + 478 NSClassesValues CF$UID - 480 + 479 NSConnections CF$UID - 405 + 404 NSFontManager @@ -41,34 +41,34 @@ NSNamesKeys CF$UID - 456 + 455 NSNamesValues CF$UID - 457 + 456 NSNextOid 453 NSObjectsKeys CF$UID - 453 + 452 NSObjectsValues CF$UID - 455 + 454 NSOidsKeys CF$UID - 481 + 480 NSOidsValues CF$UID - 482 + 481 NSRoot @@ -126,7 +126,7 @@ $class CF$UID - 51 + 183 NS.objects @@ -140,27 +140,27 @@ $class CF$UID - 404 + 403 NSFrameAutosaveName CF$UID - 403 + 402 NSMaxSize CF$UID - 402 + 401 NSMinSize CF$UID - 401 + 400 NSScreenRect CF$UID - 400 + 399 NSViewClass @@ -210,12 +210,12 @@ $class CF$UID - 85 + 148 NSFrame CF$UID - 399 + 398 NSNextResponder @@ -232,7 +232,7 @@ $class CF$UID - 33 + 63 NS.objects @@ -242,15 +242,15 @@ CF$UID - 379 + 378 CF$UID - 383 + 382 CF$UID - 388 + 387 @@ -258,17 +258,17 @@ $class CF$UID - 378 + 377 NSFont CF$UID - 159 + 260 NSFrame CF$UID - 86 + 149 NSNextResponder @@ -278,7 +278,7 @@ NSSelectedTabViewItem CF$UID - 88 + 374 NSSubviews @@ -293,7 +293,7 @@ NSTabViewItems CF$UID - 87 + 150 NSTvFlags 268435462 @@ -304,7 +304,7 @@ $class CF$UID - 33 + 63 NS.objects @@ -318,12 +318,12 @@ $class CF$UID - 85 + 148 NSFrameSize CF$UID - 84 + 147 NSNextResponder @@ -345,7 +345,7 @@ $class CF$UID - 33 + 63 NS.objects @@ -353,213 +353,169 @@ CF$UID 19 + + CF$UID + 37 + + + CF$UID + 136 + + + CF$UID + 142 + $class CF$UID - 83 - - FrameName - - CF$UID - 0 - - GroupName - - CF$UID - 0 - - NSDragTypes - - CF$UID - 38 + 36 - NSFrameSize + NSCell CF$UID - 52 + 21 - NSNextKeyView + NSEnabled + + NSFrame CF$UID - 21 + 20 NSNextResponder CF$UID 17 - NSSubviews - - CF$UID - 20 - NSSuperview CF$UID 17 NSvFlags - 274 - Preferences - - CF$UID - 53 - - UseBackForwardList - - - - $class - - CF$UID - 33 - - NS.objects - - - CF$UID - 21 - - + 12 + {{116, 527}, {347, 13}} $class CF$UID - 37 + 35 - NSFrameSize + NSBackgroundColor CF$UID - 36 + 27 - NSNextKeyView + NSCellFlags + 67239424 + NSCellFlags2 + 4194304 + NSContents CF$UID - 23 + 22 - NSNextResponder + NSControlView CF$UID 19 - NSSubviews + NSPlaceholderString CF$UID - 22 + 26 - NSSuperview + NSSupport CF$UID - 19 + 23 - NSvFlags - 274 - - - $class + NSTextColor CF$UID - 33 + 32 - NS.objects - - - CF$UID - 23 - - + $class - - CF$UID - 35 - - NSContentView - - CF$UID - 25 - - NSFrameSize - - CF$UID - 34 - - NSNextKeyView CF$UID 25 - NSNextResponder - - CF$UID - 21 - - NSSubviews + NSName CF$UID 24 - NSSuperview - - CF$UID - 21 - - NSsFlags - 0 - NSvFlags - 274 + NSSize + 10 + NSfFlags + 27 + LucidaGrande - $class - - CF$UID - 33 - - NS.objects + $classes - - CF$UID - 25 - + NSFont + NSObject + $classname + NSFont + WO Name $class CF$UID - 32 + 31 - NSBGColor + NSCatalogName CF$UID - 27 + 28 - NSFrameSize + NSColor CF$UID - 26 + 30 - NSNextResponder + NSColorName CF$UID - 23 + 29 - NSSuperview + NSColorSpace + 6 + + System + controlColor + + $class CF$UID - 23 + 31 - NScvFlags - 2 - NSvFlags - 256 + NSColorSpace + 3 + NSWhite + + MC42NjY2NjY2OQA= + + + + $classes + + NSColor + NSObject + + $classname + NSColor - {480, 547} $class @@ -574,18 +530,17 @@ NSColor CF$UID - 30 + 34 NSColorName CF$UID - 29 + 33 NSColorSpace 6 - System - controlBackgroundColor + controlTextColor $class @@ -596,401 +551,77 @@ 3 NSWhite - MC42NjY2NjY2OQA= + MAA= $classes - NSColor - NSObject - - $classname - NSColor - - - $classes - - WebClipView - NSClipView - NSView - NSResponder - NSObject - - $classname - WebClipView - - - $classes - - NSMutableArray - NSArray - NSObject - - $classname - NSMutableArray - - {480, 547} - - $classes - - WebDynamicScrollBarsView - WebCoreScrollView - NSScrollView - NSView - NSResponder + NSTextFieldCell + NSActionCell + NSCell NSObject $classname - WebDynamicScrollBarsView + NSTextFieldCell - {480, 547} $classes - WebFrameView + NSTextField + %NSTextField + NSControl NSView NSResponder NSObject $classname - WebFrameView + NSTextField $class CF$UID - 51 + 135 - NS.objects - - - CF$UID - 39 - - - CF$UID - 40 - - - CF$UID - 41 - - - CF$UID - 42 - - - CF$UID - 43 - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - - Apple PICT pasteboard type - dyn.aqr104pxbsb2g23msr731k8puqy81n6xqr2oooooo - Apple Web Archive pasteboard type - NSStringPboardType - NeXT Rich Text Format v1.0 pasteboard type - NSFilenamesPboardType - Apple URL pasteboard type - Apple HTML pasteboard type - public.url - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - NeXT RTFD pasteboard type - - $classes - - NSMutableSet - NSSet - NSObject - - $classname - NSMutableSet - - {480, 547} - - $class + NSFrame CF$UID - 82 + 134 - Identifier + NSNextResponder CF$UID - 54 + 17 - Values + NSSubviews CF$UID - 55 + 38 - - WebUI - - $class + NSSuperview CF$UID - 81 + 17 - NS.keys - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 58 - - - CF$UID - 59 - - - CF$UID - 60 - - - CF$UID - 61 - - - CF$UID - 62 - - - CF$UID - 63 - - - CF$UID - 64 - - - CF$UID - 65 - - - CF$UID - 66 - - - CF$UID - 67 - - - CF$UID - 68 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - NS.objects - - - CF$UID - 72 - - - CF$UID - 73 - - - CF$UID - 73 - - - CF$UID - 74 - - - CF$UID - 75 - - - CF$UID - 73 - - - CF$UID - 76 - - - CF$UID - 73 - - - CF$UID - 77 - - - CF$UID - 73 - - - CF$UID - 78 - - - CF$UID - 76 - - - CF$UID - 79 - - - CF$UID - 80 - - - CF$UID - 73 - - - CF$UID - 73 - - - - WebUIWebKitFantasyFont - WebUIWebKitAllowAnimatedImageLoopingPreferenceKey - WebUIWebKitJavaEnabled - WebUIWebKitDefaultFontSize - WebUIWebKitMinimumFontSize - WebUIWebKitPluginsEnabled - WebUIWebKitStandardFont - WebUIWebKitJavaScriptEnabled - WebUIWebKitSansSerifFont - WebUIWebKitDisplayImagesKey - WebUIWebKitCursiveFont - WebUIWebKitSerifFont - WebUIWebKitDefaultFixedFontSize - WebUIWebKitFixedFont - WebUIWebKitAllowAnimatedImagesPreferenceKey - WebUIWebKitJavaScriptCanOpenWindowsAutomatically - Papyrus - - 16 - 1 - Times - Helvetica - Apple Chancery - 13 - Courier - - $classes - - NSMutableDictionary - NSDictionary - NSObject - - $classname - NSMutableDictionary - - - $classes - - WebPreferences - NSObject - - $classname - WebPreferences - - - $classes - - WebView - %WebView - NSView - NSResponder - NSObject - - $classname - WebView - - {480, 546} - - $classes - - NSView - NSResponder - NSObject - - $classname - NSView + NSvFlags + 256 - {{0, 19}, {480, 546}} $class CF$UID - 33 + 63 NS.objects CF$UID - 88 - - - CF$UID - 94 - - - CF$UID - 178 - - - CF$UID - 233 + 39 CF$UID - 295 + 106 @@ -998,144 +629,49 @@ $class CF$UID - 93 - - NSColor - - CF$UID - 91 - - NSIdentifier - - CF$UID - 89 - - NSLabel - - CF$UID - 90 - - NSTabView - - CF$UID - 15 - - NSView - - CF$UID - 17 - - - application - Application - - $class - - CF$UID - 31 - - NSCatalogName - - CF$UID - 28 - - NSColor - - CF$UID - 30 - - NSColorName - - CF$UID - 92 - - NSColorSpace - 6 - - controlColor - - $classes - - NSTabViewItem - NSObject - - $classname - NSTabViewItem - - - $class - - CF$UID - 93 - - NSColor - - CF$UID - 91 - - NSIdentifier - - CF$UID - 95 - - NSLabel - - CF$UID - 177 - - NSTabView - - CF$UID - 15 - - NSView - - CF$UID - 96 + 103 - - html - - $class + NSClassName CF$UID - 85 + 105 NSFrameSize CF$UID - 176 + 104 NSNextResponder CF$UID - 0 + 37 NSSubviews CF$UID - 97 + 40 + + NSSuperview + + CF$UID + 37 $class CF$UID - 33 + 63 NS.objects CF$UID - 98 - - - CF$UID - 155 + 41 CF$UID - 167 + 99 @@ -1143,72 +679,72 @@ $class CF$UID - 154 + 98 NSContentView CF$UID - 100 + 43 NSFrame CF$UID - 153 + 97 NSHScroller CF$UID - 150 + 94 NSNextKeyView CF$UID - 100 + 43 NSNextResponder CF$UID - 96 + 39 NSSubviews CF$UID - 99 + 42 NSSuperview CF$UID - 96 + 39 NSVScroller CF$UID - 146 + 90 NSsFlags 18 NSvFlags - 274 + 256 $class CF$UID - 33 + 63 NS.objects CF$UID - 100 + 43 CF$UID - 146 + 90 CF$UID - 150 + 94 @@ -1216,52 +752,47 @@ $class CF$UID - 145 + 89 NSBGColor CF$UID - 118 - - NSBounds - - CF$UID - 142 + 67 NSCursor CF$UID - 143 + 87 NSDocView CF$UID - 102 + 45 NSFrame CF$UID - 141 + 86 NSNextKeyView CF$UID - 102 + 45 NSNextResponder CF$UID - 98 + 41 NSSubviews CF$UID - 101 + 44 NSSuperview CF$UID - 98 + 41 NScvFlags 4 @@ -1272,13 +803,13 @@ $class CF$UID - 33 + 63 NS.objects CF$UID - 102 + 45 @@ -1286,129 +817,78 @@ $class CF$UID - 140 + 85 - NSDelegate + NSClassName CF$UID - 0 + 46 - NSDragTypes + NSDelegate CF$UID - 103 + 0 - NSFrame + NSFrameSize CF$UID - 108 + 48 NSMaxSize CF$UID - 139 + 84 NSNextResponder CF$UID - 100 + 43 + + NSOriginalClassName + + CF$UID + 47 NSSharedData CF$UID - 117 + 66 NSSuperview CF$UID - 100 + 43 NSTVFlags 6 NSTextContainer CF$UID - 109 + 49 NSvFlags 2066 + SOPEXTextView + NSTextView + {463, 239} $class CF$UID - 51 - - NS.objects - - - CF$UID - 104 - - - CF$UID - 39 - - - CF$UID - 42 - - - CF$UID - 43 - - - CF$UID - 105 - - - CF$UID - 46 - - - CF$UID - 44 - - - CF$UID - 48 - - - CF$UID - 50 - - - CF$UID - 106 - - - CF$UID - 107 - - - - Apple PDF pasteboard type - NeXT Encapsulated PostScript v1.2 pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - {{0, 124}, {463, 523}} - - $class - - CF$UID - 116 + 65 NSLayoutManager CF$UID - 110 + 50 NSTCFlags 1 NSTextView CF$UID - 102 + 45 NSWidth 463 @@ -1417,7 +897,7 @@ $class CF$UID - 115 + 64 NSDelegate @@ -1429,19 +909,24 @@ NSTextContainers CF$UID - 114 + 62 NSTextStorage CF$UID - 111 + 51 $class CF$UID - 113 + 61 + + NSAttributes + + CF$UID + 53 NSDelegate @@ -1451,7 +936,7 @@ NSString CF$UID - 112 + 52 @@ -1461,7 +946,86 @@ 6 NS.string - + source + + + $class + + CF$UID + 60 + + NS.keys + + + CF$UID + 54 + + + CF$UID + 55 + + + NS.objects + + + CF$UID + 56 + + + CF$UID + 58 + + + + NSFont + NSParagraphStyle + + $class + + CF$UID + 25 + + NSName + + CF$UID + 57 + + NSSize + 10 + NSfFlags + 18 + + Monaco + + $class + + CF$UID + 59 + + NSTabStops + + CF$UID + 0 + + + + $classes + + NSMutableParagraphStyle + NSParagraphStyle + NSObject + + $classname + NSMutableParagraphStyle + + + $classes + + NSDictionary + NSObject + + $classname + NSDictionary $classes @@ -1478,16 +1042,26 @@ $class CF$UID - 33 + 63 NS.objects CF$UID - 109 + 49 + + $classes + + NSMutableArray + NSArray + NSObject + + $classname + NSMutableArray + $classes @@ -1510,12 +1084,12 @@ $class CF$UID - 138 + 83 NSBackgroundColor CF$UID - 118 + 67 NSDefaultParagraphStyle @@ -1523,65 +1097,27 @@ 0 NSFlags - 11105 + 12259 NSInsertionColor CF$UID - 121 - - NSLinkAttributes - - CF$UID - 130 - - NSMarkedAttributes - - CF$UID - 0 - - NSSelectedAttributes - - CF$UID - 122 - - - - $class - - CF$UID - 31 - - NSCatalogName - - CF$UID - 28 + 34 - NSColor + NSLinkAttributes CF$UID - 120 + 75 - NSColorName + NSMarkedAttributes CF$UID - 119 + 0 - NSColorSpace - 6 - - controlHighlightColor - - $class + NSSelectedAttributes CF$UID - 31 + 68 - NSColorSpace - 3 - NSWhite - - MQA= - $class @@ -1593,35 +1129,35 @@ 3 NSWhite - MAA= + MQA= $class CF$UID - 129 + 60 NS.keys CF$UID - 123 + 69 CF$UID - 124 + 70 NS.objects CF$UID - 125 + 71 CF$UID - 127 + 73 @@ -1646,7 +1182,7 @@ NSColorName CF$UID - 126 + 72 NSColorSpace 6 @@ -1666,60 +1202,51 @@ NSColor CF$UID - 121 + 34 NSColorName CF$UID - 128 + 74 NSColorSpace 6 selectedTextColor - - $classes - - NSDictionary - NSObject - - $classname - NSDictionary - $class CF$UID - 129 + 60 NS.keys CF$UID - 131 + 76 CF$UID - 132 + 77 CF$UID - 124 + 70 NS.objects CF$UID - 133 + 78 CF$UID - 134 + 79 CF$UID - 137 + 82 @@ -1730,14 +1257,14 @@ $class CF$UID - 136 + 81 NSCursorType 13 NSHotSpot CF$UID - 135 + 80 {8, -8} @@ -1776,30 +1303,25 @@ $classes - NSTextView - %NSTextView - NSText - NSView - NSResponder + NSClassSwapper NSObject $classname - NSTextView + NSClassSwapper - {{1, 1}, {463, 523}} - {{0, 124}, {463, 523}} + {{1, 1}, {463, 239}} $class CF$UID - 136 + 81 NSCursorType 1 NSHotSpot CF$UID - 144 + 88 {4, -5} @@ -1818,39 +1340,39 @@ $class CF$UID - 149 + 93 NSAction CF$UID - 148 + 92 NSCurValue 1 NSFrame CF$UID - 147 + 91 NSNextResponder CF$UID - 98 + 41 NSSuperview CF$UID - 98 + 41 NSTarget CF$UID - 98 + 41 NSvFlags 256 - {{464, 1}, {15, 523}} + {{464, 1}, {15, 239}} _doScroller: $classes @@ -1868,36 +1390,36 @@ $class CF$UID - 149 + 93 NSAction CF$UID - 152 + 96 NSCurValue 1 NSFrame CF$UID - 151 + 95 NSNextResponder CF$UID - 98 + 41 NSPercent 0.94565218687057495 NSSuperview CF$UID - 98 + 41 NSTarget CF$UID - 98 + 41 NSsFlags 1 @@ -1906,7 +1428,7 @@ {{-100, -100}, {87, 18}} _doScroller: - {{0, -1}, {480, 525}} + {{0, 39}, {480, 241}} $classes @@ -1922,716 +1444,808 @@ $class CF$UID - 166 + 103 - NSCell + NSClassName CF$UID - 157 + 101 + + NSExtension + + CF$UID + 102 - NSEnabled - NSFrame CF$UID - 156 + 100 NSNextResponder CF$UID - 96 + 39 NSSuperview CF$UID - 96 + 39 NSvFlags - 9 + 2 - {{397, 526}, {64, 16}} + {{0, 20}, {480, 19}} + MLHierarchyView + NSControl + + $classes + + NSCustomView + NSView + NSResponder + NSObject + + $classname + NSCustomView + + {520, 300} + NSView $class CF$UID - 165 + 98 - NSAlternateContents + NSContentView CF$UID - 163 + 108 - NSAlternateImage + NSFrame CF$UID - 162 + 133 - NSButtonFlags - -2038284033 - NSButtonFlags2 - 1 - NSCellFlags - 604110336 - NSCellFlags2 - 134479872 - NSContents + NSHScroller CF$UID - 158 + 130 - NSControlView + NSNextKeyView CF$UID - 155 + 108 - NSKeyEquivalent + NSNextResponder CF$UID - 164 + 37 - NSPeriodicDelay - 200 - NSPeriodicInterval - 25 - NSSupport + NSSubviews CF$UID - 159 + 107 - - Reformat - - $class + NSSuperview CF$UID - 161 + 37 - NSName + NSVScroller CF$UID - 160 + 127 - NSSize - 9 - NSfFlags - 30 + NSsFlags + 18 + NSvFlags + 274 - LucidaGrande - $classes + $class + + CF$UID + 63 + + NS.objects - NSFont - NSObject + + CF$UID + 108 + + + CF$UID + 127 + + + CF$UID + 130 + - $classname - NSFont $class CF$UID - 161 + 89 - NSName + NSBGColor CF$UID - 160 + 67 - NSSize - 9 - NSfFlags - 16 - - - - $class + NSBounds CF$UID - 6 + 126 - NS.string - - - - $classes - - NSButtonCell - %NSButtonCell - NSActionCell - NSCell - NSObject - - $classname - NSButtonCell + NSCursor + + CF$UID + 87 + + NSDocView + + CF$UID + 110 + + NSFrame + + CF$UID + 125 + + NSNextKeyView + + CF$UID + 110 + + NSNextResponder + + CF$UID + 106 + + NSSubviews + + CF$UID + 109 + + NSSuperview + + CF$UID + 106 + + NScvFlags + 4 + NSvFlags + 2304 - $classes + $class + + CF$UID + 63 + + NS.objects - NSButton - NSControl - NSView - NSResponder - NSObject + + CF$UID + 110 + - $classname - NSButton $class CF$UID - 175 + 85 - NSCell + NSClassName CF$UID - 169 + 46 + + NSDelegate + + CF$UID + 0 - NSEnabled - NSFrame CF$UID - 168 + 112 + + NSMaxSize + + CF$UID + 124 NSNextResponder CF$UID - 96 + 108 - NSSuperview + NSOriginalClassName CF$UID - 96 + 111 - NSvFlags - 12 - - {{17, 527}, {371, 13}} - - $class + NSSharedData CF$UID - 174 + 120 - NSBackgroundColor + NSSuperview CF$UID - 91 + 108 - NSCellFlags - 69336577 - NSCellFlags2 - 4194304 - NSContents + NSTVFlags + 6 + NSTextContainer CF$UID - 170 + 113 - NSControlView + NSvFlags + 2066 + + NSTextView + {{0, 102}, {503, 264}} + + $class CF$UID - 167 + 65 - NSSupport + NSLayoutManager CF$UID - 171 + 114 - NSTextColor + NSTCFlags + 1 + NSTextView CF$UID - 172 + 110 + NSWidth + 503 - HTML Source - $class CF$UID - 161 + 64 - NSName + NSDelegate CF$UID - 160 + 0 + + NSLMFlags + 6 + NSTextContainers + + CF$UID + 119 + + NSTextStorage + + CF$UID + 115 - NSSize - 10 - NSfFlags - 27 $class CF$UID - 31 + 61 - NSCatalogName + NSAttributes CF$UID - 28 + 117 - NSColor + NSDelegate CF$UID - 121 + 0 - NSColorName + NSString CF$UID - 173 + 116 - NSColorSpace - 6 - controlTextColor - $classes - - NSTextFieldCell - NSActionCell - NSCell - NSObject - - $classname - NSTextFieldCell + $class + + CF$UID + 6 + + NS.string + definition - $classes + $class + + CF$UID + 60 + + NS.keys - NSTextField - %NSTextField - NSControl - NSView - NSResponder - NSObject + + CF$UID + 118 + + + CF$UID + 55 + + + CF$UID + 54 + + + NS.objects + + + CF$UID + 34 + + + CF$UID + 58 + + + CF$UID + 56 + - $classname - NSTextField - {480, 546} - HTML + NSColor $class CF$UID - 93 - - NSColor - - CF$UID - 91 + 63 - NSIdentifier + NS.objects + + + CF$UID + 113 + + + + + $class CF$UID - 179 + 83 - NSLabel + NSBackgroundColor CF$UID - 232 + 67 - NSTabView + NSDefaultParagraphStyle CF$UID - 15 + 0 - NSView + NSFlags + 12259 + NSInsertionColor CF$UID - 180 + 34 - - http - - $class + NSLinkAttributes CF$UID - 85 + 122 - NSFrameSize + NSMarkedAttributes CF$UID - 231 + 0 - NSNextResponder + NSSelectedAttributes CF$UID - 0 + 121 - NSSubviews + + + $class CF$UID - 181 + 60 + NS.keys + + + CF$UID + 69 + + + CF$UID + 70 + + + NS.objects + + + CF$UID + 71 + + + CF$UID + 73 + + $class CF$UID - 33 + 60 + NS.keys + + + CF$UID + 76 + + + CF$UID + 77 + + + CF$UID + 70 + + NS.objects CF$UID - 182 + 123 CF$UID - 227 + 79 + + + CF$UID + 82 + 1 + {518, 1e+07} + {{1, 1}, {503, 264}} + {{0, 102}, {503, 264}} $class CF$UID - 154 + 93 - NSContentView + NSAction CF$UID - 184 + 129 + NSCurValue + 1 NSFrame CF$UID - 226 + 128 - NSHScroller + NSNextResponder CF$UID - 221 + 106 - NSHeaderClipView + NSSuperview CF$UID - 189 + 106 - NSNextKeyView + NSTarget CF$UID - 184 + 106 - NSNextResponder + NSvFlags + 256 + + {{504, 1}, {15, 264}} + _doScroller: + + $class CF$UID - 180 + 93 - NSScrollAmts - - QSAAAEEgAABBmAAAQZgAAA== - - NSSubviews + NSAction CF$UID - 183 + 132 + + NSCurValue + 1 + NSFrame + + CF$UID + 131 + + NSNextResponder + + CF$UID + 106 + NSPercent + 0.94565218687057495 NSSuperview CF$UID - 180 + 106 - NSVScroller + NSTarget CF$UID - 218 + 106 NSsFlags - 562 + 1 NSvFlags - 274 + 256 + {{-100, -100}, {87, 18}} + _doScroller: + {{0, 309}, {520, 266}} + {{0, -31}, {520, 575}} - $class - - CF$UID - 33 - - NS.objects + $classes - - CF$UID - 184 - - - CF$UID - 218 - - - CF$UID - 221 - - - CF$UID - 189 - - - CF$UID - 192 - + NSSplitView + NSView + NSResponder + NSObject + $classname + NSSplitView $class CF$UID - 145 - - NSBGColor - - CF$UID - 27 + 36 - NSDocView + NSCell CF$UID - 186 + 138 + NSEnabled + NSFrame CF$UID - 217 - - NSNextKeyView - - CF$UID - 186 + 137 NSNextResponder CF$UID - 182 - - NSSubviews - - CF$UID - 185 + 17 NSSuperview CF$UID - 182 + 17 - NScvFlags - 4 NSvFlags - 2304 - - - $class - - CF$UID - 33 - - NS.objects - - - CF$UID - 186 - - + 9 + {{336, 506}, {128, 17}} $class CF$UID - 216 + 35 NSBackgroundColor CF$UID - 120 + 141 - NSCornerView + NSCellFlags + 75628032 + NSCellFlags2 + 71303168 + NSContents CF$UID - 192 + 139 - NSEnabled - - NSFrameSize + NSControlView CF$UID - 187 + 136 - NSGridColor + NSDrawsBackground + + NSSupport CF$UID - 213 + 140 - NSHeaderView + NSTextColor CF$UID - 188 + 32 - NSIntercellSpacingHeight - 2 - NSIntercellSpacingWidth - 3 - NSNextResponder + + .html Validation failed + + + $class CF$UID - 184 + 25 - NSRowHeight - 17 - NSSuperview + NSName CF$UID - 184 + 24 - NSTableColumns + NSSize + 11 + NSfFlags + 28 + + + $class CF$UID - 195 + 31 - NSTvFlags - -759169024 + NSColorSpace + 1 + NSRGB + + MSAwLjcxOTk2NzI1IDAuNzQ3Mjk4NDgA + - {478, 0} $class CF$UID - 191 + 36 - NSFrameSize + NSCell CF$UID - 190 + 144 - NSNextResponder + NSEnabled + + NSFrame CF$UID - 189 + 143 - NSSuperview + NSNextResponder CF$UID - 189 + 17 - NSTableView + NSSuperview CF$UID - 186 + 17 NSvFlags - 256 + 9 + {{332, 217}, {128, 17}} $class CF$UID - 145 - - NSBGColor - - CF$UID - 27 - - NSDocView - - CF$UID - 188 + 35 - NSFrame + NSBackgroundColor CF$UID - 225 + 146 - NSNextKeyView + NSCellFlags + 75628032 + NSCellFlags2 + 71303168 + NSContents CF$UID - 188 + 145 - NSNextResponder + NSControlView CF$UID - 182 + 142 - NSSubviews + NSDrawsBackground + + NSSupport CF$UID - 224 + 140 - NSSuperview + NSTextColor CF$UID - 182 + 32 - NScvFlags - 4 - NSvFlags - 2304 - - {478, 17} - - $classes - - NSTableHeaderView - NSView - NSResponder - NSObject - - $classname - NSTableHeaderView + .wod Validation failed + $class CF$UID - 194 - - NSFrame - - CF$UID - 193 - - NSNextResponder - - CF$UID - 182 - - NSSuperview - - CF$UID - 182 + 31 - NSvFlags - -2147483392 + NSColorSpace + 1 + NSRGB + + MSAwLjcxOTk2NzI1IDAuNzQ3Mjk4NDgA + - {{-32, -34}, {16, 17}} + {480, 546} $classes - _NSCornerView NSView NSResponder NSObject $classname - _NSCornerView + NSView + {{0, 19}, {480, 546}} $class CF$UID - 33 + 63 NS.objects CF$UID - 196 + 151 CF$UID - 208 + 219 + + + CF$UID + 271 + + + CF$UID + 325 + + + CF$UID + 374 @@ -2639,531 +2253,666 @@ $class CF$UID - 207 - - NSDataCell - - CF$UID - 205 + 218 - NSHeaderCell + NSColor CF$UID - 198 + 27 NSIdentifier CF$UID - 197 - - NSIsResizeable - - NSMaxWidth - 1000 - NSMinWidth - 40 - NSTableView - - CF$UID - 186 - - NSWidth - 164 - - header - - $class - - CF$UID - 204 - - NSBackgroundColor - - CF$UID - 201 - - NSCellFlags - 75628032 - NSCellFlags2 - 0 - NSContents - - CF$UID - 199 - - NSSupport - - CF$UID - 200 + 152 - NSTextColor + NSLabel CF$UID - 202 + 217 - - Header - - $class + NSTabView CF$UID - 161 + 15 - NSName + NSView CF$UID - 160 + 153 - NSSize - 11 - NSfFlags - 28 + application $class CF$UID - 31 + 148 - NSColorSpace - 3 - NSWhite - - MC4zMzMzMzI5OQA= - - - - $class + NSFrameSize CF$UID - 31 + 216 - NSCatalogName + NSNextResponder CF$UID - 28 + 0 - NSColor + NSSubviews CF$UID - 121 + 154 - NSColorName + + + $class CF$UID - 203 + 63 - NSColorSpace - 6 - - headerTextColor - - $classes + NS.objects - NSTableHeaderCell - NSTextFieldCell - NSActionCell - NSCell - NSObject + + CF$UID + 155 + - $classname - NSTableHeaderCell $class CF$UID - 174 - - NSBackgroundColor - - CF$UID - 120 + 215 - NSCellFlags - 338820672 - NSCellFlags2 - 0 - NSControlView + FrameName CF$UID - 186 + 0 - NSSupport + GroupName CF$UID - 206 + 0 - NSTextColor + NSDragTypes CF$UID - 172 + 170 - - - $class + NSFrameSize CF$UID - 161 + 184 - NSName + NSNextKeyView CF$UID - 160 + 157 - NSSize - 13 - NSfFlags - 20 - - - $classes - - NSTableColumn - NSObject - - $classname - NSTableColumn - - - $class + NSNextResponder CF$UID - 207 + 153 - NSDataCell + NSSubviews CF$UID - 212 + 156 - NSHeaderCell + NSSuperview CF$UID - 210 + 153 - NSIdentifier + NSvFlags + 274 + Preferences CF$UID - 209 + 185 - NSIsEditable - - NSIsResizeable + UseBackForwardList - NSMaxWidth - 1000 - NSMinWidth - 8 - NSTableView + + + $class CF$UID - 186 + 63 - NSWidth - 308.4010009765625 + NS.objects + + + CF$UID + 157 + + - value $class CF$UID - 204 + 169 - NSBackgroundColor + NSFrameSize CF$UID - 201 + 168 - NSCellFlags - 75628032 - NSCellFlags2 - 0 - NSContents + NSNextKeyView CF$UID - 211 + 159 - NSSupport + NSNextResponder CF$UID - 200 + 155 - NSTextColor + NSSubviews CF$UID - 202 + 158 - - Value - - $class + NSSuperview CF$UID - 174 + 155 - NSBackgroundColor + NSvFlags + 274 + + + $class CF$UID - 120 + 63 - NSCellFlags - 338820672 - NSCellFlags2 - 0 - NSControlView + NS.objects + + + CF$UID + 159 + + + + + $class CF$UID - 186 + 167 - NSSupport + NSContentView CF$UID - 206 + 161 - NSTextColor + NSFrameSize CF$UID - 172 + 166 - - - $class + NSNextKeyView CF$UID - 31 + 161 - NSCatalogName + NSNextResponder CF$UID - 28 + 157 - NSColor + NSSubviews CF$UID - 215 + 160 - NSColorName + NSSuperview CF$UID - 214 + 157 - NSColorSpace - 6 + NSsFlags + 0 + NSvFlags + 274 - gridColor $class CF$UID - 31 + 63 - NSColorSpace - 3 - NSWhite - - MC41AA== - - - - $classes + NS.objects - NSTableView - %NSTableView - NSControl - NSView - NSResponder - NSObject + + CF$UID + 161 + - $classname - NSTableView - {{1, 17}, {478, 507}} $class CF$UID - 149 + 165 - NSAction + NSBGColor CF$UID - 220 + 163 - NSFrame + NSFrameSize CF$UID - 219 + 162 NSNextResponder CF$UID - 182 + 159 - NSPercent - 0.41052630543708801 NSSuperview CF$UID - 182 - - NSTarget - - CF$UID - 182 + 159 + NScvFlags + 2 NSvFlags - -2147483392 + 256 - {{-30, 17}, {15, 472}} - _doScroller: + {480, 547} $class CF$UID - 149 - - NSAction - - CF$UID - 223 - - NSFrame - - CF$UID - 222 + 31 - NSNextResponder + NSCatalogName CF$UID - 182 + 28 - NSPercent - 0.99047619104385376 - NSSuperview + NSColor CF$UID - 182 + 30 - NSTarget + NSColorName CF$UID - 182 + 164 - NSsFlags - 1 - NSvFlags - -2147483392 + NSColorSpace + 6 + + controlBackgroundColor + + $classes + + WebClipView + NSClipView + NSView + NSResponder + NSObject + + $classname + WebClipView + + {480, 547} + + $classes + + WebDynamicScrollBarsView + WebCoreScrollView + NSScrollView + NSView + NSResponder + NSObject + + $classname + WebDynamicScrollBarsView + + {480, 547} + + $classes + + WebFrameView + NSView + NSResponder + NSObject + + $classname + WebFrameView - {{1, -30}, {423, 15}} - _doScroller: $class CF$UID - 33 + 183 NS.objects CF$UID - 188 + 171 + + + CF$UID + 172 + + + CF$UID + 173 + + + CF$UID + 174 + + + CF$UID + 175 + + + CF$UID + 176 + + + CF$UID + 177 + + + CF$UID + 178 + + + CF$UID + 179 + + + CF$UID + 180 + + + CF$UID + 181 + + CF$UID + 182 + + + + Apple PICT pasteboard type + dyn.aqr104pxbsb2g23msr731k8puqy81n6xqr2oooooo + Apple Web Archive pasteboard type + NSStringPboardType + NeXT Rich Text Format v1.0 pasteboard type + NSFilenamesPboardType + Apple URL pasteboard type + Apple HTML pasteboard type + public.url + NeXT TIFF v4.0 pasteboard type + WebURLsWithTitlesPboardType + NeXT RTFD pasteboard type + + $classes + + NSMutableSet + NSSet + NSObject + $classname + NSMutableSet - {{1, 0}, {478, 17}} - {{0, -1}, {480, 525}} + {480, 547} $class CF$UID - 175 - - NSCell - - CF$UID - 229 - - NSEnabled - - NSFrame - - CF$UID - 228 + 214 - NSNextResponder + Identifier CF$UID - 180 + 186 - NSSuperview + Values CF$UID - 180 + 187 - NSvFlags - 12 - {{17, 527}, {446, 13}} + WebUI $class CF$UID - 174 - - NSBackgroundColor - - CF$UID - 91 - - NSCellFlags - 69336577 - NSCellFlags2 - 4194304 - NSContents - - CF$UID - 230 - - NSControlView - - CF$UID - 227 - - NSSupport - - CF$UID - 171 - - NSTextColor - - CF$UID - 172 + 213 + NS.keys + + + CF$UID + 188 + + + CF$UID + 189 + + + CF$UID + 190 + + + CF$UID + 191 + + + CF$UID + 192 + + + CF$UID + 193 + + + CF$UID + 194 + + + CF$UID + 195 + + + CF$UID + 196 + + + CF$UID + 197 + + + CF$UID + 198 + + + CF$UID + 199 + + + CF$UID + 200 + + + CF$UID + 201 + + + CF$UID + 202 + + + CF$UID + 203 + + + NS.objects + + + CF$UID + 204 + + + CF$UID + 205 + + + CF$UID + 205 + + + CF$UID + 206 + + + CF$UID + 207 + + + CF$UID + 205 + + + CF$UID + 208 + + + CF$UID + 205 + + + CF$UID + 209 + + + CF$UID + 205 + + + CF$UID + 210 + + + CF$UID + 208 + + + CF$UID + 211 + + + CF$UID + 212 + + + CF$UID + 205 + + + CF$UID + 205 + + + + WebUIWebKitFantasyFont + WebUIWebKitAllowAnimatedImageLoopingPreferenceKey + WebUIWebKitJavaEnabled + WebUIWebKitDefaultFontSize + WebUIWebKitMinimumFontSize + WebUIWebKitPluginsEnabled + WebUIWebKitStandardFont + WebUIWebKitJavaScriptEnabled + WebUIWebKitSansSerifFont + WebUIWebKitDisplayImagesKey + WebUIWebKitCursiveFont + WebUIWebKitSerifFont + WebUIWebKitDefaultFixedFontSize + WebUIWebKitFixedFont + WebUIWebKitAllowAnimatedImagesPreferenceKey + WebUIWebKitJavaScriptCanOpenWindowsAutomatically + Papyrus + + 16 + 1 + Times + Helvetica + Apple Chancery + 13 + Courier + + $classes + + NSMutableDictionary + NSDictionary + NSObject + + $classname + NSMutableDictionary + + + $classes + + WebPreferences + NSObject + + $classname + WebPreferences + + + $classes + + WebView + %WebView + NSView + NSResponder + NSObject + + $classname + WebView - HTTP Headers - {480, 546} - HTTP + Application + + $classes + + NSTabViewItem + NSObject + + $classname + NSTabViewItem + $class CF$UID - 93 + 218 NSColor CF$UID - 91 + 27 NSIdentifier CF$UID - 234 + 220 NSLabel CF$UID - 294 + 270 NSTabView @@ -3173,20 +2922,20 @@ NSView CF$UID - 235 + 221 - wox + html $class CF$UID - 85 + 148 NSFrameSize CF$UID - 293 + 269 NSNextResponder @@ -3196,36 +2945,28 @@ NSSubviews CF$UID - 236 + 222 $class CF$UID - 33 + 63 NS.objects - - - CF$UID - 237 - - - CF$UID - 272 - + CF$UID - 276 + 223 CF$UID - 281 + 256 CF$UID - 288 + 265 @@ -3233,47 +2974,47 @@ $class CF$UID - 154 + 98 NSContentView CF$UID - 239 + 225 NSFrame CF$UID - 271 + 255 NSHScroller CF$UID - 268 + 252 NSNextKeyView CF$UID - 239 + 225 NSNextResponder CF$UID - 235 + 221 NSSubviews CF$UID - 238 + 224 NSSuperview CF$UID - 235 + 221 NSVScroller CF$UID - 265 + 249 NSsFlags 18 @@ -3284,21 +3025,21 @@ $class CF$UID - 33 + 63 NS.objects CF$UID - 239 + 225 CF$UID - 265 + 249 CF$UID - 268 + 252 @@ -3306,47 +3047,52 @@ $class CF$UID - 145 + 89 NSBGColor CF$UID - 120 + 240 + + NSBounds + + CF$UID + 248 NSCursor CF$UID - 143 + 87 NSDocView CF$UID - 241 + 227 NSFrame CF$UID - 264 + 247 NSNextKeyView CF$UID - 241 + 227 NSNextResponder CF$UID - 237 + 223 NSSubviews CF$UID - 240 + 226 NSSuperview CF$UID - 237 + 223 NScvFlags 4 @@ -3357,13 +3103,13 @@ $class CF$UID - 33 + 63 NS.objects CF$UID - 241 + 227 @@ -3371,78 +3117,129 @@ $class CF$UID - 263 - - NSClassName - - CF$UID - 242 + 246 NSDelegate CF$UID 0 - NSFrameSize + NSDragTypes CF$UID - 244 + 228 - NSMaxSize + NSFrame CF$UID - 262 + 233 - NSNextResponder + NSMaxSize CF$UID - 239 + 245 - NSOriginalClassName + NSNextResponder CF$UID - 243 + 225 NSSharedData CF$UID - 258 + 239 NSSuperview CF$UID - 239 + 225 NSTVFlags 6 NSTextContainer CF$UID - 245 + 234 NSvFlags 2066 - SOPEXTextView - NSTextView - {463, 502} $class CF$UID - 116 + 183 + + NS.objects + + + CF$UID + 229 + + + CF$UID + 171 + + + CF$UID + 174 + + + CF$UID + 175 + + + CF$UID + 230 + + + CF$UID + 178 + + + CF$UID + 176 + + + CF$UID + 180 + + + CF$UID + 182 + + + CF$UID + 231 + + + CF$UID + 232 + + + + Apple PDF pasteboard type + NeXT Encapsulated PostScript v1.2 pasteboard type + CorePasteboardFlavorType 0x6D6F6F76 + NSColor pasteboard type + {{0, 124}, {463, 523}} + + $class + + CF$UID + 65 NSLayoutManager CF$UID - 246 + 235 NSTCFlags 1 NSTextView CF$UID - 241 + 227 NSWidth 463 @@ -3451,7 +3248,7 @@ $class CF$UID - 115 + 64 NSDelegate @@ -3463,24 +3260,19 @@ NSTextContainers CF$UID - 257 + 238 NSTextStorage CF$UID - 247 + 236 $class CF$UID - 113 - - NSAttributes - - CF$UID - 249 + 61 NSDelegate @@ -3490,7 +3282,7 @@ NSString CF$UID - 248 + 237 @@ -3500,166 +3292,112 @@ 6 NS.string - source + $class CF$UID - 129 + 63 - NS.keys - - - CF$UID - 250 - - - CF$UID - 251 - - - CF$UID - 252 - - NS.objects CF$UID - 121 - - - CF$UID - 253 - - - CF$UID - 255 + 234 - NSColor - NSParagraphStyle - NSFont $class CF$UID - 254 - - NSTabStops - - CF$UID - 0 + 83 - - - $classes - - NSMutableParagraphStyle - NSParagraphStyle - NSObject - - $classname - NSMutableParagraphStyle - - - $class + NSBackgroundColor CF$UID - 161 + 240 - NSName + NSDefaultParagraphStyle CF$UID - 256 + 0 - NSSize - 10 - NSfFlags - 18 - - Monaco - - $class + NSFlags + 11105 + NSInsertionColor CF$UID - 33 + 34 - NS.objects - - - CF$UID - 245 - - - - - $class + NSLinkAttributes CF$UID - 138 + 243 - NSBackgroundColor + NSMarkedAttributes CF$UID - 120 + 0 - NSDefaultParagraphStyle + NSSelectedAttributes CF$UID - 0 + 242 - NSFlags - 12259 - NSInsertionColor + + + $class CF$UID - 121 + 31 - NSLinkAttributes + NSCatalogName CF$UID - 260 + 28 - NSMarkedAttributes + NSColor CF$UID - 0 + 67 - NSSelectedAttributes + NSColorName CF$UID - 259 + 241 + NSColorSpace + 6 + controlHighlightColor $class CF$UID - 129 + 60 NS.keys CF$UID - 123 + 69 CF$UID - 124 + 70 NS.objects CF$UID - 125 + 71 CF$UID - 127 + 73 @@ -3667,36 +3405,36 @@ $class CF$UID - 129 + 60 NS.keys CF$UID - 131 + 76 CF$UID - 132 + 77 CF$UID - 124 + 70 NS.objects CF$UID - 261 + 244 CF$UID - 134 + 79 CF$UID - 137 + 82 @@ -3705,85 +3443,90 @@ $classes - NSClassSwapper + NSTextView + %NSTextView + NSText + NSView + NSResponder NSObject $classname - NSClassSwapper + NSTextView - {{1, 1}, {463, 502}} + {{1, 1}, {463, 523}} + {{0, 124}, {463, 523}} $class CF$UID - 149 + 93 NSAction CF$UID - 267 + 251 NSCurValue 1 NSFrame CF$UID - 266 + 250 NSNextResponder CF$UID - 237 + 223 NSSuperview CF$UID - 237 + 223 NSTarget CF$UID - 237 + 223 NSvFlags 256 - {{464, 1}, {15, 502}} + {{464, 1}, {15, 523}} _doScroller: $class CF$UID - 149 + 93 NSAction CF$UID - 270 + 254 NSCurValue 1 NSFrame CF$UID - 269 + 253 NSNextResponder CF$UID - 237 + 223 NSPercent 0.94565218687057495 NSSuperview CF$UID - 237 + 223 NSTarget CF$UID - 237 + 223 NSsFlags 1 @@ -3792,395 +3535,391 @@ {{-100, -100}, {87, 18}} _doScroller: - {{0, 20}, {480, 504}} + {{0, -1}, {480, 525}} $class CF$UID - 175 + 264 NSCell CF$UID - 274 + 258 NSEnabled NSFrame CF$UID - 273 + 257 NSNextResponder CF$UID - 235 + 221 NSSuperview CF$UID - 235 + 221 NSvFlags - 12 + 9 - {{74, 528}, {401, 13}} + {{397, 526}, {64, 16}} $class CF$UID - 174 + 263 - NSBackgroundColor + NSAlternateContents CF$UID - 91 + 22 + + NSAlternateImage + + CF$UID + 261 + NSButtonFlags + -2038284033 + NSButtonFlags2 + 1 NSCellFlags - 69336577 + 604110336 NSCellFlags2 - 4194304 + 134479872 NSContents CF$UID - 275 + 259 NSControlView CF$UID - 272 + 256 - NSSupport + NSKeyEquivalent CF$UID - 171 + 262 - NSTextColor + NSPeriodicDelay + 200 + NSPeriodicInterval + 25 + NSSupport CF$UID - 172 + 260 - WOX Name + Reformat $class CF$UID - 175 - - NSCell - - CF$UID - 278 - - NSEnabled - - NSFrame - - CF$UID - 277 - - NSNextResponder - - CF$UID - 235 + 25 - NSSuperview + NSName CF$UID - 235 + 24 - NSvFlags - 9 + NSSize + 9 + NSfFlags + 30 - {{369, 506}, {95, 17}} $class CF$UID - 174 - - NSBackgroundColor - - CF$UID - 280 - - NSCellFlags - 75628032 - NSCellFlags2 - 71303168 - NSContents - - CF$UID - 279 - - NSControlView - - CF$UID - 276 - - NSDrawsBackground - - NSSupport - - CF$UID - 200 + 25 - NSTextColor + NSName CF$UID - 172 + 24 + NSSize + 9 + NSfFlags + 16 - Validation failed - $class CF$UID - 31 + 6 - NSColorSpace - 1 - NSRGB - - MSAwLjcxOTk2NzI1IDAuNzQ3Mjk4NDgA - + NS.string + + + + $classes + + NSButtonCell + %NSButtonCell + NSActionCell + NSCell + NSObject + + $classname + NSButtonCell + + + $classes + + NSButton + NSControl + NSView + NSResponder + NSObject + + $classname + NSButton $class CF$UID - 175 + 36 NSCell CF$UID - 283 + 267 NSEnabled NSFrame CF$UID - 282 + 266 NSNextResponder CF$UID - 235 + 221 NSSuperview CF$UID - 235 + 221 + NSvFlags + 12 - {{3, 528}, {74, 13}} + {{2, 527}, {371, 13}} $class CF$UID - 174 + 35 NSBackgroundColor CF$UID - 91 + 27 NSCellFlags - 67239424 + 69336577 NSCellFlags2 4194304 NSContents CF$UID - 284 + 268 NSControlView CF$UID - 281 + 265 NSSupport CF$UID - 171 + 23 NSTextColor CF$UID - 285 + 32 - Cursor + HTML Source + {480, 546} + HTML $class CF$UID - 31 - - NSCatalogName - - CF$UID - 28 + 218 NSColor CF$UID - 287 + 27 - NSColorName + NSIdentifier CF$UID - 286 + 272 - NSColorSpace - 6 - - disabledControlTextColor - - $class + NSLabel CF$UID - 31 + 324 - NSColorSpace - 3 - NSWhite - - MC4zMzMzMzMzNAA= - - - - $class + NSTabView CF$UID - 292 + 15 - NSClassName + NSView CF$UID - 290 + 273 - NSExtension + + http + + $class CF$UID - 291 + 148 NSFrameSize CF$UID - 289 + 323 NSNextResponder CF$UID - 235 + 0 - NSSuperview + NSSubviews CF$UID - 235 + 274 - NSvFlags - 34 - {480, 19} - MLHierarchyView - NSControl - $classes + $class + + CF$UID + 63 + + NS.objects - NSCustomView - NSView - NSResponder - NSObject + + CF$UID + 275 + + + CF$UID + 319 + - $classname - NSCustomView - {480, 546} - WOX $class CF$UID - 93 + 98 - NSColor + NSContentView CF$UID - 91 + 277 - NSIdentifier + NSCornerView CF$UID - 296 + 285 - NSLabel + NSFrame CF$UID - 377 + 318 - NSTabView + NSHScroller CF$UID - 15 + 313 - NSView + NSHeaderClipView CF$UID - 297 + 282 - - wo - - $class + NSNextKeyView CF$UID - 85 + 277 - NSFrameSize + NSNextResponder CF$UID - 376 + 273 - NSNextResponder + NSScrollAmts + + QSAAAEEgAABBmAAAQZgAAA== + + NSSubviews CF$UID - 0 + 276 - NSSubviews + NSSuperview CF$UID - 298 + 273 + + NSVScroller + + CF$UID + 310 + NSsFlags + 562 + NSvFlags + 274 $class CF$UID - 33 + 63 NS.objects CF$UID - 299 + 277 + + + CF$UID + 310 CF$UID - 303 + 313 CF$UID - 366 + 282 CF$UID - 371 + 285 @@ -4188,101 +3927,145 @@ $class CF$UID - 175 + 89 - NSCell + NSBGColor CF$UID - 301 + 163 + + NSDocView + + CF$UID + 279 - NSEnabled - NSFrame CF$UID - 300 + 309 + + NSNextKeyView + + CF$UID + 279 NSNextResponder CF$UID - 297 + 275 + + NSSubviews + + CF$UID + 278 NSSuperview CF$UID - 297 + 275 + NScvFlags + 4 NSvFlags - 12 + 2304 + + + $class + + CF$UID + 63 + + NS.objects + + + CF$UID + 279 + + - {{116, 527}, {347, 13}} $class CF$UID - 174 + 308 NSBackgroundColor CF$UID - 91 + 67 - NSCellFlags - 67239424 - NSCellFlags2 - 4194304 - NSContents + NSCornerView CF$UID - 163 + 285 - NSControlView + NSEnabled + + NSFrameSize CF$UID - 299 + 280 - NSPlaceholderString + NSGridColor CF$UID - 302 + 305 - NSSupport + NSHeaderView CF$UID - 171 + 281 - NSTextColor + NSIntercellSpacingHeight + 2 + NSIntercellSpacingWidth + 3 + NSNextResponder + + CF$UID + 277 + + NSRowHeight + 17 + NSSuperview + + CF$UID + 277 + + NSTableColumns CF$UID - 172 + 288 + NSTvFlags + -759169024 - WO Name + {478, 507} $class CF$UID - 365 + 284 - NSFrame + NSFrameSize CF$UID - 364 + 283 NSNextResponder CF$UID - 297 + 282 - NSSubviews + NSSuperview CF$UID - 304 + 282 - NSSuperview + NSTableView CF$UID - 297 + 279 NSvFlags 256 @@ -4291,140 +4074,111 @@ $class CF$UID - 33 + 89 - NS.objects - - - CF$UID - 305 - - - CF$UID - 338 - - - - - $class + NSBGColor CF$UID - 292 + 163 - NSClassName + NSDocView CF$UID - 337 + 281 - NSFrameSize + NSFrame CF$UID - 336 + 317 + + NSNextKeyView + + CF$UID + 281 NSNextResponder CF$UID - 303 + 275 NSSubviews CF$UID - 306 + 316 NSSuperview CF$UID - 303 + 275 + NScvFlags + 4 + NSvFlags + 2304 + {478, 17} - $class - - CF$UID - 33 - - NS.objects + $classes - - CF$UID - 307 - - - CF$UID - 334 - + NSTableHeaderView + NSView + NSResponder + NSObject + $classname + NSTableHeaderView $class CF$UID - 154 - - NSContentView - - CF$UID - 309 + 287 NSFrame CF$UID - 333 - - NSHScroller - - CF$UID - 330 - - NSNextKeyView - - CF$UID - 309 + 286 NSNextResponder CF$UID - 305 - - NSSubviews - - CF$UID - 308 + 275 NSSuperview CF$UID - 305 - - NSVScroller - - CF$UID - 327 + 275 - NSsFlags - 18 NSvFlags - 256 + -2147483392 + + {{-32, -34}, {16, 17}} + + $classes + + _NSCornerView + NSView + NSResponder + NSObject + + $classname + _NSCornerView $class CF$UID - 33 + 63 NS.objects CF$UID - 309 - - - CF$UID - 327 + 289 CF$UID - 330 + 300 @@ -4432,574 +4186,625 @@ $class CF$UID - 145 + 299 - NSBGColor + NSDataCell CF$UID - 120 + 297 - NSCursor + NSHeaderCell CF$UID - 143 + 291 - NSDocView + NSIdentifier CF$UID - 311 + 290 - NSFrame + NSIsResizeable + + NSMaxWidth + 1000 + NSMinWidth + 40 + NSTableView CF$UID - 326 + 279 - NSNextKeyView + NSWidth + 164 + + header + + $class CF$UID - 311 + 296 - NSNextResponder + NSBackgroundColor CF$UID - 307 + 293 - NSSubviews + NSCellFlags + 75628032 + NSCellFlags2 + 0 + NSContents CF$UID - 310 + 292 - NSSuperview + NSSupport CF$UID - 307 + 140 + + NSTextColor + + CF$UID + 294 - NScvFlags - 4 - NSvFlags - 2304 + Header $class CF$UID - 33 + 31 - NS.objects - - - CF$UID - 311 - - + NSColorSpace + 3 + NSWhite + + MC4zMzMzMzI5OQA= + $class CF$UID - 263 + 31 - NSClassName + NSCatalogName CF$UID - 242 + 28 - NSDelegate + NSColor CF$UID - 0 + 34 - NSDragTypes + NSColorName CF$UID - 313 + 295 - NSFrameSize + NSColorSpace + 6 + + headerTextColor + + $classes + + NSTableHeaderCell + NSTextFieldCell + NSActionCell + NSCell + NSObject + + $classname + NSTableHeaderCell + + + $class CF$UID - 314 + 35 - NSMaxSize + NSBackgroundColor CF$UID - 325 + 67 - NSNextResponder + NSCellFlags + 338820672 + NSCellFlags2 + 0 + NSControlView CF$UID - 309 + 279 - NSOriginalClassName + NSSupport CF$UID - 312 + 298 - NSSharedData + NSTextColor CF$UID - 321 + 32 - NSSuperview + + + $class CF$UID - 309 + 25 - NSTVFlags - 6 - NSTextContainer + NSName CF$UID - 315 + 24 - NSvFlags - 2066 + NSSize + 13 + NSfFlags + 20 - NSTextView - $class - - CF$UID - 51 - - NS.objects + $classes - - CF$UID - 104 - - - CF$UID - 39 - - - CF$UID - 42 - - - CF$UID - 43 - - - CF$UID - 105 - - - CF$UID - 46 - - - CF$UID - 44 - - - CF$UID - 48 - - - CF$UID - 50 - - - CF$UID - 106 - - - CF$UID - 107 - + NSTableColumn + NSObject + $classname + NSTableColumn - {463, 239} $class CF$UID - 116 + 299 + + NSDataCell + + CF$UID + 304 - NSLayoutManager + NSHeaderCell CF$UID - 316 + 302 - NSTCFlags - 1 - NSTextView + NSIdentifier CF$UID - 311 + 301 + + NSIsEditable + + NSIsResizeable + + NSMaxWidth + 1000 + NSMinWidth + 8 + NSTableView + + CF$UID + 279 NSWidth - 463 + 308.4010009765625 + value $class CF$UID - 115 + 296 - NSDelegate + NSBackgroundColor CF$UID - 0 + 293 - NSLMFlags - 6 - NSTextContainers + NSCellFlags + 75628032 + NSCellFlags2 + 0 + NSContents CF$UID - 320 + 303 - NSTextStorage + NSSupport CF$UID - 317 + 140 + + NSTextColor + + CF$UID + 294 + Value $class CF$UID - 113 + 35 - NSAttributes + NSBackgroundColor CF$UID - 319 + 67 - NSDelegate + NSCellFlags + 338820672 + NSCellFlags2 + 0 + NSControlView CF$UID - 0 + 279 - NSString + NSSupport CF$UID - 318 + 298 - - - $class + NSTextColor CF$UID - 6 + 32 - NS.string - source $class CF$UID - 129 + 31 - NS.keys - - - CF$UID - 252 - - - CF$UID - 251 - - - NS.objects - - - CF$UID - 255 - - - CF$UID - 253 - - + NSCatalogName + + CF$UID + 28 + + NSColor + + CF$UID + 307 + + NSColorName + + CF$UID + 306 + + NSColorSpace + 6 + gridColor $class CF$UID - 33 + 31 - NS.objects + NSColorSpace + 3 + NSWhite + + MC41AA== + + + + $classes - - CF$UID - 315 - + NSTableView + %NSTableView + NSControl + NSView + NSResponder + NSObject + $classname + NSTableView + {{1, 17}, {478, 507}} $class CF$UID - 138 - - NSBackgroundColor - - CF$UID - 120 + 93 - NSDefaultParagraphStyle + NSAction CF$UID - 0 + 312 - NSFlags - 12259 - NSInsertionColor + NSFrame CF$UID - 121 + 311 - NSLinkAttributes + NSNextResponder CF$UID - 323 + 275 - NSMarkedAttributes + NSPercent + 0.41052630543708801 + NSSuperview CF$UID - 0 + 275 - NSSelectedAttributes + NSTarget CF$UID - 322 + 275 + NSvFlags + -2147483392 + {{-30, 17}, {15, 472}} + _doScroller: $class CF$UID - 129 + 93 - NS.keys - - - CF$UID - 123 - - - CF$UID - 124 - - - NS.objects - - - CF$UID - 125 - - - CF$UID - 127 - - - - - $class + NSAction CF$UID - 129 + 315 - NS.keys - - - CF$UID - 131 - - - CF$UID - 132 - - - CF$UID - 124 - - - NS.objects - - - CF$UID - 324 - - - CF$UID - 134 - + NSFrame + + CF$UID + 314 + + NSNextResponder + + CF$UID + 275 + + NSPercent + 0.99047619104385376 + NSSuperview + + CF$UID + 275 + + NSTarget + + CF$UID + 275 + + NSsFlags + 1 + NSvFlags + -2147483392 + + {{1, -30}, {423, 15}} + _doScroller: + + $class + + CF$UID + 63 + + NS.objects + CF$UID - 137 + 281 - 1 - {463, 1e+07} - {{1, 1}, {463, 239}} + {{1, 0}, {478, 17}} + {{0, -1}, {480, 525}} $class CF$UID - 149 + 36 - NSAction + NSCell CF$UID - 329 + 321 - NSCurValue - 1 + NSEnabled + NSFrame CF$UID - 328 + 320 NSNextResponder CF$UID - 307 + 273 NSSuperview CF$UID - 307 - - NSTarget - - CF$UID - 307 + 273 NSvFlags - 256 + 12 - {{464, 1}, {15, 239}} - _doScroller: + {{2, 527}, {446, 13}} $class CF$UID - 149 + 35 - NSAction + NSBackgroundColor CF$UID - 332 + 27 - NSCurValue - 1 - NSFrame + NSCellFlags + 69336577 + NSCellFlags2 + 4194304 + NSContents CF$UID - 331 + 322 - NSNextResponder + NSControlView CF$UID - 307 + 319 - NSPercent - 0.94565218687057495 - NSSuperview + NSSupport CF$UID - 307 + 23 - NSTarget + NSTextColor CF$UID - 307 + 32 - NSsFlags - 1 - NSvFlags - 256 - {{-100, -100}, {87, 18}} - _doScroller: - {{0, 39}, {480, 241}} + HTTP Headers + + {480, 546} + HTTP $class CF$UID - 292 + 218 - NSClassName + NSColor CF$UID - 290 + 27 - NSExtension + NSIdentifier CF$UID - 291 + 326 - NSFrame + NSLabel CF$UID - 335 + 373 + + NSTabView + + CF$UID + 15 + + NSView + + CF$UID + 327 + + + wox + + $class + + CF$UID + 148 + + NSFrameSize + + CF$UID + 372 NSNextResponder CF$UID - 305 + 0 - NSSuperview + NSSubviews CF$UID - 305 + 328 - NSvFlags - 2 - {{0, 20}, {480, 19}} - {520, 300} - NSView $class CF$UID - 154 + 63 + + NS.objects + + + CF$UID + 329 + + + CF$UID + 354 + + + CF$UID + 358 + + + CF$UID + 363 + + + CF$UID + 370 + + + + + $class + + CF$UID + 98 NSContentView CF$UID - 340 + 331 NSFrame CF$UID - 363 + 353 NSHScroller CF$UID - 360 + 350 NSNextKeyView CF$UID - 340 + 331 NSNextResponder CF$UID - 303 + 327 NSSubviews CF$UID - 339 + 330 NSSuperview CF$UID - 303 + 327 NSVScroller CF$UID - 357 + 347 NSsFlags 18 @@ -5010,21 +4815,21 @@ $class CF$UID - 33 + 63 NS.objects CF$UID - 340 + 331 CF$UID - 357 + 347 CF$UID - 360 + 350 @@ -5032,52 +4837,47 @@ $class CF$UID - 145 + 89 NSBGColor CF$UID - 120 - - NSBounds - - CF$UID - 356 + 67 NSCursor CF$UID - 143 + 87 NSDocView CF$UID - 342 + 333 NSFrame CF$UID - 355 + 346 NSNextKeyView CF$UID - 342 + 333 NSNextResponder CF$UID - 338 + 329 NSSubviews CF$UID - 341 + 332 NSSuperview CF$UID - 338 + 329 NScvFlags 4 @@ -5088,13 +4888,13 @@ $class CF$UID - 33 + 63 NS.objects CF$UID - 342 + 333 @@ -5102,86 +4902,86 @@ $class CF$UID - 263 + 85 NSClassName CF$UID - 242 + 46 NSDelegate CF$UID 0 - NSFrame + NSFrameSize CF$UID - 344 + 335 NSMaxSize CF$UID - 354 + 345 NSNextResponder CF$UID - 340 + 331 NSOriginalClassName CF$UID - 343 + 334 NSSharedData CF$UID - 350 + 341 NSSuperview CF$UID - 340 + 331 NSTVFlags 6 NSTextContainer CF$UID - 345 + 336 NSvFlags 2066 NSTextView - {{0, 102}, {503, 264}} + {463, 502} $class CF$UID - 116 + 65 NSLayoutManager CF$UID - 346 + 337 NSTCFlags 1 NSTextView CF$UID - 342 + 333 NSWidth - 503 + 463 $class CF$UID - 115 + 64 NSDelegate @@ -5193,24 +4993,24 @@ NSTextContainers CF$UID - 349 + 340 NSTextStorage CF$UID - 347 + 338 $class CF$UID - 113 + 61 NSAttributes CF$UID - 249 + 117 NSDelegate @@ -5220,7 +5020,7 @@ NSString CF$UID - 348 + 339 @@ -5230,19 +5030,19 @@ 6 NS.string - definition + source $class CF$UID - 33 + 63 NS.objects CF$UID - 345 + 336 @@ -5250,12 +5050,12 @@ $class CF$UID - 138 + 83 NSBackgroundColor CF$UID - 120 + 67 NSDefaultParagraphStyle @@ -5267,12 +5067,12 @@ NSInsertionColor CF$UID - 121 + 34 NSLinkAttributes CF$UID - 352 + 343 NSMarkedAttributes @@ -5282,35 +5082,35 @@ NSSelectedAttributes CF$UID - 351 + 342 $class CF$UID - 129 + 60 NS.keys CF$UID - 123 + 69 CF$UID - 124 + 70 NS.objects CF$UID - 125 + 71 CF$UID - 127 + 73 @@ -5318,115 +5118,114 @@ $class CF$UID - 129 + 60 NS.keys CF$UID - 131 + 76 CF$UID - 132 + 77 CF$UID - 124 + 70 NS.objects CF$UID - 353 + 344 CF$UID - 134 + 79 CF$UID - 137 + 82 1 - {518, 1e+07} - {{1, 1}, {503, 264}} - {{0, 102}, {503, 264}} + {463, 1e+07} + {{1, 1}, {463, 502}} $class CF$UID - 149 + 93 NSAction CF$UID - 359 + 349 NSCurValue 1 NSFrame CF$UID - 358 + 348 NSNextResponder CF$UID - 338 + 329 NSSuperview CF$UID - 338 + 329 NSTarget CF$UID - 338 + 329 NSvFlags 256 - {{504, 1}, {15, 264}} + {{464, 1}, {15, 502}} _doScroller: $class CF$UID - 149 + 93 NSAction CF$UID - 362 + 352 NSCurValue 1 NSFrame CF$UID - 361 + 351 NSNextResponder CF$UID - 338 + 329 NSPercent 0.94565218687057495 NSSuperview CF$UID - 338 + 329 NSTarget CF$UID - 338 + 329 NSsFlags 1 @@ -5435,61 +5234,118 @@ {{-100, -100}, {87, 18}} _doScroller: - {{0, 309}, {520, 266}} - {{0, -31}, {520, 575}} + {{0, 20}, {480, 504}} - $classes - - NSSplitView - NSView - NSResponder - NSObject - - $classname - NSSplitView + $class + + CF$UID + 36 + + NSCell + + CF$UID + 356 + + NSEnabled + + NSFrame + + CF$UID + 355 + + NSNextResponder + + CF$UID + 327 + + NSSuperview + + CF$UID + 327 + + NSvFlags + 12 + + {{74, 528}, {401, 13}} + + $class + + CF$UID + 35 + + NSBackgroundColor + + CF$UID + 27 + + NSCellFlags + 69336577 + NSCellFlags2 + 4194304 + NSContents + + CF$UID + 357 + + NSControlView + + CF$UID + 354 + + NSSupport + + CF$UID + 23 + + NSTextColor + + CF$UID + 32 + + WOX Name $class CF$UID - 175 + 36 NSCell CF$UID - 368 + 360 NSEnabled NSFrame CF$UID - 367 + 359 NSNextResponder CF$UID - 297 + 327 NSSuperview CF$UID - 297 + 327 NSvFlags 9 - {{336, 506}, {128, 17}} + {{369, 506}, {95, 17}} $class CF$UID - 174 + 35 NSBackgroundColor CF$UID - 370 + 362 NSCellFlags 75628032 @@ -5498,27 +5354,27 @@ NSContents CF$UID - 369 + 361 NSControlView CF$UID - 366 + 358 NSDrawsBackground NSSupport CF$UID - 200 + 140 NSTextColor CF$UID - 172 + 32 - .html Validation failed + Validation failed $class @@ -5537,88 +5393,180 @@ $class CF$UID - 175 + 36 NSCell CF$UID - 373 + 365 NSEnabled NSFrame CF$UID - 372 + 364 NSNextResponder CF$UID - 297 + 327 NSSuperview CF$UID - 297 + 327 NSvFlags - 9 + 8 - {{332, 217}, {128, 17}} + {{3, 528}, {74, 13}} $class CF$UID - 174 + 35 NSBackgroundColor CF$UID - 375 + 27 NSCellFlags - 75628032 + 67239424 NSCellFlags2 - 71303168 + 4194304 NSContents CF$UID - 374 + 366 NSControlView CF$UID - 371 + 363 - NSDrawsBackground - NSSupport CF$UID - 200 + 23 NSTextColor CF$UID - 172 + 367 + + + Cursor + + + $class + + CF$UID + 31 + + NSCatalogName + + CF$UID + 28 + + NSColor + + CF$UID + 369 + + NSColorName + + CF$UID + 368 + + NSColorSpace + 6 + + disabledControlTextColor + + $class + + CF$UID + 31 + + NSColorSpace + 3 + NSWhite + + MC4zMzMzMzMzNAA= + + + + $class + + CF$UID + 103 + + NSClassName + + CF$UID + 101 + + NSExtension + + CF$UID + 102 + + NSFrameSize + + CF$UID + 371 + + NSNextResponder + + CF$UID + 327 + + NSSuperview + + CF$UID + 327 + + NSvFlags + 34 + + {480, 19} + {480, 546} + WOX + + $class + + CF$UID + 218 + + NSColor + + CF$UID + 27 + + NSIdentifier + + CF$UID + 375 + + NSLabel + + CF$UID + 376 + + NSTabView + + CF$UID + 15 - - .wod Validation failed - - - $class + NSView CF$UID - 31 + 17 - NSColorSpace - 1 - NSRGB - - MSAwLjcxOTk2NzI1IDAuNzQ3Mjk4NDgA - - {480, 546} + wo WO $classes @@ -5635,19 +5583,19 @@ $class CF$UID - 175 + 36 NSCell CF$UID - 381 + 380 NSEnabled NSFrame CF$UID - 380 + 379 NSNextResponder @@ -5667,12 +5615,12 @@ $class CF$UID - 174 + 35 NSBackgroundColor CF$UID - 91 + 27 NSCellFlags 67239424 @@ -5681,22 +5629,22 @@ NSContents CF$UID - 382 + 381 NSControlView CF$UID - 379 + 378 NSSupport CF$UID - 159 + 260 NSTextColor CF$UID - 172 + 32 Status Bar @@ -5705,17 +5653,17 @@ $class CF$UID - 387 + 386 NSDrawMatrix CF$UID - 384 + 383 NSFrame CF$UID - 386 + 385 NSMaxValue 100 @@ -5738,7 +5686,7 @@ $class CF$UID - 385 + 384 @@ -5766,7 +5714,7 @@ $class CF$UID - 398 + 397 NSBorderType 3 @@ -5775,7 +5723,7 @@ NSFrame CF$UID - 392 + 391 NSNextResponder @@ -5785,12 +5733,12 @@ NSOffsets CF$UID - 393 + 392 NSSubviews CF$UID - 389 + 388 NSSuperview @@ -5800,7 +5748,7 @@ NSTitleCell CF$UID - 394 + 393 NSTitlePosition 0 @@ -5813,13 +5761,13 @@ $class CF$UID - 33 + 63 NS.objects CF$UID - 390 + 389 @@ -5827,22 +5775,22 @@ $class CF$UID - 85 + 148 NSFrame CF$UID - 391 + 390 NSNextResponder CF$UID - 388 + 387 NSSuperview CF$UID - 388 + 387 {{2, 2}, {125, 1}} @@ -5852,12 +5800,12 @@ $class CF$UID - 174 + 35 NSBackgroundColor CF$UID - 396 + 395 NSCellFlags 67239424 @@ -5866,17 +5814,17 @@ NSContents CF$UID - 395 + 394 NSSupport CF$UID - 206 + 298 NSTextColor CF$UID - 172 + 32 Box @@ -5894,12 +5842,12 @@ NSColor CF$UID - 120 + 67 NSColorName CF$UID - 397 + 396 NSColorSpace 6 @@ -5917,7 +5865,7 @@ NSBox {{1, 9}, {480, 565}} - {{0, 0}, {1152, 848}} + {{0, 0}, {1920, 1178}} {213, 129} {3.40282e+38, 3.40282e+38} MainWindow @@ -5934,13 +5882,17 @@ $class CF$UID - 33 + 63 NS.objects CF$UID - 406 + 405 + + + CF$UID + 408 CF$UID @@ -5952,51 +5904,51 @@ CF$UID - 411 + 412 CF$UID - 413 + 414 CF$UID - 415 + 416 CF$UID - 417 + 418 CF$UID - 419 + 420 CF$UID - 421 + 422 CF$UID - 423 + 424 CF$UID - 425 + 426 CF$UID - 427 + 428 CF$UID - 429 + 430 CF$UID - 431 + 432 CF$UID - 433 + 434 CF$UID @@ -6024,27 +5976,23 @@ CF$UID - 441 + 442 CF$UID - 443 + 444 CF$UID - 445 + 446 CF$UID - 447 + 448 CF$UID - 449 - - - CF$UID - 451 + 450 @@ -6052,22 +6000,22 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 276 + 358 NSLabel CF$UID - 407 + 406 NSSource CF$UID - 241 + 333 statusField @@ -6085,51 +6033,51 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 366 + 136 NSLabel CF$UID - 407 + 406 NSSource CF$UID - 311 + 45 $class CF$UID - 408 + 407 NSDestination CF$UID - 371 + 142 NSLabel CF$UID - 407 + 406 NSSource CF$UID - 342 + 110 $class CF$UID - 408 + 407 NSDestination @@ -6139,7 +6087,7 @@ NSLabel CF$UID - 412 + 411 NSSource @@ -6152,7 +6100,7 @@ $class CF$UID - 408 + 407 NSDestination @@ -6162,7 +6110,7 @@ NSLabel CF$UID - 414 + 413 NSSource @@ -6175,17 +6123,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 379 + 378 NSLabel CF$UID - 416 + 415 NSSource @@ -6198,17 +6146,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 383 + 382 NSLabel CF$UID - 418 + 417 NSSource @@ -6221,7 +6169,7 @@ $class CF$UID - 408 + 407 NSDestination @@ -6231,7 +6179,7 @@ NSLabel CF$UID - 420 + 419 NSSource @@ -6244,17 +6192,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 19 + 155 NSLabel CF$UID - 422 + 421 NSSource @@ -6267,17 +6215,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 102 + 227 NSLabel CF$UID - 424 + 423 NSSource @@ -6290,17 +6238,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 272 + 354 NSLabel CF$UID - 426 + 425 NSSource @@ -6313,17 +6261,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 186 + 279 NSLabel CF$UID - 428 + 427 NSSource @@ -6336,17 +6284,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 342 + 110 NSLabel CF$UID - 430 + 429 NSSource @@ -6359,17 +6307,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 311 + 45 NSLabel CF$UID - 432 + 431 NSSource @@ -6382,17 +6330,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 299 + 19 NSLabel CF$UID - 434 + 433 NSSource @@ -6405,7 +6353,7 @@ $class CF$UID - 408 + 407 NSDestination @@ -6415,19 +6363,19 @@ NSLabel CF$UID - 412 + 411 NSSource CF$UID - 342 + 110 $class CF$UID - 408 + 407 NSDestination @@ -6437,19 +6385,19 @@ NSLabel CF$UID - 412 + 411 NSSource CF$UID - 311 + 45 $class CF$UID - 408 + 407 NSDestination @@ -6459,19 +6407,19 @@ NSLabel CF$UID - 412 + 411 NSSource CF$UID - 102 + 227 $class CF$UID - 408 + 407 NSDestination @@ -6481,19 +6429,19 @@ NSLabel CF$UID - 412 + 411 NSSource CF$UID - 241 + 333 $class CF$UID - 408 + 407 NSDestination @@ -6503,19 +6451,19 @@ NSLabel CF$UID - 412 + 411 NSSource CF$UID - 288 + 370 $class CF$UID - 408 + 407 NSDestination @@ -6525,19 +6473,19 @@ NSLabel CF$UID - 412 + 411 NSSource CF$UID - 334 + 99 $class CF$UID - 408 + 407 NSDestination @@ -6547,12 +6495,12 @@ NSLabel CF$UID - 442 + 441 NSSource CF$UID - 19 + 155 downloadDelegate @@ -6560,7 +6508,7 @@ $class CF$UID - 408 + 407 NSDestination @@ -6570,12 +6518,12 @@ NSLabel CF$UID - 444 + 443 NSSource CF$UID - 19 + 155 frameLoadDelegate @@ -6583,7 +6531,7 @@ $class CF$UID - 408 + 407 NSDestination @@ -6593,12 +6541,12 @@ NSLabel CF$UID - 446 + 445 NSSource CF$UID - 19 + 155 policyDelegate @@ -6606,7 +6554,7 @@ $class CF$UID - 408 + 407 NSDestination @@ -6616,12 +6564,12 @@ NSLabel CF$UID - 448 + 447 NSSource CF$UID - 19 + 155 resourceLoadDelegate @@ -6629,7 +6577,7 @@ $class CF$UID - 408 + 407 NSDestination @@ -6639,12 +6587,12 @@ NSLabel CF$UID - 450 + 449 NSSource CF$UID - 19 + 155 UIDelegate @@ -6652,17 +6600,17 @@ $class CF$UID - 408 + 407 NSDestination CF$UID - 241 + 333 NSLabel CF$UID - 452 + 451 NSSource @@ -6675,181 +6623,181 @@ $class CF$UID - 454 + 453 NS.objects CF$UID - 96 + 19 CF$UID - 167 + 300 CF$UID - 196 + 354 CF$UID - 182 + 374 CF$UID - 288 + 256 CF$UID - 235 + 319 CF$UID - 186 + 382 CF$UID - 241 + 289 CF$UID - 15 + 227 CF$UID - 383 + 155 CF$UID - 338 + 39 CF$UID - 88 + 378 CF$UID - 342 + 223 CF$UID - 299 + 275 CF$UID - 334 + 221 CF$UID - 8 + 271 CF$UID - 281 + 136 CF$UID - 227 + 370 CF$UID - 390 + 45 CF$UID - 208 + 37 CF$UID - 295 + 17 CF$UID - 19 + 358 CF$UID - 272 + 8 CF$UID - 311 + 279 CF$UID - 366 + 325 CF$UID - 17 + 329 CF$UID - 307 + 153 CF$UID - 13 + 15 CF$UID - 155 + 273 CF$UID - 102 + 265 CF$UID - 178 + 333 CF$UID - 305 + 327 CF$UID - 94 + 142 CF$UID - 388 + 13 CF$UID - 237 + 106 CF$UID - 371 + 389 CF$UID - 233 + 110 CF$UID - 297 + 41 CF$UID - 303 + 151 CF$UID - 379 + 363 CF$UID - 98 + 387 CF$UID - 276 + 219 CF$UID - 180 + 99 @@ -6866,181 +6814,181 @@ $class CF$UID - 454 + 453 NS.objects CF$UID - 94 + 17 CF$UID - 96 + 279 CF$UID - 186 + 327 CF$UID - 180 + 15 CF$UID - 235 + 221 CF$UID - 233 + 273 CF$UID - 182 + 13 CF$UID - 237 + 279 CF$UID - 13 + 223 CF$UID - 13 + 153 CF$UID - 303 + 37 CF$UID - 15 + 13 CF$UID - 338 + 221 CF$UID - 297 + 273 CF$UID - 305 + 219 CF$UID - 2 + 15 CF$UID - 235 + 17 CF$UID - 180 + 327 CF$UID - 388 + 41 CF$UID - 186 + 17 CF$UID - 15 + 374 CF$UID - 17 + 327 CF$UID - 235 + 2 CF$UID - 307 + 275 CF$UID - 297 + 15 CF$UID - 88 + 327 CF$UID - 305 + 151 CF$UID - 8 + 13 CF$UID - 96 + 271 CF$UID - 98 + 221 CF$UID - 15 + 329 CF$UID - 303 + 325 CF$UID - 15 + 17 CF$UID - 13 + 8 CF$UID - 235 + 37 CF$UID - 297 + 387 CF$UID - 15 + 106 CF$UID - 295 + 39 CF$UID - 297 + 15 CF$UID - 13 + 327 CF$UID - 96 + 13 CF$UID - 235 + 15 CF$UID - 178 + 39 @@ -7048,149 +6996,149 @@ $class CF$UID - 454 + 453 NS.objects CF$UID - 96 + 19 CF$UID - 167 + 300 CF$UID - 196 + 354 CF$UID - 182 + 227 CF$UID - 288 + 256 CF$UID - 186 + 319 CF$UID - 241 + 382 CF$UID - 15 + 289 CF$UID - 383 + 223 CF$UID - 338 + 155 CF$UID - 88 + 378 CF$UID - 342 + 275 CF$UID - 299 + 221 CF$UID - 334 + 136 CF$UID - 8 + 370 CF$UID - 281 + 45 CF$UID - 227 + 358 CF$UID - 390 + 8 CF$UID - 208 + 279 CF$UID - 19 + 329 CF$UID - 272 + 2 CF$UID - 311 + 153 CF$UID - 366 + 15 CF$UID - 17 + 265 CF$UID - 307 + 333 CF$UID - 155 + 142 CF$UID - 102 + 387 CF$UID - 94 + 106 CF$UID - 388 + 110 CF$UID - 237 + 41 CF$UID - 371 + 151 CF$UID - 2 + 363 CF$UID - 98 + 389 CF$UID - 379 + 219 CF$UID - 276 + 99 @@ -7198,18 +7146,22 @@ $class CF$UID - 454 + 453 NS.objects CF$UID - 337 + 457 CF$UID 458 + + CF$UID + 457 + CF$UID 459 @@ -7218,6 +7170,10 @@ CF$UID 460 + + CF$UID + 457 + CF$UID 461 @@ -7244,39 +7200,35 @@ CF$UID - 467 - - - CF$UID - 463 + 105 CF$UID - 458 + 467 CF$UID - 461 + 468 CF$UID - 10 + 459 CF$UID - 468 + 467 CF$UID - 458 + 10 CF$UID - 337 + 469 CF$UID - 469 + 463 CF$UID @@ -7284,19 +7236,19 @@ CF$UID - 458 + 105 CF$UID - 463 + 471 CF$UID - 471 + 457 CF$UID - 337 + 459 CF$UID @@ -7306,63 +7258,53 @@ CF$UID 473 - - CF$UID - 463 - CF$UID 474 CF$UID - 475 + 459 CF$UID - 472 + 463 CF$UID - 476 + 475 CF$UID - 477 + 476 CF$UID - 472 + 105 CF$UID - 478 + 477 CF$UID - 471 + 468 NSTextField111111 - NSTableColumn - NSScrollView1 - View - NSTableView + NSTableColumn1 NSTextView - NSTabView + NSButton 11 - NSScrollView21 - NSTabViewItem - NSTextField1111111 - NSTableColumn1 + NSTableColumn + NSScrollView2 WebView + NSTextField111 + NSScrollView1 NSTextField1 - NSScrollView2 - NSButton - NSTabViewItem1 - NSBox1 - NSTextField11 + View + NSTableView $class @@ -7372,26 +7314,32 @@ NS.string File's Owner - NSTextField111 + NSTabView + NSTextField11 + NSBox1 + NSScrollView21 + NSTabViewItem + NSTextField1111111 + NSTabViewItem1 $class CF$UID - 454 + 453 NS.objects CF$UID - 342 + 333 CF$UID - 241 + 110 CF$UID - 311 + 45 @@ -7399,21 +7347,21 @@ $class CF$UID - 454 + 453 NS.objects CF$UID - 242 + 46 CF$UID - 242 + 46 CF$UID - 242 + 46 @@ -7421,293 +7369,293 @@ $class CF$UID - 454 + 453 NS.objects CF$UID - 19 + 442 CF$UID - 276 + 434 CF$UID - 429 + 358 CF$UID - 299 + 426 CF$UID - 235 + 333 CF$UID - 297 + 221 CF$UID - 155 + 19 CF$UID - 295 + 106 CF$UID - 409 + 275 CF$UID - 196 + 99 CF$UID - 436 + 405 CF$UID - 227 + 327 CF$UID - 451 + 153 CF$UID - 379 + 319 CF$UID - 431 + 227 CF$UID - 390 + 435 CF$UID - 88 + 444 CF$UID - 437 + 428 CF$UID - 419 + 37 CF$UID - 241 + 223 CF$UID - 178 + 409 CF$UID - 102 + 446 CF$UID - 167 + 436 CF$UID - 433 + 418 CF$UID - 311 + 430 CF$UID - 208 + 136 CF$UID - 98 + 219 CF$UID - 438 + 325 CF$UID - 421 + 382 CF$UID - 334 + 448 CF$UID - 281 + 437 CF$UID - 413 + 420 CF$UID - 13 + 432 CF$UID - 342 + 408 CF$UID - 307 + 256 CF$UID - 233 + 17 CF$UID - 439 + 387 CF$UID - 182 + 273 CF$UID - 288 + 370 CF$UID - 186 + 450 CF$UID - 305 + 438 CF$UID - 303 + 414 CF$UID - 443 + 412 CF$UID - 237 + 151 CF$UID - 423 + 300 CF$UID - 272 + 13 CF$UID - 445 + 155 CF$UID - 8 + 363 CF$UID - 2 + 439 CF$UID - 415 + 416 CF$UID - 440 + 142 CF$UID - 388 + 422 CF$UID - 338 + 374 CF$UID - 417 + 271 CF$UID - 447 + 8 CF$UID - 383 + 2 CF$UID - 449 + 410 CF$UID - 425 + 265 CF$UID - 96 + 289 CF$UID - 15 + 41 CF$UID - 441 + 39 CF$UID - 406 + 110 CF$UID - 94 + 424 CF$UID - 411 + 354 CF$UID - 410 + 389 CF$UID - 427 + 15 CF$UID - 371 + 45 CF$UID - 17 + 279 CF$UID - 366 + 329 CF$UID - 435 + 378 CF$UID - 180 + 440 @@ -7715,10 +7663,14 @@ $class CF$UID - 454 + 453 NS.objects + + CF$UID + 482 + CF$UID 483 @@ -7999,83 +7951,79 @@ CF$UID 552 - - CF$UID - 553 - - 305 + 448 + 441 396 - 438 + 437 + 358 + 302 361 + 365 + 342 + 411 + 397 353 - 357 - 341 - 356 - 409 - 343 - 442 + 303 379 - 452 - 291 - 439 - 315 - 299 - 443 - 431 - 358 - 339 334 - 380 - 440 - 363 - 344 + 442 + 449 + 438 + 413 333 + 423 + 450 + 443 + 431 + 439 + 406 + 301 + 352 + 313 + 451 444 432 - 411 - 426 + 440 + 409 + 341 + 357 + 316 + 340 + 434 + 452 + 445 + 429 428 + 299 + 344 2 - 364 - 362 - 352 - 445 - 342 - 434 - 345 - 412 - 413 - 448 - 359 + 305 + 426 + 446 + 430 + 422 433 - 360 - 449 + 356 + 339 21 1 - 429 - 446 - 316 - 365 - 430 - 450 - 313 - 451 + 427 + 380 + 343 + 362 + 412 + 364 435 - 302 + 360 + 315 300 + 363 + 345 + 359 + 291 447 - 397 - 301 - 427 - 423 - 437 - 422 - 303 - 406 - 441 - 340 $classes diff --git a/sopex/SOPEX/Info.plist b/sopex/SOPEX/Info.plist index 7fc489fa..93475c9f 100644 --- a/sopex/SOPEX/Info.plist +++ b/sopex/SOPEX/Info.plist @@ -17,7 +17,7 @@ CFBundleSignature ???? CFBundleVersion - 2.0 + 2.0.1 NSPrincipalClass diff --git a/sopex/SOPEX/SOPEXAppController.h b/sopex/SOPEX/SOPEXAppController.h index e339192a..c7631663 100644 --- a/sopex/SOPEX/SOPEXAppController.h +++ b/sopex/SOPEX/SOPEXAppController.h @@ -49,6 +49,8 @@ SOPEXBrowserController *mainBrowserController; } ++ (id)sharedController; + - (BOOL)isInRADMode; /* hook to provide custom launch defaults. remember to call super! */ @@ -57,9 +59,12 @@ - (IBAction)openConsole:(id)sender; - (IBAction)openStatistics:(id)sender; - (IBAction)clear:(id)sender; +- (IBAction)restart:(id)sender; - (SOPEXConsole *)console; +- (void)browserControllerDidClose:(SOPEXBrowserController *)_controller; + @end #endif /* __SOPEX_SOPEXAppController_H_ */ diff --git a/sopex/SOPEX/SOPEXAppController.m b/sopex/SOPEX/SOPEXAppController.m index cc9f81b3..3b5e467b 100644 --- a/sopex/SOPEX/SOPEXAppController.m +++ b/sopex/SOPEX/SOPEXAppController.m @@ -32,6 +32,28 @@ #define DNC [NSNotificationCenter defaultCenter] #define UD [NSUserDefaults standardUserDefaults] +@interface WOAdaptor (SOPEXConvenience) +- (NGInternetSocketAddress *)socketAddress; +@end + +@interface WOApplication (SOPEXConvenience) +- (NGInternetSocketAddress *)address; +@end + +@implementation WOApplication (SOPEXConvenience) +- (NGInternetSocketAddress *)address { + NSArray *_adaptors = [self adaptors]; + WOAdaptor *adaptor = nil; + + NSAssert([_adaptors count] > 0, @"no adaptors registered for application"); + adaptor = [_adaptors objectAtIndex:0]; + + if (![adaptor respondsToSelector:@selector(socketAddress)]) + return nil; + return [adaptor socketAddress]; +} +@end + @interface SOPEXAppController (PrivateAPI) - (void)_setup; - (void)_launchSOPE; @@ -60,6 +82,10 @@ static BOOL isInRADMode = YES; isInRADMode ? @"YES" : @"NO"]; } ++ (id)sharedController { + return [NSApp delegate]; +} + - (void)dealloc { [DNC removeObserver:self]; [self->console release]; @@ -119,7 +145,17 @@ static BOOL isInRADMode = YES; } - (void)runSOPE { - WOApplicationMain(@"Application", 0, NULL); + NSAutoreleasePool *p; + NSUserDefaults *ud; + NSString *appClass; + + p = [NSAutoreleasePool new]; + ud = [NSUserDefaults standardUserDefaults]; + appClass = [ud stringForKey:@"SOPEXWOApplicationClass"]; + if (!appClass) + appClass = @"Application"; + WOApplicationMain(appClass, 0, NULL); + [p release]; } - (void)prepareForLaunch { @@ -136,6 +172,9 @@ static BOOL isInRADMode = YES; /* SOPE options */ + /* wildcard host and automatic port */ + [ud setObject:@"*:auto" forKey:@"WOPort"]; + // the next entry works, because executable's cwd is the project directory // (set in project's launch options) [ud setObject:[[NSFileManager defaultManager] currentDirectoryPath] @@ -185,6 +224,25 @@ static BOOL isInRADMode = YES; [self->console clear:sender]; } +- (IBAction)restart:(id)sender { + [[WOApplication application] terminate]; + [self _launchSOPE]; +} + + +/* Notifications */ + +- (void)browserControllerDidClose:(SOPEXBrowserController *)_controller { + if(self->mainBrowserController == _controller) { + self->mainBrowserController = nil; + } + if (![SOPEXBrowserController hasActiveControllers]) { + if([self->console isVisible]) + [self->console close:self]; + if([self->statsController isVisible]) + [self->statsController close:self]; + } +} /* VALIDATION */ @@ -225,6 +283,7 @@ static BOOL isInRADMode = YES; if(! [self windowShouldClose:self->mainWindow]) return NSTerminateLater; #endif + [[WOApplication application] terminate]; return NSTerminateNow; } @@ -243,16 +302,18 @@ static BOOL isInRADMode = YES; - (void)_connectToSOPE { /* create web connection */ + WOApplication *app; SOPEXWebConnection *conn; NSString *url, *path; NSBundle *rsrcBundle; + app = [WOApplication application]; /* ZNeK: "localhost" might be wrong as WOPort could be an NGInternetSocketAddress ... in theory */ url = [NSString stringWithFormat:@"http://localhost:%d/%@", - [[WOApplication port] intValue], - [[WOApplication application] name]]; - + [[app address] port], + [app name]]; + // In Rapid Development mode the mainBundle path is the current working // directory, which is where the source code is located if([self isInRADMode]) { diff --git a/sopex/SOPEX/SOPEXBrowserController.h b/sopex/SOPEX/SOPEXBrowserController.h index d5544460..7fa319b4 100644 --- a/sopex/SOPEX/SOPEXBrowserController.h +++ b/sopex/SOPEX/SOPEXBrowserController.h @@ -57,6 +57,8 @@ SOPEXDocument *document; } ++ (BOOL)hasActiveControllers; + - (NSTextView *)document:(SOPEXDocument *)document textViewForType:(NSString *)fileType; - (void)setWebConnection:(SOPEXWebConnection *)_conn; diff --git a/sopex/SOPEX/SOPEXBrowserController.m b/sopex/SOPEX/SOPEXBrowserController.m index 81cc7c8b..db0cf739 100644 --- a/sopex/SOPEX/SOPEXBrowserController.m +++ b/sopex/SOPEX/SOPEXBrowserController.m @@ -50,6 +50,8 @@ @implementation SOPEXBrowserController +static unsigned controllersCount = 0; + NSString *SOPEXApplicationTabIdentifier = @"application"; NSString *SOPEXWOTabIdentifier = @"wo"; NSString *SOPEXWOXTabIdentifier = @"wox"; @@ -68,6 +70,9 @@ static NGLogger *logger = nil; logger = [lm loggerForDefaultKey:@"SOPEXDebugEnabled"]; } ++ (BOOL)hasActiveControllers { + return controllersCount != 0; +} /* init & dealloc */ @@ -77,6 +82,7 @@ static NGLogger *logger = nil; [NSBundle loadNibNamed:@"SOPEXBrowserController" owner:self]; NSAssert(self->mainWindow != nil, @"Problem loading SOPEXBrowserController.nib!"); + controllersCount += 1; } return self; } @@ -416,6 +422,11 @@ static NGLogger *logger = nil; return YES; } +- (void)windowWillClose:(NSNotification *)_notif { + controllersCount -= 1; + [[SOPEXAppController sharedAppController] browserControllerDidClose:self]; +} + /* tableview datasource */ - (int)numberOfRowsInTableView:(NSTableView *)_tableView { diff --git a/sopex/SOPEX/SOPEXConsole.h b/sopex/SOPEX/SOPEXConsole.h index 7c6fbc00..8cc188bb 100644 --- a/sopex/SOPEX/SOPEXConsole.h +++ b/sopex/SOPEX/SOPEXConsole.h @@ -38,6 +38,9 @@ - (IBAction)orderFront:(id)sender; - (IBAction)clear:(id)sender; +- (IBAction)close:(id)sender; + +- (BOOL)isVisible; - (BOOL)validateMenuItem:(id )menuItem; diff --git a/sopex/SOPEX/SOPEXConsole.m b/sopex/SOPEX/SOPEXConsole.m index 54a01310..cef10c78 100644 --- a/sopex/SOPEX/SOPEXConsole.m +++ b/sopex/SOPEX/SOPEXConsole.m @@ -91,8 +91,14 @@ static NGLogEventFormatter *eventFormatter = nil; - (IBAction)orderFront:(id)sender { [self->window makeKeyAndOrderFront:sender]; } +- (IBAction)close:(id)sender { + [self->window close]; +} - (void)windowWillClose:(NSNotification *)_notif { } +- (BOOL)isVisible { + return [self->window isVisible]; +} /* actions */ diff --git a/sopex/SOPEX/SOPEXStatisticsController.h b/sopex/SOPEX/SOPEXStatisticsController.h index 2dfe2cc0..95a59630 100644 --- a/sopex/SOPEX/SOPEXStatisticsController.h +++ b/sopex/SOPEX/SOPEXStatisticsController.h @@ -53,7 +53,11 @@ - (id)initWithApplicationURL:(NSString *)url; +- (BOOL)isVisible; + - (IBAction)orderFront:(id)sender; +- (IBAction)close:(id)sender; + - (IBAction)performRefresh:(id)sender; - (IBAction)openApplicationInBrowser:(id)sender; diff --git a/sopex/SOPEX/SOPEXStatisticsController.m b/sopex/SOPEX/SOPEXStatisticsController.m index 8aff3534..31c5c56a 100644 --- a/sopex/SOPEX/SOPEXStatisticsController.m +++ b/sopex/SOPEX/SOPEXStatisticsController.m @@ -113,14 +113,16 @@ #pragma mark ### ACTIONS ### -- (IBAction)orderFront:(id)sender -{ +- (IBAction)orderFront:(id)sender { [self->window makeKeyAndOrderFront:sender]; [self performRefresh:self]; } -- (IBAction)performRefresh:(id)sender -{ +- (IBAction)close:(id)sender { + [self->window close]; +} + +- (IBAction)performRefresh:(id)sender { NSURLRequest *request; NSData *xmlStats; @@ -142,19 +144,23 @@ [self->refreshButton setEnabled:YES]; } - - (IBAction)openApplicationInBrowser:(id)sender { [[NSWorkspace sharedWorkspace] openURL:self->applicationURL]; } +/* Window handling */ + +- (BOOL)isVisible { + return [self->window isVisible]; +} + #pragma mark - #pragma mark ### WINDOW DELEGATE ### -- (void)windowWillClose:(NSNotification *)aNotification -{ +- (void)windowWillClose:(NSNotification *)_notif { } diff --git a/sopex/SOPEX/Version b/sopex/SOPEX/Version index 3d5e8b5c..4508310c 100644 --- a/sopex/SOPEX/Version +++ b/sopex/SOPEX/Version @@ -8,7 +8,7 @@ MAJOR_VERSION=2 MINOR_VERSION=0 -SUBMINOR_VERSION=0 +SUBMINOR_VERSION=1 # v2.0.0 requires NGObjWeb v4.5.95 # v1.0.7 requires NGObjWeb v4.2.341 -- 2.39.5