From dc42634f648242a9ac35d5052db40e412080375e Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 1 Feb 2010 01:10:56 -0500 Subject: [PATCH] Remove IDE key preference because this is a property from the engine, not the IDE. --- English.lproj/Preferences.xib | 792 ++++++++++++++++++++++++++-------- Source/AppDelegate.m | 1 - Source/DebuggerController.m | 4 +- 3 files changed, 623 insertions(+), 174 deletions(-) diff --git a/English.lproj/Preferences.xib b/English.lproj/Preferences.xib index 0b28fa1..31954f8 100644 --- a/English.lproj/Preferences.xib +++ b/English.lproj/Preferences.xib @@ -1,11 +1,15 @@ - + 1050 - 9J61 - 677 - 949.46 - 353.00 + 10C540 + 740 + 1038.25 + 458.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 740 + YES @@ -13,12 +17,11 @@ YES - com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin YES - + YES @@ -56,7 +59,7 @@ 1 YES - + YES 6AEED900-187C-4FE3-B185-35C4C2105744 7E7339A3-79C3-4087-B2F7-2479CFD10818 @@ -189,21 +192,17 @@ YES - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 256 {420, 120} {{0, 0}, {1680, 1028}} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} Preferences - - YES - AutoReconnect - YES @@ -214,7 +213,7 @@ 268 - {{77, 54}, {86, 17}} + {{77, 20}, {86, 17}} YES @@ -223,7 +222,7 @@ Xdebug Port: LucidaGrande - 1.300000e+01 + 13 1044 @@ -233,7 +232,7 @@ controlColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -250,7 +249,7 @@ 268 - {{168, 52}, {60, 22}} + {{168, 18}, {60, 22}} YES @@ -260,7 +259,7 @@ YES - + 6 System textBackgroundColor @@ -269,7 +268,7 @@ MQA - + 6 System textColor @@ -277,43 +276,10 @@ - - - 268 - {{55, 22}, {108, 17}} - - YES - - 68288064 - 272630784 - Xdebug IDE Key: - - - - - - - - - 268 - {{168, 20}, {210, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - - - 268 - {{17, 79}, {387, 28}} + {{17, 45}, {387, 28}} YES @@ -322,7 +288,7 @@ You must close and reopen MacGDBp before these preference values take effect. LucidaGrande - 1.100000e+01 + 11 16 @@ -333,7 +299,7 @@ 268 - {{164, 147}, {216, 18}} + {{164, 113}, {216, 18}} YES @@ -360,7 +326,7 @@ 268 - {{15, 149}, {146, 17}} + {{15, 115}, {146, 17}} YES @@ -376,7 +342,7 @@ 268 - {{164, 125}, {216, 18}} + {{164, 91}, {216, 18}} YES @@ -396,7 +362,7 @@ - {421, 186} + {421, 152} NSView @@ -437,16 +403,16 @@ YES - 2.160000e+02 - 4.000000e+01 - 1.000000e+03 + 216 + 40 + 1000 - 75628032 - 0 + 75628096 + 2048 Local LucidaGrande - 1.100000e+01 + 11 3100 @@ -480,12 +446,12 @@ - 2.050000e+02 - 4.000000e+01 - 1.000000e+03 + 205 + 40 + 1000 - 75628032 - 0 + 75628096 + 2048 Remote @@ -506,8 +472,8 @@ - 3.000000e+00 - 2.000000e+00 + 3 + 2 6 @@ -518,12 +484,15 @@ MC41AA - 1.700000e+01 + 17 1522532352 + + 4 15 0 YES + 0 {{1, 17}, {427, 175}} @@ -540,7 +509,7 @@ _doScroller: - 9.142857e-01 + 0.91428569999999998 @@ -550,8 +519,8 @@ 1 _doScroller: - 1.000000e+00 - 9.976526e-01 + 1 + 0.9976526 @@ -692,22 +661,6 @@ 45 - - - value: values.IDEKey - - - - - - value: values.IDEKey - value - values.IDEKey - 2 - - - 46 - delegate @@ -769,7 +722,7 @@ values.PathReplacements NSHandlesContentAsCompoundValue - + 2 @@ -870,28 +823,26 @@ YES 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application @@ -902,7 +853,7 @@ - + 2 @@ -915,7 +866,7 @@ 13 - + 20 @@ -949,11 +900,9 @@ - - - + GeneralPreferences @@ -974,24 +923,6 @@ - - 34 - - - YES - - - - - - 35 - - - YES - - - - 36 @@ -1006,16 +937,6 @@ - - 38 - - - - - 39 - - - 40 @@ -1045,7 +966,7 @@ - + PathsPreferences @@ -1144,7 +1065,7 @@ 78 - + Paths Controller @@ -1193,10 +1114,8 @@ YES - + YES - -1.IBPluginDependency - -2.IBPluginDependency -3.IBPluginDependency 1.IBEditorWindowLastContentRect 1.IBPluginDependency @@ -1206,21 +1125,16 @@ 1.NSWindowTemplate.visibleAtLaunch 1.WindowOrigin 1.editorWindowContentRectSynchronizationRect + 13.IBPluginDependency 2.IBPluginDependency 20.IBEditorWindowLastContentRect 20.IBPluginDependency - 25.IBPluginDependency - 26.IBPluginDependency 29.IBEditorWindowLastContentRect 29.IBPluginDependency 32.IBPluginDependency 33.IBPluginDependency - 34.IBPluginDependency - 35.IBPluginDependency 36.IBPluginDependency 37.IBPluginDependency - 38.IBPluginDependency - 39.IBPluginDependency 40.IBPluginDependency 41.IBPluginDependency 43.IBPluginDependency @@ -1254,26 +1168,19 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit {{647, 290}, {420, 120}} com.apple.InterfaceBuilder.CocoaPlugin - - + + {{647, 290}, {420, 120}} - + {196, 240} {{202, 428}, {480, 270}} com.apple.InterfaceBuilder.CocoaPlugin - {{549, 410}, {616, 0}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{483, 332}, {421, 186}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{549, 410}, {616, 0}} com.apple.InterfaceBuilder.CocoaPlugin + {{483, 366}, {421, 152}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1326,9 +1233,7 @@ YES - - YES - + YES @@ -1336,9 +1241,7 @@ YES - - YES - + YES @@ -1356,19 +1259,12 @@ Source/BSSourceView.h - - NSObject - - IBProjectSource - Source/SocketWrapper.h - - PreferencesController NSWindowController YES - + YES showGeneral: showPaths: @@ -1381,7 +1277,7 @@ YES - + YES generalPreferencesItem generalPreferencesView @@ -1412,8 +1308,562 @@ + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + + + NSArrayController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSArrayController.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSController + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSController.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSManagedObjectContext + NSObject + + IBFrameworkSource + CoreData.framework/Headers/NSManagedObjectContext.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUAppcast.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h + + + + NSObjectController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSObjectController.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + + + NSTableColumn + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableColumn.h + + + + NSTableHeaderView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTableHeaderView.h + + + + NSTableView + NSControl + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSToolbar + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSToolbarItem + NSObject + + + + NSUserDefaultsController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSUserDefaultsController.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSWindowScripting.h + + + + NSWindowController + NSResponder + + showWindow: + id + + + IBFrameworkSource + AppKit.framework/Headers/NSWindowController.h + + + 0 + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES ../MacGDBp.xcodeproj 3 diff --git a/Source/AppDelegate.m b/Source/AppDelegate.m index b861bb2..333ab58 100644 --- a/Source/AppDelegate.m +++ b/Source/AppDelegate.m @@ -41,7 +41,6 @@ NSDictionary* dict = [[NSDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt:9000], @"Port", - @"macgdbp", @"IDEKey", [NSNumber numberWithBool:YES], @"BreakpointsWindowVisible", [NSNumber numberWithBool:YES], @"InspectorWindowVisible", [NSMutableArray array], @"PathReplacements", diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m index b425c62..91c86e3 100644 --- a/Source/DebuggerController.m +++ b/Source/DebuggerController.m @@ -41,7 +41,7 @@ stackController = [[StackController alloc] init]; NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; - connection = [[GDBpConnection alloc] initWithPort:[defaults integerForKey:@"Port"] ideKey:[defaults stringForKey:@"IDEKey"]]; + connection = [[GDBpConnection alloc] initWithPort:[defaults integerForKey:@"Port"]]; connection.delegate = self; expandedVariables = [[NSMutableSet alloc] init]; [[self window] makeKeyAndOrderFront:nil]; @@ -70,7 +70,7 @@ - (void)awakeFromNib { [[self window] setExcludedFromWindowsMenu:YES]; - [[self window] setTitle:[NSString stringWithFormat:@"GDBp @ %@:%d/%@", [connection remoteHost], [connection port], [connection ideKey]]]; + [[self window] setTitle:[NSString stringWithFormat:@"GDBp @ %@:%d", [connection remoteHost], [connection port]]]; [sourceViewer setDelegate:self]; [stackArrayController setSortDescriptors:[NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"index" ascending:YES] autorelease]]]; } -- 2.22.5