Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[macOS] UI updates #344

Merged
merged 1 commit into from
Apr 18, 2022
Merged

[macOS] UI updates #344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions macos/QMK Toolbox/Base.lproj/MainMenu.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,18 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button translatesAutoresizingMaskIntoConstraints="NO" id="TwL-TO-5Ka">
<rect key="frame" x="453" y="553" width="93" height="18"/>
<buttonCell key="cell" type="check" title="Auto-Flash" bezelStyle="regularSquare" imagePosition="trailing" inset="2" id="X8j-zC-WSC">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="label" size="12"/>
</buttonCell>
<connections>
<binding destination="Voe-Tx-rLC" name="value" keyPath="autoFlashEnabled" id="H8W-yV-uz1"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OKF-oG-mRx">
<rect key="frame" x="656" y="538" width="64" height="32"/>
<rect key="frame" x="545" y="545" width="64" height="32"/>
<buttonCell key="cell" type="push" title="Flash" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="WBr-hK-w8Y">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="label" size="12"/>
Expand All @@ -372,66 +382,56 @@
<binding destination="Voe-Tx-rLC" name="enabled" keyPath="canFlash" id="B7O-2B-f3E"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qEj-2h-OmC">
<rect key="frame" x="714" y="538" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Exit DFU" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="euK-aj-UAI">
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RSb-Il-mNt">
<rect key="frame" x="603" y="545" width="117" height="32"/>
<buttonCell key="cell" type="push" title="Clear EEPROM" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aot-j7-w9r">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="label" size="12"/>
</buttonCell>
<connections>
<action selector="resetButtonClick:" target="Voe-Tx-rLC" id="OeF-Gz-mpL"/>
<binding destination="Voe-Tx-rLC" name="enabled" keyPath="canReset" id="bTa-Zn-nnd"/>
<action selector="clearEEPROMButtonClick:" target="Voe-Tx-rLC" id="xaR-XN-Tf6"/>
<binding destination="Voe-Tx-rLC" name="enabled" keyPath="canClearEEPROM" id="onc-Z0-w85"/>
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="TwL-TO-5Ka">
<rect key="frame" x="661" y="520.5" width="129" height="18"/>
<buttonCell key="cell" type="check" title="Auto-Flash" bezelStyle="regularSquare" imagePosition="left" inset="2" id="X8j-zC-WSC">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qEj-2h-OmC">
<rect key="frame" x="714" y="545" width="83" height="32"/>
<buttonCell key="cell" type="push" title="Exit DFU" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="euK-aj-UAI">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="label" size="12"/>
</buttonCell>
<connections>
<binding destination="Voe-Tx-rLC" name="value" keyPath="autoFlashEnabled" id="H8W-yV-uz1"/>
<action selector="resetButtonClick:" target="Voe-Tx-rLC" id="OeF-Gz-mpL"/>
<binding destination="Voe-Tx-rLC" name="enabled" keyPath="canReset" id="bTa-Zn-nnd"/>
</connections>
</button>
<scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" scrollerKnobStyle="dark" translatesAutoresizingMaskIntoConstraints="NO" id="w5R-Hk-e8X">
<rect key="frame" x="10" y="38" width="780" height="476"/>
<scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w5R-Hk-e8X">
<rect key="frame" x="10" y="38" width="780" height="506"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="oaz-yh-Zob">
<rect key="frame" x="1" y="1" width="778" height="474"/>
<rect key="frame" x="1" y="1" width="778" height="504"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView editable="NO" importsGraphics="NO" verticallyResizable="YES" allowsNonContiguousLayout="YES" id="tMQ-2J-GgU" customClass="LogTextView">
<rect key="frame" x="0.0" y="0.0" width="778" height="474"/>
<rect key="frame" x="0.0" y="0.0" width="778" height="504"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="textColor" name="LogMessageDefault"/>
<color key="backgroundColor" name="LogBoxBackground"/>
<size key="minSize" width="778" height="474"/>
<size key="maxSize" width="793" height="10000000"/>
<size key="minSize" width="778" height="504"/>
<size key="maxSize" width="897" height="10000000"/>
<color key="insertionPointColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</textView>
</subviews>
</clipView>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="IBW-oz-f3p">
<rect key="frame" x="1" y="460" width="768" height="16"/>
<rect key="frame" x="1" y="489" width="778" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="guZ-nH-ZjT">
<rect key="frame" x="763" y="1" width="16" height="474"/>
<rect key="frame" x="763" y="1" width="16" height="485"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RSb-Il-mNt">
<rect key="frame" x="3" y="3" width="117" height="32"/>
<buttonCell key="cell" type="push" title="Clear EEPROM" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aot-j7-w9r">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="label" size="12"/>
</buttonCell>
<connections>
<action selector="clearEEPROMButtonClick:" target="Voe-Tx-rLC" id="xaR-XN-Tf6"/>
<binding destination="Voe-Tx-rLC" name="enabled" keyPath="canClearEEPROM" id="onc-Z0-w85"/>
</connections>
</button>
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FPO-qP-5FM">
<rect key="frame" x="121" y="6" width="672" height="25"/>
<rect key="frame" x="10" y="6" width="783" height="25"/>
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="No HID console devices connected" drawsBackground="YES" buttonBordered="NO" completes="NO" numberOfVisibleItems="5" id="7kS-Qf-UrK">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -440,30 +440,30 @@
</comboBox>
</subviews>
<constraints>
<constraint firstItem="TwL-TO-5Ka" firstAttribute="top" secondItem="qEj-2h-OmC" secondAttribute="bottom" constant="8" id="0cf-RK-F41"/>
<constraint firstAttribute="trailing" secondItem="w5R-Hk-e8X" secondAttribute="trailing" constant="10" id="1SK-rh-DGn"/>
<constraint firstItem="TwL-TO-5Ka" firstAttribute="leading" secondItem="OKF-oG-mRx" secondAttribute="leading" id="533-Os-hQd"/>
<constraint firstAttribute="trailing" secondItem="qEj-2h-OmC" secondAttribute="trailing" constant="10" id="56Q-ms-Qm2"/>
<constraint firstAttribute="leading" relation="greaterThanOrEqual" secondItem="RSb-Il-mNt" secondAttribute="trailing" constant="-113" id="BC0-zS-krH"/>
<constraint firstItem="w5R-Hk-e8X" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="10" id="BdT-Ww-Qmp"/>
<constraint firstItem="w5R-Hk-e8X" firstAttribute="top" secondItem="TwL-TO-5Ka" secondAttribute="bottom" constant="8" symbolic="YES" id="C58-dN-Nz8"/>
<constraint firstAttribute="trailing" secondItem="t67-0j-kLe" secondAttribute="trailing" constant="10" id="G6N-Tg-bGd"/>
<constraint firstItem="w5R-Hk-e8X" firstAttribute="top" secondItem="OKF-oG-mRx" secondAttribute="bottom" constant="8" id="IJo-El-PT8"/>
<constraint firstItem="FPO-qP-5FM" firstAttribute="top" secondItem="w5R-Hk-e8X" secondAttribute="bottom" constant="9" id="J0O-yY-UE3"/>
<constraint firstItem="qEj-2h-OmC" firstAttribute="leading" secondItem="OKF-oG-mRx" secondAttribute="trailing" constant="8" id="Nc3-jf-JYQ"/>
<constraint firstItem="RSb-Il-mNt" firstAttribute="leading" secondItem="OKF-oG-mRx" secondAttribute="trailing" constant="8" id="LFw-N8-O94"/>
<constraint firstItem="9ht-zl-DdM" firstAttribute="trailing" secondItem="t67-0j-kLe" secondAttribute="trailing" id="Psu-ML-lmF"/>
<constraint firstItem="qEj-2h-OmC" firstAttribute="trailing" secondItem="TwL-TO-5Ka" secondAttribute="trailing" id="RnE-Zh-3N5"/>
<constraint firstItem="TwL-TO-5Ka" firstAttribute="top" secondItem="OKF-oG-mRx" secondAttribute="bottom" constant="8" id="Zf8-0i-vof"/>
<constraint firstItem="RSb-Il-mNt" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="10" id="Zwx-cY-fGS"/>
<constraint firstItem="OKF-oG-mRx" firstAttribute="top" secondItem="t67-0j-kLe" secondAttribute="bottom" constant="15" id="b0B-xw-uMI"/>
<constraint firstItem="OKF-oG-mRx" firstAttribute="centerY" secondItem="TwL-TO-5Ka" secondAttribute="centerY" id="bHQ-So-j6P"/>
<constraint firstItem="RSb-Il-mNt" firstAttribute="top" secondItem="t67-0j-kLe" secondAttribute="bottom" constant="8" id="eht-5N-KXX"/>
<constraint firstAttribute="bottom" secondItem="FPO-qP-5FM" secondAttribute="bottom" constant="10" id="fUh-wY-4b9"/>
<constraint firstAttribute="bottom" secondItem="RSb-Il-mNt" secondAttribute="bottom" constant="10" id="hMV-Bz-Rd0"/>
<constraint firstItem="t67-0j-kLe" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="10" id="hY7-4X-Nrm"/>
<constraint firstItem="w5R-Hk-e8X" firstAttribute="top" secondItem="RSb-Il-mNt" secondAttribute="bottom" constant="8" id="i5W-ZD-fyz"/>
<constraint firstItem="9ht-zl-DdM" firstAttribute="leading" secondItem="A13-Sl-S0x" secondAttribute="leading" constant="3" id="jhU-5m-HNH"/>
<constraint firstItem="OKF-oG-mRx" firstAttribute="top" secondItem="t67-0j-kLe" secondAttribute="bottom" constant="8" id="jo7-LH-Xpn"/>
<constraint firstItem="9ht-zl-DdM" firstAttribute="bottom" secondItem="t67-0j-kLe" secondAttribute="top" constant="14" id="me3-Ss-MQt"/>
<constraint firstItem="FPO-qP-5FM" firstAttribute="leading" secondItem="RSb-Il-mNt" secondAttribute="trailing" constant="8" symbolic="YES" id="mzX-zO-3Sz"/>
<constraint firstItem="OKF-oG-mRx" firstAttribute="leading" secondItem="TwL-TO-5Ka" secondAttribute="trailing" constant="8" symbolic="YES" id="okv-8t-gzV"/>
<constraint firstItem="w5R-Hk-e8X" firstAttribute="top" secondItem="qEj-2h-OmC" secondAttribute="bottom" constant="8" id="pgm-gC-AX5"/>
<constraint firstItem="TwL-TO-5Ka" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="453" id="tV3-KG-Gbt"/>
<constraint firstItem="t67-0j-kLe" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="10" id="tnv-lz-t10"/>
<constraint firstAttribute="trailing" secondItem="FPO-qP-5FM" secondAttribute="trailing" constant="10" id="utN-AQ-ZVa"/>
<constraint firstItem="RSb-Il-mNt" firstAttribute="top" secondItem="w5R-Hk-e8X" secondAttribute="bottom" constant="8" id="xU6-gQ-pgQ"/>
<constraint firstItem="qEj-2h-OmC" firstAttribute="leading" secondItem="RSb-Il-mNt" secondAttribute="trailing" constant="8" id="vD8-g2-zXG"/>
<constraint firstItem="FPO-qP-5FM" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="10" id="wjn-N3-CTh"/>
<constraint firstItem="qEj-2h-OmC" firstAttribute="top" secondItem="t67-0j-kLe" secondAttribute="bottom" constant="8" id="x1T-gj-rus"/>
</constraints>
</view>
<point key="canvasLocation" x="349" y="454"/>
Expand All @@ -474,7 +474,7 @@
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="LogMessageDefault">
<color red="0.11764705882352941" green="0.11764705882352941" blue="0.11764705882352941" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.11800000071525574" green="0.11800000071525574" blue="0.11800000071525574" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>