From e9f4830e1cbedf87da56c372d88096a06bbf7391 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Tue, 23 Sep 2008 02:40:59 +0200 Subject: [PATCH] Show a pretty status bar --- English.lproj/RepositoryWindow.xib | 30 +++---- PBGitCommitView.xib | 126 ++++++++++++++--------------- PBGitHistoryView.xib | 16 ++-- PBGitWindowController.m | 3 + 4 files changed, 93 insertions(+), 82 deletions(-) diff --git a/English.lproj/RepositoryWindow.xib b/English.lproj/RepositoryWindow.xib index d3b0ec6..a8aaea2 100644 --- a/English.lproj/RepositoryWindow.xib +++ b/English.lproj/RepositoryWindow.xib @@ -8,6 +8,7 @@ 352.00 YES + YES @@ -26,7 +27,7 @@ NSApplication - 271 + 15 2 {{4, 386}, {850, 418}} 1886912512 @@ -789,12 +790,13 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ {3.40282e+38, 3.40282e+38} {213, 107} - + 274 {850, 418} + {{0, 0}, {1440, 878}} - {213, 178} + {213, 179} {3.40282e+38, 3.40282e+38} GitX @@ -820,14 +822,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ YES - - - window - - - - 77 - delegate @@ -1014,6 +1008,14 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ 291 + + + window + + + + 292 + @@ -1279,9 +1281,9 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ com.apple.InterfaceBuilderKit com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin - {{312, 453}, {850, 418}} + {{368, 321}, {850, 418}} com.apple.InterfaceBuilder.CocoaPlugin - {{312, 453}, {850, 418}} + {{368, 321}, {850, 418}} {{15, 196}, {850, 418}} @@ -1336,7 +1338,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ - 291 + 295 diff --git a/PBGitCommitView.xib b/PBGitCommitView.xib index dcf77c9..42635d2 100644 --- a/PBGitCommitView.xib +++ b/PBGitCommitView.xib @@ -8,7 +8,7 @@ 352.00 YES - + YES @@ -32,42 +32,6 @@ 274 YES - - - 292 - {{17, 7}, {305, 17}} - - YES - - 67239488 - 272630784 - Ready to commit - - LucidaGrande - 1.300000e+01 - 1044 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2OQA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - 272 @@ -125,7 +89,10 @@ 6 System headerTextColor - + + 3 + MAA + @@ -166,15 +133,27 @@ 337772096 2048 Text Cell - + + LucidaGrande + 1.300000e+01 + 1044 + 6 System controlBackgroundColor - + + 3 + MC42NjY2NjY2OQA + + + + 6 + System + controlTextColor + - 3 YES @@ -408,7 +387,7 @@ QSAAAEEgAABBmAAAQZgAAA - {{0, 32}, {260, 400}} + {{0, 35}, {260, 400}} @@ -614,7 +593,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 75 - + + 6 + System + controlColor + + @@ -639,11 +623,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{1, 1}, {589, 64}} + {{1, 1}, {589, 60}} - {{260, 28}, {591, 66}} + {{260, 36}, {591, 62}} {0, 0} @@ -709,7 +693,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + @@ -901,6 +885,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + + 292 + {{3, 5}, {260, 16}} + + YES + + 67239488 + 272630784 + Ready to commit + + + + + + {852, 432} @@ -1141,30 +1141,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + - - 2 - - - YES - - - - Status label - - - 42 - - - 67 @@ -1423,6 +1408,21 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + 2 + + + YES + + + + Status label + + + 42 + + + @@ -1524,7 +1524,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 158 + 159 diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib index 0d05ef7..2759752 100644 --- a/PBGitHistoryView.xib +++ b/PBGitHistoryView.xib @@ -915,7 +915,7 @@ - {{0, 36}, {852, 396}} + {{0, 35}, {852, 396}} 2 @@ -1887,7 +1887,7 @@ PBGitHistoryController - NSViewController + PBViewController YES @@ -1916,7 +1916,6 @@ commitController commitList fileBrowser - searchField treeController @@ -1924,7 +1923,6 @@ NSArrayController NSTableView NSOutlineView - NSSearchField NSTreeController @@ -1935,7 +1933,7 @@ PBGitHistoryController - NSViewController + PBViewController IBUserSource @@ -1965,6 +1963,14 @@ PBQLOutlineView.h + + PBViewController + NSViewController + + IBProjectSource + PBViewController.h + + PBWebGitController NSObject diff --git a/PBGitWindowController.m b/PBGitWindowController.m index bfe6f0a..a416dbf 100644 --- a/PBGitWindowController.m +++ b/PBGitWindowController.m @@ -75,6 +75,9 @@ // We bind this ourselves because otherwise we would lose our selection [branchesController bind:@"selectionIndexes" toObject:repository withKeyPath:@"currentBranch" options:nil]; NSLog(@"CurrentBranch: %@", repository.currentBranch); [self changeViewController:0]; + [[self window] setAutorecalculatesContentBorderThickness:NO forEdge:NSMinYEdge]; + [[self window] setContentBorderThickness:35.0f forEdge:NSMinYEdge]; + } @end