diff options
Diffstat (limited to 'R2D2')
16 files changed, 203 insertions, 678 deletions
diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png Binary files differindex d0b5a80..127e167 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png Binary files differindex f4c8d29..004f42c 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png Binary files differindex ebb5a0f..c9a01ca 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png Binary files differindex 0986d31..6e3b25e 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png Binary files differindex f4c8d29..004f42c 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png Binary files differindex a142c83..3b23455 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png Binary files differindex 0986d31..6e3b25e 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png Binary files differindex 412d6ca..5591c78 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png Binary files differindex a142c83..3b23455 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png diff --git a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png Binary files differindex e99022a..274a8e9 100644 --- a/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png +++ b/R2D2/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png diff --git a/R2D2/Command.cs b/R2D2/Command.cs new file mode 100644 index 0000000..7a1423e --- /dev/null +++ b/R2D2/Command.cs @@ -0,0 +1,82 @@ +// R2D2 - Simple driver for Sphero R2D2 +// Copyright 2020 Ian Cowburn +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// +using System; +using System.Collections.Generic; + +namespace R2D2 +{ + public static class Command + { + static private Dictionary<string, byte[]> commands; + + static Command() + { + commands = new Dictionary<string, byte[]>(); + + commands["Laugh"] = new byte[] {0x0A,0x18,0x00,0x1F,0x00,0x32,0x00,0x00,0x00,0x00,0x00}; + commands["Yes"] = new byte[] {0x0A,0x17,0x05,0x41,0x00,0x0F}; + commands["No"] = new byte[] {0x0A,0x17,0x05,0x3F,0x00,0x10}; + commands["Alarm"] = new byte[] {0x0A,0x17,0x05,0x17,0x00,0x07}; + commands["Angry"] = new byte[] {0x0A,0x17,0x05,0x18,0x00,0x08}; + commands["Annoyed"] = new byte[] {0x0A,0x17,0x05,0x19,0x00,0x09}; + commands["IonBlast"] = new byte[] {0x0A,0x17,0x05,0x1A,0x00,0x0E}; + commands["Sad"] = new byte[] {0x0A,0x17,0x05,0x1C,0x00,0x11}; + commands["Scared"] = new byte[] {0x0A,0x17,0x05,0x1D,0x00,0x13}; + commands["Chatty"] = new byte[] {0x0A,0x17,0x05,0x17,0x00,0x0A}; + commands["Confident"] = new byte[] {0x0A,0x17,0x05,0x18,0x00,0x12}; + commands["Excited"] = new byte[] {0x0A,0x17,0x05,0x19,0x00,0x0C}; + commands["Happy"] = new byte[] {0x0A,0x17,0x05,0x1A,0x00,0x0D}; + commands["Laugh"] = new byte[] {0x0A,0x17,0x05,0x1B,0x00,0x0F}; + commands["Surprise"] = new byte[] {0x0A,0x17,0x05,0x1C,0x00,0x18}; + commands["Tripod"] = new byte[] {0x0A,0x17,0x0D,0x1D,0x01}; + commands["Bipod"] = new byte[] {0x0A,0x17,0x0D,0x1C,0x02}; + } + + public static ICollection<string> GetNames() + { + return commands.Keys; + } + + public static byte[] Get(string name) + { + if (commands.ContainsKey(name)) + { + return commands[name]; + } + else + { + return null; + } + } + + public static byte[] ForceCommand + { + get + { + return new byte[] {0x75,0x73,0x65,0x74,0x68,0x65,0x66,0x6F,0x72,0x63,0x65,0x2E,0x2E,0x2E,0x62,0x61,0x6E,0x64}; + } + } + + public static byte[] Wakeup + { + get + { + return new byte[] {0x0A,0x13,0x0D,0x00}; + } + } + } +} diff --git a/R2D2/Info.plist b/R2D2/Info.plist index 2586d16..56d779c 100644 --- a/R2D2/Info.plist +++ b/R2D2/Info.plist @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> @@ -9,7 +9,7 @@ <key>CFBundleShortVersionString</key> <string>1.0</string> <key>CFBundleVersion</key> - <string>1</string> + <string>devel</string> <key>LSMinimumSystemVersion</key> <string>10.15</string> <key>CFBundleDevelopmentRegion</key> @@ -28,6 +28,5 @@ <string>Main</string> <key>XSAppIconAssets</key> <string>Assets.xcassets/AppIcon.appiconset</string> - </dict> </plist> diff --git a/R2D2/Main.storyboard b/R2D2/Main.storyboard index 5052149..b1b2957 100644 --- a/R2D2/Main.storyboard +++ b/R2D2/Main.storyboard @@ -1,7 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134" /> + <deployment identifier="macosx"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> <!--Application--> @@ -11,657 +13,19 @@ <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6"> <items> <menuItem title="R2D2" id="1Xt-HY-uBw"> - <modifierMask key="keyEquivalentModifierMask" /> + <modifierMask key="keyEquivalentModifierMask"/> <menu key="submenu" title="R2D2" systemMenu="apple" id="uQy-DD-JDr"> <items> <menuItem title="About R2D2" id="5kV-Vb-QxS"> - <modifierMask key="keyEquivalentModifierMask" /> + <modifierMask key="keyEquivalentModifierMask"/> <connections> - <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem" /> + <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/> </connections> </menuItem> - <menuItem isSeparatorItem="YES" id="VOq-y0-SEH" /> - <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW" /> - <menuItem isSeparatorItem="YES" id="wFC-TO-SCJ" /> - <menuItem title="Services" id="NMo-om-nkz"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5" /> - </menuItem> - <menuItem isSeparatorItem="YES" id="4je-JR-u6R" /> - <menuItem title="Hide R2D2" keyEquivalent="h" id="Olw-nP-bQN"> - <connections> - <action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68" /> - </connections> - </menuItem> - <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO"> - <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" /> - <connections> - <action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT" /> - </connections> - </menuItem> - <menuItem title="Show All" id="Kd2-mp-pUS"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="kCx-OE-vgT" /> + <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/> <menuItem title="Quit R2D2" keyEquivalent="q" id="4sb-4s-VLi"> <connections> - <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="File" id="dMs-cI-mzQ"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="File" id="bib-Uj-vzu"> - <items> - <menuItem title="New" keyEquivalent="n" id="Was-JA-tGl"> - <connections> - <action selector="newDocument:" target="Ady-hI-5gd" id="4Si-XN-c54" /> - </connections> - </menuItem> - <menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9"> - <connections> - <action selector="openDocument:" target="Ady-hI-5gd" id="bVn-NM-KNZ" /> - </connections> - </menuItem> - <menuItem title="Open Recent" id="tXI-mr-wws"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ"> - <items> - <menuItem title="Clear Menu" id="vNY-rz-j42"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="clearRecentDocuments:" target="Ady-hI-5gd" id="Daa-9d-B3U" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem isSeparatorItem="YES" id="m54-Is-iLE" /> - <menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG"> - <connections> - <action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q" /> - </connections> - </menuItem> - <menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV"> - <connections> - <action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY" /> - </connections> - </menuItem> - <menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A"> - <connections> - <action selector="saveDocumentAs:" target="Ady-hI-5gd" id="mDf-zr-I0C" /> - </connections> - </menuItem> - <menuItem title="Revert to Saved" keyEquivalent="r" id="KaW-ft-85H"> - <connections> - <action selector="revertDocumentToSaved:" target="Ady-hI-5gd" id="iJ3-Pv-kwq" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="aJh-i4-bef" /> - <menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK"> - <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES" /> - <connections> - <action selector="runPageLayout:" target="Ady-hI-5gd" id="Din-rz-gC5" /> - </connections> - </menuItem> - <menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS"> - <connections> - <action selector="print:" target="Ady-hI-5gd" id="qaZ-4w-aoO" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Edit" id="5QF-Oa-p0T"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Edit" id="W48-6f-4Dl"> - <items> - <menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg"> - <connections> - <action selector="undo:" target="Ady-hI-5gd" id="M6e-cu-g7V" /> - </connections> - </menuItem> - <menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam"> - <connections> - <action selector="redo:" target="Ady-hI-5gd" id="oIA-Rs-6OD" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="WRV-NI-Exz" /> - <menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG"> - <connections> - <action selector="cut:" target="Ady-hI-5gd" id="YJe-68-I9s" /> - </connections> - </menuItem> - <menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU"> - <connections> - <action selector="copy:" target="Ady-hI-5gd" id="G1f-GL-Joy" /> - </connections> - </menuItem> - <menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL"> - <connections> - <action selector="paste:" target="Ady-hI-5gd" id="UvS-8e-Qdg" /> - </connections> - </menuItem> - <menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk"> - <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" /> - <connections> - <action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="cEh-KX-wJQ" /> - </connections> - </menuItem> - <menuItem title="Delete" id="pa3-QI-u2k"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="delete:" target="Ady-hI-5gd" id="0Mk-Ml-PaM" /> - </connections> - </menuItem> - <menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m"> - <connections> - <action selector="selectAll:" target="Ady-hI-5gd" id="VNm-Mi-diN" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="uyl-h8-XO2" /> - <menuItem title="Find" id="4EN-yA-p0u"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Find" id="1b7-l0-nxx"> - <items> - <menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W"> - <connections> - <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="cD7-Qs-BN4" /> - </connections> - </menuItem> - <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz"> - <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" /> - <connections> - <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="WD3-Gg-5AJ" /> - </connections> - </menuItem> - <menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye"> - <connections> - <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="NDo-RZ-v9R" /> - </connections> - </menuItem> - <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV"> - <connections> - <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="HOh-sY-3ay" /> - </connections> - </menuItem> - <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt"> - <connections> - <action selector="performFindPanelAction:" target="Ady-hI-5gd" id="U76-nv-p5D" /> - </connections> - </menuItem> - <menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd"> - <connections> - <action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="IOG-6D-g5B" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Spelling and Grammar" id="Dv1-io-Yv7"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Spelling" id="3IN-sU-3Bg"> - <items> - <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI"> - <connections> - <action selector="showGuessPanel:" target="Ady-hI-5gd" id="vFj-Ks-hy3" /> - </connections> - </menuItem> - <menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7"> - <connections> - <action selector="checkSpelling:" target="Ady-hI-5gd" id="fz7-VC-reM" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="bNw-od-mp5" /> - <menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="7w6-Qz-0kB" /> - </connections> - </menuItem> - <menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="muD-Qn-j4w" /> - </connections> - </menuItem> - <menuItem title="Correct Spelling Automatically" id="78Y-hA-62v"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="2lM-Qi-WAP" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Substitutions" id="9ic-FL-obx"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Substitutions" id="FeM-D8-WVr"> - <items> - <menuItem title="Show Substitutions" id="z6F-FW-3nz"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="oku-mr-iSq" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="gPx-C9-uUO" /> - <menuItem title="Smart Copy/Paste" id="9yt-4B-nSM"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="3IJ-Se-DZD" /> - </connections> - </menuItem> - <menuItem title="Smart Quotes" id="hQb-2v-fYv"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="ptq-xd-QOA" /> - </connections> - </menuItem> - <menuItem title="Smart Dashes" id="rgM-f4-ycn"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="oCt-pO-9gS" /> - </connections> - </menuItem> - <menuItem title="Smart Links" id="cwL-P1-jid"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="Gip-E3-Fov" /> - </connections> - </menuItem> - <menuItem title="Data Detectors" id="tRr-pd-1PS"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="R1I-Nq-Kbl" /> - </connections> - </menuItem> - <menuItem title="Text Replacement" id="HFQ-gK-NFA"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="DvP-Fe-Py6" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Transformations" id="2oI-Rn-ZJC"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Transformations" id="c8a-y6-VQd"> - <items> - <menuItem title="Make Upper Case" id="vmV-6d-7jI"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="uppercaseWord:" target="Ady-hI-5gd" id="sPh-Tk-edu" /> - </connections> - </menuItem> - <menuItem title="Make Lower Case" id="d9M-CD-aMd"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="lowercaseWord:" target="Ady-hI-5gd" id="iUZ-b5-hil" /> - </connections> - </menuItem> - <menuItem title="Capitalize" id="UEZ-Bs-lqG"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="capitalizeWord:" target="Ady-hI-5gd" id="26H-TL-nsh" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Speech" id="xrE-MZ-jX0"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Speech" id="3rS-ZA-NoH"> - <items> - <menuItem title="Start Speaking" id="Ynk-f8-cLZ"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="startSpeaking:" target="Ady-hI-5gd" id="654-Ng-kyl" /> - </connections> - </menuItem> - <menuItem title="Stop Speaking" id="Oyz-dy-DGm"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="stopSpeaking:" target="Ady-hI-5gd" id="dX8-6p-jy9" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Format" id="jxT-CU-nIS"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Format" id="GEO-Iw-cKr"> - <items> - <menuItem title="Font" id="Gi5-1S-RQB"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq"> - <items> - <menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq"> - <connections> - <action selector="orderFrontFontPanel:" target="YLy-65-1bz" id="WHr-nq-2xA" /> - </connections> - </menuItem> - <menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27"> - <connections> - <action selector="addFontTrait:" target="YLy-65-1bz" id="hqk-hr-sYV" /> - </connections> - </menuItem> - <menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq"> - <connections> - <action selector="addFontTrait:" target="YLy-65-1bz" id="IHV-OB-c03" /> - </connections> - </menuItem> - <menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S"> - <connections> - <action selector="underline:" target="Ady-hI-5gd" id="FYS-2b-JAY" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="5gT-KC-WSO" /> - <menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL"> - <connections> - <action selector="modifyFont:" target="YLy-65-1bz" id="Uc7-di-UnL" /> - </connections> - </menuItem> - <menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST"> - <connections> - <action selector="modifyFont:" target="YLy-65-1bz" id="HcX-Lf-eNd" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="kx3-Dk-x3B" /> - <menuItem title="Kern" id="jBQ-r6-VK2"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Kern" id="tlD-Oa-oAM"> - <items> - <menuItem title="Use Default" id="GUa-eO-cwY"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="useStandardKerning:" target="Ady-hI-5gd" id="6dk-9l-Ckg" /> - </connections> - </menuItem> - <menuItem title="Use None" id="cDB-IK-hbR"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="turnOffKerning:" target="Ady-hI-5gd" id="U8a-gz-Maa" /> - </connections> - </menuItem> - <menuItem title="Tighten" id="46P-cB-AYj"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="tightenKerning:" target="Ady-hI-5gd" id="hr7-Nz-8ro" /> - </connections> - </menuItem> - <menuItem title="Loosen" id="ogc-rX-tC1"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="loosenKerning:" target="Ady-hI-5gd" id="8i4-f9-FKE" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Ligatures" id="o6e-r0-MWq"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Ligatures" id="w0m-vy-SC9"> - <items> - <menuItem title="Use Default" id="agt-UL-0e3"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="useStandardLigatures:" target="Ady-hI-5gd" id="7uR-wd-Dx6" /> - </connections> - </menuItem> - <menuItem title="Use None" id="J7y-lM-qPV"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="turnOffLigatures:" target="Ady-hI-5gd" id="iX2-gA-Ilz" /> - </connections> - </menuItem> - <menuItem title="Use All" id="xQD-1f-W4t"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="useAllLigatures:" target="Ady-hI-5gd" id="KcB-kA-TuK" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Baseline" id="OaQ-X3-Vso"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Baseline" id="ijk-EB-dga"> - <items> - <menuItem title="Use Default" id="3Om-Ey-2VK"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="unscript:" target="Ady-hI-5gd" id="0vZ-95-Ywn" /> - </connections> - </menuItem> - <menuItem title="Superscript" id="Rqc-34-cIF"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="superscript:" target="Ady-hI-5gd" id="3qV-fo-wpU" /> - </connections> - </menuItem> - <menuItem title="Subscript" id="I0S-gh-46l"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="subscript:" target="Ady-hI-5gd" id="Q6W-4W-IGz" /> - </connections> - </menuItem> - <menuItem title="Raise" id="2h7-ER-AoG"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="raiseBaseline:" target="Ady-hI-5gd" id="4sk-31-7Q9" /> - </connections> - </menuItem> - <menuItem title="Lower" id="1tx-W0-xDw"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="lowerBaseline:" target="Ady-hI-5gd" id="OF1-bc-KW4" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem isSeparatorItem="YES" id="Ndw-q3-faq" /> - <menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk"> - <connections> - <action selector="orderFrontColorPanel:" target="Ady-hI-5gd" id="mSX-Xz-DV3" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="iMs-zA-UFJ" /> - <menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD"> - <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" /> - <connections> - <action selector="copyFont:" target="Ady-hI-5gd" id="GJO-xA-L4q" /> - </connections> - </menuItem> - <menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH"> - <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" /> - <connections> - <action selector="pasteFont:" target="Ady-hI-5gd" id="JfD-CL-leO" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Text" id="Fal-I4-PZk"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Text" id="d9c-me-L2H"> - <items> - <menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1"> - <connections> - <action selector="alignLeft:" target="Ady-hI-5gd" id="zUv-R1-uAa" /> - </connections> - </menuItem> - <menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb"> - <connections> - <action selector="alignCenter:" target="Ady-hI-5gd" id="spX-mk-kcS" /> - </connections> - </menuItem> - <menuItem title="Justify" id="J5U-5w-g23"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="alignJustified:" target="Ady-hI-5gd" id="ljL-7U-jND" /> - </connections> - </menuItem> - <menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4"> - <connections> - <action selector="alignRight:" target="Ady-hI-5gd" id="r48-bG-YeY" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="4s2-GY-VfK" /> - <menuItem title="Writing Direction" id="H1b-Si-o9J"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd"> - <items> - <menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH"> - <modifierMask key="keyEquivalentModifierMask" /> - </menuItem> - <menuItem id="YGs-j5-SAR"> - <string key="title"> Default</string> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="makeBaseWritingDirectionNatural:" target="Ady-hI-5gd" id="qtV-5e-UBP" /> - </connections> - </menuItem> - <menuItem id="Lbh-J2-qVU"> - <string key="title"> Left to Right</string> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="makeBaseWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="S0X-9S-QSf" /> - </connections> - </menuItem> - <menuItem id="jFq-tB-4Kx"> - <string key="title"> Right to Left</string> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="makeBaseWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="5fk-qB-AqJ" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="swp-gr-a21" /> - <menuItem title="Selection" enabled="NO" id="cqv-fj-IhA"> - <modifierMask key="keyEquivalentModifierMask" /> - </menuItem> - <menuItem id="Nop-cj-93Q"> - <string key="title"> Default</string> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="makeTextWritingDirectionNatural:" target="Ady-hI-5gd" id="lPI-Se-ZHp" /> - </connections> - </menuItem> - <menuItem id="BgM-ve-c93"> - <string key="title"> Left to Right</string> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="makeTextWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="caW-Bv-w94" /> - </connections> - </menuItem> - <menuItem id="RB4-Sm-HuC"> - <string key="title"> Right to Left</string> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="makeTextWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="EXD-6r-ZUu" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem isSeparatorItem="YES" id="fKy-g9-1gm" /> - <menuItem title="Show Ruler" id="vLm-3I-IUL"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="toggleRuler:" target="Ady-hI-5gd" id="FOx-HJ-KwY" /> - </connections> - </menuItem> - <menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5"> - <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES" /> - <connections> - <action selector="copyRuler:" target="Ady-hI-5gd" id="71i-fW-3W2" /> - </connections> - </menuItem> - <menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI"> - <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES" /> - <connections> - <action selector="pasteRuler:" target="Ady-hI-5gd" id="cSh-wd-qM2" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="View" id="H8h-7b-M4v"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="View" id="HyV-fh-RgO"> - <items> - <menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5"> - <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" /> - <connections> - <action selector="toggleToolbarShown:" target="Ady-hI-5gd" id="BXY-wc-z0C" /> - </connections> - </menuItem> - <menuItem title="Customize Toolbar…" id="1UK-8n-QPP"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="runToolbarCustomizationPalette:" target="Ady-hI-5gd" id="pQI-g3-MTW" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="hB3-LF-h0Y" /> - <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE"> - <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES" /> - <connections> - <action selector="toggleSidebar:" target="Ady-hI-5gd" id="iwa-gc-5KM" /> - </connections> - </menuItem> - <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa"> - <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES" /> - <connections> - <action selector="toggleFullScreen:" target="Ady-hI-5gd" id="dU3-MA-1Rq" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Window" id="aUF-d1-5bR"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo"> - <items> - <menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV"> - <connections> - <action selector="performMiniaturize:" target="Ady-hI-5gd" id="VwT-WD-YPe" /> - </connections> - </menuItem> - <menuItem title="Zoom" id="R4o-n2-Eq4"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="performZoom:" target="Ady-hI-5gd" id="DIl-cC-cCs" /> - </connections> - </menuItem> - <menuItem isSeparatorItem="YES" id="eu3-7i-yIM" /> - <menuItem title="Bring All to Front" id="LE2-aR-0XJ"> - <modifierMask key="keyEquivalentModifierMask" /> - <connections> - <action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh" /> - </connections> - </menuItem> - </items> - </menu> - </menuItem> - <menuItem title="Help" id="wpr-3q-Mcd"> - <modifierMask key="keyEquivalentModifierMask" /> - <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ"> - <items> - <menuItem title="R2D2 Help" keyEquivalent="?" id="FKE-Sm-Kum"> - <connections> - <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no" /> + <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/> </connections> </menuItem> </items> @@ -670,48 +34,94 @@ </items> </menu> <connections> - <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m" /> + <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/> </connections> </application> - <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="" /> - <customObject id="YLy-65-1bz" customClass="NSFontManager" /> - <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" /> + <customObject id="Voe-Tx-rLC" customClass="AppDelegate"/> + <customObject id="YLy-65-1bz" customClass="NSFontManager"/> + <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="75" y="0.0" /> + <point key="canvasLocation" x="75" y="0.0"/> </scene> <!--Window Controller--> <scene sceneID="R2V-B0-nI4"> <objects> <windowController id="B8D-0N-5wS" sceneMemberID="viewController"> - <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA"> - <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" /> - <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES" /> - <rect key="contentRect" x="196" y="240" width="480" height="270" /> - <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027" /> + <window key="window" title="R2D2" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA"> + <windowStyleMask key="styleMask" titled="YES"/> + <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> + <rect key="contentRect" x="196" y="240" width="480" height="270"/> + <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/> <connections> - <outlet property="delegate" destination="B8D-0N-5wS" id="98r-iN-zZc" /> + <outlet property="delegate" destination="B8D-0N-5wS" id="98r-iN-zZc"/> </connections> </window> <connections> - <segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM" /> + <segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM"/> </connections> </windowController> - <customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" /> + <customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="75" y="250" /> + <point key="canvasLocation" x="75" y="250"/> </scene> <!--View Controller--> <scene sceneID="hIz-AP-VOD"> <objects> - <viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController"> + <viewController id="XfG-lQ-9wD" customClass="ViewController" sceneMemberID="viewController"> <view key="view" wantsLayer="YES" id="m2S-Jp-Qdl"> - <rect key="frame" x="0.0" y="0.0" width="480" height="270" /> - <autoresizingMask key="autoresizingMask" /> + <rect key="frame" x="0.0" y="0.0" width="480" height="270"/> + <autoresizingMask key="autoresizingMask"/> + <subviews> + <comboBox verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ODh-nY-vC4"> + <rect key="frame" x="20" y="227" width="225" height="25"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="pqd-In-G4A"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> + </comboBoxCell> + </comboBox> + <comboBox verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fkq-Rr-8jD"> + <rect key="frame" x="21" y="197" width="224" height="25"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="Wzy-RU-KF9"> + <font key="font" metaFont="system"/> + <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> + </comboBoxCell> + </comboBox> + <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZUE-h2-Ecq"> + <rect key="frame" x="248" y="223" width="65" height="32"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <buttonCell key="cell" type="push" title="Scan" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cIS-gM-AZk"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <connections> + <action selector="DoScan:" target="XfG-lQ-9wD" id="9sl-es-9JY"/> + </connections> + </button> + <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BAI-SH-NYl"> + <rect key="frame" x="248" y="194" width="131" height="32"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <buttonCell key="cell" type="push" title="Send Command" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6vM-GU-aGA"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <connections> + <action selector="DoSendCommand:" target="XfG-lQ-9wD" id="Vd7-FL-hJB"/> + </connections> + </button> + </subviews> </view> + <connections> + <outlet property="commandList" destination="fkq-Rr-8jD" id="wTo-Xk-Wjr"/> + <outlet property="scanList" destination="ODh-nY-vC4" id="8gZ-7c-jek"/> + </connections> </viewController> - <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" /> + <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="75" y="655" /> + <point key="canvasLocation" x="75" y="655"/> </scene> </scenes> </document> diff --git a/R2D2/R2D2.csproj b/R2D2/R2D2.csproj index abe2009..d9aba58 100644 --- a/R2D2/R2D2.csproj +++ b/R2D2/R2D2.csproj @@ -76,6 +76,7 @@ <Compile Include="ViewController.designer.cs">
<DependentUpon>ViewController.cs</DependentUpon>
</Compile>
+ <Compile Include="Command.cs" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="Main.storyboard" />
diff --git a/R2D2/ViewController.cs b/R2D2/ViewController.cs index de5674f..ff6885c 100644 --- a/R2D2/ViewController.cs +++ b/R2D2/ViewController.cs @@ -31,7 +31,10 @@ namespace R2D2 { base.ViewDidLoad(); - // Do any additional setup after loading the view. + foreach (string name in Command.GetNames()) + { + commandList.Add(new NSString(name)); + } } public override NSObject RepresentedObject @@ -46,5 +49,13 @@ namespace R2D2 // Update the view, if already loaded. } } + + partial void DoScan(NSObject sender) + { + } + + partial void DoSendCommand(NSObject sender) + { + } } } diff --git a/R2D2/ViewController.designer.cs b/R2D2/ViewController.designer.cs index 40a740f..61c2322 100644 --- a/R2D2/ViewController.designer.cs +++ b/R2D2/ViewController.designer.cs @@ -1,18 +1,40 @@ -// WARNING +// WARNING // -// This file has been generated automatically by Xamarin Studio to store outlets and +// This file has been generated automatically by Visual Studio to store outlets and // actions made in the UI designer. If it is removed, they will be lost. // Manual changes to this file may not be handled correctly. // using Foundation; +using System.CodeDom.Compiler; namespace R2D2 { - [Register("ViewController")] - partial class ViewController - { - void ReleaseDesignerOutlets() - { - } - } + [Register ("ViewController")] + partial class ViewController + { + [Outlet] + AppKit.NSComboBox commandList { get; set; } + + [Outlet] + AppKit.NSComboBox scanList { get; set; } + + [Action ("DoScan:")] + partial void DoScan (Foundation.NSObject sender); + + [Action ("DoSendCommand:")] + partial void DoSendCommand (Foundation.NSObject sender); + + void ReleaseDesignerOutlets () + { + if (commandList != null) { + commandList.Dispose (); + commandList = null; + } + + if (scanList != null) { + scanList.Dispose (); + scanList = null; + } + } + } } |
