From 6af38e934a9205e2ccdc805acc5a2cea8218ab27 Mon Sep 17 00:00:00 2001 From: Johannes Gilger Date: Wed, 19 Aug 2009 13:01:31 +0200 Subject: [PATCH 1/2] Statusbar: Bring View-Mode buttons to front When resizing the GitX-window to small widths the buttons for switching the view-mode would eventually "disappear" behind the label for loaded commits. This fixes that behaviour, so that the buttons always go in front of it, and therefore remain usable. Signed-off-by: Johannes Gilger --- PBGitHistoryView.xib | 118 +++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib index a7e58bd..ef4df1e 100644 --- a/PBGitHistoryView.xib +++ b/PBGitHistoryView.xib @@ -2,9 +2,9 @@ 1050 - 9J61 + 9L30 677 - 949.46 + 949.54 353.00 YES @@ -93,6 +93,57 @@ 274 YES + + + 293 + {{376, 6}, {99, 25}} + + YES + + -2080244224 + 0 + + LucidaGrande + 1.300000e+01 + 1044 + + + + YES + + 3.200000e+01 + + NSImage + DetailViewTemplate + + + Detailed View + YES + 2 + + + + NSImage + NSListViewTemplate + + + Raw View + 1 + 2 + + + 3.200000e+01 + + NSImage + NSPathTemplate + + Tree View + 0 + + + 2 + + 274 @@ -161,11 +212,7 @@ 337772096 2048 Text Cell - - LucidaGrande - 1.300000e+01 - 1044 - + 6 @@ -420,7 +467,7 @@ 2322 - {835, 0} + {835, 70} @@ -784,7 +831,7 @@ 2322 - {543, 0} + {543, 112} @@ -929,53 +976,6 @@ - - - 293 - {{376, 4}, {99, 25}} - - YES - - -2080244224 - 0 - - - - YES - - 3.200000e+01 - - NSImage - DetailViewTemplate - - - Detailed View - YES - 2 - - - - NSImage - NSListViewTemplate - - - Raw View - 1 - 2 - - - 3.200000e+01 - - NSImage - NSPathTemplate - - Tree View - 0 - - - 2 - - 289 @@ -2961,7 +2961,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{358, 67}, {852, 432}} + {{59, 67}, {852, 432}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3039,6 +3039,7 @@ YES YES + openFilesAction: openSelectedFile: refresh: setDetailedView: @@ -3058,6 +3059,7 @@ id id id + id @@ -3069,7 +3071,6 @@ fileBrowser historySplitView searchField - treeContextMenu treeController webView @@ -3080,7 +3081,6 @@ NSOutlineView PBCollapsibleSplitView NSSearchField - NSMenu NSTreeController id From 2f9ca38689cc5dff15d7e52af846f275c00295d2 Mon Sep 17 00:00:00 2001 From: Gerd Knops Date: Wed, 12 Aug 2009 00:21:53 -0500 Subject: [PATCH 2/2] Fix build with external build products directory --- GitX.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index b89cb2b..db13f30 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -767,7 +767,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export PATH=$PATH:$HOME/bin:$HOME/local/bin:/sw/bin:/opt/local/bin:`\"$TARGET_BUILD_DIR\"/gitx --git-path`\nVERSION=$(git describe)\nLONG_VERSION=$(echo $VERSION | sed -e \"s/\\-/\\./\" -e \"s/^v//\" -e \"s/-.*//\")\nSHORT_VERSION=$(echo $VERSION | sed -e \"s/\\-.*//\" -e \"s/^v//\")\n\necho -n \"#define LONG_VERSION $LONG_VERSION\n#define SHORT_VERSION $SHORT_VERSION\" > build/revision\ntouch Info.plist"; + shellScript = "export PATH=$PATH:$HOME/bin:$HOME/local/bin:/sw/bin:/opt/local/bin:`\"$TARGET_BUILD_DIR\"/gitx --git-path`\nVERSION=$(cd \"$PROJECT_DIR\";git describe)\nLONG_VERSION=$(echo $VERSION | sed -e \"s/\\-/\\./\" -e \"s/^v//\" -e \"s/-.*//\")\nSHORT_VERSION=$(echo $VERSION | sed -e \"s/\\-.*//\" -e \"s/^v//\")\n\necho -n \"#define LONG_VERSION $LONG_VERSION\n#define SHORT_VERSION $SHORT_VERSION\" > \"$PROJECT_TEMP_DIR/revision\"\ntouch Info.plist"; }; F5792DFB0EDB570C001B0C31 /* Compile libgit2 */ = { isa = PBXShellScriptBuildPhase; @@ -959,7 +959,7 @@ HEADER_SEARCH_PATHS = libgit2/src; INFOPLIST_FILE = Info.plist; INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; - INFOPLIST_PREFIX_HEADER = build/revision; + INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/revision; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = libgit2;