From: <de...@us...> - 2009-09-17 17:55:22
|
Revision: 1804 http://iterm.svn.sourceforge.net/iterm/?rev=1804&view=rev Author: delx Date: 2009-09-17 17:55:10 +0000 (Thu, 17 Sep 2009) Log Message: ----------- Formatting changes - to test iterm-commits list Modified Paths: -------------- trunk/PTYSession.m trunk/VT100Screen.m Modified: trunk/PTYSession.m =================================================================== --- trunk/PTYSession.m 2009-09-17 14:39:20 UTC (rev 1803) +++ trunk/PTYSession.m 2009-09-17 17:55:10 UTC (rev 1804) @@ -298,25 +298,23 @@ parent = nil; } -- (void)writeTask:(NSData *)data +- (void)writeTask:(NSData*)data { // check if we want to send this input to all the sessions - if([parent sendInputToAllSessions] == NO) - { + if([parent sendInputToAllSessions] == NO) { if (!EXIT) { [self setBell: NO]; - PTYScroller *ptys=(PTYScroller *)[SCROLLVIEW verticalScroller]; + PTYScroller* ptys=(PTYScroller*)[SCROLLVIEW verticalScroller]; [SHELL writeTask: data]; // Make sure we scroll down to the end [TEXTVIEW scrollEnd]; [ptys setUserScroll: NO]; } - } - else - { + } + else { // send to all sessions [parent sendInputToAllSessions: data]; - } + } } - (void)readTask:(NSData*)data Modified: trunk/VT100Screen.m =================================================================== --- trunk/VT100Screen.m 2009-09-17 14:39:20 UTC (rev 1803) +++ trunk/VT100Screen.m 2009-09-17 17:55:10 UTC (rev 1804) @@ -1026,21 +1026,18 @@ [self setDirty]; } -- (void) saveBuffer -{ - int size=REAL_WIDTH*HEIGHT; - +- (void)saveBuffer +{ #if DEBUG_METHOD_TRACE NSLog(@"%s", __PRETTY_FUNCTION__); -#endif - - if (temp_buffer) - free(temp_buffer); - +#endif + + if(temp_buffer) free(temp_buffer); + + int size=REAL_WIDTH*HEIGHT; int n = (screen_top - buffer_lines)/REAL_WIDTH - max_scrollback_lines; - - temp_buffer=(screen_char_t *)malloc(size*(sizeof(screen_char_t))); - if (n <= 0) + temp_buffer = (screen_char_t*)malloc(size*(sizeof(screen_char_t))); + if(n <= 0) memcpy(temp_buffer, screen_top, size*sizeof(screen_char_t)); else { memcpy(temp_buffer, screen_top, (HEIGHT-n)*REAL_WIDTH*sizeof(screen_char_t)); @@ -1048,28 +1045,24 @@ } } -- (void) restoreBuffer -{ - +- (void)restoreBuffer +{ #if DEBUG_METHOD_TRACE NSLog(@"%s", __PRETTY_FUNCTION__); -#endif - - if (!temp_buffer) - return; +#endif - int n = (screen_top - buffer_lines)/REAL_WIDTH - max_scrollback_lines; + if(!temp_buffer) return; - if (n<=0) + int n = (screen_top - buffer_lines)/REAL_WIDTH - max_scrollback_lines; + if(n <= 0) memcpy(screen_top, temp_buffer, REAL_WIDTH*HEIGHT*sizeof(screen_char_t)); else { memcpy(screen_top, temp_buffer, (HEIGHT-n)*REAL_WIDTH*sizeof(screen_char_t)); memcpy(buffer_lines, temp_buffer+(HEIGHT-n)*REAL_WIDTH, n*REAL_WIDTH*sizeof(screen_char_t)); } - - + [self setDirty]; - + free(temp_buffer); temp_buffer = NULL; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-09-18 13:26:29
|
Revision: 1808 http://iterm.svn.sourceforge.net/iterm/?rev=1808&view=rev Author: delx Date: 2009-09-18 13:26:21 +0000 (Fri, 18 Sep 2009) Log Message: ----------- Show correct window titles (#2765347) Modified Paths: -------------- trunk/Changelog trunk/PTYSession.m trunk/PseudoTerminal.m Modified: trunk/Changelog =================================================================== --- trunk/Changelog 2009-09-18 03:22:14 UTC (rev 1807) +++ trunk/Changelog 2009-09-18 13:26:21 UTC (rev 1808) @@ -1,5 +1,6 @@ 2009-09-17 delx * Save cursor position separately for alternate screens (#2833765) + * Show correct window titles (#2765347) 2009-09-16 delx * Fixed CMD-num tab switching (#2271203) Modified: trunk/PTYSession.m =================================================================== --- trunk/PTYSession.m 2009-09-18 03:22:14 UTC (rev 1807) +++ trunk/PTYSession.m 2009-09-18 13:26:21 UTC (rev 1808) @@ -1164,81 +1164,82 @@ return ([self tty]); } -- (void) setUniqueID: (NSString *)uniqueID +- (void) setUniqueID:(NSString*)uniqueID { NSLog(@"Not allowed to set unique ID"); } -- (NSString *) defaultName +- (NSString*)defaultName { - return (defaultName); + return defaultName; } -- (void) setDefaultName: (NSString *) theName +- (void)setDefaultName:(NSString*)theName { - if([defaultName isEqualToString: theName]) + if([defaultName isEqualToString:theName]) return; - - if(defaultName) - { + + if(defaultName) { // clear the window title if it is not different - if([self windowTitle] == nil || [name isEqualToString: [self windowTitle]]) - [self setWindowTitle: nil]; - [defaultName release]; - defaultName = nil; - } - if (!theName) - theName = NSLocalizedStringFromTableInBundle(@"Untitled",@"iTerm", [NSBundle bundleForClass: [self class]], @"Profiles"); - + if(windowTitle == nil || [name isEqualToString:windowTitle]) + windowTitle = nil; + [defaultName release]; + defaultName = nil; + } + if(!theName) { + theName = NSLocalizedStringFromTableInBundle(@"Untitled",@"iTerm", + [NSBundle bundleForClass:[self class]], @"Profiles"); + } + defaultName = [theName retain]; } -- (NSString *) name +- (NSString*)name { - return (name); + return name; } -- (void) setName: (NSString *) theName +- (void)setName:(NSString*)theName { - if([name isEqualToString: theName]) + if([name isEqualToString:theName]) return; - - if(name) - { + + if(name) { // clear the window title if it is not different - if([self windowTitle] == nil || [name isEqualToString: [self windowTitle]]) - [self setWindowTitle: nil]; - [name release]; - name = nil; - } - if (!theName) - theName = NSLocalizedStringFromTableInBundle(@"Untitled",@"iTerm", [NSBundle bundleForClass: [self class]], @"Profiles"); - + if([name isEqualToString:windowTitle]) + windowTitle = nil; + [name release]; + name = nil; + } + if(!theName) { + theName = NSLocalizedStringFromTableInBundle(@"Untitled",@"iTerm", + [NSBundle bundleForClass:[self class]], @"Profiles"); + } + name = [theName retain]; // sync the window title if it is not set to something else - if([self windowTitle] == nil) - [self setWindowTitle: theName]; - - - [tabViewItem setLabel: name]; - [self setBell: NO]; - - - // get the session submenu to be rebuilt - if([[iTermController sharedInstance] currentTerminal] == [self parent]) - { - [[NSNotificationCenter defaultCenter] postNotificationName: @"iTermNameOfSessionDidChange" object: [self parent] userInfo: nil]; - } + if(windowTitle == nil) + [self setWindowTitle:theName]; + + [tabViewItem setLabel:name]; + [self setBell:NO]; + + // get the session submenu to be rebuilt + if([[iTermController sharedInstance] currentTerminal] == [self parent]) { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"iTermNameOfSessionDidChange" + object:[self parent] userInfo:nil]; + } } -- (NSString *) windowTitle +- (NSString*)windowTitle { - return (windowTitle); + return windowTitle; } -- (void) setWindowTitle: (NSString *) theTitle +- (void)setWindowTitle:(NSString*)theTitle { - if ([theTitle isEqualToString:windowTitle]) return; + if([theTitle isEqualToString:windowTitle]) return; [windowTitle autorelease]; windowTitle = nil; Modified: trunk/PseudoTerminal.m =================================================================== --- trunk/PseudoTerminal.m 2009-09-18 03:22:14 UTC (rev 1807) +++ trunk/PseudoTerminal.m 2009-09-18 13:26:21 UTC (rev 1808) @@ -1167,9 +1167,6 @@ NSLog(@"%s(%d):-[PseudoTerminal setWindowTitle:%@]", __FILE__, __LINE__, title); #endif - if([title length] == 0) { - NSLog(@"ack"); - } NSParameterAssert([title length] > 0); if([self sendInputToAllSessions]) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-09-19 04:49:54
|
Revision: 1812 http://iterm.svn.sourceforge.net/iterm/?rev=1812&view=rev Author: delx Date: 2009-09-19 04:49:46 +0000 (Sat, 19 Sep 2009) Log Message: ----------- Removed +x from files that didn't need it Property Changed: ---------------- trunk/Korean.lproj/AddressBook.strings trunk/Korean.lproj/FindPanel.strings trunk/Korean.lproj/MainMenu.strings trunk/Korean.lproj/PreferencePanel.strings trunk/Korean.lproj/PseudoTerminal.strings trunk/PSMTabBarControl/images/overflowImage.tiff trunk/PSMTabBarControl/images/overflowImagePressed.tif trunk/PSMTabBarControl/source/NSBezierPath_AMShading.h trunk/PSMTabBarControl/source/NSBezierPath_AMShading.m trunk/Sparkle.framework/Headers/NSString+extras.h trunk/Sparkle.framework/Headers/RSS.h Property changes on: trunk/Korean.lproj/AddressBook.strings ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/Korean.lproj/FindPanel.strings ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/Korean.lproj/MainMenu.strings ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/Korean.lproj/PreferencePanel.strings ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/Korean.lproj/PseudoTerminal.strings ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/PSMTabBarControl/images/overflowImage.tiff ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/PSMTabBarControl/images/overflowImagePressed.tif ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/PSMTabBarControl/source/NSBezierPath_AMShading.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/PSMTabBarControl/source/NSBezierPath_AMShading.m ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/Sparkle.framework/Headers/NSString+extras.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/Sparkle.framework/Headers/RSS.h ___________________________________________________________________ Deleted: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-09-22 01:06:17
|
Revision: 1824 http://iterm.svn.sourceforge.net/iterm/?rev=1824&view=rev Author: delx Date: 2009-09-22 01:06:10 +0000 (Tue, 22 Sep 2009) Log Message: ----------- Faster bold text rendering + separation between bold & highlight attributes Modified Paths: -------------- trunk/Changelog trunk/PTYTextView.m Modified: trunk/Changelog =================================================================== --- trunk/Changelog 2009-09-20 01:56:05 UTC (rev 1823) +++ trunk/Changelog 2009-09-22 01:06:10 UTC (rev 1824) @@ -1,3 +1,9 @@ +2009-09-22 delx + * Draw bold text the old fashioned way, much faster + * Separate bold & highlight attributes for text + * New behaviour gives four distinct modes -- plain, bold, highlight, bold+highlight + Use the disable bold option to collapse the last 3 into one + 2009-09-20 delx * Fixed blinking text * Fixed drawing corruption when new text is placed into a full buffer is not scrolled to the bottom Modified: trunk/PTYTextView.m =================================================================== --- trunk/PTYTextView.m 2009-09-20 01:56:05 UTC (rev 1823) +++ trunk/PTYTextView.m 2009-09-22 01:06:10 UTC (rev 1824) @@ -377,7 +377,7 @@ } } else { - if((index & BOLD_MASK) && (index % 256 < 8)) { + if([self disableBold] && (index & BOLD_MASK) && (index % 256 < 8)) { index = index - BOLD_MASK + 8; } color = colorTable[index & 0xff]; @@ -2472,60 +2472,21 @@ - (void) _drawCharacter:(unichar)code fgColor:(int)fg AtX:(float)X Y:(float)Y doubleWidth:(BOOL) dw { - if (!code) { - return; - } + if (!code) return; - //NSLog(@"%s: %c(%d)",__PRETTY_FUNCTION__, code,code); - // - NSColor* color; - NSString* crap; - NSDictionary* attrib; - NSFont* theFont; - float sw; - BOOL renderBold; - NSFontManager* fontManager = [NSFontManager sharedFontManager]; + NSFont* theFont = dw?nafont:font; + BOOL renderBold = (fg&BOLD_MASK) && ![self disableBold]; + NSColor* color = [self colorForCode: fg]; - theFont = dw?nafont:font; - renderBold = (fg&BOLD_MASK) && ![self disableBold]; - color = [self colorForCode: fg]; - - if(renderBold) { - theFont = [fontManager convertFont: theFont toHaveTrait: NSBoldFontMask]; - - // Check if there is native bold support - // if conversion was successful, else use our own methods to convert to bold - if ([fontManager traitsOfFont:theFont] & NSBoldFontMask) { - sw = antiAlias ? strokeWidth:0; - renderBold = NO; - } - else { - sw = antiAlias? boldStrokeWidth : 0; - } - } - else { - sw = antiAlias ? strokeWidth:0; - } + NSDictionary* attrib=[NSDictionary dictionaryWithObjectsAndKeys: + theFont, NSFontAttributeName, color, NSForegroundColorAttributeName, + nil]; - if (OSX_TIGERORLATER && sw) { - attrib=[NSDictionary dictionaryWithObjectsAndKeys: - theFont, NSFontAttributeName, - color, NSForegroundColorAttributeName, - [NSNumber numberWithFloat: sw], @"NSStrokeWidth", - nil]; - } - else { - attrib=[NSDictionary dictionaryWithObjectsAndKeys: - theFont, NSFontAttributeName, - color, NSForegroundColorAttributeName, - nil]; - } - - crap = [NSString stringWithCharacters:&code length:1]; + NSString* crap = [NSString stringWithCharacters:&code length:1]; [crap drawWithRect:NSMakeRect(X,Y+[theFont ascender], 0, 0) options:0 attributes:attrib]; // on older systems, for bold, redraw the character offset by 1 pixel - if (renderBold && (!OSX_TIGERORLATER || !antiAlias)) { + if (renderBold) { [crap drawWithRect:NSMakeRect(X+1,Y+[theFont ascender], 0, 0) options:0 attributes:attrib]; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-09-23 01:49:44
|
Revision: 1830 http://iterm.svn.sourceforge.net/iterm/?rev=1830&view=rev Author: delx Date: 2009-09-23 01:49:34 +0000 (Wed, 23 Sep 2009) Log Message: ----------- Merging newsparkle into trunk, will copy Sparkle.framework back in next rev Modified Paths: -------------- trunk/English.lproj/PreferencePanel.xib trunk/PreferencePanel.m trunk/iTerm.plist trunk/iTerm.xcodeproj/project.pbxproj trunk/iTermApplicationDelegate.m Added Paths: ----------- trunk/dsa_pub.pem Removed Paths: ------------- trunk/Sparkle.framework/ Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/newsparkle:1810-1829 Modified: trunk/English.lproj/PreferencePanel.xib =================================================================== --- trunk/English.lproj/PreferencePanel.xib 2009-09-23 01:29:40 UTC (rev 1829) +++ trunk/English.lproj/PreferencePanel.xib 2009-09-23 01:49:34 UTC (rev 1830) @@ -2,13 +2,13 @@ <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> - <integer value="1680"/> + <integer value="323"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -60,7 +60,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="163603654"> <object class="NSView" key="NSView" id="558013919"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="560294543"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -252,7 +252,7 @@ <object class="NSButtonCell" key="NSCell" id="852546834"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> - <string key="NSContents">Check updates when iTerms starts</string> + <string key="NSContents">Check for updates automatically</string> <reference key="NSSupport" ref="966507434"/> <reference key="NSControlView" ref="790902597"/> <int key="NSButtonFlags">1211912703</int> @@ -289,6 +289,7 @@ </object> </object> <string key="NSFrame">{{10, 33}, {381, 185}}</string> + <reference key="NSSuperview" ref="560294543"/> <reference key="NSNextKeyView" ref="12109862"/> </object> <string key="NSLabel">General</string> @@ -297,7 +298,7 @@ </object> <object class="NSTabViewItem" id="932824733"> <object class="NSView" key="NSView" id="938649533"> - <reference key="NSNextResponder" ref="560294543"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -578,7 +579,6 @@ </object> </object> <string key="NSFrame">{{10, 33}, {381, 185}}</string> - <reference key="NSSuperview" ref="560294543"/> </object> <string key="NSLabel">Window</string> <reference key="NSColor" ref="303715562"/> @@ -1256,14 +1256,14 @@ <reference key="NSTabView" ref="560294543"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="932824733"/> + <reference key="NSSelectedTabViewItem" ref="163603654"/> <reference key="NSFont" ref="966507434"/> <int key="NSTvFlags">0</int> <bool key="NSAllowTruncatedLabels">YES</bool> <bool key="NSDrawsBackground">YES</bool> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="938649533"/> + <reference ref="558013919"/> </object> </object> <object class="NSButton" id="275916175"> @@ -2643,11 +2643,49 @@ <string>1831.ImportedFromIB2</string> <string>1874.IBPluginDependency</string> <string>1874.ImportedFromIB2</string> + <string>1881.IBPluginDependency</string> + <string>1882.IBPluginDependency</string> + <string>1883.IBPluginDependency</string> + <string>1884.IBPluginDependency</string> + <string>1885.IBPluginDependency</string> + <string>1886.IBPluginDependency</string> + <string>1887.IBPluginDependency</string> + <string>1888.IBPluginDependency</string> + <string>1889.IBPluginDependency</string> + <string>1890.IBPluginDependency</string> + <string>1891.IBPluginDependency</string> + <string>1892.IBPluginDependency</string> + <string>1893.IBPluginDependency</string> + <string>1894.IBPluginDependency</string> + <string>1895.IBPluginDependency</string> + <string>1896.IBPluginDependency</string> + <string>1897.IBPluginDependency</string> + <string>1898.IBPluginDependency</string> + <string>1899.IBPluginDependency</string> + <string>1900.IBPluginDependency</string> + <string>1901.IBPluginDependency</string> + <string>1902.IBPluginDependency</string> + <string>1903.IBPluginDependency</string> + <string>1904.IBPluginDependency</string> + <string>1905.IBPluginDependency</string> + <string>1906.IBPluginDependency</string> + <string>1907.IBPluginDependency</string> + <string>1908.IBPluginDependency</string> + <string>1909.IBPluginDependency</string> + <string>1910.IBPluginDependency</string> + <string>1911.IBPluginDependency</string> + <string>1912.IBPluginDependency</string> + <string>1913.IBPluginDependency</string> <string>1913.IBShouldRemoveOnLegacySave</string> + <string>1914.IBPluginDependency</string> <string>1914.IBShouldRemoveOnLegacySave</string> + <string>1915.IBPluginDependency</string> <string>1915.IBShouldRemoveOnLegacySave</string> + <string>1916.IBPluginDependency</string> <string>1916.IBShouldRemoveOnLegacySave</string> + <string>1917.IBPluginDependency</string> <string>1917.IBShouldRemoveOnLegacySave</string> + <string>1918.IBPluginDependency</string> <string>1918.IBShouldRemoveOnLegacySave</string> <string>32.IBEditorWindowLastContentRect</string> <string>32.IBWindowTemplateEditedContentRect</string> @@ -2783,11 +2821,49 @@ <reference ref="5"/> <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> + <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> + <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> + <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> + <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> + <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> + <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"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="5"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="5"/> <string>{{208, 103}, {427, 247}}</string> <string>{{208, 103}, {427, 247}}</string> Modified: trunk/PreferencePanel.m =================================================================== --- trunk/PreferencePanel.m 2009-09-23 01:29:40 UTC (rev 1829) +++ trunk/PreferencePanel.m 2009-09-23 01:49:34 UTC (rev 1830) @@ -148,7 +148,7 @@ defaultOpenBookmark = [prefs objectForKey:@"OpenBookmark"]?[[prefs objectForKey:@"OpenBookmark"] boolValue]: NO; defaultQuitWhenAllWindowsClosed = [prefs objectForKey:@"QuitWhenAllWindowsClosed"]?[[prefs objectForKey:@"QuitWhenAllWindowsClosed"] boolValue]: NO; defaultCursorType=[prefs objectForKey:@"CursorType"]?[prefs integerForKey:@"CursorType"]:2; - defaultCheckUpdate = [prefs objectForKey:@"SUCheckAtStartup"]?[[prefs objectForKey:@"SUCheckAtStartup"] boolValue]: YES; + defaultCheckUpdate = [prefs objectForKey:@"SUEnableAutomaticChecks"]?[[prefs objectForKey:@"SUEnableAutomaticChecks"] boolValue]: YES; defaultUseBorder = [prefs objectForKey:@"UseBorder"]?[[prefs objectForKey:@"UseBorder"] boolValue]: NO; defaultHideScrollbar = [prefs objectForKey:@"HideScrollbar"]?[[prefs objectForKey:@"HideScrollbar"] boolValue]: NO; defaultCheckTestRelease = [prefs objectForKey:@"CheckTestRelease"]?[[prefs objectForKey:@"CheckTestRelease"] boolValue]: YES; @@ -205,7 +205,7 @@ [prefs setObject: [[iTermTerminalProfileMgr singleInstance] profiles] forKey: @"Terminals"]; [prefs setObject: [[ITAddressBookMgr sharedInstance] bookmarks] forKey: @"Bookmarks"]; [prefs setBool:defaultQuitWhenAllWindowsClosed forKey:@"QuitWhenAllWindowsClosed"]; - [prefs setBool:defaultCheckUpdate forKey:@"SUCheckAtStartup"]; + [prefs setBool:defaultCheckUpdate forKey:@"SUEnableAutomaticChecks"]; [prefs setInteger:defaultCursorType forKey:@"CursorType"]; [prefs setBool:defaultUseBorder forKey:@"UseBorder"]; [prefs setBool:defaultHideScrollbar forKey:@"HideScrollbar"]; @@ -253,7 +253,7 @@ [refreshRate setIntValue: defaultRefreshRate]; [wordChars setStringValue: ([defaultWordChars length] > 0)?defaultWordChars:@""]; [quitWhenAllWindowsClosed setState: defaultQuitWhenAllWindowsClosed?NSOnState:NSOffState]; - [checkUpdate setState: defaultCheckUpdate?NSOnState:NSOffState]; + [checkUpdate setState: defaultCheckUpdate?NSOnState:NSOffState]; [cursorType selectCellWithTag:defaultCursorType]; [useBorder setState: defaultUseBorder?NSOnState:NSOffState]; [hideScrollbar setState: defaultHideScrollbar?NSOnState:NSOffState]; @@ -310,15 +310,10 @@ defaultCheckTestRelease = ([checkTestRelease state] == NSOnState); -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - NSString *appCast = defaultCheckTestRelease ? - [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURL"] : - [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForFinalRelease"]; + NSString *appCast = defaultCheckTestRelease ? + [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForTesting"] : + [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForFinal"]; [[NSUserDefaults standardUserDefaults] setObject: appCast forKey:@"SUFeedURL"]; -#else - NSString *appCast = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForPanther"]; - [[NSUserDefaults standardUserDefaults] setObject: appCast forKey:@"SUFeedURL"]; -#endif } } } Copied: trunk/dsa_pub.pem (from rev 1829, branches/newsparkle/dsa_pub.pem) =================================================================== --- trunk/dsa_pub.pem (rev 0) +++ trunk/dsa_pub.pem 2009-09-23 01:49:34 UTC (rev 1830) @@ -0,0 +1,20 @@ +-----BEGIN PUBLIC KEY----- +MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDCJaphqc+oMFjXq36dYoLA/3hEaCbh +sIZlaScdtoS91BETnt6qPtcqGZfXx+W9nTAvdZfyJwMM0zsXG92e9V9xtr+fbixS +OQeBmsfSu+LOdIwwjRliMU2XdcFi8Taarl6BznjUrsW+UDGrEgf/0ZABvPkT5vRu +na8LSzhc37Zq/qEU22Ljw8jOA5eZVjY8sJXUsjrOoK2JTo/F6kM2J6/KxQBporTF +/Bj1lewZyj5kTZ1NEtUOc0nbsqQfJow0Q3SOj2aC40JlHOQkYMmlJNzKCO2U4BvQ +K8+U4xu7DFxrnicObmqkDhQ7J3CEvi1KAyIpYkdJ6mhb3he/rP3Y8SMtAhUAqsbN +sNFg94wRGrm9AvXCLydtsdUCggEAYY+wBgfH6grXENP++Ik9ldSD9Ndy6KrXzdg6 +EXqfz3gfNvxRypIgsotNYo/XPz9jwS33I6kfkepDWwCUoCdiH73ssFM7ZAtXDQn6 +oG09q9+CilGom+rwUj50UVkJMOzRRTGcag+w6Hn0GAn61fNwtaj71T8HKzgWuROR +5rb+E0PtHdiaUIzIy2jGZkw3dNogEKvn03eEbxHcKIh9LwxqL1jetRgfMUYpviWR +gK8271MM4Pm2HA35rvY5ivBZsxU4DQPJ8HNjSQZxg7AaX6g+Tc6hHnPU1OWZtJiz +m5vWzNyPsO/aRz0Y3zO1rew3CM3TEQePfnPXbTI+3Xw0/ZH2hQOCAQUAAoIBAFmb +ROBReUveKovsmU80clAyKD1APmmAQ891p7Fen+A0/2mw6VTnjdwcg55nOfd7tvIw +gWiMMvu+qjbT1OKKMRtockh5AijkzmzsE9gsmdfFiElvI6X/QTpFsMC85fB5uBfy +21PwNwGCzv3NffovqYvg4DYSEHJfh8mFtFC27td1byk1HcxphcPEp4Bh8ZBXQ02v +vBfikGuHEm7Ci9IcCaqSmKOZeOeM1kMXI6IriXARiiSlT9h5+MFQGtXOBM49VM/9 +4XWgadSdV/pyBotKB1hEzWZ4sM2EQ0JSBIl3FwLWEDMtio10aPHIyVHg7j3TX00E +Mf7gbAyWRMlMpam2Xfk= +-----END PUBLIC KEY----- Modified: trunk/iTerm.plist =================================================================== --- trunk/iTerm.plist 2009-09-23 01:29:40 UTC (rev 1829) +++ trunk/iTerm.plist 2009-09-23 01:49:34 UTC (rev 1830) @@ -173,12 +173,12 @@ <string>MainMenu</string> <key>NSPrincipalClass</key> <string>iTermApplication</string> - <key>SUFeedURL</key> - <string>http://iterm.sourceforge.net/appcast.xml</string> - <key>SUFeedURLForFinalRelease</key> - <string>http://iterm.sourceforge.net/appcast_final.xml</string> - <key>SUFeedURLForPanther</key> - <string>http://iterm.sourceforge.net/appcast_panther.xml</string> + <key>SUPublicDSAKeyFile</key> + <string>dsa_pub.pem</string> + <key>SUFeedURLForTesting</key> + <string>http://iterm.sourceforge.net/appcasts/b/testing.xml</string> + <key>SUFeedURLForFinal</key> + <string>http://iterm.sourceforge.net/appcasts/b/final.xml</string> <key>SmartCrashReports_CompanyName</key> <string>iTerm</string> <key>SmartCrashReports_EmailTicket</key> Modified: trunk/iTerm.xcodeproj/project.pbxproj =================================================================== --- trunk/iTerm.xcodeproj/project.pbxproj 2009-09-23 01:29:40 UTC (rev 1829) +++ trunk/iTerm.xcodeproj/project.pbxproj 2009-09-23 01:49:34 UTC (rev 1830) @@ -75,6 +75,7 @@ 9325FF4C0FB54DF1004EC67C /* FindPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9325FF440FB54DF1004EC67C /* FindPanel.xib */; }; 9325FF4D0FB54DF1004EC67C /* Bookmarks.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9325FF460FB54DF1004EC67C /* Bookmarks.xib */; }; 9325FF500FB54E00004EC67C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9325FF4E0FB54E00004EC67C /* MainMenu.xib */; }; + 93A6FEFA10685E9900A5F905 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 93A6FEF910685E9900A5F905 /* dsa_pub.pem */; }; DD02573F09CB9399008F320C /* PSMAquaTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = DD02572409CB9398008F320C /* PSMAquaTabStyle.h */; }; DD02574009CB9399008F320C /* PSMAquaTabStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = DD02572509CB9398008F320C /* PSMAquaTabStyle.m */; }; DD02574109CB9399008F320C /* PSMMetalTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = DD02572609CB9398008F320C /* PSMMetalTabStyle.h */; }; @@ -264,6 +265,7 @@ 9325FF450FB54DF1004EC67C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/FindPanel.xib; sourceTree = "<group>"; }; 9325FF470FB54DF1004EC67C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Bookmarks.xib; sourceTree = "<group>"; }; 9325FF4F0FB54E00004EC67C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; }; + 93A6FEF910685E9900A5F905 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; }; DD02572409CB9398008F320C /* PSMAquaTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSMAquaTabStyle.h; sourceTree = "<group>"; }; DD02572509CB9398008F320C /* PSMAquaTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PSMAquaTabStyle.m; sourceTree = "<group>"; }; DD02572609CB9398008F320C /* PSMMetalTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSMMetalTabStyle.h; sourceTree = "<group>"; }; @@ -569,6 +571,7 @@ F500A65D0395269C01A8A066 /* Changelog */, DD8CF2DD03CDD34B00A8A065 /* iTerm Help */, DDB79A9A0612BBBF00EAE159 /* Profiles.plist */, + 93A6FEF910685E9900A5F905 /* dsa_pub.pem */, ); name = "Supporting Files"; sourceTree = "<group>"; @@ -996,6 +999,7 @@ 8742064D0564169600CFC3F1 /* iTerm.icns in Resources */, F6CDC4E70AE6D3E2005E7D4F /* folder.png in Resources */, 9325FF500FB54E00004EC67C /* MainMenu.xib in Resources */, + 93A6FEFA10685E9900A5F905 /* dsa_pub.pem in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: trunk/iTermApplicationDelegate.m =================================================================== --- trunk/iTermApplicationDelegate.m 2009-09-23 01:29:40 UTC (rev 1829) +++ trunk/iTermApplicationDelegate.m 2009-09-23 01:49:34 UTC (rev 1830) @@ -79,18 +79,6 @@ [iTermProfileWindowController sharedInstance]; [iTermBookmarkController sharedInstance]; [PreferencePanel sharedInstance]; - - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - NSString *appCast = [[PreferencePanel sharedInstance] checkTestRelease] ? - [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURL"] : - [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForFinalRelease"]; - [[NSUserDefaults standardUserDefaults] setObject: appCast forKey:@"SUFeedURL"]; -#else - NSString *appCast = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForPanther"]; - [[NSUserDefaults standardUserDefaults] setObject: appCast forKey:@"SUFeedURL"]; -#endif - } - (void)applicationDidFinishLaunching:(NSNotification *)aNotification This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-09-27 03:01:16
|
Revision: 1840 http://iterm.svn.sourceforge.net/iterm/?rev=1840&view=rev Author: delx Date: 2009-09-27 03:01:04 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Fixed focus follows mouse not working on scrollback buffer (#2764633) Modified Paths: -------------- trunk/Changelog trunk/PTYSession.m trunk/PTYTextView.m trunk/PTYWindow.m Modified: trunk/Changelog =================================================================== --- trunk/Changelog 2009-09-26 01:43:46 UTC (rev 1839) +++ trunk/Changelog 2009-09-27 03:01:04 UTC (rev 1840) @@ -1,3 +1,6 @@ +2009-09-27 delx + * Fixed focus follows mouse not working when viewing scrollback (#2764633) + 2009-09-26 delx * Fixed option key as esc/meta under Snow Leopard (#2849154) Modified: trunk/PTYSession.m =================================================================== --- trunk/PTYSession.m 2009-09-26 01:43:46 UTC (rev 1839) +++ trunk/PTYSession.m 2009-09-27 03:01:04 UTC (rev 1840) @@ -306,9 +306,7 @@ [self setBell: NO]; PTYScroller* ptys=(PTYScroller*)[SCROLLVIEW verticalScroller]; [SHELL writeTask: data]; - // Make sure we scroll down to the end - [TEXTVIEW scrollEnd]; - [ptys setUserScroll: NO]; + [ptys setUserScroll:NO]; } } else { @@ -1751,6 +1749,9 @@ } [TEXTVIEW refresh]; + if(![(PTYScroller*)([SCROLLVIEW verticalScroller]) userScroll]) { + [TEXTVIEW scrollEnd]; + } [self scheduleUpdateSoon:NO]; } Modified: trunk/PTYTextView.m =================================================================== --- trunk/PTYTextView.m 2009-09-26 01:43:46 UTC (rev 1839) +++ trunk/PTYTextView.m 2009-09-27 03:01:04 UTC (rev 1840) @@ -583,32 +583,31 @@ [dataSource resetDirty]; } -// We override this method since both refresh and window resize can conflict resulting in this happening twice -// So we do not allow the size to be set larger than what the data source can fill +// We override this method since both refresh and window resize can conflict +// resulting in this happening twice So we do not allow the size to be set +// larger than what the data source can fill - (void)setFrameSize:(NSSize)frameSize { // Force the height to always be correct frameSize.height = [dataSource numberOfLines] * lineHeight; [super setFrameSize:frameSize]; +} - if(![(PTYScroller *)([[self enclosingScrollView] verticalScroller]) userScroll]) { - [self scrollEnd]; - } +- (void)refresh +{ + if(dataSource == nil) return; // reset tracking rect if(trackingRectTag) { [self removeTrackingRect:trackingRectTag]; } trackingRectTag = [self addTrackingRect:[self visibleRect] owner:self userData:nil assumeInside:NO]; -} -- (void)refresh -{ - if(dataSource == nil) return; - + // number of lines that have disappeared if circular buffer is full int scrollbackOverflow = [dataSource scrollbackOverflow]; [dataSource resetScrollbackOverflow]; + // frame size changed? int height = [dataSource numberOfLines] * lineHeight; NSRect frame = [self frame]; Modified: trunk/PTYWindow.m =================================================================== --- trunk/PTYWindow.m 2009-09-26 01:43:46 UTC (rev 1839) +++ trunk/PTYWindow.m 2009-09-27 03:01:04 UTC (rev 1840) @@ -275,18 +275,4 @@ return YES; } -- (void)sendEvent:(NSEvent *)event -{ - // NSLog(@"%s: 0x%x", __PRETTY_FUNCTION__, self); - - if([event type] == NSMouseEntered) - { - //NSLog(@"window mouse entered"); - if([[PreferencePanel sharedInstance] focusFollowsMouse]) - [self makeKeyWindow]; - } - - if (super) [super sendEvent:event]; -} - @end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-09-27 03:19:17
|
Revision: 1842 http://iterm.svn.sourceforge.net/iterm/?rev=1842&view=rev Author: delx Date: 2009-09-27 03:19:06 +0000 (Sun, 27 Sep 2009) Log Message: ----------- make zip now gives a more useful filename Modified Paths: -------------- trunk/Makefile trunk/iTerm.plist trunk/iTerm_Framework.plist trunk/updateVersion.py Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-09-27 03:07:53 UTC (rev 1841) +++ trunk/Makefile 2009-09-27 03:19:06 UTC (rev 1842) @@ -13,7 +13,7 @@ zip: Deployment cd build/Deployment && \ - zip -r iTerm.app.zip iTerm.app + zip -r iTerm_$$(cat ../../version.txt).$$(date '+%Y%m%d').zip iTerm.app clean: xcodebuild -alltargets clean Modified: trunk/iTerm.plist =================================================================== --- trunk/iTerm.plist 2009-09-27 03:07:53 UTC (rev 1841) +++ trunk/iTerm.plist 2009-09-27 03:19:06 UTC (rev 1842) @@ -37,7 +37,7 @@ <key>CFBundleExecutable</key> <string>iTerm</string> <key>CFBundleGetInfoString</key> - <string>0.9.6.unknown</string> + <string>unknown</string> <key>CFBundleHelpBookFolder</key> <string>iTerm Help</string> <key>CFBundleHelpBookName</key> @@ -53,7 +53,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.9.6</string> + <string>unknown</string> <key>CFBundleSignature</key> <string>ITRM</string> <key>CFBundleURLTypes</key> @@ -164,7 +164,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.9.6.unknown</string> + <string>unknown</string> <key>NSAppleScriptEnabled</key> <string>YES</string> <key>NSExtensions</key> Modified: trunk/iTerm_Framework.plist =================================================================== --- trunk/iTerm_Framework.plist 2009-09-27 03:07:53 UTC (rev 1841) +++ trunk/iTerm_Framework.plist 2009-09-27 03:19:06 UTC (rev 1842) @@ -17,10 +17,10 @@ <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>0.9.6</string> + <string>unknown</string> <key>CFBundleSignature</key> <string>ITRM</string> <key>CFBundleVersion</key> - <string>0.9.6.unknown</string> + <string>unknown</string> </dict> </plist> Modified: trunk/updateVersion.py =================================================================== --- trunk/updateVersion.py 2009-09-27 03:07:53 UTC (rev 1841) +++ trunk/updateVersion.py 2009-09-27 03:19:06 UTC (rev 1842) @@ -30,8 +30,9 @@ infoFile = os.environ["INFOPLIST_PATH"] path = os.path.join(buildDir, infoFile) plist = NSMutableDictionary.dictionaryWithContentsOfFile_(path) -version = "%s.%s" % (plist["CFBundleShortVersionString"], revision) +version = "%s.%s" % (open("version.txt").read().strip(), revision) print "Updating versions:", infoFile, version +plist["CFBundleShortVersionString"] = version plist["CFBundleGetInfoString"] = version plist["CFBundleVersion"] = version plist.writeToFile_atomically_(path, 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-09-27 23:41:56
|
Revision: 1848 http://iterm.svn.sourceforge.net/iterm/?rev=1848&view=rev Author: delx Date: 2009-09-27 23:41:46 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Remove unused hidden prefs Modified Paths: -------------- trunk/Headers/iTerm/PreferencePanel.h trunk/PTYTextView.m trunk/PreferencePanel.m Modified: trunk/Headers/iTerm/PreferencePanel.h =================================================================== --- trunk/Headers/iTerm/PreferencePanel.h 2009-09-27 15:26:50 UTC (rev 1847) +++ trunk/Headers/iTerm/PreferencePanel.h 2009-09-27 23:41:46 UTC (rev 1848) @@ -137,8 +137,6 @@ - (int) minTabWidth; - (int) minCompactTabWidth; - (int) optimumTabWidth; -- (float) strokeWidth; -- (float) boldStrokeWidth; - (NSString *) searchCommand; @end Modified: trunk/PTYTextView.m =================================================================== --- trunk/PTYTextView.m 2009-09-27 15:26:50 UTC (rev 1847) +++ trunk/PTYTextView.m 2009-09-27 23:41:46 UTC (rev 1848) @@ -48,7 +48,6 @@ #include <math.h> static NSCursor* textViewCursor = nil; -static float strokeWidth, boldStrokeWidth; @implementation PTYTextView @@ -67,8 +66,6 @@ [reverseCursorImage compositeToPoint:NSMakePoint(2,0) operation:NSCompositePlusLighter]; [aCursorImage unlockFocus]; textViewCursor = [[NSCursor alloc] initWithImage:aCursorImage hotSpot:hotspot]; - strokeWidth = [[PreferencePanel sharedInstance] strokeWidth]; - boldStrokeWidth = [[PreferencePanel sharedInstance] boldStrokeWidth]; } + (NSCursor *) textViewCursor Modified: trunk/PreferencePanel.m =================================================================== --- trunk/PreferencePanel.m 2009-09-27 15:26:50 UTC (rev 1847) +++ trunk/PreferencePanel.m 2009-09-27 23:41:46 UTC (rev 1848) @@ -468,8 +468,6 @@ // defaults write net.sourceforge.iTerm MinTabWidth -int 100 // defaults write net.sourceforge.iTerm MinCompactTabWidth -int 120 // defaults write net.sourceforge.iTerm OptimumTabWidth -int 100 -// defaults write net.sourceforge.iTerm StrokeWidth -float -1 -// defaults write net.sourceforge.iTerm BoldStrokeWidth -float -3 - (BOOL) useUnevenTabs { @@ -491,16 +489,6 @@ return [prefs objectForKey:@"OptimumTabWidth"]?[[prefs objectForKey:@"OptimumTabWidth"] intValue]:175; } -- (float) strokeWidth -{ - return [prefs objectForKey:@"StrokeWidth"]?[[prefs objectForKey:@"StrokeWidth"] floatValue]:0; -} - -- (float) boldStrokeWidth -{ - return [prefs objectForKey:@"BoldStrokeWidth"]?[[prefs objectForKey:@"BoldStrokeWidth"] floatValue]:-2; -} - - (NSString *) searchCommand { return [prefs objectForKey:@"SearchCommand"]?[prefs objectForKey:@"SearchCommand"]:@"http://google.com/search?q=%@"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-09-28 03:51:03
|
Revision: 1853 http://iterm.svn.sourceforge.net/iterm/?rev=1853&view=rev Author: delx Date: 2009-09-28 03:50:55 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Fix showing toolbar when window is maximised (#2765328) Modified Paths: -------------- trunk/Changelog trunk/PseudoTerminal.m Modified: trunk/Changelog =================================================================== --- trunk/Changelog 2009-09-28 02:53:48 UTC (rev 1852) +++ trunk/Changelog 2009-09-28 03:50:55 UTC (rev 1853) @@ -1,3 +1,8 @@ +2009-09-28 delx + * Fixed IME when option key is set to meta/esc + * Fix auto update bug + * Fix showing toolbar when window is maximised (#2765328) + 2009-09-27 delx * Fixed focus follows mouse not working when viewing scrollback (#2764633) Modified: trunk/PseudoTerminal.m =================================================================== --- trunk/PseudoTerminal.m 2009-09-28 02:53:48 UTC (rev 1852) +++ trunk/PseudoTerminal.m 2009-09-28 03:50:55 UTC (rev 1853) @@ -1726,6 +1726,7 @@ - (void) windowDidToggleToolbarVisibility: (id) sender { + [self setWindowSize]; } // Bookmarks This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <de...@us...> - 2009-09-28 12:49:51
|
Revision: 1856 http://iterm.svn.sourceforge.net/iterm/?rev=1856&view=rev Author: delx Date: 2009-09-28 12:49:43 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Fixed application cycling differently Modified Paths: -------------- trunk/English.lproj/MainMenu.xib trunk/Headers/iTerm/VT100Screen.h trunk/iTermApplicationDelegate.h trunk/iTermApplicationDelegate.m trunk/iTermController.m Modified: trunk/English.lproj/MainMenu.xib =================================================================== --- trunk/English.lproj/MainMenu.xib 2009-09-28 04:20:42 UTC (rev 1855) +++ trunk/English.lproj/MainMenu.xib 2009-09-28 12:49:43 UTC (rev 1856) @@ -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">9L30</string> + <string key="IBDocument.SystemVersion">9G2133</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.54</string> + <string key="IBDocument.AppKitVersion">949.43</string> <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -868,6 +868,35 @@ <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> @@ -1055,7 +1084,7 @@ <object class="NSTextView" id="637673380"> <reference key="NSNextResponder" ref="829948544"/> <int key="NSvFlags">2322</int> - <string key="NSFrameSize">{182, 14}</string> + <string key="NSFrame">{{0, 192}, {182, 14}}</string> <reference key="NSSuperview" ref="829948544"/> <object class="NSTextContainer" key="NSTextContainer" id="700346087"> <object class="NSLayoutManager" key="NSLayoutManager"> @@ -1108,12 +1137,13 @@ <nil key="NSDefaultParagraphStyle"/> </object> <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{364, 1e+07}</string> - <string key="NSMinize">{175, 0}</string> + <string key="NSMaxSize">{231, 1e+07}</string> + <string key="NSMinize">{175, 8}</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"/> @@ -1334,7 +1364,7 @@ <nil key="NSDefaultParagraphStyle"/> </object> <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{660, 1e+07}</string> + <string key="NSMaxSize">{378, 1e+07}</string> <string key="NSMinize">{114, 0}</string> <nil key="NSDelegate"/> </object> @@ -1664,7 +1694,39 @@ <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"/> @@ -2006,10 +2068,13 @@ <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"/> @@ -2032,6 +2097,16 @@ <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"/> @@ -2061,6 +2136,11 @@ <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"/> @@ -2902,6 +2982,10 @@ <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> @@ -2942,6 +3026,8 @@ <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> @@ -2998,16 +3084,9 @@ <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"> @@ -3078,7 +3157,7 @@ <reference ref="5"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="5"/> - <string>{{312, 541}, {246, 173}}</string> + <string>{{312, 491}, {246, 223}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="5"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3240,16 +3319,15 @@ <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"> @@ -3279,7 +3357,6 @@ <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/Headers/iTerm/VT100Screen.h =================================================================== --- trunk/Headers/iTerm/VT100Screen.h 2009-09-28 04:20:42 UTC (rev 1855) +++ trunk/Headers/iTerm/VT100Screen.h 2009-09-28 12:49:43 UTC (rev 1856) @@ -38,8 +38,8 @@ typedef struct screen_char_t { unichar ch; // the actual character - unsigned short bg_color; // background color - unsigned short fg_color; // foreground color + unsigned int bg_color; // background color + unsigned int fg_color; // foreground color } screen_char_t; #define TABWINDOW 300 Modified: trunk/iTermApplicationDelegate.h =================================================================== --- trunk/iTermApplicationDelegate.h 2009-09-28 04:20:42 UTC (rev 1855) +++ trunk/iTermApplicationDelegate.h 2009-09-28 12:49:43 UTC (rev 1856) @@ -50,6 +50,8 @@ // Menu items IBOutlet NSMenu *bookmarkMenu; IBOutlet NSMenuItem *selectTab; + IBOutlet NSMenuItem *previousTerminal; + IBOutlet NSMenuItem *nextTerminal; IBOutlet NSMenuItem *logStart; IBOutlet NSMenuItem *logStop; IBOutlet NSMenuItem *closeTab; @@ -81,6 +83,10 @@ - (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 04:20:42 UTC (rev 1855) +++ trunk/iTermApplicationDelegate.m 2009-09-28 12:49:43 UTC (rev 1856) @@ -266,6 +266,17 @@ [[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]; @@ -450,6 +461,9 @@ 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 04:20:42 UTC (rev 1855) +++ trunk/iTermController.m 2009-09-28 12:49:43 UTC (rev 1856) @@ -44,6 +44,12 @@ #import <iTermProfileWindowController.h> #import <iTermBookmarkController.h> + +@interface NSApplication (Undocumented) +- (void)_cycleWindowsReversed:(BOOL)back; +@end + + static NSString* APPLICATION_SUPPORT_DIRECTORY = @"~/Library/Application Support"; static NSString *SUPPORT_DIRECTORY = @"~/Library/Application Support/iTerm"; static NSString *SCRIPT_DIRECTORY = @"~/Library/Application Support/iTerm/Scripts"; @@ -207,6 +213,16 @@ [self launchBookmark:nil inTerminal: FRONT]; } +// navigation +- (IBAction) previousTerminal:(id)sender +{ + [NSApp _cycleWindowsReversed:YES]; +} +- (IBAction)nextTerminal:(id)sender +{ + [NSApp _cycleWindowsReversed:NO]; +} + - (PseudoTerminal *) currentTerminal { return (FRONT); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-10-07 10:57:01
|
Revision: 1867 http://iterm.svn.sourceforge.net/iterm/?rev=1867&view=rev Author: delx Date: 2009-10-07 10:56:49 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Fixed report bug link in about box (#2872981) Modified Paths: -------------- trunk/Changelog trunk/iTermApplicationDelegate.m Modified: trunk/Changelog =================================================================== --- trunk/Changelog 2009-10-02 00:11:11 UTC (rev 1866) +++ trunk/Changelog 2009-10-07 10:56:49 UTC (rev 1867) @@ -1,3 +1,6 @@ +2009-10-07 delx + * Fixed report bug link in about box (#2872981) + 2009-09-29 delx * Lock scrolling while the user is selecting text (#2868971) Modified: trunk/iTermApplicationDelegate.m =================================================================== --- trunk/iTermApplicationDelegate.m 2009-10-02 00:11:11 UTC (rev 1866) +++ trunk/iTermApplicationDelegate.m 2009-10-07 10:56:49 UTC (rev 1867) @@ -374,7 +374,7 @@ webSite = [[NSAttributedString alloc] initWithString: @"http://iterm.sourceforge.net" attributes: linkAttributes]; // Bug report - bugURL = [NSURL URLWithString: @"https://sourceforge.net/tracker/?func=add&group_id=67789&atid=518973"]; + bugURL = [NSURL URLWithString: @"http://iterm.sourceforge.net/tracker-bug"]; linkAttributes= [NSDictionary dictionaryWithObjectsAndKeys: bugURL, NSLinkAttributeName, [NSNumber numberWithInt: NSSingleUnderlineStyle], NSUnderlineStyleAttributeName, [NSColor blueColor], NSForegroundColorAttributeName, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-10-07 11:01:20
|
Revision: 1869 http://iterm.svn.sourceforge.net/iterm/?rev=1869&view=rev Author: delx Date: 2009-10-07 11:01:13 +0000 (Wed, 07 Oct 2009) Log Message: ----------- Improve updateVersion.py to support stable releases Modified Paths: -------------- trunk/updateVersion.py trunk/version.txt Modified: trunk/updateVersion.py =================================================================== --- trunk/updateVersion.py 2009-10-07 10:57:20 UTC (rev 1868) +++ trunk/updateVersion.py 2009-10-07 11:01:13 UTC (rev 1869) @@ -30,7 +30,7 @@ infoFile = os.environ["INFOPLIST_PATH"] path = os.path.join(buildDir, infoFile) plist = NSMutableDictionary.dictionaryWithContentsOfFile_(path) -version = "%s.%s" % (open("version.txt").read().strip(), revision) +version = open("version.txt").read().strip() % {"extra": revision} print "Updating versions:", infoFile, version plist["CFBundleShortVersionString"] = version plist["CFBundleGetInfoString"] = version Modified: trunk/version.txt =================================================================== --- trunk/version.txt 2009-10-07 10:57:20 UTC (rev 1868) +++ trunk/version.txt 2009-10-07 11:01:13 UTC (rev 1869) @@ -1 +1 @@ -0.9.6 +0.10.%(extra)s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-10-12 01:49:46
|
Revision: 1876 http://iterm.svn.sourceforge.net/iterm/?rev=1876&view=rev Author: delx Date: 2009-10-12 01:49:38 +0000 (Mon, 12 Oct 2009) Log Message: ----------- Fixed incorrect vertical font positioning (#2765901) Modified Paths: -------------- trunk/Changelog trunk/PTYTextView.m Modified: trunk/Changelog =================================================================== --- trunk/Changelog 2009-10-09 13:02:48 UTC (rev 1875) +++ trunk/Changelog 2009-10-12 01:49:38 UTC (rev 1876) @@ -1,3 +1,6 @@ +2009-10-12 delx + * Fixed incorrect vertical font positioning (#2765901) + 2009-10-07 delx * Fixed report bug link in about box (#2872981) Modified: trunk/PTYTextView.m =================================================================== --- trunk/PTYTextView.m 2009-10-09 13:02:48 UTC (rev 1875) +++ trunk/PTYTextView.m 2009-10-12 01:49:38 UTC (rev 1876) @@ -2473,12 +2473,13 @@ if(oldFont != theFont) [attrib setObject:theFont forKey: NSFontAttributeName]; + Y += lineHeight + [theFont descender]; NSString* crap = [NSString stringWithCharacters:&code length:1]; - [crap drawWithRect:NSMakeRect(X,Y+[theFont ascender], 0, 0) options:0 attributes:attrib]; + [crap drawWithRect:NSMakeRect(X,Y, 0, 0) options:0 attributes:attrib]; // redraw the character offset by 1 pixel, this is faster than real bold if(renderBold) { - [crap drawWithRect:NSMakeRect(X+1,Y+[theFont ascender], 0, 0) options:0 attributes:attrib]; + [crap drawWithRect:NSMakeRect(X+1,Y, 0, 0) options:0 attributes:attrib]; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2009-10-12 02:03:55
|
Revision: 1877 http://iterm.svn.sourceforge.net/iterm/?rev=1877&view=rev Author: delx Date: 2009-10-12 02:03:45 +0000 (Mon, 12 Oct 2009) Log Message: ----------- Lock scrollback buffer after finding text (#2875908) Modified Paths: -------------- trunk/Changelog trunk/PTYTextView.m Modified: trunk/Changelog =================================================================== --- trunk/Changelog 2009-10-12 01:49:38 UTC (rev 1876) +++ trunk/Changelog 2009-10-12 02:03:45 UTC (rev 1877) @@ -1,5 +1,6 @@ 2009-10-12 delx * Fixed incorrect vertical font positioning (#2765901) + * Lock scrollback buffer after finding text (#2875908) 2009-10-07 delx * Fixed report bug link in about box (#2872981) Modified: trunk/PTYTextView.m =================================================================== --- trunk/PTYTextView.m 2009-10-12 01:49:38 UTC (rev 1876) +++ trunk/PTYTextView.m 2009-10-12 02:03:45 UTC (rev 1877) @@ -2935,6 +2935,9 @@ endX = anIndex % [dataSource width]; endY = anIndex/[dataSource width]; + // Lock scrolling after finding text + [(PTYScroller*)([[self enclosingScrollView] verticalScroller]) setUserScroll:YES]; + [self _scrollToLine:endY]; [self setNeedsDisplay:YES]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <uj...@us...> - 2011-12-05 01:10:36
|
Revision: 1880 http://iterm.svn.sourceforge.net/iterm/?rev=1880&view=rev Author: ujwal Date: 2011-12-05 01:10:27 +0000 (Mon, 05 Dec 2011) Log Message: ----------- * Updated project file for Xcode on Lion. * Disabled Growl support for now: Removed existing Growl and added new Growl * Deleted CGSInternal since that does not compile for Lion anymore. * Result: iTerm builds, but no windows open. Need to fix. Modified Paths: -------------- trunk/Changelog trunk/English.lproj/Bookmarks.xib trunk/English.lproj/ITConfigPanel.xib trunk/PTYSession.m trunk/PseudoTerminal.m trunk/VT100Screen.m trunk/iTerm.xcodeproj/project.pbxproj trunk/iTermController.m Added Paths: ----------- trunk/Growl.framework/ trunk/Growl.framework/Growl trunk/Growl.framework/Headers trunk/Growl.framework/Resources trunk/Growl.framework/Versions/ trunk/Growl.framework/Versions/A/ trunk/Growl.framework/Versions/A/Growl trunk/Growl.framework/Versions/A/Headers/ trunk/Growl.framework/Versions/A/Headers/Growl.h trunk/Growl.framework/Versions/A/Headers/GrowlApplicationBridge.h trunk/Growl.framework/Versions/A/Headers/GrowlDefines.h trunk/Growl.framework/Versions/A/Resources/ trunk/Growl.framework/Versions/A/Resources/Info.plist trunk/Growl.framework/Versions/A/_CodeSignature/ trunk/Growl.framework/Versions/A/_CodeSignature/CodeResources trunk/Growl.framework/Versions/Current Removed Paths: ------------- trunk/Growl/CFGrowlAdditions.c trunk/Growl/CFGrowlAdditions.h trunk/Growl/Growl.h trunk/Growl/GrowlApplicationBridge-Carbon.c trunk/Growl/GrowlApplicationBridge-Carbon.h trunk/Growl/GrowlApplicationBridge.h trunk/Growl/GrowlApplicationBridge.m trunk/Growl/GrowlDefines.h trunk/Growl/GrowlDefinesInternal.h trunk/Growl/GrowlDelegate.h trunk/Growl/GrowlDelegate.m trunk/Growl/GrowlImageAdditions.h trunk/Growl/GrowlImageAdditions.m trunk/Growl/GrowlInstallationPrompt-Carbon.h trunk/Growl/GrowlPathUtil.h trunk/Growl/GrowlPathUtil.m trunk/Growl/GrowlPathway.h trunk/Growl/GrowlVersionUtilities.h trunk/Growl/NSURLAdditions.h trunk/Growl/NSURLAdditions.m Modified: trunk/Changelog =================================================================== --- trunk/Changelog 2011-12-05 01:07:49 UTC (rev 1879) +++ trunk/Changelog 2011-12-05 01:10:27 UTC (rev 1880) @@ -1,3 +1,9 @@ +2011-12-04 ujwal + * Updatd project file for Xcode on Lion. + * Disabled Growl support for now: Removed existing Growl and added new Growl + * Deleted CGSInternal since that does not compile for Lion anymore. + * Result: iTerm builds, but no windows open. Need to fix. + 2009-10-12 delx * Fixed incorrect vertical font positioning (#2765901) * Lock scrollback buffer after finding text (#2875908) Modified: trunk/English.lproj/Bookmarks.xib =================================================================== --- trunk/English.lproj/Bookmarks.xib 2011-12-05 01:07:49 UTC (rev 1879) +++ trunk/English.lproj/Bookmarks.xib 2011-12-05 01:10:27 UTC (rev 1880) @@ -1,27 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9G2133</string> - <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.43</string> - <string key="IBDocument.HIToolboxVersion">353.00</string> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <string key="IBDocument.SystemVersion">11C74</string> + <string key="IBDocument.InterfaceBuilderVersion">1938</string> + <string key="IBDocument.AppKitVersion">1138.23</string> + <string key="IBDocument.HIToolboxVersion">567.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">1938</string> + </object> + <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="6"/> + <string>NSTableHeaderView</string> + <string>NSMenu</string> + <string>NSButton</string> + <string>NSCustomObject</string> + <string>NSImageView</string> + <string>NSImageCell</string> + <string>NSTextField</string> + <string>NSWindowTemplate</string> + <string>NSTextFieldCell</string> + <string>NSButtonCell</string> + <string>NSSegmentedControl</string> + <string>NSTableColumn</string> + <string>NSBox</string> + <string>NSPopUpButtonCell</string> + <string>NSOutlineView</string> + <string>NSView</string> + <string>NSScrollView</string> + <string>NSSegmentedCell</string> + <string>NSPopUpButton</string> + <string>NSMenuItem</string> + <string>NSScroller</string> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <string key="NS.key.0">PluginDependencyRecalculationVersion</string> + <integer value="1" key="NS.object.0"/> </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="443125109"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -46,7 +65,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMinSize">{500, 200}</string> <object class="NSView" key="NSWindowView" id="944403435"> <reference key="NSNextResponder"/> @@ -68,34 +87,35 @@ <int key="NSvFlags">256</int> <string key="NSFrameSize">{557, 233}</string> <reference key="NSSuperview" ref="121332509"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="156025350"> <reference key="NSNextResponder" ref="376142252"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{557, 17}</string> <reference key="NSSuperview" ref="376142252"/> + <reference key="NSWindow"/> <reference key="NSTableView" ref="588715660"/> </object> - <object class="_NSCornerView" key="NSCornerView" id="660545021"> - <reference key="NSNextResponder" ref="226783281"/> + <object class="_NSCornerView" key="NSCornerView"> + <nil key="NSNextResponder"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-22, 0}, {12, 17}}</string> - <reference key="NSSuperview" ref="226783281"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn" id="837844401"> <string key="NSIdentifier">Name</string> - <double key="NSWidth">1.620000e+02</double> - <double key="NSMinWidth">1.600000e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> + <double key="NSWidth">162</double> + <double key="NSMinWidth">16</double> + <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> - <int key="NSCellFlags2">0</int> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> <string key="NSContents">Name</string> <object class="NSFont" key="NSSupport" id="26"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.100000e+01</double> + <double key="NSSize">11</double> <int key="NSfFlags">3100</int> </object> <object class="NSColor" key="NSBackgroundColor" id="748259038"> @@ -118,7 +138,7 @@ <string key="NSContents">Text Cell</string> <object class="NSFont" key="NSSupport" id="981454797"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="588715660"/> @@ -140,12 +160,12 @@ </object> <object class="NSTableColumn" id="761586191"> <string key="NSIdentifier">Command</string> - <double key="NSWidth">1.590488e+02</double> - <double key="NSMinWidth">6.900000e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> + <double key="NSWidth">159.0488</double> + <double key="NSMinWidth">69</double> + <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> - <int key="NSCellFlags2">0</int> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">2048</int> <string key="NSContents">Command</string> <reference key="NSSupport" ref="26"/> <reference key="NSBackgroundColor" ref="748259038"/> @@ -167,12 +187,12 @@ </object> <object class="NSTableColumn" id="1049781251"> <string key="NSIdentifier">Terminal Profile</string> - <double key="NSWidth">6.300000e+01</double> - <double key="NSMinWidth">1.000000e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> + <double key="NSWidth">63</double> + <double key="NSMinWidth">10</double> + <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">134219776</int> <string key="NSContents">Terminal</string> <reference key="NSSupport" ref="26"/> <object class="NSColor" key="NSBackgroundColor" id="318286862"> @@ -195,7 +215,7 @@ <string key="NSColorName">controlBackgroundColor</string> <object class="NSColor" key="NSColor" id="388699233"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> </object> </object> <reference key="NSTextColor" ref="99148667"/> @@ -206,12 +226,12 @@ </object> <object class="NSTableColumn" id="666848471"> <string key="NSIdentifier">Keyboard Profile</string> - <double key="NSWidth">6.300000e+01</double> - <double key="NSMinWidth">1.000000e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> + <double key="NSWidth">63</double> + <double key="NSMinWidth">10</double> + <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">134219776</int> <string key="NSContents">Keyboard</string> <reference key="NSSupport" ref="26"/> <reference key="NSBackgroundColor" ref="318286862"/> @@ -232,12 +252,12 @@ </object> <object class="NSTableColumn" id="679658245"> <string key="NSIdentifier">Display Profile</string> - <double key="NSWidth">6.300000e+01</double> - <double key="NSMinWidth">1.000000e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> + <double key="NSWidth">63</double> + <double key="NSMinWidth">10</double> + <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">134219776</int> <string key="NSContents">Display</string> <reference key="NSSupport" ref="26"/> <reference key="NSBackgroundColor" ref="318286862"/> @@ -258,13 +278,13 @@ </object> <object class="NSTableColumn" id="658591832"> <string key="NSIdentifier">Shortcut</string> - <double key="NSWidth">2.900000e+01</double> - <double key="NSMinWidth">1.000000e+01</double> - <double key="NSMaxWidth">2.900000e+01</double> + <double key="NSWidth">29</double> + <double key="NSMinWidth">10</double> + <double key="NSMaxWidth">29</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> - <int key="NSCellFlags2">134217728</int> - <string type="base64-UTF8" key="NSContents">XuKMmA</string> + <int key="NSCellFlags">75628096</int> + <int key="NSCellFlags2">134219776</int> + <string key="NSContents">^⌘</string> <reference key="NSSupport" ref="26"/> <reference key="NSBackgroundColor" ref="318286862"/> <reference key="NSTextColor" ref="742845987"/> @@ -281,8 +301,8 @@ <reference key="NSTableView" ref="588715660"/> </object> </object> - <double key="NSIntercellSpacingWidth">3.000000e+00</double> - <double key="NSIntercellSpacingHeight">2.000000e+00</double> + <double key="NSIntercellSpacingWidth">3</double> + <double key="NSIntercellSpacingHeight">2</double> <reference key="NSBackgroundColor" ref="979458731"/> <object class="NSColor" key="NSGridColor"> <int key="NSColorSpace">6</int> @@ -293,18 +313,23 @@ <bytes key="NSWhite">MC41AA</bytes> </object> </object> - <double key="NSRowHeight">1.700000e+01</double> - <int key="NSTvFlags">-742359040</int> + <double key="NSRowHeight">17</double> + <int key="NSTvFlags">-205488128</int> + <reference key="NSDelegate"/> + <reference key="NSDataSource"/> <string key="NSAutosaveName">BookmarksView5</string> <int key="NSGridStyleMask">2</int> <int key="NSColumnAutoresizingStyle">1</int> <int key="NSDraggingSourceMaskForLocal">15</int> <int key="NSDraggingSourceMaskForNonLocal">0</int> <bool key="NSAllowsTypeSelect">YES</bool> + <int key="NSTableViewDraggingDestinationStyle">0</int> + <int key="NSTableViewGroupRowStyle">1</int> </object> </object> <string key="NSFrame">{{2, 19}, {557, 233}}</string> <reference key="NSSuperview" ref="226783281"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="588715660"/> <reference key="NSDocView" ref="588715660"/> <reference key="NSBGColor" ref="292156839"/> @@ -315,20 +340,22 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{548, 19}, {11, 222}}</string> <reference key="NSSuperview" ref="226783281"/> + <reference key="NSWindow"/> <int key="NSsFlags">256</int> <reference key="NSTarget" ref="226783281"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">9.527897e-01</double> + <double key="NSPercent">0.95278969999999996</double> </object> <object class="NSScroller" id="71944760"> <reference key="NSNextResponder" ref="226783281"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{2, 241}, {546, 11}}</string> <reference key="NSSuperview" ref="226783281"/> + <reference key="NSWindow"/> <int key="NSsFlags">257</int> <reference key="NSTarget" ref="226783281"/> <string key="NSAction">_doScroller:</string> - <double key="NSPercent">9.840989e-01</double> + <double key="NSPercent">0.9840989</double> </object> <object class="NSClipView" id="376142252"> <reference key="NSNextResponder" ref="226783281"/> @@ -339,22 +366,22 @@ </object> <string key="NSFrame">{{2, 2}, {557, 17}}</string> <reference key="NSSuperview" ref="226783281"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="156025350"/> <reference key="NSDocView" ref="156025350"/> <reference key="NSBGColor" ref="292156839"/> <int key="NScvFlags">4</int> </object> - <reference ref="660545021"/> </object> <string key="NSFrame">{{20, 53}, {561, 254}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="121332509"/> - <int key="NSsFlags">563</int> + <int key="NSsFlags">133683</int> <reference key="NSVScroller" ref="278330220"/> <reference key="NSHScroller" ref="71944760"/> <reference key="NSContentView" ref="121332509"/> <reference key="NSHeaderClipView" ref="376142252"/> - <reference key="NSCornerView" ref="660545021"/> <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> </object> <object class="NSButton" id="92661013"> @@ -362,6 +389,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{114, 11}, {39, 38}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="465013685"> <int key="NSCellFlags">67239424</int> @@ -386,6 +414,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{48, 11}, {39, 38}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="229493367"> <int key="NSCellFlags">67239424</int> @@ -410,6 +439,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{15, 11}, {39, 38}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="856375191"> <int key="NSCellFlags">67239424</int> @@ -417,7 +447,7 @@ <string key="NSContents">+</string> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande-Bold</string> - <double key="NSSize">1.300000e+01</double> + <double key="NSSize">13</double> <int key="NSfFlags">2072</int> </object> <reference key="NSControlView" ref="53906530"/> @@ -438,6 +468,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{81, 11}, {39, 38}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="513109409"> <int key="NSCellFlags">67239424</int> @@ -462,6 +493,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{222, 21}, {113, 18}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="787474048"> <int key="NSCellFlags">67239424</int> @@ -489,6 +521,7 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{460, -55}, {82, 32}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="192769943"> <int key="NSCellFlags">67239424</int> @@ -508,8 +541,9 @@ <object class="NSSegmentedControl" id="736837561"> <reference key="NSNextResponder" ref="944403435"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{368, 17}, {215, 24}}</string> + <string key="NSFrame">{{368, 17}, {215, 25}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSSegmentedCell" key="NSCell" id="432043654"> <int key="NSCellFlags">67239424</int> @@ -519,12 +553,12 @@ <object class="NSMutableArray" key="NSSegmentImages"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSSegmentItem"> - <double key="NSSegmentItemWidth">1.040000e+02</double> + <double key="NSSegmentItemWidth">104</double> <string key="NSSegmentItemLabel">New Tab</string> <int key="NSSegmentItemImageScaling">2</int> </object> <object class="NSSegmentItem"> - <double key="NSSegmentItemWidth">1.040000e+02</double> + <double key="NSSegmentItemWidth">104</double> <string key="NSSegmentItemLabel">New Window</string> <int key="NSSegmentItemTag">1</int> <int key="NSSegmentItemImageScaling">2</int> @@ -539,6 +573,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{147, 11}, {39, 38}}</string> <reference key="NSSuperview" ref="944403435"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="107298134"> <int key="NSCellFlags">67239424</int> @@ -561,10 +596,12 @@ </object> <string key="NSFrameSize">{601, 322}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1600, 1002}}</string> <string key="NSMinSize">{500, 222}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{10000000000000, 10000000000000}</string> + <bool key="NSWindowIsRestorable">YES</bool> </object> <object class="NSWindowTemplate" id="929290169"> <int key="NSWindowStyleMask">3</int> @@ -576,7 +613,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="853298807"> <nil key="NSNextResponder"/> @@ -678,7 +715,7 @@ <int key="NSvFlags">256</int> <object class="NSMutableSet" key="NSDragTypes"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="set.sortedObjects"> + <object class="NSArray" key="set.sortedObjects"> <bool key="EncodedWithXMLCoder">YES</bool> <string>Apple PDF pasteboard type</string> <string>Apple PICT pasteboard type</string> @@ -710,7 +747,8 @@ </object> <string key="NSScreenRect">{{0, 0}, {1600, 1002}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{10000000000000, 10000000000000}</string> + <bool key="NSWindowIsRestorable">YES</bool> </object> <object class="NSWindowTemplate" id="1058331134"> <int key="NSWindowStyleMask">3</int> @@ -724,7 +762,7 @@ <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMinSize">{213, 107}</string> <object class="NSView" key="NSWindowView" id="97623800"> <nil key="NSNextResponder"/> @@ -1217,7 +1255,7 @@ <object class="NSTextFieldCell" key="NSCell" id="501508300"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">4194304</int> - <string type="base64-UTF8" key="NSContents">U2hvcnRjdXQga2V5OiAgICAgIOKMg+KMmA</string> + <string key="NSContents">Shortcut key: ⌃⌘</string> <reference key="NSSupport" ref="981454797"/> <reference key="NSControlView" ref="393567908"/> <reference key="NSBackgroundColor" ref="764840485"/> @@ -1248,7 +1286,7 @@ <int key="NSPeriodicInterval">75</int> <object class="NSMenuItem" key="NSMenuItem" id="489933470"> <reference key="NSMenu" ref="16558044"/> - <string key="NSTitle"> </string> + <string type="base64-UTF8" key="NSTitle">IA</string> <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -1675,8 +1713,14 @@ </object> <string key="NSScreenRect">{{0, 0}, {1600, 1002}}</string> <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSMaxSize">{10000000000000, 10000000000000}</string> + <bool key="NSWindowIsRestorable">YES</bool> </object> + <object class="NSView" id="383700681"> + <nil key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <string key="NSFrameSize">{125, 1}</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -1866,22 +1910,6 @@ <int key="connectionID">133</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">dataSource</string> - <reference key="source" ref="588715660"/> - <reference key="destination" ref="702893507"/> - </object> - <int key="connectionID">142</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="588715660"/> - <reference key="destination" ref="702893507"/> - </object> - <int key="connectionID">143</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">addBookmarkFolderCancel:</string> <reference key="source" ref="702893507"/> @@ -1929,6 +1957,22 @@ </object> <int key="connectionID">279</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">dataSource</string> + <reference key="source" ref="588715660"/> + <reference key="destination" ref="702893507"/> + </object> + <int key="connectionID">142</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="588715660"/> + <reference key="destination" ref="702893507"/> + </object> + <int key="connectionID">143</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1945,7 +1989,7 @@ <int key="objectID">-2</int> <reference key="object" ref="702893507"/> <reference key="parent" ref="0"/> - <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> + <string key="objectName">File's Owner</string> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> @@ -2395,20 +2439,10 @@ <reference key="object" ref="263341744"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="383700681"> - <nil key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{2, 2}, {125, 1}}</string> - </object> </object> <reference key="parent" ref="97623800"/> </object> <object class="IBObjectRecord"> - <int key="objectID">117</int> - <reference key="object" ref="383700681"/> - <reference key="parent" ref="263341744"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">282</int> <reference key="object" ref="465013685"/> <reference key="parent" ref="92661013"/> @@ -2941,469 +2975,330 @@ <reference key="object" ref="156025350"/> <reference key="parent" ref="226783281"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">117</int> + <reference key="object" ref="383700681"/> + <reference key="parent" ref="0"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>-1.IBPluginDependency</string> <string>-2.IBPluginDependency</string> <string>-3.IBPluginDependency</string> - <string>-3.ImportedFromIB2</string> <string>10.IBPluginDependency</string> - <string>10.ImportedFromIB2</string> <string>100.IBPluginDependency</string> - <string>100.ImportedFromIB2</string> <string>101.IBPluginDependency</string> - <string>101.ImportedFromIB2</string> <string>102.IBPluginDependency</string> - <string>102.ImportedFromIB2</string> <string>103.IBPluginDependency</string> - <string>103.ImportedFromIB2</string> <string>104.IBPluginDependency</string> - <string>104.ImportedFromIB2</string> <string>105.IBPluginDependency</string> - <string>105.ImportedFromIB2</string> <string>106.IBPluginDependency</string> - <string>106.ImportedFromIB2</string> <string>107.IBPluginDependency</string> - <string>107.ImportedFromIB2</string> <string>108.IBPluginDependency</string> - <string>108.ImportedFromIB2</string> <string>109.IBPluginDependency</string> - <string>109.ImportedFromIB2</string> <string>11.IBPluginDependency</string> - <string>11.ImportedFromIB2</string> <string>110.IBPluginDependency</string> - <string>110.ImportedFromIB2</string> <string>111.IBPluginDependency</string> - <string>111.ImportedFromIB2</string> <string>112.IBPluginDependency</string> - <string>112.ImportedFromIB2</string> <string>113.IBPluginDependency</string> - <string>113.ImportedFromIB2</string> <string>114.IBPluginDependency</string> - <string>114.ImportedFromIB2</string> <string>115.IBPluginDependency</string> - <string>115.ImportedFromIB2</string> <string>116.IBPluginDependency</string> - <string>116.ImportedFromIB2</string> <string>117.IBPluginDependency</string> - <string>117.ImportedFromIB2</string> <string>13.IBPluginDependency</string> - <string>13.ImportedFromIB2</string> <string>14.IBPluginDependency</string> - <string>14.ImportedFromIB2</string> <string>147.IBPluginDependency</string> - <string>147.ImportedFromIB2</string> <string>148.IBPluginDependency</string> - <string>148.ImportedFromIB2</string> <string>149.IBPluginDependency</string> - <string>149.ImportedFromIB2</string> <string>15.IBPluginDependency</string> - <string>15.ImportedFromIB2</string> <string>152.IBPluginDependency</string> - <string>152.ImportedFromIB2</string> <string>153.IBPluginDependency</string> - <string>153.ImportedFromIB2</string> <string>156.IBPluginDependency</string> - <string>156.ImportedFromIB2</string> <string>16.IBPluginDependency</string> - <string>16.ImportedFromIB2</string> <string>197.IBPluginDependency</string> - <string>197.ImportedFromIB2</string> <string>198.IBPluginDependency</string> - <string>198.ImportedFromIB2</string> - <string>23.ImportedFromIB2</string> - <string>23.windowTemplate.hasMinSize</string> - <string>23.windowTemplate.minSize</string> + <string>23.IBPluginDependency</string> <string>237.IBPluginDependency</string> - <string>237.ImportedFromIB2</string> <string>24.IBPluginDependency</string> - <string>24.ImportedFromIB2</string> <string>25.IBPluginDependency</string> - <string>25.ImportedFromIB2</string> <string>26.IBPluginDependency</string> - <string>26.ImportedFromIB2</string> <string>27.IBPluginDependency</string> - <string>27.ImportedFromIB2</string> <string>28.IBPluginDependency</string> - <string>28.ImportedFromIB2</string> + <string>282.IBPluginDependency</string> + <string>283.IBPluginDependency</string> + <string>284.IBPluginDependency</string> + <string>285.IBPluginDependency</string> + <string>286.IBPluginDependency</string> + <string>287.IBPluginDependency</string> + <string>288.IBPluginDependency</string> + <string>289.IBPluginDependency</string> + <string>290.IBPluginDependency</string> + <string>291.IBPluginDependency</string> + <string>292.IBPluginDependency</string> + <string>293.IBPluginDependency</string> + <string>294.IBPluginDependency</string> + <string>295.IBPluginDependency</string> + <string>296.IBPluginDependency</string> + <string>297.IBPluginDependency</string> + <string>298.IBPluginDependency</string> + <string>299.IBPluginDependency</string> + <string>300.IBPluginDependency</string> + <string>301.IBPluginDependency</string> + <string>302.IBPluginDependency</string> + <string>303.IBPluginDependency</string> + <string>304.IBPluginDependency</string> + <string>305.IBPluginDependency</string> + <string>306.IBPluginDependency</string> + <string>307.IBPluginDependency</string> + <string>308.IBPluginDependency</string> + <string>309.IBPluginDependency</string> + <string>310.IBPluginDependency</string> + <string>311.IBPluginDependency</string> <string>311.IBShouldRemoveOnLegacySave</string> + <string>312.IBPluginDependency</string> <string>312.IBShouldRemoveOnLegacySave</string> + <string>313.IBPluginDependency</string> <string>313.IBShouldRemoveOnLegacySave</string> + <string>314.IBPluginDependency</string> <string>314.IBShouldRemoveOnLegacySave</string> + <string>315.IBPluginDependency</string> <string>315.IBShouldRemoveOnLegacySave</string> + <string>316.IBPluginDependency</string> <string>316.IBShouldRemoveOnLegacySave</string> + <string>317.IBPluginDependency</string> <string>317.IBShouldRemoveOnLegacySave</string> + <string>318.IBPluginDependency</string> <string>318.IBShouldRemoveOnLegacySave</string> - <string>44.ImportedFromIB2</string> - <string>44.windowTemplate.hasMinSize</string> - <string>44.windowTemplate.minSize</string> + <string>44.IBPluginDependency</string> <string>45.IBPluginDependency</string> - <string>45.ImportedFromIB2</string> <string>46.IBPluginDependency</string> - <string>46.ImportedFromIB2</string> <string>47.IBPluginDependency</string> - <string>47.ImportedFromIB2</string> <string>48.IBPluginDependency</string> - <string>48.ImportedFromIB2</string> <string>49.IBPluginDependency</string> - <string>49.ImportedFromIB2</string> - <string>5.IBEditorWindowLastContentRect</string> + <string>5.IBPluginDependency</string> <string>5.IBWindowTemplateEditedContentRect</string> - <string>5.ImportedFromIB2</string> - <string>5.windowTemplate.hasMinSize</string> - <string>5.windowTemplate.minSize</string> <string>50.IBPluginDependency</string> - <string>50.ImportedFromIB2</string> <string>51.IBPluginDependency</string> - <string>51.ImportedFromIB2</string> <string>52.IBPluginDependency</string> - <string>52.ImportedFromIB2</string> <string>53.IBPluginDependency</string> - <string>53.ImportedFromIB2</string> <string>54.IBPluginDependency</string> - <string>54.ImportedFromIB2</string> <string>55.IBPluginDependency</string> - <string>55.ImportedFromIB2</string> <string>56.IBPluginDependency</string> - <string>56.ImportedFromIB2</string> <string>57.IBPluginDependency</string> - <string>57.ImportedFromIB2</string> <string>58.IBPluginDependency</string> - <string>58.ImportedFromIB2</string> <string>59.IBPluginDependency</string> - <string>59.ImportedFromIB2</string> <string>6.IBPluginDependency</string> - <string>6.ImportedFromIB2</string> <string>60.IBPluginDependency</string> - <string>60.ImportedFromIB2</string> <string>61.IBPluginDependency</string> - <string>61.ImportedFromIB2</string> <string>62.IBPluginDependency</string> - <string>62.ImportedFromIB2</string> <string>63.IBPluginDependency</string> - <string>63.ImportedFromIB2</string> <string>64.IBPluginDependency</string> - <string>64.ImportedFromIB2</string> <string>65.IBPluginDependency</string> - <string>65.ImportedFromIB2</string> <string>66.IBPluginDependency</string> - <string>66.ImportedFromIB2</string> <string>67.IBPluginDependency</string> - <string>67.ImportedFromIB2</string> <string>68.IBPluginDependency</string> - <string>68.ImportedFromIB2</string> <string>69.IBPluginDependency</string> - <string>69.ImportedFromIB2</string> <string>7.IBPluginDependency</string> - <string>7.ImportedFromIB2</string> <string>70.IBPluginDependency</string> - <string>70.ImportedFromIB2</string> <string>71.IBPluginDependency</string> - <string>71.ImportedFromIB2</string> <string>72.IBPluginDependency</string> - <string>72.ImportedFromIB2</string> <string>73.IBPluginDependency</string> - <string>73.ImportedFromIB2</string> <string>74.IBPluginDependency</string> - <string>74.ImportedFromIB2</string> <string>75.IBPluginDependency</string> - <string>75.ImportedFromIB2</string> <string>76.IBPluginDependency</string> - <string>76.ImportedFromIB2</string> <string>77.IBPluginDependency</string> - <string>77.ImportedFromIB2</string> <string>78.IBPluginDependency</string> - <string>78.ImportedFromIB2</string> <string>79.IBPluginDependency</string> - <string>79.ImportedFromIB2</string> <string>8.IBPluginDependency</string> - <string>8.ImportedFromIB2</string> <string>80.IBPluginDependency</string> - <string>80.ImportedFromIB2</string> <string>81.IBPluginDependency</string> - <string>81.ImportedFromIB2</string> <string>82.IBPluginDependency</string> - <string>82.ImportedFromIB2</string> <string>83.IBPluginDependency</string> - <string>83.ImportedFromIB2</string> <string>84.IBPluginDependency</string> - <string>84.ImportedFromIB2</string> <string>85.IBPluginDependency</string> - <string>85.ImportedFromIB2</string> <string>86.IBPluginDependency</string> - <string>86.ImportedFromIB2</string> <string>87.IBPluginDependency</string> - <string>87.ImportedFromIB2</string> <string>88.IBPluginDependency</string> - <string>88.ImportedFromIB2</string> <string>89.IBPluginDependency</string> - <string>89.ImportedFromIB2</string> <string>9.IBPluginDependency</string> - <string>9.ImportedFromIB2</string> <string>90.IBPluginDependency</string> - <string>90.ImportedFromIB2</string> <string>91.IBPluginDependency</string> - <string>91.ImportedFromIB2</string> <string>92.IBPluginDependency</string> - <string>92.ImportedFromIB2</string> <string>93.IBPluginDependency</string> - <string>93.ImportedFromIB2</string> <string>94.IBPluginDependency</string> - <string>94.ImportedFromIB2</string> <string>95.IBPluginDependency</string> - <string>95.ImportedFromIB2</string> <string>96.IBPluginDependency</string> - <string>96.ImportedFromIB2</string> <string>97.IBPluginDependency</string> - <string>97.ImportedFromIB2</string> <string>98.IBPluginDependency</string> - <string>98.ImportedFromIB2</string> <string>99.IBPluginDependency</string> - <string>99.ImportedFromIB2</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES" id="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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="5"/> - <reference ref="5"/> - <reference ref="5"/> - <string>{213, 107}</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"/> <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"/> - <reference ref="5"/> - <reference ref="5"/> - <reference ref="5"/> - <reference ref="5"/> - <reference ref="5"/> - <reference ref="5"/> - <reference ref="5"/> - <string>{213, 107}</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"/> <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> + <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> + <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> + <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> + <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> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="YES"/> + <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> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{21, 400}, {601, 322}}</string> - <string>{{21, 400}, {601, 322}}</string> - <reference ref="5"/> - <reference ref="5"/> - <string>{500, 200}</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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <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"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="5"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <reference ref="5"/> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.sortedKeys" ref="0"/> + <reference key="dict.values" ref="0"/> </object> <nil key="activeLocalization"/> <object class="NSMutableDictionary" key="localizations"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.sortedKeys" ref="0"/> + <reference key="dict.values" ref="0"/> </object> <nil key="sourceID"/> <int key="maxID">318</int> @@ -3412,32 +3307,11 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">FirstResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSegmentedControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">iTermBookmarkController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addBookmark:</string> <string>addBookmarkCancel:</string> @@ -3445,11 +3319,7 @@ <string>addBookmarkFolder:</string> <string>addBookmarkFolderCancel:</string> <string>addBookmarkFolderConfirm:</string> - <string>closeWindow:</string> <string>deleteBookmark:</string> - <string>deleteBookmarkCancel:</string> - <string>deleteBookmarkConfirm:</string> - <string>deleteBookmarkFolder:</string> <string>editBookmark:</string> <string>launchSession:</string> <string>setDefaultSession:</string> @@ -3468,15 +3338,75 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addBookmark:</string> + <string>addBookmarkCancel:</string> + <string>addBookmarkConfirm:</string> + <string>addBookmarkFolder:</string> + <string>addBookmarkFolderCancel:</string> + <string>addBookmarkFolderConfirm:</string> + <string>deleteBookmark:</string> + <string>editBookmark:</string> + <string>launchSession:</string> + <string>setDefaultSession:</string> + <string>sortBookmark:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">addBookmark:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">addBookmarkCancel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">addBookmarkConfirm:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">addBookmarkFolder:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">addBookmarkFolderCancel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">addBookmarkFolderConfirm:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">deleteBookmark:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">editBookmark:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">launchSession:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">setDefaultSession:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">sortBookmark:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addBookmarkFolderPanel</string> <string>addFolderPanelTitle</string> @@ -3517,15 +3447,145 @@ <string>NSSegmentedControl</string> </object> </... [truncated message content] |