nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 22:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added warning in Integration settings when autotype is not available

Browse Source
This commit is contained in:
Michael Starke
2018-09-26 15:09:21 +02:00
parent 182f448535
commit bf68afb457
4 changed files with 204 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

261
MacPass/Base.lproj/IntegrationSettings.xib
View File

@@ -8,6 +8,8 @@
<objects> <objects>
<customObject id="-2" userLabel="File's Owner" customClass="MPIntegrationSettingsController"> <customObject id="-2" userLabel="File's Owner" customClass="MPIntegrationSettingsController">
<connections> <connections>
<outlet property="autotypeStackView" destination="j52-9L-k7c" id="Mxw-aa-elx"/>
<outlet property="autotypeWarningTextField" destination="hMJ-Mo-xOM" id="LcH-X2-TAm"/>
<outlet property="enableGlobalAutotypeCheckBox" destination="tik-Ar-FJg" id="yVA-bM-sSh"/> <outlet property="enableGlobalAutotypeCheckBox" destination="tik-Ar-FJg" id="yVA-bM-sSh"/>
<outlet property="enableQuicklookCheckBox" destination="LNw-5t-TS4" id="YiZ-Kk-0dF"/> <outlet property="enableQuicklookCheckBox" destination="LNw-5t-TS4" id="YiZ-Kk-0dF"/>
<outlet property="hotKeyTextField" destination="Kvg-he-3c8" id="c7p-1F-zth"/> <outlet property="hotKeyTextField" destination="Kvg-he-3c8" id="c7p-1F-zth"/>
@@ -16,6 +18,7 @@
<outlet property="matchTagsCheckBox" destination="9MH-jx-GpG" id="j1Y-BT-J81"/> <outlet property="matchTagsCheckBox" destination="9MH-jx-GpG" id="j1Y-BT-J81"/>
<outlet property="matchTitleCheckBox" destination="DAX-V8-Say" id="rbc-nA-1bQ"/> <outlet property="matchTitleCheckBox" destination="DAX-V8-Say" id="rbc-nA-1bQ"/>
<outlet property="matchURLCheckBox" destination="8Wz-lo-AXG" id="jTp-2n-oO7"/> <outlet property="matchURLCheckBox" destination="8Wz-lo-AXG" id="jTp-2n-oO7"/>
<outlet property="openPreferencesButton" destination="jai-b6-Qv4" id="Uq1-un-Dga"/>
<outlet property="sendCommandForControlCheckBox" destination="VK8-z4-2ci" id="nIa-ap-QfD"/> <outlet property="sendCommandForControlCheckBox" destination="VK8-z4-2ci" id="nIa-ap-QfD"/>
<outlet property="view" destination="1" id="18"/> <outlet property="view" destination="1" id="18"/>
</connections> </connections>
@@ -23,120 +26,161 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/> <customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="1"> <customView translatesAutoresizingMaskIntoConstraints="NO" id="1">
<rect key="frame" x="0.0" y="0.0" width="400" height="366"/> <rect key="frame" x="0.0" y="0.0" width="400" height="463"/>
<subviews> <subviews>
<box autoresizesSubviews="NO" verticalHuggingPriority="500" borderType="line" title="Autotype" translatesAutoresizingMaskIntoConstraints="NO" id="P9N-HM-wER"> <box autoresizesSubviews="NO" verticalHuggingPriority="500" borderType="line" title="Autotype" translatesAutoresizingMaskIntoConstraints="NO" id="P9N-HM-wER">
<rect key="frame" x="17" y="115" width="366" height="231"/> <rect key="frame" x="17" y="115" width="366" height="328"/>
<view key="contentView" id="faU-Ok-HJ3"> <view key="contentView" id="faU-Ok-HJ3">
<rect key="frame" x="1" y="1" width="364" height="215"/> <rect key="frame" x="1" y="1" width="364" height="312"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Kvg-he-3c8" customClass="DDHotKeyTextField"> <stackView orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="j52-9L-k7c">
<rect key="frame" x="79" y="161" width="89" height="22"/> <rect key="frame" x="18" y="19" width="328" height="283"/>
<constraints> <beginningViews>
<constraint firstAttribute="width" constant="89" id="Mia-b8-HCZ"/> <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="328" translatesAutoresizingMaskIntoConstraints="NO" id="hMJ-Mo-xOM">
</constraints> <rect key="frame" x="-2" y="227" width="332" height="56"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="" drawsBackground="YES" id="sW8-rh-bhD" customClass="DDHotKeyTextFieldCell"> <textFieldCell key="cell" controlSize="small" id="H37-ku-aTc">
<font key="font" metaFont="system"/> <font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <string key="title">Autotype is not available, because MacPass does not have the right to control you computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require that you restart MacPass.</string>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
</textFieldCell> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textField> </textFieldCell>
<button translatesAutoresizingMaskIntoConstraints="NO" id="tik-Ar-FJg"> </textField>
<rect key="frame" x="16" y="189" width="162" height="18"/> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jai-b6-Qv4">
<buttonCell key="cell" type="check" title="Enable global Autotype" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="1qb-Rd-jYu"> <rect key="frame" x="-6" y="191" width="153" height="32"/>
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <buttonCell key="cell" type="push" title="Open Preference…" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="NP0-R3-m6n">
<font key="font" metaFont="system"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
</buttonCell> <font key="font" metaFont="system"/>
</button> </buttonCell>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="buI-Wb-o3V"> <connections>
<rect key="frame" x="16" y="164" width="57" height="17"/> <action selector="openAccessibiltyPreferences:" target="-2" id="GTg-6Z-6nd"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Shortcut" id="6oN-CH-T0O"> </connections>
<font key="font" metaFont="system"/> </button>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <button translatesAutoresizingMaskIntoConstraints="NO" id="tik-Ar-FJg">
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <rect key="frame" x="-2" y="174" width="162" height="18"/>
</textFieldCell> <buttonCell key="cell" type="check" title="Enable global Autotype" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="1qb-Rd-jYu">
</textField> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f5q-EW-RHf"> <font key="font" metaFont="system"/>
<rect key="frame" x="174" y="167" width="127" height="14"/> </buttonCell>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Shortcut is missing Key" id="Lxp-wI-yQy"> </button>
<font key="font" metaFont="smallSystem"/> <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="d6A-Vb-CMt">
<color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/> <rect key="frame" x="0.0" y="146" width="328" height="22"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <beginningViews>
</textFieldCell> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="buI-Wb-o3V">
</textField> <rect key="frame" x="-2" y="3" width="57" height="17"/>
<button translatesAutoresizingMaskIntoConstraints="NO" id="DAX-V8-Say"> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Shortcut" id="6oN-CH-T0O">
<rect key="frame" x="16" y="133" width="208" height="18"/> <font key="font" metaFont="system"/>
<buttonCell key="cell" type="check" title="Include Entry Title for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="tmL-dT-D0G"> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<font key="font" metaFont="system"/> </textFieldCell>
</buttonCell> </textField>
</button> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Kvg-he-3c8" customClass="DDHotKeyTextField">
<button translatesAutoresizingMaskIntoConstraints="NO" id="TiO-ah-BlR"> <rect key="frame" x="61" y="0.0" width="136" height="22"/>
<rect key="frame" x="16" y="93" width="239" height="18"/> <constraints>
<buttonCell key="cell" type="check" title="Include Entry URL Host for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="B1D-j9-L8x"> <constraint firstAttribute="width" constant="89" id="Mia-b8-HCZ"/>
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> </constraints>
<font key="font" metaFont="system"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="" drawsBackground="YES" id="sW8-rh-bhD" customClass="DDHotKeyTextFieldCell">
</buttonCell> <font key="font" metaFont="system"/>
</button> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<button translatesAutoresizingMaskIntoConstraints="NO" id="9MH-jx-GpG"> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<rect key="frame" x="16" y="73" width="210" height="18"/> </textFieldCell>
<buttonCell key="cell" type="check" title="Include Entry Tags for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="rbu-G7-MT8"> </textField>
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f5q-EW-RHf">
<font key="font" metaFont="system"/> <rect key="frame" x="203" y="4" width="127" height="14"/>
</buttonCell> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Shortcut is missing Key" id="Lxp-wI-yQy">
</button> <font key="font" metaFont="smallSystem"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VK8-z4-2ci"> <color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/>
<rect key="frame" x="16" y="53" width="123" height="18"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<buttonCell key="cell" type="check" title="Interpret ⌃ as ⌘" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QfO-yG-l3F"> </textFieldCell>
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> </textField>
<font key="font" metaFont="system"/> </beginningViews>
</buttonCell> <visibilityPriorities>
</button> <integer value="1000"/>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wbP-A9-jpw"> <integer value="1000"/>
<rect key="frame" x="18" y="19" width="330" height="28"/> <integer value="1000"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to." id="QRy-CY-ENC"> </visibilityPriorities>
<font key="font" metaFont="smallSystem"/> <customSpacing>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <real value="3.4028234663852886e+38"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <real value="3.4028234663852886e+38"/>
</textFieldCell> <real value="3.4028234663852886e+38"/>
</textField> </customSpacing>
<button translatesAutoresizingMaskIntoConstraints="NO" id="8Wz-lo-AXG"> </stackView>
<rect key="frame" x="16" y="113" width="207" height="18"/> <button translatesAutoresizingMaskIntoConstraints="NO" id="DAX-V8-Say">
<buttonCell key="cell" type="check" title="Include Entry URL for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="TzR-00-Vp3"> <rect key="frame" x="-2" y="122" width="208" height="18"/>
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <buttonCell key="cell" type="check" title="Include Entry Title for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="tmL-dT-D0G">
<font key="font" metaFont="system"/> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
</buttonCell> <font key="font" metaFont="system"/>
</button> </buttonCell>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="8Wz-lo-AXG">
<rect key="frame" x="-2" y="100" width="207" height="18"/>
<buttonCell key="cell" type="check" title="Include Entry URL for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="TzR-00-Vp3">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="TiO-ah-BlR">
<rect key="frame" x="-2" y="78" width="239" height="18"/>
<buttonCell key="cell" type="check" title="Include Entry URL Host for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="B1D-j9-L8x">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="9MH-jx-GpG">
<rect key="frame" x="-2" y="56" width="210" height="18"/>
<buttonCell key="cell" type="check" title="Include Entry Tags for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="rbu-G7-MT8">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VK8-z4-2ci">
<rect key="frame" x="-2" y="34" width="123" height="18"/>
<buttonCell key="cell" type="check" title="Interpret ⌃ as ⌘" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QfO-yG-l3F">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wbP-A9-jpw">
<rect key="frame" x="-2" y="0.0" width="310" height="28"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to." id="QRy-CY-ENC">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</beginningViews>
<visibilityPriorities>
<real value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews> </subviews>
<constraints>
<constraint firstItem="8Wz-lo-AXG" firstAttribute="top" secondItem="DAX-V8-Say" secondAttribute="bottom" constant="6" symbolic="YES" id="MoH-z7-kAd"/>
<constraint firstItem="wbP-A9-jpw" firstAttribute="leading" secondItem="faU-Ok-HJ3" secondAttribute="leading" constant="20" symbolic="YES" id="VLP-Gn-i60"/>
<constraint firstItem="9MH-jx-GpG" firstAttribute="leading" secondItem="TiO-ah-BlR" secondAttribute="leading" id="ZD4-CI-kNs"/>
<constraint firstItem="8Wz-lo-AXG" firstAttribute="leading" secondItem="tik-Ar-FJg" secondAttribute="leading" id="djt-ZE-TVX"/>
<constraint firstItem="TiO-ah-BlR" firstAttribute="top" secondItem="8Wz-lo-AXG" secondAttribute="bottom" constant="6" symbolic="YES" id="ejm-fw-tc2"/>
<constraint firstItem="VK8-z4-2ci" firstAttribute="leading" secondItem="tik-Ar-FJg" secondAttribute="leading" id="umE-F4-nDY"/>
</constraints>
</view> </view>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="wbP-A9-jpw" secondAttribute="trailing" constant="16" id="2V3-QT-fHc"/> <constraint firstAttribute="trailing" secondItem="j52-9L-k7c" secondAttribute="trailing" constant="16" id="DbO-uU-dBc"/>
<constraint firstItem="DAX-V8-Say" firstAttribute="top" secondItem="Kvg-he-3c8" secondAttribute="bottom" constant="12" id="3uN-8n-txN"/> <constraint firstItem="j52-9L-k7c" firstAttribute="top" secondItem="P9N-HM-wER" secondAttribute="top" constant="25" id="GW1-NJ-TjL"/>
<constraint firstItem="Kvg-he-3c8" firstAttribute="leading" secondItem="buI-Wb-o3V" secondAttribute="trailing" constant="8" symbolic="YES" id="53L-pe-f6c"/> <constraint firstItem="j52-9L-k7c" firstAttribute="leading" secondItem="P9N-HM-wER" secondAttribute="leading" constant="16" id="I0o-Ef-GNj"/>
<constraint firstAttribute="bottom" secondItem="wbP-A9-jpw" secondAttribute="bottom" constant="16" id="Cz4-ys-xjj"/> <constraint firstAttribute="bottom" secondItem="j52-9L-k7c" secondAttribute="bottom" constant="16" id="stS-Jr-dyi"/>
<constraint firstItem="tik-Ar-FJg" firstAttribute="leading" secondItem="P9N-HM-wER" secondAttribute="leading" constant="16" id="DfG-iG-Cdv"/>
<constraint firstItem="tik-Ar-FJg" firstAttribute="top" secondItem="P9N-HM-wER" secondAttribute="top" constant="25" id="E3O-BW-PBU"/>
<constraint firstItem="f5q-EW-RHf" firstAttribute="leading" secondItem="Kvg-he-3c8" secondAttribute="trailing" constant="8" symbolic="YES" id="F3E-6w-vYY"/>
<constraint firstItem="wbP-A9-jpw" firstAttribute="top" secondItem="VK8-z4-2ci" secondAttribute="bottom" constant="8" symbolic="YES" id="SjT-SU-tCe"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Kvg-he-3c8" secondAttribute="trailing" constant="26" id="U4h-wP-3di"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="f5q-EW-RHf" secondAttribute="trailing" constant="26" id="Xme-uO-a5Z"/>
<constraint firstItem="Kvg-he-3c8" firstAttribute="baseline" secondItem="f5q-EW-RHf" secondAttribute="baseline" constant="3" id="Zvz-jd-nLG"/>
<constraint firstItem="Kvg-he-3c8" firstAttribute="top" secondItem="tik-Ar-FJg" secondAttribute="bottom" constant="8" symbolic="YES" id="bxR-sX-uV3"/>
<constraint firstItem="buI-Wb-o3V" firstAttribute="baseline" secondItem="Kvg-he-3c8" secondAttribute="baseline" id="her-EX-xCf"/>
<constraint firstItem="9MH-jx-GpG" firstAttribute="top" secondItem="TiO-ah-BlR" secondAttribute="bottom" constant="6" symbolic="YES" id="mDj-Hg-CFH"/>
<constraint firstItem="tik-Ar-FJg" firstAttribute="leading" secondItem="buI-Wb-o3V" secondAttribute="leading" id="qDJ-3S-cPr"/>
<constraint firstItem="VK8-z4-2ci" firstAttribute="top" secondItem="9MH-jx-GpG" secondAttribute="bottom" constant="6" symbolic="YES" id="qaN-4g-KJh"/>
<constraint firstItem="DAX-V8-Say" firstAttribute="leading" secondItem="tik-Ar-FJg" secondAttribute="leading" id="s2L-A8-WQ2"/>
<constraint firstItem="tik-Ar-FJg" firstAttribute="leading" secondItem="TiO-ah-BlR" secondAttribute="leading" id="uJP-4u-dr4"/>
</constraints> </constraints>
</box> </box>
<box autoresizesSubviews="NO" verticalHuggingPriority="500" borderType="line" title="Preview" translatesAutoresizingMaskIntoConstraints="NO" id="VVs-b5-cX9"> <box autoresizesSubviews="NO" verticalHuggingPriority="500" borderType="line" title="Preview" translatesAutoresizingMaskIntoConstraints="NO" id="VVs-b5-cX9">
@@ -161,6 +205,9 @@
</textFieldCell> </textFieldCell>
</textField> </textField>
</subviews> </subviews>
<constraints>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="LNw-5t-TS4" secondAttribute="trailing" constant="20" symbolic="YES" id="5bd-ta-CgC"/>
</constraints>
</view> </view>
<constraints> <constraints>
<constraint firstItem="V6l-R9-hIj" firstAttribute="leading" secondItem="VVs-b5-cX9" secondAttribute="leading" constant="16" id="4UQ-7R-4C6"/> <constraint firstItem="V6l-R9-hIj" firstAttribute="leading" secondItem="VVs-b5-cX9" secondAttribute="leading" constant="16" id="4UQ-7R-4C6"/>
@@ -182,7 +229,7 @@
<constraint firstItem="P9N-HM-wER" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="ulV-xL-ldJ"/> <constraint firstItem="P9N-HM-wER" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" id="ulV-xL-ldJ"/>
<constraint firstItem="VVs-b5-cX9" firstAttribute="leading" secondItem="P9N-HM-wER" secondAttribute="leading" id="z4a-9C-78h"/> <constraint firstItem="VVs-b5-cX9" firstAttribute="leading" secondItem="P9N-HM-wER" secondAttribute="leading" id="z4a-9C-78h"/>
</constraints> </constraints>
<point key="canvasLocation" x="-28" y="150"/> <point key="canvasLocation" x="-357" y="-1007.5"/>
</customView> </customView>
</objects> </objects>
</document> </document>

4
MacPass/MPAutotypeDaemon.m
View File

@@ -100,8 +100,8 @@ static MPAutotypeDaemon *_sharedInstance;
} }
- (void)dealloc { - (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self]; [NSNotificationCenter.defaultCenter removeObserver:self];
[[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self]; [NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
[self unbind:NSStringFromSelector(@selector(enabled))]; [self unbind:NSStringFromSelector(@selector(enabled))];
[self unbind:NSStringFromSelector(@selector(hotKeyData))]; [self unbind:NSStringFromSelector(@selector(hotKeyData))];
} }

23
MacPass/MPIntegrationSettingsController.h
View File

@@ -27,18 +27,23 @@
@interface MPIntegrationSettingsController : MPViewController <MPSettingsTab, NSTextFieldDelegate> @interface MPIntegrationSettingsController : MPViewController <MPSettingsTab, NSTextFieldDelegate>
/* Autotype */ /* Autotype */
@property (weak) IBOutlet NSButton *enableGlobalAutotypeCheckBox; @property (strong) IBOutlet NSButton *enableGlobalAutotypeCheckBox;
@property (weak) IBOutlet DDHotKeyTextField *hotKeyTextField; @property (strong) IBOutlet DDHotKeyTextField *hotKeyTextField;
@property (weak) IBOutlet NSTextField *hotkeyWarningTextField; @property (strong) IBOutlet NSTextField *hotkeyWarningTextField;
@property (weak) IBOutlet NSButton *matchTitleCheckBox; @property (strong) IBOutlet NSTextField *autotypeWarningTextField;
@property (weak) IBOutlet NSButton *matchURLCheckBox; @property (strong) IBOutlet NSStackView *autotypeStackView;
@property (weak) IBOutlet NSButton *matchHostCheckBox; @property (strong) IBOutlet NSButton *openPreferencesButton;
@property (weak) IBOutlet NSButton *matchTagsCheckBox; @property (strong) IBOutlet NSButton *matchTitleCheckBox;
@property (strong) IBOutlet NSButton *matchURLCheckBox;
@property (strong) IBOutlet NSButton *matchHostCheckBox;
@property (strong) IBOutlet NSButton *matchTagsCheckBox;
@property (weak) IBOutlet NSButton *sendCommandForControlCheckBox; @property (strong) IBOutlet NSButton *sendCommandForControlCheckBox;
/* Preview */ /* Preview */
@property (weak) IBOutlet NSButton *enableQuicklookCheckBox; @property (strong) IBOutlet NSButton *enableQuicklookCheckBox;
- (IBAction)openAccessibiltyPreferences:(id)sender;
@end @end

38
MacPass/MPIntegrationSettingsController.m
View File

@@ -23,6 +23,7 @@
#import "MPIntegrationSettingsController.h" #import "MPIntegrationSettingsController.h"
#import "MPSettingsHelper.h" #import "MPSettingsHelper.h"
#import "MPIconHelper.h" #import "MPIconHelper.h"
#import "MPAutotypeDaemon.h"
#import "DDHotKeyCenter.h" #import "DDHotKeyCenter.h"
#import "DDHotKey+MacPassAdditions.h" #import "DDHotKey+MacPassAdditions.h"
@@ -67,8 +68,9 @@
[self.matchTagsCheckBox bind:NSValueBinding toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyAutotypeMatchTags] options:nil]; [self.matchTagsCheckBox bind:NSValueBinding toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeyAutotypeMatchTags] options:nil];
[self.sendCommandForControlCheckBox bind:NSValueBinding toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeySendCommandForControlKey] options:nil]; [self.sendCommandForControlCheckBox bind:NSValueBinding toObject:defaultsController withKeyPath:[MPSettingsHelper defaultControllerPathForKey:kMPSettingsKeySendCommandForControlKey] options:nil];
[self _showWarning:NO]; [self _showKeyCodeMissingKeyWarning:NO];
[self _updateAccessabilityWarning];
} }
- (void)willShowTab { - (void)willShowTab {
@@ -92,14 +94,42 @@
- (void)controlTextDidChange:(NSNotification *)obj { - (void)controlTextDidChange:(NSNotification *)obj {
BOOL validHotKey = self.hotKeyTextField.hotKey.valid; BOOL validHotKey = self.hotKeyTextField.hotKey.valid;
[self _showWarning:!validHotKey]; [self _showKeyCodeMissingKeyWarning:!validHotKey];
if(validHotKey) { if(validHotKey) {
self.hotKey = self.hotKeyTextField.hotKey; self.hotKey = self.hotKeyTextField.hotKey;
} }
} }
- (void)_showWarning:(BOOL)show { - (void)_showKeyCodeMissingKeyWarning:(BOOL)show {
self.hotkeyWarningTextField.hidden = !show; self.hotkeyWarningTextField.hidden = !show;
} }
- (void)_updateAccessabilityWarning {
BOOL hasAutotypeSupport = MPAutotypeDaemon.defaultDaemon.autotypeSupported;
if(hasAutotypeSupport) {
[self.autotypeStackView setVisibilityPriority:NSStackViewVisibilityPriorityNotVisible forView:self.autotypeWarningTextField];
[self.autotypeStackView setVisibilityPriority:NSStackViewVisibilityPriorityNotVisible forView:self.openPreferencesButton];
}
else {
[self.autotypeStackView setVisibilityPriority:NSStackViewVisibilityPriorityMustHold forView:self.autotypeWarningTextField];
[self.autotypeStackView setVisibilityPriority:NSStackViewVisibilityPriorityMustHold forView:self.openPreferencesButton];
}
NSArray <NSControl *> *controls = @[ self.enableGlobalAutotypeCheckBox,
self.hotKeyTextField,
self.matchTitleCheckBox,
self.matchURLCheckBox,
self.matchHostCheckBox,
self.matchTagsCheckBox,
self.sendCommandForControlCheckBox ];
for(NSControl *control in controls) {
control.enabled = hasAutotypeSupport;
}
}
- (void)openAccessibiltyPreferences:(id)sender {
[NSWorkspace.sharedWorkspace openURL:[NSURL URLWithString:@"x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility"]];
}
@end @end