Skip to content
Snippets Groups Projects
Commit 34150ab3 authored by George Nachman's avatar George Nachman
Browse files

Adhoc build 3.0.20170219_104700

parent 7e37f106
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Interfaces/PreferencePanel.xib
+ 2
− 3
View file @ 34150ab3
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
<capability name="box content view" minToolsVersion="7.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -3446,7 +3445,7 @@ DQ
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<clipView key="contentView" id="ArV-0K-qze">
<rect key="frame" x="1" y="1" width="511" height="95"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" id="5661">
<rect key="frame" x="0.0" y="0.0" width="511" height="95"/>
@@ -4046,7 +4045,7 @@ DQ
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<clipView key="contentView" id="FMp-vf-IvG">
<rect key="frame" x="1" y="1" width="519" height="76"/>
<autoresizingMask key="autoresizingMask"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" id="69M-P0-mzb">
<rect key="frame" x="0.0" y="0.0" width="519" height="76"/>
plists/iTerm2.plist
+ 41
− 41
View file @ 34150ab3
@@ -56,6 +56,47 @@
</array>
</dict>
</array>
<key>NSServices</key>
<array>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>New iTerm2 Tab Here</string>
</dict>
<key>NSMessage</key>
<string>openTab</string>
<key>NSRequiredContext</key>
<dict>
<key>NSTextContent</key>
<string>FilePath</string>
</dict>
<key>NSSendTypes</key>
<array>
<string>NSFilenamesPboardType</string>
<string>public.plain-text</string>
</array>
</dict>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>New iTerm2 Window Here</string>
</dict>
<key>NSMessage</key>
<string>openWindow</string>
<key>NSRequiredContext</key>
<dict>
<key>NSTextContent</key>
<string>FilePath</string>
</dict>
<key>NSSendTypes</key>
<array>
<string>NSFilenamesPboardType</string>
<string>public.plain-text</string>
</array>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>iTerm2</string>
<key>CFBundleGetInfoString</key>
@@ -177,47 +218,6 @@
</array>
</dict>
</array>
<key>NSServices</key>
<array>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>New iTerm2 Tab Here</string>
</dict>
<key>NSMessage</key>
<string>openTab</string>
<key>NSRequiredContext</key>
<dict>
<key>NSTextContent</key>
<string>FilePath</string>
</dict>
<key>NSSendTypes</key>
<array>
<string>NSFilenamesPboardType</string>
<string>public.plain-text</string>
</array>
</dict>
<dict>
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>New iTerm2 Window Here</string>
</dict>
<key>NSMessage</key>
<string>openWindow</string>
<key>NSRequiredContext</key>
<dict>
<key>NSTextContent</key>
<string>FilePath</string>
</dict>
<key>NSSendTypes</key>
<array>
<string>NSFilenamesPboardType</string>
<string>public.plain-text</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>unknown</string>
<key>LSApplicationCategoryType</key>
sources/iTermSemanticHistoryController.m
+ 8
− 1
View file @ 34150ab3
@@ -126,6 +126,10 @@ NSString *const kSemanticHistoryWorkingDirectorySubstitutionKey = @"semanticHist
[self launchAppWithBundleIdentifier:kAtomIdentifier path:path];
}
 
- (void)launchVisualStudioCodeWithPath:(NSString *)path {
[self launchAppWithBundleIdentifier:kVisualStudioCodeIdentifier path:path];
}
- (void)launchAppWithBundleIdentifier:(NSString *)bundleIdentifier path:(NSString *)path {
NSString *bundlePath =
[[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:bundleIdentifier];
@@ -172,7 +176,8 @@ NSString *const kSemanticHistoryWorkingDirectorySubstitutionKey = @"semanticHist
kMacVimIdentifier,
kTextmateIdentifier,
kTextmate2Identifier,
kBBEditIdentifier ];
kBBEditIdentifier,
kVisualStudioCodeIdentifier ];
}
 
- (void)openFile:(NSString *)path
@@ -185,6 +190,8 @@ NSString *const kSemanticHistoryWorkingDirectorySubstitutionKey = @"semanticHist
path = [NSString stringWithFormat:@"%@:%@", path, lineNumber];
}
[self launchAtomWithPath:path];
} else if ([identifier isEqualToString:kVisualStudioCodeIdentifier]) {
[self launchVisualStudioCodeWithPath:path];
} else if ([identifier isEqualToString:kSublimeText2Identifier] ||
[identifier isEqualToString:kSublimeText3Identifier]) {
if (lineNumber != nil) {
sources/iTermSemanticHistoryPrefsController.h
+ 1
− 0
View file @ 34150ab3
@@ -16,6 +16,7 @@ extern NSString *kSublimeText2Identifier;
extern NSString *kSublimeText3Identifier;
extern NSString *kMacVimIdentifier;
extern NSString *kAtomIdentifier;
extern NSString *kVisualStudioCodeIdentifier;
extern NSString *kTextmateIdentifier;
extern NSString *kTextmate2Identifier;
extern NSString *kBBEditIdentifier;
sources/iTermSemanticHistoryPrefsController.m
+ 14
− 6
View file @ 34150ab3
@@ -22,6 +22,7 @@ NSString *kTextmateIdentifier = @"com.macromates.TextMate";
NSString *kTextmate2Identifier = @"com.macromates.TextMate.preview";
NSString *kBBEditIdentifier = @"com.barebones.bbedit";
NSString *kAtomIdentifier = @"com.github.atom";
NSString *kVisualStudioCodeIdentifier = @"com.microsoft.VSCode";
NSString *kSemanticHistoryBestEditorAction = @"best editor";
NSString *kSemanticHistoryUrlAction = @"url";
NSString *kSemanticHistoryEditorAction = @"editor";
@@ -45,6 +46,7 @@ enum {
kSublimeText3Tag,
kAtomTag,
kTextmate2Tag,
kVisualStudioCodeTag
// Only append to the end of the list; never delete or change.
};
 
@@ -91,7 +93,8 @@ enum {
kTextmateIdentifier: @"txmt",
kTextmate2Identifier: @"txmt",
kBBEditIdentifier: @"txmt",
kAtomIdentifier: @"atom" };
kAtomIdentifier: @"atom",
kVisualStudioCodeIdentifier: @"vscode" };
return schemes[editor];
}
 
@@ -103,7 +106,8 @@ enum {
kTextmateIdentifier,
kTextmate2Identifier,
kBBEditIdentifier,
kAtomIdentifier ];
kAtomIdentifier,
kVisualStudioCodeIdentifier ];
}
 
+ (NSString *)bestEditor {
@@ -122,7 +126,8 @@ enum {
kTextmateIdentifier,
kTextmate2Identifier,
kBBEditIdentifier,
kAtomIdentifier ];
kAtomIdentifier,
kVisualStudioCodeIdentifier ];
return [editorBundleIds containsObject:bundleId];
}
 
@@ -133,7 +138,8 @@ enum {
kTextmateIdentifier: @(kTextmateTag),
kTextmate2Identifier: @(kTextmate2Tag),
kBBEditIdentifier: @(kBBEditTag),
kAtomIdentifier: @(kAtomTag) };
kAtomIdentifier: @(kAtomTag),
kVisualStudioCodeIdentifier: @(kVisualStudioCodeTag) };
return tags;
}
 
@@ -144,7 +150,8 @@ enum {
kTextmateIdentifier: @"Textmate",
kTextmate2Identifier: @"Textmate Preview",
kBBEditIdentifier: @"BBEdit",
kAtomIdentifier: @"Atom" };
kAtomIdentifier: @"Atom",
kVisualStudioCodeIdentifier: @"Visual Studio Code" };
 
NSDictionary *tags = [[self class] identifierToTagMap];
 
@@ -199,7 +206,8 @@ enum {
@(kTextmateTag): kTextmateIdentifier,
@(kTextmate2Tag): kTextmate2Identifier,
@(kBBEditTag): kBBEditIdentifier,
@(kAtomTag): kAtomIdentifier };
@(kAtomTag): kAtomIdentifier,
@(kVisualStudioCodeTag): kVisualStudioCodeIdentifier };
return map[@([[editors_ selectedItem] tag])];
}
 
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment