Skip to content

Commit ec3a0ca

Browse files
danshevlukdanshevluk
committed
Change primary modal view action shortcut to cmd+return
Usage of a cmd+return is more common in modern macOS apps, so it makes sense to update option usage to a more familiar key binding.
1 parent 67f2cc0 commit ec3a0ca

File tree

5 files changed

+82
-80
lines changed

5 files changed

+82
-80
lines changed

‎GitUpKit/Views/Base.lproj/GIAdvancedCommitViewController.xib‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -225,7 +225,7 @@
225225
<string key="keyEquivalent" base64-UTF8="YES">
226226
DQ
227227
</string>
228-
<modifierMask key="keyEquivalentModifierMask" option="YES"/>
228+
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
229229
<connections>
230230
<action selector="commit:" target="-2" id="TeY-Mz-e1l"/>
231231
</connections>

‎GitUpKit/Views/Base.lproj/GICommitRewriterViewController.xib‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -20,19 +20,19 @@
2020
</customObject>
2121
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
2222
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
23-
<view translatesAutoresizingMaskIntoConstraints="NO" id="Mge-gB-T5T" userLabel="Main View" customClass="GIView">
23+
<view id="Mge-gB-T5T" userLabel="Main View" customClass="GIView">
2424
<rect key="frame" x="0.0" y="0.0" width="1000" height="500"/>
2525
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2626
<subviews>
27-
<customView id="GrA-cS-Ts1">
27+
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GrA-cS-Ts1">
2828
<rect key="frame" x="0.0" y="470" width="1000" height="30"/>
2929
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
3030
<subviews>
31-
<box verticalHuggingPriority="750" boxType="separator" id="e23-jK-FRM">
31+
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="e23-jK-FRM">
3232
<rect key="frame" x="0.0" y="-2" width="1000" height="5"/>
3333
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
3434
</box>
35-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="r86-wZ-wly">
35+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="r86-wZ-wly">
3636
<rect key="frame" x="13" y="8" width="122" height="16"/>
3737
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
3838
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="right" title="Rewriting Commit:" id="e11-6O-HXn">
@@ -41,34 +41,34 @@
4141
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
4242
</textFieldCell>
4343
</textField>
44-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="hZw-Mr-R8r">
44+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hZw-Mr-R8r">
4545
<rect key="frame" x="135" y="8" width="847" height="16"/>
4646
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
4747
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;TITLE&gt;" id="rrE-b8-3j3">
48-
<font key="font" metaFont="controlContent"/>
48+
<font key="font" metaFont="cellTitle"/>
4949
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
5050
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
5151
</textFieldCell>
5252
</textField>
5353
</subviews>
5454
</customView>
55-
<splitView dividerStyle="thin" vertical="YES" id="ggX-gG-WJV" customClass="GIDualSplitView">
55+
<splitView fixedFrame="YES" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ggX-gG-WJV" customClass="GIDualSplitView">
5656
<rect key="frame" x="0.0" y="0.0" width="1000" height="470"/>
5757
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
5858
<subviews>
59-
<customView id="ac4-Pc-4Ig">
59+
<customView fixedFrame="YES" id="ac4-Pc-4Ig">
6060
<rect key="frame" x="0.0" y="0.0" width="300" height="470"/>
6161
<autoresizingMask key="autoresizingMask"/>
6262
<subviews>
63-
<box verticalHuggingPriority="750" boxType="separator" id="ZBF-ni-AKe">
63+
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="ZBF-ni-AKe">
6464
<rect key="frame" x="0.0" y="43" width="300" height="5"/>
6565
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
6666
</box>
67-
<customView id="OjA-hK-WAP">
67+
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OjA-hK-WAP">
6868
<rect key="frame" x="0.0" y="46" width="300" height="424"/>
6969
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
7070
</customView>
71-
<button verticalHuggingPriority="750" id="MQE-ts-iIn">
71+
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MQE-ts-iIn">
7272
<rect key="frame" x="8" y="5" width="100" height="32"/>
7373
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
7474
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mX3-eO-IXN">
@@ -82,7 +82,7 @@ Gw
8282
<action selector="cancel:" target="-2" id="bab-Tm-5kX"/>
8383
</connections>
8484
</button>
85-
<button verticalHuggingPriority="750" id="3PR-J1-aKE">
85+
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3PR-J1-aKE">
8686
<rect key="frame" x="180" y="5" width="112" height="32"/>
8787
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
8888
<buttonCell key="cell" type="push" title="Continue…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ibk-mz-3rz">
@@ -98,11 +98,11 @@ DQ
9898
</button>
9999
</subviews>
100100
</customView>
101-
<customView id="uU2-RL-XAi">
101+
<customView fixedFrame="YES" id="uU2-RL-XAi">
102102
<rect key="frame" x="301" y="0.0" width="699" height="470"/>
103103
<autoresizingMask key="autoresizingMask"/>
104104
<subviews>
105-
<customView id="hwM-6S-E69">
105+
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hwM-6S-E69">
106106
<rect key="frame" x="0.0" y="0.0" width="699" height="470"/>
107107
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
108108
</customView>
@@ -123,12 +123,13 @@ DQ
123123
</userDefinedRuntimeAttributes>
124124
</splitView>
125125
</subviews>
126+
<point key="canvasLocation" x="139" y="154"/>
126127
</view>
127128
<customView id="RtD-0g-Q5a" userLabel="Message View">
128129
<rect key="frame" x="0.0" y="0.0" width="590" height="273"/>
129130
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
130131
<subviews>
131-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="pPL-IW-FD6">
132+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pPL-IW-FD6">
132133
<rect key="frame" x="18" y="241" width="248" height="17"/>
133134
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
134135
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Updated commit message:" id="H9b-Gu-kkA">
@@ -137,7 +138,7 @@ DQ
137138
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
138139
</textFieldCell>
139140
</textField>
140-
<scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="DIo-C0-hvl">
141+
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DIo-C0-hvl">
141142
<rect key="frame" x="20" y="83" width="550" height="150"/>
142143
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
143144
<clipView key="contentView" drawsBackground="NO" id="PV2-zJ-Th2">
@@ -155,7 +156,7 @@ DQ
155156
<fragment content="&lt;MESSAGE&gt;">
156157
<attributes>
157158
<color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
158-
<font key="NSFont" metaFont="toolTip"/>
159+
<font key="NSFont" metaFont="controlContent" size="11"/>
159160
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
160161
</attributes>
161162
</fragment>
@@ -176,7 +177,7 @@ DQ
176177
<autoresizingMask key="autoresizingMask"/>
177178
</scroller>
178179
</scrollView>
179-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="uTH-et-agS">
180+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uTH-et-agS">
180181
<rect key="frame" x="18" y="61" width="554" height="14"/>
181182
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
182183
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="&lt;INFO&gt;" id="RGN-xW-ZIT">
@@ -185,7 +186,7 @@ DQ
185186
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
186187
</textFieldCell>
187188
</textField>
188-
<button verticalHuggingPriority="750" id="jiN-49-CJi">
189+
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jiN-49-CJi">
189190
<rect key="frame" x="434" y="13" width="142" height="32"/>
190191
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
191192
<buttonCell key="cell" type="push" title="Rewrite Commit" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="JGJ-zD-wfi">
@@ -194,13 +195,13 @@ DQ
194195
<string key="keyEquivalent" base64-UTF8="YES">
195196
DQ
196197
</string>
197-
<modifierMask key="keyEquivalentModifierMask" option="YES"/>
198+
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
198199
</buttonCell>
199200
<connections>
200201
<action selector="finishModalView:" target="-2" id="KB3-Kv-Pfn"/>
201202
</connections>
202203
</button>
203-
<button verticalHuggingPriority="750" id="2mu-cU-csS">
204+
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2mu-cU-csS">
204205
<rect key="frame" x="334" y="13" width="100" height="32"/>
205206
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
206207
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="GL2-s4-e19">

‎GitUpKit/Views/Base.lproj/GICommitSplitterViewController.xib‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -157,7 +157,7 @@ Gw
157157
<string key="keyEquivalent" base64-UTF8="YES">
158158
DQ
159159
</string>
160-
<modifierMask key="keyEquivalentModifierMask" option="YES"/>
160+
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
161161
</buttonCell>
162162
<connections>
163163
<action selector="continue:" target="-2" id="b6D-BI-9Ig"/>
@@ -294,7 +294,7 @@ DQ
294294
<string key="keyEquivalent" base64-UTF8="YES">
295295
DQ
296296
</string>
297-
<modifierMask key="keyEquivalentModifierMask" option="YES"/>
297+
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
298298
</buttonCell>
299299
<connections>
300300
<action selector="finishModalView:" target="-2" id="vTp-E1-o2W"/>

0 commit comments

Comments
 (0)