coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-17 14:17:13 +03:00
Code Issues Projects Releases Wiki Activity

Remove “length” display in status bar

Browse Source
This commit is contained in:
1024jp 2018-06-14 16:27:21 +02:00
parent bc52f04070
commit 1051a604e5
11 changed files with 30 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ Change Log
- Select all matches by “Find All”.
- Remove the window size setting option.
- Now, the initial window size is determined by the last window size, just like other standard Cocoa applications.
- Remove “length” display in status bar.
- Remove the initlal document inspector visibility setting option.
- Display current user's system-wide setting for window tabbing in the menu on the Window pane.
- [trivial] Update editor opacity sample tip.

69
CotEditor/Base.lproj/WindowPane.storyboard
View File

@ -13,11 +13,11 @@
<objects>
<viewController id="Qki-Cn-AgK" customClass="WindowPaneController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
<customView key="view" horizontalHuggingPriority="750" verticalCompressionResistancePriority="250" id="uRF-iT-6pD">
<rect key="frame" x="0.0" y="0.0" width="560" height="402"/>
<rect key="frame" x="0.0" y="0.0" width="560" height="380"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="WD1-55-LD1">
<rect key="frame" x="274" y="291" width="157" height="18"/>
<rect key="frame" x="274" y="269" width="157" height="18"/>
<buttonCell key="cell" type="check" title="Page guide at column:" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3352">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -27,7 +27,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="7w7-HA-vO7">
<rect key="frame" x="134" y="313" width="110" height="18"/>
<rect key="frame" x="134" y="291" width="110" height="18"/>
<buttonCell key="cell" type="check" title="Navigation bar" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3351">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -37,7 +37,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="tNa-ag-PUj">
<rect key="frame" x="134" y="291" width="85" height="18"/>
<rect key="frame" x="134" y="269" width="85" height="18"/>
<buttonCell key="cell" type="check" title="Status bar" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3349">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -71,13 +71,13 @@
<rect key="frame" x="20" y="113" width="520" height="5"/>
</box>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="fDR-J7-rvC">
<rect key="frame" x="20" y="274" width="520" height="5"/>
<rect key="frame" x="20" y="252" width="520" height="5"/>
</box>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="HPd-WR-pN4">
<rect key="frame" x="20" y="161" width="520" height="5"/>
</box>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="W7e-Di-3ya">
<rect key="frame" x="134" y="244" width="86" height="18"/>
<rect key="frame" x="134" y="222" width="86" height="18"/>
<buttonCell key="cell" type="check" title="Line count" bezelStyle="regularSquare" imagePosition="left" inset="2" id="6jK-xX-8AH">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -87,7 +87,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="4Hc-mj-n2O">
<rect key="frame" x="134" y="222" width="121" height="18"/>
<rect key="frame" x="134" y="200" width="121" height="18"/>
<buttonCell key="cell" type="check" title="Character count" bezelStyle="regularSquare" imagePosition="left" inset="2" id="sHZ-kO-Wvu">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -96,16 +96,6 @@
<binding destination="NU0-2h-SUe" name="value" keyPath="values.showStatusBarChars" id="zzb-8j-dSl"/>
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="iuC-pv-esh">
<rect key="frame" x="134" y="200" width="64" height="18"/>
<buttonCell key="cell" type="check" title="Length" bezelStyle="regularSquare" imagePosition="left" inset="2" id="YE8-hr-UbT">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<binding destination="NU0-2h-SUe" name="value" keyPath="values.showStatusBarLength" id="eL4-nI-hQ1"/>
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="oLV-nM-Y3n">
<rect key="frame" x="134" y="178" width="93" height="18"/>
<buttonCell key="cell" type="check" title="Word count" bezelStyle="regularSquare" imagePosition="left" inset="2" id="hRw-gK-ONt">
@ -117,7 +107,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="XTB-Ii-tsF">
<rect key="frame" x="264" y="244" width="74" height="18"/>
<rect key="frame" x="264" y="222" width="74" height="18"/>
<buttonCell key="cell" type="check" title="Location" bezelStyle="regularSquare" imagePosition="left" inset="2" id="ctl-Ps-V8Z">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -127,7 +117,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="6wB-lm-God">
<rect key="frame" x="264" y="222" width="93" height="18"/>
<rect key="frame" x="264" y="200" width="93" height="18"/>
<buttonCell key="cell" type="check" title="Current line" bezelStyle="regularSquare" imagePosition="left" inset="2" id="JbR-gR-aiA">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -137,7 +127,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="6mq-9Q-QKL">
<rect key="frame" x="394" y="244" width="79" height="18"/>
<rect key="frame" x="394" y="222" width="79" height="18"/>
<buttonCell key="cell" type="check" title="Encoding" bezelStyle="regularSquare" imagePosition="left" inset="2" id="8m3-5I-Moe">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -147,7 +137,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="Oek-xc-AnE">
<rect key="frame" x="394" y="222" width="99" height="18"/>
<rect key="frame" x="394" y="200" width="99" height="18"/>
<buttonCell key="cell" type="check" title="Line endings" bezelStyle="regularSquare" imagePosition="left" inset="2" id="Ief-Dy-mPR">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -157,7 +147,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="O64-k1-YJA">
<rect key="frame" x="394" y="200" width="71" height="18"/>
<rect key="frame" x="394" y="178" width="71" height="18"/>
<buttonCell key="cell" type="check" title="File size" bezelStyle="regularSquare" imagePosition="left" inset="2" id="ikB-dS-c4S">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -167,7 +157,7 @@
</connections>
</button>
<button horizontalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="FLk-vp-SAl">
<rect key="frame" x="264" y="200" width="69" height="18"/>
<rect key="frame" x="264" y="178" width="69" height="18"/>
<buttonCell key="cell" type="check" title="Column" bezelStyle="regularSquare" imagePosition="left" inset="2" id="SR0-Bx-Nh6">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -177,7 +167,7 @@
</connections>
</button>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Obi-8V-K8Q">
<rect key="frame" x="18" y="245" width="112" height="17"/>
<rect key="frame" x="18" y="223" width="112" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Status bar shows:" usesSingleLineMode="YES" id="kjP-FS-fyd">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -185,7 +175,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="751" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1hW-gQ-vjs">
<rect key="frame" x="89" y="314" width="41" height="17"/>
<rect key="frame" x="89" y="292" width="41" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Show:" usesSingleLineMode="YES" id="iw9-Ba-eD2">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -219,7 +209,7 @@
</connections>
</imageView>
<button translatesAutoresizingMaskIntoConstraints="NO" id="dN2-g1-1rQ">
<rect key="frame" x="274" y="313" width="104" height="18"/>
<rect key="frame" x="274" y="291" width="104" height="18"/>
<buttonCell key="cell" type="check" title="Line numbers" bezelStyle="regularSquare" imagePosition="left" inset="2" id="A9U-Sx-or3">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@ -253,7 +243,7 @@
</connections>
</button>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KWJ-gB-0KX">
<rect key="frame" x="134" y="359" width="185" height="26"/>
<rect key="frame" x="134" y="337" width="185" height="26"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="180" id="6fV-wp-pso"/>
</constraints>
@ -277,7 +267,7 @@
</connections>
</popUpButton>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="w4k-Qb-kRF">
<rect key="frame" x="53" y="365" width="77" height="17"/>
<rect key="frame" x="53" y="343" width="77" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Prefer Tabs:" id="8zu-3V-Obg">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -285,10 +275,10 @@
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="TQJ-IO-6BB">
<rect key="frame" x="20" y="343" width="520" height="5"/>
<rect key="frame" x="20" y="321" width="520" height="5"/>
</box>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rbS-x0-OwF">
<rect key="frame" x="322" y="365" width="157" height="17"/>
<rect key="frame" x="322" y="343" width="157" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="(Only on Sierra and later)" id="AaA-Nm-2CL">
<font key="font" metaFont="system"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@ -296,9 +286,9 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hqW-e1-Q8a" customClass="NumberTextField" customModule="CotEditor" customModuleProvider="target">
<rect key="frame" x="344" y="77" width="44" height="22"/>
<rect key="frame" x="344" y="77" width="48" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="44" id="kWm-Nn-j3V"/>
<constraint firstAttribute="width" constant="48" id="kWm-Nn-j3V"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="100%" drawsBackground="YES" id="0kZ-bJ-cKp">
<numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="percent" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" id="9qW-Ke-cKB">
@ -402,7 +392,7 @@
</customSpacing>
</stackView>
<textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WVD-kf-A2E" customClass="NumberTextField" customModule="CotEditor" customModuleProvider="target">
<rect key="frame" x="437" y="289" width="36" height="22"/>
<rect key="frame" x="437" y="267" width="36" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="36" id="lNd-bS-xpa"/>
</constraints>
@ -424,7 +414,7 @@
</connections>
</textField>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Euq-1v-RyO">
<rect key="frame" x="474" y="286" width="19" height="27"/>
<rect key="frame" x="474" y="264" width="19" height="27"/>
<stepperCell key="cell" continuous="YES" alignment="left" minValue="1" maxValue="1000" doubleValue="1" id="jBa-nO-Be8"/>
<connections>
<binding destination="NU0-2h-SUe" name="value" keyPath="values.pageGuideColumn" id="keB-PP-HXG"/>
@ -437,8 +427,9 @@
<constraint firstItem="tNa-ag-PUj" firstAttribute="top" secondItem="7w7-HA-vO7" secondAttribute="bottom" constant="8" id="12R-33-yNm"/>
<constraint firstItem="rbS-x0-OwF" firstAttribute="leading" secondItem="KWJ-gB-0KX" secondAttribute="trailing" constant="8" symbolic="YES" id="1BB-tR-Thv"/>
<constraint firstItem="KI8-gR-WjS" firstAttribute="leading" secondItem="dgR-do-Wa7" secondAttribute="trailing" constant="6" symbolic="YES" id="1fa-Ll-JaY"/>
<constraint firstItem="oLV-nM-Y3n" firstAttribute="top" secondItem="4Hc-mj-n2O" secondAttribute="bottom" constant="8" id="1jx-Sy-kee"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="hqW-e1-Q8a" secondAttribute="trailing" constant="20" symbolic="YES" id="1pL-G7-neU"/>
<constraint firstItem="4Hc-mj-n2O" firstAttribute="leading" secondItem="iuC-pv-esh" secondAttribute="leading" id="2fa-3y-kSo"/>
<constraint firstItem="FLk-vp-SAl" firstAttribute="baseline" secondItem="oLV-nM-Y3n" secondAttribute="baseline" id="2Xm-ht-ZWy"/>
<constraint firstItem="6mq-9Q-QKL" firstAttribute="baseline" secondItem="XTB-Ii-tsF" secondAttribute="baseline" id="2g6-Go-GVH"/>
<constraint firstItem="1hW-gQ-vjs" firstAttribute="trailing" secondItem="Obi-8V-K8Q" secondAttribute="trailing" id="2oP-cF-svY"/>
<constraint firstItem="LPQ-lD-rUg" firstAttribute="top" secondItem="dhU-V2-fZC" secondAttribute="bottom" constant="8" symbolic="YES" id="3Gf-dK-6nb"/>
@ -454,6 +445,7 @@
<constraint firstItem="1hW-gQ-vjs" firstAttribute="baseline" secondItem="7w7-HA-vO7" secondAttribute="baseline" id="8LV-9M-sZl"/>
<constraint firstItem="FLk-vp-SAl" firstAttribute="leading" secondItem="XTB-Ii-tsF" secondAttribute="leading" id="9DM-mM-HZm"/>
<constraint firstItem="Oek-xc-AnE" firstAttribute="leading" secondItem="6mq-9Q-QKL" secondAttribute="leading" id="9L0-G4-LUd"/>
<constraint firstItem="FLk-vp-SAl" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="oLV-nM-Y3n" secondAttribute="trailing" constant="8" symbolic="YES" id="A1Z-gK-F1p"/>
<constraint firstItem="dgR-do-Wa7" firstAttribute="trailing" secondItem="1hW-gQ-vjs" secondAttribute="trailing" id="Asi-WK-8a5"/>
<constraint firstItem="1hW-gQ-vjs" firstAttribute="trailing" secondItem="w4k-Qb-kRF" secondAttribute="trailing" id="B2X-Q1-4NF"/>
<constraint firstAttribute="trailing" secondItem="BXd-DT-jKh" secondAttribute="trailing" constant="20" symbolic="YES" id="BAa-65-CRH"/>
@ -469,7 +461,6 @@
<constraint firstItem="ExR-YZ-RPy" firstAttribute="baseline" secondItem="dgR-do-Wa7" secondAttribute="baseline" id="EW9-uO-I6A"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="O64-k1-YJA" secondAttribute="trailing" constant="20" symbolic="YES" id="GCL-SC-v1V"/>
<constraint firstItem="dhU-V2-fZC" firstAttribute="trailing" secondItem="klg-3N-8x9" secondAttribute="trailing" id="Gyi-a2-aGy"/>
<constraint firstItem="iuC-pv-esh" firstAttribute="top" secondItem="4Hc-mj-n2O" secondAttribute="bottom" constant="8" id="HLR-Bm-gw6"/>
<constraint firstItem="HPd-WR-pN4" firstAttribute="top" secondItem="oLV-nM-Y3n" secondAttribute="bottom" constant="16" id="Iih-i7-2BG"/>
<constraint firstItem="WD1-55-LD1" firstAttribute="top" secondItem="dN2-g1-1rQ" secondAttribute="bottom" constant="8" id="JIv-FC-BxE"/>
<constraint firstItem="WVD-kf-A2E" firstAttribute="centerY" secondItem="Euq-1v-RyO" secondAttribute="centerY" id="Kod-4b-ebn"/>
@ -488,11 +479,8 @@
<constraint firstItem="KWJ-gB-0KX" firstAttribute="leading" secondItem="w4k-Qb-kRF" secondAttribute="trailing" constant="8" symbolic="YES" id="TQI-mX-Ugs"/>
<constraint firstItem="7w7-HA-vO7" firstAttribute="leading" secondItem="1hW-gQ-vjs" secondAttribute="trailing" constant="8" symbolic="YES" id="Uf1-oQ-bNC"/>
<constraint firstItem="ExR-YZ-RPy" firstAttribute="leading" secondItem="KI8-gR-WjS" secondAttribute="trailing" constant="8" symbolic="YES" id="VLk-PL-Wfw"/>
<constraint firstItem="O64-k1-YJA" firstAttribute="baseline" secondItem="iuC-pv-esh" secondAttribute="baseline" id="Vrc-xr-lrw"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="oLV-nM-Y3n" secondAttribute="trailing" constant="20" symbolic="YES" id="Wxe-dd-WHz"/>
<constraint firstItem="Gi0-Gf-dth" firstAttribute="trailing" secondItem="dgR-do-Wa7" secondAttribute="trailing" id="YNp-Xj-1N4"/>
<constraint firstItem="O64-k1-YJA" firstAttribute="leading" secondItem="6mq-9Q-QKL" secondAttribute="leading" id="YXr-P4-UAB"/>
<constraint firstItem="FLk-vp-SAl" firstAttribute="baseline" secondItem="iuC-pv-esh" secondAttribute="baseline" id="ZoP-Ch-jRL"/>
<constraint firstItem="klg-3N-8x9" firstAttribute="leading" secondItem="Gi0-Gf-dth" secondAttribute="trailing" constant="8" symbolic="YES" id="aOS-Ia-x4o"/>
<constraint firstItem="Euq-1v-RyO" firstAttribute="leading" secondItem="WVD-kf-A2E" secondAttribute="trailing" constant="4" id="ab7-dL-v9P"/>
<constraint firstItem="6S6-gu-D2C" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="uRF-iT-6pD" secondAttribute="leading" constant="20" symbolic="YES" id="bKg-86-Qmv"/>
@ -503,7 +491,6 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="dN2-g1-1rQ" secondAttribute="trailing" constant="20" symbolic="YES" id="dGx-99-HMP"/>
<constraint firstItem="WVD-kf-A2E" firstAttribute="baseline" secondItem="WD1-55-LD1" secondAttribute="baseline" id="e2u-9d-hNj"/>
<constraint firstItem="LPQ-lD-rUg" firstAttribute="leading" secondItem="bPu-Lc-Uek" secondAttribute="trailing" constant="4" id="eNf-Td-J9y"/>
<constraint firstItem="oLV-nM-Y3n" firstAttribute="top" secondItem="iuC-pv-esh" secondAttribute="bottom" constant="8" id="fdP-G7-4Qp"/>
<constraint firstAttribute="bottom" secondItem="6S6-gu-D2C" secondAttribute="bottom" constant="20" symbolic="YES" id="hbe-NP-WuW"/>
<constraint firstItem="BXd-DT-jKh" firstAttribute="leading" secondItem="uRF-iT-6pD" secondAttribute="leading" constant="20" symbolic="YES" id="i20-gX-dFf"/>
<constraint firstItem="Gi0-Gf-dth" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="uRF-iT-6pD" secondAttribute="leading" constant="20" symbolic="YES" id="iLE-zZ-jCo"/>
@ -514,6 +501,7 @@
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="LPQ-lD-rUg" secondAttribute="bottom" constant="20" symbolic="YES" id="nbV-J5-h5k"/>
<constraint firstItem="Obi-8V-K8Q" firstAttribute="leading" secondItem="uRF-iT-6pD" secondAttribute="leading" priority="750" constant="20" symbolic="YES" id="qCy-Nr-Xvh"/>
<constraint firstItem="6mq-9Q-QKL" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="XTB-Ii-tsF" secondAttribute="trailing" constant="8" symbolic="YES" id="qDd-hg-LgI"/>
<constraint firstItem="O64-k1-YJA" firstAttribute="baseline" secondItem="oLV-nM-Y3n" secondAttribute="baseline" id="qmm-l5-ddg"/>
<constraint firstAttribute="trailing" secondItem="TQJ-IO-6BB" secondAttribute="trailing" constant="20" symbolic="YES" id="rX5-IC-FnL"/>
<constraint firstItem="dN2-g1-1rQ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="7w7-HA-vO7" secondAttribute="trailing" constant="8" symbolic="YES" id="rfE-U3-7yX"/>
<constraint firstItem="7w7-HA-vO7" firstAttribute="leading" secondItem="tNa-ag-PUj" secondAttribute="leading" id="rqe-jH-QAH"/>
@ -531,7 +519,6 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="rbS-x0-OwF" secondAttribute="trailing" constant="20" symbolic="YES" id="x4E-gT-FG6"/>
<constraint firstItem="Oek-xc-AnE" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="6wB-lm-God" secondAttribute="trailing" constant="8" symbolic="YES" id="x6X-h7-pHC"/>
<constraint firstItem="HPd-WR-pN4" firstAttribute="leading" secondItem="uRF-iT-6pD" secondAttribute="leading" constant="20" symbolic="YES" id="yO8-xW-hwV"/>
<constraint firstItem="FLk-vp-SAl" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iuC-pv-esh" secondAttribute="trailing" constant="8" symbolic="YES" id="zPR-8t-eeV"/>
<constraint firstItem="WD1-55-LD1" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="tNa-ag-PUj" secondAttribute="trailing" constant="8" symbolic="YES" id="zdD-LK-1kN"/>
</constraints>
</customView>

1
CotEditor/Sources/DefaultKeys.swift
View File

@ -52,7 +52,6 @@ extension DefaultKeys {
static let pageGuideColumn = DefaultKey<Int>("pageGuideColumn")
static let showStatusBarLines = DefaultKey<Bool>("showStatusBarLines")
static let showStatusBarChars = DefaultKey<Bool>("showStatusBarChars")
static let showStatusBarLength = DefaultKey<Bool>("showStatusBarLength")
static let showStatusBarWords = DefaultKey<Bool>("showStatusBarWords")
static let showStatusBarLocation = DefaultKey<Bool>("showStatusBarLocation")
static let showStatusBarLine = DefaultKey<Bool>("showStatusBarLine")

1
CotEditor/Sources/DefaultSettings.swift
View File

@ -52,7 +52,6 @@ struct DefaultSettings {
.pageGuideColumn: 80,
.showStatusBarLines: true,
.showStatusBarChars: true,
.showStatusBarLength: false,
.showStatusBarWords: false,
.showStatusBarLocation: true,
.showStatusBarLine: true,

3
CotEditor/Sources/DocumentAnalyzer.swift
View File

@ -46,7 +46,7 @@ final class DocumentInfo: NSObject {
@objc dynamic var lines: String?
@objc dynamic var chars: String?
@objc dynamic var words: String?
@objc dynamic var length: String?
@objc dynamic var length: String? // character length as UTF-16 string
@objc dynamic var location: String? // caret location from the beginning of document
@objc dynamic var line: String? // current line
@objc dynamic var column: String? // caret location from the beginning of line
@ -165,7 +165,6 @@ final class DocumentAnalyzer: NSObject {
if self.needsUpdateEditorInfo { return .all }
var types = EditorInfoTypes()
if UserDefaults.standard[.showStatusBarLength] { types.update(with: .length) }
if UserDefaults.standard[.showStatusBarChars] { types.update(with: .characters) }
if UserDefaults.standard[.showStatusBarLines] { types.update(with: .lines) }
if UserDefaults.standard[.showStatusBarWords] { types.update(with: .words) }

4
CotEditor/Sources/StatusBarController.swift
View File

@ -129,7 +129,6 @@ final class StatusBarController: NSViewController {
/// default keys to observe update
private static let observedDefaultKeys: [DefaultKeys] = [.showStatusBarLines,
.showStatusBarChars,
.showStatusBarLength,
.showStatusBarWords,
.showStatusBarLocation,
.showStatusBarLine,
@ -157,9 +156,6 @@ final class StatusBarController: NSViewController {
if defaults[.showStatusBarChars] {
status.appendFormattedState(value: info.chars, label: "Characters", appearance: appearance)
}
if defaults[.showStatusBarLength] {
status.appendFormattedState(value: info.length, label: "Length", appearance: appearance)
}
if defaults[.showStatusBarWords] {
status.appendFormattedState(value: info.words, label: "Words", appearance: appearance)
}

2
CotEditor/de.lproj/WindowPane.strings
View File

@ -59,8 +59,6 @@
"6jK-xX-8AH.title" = "Zeilenanzahl";
/* Class = "NSButtonCell"; title = "Character count"; ObjectID = "sHZ-kO-Wvu"; */
"sHZ-kO-Wvu.title" = "Zeichenanzahl";
/* Class = "NSButtonCell"; title = "Length"; ObjectID = "YE8-hr-UbT"; */
"YE8-hr-UbT.title" = "Länge";
/* Class = "NSButtonCell"; title = "Word count"; ObjectID = "hRw-gK-ONt"; */
"hRw-gK-ONt.title" = "Wortanzahl";
/* Class = "NSButtonCell"; title = "Location"; ObjectID = "ctl-Ps-V8Z"; */

2
CotEditor/it.lproj/WindowPane.strings
View File

@ -60,8 +60,6 @@
"6jK-xX-8AH.title" = "N.ro righe";
/* Class = "NSButtonCell"; title = "Character count"; ObjectID = "sHZ-kO-Wvu"; */
"sHZ-kO-Wvu.title" = "N.ro caratteri";
/* Class = "NSButtonCell"; title = "Length"; ObjectID = "YE8-hr-UbT"; */
"YE8-hr-UbT.title" = "Lunghezza";
/* Class = "NSButtonCell"; title = "Word count"; ObjectID = "hRw-gK-ONt"; */
"hRw-gK-ONt.title" = "N.ro parole";
/* Class = "NSButtonCell"; title = "Location"; ObjectID = "ctl-Ps-V8Z"; */

2
CotEditor/ja.lproj/WindowPane.strings
View File

@ -59,8 +59,6 @@
"6jK-xX-8AH.title" = "行数";
/* Class = "NSButtonCell"; title = "Character count"; ObjectID = "sHZ-kO-Wvu"; */
"sHZ-kO-Wvu.title" = "文字数";
/* Class = "NSButtonCell"; title = "Length"; ObjectID = "YE8-hr-UbT"; */
"YE8-hr-UbT.title" = "文字長";
/* Class = "NSButtonCell"; title = "Word count"; ObjectID = "hRw-gK-ONt"; */
"hRw-gK-ONt.title" = "単語数";
/* Class = "NSButtonCell"; title = "Location"; ObjectID = "ctl-Ps-V8Z"; */

2
CotEditor/pt.lproj/WindowPane.strings
View File

@ -58,8 +58,6 @@
"6jK-xX-8AH.title" = "Contagem de linhas";
/* Class = "NSButtonCell"; title = "Character count"; ObjectID = "sHZ-kO-Wvu"; */
"sHZ-kO-Wvu.title" = "Contagem de caracteres";
/* Class = "NSButtonCell"; title = "Length"; ObjectID = "YE8-hr-UbT"; */
"YE8-hr-UbT.title" = "Comprimento";
/* Class = "NSButtonCell"; title = "Word count"; ObjectID = "hRw-gK-ONt"; */
"hRw-gK-ONt.title" = "Contagem de palavras";
/* Class = "NSButtonCell"; title = "Location"; ObjectID = "ctl-Ps-V8Z"; */

2
CotEditor/zh-Hans.lproj/WindowPane.strings
View File

@ -60,8 +60,6 @@
"6jK-xX-8AH.title" = "行数";
/* Class = "NSButtonCell"; title = "Character count"; ObjectID = "sHZ-kO-Wvu"; */
"sHZ-kO-Wvu.title" = "字符数";
/* Class = "NSButtonCell"; title = "Length"; ObjectID = "YE8-hr-UbT"; */
"YE8-hr-UbT.title" = "长度";
/* Class = "NSButtonCell"; title = "Word count"; ObjectID = "hRw-gK-ONt"; */
"hRw-gK-ONt.title" = "字数";
/* Class = "NSButtonCell"; title = "Location"; ObjectID = "ctl-Ps-V8Z"; */