Skip to content

Commit

Permalink
[IMP] Some texts
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pyroh
Pyroh committed May 6, 2020
1 parent 7fac0ca commit ac8c077
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 53 deletions.
22 changes: 8 additions & 14 deletions Fluor/Base.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
<segmentedCell key="cell" borderStyle="border" focusRingType="none" alignment="left" style="roundRect" trackingMode="selectOne" id="qZf-Wa-JJt">
<font key="font" metaFont="label" size="12"/>
<segments>
<segment toolTip="Change mode relative to the active application" image="AppSwitch" imageScaling="proportionallyUpOrDown" selected="YES">
<segment toolTip="Change mode with the active application" image="AppSwitch" imageScaling="proportionallyUpOrDown" selected="YES">
<nil key="label"/>
</segment>
<segment toolTip="Change mode for the active application when the fn key is pressed" image="MixedSwitch" imageScaling="proportionallyUpOrDown" tag="1">
<segment toolTip="Set mode for the active application when the fn key is pressed" image="MixedSwitch" imageScaling="proportionallyUpOrDown" tag="1">
<nil key="label"/>
</segment>
<segment toolTip="Change mode when the fn key is pressed" image="FnKey">
<segment toolTip="Set the default mode when the fn key is pressed" image="FnKey">
<nil key="label"/>
</segment>
</segments>
Expand Down Expand Up @@ -216,8 +216,8 @@
<segmentedCell key="cell" borderStyle="border" alignment="left" style="roundRect" trackingMode="selectOne" id="Vfh-zJ-Axi">
<font key="font" metaFont="label" size="12"/>
<segments>
<segment toolTip="Switch to Apple mode" image="AppleMode" imageScaling="proportionallyUpOrDown" selected="YES"/>
<segment toolTip="Switch to function key mode" image="OtherMode" imageScaling="proportionallyUpOrDown" tag="1"/>
<segment toolTip="Media key mode" image="AppleMode" imageScaling="proportionallyUpOrDown" selected="YES"/>
<segment toolTip="Function key mode" image="OtherMode" imageScaling="proportionallyUpOrDown" tag="1"/>
</segments>
</segmentedCell>
<connections>
Expand Down Expand Up @@ -290,15 +290,9 @@
<segmentedCell key="cell" borderStyle="border" alignment="left" style="roundRect" trackingMode="selectOne" id="1I5-bW-HGh">
<font key="font" metaFont="label" size="12"/>
<segments>
<segment toolTip="Same as default mode" image="DefaultMode" selected="YES">
<nil key="label"/>
</segment>
<segment toolTip="Switch to Apple mode" image="AppleMode" tag="1">
<nil key="label"/>
</segment>
<segment toolTip="Switch to Function mode" image="OtherMode">
<nil key="label"/>
</segment>
<segment toolTip="Same as default mode" image="DefaultMode" selected="YES"/>
<segment toolTip="Media key mode" image="AppleMode" tag="1"/>
<segment toolTip="Function key mode" image="OtherMode"/>
</segments>
</segmentedCell>
<connections>
Expand Down
16 changes: 8 additions & 8 deletions Fluor/Base.lproj/Preferences.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="aHs-kY-jFz">
<font key="font" metaFont="system"/>
<segments>
<segment image="AppleMode" width="32" selected="YES"/>
<segment image="OtherMode" width="32" tag="1"/>
<segment toolTip="Media key mode" image="AppleMode" width="32" selected="YES"/>
<segment toolTip="Function key mode" image="OtherMode" width="32" tag="1"/>
</segments>
</segmentedCell>
<connections>
Expand Down Expand Up @@ -138,8 +138,8 @@
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="J3t-x7-5C6">
<font key="font" metaFont="system"/>
<segments>
<segment image="AppleMode" width="32" selected="YES"/>
<segment image="OtherMode" width="32" tag="1"/>
<segment toolTip="Media key mode" image="AppleMode" width="32" selected="YES"/>
<segment toolTip="Function key mode" image="OtherMode" width="32" tag="1"/>
</segments>
</segmentedCell>
<connections>
Expand Down Expand Up @@ -456,7 +456,7 @@
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oN7-9d-NkH">
<rect key="frame" x="-2" y="4" width="79" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Last Checked:" id="TZA-yl-nGe">
<font key="font" metaFont="controlContent" size="11"/>
<font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
Expand All @@ -465,7 +465,7 @@
<rect key="frame" x="75" y="4" width="102" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Yesterday at 16:28" id="tQx-sm-17A">
<dateFormatter key="formatter" dateStyle="medium" timeStyle="short" doesRelativeDateFormatting="YES" id="DX2-WR-kjA"/>
<font key="font" metaFont="controlContent" size="11"/>
<font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
Expand Down Expand Up @@ -540,8 +540,8 @@
<scene sceneID="0q3-2b-oin">
<objects>
<viewController storyboardIdentifier="NotificationsEnablement" id="Xyq-oP-Aha" customClass="UserNotificationEnablementViewController" customModule="Fluor" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" misplaced="YES" id="O86-Ya-eHz">
<rect key="frame" x="0.0" y="0.0" width="442" height="144"/>
<view key="view" id="O86-Ya-eHz">
<rect key="frame" x="0.0" y="0.0" width="409" height="144"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="749" verticalStackHuggingPriority="749" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ccL-vU-XQT">
Expand Down
8 changes: 4 additions & 4 deletions Fluor/Base.lproj/RulesEditor.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="Xfv-1b-Hu4">
<font key="font" metaFont="system"/>
<segments>
<segment toolTip="Apple keys" image="AppleMode" selected="YES"/>
<segment toolTip="Function keys" image="OtherMode" width="34" tag="1"/>
<segment toolTip="Media key mode" image="AppleMode" selected="YES"/>
<segment toolTip="Function key mode" image="OtherMode" width="34" tag="1"/>
</segments>
</segmentedCell>
<connections>
Expand Down Expand Up @@ -204,7 +204,7 @@
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FQS-Uv-JNd">
<rect key="frame" x="144" y="6" width="33" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="Y1u-Fa-sgm">
<font key="font" metaFont="controlContent" size="11"/>
<font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
Expand All @@ -219,7 +219,7 @@
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ttC-Xk-L6o">
<rect key="frame" x="2" y="2" width="51" height="21"/>
<segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="qsY-JB-wQQ">
<font key="font" metaFont="controlContent" size="11"/>
<font key="font" metaFont="menu" size="11"/>
<segments>
<segment toolTip="Add rule" image="NSAddTemplate" width="22"/>
<segment toolTip="Delete selected rule" image="NSRemoveTemplate" width="22" tag="1"/>
Expand Down
24 changes: 7 additions & 17 deletions Fluor/Base.lproj/RunningApps.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,9 @@
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="q73-3D-poM">
<font key="font" metaFont="system"/>
<segments>
<segment toolTip="Default" image="DefaultMode" width="32" selected="YES">
<nil key="label"/>
</segment>
<segment toolTip="Apple keys" image="AppleMode" width="32" tag="1">
<nil key="label"/>
</segment>
<segment toolTip="Function keys" image="OtherMode" width="32">
<nil key="label"/>
</segment>
<segment toolTip="Same as default mode" image="DefaultMode" width="32" selected="YES"/>
<segment toolTip="Media key mode" image="AppleMode" width="32" tag="1"/>
<segment toolTip="Function key mode" image="OtherMode" width="32"/>
</segments>
</segmentedCell>
<connections>
Expand All @@ -156,10 +150,6 @@
</stackView>
<button translatesAutoresizingMaskIntoConstraints="NO" id="Jny-9j-WOO">
<rect key="frame" x="213" y="8" width="24" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="QXL-4k-1nK"/>
<constraint firstAttribute="width" constant="24" id="WMs-as-Qo9"/>
</constraints>
<buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="Service" imagePosition="only" alternateImage="App" enabled="NO" imageScaling="proportionallyUpOrDown" inset="2" id="NKc-Hc-rii">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
Expand Down Expand Up @@ -239,7 +229,7 @@
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kDJ-2C-TWd" userLabel="StatusBarLabel">
<rect key="frame" x="144" y="6" width="33" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="Twm-uj-Z9c">
<font key="font" metaFont="message" size="11"/>
<font key="font" metaFont="menu" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
Expand All @@ -255,7 +245,7 @@
<rect key="frame" x="8" y="3" width="83" height="19"/>
<buttonCell key="cell" type="roundTextured" title="Show all" alternateTitle="Hide services" bezelStyle="texturedRounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="Yb5-hU-zbp">
<behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
<font key="font" metaFont="message" size="11"/>
<font key="font" metaFont="menu" size="11"/>
</buttonCell>
<connections>
<binding destination="d1L-i9-UVk" name="value" keyPath="self.showAll" id="t2D-qG-4Jy"/>
Expand Down Expand Up @@ -303,11 +293,11 @@
</scene>
</scenes>
<resources>
<image name="App" width="32" height="32"/>
<image name="App" width="24" height="24"/>
<image name="AppleMode" width="16" height="16"/>
<image name="DefaultMode" width="16" height="16"/>
<image name="NSApplicationIcon" width="32" height="32"/>
<image name="OtherMode" width="16" height="16"/>
<image name="Service" width="32" height="32"/>
<image name="Service" width="24" height="24"/>
</resources>
</document>
5 changes: 0 additions & 5 deletions Fluor/Extensions/SetExtension.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,3 @@ extension Set: UserDefaultsConvertible where Element: UserDefaultsConvertible {
}
}

infix operator ?->: TernaryPrecedence

func ?-><T>(lhs: @autoclosure () -> Bool, rhs: @autoclosure () -> T?) -> T? {
lhs() ? rhs() : nil
}
Loading

0 comments on commit ac8c077

Please sign in to comment.