From cce18dd083e888076c47b5bb0cdc439ae4bb543b Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Mon, 7 Dec 2015 02:19:31 -0500 Subject: [PATCH] Initial re-layout of the main Debugger.xib. This makes the variable list full-height and makes the source view split horizontally with the stack. --- English.lproj/Debugger.xib | 246 +++++++++++++++--------------- MacGDBp.xcodeproj/project.pbxproj | 10 -- Source/BSSplitView.h | 21 --- Source/BSSplitView.m | 60 -------- dimple.png | Bin 134 -> 0 bytes 5 files changed, 123 insertions(+), 214 deletions(-) delete mode 100644 Source/BSSplitView.h delete mode 100644 Source/BSSplitView.m delete mode 100644 dimple.png diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib index 512f170..7236e23 100644 --- a/English.lproj/Debugger.xib +++ b/English.lproj/Debugger.xib @@ -1,8 +1,8 @@ - + - + @@ -18,7 +18,7 @@ - + @@ -60,132 +60,132 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - StripLineBreaksValueTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + StripLineBreaksValueTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -206,7 +206,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -286,11 +286,16 @@ - + + + + + + @@ -298,11 +303,6 @@ - - - - - @@ -354,7 +354,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -586,7 +586,7 @@ - + YnBsaXN0MDDUAQIDBAUGW1xYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QFwcI ERYbHCc0NTY3ODk6O0JDRElMT1VYVSRudWxs1AkKCwwNDg8QViRjbGFzc1xOU0ltYWdlRmxhZ3NWTlNS diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj index 9341621..a258336 100644 --- a/MacGDBp.xcodeproj/project.pbxproj +++ b/MacGDBp.xcodeproj/project.pbxproj @@ -47,8 +47,6 @@ 1EEBFBE50D34C793008F835B /* Debugger.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1EEBFBE30D34C793008F835B /* Debugger.xib */; }; 1EEBFC2B0D358EBD008F835B /* StepIn.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EEBFC2A0D358EBD008F835B /* StepIn.png */; }; 1EEBFC370D358F1B008F835B /* StepOut.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EEBFC360D358F1B008F835B /* StepOut.png */; }; - 1EEBFD090D3599E8008F835B /* BSSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EEBFD070D3599E8008F835B /* BSSplitView.m */; }; - 1EEBFD120D359A9F008F835B /* dimple.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EEBFD110D359A9F008F835B /* dimple.png */; }; 1EECC0BA1BC9B1E800FB22D3 /* DebuggerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EECC0B91BC9B1E700FB22D3 /* DebuggerModel.m */; }; 1EEE875D0D9DE4B4009CBA7C /* MacGDBp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1EEE875C0D9DE4B4009CBA7C /* MacGDBp.icns */; }; 1EFF70C30DFDC018006B9D33 /* BreakpointController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EFF70C20DFDC018006B9D33 /* BreakpointController.m */; }; @@ -144,9 +142,6 @@ 1EEBFBE40D34C793008F835B /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Debugger.xib; sourceTree = ""; }; 1EEBFC2A0D358EBD008F835B /* StepIn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StepIn.png; path = Icons/StepIn.png; sourceTree = ""; }; 1EEBFC360D358F1B008F835B /* StepOut.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StepOut.png; path = Icons/StepOut.png; sourceTree = ""; }; - 1EEBFD070D3599E8008F835B /* BSSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BSSplitView.m; path = Source/BSSplitView.m; sourceTree = ""; }; - 1EEBFD080D3599E8008F835B /* BSSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSSplitView.h; path = Source/BSSplitView.h; sourceTree = ""; }; - 1EEBFD110D359A9F008F835B /* dimple.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dimple.png; sourceTree = ""; }; 1EECC0B81BC9B1E700FB22D3 /* DebuggerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerModel.h; path = Source/DebuggerModel.h; sourceTree = ""; }; 1EECC0B91BC9B1E700FB22D3 /* DebuggerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerModel.m; path = Source/DebuggerModel.m; sourceTree = ""; }; 1EEE875C0D9DE4B4009CBA7C /* MacGDBp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacGDBp.icns; path = Icons/MacGDBp.icns; sourceTree = ""; }; @@ -279,8 +274,6 @@ 1E71886C0D839F6C00969277 /* Source View */ = { isa = PBXGroup; children = ( - 1EEBFD080D3599E8008F835B /* BSSplitView.h */, - 1EEBFD070D3599E8008F835B /* BSSplitView.m */, 1E7188640D839F6300969277 /* BSSourceView.h */, 1E7188650D839F6300969277 /* BSSourceView.mm */, 1EDA9CF612DD13B300596211 /* BSLineNumberRulerView.h */, @@ -375,7 +368,6 @@ 1E42F1D60F53317B008412DB /* dsa_pub.pem */, 1E416FFB0D36F827009A53A2 /* Interfaces */, 1E027F0D0D36F24200885DEE /* Toolbar Icons */, - 1EEBFD110D359A9F008F835B /* dimple.png */, 8D1107310486CEB800E47090 /* Info.plist */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 1E8C709B1BDB167F00D333DC /* UnitTests-Info.plist */, @@ -483,7 +475,6 @@ 1EEBFBE50D34C793008F835B /* Debugger.xib in Resources */, 1EEBFC2B0D358EBD008F835B /* StepIn.png in Resources */, 1EEBFC370D358F1B008F835B /* StepOut.png in Resources */, - 1EEBFD120D359A9F008F835B /* dimple.png in Resources */, 1E027F0A0D36F23F00885DEE /* Run.png in Resources */, 1E027F0B0D36F23F00885DEE /* StepOver.png in Resources */, 1E416FF90D36F821009A53A2 /* MainMenu.xib in Resources */, @@ -537,7 +528,6 @@ 1E02C5710C610158006F1752 /* DebuggerBackEnd.m in Sources */, 1E02C5F60C610724006F1752 /* DebuggerController.m in Sources */, 1E35FC760C6579CA0030F527 /* NSXMLElementAdditions.m in Sources */, - 1EEBFD090D3599E8008F835B /* BSSplitView.m in Sources */, 1E7188690D839F6300969277 /* BSSourceView.mm in Sources */, 1E822CDD0DA28AC30027A23F /* Breakpoint.m in Sources */, 1E4C7AF90DA401C7000A9DC7 /* BreakpointManager.m in Sources */, diff --git a/Source/BSSplitView.h b/Source/BSSplitView.h deleted file mode 100644 index e2ab6e8..0000000 --- a/Source/BSSplitView.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * MacGDBp - * Copyright (c) 2007 - 2011, 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 - -// A split view that performs custom drawing to get a gradient on the divider. -@interface BSSplitView : NSSplitView -@end diff --git a/Source/BSSplitView.m b/Source/BSSplitView.m deleted file mode 100644 index 92a195f..0000000 --- a/Source/BSSplitView.m +++ /dev/null @@ -1,60 +0,0 @@ -/* - * MacGDBp - * Copyright (c) 2007 - 2011, 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 "BSSplitView.h" - - -@implementation BSSplitView - -/** - * Override the drawing method for the divider so we can make it prettier - * - * @todo draw the dimple - */ -- (void)drawDividerInRect:(NSRect)rect -{ - // Draw the gradient. - NSColor* startColor = [NSColor colorWithDeviceRed:0.875 green:0.875 blue:0.875 alpha:1.0]; - NSColor* endColor = [NSColor colorWithDeviceRed:0.812 green:0.812 blue:0.812 alpha:1.0]; - NSGradient* gradient = [[NSGradient alloc] initWithStartingColor:startColor endingColor:endColor]; - [gradient drawInRect:rect angle:([self isVertical] ? 0.0 : 90.0)]; - [gradient release]; - - // Stroke the divider. - [[NSColor colorWithDeviceRed:0.667 green:0.667 blue:0.667 alpha:1.0] setStroke]; - [NSBezierPath setDefaultLineWidth:0.5]; - [NSBezierPath strokeRect:rect]; - - // Draw the dimple image. - NSImage* dimple = [NSImage imageNamed:@"dimple.png"]; - NSSize dmpSize = [dimple size]; - NSPoint origin = NSMakePoint(NSMidX(rect) - (dmpSize.width / 2), - NSMidY(rect) - (dmpSize.height / 2)); - [dimple drawAtPoint:origin - fromRect:NSZeroRect - operation:NSCompositeSourceOver - fraction:1.0]; -} - -/** - * Returns the size of the divider to draw - */ -- (CGFloat)dividerThickness; -{ - return 6.0; -} - -@end diff --git a/dimple.png b/dimple.png deleted file mode 100644 index 284e65bfc1be003b1e54c90a89e5417fa0bf0e9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1SHiab7}%9&H|6fVg?3oVGw3ym^DWNC}`p7 z;uyj)ll9<2UIqgWhJ*P*&BqgWvHa$5P|@H?R;VsFGFD