From: znek Date: Fri, 27 Jan 2006 00:36:24 +0000 (+0000) Subject: added support for multiple browser windows X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14c13eb01f7483cdbc8a2ffc1990ba343bd73f48;p=sope added support for multiple browser windows git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1206 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sopex/SOPEX/ChangeLog b/sopex/SOPEX/ChangeLog index 7200f81a..9824be35 100644 --- a/sopex/SOPEX/ChangeLog +++ b/sopex/SOPEX/ChangeLog @@ -1,3 +1,16 @@ +2006-01-27 Marcus Mueller + + * v2.0.4 + + * SOPEXBrowserController.m: added UI delegate methods for creating + new browser windows. It's possible now to have multiple targets + in a SOPE:X application. + + * SOPEXWebConnection.[hm]: exposed -localResourceBundle and reworked + discovery of application prefix. + + * NSBundle+Ext.m: minor bugfix + 2005-09-28 Helge Hess * SOPEXContentValidator.h: added missing @class declarations (v2.0.7) diff --git a/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/info.nib b/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/info.nib index e5bd8ef5..fd7e35b4 100644 --- a/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/info.nib +++ b/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/info.nib @@ -5,7 +5,7 @@ IBDocumentLocation 24 222 356 241 0 0 1920 1178 IBFramework Version - 364.0 + 443.0 IBGroupedObjects 0 @@ -23,7 +23,7 @@ 21 IBSystem Version - 7S215 + 8G32 IBUsesTextArchiving diff --git a/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/keyedobjects.nib b/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/keyedobjects.nib index 08ce795a..47697ec8 100644 --- a/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/keyedobjects.nib +++ b/sopex/SOPEX/English.lproj/SOPEXBrowserController.nib/keyedobjects.nib @@ -9,10 +9,25 @@ $null $class + + CF$UID + 555 + + NSAccessibilityConnectors + + CF$UID + 552 + + NSAccessibilityOidsKeys CF$UID 553 + NSAccessibilityOidsValues + + CF$UID + 554 + NSClassesKeys CF$UID @@ -126,7 +141,7 @@ $class CF$UID - 183 + 53 NS.objects @@ -142,25 +157,20 @@ CF$UID 403 - NSFrameAutosaveName - - CF$UID - 402 - NSMaxSize CF$UID - 401 + 402 NSMinSize CF$UID - 400 + 401 NSScreenRect CF$UID - 399 + 400 NSViewClass @@ -210,12 +220,12 @@ $class CF$UID - 148 + 87 NSFrame CF$UID - 398 + 399 NSNextResponder @@ -232,7 +242,7 @@ $class CF$UID - 63 + 33 NS.objects @@ -263,12 +273,12 @@ NSFont CF$UID - 260 + 160 NSFrame CF$UID - 149 + 88 NSNextResponder @@ -278,7 +288,7 @@ NSSelectedTabViewItem CF$UID - 374 + 90 NSSubviews @@ -293,7 +303,7 @@ NSTabViewItems CF$UID - 150 + 89 NSTvFlags 268435462 @@ -304,7 +314,7 @@ $class CF$UID - 63 + 33 NS.objects @@ -318,12 +328,12 @@ $class CF$UID - 148 + 87 NSFrameSize CF$UID - 147 + 86 NSNextResponder @@ -345,7 +355,7 @@ $class CF$UID - 63 + 33 NS.objects @@ -353,169 +363,217 @@ CF$UID 19 - - CF$UID - 37 - - - CF$UID - 136 - - - CF$UID - 142 - $class CF$UID - 36 + 85 - NSCell + FrameName CF$UID - 21 + 0 - NSEnabled - - NSFrame + GroupName CF$UID - 20 + 0 + + NSDragTypes + + CF$UID + 38 + + NSFrameSize + + CF$UID + 54 + + NSNextKeyView + + CF$UID + 21 NSNextResponder CF$UID 17 + NSSubviews + + CF$UID + 20 + NSSuperview CF$UID 17 NSvFlags - 12 + 274 + Preferences + + CF$UID + 55 + + UseBackForwardList + - {{116, 527}, {347, 13}} $class CF$UID - 35 + 33 - NSBackgroundColor + NS.objects + + + CF$UID + 21 + + + + + $class CF$UID - 27 + 37 - NSCellFlags - 67239424 - NSCellFlags2 - 4194304 - NSContents + NSFrameSize CF$UID - 22 + 36 - NSControlView + NSNextKeyView + + CF$UID + 23 + + NSNextResponder CF$UID 19 - NSPlaceholderString + NSSubviews CF$UID - 26 + 22 - NSSupport + NSSuperview CF$UID - 23 + 19 - NSTextColor + NSvFlags + 274 + + + $class CF$UID - 32 + 33 + NS.objects + + + CF$UID + 23 + + - $class + + CF$UID + 35 + + NSContentView CF$UID 25 - NSName + NSFrameSize + + CF$UID + 34 + + NSNextKeyView + + CF$UID + 25 + + NSNextResponder + + CF$UID + 21 + + NSScrollAmts + + QSAAAEEgAABCIAAAQiAAAA== + + NSSubviews CF$UID 24 - NSSize - 10 - NSfFlags - 27 + NSSuperview + + CF$UID + 21 + + NSsFlags + 0 + NSvFlags + 274 - LucidaGrande - $classes + $class + + CF$UID + 33 + + NS.objects - NSFont - NSObject + + CF$UID + 25 + - $classname - NSFont - WO Name $class CF$UID - 31 + 32 - NSCatalogName + NSBGColor CF$UID - 28 + 27 - NSColor + NSFrameSize CF$UID - 30 + 26 - NSColorName + NSNextResponder CF$UID - 29 + 23 - NSColorSpace - 6 - - System - controlColor - - $class + NSSuperview CF$UID - 31 + 23 - NSColorSpace - 3 - NSWhite - - MC42NjY2NjY2OQA= - - - - $classes - - NSColor - NSObject - - $classname - NSColor + NScvFlags + 2 + NSvFlags + 256 + {480, 547} $class @@ -530,17 +588,18 @@ NSColor CF$UID - 34 + 30 NSColorName CF$UID - 33 + 29 NSColorSpace 6 - controlTextColor + System + controlBackgroundColor $class @@ -551,67 +610,71 @@ 3 NSWhite - MAA= + MC42NjY2NjY2OQA= $classes - NSTextFieldCell - NSActionCell - NSCell + NSColor NSObject $classname - NSTextFieldCell + NSColor $classes - NSTextField - %NSTextField - NSControl - NSView + WebClipView + NSClipView + NSView NSResponder NSObject $classname - NSTextField + WebClipView - $class - - CF$UID - 135 - - NSFrame - - CF$UID - 134 - - NSNextResponder - - CF$UID - 17 - - NSSubviews - - CF$UID - 38 - - NSSuperview - - CF$UID - 17 - - NSvFlags - 256 + $classes + + NSMutableArray + NSArray + NSObject + + $classname + NSMutableArray + + {480, 547} + + $classes + + WebDynamicScrollBarsView + WebCoreScrollView + NSScrollView + NSView + NSResponder + NSObject + + $classname + WebDynamicScrollBarsView + + {480, 547} + + $classes + + WebFrameView + NSView + NSResponder + NSObject + + $classname + WebFrameView $class CF$UID - 63 + 53 NS.objects @@ -621,411 +684,808 @@ CF$UID - 106 + 40 - - - - $class - - CF$UID - 103 - - NSClassName - - CF$UID - 105 - - NSFrameSize - - CF$UID - 104 - - NSNextResponder - - CF$UID - 37 - - NSSubviews - - CF$UID - 40 - - NSSuperview - - CF$UID - 37 - - - - $class - - CF$UID - 63 - - NS.objects - CF$UID 41 CF$UID - 99 + 42 - - - - $class - - CF$UID - 98 - - NSContentView - - CF$UID - 43 - - NSFrame - - CF$UID - 97 - - NSHScroller - - CF$UID - 94 - - NSNextKeyView - - CF$UID - 43 - - NSNextResponder - - CF$UID - 39 - - NSSubviews - - CF$UID - 42 - - NSSuperview - - CF$UID - 39 - - NSVScroller - - CF$UID - 90 - - NSsFlags - 18 - NSvFlags - 256 - - - $class - - CF$UID - 63 - - NS.objects - CF$UID 43 CF$UID - 90 + 44 + + + CF$UID + 45 + + + CF$UID + 46 + + + CF$UID + 47 + + + CF$UID + 48 CF$UID - 94 + 49 + + + CF$UID + 50 + + + CF$UID + 51 + + + CF$UID + 52 + Apple HTML pasteboard type + Apple PICT pasteboard type + NeXT Rich Text Format v1.0 pasteboard type + public.url-name + NSFilenamesPboardType + NSStringPboardType + Apple Web Archive pasteboard type + public.url + NeXT TIFF v4.0 pasteboard type + WebURLsWithTitlesPboardType + NSColor pasteboard type + dyn.aqr104pxbsb2g23msr731k8puqy81n6xqr2oooooo + Apple URL pasteboard type + NeXT RTFD pasteboard type + + $classes + + NSMutableSet + NSSet + NSObject + + $classname + NSMutableSet + + {480, 547} $class CF$UID - 89 - - NSBGColor - - CF$UID - 67 - - NSCursor - - CF$UID - 87 - - NSDocView - - CF$UID - 45 - - NSFrame - - CF$UID - 86 - - NSNextKeyView - - CF$UID - 45 - - NSNextResponder - - CF$UID - 41 + 84 - NSSubviews + Identifier CF$UID - 44 + 56 - NSSuperview + Values CF$UID - 41 + 57 - NScvFlags - 4 - NSvFlags - 2304 + WebUI $class CF$UID - 63 + 83 - NS.objects + NS.keys CF$UID - 45 + 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 + + + CF$UID + 72 + + + CF$UID + 73 + + + NS.objects + + + CF$UID + 74 + + + CF$UID + 75 + + + CF$UID + 76 + + + CF$UID + 76 + + + CF$UID + 76 + + + CF$UID + 77 + + + CF$UID + 76 + + + CF$UID + 78 + + + CF$UID + 79 + + + CF$UID + 76 + + + CF$UID + 76 + + + CF$UID + 80 + + + CF$UID + 81 + + + CF$UID + 79 + + + CF$UID + 82 + + + CF$UID + 76 + + + + WebUIWebKitDefaultFixedFontSize + WebUIWebKitDefaultFontSize + WebUIWebKitDisplayImagesKey + WebUIWebKitJavaScriptEnabled + WebUIWebKitAllowAnimatedImagesPreferenceKey + WebUIWebKitMinimumFontSize + WebUIWebKitPluginsEnabled + WebUIWebKitFantasyFont + WebUIWebKitStandardFont + WebUIWebKitAllowAnimatedImageLoopingPreferenceKey + WebUIWebKitJavaEnabled + WebUIWebKitSansSerifFont + WebUIWebKitCursiveFont + WebUIWebKitSerifFont + WebUIWebKitFixedFont + WebUIWebKitJavaScriptCanOpenWindowsAutomatically + 13 + 16 + + 1 + Papyrus + Times + Helvetica + Apple Chancery + 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 + + {{0, 19}, {480, 546}} + + $class + + CF$UID + 33 + + NS.objects + + + CF$UID + 90 + + + CF$UID + 96 + + + CF$UID + 179 + + + CF$UID + 234 + + + CF$UID + 295 + + + + + $class + + CF$UID + 95 + + NSColor + + CF$UID + 93 + + NSIdentifier + + CF$UID + 91 + + NSLabel + + CF$UID + 92 + + 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 + 94 + + NSColorSpace + 6 + + controlColor + + $classes + + NSTabViewItem + NSObject + + $classname + NSTabViewItem + + + $class + + CF$UID + 95 + + NSColor + + CF$UID + 93 + + NSIdentifier + + CF$UID + 97 + + NSLabel + + CF$UID + 178 + + NSTabView + + CF$UID + 15 + + NSView + + CF$UID + 98 + + + html + + $class + + CF$UID + 87 + + NSFrameSize + + CF$UID + 177 + + NSNextResponder + + CF$UID + 0 + + NSSubviews + + CF$UID + 99 + + + $class CF$UID - 85 + 33 - NSClassName + NS.objects + + + CF$UID + 100 + + + CF$UID + 156 + + + CF$UID + 168 + + + + + $class CF$UID - 46 + 155 - NSDelegate + NSContentView CF$UID - 0 + 102 - NSFrameSize + NSFrame CF$UID - 48 + 154 - NSMaxSize + NSHScroller CF$UID - 84 + 151 - NSNextResponder + NSNextKeyView CF$UID - 43 + 102 - NSOriginalClassName + NSNextResponder CF$UID - 47 + 98 - NSSharedData + NSSubviews CF$UID - 66 + 101 NSSuperview CF$UID - 43 + 98 - NSTVFlags - 6 - NSTextContainer + NSVScroller CF$UID - 49 + 147 + NSsFlags + 18 NSvFlags - 2066 + 274 - SOPEXTextView - NSTextView - {463, 239} $class CF$UID - 65 + 33 - NSLayoutManager + NS.objects + + + CF$UID + 102 + + + CF$UID + 147 + + + CF$UID + 151 + + + + + $class CF$UID - 50 + 146 - NSTCFlags - 1 - NSTextView + NSBGColor CF$UID - 45 + 120 - NSWidth - 463 - - - $class + NSBounds CF$UID - 64 + 143 - NSDelegate + NSCursor CF$UID - 0 + 144 - NSLMFlags - 6 - NSTextContainers + NSDocView CF$UID - 62 + 104 - NSTextStorage + NSFrame + + CF$UID + 142 + + NSNextKeyView + + CF$UID + 104 + + NSNextResponder + + CF$UID + 100 + + NSSubviews + + CF$UID + 103 + + NSSuperview CF$UID - 51 + 100 + NScvFlags + 4 + NSvFlags + 2304 $class CF$UID - 61 + 33 - NSAttributes + NS.objects + + + CF$UID + 104 + + + + + $class CF$UID - 53 + 141 NSDelegate CF$UID 0 - NSString + NSDragTypes CF$UID - 52 + 105 - - - $class + NSFrame CF$UID - 6 + 110 - NS.string - source + NSMaxSize + + CF$UID + 140 + + NSNextResponder + + CF$UID + 102 + + NSSharedData + + CF$UID + 119 + + NSSuperview + + CF$UID + 102 + + NSTVFlags + 6 + NSTextContainer + + CF$UID + 111 + + NSvFlags + 2322 $class CF$UID - 60 + 53 - NS.keys + NS.objects CF$UID - 54 + 39 CF$UID - 55 + 40 - - NS.objects - CF$UID - 56 + 106 CF$UID - 58 + 41 + + + CF$UID + 107 + + + CF$UID + 43 + + + CF$UID + 44 + + + CF$UID + 47 + + + CF$UID + 108 + + + CF$UID + 109 + + + CF$UID + 52 - NSFont - NSParagraphStyle + NeXT Encapsulated PostScript v1.2 pasteboard type + Apple PDF pasteboard type + NSColor pasteboard type + CorePasteboardFlavorType 0x6D6F6F76 + {{0, 124}, {463, 523}} $class CF$UID - 25 + 118 - NSName + NSLayoutManager CF$UID - 57 + 112 + + NSTCFlags + 1 + NSTextView + + CF$UID + 104 + + NSWidth + 463 + + + $class + + CF$UID + 117 + + NSDelegate + + CF$UID + 0 + + NSLMFlags + 6 + NSTextContainers + + CF$UID + 116 + + NSTextStorage + + CF$UID + 113 - NSSize - 10 - NSfFlags - 18 - Monaco $class CF$UID - 59 + 115 + + NSDelegate + + CF$UID + 0 - NSTabStops + NSString CF$UID - 0 + 114 - $classes - - NSMutableParagraphStyle - NSParagraphStyle - NSObject - - $classname - NSMutableParagraphStyle - - - $classes - - NSDictionary - NSObject - - $classname - NSDictionary + $class + + CF$UID + 6 + + NS.string + $classes @@ -1042,26 +1502,16 @@ $class CF$UID - 63 + 33 NS.objects CF$UID - 49 + 111 - - $classes - - NSMutableArray - NSArray - NSObject - - $classname - NSMutableArray - $classes @@ -1084,12 +1534,12 @@ $class CF$UID - 83 + 139 NSBackgroundColor CF$UID - 67 + 120 NSDefaultParagraphStyle @@ -1097,16 +1547,16 @@ 0 NSFlags - 12259 + 11105 NSInsertionColor CF$UID - 34 + 123 NSLinkAttributes CF$UID - 75 + 132 NSMarkedAttributes @@ -1116,9 +1566,34 @@ NSSelectedAttributes CF$UID - 68 + 124 + + + + $class + + CF$UID + 31 + + NSCatalogName + + CF$UID + 28 + + NSColor + + CF$UID + 122 + + NSColorName + + CF$UID + 121 + NSColorSpace + 6 + controlHighlightColor $class @@ -1136,28 +1611,41 @@ $class CF$UID - 60 + 31 + + NSColorSpace + 3 + NSWhite + + MAA= + + + + $class + + CF$UID + 131 NS.keys CF$UID - 69 + 125 CF$UID - 70 + 126 NS.objects CF$UID - 71 + 127 CF$UID - 73 + 129 @@ -1182,7 +1670,7 @@ NSColorName CF$UID - 72 + 128 NSColorSpace 6 @@ -1202,69 +1690,77 @@ NSColor CF$UID - 34 + 123 NSColorName CF$UID - 74 + 130 NSColorSpace 6 selectedTextColor + + $classes + + NSDictionary + NSObject + + $classname + NSDictionary + $class CF$UID - 60 + 131 NS.keys CF$UID - 76 + 133 CF$UID - 77 + 134 CF$UID - 70 + 126 NS.objects CF$UID - 78 + 77 CF$UID - 79 + 135 CF$UID - 82 + 138 NSUnderline NSCursor - 1 $class CF$UID - 81 + 137 NSCursorType 13 NSHotSpot CF$UID - 80 + 136 {8, -8} @@ -1303,25 +1799,30 @@ $classes - NSClassSwapper + NSTextView + %NSTextView + NSText + NSView + NSResponder NSObject $classname - NSClassSwapper + NSTextView - {{1, 1}, {463, 239}} + {{1, 1}, {463, 523}} + {{0, 124}, {463, 523}} $class CF$UID - 81 + 137 NSCursorType 1 NSHotSpot CF$UID - 88 + 145 {4, -5} @@ -1340,39 +1841,39 @@ $class CF$UID - 93 + 150 NSAction CF$UID - 92 + 149 NSCurValue 1 NSFrame CF$UID - 91 + 148 NSNextResponder CF$UID - 41 + 100 NSSuperview CF$UID - 41 + 100 NSTarget CF$UID - 41 + 100 NSvFlags 256 - {{464, 1}, {15, 239}} + {{464, 1}, {15, 523}} _doScroller: $classes @@ -1390,36 +1891,36 @@ $class CF$UID - 93 + 150 NSAction CF$UID - 96 + 153 NSCurValue 1 NSFrame CF$UID - 95 + 152 NSNextResponder CF$UID - 41 + 100 NSPercent 0.94565218687057495 NSSuperview CF$UID - 41 + 100 NSTarget CF$UID - 41 + 100 NSsFlags 1 @@ -1428,7 +1929,7 @@ {{-100, -100}, {87, 18}} _doScroller: - {{0, 39}, {480, 241}} + {{0, -1}, {480, 525}} $classes @@ -1444,808 +1945,724 @@ $class CF$UID - 103 - - NSClassName - - CF$UID - 101 + 167 - NSExtension + NSCell CF$UID - 102 + 158 + NSEnabled + NSFrame CF$UID - 100 + 157 NSNextResponder CF$UID - 39 + 98 NSSuperview CF$UID - 39 + 98 NSvFlags - 2 - - {{0, 20}, {480, 19}} - MLHierarchyView - NSControl - - $classes - - NSCustomView - NSView - NSResponder - NSObject - - $classname - NSCustomView + 265 - {520, 300} - NSView + {{397, 526}, {64, 16}} $class CF$UID - 98 + 166 - NSContentView + NSAlternateContents CF$UID - 108 + 164 - NSFrame + NSAlternateImage CF$UID - 133 + 163 - NSHScroller + NSButtonFlags + -2038284033 + NSButtonFlags2 + 1 + NSCellFlags + 604110336 + NSCellFlags2 + 134479872 + NSContents CF$UID - 130 + 159 - NSNextKeyView + NSControlView CF$UID - 108 + 156 - NSNextResponder + NSKeyEquivalent CF$UID - 37 + 165 - NSSubviews + NSPeriodicDelay + 200 + NSPeriodicInterval + 25 + NSSupport CF$UID - 107 + 160 - NSSuperview + + Reformat + + $class CF$UID - 37 + 162 - NSVScroller + NSName CF$UID - 127 + 161 - NSsFlags - 18 - NSvFlags - 274 + NSSize + 9 + NSfFlags + 3614 - - $class - - CF$UID - 63 - - NS.objects - - - CF$UID - 108 - - - CF$UID - 127 - - - CF$UID - 130 - + LucidaGrande + + $classes + + NSFont + NSObject + $classname + NSFont $class CF$UID - 89 + 162 - NSBGColor + NSName CF$UID - 67 + 161 - NSBounds + NSSize + 9 + NSfFlags + 16 + + + + $class CF$UID - 126 + 6 - NSCursor + NS.string + + + + $classes + + NSButtonCell + %NSButtonCell + NSActionCell + NSCell + NSObject + + $classname + NSButtonCell + + + $classes + + NSButton + NSControl + NSView + NSResponder + NSObject + + $classname + NSButton + + + $class CF$UID - 87 + 176 - NSDocView + NSCell CF$UID - 110 + 170 + NSEnabled + NSFrame CF$UID - 125 - - NSNextKeyView - - CF$UID - 110 + 169 NSNextResponder CF$UID - 106 - - NSSubviews - - CF$UID - 109 + 98 NSSuperview CF$UID - 106 + 98 - NScvFlags - 4 NSvFlags - 2304 + 268 + {{2, 527}, {371, 13}} $class CF$UID - 63 + 175 - NS.objects - - - CF$UID - 110 - - - - - $class + NSBackgroundColor CF$UID - 85 + 93 - NSClassName + NSCellFlags + 69336577 + NSCellFlags2 + 4194304 + NSContents CF$UID - 46 + 171 - NSDelegate + NSControlView CF$UID - 0 + 168 - NSFrame + NSSupport CF$UID - 112 + 172 - NSMaxSize + NSTextColor CF$UID - 124 + 173 - NSNextResponder + + HTML Source + + + $class CF$UID - 108 + 162 - NSOriginalClassName + NSName CF$UID - 111 + 161 - NSSharedData + NSSize + 10 + NSfFlags + 2843 + + + $class CF$UID - 120 + 31 - NSSuperview + NSCatalogName CF$UID - 108 + 28 - NSTVFlags - 6 - NSTextContainer + NSColor CF$UID - 113 + 123 - NSvFlags - 2066 - - NSTextView - {{0, 102}, {503, 264}} - - $class + NSColorName CF$UID - 65 + 174 - NSLayoutManager + NSColorSpace + 6 + + controlTextColor + + $classes + + NSTextFieldCell + NSActionCell + NSCell + NSObject + + $classname + NSTextFieldCell + + + $classes + + NSTextField + %NSTextField + NSControl + NSView + NSResponder + NSObject + + $classname + NSTextField + + {480, 546} + HTML + + $class CF$UID - 114 + 95 - NSTCFlags - 1 - NSTextView + NSColor CF$UID - 110 + 93 - NSWidth - 503 - - - $class + NSIdentifier CF$UID - 64 + 180 - NSDelegate + NSLabel CF$UID - 0 + 233 - NSLMFlags - 6 - NSTextContainers + NSTabView CF$UID - 119 + 15 - NSTextStorage + NSView CF$UID - 115 + 181 + http $class CF$UID - 61 + 87 - NSAttributes + NSFrameSize CF$UID - 117 + 232 - NSDelegate + NSNextResponder CF$UID 0 - NSString - - CF$UID - 116 - - - - $class + NSSubviews CF$UID - 6 + 182 - NS.string - definition $class CF$UID - 60 + 33 - NS.keys - - - CF$UID - 118 - - - CF$UID - 55 - - - CF$UID - 54 - - NS.objects CF$UID - 34 - - - CF$UID - 58 + 183 CF$UID - 56 + 228 - NSColor $class CF$UID - 63 + 155 - NS.objects - - - CF$UID - 113 - - - - - $class + NSContentView CF$UID - 83 + 185 - NSBackgroundColor + NSFrame + + CF$UID + 227 + + NSHScroller CF$UID - 67 + 222 - NSDefaultParagraphStyle + NSHeaderClipView CF$UID - 0 + 190 - NSFlags - 12259 - NSInsertionColor + NSNextKeyView CF$UID - 34 + 185 - NSLinkAttributes + NSNextResponder CF$UID - 122 + 181 - NSMarkedAttributes + NSScrollAmts + + QSAAAEEgAABBmAAAQZgAAA== + + NSSubviews CF$UID - 0 + 184 - NSSelectedAttributes + NSSuperview CF$UID - 121 + 181 - - - $class + NSVScroller CF$UID - 60 + 219 - NS.keys - - - CF$UID - 69 - - - CF$UID - 70 - - - NS.objects - - - CF$UID - 71 - - - CF$UID - 73 - - + NSsFlags + 562 + NSvFlags + 274 $class CF$UID - 60 + 33 - NS.keys + NS.objects CF$UID - 76 - - - CF$UID - 77 + 185 CF$UID - 70 + 219 - - NS.objects - CF$UID - 123 + 222 CF$UID - 79 + 190 CF$UID - 82 + 193 - 1 - {518, 1e+07} - {{1, 1}, {503, 264}} - {{0, 102}, {503, 264}} $class CF$UID - 93 - - NSAction - - CF$UID - 129 - - NSCurValue - 1 - NSFrame - - CF$UID - 128 - - NSNextResponder - - CF$UID - 106 - - NSSuperview - - CF$UID - 106 + 146 - NSTarget + NSBGColor CF$UID - 106 + 27 - NSvFlags - 256 - - {{504, 1}, {15, 264}} - _doScroller: - - $class + NSDocView CF$UID - 93 + 187 - NSAction + NSFrame CF$UID - 132 + 218 - NSCurValue - 1 - NSFrame + NSNextKeyView CF$UID - 131 + 187 NSNextResponder CF$UID - 106 + 183 - NSPercent - 0.94565218687057495 - NSSuperview + NSSubviews CF$UID - 106 + 186 - NSTarget + NSSuperview CF$UID - 106 + 183 - NSsFlags - 1 + NScvFlags + 4 NSvFlags - 256 + 2304 - {{-100, -100}, {87, 18}} - _doScroller: - {{0, 309}, {520, 266}} - {{0, -31}, {520, 575}} - $classes + $class + + CF$UID + 33 + + NS.objects - NSSplitView - NSView - NSResponder - NSObject + + CF$UID + 187 + - $classname - NSSplitView $class CF$UID - 36 + 217 - NSCell + NSBackgroundColor CF$UID - 138 + 122 - NSEnabled - - NSFrame + NSColumnAutoresizingStyle + 4 + NSCornerView CF$UID - 137 + 193 - NSNextResponder + NSDraggingSourceMaskForLocal + 15 + NSDraggingSourceMaskForNonLocal + 0 + NSEnabled + + NSFrameSize CF$UID - 17 + 188 - NSSuperview + NSGridColor CF$UID - 17 + 214 - NSvFlags - 9 - - {{336, 506}, {128, 17}} - - $class + NSHeaderView CF$UID - 35 + 189 - NSBackgroundColor + NSIntercellSpacingHeight + 2 + NSIntercellSpacingWidth + 3 + NSNextResponder CF$UID - 141 + 185 - NSCellFlags - 75628032 - NSCellFlags2 - 71303168 - NSContents + NSRowHeight + 17 + NSSuperview CF$UID - 139 + 185 - NSControlView + NSTableColumns CF$UID - 136 + 196 - NSDrawsBackground - - NSSupport + NSTvFlags + -759169024 + NSvFlags + 256 + + {478, 0} + + $class CF$UID - 140 + 192 - NSTextColor + NSFrameSize CF$UID - 32 + 191 - - .html Validation failed - - - $class + NSNextResponder CF$UID - 25 + 190 - NSName + NSSuperview CF$UID - 24 + 190 - NSSize - 11 - NSfFlags - 28 - - - $class + NSTableView CF$UID - 31 + 187 - NSColorSpace - 1 - NSRGB - - MSAwLjcxOTk2NzI1IDAuNzQ3Mjk4NDgA - + NSvFlags + 256 $class CF$UID - 36 + 146 - NSCell + NSBGColor CF$UID - 144 + 27 - NSEnabled - - NSFrame + NSDocView CF$UID - 143 + 189 - NSNextResponder + NSFrame CF$UID - 17 + 226 - NSSuperview + NSNextKeyView CF$UID - 17 + 189 - NSvFlags - 9 - - {{332, 217}, {128, 17}} - - $class + NSNextResponder CF$UID - 35 + 183 - NSBackgroundColor + NSSubviews CF$UID - 146 + 225 - NSCellFlags - 75628032 - NSCellFlags2 - 71303168 - NSContents + NSSuperview CF$UID - 145 + 183 - NSControlView + NScvFlags + 4 + NSvFlags + 2304 + + {478, 17} + + $classes + + NSTableHeaderView + NSView + NSResponder + NSObject + + $classname + NSTableHeaderView + + + $class CF$UID - 142 + 195 - NSDrawsBackground - - NSSupport + NSFrame CF$UID - 140 + 194 - NSTextColor + NSNextResponder CF$UID - 32 + 183 - - .wod Validation failed - - - $class + NSSuperview CF$UID - 31 + 183 - NSColorSpace - 1 - NSRGB - - MSAwLjcxOTk2NzI1IDAuNzQ3Mjk4NDgA - + NSvFlags + -2147483392 - {480, 546} + {{-32, -34}, {16, 17}} $classes + _NSCornerView NSView NSResponder NSObject $classname - NSView + _NSCornerView - {{0, 19}, {480, 546}} $class CF$UID - 63 + 33 NS.objects CF$UID - 151 - - - CF$UID - 219 - - - CF$UID - 271 - - - CF$UID - 325 + 197 CF$UID - 374 + 209 @@ -2253,276 +2670,297 @@ $class CF$UID - 218 - - NSColor - - CF$UID - 27 + 208 - NSIdentifier + NSDataCell CF$UID - 152 + 206 - NSLabel + NSHeaderCell CF$UID - 217 + 199 - NSTabView + NSIdentifier CF$UID - 15 + 198 - NSView + NSIsResizeable + + NSMaxWidth + 1000 + NSMinWidth + 40 + NSResizingMask + 3 + NSTableView CF$UID - 153 + 187 + NSWidth + 164 - application + header $class CF$UID - 148 + 205 - NSFrameSize + NSBackgroundColor CF$UID - 216 + 202 - NSNextResponder + NSCellFlags + 75628032 + NSCellFlags2 + 0 + NSContents CF$UID - 0 + 200 - NSSubviews + NSSupport CF$UID - 154 + 201 - - - $class + NSTextColor CF$UID - 63 + 203 - NS.objects - - - CF$UID - 155 - - + Header $class CF$UID - 215 - - FrameName - - CF$UID - 0 - - GroupName - - CF$UID - 0 - - NSDragTypes - - CF$UID - 170 + 162 - NSFrameSize + NSName CF$UID - 184 + 161 - NSNextKeyView + NSSize + 11 + NSfFlags + 3100 + + + $class CF$UID - 157 + 31 - NSNextResponder + NSColorSpace + 3 + NSWhite + + MC4zMzMzMzI5OQA= + + + + $class CF$UID - 153 + 31 - NSSubviews + NSCatalogName CF$UID - 156 + 28 - NSSuperview + NSColor CF$UID - 153 + 123 - NSvFlags - 274 - Preferences + NSColorName CF$UID - 185 + 204 - UseBackForwardList - + NSColorSpace + 6 + headerTextColor - $class - - CF$UID - 63 - - NS.objects + $classes - - CF$UID - 157 - + NSTableHeaderCell + NSTextFieldCell + NSActionCell + NSCell + NSObject + $classname + NSTableHeaderCell $class CF$UID - 169 + 175 - NSFrameSize + NSBackgroundColor CF$UID - 168 + 122 - NSNextKeyView + NSCellFlags + 338820672 + NSCellFlags2 + 1024 + NSControlView CF$UID - 159 + 187 - NSNextResponder + NSSupport CF$UID - 155 + 207 - NSSubviews + NSTextColor CF$UID - 158 + 173 - NSSuperview + + + $class CF$UID - 155 + 162 - NSvFlags - 274 + NSName + + CF$UID + 161 + + NSSize + 13 + NSfFlags + 1044 - $class - - CF$UID - 63 - - NS.objects + $classes - - CF$UID - 159 - + NSTableColumn + NSObject + $classname + NSTableColumn $class CF$UID - 167 + 208 - NSContentView + NSDataCell CF$UID - 161 + 213 - NSFrameSize + NSHeaderCell CF$UID - 166 + 211 - NSNextKeyView + NSIdentifier CF$UID - 161 + 210 - NSNextResponder + NSIsEditable + + NSIsResizeable + + NSMaxWidth + 1000 + NSMinWidth + 8 + NSResizingMask + 3 + NSTableView CF$UID - 157 + 187 - NSSubviews + NSWidth + 308.4010009765625 + + value + + $class CF$UID - 160 + 205 - NSSuperview + NSBackgroundColor CF$UID - 157 + 202 - NSsFlags + NSCellFlags + 75628032 + NSCellFlags2 0 - NSvFlags - 274 - - - $class + NSContents CF$UID - 63 + 212 + + NSSupport + + CF$UID + 201 + + NSTextColor + + CF$UID + 203 - NS.objects - - - CF$UID - 161 - - + Value $class CF$UID - 165 + 175 - NSBGColor + NSBackgroundColor CF$UID - 163 + 122 - NSFrameSize + NSCellFlags + 338820672 + NSCellFlags2 + 1024 + NSControlView CF$UID - 162 + 187 - NSNextResponder + NSSupport CF$UID - 159 + 207 - NSSuperview + NSTextColor CF$UID - 159 + 173 - NScvFlags - 2 - NSvFlags - 256 - {480, 547} $class @@ -2537,382 +2975,230 @@ NSColor CF$UID - 30 + 216 NSColorName CF$UID - 164 + 215 NSColorSpace 6 - controlBackgroundColor - - $classes - - WebClipView - NSClipView - NSView - NSResponder - NSObject - - $classname - WebClipView - - {480, 547} + gridColor - $classes - - WebDynamicScrollBarsView - WebCoreScrollView - NSScrollView - NSView - NSResponder - NSObject - - $classname - WebDynamicScrollBarsView + $class + + CF$UID + 31 + + NSColorSpace + 3 + NSWhite + + MC41AA== + - {480, 547} $classes - WebFrameView + NSTableView + %NSTableView + NSControl NSView NSResponder NSObject $classname - WebFrameView + NSTableView + {{1, 17}, {478, 507}} $class + + CF$UID + 150 + + NSAction + + CF$UID + 221 + + NSFrame + + CF$UID + 220 + + NSNextResponder CF$UID 183 - NS.objects - - - CF$UID - 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 + NSPercent + 0.41052630543708801 + NSSuperview + + CF$UID + 183 + + NSTarget + + CF$UID + 183 + + NSvFlags + -2147483392 - {480, 547} + {{-30, 17}, {15, 472}} + _doScroller: $class CF$UID - 214 + 150 + + NSAction + + CF$UID + 224 + + NSFrame + + CF$UID + 223 + + NSNextResponder + + CF$UID + 183 - Identifier + NSPercent + 0.99047619104385376 + NSSuperview CF$UID - 186 + 183 - Values + NSTarget CF$UID - 187 + 183 + NSsFlags + 1 + NSvFlags + -2147483392 - WebUI + {{1, -30}, {423, 15}} + _doScroller: $class CF$UID - 213 + 33 - 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 + 189 - 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 - + {{1, 0}, {478, 17}} + {{0, -1}, {480, 525}} - $classes - - WebPreferences - NSObject - - $classname - WebPreferences + $class + + CF$UID + 176 + + NSCell + + CF$UID + 230 + + NSEnabled + + NSFrame + + CF$UID + 229 + + NSNextResponder + + CF$UID + 181 + + NSSuperview + + CF$UID + 181 + + NSvFlags + 268 + {{2, 527}, {446, 13}} - $classes - - WebView - %WebView - NSView - NSResponder - NSObject - - $classname - WebView + $class + + CF$UID + 175 + + NSBackgroundColor + + CF$UID + 93 + + NSCellFlags + 69336577 + NSCellFlags2 + 4194304 + NSContents + + CF$UID + 231 + + NSControlView + + CF$UID + 228 + + NSSupport + + CF$UID + 172 + + NSTextColor + + CF$UID + 173 + + HTTP Headers + {480, 546} - Application - - $classes - - NSTabViewItem - NSObject - - $classname - NSTabViewItem - + HTTP $class CF$UID - 218 + 95 NSColor CF$UID - 27 + 93 NSIdentifier CF$UID - 220 + 235 NSLabel CF$UID - 270 + 294 NSTabView @@ -2922,20 +3208,20 @@ NSView CF$UID - 221 + 236 - html + wox $class CF$UID - 148 + 87 NSFrameSize CF$UID - 269 + 293 NSNextResponder @@ -2945,28 +3231,36 @@ NSSubviews CF$UID - 222 + 237 $class CF$UID - 63 + 33 NS.objects CF$UID - 223 + 238 CF$UID - 256 + 272 CF$UID - 265 + 276 + + + CF$UID + 281 + + + CF$UID + 288 @@ -2974,47 +3268,47 @@ $class CF$UID - 98 + 155 NSContentView CF$UID - 225 + 240 NSFrame CF$UID - 255 + 271 NSHScroller CF$UID - 252 + 268 NSNextKeyView CF$UID - 225 + 240 NSNextResponder CF$UID - 221 + 236 NSSubviews CF$UID - 224 + 239 NSSuperview CF$UID - 221 + 236 NSVScroller CF$UID - 249 + 265 NSsFlags 18 @@ -3025,21 +3319,21 @@ $class CF$UID - 63 + 33 NS.objects CF$UID - 225 + 240 CF$UID - 249 + 265 CF$UID - 252 + 268 @@ -3047,52 +3341,47 @@ $class CF$UID - 89 + 146 NSBGColor CF$UID - 240 - - NSBounds - - CF$UID - 248 + 122 NSCursor CF$UID - 87 + 144 NSDocView CF$UID - 227 + 242 NSFrame CF$UID - 247 + 264 NSNextKeyView CF$UID - 227 + 242 NSNextResponder CF$UID - 223 + 238 NSSubviews CF$UID - 226 + 241 NSSuperview CF$UID - 223 + 238 NScvFlags 4 @@ -3103,13 +3392,13 @@ $class CF$UID - 63 + 33 NS.objects CF$UID - 227 + 242 @@ -3117,129 +3406,78 @@ $class CF$UID - 246 + 263 - NSDelegate + NSClassName CF$UID - 0 + 243 - NSDragTypes + NSDelegate CF$UID - 228 + 0 - NSFrame + NSFrameSize CF$UID - 233 + 245 NSMaxSize CF$UID - 245 + 262 NSNextResponder CF$UID - 225 + 240 + + NSOriginalClassName + + CF$UID + 244 NSSharedData CF$UID - 239 + 259 NSSuperview CF$UID - 225 + 240 NSTVFlags 6 NSTextContainer CF$UID - 234 + 246 NSvFlags - 2066 - - - $class - - CF$UID - 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 - - + 2322 - Apple PDF pasteboard type - NeXT Encapsulated PostScript v1.2 pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - {{0, 124}, {463, 523}} + SOPEXTextView + NSTextView + {463, 502} $class CF$UID - 65 + 118 NSLayoutManager CF$UID - 235 + 247 NSTCFlags 1 NSTextView CF$UID - 227 + 242 NSWidth 463 @@ -3248,7 +3486,7 @@ $class CF$UID - 64 + 117 NSDelegate @@ -3260,19 +3498,24 @@ NSTextContainers CF$UID - 238 + 258 NSTextStorage CF$UID - 236 + 248 $class CF$UID - 61 + 115 + + NSAttributes + + CF$UID + 250 NSDelegate @@ -3282,7 +3525,7 @@ NSString CF$UID - 237 + 249 @@ -3292,112 +3535,166 @@ 6 NS.string - + source $class CF$UID - 63 + 131 + NS.keys + + + CF$UID + 251 + + + CF$UID + 252 + + + CF$UID + 253 + + NS.objects CF$UID - 234 + 123 + + + CF$UID + 254 + + + CF$UID + 256 + NSColor + NSParagraphStyle + NSFont $class CF$UID - 83 + 255 - NSBackgroundColor + NSTabStops CF$UID - 240 + 0 - NSDefaultParagraphStyle + + + $classes + + NSMutableParagraphStyle + NSParagraphStyle + NSObject + + $classname + NSMutableParagraphStyle + + + $class CF$UID - 0 + 162 - NSFlags - 11105 - NSInsertionColor + NSName CF$UID - 34 + 257 - NSLinkAttributes + NSSize + 10 + NSfFlags + 530 + + Monaco + + $class CF$UID - 243 + 33 - NSMarkedAttributes + NS.objects + + + CF$UID + 246 + + + + + $class CF$UID - 0 + 139 - NSSelectedAttributes + NSBackgroundColor CF$UID - 242 + 122 - - - $class + NSDefaultParagraphStyle CF$UID - 31 + 0 - NSCatalogName + NSFlags + 12259 + NSInsertionColor CF$UID - 28 + 123 - NSColor + NSLinkAttributes CF$UID - 67 + 261 - NSColorName + NSMarkedAttributes + + CF$UID + 0 + + NSSelectedAttributes CF$UID - 241 + 260 - NSColorSpace - 6 - controlHighlightColor $class CF$UID - 60 + 131 NS.keys CF$UID - 69 + 125 CF$UID - 70 + 126 NS.objects CF$UID - 71 + 127 CF$UID - 73 + 129 @@ -3405,128 +3702,122 @@ $class CF$UID - 60 + 131 NS.keys CF$UID - 76 + 133 CF$UID - 77 + 134 CF$UID - 70 + 126 NS.objects CF$UID - 244 + 77 CF$UID - 79 + 135 CF$UID - 82 + 138 - 1 {463, 1e+07} $classes - NSTextView - %NSTextView - NSText - NSView - NSResponder + NSClassSwapper NSObject $classname - NSTextView + NSClassSwapper - {{1, 1}, {463, 523}} - {{0, 124}, {463, 523}} + {{1, 1}, {463, 502}} $class CF$UID - 93 + 150 NSAction CF$UID - 251 + 267 NSCurValue 1 NSFrame CF$UID - 250 + 266 NSNextResponder CF$UID - 223 + 238 NSSuperview CF$UID - 223 + 238 NSTarget CF$UID - 223 + 238 NSvFlags 256 - {{464, 1}, {15, 523}} + {{464, 1}, {15, 502}} _doScroller: $class CF$UID - 93 + 150 NSAction CF$UID - 254 + 270 NSCurValue 1 NSFrame CF$UID - 253 + 269 NSNextResponder CF$UID - 223 + 238 NSPercent 0.94565218687057495 NSSuperview CF$UID - 223 + 238 NSTarget CF$UID - 223 + 238 NSsFlags 1 @@ -3535,451 +3826,397 @@ {{-100, -100}, {87, 18}} _doScroller: - {{0, -1}, {480, 525}} + {{0, 20}, {480, 504}} $class CF$UID - 264 + 176 NSCell CF$UID - 258 + 274 NSEnabled NSFrame CF$UID - 257 + 273 NSNextResponder CF$UID - 221 + 236 NSSuperview CF$UID - 221 + 236 NSvFlags - 9 + 268 - {{397, 526}, {64, 16}} + {{74, 528}, {401, 13}} $class CF$UID - 263 - - NSAlternateContents - - CF$UID - 22 + 175 - NSAlternateImage + NSBackgroundColor CF$UID - 261 + 93 - NSButtonFlags - -2038284033 - NSButtonFlags2 - 1 NSCellFlags - 604110336 + 69336577 NSCellFlags2 - 134479872 + 4194304 NSContents CF$UID - 259 + 275 NSControlView CF$UID - 256 + 272 - NSKeyEquivalent + NSSupport CF$UID - 262 + 172 - NSPeriodicDelay - 200 - NSPeriodicInterval - 25 - NSSupport + NSTextColor CF$UID - 260 + 173 - Reformat + WOX Name $class CF$UID - 25 + 176 - NSName + NSCell CF$UID - 24 + 278 - NSSize - 9 - NSfFlags - 30 + NSEnabled + + NSFrame + + CF$UID + 277 + + NSNextResponder + + CF$UID + 236 + + NSSuperview + + CF$UID + 236 + + NSvFlags + 265 + {{369, 506}, {95, 17}} $class CF$UID - 25 + 175 - NSName + NSBackgroundColor CF$UID - 24 + 280 + + NSCellFlags + 75628032 + NSCellFlags2 + 71303168 + NSContents + + CF$UID + 279 + + NSControlView + + CF$UID + 276 + + NSDrawsBackground + + NSSupport + + CF$UID + 201 + + NSTextColor + + CF$UID + 173 - NSSize - 9 - NSfFlags - 16 + Validation failed + $class CF$UID - 6 + 31 - NS.string - - - - $classes - - NSButtonCell - %NSButtonCell - NSActionCell - NSCell - NSObject - - $classname - NSButtonCell - - - $classes - - NSButton - NSControl - NSView - NSResponder - NSObject - - $classname - NSButton + NSColorSpace + 1 + NSRGB + + MSAwLjcxOTk2NzI1IDAuNzQ3Mjk4NDgA + $class CF$UID - 36 + 176 NSCell CF$UID - 267 + 283 NSEnabled NSFrame CF$UID - 266 + 282 NSNextResponder CF$UID - 221 + 236 NSSuperview CF$UID - 221 + 236 NSvFlags - 12 + 264 - {{2, 527}, {371, 13}} + {{3, 528}, {74, 13}} $class CF$UID - 35 + 175 NSBackgroundColor CF$UID - 27 + 93 NSCellFlags - 69336577 + 67239424 NSCellFlags2 4194304 NSContents CF$UID - 268 + 284 NSControlView CF$UID - 265 + 281 NSSupport CF$UID - 23 + 172 NSTextColor CF$UID - 32 + 285 - HTML Source + Cursor - {480, 546} - HTML - - $class - - CF$UID - 218 - - NSColor - - CF$UID - 27 - - NSIdentifier - - CF$UID - 272 - - NSLabel - - CF$UID - 324 - - NSTabView - - CF$UID - 15 - - NSView - - CF$UID - 273 - - - http $class CF$UID - 148 + 31 - NSFrameSize + NSCatalogName CF$UID - 323 + 28 - NSNextResponder + NSColor CF$UID - 0 + 287 - NSSubviews + NSColorName CF$UID - 274 + 286 + NSColorSpace + 6 + disabledControlTextColor $class CF$UID - 63 + 31 - NS.objects - - - CF$UID - 275 - - - CF$UID - 319 - - + NSColorSpace + 3 + NSWhite + + MC4zMzMzMzMzNAA= + $class CF$UID - 98 + 292 - NSContentView + NSClassName CF$UID - 277 + 290 - NSCornerView + NSExtension CF$UID - 285 + 291 - NSFrame + NSFrameSize CF$UID - 318 + 289 - NSHScroller + NSNextResponder CF$UID - 313 + 236 - NSHeaderClipView + NSSuperview CF$UID - 282 + 236 - NSNextKeyView + NSvFlags + 34 + + {480, 19} + MLHierarchyView + NSControl + + $classes + + NSCustomView + NSView + NSResponder + NSObject + + $classname + NSCustomView + + {480, 546} + WOX + + $class CF$UID - 277 + 95 - NSNextResponder + NSColor CF$UID - 273 + 93 - NSScrollAmts - - QSAAAEEgAABBmAAAQZgAAA== - - NSSubviews + NSIdentifier CF$UID - 276 + 296 - NSSuperview + NSLabel CF$UID - 273 + 376 - NSVScroller + NSTabView CF$UID - 310 + 15 - NSsFlags - 562 - NSvFlags - 274 - - - $class + NSView CF$UID - 63 + 297 - NS.objects - - - CF$UID - 277 - - - CF$UID - 310 - - - CF$UID - 313 - - - CF$UID - 282 - - - CF$UID - 285 - - + wo $class CF$UID - 89 - - NSBGColor - - CF$UID - 163 - - NSDocView - - CF$UID - 279 - - NSFrame - - CF$UID - 309 + 87 - NSNextKeyView + NSFrameSize CF$UID - 279 + 375 NSNextResponder CF$UID - 275 + 0 NSSubviews CF$UID - 278 - - NSSuperview - - CF$UID - 275 + 298 - NScvFlags - 4 - NSvFlags - 2304 $class CF$UID - 63 + 33 NS.objects CF$UID - 279 + 299 + + + CF$UID + 303 + + + CF$UID + 365 + + + CF$UID + 370 @@ -3987,198 +4224,172 @@ $class CF$UID - 308 - - NSBackgroundColor - - CF$UID - 67 + 176 - NSCornerView + NSCell CF$UID - 285 + 301 NSEnabled - NSFrameSize - - CF$UID - 280 - - NSGridColor - - CF$UID - 305 - - NSHeaderView + NSFrame CF$UID - 281 + 300 - NSIntercellSpacingHeight - 2 - NSIntercellSpacingWidth - 3 NSNextResponder CF$UID - 277 + 297 - NSRowHeight - 17 NSSuperview CF$UID - 277 - - NSTableColumns - - CF$UID - 288 + 297 - NSTvFlags - -759169024 + NSvFlags + 268 - {478, 507} + {{116, 527}, {347, 13}} $class CF$UID - 284 + 175 - NSFrameSize + NSBackgroundColor CF$UID - 283 + 93 - NSNextResponder + NSCellFlags + 67239424 + NSCellFlags2 + 4194304 + NSContents CF$UID - 282 + 164 - NSSuperview + NSControlView CF$UID - 282 + 299 - NSTableView + NSPlaceholderString CF$UID - 279 + 302 - NSvFlags - 256 - - - $class + NSSupport CF$UID - 89 + 172 - NSBGColor + NSTextColor CF$UID - 163 + 173 - NSDocView + + WO Name + + $class CF$UID - 281 + 364 NSFrame CF$UID - 317 - - NSNextKeyView - - CF$UID - 281 + 363 NSNextResponder CF$UID - 275 + 297 NSSubviews CF$UID - 316 + 304 NSSuperview CF$UID - 275 + 297 - NScvFlags - 4 NSvFlags - 2304 + 256 - {478, 17} - $classes + $class + + CF$UID + 33 + + NS.objects - NSTableHeaderView - NSView - NSResponder - NSObject + + CF$UID + 305 + + + CF$UID + 338 + - $classname - NSTableHeaderView $class CF$UID - 287 + 292 - NSFrame + NSClassName CF$UID - 286 + 337 + + NSFrameSize + + CF$UID + 336 NSNextResponder CF$UID - 275 + 303 + + NSSubviews + + CF$UID + 306 NSSuperview CF$UID - 275 + 303 NSvFlags - -2147483392 - - {{-32, -34}, {16, 17}} - - $classes - - _NSCornerView - NSView - NSResponder - NSObject - - $classname - _NSCornerView + 274 $class CF$UID - 63 + 33 NS.objects CF$UID - 289 + 307 CF$UID - 300 + 334 @@ -4186,276 +4397,310 @@ $class CF$UID - 299 - - NSDataCell - - CF$UID - 297 + 155 - NSHeaderCell + NSContentView CF$UID - 291 + 309 - NSIdentifier + NSFrame CF$UID - 290 + 333 - NSIsResizeable - - NSMaxWidth - 1000 - NSMinWidth - 40 - NSTableView + NSHScroller CF$UID - 279 + 330 - NSWidth - 164 - - header - - $class + NSNextKeyView CF$UID - 296 + 309 - NSBackgroundColor + NSNextResponder CF$UID - 293 + 305 - NSCellFlags - 75628032 - NSCellFlags2 - 0 - NSContents + NSSubviews CF$UID - 292 + 308 - NSSupport + NSSuperview CF$UID - 140 + 305 - NSTextColor + NSVScroller CF$UID - 294 + 327 + NSsFlags + 18 + NSvFlags + 256 - Header $class CF$UID - 31 + 33 - NSColorSpace - 3 - NSWhite - - MC4zMzMzMzI5OQA= - + NS.objects + + + CF$UID + 309 + + + CF$UID + 327 + + + CF$UID + 330 + + $class CF$UID - 31 + 146 - NSCatalogName + NSBGColor CF$UID - 28 + 122 - NSColor + NSCursor CF$UID - 34 + 144 - NSColorName + NSDocView + + CF$UID + 311 + + NSFrame CF$UID - 295 + 326 - NSColorSpace - 6 + NSNextKeyView + + CF$UID + 311 + + NSNextResponder + + CF$UID + 307 + + NSSubviews + + CF$UID + 310 + + NSSuperview + + CF$UID + 307 + + NScvFlags + 4 + NSvFlags + 2304 - headerTextColor - $classes + $class + + CF$UID + 33 + + NS.objects - NSTableHeaderCell - NSTextFieldCell - NSActionCell - NSCell - NSObject + + CF$UID + 311 + - $classname - NSTableHeaderCell $class CF$UID - 35 + 263 - NSBackgroundColor + NSClassName CF$UID - 67 + 243 - NSCellFlags - 338820672 - NSCellFlags2 - 0 - NSControlView + NSDelegate CF$UID - 279 + 0 - NSSupport + NSFrameSize CF$UID - 298 + 313 - NSTextColor + NSMaxSize CF$UID - 32 + 325 - - - $class + NSNextResponder CF$UID - 25 + 309 - NSName + NSOriginalClassName CF$UID - 24 + 312 - NSSize - 13 - NSfFlags - 20 - - - $classes - - NSTableColumn - NSObject - - $classname - NSTableColumn - - - $class + NSSharedData + + CF$UID + 322 + + NSSuperview CF$UID - 299 + 309 - NSDataCell + NSTVFlags + 6 + NSTextContainer CF$UID - 304 + 314 - NSHeaderCell + NSvFlags + 2322 + + NSTextView + {463, 239} + + $class CF$UID - 302 + 118 - NSIdentifier + NSLayoutManager CF$UID - 301 + 315 - NSIsEditable - - NSIsResizeable - - NSMaxWidth - 1000 - NSMinWidth - 8 - NSTableView + NSTCFlags + 1 + NSTextView CF$UID - 279 + 311 NSWidth - 308.4010009765625 + 463 - value $class CF$UID - 296 - - NSBackgroundColor - - CF$UID - 293 + 117 - NSCellFlags - 75628032 - NSCellFlags2 - 0 - NSContents + NSDelegate CF$UID - 303 + 0 - NSSupport + NSLMFlags + 6 + NSTextContainers CF$UID - 140 + 321 - NSTextColor + NSTextStorage CF$UID - 294 + 316 - Value $class CF$UID - 35 + 115 - NSBackgroundColor + NSAttributes CF$UID - 67 + 318 - NSCellFlags - 338820672 - NSCellFlags2 - 0 - NSControlView + NSDelegate CF$UID - 279 + 0 - NSSupport + NSString CF$UID - 298 + 317 - NSTextColor + + + $class CF$UID - 32 + 6 + + NS.string + source + + + $class + + CF$UID + 131 + NS.keys + + + CF$UID + 252 + + + CF$UID + 251 + + + CF$UID + 253 + + + NS.objects + + + CF$UID + 254 + + + CF$UID + 319 + + + CF$UID + 256 + + $class @@ -4471,340 +4716,301 @@ NSColor CF$UID - 307 + 123 NSColorName CF$UID - 306 + 320 NSColorSpace 6 - gridColor + textColor $class CF$UID - 31 + 33 - NSColorSpace - 3 - NSWhite - - MC41AA== - - - - $classes + NS.objects - NSTableView - %NSTableView - NSControl - NSView - NSResponder - NSObject + + CF$UID + 314 + - $classname - NSTableView - {{1, 17}, {478, 507}} $class CF$UID - 93 - - NSAction - - CF$UID - 312 - - NSFrame - - CF$UID - 311 - - NSNextResponder - - CF$UID - 275 - - NSPercent - 0.41052630543708801 - NSSuperview - - CF$UID - 275 + 139 - NSTarget + NSBackgroundColor CF$UID - 275 + 122 - NSvFlags - -2147483392 - - {{-30, 17}, {15, 472}} - _doScroller: - - $class + NSDefaultParagraphStyle CF$UID - 93 + 0 - NSAction + NSFlags + 12259 + NSInsertionColor CF$UID - 315 + 123 - NSFrame + NSLinkAttributes CF$UID - 314 + 324 - NSNextResponder + NSMarkedAttributes CF$UID - 275 + 0 - NSPercent - 0.99047619104385376 - NSSuperview + NSSelectedAttributes CF$UID - 275 + 323 - NSTarget + + + $class CF$UID - 275 + 131 - NSsFlags - 1 - NSvFlags - -2147483392 + NS.keys + + + CF$UID + 125 + + + CF$UID + 126 + + + NS.objects + + + CF$UID + 127 + + + CF$UID + 129 + + - {{1, -30}, {423, 15}} - _doScroller: $class CF$UID - 63 + 131 + NS.keys + + + CF$UID + 133 + + + CF$UID + 134 + + + CF$UID + 126 + + NS.objects CF$UID - 281 + 77 + + + CF$UID + 135 + + + CF$UID + 138 - {{1, 0}, {478, 17}} - {{0, -1}, {480, 525}} + {463, 1e+07} + {{1, 1}, {463, 239}} $class CF$UID - 36 + 150 - NSCell + NSAction CF$UID - 321 + 329 - NSEnabled - + NSCurValue + 1 NSFrame CF$UID - 320 + 328 NSNextResponder CF$UID - 273 + 307 NSSuperview CF$UID - 273 + 307 + + NSTarget + + CF$UID + 307 NSvFlags - 12 + 256 - {{2, 527}, {446, 13}} + {{464, 1}, {15, 239}} + _doScroller: $class CF$UID - 35 + 150 - NSBackgroundColor + NSAction CF$UID - 27 + 332 - NSCellFlags - 69336577 - NSCellFlags2 - 4194304 - NSContents + NSCurValue + 1 + NSFrame CF$UID - 322 + 331 - NSControlView + NSNextResponder CF$UID - 319 + 307 - NSSupport + NSPercent + 0.94565218687057495 + NSSuperview CF$UID - 23 + 307 - NSTextColor + NSTarget CF$UID - 32 + 307 + NSsFlags + 1 + NSvFlags + 256 - HTTP Headers - - {480, 546} - HTTP + {{-100, -100}, {87, 18}} + _doScroller: + {{0, 39}, {480, 241}} $class CF$UID - 218 - - NSColor - - CF$UID - 27 - - NSIdentifier - - CF$UID - 326 - - NSLabel - - CF$UID - 373 - - NSTabView - - CF$UID - 15 + 292 - NSView + NSClassName CF$UID - 327 + 290 - - wox - - $class + NSExtension CF$UID - 148 + 291 - NSFrameSize + NSFrame CF$UID - 372 + 335 NSNextResponder CF$UID - 0 - - NSSubviews - - CF$UID - 328 + 305 - - - $class + NSSuperview CF$UID - 63 + 305 - NS.objects - - - CF$UID - 329 - - - CF$UID - 354 - - - CF$UID - 358 - - - CF$UID - 363 - - - CF$UID - 370 - - + NSvFlags + 258 + {{0, 20}, {480, 19}} + {520, 300} + NSView $class CF$UID - 98 + 155 NSContentView CF$UID - 331 + 340 NSFrame CF$UID - 353 + 362 NSHScroller CF$UID - 350 + 359 NSNextKeyView CF$UID - 331 + 340 NSNextResponder CF$UID - 327 + 303 NSSubviews CF$UID - 330 + 339 NSSuperview CF$UID - 327 + 303 NSVScroller CF$UID - 347 + 356 NSsFlags 18 @@ -4815,21 +5021,21 @@ $class CF$UID - 63 + 33 NS.objects CF$UID - 331 + 340 CF$UID - 347 + 356 CF$UID - 350 + 359 @@ -4837,47 +5043,52 @@ $class CF$UID - 89 + 146 NSBGColor CF$UID - 67 + 122 + + NSBounds + + CF$UID + 355 NSCursor CF$UID - 87 + 144 NSDocView CF$UID - 333 + 342 NSFrame CF$UID - 346 + 354 NSNextKeyView CF$UID - 333 + 342 NSNextResponder CF$UID - 329 + 338 NSSubviews CF$UID - 332 + 341 NSSuperview CF$UID - 329 + 338 NScvFlags 4 @@ -4888,13 +5099,13 @@ $class CF$UID - 63 + 33 NS.objects CF$UID - 333 + 342 @@ -4902,86 +5113,86 @@ $class CF$UID - 85 + 263 NSClassName CF$UID - 46 + 243 NSDelegate CF$UID 0 - NSFrameSize + NSFrame CF$UID - 335 + 344 NSMaxSize CF$UID - 345 + 353 NSNextResponder CF$UID - 331 + 340 NSOriginalClassName CF$UID - 334 + 343 NSSharedData CF$UID - 341 + 350 NSSuperview CF$UID - 331 + 340 NSTVFlags 6 NSTextContainer CF$UID - 336 + 345 NSvFlags - 2066 + 2322 NSTextView - {463, 502} + {{0, 102}, {503, 264}} $class CF$UID - 65 + 118 NSLayoutManager CF$UID - 337 + 346 NSTCFlags 1 NSTextView CF$UID - 333 + 342 NSWidth - 463 + 503 $class CF$UID - 64 + 117 NSDelegate @@ -4993,24 +5204,24 @@ NSTextContainers CF$UID - 340 + 349 NSTextStorage CF$UID - 338 + 347 $class CF$UID - 61 + 115 NSAttributes CF$UID - 117 + 250 NSDelegate @@ -5020,7 +5231,7 @@ NSString CF$UID - 339 + 348 @@ -5030,19 +5241,19 @@ 6 NS.string - source + definition $class CF$UID - 63 + 33 NS.objects CF$UID - 336 + 345 @@ -5050,12 +5261,12 @@ $class CF$UID - 83 + 139 NSBackgroundColor CF$UID - 67 + 122 NSDefaultParagraphStyle @@ -5067,12 +5278,12 @@ NSInsertionColor CF$UID - 34 + 123 NSLinkAttributes CF$UID - 343 + 352 NSMarkedAttributes @@ -5082,35 +5293,35 @@ NSSelectedAttributes CF$UID - 342 + 351 $class CF$UID - 60 + 131 NS.keys CF$UID - 69 + 125 CF$UID - 70 + 126 NS.objects CF$UID - 71 + 127 CF$UID - 73 + 129 @@ -5118,114 +5329,114 @@ $class CF$UID - 60 + 131 NS.keys CF$UID - 76 + 133 CF$UID - 77 + 134 CF$UID - 70 + 126 NS.objects CF$UID - 344 + 77 CF$UID - 79 + 135 CF$UID - 82 + 138 - 1 - {463, 1e+07} - {{1, 1}, {463, 502}} + {518, 1e+07} + {{1, 1}, {503, 264}} + {{0, 102}, {503, 264}} $class CF$UID - 93 + 150 NSAction CF$UID - 349 + 358 NSCurValue 1 NSFrame CF$UID - 348 + 357 NSNextResponder CF$UID - 329 + 338 NSSuperview CF$UID - 329 + 338 NSTarget CF$UID - 329 + 338 NSvFlags 256 - {{464, 1}, {15, 502}} + {{504, 1}, {15, 264}} _doScroller: $class CF$UID - 93 + 150 NSAction CF$UID - 352 + 361 NSCurValue 1 NSFrame CF$UID - 351 + 360 NSNextResponder CF$UID - 329 + 338 NSPercent 0.94565218687057495 NSSuperview CF$UID - 329 + 338 NSTarget CF$UID - 329 + 338 NSsFlags 1 @@ -5234,118 +5445,61 @@ {{-100, -100}, {87, 18}} _doScroller: - {{0, 20}, {480, 504}} - - $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}} + {{0, 309}, {520, 266}} + {{0, -31}, {520, 575}} - $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 - + $classes + + NSSplitView + NSView + NSResponder + NSObject + + $classname + NSSplitView - WOX Name $class CF$UID - 36 + 176 NSCell CF$UID - 360 + 367 NSEnabled NSFrame CF$UID - 359 + 366 NSNextResponder CF$UID - 327 + 297 NSSuperview CF$UID - 327 + 297 NSvFlags - 9 + 265 - {{369, 506}, {95, 17}} + {{336, 506}, {128, 17}} $class CF$UID - 35 + 175 NSBackgroundColor CF$UID - 362 + 369 NSCellFlags 75628032 @@ -5354,27 +5508,27 @@ NSContents CF$UID - 361 + 368 NSControlView CF$UID - 358 + 365 NSDrawsBackground NSSupport CF$UID - 140 + 201 NSTextColor CF$UID - 32 + 173 - Validation failed + .html Validation failed $class @@ -5393,180 +5547,88 @@ $class CF$UID - 36 + 176 NSCell CF$UID - 365 + 372 NSEnabled NSFrame CF$UID - 364 + 371 NSNextResponder CF$UID - 327 + 297 NSSuperview CF$UID - 327 + 297 NSvFlags - 8 + 265 - {{3, 528}, {74, 13}} + {{332, 217}, {128, 17}} $class CF$UID - 35 + 175 NSBackgroundColor CF$UID - 27 + 374 NSCellFlags - 67239424 + 75628032 NSCellFlags2 - 4194304 + 71303168 NSContents CF$UID - 366 + 373 NSControlView CF$UID - 363 + 370 + NSDrawsBackground + NSSupport CF$UID - 23 + 201 NSTextColor CF$UID - 367 + 173 - Cursor + .wod Validation failed - - $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 - - NSView + + $class CF$UID - 17 + 31 + NSColorSpace + 1 + NSRGB + + MSAwLjcxOTk2NzI1IDAuNzQ3Mjk4NDgA + - wo + {480, 546} WO $classes @@ -5583,7 +5645,7 @@ $class CF$UID - 36 + 176 NSCell @@ -5608,19 +5670,19 @@ 13 NSvFlags - 34 + 290 {{3, 4}, {442, 11}} $class CF$UID - 35 + 175 NSBackgroundColor CF$UID - 27 + 93 NSCellFlags 67239424 @@ -5639,12 +5701,12 @@ NSSupport CF$UID - 260 + 160 NSTextColor CF$UID - 32 + 173 Status Bar @@ -5680,7 +5742,7 @@ NSpiFlags 12554 NSvFlags - 1057 + 1313 $class @@ -5714,7 +5776,7 @@ $class CF$UID - 397 + 398 NSBorderType 3 @@ -5761,7 +5823,7 @@ $class CF$UID - 63 + 33 NS.objects @@ -5775,7 +5837,7 @@ $class CF$UID - 148 + 87 NSFrame @@ -5800,7 +5862,7 @@ $class CF$UID - 35 + 175 NSBackgroundColor @@ -5819,12 +5881,12 @@ NSSupport CF$UID - 298 + 207 NSTextColor CF$UID - 32 + 397 Box @@ -5842,7 +5904,7 @@ NSColor CF$UID - 67 + 122 NSColorName @@ -5853,6 +5915,19 @@ 6 textBackgroundColor + + $class + + CF$UID + 31 + + NSColorSpace + 3 + NSWhite + + MCAwLjgwMDAwMDAxAA== + + $classes @@ -5868,7 +5943,6 @@ {{0, 0}, {1920, 1178}} {213, 129} {3.40282e+38, 3.40282e+38} - MainWindow $classes @@ -5882,7 +5956,7 @@ $class CF$UID - 63 + 33 NS.objects @@ -6005,7 +6079,7 @@ NSDestination CF$UID - 358 + 276 NSLabel @@ -6015,7 +6089,7 @@ NSSource CF$UID - 333 + 242 statusField @@ -6038,7 +6112,7 @@ NSDestination CF$UID - 136 + 365 NSLabel @@ -6048,7 +6122,7 @@ NSSource CF$UID - 45 + 311 @@ -6060,7 +6134,7 @@ NSDestination CF$UID - 142 + 370 NSLabel @@ -6070,7 +6144,7 @@ NSSource CF$UID - 110 + 342 @@ -6197,7 +6271,7 @@ NSDestination CF$UID - 155 + 19 NSLabel @@ -6220,7 +6294,7 @@ NSDestination CF$UID - 227 + 104 NSLabel @@ -6243,7 +6317,7 @@ NSDestination CF$UID - 354 + 272 NSLabel @@ -6266,7 +6340,7 @@ NSDestination CF$UID - 279 + 187 NSLabel @@ -6289,7 +6363,7 @@ NSDestination CF$UID - 110 + 342 NSLabel @@ -6312,7 +6386,7 @@ NSDestination CF$UID - 45 + 311 NSLabel @@ -6335,7 +6409,7 @@ NSDestination CF$UID - 19 + 299 NSLabel @@ -6368,7 +6442,7 @@ NSSource CF$UID - 110 + 342 @@ -6390,7 +6464,7 @@ NSSource CF$UID - 45 + 311 @@ -6412,7 +6486,7 @@ NSSource CF$UID - 227 + 104 @@ -6434,7 +6508,7 @@ NSSource CF$UID - 333 + 242 @@ -6456,7 +6530,7 @@ NSSource CF$UID - 370 + 288 @@ -6478,7 +6552,7 @@ NSSource CF$UID - 99 + 334 @@ -6500,7 +6574,7 @@ NSSource CF$UID - 155 + 19 downloadDelegate @@ -6523,7 +6597,7 @@ NSSource CF$UID - 155 + 19 frameLoadDelegate @@ -6546,7 +6620,7 @@ NSSource CF$UID - 155 + 19 policyDelegate @@ -6569,7 +6643,7 @@ NSSource CF$UID - 155 + 19 resourceLoadDelegate @@ -6592,7 +6666,7 @@ NSSource CF$UID - 155 + 19 UIDelegate @@ -6605,7 +6679,7 @@ NSDestination CF$UID - 333 + 242 NSLabel @@ -6629,175 +6703,175 @@ CF$UID - 19 + 13 CF$UID - 300 + 311 CF$UID - 354 + 338 CF$UID - 374 + 90 CF$UID - 256 + 303 CF$UID - 319 + 234 CF$UID - 382 + 299 CF$UID - 289 + 15 CF$UID - 227 + 378 CF$UID - 155 + 181 CF$UID - 39 + 98 CF$UID - 378 + 187 CF$UID - 223 + 197 CF$UID - 275 + 8 CF$UID - 221 + 305 CF$UID - 271 + 307 CF$UID - 136 + 365 CF$UID - 370 + 96 CF$UID - 45 + 168 CF$UID - 37 + 238 CF$UID - 17 + 295 CF$UID - 358 + 100 CF$UID - 8 + 236 CF$UID - 279 + 281 CF$UID - 325 + 228 CF$UID - 329 + 156 CF$UID - 153 + 19 CF$UID - 15 + 209 CF$UID - 273 + 17 CF$UID - 265 + 272 CF$UID - 333 + 342 CF$UID - 327 + 104 CF$UID - 142 + 387 CF$UID - 13 + 382 CF$UID - 106 + 297 CF$UID - 389 + 288 CF$UID - 110 + 179 CF$UID - 41 + 389 CF$UID - 151 + 242 CF$UID - 363 + 334 CF$UID - 387 + 183 CF$UID - 219 + 276 CF$UID - 99 + 370 @@ -6820,15 +6894,15 @@ CF$UID - 17 + 8 CF$UID - 279 + 307 CF$UID - 327 + 303 CF$UID @@ -6836,159 +6910,159 @@ CF$UID - 221 + 297 CF$UID - 273 + 15 CF$UID - 13 + 297 CF$UID - 279 + 13 CF$UID - 223 + 13 CF$UID - 153 + 179 CF$UID - 37 + 96 CF$UID - 13 + 183 CF$UID - 221 + 187 CF$UID - 273 + 2 CF$UID - 219 + 303 CF$UID - 15 + 305 CF$UID - 17 + 297 CF$UID - 327 + 15 CF$UID - 41 + 98 CF$UID - 17 + 236 CF$UID - 374 + 15 CF$UID - 327 + 98 CF$UID - 2 + 234 CF$UID - 275 + 236 CF$UID - 15 + 181 CF$UID - 327 + 98 CF$UID - 151 + 17 CF$UID - 13 + 187 CF$UID - 271 + 90 CF$UID - 221 + 236 CF$UID - 329 + 338 CF$UID - 325 + 100 CF$UID - 17 + 13 CF$UID - 8 + 13 CF$UID - 37 + 295 CF$UID - 387 + 236 CF$UID - 106 + 15 CF$UID - 39 + 387 CF$UID - 15 + 238 CF$UID - 327 + 305 CF$UID - 13 + 181 CF$UID - 15 + 236 CF$UID - 39 + 297 @@ -7002,143 +7076,143 @@ CF$UID - 19 + 311 CF$UID - 300 + 338 CF$UID - 354 + 90 CF$UID - 227 + 378 CF$UID - 256 + 299 CF$UID - 319 + 15 CF$UID - 382 + 98 CF$UID - 289 + 197 CF$UID - 223 + 307 CF$UID - 155 + 187 CF$UID - 378 + 96 CF$UID - 275 + 8 CF$UID - 221 + 365 CF$UID - 136 + 168 CF$UID - 370 + 238 CF$UID - 45 + 100 CF$UID - 358 + 281 CF$UID - 8 + 228 CF$UID - 279 + 156 CF$UID - 329 + 19 CF$UID - 2 + 209 CF$UID - 153 + 17 CF$UID - 15 + 387 CF$UID - 265 + 272 CF$UID - 333 + 104 CF$UID - 142 + 342 CF$UID - 387 + 382 CF$UID - 106 + 2 CF$UID - 110 + 288 CF$UID - 41 + 389 CF$UID - 151 + 242 CF$UID - 363 + 334 CF$UID - 389 + 183 CF$UID - 219 + 276 CF$UID - 99 + 370 @@ -7158,10 +7232,6 @@ CF$UID 458 - - CF$UID - 457 - CF$UID 459 @@ -7172,15 +7242,15 @@ CF$UID - 457 + 461 CF$UID - 461 + 462 CF$UID - 462 + 337 CF$UID @@ -7200,7 +7270,7 @@ CF$UID - 105 + 10 CF$UID @@ -7208,27 +7278,27 @@ CF$UID - 468 + 461 CF$UID - 459 + 464 CF$UID - 467 + 464 CF$UID - 10 + 468 CF$UID - 469 + 461 CF$UID - 463 + 469 CF$UID @@ -7236,23 +7306,27 @@ CF$UID - 105 + 471 + + + CF$UID + 337 CF$UID - 471 + 472 CF$UID - 457 + 461 CF$UID - 459 + 457 CF$UID - 472 + 457 CF$UID @@ -7264,47 +7338,51 @@ CF$UID - 459 + 475 CF$UID - 463 + 337 CF$UID - 475 + 457 CF$UID - 476 + 475 CF$UID - 105 + 476 CF$UID - 477 + 467 CF$UID - 468 + 477 - NSTextField111111 - NSTableColumn1 NSTextView - NSButton - 11 + NSScrollView21 + NSTabViewItem + NSTextField111 + NSTextField111111 + NSTabView NSTableColumn NSScrollView2 - WebView - NSTextField111 - NSScrollView1 - NSTextField1 - View NSTableView + NSTabViewItem1 + NSTextField1 + NSTextField1111111 + NSButton + WebView + NSTableColumn1 + NSBox1 + 11 $class @@ -7314,13 +7392,9 @@ NS.string File's Owner - NSTabView + View + NSScrollView1 NSTextField11 - NSBox1 - NSScrollView21 - NSTabViewItem - NSTextField1111111 - NSTabViewItem1 $class @@ -7331,15 +7405,15 @@ CF$UID - 333 + 342 CF$UID - 110 + 311 CF$UID - 45 + 242 @@ -7353,15 +7427,15 @@ CF$UID - 46 + 243 CF$UID - 46 + 243 CF$UID - 46 + 243 @@ -7379,283 +7453,283 @@ CF$UID - 434 + 428 CF$UID - 358 + 98 CF$UID - 426 + 418 CF$UID - 333 + 437 CF$UID - 221 + 13 CF$UID - 19 + 444 CF$UID - 106 + 156 CF$UID - 275 + 17 CF$UID - 99 + 281 CF$UID - 405 + 228 CF$UID - 327 + 430 CF$UID - 153 + 422 CF$UID - 319 + 420 CF$UID - 227 + 338 CF$UID - 435 + 438 CF$UID - 444 + 409 CF$UID - 428 + 168 CF$UID - 37 + 272 CF$UID - 223 + 446 CF$UID - 409 + 197 CF$UID - 446 + 342 CF$UID - 436 + 100 CF$UID - 418 + 414 CF$UID - 430 + 432 CF$UID - 136 + 424 CF$UID - 219 + 389 CF$UID - 325 + 439 CF$UID - 382 + 311 CF$UID - 448 + 19 CF$UID - 437 + 448 CF$UID - 420 + 434 CF$UID - 432 + 426 CF$UID - 408 + 183 CF$UID - 256 + 408 CF$UID - 17 + 181 CF$UID - 387 + 405 CF$UID - 273 + 412 CF$UID - 370 + 334 CF$UID - 450 + 387 CF$UID - 438 + 303 CF$UID - 414 + 440 CF$UID - 412 + 450 CF$UID - 151 + 236 CF$UID - 300 + 382 CF$UID - 13 + 276 CF$UID - 155 + 297 CF$UID - 363 + 8 CF$UID - 439 + 305 CF$UID - 416 + 288 CF$UID - 142 + 416 CF$UID - 422 + 104 CF$UID - 374 + 2 CF$UID - 271 + 90 CF$UID - 8 + 410 CF$UID - 2 + 307 CF$UID - 410 + 242 CF$UID - 265 + 295 CF$UID - 289 + 179 CF$UID - 41 + 15 CF$UID - 39 + 365 CF$UID - 110 + 435 CF$UID - 424 + 209 CF$UID - 354 + 238 CF$UID - 389 + 378 CF$UID - 15 + 234 CF$UID - 45 + 187 CF$UID - 279 + 299 CF$UID - 329 + 370 CF$UID - 378 + 436 CF$UID - 440 + 96 @@ -7875,6 +7949,10 @@ CF$UID 533 + + CF$UID + 77 + CF$UID 534 @@ -7947,83 +8025,105 @@ CF$UID 551 - - CF$UID - 552 - 448 - 441 - 396 - 437 - 358 + 438 302 - 361 - 365 - 342 - 411 - 397 - 353 + 431 + 444 + 2 + 449 + 341 303 + 426 379 - 334 - 442 - 449 - 438 - 413 - 333 - 423 - 450 - 443 - 431 439 - 406 - 301 - 352 - 313 - 451 - 444 + 433 432 + 365 + 445 + 423 + 380 + 360 + 450 + 343 + 364 + 333 + 429 440 + 435 + 315 + 446 + 363 + 305 + 451 + 441 + 437 + 342 409 - 341 - 357 - 316 340 - 434 - 452 - 445 - 429 + 397 428 - 299 - 344 - 2 - 305 - 426 - 446 - 430 - 422 - 433 - 356 - 339 + 411 + 316 + 413 + 447 + 452 + 353 + 313 + 396 + 357 21 - 1 + 412 + 434 + 430 + 334 + 299 427 - 380 - 343 362 - 412 - 364 - 435 - 360 - 315 + 358 + 356 + 339 300 - 363 - 345 + 406 + 442 + 344 359 291 - 447 + 352 + 345 + 361 + 422 + 443 + 301 + + $class + + CF$UID + 33 + + NS.objects + + + + $class + + CF$UID + 453 + + NS.objects + + + + $class + + CF$UID + 453 + + NS.objects + + $classes diff --git a/sopex/SOPEX/Info.plist b/sopex/SOPEX/Info.plist index 275db0b2..d946579c 100644 --- a/sopex/SOPEX/Info.plist +++ b/sopex/SOPEX/Info.plist @@ -17,7 +17,7 @@ CFBundleSignature ???? CFBundleVersion - 2.0.2 + 2.0.4 NSPrincipalClass diff --git a/sopex/SOPEX/NSBundle+Ext.m b/sopex/SOPEX/NSBundle+Ext.m index aa414510..ba928f35 100644 --- a/sopex/SOPEX/NSBundle+Ext.m +++ b/sopex/SOPEX/NSBundle+Ext.m @@ -39,6 +39,8 @@ r = [_urlPath rangeOfString:@"WebServerResources"]; if(r.location != NSNotFound) _urlPath = [_urlPath substringFromIndex:r.location + r.length]; + else if ([_urlPath hasPrefix:@"/"] && ([_urlPath length] > 1)) + _urlPath = [_urlPath substringFromIndex:1]; resourcePath = [[self bundlePath] stringByAppendingPathComponent:_urlPath]; if([fm fileExistsAtPath:resourcePath]) diff --git a/sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj b/sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj index 28baba14..43aae216 100644 --- a/sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj +++ b/sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj @@ -204,6 +204,8 @@ ADDFB45105DC5555005FB28D /* SOPEXConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOPEXConstants.h; sourceTree = ""; }; ADDFB45205DC5555005FB28D /* SOPEXConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOPEXConstants.m; sourceTree = ""; }; ADDFB48F05DC5A05005FB28D /* SOPEX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOPEX.h; sourceTree = ""; }; + ADE6900F0989A0AA005E3971 /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile; sourceTree = ""; tabWidth = 8; }; + ADE690100989A0AA005E3971 /* GNUmakefile.preamble */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 5; indentWidth = 8; path = GNUmakefile.preamble; sourceTree = ""; tabWidth = 8; }; ADEE3D8705DCF8C800F523DB /* SOPEXMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOPEXMain.m; sourceTree = ""; }; ADEE3DAB05DCFD0800F523DB /* SOPEXMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOPEXMain.h; sourceTree = ""; }; ADFA08B20614635A00E216F9 /* SOPEXDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOPEXDocument.h; sourceTree = ""; }; @@ -260,6 +262,7 @@ ADDFB3F505DC517A005FB28D /* PROJECTLEAD */, ADDFB3F705DC51A0005FB28D /* ChangeLog */, ADDFB3F905DC51BD005FB28D /* Version */, + ADE6900E0989A07F005E3971 /* Makefiles */, ADEE3D9505DCF8EC00F523DB /* Global */, ADFA08B10614634400E216F9 /* Model */, AD3FED21060F558A00A90173 /* Controllers */, @@ -435,6 +438,15 @@ name = NGLogging; sourceTree = ""; }; + ADE6900E0989A07F005E3971 /* Makefiles */ = { + isa = PBXGroup; + children = ( + ADE6900F0989A0AA005E3971 /* GNUmakefile */, + ADE690100989A0AA005E3971 /* GNUmakefile.preamble */, + ); + name = Makefiles; + sourceTree = ""; + }; ADEE3D9505DCF8EC00F523DB /* Global */ = { isa = PBXGroup; children = ( @@ -515,7 +527,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.0.2; + DYLIB_CURRENT_VERSION = 2.0.7; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_ENABLE_TRIGRAPHS = NO; @@ -724,7 +736,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.0.2; + DYLIB_CURRENT_VERSION = 2.0.7; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_ENABLE_TRIGRAPHS = NO; @@ -740,6 +752,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Dynamic; + MACH_O_TYPE = mh_dylib; OTHER_CFLAGS = ( "-DNeXT_RUNTIME=1", "-DAPPLE_RUNTIME=1", @@ -770,7 +783,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.0.2; + DYLIB_CURRENT_VERSION = 2.0.7; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -795,6 +808,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Dynamic; + MACH_O_TYPE = mh_dylib; OTHER_CFLAGS = ( "-DNeXT_RUNTIME=1", "-DAPPLE_RUNTIME=1", @@ -826,7 +840,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.0.2; + DYLIB_CURRENT_VERSION = 2.0.7; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_ENABLE_TRIGRAPHS = NO; @@ -841,6 +855,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Dynamic; + MACH_O_TYPE = mh_dylib; OTHER_CFLAGS = ( "-DNeXT_RUNTIME=1", "-DAPPLE_RUNTIME=1", diff --git a/sopex/SOPEX/SOPEXBrowserController.m b/sopex/SOPEX/SOPEXBrowserController.m index b16d0cbf..9726496f 100644 --- a/sopex/SOPEX/SOPEXBrowserController.m +++ b/sopex/SOPEX/SOPEXBrowserController.m @@ -50,7 +50,8 @@ @implementation SOPEXBrowserController -static unsigned controllersCount = 0; +static unsigned controllersCount = 0; +static NSPoint cascadeTopLeft = {0, 0}; NSString *SOPEXApplicationTabIdentifier = @"application"; NSString *SOPEXWOTabIdentifier = @"wo"; @@ -79,15 +80,21 @@ static NGLogger *logger = nil; - (id)init { self = [super init]; if(self) { + NSString *autosaveName; + [NSBundle loadNibNamed:@"SOPEXBrowserController" owner:self]; NSAssert(self->mainWindow != nil, @"Problem loading SOPEXBrowserController.nib!"); + + autosaveName = [NSString stringWithFormat:@"BrowserWindow%d", + controllersCount]; + [self->mainWindow setFrameAutosaveName:autosaveName]; controllersCount += 1; } return self; } -- (oneway void)release { +- (void)release { #warning !! FIXME /* This seems to be triggered by a bug in WebKit by the resource load delegate, after a successful load - it might be another problem, @@ -98,8 +105,7 @@ static NGLogger *logger = nil; #endif } -- (void)dealloc -{ +- (void)dealloc { [self->responseHeaderValues release]; [self->connection release]; [self->toolbarController release]; @@ -111,10 +117,14 @@ static NGLogger *logger = nil; /* setup */ - (void)awakeFromNib { - [self->webView setGroupName:@"WebUI"]; - self->responseHeaderValues = [[NSMutableArray alloc] initWithCapacity:20]; + NSString *groupName; + + cascadeTopLeft = [self->mainWindow cascadeTopLeftFromPoint:cascadeTopLeft]; + groupName = [NSString stringWithFormat:@"WebUI%d", controllersCount]; + [self->webView setGroupName:groupName]; - self->toolbarController = [[SOPEXToolbarController alloc] + self->responseHeaderValues = [[NSMutableArray alloc] initWithCapacity:20]; + self->toolbarController = [[SOPEXToolbarController alloc] initWithIdentifier:@"SOPEXWebUI" target:self]; @@ -133,6 +143,13 @@ static NGLogger *logger = nil; self->connection]; } +- (WebView *)webView { + return self->webView; +} + +- (SOPEXWebConnection *)webConnection { + return self->connection; +} /* actions */ @@ -344,7 +361,7 @@ static NGLogger *logger = nil; [self setStatus:_msg isError:NO]; } -- (void)setStatus:(NSString *)_msg isError:(BOOL)isError { +- (void)setStatus:(NSString *)_msg isError:(BOOL)_isError { if(_msg == nil) _msg = @""; [self->statusBarTextField setStringValue:_msg]; @@ -357,11 +374,11 @@ static NGLogger *logger = nil; } - (void)createDocumentFromResponse { - WebDataSource *dataSource; + WebDataSource *dataSource; NSHTTPURLResponse *response; - NSDictionary *headerFields; - NSString *templatePath; - + NSDictionary *headerFields; + NSString *templatePath; + dataSource = [[self->webView mainFrame] dataSource]; response = (NSHTTPURLResponse *)[dataSource response]; @@ -454,7 +471,7 @@ static NGLogger *logger = nil; - (NSURLRequest *)webView:(WebView *)_sender resource:(id)_id willSendRequest:(NSURLRequest *)_rq - redirectResponse:(NSURLResponse *)redirectResponse + redirectResponse:(NSURLResponse *)_redirectResponse fromDataSource:(WebDataSource *)_ds { /* use that to patch resource requests to local files ;-) */ @@ -653,6 +670,37 @@ static NGLogger *logger = nil; [self setStatus:nil]; } +- (WebView *)webView:(WebView *)sender + createWebViewWithRequest:(NSURLRequest *)_rq +{ + SOPEXBrowserController *controller; + NSURL *url; + + controller = [[SOPEXBrowserController alloc] init]; // leak + url = [_rq URL]; + if (url) { + SOPEXWebConnection *conn; + NSBundle *bundle; + + bundle = [[self webConnection] localResourceBundle]; + conn = [[SOPEXWebConnection alloc] initWithURL:url + localResourceBundle:bundle]; + [controller setWebConnection:conn]; + } + + [[[controller webView] mainFrame] loadRequest:_rq]; + return [controller webView]; +} + +- (void)webViewShow:(WebView *)sender { +#if 0 + NSLog(@"%s sender:%@ webView:%@", __PRETTY_FUNCTION__, sender, self->webView); +#endif + if (sender == self->webView) + [self orderFront:self]; +} + + /* Logging */ - (id)debugLogger { diff --git a/sopex/SOPEX/SOPEXWebConnection.h b/sopex/SOPEX/SOPEXWebConnection.h index 9d4a84fb..3930b157 100644 --- a/sopex/SOPEX/SOPEXWebConnection.h +++ b/sopex/SOPEX/SOPEXWebConnection.h @@ -18,12 +18,13 @@ - (id)initWithURL:(id)_url localResourceBundle:(NSBundle *)_resourceBundle; - /* accessors */ +/* accessors */ - (NSURL *)url; - (NSString *)sessionID; +- (NSBundle *)localResourceBundle; - /* operations */ +/* operations */ - (void)processResponse:(NSURLResponse *)_r data:(NSData *)_data; diff --git a/sopex/SOPEX/SOPEXWebConnection.m b/sopex/SOPEX/SOPEXWebConnection.m index d58dc0f6..2d684e00 100644 --- a/sopex/SOPEX/SOPEXWebConnection.m +++ b/sopex/SOPEX/SOPEXWebConnection.m @@ -23,6 +23,9 @@ static NGLogger *logger = nil; - (id)initWithURL:(id)_url localResourceBundle:(NSBundle *)_resourceBundle { if ((self = [super init])) { + NSArray *pathComponents; + NSString *appName; + if ([_url isKindOfClass:[NSURL class]]) self->url = [_url copy]; else @@ -32,9 +35,17 @@ static NGLogger *logger = nil; _resourceBundle = [NSBundle mainBundle]; self->localResourceBundle = [_resourceBundle retain]; self->resourceCache = [[NSMutableDictionary alloc] init]; - self->appPrefix = - [[NSString stringWithFormat:@"/%@", - [[self->url path] lastPathComponent]] retain]; + + pathComponents = [[self->url path] pathComponents]; + if ([pathComponents count] == 0) { + [self errorWithFormat:@"Cannot determine application prefix properly?!"]; + appName = @"UNKNOWN_APPNAME"; + } + else { + appName = [pathComponents objectAtIndex:0]; + } + + self->appPrefix = [[NSString stringWithFormat:@"/%@", appName] retain]; } return self; } @@ -44,9 +55,9 @@ static NGLogger *logger = nil; } - (void)dealloc { - [self->resourceCache release]; + [self->resourceCache release]; [self->localResourceBundle release]; - [self->url release]; + [self->url release]; [self->sessionID release]; [self->appPrefix release]; [super dealloc]; @@ -60,12 +71,14 @@ static NGLogger *logger = nil; - (NSString *)sessionID { return self->sessionID; } +- (NSBundle *)localResourceBundle { + return self->localResourceBundle; +} /* session tracking */ - (void)_useSessionID:(NSString *)_sid { - [self->sessionID autorelease]; - self->sessionID = [_sid copy]; + ASSIGNCOPY(self->sessionID, _sid); } - (void)handleNoSessionInResponse:(NSURLResponse *)_r { @@ -156,7 +169,7 @@ static NGLogger *logger = nil; - (NSURL *)rewriteRequestURL:(NSURL *)_url { NSString *resourcePath, *urlPath; - NSURL *cacheURL; + NSURL *cacheURL; if ([_url isFileURL]) return _url; diff --git a/sopex/SOPEX/Version b/sopex/SOPEX/Version index 0ea8b0d9..2637404d 100644 --- a/sopex/SOPEX/Version +++ b/sopex/SOPEX/Version @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=0 -SUBMINOR_VERSION=7 +SUBMINOR_VERSION=8 # v2.0.0 requires NGObjWeb v4.5.95 # v1.0.7 requires NGObjWeb v4.2.341