Release 1.0.1

PrinceMei · Jan 7, 2017 · 24b0d55 · 24b0d55
1 parent 4c57e9a
commit 24b0d55
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 58 deletions.
diff --git a/Fluor.xcodeproj/project.pbxproj b/Fluor.xcodeproj/project.pbxproj
@@ -175,12 +175,11 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = Pyrolyse;
 				TargetAttributes = {
 					3FCD16A01D79793600C57B22 = {
 						CreatedOnToolsVersion = 8.0;
-						DevelopmentTeam = Q2E884V952;
 						LastSwiftMigration = 0800;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
@@ -295,6 +294,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -344,6 +344,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -374,7 +375,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = Q2E884V952;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Fluor/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.pyrolyse.Fluor;
@@ -392,7 +393,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = Q2E884V952;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Fluor/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.pyrolyse.Fluor;

diff --git a/Fluor/AboutWindowController.swift b/Fluor/AboutWindowController.swift
@@ -17,7 +17,7 @@ class AboutWindowController: NSWindowController {
         window?.styleMask.formUnion(.fullSizeContentView)
         window?.titleVisibility = .hidden
         window?.titlebarAppearsTransparent = true
-        window?.setFrameAutosaveName("AboutWindowAutosaveName")
+        window?.setFrameAutosaveName("Fluor_AboutWindowAutosaveName")
 
         let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
         let build = Bundle.main.infoDictionary?[kCFBundleVersionKey as String] as! String

diff --git a/Fluor/Base.lproj/AboutWindowController.xib b/Fluor/Base.lproj/AboutWindowController.xib
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11198.2" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11198.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
         <capability name="box content view" minToolsVersion="7.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
@@ -18,7 +19,7 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <rect key="contentRect" x="196" y="240" width="513" height="236"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
             <view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="513" height="236"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -57,8 +58,8 @@
                                             </textFieldCell>
                                         </textField>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ph2-GS-RQB">
-                                            <rect key="frame" x="-2" y="0.0" width="127" height="11"/>
-                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Copyright (c) Pyrolyse 2016" id="wgD-d7-yIk">
+                                            <rect key="frame" x="-2" y="0.0" width="153" height="11"/>
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Copyright (c) Pyrolyse 2016-2017" id="wgD-d7-yIk">
                                                 <font key="font" metaFont="miniSystem"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

diff --git a/Fluor/Base.lproj/MainMenu.xib b/Fluor/Base.lproj/MainMenu.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A322" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
@@ -69,7 +70,7 @@
                     </connections>
                 </menuItem>
             </items>
-            <point key="canvasLocation" x="-70" y="-283"/>
+            <point key="canvasLocation" x="-139" y="-336"/>
         </menu>
         <customView id="u6O-d0-7Hq" customClass="StateView" customModule="Fluor" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="219" height="34"/>
@@ -115,7 +116,7 @@
             <connections>
                 <outlet property="stateSelector" destination="kdK-wj-mRZ" id="Egq-Rm-zuG"/>
             </connections>
-            <point key="canvasLocation" x="170" y="-420"/>
+            <point key="canvasLocation" x="170" y="-421"/>
         </customView>
         <customView id="o8r-mD-TI5" customClass="CurrentAppView" customModule="Fluor" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="245" height="80"/>
@@ -188,7 +189,7 @@
                 <outlet property="appNameLabel" destination="gmQ-wu-N8N" id="xKJ-Xc-RRC"/>
                 <outlet property="behaviorSegment" destination="gls-pL-7qN" id="RlX-aP-rPf"/>
             </connections>
-            <point key="canvasLocation" x="183" y="-321"/>
+            <point key="canvasLocation" x="183" y="-275"/>
         </customView>
     </objects>
     <resources>

diff --git a/Fluor/Base.lproj/PreferencesWindowController.xib b/Fluor/Base.lproj/PreferencesWindowController.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16A322" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="PreferencesWindowController" customModule="Fluor" customModuleProvider="target">
@@ -13,7 +14,7 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="NSPanel">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <rect key="contentRect" x="196" y="240" width="261" height="135"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
             <view key="contentView" wantsLayer="YES" id="se5-gp-TjO">

diff --git a/Fluor/Base.lproj/RulesEditorWindowController.xib b/Fluor/Base.lproj/RulesEditorWindowController.xib
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
         <capability name="system font weights other than Regular or Bold" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
@@ -17,9 +18,9 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Rules" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="NSPanel">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES" texturedBackground="YES"/>
             <rect key="contentRect" x="196" y="240" width="300" height="417"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
             <view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="300" height="417"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -191,9 +192,25 @@
                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="SE9-rL-q9S">
                         <rect key="frame" x="0.0" y="376" width="300" height="5"/>
                     </box>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qn5-zK-TAd">
+                        <rect key="frame" x="134" y="5" width="33" height="14"/>
+                        <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="SUM-sR-gjk">
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <binding destination="Cai-D8-Yrn" name="displayPatternValue1" keyPath="arrangedObjects.@count" id="EIA-kM-FBG">
+                                <dictionary key="options">
+                                    <string key="NSDisplayPattern">%{value1}@ rules</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </textField>
                 </subviews>
                 <constraints>
                     <constraint firstItem="V0G-K2-HLw" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="-1" id="5IN-Ap-uuK"/>
+                    <constraint firstItem="qn5-zK-TAd" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="AgD-Us-1gw"/>
                     <constraint firstItem="uDU-hq-ED5" firstAttribute="leading" secondItem="V0G-K2-HLw" secondAttribute="trailing" constant="-1" id="HaM-G8-5Kh"/>
                     <constraint firstAttribute="trailing" secondItem="SE9-rL-q9S" secondAttribute="trailing" id="IUC-Yv-gKR"/>
                     <constraint firstItem="SdN-eh-ayo" firstAttribute="top" secondItem="g4X-A8-IfS" secondAttribute="bottom" id="ImC-FJ-TLC"/>
@@ -202,6 +219,7 @@
                     <constraint firstItem="g4X-A8-IfS" firstAttribute="top" secondItem="SE9-rL-q9S" secondAttribute="bottom" id="Ncc-fq-46w"/>
                     <constraint firstItem="C9t-2H-PLG" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="20" id="OVW-eE-zxI"/>
                     <constraint firstAttribute="trailing" secondItem="SdN-eh-ayo" secondAttribute="trailing" id="cTf-i5-i7f"/>
+                    <constraint firstItem="qn5-zK-TAd" firstAttribute="centerY" secondItem="uDU-hq-ED5" secondAttribute="centerY" id="dNp-Pz-qmo"/>
                     <constraint firstAttribute="trailing" secondItem="g4X-A8-IfS" secondAttribute="trailing" id="fIF-gH-seG"/>
                     <constraint firstItem="uDU-hq-ED5" firstAttribute="width" secondItem="V0G-K2-HLw" secondAttribute="width" id="jaa-hF-Gwu"/>
                     <constraint firstItem="uDU-hq-ED5" firstAttribute="top" secondItem="SdN-eh-ayo" secondAttribute="bottom" constant="-1" id="loP-nY-HS8"/>