Skip to content

Commit

Permalink
Merge branch 'release/3.6.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
1024jp committed Oct 28, 2018
2 parents 0f21836 + 2285c12 commit 4edf7d2
Show file tree
Hide file tree
Showing 78 changed files with 1,089 additions and 451 deletions.
5 changes: 3 additions & 2 deletions .swiftlint.yml
Expand Up @@ -45,6 +45,7 @@ disabled_rules:
- force_try
- nesting
- opening_brace
- pattern_matching_keywords
- trailing_comma
- unused_closure_parameter

Expand All @@ -70,8 +71,8 @@ type_body_length:
error: 1000

function_body_length:
warning: 100
error: 150
warning: 80
error: 100

cyclomatic_complexity:
warning: 25
Expand Down
26 changes: 25 additions & 1 deletion CHANGELOG.md
Expand Up @@ -2,6 +2,30 @@
Change Log
==========================

3.6.3 (292)
--------------------------

### Improvements

- Assign `⌘⇧[` shortcut to “Show Next Tab” command instead of “Surround Selection with Brackets” command.
- Treat a logical line, which is delimited by line ending characters, as one line in VoiceOver, instead of a visual (wrapped) line.
- Thereby, users can now also know the current line number by pressing VoiceOver shortcut VO+F3.
- Improve the accessibility of user interface elements with VoiceOver.
- Avoid performing custom sort with an invalid parameter.
- Display default setting values as the input field's placeholder in preferences window when empty.
- [trivial] Move the focus to the target input field when the clear button in the find panel was pressed.


### Fixes

- Fix an issue where selected inspector pane was not stored.
- Fix an issue where initial display area shifted unwantedly if line numbers are displayed lines are unwrapped.
- Fix an issue where script name was not displayed in Console.
- Fix an issue where the writing direction (RtL) was not delivered to printing.
- Fix layout in some localized environment.



3.6.2 (290)
--------------------------

Expand All @@ -23,7 +47,7 @@ Change Log

- Fix an issue where the cursor position did not restore correctly after repeatedly undoing & redoing bracket insertion with the “Automatically insert closing brackets and quotes” option enabled.
- Fix an issue where editor scrolled unwantedly after pasting something at a latter half part of the document with “Link URLs in document” option enabled.
- Fix an issue where URL link ranges expanded even if non-URL-related lines is pasted just after an URL.
- Fix an issue where URL link ranges expanded even if non-URL-related lines is pasted just after an URL.
- Fix an issue where the application could rarely crash under specific conditions.


Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Base.lproj/AppearancePane.storyboard
Expand Up @@ -2,7 +2,6 @@
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="WBM-EY-ENr">
<dependencies>
<deployment identifier="macosx"/>
<development version="10000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -578,6 +577,7 @@
</customView>
<connections>
<outlet property="fontField" destination="wT1-jD-6aC" id="bP0-VX-1Yp"/>
<outlet property="lineHeightField" destination="5XW-Ju-Ix5" id="hEH-sP-bVE"/>
<outlet property="themeTableMenu" destination="M4k-Ev-Myg" id="fHl-oM-EJc"/>
<outlet property="themeTableView" destination="8ed-Dt-hO9" id="00r-aw-jk5"/>
</connections>
Expand Down
107 changes: 107 additions & 0 deletions CotEditor/Base.lproj/ConsolePanel.storyboard
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="EcT-zs-4uz">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Window Controller-->
<scene sceneID="Ra4-72-mvU">
<objects>
<windowController showSeguePresentationStyle="single" id="EcT-zs-4uz" customClass="ConsoleWindowController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
<window key="window" title="Console" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" tabbingMode="disallowed" id="6" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES" utility="YES"/>
<rect key="contentRect" x="196" y="240" width="360" height="200"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<toolbar key="toolbar" implicitIdentifier="E6F3CCE9-4AD4-47B3-9EF1-E93EBADCE675" autosavesConfiguration="NO" displayMode="iconOnly" sizeMode="regular" id="NNy-0g-def">
<allowedToolbarItems>
<toolbarItem implicitItemIdentifier="09F2FD3D-BD1E-4463-A6B1-D523662F7AFD" label="Clear Log" paletteLabel="Clear Log" image="ClearTemplate" sizingBehavior="auto" id="Yei-b2-m1J">
<nil key="toolTip"/>
<button key="view" verticalHuggingPriority="750" id="LmD-iK-XXv">
<rect key="frame" x="8" y="14" width="42" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="push" bezelStyle="rounded" image="ClearTemplate" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="OJt-Sj-vUu">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<connections>
<action selector="clear:" target="3xK-fF-oQg" id="qND-oe-MCq"/>
</connections>
</toolbarItem>
</allowedToolbarItems>
<defaultToolbarItems>
<toolbarItem reference="Yei-b2-m1J"/>
</defaultToolbarItems>
</toolbar>
<connections>
<outlet property="delegate" destination="EcT-zs-4uz" id="UWD-21-Okb"/>
</connections>
</window>
<connections>
<segue destination="8Qv-fh-klx" kind="relationship" relationship="window.shadowedContentViewController" id="7Cv-ri-pVk"/>
</connections>
</windowController>
<customObject id="3xK-fF-oQg" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-124" y="-15"/>
</scene>
<!--Console View Controller-->
<scene sceneID="fBr-T5-CBB">
<objects>
<viewController id="8Qv-fh-klx" customClass="ConsoleViewController" customModule="CotEditor" customModuleProvider="target" sceneMemberID="viewController">
<visualEffectView key="view" appearanceType="inheritedVibrantLight" blendingMode="behindWindow" material="underWindowBackground" state="followsWindowActiveState" id="zKt-hT-VXP">
<rect key="frame" x="0.0" y="0.0" width="360" height="200"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pbR-PK-wLW">
<rect key="frame" x="0.0" y="0.0" width="360" height="200"/>
<clipView key="contentView" drawsBackground="NO" id="IIt-Hg-Hn1">
<rect key="frame" x="0.0" y="0.0" width="360" height="200"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="bar" incrementalSearchingEnabled="YES" allowsNonContiguousLayout="YES" smartInsertDelete="YES" id="NIi-Kj-Qca">
<rect key="frame" x="0.0" y="0.0" width="360" height="200"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<size key="minSize" width="360" height="200"/>
<size key="maxSize" width="450" height="10000000"/>
<color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
</textView>
</subviews>
</clipView>
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="NO" id="wum-yU-z29">
<rect key="frame" x="346" y="0.0" width="14" height="200"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="pbR-PK-wLW" secondAttribute="bottom" id="LAC-O4-1gW"/>
<constraint firstAttribute="trailing" secondItem="pbR-PK-wLW" secondAttribute="trailing" id="MCm-OJ-GW6"/>
<constraint firstItem="pbR-PK-wLW" firstAttribute="top" secondItem="zKt-hT-VXP" secondAttribute="top" id="ttC-vW-Oop"/>
<constraint firstItem="pbR-PK-wLW" firstAttribute="leading" secondItem="zKt-hT-VXP" secondAttribute="leading" id="wcp-gt-oEd"/>
</constraints>
</visualEffectView>
<connections>
<outlet property="textFinder" destination="hzY-Bm-wcu" id="ebd-b8-iX6"/>
<outlet property="textView" destination="NIi-Kj-Qca" id="49x-Uf-zhI"/>
</connections>
</viewController>
<customObject id="RSJ-fj-Hpl" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
<textFinder incrementalSearchingEnabled="YES" id="hzY-Bm-wcu">
<connections>
<outlet property="client" destination="NIi-Kj-Qca" id="Mhr-Dc-cvz"/>
<outlet property="findBarContainer" destination="pbR-PK-wLW" id="RbM-S5-OKQ"/>
</connections>
</textFinder>
</objects>
<point key="canvasLocation" x="297" y="-15"/>
</scene>
</scenes>
<resources>
<image name="ClearTemplate" width="15" height="16"/>
</resources>
</document>
106 changes: 0 additions & 106 deletions CotEditor/Base.lproj/ConsolePanel.xib

This file was deleted.

0 comments on commit 4edf7d2

Please sign in to comment.