coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-10-26 19:10:11 +03:00
Code Issues Projects Releases Wiki Activity

Use more CEWrappingTextFied

Browse Source
This commit is contained in:
1024jp 2014-12-26 23:19:25 +01:00
parent caacb03351
commit ae260b9a72
10 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -23,11 +23,9 @@ Change Log
- Close Preferences window with esc key.
- Improve find result panel behavior with Spaces.
- Delay timing to save text key bindings setting.
- Update UI elements' text color on Yosemite.
- Tweak window size sample window.
### Fixes
- Fix duplication check in key bindings editor.
@ -37,6 +35,7 @@ Change Log
- Fix a possible crash on Japanese input.
- Fix some missing localizations in simplified Chinese. (Thanks to Wei Wang!)
- Fix an issue that an alert message was not localized.
- And other trivial UI fixes and enhancements.

3
CotEditor/Base.lproj/DocumentInspectorView.xib
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
</dependencies>
<objects>
@ -421,7 +420,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="WDa-oe-PRZ" customClass="CETextField">
<textField horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="WDa-oe-PRZ" customClass="CEWrappingTextField">
<rect key="frame" x="90" y="268" width="124" height="28"/>
<constraints>
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="128" id="0N6-kr-Zlr"/>

1
CotEditor/Base.lproj/EncodingListSheet.xib
View File

@ -197,6 +197,7 @@ Auto-Detect tries these encodings from the top of the list.</string>
<constraint firstAttribute="bottom" secondItem="42" secondAttribute="bottom" constant="20" symbolic="YES" id="RUg-QY-MXl"/>
<constraint firstItem="38" firstAttribute="top" secondItem="56" secondAttribute="bottom" constant="8" symbolic="YES" id="Syx-Wi-LNT"/>
<constraint firstItem="42" firstAttribute="top" secondItem="38" secondAttribute="bottom" constant="20" symbolic="YES" id="UsJ-hk-9IV"/>
<constraint firstItem="42" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="700" secondAttribute="trailing" constant="12" symbolic="YES" id="ZWT-Y8-hTY"/>
<constraint firstItem="38" firstAttribute="leading" secondItem="37" secondAttribute="leading" constant="20" symbolic="YES" id="a28-Q1-dxx"/>
<constraint firstAttribute="trailing" secondItem="55" secondAttribute="trailing" constant="20" symbolic="YES" id="aMR-De-Syy"/>
<constraint firstItem="700" firstAttribute="leading" secondItem="37" secondAttribute="leading" constant="20" symbolic="YES" id="dyn-hT-SiN"/>

10
CotEditor/Base.lproj/IncompatibleCharsView.xib
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
</dependencies>
<objects>
@ -112,7 +111,7 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
<tableColumn editable="NO" width="79" minWidth="10" maxWidth="1000" id="2AE-nU-rdc">
<tableColumn editable="NO" width="65" minWidth="10" maxWidth="1000" id="2AE-nU-rdc">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Converted">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@ -178,11 +177,8 @@
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
<textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="iOD-RT-n3c">
<rect key="frame" x="10" y="390" width="200" height="28"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="28" id="mRi-uK-qcJ"/>
</constraints>
<textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="iOD-RT-n3c" customClass="CEWrappingTextField">
<rect key="frame" x="10" y="404" width="200" height="14"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="No incompatible chars were found." id="wsL-BG-Ii8">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>

2
CotEditor/Base.lproj/MenuKeyBindingEditSheet.xib
View File

@ -22,7 +22,7 @@
<rect key="frame" x="0.0" y="0.0" width="460" height="360"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="15">
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="15" customClass="CEWrappingTextField">
<rect key="frame" x="18" y="312" width="424" height="28"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="144">
<font key="font" metaFont="smallSystem"/>

5
CotEditor/Base.lproj/SyntaxEditSheet.xib
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
</dependencies>
<objects>
@ -3337,9 +3336,9 @@
<binding destination="jqJ-Ce-QDb" name="enabled" keyPath="canRemove" id="eQY-Ir-lOx"/>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="arv-de-MwR">
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="arv-de-MwR" customClass="CEWrappingTextField">
<rect key="frame" x="174" y="171" width="238" height="42"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Files that have exactly one of the following names are opened in this syntax style, even they don't have file extension." id="Sr3-Pj-HPi">
<textFieldCell key="cell" controlSize="small" truncatesLastVisibleLine="YES" sendsActionOnEndEditing="YES" title="Files that have exactly one of the following names are opened in this syntax style, even they don't have file extension." id="Sr3-Pj-HPi">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

2
CotEditor/Base.lproj/TextKeyBindingEditSheet.xib
View File

@ -24,7 +24,7 @@
<rect key="frame" x="0.0" y="0.0" width="460" height="360"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="64">
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="64" customClass="CEWrappingTextField">
<rect key="frame" x="18" y="312" width="424" height="28"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="150">
<font key="font" metaFont="smallSystem"/>

12
CotEditor/CotEditor.xcodeproj/project.pbxproj
View File

@ -105,7 +105,7 @@
2AA0AC4B1A26CDD60063ED1B /* RemoteEditorController.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 2A40D7CA1A23A60100721EB4 /* RemoteEditorController.applescript */; };
2AA0AC551A273F5D0063ED1B /* RemoteEditorController.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 2A40D7CA1A23A60100721EB4 /* RemoteEditorController.applescript */; };
2AA0AC7A1A29D8CB0063ED1B /* CEPopUpToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AA0AC791A29D8CB0063ED1B /* CEPopUpToolbarItem.m */; };
2AAC90011A4E12D10074E076 /* CETextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AAC90001A4E12D10074E076 /* CETextField.m */; };
2AAC90011A4E12D10074E076 /* CEWrappingTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AAC90001A4E12D10074E076 /* CEWrappingTextField.m */; };
2AACC9591942A82900E3FF63 /* CEIndicatorSheetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AACC9581942A82900E3FF63 /* CEIndicatorSheetController.m */; };
2AB4326E1912ADAC00835004 /* GlyphPopover.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2AB4326C1912ADAC00835004 /* GlyphPopover.xib */; };
2AB432711912AF7200835004 /* CEGlyphPopoverController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AB432701912AF7200835004 /* CEGlyphPopoverController.m */; };
@ -380,8 +380,8 @@
2AA0AC771A2877970063ED1B /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/PrintPane.strings"; sourceTree = "<group>"; };
2AA0AC781A29D8CB0063ED1B /* CEPopUpToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEPopUpToolbarItem.h; sourceTree = "<group>"; };
2AA0AC791A29D8CB0063ED1B /* CEPopUpToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEPopUpToolbarItem.m; sourceTree = "<group>"; };
2AAC8FFF1A4E12D10074E076 /* CETextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CETextField.h; sourceTree = "<group>"; };
2AAC90001A4E12D10074E076 /* CETextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CETextField.m; sourceTree = "<group>"; };
2AAC8FFF1A4E12D10074E076 /* CEWrappingTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEWrappingTextField.h; sourceTree = "<group>"; };
2AAC90001A4E12D10074E076 /* CEWrappingTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEWrappingTextField.m; sourceTree = "<group>"; };
2AACC9571942A82900E3FF63 /* CEIndicatorSheetController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEIndicatorSheetController.h; sourceTree = "<group>"; };
2AACC9581942A82900E3FF63 /* CEIndicatorSheetController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEIndicatorSheetController.m; sourceTree = "<group>"; };
2AB4326F1912AF7200835004 /* CEGlyphPopoverController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEGlyphPopoverController.h; sourceTree = "<group>"; };
@ -737,8 +737,8 @@
25B2C23507FA667400F4EFC7 /* CELineNumberView.m */,
25B2C24107FA68D100F4EFC7 /* CEStatusBarView.h */,
25B2C24207FA68D100F4EFC7 /* CEStatusBarView.m */,
2AAC8FFF1A4E12D10074E076 /* CETextField.h */,
2AAC90001A4E12D10074E076 /* CETextField.m */,
2AAC8FFF1A4E12D10074E076 /* CEWrappingTextField.h */,
2AAC90001A4E12D10074E076 /* CEWrappingTextField.m */,
);
name = Views;
sourceTree = "<group>";
@ -1384,7 +1384,7 @@
2A5411C9198549A7008B43DA /* CENavigationBarView.m in Sources */,
8CD7A93C09CBDDDC00739513 /* CEEditorView.m in Sources */,
2A149DC21901884500A9D6EF /* CEFileDropPaneController.m in Sources */,
2AAC90011A4E12D10074E076 /* CETextField.m in Sources */,
2AAC90011A4E12D10074E076 /* CEWrappingTextField.m in Sources */,
2AA0AC7A1A29D8CB0063ED1B /* CEPopUpToolbarItem.m in Sources */,
8C8CCCB109D6803400A008E5 /* CESplitView.m in Sources */,
2A68F93518F9995500673440 /* CEThemeManager.m in Sources */,

4
CotEditor/Sources/CETextField.h → CotEditor/Sources/CEWrappingTextField.h
View File

@ -1,6 +1,6 @@
/*
==============================================================================
CETextField
CEWrappingTextField
CotEditor
http://coteditor.com
@ -30,6 +30,6 @@
@import Cocoa;
@interface CETextField : NSTextField
@interface CEWrappingTextField : NSTextField
@end

6
CotEditor/Sources/CETextField.m → CotEditor/Sources/CEWrappingTextField.m
View File

@ -1,6 +1,6 @@
/*
==============================================================================
CETextField
CEWrappingTextField
CotEditor
http://coteditor.com
@ -27,10 +27,10 @@
==============================================================================
*/
#import "CETextField.h"
#import "CEWrappingTextField.h"
@implementation CETextField
@implementation CEWrappingTextField
#pragma mark Superclass Methods