[dasher: 6/28] MacOS fixes from compiling under OS 10.7 / XCode 4 on a new Mac
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher: 6/28] MacOS fixes from compiling under OS 10.7 / XCode 4 on a new Mac
- Date: Tue, 22 Nov 2011 17:03:10 +0000 (UTC)
commit cc9b34d97dbe064261fb9b4c9f61f7e56538f9c9
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date: Wed Sep 21 17:03:38 2011 +0100
MacOS fixes from compiling under OS 10.7 / XCode 4 on a new Mac
(+project file update)
Src/Common/OpenGLScreen.h | 2 +-
Src/MacOSX/COSXMouseInput.h | 2 +-
Src/MacOSX/Dasher.xcodeproj/project.pbxproj | 13 +-
Src/MacOSX/DasherApp.mm | 2 +-
Src/MacOSX/DasherTextView.h | 4 +
Src/MacOSX/DasherViewOpenGL.mm | 3 +-
.../English.lproj/MainMenu.nib/designable.nib | 1008 ++------------------
.../English.lproj/MainMenu.nib/keyedobjects.nib | Bin 33605 -> 27930 bytes
Src/MacOSX/PreferencesController.mm | 6 +-
9 files changed, 97 insertions(+), 943 deletions(-)
---
diff --git a/Src/Common/OpenGLScreen.h b/Src/Common/OpenGLScreen.h
index 59878e2..d9004df 100755
--- a/Src/Common/OpenGLScreen.h
+++ b/Src/Common/OpenGLScreen.h
@@ -5,7 +5,7 @@
// Created by Alan Lawrence on 20/03/2009.
// Copyright 2009 Cavendish Laboratory. All rights reserved.
//
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE
#import <OpenGLES/ES1/gl.h>
#else
#import <AppKit/AppKit.h>
diff --git a/Src/MacOSX/COSXMouseInput.h b/Src/MacOSX/COSXMouseInput.h
index 42c0afb..8a075e5 100644
--- a/Src/MacOSX/COSXMouseInput.h
+++ b/Src/MacOSX/COSXMouseInput.h
@@ -67,7 +67,7 @@ public:
m_iY = _iY;
};
- void KeyDown(int iTime, int iId) {
+ void KeyDown(unsigned long iTime, int iId) {
if(iId == 10) {
m_iOffset = m_iY - 2048;
}
diff --git a/Src/MacOSX/Dasher.xcodeproj/project.pbxproj b/Src/MacOSX/Dasher.xcodeproj/project.pbxproj
index 43a7a81..f57a05e 100755
--- a/Src/MacOSX/Dasher.xcodeproj/project.pbxproj
+++ b/Src/MacOSX/Dasher.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -1498,8 +1498,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0410;
+ };
buildConfigurationList = 198D19FD08965C4800CE3CC9 /* Build configuration list for PBXProject "Dasher" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -1859,7 +1862,6 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G4;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1888,9 +1890,9 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G4;
GCC_OPTIMIZATION_LEVEL = 3;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "Info-Dasher.plist";
OTHER_CFLAGS = (
"-D",
@@ -1944,8 +1946,7 @@
198D19FF08965C4800CE3CC9 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
- ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_PREPROCESSOR_DEFINITIONS = "";
GCC_VERSION = 4.0;
};
diff --git a/Src/MacOSX/DasherApp.mm b/Src/MacOSX/DasherApp.mm
index 7e82256..51590eb 100644
--- a/Src/MacOSX/DasherApp.mm
+++ b/Src/MacOSX/DasherApp.mm
@@ -8,8 +8,8 @@
#import "DasherApp.h"
#import "PreferencesController.h"
-#import "DasherEdit.h"
#import "DasherUtil.h"
+#import "DasherTextView.h"
/*
* Created by Doug Dickinson (dasher AT DressTheMonkey DOT plus DOT com), 18 April 2003
diff --git a/Src/MacOSX/DasherTextView.h b/Src/MacOSX/DasherTextView.h
index a1a0154..e99aa2a 100644
--- a/Src/MacOSX/DasherTextView.h
+++ b/Src/MacOSX/DasherTextView.h
@@ -14,7 +14,11 @@
/// (as it _is_ the textbox). However NOTE, bit of a hack, it checks for
/// game mode and disables most functions while game mode is on, as the
/// COSXGameModule will be mutating the text storage instead.
+#ifdef MAC_OS_X_VERSION_10_6
+ interface DasherTextView : NSTextView<DasherEdit,NSTextViewDelegate> {
+#else
@interface DasherTextView : NSTextView<DasherEdit> {
+#endif
IBOutlet DasherApp *dasherApp;
BOOL suppressCursorEvents;
}
diff --git a/Src/MacOSX/DasherViewOpenGL.mm b/Src/MacOSX/DasherViewOpenGL.mm
index 58cd8b6..c61c787 100755
--- a/Src/MacOSX/DasherViewOpenGL.mm
+++ b/Src/MacOSX/DasherViewOpenGL.mm
@@ -68,7 +68,8 @@ protected:
}
CGSize TextSize(NSString *str, unsigned int iFontSize, bool bWrap) {
- NSDictionary *attrs =[NSDictionary dictionaryWithObject:[NSFont fontWithName:dasherView.cachedFontName size:iFontSize] forKey:NSFontAttributeName];
+ NSFont *font=[NSFont fontWithName:dasherView.cachedFontName size:iFontSize];
+ NSDictionary *attrs =[NSDictionary dictionaryWithObject:(font ? font : [NSFont systemFontOfSize:iFontSize]) forKey:NSFontAttributeName];
return NSSizeToCGSize(bWrap ? ([str boundingRectWithSize:NSMakeSize(GetWidth(), CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin attributes:attrs].size) : ([str sizeWithAttributes:attrs]));
}
};
diff --git a/Src/MacOSX/English.lproj/MainMenu.nib/designable.nib b/Src/MacOSX/English.lproj/MainMenu.nib/designable.nib
index e17dec8..33e088f 100644
--- a/Src/MacOSX/English.lproj/MainMenu.nib/designable.nib
+++ b/Src/MacOSX/English.lproj/MainMenu.nib/designable.nib
@@ -2,27 +2,41 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J869</string>
- <string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <string key="IBDocument.SystemVersion">11B2118</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1617</string>
+ <string key="IBDocument.AppKitVersion">1138.1</string>
+ <string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">851</string>
+ <string key="NS.object.0">1617</string>
</object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="526"/>
- <integer value="2"/>
- <integer value="29"/>
+ <string>NSObjectController</string>
+ <string>NSTextView</string>
+ <string>NSPopUpButton</string>
+ <string>NSArrayController</string>
+ <string>NSMenuItem</string>
+ <string>NSMenu</string>
+ <string>NSScrollView</string>
+ <string>NSScroller</string>
+ <string>NSCustomView</string>
+ <string>NSCustomObject</string>
+ <string>NSView</string>
+ <string>NSWindowTemplate</string>
+ <string>NSPopUpButtonCell</string>
+ <string>NSUserDefaultsController</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="dict.values" ref="0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="139870953">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,7 +59,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{112, 50}</string>
<object class="NSView" key="NSWindowView" id="417172531">
<reference key="NSNextResponder"/>
@@ -161,30 +175,7 @@
<object class="NSTextView" id="630166701">
<reference key="NSNextResponder" ref="352247726"/>
<int key="NSvFlags">2322</int>
- <object class="NSMutableSet" key="NSDragTypes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="set.sortedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Apple HTML pasteboard type</string>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>Apple URL pasteboard type</string>
- <string>CorePasteboardFlavorType 0x6D6F6F76</string>
- <string>NSColor pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NSStringPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT RTFD pasteboard type</string>
- <string>NeXT Rich Text Format v1.0 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- <string>NeXT font pasteboard type</string>
- <string>NeXT ruler pasteboard type</string>
- <string>WebURLsWithTitlesPboardType</string>
- <string>public.url</string>
- </object>
- </object>
- <string key="NSFrame">{{0, 1}, {382, 14}}</string>
+ <string key="NSFrameSize">{397, 14}</string>
<reference key="NSSuperview" ref="352247726"/>
<object class="NSTextContainer" key="NSTextContainer" id="978406844">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -202,7 +193,7 @@
<nil key="NSDelegate"/>
</object>
<reference key="NSTextView" ref="630166701"/>
- <double key="NSWidth">382</double>
+ <double key="NSWidth">397</double>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
@@ -265,21 +256,45 @@
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
+ <nil key="NSTextFinder"/>
+ <int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{463, 1e+07}</string>
+ <string key="NSMaxSize">{463, 10000000}</string>
<string key="NSMinize">{223, 12}</string>
<nil key="NSDelegate"/>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {382, 52}}</string>
+ <string key="NSFrame">{{1, 1}, {397, 52}}</string>
<reference key="NSSuperview" ref="927114913"/>
<reference key="NSNextKeyView" ref="630166701"/>
<reference key="NSDocView" ref="630166701"/>
<reference key="NSBGColor" ref="29678397"/>
<object class="NSCursor" key="NSCursor">
- <string key="NSHotSpot">{4, -5}</string>
- <int key="NSCursorType">1</int>
+ <string key="NSHotSpot">{4, 5}</string>
+ <object class="NSImage" key="NSImage">
+ <int key="NSImageFlags">12582912</int>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym
+SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA
+AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA
+AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA
+AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ </object>
</object>
<int key="NScvFlags">4</int>
</object>
@@ -308,7 +323,7 @@
<string key="NSFrame">{{0, 304}, {399, 54}}</string>
<reference key="NSSuperview" ref="417172531"/>
<reference key="NSNextKeyView" ref="352247726"/>
- <int key="NSsFlags">18</int>
+ <int key="NSsFlags">133138</int>
<reference key="NSVScroller" ref="772493981"/>
<reference key="NSHScroller" ref="952670276"/>
<reference key="NSContentView" ref="352247726"/>
@@ -318,10 +333,11 @@
<reference key="NSSuperview"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
</object>
- <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1366, 746}}</string>
<string key="NSMinSize">{112, 72}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSFrameAutosaveName">DasherMain</string>
+ <bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSMenu" id="258167094">
<string key="NSTitle">MainMenu</string>
@@ -1982,9 +1998,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <object class="NSArray" key="object" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="object" ref="0"/>
<reference key="children" ref="139870953"/>
<nil key="parent"/>
</object>
@@ -2770,103 +2784,59 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.IBPluginDependency</string>
+ <string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
- <string>-3.ImportedFromIB2</string>
<string>103.IBPluginDependency</string>
- <string>103.ImportedFromIB2</string>
- <string>106.IBEditorWindowLastContentRect</string>
<string>106.IBPluginDependency</string>
- <string>106.ImportedFromIB2</string>
<string>111.IBPluginDependency</string>
- <string>111.ImportedFromIB2</string>
<string>129.IBPluginDependency</string>
- <string>129.ImportedFromIB2</string>
<string>130.IBPluginDependency</string>
- <string>130.ImportedFromIB2</string>
<string>131.IBPluginDependency</string>
- <string>131.ImportedFromIB2</string>
<string>134.IBPluginDependency</string>
- <string>134.ImportedFromIB2</string>
<string>136.IBPluginDependency</string>
- <string>136.ImportedFromIB2</string>
<string>143.IBPluginDependency</string>
- <string>143.ImportedFromIB2</string>
<string>144.IBPluginDependency</string>
- <string>144.ImportedFromIB2</string>
<string>145.IBPluginDependency</string>
- <string>145.ImportedFromIB2</string>
<string>149.IBPluginDependency</string>
- <string>149.ImportedFromIB2</string>
<string>150.IBPluginDependency</string>
- <string>150.ImportedFromIB2</string>
<string>196.IBPluginDependency</string>
- <string>196.ImportedFromIB2</string>
<string>2.IBPluginDependency</string>
- <string>2.ImportedFromIB2</string>
- <string>21.IBEditorWindowLastContentRect</string>
<string>21.IBPluginDependency</string>
<string>21.IBWindowTemplateEditedContentRect</string>
- <string>21.ImportedFromIB2</string>
<string>21.NSWindowTemplate.visibleAtLaunch</string>
- <string>21.windowTemplate.hasMinSize</string>
- <string>21.windowTemplate.minSize</string>
- <string>226.ImportedFromIB2</string>
- <string>29.IBEditorWindowLastContentRect</string>
+ <string>226.IBPluginDependency</string>
<string>29.IBPluginDependency</string>
- <string>29.ImportedFromIB2</string>
- <string>438.ImportedFromIB2</string>
+ <string>438.IBPluginDependency</string>
<string>493.IBPluginDependency</string>
- <string>493.ImportedFromIB2</string>
<string>494.IBPluginDependency</string>
- <string>494.ImportedFromIB2</string>
<string>495.IBPluginDependency</string>
- <string>495.ImportedFromIB2</string>
<string>496.IBPluginDependency</string>
- <string>496.ImportedFromIB2</string>
<string>497.IBPluginDependency</string>
- <string>497.ImportedFromIB2</string>
- <string>499.ImportedFromIB2</string>
+ <string>499.IBPluginDependency</string>
<string>500.IBPluginDependency</string>
- <string>500.ImportedFromIB2</string>
<string>503.IBPluginDependency</string>
- <string>503.ImportedFromIB2</string>
<string>521.IBPluginDependency</string>
- <string>521.ImportedFromIB2</string>
- <string>526.IBEditorWindowLastContentRect</string>
<string>526.IBPluginDependency</string>
- <string>526.ImportedFromIB2</string>
<string>527.IBPluginDependency</string>
- <string>527.ImportedFromIB2</string>
+ <string>534.IBPluginDependency</string>
<string>536.IBPluginDependency</string>
- <string>536.ImportedFromIB2</string>
+ <string>540.IBPluginDependency</string>
<string>546.IBPluginDependency</string>
- <string>546.ImportedFromIB2</string>
<string>56.IBPluginDependency</string>
- <string>56.ImportedFromIB2</string>
<string>564.IBPluginDependency</string>
- <string>564.ImportedFromIB2</string>
<string>567.IBPluginDependency</string>
- <string>567.ImportedFromIB2</string>
- <string>57.IBEditorWindowLastContentRect</string>
<string>57.IBPluginDependency</string>
- <string>57.ImportedFromIB2</string>
<string>578.IBPluginDependency</string>
<string>579.IBPluginDependency</string>
<string>58.IBPluginDependency</string>
- <string>58.ImportedFromIB2</string>
<string>580.IBPluginDependency</string>
<string>581.CustomClassName</string>
<string>581.IBPluginDependency</string>
<string>763.IBPluginDependency</string>
- <string>763.ImportedFromIB2</string>
<string>767.IBPluginDependency</string>
- <string>767.ImportedFromIB2</string>
- <string>768.IBEditorWindowLastContentRect</string>
<string>768.IBPluginDependency</string>
- <string>768.ImportedFromIB2</string>
- <string>768.editorWindowContentRectSynchronizationRect</string>
<string>814.IBPluginDependency</string>
- <string>815.IBEditorWindowLastContentRect</string>
<string>815.IBPluginDependency</string>
<string>816.IBPluginDependency</string>
<string>817.IBPluginDependency</string>
@@ -2894,14 +2864,12 @@
<string>839.IBPluginDependency</string>
<string>840.IBPluginDependency</string>
<string>841.IBPluginDependency</string>
- <string>842.IBEditorWindowLastContentRect</string>
<string>842.IBPluginDependency</string>
<string>843.IBPluginDependency</string>
<string>844.IBPluginDependency</string>
<string>845.IBPluginDependency</string>
<string>846.IBPluginDependency</string>
<string>868.IBPluginDependency</string>
- <string>869.IBEditorWindowLastContentRect</string>
<string>869.IBPluginDependency</string>
<string>870.IBPluginDependency</string>
<string>871.IBPluginDependency</string>
@@ -2920,14 +2888,12 @@
<string>888.IBPluginDependency</string>
<string>889.IBPluginDependency</string>
<string>903.IBPluginDependency</string>
- <string>904.IBEditorWindowLastContentRect</string>
<string>904.IBPluginDependency</string>
<string>908.IBPluginDependency</string>
<string>909.IBPluginDependency</string>
<string>910.IBPluginDependency</string>
<string>913.IBPluginDependency</string>
<string>980.IBPluginDependency</string>
- <string>981.IBEditorWindowLastContentRect</string>
<string>981.IBPluginDependency</string>
<string>982.IBPluginDependency</string>
<string>983.IBPluginDependency</string>
@@ -2939,102 +2905,58 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>{{316, 638}, {154, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>{{4, 166}, {398, 357}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{4, 166}, {398, 357}}</string>
<boolean value="YES"/>
- <boolean value="YES"/>
- <boolean value="YES"/>
- <string>{112, 50}</string>
- <boolean value="YES"/>
- <string>{{98, 661}, {279, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>{{0, 660}, {168, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>{{110, 418}, {245, 243}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>DasherTextView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{266, 618}, {83, 43}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
- <string>{{197, 734}, {243, 243}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{349, 378}, {175, 283}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3062,14 +2984,12 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{524, 438}, {131, 83}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{349, 528}, {186, 113}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3088,14 +3008,12 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{222, 578}, {137, 83}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{180, 548}, {195, 113}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3108,787 +3026,18 @@
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">1028</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">AppWatcher</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">appsController</string>
- <string key="NS.object.0">NSArrayController</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">appsController</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">appsController</string>
- <string key="candidateClassName">NSArrayController</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">AppWatcher.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AppWatcher</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">DasherApp</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>importTrainingText:</string>
- <string>newDoc:</string>
- <string>openDoc:</string>
- <string>revertToSaved:</string>
- <string>saveDoc:</string>
- <string>saveDocAs:</string>
- <string>showPreferences:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>importTrainingText:</string>
- <string>newDoc:</string>
- <string>openDoc:</string>
- <string>revertToSaved:</string>
- <string>saveDoc:</string>
- <string>saveDocAs:</string>
- <string>showPreferences:</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">importTrainingText:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">newDoc:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">openDoc:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">revertToSaved:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">saveDoc:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">saveDocAs:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">showPreferences:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>appWatcher</string>
- <string>dasherPanelUI</string>
- <string>dasherView</string>
- <string>textView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>AppWatcher</string>
- <string>NSWindow</string>
- <string>id</string>
- <string>DasherTextView</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>appWatcher</string>
- <string>dasherPanelUI</string>
- <string>dasherView</string>
- <string>textView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">appWatcher</string>
- <string key="candidateClassName">AppWatcher</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">dasherPanelUI</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">dasherView</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textView</string>
- <string key="candidateClassName">DasherTextView</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">DasherApp.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">DasherApp</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">DasherTextView</string>
- <string key="superclassName">NSTextView</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">dasherApp</string>
- <string key="NS.object.0">DasherApp</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">dasherApp</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">dasherApp</string>
- <string key="candidateClassName">DasherApp</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">DasherTextView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">DasherViewOpenGL</string>
- <string key="superclassName">NSOpenGLView</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">dasherApp</string>
- <string key="NS.object.0">DasherApp</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">dasherApp</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">dasherApp</string>
- <string key="candidateClassName">DasherApp</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">DasherViewOpenGL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">DasherViewOpenGL</string>
- <string key="superclassName">NSOpenGLView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">FirstResponder</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- </object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSActionCell</string>
- <string key="superclassName">NSCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="109692337">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="519767509">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="138172701">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSApplication</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSArrayController</string>
- <string key="superclassName">NSObjectController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSArrayController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSBrowser</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButton</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSButtonCell</string>
- <string key="superclassName">NSActionCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSCell</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSControl</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="64113082">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSFontManager</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="319218362">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSFormatter</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMatrix</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMenu</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="488847929">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMenuItem</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="468156521">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMenuItemCell</string>
- <string key="superclassName">NSButtonCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSMovieView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSMovieView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="109692337"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="519767509"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="138172701"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="64113082"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="319218362"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="488847929"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="383092978">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="797006090">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">PrintCore.framework/Headers/PDEPluginInterface.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObjectController</string>
- <string key="superclassName">NSController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSObjectController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSOpenGLView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSOpenGLView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSPopUpButton</string>
- <string key="superclassName">NSButton</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSPopUpButtonCell</string>
- <string key="superclassName">NSMenuItemCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSResponder</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSScrollView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSScroller</string>
- <string key="superclassName">NSControl</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSScroller.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSTableView</string>
- <string key="superclassName">NSControl</string>
- <reference key="sourceIdentifier" ref="383092978"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSText</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSText.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSTextView</string>
- <string key="superclassName">NSText</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSUserDefaultsController</string>
- <string key="superclassName">NSController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <reference key="sourceIdentifier" ref="468156521"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSView</string>
- <string key="superclassName">NSResponder</string>
- <reference key="sourceIdentifier" ref="797006090"/>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <string key="superclassName">NSResponder</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
- </object>
- </object>
- </object>
- </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
@@ -3900,7 +3049,6 @@
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../Dasher.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>
diff --git a/Src/MacOSX/English.lproj/MainMenu.nib/keyedobjects.nib b/Src/MacOSX/English.lproj/MainMenu.nib/keyedobjects.nib
index bdf8369..4fccaec 100644
Binary files a/Src/MacOSX/English.lproj/MainMenu.nib/keyedobjects.nib and b/Src/MacOSX/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Src/MacOSX/PreferencesController.mm b/Src/MacOSX/PreferencesController.mm
index 5b3a5c3..cfdbd84 100644
--- a/Src/MacOSX/PreferencesController.mm
+++ b/Src/MacOSX/PreferencesController.mm
@@ -19,12 +19,12 @@ static PreferencesController *preferencesController = nil;
@end
//The key which "Start With Mouse Position:" checkbox writes its value to, as specified in InterfaceBuilder
-static const NSString *AnyStartHandlerEnabled = @"values.StartWithMousePosition";
+static NSString * const AnyStartHandlerEnabled = @"values.StartWithMousePosition";
//The key which the drop-down box (circle/two-box) writes its selected-index to, as specified in InterfaceBuilder
-static const NSString *StartHandlerIndex = @"values.StartHandlerIdx";
+static NSString * const StartHandlerIndex = @"values.StartHandlerIdx";
//The names (as written out to persistent settings file) of the bool parameters corresponding to each
// of the entries in that drop-down box, in the order they appear in the drop-down.
-static const NSString *StartHandlerParamNames[2] = {
+static NSString * const StartHandlerParamNames[2] = {
@"CircleStart", @"StartOnMousePosition"
};
#define numStartHandlerParams (sizeof(StartHandlerParamNames)/sizeof(StartHandlerParamNames[0]))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
