Menu
▾
▴
SF.net SVN: iterm:[1854] trunk
|
From: <de...@us...> - 2009-09-28 04:06:52
|
Revision: 1854
http://iterm.svn.sourceforge.net/iterm/?rev=1854&view=rev
Author: delx
Date: 2009-09-28 04:06:45 +0000 (Mon, 28 Sep 2009)
Log Message:
-----------
Removed prev/next items from Window menu (fixes #2805216, #2688460)
Modified Paths:
--------------
trunk/Changelog
trunk/English.lproj/MainMenu.xib
trunk/iTermApplicationDelegate.h
trunk/iTermApplicationDelegate.m
trunk/iTermController.m
Modified: trunk/Changelog
===================================================================
--- trunk/Changelog 2009-09-28 03:50:55 UTC (rev 1853)
+++ trunk/Changelog 2009-09-28 04:06:45 UTC (rev 1854)
@@ -2,6 +2,7 @@
* Fixed IME when option key is set to meta/esc
* Fix auto update bug
* Fix showing toolbar when window is maximised (#2765328)
+ * Removed prev/next items from Window menu (fixes #2805216, #2688460)
2009-09-27 delx
* Fixed focus follows mouse not working when viewing scrollback (#2764633)
Modified: trunk/English.lproj/MainMenu.xib
===================================================================
--- trunk/English.lproj/MainMenu.xib 2009-09-28 03:50:55 UTC (rev 1853)
+++ trunk/English.lproj/MainMenu.xib 2009-09-28 04:06:45 UTC (rev 1854)
@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9G2133</string>
+ <string key="IBDocument.SystemVersion">9L30</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
- <string key="IBDocument.AppKitVersion">949.43</string>
+ <string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -868,35 +868,6 @@
<reference key="NSOnImage" ref="643967552"/>
<reference key="NSMixedImage" ref="326707852"/>
</object>
- <object class="NSMenuItem" id="606479112">
- <reference key="NSMenu" ref="704295309"/>
- <string key="NSTitle">Previous Terminal</string>
- <string key="NSKeyEquiv">`</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="643967552"/>
- <reference key="NSMixedImage" ref="326707852"/>
- </object>
- <object class="NSMenuItem" id="77932280">
- <reference key="NSMenu" ref="704295309"/>
- <string key="NSTitle">Next Terminal</string>
- <string key="NSKeyEquiv">~</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="643967552"/>
- <reference key="NSMixedImage" ref="326707852"/>
- </object>
- <object class="NSMenuItem" id="983824543">
- <reference key="NSMenu" ref="704295309"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="643967552"/>
- <reference key="NSMixedImage" ref="326707852"/>
- </object>
<object class="NSMenuItem" id="48039160">
<reference key="NSMenu" ref="704295309"/>
<string key="NSTitle">Select Next Tab</string>
@@ -1084,7 +1055,7 @@
<object class="NSTextView" id="637673380">
<reference key="NSNextResponder" ref="829948544"/>
<int key="NSvFlags">2322</int>
- <string key="NSFrame">{{0, 192}, {182, 14}}</string>
+ <string key="NSFrameSize">{182, 14}</string>
<reference key="NSSuperview" ref="829948544"/>
<object class="NSTextContainer" key="NSTextContainer" id="700346087">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -1137,13 +1108,12 @@
<nil key="NSDefaultParagraphStyle"/>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{231, 1e+07}</string>
- <string key="NSMinize">{175, 8}</string>
+ <string key="NSMaxSize">{364, 1e+07}</string>
+ <string key="NSMinize">{175, 0}</string>
<nil key="NSDelegate"/>
</object>
</object>
<string key="NSFrameSize">{182, 61}</string>
- <string key="NSBounds">{{0, 180}, {182, 61}}</string>
<reference key="NSSuperview" ref="949675429"/>
<reference key="NSNextKeyView" ref="637673380"/>
<reference key="NSDocView" ref="637673380"/>
@@ -1364,7 +1334,7 @@
<nil key="NSDefaultParagraphStyle"/>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{378, 1e+07}</string>
+ <string key="NSMaxSize">{660, 1e+07}</string>
<string key="NSMinize">{114, 0}</string>
<nil key="NSDelegate"/>
</object>
@@ -1694,39 +1664,7 @@
<int key="connectionID">780</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">previousTerminal:</string>
- <reference key="source" ref="608955146"/>
- <reference key="destination" ref="606479112"/>
- </object>
- <int key="connectionID">785</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">nextTerminal:</string>
- <reference key="source" ref="608955146"/>
- <reference key="destination" ref="77932280"/>
- </object>
- <int key="connectionID">786</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">previousTerminal</string>
- <reference key="source" ref="608955146"/>
- <reference key="destination" ref="606479112"/>
- </object>
- <int key="connectionID">787</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">nextTerminal</string>
- <reference key="source" ref="608955146"/>
- <reference key="destination" ref="77932280"/>
- </object>
- <int key="connectionID">788</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">logStart</string>
<reference key="source" ref="608955146"/>
<reference key="destination" ref="381797437"/>
@@ -2068,13 +2006,10 @@
<reference ref="603172949"/>
<reference ref="99361977"/>
<reference ref="669599182"/>
- <reference ref="606479112"/>
- <reference ref="77932280"/>
<reference ref="915870994"/>
<reference ref="839254411"/>
<reference ref="48039160"/>
<reference ref="39668782"/>
- <reference ref="983824543"/>
<reference ref="365978022"/>
<reference ref="135837852"/>
<reference ref="249023174"/>
@@ -2097,16 +2032,6 @@
<reference key="parent" ref="704295309"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">782</int>
- <reference key="object" ref="606479112"/>
- <reference key="parent" ref="704295309"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">783</int>
- <reference key="object" ref="77932280"/>
- <reference key="parent" ref="704295309"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">784</int>
<reference key="object" ref="915870994"/>
<reference key="parent" ref="704295309"/>
@@ -2136,11 +2061,6 @@
<reference key="parent" ref="39668782"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">849</int>
- <reference key="object" ref="983824543"/>
- <reference key="parent" ref="704295309"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">882</int>
<reference key="object" ref="365978022"/>
<reference key="parent" ref="704295309"/>
@@ -2982,10 +2902,6 @@
<string>765.ImportedFromIB2</string>
<string>778.IBPluginDependency</string>
<string>778.ImportedFromIB2</string>
- <string>782.IBPluginDependency</string>
- <string>782.ImportedFromIB2</string>
- <string>783.IBPluginDependency</string>
- <string>783.ImportedFromIB2</string>
<string>784.IBPluginDependency</string>
<string>784.ImportedFromIB2</string>
<string>802.IBPluginDependency</string>
@@ -3026,8 +2942,6 @@
<string>847.ImportedFromIB2</string>
<string>848.IBPluginDependency</string>
<string>848.ImportedFromIB2</string>
- <string>849.IBPluginDependency</string>
- <string>849.ImportedFromIB2</string>
<string>850.IBPluginDependency</string>
<string>850.ImportedFromIB2</string>
<string>852.IBPluginDependency</string>
@@ -3084,9 +2998,16 @@
<string>915.ImportedFromIB2</string>
<string>92.IBPluginDependency</string>
<string>92.ImportedFromIB2</string>
+ <string>928.IBPluginDependency</string>
+ <string>929.IBPluginDependency</string>
+ <string>930.IBPluginDependency</string>
+ <string>931.IBPluginDependency</string>
<string>931.IBShouldRemoveOnLegacySave</string>
+ <string>932.IBPluginDependency</string>
<string>932.IBShouldRemoveOnLegacySave</string>
+ <string>933.IBPluginDependency</string>
<string>933.IBShouldRemoveOnLegacySave</string>
+ <string>934.IBPluginDependency</string>
<string>934.IBShouldRemoveOnLegacySave</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -3157,7 +3078,7 @@
<reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
- <string>{{312, 491}, {246, 223}}</string>
+ <string>{{312, 541}, {246, 173}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3319,15 +3240,16 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="5"/>
- <reference ref="5"/>
- <reference ref="5"/>
- <reference ref="5"/>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -3357,6 +3279,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
+ <string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
Modified: trunk/iTermApplicationDelegate.h
===================================================================
--- trunk/iTermApplicationDelegate.h 2009-09-28 03:50:55 UTC (rev 1853)
+++ trunk/iTermApplicationDelegate.h 2009-09-28 04:06:45 UTC (rev 1854)
@@ -50,8 +50,6 @@
// Menu items
IBOutlet NSMenu *bookmarkMenu;
IBOutlet NSMenuItem *selectTab;
- IBOutlet NSMenuItem *previousTerminal;
- IBOutlet NSMenuItem *nextTerminal;
IBOutlet NSMenuItem *logStart;
IBOutlet NSMenuItem *logStop;
IBOutlet NSMenuItem *closeTab;
@@ -83,10 +81,6 @@
- (IBAction)showPrefWindow:(id)sender;
- (IBAction)showBookmarkWindow:(id)sender;
- // navigation
-- (IBAction) previousTerminal: (id) sender;
-- (IBAction) nextTerminal: (id) sender;
-
// Notifications
- (void) reloadMenus: (NSNotification *) aNotification;
- (void) buildSessionSubmenu: (NSNotification *) aNotification;
Modified: trunk/iTermApplicationDelegate.m
===================================================================
--- trunk/iTermApplicationDelegate.m 2009-09-28 03:50:55 UTC (rev 1853)
+++ trunk/iTermApplicationDelegate.m 2009-09-28 04:06:45 UTC (rev 1854)
@@ -266,17 +266,6 @@
[[iTermController sharedInstance] newSession:sender];
}
-// navigation
-- (IBAction) previousTerminal: (id) sender
-{
- [[iTermController sharedInstance] previousTerminal:sender];
-}
-
-- (IBAction) nextTerminal: (id) sender
-{
- [[iTermController sharedInstance] nextTerminal:sender];
-}
-
- (IBAction)showPrefWindow:(id)sender
{
[[PreferencePanel sharedInstance] run];
@@ -461,9 +450,6 @@
unsigned int drawerState;
- [previousTerminal setAction: (frontTerminal?@selector(previousTerminal:):nil)];
- [nextTerminal setAction: (frontTerminal?@selector(nextTerminal:):nil)];
-
[self buildSessionSubmenu: aNotification];
[self buildAddressBookMenu: aNotification];
// reset the close tab/window shortcuts
Modified: trunk/iTermController.m
===================================================================
--- trunk/iTermController.m 2009-09-28 03:50:55 UTC (rev 1853)
+++ trunk/iTermController.m 2009-09-28 04:06:45 UTC (rev 1854)
@@ -207,61 +207,6 @@
[self launchBookmark:nil inTerminal: FRONT];
}
-// navigation
-- (IBAction) previousTerminal: (id) sender
-{
- unsigned int currentIndex;
- BOOL looped = NO;
-
- currentIndex = [[self terminals] indexOfObject: FRONT];
- if(FRONT == nil || currentIndex == NSNotFound)
- {
- NSBeep();
- return;
- }
-
- // get the previous terminal
- do {
- if(currentIndex == 0) {
- if (looped) return;
- currentIndex = [[self terminals] count] - 1;
- looped = YES;
- }
- else
- currentIndex--;
- } while ([[[[self terminals] objectAtIndex: currentIndex] window] isMiniaturized]);
-
- // make sure that terminal's window active
- [[[[self terminals] objectAtIndex: currentIndex] window] makeKeyAndOrderFront: self];
-
-}
-- (IBAction)nextTerminal: (id) sender
-{
- unsigned int currentIndex;
- BOOL looped = NO;
-
- currentIndex = [[self terminals] indexOfObject: FRONT];
- if(FRONT == nil || currentIndex == NSNotFound)
- {
- NSBeep();
- return;
- }
-
- // get the next terminal
- do {
- if(currentIndex == [[self terminals] count] - 1) {
- if (looped) return;
- currentIndex = 0;
- looped = YES;
- }
- else
- currentIndex++;
- } while ([[[[self terminals] objectAtIndex: currentIndex] window] isMiniaturized]);
-
- // make sure that terminal's window active
- [[[[self terminals] objectAtIndex: currentIndex] window] makeKeyAndOrderFront: self];
-}
-
- (PseudoTerminal *) currentTerminal
{
return (FRONT);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
