Mandatory filename for icon.

diff --git a/Enjoyable.xcodeproj/project.pbxproj b/Enjoyable.xcodeproj/project.pbxproj
index bb1f67c41a42b5211df4bda5759cbadc9b862f21..6fe308ebf261bd705bcf14a81967d90b38338376 100644 (file)
--- a/Enjoyable.xcodeproj/project.pbxproj
+++ b/Enjoyable.xcodeproj/project.pbxproj
@@ -9,8 +9,8 @@
 /* Begin PBXBuildFile section */
                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
                D594BF000FAE7397007A85F2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D594BEFF0FAE7397007A85F2 /* IOKit.framework */; };
+               EE6A122E16E8F46300EDBD32 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = EE6A122D16E8F46300EDBD32 /* Icon.icns */; };
                EEF17D1916E8E21A00D7DC4D /* com.yukkurigames.Enjoyable.mapping.icns in Resources */ = {isa = PBXBuildFile; fileRef = EEF17D1716E8E21A00D7DC4D /* com.yukkurigames.Enjoyable.mapping.icns */; };
-               EEF17D1A16E8E21A00D7DC4D /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = EEF17D1816E8E21A00D7DC4D /* Icon.icns */; };
                EEF17D1F16E8E23A00D7DC4D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EEF17D1B16E8E23A00D7DC4D /* InfoPlist.strings */; };
                EEF17D2016E8E23A00D7DC4D /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = EEF17D1D16E8E23A00D7DC4D /* MainMenu.xib */; };
                EEF17D2216E8E24400D7DC4D /* Help in Resources */ = {isa = PBXBuildFile; fileRef = EEF17D2116E8E24400D7DC4D /* Help */; };
@@ -47,8 +47,8 @@
                8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                8D1107320486CEB800E47090 /* Enjoyable.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Enjoyable.app; sourceTree = BUILT_PRODUCTS_DIR; };
                D594BEFF0FAE7397007A85F2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
+               EE6A122D16E8F46300EDBD32 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
                EEF17D1716E8E21A00D7DC4D /* com.yukkurigames.Enjoyable.mapping.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = com.yukkurigames.Enjoyable.mapping.icns; path = Resources/com.yukkurigames.Enjoyable.mapping.icns; sourceTree = "<group>"; };
-               EEF17D1816E8E21A00D7DC4D /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Icon.icns; path = Resources/Icon.icns; sourceTree = "<group>"; };
                EEF17D1C16E8E23A00D7DC4D /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = Resources/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                EEF17D1E16E8E23A00D7DC4D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/MainMenu.xib; sourceTree = "<group>"; };
                EEF17D2116E8E24400D7DC4D /* Help */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Help; path = Resources/Help; sourceTree = "<group>"; };
@@ -212,11 +212,11 @@
                29B97317FDCFA39411CA2CEA /* Resources */ = {
                        isa = PBXGroup;
                        children = (
+                               EE6A122D16E8F46300EDBD32 /* Icon.icns */,
                                EEF17D2116E8E24400D7DC4D /* Help */,
                                EEF17D1B16E8E23A00D7DC4D /* InfoPlist.strings */,
                                EEF17D1D16E8E23A00D7DC4D /* MainMenu.xib */,
                                EEF17D1716E8E21A00D7DC4D /* com.yukkurigames.Enjoyable.mapping.icns */,
-                               EEF17D1816E8E21A00D7DC4D /* Icon.icns */,
                        );
                        name = Resources;
                        sourceTree = "<group>";
@@ -304,10 +304,10 @@
                        buildActionMask = 2147483647;
                        files = (
                                EEF17D1916E8E21A00D7DC4D /* com.yukkurigames.Enjoyable.mapping.icns in Resources */,
-                               EEF17D1A16E8E21A00D7DC4D /* Icon.icns in Resources */,
                                EEF17D1F16E8E23A00D7DC4D /* InfoPlist.strings in Resources */,
                                EEF17D2016E8E23A00D7DC4D /* MainMenu.xib in Resources */,
                                EEF17D2216E8E24400D7DC4D /* Help in Resources */,
+                               EE6A122E16E8F46300EDBD32 /* Icon.icns in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/Icon.icns b/Icon.icns
new file mode 100644 (file)
index 0000000..c7e3f36
Binary files /dev/null and b/Icon.icns differ

diff --git a/Info.plist b/Info.plist
index c7a50270b28d6f6a47c289577f8ca3041b80a737..0a17c785c0c849e63a713ce0fb374d52b5bd3778 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -2,53 +2,29 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-       <key>UTExportedTypeDeclarations</key>
-       <array>
-               <dict>
-                       <key>UTTypeIconFile</key>
-                       <string>com.yukkurigames.Enjoyable.mapping.icns</string>
-                       <key>UTTypeDescription</key>
-                       <string>Enjoyable Mapping</string>
-                       <key>UTTypeConformsTo</key>
-                       <array>
-                               <string>public.data</string>
-                       </array>
-                       <key>UTTypeIdentifier</key>
-                       <string>com.yukkurigames.Enjoyable.mapping</string>
-                       <key>UTTypeTagSpecification</key>
-                       <dict>
-                               <key>public.filename-extension</key>
-                               <array>
-                                       <string>enjoyable</string>
-                               </array>
-                               <key>public.mime-type</key>
-                               <string>application/json</string>
-                       </dict>
-               </dict>
-       </array>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
        <key>CFBundleDocumentTypes</key>
        <array>
                <dict>
-                       <key>CFBundleTypeIconFile</key>
-                       <string>com.yukkurigames.Enjoyable.mapping.icns</string>
                        <key>CFBundleTypeExtensions</key>
                        <array>
                                <string>enjoyable</string>
                        </array>
+                       <key>CFBundleTypeIconFile</key>
+                       <string>com.yukkurigames.Enjoyable.mapping.icns</string>
+                       <key>CFBundleTypeName</key>
+                       <string>com.yukkurigames.Enjoyable.mapping</string>
                        <key>CFBundleTypeRole</key>
                        <string>Editor</string>
+                       <key>LSHandlerRank</key>
+                       <string>Owner</string>
                        <key>LSItemContentTypes</key>
                        <array>
                                <string>com.yukkurigames.Enjoyable.mapping</string>
                        </array>
-                       <key>CFBundleTypeName</key>
-                       <string>com.yukkurigames.Enjoyable.mapping</string>
-                       <key>LSHandlerRank</key>
-                       <string>Owner</string>
                </dict>
        </array>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
        <key>CFBundleExecutable</key>
        <string>${EXECUTABLE_NAME}</string>
        <key>CFBundleHelpBookFolder</key>
@@ -56,7 +32,7 @@
        <key>CFBundleHelpBookName</key>
        <string>com.yukkurigames.Enjoyable.help</string>
        <key>CFBundleIconFile</key>
-       <string>icon.icns</string>
+       <string>Icon</string>
        <key>CFBundleIdentifier</key>
        <string>com.yukkurigames.${PRODUCT_NAME:identifier}</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -81,5 +57,29 @@
        <string>YES</string>
        <key>NSSupportsSuddenTermination</key>
        <true/>
+       <key>UTExportedTypeDeclarations</key>
+       <array>
+               <dict>
+                       <key>UTTypeConformsTo</key>
+                       <array>
+                               <string>public.data</string>
+                       </array>
+                       <key>UTTypeDescription</key>
+                       <string>Enjoyable Mapping</string>
+                       <key>UTTypeIconFile</key>
+                       <string>com.yukkurigames.Enjoyable.mapping.icns</string>
+                       <key>UTTypeIdentifier</key>
+                       <string>com.yukkurigames.Enjoyable.mapping</string>
+                       <key>UTTypeTagSpecification</key>
+                       <dict>
+                               <key>public.filename-extension</key>
+                               <array>
+                                       <string>enjoyable</string>
+                               </array>
+                               <key>public.mime-type</key>
+                               <string>application/json</string>
+                       </dict>
+               </dict>
+       </array>
 </dict>
 </plist>

diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index cd9a1b9281fd43bab4a315520c297133a3616d2b..b60d2fe7b23f66d55786befdc2b0aa8028adb8c7 100644 (file)
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -493,6 +493,36 @@
                                                                        <reference key="NSNextResponder" ref="206489479"/>
                                                                        <int key="NSvFlags">256</int>
                                                                        <array class="NSMutableArray" key="NSSubviews">
+                                                                               <object class="NSButton" id="12898323">
+                                                                                       <reference key="NSNextResponder" ref="977242492"/>
+                                                                                       <int key="NSvFlags">274</int>
+                                                                                       <string key="NSFrame">{{20, 20}, {162, 280}}</string>
+                                                                                       <reference key="NSSuperview" ref="977242492"/>
+                                                                                       <reference key="NSWindow"/>
+                                                                                       <reference key="NSNextKeyView" ref="606740242"/>
+                                                                                       <string key="NSReuseIdentifierKey">_NS:22</string>
+                                                                                       <bool key="NSEnabled">YES</bool>
+                                                                                       <object class="NSButtonCell" key="NSCell" id="468117320">
+                                                                                               <int key="NSCellFlags">603979776</int>
+                                                                                               <int key="NSCellFlags2">134217728</int>
+                                                                                               <string type="base64-UTF8" key="NSContents">Tm8gaW5wdXQgZGV2aWNlcyB3ZXJlIGZvdW5kLgoKQ29ubmVjdCBhIGRldmljZSB0byBiZWdpbiBtYXBw
+aW5nLg</string>
+                                                                                               <object class="NSFont" key="NSSupport">
+                                                                                                       <string key="NSName">LucidaGrande-Bold</string>
+                                                                                                       <double key="NSSize">14</double>
+                                                                                                       <int key="NSfFlags">16</int>
+                                                                                               </object>
+                                                                                               <string key="NSCellIdentifier">_NS:22</string>
+                                                                                               <reference key="NSControlView" ref="12898323"/>
+                                                                                               <int key="NSButtonFlags">-2041823232</int>
+                                                                                               <int key="NSButtonFlags2">134</int>
+                                                                                               <string key="NSAlternateContents"/>
+                                                                                               <string key="NSKeyEquivalent"/>
+                                                                                               <int key="NSPeriodicDelay">400</int>
+                                                                                               <int key="NSPeriodicInterval">75</int>
+                                                                                       </object>
+                                                                                       <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+                                                                               </object>
                                                                                <object class="NSScrollView" id="364857164">
                                                                                        <reference key="NSNextResponder" ref="977242492"/>
                                                                                        <int key="NSvFlags">274</int>
@@ -504,6 +534,7 @@
                                                                                                                <object class="NSOutlineView" id="365506042">
                                                                                                                        <reference key="NSNextResponder" ref="698362889"/>
                                                                                                                        <int key="NSvFlags">256</int>
+                                                                                                                       <array class="NSMutableArray" key="NSSubviews"/>
                                                                                                                        <string key="NSFrameSize">{200, 318}</string>
                                                                                                                        <reference key="NSSuperview" ref="698362889"/>
                                                                                                                        <reference key="NSWindow"/>
@@ -614,7 +645,7 @@
                                                                                                        <string key="NSFrame">{{1, 1}, {8, 298}}</string>
                                                                                                        <reference key="NSSuperview" ref="364857164"/>
                                                                                                        <reference key="NSWindow"/>
-                                                                                                       <reference key="NSNextKeyView" ref="606740242"/>
+                                                                                                       <reference key="NSNextKeyView" ref="12898323"/>
                                                                                                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                                                        <reference key="NSTarget" ref="364857164"/>
                                                                                                        <string key="NSAction">_doScroller:</string>
@@ -1101,7 +1132,7 @@
                                <bool key="NSWindowIsRestorable">YES</bool>
                        </object>
                        <object class="NSCustomView" id="671181514">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="NSScrollView" id="443618264">
@@ -1117,8 +1148,7 @@
                                                                                <int key="NSvFlags">256</int>
                                                                                <string key="NSFrameSize">{198, 198}</string>
                                                                                <reference key="NSSuperview" ref="947403733"/>
-                                                                               <reference key="NSWindow"/>
-                                                                               <reference key="NSNextKeyView" ref="968378655"/>
+                                                                               <reference key="NSNextKeyView" ref="553414014"/>
                                                                                <bool key="NSEnabled">YES</bool>
                                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                                <bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -1175,7 +1205,6 @@
                                                                </array>
                                                                <string key="NSFrame">{{1, 1}, {198, 198}}</string>
                                                                <reference key="NSSuperview" ref="443618264"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="762432499"/>
                                                                <reference key="NSDocView" ref="762432499"/>
                                                                <reference key="NSBGColor" ref="834857663"/>
@@ -1186,7 +1215,6 @@
                                                                <int key="NSvFlags">-2147483392</int>
                                                                <string key="NSFrame">{{306, 1}, {15, 403}}</string>
                                                                <reference key="NSSuperview" ref="443618264"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="861276216"/>
                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                <reference key="NSTarget" ref="443618264"/>
@@ -1198,7 +1226,6 @@
                                                                <int key="NSvFlags">-2147483392</int>
                                                                <string key="NSFrame">{{-100, -100}, {366, 16}}</string>
                                                                <reference key="NSSuperview" ref="443618264"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="947403733"/>
                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                <int key="NSsFlags">1</int>
@@ -1209,8 +1236,7 @@
                                                </array>
                                                <string key="NSFrame">{{0, 20}, {200, 200}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="553414014"/>
+                                               <reference key="NSNextKeyView" ref="947403733"/>
                                                <int key="NSsFlags">150034</int>
                                                <reference key="NSVScroller" ref="968378655"/>
                                                <reference key="NSHScroller" ref="553414014"/>
@@ -1225,7 +1251,6 @@
                                                <int key="NSvFlags">268</int>
                                                <string key="NSFrame">{{66, -1}, {68, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="1023366520"/>
                                                <string key="NSReuseIdentifierKey">_NS:22</string>
                                                <bool key="NSEnabled">YES</bool>
@@ -1254,7 +1279,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{0, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="456935010"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="867532725">
@@ -1281,8 +1305,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{166, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="828611353">
                                                        <int key="NSCellFlags">67108864</int>
@@ -1304,7 +1326,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{133, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="1043784903"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="57592747">
@@ -1327,7 +1348,6 @@
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{33, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="149148392"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="1008023024">
@@ -1351,8 +1371,6 @@
                                        </object>
                                </array>
                                <string key="NSFrameSize">{200, 220}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="443618264"/>
                                <string key="NSClassName">NSView</string>
                        </object>
@@ -1532,6 +1550,14 @@
                                        </object>
                                        <int key="connectionID">879</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">connectDevicePrompt</string>
+                                               <reference key="source" ref="1007832501"/>
+                                               <reference key="destination" ref="12898323"/>
+                                       </object>
+                                       <int key="connectionID">915</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">dockMenuBase</string>
@@ -2192,6 +2218,7 @@
                                                <reference key="object" ref="977242492"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="364857164"/>
+                                                       <reference ref="12898323"/>
                                                </array>
                                                <reference key="parent" ref="206489479"/>
                                                <string key="objectName">Input Devices Pane</string>
@@ -2595,6 +2622,19 @@
                                                <reference key="object" ref="828611353"/>
                                                <reference key="parent" ref="1043784903"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">913</int>
+                                               <reference key="object" ref="12898323"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="468117320"/>
+                                               </array>
+                                               <reference key="parent" ref="977242492"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">914</int>
+                                               <reference key="object" ref="468117320"/>
+                                               <reference key="parent" ref="12898323"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2769,13 +2809,15 @@
                                </object>
                                <string key="896.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="897.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="913.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="914.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                        </dictionary>
                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">902</int>
+                       <int key="maxID">915</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2826,6 +2868,7 @@
                                                </object>
                                        </object>
                                        <dictionary class="NSMutableDictionary" key="outlets">
+                                               <string key="connectDevicePrompt">NSView</string>
                                                <string key="mappingsController">NJMappingsController</string>
                                                <string key="outlineView">NSOutlineView</string>
                                                <string key="outputController">NJOutputController</string>
@@ -2833,6 +2876,10 @@
                                                <string key="translatingEventsMenu">NSMenuItem</string>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+                                               <object class="IBToOneOutletInfo" key="connectDevicePrompt">
+                                                       <string key="name">connectDevicePrompt</string>
+                                                       <string key="candidateClassName">NSView</string>
+                                               </object>
                                                <object class="IBToOneOutletInfo" key="mappingsController">
                                                        <string key="name">mappingsController</string>
                                                        <string key="candidateClassName">NJMappingsController</string>

diff --git a/Resources/Icon.icns b/Resources/Icon.icns
deleted file mode 100644 (file)
index c7e3f36..0000000
Binary files a/Resources/Icon.icns and /dev/null differ