From ae260b9a723af310cde39d41087877813237dfa4 Mon Sep 17 00:00:00 2001 From: 1024jp <1024jp@wolfrosch.com> Date: Fri, 26 Dec 2014 23:19:25 +0100 Subject: [PATCH] Use more CEWrappingTextFied --- CHANGELOG.md | 3 +-- CotEditor/Base.lproj/DocumentInspectorView.xib | 3 +-- CotEditor/Base.lproj/EncodingListSheet.xib | 1 + CotEditor/Base.lproj/IncompatibleCharsView.xib | 10 +++------- CotEditor/Base.lproj/MenuKeyBindingEditSheet.xib | 2 +- CotEditor/Base.lproj/SyntaxEditSheet.xib | 5 ++--- CotEditor/Base.lproj/TextKeyBindingEditSheet.xib | 2 +- CotEditor/CotEditor.xcodeproj/project.pbxproj | 12 ++++++------ .../Sources/{CETextField.h => CEWrappingTextField.h} | 4 ++-- .../Sources/{CETextField.m => CEWrappingTextField.m} | 6 +++--- 10 files changed, 21 insertions(+), 27 deletions(-) rename CotEditor/Sources/{CETextField.h => CEWrappingTextField.h} (94%) rename CotEditor/Sources/{CETextField.m => CEWrappingTextField.m} (94%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 594ace8f5..9023a56e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/CotEditor/Base.lproj/DocumentInspectorView.xib b/CotEditor/Base.lproj/DocumentInspectorView.xib index 4140df511..8d13e109b 100644 --- a/CotEditor/Base.lproj/DocumentInspectorView.xib +++ b/CotEditor/Base.lproj/DocumentInspectorView.xib @@ -1,7 +1,6 @@ - @@ -421,7 +420,7 @@ - + diff --git a/CotEditor/Base.lproj/EncodingListSheet.xib b/CotEditor/Base.lproj/EncodingListSheet.xib index adb56092e..4a3ec0c80 100644 --- a/CotEditor/Base.lproj/EncodingListSheet.xib +++ b/CotEditor/Base.lproj/EncodingListSheet.xib @@ -197,6 +197,7 @@ Auto-Detect tries these encodings from the top of the list. + diff --git a/CotEditor/Base.lproj/IncompatibleCharsView.xib b/CotEditor/Base.lproj/IncompatibleCharsView.xib index 14ad3cece..327f74846 100644 --- a/CotEditor/Base.lproj/IncompatibleCharsView.xib +++ b/CotEditor/Base.lproj/IncompatibleCharsView.xib @@ -1,7 +1,6 @@ - @@ -112,7 +111,7 @@ - + @@ -178,11 +177,8 @@ - - - - - + + diff --git a/CotEditor/Base.lproj/MenuKeyBindingEditSheet.xib b/CotEditor/Base.lproj/MenuKeyBindingEditSheet.xib index e9b0aa767..6742ee6f5 100644 --- a/CotEditor/Base.lproj/MenuKeyBindingEditSheet.xib +++ b/CotEditor/Base.lproj/MenuKeyBindingEditSheet.xib @@ -22,7 +22,7 @@ - + diff --git a/CotEditor/Base.lproj/SyntaxEditSheet.xib b/CotEditor/Base.lproj/SyntaxEditSheet.xib index eab804d6d..002a79af4 100644 --- a/CotEditor/Base.lproj/SyntaxEditSheet.xib +++ b/CotEditor/Base.lproj/SyntaxEditSheet.xib @@ -1,7 +1,6 @@ - @@ -3337,9 +3336,9 @@ - + - + diff --git a/CotEditor/Base.lproj/TextKeyBindingEditSheet.xib b/CotEditor/Base.lproj/TextKeyBindingEditSheet.xib index d2306e9ae..dccdf37c1 100644 --- a/CotEditor/Base.lproj/TextKeyBindingEditSheet.xib +++ b/CotEditor/Base.lproj/TextKeyBindingEditSheet.xib @@ -24,7 +24,7 @@ - + diff --git a/CotEditor/CotEditor.xcodeproj/project.pbxproj b/CotEditor/CotEditor.xcodeproj/project.pbxproj index 24a87b7a4..c8c6b5372 100644 --- a/CotEditor/CotEditor.xcodeproj/project.pbxproj +++ b/CotEditor/CotEditor.xcodeproj/project.pbxproj @@ -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 = ""; }; 2AA0AC781A29D8CB0063ED1B /* CEPopUpToolbarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEPopUpToolbarItem.h; sourceTree = ""; }; 2AA0AC791A29D8CB0063ED1B /* CEPopUpToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEPopUpToolbarItem.m; sourceTree = ""; }; - 2AAC8FFF1A4E12D10074E076 /* CETextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CETextField.h; sourceTree = ""; }; - 2AAC90001A4E12D10074E076 /* CETextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CETextField.m; sourceTree = ""; }; + 2AAC8FFF1A4E12D10074E076 /* CEWrappingTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEWrappingTextField.h; sourceTree = ""; }; + 2AAC90001A4E12D10074E076 /* CEWrappingTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEWrappingTextField.m; sourceTree = ""; }; 2AACC9571942A82900E3FF63 /* CEIndicatorSheetController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEIndicatorSheetController.h; sourceTree = ""; }; 2AACC9581942A82900E3FF63 /* CEIndicatorSheetController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEIndicatorSheetController.m; sourceTree = ""; }; 2AB4326F1912AF7200835004 /* CEGlyphPopoverController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEGlyphPopoverController.h; sourceTree = ""; }; @@ -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 = ""; @@ -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 */, diff --git a/CotEditor/Sources/CETextField.h b/CotEditor/Sources/CEWrappingTextField.h similarity index 94% rename from CotEditor/Sources/CETextField.h rename to CotEditor/Sources/CEWrappingTextField.h index 4cb58b142..488c159d5 100644 --- a/CotEditor/Sources/CETextField.h +++ b/CotEditor/Sources/CEWrappingTextField.h @@ -1,6 +1,6 @@ /* ============================================================================== - CETextField + CEWrappingTextField CotEditor http://coteditor.com @@ -30,6 +30,6 @@ @import Cocoa; -@interface CETextField : NSTextField +@interface CEWrappingTextField : NSTextField @end diff --git a/CotEditor/Sources/CETextField.m b/CotEditor/Sources/CEWrappingTextField.m similarity index 94% rename from CotEditor/Sources/CETextField.m rename to CotEditor/Sources/CEWrappingTextField.m index 77e7a8ab8..3aa29e403 100644 --- a/CotEditor/Sources/CETextField.m +++ b/CotEditor/Sources/CEWrappingTextField.m @@ -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