Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated help, disabled bluetooth

  • Loading branch information...
commit fd61583f88279502219bd97154f5cf4ef89a8f65 1 parent 115f183
@dustinrue authored
Showing with 17,025 additions and 17,498 deletions.
  1. BIN  ControlPlane Help/ControlPlane Help.helpindex
  2. 0  {MarcoPolo Help → ControlPlane Help}/css/accessPage.css
  3. 0  {MarcoPolo Help → ControlPlane Help}/css/genlist.html
  4. 0  {MarcoPolo Help → ControlPlane Help}/css/genlist_style.css
  5. 0  {MarcoPolo Help → ControlPlane Help}/css/indexPage.css
  6. 0  {MarcoPolo Help → ControlPlane Help}/css/topicPage.css
  7. BIN  ControlPlane Help/gfx/control-plane-logo-big.png
  8. 0  {MarcoPolo Help → ControlPlane Help}/gfx/equation-0.png
  9. 0  {MarcoPolo Help → ControlPlane Help}/gfx/equation-1.png
  10. BIN  ControlPlane Help/gfx/icon.png
  11. BIN  ControlPlane Help/gfx/iconSmall.png
  12. 0  {MarcoPolo Help → ControlPlane Help}/gfx/orngbullet.gif
  13. BIN  ControlPlane Help/gfx/splashScreenshot.png
  14. +15 −15 {MarcoPolo Help → ControlPlane Help}/index.html
  15. +10 −10 {MarcoPolo Help → ControlPlane Help}/pages/actions.html
  16. +8 −8 {MarcoPolo Help → ControlPlane Help}/pages/advanced.html
  17. +18 −18 {MarcoPolo Help → ControlPlane Help}/pages/config.html
  18. +9 −9 {MarcoPolo Help → ControlPlane Help}/pages/discover.html
  19. +9 −9 {MarcoPolo Help → ControlPlane Help}/pages/maths.html
  20. +11 −11 {MarcoPolo Help → ControlPlane Help}/pages/rules.html
  21. +7 −7 {MarcoPolo Help → ControlPlane Help}/pages/tips.html
  22. +19 −30 ControlPlane.xcodeproj/project.pbxproj
  23. +16,645 −16,822 ControlPlane.xcodeproj/project.xcworkspace/xcuserdata/dustin.xcuserdatad/UserInterfaceState.xcuserstate
  24. +25 −15 ControlPlane.xcodeproj/xcuserdata/dustin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
  25. +1 −1  ControlPlane.xcodeproj/xcuserdata/dustin.xcuserdatad/xcschemes/xcschememanagement.plist
  26. +2 −2 HACKING.html
  27. +25 −7 Info.plist
  28. +6 −6 LOCALISATION.html
  29. BIN  MarcoPolo Help/gfx/icon.png
  30. BIN  MarcoPolo Help/gfx/iconSmall.png
  31. BIN  MarcoPolo Help/gfx/splashScreenshot.png
  32. +2 −7 NOTES.txt
  33. +33 −88 Resources/AboutPanel.nib/designable.nib
  34. BIN  Resources/AboutPanel.nib/keyedobjects.nib
  35. +20 −0 Resources/dsa_pub.pem
  36. +49 −8 Resources/oui.txt
  37. +10 −12 Resources/usb-vendors.txt
  38. +62 −406 en.lproj/MainMenu.nib/designable.nib
  39. BIN  en.lproj/MainMenu.nib/keyedobjects.nib
  40. BIN  graphics/038392-glossy-black-icon-transport-travel-transportation-airplane4.zip
  41. +12 −3 make_disk_image.sh
  42. +2 −0  src/BluetoothEvidenceSource.h
  43. +7 −0 src/BluetoothEvidenceSource.m
  44. +2 −1  src/Common.m
  45. +3 −0  src/CoreWLANEvidenceSource.m
  46. +8 −1 src/EvidenceSource.m
  47. +4 −1 src/MPController.m
  48. +1 −1  src/PrefsWindowController.m
View
BIN  ControlPlane Help/ControlPlane Help.helpindex
Binary file not shown
View
0  MarcoPolo Help/css/accessPage.css → ControlPlane Help/css/accessPage.css
File renamed without changes
View
0  MarcoPolo Help/css/genlist.html → ControlPlane Help/css/genlist.html
File renamed without changes
View
0  MarcoPolo Help/css/genlist_style.css → ControlPlane Help/css/genlist_style.css
File renamed without changes
View
0  MarcoPolo Help/css/indexPage.css → ControlPlane Help/css/indexPage.css
File renamed without changes
View
0  MarcoPolo Help/css/topicPage.css → ControlPlane Help/css/topicPage.css
File renamed without changes
View
BIN  ControlPlane Help/gfx/control-plane-logo-big.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  MarcoPolo Help/gfx/equation-0.png → ControlPlane Help/gfx/equation-0.png
File renamed without changes
View
0  MarcoPolo Help/gfx/equation-1.png → ControlPlane Help/gfx/equation-1.png
File renamed without changes
View
BIN  ControlPlane Help/gfx/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ControlPlane Help/gfx/iconSmall.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  MarcoPolo Help/gfx/orngbullet.gif → ControlPlane Help/gfx/orngbullet.gif
File renamed without changes
View
BIN  ControlPlane Help/gfx/splashScreenshot.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
30 MarcoPolo Help/index.html → ControlPlane Help/index.html
@@ -6,10 +6,10 @@
<head>
<meta http-equiv="content-type" content=
"text/html; charset=us-ascii" />
-<title>MarcoPolo Help</title>
-<meta name="AppleTitle" content="MarcoPolo Help" />
+<title>ControlPlane Help</title>
+<meta name="AppleTitle" content="ControlPlane Help" />
<!-- Make sure you use the above value for CFBundleHelpBookName in the Info.plist file -->
-<meta name="AppleIcon" content="MarcoPolo Help/gfx/iconSmall.png" />
+<meta name="AppleIcon" content="ControlPlane Help/gfx/iconSmall.png" />
<!-- The iconSmall.png should be 16x16. This icon will represent your app in the Help Viewer menus. Substitute whatever's in CFBundleHelpBookFolder for "YOURAPP Help" in the AppleIcon path if you've named your help book folder differently. -->
<meta name="robots" content="anchors" />
<link href="css/accessPage.css" rel="stylesheet" media="all" type=
@@ -18,34 +18,34 @@
<body>
<div id="frame"><a name="access" id="access"></a>
<div id="contentleft">
-<center><img src="gfx/splashScreenshot.png" alt="MarcoPolo logo" />
+<center><img src="gfx/control-plane-logo-big.png" alt="ControlPlane logo" />
<!-- splashScreenshot.png should be ~200x200 or smaller. -->
-<h1>MarcoPolo</h1>
-<h4><a href="http://www.symonds.id.au/marcopolo/">www.symonds.id.au/marcopolo/</a></h4>
+<h1>ControlPlane</h1>
+<h4><a href="http://controlplane.dustinrue.com/">controlplan.dustinrue.com</a></h4>
</center>
</div>
<div id="contentcenter"></div>
<div id="contentright">
<!-- These are just ideas; feel free to stick other useful links in this area. -->
-<h2>Discover MarcoPolo</h2>
-<p><a href="pages/discover.html">An introduction to MarcoPolo.</a></p>
+<h2>Discover ControlPlane</h2>
+<p><a href="pages/discover.html">An introduction to ControlPlane.</a></p>
-<h2>Configuring MarcoPolo</h2>
-<p><a href="pages/config.html">How to configure MarcoPolo.</a></p>
+<h2>Configuring ControlPlane</h2>
+<p><a href="pages/config.html">How to configure ControlPlane.</a></p>
-<h2>Setting up MarcoPolo's rules</h2>
+<h2>Setting up ControlPlane's rules</h2>
<p><a href="pages/rules.html">How to configure rules for switching.</a></p>
-<h2>Setting up MarcoPolo's actions</h2>
+<h2>Setting up ControlPlane's actions</h2>
<p><a href="pages/actions.html">How to configure triggered actions.</a></p>
<h2>Tips and Tricks</h2>
-<p><a href="pages/tips.html">Getting the most out of MarcoPolo.</a></p>
+<p><a href="pages/tips.html">Getting the most out of ControlPlane.</a></p>
<h2>Advanced settings</h2>
-<p><a href="pages/advanced.html">Tweaking some of MarcoPolo's internals.</a></p>
+<p><a href="pages/advanced.html">Tweaking some of ControlPlane's internals.</a></p>
-<h2>The maths behind MarcoPolo</h2>
+<h2>The maths behind ControlPlane</h2>
<p><a href="pages/maths.html">Understanding what's going on.</a></p>
</div>
View
20 MarcoPolo Help/pages/actions.html → ControlPlane Help/pages/actions.html
@@ -1,26 +1,26 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>Setting up MarcoPolo's actions</title>
+ <title>Setting up ControlPlane's actions</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="actions triggers">
- <meta name="description" content="Learn how to set up MarcoPolo's actions.">
+ <meta name="description" content="Learn how to set up ControlPlane's actions.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
- <h1>Setting up MarcoPolo's actions</h1>
+ <h1>Setting up ControlPlane's actions</h1>
</div>
- <p><i>Actions</i> are triggered when MarcoPolo decides to
+ <p><i>Actions</i> are triggered when ControlPlane decides to
change your context.
</p>
<p>Each action has the following properties:
@@ -36,9 +36,9 @@
</ul>
<p>Most actions will be Arrival actions; that is, they will be
- triggered when MarcoPolo switches <em>to</em> that context.
+ triggered when ControlPlane switches <em>to</em> that context.
The alternative is a Departure action, which is triggered when
- MarcoPolo switches <em>away</em> from that action's context.
+ ControlPlane switches <em>away</em> from that action's context.
In this case, the <i>delay</i> parameter will be the length of
time from the action being triggered until the context is
switched.
@@ -84,7 +84,7 @@
<h2><em>Open</em> actions</h2>
<p>Actions of type <em>Open</em> are the most general actions.
- Upon triggering, MarcoPolo will open that file: if it
+ Upon triggering, ControlPlane will open that file: if it
is an application, it will be launched; if it is an
AppleScript, it will be executed; otherwise, it will be opened
with that file's default application. This is roughly
@@ -127,7 +127,7 @@
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="rules.html">Setting up MarcoPolo's rules</a><br />
+ <a href="rules.html">Setting up ControlPlane's rules</a><br />
<a href="tips.html">Tips and tricks</a><br />
</p>
</div>
View
16 MarcoPolo Help/pages/advanced.html → ControlPlane Help/pages/advanced.html
@@ -1,34 +1,34 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>Setting up MarcoPolo's rules</title>
+ <title>Setting up ControlPlane's rules</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="advanced configuration tuning">
- <meta name="description" content="Advanced settings for MarcoPolo.">
+ <meta name="description" content="Advanced settings for ControlPlane.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
<!-- The above links back to the index page -->
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
<h1>Advanced settings</h1>
</div>
<p>This section details the advanced configuration options of
- MarcoPolo. <b>Please be aware that changing these settings could
+ ControlPlane. <b>Please be aware that changing these settings could
have a detrimental effect on your computer's performance, as
- well as MarcoPolo's performance.</b>
+ well as ControlPlane's performance.</b>
</p>
<h2>Time interval between re-evaluating rules</h2>
- <p>The main MarcoPolo thread runs in a loop, gathering evidence
+ <p>The main ControlPlane thread runs in a loop, gathering evidence
from each evidence source, evaluating it against all the rules,
and computing the correct context. This setting controls the
length of time to pause between these cycles.
@@ -47,7 +47,7 @@
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="config.html">Configuring MarcoPolo</a><br />
+ <a href="config.html">Configuring ControlPlane</a><br />
</p>
</div>
</body>
View
36 MarcoPolo Help/pages/config.html → ControlPlane Help/pages/config.html
@@ -1,34 +1,34 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>Setting up MarcoPolo's rules</title>
+ <title>Setting up ControlPlane's rules</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="config configuration">
- <meta name="description" content="Overall settings for MarcoPolo.">
+ <meta name="description" content="Overall settings for ControlPlane.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
<!-- The above links back to the index page -->
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
- <h1>Configuring MarcoPolo</h1>
+ <h1>Configuring ControlPlane</h1>
</div>
<p>This section deals with the overall configuration of
- MarcoPolo; it doesn't cover <a href="rules.html">rules</a> or
+ ControlPlane; it doesn't cover <a href="rules.html">rules</a> or
<a href="actions.html">actions</a>.
</p>
- <p>MarcoPolo runs from the <em>status bar</em> (the right-hand
+ <p>ControlPlane runs from the <em>status bar</em> (the right-hand
portion of the menu bar containing icons), and does not show in
- the Dock. You can access MarcoPolo's preferences and other
- features through the MarcoPolo icon.
+ the Dock. You can access ControlPlane's preferences and other
+ features through the ControlPlane icon.
</p>
<h2>Enabling automatic switching</h2>
@@ -40,23 +40,23 @@
<h2>Hiding from status bar</h2>
<p>If the 'Hide from status bar' option is checked in the
- General preferences, the MarcoPolo icon in the status bar will
+ General preferences, the ControlPlane icon in the status bar will
disappear about 10 seconds after launching (or after enabling
this option). To restore the icon to access preferences,
- simply relaunch MarcoPolo, and the icon will be visible again
+ simply relaunch ControlPlane, and the icon will be visible again
for another 10 seconds.
</p>
<h2>Switch Smoothing</h2>
- <p>Some evidence sources in MarcoPolo can occasionally return
+ <p>Some evidence sources in ControlPlane can occasionally return
spurious data, either due to bad hardware (such as USB), or
fundamentally unreliable physical circumstances (such as WiFi).
- This can sometimes cause MarcoPolo to momentarily switch away
+ This can sometimes cause ControlPlane to momentarily switch away
from the current (correct) context, and then switch back once
the evidence source corrects itself.
</p>
<p>If you check the 'Use switch smoothing' option in the
- General preferences, MarcoPolo will delay all context
+ General preferences, ControlPlane will delay all context
switching until two consecutive rule evaluations both yield the
same guess. The interval between rule evaluations defaults to
five seconds, so using switch smoothing will delay legitimate
@@ -64,22 +64,22 @@
</p>
<h2>Default Context</h2>
- <p>Sometimes MarcoPolo doesn't have enough evidence to make a
+ <p>Sometimes ControlPlane doesn't have enough evidence to make a
confident enough guess as to your correct context. You can
specify a <em>default context</em> to be used in these
situations.
</p>
<h2>Confidence required</h2>
- <p>After MarcoPolo has combined all the matching rules, it
+ <p>After ControlPlane has combined all the matching rules, it
arrives at a confidence for each possible context. The
minimum confidence threshold is configurable via this slider.
</p>
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="rules.html">Setting up MarcoPolo's rules</a><br />
- <a href="actions.html">Setting up MarcoPolo's actions</a><br />
+ <a href="rules.html">Setting up ControlPlane's rules</a><br />
+ <a href="actions.html">Setting up ControlPlane's actions</a><br />
<a href="advanced.html">Advanced settings</a><br />
</p>
</div>
View
18 MarcoPolo Help/pages/discover.html → ControlPlane Help/pages/discover.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html;charset=utf-8">
- <title>Discover MarcoPolo</title>
+ <title>Discover ControlPlane</title>
<meta name="robots" content="anchors">
<link href="../css/topicPage.css" type="text/css" rel="stylesheet" media="all">
</head>
@@ -10,23 +10,23 @@
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img src="../gfx/icon.png" alt="MarcoPolo icon">
+ <img src="../gfx/icon.png" alt="ControlPlane icon">
</div>
<div id="pagetitle">
- <h1>Discover MarcoPolo</h1>
+ <h1>Discover ControlPlane</h1>
</div>
-<p>MarcoPolo brings context-aware computing to your portable Mac computer.
+<p>ControlPlane brings context-aware computing to your portable Mac computer.
It allows your computer to determine its context through gathering evidence
from your environment (<b>evidence sources</b>), using flexible rule-based
fuzzy matching to make an educated guess (<b>rules</b>), and then
performing arbitrary actions upon changing context (<b>actions</b>).
</p>
-<p>MarcoPolo's concept of <em>contexts</em> is a generalisation of a location,
+<p>ControlPlane's concept of <em>contexts</em> is a generalisation of a location,
and encompasses more than just where your computer is. A context might
represent what you are doing, or what else is going on around you.
</p>
@@ -64,9 +64,9 @@
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="config.html">Configuring MarcoPolo</a><br />
- <a href="rules.html">Setting up MarcoPolo's rules</a><br />
- <a href="actions.html">Setting up MarcoPolo's actions</a><br />
+ <a href="config.html">Configuring ControlPlane</a><br />
+ <a href="rules.html">Setting up ControlPlane's rules</a><br />
+ <a href="actions.html">Setting up ControlPlane's actions</a><br />
</p>
</body>
</html>
View
18 MarcoPolo Help/pages/maths.html → ControlPlane Help/pages/maths.html
@@ -1,39 +1,39 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>The maths behind MarcoPolo</title>
+ <title>The maths behind ControlPlane</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="maths details">
- <meta name="description" content="Learn how MarcoPolo works behind-the-scenes.">
+ <meta name="description" content="Learn how ControlPlane works behind-the-scenes.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
<!-- The above links back to the index page -->
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
- <h1>The maths behind MarcoPolo</h1>
+ <h1>The maths behind ControlPlane</h1>
</div>
<p style="font-style: italic;">Note: this is fairly technical,
and is aimed at an undergraduate mathematics level. It is not
- necessary to understand the following content to use MarcoPolo;
+ necessary to understand the following content to use ControlPlane;
it is provided for the curious.
</p>
- <p>MarcoPolo doesn't use traditional "fuzzy logic" handling,
+ <p>ControlPlane doesn't use traditional "fuzzy logic" handling,
but rather combines fuzzy sets with a more traditional
confidence combination method. The fuzzy sets are implicit, and
represent each possible context: a given rule indicates that a
piece of evidence is in a certain context set with a certain
membership value (the confidence).
</p>
- <p>Every time MarcoPolo decides to evaluate the best guess, it
+ <p>Every time ControlPlane decides to evaluate the best guess, it
finds all the rules that match, groups them based on the
context that they provide evidence for, and then aggregates
the confidence values for each context. The context with the
@@ -56,7 +56,7 @@
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="rules.html">Setting up MarcoPolo's rules</a><br />
+ <a href="rules.html">Setting up ControlPlane's rules</a><br />
</p>
</div>
</body>
View
22 MarcoPolo Help/pages/rules.html → ControlPlane Help/pages/rules.html
@@ -1,27 +1,27 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>Setting up MarcoPolo's rules</title>
+ <title>Setting up ControlPlane's rules</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="rules">
- <meta name="description" content="Learn how to set up MarcoPolo's rules.">
+ <meta name="description" content="Learn how to set up ControlPlane's rules.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
<!-- The above links back to the index page -->
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
- <h1>Setting up MarcoPolo's rules</h1>
+ <h1>Setting up ControlPlane's rules</h1>
</div>
- <p><b>Rules</b> in MarcoPolo are how MarcoPolo determines your
+ <p><b>Rules</b> in ControlPlane are how ControlPlane determines your
context from different sources of evidence.
Different <i>types</i> of rules for different types of
evidence, but they are all combined mathematically to arrive at
@@ -49,19 +49,19 @@
&lt; type=Bluetooth, parameter=00-00-6C-33-7A-2F, context=Home,
confidence=80% &gt;
</p>
- <p>This tells MarcoPolo that the presence of a <i>Bluetooth</i>
+ <p>This tells ControlPlane that the presence of a <i>Bluetooth</i>
device with a MAC of <i>00-00-6C-33-7A-2F</i> means that we are
at the <i>Home</i> context, and that we can be <i>80%</i>
confident of this. Ordinarily, you won't have to explicitly
set the parameter, but it's sometimes useful to be able to
tweak it.
</p>
- <p>MarcoPolo frequently evaluates all its rules, and finds the
+ <p>ControlPlane frequently evaluates all its rules, and finds the
subset of rules that match. It combines all these rules to get
a confidence for each context, and decides on the highest
confidence context. If the confidence for that context is
greater than a threshold (configurable in the Preferences
- window), and the context is not the current one, MarcoPolo
+ window), and the context is not the current one, ControlPlane
changes to that context, and triggers any relevant actions.
</p>
<!--
@@ -72,8 +72,8 @@
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="actions.html">Setting up MarcoPolo's actions</a><br />
- <a href="maths.html">The maths behind MarcoPolo</a><br />
+ <a href="actions.html">Setting up ControlPlane's actions</a><br />
+ <a href="maths.html">The maths behind ControlPlane</a><br />
</p>
</div>
</body>
View
14 MarcoPolo Help/pages/tips.html → ControlPlane Help/pages/tips.html
@@ -4,25 +4,25 @@
<title>Tips and Tricks</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="tips, tricks, examples, samples">
- <meta name="description" content="Get the most out of MarcoPolo.">
+ <meta name="description" content="Get the most out of ControlPlane.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
<!-- The above links back to the index page -->
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
<h1>Tips and Tricks</h1>
</div>
<p>This page gives examples of useful ways that
- MarcoPolo can be used, especially via actions.
+ ControlPlane can be used, especially via actions.
</p>
@@ -40,7 +40,7 @@
</pre>
</li>
<li>Save it somewhere convenient.</li>
- <li>Create an <em>Open</em> action in MarcoPolo, selecting the saved script as its parameter.</li>
+ <li>Create an <em>Open</em> action in ControlPlane, selecting the saved script as its parameter.</li>
</ol>
</p>
<p>
@@ -62,14 +62,14 @@
</pre>
</li>
<li>Save it somewhere convenient.</li>
- <li>Create an <em>Open</em> action in MarcoPolo, selecting the saved script as its parameter.</li>
+ <li>Create an <em>Open</em> action in ControlPlane, selecting the saved script as its parameter.</li>
</ol>
</p>
</div>
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="actions.html">Setting up MarcoPolo's actions</a><br />
+ <a href="actions.html">Setting up ControlPlane's actions</a><br />
</p>
</div>
</body>
View
49 ControlPlane.xcodeproj/project.pbxproj
@@ -27,11 +27,9 @@
8D3453C40C18E5C1006011D0 /* IChatAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D3453C20C18E5C1006011D0 /* IChatAction.m */; };
8D38B66C0C49D50200290F47 /* SliderWithValue.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D38B66A0C49D50200290F47 /* SliderWithValue.m */; };
8D3A3D5F0C012565008EBF2A /* EvidenceSourcesPrefs.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 8D3A3D5E0C012564008EBF2A /* EvidenceSourcesPrefs.tiff */; };
- 8D3B008E0C620E4A00B9B910 /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 8D3B008D0C620E4A00B9B910 /* Credits.html */; };
8D3BFF3F0C61BE4500B9B910 /* AboutPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D3BFF3D0C61BE4500B9B910 /* AboutPanel.m */; };
8D3BFFB20C61CA5300B9B910 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D3BFFB10C61CA5300B9B910 /* WebKit.framework */; };
8D3C85150CDD8546009DBCD9 /* ScreenSaverStartAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D3C85130CDD8546009DBCD9 /* ScreenSaverStartAction.m */; };
- 8D3E2DD20AA4F3C000FB21C1 /* marcopolo.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8D3E2DD10AA4F3C000FB21C1 /* marcopolo.icns */; };
8D447DF90C3E65D000DAB17A /* ContextSelectionButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D447DF70C3E65CF00DAB17A /* ContextSelectionButton.m */; };
8D481B0A0B6098DD0097CF9C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D481B070B6098DD0097CF9C /* IOKit.framework */; };
8D4DBDC30BE1E3C00024DEA0 /* gear.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D4DBDC20BE1E3C00024DEA0 /* gear.png */; };
@@ -86,11 +84,13 @@
8DE4C00C0C4EE58D00511590 /* GenericRule.nib in Resources */ = {isa = PBXBuildFile; fileRef = 8DE4C00A0C4EE58D00511590 /* GenericRule.nib */; };
8DE4C0110C4EE60700511590 /* GenericEvidenceSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DE4C00F0C4EE60700511590 /* GenericEvidenceSource.m */; };
8DE4EE470C4B2A6F00A5B559 /* ScreenSaverTimeAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DE4EE450C4B2A6F00A5B559 /* ScreenSaverTimeAction.m */; };
- 8DEF428F0BAA05D300F87273 /* MarcoPolo Help in Copy Help Files */ = {isa = PBXBuildFile; fileRef = 8DEF42780BAA05CD00F87273 /* MarcoPolo Help */; };
8DF5A4180BC2353D00CBEB4B /* Action.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DF5A4160BC2353D00CBEB4B /* Action.m */; };
8DF5A4610BC239B100CBEB4B /* DefaultPrinterAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DF5A45F0BC239B100CBEB4B /* DefaultPrinterAction.m */; };
8DFA46170CC33E46003EAC16 /* QuitApplicationAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DFA46150CC33E46003EAC16 /* QuitApplicationAction.m */; };
8DFD0DA60CEBBC8A00E79049 /* UnmountAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DFD0DA40CEBBC8A00E79049 /* UnmountAction.m */; };
+ DA16392613D4B14A00E3F421 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = DA16392513D4B14A00E3F421 /* dsa_pub.pem */; };
+ DA4A629313E2546800CE976F /* ControlPlane Help in Resources */ = {isa = PBXBuildFile; fileRef = DA4A629213E2546800CE976F /* ControlPlane Help */; };
+ DA4A629513E25C9D00CE976F /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = DA4A629413E25C9D00CE976F /* Credits.html */; };
DA72BF9413CD317B002D27DD /* CoreWLAN.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA72BF9313CD317B002D27DD /* CoreWLAN.framework */; };
DA83A21D13D0FE8F00074503 /* CoreWLANEvidenceSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DA83A21C13D0FE8F00074503 /* CoreWLANEvidenceSource.m */; };
DA83A21F13D12A3200074503 /* cp-icon-active.icns in Resources */ = {isa = PBXBuildFile; fileRef = DA83A21E13D12A3200074503 /* cp-icon-active.icns */; };
@@ -119,7 +119,6 @@
dstPath = "";
dstSubfolderSpec = 7;
files = (
- 8DEF428F0BAA05D300F87273 /* MarcoPolo Help in Copy Help Files */,
8D1EDA170CE11C8C00202458 /* Common.h in Copy Help Files */,
);
name = "Copy Help Files";
@@ -146,7 +145,6 @@
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D1493F40C824B6D00D29FE8 /* BonjourEvidenceSource.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = BonjourEvidenceSource.h; path = src/BonjourEvidenceSource.h; sourceTree = "<group>"; };
8D1493F50C824B6D00D29FE8 /* BonjourEvidenceSource.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BonjourEvidenceSource.m; path = src/BonjourEvidenceSource.m; sourceTree = "<group>"; };
- 8D14E1190BF3DADE00FDD12C /* HACKING.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = HACKING.html; sourceTree = "<group>"; };
8D185DC50BF428CF00A06B03 /* AdvancedPrefs.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AdvancedPrefs.tiff; path = graphics/AdvancedPrefs.tiff; sourceTree = "<group>"; };
8D1A45590BA00DE2004A6BC4 /* minus-8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "minus-8.png"; path = "graphics/minus-8.png"; sourceTree = "<group>"; };
8D1A455A0BA00DE2004A6BC4 /* plus-8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "plus-8.png"; path = "graphics/plus-8.png"; sourceTree = "<group>"; };
@@ -177,7 +175,6 @@
8D38B6690C49D50200290F47 /* SliderWithValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SliderWithValue.h; path = src/SliderWithValue.h; sourceTree = "<group>"; };
8D38B66A0C49D50200290F47 /* SliderWithValue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SliderWithValue.m; path = src/SliderWithValue.m; sourceTree = "<group>"; };
8D3A3D5E0C012564008EBF2A /* EvidenceSourcesPrefs.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = EvidenceSourcesPrefs.tiff; path = graphics/EvidenceSourcesPrefs.tiff; sourceTree = "<group>"; };
- 8D3B008D0C620E4A00B9B910 /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Credits.html; sourceTree = "<group>"; };
8D3BFF3C0C61BE4500B9B910 /* AboutPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AboutPanel.h; path = src/AboutPanel.h; sourceTree = "<group>"; };
8D3BFF3D0C61BE4500B9B910 /* AboutPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AboutPanel.m; path = src/AboutPanel.m; sourceTree = "<group>"; };
8D3BFFB10C61CA5300B9B910 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
@@ -224,7 +221,6 @@
8D82F0A10AA81411009ADA44 /* PrefsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PrefsWindowController.h; path = src/PrefsWindowController.h; sourceTree = "<group>"; };
8D82F0A20AA81411009ADA44 /* PrefsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PrefsWindowController.m; path = src/PrefsWindowController.m; sourceTree = "<group>"; };
8D88FE290C534737007A14D6 /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = graphics/pause.png; sourceTree = "<group>"; };
- 8D8B65A10B855DA1003870A1 /* NOTES.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = NOTES.txt; sourceTree = "<group>"; };
8D8C9BA70BBB3AAC0074D5B3 /* Apple80211.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Apple80211.h; path = src/Apple80211.h; sourceTree = "<group>"; };
8D8C9BA90BBB3ADB0074D5B3 /* Apple80211.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Apple80211.framework; path = /System/Library/PrivateFrameworks/Apple80211.framework; sourceTree = "<absolute>"; };
8D8C9CA30BBB74E70074D5B3 /* EvidenceSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EvidenceSource.h; path = src/EvidenceSource.h; sourceTree = "<group>"; };
@@ -250,7 +246,6 @@
8D9ED1710C69D636000FE939 /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr; path = fr.lproj/TimeOfDayRule.nib; sourceTree = "<group>"; };
8DA2F4120CE8630200F92D4D /* DesktopBackgroundAction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DesktopBackgroundAction.h; path = src/DesktopBackgroundAction.h; sourceTree = "<group>"; };
8DA2F4130CE8630200F92D4D /* DesktopBackgroundAction.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = DesktopBackgroundAction.m; path = src/DesktopBackgroundAction.m; sourceTree = "<group>"; };
- 8DAEC7A60C62A7F00020BD5E /* LOCALISATION.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = LOCALISATION.html; sourceTree = "<group>"; wrapsLines = 1; };
8DB1EF210C6C60A300586F84 /* MailIMAPServerAction.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = MailIMAPServerAction.h; path = src/MailIMAPServerAction.h; sourceTree = "<group>"; };
8DB1EF220C6C60A300586F84 /* MailIMAPServerAction.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MailIMAPServerAction.m; path = src/MailIMAPServerAction.m; sourceTree = "<group>"; };
8DB4B4FA0BDF22CC00472564 /* mp-icon-active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mp-icon-active.png"; path = "graphics/mp-icon-active.png"; sourceTree = "<group>"; };
@@ -290,7 +285,6 @@
8DE4C00F0C4EE60700511590 /* GenericEvidenceSource.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = GenericEvidenceSource.m; path = src/GenericEvidenceSource.m; sourceTree = "<group>"; };
8DE4EE440C4B2A6F00A5B559 /* ScreenSaverTimeAction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ScreenSaverTimeAction.h; path = src/ScreenSaverTimeAction.h; sourceTree = "<group>"; };
8DE4EE450C4B2A6F00A5B559 /* ScreenSaverTimeAction.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ScreenSaverTimeAction.m; path = src/ScreenSaverTimeAction.m; sourceTree = "<group>"; };
- 8DEF42780BAA05CD00F87273 /* MarcoPolo Help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "MarcoPolo Help"; sourceTree = "<group>"; };
8DF5A4150BC2353D00CBEB4B /* Action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Action.h; path = src/Action.h; sourceTree = "<group>"; };
8DF5A4160BC2353D00CBEB4B /* Action.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Action.m; path = src/Action.m; sourceTree = "<group>"; };
8DF5A45E0BC239B100CBEB4B /* DefaultPrinterAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultPrinterAction.h; path = src/DefaultPrinterAction.h; sourceTree = "<group>"; };
@@ -300,6 +294,9 @@
8DFD0DA30CEBBC8A00E79049 /* UnmountAction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UnmountAction.h; path = src/UnmountAction.h; sourceTree = "<group>"; };
8DFD0DA40CEBBC8A00E79049 /* UnmountAction.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = UnmountAction.m; path = src/UnmountAction.m; sourceTree = "<group>"; };
DA1204DA13D0E5C800CDA091 /* ControlPlane.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ControlPlane.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ DA16392513D4B14A00E3F421 /* dsa_pub.pem */ = {isa = PBXFileReference; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = "<group>"; };
+ DA4A629213E2546800CE976F /* ControlPlane Help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "ControlPlane Help"; sourceTree = "<group>"; };
+ DA4A629413E25C9D00CE976F /* Credits.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = Credits.html; sourceTree = "<group>"; };
DA6D184A1154581000347E93 /* LmuTracker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = LmuTracker.c; sourceTree = "<group>"; };
DA6D184C1154581700347E93 /* LmuTrackerCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LmuTrackerCommon.h; sourceTree = "<group>"; };
DA72BF9313CD317B002D27DD /* CoreWLAN.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreWLAN.framework; path = SDKs/MacOSX10.6.sdk/System/Library/Frameworks/CoreWLAN.framework; sourceTree = DEVELOPER_DIR; };
@@ -390,9 +387,9 @@
29B97314FDCFA39411CA2CEA /* MarcoPolo */ = {
isa = PBXGroup;
children = (
+ DA4A629413E25C9D00CE976F /* Credits.html */,
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
- 8D8B65A00B855D78003870A1 /* Docs */,
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
@@ -415,6 +412,8 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ DA4A629213E2546800CE976F /* ControlPlane Help */,
+ DA16392513D4B14A00E3F421 /* dsa_pub.pem */,
DA83A22613D1430000074503 /* usb-vendors.txt */,
DA83A22413D13E0500074503 /* cp-icon.icns */,
DA83A22213D13DF300074503 /* cp-icon.icns */,
@@ -476,23 +475,9 @@
name = "UI Utilities";
sourceTree = "<group>";
};
- 8D8B65A00B855D78003870A1 /* Docs */ = {
- isa = PBXGroup;
- children = (
- 8D3B008D0C620E4A00B9B910 /* Credits.html */,
- 8DEF42780BAA05CD00F87273 /* MarcoPolo Help */,
- 8D8B65A10B855DA1003870A1 /* NOTES.txt */,
- 8D14E1190BF3DADE00FDD12C /* HACKING.html */,
- 8DAEC7A60C62A7F00020BD5E /* LOCALISATION.html */,
- );
- name = Docs;
- sourceTree = "<group>";
- };
8DAD148E0BBCA40700F93914 /* Evidence Sources */ = {
isa = PBXGroup;
children = (
- 8D1493F40C824B6D00D29FE8 /* BonjourEvidenceSource.h */,
- 8D1493F50C824B6D00D29FE8 /* BonjourEvidenceSource.m */,
8DE4C0C00C4EEE3E00511590 /* Concrete Evidence Sources */,
8D643CDA0C4EF6FD006D8ECC /* LoopingEvidenceSource.h */,
8D643CDB0C4EF6FD006D8ECC /* LoopingEvidenceSource.m */,
@@ -509,6 +494,8 @@
8DE4C0C00C4EEE3E00511590 /* Concrete Evidence Sources */ = {
isa = PBXGroup;
children = (
+ 8D1493F50C824B6D00D29FE8 /* BonjourEvidenceSource.m */,
+ 8D1493F40C824B6D00D29FE8 /* BonjourEvidenceSource.h */,
8D2BAAAA0C56E26100A50777 /* NetworkLinkEvidenceSource.h */,
8D2BAAAB0C56E26100A50777 /* NetworkLinkEvidenceSource.m */,
8DE428F90C5084D00073499A /* TimeOfDayEvidenceSource.h */,
@@ -620,6 +607,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
+ LastUpgradeCheck = 0410;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ControlPlane" */;
compatibilityVersion = "Xcode 3.0";
@@ -648,10 +636,11 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ DA4A629513E25C9D00CE976F /* Credits.html in Resources */,
+ DA16392613D4B14A00E3F421 /* dsa_pub.pem in Resources */,
DA83A22113D13C8300074503 /* cp-icon-inactive.icns in Resources */,
DA83A21F13D12A3200074503 /* cp-icon-active.icns in Resources */,
8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
- 8D3E2DD20AA4F3C000FB21C1 /* marcopolo.icns in Resources */,
8D1A455B0BA00DE2004A6BC4 /* minus-8.png in Resources */,
8D1A455C0BA00DE2004A6BC4 /* plus-8.png in Resources */,
8DB8917C0BB89BD8005347C2 /* oui.txt in Resources */,
@@ -670,11 +659,11 @@
8DE429480C5091F90073499A /* TimeOfDayRule.nib in Resources */,
8D88FE2A0C534737007A14D6 /* pause.png in Resources */,
8D66DBD90C548F100093D0D8 /* IPRule.nib in Resources */,
- 8D3B008E0C620E4A00B9B910 /* Credits.html in Resources */,
8DC410FB0C64665E00393759 /* AboutPanel.nib in Resources */,
DA83A22313D13DF300074503 /* cp-icon.icns in Resources */,
DA83A22513D13E0500074503 /* cp-icon.icns in Resources */,
DA83A22713D1430000074503 /* usb-vendors.txt in Resources */,
+ DA4A629313E2546800CE976F /* ControlPlane Help in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -925,7 +914,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
};
name = Debug;
};
@@ -939,8 +928,8 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
- VALID_ARCHS = "ppc i386 ppc64 ppc7400 ppc970 x86_64";
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+ VALID_ARCHS = "i386 x86_64";
};
name = Release;
};
@@ -954,7 +943,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+ SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
};
name = "Release copy";
};
View
33,467 ...codeproj/project.xcworkspace/xcuserdata/dustin.xcuserdatad/UserInterfaceState.xcuserstate
16,645 additions, 16,822 deletions not shown
View
40 ControlPlane.xcodeproj/xcuserdata/dustin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -9,11 +9,13 @@
continueAfterRunningActions = "No"
isPathRelative = "1"
filePath = "src/BluetoothEvidenceSource.m"
- timestampString = "290812703.257686"
+ timestampString = "333143200.454023"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "58"
- endingLineNumber = "58">
+ startingLineNumber = "65"
+ endingLineNumber = "65"
+ landmarkName = "-start"
+ landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
shouldBeEnabled = "Yes"
@@ -21,11 +23,13 @@
continueAfterRunningActions = "No"
isPathRelative = "1"
filePath = "src/BluetoothEvidenceSource.m"
- timestampString = "290812706.051615"
+ timestampString = "333143200.454023"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "60"
- endingLineNumber = "60">
+ startingLineNumber = "67"
+ endingLineNumber = "67"
+ landmarkName = "-start"
+ landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
shouldBeEnabled = "Yes"
@@ -33,11 +37,13 @@
continueAfterRunningActions = "No"
isPathRelative = "1"
filePath = "src/BluetoothEvidenceSource.m"
- timestampString = "290812706.542297"
+ timestampString = "333143200.454023"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "61"
- endingLineNumber = "61">
+ startingLineNumber = "68"
+ endingLineNumber = "68"
+ landmarkName = "-start"
+ landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
shouldBeEnabled = "Yes"
@@ -45,11 +51,13 @@
continueAfterRunningActions = "No"
isPathRelative = "1"
filePath = "src/BluetoothEvidenceSource.m"
- timestampString = "290812707.065571"
+ timestampString = "333143200.454023"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "62"
- endingLineNumber = "62">
+ startingLineNumber = "69"
+ endingLineNumber = "69"
+ landmarkName = "-start"
+ landmarkType = "5">
</FileBreakpoint>
<FileBreakpoint
shouldBeEnabled = "Yes"
@@ -57,11 +65,13 @@
continueAfterRunningActions = "No"
isPathRelative = "1"
filePath = "src/BluetoothEvidenceSource.m"
- timestampString = "290812676.844415"
+ timestampString = "333143200.454023"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "63"
- endingLineNumber = "63">
+ startingLineNumber = "70"
+ endingLineNumber = "70"
+ landmarkName = "-start"
+ landmarkType = "5">
</FileBreakpoint>
</FileBreakpoints>
</Bucket>
View
2  ControlPlane.xcodeproj/xcuserdata/dustin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,7 +4,7 @@
<dict>
<key>SchemeUserState</key>
<dict>
- <key>MarcoPolo.xcscheme</key>
+ <key>Debug.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
View
4 HACKING.html
@@ -1,6 +1,6 @@
<html>
<head>
- <title>MarcoPolo Hacking Guide</title>
+ <title>ControlPlane Hacking Guide</title>
<style type="text/css">
table {
border: 1px solid black;
@@ -16,7 +16,7 @@
</style>
</head>
<body>
-<h1>MarcoPolo Hacking Guide</h1>
+<h1>ControlPlane Hacking Guide</h1>
<h2>5 August 2007</h2>
<h3>Adding a new Evidence Source</h3>
View
32 Info.plist
@@ -2,16 +2,18 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>BuildMachineOSBuild</key>
+ <string>11A511</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDocumentTypes</key>
<array/>
<key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
+ <string>ControlPlane</string>
<key>CFBundleHelpBookFolder</key>
- <string>MarcoPolo Help</string>
+ <string>ControlPlane Help</string>
<key>CFBundleHelpBookName</key>
- <string>MarcoPolo Help</string>
+ <string>ControlPlane Help</string>
<key>CFBundleIconFile</key>
<string>cp-icon.icns</string>
<key>CFBundleIdentifier</key>
@@ -19,23 +21,37 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
- <string>${PRODUCT_NAME}</string>
+ <string>ControlPlane</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.9.9</string>
+ <string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array/>
<key>CFBundleVersion</key>
- <string>0.9.9</string>
+ <string>1.0.0</string>
+ <key>DTCompiler</key>
+ <string></string>
+ <key>DTPlatformBuild</key>
+ <string>4B110</string>
+ <key>DTPlatformVersion</key>
+ <string>GM</string>
+ <key>DTSDKBuild</key>
+ <string>10J567</string>
+ <key>DTSDKName</key>
+ <string>macosx10.6</string>
+ <key>DTXcode</key>
+ <string>0410</string>
+ <key>DTXcodeBuild</key>
+ <string>4B110</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSUIElement</key>
<string>1</string>
<key>MPWebPageURL</key>
- <string>http://www.symonds.id.au/marcopolo/</string>
+ <string>http://controlplane.dustinrue.com/</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
@@ -44,6 +60,8 @@
<array/>
<key>SUFeedURL</key>
<string>http://controlplane.dustinrue.com/appcast.xml</string>
+ <key>SUPublicDSAKeyFile</key>
+ <string>dsa_pub.pem</string>
<key>SUScheduledCheckInterval</key>
<integer>86400</integer>
<key>UTExportedTypeDeclarations</key>
View
12 LOCALISATION.html
@@ -1,12 +1,12 @@
<html>
<head>
- <title>MarcoPolo Localisation Guide</title>
+ <title>ControlPlane Localisation Guide</title>
</head>
<body>
-<h1>MarcoPolo Localisation Guide</h1>
+<h1>ControlPlane Localisation Guide</h1>
<h2>9 August 2007</h2>
-<p>This is a brief overview of some important points that MarcoPolo
+<p>This is a brief overview of some important points that ControlPlane
localisers should know. If you are a new localiser, or haven't read
this file for a while, please review it.
</p>
@@ -37,14 +37,14 @@
<h3>Sending Updates</h3>
<p>If you've created or updated a localisation, you'll need to send it to
me (David Symonds) for it to be included in the next version of
-MarcoPolo. Your options, in decreasing order of my preference, are
+ControlPlane. Your options, in decreasing order of my preference, are
below:</p>
<ol>
<li>Do your changes in your own git repository (cloned from my tree), use
<tt>git format-patch master</tt> to generate patch files, and email those to me.</li>
<li>Zip up your <tt>XX.lproj/</tt> directory, and email it to me.</li>
-<li>Zip up the whole customised MarcoPolo.app bundle, and email it to me.
+<li>Zip up the whole customised ControlPlane.app bundle, and email it to me.
(This is apparently the default way that iLocalize operates)</li>
</ol>
@@ -114,7 +114,7 @@
make everything fit neatly.</p>
<p>Be careful not to change any of the controls' properties other than the
-text label and sizes. If you do, you might prevent parts of MarcoPolo
+text label and sizes. If you do, you might prevent parts of ControlPlane
from working properly!</p>
</body>
View
BIN  MarcoPolo Help/gfx/icon.png
Deleted file not rendered
View
BIN  MarcoPolo Help/gfx/iconSmall.png
Deleted file not rendered
View
BIN  MarcoPolo Help/gfx/splashScreenshot.png
Deleted file not rendered
View
9 NOTES.txt
@@ -1,20 +1,15 @@
USB data
--------
To update:
- wget http://www.usb.org/developers/tools/comp_dump \
- -O Resources/usb-vendors.txt
+ cd into scripts, run ./update-usb-data.sh
OUI data
--------
To update:
- curl http://standards.ieee.org/regauth/oui/oui.txt \
- | grep "^..-..-.." | sed "s/(hex)//" \
- | tr -s '\t' \
- > Resources/oui.txt
+ cd into scripts, run ./update-oui.sh
Pre-Release Checklist
---------------------
- + Update USB vendor and OUI databases (see above)
+ Check version numbers in Info.plist
+ Git tag
+ Run ./make_disk_image.sh
View
121 Resources/AboutPanel.nib/designable.nib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1040</int>
- <string key="IBDocument.SystemVersion">10K540</string>
- <string key="IBDocument.InterfaceBuilderVersion">1306</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <string key="IBDocument.SystemVersion">11A511</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1617</string>
+ <string key="IBDocument.AppKitVersion">1138</string>
+ <string key="IBDocument.HIToolboxVersion">566.00</string>
<dictionary class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="com.apple.InterfaceBuilder.CocoaPlugin">1306</string>
- <string key="com.apple.WebKitIBPlugin">30</string>
+ <string key="com.apple.InterfaceBuilder.CocoaPlugin">1617</string>
+ <string key="com.apple.WebKitIBPlugin">518</string>
</dictionary>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSTextField</string>
@@ -39,7 +39,7 @@
<object class="NSWindowTemplate" id="729589211">
<int key="NSWindowStyleMask">11</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{163, 504}, {569, 243}}</string>
+ <string key="NSWindowRect">{{163, 351}, {569, 243}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle"/>
<object class="NSMutableString" key="NSWindowClass">
@@ -48,9 +48,10 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
+ <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{567, 224}</string>
<object class="NSView" key="NSWindowView" id="760619837">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSImageView" id="996622039">
<reference key="NSNextResponder" ref="760619837"/>
@@ -65,13 +66,14 @@
</set>
<string key="NSFrame">{{20, 95}, {128, 128}}</string>
<reference key="NSSuperview" ref="760619837"/>
+ <reference key="NSNextKeyView" ref="1058672371"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="813201744">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">marcopolo</string>
+ <string key="NSResourceName">cp-icon</string>
</object>
<int key="NSAlign">0</int>
<int key="NSScale">1</int>
@@ -85,6 +87,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{20, 64}, {128, 23}}</string>
<reference key="NSSuperview" ref="760619837"/>
+ <reference key="NSNextKeyView" ref="639283509"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="766504976">
<int key="NSCellFlags">67239424</int>
@@ -142,7 +145,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSView" id="737362111">
<reference key="NSNextResponder" ref="889513965"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="WebView" id="10484531">
<reference key="NSNextResponder" ref="737362111"/>
@@ -164,7 +167,7 @@
<string>public.url</string>
<string>public.url-name</string>
</set>
- <string key="NSFrame">{{16, 11}, {347, 179}}</string>
+ <string key="NSFrame">{{16, 12}, {347, 179}}</string>
<reference key="NSSuperview" ref="737362111"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
@@ -172,16 +175,9 @@
<object class="WebPreferences" key="Preferences">
<string key="Identifier"/>
<dictionary class="NSMutableDictionary" key="Values">
- <boolean value="YES" key="WebKitAllowAnimatedImageLoopingPreferenceKey"/>
- <boolean value="YES" key="WebKitAllowAnimatedImagesPreferenceKey"/>
- <integer value="13" key="WebKitDefaultFixedFontSize"/>
- <integer value="16" key="WebKitDefaultFontSize"/>
- <boolean value="YES" key="WebKitDisplayImagesKey"/>
- <boolean value="NO" key="WebKitJavaEnabled"/>
- <boolean value="NO" key="WebKitJavaScriptCanOpenWindowsAutomatically"/>
- <boolean value="NO" key="WebKitJavaScriptEnabled"/>
+ <integer value="12" key="WebKitDefaultFixedFontSize"/>
+ <integer value="12" key="WebKitDefaultFontSize"/>
<integer value="1" key="WebKitMinimumFontSize"/>
- <boolean value="NO" key="WebKitPluginsEnabled"/>
</dictionary>
</object>
<bool key="UseBackForwardList">NO</bool>
@@ -190,10 +186,12 @@
</array>
<string key="NSFrame">{{3, 3}, {379, 201}}</string>
<reference key="NSSuperview" ref="889513965"/>
+ <reference key="NSNextKeyView" ref="10484531"/>
</object>
</array>
<string key="NSFrame">{{167, 16}, {385, 207}}</string>
<reference key="NSSuperview" ref="760619837"/>
+ <reference key="NSNextKeyView" ref="737362111"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -223,33 +221,17 @@
<int key="NSBoxType">1</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
- </object>
- <object class="NSTextField" id="365718074">
- <reference key="NSNextResponder" ref="760619837"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 20}, {134, 11}}</string>
- <reference key="NSSuperview" ref="760619837"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="617648981">
- <int key="NSCellFlags">69336641</int>
- <int key="NSCellFlags2">138414080</int>
- <string key="NSContents">git: 000000000</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">9</double>
- <int key="NSfFlags">3614</int>
- </object>
- <reference key="NSControlView" ref="365718074"/>
- <reference key="NSBackgroundColor" ref="1029549355"/>
- <reference key="NSTextColor" ref="448117089"/>
- </object>
+ <real value="0.0" key="NSBorderWidth2"/>
</object>
</array>
- <string key="NSFrame">{{1, 1}, {569, 243}}</string>
+ <string key="NSFrameSize">{569, 243}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSNextKeyView" ref="996622039"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{567, 246}</string>
- <string key="NSMaxSize">{1e+13, 1e+13}</string>
+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+ <bool key="NSWindowIsRestorable">YES</bool>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -278,26 +260,6 @@
</object>
<int key="connectionID">17</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">displayPatternValue1: gitCommit</string>
- <reference key="source" ref="365718074"/>
- <reference key="destination" ref="652402232"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="365718074"/>
- <reference key="NSDestination" ref="652402232"/>
- <string key="NSLabel">displayPatternValue1: gitCommit</string>
- <string key="NSBinding">displayPatternValue1</string>
- <string key="NSKeyPath">gitCommit</string>
- <object class="NSDictionary" key="NSOptions">
- <string key="NS.key.0">NSDisplayPattern</string>
- <string key="NS.object.0">git: %{value1}@</string>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">20</int>
- </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -336,7 +298,6 @@
<reference ref="1058672371"/>
<reference ref="639283509"/>
<reference ref="889513965"/>
- <reference ref="365718074"/>
</array>
<reference key="parent" ref="729589211"/>
</object>
@@ -373,14 +334,6 @@
<reference key="parent" ref="760619837"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="365718074"/>
- <array class="NSMutableArray" key="children">
- <reference ref="617648981"/>
- </array>
- <reference key="parent" ref="760619837"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">22</int>
<reference key="object" ref="813201744"/>
<reference key="parent" ref="996622039"/>
@@ -396,11 +349,6 @@
<reference key="parent" ref="639283509"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="617648981"/>
- <reference key="parent" ref="365718074"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="97062027"/>
<reference key="parent" ref="0"/>
@@ -416,22 +364,19 @@
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="10.ImportedFromIB2"/>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="14.ImportedFromIB2"/>
<string key="16.IBPluginDependency">com.apple.WebKitIBPlugin</string>
- <boolean value="YES" key="16.ImportedFromIB2"/>
- <string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="18.ImportedFromIB2"/>
+ <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="YES" key="5.IBNSWindowAutoPositionCentersHorizontal"/>
+ <boolean value="NO" key="5.IBNSWindowAutoPositionCentersVertical"/>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="5.ImportedFromIB2"/>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="6.ImportedFromIB2"/>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="8.ImportedFromIB2"/>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="9.ImportedFromIB2"/>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
@@ -449,8 +394,8 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <string key="NS.key.0">marcopolo</string>
- <string key="NS.object.0">{128, 128}</string>
+ <string key="NS.key.0">cp-icon</string>
+ <string key="NS.object.0">{256, 256}</string>
</object>
</data>
</archive>
View
BIN  Resources/AboutPanel.nib/keyedobjects.nib
Binary file not shown
View
20 Resources/dsa_pub.pem
@@ -0,0 +1,20 @@
+-----BEGIN PUBLIC KEY-----
+MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQCPrf9rLMvBueon0nusrVnfU+Xx+JiK
+xGJU8G3rSFoytKSZ1i9B95Lutd0YFMRUCIlBiPGAsdhQRyo8ih/lZH9mgSqPN0Ji
+XXjhi0CWKRSq/FLSy3qpAz6ajce9g6JOhImJQ7LXYNHWLIH6FDlHkPMqpQCXk6rV
+Cl+LzfpKncfXGhvOKy5g2A6SDRhnKghhV2BYKOiR6eiLvffROx2L4mYYHc7T37o8
+awl7Oedwq0HnBj2HZjp++7QZJs90vjmxAO5b1pirVwST5mmjfv8gnsoPzYkQb6TJ
+DluAdtrsnVDzfBIBavoYBLMu+nCA0+msIowqDnNRj/qRZMLNs7zU5nUVAhUA4Kv9
+Ma1+1l2/ZhYNI60gypjn56sCggEATTQV4kPt1yN1xwkN8iG/dnkbs+VdOjI1h8r2
+4J/5vUhfPh8wukRQVBm6oWQueEu003mUhBx8sIinh9CmxZ0nrI+4X6FeGgPRj9Ae
+pilcXqLOWMTaFHMjVQSmOf8pUTrK30hLeJgLChv9F6DuDl1SCP79URWu7phgeTyj
+MLHFhxgohOofcZmSDnkZORDf/R5eOH4QJjbwLQVbYLdHQ8zncp0z5ZiED4L1OSVm
+bUtX2nZTUgE+3ylaCpCV/YSTZ0KzANv4ABQYWrlHg/c/5Fx+ARlvSkn/S3FalMwV
+5vhbnJGcOE8ZI4t72DI4DYhd/Wx8TeBJuhRm5i4HpsqKbB1oeAOCAQUAAoIBACdW
+57e/2n+LZM/v5kwwZo8w10qI8eDyfyf3jrX+h/vJDVCTk9EyD6V4DZb3ykz53CK/
+/XoJBzvvxv8LgrMTiNoe8avFLaC3gLjS0kr5gApAcsx2Kx5B5qPyNaeGz3feiOaI
+Jpl+uYCSIz/JtuQakODr7xb4+/8QY5T5IbpYh6UKwtLaEC+VSOdrr4wvqNcuH7zk
+8gwEXBpitLYOeIPDDMEo+a0YFo/+kduVrwlj/J3NVJ2e52/JaIpoUajFn6KYNsjl
+5ek4j11amozBqMGe6ZRKL0uhAs6CEHYQ0xZToROrRu1D2KmoDm5qsCa9lqBfEoGr
+ImtOdlc/OKtbaGbMUh8=
+-----END PUBLIC KEY-----
View
57 Resources/oui.txt
@@ -676,7 +676,7 @@
00-02-A2 Hilscher GmbH
00-02-A3 ABB Switzerland Ltd, Power Systems
00-02-A4 AddPac Technology Co., Ltd.
-00-02-A5 Hewlett Packard
+00-02-A5 Hewlett-Packard Company
00-02-A6 Effinet Systems Co., Ltd.
00-02-A7 Vivace Networks
00-02-A8 Air Link Technology
@@ -2095,6 +2095,7 @@
00-08-2D Indus Teqsite Private Limited
00-08-2E Multitone Electronics PLC
00-08-2F Cisco Systems
+00-08-30 Cisco Systems
00-08-4E DivergeNet, Inc.
00-08-4F Qualstar Corporation
00-08-50 Arizona Instrument Corp.
@@ -2216,7 +2217,7 @@
00-08-C4 Hikari Co.,Ltd.
00-08-C5 Liontech Co., Ltd.
00-08-C6 Philips Consumer Communications
-00-08-C7 Hewlett Packard
+00-08-C7 Hewlett-Packard Company
00-08-C8 Soneticom, Inc.
00-08-C9 TechniSat Digital GmbH
00-08-CA TwinHan Technology Co.,Ltd
@@ -4235,7 +4236,7 @@
00-10-A8 RELIANCE COMPUTER CORP.
00-10-A9 ADHOC TECHNOLOGIES
00-10-AA MEDIA4, INC.
-00-10-AB KOITO INDUSTRIES, LTD.
+00-10-AB KOITO ELECTRIC INDUSTRIES, LTD.
00-10-AC IMCI TECHNOLOGIES
00-10-AD SOFTRONICS USB, INC.
00-10-AE SHINKO ELECTRIC INDUSTRIES CO.
@@ -4291,7 +4292,7 @@
00-10-E0 Oracle Corporation
00-10-E1 S.I. TECH, INC.
00-10-E2 ArrayComm, Inc.
-00-10-E3 Hewlett Packard
+00-10-E3 Hewlett-Packard Company
00-10-E4 NSI CORPORATION
00-10-E5 SOLECTRON TEXAS
00-10-E6 APPLIED INTELLIGENT SYSTEMS, INC.
@@ -9690,7 +9691,7 @@
00-25-FE Pilot Electronics Corporation
00-25-FF CreNova Technology GmbH
00-26-00 TEAC Australia Pty Ltd.
-00-26-01 PRIVATE
+00-26-01 Cutera Inc
00-26-02 SMART Temps LLC
00-26-03 Shenzhen Wistar Technology Co., Ltd
00-26-04 Audio Processing Technology Ltd
@@ -10634,7 +10635,7 @@
00-50-87 TERASAKI ELECTRIC CO., LTD.
00-50-88 AMANO CORPORATION
00-50-89 SAFETY MANAGEMENT SYSTEMS
-00-50-8B Hewlett Packard
+00-50-8B Hewlett-Packard Company
00-50-8C RSI SYSTEMS
00-50-8D ABIT COMPUTER CORPORATION
00-50-8E OPTIMATION, INC.
@@ -12861,6 +12862,7 @@
08-F2-F4 Net One Partners Co.,Ltd.
08-F6-F8 GET Engineering
08-FA-E0 Fohhn Audio AG
+08-FC-52 OpenXS BV
0C-15-C5 SDTEC Co., Ltd.
0C-17-F1 TELECSYS
0C-1D-C2 SeAH Networks
@@ -12999,6 +13001,7 @@
18-46-17 Samsung Electronics
18-4E-94 MESSOA TECHNOLOGIES INC.
18-66-E3 Veros Systems, Inc.
+18-7C-81 Valeo Vision Systems
18-80-CE Barberry Solutions Ltd
18-80-F5 Alcatel-Lucent Shanghai Bell Co., Ltd
18-86-AC Nokia Danmark A/S
@@ -13074,6 +13077,7 @@
20-4E-7F NETGEAR
20-59-A0 Paragon Technologies Inc.
20-5B-2A PRIVATE
+20-5B-5E Shenzhen Wonhe Technology Co., Ltd
20-6A-8A Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd.
20-6A-FF Atlas Elektronik UK Limited
20-6F-EC Braemac CA LLC
@@ -13085,6 +13089,7 @@
20-B3-99 Enterasys
20-B7-C0 Omicron electronics GmbH
20-BF-DB DVL
+20-C8-B3 SHENZHEN BUL-TECH CO.,LTD.
20-CF-30 ASUSTek COMPUTER INC.
20-D5-AB Korea Infocom Co.,Ltd.
20-D6-07 Nokia Corporation
@@ -13099,6 +13104,7 @@
24-1A-8C Squarehead Technology AS
24-1F-2C Calsys, Inc.
24-21-AB Sony Ericsson Mobile Communications
+24-37-EF EMC Electronic Media Communication SA
24-3C-20 Dynamode Group
24-45-97 GEMUE Gebr. Mueller Apparatebau
24-47-0E PentronicAB
@@ -13153,6 +13159,8 @@
28-89-15 CashGuard Sverige AB
28-93-FE Cisco Systems
28-A5-74 Miller Electric Mfg. Co.
+28-AF-0A Sirius XM Radio Inc
+28-B0-CC Xenya d.o.o.
28-C0-DA Juniper Networks
28-C7-18 Altierre
28-CC-FF Corporacion Empresarial Altra SL
@@ -13197,6 +13205,7 @@
2C-D1-DA Sanjole, Inc.
2C-D2-E7 Nokia Corporation
2C-DD-0C Discovergy GmbH
+2C-F4-C5 Avaya Inc
30-0B-9C Delta Mobile Systems, Inc.
30-14-2D Piciorgros GmbH
30-17-C8 Sony Ericsson Mobile Communications AB
@@ -13214,11 +13223,13 @@
30-4C-7E Panasonic Electric Works Automation Controls Techno Co.,Ltd.
30-4E-C3 Tianjin Techua Technology Co., Ltd.
30-52-5A NST Co., LTD
+30-57-AC IRLAB LTD.
30-61-18 Paradom Inc.
30-68-8C Reach Technology Inc.
30-69-4B RIM
30-71-B2 Hangzhou Prevail Optoelectronic Equipment Co.,LTD.
30-7C-30 RIM
+30-7E-CB SFR
30-87-30 Huawei Device Co., Ltd
30-8C-FB Dropcam
30-DE-86 Cedac Software S.r.l.
@@ -13425,6 +13436,7 @@
44-D6-3D Talari Networks
44-D8-32 Azurewave Technologies, Inc.
44-DC-CB SEMINDIA SYSTEMS PVT LTD
+44-E0-8E Cisco SPVTG
44-E4-9A OMNITRONICS PTY LTD
44-E4-D9 Cisco Systems
44-ED-57 Longicorn, inc.
@@ -13473,6 +13485,7 @@
4C-54-99 Huawei Device Co., Ltd
4C-55-85 Hamilton Systems
4C-5D-CD Oy Finnish Electric Vehicle Technologies Ltd
+4C-5F-D2 Alcatel-Lucent
4C-60-D5 airPointe of New Hampshire
4C-63-EB Application Solutions (Electronics and Vision) Ltd
4C-73-67 Genius Bytes Software Solutions GmbH
@@ -13622,6 +13635,7 @@
5C-BD-9E HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED
5C-CA-32 Theben AG
5C-D1-35 Xtreme Power Systems
+5C-D4-AB Zektor
5C-D9-98 D-Link Corporation
5C-DA-D4 Murata Manufacturing Co., Ltd.
5C-E2-23 Delphin Technology AG
@@ -13656,6 +13670,7 @@
60-C9-80 Trymus
60-D0-A9 Samsung Electronics Co.,Ltd
60-D3-0A Quatius Limited
+60-D8-19 Hon Hai Precision Ind. Co.,Ltd.
60-DA-23 Estech Co.,Ltd
60-EB-69 Quanta computer Inc.
60-F1-3D JABLOCOM s.r.o.
@@ -13751,6 +13766,7 @@
68-EB-AE Samsung Electronics Co.,Ltd
68-EB-C5 Angstrem Telecom
68-EF-BD Cisco Systems
+68-F1-25 Data Controls Inc.
68-F8-95 Redflow Limited
6C-04-60 RBH Access Technologies Inc.
6C-0E-0D Sony Ericsson Mobile Communications AB
@@ -13904,6 +13920,7 @@
78-99-8F MEDILINE ITALIA SRL
78-A0-51 iiNet Labs Pty Ltd
78-A2-A0 Nintendo Co., Ltd.
+78-A5-DD Shenzhen Smarteye Digital Electronics Co., Ltd
78-A6-83 Precidata
78-A6-BD DAEYEON Control&Instrument Co,.Ltd
78-A7-14 Amphenol
@@ -14116,6 +14133,7 @@
8C-F9-C9 MESADA Technology Co.,Ltd.
90-00-4E Hon Hai Precision Ind. Co.,Ltd.
90-01-3B SAGEMCOM
+90-02-A9 ZHEJIANG DAHUA TECHNOLOGY CO.,LTD
90-09-17 Far-sighted mobile
90-0D-66 Digimore Electronics Co., Ltd
90-18-AE Shanghai Meridian Technologies, Co. Ltd.
@@ -14147,6 +14165,7 @@
90-90-60 RSI VIDEO TECHNOLOGIES
90-A2-DA GHEO SA
90-A4-DE Wistron Neweb Corp.
+90-A7-83 JSW Pacific China Co,.Ltd
90-A7-C1 Pakedge Device and Software Inc.
90-B8-D0 Joyent, Inc.
90-B9-7D Johnson Outdoors Marine Electronics d/b/a Minnkota
@@ -14168,10 +14187,12 @@
94-20-53 Nokia Corporation
94-23-6E Shenzhen Junlan Electronic Ltd
94-2E-63 Fins�cur
+94-31-9B Alphatronics BV
94-33-DD Taco Electronic Solutions, Inc.
94-39-E5 Hon Hai Precision Ind. Co.,Ltd.
94-44-52 Belkin International, Inc.
94-46-96 BaudTec Corporation
+94-51-03 Samsung Electronics
94-59-2D EKE Building Technology Systems Ltd
94-5B-7E TRILOBIT LTDA.
94-63-D1 Samsung Electronics Co.,Ltd
@@ -14191,6 +14212,7 @@
94-C7-AF Raylios Technology
94-CD-AC Creowave Oy
94-D0-19 Cydle Corp.
+94-D7-23 Shanghai DareGlobal Technologies Co., Ltd
94-D9-3C ENELPS
94-DD-3F A+V Link Technologies, Corp.
94-DE-0E SmartOptics AS
@@ -14272,6 +14294,7 @@
9C-FF-BE OTSL Inc.
A0-07-98 Samsung Electronics
A0-0B-BA SAMSUNG ELECTRO-MECHANICS
+A0-0C-A1 SKTB "SKiT"
A0-13-3B Copyright � HiTi Digital, Inc.
A0-16-5C TangoTec Ltd.
A0-18-59 Shenzhen Yidashi Electronics Co Ltd
@@ -14313,6 +14336,7 @@ A0-DE-05 JSC "Irbis-T"
A0-E2-95 DAT System Co.,Ltd
A0-E9-DB Ningbo FreeWings Technologies Co.,Ltd
A0-F2-17 GE Medical System(China) Co., Ltd.
+A4-01-30 ABIsystems Co., LTD
A4-0C-C3 Cisco Systems
A4-13-4E Luxul Wireless
A4-1B-C0 Fastec Imaging Corporation
@@ -14432,6 +14456,7 @@ AC-C9-35 Ness Corporation
AC-CA-54 Telldus Technologies AB
AC-CA-BA Midokura Co., Ltd.
AC-CB-09 Hefcom Metering (Pty) Ltd
+AC-CC-8E Axis Communications AB
AC-CE-8F HWA YAO TECHNOLOGIES CO., LTD
AC-D1-80 Crexendo Business Solutions, Inc.
AC-DE-48 PRIVATE
@@ -14568,6 +14593,7 @@ BC-67-84 Environics Oy
BC-6A-16 tdvine
BC-6E-76 Green Energy Options Ltd
BC-71-C1 XTrillion, Inc.
+BC-76-4E Rackspace US, Inc.
BC-76-70 Huawei Device Co., Ltd
BC-77-37 Intel Corporate
BC-77-9F SBM Co., Ltd.
@@ -14648,6 +14674,7 @@ C4-CA-D9 Hangzhou H3C Technologies Co., Limited
C4-CD-45 Beijing Boomsense Technology CO.,LTD.
C4-D4-89 JiangSu Joyque Information Industry Co.,Ltd
C4-E1-7C U2S co.
+C4-EE-AE VSS Monitoring
C4-EE-F5 Oclaro, Inc.
C4-F4-64 Spica international
C4-FC-E4 DishTV NZ Ltd
@@ -14685,6 +14712,7 @@ C8-A1-B6 Shenzhen Longway Technologies Co., Ltd
C8-A1-BA Neul Ltd
C8-A7-0A Verizon Business
C8-A7-29 SYStronics Co., Ltd.
+C8-AA-21 Motorola Mobility, Inc.
C8-AA-CC PRIVATE
C8-BC-C8 Apple
C8-C1-26 ZPM Industria e Comercio Ltda
@@ -14742,11 +14770,13 @@ CC-D8-11 Aiconn Technology Corporation
CC-D9-E9 SCR Engineers Ltd.
CC-E7-DF American Magnetics, Inc.
CC-EA-1C DCONWORKS
+CC-EF-48 Cisco Systems
CC-F3-A5 Chi Mei Communication Systems, Inc
CC-F6-7A Ayecka Communication Systems LTD
CC-F8-41 Lumewave
CC-F8-F0 Xi'an HISU Multimedia Technology Co.,Ltd.
CC-F9-54 Avaya, Inc
+CC-F9-E8 Samsung Electronics Co.,Ltd
CC-FC-6D RIZ TRANSMITTERS
CC-FC-B1 Wireless Technology, Inc.
D0-13-1E Sunrex Technology Corp
@@ -14756,6 +14786,7 @@ D0-1C-BB Beijing Ctimes Digital Technology Co., Ltd.
D0-27-88 Hon Hai Precision Ind.Co.Ltd
D0-31-10 Ingenic Semiconductor Co.,Ltd
D0-37-61 Texas Instruments
+D0-54-2D Cambridge Industries(Group) Co.,Ltd.
D0-57-4C Cisco Systems
D0-58-75 Active Control Technology Inc.
D0-59-C3 CeraMicro Technology Corporation
@@ -14824,6 +14855,7 @@ D4-9E-6D Wuhan Zhongyuan Huadian Science & Technology Co.,
D4-A4-25 SMAX Technology Co., Ltd.
D4-A9-28 GreenWave Reality Inc
D4-AA-FF MICRO WORLD
+D4-BE-D9 Dell Inc
D4-C1-FC Nokia Corporation
D4-C7-66 Acentic GmbH
D4-CB-AF Nokia Corporation
@@ -14838,6 +14870,7 @@ D4-F1-43 IPROAD.,Inc
D4-F6-3F IEA S.R.L.
D8-1B-FE TWINLINX CORPORATION
D8-1C-14 Compacta International, Ltd.
+D8-26-B9 Guangdong Coagent Electronics S &T Co., Ltd.
D8-28-C9 General Electric Consumer and Industrial
D8-29-86 Best Wish Technology LTD
D8-2A-7E Nokia Corporation
@@ -14875,10 +14908,12 @@ D8-FE-8F IDFone Co., Ltd.
DC-02-65 Meditech Kft
DC-05-ED Nabtesco
DC-07-C1 HangZhou QiYang Technology Co.,Ltd.
+DC-0B-1A ADB Broadband SpA
DC-0E-A1 COMPAL INFORMATION (KUNSHAN) CO., LTD
DC-16-A2 Medtronic Diabetes
DC-17-5A Hitachi High-Technologies Corporation
DC-1D-9F U & B tech
+DC-1E-A3 Accensus LLC
DC-20-08 ASD Electronics Ltd
DC-2B-61 Apple
DC-2B-66 Infoblock
@@ -14931,6 +14966,7 @@ E0-8A-7E Exponent
E0-8F-EC REPOTEC CO., LTD.
E0-91-53 XAVi Technologies Corp.
E0-91-F5 NETGEAR
+E0-95-79 ORTHOsoft inc, d/b/a Zimmer CAS
E0-A1-D7 SFR
E0-A6-70 Nokia Corporation
E0-AB-FE Orb Networks, Inc.
@@ -14977,6 +15013,7 @@ E4-A5-EF TRON LINK ELECTRONICS CO., LTD.
E4-AB-46 UAB Selteka
E4-AD-7D SCL Elements
E4-CE-8F Apple Inc
+E4-D5-3D Hon Hai Precision Ind. Co.,Ltd.
E4-D7-1D Oraya Therapeutics
E4-DD-79 En-Vision America, Inc.
E4-E0-C5 Samsung Electronics Co., LTD
@@ -14995,12 +15032,13 @@ E8-39-DF Askey Computer
E8-3A-97 OCZ Technology Group
E8-3E-B6 RIM
E8-40-40 Cisco Systems
-E8-4E-06 PRIVATE
+E8-4E-06 EDUP INTERNATIONAL (HK) CO., LTD
E8-4E-CE Nintendo Co., Ltd.
E8-5B-5B LG ELECTRONICS INC
E8-5E-53 Infratec Datentechnik GmbH
E8-6C-DA Supercomputers and Neurocomputers Research Center
E8-75-7F FIRS Technologies(Shenzhen) Co., Ltd
+E8-78-A1 BEOVIEW INTERCOM DOO
E8-7A-F3 S5 Tech S.r.l.
E8-94-4C Cogent Healthcare Systems Ltd
E8-99-5A PiiGAB, Processinformation i Goteborg AB
@@ -15058,6 +15096,7 @@ EC-D0-0E MiraeRecognition Co., Ltd.
EC-DE-3D Lamprey Networks, Inc.
EC-E0-9B Samsung electronics CO., LTD
EC-E5-55 Hirschmann Automation
+EC-E7-44 Omntec mfg. inc
EC-E9-0B SISTEMA SOLUCOES ELETRONICAS LTDA - EASYTECH
EC-E9-F8 Guang Zhou TRI-SUN Electronics Technology
EC-EA-03 DARFON LIGHTING CORP
@@ -15155,6 +15194,7 @@ F8-10-37 Atopia Systems, LP
F8-1D-93 Longdhua(Beijing) Controls Technology Co.,Ltd
F8-1E-DF Apple, Inc
F8-3D-FF Huawei Technologies Co., Ltd
+F8-46-2D SYNTEC Incorporation
F8-47-2D X2gen Digital Corp. Ltd
F8-52-DF VNL Europe AB
F8-66-F2 Cisco Systems
@@ -15176,6 +15216,7 @@ F8-C0-01 Juniper Networks
F8-C0-91 Highgates Technology
F8-C6-78 Carefusion
F8-D1-11 TP-LINK TECHNOLOGIES CO., LTD.
+F8-D3-A9 AXAN Networks
F8-D7-56 Simm Tronic Limited
F8-DA-E2 Beta LaserMike
F8-DA-F4 Taishan Online Technology Co., Ltd.
@@ -15185,7 +15226,7 @@ F8-E7-B5 uTech Engenharia e Automa�ao LTDA
F8-E9-68 Egker Kft.
F8-EA-0A Dipl.-Math. Michael Rauch
F8-F0-14 RackWare Inc.
-F8-F2-5A Geneva Lab Information Consulting (GZ) Co.,Ltd
+F8-F2-5A G-Lab GmbH
F8-FB-2F Santur Corporation
FC-00-12 Toshiba Samsung Storage Technolgoy Korea Corporation
FC-01-CD FUNDACION TEKNIKER
View
22 Resources/usb-vendors.txt
@@ -75,7 +75,6 @@
1302|Longwell Electronics/Longwell Company
1305|Star Micronics Co., LTD
1309|American Power Conversion
-1312|Taiwan Semiconductor Manufacturing Co.
1314|ACON, Advanced-Connectek, Inc.
1317|PLX Technology, Inc.
1321|Aladdin Knowledge Systems
@@ -187,10 +186,8 @@
2199|Lauterbach GmbH
2205|Icron Technologies Corporation
2233|RadioShack Corporation
-2235|Texas Instruments Japan
2247|TAI TWUN ENTERPRISE CO., LTD.
2276|Pioneer Corporation
-2278|Gemalto SA
2303|AuthenTec, Inc.
2310|FARADAY Technology Corp.
2313|Audio-Technica Corp.
@@ -216,7 +213,6 @@
2521|Jungo
2522|A-FOUR TECH CO., LTD.
2533|Jo-Dan International, Inc.
-2554|Mtek Vision
2578|Cambridge Silicon Radio Ltd.
2583|HOYA Corporation
2593|Physio-Control, Inc.
@@ -257,12 +253,12 @@
3141|Sonix Technology Co., Ltd.
3158|Billion Bright Limited
3161|Dong Guan Shinko Wire Co., Ltd.
+3170|Chant Sincere Co., Ltd
3176|Whanam Electronics Co., Ltd.
3190|Solid State System Co., Ltd.
3209|Honda Tsushin Kogyo Co., Ltd
3245|Motorola Solutions
3255|Singatron Enterprise Co. Ltd.
-3259|Shanghai Darong Electronics Co., Ltd.
3268|emsys Embedded Systems GmbH
3289|Shin Din Cable Ltd.
32902|Intel Corporation
@@ -540,8 +536,8 @@
7758|Etron Technology, Inc.
7789|WAN SHIH ELECTRONIC (H.K.) CO., LTD.
7795|COMLINK ELECTRONICS CO., LTD.
+7817|Vtion Information Technology (Fujian) Co., Ltd.
7843|Concraft Holding Co., Ltd.
-7846|novero GmbH
7863|WIN WIN PRECISION INDUSTRIAL CO., LTD.
7881|MOSER BAER INDIA LIMITED
7892|Transwitch (Israel) Ltd.
@@ -574,6 +570,7 @@
8341|CE LINK LIMITED
8342|Microconn Electronic Co., Ltd.
8367|Shenzhen CARVE Electronics Co., Ltd.
+8384|FENGHUA KINGSUN CO., LTD.
8386|Sumitomo Electric Ind., Ltd., Optical Comm. R&D Lab
8408|Changzhou Xinchao Technologies, Inc.
8432|Insight Technology Incorporated
@@ -588,7 +585,7 @@
8519|Chin-Ban Electronics (Hong Kong) Co.
8520|Visteon Sistemas Automotives Ltda.
8524|Y Soft Corporation
-8550|JVC KENWOOD Holdings, Inc.
+8550|JVC KENWOOD Corporation
8551|Zhejiang Fousine Science & Technology Co., Ltd.
8563|HUIZHOU HUANGJI PRECISIONS FLEX ELECTRONICAL CO., LTD.
8564|Transcend Information, Inc.
@@ -615,11 +612,7 @@
8957|Miltope Corp.
8959|Avnet
8979|Kunshan Jiahua Electronics Co., Ltd.
-8980|INQ Mobile Limited
8981|Avery Design Systems, Inc.
-8982|DongGuan Potec Electric Industrial Co., Ltd.
-8983|Huawei Device Co., Ltd.
-8998|CHAO KUEI MOLD INDUSTRIAL CO., LTD.
9008|Tensorcom
9009|PUZZLE LOGIC INC.
9028|HAMBURG INDUSTRIES CO., LTD.
@@ -683,9 +676,14 @@
9463|Seneye Ltd.
9481|Chain-In Electronic Co., Ltd.
9513|SUZHOU XINYA ELECTRIC COMMUNICATION CO., LTD.
-9514|SUZHOU KELI TECHNOLOGY DEVELOPMENT CO., LTD.
9515|TOP Exactitude Industry (ShenZhen) Co., Ltd.
9525|Shenzhen Hong Junde Precision Technology Co., Ltd.
9526|Ubisys Technology Co., Ltd.
9527|Norel Systems Ltd.
9560|INTECH ELECTRONICS CORP.
+9575|DongGuan LongTao Electronic Co., Ltd.
+9576|ALL LINK CONN. TECHNOLOGY CORP.
+9577|DongGuan City MingJi Electronics Co., Ltd.
+9588|AVer Information Inc.
+9589|Weida Hi-Tech Co., Ltd.
+9593|Dongguan Kowell Electronic Co., Ltd.
View
468 en.lproj/MainMenu.nib/designable.nib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
- <string key="IBDocument.SystemVersion">10K540</string>
- <string key="IBDocument.InterfaceBuilderVersion">1306</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <string key="IBDocument.SystemVersion">11A511</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1617</string>
+ <string key="IBDocument.AppKitVersion">1138</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">1306</string>
+ <string key="NS.object.0">1617</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -803,6 +803,7 @@
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
+ <int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
<string key="NSFrame">{{1, 17}, {435, 198}}</string>
@@ -852,12 +853,11 @@
<string key="NSFrame">{{20, 48}, {437, 216}}</string>
<reference key="NSSuperview" ref="273226987"/>
<reference key="NSNextKeyView" ref="916458113"/>
- <int key="NSsFlags">562</int>
+ <int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="439280017"/>
<reference key="NSHScroller" ref="729802760"/>
<reference key="NSContentView" ref="916458113"/>
<reference key="NSHeaderClipView" ref="217639070"/>
- <reference key="NSCornerView" ref="58361767"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
<object class="NSButton" id="829084382">
@@ -1123,6 +1123,7 @@
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
+ <int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
<string key="NSFrame">{{1, 17}, {456, 126}}</string>
@@ -1172,12 +1173,11 @@
<string key="NSFrame">{{20, 249}, {458, 144}}</string>
<reference key="NSSuperview" ref="742374488"/>
<reference key="NSNextKeyView" ref="572115010"/>
- <int key="NSsFlags">562</int>
+ <int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="861096710"/>
<reference key="NSHScroller" ref="955731289"/>
<reference key="NSContentView" ref="572115010"/>
<reference key="NSHeaderClipView" ref="1069107717"/>
- <reference key="NSCornerView" ref="711044735"/>
<bytes key="NSScrollAmts">AAAAAAAAAABBmAAAQZgAAA</bytes>
</object>
<object class="NSButton" id="780915981">
@@ -1617,6 +1617,7 @@ d28gbGluZXMsIC4uLioKKmJ1dCBpdCBtYXkgc3BhbiB0aHJlZS4qA</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
+ <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{243, 167}</string>
<object class="NSView" key="NSWindowView" id="286985523">
<nil key="NSNextResponder"/>
@@ -1625,7 +1626,8 @@ d28gbGluZXMsIC4uLioKKmJ1dCBpdCBtYXkgc3BhbiB0aHJlZS4qA</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{243, 189}</string>
- <string key="NSMaxSize">{1e+13, 1e+13}</string>
+ <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+ <bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSMenu" id="383987829">
<string key="NSTitle">Menu</string>
@@ -1694,7 +1696,7 @@ d28gbGluZXMsIC4uLioKKmJ1dCBpdCBtYXkgc3BhbiB0aHJlZS4qA</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="576237743">
<reference key="NSNextResponder" ref="734846967"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="377814272">
@@ -1834,7 +1836,7 @@ d28gbGluZXMsIC4uLioKKmJ1dCBpdCBtYXkgc3BhbiB0aHJlZS4qA</string>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">2913</int>
+ <int key="NSFlags">67111777</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="326007814"/>
@@ -1879,9 +1881,11 @@ d28gbGluZXMsIC4uLioKKmJ1dCBpdCBtYXkgc3BhbiB0aHJlZS4qA</string>
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
+ <nil key="NSTextFinder"/>
+ <int key="NSPreferredTextFinderStyle">0</int>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{423, 1e+07}</string>
+ <string key="NSMaxSize">{423, 10000000}</string>
<string key="NSMinize">{114, 0}</string>
<nil key="NSDelegate"/>
</object>
@@ -1892,8 +1896,30 @@ d28gbGluZXMsIC4uLioKKmJ1dCBpdCBtYXkgc3BhbiB0aHJlZS4qA</string>
<reference key="NSDocView" ref="220548516"/>
<reference key="NSBGColor" ref="326007814"/>
<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>