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

Remove "Insert encoding with ..." actions (#559)

Browse Source
This commit is contained in:
1024jp 2016-05-30 00:08:23 +09:00
parent 93dae55813
commit 4c9211a224
7 changed files with 19 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -11,6 +11,9 @@ develop
- Remove “Not writable” alert which displayed on file opening.
- New acknowledgements window.
- Add help buttons to syntax style editor.
- Remove less important text actions:
- Insert Encoding Name with “charset=”
- Insert Encoding Name with “encoding=”
- Display dialogs while changing file enocoding as a document-modal sheet.
- Better syntax highlighting while editing.
- Enable activate “Show Invisibles” action even if all of invisible characters were set as not shown when the document was opened.

28
CotEditor/Base.lproj/MainMenu.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="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
</dependencies>
<objects>
@ -829,29 +828,10 @@ CA
<menuItem isSeparatorItem="YES" id="597">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Insert Encoding Name" id="661">
<menu key="submenu" title="Insert Encoding Name" id="662">
<items>
<menuItem title="as IANA Charset" id="663">
<connections>
<action selector="insertIANACharSetName:" target="-1" id="666"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="664">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="with “charset=”" id="665">
<connections>
<action selector="insertIANACharSetNameWithCharset:" target="-1" id="668"/>
</connections>
</menuItem>
<menuItem title="with “encoding=”" id="667">
<connections>
<action selector="insertIANACharSetNameWithEncoding:" target="-1" id="669"/>
</connections>
</menuItem>
</items>
</menu>
<menuItem title="Insert Encoding Name" toolTip="Inesrt encoding name as IANA charset name" id="663">
<connections>
<action selector="insertIANACharSetName:" target="-1" id="666"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="640">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>

2
CotEditor/Sources/CEDocument.h
View File

@ -86,7 +86,5 @@ extern NSString *_Nonnull const CEDocumentSyntaxStyleDidChangeNotification;
- (IBAction)changeEncoding:(nullable id)sender;
- (IBAction)changeSyntaxStyle:(nullable id)sender;
- (IBAction)insertIANACharSetName:(nullable id)sender;
- (IBAction)insertIANACharSetNameWithCharset:(nullable id)sender;
- (IBAction)insertIANACharSetNameWithEncoding:(nullable id)sender;
@end

30
CotEditor/Sources/CEDocument.m
View File

@ -1274,36 +1274,6 @@ NSString *_Nonnull const CEDocumentSyntaxStyleDidChangeNotification = @"CEDocume
}
// ------------------------------------------------------
/// IANA文字コード名を挿入する
- (IBAction)insertIANACharSetNameWithCharset:(nullable id)sender
// ------------------------------------------------------
{
NSString *string = [NSString IANACharSetNameOfStringEncoding:[self encoding]];
if (!string) { return; }
NSString *insertionString = [NSString stringWithFormat:@"charset=\"%@\"", string];
[[self editor] insertTextViewString:insertionString];
}
// ------------------------------------------------------
/// IANA文字コード名を挿入する
- (IBAction)insertIANACharSetNameWithEncoding:(nullable id)sender
// ------------------------------------------------------
{
NSString *string = [NSString IANACharSetNameOfStringEncoding:[self encoding]];
if (!string) { return; }
NSString *insertionString = [NSString stringWithFormat:@"encoding=\"%@\"", string];
[[self editor] insertTextViewString:insertionString];
}
#pragma mark Private Methods

14
CotEditor/de.lproj/MainMenu.strings
View File

@ -389,16 +389,10 @@
/* Class = "NSMenuItem"; title = "Modified NFD (HFS+)"; ObjectID = "NU7-EI-1Ct"; */
"NU7-EI-1Ct.title" = "Modifizierte NFD (HFS+)";
/* Class = "NSMenuItem"; title = "Insert Encoding Name"; ObjectID = "661"; */
"661.title" = "Codierungsnamen hinzufügen";
/* Class = "NSMenu"; title = "Insert Encoding Name"; ObjectID = "662"; */
"662.title" = "Codierungsnamen hinzufügen";
/* Class = "NSMenuItem"; title = "as IANA Charset"; ObjectID = "663"; */
"663.title" = "als IANA Charset";
/* Class = "NSMenuItem"; title = "with “charset=”"; ObjectID = "665"; */
"665.title" = "mit „charset=“";
/* Class = "NSMenuItem"; title = "with “encoding=”"; ObjectID = "667"; */
"667.title" = "mit „encoding=“";
/* Class = "NSMenuItem"; title = "Insert IANA Charset Name"; ObjectID = "663"; */
"663.title" = "Codierungsname als IANA-Charset hinzufügen";
/* Class = "NSMenuItem"; title = "Insert encoding name as IANA charset"; ObjectID = "663"; */
"663.ibShadowedToolTip" = "Codierungsname als IANA-Charset hinzufügen";
/* Class = "NSMenuItem"; title = "Inspect Character"; ObjectID = "ToR-yH-ahH"; */
"ToR-yH-ahH.title" = "Zeicheninformation einblenden";

14
CotEditor/ja.lproj/MainMenu.strings
View File

@ -388,16 +388,10 @@
/* Class = "NSMenuItem"; title = "Modified NFD (HFS+)"; ObjectID = "NU7-EI-1Ct"; */
"NU7-EI-1Ct.title" = "修正 NFD (HFS+)";
/* Class = "NSMenuItem"; title = "Insert Encoding Name"; ObjectID = "661"; */
"661.title" = "エンコーディング名を挿入";
/* Class = "NSMenu"; title = "Insert Encoding Name"; ObjectID = "662"; */
"662.title" = "エンコーディング名を挿入";
/* Class = "NSMenuItem"; title = "as IANA Charset"; ObjectID = "663"; */
"663.title" = "IANA 文字コード名";
/* Class = "NSMenuItem"; title = "with “charset=”"; ObjectID = "665"; */
"665.title" = "“charset=”形式";
/* Class = "NSMenuItem"; title = "with “encoding=”"; ObjectID = "667"; */
"667.title" = "“encoding=”形式";
/* Class = "NSMenuItem"; title = "Insert IANA Charset Name"; ObjectID = "663"; */
"663.title" = "IANA エンコーディング名を挿入";
/* Class = "NSMenuItem"; title = "Insert encoding name as IANA charset"; ObjectID = "663"; */
"663.ibShadowedToolTip" = "エンコーディング名をIANA 文字コード名として挿入";
/* Class = "NSMenuItem"; title = "Inspect Character"; ObjectID = "ToR-yH-ahH"; */
"ToR-yH-ahH.title" = "文字情報を表示";

14
CotEditor/zh-Hans.lproj/MainMenu.strings
View File

@ -390,16 +390,10 @@
/* Class = "NSMenuItem"; title = "Modified NFD (HFS+)"; ObjectID = "NU7-EI-1Ct"; */
"NU7-EI-1Ct.title" = "修改 NFD (HFS+)";
/* Class = "NSMenuItem"; title = "Insert Encoding Name"; ObjectID = "661"; */
"661.title" = "插入编码名字";
/* Class = "NSMenu"; title = "Insert Encoding Name"; ObjectID = "662"; */
"662.title" = "插入编码名字";
/* Class = "NSMenuItem"; title = "as IANA Charset"; ObjectID = "663"; */
"663.title" = "以 IANA 字符集";
/* Class = "NSMenuItem"; title = "with “charset=”"; ObjectID = "665"; */
"665.title" = "以“charset=”";
/* Class = "NSMenuItem"; title = "with “encoding=”"; ObjectID = "667"; */
"667.title" = "以“encoding=”";
/* Class = "NSMenuItem"; title = "Insert IANA Charset Name"; ObjectID = "663"; */
"663.title" = "插入编码名字"; // FIXME: updated
/* Class = "NSMenuItem"; title = "Insert encoding name as IANA charset"; ObjectID = "663"; */
"663.ibShadowedToolTip" = "插入编码名字以 IANA 字符集";
/* Class = "NSMenuItem"; title = "Inspect Character"; ObjectID = "ToR-yH-ahH"; */
"ToR-yH-ahH.title" = "检视文字";