github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-23 21:57:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove overwrite and freehanded toggles

Browse Source 
Both from code and the menus. These were not implemented and I see no real reason to implement freehanded movement as a toggle since it is easily obtainable via column selections or option-clicking beyond EOL.

Overwrite mode might be implemented, but rather low priority.
This commit is contained in:
Allan Odgaard
2012-09-09 18:53:34 +02:00
parent aed4c1c27f
commit 6156cf87d7
5 changed files with 2 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Applications/TextMate/resources/English.lproj/MainMenu.xib
View File

@@ -551,24 +551,6 @@
<string key="NSTitle">Mode</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="1012679922">
<reference key="NSMenu" ref="218343808"/>
<string key="NSTitle">Freehanded Editing</string>
<string key="NSKeyEquiv">e</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="944637517"/>
<reference key="NSMixedImage" ref="596846250"/>
</object>
<object class="NSMenuItem" id="891743585">
<reference key="NSMenu" ref="218343808"/>
<string key="NSTitle">Overwrite Mode</string>
<string key="NSKeyEquiv">o</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="944637517"/>
<reference key="NSMixedImage" ref="596846250"/>
</object>
<object class="NSMenuItem" id="822810231">
<reference key="NSMenu" ref="218343808"/>
<string key="NSTitle">Soft Tabs (Use Spaces Instead of Tabs)</string>
@@ -3288,14 +3270,6 @@
</object>
<int key="connectionID">541</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleFreehandedEditing:</string>
<reference key="source" ref="51167417"/>
<reference key="destination" ref="1012679922"/>
</object>
<int key="connectionID">542</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">goForward:</string>
@@ -3360,14 +3334,6 @@
</object>
<int key="connectionID">580</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleOverwriteMode:</string>
<reference key="source" ref="51167417"/>
<reference key="destination" ref="891743585"/>
</object>
<int key="connectionID">583</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">reload:</string>
@@ -4361,8 +4327,6 @@
<reference key="object" ref="218343808"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1012679922"/>
<reference ref="891743585"/>
<reference ref="822810231"/>
</object>
<reference key="parent" ref="272970472"/>
@@ -5029,16 +4993,6 @@
<reference key="object" ref="1005346662"/>
<reference key="parent" ref="1104"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">488</int>
<reference key="object" ref="1012679922"/>
<reference key="parent" ref="218343808"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">489</int>
<reference key="object" ref="891743585"/>
<reference key="parent" ref="218343808"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">490</int>
<reference key="object" ref="822810231"/>
@@ -5745,8 +5699,6 @@
<string>485.IBPluginDependency</string>
<string>486.IBPluginDependency</string>
<string>487.IBPluginDependency</string>
<string>488.IBPluginDependency</string>
<string>489.IBPluginDependency</string>
<string>490.IBPluginDependency</string>
<string>495.IBPluginDependency</string>
<string>496.IBPluginDependency</string>
@@ -6100,8 +6052,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>

4
Frameworks/OakTextView/src/OTVStatusBar.h
View File

@@ -6,9 +6,7 @@
text::range_t caretPosition;
NSString* grammarName;
NSString* symbolName;
BOOL overwriteMode;
BOOL isMacroRecording;
BOOL freehandedEditing;
BOOL softTabs;
int32_t tabSize;
BOOL showResizeThumb;
@@ -22,9 +20,7 @@
- (void)setCaretPosition:(std::string const&)range;
@property (nonatomic, copy) NSString* grammarName;
@property (nonatomic, copy) NSString* symbolName;
@property (nonatomic, assign) BOOL overwriteMode;
@property (nonatomic, assign) BOOL isMacroRecording;
@property (nonatomic, assign) BOOL freehandedEditing;
@property (nonatomic, assign) BOOL softTabs;
@property (nonatomic, assign) int32_t tabSize;
@property (nonatomic, assign) BOOL showResizeThumb;

16
Frameworks/OakTextView/src/OTVStatusBar.mm
View File

@@ -10,7 +10,7 @@
const NSInteger BundleItemSelector = 1;
@implementation OTVStatusBar
@synthesize recordingTimer, pulsedRecordingIndicator, grammarName, symbolName, overwriteMode, isMacroRecording, freehandedEditing, tabSize, softTabs, showResizeThumb;
@synthesize recordingTimer, pulsedRecordingIndicator, grammarName, symbolName, isMacroRecording, tabSize, softTabs, showResizeThumb;
@synthesize delegate;
- (void)update
@@ -30,8 +30,6 @@ const NSInteger BundleItemSelector = 1;
sb::cell_t::popup(gearImage, @selector(showBundleItemSelector:), self.delegate).set_tag(BundleItemSelector),
sb::cell_t::popup(tabSizeText, @selector(showTabSizeSelector:), self.delegate),
sb::cell_t::popup([symbolName UTF8String] ?: "Symbol", @selector(showSymbolSelector:), self.delegate).size(200, CGFLOAT_MAX),
sb::cell_t::button(overwriteMode ? "OW" : "", @selector(toggleOverwriteMode:), self.delegate).no_padding().size(18),
sb::cell_t::button(freehandedEditing ? "FE" : "", @selector(toggleFreehandedEditing:), self.delegate).no_padding().size(18),
sb::cell_t::button(pulsedRecordingIndicator, @selector(toggleMacroRecording:), self.delegate).no_padding().size(17),
showResizeThumb ? sb::cell_t::button(splitViewThumb, NULL, nil).no_padding().size(15) : sb::cell_t::info().size(15),
};
@@ -70,12 +68,6 @@ const NSInteger BundleItemSelector = 1;
[self update];
}
- (void)setOverwriteMode:(BOOL)flag
{
overwriteMode = flag;
[self update];
}
- (void)setRecordingTimer:(NSTimer*)aTimer
{
if(aTimer != recordingTimer)
@@ -102,12 +94,6 @@ const NSInteger BundleItemSelector = 1;
[self update];
}
- (void)setFreehandedEditing:(BOOL)flag
{
freehandedEditing = flag;
[self update];
}
- (void)setCaretPosition:(std::string const&)range
{
caretPosition = range;

4
Frameworks/OakTextView/src/OakDocumentView.mm
View File

@@ -31,7 +31,7 @@ static NSString* const kFoldingsColumnIdentifier = @"foldings";
- (void)updateStyle;
@end
static NSString* const ObservedTextViewKeyPaths[] = { @"selectionString", @"tabSize", @"softTabs", @"freehandedEditing", @"overwriteMode", @"isMacroRecording"};
static NSString* const ObservedTextViewKeyPaths[] = { @"selectionString", @"tabSize", @"softTabs", @"isMacroRecording"};
struct document_view_callback_t : document::document_t::callback_t
{
@@ -671,8 +671,6 @@ private:
[tabSizeSelectorPanel makeKeyAndOrderFront:self];
}
- (IBAction)toggleOverwriteMode:(id)sender { /*[textView toggleOverwriteMode:sender];*/ }
- (IBAction)toggleFreehandedEditing:(id)sender { /*[textView toggleFreehandedEditing:sender];*/ }
- (IBAction)toggleMacroRecording:(id)sender { [textView toggleMacroRecording:sender]; }
- (IBAction)takeThemeUUIDFrom:(id)sender

3
Frameworks/OakTextView/src/OakTextView.mm
View File

@@ -1827,9 +1827,6 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac
- (BOOL)hasMultiLineSelection { return multiline(document->buffer(), editor->ranges()); }
- (BOOL)freehandedEditing { return NO; }
- (BOOL)overwriteMode { return NO; }
- (IBAction)toggleShowInvisibles:(id)sender
{
self.showInvisibles = !self.showInvisibles;