From 05a8f087d5abf971a7064c1c03772ad30b9a3032 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Wed, 23 Apr 2008 15:12:05 -0400 Subject: [PATCH] Removing the connect dialog * English.lproj/Connect.xib: Removed * English.lproj/MainMenu.xib: Removing the "Connection" menu and adding a "File" menu * Source/AppDelegate.m/h: ([showConnectWindow:]): Removed * Source/ConnectWindowController.m/h: Removed * MacGDBp.xcodeproj: Project updates for removed files --- English.lproj/Connect.xib | 624 ------------------------------ English.lproj/MainMenu.xib | 336 ++++++++++++---- MacGDBp.xcodeproj/project.pbxproj | 18 - Source/AppDelegate.h | 2 - Source/AppDelegate.m | 12 +- Source/ConnectWindowController.h | 30 -- Source/ConnectWindowController.m | 46 --- 7 files changed, 254 insertions(+), 814 deletions(-) delete mode 100644 English.lproj/Connect.xib delete mode 100644 Source/ConnectWindowController.h delete mode 100644 Source/ConnectWindowController.m diff --git a/English.lproj/Connect.xib b/English.lproj/Connect.xib deleted file mode 100644 index c111ebb..0000000 --- a/English.lproj/Connect.xib +++ /dev/null @@ -1,624 +0,0 @@ - - - - 1050 - 9B18 - 629 - 949 - 343.00 - - YES - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - ConnectWindowController - - - FirstResponder - - - NSApplication - - - 7 - 2 - {{532, 546}, {399, 174}} - 1886912512 - Connect to GDBp - - NSWindow - - - View - - {3.40282e+38, 3.40282e+38} - {213, 107} - - - 256 - - YES - - - 256 - - YES - - - 256 - - YES - - - 256 - {{13, 54}, {84, 17}} - - YES - - 67239424 - 272629760 - Session: - - LucidaGrande - 1.300000e+01 - 1044 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2OQA - - - - 6 - - controlTextColor - - 3 - MAA - - - - - - - 256 - {{102, 52}, {239, 22}} - - YES - - -1804468671 - 272630784 - - - - YES - - 6 - - textBackgroundColor - - 3 - MQA - - - - 6 - - textColor - - - - - - - 256 - {{13, 22}, {84, 17}} - - YES - - 67239424 - 272629760 - Port: - - - - - - - - - 256 - {{102, 20}, {91, 22}} - - YES - - -1804468671 - 272630784 - 9000 - - - YES - - - - - - {{2, 2}, {361, 90}} - - - - {{17, 47}, {365, 107}} - - {0, 0} - - 67239424 - 0 - Connection Details - - - 1.100000e+01 - 3100 - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{274, 12}, {111, 32}} - - YES - - 67239424 - 134217728 - Connect - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - {{1, 9}, {399, 174}} - - {{0, 0}, {1440, 878}} - {213, 129} - {3.40282e+38, 3.40282e+38} - - - - - YES - - - window - - - - 16 - - - - connect: - - - - 22 - - - - port - - - - 29 - - - - session - - - - 36 - - - - - YES - - 0 - - YES - - - - - - -2 - - - RmlsZSdzIE93bmVyA - - - -1 - - - First Responder - - - -3 - - - Application - - - 5 - - - YES - - - - Window - - - 6 - - - YES - - - - - - - 7 - - - YES - - - - - - - - - 15 - - - YES - - - - - - 42 - - - - - 11 - - - YES - - - - - - 38 - - - - - 12 - - - YES - - - - - - 39 - - - - - 13 - - - YES - - - - - - 40 - - - - - 14 - - - YES - - - - - - 41 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - -3.ImportedFromIB2 - 11.IBPluginDependency - 11.ImportedFromIB2 - 12.IBPluginDependency - 12.ImportedFromIB2 - 13.IBPluginDependency - 13.ImportedFromIB2 - 14.IBPluginDependency - 14.ImportedFromIB2 - 15.IBPluginDependency - 15.ImportedFromIB2 - 5.IBPluginDependency - 5.ImportedFromIB2 - 5.windowTemplate.hasMaxSize - 5.windowTemplate.hasMinSize - 5.windowTemplate.maxSize - 5.windowTemplate.minSize - 6.IBPluginDependency - 6.ImportedFromIB2 - 7.IBPluginDependency - 7.ImportedFromIB2 - - - YES - - - - - - - - - - - - - - - - - - - {3.40282e+38, 3.40282e+38} - {213, 107} - - - - - - - - YES - - YES - - - YES - - - - - YES - - YES - - - YES - - - - 42 - - - - YES - - ConnectWindowController - NSWindowController - - connect: - id - - - YES - - YES - port - session - - - YES - NSTextField - - - - - IBUserSource - - - - - FirstResponder - - - YES - - YES - - - YES - - - - YES - - YES - - - YES - - - - - - - - - - 0 - - 3 - - YnBsaXN0MDDUAAEAAgADAAQABQAGAAkAClgkdmVyc2lvblQkdG9wWSRhcmNoaXZlclgkb2JqZWN0cxIA -AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxCKAAsADAAxADUANgA8AD0A -QQBFAEwAVABiAGgAaQCDAIQAjACNAJAAkQCSAJYAnACdAKEApgCtALMAtADBAMsAzADNANIA1ADZANoA -3QDgAOMA5ADnAOwBCAEJAQoBDgESARUBFgEXARwBLgEyATkBQAFBAUkBSgFPAVABUwFYAVkBYAFhAWgB -aQFwAXEBeQF6AX4BfwGBAYIBgwGJAYoBjwGSAZUBlgGXARUBmAGbAZwBoQGiAbMBtgG3AbkBygHcAe4B -7wHwAfEB8gHzAfQB9QH2AfcB+AH5AfoB+wH8Af0CAAIDAhkCLwIwAjECMgIzAjQAyAI1AjYCNwEFAjgC -OQI6AjsAegI8Aj0CPgI/AkICRQJIVSRudWxs3xASAA0ADgAPABAAEQASABMAFAAVABYAFwAYABkAGgAb -ABwAHQAeAB8AIAAhACIAIwAkACUAJgAnACgAKQAqACsALAAtAC4ALwAwVk5TUm9vdFYkY2xhc3NdTlNP -YmplY3RzS2V5c18QD05TQ2xhc3Nlc1ZhbHVlc18QGU5TQWNjZXNzaWJpbGl0eU9pZHNWYWx1ZXNdTlND -b25uZWN0aW9uc1tOU05hbWVzS2V5c1tOU0ZyYW1ld29ya11OU0NsYXNzZXNLZXlzWk5TT2lkc0tleXNd -TlNOYW1lc1ZhbHVlc18QGU5TQWNjZXNzaWJpbGl0eUNvbm5lY3RvcnNdTlNGb250TWFuYWdlcl8QEE5T -VmlzaWJsZVdpbmRvd3NfEA9OU09iamVjdHNWYWx1ZXNfEBdOU0FjY2Vzc2liaWxpdHlPaWRzS2V5c1lO -U05leHRPaWRcTlNPaWRzVmFsdWVzgAKAiYBZgHCAiIAIgF6ABYBvgHGAX4CGgACABoBdgIcQK4By0gAO -ADIAMwA0W05TQ2xhc3NOYW1lgASAA18QF0Nvbm5lY3RXaW5kb3dDb250cm9sbGVy0gA3ADgAOQA6WCRj -bGFzc2VzWiRjbGFzc25hbWWiADoAO15OU0N1c3RvbU9iamVjdFhOU09iamVjdF8QEElCQ29jb2FGcmFt -ZXdvcmvSAA4APgA/AEBaTlMub2JqZWN0c4AHoNIANwA4AEIAQ6MAQwBEADtcTlNNdXRhYmxlU2V0VU5T -U2V00gAOAD4ARgBHgEekAEgASQBKAEuACYAYgCmAV9QADgBNAE4ATwBQAB8AUgBTXU5TRGVzdGluYXRp -b25YTlNTb3VyY2VXTlNMYWJlbIAXgAKACoAW1wBVAA4AVgBXAFgAWQBaAFsAXABdAF4AXwBgAFtfEA9O -U05leHRSZXNwb25kZXJXTlNGcmFtZVZOU0NlbGxYTlN2RmxhZ3NZTlNFbmFibGVkW05TU3VwZXJ2aWV3 -gAuAFYAMgA0RAQAJgAvVAFUADgBWAGMAWAArAGUAZgBnAF9aTlNTdWJ2aWV3c4AAgEmAUYAyXxAWe3sy -NzQsIDEyfSwgezExMSwgMzJ9fd0AagAOAGsAbABtAG4AbwBwAHEAcgBzAHQAdQB2AHcAeAB5AHoAewB8 -AH0AewBSAIAAgQCCW05TQ2VsbEZsYWdzXxATTlNBbHRlcm5hdGVDb250ZW50c18QEk5TUGVyaW9kaWNJ -bnRlcnZhbF5OU0J1dHRvbkZsYWdzMl8QEE5TQWx0ZXJuYXRlSW1hZ2VfEA9OU0tleUVxdWl2YWxlbnRa -TlNDb250ZW50c1lOU1N1cHBvcnRdTlNDb250cm9sVmlld18QD05TUGVyaW9kaWNEZWxheVxOU0NlbGxG -bGFnczJdTlNCdXR0b25GbGFncxIEAf4AgBSAEhAZEAGAD4ATgA6AD4AKEMgSCAAAABP/////hoJA/1dD -b25uZWN01AAOAIUAhgCHAIgAiQCKAItWTlNTaXplVk5TTmFtZVhOU2ZGbGFnc4ARI0AqAAAAAAAAgBAR -BBRcTHVjaWRhR3JhbmRl0gA3ADgAjgCPogCPADtWTlNGb250UFEN0gA3ADgAkwCUpACUAJUAVwA7XE5T -QnV0dG9uQ2VsbFxOU0FjdGlvbkNlbGzSADcAOACXAJilAJgAmQCaAJsAO1hOU0J1dHRvbllOU0NvbnRy -b2xWTlNWaWV3W05TUmVzcG9uZGVyWGNvbm5lY3Q60gA3ADgAngCfowCfAKAAO18QFU5TTmliQ29udHJv -bENvbm5lY3Rvcl5OU05pYkNvbm5lY3RvctQADgBNAE4ATwCiAKMAHwClgCiAGYACgCfXAFUADgBWAFcA -WABZAFoApwCoAKkAqgBfAGAAp4AagCaAG4AcCYAa1gBVAA4AVgBjAFgAWgCuAGUAsACxAF8AroAzgEmA -SIA1gDNfEBZ7ezEwMiwgNTJ9LCB7MjM5LCAyMn192QBqAA4AtQBwAHEAcgB0ALYAtwC4ALkAugB4AHsA -owC+AGAAwF8QEU5TQmFja2dyb3VuZENvbG9yXxARTlNEcmF3c0JhY2tncm91bmRbTlNUZXh0Q29sb3IT -/////5Rx/kGAJYAdgBKAD4AZEhBABAAJgCLVAA4AwgDDAMQAxQDGAMcAyADJAMpXTlNDb2xvclxOU0Nv -bG9yU3BhY2VbTlNDb2xvck5hbWVdTlNDYXRhbG9nTmFtZYAhgCAQBoAfgB5WU3lzdGVtXxATdGV4dEJh -Y2tncm91bmRDb2xvctMADgDDAM4AxgDQANFXTlNXaGl0ZYAhEANCMQDSADcAOADTAMKiAMIAO9UADgDC -AMMAxADFAMYA1gDIANcAyoAhgCSAI4AeWXRleHRDb2xvctMADgDDAM4AxgDQANyAIUIwANIANwA4AN4A -36QA3wCVAFcAO18QD05TVGV4dEZpZWxkQ2VsbNIANwA4AOEA4qUA4gCZAJoAmwA7W05TVGV4dEZpZWxk -V3Nlc3Npb27SADcAOADlAOajAOYAoAA7XxAUTlNOaWJPdXRsZXRDb25uZWN0b3LUAA4ATQBOAE8AogDp -AB8A64AogCqAAoBW3gDtAA4A7gDvAPAA8QDyAPMA9AD1APYA9wD4APkAWwD7APwA/QD+AP8BAAEBAQIB -AwEEAQUBBgEHXE5TV2luZG93Vmlld18QFk5TV2luZG93Q29udGVudE1heFNpemVcTlNTY3JlZW5SZWN0 -XU5TV2luZG93VGl0bGVZTlNXVEZsYWdzXU5TV2luZG93Q2xhc3NfEBZOU1dpbmRvd0NvbnRlbnRNaW5T -aXplXE5TV2luZG93UmVjdFlOU01heFNpemVfEA9OU1dpbmRvd0JhY2tpbmdfEBFOU1dpbmRvd1N0eWxl -TWFza1lOU01pblNpemVbTlNWaWV3Q2xhc3OAC4BVgDCAUoAsEnB4AACALYAxgCuAVBACEAeAU4AvXxAY -e3s1MzIsIDU0Nn0sIHszOTksIDE3NH19XxAPQ29ubmVjdCB0byBHREJw0gAOAQsBDAENWU5TLnN0cmlu -Z4AuWE5TV2luZG930gA3ADgBDwEQowEQAREAO18QD05TTXV0YWJsZVN0cmluZ1hOU1N0cmluZ9IADgEL -AQwBFIAuVFZpZXdfEBp7My40MDI4MmUrMzgsIDMuNDAyODJlKzM4fVp7MjEzLCAxMDd90gAOAD4ARgEZ -gEeiAK4AUoAzgArdAFUBHQAOAR4AVgEfAGMAWAEgASEBIgBaASMAWwElASYBJwEoASkBKgBfANABKwEE -AFsAp1lOU0JveFR5cGVbTlNUaXRsZUNlbGxdTlNUcmFuc3BhcmVudFxOU0JvcmRlclR5cGVZTlNPZmZz -ZXRzXxAPTlNUaXRsZVBvc2l0aW9uXU5TQ29udGVudFZpZXeACxAAgFCATIBKCIA0gEuAC4Aa0gAOAD4A -RgEwgEehAKeAGtIADgA+AEYBNIBHpAE1AKMBNwE4gDaAGYA/gEPXAFUADgBWAFcAWABZAFoApwCoATwB -PQBfAGAAp4AagCaAN4A4CYAaXxAUe3sxMywgNTR9LCB7ODQsIDE3fX3YAGoADgC1AHAAcQByAHQAtwB2 -ALkBQwFEAHsBNQFHAUiAJYA6gDmAD4A2EhBAAACAPVhTZXNzaW9uOtUADgDCAMMAxADFAMYBTADIAU0A -yoAhgDyAO4AeXGNvbnRyb2xDb2xvctMADgDDAM4AxgDQAVKAIUswLjY2NjY2NjY5ANUADgDCAMMAxADF -AMYA1gDIAVYAyoAhgCSAPoAeXxAQY29udHJvbFRleHRDb2xvctcAVQAOAFYAVwBYAFkAWgCnAKgBXAFd -AF8AYACngBqAJoBAgEEJgBpfEBR7ezEzLCAyMn0sIHs4NCwgMTd9fdgAagAOALUAcABxAHIAdAC3AHYA -uQFDAWQAewE3AUcBSIAlgDqAQoAPgD+APVVQb3J0OtcAVQAOAFYAVwBYAFkAWgCnAKgBbAFtAF8AYACn -gBqAJoBEgEUJgBpfEBV7ezEwMiwgMjB9LCB7OTEsIDIyfX3ZAGoADgC1AHAAcQByAHQAtgC3ALgAuQC6 -AXQAewE4AL4AYADAgCWAHYBGgA+AQwmAIlQ5MDAw0gA3ADgBewF8owF8AX0AO15OU011dGFibGVBcnJh -eVdOU0FycmF5XxATe3syLCAyfSwgezM2MSwgOTB9fdIANwA4AYAAmqMAmgCbADtfEBZ7ezE3LCA0N30s -IHszNjUsIDEwN319VnswLCAwfdcAagAOALUAcABxAHQAtwB2ALkAugGGAYcBJQGIgCWAHYBNgE6AT18Q -EkNvbm5lY3Rpb24gRGV0YWlsc9QADgCFAIYAhwCIAYwAigGOgBEjQCYAAAAAAACAEBEMHNMADgDDAM4A -xgDQAZGAIU0wIDAuODAwMDAwMDEA0gA3ADgBkwGUpAGUAJoAmwA7VU5TQm94XxAUe3sxLCA5fSwgezM5 -OSwgMTc0fX1fEBV7ezAsIDB9LCB7MTQ0MCwgODc4fX1aezIxMywgMTI5fdIANwA4AZkBmqIBmgA7XxAQ -TlNXaW5kb3dUZW1wbGF0ZVZ3aW5kb3fUAA4ATQBOAE8AogE4AB8BoIAogEOAAoBYVHBvcnTSAA4APgGj -AaSAXK4BPQFtAF4BOABbAV0AUgDpAK4BNwGvATUAqgCjgDiARYANgEOAC4BBgAqAKoAzgD+AWoA2gByA -GdIADgAyADMBtYAEgFtdTlNBcHBsaWNhdGlvbtIANwA4AbgBfaIBfQA70gAOAD4BowG7gFyuATUBOABS -AK4A6QE3AFsAHwBbAK4AHwCuAKMAroA2gEOACoAzgCqAP4ALgAKAC4AzgAKAM4AZgDPSAA4APgGjAcyA -XK8QDwE9AF4BbQE4AFsBXQBSAOkArgE3Aa8BNQAfAKoAo4A4gA2ARYBDgAuAQYAKgCqAM4A/gFqANoAC -gByAGdIADgA+AaMB3oBcrxAPAd8B4AHhAeIB4wHkAeUB5gHnAegB6QHqAesB7AHtgGCAYYBigGOAZIBl -gGaAZ4BogGmAaoBrgGyAbYBuXxAaVGV4dCBGaWVsZCBDZWxsIChTZXNzaW9uOilfEBVCdXR0b24gQ2Vs -bCAoQ29ubmVjdClfEBZUZXh0IEZpZWxkIENlbGwgKDkwMDApXxARVGV4dCBGaWVsZCAoOTAwMClcQ29u -dGVudCBWaWV3XxAXVGV4dCBGaWVsZCBDZWxsIChQb3J0OilfEBVQdXNoIEJ1dHRvbiAoQ29ubmVjdClW -V2luZG93XxAYQm94IChDb25uZWN0aW9uIERldGFpbHMpXxATU3RhdGljIFRleHQgKFBvcnQ6KVtBcHBs -aWNhdGlvbl8QFlN0YXRpYyBUZXh0IChTZXNzaW9uOilcRmlsZSdzIE93bmVyXxAPVGV4dCBGaWVsZCBD -ZWxsWlRleHQgRmllbGTSAA4APgGjAf+AXKDSAA4APgGjAgKAXKDSAA4APgGjAgWAXK8QEwE9AW0AXgBI -ATgASwBbAV0AUgDpAK4BNwGvAEkBNQAfAEoAqgCjgDiARYANgAmAQ4BXgAuAQYAKgCqAM4A/gFqAGIA2 -gAKAKYAcgBnSAA4APgGjAhuAXK8QEwIcAh0CHgIfAiACIQIiAiMCJAIlAiYCJwIoAikCKgIrAiwCLQIu -gHOAdIB1gHaAd4B4gHmAeoB7gHyAfYB+gH+AgICBgIKAg4CEgIUQJhApECoQFhAOEB0QKBAPEAUQDRP/ -/////////RAkEAsQEBAnEAzSAA4APgBGAkGAR6DSAA4APgGjAkSAXKDSAA4APgGjAkeAXKDSADcAOAJJ -AkqiAkoAO15OU0lCT2JqZWN0RGF0YQAIABkAIgAnADEAOgA/AEQAUgBUAGYBfQGDAc4B1QHcAeoB/AIY -AiYCMgI+AkwCVwJlAoECjwKiArQCzgLYAuUC5wLpAusC7QLvAvEC8wL1AvcC+QL7Av0C/wMBAwMDBQMH -AwkDEgMeAyADIgM8A0UDTgNZA14DbQN2A4kDkgOdA58DoAOpA7ADvQPDA8wDzgPXA9kD2wPdA98D8AP+ -BAcEDwQRBBMEFQQXBDQERgROBFUEXgRoBHQEdgR4BHoEfAR/BIAEggSXBKIEpASmBKgEqgTDBPgFBAUa -BS8FPgVRBWMFbgV4BYYFmAWlBbMFuAW6BbwFvgXABcIFxAXGBcgFygXMBdEF2gXiBfMF+gYBBgoGDAYV -BhcGGgYnBjAGNQY8Bj0GPwZIBlEGXgZrBnQGfwaIBpIGmQalBq4Gtwa+BtYG5Qb2BvgG+gb8Bv4HGwcd -Bx8HIQcjByQHJgc/B0EHQwdFB0cHSQdiB4cHmwevB7sHxAfGB8gHygfMB84H0wfUB9YH6wfzCAAIDAga -CBwIHgggCCIIJAgrCEEITghWCFgIWghdCGYIawiACIIIhAiGCIgIkgifCKEIpAitCLYIyAjRCNwI6Ajw -CPkJAAkXCSgJKgksCS4JMAlpCXYJjwmcCaoJtAnCCdsJ6AnyCgQKGAoiCi4KMAoyCjQKNgo4Cj0KPwpB -CkMKRQpHCkkKSwpNCmgKegqDCo0KjwqYCqEKqAq6CsMKzArOCtMK8Ar7CwQLBgsLCw0LDwtEC04LWgto -C3ULfwuRC58LoQujC6ULpwupC6oLrAuuC7ALsgu7C70LwAvCC8sLzQvWC9gL2gvcC94L+wv9C/8MAQwD -DAQMBgwdDD4MQAxCDEQMRgxIDE0MTwxYDG0MbwxxDHMMdQyCDI8MkQydDLIMtAy2DLgMugzNDOoM7Azu -DPAM8gzzDPUNDA0tDS8NMQ0zDTUNNw05DT8NXA1eDWANYg1kDWUNZw1/DaQNpg2oDaoNrA2uDa8NsQ22 -Db8Nxg3VDd0N8w38DgMOHA4jDkAOQg5EDkYOSA5KDl8OcA5yDnsOfQ6ADo0Ojw6dDqYOrw61DswO5A7v -DvgO/Q8QDxcPKA8qDywPLg8wDzUPPg9AD10PXw9hD2MPZQ9nD2kPaw9tD28PcQ9zD3UPdw95D4IPhA+G -D5QPnQ+iD6sPrQ/KD8wPzg/QD9IP1A/WD9gP2g/cD94P4A/iD+QP5g/vD/EQEhAUEBYQGBAaEBwQHhAg -ECIQJBAmECgQKhAsEC4QMBA5EDsQXBBeEGAQYhBkEGYQaBBqEGwQbhBwEHIQdBB2EHgQehCXEK8QyBDc -EOkRAxEbESIRPRFTEV8ReBGFEZcRohGrEa0RrhG3EbkRuhHDEcUR7hHwEfIR9BH2EfgR+hH8Ef4SABIC -EgQSBhIIEgoSDBIOEhASEhIUEh0SHxJIEkoSTBJOElASUhJUElYSWBJaElwSXhJgEmISZBJmEmgSahJs -Em4ScBJyEnQSdhJ4EnoSfBJ+EoASghKLEo0SjxKREpMSlRKeEqASoRKqEqwSrRK2ErgSuRLCEscAAAAA -AAACAgAAAAAAAAJLAAAAAAAAAAAAAAAAAAAS1g - - - diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 1465fba..22ff723 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -8,8 +8,7 @@ 352.00 YES - - + YES @@ -171,30 +170,73 @@ _NSAppleMenu - + - Connection + File - 1048576 2147483647 submenuAction: - - Connection + + File YES - - - Open... + + + New + n + 1048576 + 2147483647 + + + + + + T3BlbuKApg o 1048576 2147483647 - - + + + Open Recent + + 2147483647 + + + submenuAction: + + Open Recent + + YES + + + Clear Menu + + 1048576 + 2147483647 + + + + + _NSRecentDocumentsMenu + + + + + YES + YES + + + 2147483647 + + + + + Close w 1048576 @@ -202,6 +244,60 @@ + + + Save + s + 1048576 + 2147483647 + + + + + + U2F2ZSBBc+KApg + S + 1048576 + 2147483647 + + + + + + Revert + + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + UGFnZSBTZXR1cOKApg + P + 1048576 + 2147483647 + + + + + + UHJpbnTigKY + p + 1048576 + 2147483647 + + + @@ -524,7 +620,7 @@ NSWindow - + 256 YES @@ -551,7 +647,7 @@ 256 - {584, 193} + {584, 194} YES @@ -564,7 +660,7 @@ 256 - {{585, 1}, {16, 17}} + {{585, 0}, {16, 17}} @@ -677,9 +773,8 @@ YES - {{1, 18}, {584, 193}} + {{1, 17}, {584, 194}} - 4 @@ -687,7 +782,7 @@ 256 - {{585, 18}, {15, 193}} + {{585, 17}, {15, 194}} _doScroller: @@ -710,9 +805,8 @@ YES - {{1, 1}, {584, 17}} + {{1, 0}, {584, 17}} - 4 @@ -721,7 +815,6 @@ {601, 227} - 50 @@ -748,7 +841,6 @@ {601, 489} - {{0, 0}, {1440, 878}} @@ -892,14 +984,6 @@ 192 - - - performClose: - - - - 193 - delete: @@ -972,14 +1056,6 @@ 226 - - - showConnectionWindow: - - - - 227 - @@ -1011,9 +1087,9 @@ YES - + MainMenu @@ -1151,35 +1227,6 @@ - - 83 - - - YES - - - - - - 81 - - - YES - - - - - - - 72 - - - - - 73 - - - 103 @@ -1484,6 +1531,107 @@ + + 249 + + + YES + + + + + + 250 + + + YES + + + + + + + + + + + + + + + + 251 + + + + + 252 + + + + + 253 + + + YES + + + + + + 254 + + + + + 255 + + + + + 256 + + + + + 257 + + + + + 258 + + + + + 259 + + + + + 260 + + + + + 261 + + + + + 262 + + + YES + + + + + + 263 + + + @@ -1544,6 +1692,7 @@ 167.ImportedFromIB2 168.IBPluginDependency 168.ImportedFromIB2 + 169.IBEditorWindowLastContentRect 169.IBPluginDependency 169.ImportedFromIB2 171.IBPluginDependency @@ -1591,11 +1740,28 @@ 237.IBPluginDependency 238.IBPluginDependency 239.IBPluginDependency + 24.IBEditorWindowLastContentRect 24.IBPluginDependency 24.ImportedFromIB2 240.IBPluginDependency 241.IBPluginDependency 242.IBPluginDependency + 249.IBPluginDependency + 250.IBEditorWindowLastContentRect + 250.IBPluginDependency + 251.IBPluginDependency + 252.IBPluginDependency + 253.IBPluginDependency + 254.IBPluginDependency + 255.IBPluginDependency + 256.IBPluginDependency + 257.IBPluginDependency + 258.IBPluginDependency + 259.IBPluginDependency + 260.IBPluginDependency + 261.IBPluginDependency + 262.IBPluginDependency + 263.IBPluginDependency 29.IBEditorWindowLastContentRect 29.IBPluginDependency 29.ImportedFromIB2 @@ -1603,19 +1769,11 @@ 5.ImportedFromIB2 56.IBPluginDependency 56.ImportedFromIB2 + 57.IBEditorWindowLastContentRect 57.IBPluginDependency 57.ImportedFromIB2 58.IBPluginDependency 58.ImportedFromIB2 - 72.IBPluginDependency - 72.ImportedFromIB2 - 73.IBPluginDependency - 73.ImportedFromIB2 - 81.IBEditorWindowLastContentRect - 81.IBPluginDependency - 81.ImportedFromIB2 - 83.IBPluginDependency - 83.ImportedFromIB2 92.IBPluginDependency 92.ImportedFromIB2 @@ -1675,6 +1833,7 @@ com.apple.InterfaceBuilder.CocoaPlugin + {{258, 522}, {253, 223}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1734,27 +1893,36 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{302, 672}, {197, 73}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{63, 745}, {371, 20}} com.apple.InterfaceBuilder.CocoaPlugin - + {{162, 542}, {183, 203}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{63, 745}, {317, 20}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{162, 702}, {130, 43}} + {{75, 562}, {203, 183}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1783,7 +1951,7 @@ - 248 + 263 diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj index 4f3e313..c85d452 100644 --- a/MacGDBp.xcodeproj/project.pbxproj +++ b/MacGDBp.xcodeproj/project.pbxproj @@ -11,12 +11,10 @@ 1E027F0B0D36F23F00885DEE /* StepOver.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E027F090D36F23F00885DEE /* StepOver.png */; }; 1E027F390D36F60800885DEE /* Reconnect.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E027F380D36F60800885DEE /* Reconnect.png */; }; 1E02C3D50C60EC2C006F1752 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C3D40C60EC2C006F1752 /* AppDelegate.m */; }; - 1E02C4080C60EF3F006F1752 /* ConnectWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C4070C60EF3F006F1752 /* ConnectWindowController.m */; }; 1E02C5710C610158006F1752 /* DebuggerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5700C610158006F1752 /* DebuggerConnection.m */; }; 1E02C5F60C610724006F1752 /* DebuggerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5F50C610724006F1752 /* DebuggerWindowController.m */; }; 1E35FC760C6579CA0030F527 /* NSXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E35FC750C6579CA0030F527 /* NSXMLElementAdditions.m */; }; 1E35FEA10C6599040030F527 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E35FEA00C6599040030F527 /* base64.c */; }; - 1E416FF80D36F821009A53A2 /* Connect.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E416FF40D36F821009A53A2 /* Connect.xib */; }; 1E416FF90D36F821009A53A2 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E416FF60D36F821009A53A2 /* MainMenu.xib */; }; 1E4C7AF90DA401C7000A9DC7 /* BreakpointManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E4C7AF80DA401C7000A9DC7 /* BreakpointManager.m */; }; 1E7188680D839F6300969277 /* BSLineNumberView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E7188630D839F6300969277 /* BSLineNumberView.m */; }; @@ -44,8 +42,6 @@ 1E027F380D36F60800885DEE /* Reconnect.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Reconnect.png; path = Icons/Reconnect.png; sourceTree = ""; }; 1E02C3D30C60EC2C006F1752 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/AppDelegate.h; sourceTree = ""; }; 1E02C3D40C60EC2C006F1752 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Source/AppDelegate.m; sourceTree = ""; }; - 1E02C4060C60EF3F006F1752 /* ConnectWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConnectWindowController.h; path = Source/ConnectWindowController.h; sourceTree = ""; }; - 1E02C4070C60EF3F006F1752 /* ConnectWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ConnectWindowController.m; path = Source/ConnectWindowController.m; sourceTree = ""; }; 1E02C56F0C610158006F1752 /* DebuggerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerConnection.h; path = Source/DebuggerConnection.h; sourceTree = ""; }; 1E02C5700C610158006F1752 /* DebuggerConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerConnection.m; path = Source/DebuggerConnection.m; sourceTree = ""; }; 1E02C5F40C610724006F1752 /* DebuggerWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerWindowController.h; path = Source/DebuggerWindowController.h; sourceTree = ""; }; @@ -54,7 +50,6 @@ 1E35FE9F0C6599040030F527 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = Source/base64.h; sourceTree = ""; }; 1E35FEA00C6599040030F527 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = base64.c; path = Source/base64.c; sourceTree = ""; }; 1E35FFB00C65A74C0030F527 /* NSXMLElementAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSXMLElementAdditions.h; path = Source/NSXMLElementAdditions.h; sourceTree = ""; }; - 1E416FF50D36F821009A53A2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Connect.xib; sourceTree = ""; }; 1E416FF70D36F821009A53A2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; 1E4C7AF70DA401C7000A9DC7 /* BreakpointManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BreakpointManager.h; path = Source/BreakpointManager.h; sourceTree = ""; }; 1E4C7AF80DA401C7000A9DC7 /* BreakpointManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BreakpointManager.m; path = Source/BreakpointManager.m; sourceTree = ""; }; @@ -100,8 +95,6 @@ children = ( 1E02C3D30C60EC2C006F1752 /* AppDelegate.h */, 1E02C3D40C60EC2C006F1752 /* AppDelegate.m */, - 1E02C4060C60EF3F006F1752 /* ConnectWindowController.h */, - 1E02C4070C60EF3F006F1752 /* ConnectWindowController.m */, 1E02C56F0C610158006F1752 /* DebuggerConnection.h */, 1E02C5700C610158006F1752 /* DebuggerConnection.m */, 1E02C5F40C610724006F1752 /* DebuggerWindowController.h */, @@ -163,7 +156,6 @@ isa = PBXGroup; children = ( 1EEBFBE30D34C793008F835B /* Debugger.xib */, - 1E416FF40D36F821009A53A2 /* Connect.xib */, 1E416FF60D36F821009A53A2 /* MainMenu.xib */, ); name = Interfaces; @@ -279,7 +271,6 @@ 1E027F0A0D36F23F00885DEE /* Run.png in Resources */, 1E027F0B0D36F23F00885DEE /* StepOver.png in Resources */, 1E027F390D36F60800885DEE /* Reconnect.png in Resources */, - 1E416FF80D36F821009A53A2 /* Connect.xib in Resources */, 1E416FF90D36F821009A53A2 /* MainMenu.xib in Resources */, 1EEE875D0D9DE4B4009CBA7C /* MacGDBp.icns in Resources */, ); @@ -310,7 +301,6 @@ files = ( 8D11072D0486CEB800E47090 /* main.m in Sources */, 1E02C3D50C60EC2C006F1752 /* AppDelegate.m in Sources */, - 1E02C4080C60EF3F006F1752 /* ConnectWindowController.m in Sources */, 1E02C5710C610158006F1752 /* DebuggerConnection.m in Sources */, 1E02C5F60C610724006F1752 /* DebuggerWindowController.m in Sources */, 1EEEE9400C618B70000C0732 /* SocketWrapper.m in Sources */, @@ -336,14 +326,6 @@ name = InfoPlist.strings; sourceTree = ""; }; - 1E416FF40D36F821009A53A2 /* Connect.xib */ = { - isa = PBXVariantGroup; - children = ( - 1E416FF50D36F821009A53A2 /* English */, - ); - name = Connect.xib; - sourceTree = ""; - }; 1E416FF60D36F821009A53A2 /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( diff --git a/Source/AppDelegate.h b/Source/AppDelegate.h index e0258d8..4d7002b 100644 --- a/Source/AppDelegate.h +++ b/Source/AppDelegate.h @@ -21,6 +21,4 @@ { } -- (IBAction)showConnectionWindow:(id)sender; - @end diff --git a/Source/AppDelegate.m b/Source/AppDelegate.m index 7d62eea..bc987a2 100644 --- a/Source/AppDelegate.m +++ b/Source/AppDelegate.m @@ -15,7 +15,6 @@ */ #import "AppDelegate.h" -#import "ConnectWindowController.h" @implementation AppDelegate @@ -35,15 +34,8 @@ */ - (void)applicationDidFinishLaunching:(NSNotification *)notif { - [self showConnectionWindow:self]; -} - -/** - * Shows the connection window - */ -- (IBAction)showConnectionWindow:(id)sender -{ - [[[ConnectWindowController sharedController] window] makeKeyAndOrderFront:self]; + // TODO: use preference values + [[DebuggerWindowController alloc] initWithPort:9000 session:@"macgdbp"]; } @end diff --git a/Source/ConnectWindowController.h b/Source/ConnectWindowController.h deleted file mode 100644 index fef43d7..0000000 --- a/Source/ConnectWindowController.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * MacGDBp - * Copyright (c) 2007 - 2008, Blue Static - * - * This program is free software; you can redistribute it and/or modify it under the terms of the GNU - * General Public License as published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program; if not, - * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#import - - -@interface ConnectWindowController : NSWindowController -{ - IBOutlet NSTextField *port; - IBOutlet NSTextField *session; -} - -+ (id)sharedController; - -- (IBAction)connect:(id)sender; - -@end diff --git a/Source/ConnectWindowController.m b/Source/ConnectWindowController.m deleted file mode 100644 index cb73ede..0000000 --- a/Source/ConnectWindowController.m +++ /dev/null @@ -1,46 +0,0 @@ -/* - * MacGDBp - * Copyright (c) 2007 - 2008, Blue Static - * - * This program is free software; you can redistribute it and/or modify it under the terms of the GNU - * General Public License as published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with this program; if not, - * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#import "ConnectWindowController.h" -#import "DebuggerWindowController.h" -#import "AppDelegate.h" - -@implementation ConnectWindowController - -/** - * Creates a shared controller that can be accessed statically - */ -+ (id)sharedController -{ - static id instance = nil; - if (!instance) - { - instance = [[ConnectWindowController alloc] initWithWindowNibName:@"Connect"]; - [instance window]; - } - return instance; -} - -/** - * Creates a new DebuggerConnection object (and then completely forgets about it) and then close the window - */ -- (IBAction)connect:(id)sender -{ - [[DebuggerWindowController alloc] initWithPort:[port intValue] session:[session stringValue]]; - [[self window] orderOut:self]; -} - -@end -- 2.22.5