From 34f5ed73824ee869d3a257dca99b22d5c4e3078d Mon Sep 17 00:00:00 2001 From: German Laullon Date: Mon, 14 Jun 2010 16:55:22 -0700 Subject: [PATCH] merge end --- PBGitHistoryController.h | 2 +- PBGitHistoryController.m | 8 +- PBGitHistoryView.xib | 375 ++++++++++----------------------------- 3 files changed, 99 insertions(+), 286 deletions(-) diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h index 702683b..a7d7fac 100644 --- a/PBGitHistoryController.h +++ b/PBGitHistoryController.h @@ -40,7 +40,7 @@ IBOutlet NSButton *localRemoteBranchesFilterItem; IBOutlet NSButton *selectedBranchFilterItem; - IBOutlet NSSplitView *fileViewer; + IBOutlet NSView *fileViewer; FileViewerController *fileViewerController; IBOutlet id webView; diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m index d21e2f9..619061e 100644 --- a/PBGitHistoryController.m +++ b/PBGitHistoryController.m @@ -123,7 +123,13 @@ [fileViewerController loadView]; //[fileViewer setAutoresizesSubviews:YES]; - [fileViewer addSubview:[fileViewerController view]]; + //[fileViewer addSubview:[fileViewerController view]]; + + // XXXX :( ? + NSMutableArray *sv=[NSMutableArray arrayWithArray:[[fileViewer superview] subviews]]; + [sv removeObjectAtIndex:1]; + [sv insertObject:[fileViewerController view] atIndex:1]; + [[fileViewer superview] setSubviews:sv]; [super awakeFromNib]; } diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib index ff8ce33..3c946f3 100644 --- a/PBGitHistoryView.xib +++ b/PBGitHistoryView.xib @@ -15,18 +15,18 @@ YES - 740 - 740 + 762 + 762 YES - + YES - com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.WebKitIBPlugin YES @@ -176,7 +176,7 @@ 289 - {{906, 3}, {37, 25}} + {{805, 3}, {37, 25}} YES @@ -362,7 +362,7 @@ 10 - {{0, -2}, {953, 5}} + {{0, -2}, {852, 5}} {0, 0} @@ -390,7 +390,7 @@ NO - {{0, 587}, {953, 30}} + {{0, 402}, {852, 30}} PBGitGradientBarView @@ -407,7 +407,7 @@ 10 - {{0, 117}, {953, 5}} + {{0, 143}, {852, 5}} {0, 0} @@ -439,13 +439,13 @@ 4352 - {953, 103} + {852, 129} YES 256 - {953, 17} + {852, 17} @@ -459,7 +459,7 @@ YES SubjectColumn - 650 + 549 40 1000 @@ -501,7 +501,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -624,7 +624,7 @@ 0 - {{0, 17}, {953, 103}} + {{0, 17}, {852, 129}} @@ -657,7 +657,7 @@ YES - {953, 17} + {852, 17} @@ -666,7 +666,7 @@ - {953, 120} + {852, 146} 560 @@ -710,7 +710,7 @@ 265 - {{763, 2}, {180, 19}} + {{662, 2}, {180, 19}} YES @@ -811,12 +811,12 @@ - {{0, 120}, {953, 24}} + {{0, 146}, {852, 24}} PBGitGradientBarView - {953, 144} + {852, 170} NSView @@ -828,7 +828,7 @@ 18 - {953, 443} + {852, 232} YES @@ -863,7 +863,7 @@ public.url-name - {{1, 0}, {894, 441}} + {{1, 0}, {851, 233}} @@ -890,7 +890,7 @@ YES - {895, 440} + {852, 232} Details @@ -926,7 +926,7 @@ 4368 - {938, 428} + {187, 232} YES @@ -937,7 +937,7 @@ YES - 935 + 184 16 1000 @@ -970,7 +970,7 @@ 17 - -759169024 + -624951296 4 @@ -980,7 +980,7 @@ 0 - {{1, 1}, {938, 428}} + {{1, 1}, {187, 232}} @@ -990,7 +990,7 @@ 256 - {{939, 1}, {15, 428}} + {{188, 1}, {15, 232}} _doScroller: @@ -998,8 +998,8 @@ - 256 - {{1, 429}, {938, 15}} + -2147483392 + {{-100, -100}, {502, 15}} 1 @@ -1008,268 +1008,30 @@ 0.99801188707351685 - {955, 445} + {204, 234} - 50 + 18 QSAAAEEgAABBmAAAQZgAAA - + - 4370 - - YES - - - 2304 - - YES - - - 2322 - {545, 0} - - - - - - Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum Et harumd und lookum like Greek to me, dereud facilis est er expedit distinct. Nam liber te conscient to factor tum poen legum odioque civiuda - - - YES - - YES - NSFont - NSParagraphStyle - - - YES - - Monaco - 10 - 16 - - - 3 - - YES - - 0.0 - - - 56 - - - 112 - - - 168 - - - 224 - - - 280 - - - 336 - - - 392 - - - 448 - - - 504 - - - 560 - - - 616 - - - 672 - - - 728 - - - 784 - - - 840 - - - 896 - - - 952 - - - 1008 - - - 1064 - - - 1120 - - - 1176 - - - 1232 - - - 1288 - - - 1344 - - - 1400 - - - 1456 - - - 1512 - - - 1568 - - - 1624 - - - 1680 - - - 1736 - - - - - - - - - YES - - - 6 - - - - 545 - 1 - - - 11233 - 0 - - - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - 6 - System - selectedTextBackgroundColor - - - - 6 - System - selectedTextColor - - - - - - - YES - - YES - NSColor - NSUnderline - - - YES - - 1 - MCAwIDEAA - - - - - - - 7 - {1190, 1e+07} - {0, 0} - - - - {{1, 1}, {628, 232}} - - - - - - {4, -5} - 1 - - 4 - - - - 256 - {{629, 1}, {15, 217}} - - - _doScroller: - 0.030031679198145866 - - - - -2147483392 - {{-100, -100}, {87, 18}} - - 1 - - _doScroller: - 1 - 0.94565218687057495 - - - {{209, 0}, {645, 234}} + 268 + {{205, 0}, {649, 234}} - - 18 - - - + NSView - {{-1, -1}, {955, 445}} + {{-1, -1}, {854, 234}} YES 2 - {953, 443} + {852, 232} Tree @@ -1288,25 +1050,24 @@ - {{0, 145}, {953, 443}} + {{0, 171}, {852, 232}} NSView - {953, 588} + {852, 403} 2 HistoryViewSplitView - {953, 617} + {852, 432} NSView PBRefController - @@ -1952,6 +1713,14 @@ 408 + + + fileViewer + + + + 411 + @@ -2202,6 +1971,7 @@ YES + @@ -2460,9 +2230,9 @@ - 435 - - + 410 + + @@ -2554,6 +2324,7 @@ 4.IBPluginDependency 400.IBPluginDependency 400.IBSegmentedControlInspectorSelectedSegmentMetadataKey + 410.IBPluginDependency 46.IBEditorWindowLastContentRect 46.IBPluginDependency 48.IBPluginDependency @@ -2720,7 +2491,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{501, 356}, {852, 432}} + com.apple.InterfaceBuilder.CocoaPlugin + {{221, 356}, {852, 432}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2756,7 +2528,7 @@ - 408 + 411 @@ -2865,6 +2637,7 @@ id id id + id @@ -2897,7 +2670,7 @@ NSArrayController PBCommitList NSOutlineView - NSSplitView + NSView PBCollapsibleSplitView NSButton NSButton @@ -3869,6 +3642,7 @@ 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -3884,5 +3658,38 @@ YES GitX.xcodeproj 3 + + YES + + YES + AddBranchTemplate + AddLabelTemplate + AddRemote + CherryPickTemplate + DetailViewTemplate + FetchTemplate + MergeTemplate + NSPathTemplate + NSQuickLookTemplate + PullTemplate + PushTemplate + RebaseTemplate + + + YES + {20, 12} + {23, 12} + {23, 12} + {18.5143, 12.3429} + {17, 17} + {16.4571, 12.3429} + {16.4571, 12.3429} + {16, 9} + {19, 11} + {16.4571, 12.3429} + {16.4571, 12.3429} + {16.4571, 13.3714} + +