diff --git a/F-Script/DemoAssistant.xib b/F-Script/DemoAssistant.xib index 848a9e7..62f246b 100644 --- a/F-Script/DemoAssistant.xib +++ b/F-Script/DemoAssistant.xib @@ -1,39 +1,36 @@ - + 1060 - 11C74 - 1938 - 1138.23 - 567.00 + 12B19 + 2549 + 1187 + 624.00 com.apple.InterfaceBuilder.CocoaPlugin - 1938 + 2549 - - YES - NSView - NSTextField - NSScrollView - NSWindowTemplate - NSTextFieldCell + NSBox - NSTextView - NSButtonCell NSButton - NSScroller + NSButtonCell NSCustomObject - - - YES + NSScrollView + NSScroller + NSTextField + NSTextFieldCell + NSTextView + NSView + NSWindowTemplate + + com.apple.InterfaceBuilder.CocoaPlugin - + PluginDependencyRecalculationVersion - - YES + FSDemoAssistant @@ -46,7 +43,7 @@ 15 2 - {{1190, 17}, {260, 292}} + {{473, 420}, {260, 292}} 536870912 Demo Assistant NSWindow @@ -55,17 +52,17 @@ 256 - - YES + 268 {{20, 250}, {106, 23}} + YES - -2080244224 + -2080374784 134217728 loadImage @@ -74,13 +71,14 @@ 1044 - -2033434369 + -2033434624 162 400 75 + NO @@ -88,20 +86,22 @@ {{12, 125}, {106, 23}} + YES - -2080244224 + -2080374784 134217728 horloge - -2033434369 + -2033434624 162 400 75 + NO @@ -109,20 +109,22 @@ {{8, 87}, {114, 23}} + YES - -2080244224 + -2080374784 134217728 connectToITunes - -2033434369 + -2033434624 162 400 75 + NO @@ -132,18 +134,19 @@ YES - -2080244224 + -2080374784 134217728 volumeRamp - -2033434369 + -2033434624 162 400 75 + NO @@ -151,20 +154,22 @@ {{134, 250}, {106, 23}} + YES - -2080244224 + -2080374784 134217728 perspective - -2033434369 + -2033434624 162 400 75 + NO @@ -172,20 +177,22 @@ {{134, 221}, {106, 23}} + YES - -2080244224 + -2080374784 134217728 hueAdjust - -2033434369 + -2033434624 162 400 75 + NO @@ -193,20 +200,22 @@ {{134, 192}, {106, 23}} + YES - -2080244224 + -2080374784 134217728 bump - -2033434369 + -2033434624 162 400 75 + NO @@ -214,20 +223,22 @@ {{134, 163}, {106, 23}} + YES - -2080244224 + -2080374784 134217728 bumpAnimate - -2033434369 + -2033434624 162 400 75 + NO @@ -235,20 +246,22 @@ {{20, 221}, {106, 23}} + YES - -2080244224 + -2080374784 134217728 displayImage - -2033434369 + -2033434624 162 400 75 + NO @@ -256,20 +269,22 @@ {{20, 192}, {106, 23}} + YES - -2080244224 + -2080374784 134217728 lockFocus - -2033434369 + -2033434624 162 400 75 + NO @@ -277,9 +292,10 @@ {{12, 153}, {236, 5}} + {0, 0} - 67239424 + 67108864 0 Box @@ -308,9 +324,10 @@ {{12, 115}, {236, 5}} + {0, 0} - 67239424 + 67108864 0 Box @@ -325,10 +342,11 @@ 0 NO - + {260, 292} + {{0, 0}, {1440, 878}} {10000000000000, 10000000000000} @@ -337,54 +355,28 @@ 15 2 - {{196, -392}, {881, 902}} - 603979776 + {{307, -24}, {881, 902}} + 609746944 Core Image NSWindow - + 256 - - YES + 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {824, 16} + {839, 24} @@ -393,135 +385,124 @@ aW1hZ2UgOj0gQ0lJbWFnZSBpbWFnZVdpdGhDb250ZW50c09mVVJMOihOU1VSTCBmaWxlVVJMV2l0aFBh dGg6Jy9MaWJyYXJ5L0Rlc2t0b3AgUGljdHVyZXMvTmF0dXJlL0Nsb3duIEZpc2guanBnJykuA - - YES - - YES - NSFont - NSParagraphStyle + + + Monaco + 12 + 16 - - YES - - Monaco - 12 - 16 - - - 3 - - YES - - 0.0 - - - 56 - - - 112 - - - 168 - - - 224 - - - 280 - - - 336 - - - 392 - - - 448 - - - 504 - - - 560 - - - 616 - - - 672 - - - 728 - - - 784 - - - 840 - - - 896 - - - 952 - - - 1008 - - - 1064 - - - 1120 - - - 1176 - - - 1232 - - - 1288 - - - 1344 - - - 1400 - - - 1456 - - - 1512 - - - 1568 - - - 1624 - - - 1680 - - - 1736 - + + 3 + + + 0.0 + + + 56 + + + 112 + + + 168 + + + 224 + + + 280 + + + 336 + + + 392 + + + 448 + + + 504 - + + 560 + + + 616 + + + 672 + + + 728 + + + 784 + + + 840 + + + 896 + + + 952 + + + 1008 + + + 1064 + + + 1120 + + + 1176 + + + 1232 + + + 1288 + + + 1344 + + + 1400 + + + 1456 + + + 1512 + + + 1568 + + + 1624 + + + 1680 + + + 1736 + + - + - - YES + - - 6 + + 38 - 824 + 839 1 @@ -529,63 +510,44 @@ dGg6Jy9MaWJyYXJ5L0Rlc2t0b3AgUGljdHVyZXMvTmF0dXJlL0Nsb3duIEZpc2guanBnJykuA0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - 6 - System - selectedTextBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - + + + 6 + System + selectedTextBackgroundColor + + 3 + MC42NjY2NjY2NjY3AA - - 6 - System - selectedTextColor - - 3 - MAA - + + + 6 + System + selectedTextColor + + 3 + MAA - + - - YES - - YES - NSColor - NSUnderline + + + 1 + MCAwIDEAA - - YES - - 1 - MCAwIDEAA - - - - + + 1 6 {1665, 10000000} - {223, 0} - - {{1, 1}, {824, 24}} + + {{1, 1}, {839, 24}} @@ -594,10 +556,8 @@ dGg6Jy9MaWJyYXJ5L0Rlc2t0b3AgUGljdHVyZXMvTmF0dXJlL0Nsb3duIEZpc2guanBnJykuA{4, 5} 12582912 - - YES - - YES + + @@ -608,8 +568,8 @@ AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - + + 3 MCAwAA @@ -621,8 +581,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 - {{825, 1}, {15, 24}} + {{824, 1}, {16, 24}} + NO _doScroller: 1 @@ -633,13 +594,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 831}, {841, 26}} @@ -647,6 +609,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + 0.25 + 4 + 1 @@ -655,7 +620,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 68288064 + 68157504 272630784 Load image @@ -673,45 +638,20 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {824, 16} + {839, 24} @@ -720,33 +660,23 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA aW1hZ2UgZHJhd0luUmVjdDooMTUwPD4yMDAgZXh0ZW50OjYwMDw+NDAwKSBmcm9tUmVjdDppbWFnZSBl eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg - - YES - - YES - NSFont - NSParagraphStyle + + + + 4 + - - YES - - - 4 - - - - + - - YES + - - 6 + + 38 - 824 + 839 1 @@ -754,44 +684,25 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} - - {{1, 1}, {824, 24}} + + {{1, 1}, {839, 24}} @@ -802,8 +713,9 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg 256 - {{825, 1}, {15, 24}} + {{824, 1}, {16, 24}} + NO _doScroller: 1 @@ -814,13 +726,14 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 772}, {841, 26}} @@ -828,6 +741,9 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg + 0.25 + 4 + 1 @@ -836,7 +752,7 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg YES - 68288064 + 68157504 272630784 Display image @@ -844,45 +760,20 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg + NO 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {824, 16} + {839, 24} @@ -890,18 +781,17 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg NSApplication sharedApplication mainWindow contentView lockFocus. - + - - YES + - - 6 + + 38 - 824 + 839 1 @@ -909,44 +799,25 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} - - {{1, 1}, {824, 24}} + + {{1, 1}, {839, 24}} @@ -957,8 +828,9 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg 256 - {{825, 1}, {15, 24}} + {{824, 1}, {16, 24}} + NO _doScroller: 1 @@ -969,13 +841,14 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 713}, {841, 26}} @@ -983,6 +856,9 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg + 0.25 + 4 + 1 @@ -991,7 +867,7 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg YES - 68288064 + 68157504 272630784 Lock focus @@ -999,44 +875,20 @@ eHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg + NO 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {824, 176} + {839, 182} @@ -1055,18 +907,17 @@ ciB2YWx1ZUZvcktleTonb3V0cHV0SW1hZ2UnLgpwZXJzcGVjdGl2ZUltYWdlIGRyYXdJblJlY3Q6KDE1 MDw+MjAwIGV4dGVudDo2MDA8PjQwMCkgZnJvbVJlY3Q6aW1hZ2UgZXh0ZW50IG9wZXJhdGlvbjpOU0Nv bXBvc2l0ZVNvdXJjZU92ZXIgZnJhY3Rpb246MS4 - + - - YES + - - 6 + + 38 - 824 + 839 1 @@ -1074,44 +925,25 @@ bXBvc2l0ZVNvdXJjZU92ZXIgZnJhY3Rpb246MS4 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} - - {{1, 1}, {824, 182}} + + {{1, 1}, {839, 182}} @@ -1122,8 +954,9 @@ bXBvc2l0ZVNvdXJjZU92ZXIgZnJhY3Rpb246MS4 256 - {{825, 1}, {15, 182}} + {{824, 1}, {16, 182}} + NO _doScroller: 0.7109375 @@ -1133,13 +966,14 @@ bXBvc2l0ZVNvdXJjZU92ZXIgZnJhY3Rpb246MS4 -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 473}, {841, 184}} @@ -1147,6 +981,9 @@ bXBvc2l0ZVNvdXJjZU92ZXIgZnJhY3Rpb246MS4 + 0.25 + 4 + 1 @@ -1155,7 +992,7 @@ bXBvc2l0ZVNvdXJjZU92ZXIgZnJhY3Rpb246MS4 YES - 68288064 + 68157504 272630784 Perspective @@ -1163,45 +1000,20 @@ bXBvc2l0ZVNvdXJjZU92ZXIgZnJhY3Rpb246MS4 + NO 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {824, 112} + {839, 119} @@ -1214,18 +1026,17 @@ J291dHB1dEltYWdlJy4KaHVlSW1hZ2UgZHJhd0luUmVjdDooMTUwPD4yMDAgZXh0ZW50OjYwMDw+NDAw KSBmcm9tUmVjdDppbWFnZSBleHRlbnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFj dGlvbjoxLg - + - - YES + - - 6 + + 38 - 824 + 839 1 @@ -1233,44 +1044,25 @@ dGlvbjoxLg 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} - - {{1, 1}, {824, 119}} + + {{1, 1}, {839, 119}} @@ -1281,8 +1073,9 @@ dGlvbjoxLg 256 - {{825, 1}, {15, 119}} + {{824, 1}, {16, 119}} + NO _doScroller: 0.7109375 @@ -1292,13 +1085,14 @@ dGlvbjoxLg -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 319}, {841, 121}} @@ -1306,6 +1100,9 @@ dGlvbjoxLg + 0.25 + 4 + 1 @@ -1314,7 +1111,7 @@ dGlvbjoxLg YES - 68288064 + 68157504 272630784 Hue adjust @@ -1322,45 +1119,20 @@ dGlvbjoxLg + NO 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {824, 192} + {839, 192} @@ -1375,18 +1147,17 @@ bXBJbWFnZSA6PSBidW1wRmlsdGVyIHZhbHVlRm9yS2V5OidvdXRwdXRJbWFnZScuCmJ1bXBJbWFnZSBk cmF3SW5SZWN0OigxNTA8PjIwMCBleHRlbnQ6NjAwPD40MDApIGZyb21SZWN0OmJ1bXBJbWFnZSBleHRl bnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg - + - - YES + - - 6 + + 38 - 824 + 839 1 @@ -1394,44 +1165,26 @@ bnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} + {839, 107} - - {{1, 1}, {824, 107}} + + {{1, 1}, {839, 107}} @@ -1442,9 +1195,10 @@ bnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg 256 - {{825, 1}, {15, 107}} + {{824, 1}, {16, 107}} YES + NO _doScroller: 0.55729166666666663 @@ -1454,13 +1208,14 @@ bnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 177}, {841, 109}} @@ -1468,6 +1223,9 @@ bnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg + 0.25 + 4 + 1 @@ -1476,7 +1234,7 @@ bnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg YES - 68288064 + 68157504 272630784 Bump @@ -1484,45 +1242,20 @@ bnQgb3BlcmF0aW9uOk5TQ29tcG9zaXRlU291cmNlT3ZlciBmcmFjdGlvbjoxLg + NO 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {824, 224} + {839, 224} @@ -1539,37 +1272,27 @@ PSBidW1wRmlsdGVyIHZhbHVlRm9yS2V5OidvdXRwdXRJbWFnZScuCiAgICBidW1wZWRJbWFnZSBkcmF3 SW5SZWN0OnJlY3QgZnJvbVJlY3Q6aW1hZ2UgZXh0ZW50IG9wZXJhdGlvbjpOU0NvbXBvc2l0ZVNvdXJj ZU92ZXIgZnJhY3Rpb246MS4KICAgIGtleVdpbmRvdyBmbHVzaFdpbmRvdy4KXQo - - YES - - YES - NSFont - NSParagraphStyle + + + Helvetica + 12 + 16 - - YES - - Helvetica - 12 - 16 - - - 4 - - + + 4 + - + - - YES + - - 6 + + 38 - 824 + 839 1 @@ -1577,44 +1300,26 @@ ZU92ZXIgZnJhY3Rpb246MS4KICAgIGtleVdpbmRvdyBmbHVzaFdpbmRvdy4KXQo 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} + {839, 122} - - {{1, 1}, {824, 122}} + + {{1, 1}, {839, 122}} @@ -1625,9 +1330,10 @@ ZU92ZXIgZnJhY3Rpb246MS4KICAgIGtleVdpbmRvdyBmbHVzaFdpbmRvdy4KXQo 256 - {{825, 1}, {15, 122}} + {{824, 1}, {16, 122}} YES + NO _doScroller: 0.5446428571428571 @@ -1637,13 +1343,14 @@ ZU92ZXIgZnJhY3Rpb246MS4KICAgIGtleVdpbmRvdyBmbHVzaFdpbmRvdy4KXQo -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 20}, {841, 124}} @@ -1651,6 +1358,9 @@ ZU92ZXIgZnJhY3Rpb246MS4KICAgIGtleVdpbmRvdyBmbHVzaFdpbmRvdy4KXQo + 0.25 + 4 + 1 @@ -1659,7 +1369,7 @@ ZU92ZXIgZnJhY3Rpb246MS4KICAgIGtleVdpbmRvdyBmbHVzaFdpbmRvdy4KXQo YES - 68288064 + 68157504 272630784 Bump animate @@ -1667,9 +1377,11 @@ ZU92ZXIgZnJhY3Rpb246MS4KICAgIGtleVdpbmRvdyBmbHVzaFdpbmRvdy4KXQo + NO - + {881, 902} + {{0, 0}, {1440, 878}} {10000000000000, 10000000000000} @@ -1685,47 +1397,21 @@ ZU92ZXIgZnJhY3Rpb246MS4KICAgIGtleVdpbmRvdyBmbHVzaFdpbmRvdy4KXQo - + 256 - - YES + 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {461, 266} + {476, 252} @@ -1738,18 +1424,17 @@ ZGxlIGxvYWROaWJGaWxlOicvVXNlcnMvcG1vdWdpbi9EZXNrdG9wL1NhbXBsZS9idWlsZC9EZWJ1Zy9T YW1wbGUuYXBwL0NvbnRlbnRzL1Jlc291cmNlcy9FbmdsaXNoLmxwcm9qL01haW5NZW51Lm5pYicgZXh0 ZXJuYWxOYW1lVGFibGU6bmlsIHdpdGhab25lOm5pbAo - + - - YES + - - 6 + + 38 - 461 + 476 1 @@ -1757,44 +1442,26 @@ ZXJuYWxOYW1lVGFibGU6bmlsIHdpdGhab25lOm5pbAo 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} + {476, 185} - - {{1, 1}, {461, 185}} + + {{1, 1}, {476, 185}} @@ -1805,25 +1472,27 @@ ZXJuYWxOYW1lVGFibGU6bmlsIHdpdGhab25lOm5pbAo 256 - {{462, 1}, {15, 185}} + {{461, 1}, {16, 185}} YES + NO _doScroller: - 0.69548872180451127 + 0.73412698412698407 -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 20}, {478, 187}} @@ -1831,9 +1500,13 @@ ZXJuYWxOYW1lVGFibGU6bmlsIHdpdGhab25lOm5pbAo + 0.25 + 4 + 1 - + {518, 227} + {{0, 0}, {1440, 878}} {10000000000000, 10000000000000} @@ -1842,54 +1515,28 @@ ZXJuYWxOYW1lVGFibGU6bmlsIHdpdGhab25lOm5pbAo 15 2 - {{196, -55}, {790, 565}} + {{337, 217}, {790, 565}} 611844096 SystemWideScripting NSWindow - + 256 - - YES + 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {733, 16} + {748, 24} @@ -1898,18 +1545,17 @@ ZXJuYWxOYW1lVGFibGU6bmlsIHdpdGhab25lOm5pbAo aVR1bmVzIDo9IFNCQXBwbGljYXRpb24gYXBwbGljYXRpb25XaXRoQnVuZGxlSWRlbnRpZmllcjonY29t LmFwcGxlLmlUdW5lcyc - + - - YES + - - 6 + + 38 - 733 + 748 1 @@ -1917,44 +1563,25 @@ LmFwcGxlLmlUdW5lcyc 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} - - {{1, 1}, {733, 24}} + + {{1, 1}, {748, 24}} @@ -1965,8 +1592,9 @@ LmFwcGxlLmlUdW5lcyc 256 - {{734, 1}, {15, 24}} + {{733, 1}, {16, 24}} + NO _doScroller: 0.75 @@ -1976,13 +1604,14 @@ LmFwcGxlLmlUdW5lcyc -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 489}, {750, 26}} @@ -1990,6 +1619,9 @@ LmFwcGxlLmlUdW5lcyc + 0.25 + 4 + 1 @@ -1998,7 +1630,7 @@ LmFwcGxlLmlUdW5lcyc YES - 68288064 + 68157504 272630784 Load image @@ -2006,6 +1638,7 @@ LmFwcGxlLmlUdW5lcyc + NO @@ -2014,7 +1647,7 @@ LmFwcGxlLmlUdW5lcyc YES - 68288064 + 68157504 272630784 Connect to iTunes @@ -2022,44 +1655,20 @@ LmFwcGxlLmlUdW5lcyc + NO 256 - - YES + 2304 - - YES + 2322 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - - {733, 448} + {748, 448} @@ -2080,18 +1689,17 @@ dzowLjIpLgogICAgICAgIHJhbXBWb2x1bWUgOj0gcmFtcFZvbHVtZSArIChvcmlnaW5hbFZvbHVtZSAv IDMyKS4KICAgIF0uCiAgICAKICAgIGlUdW5lcyBzZXRTb3VuZFZvbHVtZTpvcmlnaW5hbFZvbHVtZS4K XQo - + - - YES + - - 6 + + 38 - 733 + 748 1 @@ -2099,44 +1707,26 @@ XQo 0 - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - + + + + - - YES - - YES - NSColor - NSUnderline - - - YES - - - - + + + + 1 6 {1665, 10000000} - {223, 0} + {748, 311} - - {{1, 1}, {733, 311}} + + {{1, 1}, {748, 311}} @@ -2147,9 +1737,10 @@ XQo 256 - {{734, 1}, {15, 311}} + {{733, 1}, {16, 311}} YES + NO _doScroller: 0.6941964285714286 @@ -2159,13 +1750,14 @@ XQo -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: 1 0.94565220000000005 - + {{20, 138}, {750, 313}} @@ -2173,6 +1765,9 @@ XQo + 0.25 + 4 + 1 @@ -2181,7 +1776,7 @@ XQo YES - 68288064 + 68157504 272630784 Volume ramp @@ -2189,18 +1784,19 @@ XQo + NO - + {790, 565} + {{0, 0}, {1440, 878}} {10000000000000, 10000000000000} YES - + - - YES + loadImage @@ -2361,15 +1957,12 @@ XQo 144 - + - - YES + 0 - - YES - + @@ -2394,17 +1987,15 @@ XQo 1 - - YES + - + 2 - - YES + @@ -2417,16 +2008,15 @@ XQo - + 11 - - YES + - + @@ -2437,17 +2027,15 @@ XQo 15 - - YES + - + 16 - - YES + @@ -2462,18 +2050,17 @@ XQo - + 21 - - YES + - + @@ -2494,10 +2081,9 @@ XQo 33 - - YES + - + @@ -2508,21 +2094,19 @@ XQo 35 - - YES + - + 36 - - YES + - + @@ -2548,21 +2132,19 @@ XQo 41 - - YES + - + 42 - - YES + - + @@ -2588,21 +2170,19 @@ XQo 47 - - YES + - + 48 - - YES + - + @@ -2628,21 +2208,19 @@ XQo 59 - - YES + - + 60 - - YES + - + @@ -2668,21 +2246,19 @@ XQo 69 - - YES + - + 70 - - YES + - + @@ -2708,10 +2284,9 @@ XQo 76 - - YES + - + @@ -2722,10 +2297,9 @@ XQo 78 - - YES + - + @@ -2736,10 +2310,9 @@ XQo 80 - - YES + - + @@ -2750,10 +2323,9 @@ XQo 82 - - YES + - + @@ -2764,10 +2336,9 @@ XQo 84 - - YES + - + @@ -2778,21 +2349,19 @@ XQo 91 - - YES + - + 92 - - YES + - + @@ -2818,10 +2387,9 @@ XQo 98 - - YES + - + @@ -2832,30 +2400,27 @@ XQo 101 - - YES + - + 102 - - YES + - + 103 - - YES + - + @@ -2881,10 +2446,9 @@ XQo 108 - - YES + - + @@ -2895,23 +2459,21 @@ XQo 113 - - YES + - + 114 - - YES + - + @@ -2922,21 +2484,19 @@ XQo 120 - - YES + - + 121 - - YES + - + @@ -2962,10 +2522,9 @@ XQo 128 - - YES + - + @@ -2976,10 +2535,9 @@ XQo 130 - - YES + - + @@ -2990,21 +2548,19 @@ XQo 135 - - YES + - + 136 - - YES + - + @@ -3030,10 +2586,9 @@ XQo 141 - - YES + - + @@ -3041,236 +2596,121 @@ XQo - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 1.IBPluginDependency - 1.IBWindowTemplateEditedContentRect - 1.NSWindowTemplate.visibleAtLaunch - 101.IBPluginDependency - 101.IBWindowTemplateEditedContentRect - 101.NSWindowTemplate.visibleAtLaunch - 102.IBPluginDependency - 103.IBPluginDependency - 104.IBPluginDependency - 105.IBPluginDependency - 106.IBPluginDependency - 107.IBPluginDependency - 108.IBPluginDependency - 109.IBPluginDependency - 11.IBPluginDependency - 113.IBPluginDependency - 113.IBWindowTemplateEditedContentRect - 113.NSWindowTemplate.visibleAtLaunch - 114.IBPluginDependency - 115.IBPluginDependency - 12.IBPluginDependency - 120.IBPluginDependency - 121.IBPluginDependency - 122.IBPluginDependency - 123.IBPluginDependency - 124.IBPluginDependency - 125.IBPluginDependency - 128.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 135.IBPluginDependency - 136.IBPluginDependency - 137.IBPluginDependency - 138.IBPluginDependency - 139.IBPluginDependency - 140.IBPluginDependency - 141.IBPluginDependency - 142.IBPluginDependency - 15.IBPluginDependency - 15.IBWindowTemplateEditedContentRect - 15.NSWindowTemplate.visibleAtLaunch - 16.IBPluginDependency - 2.IBPluginDependency - 21.IBPluginDependency - 22.IBPluginDependency - 23.IBPluginDependency - 24.IBPluginDependency - 33.IBPluginDependency - 34.IBPluginDependency - 35.IBPluginDependency - 36.IBPluginDependency - 37.IBPluginDependency - 38.IBPluginDependency - 39.IBPluginDependency - 40.IBPluginDependency - 41.IBPluginDependency - 42.IBPluginDependency - 43.IBPluginDependency - 44.IBPluginDependency - 45.IBPluginDependency - 46.IBPluginDependency - 47.IBPluginDependency - 48.IBPluginDependency - 49.IBPluginDependency - 50.IBPluginDependency - 51.IBPluginDependency - 52.IBPluginDependency - 59.IBPluginDependency - 60.IBPluginDependency - 61.IBPluginDependency - 62.IBPluginDependency - 63.IBPluginDependency - 64.IBPluginDependency - 69.IBPluginDependency - 70.IBPluginDependency - 71.IBPluginDependency - 72.IBPluginDependency - 73.IBPluginDependency - 74.IBPluginDependency - 76.IBPluginDependency - 77.IBPluginDependency - 78.IBPluginDependency - 79.IBPluginDependency - 80.IBPluginDependency - 81.IBPluginDependency - 82.IBPluginDependency - 83.IBPluginDependency - 84.IBPluginDependency - 85.IBPluginDependency - 91.IBPluginDependency - 92.IBPluginDependency - 93.IBPluginDependency - 94.IBPluginDependency - 95.IBPluginDependency - 96.IBPluginDependency - 98.IBPluginDependency - 99.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{875, 228}, {260, 292}} - - com.apple.InterfaceBuilder.CocoaPlugin - {{452, 493}, {518, 227}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{207, 262}, {790, 565}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{99, 104}, {881, 902}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{875, 228}, {260, 292}} + + com.apple.InterfaceBuilder.CocoaPlugin + {{452, 493}, {518, 227}} + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{207, 262}, {790, 565}} + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + {{99, 104}, {881, 902}} + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + - - YES - - - + 144 - - YES + FSDemoAssistant NSObject @@ -3285,101 +2725,65 @@ XQo id - - YES - - YES - bump - bumpAnimate - connectToITunes - displayImage - horloge - hueAdjust - interpreterView - loadImage - lockFocus - perspective - volumeRamp - - - YES - NSTextView - NSTextView - NSTextView - NSTextView - NSTextView - NSTextView - FSInterpreterView - NSTextView - NSTextView - NSTextView - NSTextView - - - - YES - - YES - bump - bumpAnimate - connectToITunes - displayImage - horloge - hueAdjust - interpreterView - loadImage - lockFocus - perspective - volumeRamp - - - YES - - bump - NSTextView - - - bumpAnimate - NSTextView - - - connectToITunes - NSTextView - - - displayImage - NSTextView - - - horloge - NSTextView - - - hueAdjust - NSTextView - - - interpreterView - FSInterpreterView - - - loadImage - NSTextView - - - lockFocus - NSTextView - - - perspective - NSTextView - - - volumeRamp - NSTextView - - - + + NSTextView + NSTextView + NSTextView + NSTextView + NSTextView + NSTextView + FSInterpreterView + NSTextView + NSTextView + NSTextView + NSTextView + + + + bump + NSTextView + + + bumpAnimate + NSTextView + + + connectToITunes + NSTextView + + + displayImage + NSTextView + + + horloge + NSTextView + + + hueAdjust + NSTextView + + + interpreterView + FSInterpreterView + + + loadImage + NSTextView + + + lockFocus + NSTextView + + + perspective + NSTextView + + + volumeRamp + NSTextView + + IBProjectSource ./Classes/FSDemoAssistant.h @@ -3393,7 +2797,7 @@ XQo ./Classes/FSInterpreterView.h - + 0 IBCocoaFramework @@ -3403,7 +2807,7 @@ XQo com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - + YES 3 diff --git a/FScript.xcodeproj/project.pbxproj b/FScript.xcodeproj/project.pbxproj index 3ec3393..133599a 100644 --- a/FScript.xcodeproj/project.pbxproj +++ b/FScript.xcodeproj/project.pbxproj @@ -1098,7 +1098,6 @@ 8FC291720C4A82D10071E9CC /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8FC291710C4A82D10071E9CC /* SecurityFoundation.framework */; }; 8FC291800C4A82F90071E9CC /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8FC2917F0C4A82F90071E9CC /* SecurityInterface.framework */; }; 8FC291930C4A83380071E9CC /* SyncServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8FC291920C4A83380071E9CC /* SyncServices.framework */; }; - 8FC291A90C4A83A50071E9CC /* XgridFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8FC291A80C4A83A50071E9CC /* XgridFoundation.framework */; }; 8FCA00C30EEAF34300B10420 /* Block_fscript.h in Headers */ = {isa = PBXBuildFile; fileRef = 8FCA00C10EEAF34300B10420 /* Block_fscript.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8FCA00C40EEAF34300B10420 /* Block.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FCA00C20EEAF34300B10420 /* Block.m */; }; 8FCA00C50EEAF34300B10420 /* Block_fscript.h in Headers */ = {isa = PBXBuildFile; fileRef = 8FCA00C10EEAF34300B10420 /* Block_fscript.h */; }; @@ -1697,7 +1696,6 @@ 8FC291800C4A82F90071E9CC /* SecurityInterface.framework in Frameworks */, 8FC291930C4A83380071E9CC /* SyncServices.framework in Frameworks */, 8FF5AEFA0961E56400A3BEA9 /* WebKit.framework in Frameworks */, - 8FC291A90C4A83A50071E9CC /* XgridFoundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2792,7 +2790,7 @@ 0CD4E2FA00D7DD4D7BE9C1BD /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0440; }; buildConfigurationList = 8F2881FC08F9C040005B3C5A /* Build configuration list for PBXProject "FScript" */; compatibilityVersion = "Xcode 3.2"; @@ -3630,6 +3628,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(NATIVE_ARCH)"; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = "$(value) NO"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3667,6 +3666,7 @@ 8F2881EA08F9C040005B3C5A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3702,6 +3702,7 @@ 8F2881ED08F9C040005B3C5A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = "$(value) NO"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_PASCAL_STRINGS = NO; @@ -3724,6 +3725,7 @@ 8F2881EE08F9C040005B3C5A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; GCC_ENABLE_OBJC_GC = unsupported; GCC_ENABLE_PASCAL_STRINGS = NO; @@ -3746,6 +3748,7 @@ 8F2881F108F9C040005B3C5A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = "$(value) NO"; FRAMEWORK_SEARCH_PATHS = ""; GCC_DYNAMIC_NO_PIC = NO; @@ -3771,6 +3774,7 @@ 8F2881F208F9C040005B3C5A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_ENABLE_OBJC_GC = unsupported; @@ -3795,6 +3799,7 @@ isa = XCBuildConfiguration; buildSettings = { AUTO_SHADOW = YES; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = "$(value) NO"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -3822,6 +3827,7 @@ 8F2881F608F9C040005B3C5A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -3886,7 +3892,7 @@ IBC_FLATTEN_NIBS = NO; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_LDFLAGS = ""; - SDKROOT = macosx10.6; + SDKROOT = macosx; WARNING_CFLAGS = "-Wmost"; ZERO_LINK = NO; }; @@ -3913,7 +3919,7 @@ INSTALL_OWNER = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_LDFLAGS = ""; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 x86_64"; }; name = Release; @@ -3921,6 +3927,7 @@ 8F6392D40BDB8522005C8D94 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -3951,6 +3958,7 @@ 8F6392D50BDB8522005C8D94 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/FScriptFramework/CompiledCodeNode.m b/FScriptFramework/CompiledCodeNode.m index 848d4f6..c4ead25 100755 --- a/FScriptFramework/CompiledCodeNode.m +++ b/FScriptFramework/CompiledCodeNode.m @@ -57,7 +57,7 @@ - (NSString *)description default: assert(0); } - r = [NSMutableString stringWithFormat:@"\n****************************\n%@: type = %@, firstCharIndex = %d, lastCharIndex = %d", [self class], type, firstCharIndex, lastCharIndex]; + r = [NSMutableString stringWithFormat:@"\n****************************\n%@: type = %@, firstCharIndex = %ld, lastCharIndex = %ld", [self class], type, firstCharIndex, lastCharIndex]; switch (nodeType) { @@ -85,7 +85,7 @@ - (NSString *)description break; } - [r appendFormat:@", \n subnodeList ( %d elements)", [subnodes count]]; + [r appendFormat:@", \n subnodeList ( %ld elements)", [subnodes count]]; for (i = 0; i < [subnodes count]; i++) [r appendString:[[subnodes objectAtIndex:i] description]]; diff --git a/FScriptFramework/FSCollectionInspectorView.m b/FScriptFramework/FSCollectionInspectorView.m index 94bfd24..46b094b 100644 --- a/FScriptFramework/FSCollectionInspectorView.m +++ b/FScriptFramework/FSCollectionInspectorView.m @@ -109,7 +109,7 @@ - (IBAction)add:(id)sender // TODO: as of 10.7 the signature of NSTableColumn initWithIdentifier: has changed to // - (id)initWithIdentifier:(NSString *)identifier; - NSTableColumn *column = [[[NSTableColumn alloc] initWithIdentifier:defaultBlock] autorelease]; + NSTableColumn *column = [[[NSTableColumn alloc] initWithIdentifier:(void *)defaultBlock] autorelease]; NSInteger newColumnIndex = [tableView numberOfColumns] > 0 && [[[tableView tableColumns] objectAtIndex:0] identifier] == externalColumnIdentifier ? 1 : 0; [[column headerCell] setStringValue:headerCellStringForBlock(defaultBlock)]; @@ -346,7 +346,7 @@ -(NSArray *) selectedColumnObjects NSUInteger i; const NSUInteger count = [filteredSortedModelArray count]; NSTableColumn *column = [[tableView tableColumns] objectAtIndex:[tableView selectedColumn]]; - FSBlock *block = [column identifier]; + FSBlock *block = (void *)[column identifier]; FSArray *objects = [FSArray arrayWithCapacity:count]; if ([column identifier] == externalColumnIdentifier) return [[filteredSortedExternals copy] autorelease]; @@ -528,7 +528,7 @@ - (void)sortOnColumn:(NSTableColumn *)column signalError:(BOOL)signalError { NSUInteger i; const NSUInteger count = [sortedModelArray count]; - FSBlock *block = [column identifier]; + FSBlock *block = (id)[column identifier]; FSArray *objects = [FSArray arrayWithCapacity:count]; for (i = 0; i < count; i++) @@ -594,7 +594,7 @@ - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColu if ([aTableColumn identifier] == externalColumnIdentifier) object = [filteredSortedExternals objectAtIndex:rowIndex]; else - object = [[aTableColumn identifier] value:[filteredSortedModelArray objectAtIndex:rowIndex]]; + object = [(id)[aTableColumn identifier] value:[filteredSortedModelArray objectAtIndex:rowIndex]]; if ([object isKindOfClass:[NSString class]]) result = object; // Because we don't want the quotes to appear. else result = printStringLimited(object, 500); diff --git a/FScriptFramework/FSConstantsDictionaryGenerator.m b/FScriptFramework/FSConstantsDictionaryGenerator.m index db88e9f..ddcc114 100644 --- a/FScriptFramework/FSConstantsDictionaryGenerator.m +++ b/FScriptFramework/FSConstantsDictionaryGenerator.m @@ -60,7 +60,7 @@ #import #import #import -#import +//#import #import "Number_fscript.h" #import "FSBoolean.h"