Skip to content

Commit

Permalink
Update Manual
Browse files Browse the repository at this point in the history
  • Loading branch information
microtherion committed May 8, 2016
1 parent 630e45e commit b9bfe43
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 5 deletions.
Binary file modified Documentation/Help.key
Binary file not shown.
Binary file modified Documentation/Help.pdf
Binary file not shown.
Binary file added Documentation/Screenshots/Datasheet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/Screenshots/Organize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Screenshots/Part.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Screenshots/Partlist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Screenshots/Preferences.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Documentation/Screenshots/Search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions Octarine/Base.lproj/MainMenu.xib
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="New" id="8y3-XF-Mp5">
<items>
<menuItem title="Custom Part" keyEquivalent="N" id="u6K-8h-5Ls"/>
<menuItem title="Custom Part" keyEquivalent="N" id="u6K-8h-5Ls">
<connections>
<action selector="beginPartSheet:" target="pLF-ZX-5Ys" id="wqv-VO-plc"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="63N-o9-nZw"/>
<menuItem title="Group" tag="1" keyEquivalent="n" id="HD6-uQ-vYF">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
Expand Down Expand Up @@ -1040,7 +1044,7 @@ CA
<subviews>
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="s0k-83-QQf">
<rect key="frame" x="-4" y="-2" width="29" height="26"/>
<buttonCell key="cell" type="disclosure" bezelStyle="roundedDisclosure" image="EB622159-0598-4980-B488-44215A068547" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ljf-uA-tJW">
<buttonCell key="cell" type="disclosure" bezelStyle="roundedDisclosure" image="32C3C3C8-0CA3-4EB6-AA06-F40361D0A010" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ljf-uA-tJW">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down Expand Up @@ -1493,7 +1497,7 @@ DQ
</window>
</objects>
<resources>
<image name="EB622159-0598-4980-B488-44215A068547" width="1" height="1">
<image name="32C3C3C8-0CA3-4EB6-AA06-F40361D0A010" width="1" height="1">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
Expand Down
5 changes: 4 additions & 1 deletion Octarine/Help.xib
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@
<string key="keyEquivalent"></string>
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</buttonCell>
<connections>
<action selector="goToNextPage:" target="jG0-A1-dve" id="aJC-68-ElI"/>
</connections>
</button>
<button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z2f-6n-Uzv">
<button translatesAutoresizingMaskIntoConstraints="NO" id="z2f-6n-Uzv">
<rect key="frame" x="10" y="634" width="32" height="31"/>
<constraints>
<constraint firstAttribute="width" secondItem="z2f-6n-Uzv" secondAttribute="height" multiplier="1:1" id="QMK-sc-cf4"/>
Expand Down
5 changes: 4 additions & 1 deletion Octarine/OctSheets.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,12 @@ class OctSheets : NSObject, NSOutlineViewDataSource, NSSearchFieldDelegate, NSSh
dynamic var hideSelectionMenu : Bool = true
dynamic var dataSheets = [String]() { didSet { loadDataSheets() } }
dynamic var dataSheetDocs = [PDFDocument]()
dynamic var dataSheetURLs = [NSURL]()

var dataSheetTasks = [NSURLSessionTask]()
func loadDataSheets() {
dataSheetDocs = []
dataSheetURLs = []
dataSheetSelection = 0
hideSelectionMenu = true
for sheet in dataSheets {
Expand All @@ -96,6 +98,7 @@ class OctSheets : NSObject, NSOutlineViewDataSource, NSSearchFieldDelegate, NSSh
doc.establishTitle(url)
dispatch_async(dispatch_get_main_queue()) {
self.dataSheetDocs.append(doc)
self.dataSheetURLs.append(url)
self.hideSelectionMenu = self.dataSheetDocs.count < 2
self.dataSheetTasks = self.dataSheetTasks.filter({ $0 != task })
if self.dataSheetTasks.count == 0 {
Expand Down Expand Up @@ -290,7 +293,7 @@ class OctSheets : NSObject, NSOutlineViewDataSource, NSSearchFieldDelegate, NSSh
@IBAction func sheetShareMenu(_: AnyObject) {
var items = [AnyObject]()
if let doc = sheetView.document() {
let docURL = dataSheetDocs[dataSheetSelection].documentURL()
let docURL = dataSheetURLs[dataSheetSelection]
let tempURL = OctTemp.url.URLByAppendingPathComponent(docURL.lastPathComponent!)
doc.dataRepresentation().writeToURL(tempURL, atomically: true)
items.append(docURL)
Expand Down

0 comments on commit b9bfe43

Please sign in to comment.