From 1c3364dec9bee0d722a77a7a88c4ae8c010eac6d Mon Sep 17 00:00:00 2001 From: glaullon Date: Fri, 11 Jun 2010 16:23:12 -0700 Subject: [PATCH] source and diff view on history --- GitX.xcodeproj/project.pbxproj | 628 +++++++++++++++++++++------------ PBEasyPipe.m | 2 +- PBGitHistoryController.m | 18 +- PBGitHistoryView.xib | 12 +- PBGitTree.m | 10 +- html/views/diff/diffWindow.js | 4 + html/views/source/index.html | 14 + html/views/source/source.css | 0 html/views/source/source.js | 9 + source.css | 0 10 files changed, 461 insertions(+), 236 deletions(-) create mode 100644 html/views/source/index.html create mode 100644 html/views/source/source.css create mode 100644 html/views/source/source.js create mode 100644 source.css diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index a024fa0..7a18a69 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -22,10 +22,6 @@ /* Begin PBXBuildFile section */ 056438B70ED0C40B00985397 /* DetailViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 056438B60ED0C40B00985397 /* DetailViewTemplate.png */; }; - 314E974611C17BB4007E9610 /* blame.css in Resources */ = {isa = PBXBuildFile; fileRef = 314E974511C17BB4007E9610 /* blame.css */; }; - 31D5F72511C21F7500BC94E4 /* shBrushObjC.js in Sources */ = {isa = PBXBuildFile; fileRef = 31D5F72411C21F7500BC94E4 /* shBrushObjC.js */; }; - 31F8A73611C0CE5300517F78 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 31F8A73511C0CE5300517F78 /* index.html */; }; - 31F8A75411C0D0F800517F78 /* blame.js in Sources */ = {isa = PBXBuildFile; fileRef = 31F8A75311C0D0F800517F78 /* blame.js */; }; 3BC07F4C0ED5A5C5009A7768 /* HistoryViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */; }; 3BC07F4D0ED5A5C5009A7768 /* CommitViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */; }; 47DBDB580E94EDE700671A1E /* DBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 47DBDB570E94EDE700671A1E /* DBPrefsWindowController.m */; }; @@ -47,49 +43,84 @@ 91B103CC0E898EC300C84364 /* PBIconAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B103CB0E898EC300C84364 /* PBIconAndTextCell.m */; }; 93CB42C20EAB7B2200530609 /* PBGitDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CB42C10EAB7B2200530609 /* PBGitDefaults.m */; }; 93F7857F0EA3ABF100C1F443 /* PBCommitMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F7857E0EA3ABF100C1F443 /* PBCommitMessageView.m */; }; - C3F4791D11C1F0260020E7C1 /* LGPLv3.txt in Resources */ = {isa = PBXBuildFile; fileRef = C3F478EF11C1F0260020E7C1 /* LGPLv3.txt */; }; - C3F4791E11C1F0260020E7C1 /* clipboard.swf in Resources */ = {isa = PBXBuildFile; fileRef = C3F478F111C1F0260020E7C1 /* clipboard.swf */; }; - C3F4791F11C1F0260020E7C1 /* shBrushAS3.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478F211C1F0260020E7C1 /* shBrushAS3.js */; }; - C3F4792011C1F0260020E7C1 /* shBrushBash.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478F311C1F0260020E7C1 /* shBrushBash.js */; }; - C3F4792111C1F0260020E7C1 /* shBrushColdFusion.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478F411C1F0260020E7C1 /* shBrushColdFusion.js */; }; - C3F4792211C1F0260020E7C1 /* shBrushCpp.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478F511C1F0260020E7C1 /* shBrushCpp.js */; }; - C3F4792311C1F0260020E7C1 /* shBrushCSharp.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478F611C1F0260020E7C1 /* shBrushCSharp.js */; }; - C3F4792411C1F0260020E7C1 /* shBrushCss.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478F711C1F0260020E7C1 /* shBrushCss.js */; }; - C3F4792511C1F0260020E7C1 /* shBrushDelphi.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478F811C1F0260020E7C1 /* shBrushDelphi.js */; }; - C3F4792611C1F0260020E7C1 /* shBrushDiff.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478F911C1F0260020E7C1 /* shBrushDiff.js */; }; - C3F4792711C1F0260020E7C1 /* shBrushErlang.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478FA11C1F0260020E7C1 /* shBrushErlang.js */; }; - C3F4792811C1F0260020E7C1 /* shBrushGroovy.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478FB11C1F0260020E7C1 /* shBrushGroovy.js */; }; - C3F4792911C1F0260020E7C1 /* shBrushJava.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478FC11C1F0260020E7C1 /* shBrushJava.js */; }; - C3F4792A11C1F0260020E7C1 /* shBrushJavaFX.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478FD11C1F0260020E7C1 /* shBrushJavaFX.js */; }; - C3F4792B11C1F0260020E7C1 /* shBrushJScript.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478FE11C1F0260020E7C1 /* shBrushJScript.js */; }; - C3F4792C11C1F0260020E7C1 /* shBrushPerl.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F478FF11C1F0260020E7C1 /* shBrushPerl.js */; }; - C3F4792D11C1F0260020E7C1 /* shBrushPhp.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790011C1F0260020E7C1 /* shBrushPhp.js */; }; - C3F4792E11C1F0260020E7C1 /* shBrushPlain.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790111C1F0260020E7C1 /* shBrushPlain.js */; }; - C3F4792F11C1F0260020E7C1 /* shBrushPowerShell.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790211C1F0260020E7C1 /* shBrushPowerShell.js */; }; - C3F4793011C1F0260020E7C1 /* shBrushPython.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790311C1F0260020E7C1 /* shBrushPython.js */; }; - C3F4793111C1F0260020E7C1 /* shBrushRuby.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790411C1F0260020E7C1 /* shBrushRuby.js */; }; - C3F4793211C1F0260020E7C1 /* shBrushScala.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790511C1F0260020E7C1 /* shBrushScala.js */; }; - C3F4793311C1F0260020E7C1 /* shBrushSql.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790611C1F0260020E7C1 /* shBrushSql.js */; }; - C3F4793411C1F0260020E7C1 /* shBrushVb.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790711C1F0260020E7C1 /* shBrushVb.js */; }; - C3F4793511C1F0260020E7C1 /* shBrushXml.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790811C1F0260020E7C1 /* shBrushXml.js */; }; - C3F4793611C1F0260020E7C1 /* shCore.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790911C1F0260020E7C1 /* shCore.js */; }; - C3F4793711C1F0260020E7C1 /* shLegacy.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790A11C1F0260020E7C1 /* shLegacy.js */; }; - C3F4793811C1F0260020E7C1 /* shCore.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790C11C1F0260020E7C1 /* shCore.js */; }; - C3F4793911C1F0260020E7C1 /* shLegacy.js in Sources */ = {isa = PBXBuildFile; fileRef = C3F4790D11C1F0260020E7C1 /* shLegacy.js */; }; - C3F4793A11C1F0260020E7C1 /* help.png in Resources */ = {isa = PBXBuildFile; fileRef = C3F4790F11C1F0260020E7C1 /* help.png */; }; - C3F4793B11C1F0260020E7C1 /* magnifier.png in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791011C1F0260020E7C1 /* magnifier.png */; }; - C3F4793C11C1F0260020E7C1 /* page_white_code.png in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791111C1F0260020E7C1 /* page_white_code.png */; }; - C3F4793D11C1F0260020E7C1 /* page_white_copy.png in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791211C1F0260020E7C1 /* page_white_copy.png */; }; - C3F4793E11C1F0260020E7C1 /* printer.png in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791311C1F0260020E7C1 /* printer.png */; }; - C3F4793F11C1F0260020E7C1 /* shCore.css in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791411C1F0260020E7C1 /* shCore.css */; }; - C3F4794011C1F0260020E7C1 /* shThemeDefault.css in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791511C1F0260020E7C1 /* shThemeDefault.css */; }; - C3F4794111C1F0260020E7C1 /* shThemeDjango.css in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791611C1F0260020E7C1 /* shThemeDjango.css */; }; - C3F4794211C1F0260020E7C1 /* shThemeEclipse.css in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791711C1F0260020E7C1 /* shThemeEclipse.css */; }; - C3F4794311C1F0260020E7C1 /* shThemeEmacs.css in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791811C1F0260020E7C1 /* shThemeEmacs.css */; }; - C3F4794411C1F0260020E7C1 /* shThemeFadeToGrey.css in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791911C1F0260020E7C1 /* shThemeFadeToGrey.css */; }; - C3F4794511C1F0260020E7C1 /* shThemeMidnight.css in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791A11C1F0260020E7C1 /* shThemeMidnight.css */; }; - C3F4794611C1F0260020E7C1 /* shThemeRDark.css in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791B11C1F0260020E7C1 /* shThemeRDark.css */; }; - C3F4794711C1F0260020E7C1 /* test.html in Resources */ = {isa = PBXBuildFile; fileRef = C3F4791C11C1F0260020E7C1 /* test.html */; }; + C3138BE611C2F48400BE6CBE /* blame.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138B8D11C2F48400BE6CBE /* blame.css */; }; + C3138BE711C2F48400BE6CBE /* blame.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138B8E11C2F48400BE6CBE /* blame.js */; }; + C3138BE811C2F48400BE6CBE /* index copy.html in Resources */ = {isa = PBXBuildFile; fileRef = C3138B8F11C2F48400BE6CBE /* index copy.html */; }; + C3138BE911C2F48400BE6CBE /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = C3138B9011C2F48400BE6CBE /* index.html */; }; + C3138BEA11C2F48400BE6CBE /* commit.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138B9211C2F48400BE6CBE /* commit.css */; }; + C3138BEB11C2F48400BE6CBE /* commit.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138B9311C2F48400BE6CBE /* commit.js */; }; + C3138BEC11C2F48400BE6CBE /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = C3138B9411C2F48400BE6CBE /* index.html */; }; + C3138BED11C2F48400BE6CBE /* multipleSelection.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138B9511C2F48400BE6CBE /* multipleSelection.js */; }; + C3138BEE11C2F48400BE6CBE /* diffWindow.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138B9711C2F48400BE6CBE /* diffWindow.css */; }; + C3138BEF11C2F48400BE6CBE /* diffWindow.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138B9811C2F48400BE6CBE /* diffWindow.js */; }; + C3138BF011C2F48400BE6CBE /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = C3138B9911C2F48400BE6CBE /* index.html */; }; + C3138BF111C2F48400BE6CBE /* history.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138B9B11C2F48400BE6CBE /* history.css */; }; + C3138BF211C2F48400BE6CBE /* history.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138B9C11C2F48400BE6CBE /* history.js */; }; + C3138BF311C2F48400BE6CBE /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = C3138B9D11C2F48400BE6CBE /* index.html */; }; + C3138BF411C2F48400BE6CBE /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = C3138B9F11C2F48400BE6CBE /* index.html */; }; + C3138BF511C2F48400BE6CBE /* source.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BA011C2F48400BE6CBE /* source.css */; }; + C3138BF611C2F48400BE6CBE /* source.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BA111C2F48400BE6CBE /* source.js */; }; + C3138BF711C2F48400BE6CBE /* diffHighlighter.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BA311C2F48400BE6CBE /* diffHighlighter.js */; }; + C3138BF811C2F48400BE6CBE /* GitX.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BA411C2F48400BE6CBE /* GitX.js */; }; + C3138BF911C2F48400BE6CBE /* keyboardNavigation.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BA511C2F48400BE6CBE /* keyboardNavigation.js */; }; + C3138BFA11C2F48400BE6CBE /* md5.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BA611C2F48400BE6CBE /* md5.js */; }; + C3138BFB11C2F48400BE6CBE /* LGPLv3.txt in Resources */ = {isa = PBXBuildFile; fileRef = C3138BA811C2F48400BE6CBE /* LGPLv3.txt */; }; + C3138BFC11C2F48400BE6CBE /* clipboard.swf in Resources */ = {isa = PBXBuildFile; fileRef = C3138BAA11C2F48400BE6CBE /* clipboard.swf */; }; + C3138BFD11C2F48400BE6CBE /* shBrushAS3.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BAB11C2F48400BE6CBE /* shBrushAS3.js */; }; + C3138BFE11C2F48400BE6CBE /* shBrushBash.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BAC11C2F48400BE6CBE /* shBrushBash.js */; }; + C3138BFF11C2F48400BE6CBE /* shBrushColdFusion.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BAD11C2F48400BE6CBE /* shBrushColdFusion.js */; }; + C3138C0011C2F48400BE6CBE /* shBrushCpp.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BAE11C2F48400BE6CBE /* shBrushCpp.js */; }; + C3138C0111C2F48400BE6CBE /* shBrushCSharp.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BAF11C2F48400BE6CBE /* shBrushCSharp.js */; }; + C3138C0211C2F48400BE6CBE /* shBrushCss.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB011C2F48400BE6CBE /* shBrushCss.js */; }; + C3138C0311C2F48400BE6CBE /* shBrushDelphi.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB111C2F48400BE6CBE /* shBrushDelphi.js */; }; + C3138C0411C2F48400BE6CBE /* shBrushDiff.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB211C2F48400BE6CBE /* shBrushDiff.js */; }; + C3138C0511C2F48400BE6CBE /* shBrushErlang.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB311C2F48400BE6CBE /* shBrushErlang.js */; }; + C3138C0611C2F48400BE6CBE /* shBrushGroovy.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB411C2F48400BE6CBE /* shBrushGroovy.js */; }; + C3138C0711C2F48400BE6CBE /* shBrushJava.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB511C2F48400BE6CBE /* shBrushJava.js */; }; + C3138C0811C2F48400BE6CBE /* shBrushJavaFX.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB611C2F48400BE6CBE /* shBrushJavaFX.js */; }; + C3138C0911C2F48400BE6CBE /* shBrushJScript.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB711C2F48400BE6CBE /* shBrushJScript.js */; }; + C3138C0A11C2F48400BE6CBE /* shBrushObjC.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB811C2F48400BE6CBE /* shBrushObjC.js */; }; + C3138C0B11C2F48400BE6CBE /* shBrushPerl.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BB911C2F48400BE6CBE /* shBrushPerl.js */; }; + C3138C0C11C2F48400BE6CBE /* shBrushPhp.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BBA11C2F48400BE6CBE /* shBrushPhp.js */; }; + C3138C0D11C2F48400BE6CBE /* shBrushPlain.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BBB11C2F48400BE6CBE /* shBrushPlain.js */; }; + C3138C0E11C2F48400BE6CBE /* shBrushPowerShell.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BBC11C2F48400BE6CBE /* shBrushPowerShell.js */; }; + C3138C0F11C2F48400BE6CBE /* shBrushPython.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BBD11C2F48400BE6CBE /* shBrushPython.js */; }; + C3138C1011C2F48400BE6CBE /* shBrushRuby.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BBE11C2F48400BE6CBE /* shBrushRuby.js */; }; + C3138C1111C2F48400BE6CBE /* shBrushScala.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BBF11C2F48400BE6CBE /* shBrushScala.js */; }; + C3138C1211C2F48400BE6CBE /* shBrushSql.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BC011C2F48400BE6CBE /* shBrushSql.js */; }; + C3138C1311C2F48400BE6CBE /* shBrushVb.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BC111C2F48400BE6CBE /* shBrushVb.js */; }; + C3138C1411C2F48400BE6CBE /* shBrushXml.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BC211C2F48400BE6CBE /* shBrushXml.js */; }; + C3138C1511C2F48400BE6CBE /* shCore.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BC311C2F48400BE6CBE /* shCore.js */; }; + C3138C1611C2F48400BE6CBE /* shLegacy.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BC411C2F48400BE6CBE /* shLegacy.js */; }; + C3138C1711C2F48400BE6CBE /* shCore.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BC611C2F48400BE6CBE /* shCore.js */; }; + C3138C1811C2F48400BE6CBE /* shLegacy.js in Sources */ = {isa = PBXBuildFile; fileRef = C3138BC711C2F48400BE6CBE /* shLegacy.js */; }; + C3138C1911C2F48400BE6CBE /* help.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BC911C2F48400BE6CBE /* help.png */; }; + C3138C1A11C2F48400BE6CBE /* magnifier.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BCA11C2F48400BE6CBE /* magnifier.png */; }; + C3138C1B11C2F48400BE6CBE /* page_white_code.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BCB11C2F48400BE6CBE /* page_white_code.png */; }; + C3138C1C11C2F48400BE6CBE /* page_white_copy.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BCC11C2F48400BE6CBE /* page_white_copy.png */; }; + C3138C1D11C2F48400BE6CBE /* printer.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BCD11C2F48400BE6CBE /* printer.png */; }; + C3138C1E11C2F48400BE6CBE /* shCore.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BCE11C2F48400BE6CBE /* shCore.css */; }; + C3138C1F11C2F48400BE6CBE /* shThemeDefault.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BCF11C2F48400BE6CBE /* shThemeDefault.css */; }; + C3138C2011C2F48400BE6CBE /* shThemeDjango.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD011C2F48400BE6CBE /* shThemeDjango.css */; }; + C3138C2111C2F48400BE6CBE /* shThemeEclipse.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD111C2F48400BE6CBE /* shThemeEclipse.css */; }; + C3138C2211C2F48400BE6CBE /* shThemeEmacs.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD211C2F48400BE6CBE /* shThemeEmacs.css */; }; + C3138C2311C2F48400BE6CBE /* shThemeFadeToGrey.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD311C2F48400BE6CBE /* shThemeFadeToGrey.css */; }; + C3138C2411C2F48400BE6CBE /* shThemeMidnight.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD411C2F48400BE6CBE /* shThemeMidnight.css */; }; + C3138C2511C2F48400BE6CBE /* shThemeRDark.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD511C2F48400BE6CBE /* shThemeRDark.css */; }; + C3138C2611C2F48400BE6CBE /* test.html in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD611C2F48400BE6CBE /* test.html */; }; + C3138C2711C2F48400BE6CBE /* added.acorn in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD811C2F48400BE6CBE /* added.acorn */; }; + C3138C2811C2F48400BE6CBE /* added.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BD911C2F48400BE6CBE /* added.png */; }; + C3138C2911C2F48400BE6CBE /* modified.acorn in Resources */ = {isa = PBXBuildFile; fileRef = C3138BDA11C2F48400BE6CBE /* modified.acorn */; }; + C3138C2A11C2F48400BE6CBE /* modified.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BDB11C2F48400BE6CBE /* modified.png */; }; + C3138C2B11C2F48400BE6CBE /* removed.acorn in Resources */ = {isa = PBXBuildFile; fileRef = C3138BDC11C2F48400BE6CBE /* removed.acorn */; }; + C3138C2C11C2F48400BE6CBE /* removed.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BDD11C2F48400BE6CBE /* removed.png */; }; + C3138C2D11C2F48400BE6CBE /* renamed.acorn in Resources */ = {isa = PBXBuildFile; fileRef = C3138BDE11C2F48400BE6CBE /* renamed.acorn */; }; + C3138C2E11C2F48400BE6CBE /* renamed.png in Resources */ = {isa = PBXBuildFile; fileRef = C3138BDF11C2F48400BE6CBE /* renamed.png */; }; + C3138C2F11C2F48400BE6CBE /* spinner.gif in Resources */ = {isa = PBXBuildFile; fileRef = C3138BE011C2F48400BE6CBE /* spinner.gif */; }; + C3138C3011C2F48400BE6CBE /* dragtest.html in Resources */ = {isa = PBXBuildFile; fileRef = C3138BE111C2F48400BE6CBE /* dragtest.html */; }; + C3138C3111C2F48400BE6CBE /* diff.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BE311C2F48400BE6CBE /* diff.css */; }; + C3138C3211C2F48400BE6CBE /* GitX.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BE411C2F48400BE6CBE /* GitX.css */; }; + C3138C3311C2F48400BE6CBE /* notification.css in Resources */ = {isa = PBXBuildFile; fileRef = C3138BE511C2F48400BE6CBE /* notification.css */; }; D26DC6450E782C9000C777B2 /* gitx.icns in Resources */ = {isa = PBXBuildFile; fileRef = D26DC6440E782C9000C777B2 /* gitx.icns */; }; D8083A43111E045D00337480 /* PBRemoteProgressSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8083A42111E045D00337480 /* PBRemoteProgressSheet.m */; }; D8083C44111F106800337480 /* PBAddRemoteSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8083C43111F106800337480 /* PBAddRemoteSheet.m */; }; @@ -265,10 +296,6 @@ 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 314E974511C17BB4007E9610 /* blame.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = blame.css; sourceTree = ""; }; - 31D5F72411C21F7500BC94E4 /* shBrushObjC.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushObjC.js; sourceTree = ""; }; - 31F8A73511C0CE5300517F78 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; - 31F8A75311C0D0F800517F78 /* blame.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = blame.js; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* GitX_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitX_Prefix.pch; sourceTree = ""; }; 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HistoryViewTemplate.png; path = Images/HistoryViewTemplate.png; sourceTree = ""; }; 3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CommitViewTemplate.png; path = Images/CommitViewTemplate.png; sourceTree = ""; }; @@ -301,49 +328,84 @@ 93F7857D0EA3ABF100C1F443 /* PBCommitMessageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCommitMessageView.h; sourceTree = ""; }; 93F7857E0EA3ABF100C1F443 /* PBCommitMessageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBCommitMessageView.m; sourceTree = ""; }; 93FCCBA80EA8AF450061B02B /* PBGitConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitConfig.m; sourceTree = ""; }; - C3F478EF11C1F0260020E7C1 /* LGPLv3.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LGPLv3.txt; sourceTree = ""; }; - C3F478F111C1F0260020E7C1 /* clipboard.swf */ = {isa = PBXFileReference; lastKnownFileType = file; path = clipboard.swf; sourceTree = ""; }; - C3F478F211C1F0260020E7C1 /* shBrushAS3.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushAS3.js; sourceTree = ""; }; - C3F478F311C1F0260020E7C1 /* shBrushBash.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushBash.js; sourceTree = ""; }; - C3F478F411C1F0260020E7C1 /* shBrushColdFusion.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushColdFusion.js; sourceTree = ""; }; - C3F478F511C1F0260020E7C1 /* shBrushCpp.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushCpp.js; sourceTree = ""; }; - C3F478F611C1F0260020E7C1 /* shBrushCSharp.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushCSharp.js; sourceTree = ""; }; - C3F478F711C1F0260020E7C1 /* shBrushCss.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushCss.js; sourceTree = ""; }; - C3F478F811C1F0260020E7C1 /* shBrushDelphi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushDelphi.js; sourceTree = ""; }; - C3F478F911C1F0260020E7C1 /* shBrushDiff.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushDiff.js; sourceTree = ""; }; - C3F478FA11C1F0260020E7C1 /* shBrushErlang.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushErlang.js; sourceTree = ""; }; - C3F478FB11C1F0260020E7C1 /* shBrushGroovy.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushGroovy.js; sourceTree = ""; }; - C3F478FC11C1F0260020E7C1 /* shBrushJava.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushJava.js; sourceTree = ""; }; - C3F478FD11C1F0260020E7C1 /* shBrushJavaFX.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushJavaFX.js; sourceTree = ""; }; - C3F478FE11C1F0260020E7C1 /* shBrushJScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushJScript.js; sourceTree = ""; }; - C3F478FF11C1F0260020E7C1 /* shBrushPerl.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPerl.js; sourceTree = ""; }; - C3F4790011C1F0260020E7C1 /* shBrushPhp.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPhp.js; sourceTree = ""; }; - C3F4790111C1F0260020E7C1 /* shBrushPlain.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPlain.js; sourceTree = ""; }; - C3F4790211C1F0260020E7C1 /* shBrushPowerShell.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPowerShell.js; sourceTree = ""; }; - C3F4790311C1F0260020E7C1 /* shBrushPython.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPython.js; sourceTree = ""; }; - C3F4790411C1F0260020E7C1 /* shBrushRuby.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushRuby.js; sourceTree = ""; }; - C3F4790511C1F0260020E7C1 /* shBrushScala.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushScala.js; sourceTree = ""; }; - C3F4790611C1F0260020E7C1 /* shBrushSql.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushSql.js; sourceTree = ""; }; - C3F4790711C1F0260020E7C1 /* shBrushVb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushVb.js; sourceTree = ""; }; - C3F4790811C1F0260020E7C1 /* shBrushXml.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushXml.js; sourceTree = ""; }; - C3F4790911C1F0260020E7C1 /* shCore.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shCore.js; sourceTree = ""; }; - C3F4790A11C1F0260020E7C1 /* shLegacy.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shLegacy.js; sourceTree = ""; }; - C3F4790C11C1F0260020E7C1 /* shCore.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shCore.js; sourceTree = ""; }; - C3F4790D11C1F0260020E7C1 /* shLegacy.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shLegacy.js; sourceTree = ""; }; - C3F4790F11C1F0260020E7C1 /* help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = help.png; sourceTree = ""; }; - C3F4791011C1F0260020E7C1 /* magnifier.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = magnifier.png; sourceTree = ""; }; - C3F4791111C1F0260020E7C1 /* page_white_code.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page_white_code.png; sourceTree = ""; }; - C3F4791211C1F0260020E7C1 /* page_white_copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page_white_copy.png; sourceTree = ""; }; - C3F4791311C1F0260020E7C1 /* printer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = printer.png; sourceTree = ""; }; - C3F4791411C1F0260020E7C1 /* shCore.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shCore.css; sourceTree = ""; }; - C3F4791511C1F0260020E7C1 /* shThemeDefault.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeDefault.css; sourceTree = ""; }; - C3F4791611C1F0260020E7C1 /* shThemeDjango.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeDjango.css; sourceTree = ""; }; - C3F4791711C1F0260020E7C1 /* shThemeEclipse.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeEclipse.css; sourceTree = ""; }; - C3F4791811C1F0260020E7C1 /* shThemeEmacs.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeEmacs.css; sourceTree = ""; }; - C3F4791911C1F0260020E7C1 /* shThemeFadeToGrey.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeFadeToGrey.css; sourceTree = ""; }; - C3F4791A11C1F0260020E7C1 /* shThemeMidnight.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeMidnight.css; sourceTree = ""; }; - C3F4791B11C1F0260020E7C1 /* shThemeRDark.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeRDark.css; sourceTree = ""; }; - C3F4791C11C1F0260020E7C1 /* test.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = test.html; sourceTree = ""; }; + C3138B8D11C2F48400BE6CBE /* blame.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = blame.css; sourceTree = ""; }; + C3138B8E11C2F48400BE6CBE /* blame.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = blame.js; sourceTree = ""; }; + C3138B8F11C2F48400BE6CBE /* index copy.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "index copy.html"; sourceTree = ""; }; + C3138B9011C2F48400BE6CBE /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; + C3138B9211C2F48400BE6CBE /* commit.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = commit.css; sourceTree = ""; }; + C3138B9311C2F48400BE6CBE /* commit.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = commit.js; sourceTree = ""; }; + C3138B9411C2F48400BE6CBE /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; + C3138B9511C2F48400BE6CBE /* multipleSelection.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = multipleSelection.js; sourceTree = ""; }; + C3138B9711C2F48400BE6CBE /* diffWindow.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = diffWindow.css; sourceTree = ""; }; + C3138B9811C2F48400BE6CBE /* diffWindow.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = diffWindow.js; sourceTree = ""; }; + C3138B9911C2F48400BE6CBE /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; + C3138B9B11C2F48400BE6CBE /* history.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = history.css; sourceTree = ""; }; + C3138B9C11C2F48400BE6CBE /* history.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = history.js; sourceTree = ""; }; + C3138B9D11C2F48400BE6CBE /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; + C3138B9F11C2F48400BE6CBE /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; + C3138BA011C2F48400BE6CBE /* source.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = source.css; sourceTree = ""; }; + C3138BA111C2F48400BE6CBE /* source.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = source.js; sourceTree = ""; }; + C3138BA311C2F48400BE6CBE /* diffHighlighter.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = diffHighlighter.js; sourceTree = ""; }; + C3138BA411C2F48400BE6CBE /* GitX.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = GitX.js; sourceTree = ""; }; + C3138BA511C2F48400BE6CBE /* keyboardNavigation.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = keyboardNavigation.js; sourceTree = ""; }; + C3138BA611C2F48400BE6CBE /* md5.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = md5.js; sourceTree = ""; }; + C3138BA811C2F48400BE6CBE /* LGPLv3.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LGPLv3.txt; sourceTree = ""; }; + C3138BAA11C2F48400BE6CBE /* clipboard.swf */ = {isa = PBXFileReference; lastKnownFileType = file; path = clipboard.swf; sourceTree = ""; }; + C3138BAB11C2F48400BE6CBE /* shBrushAS3.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushAS3.js; sourceTree = ""; }; + C3138BAC11C2F48400BE6CBE /* shBrushBash.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushBash.js; sourceTree = ""; }; + C3138BAD11C2F48400BE6CBE /* shBrushColdFusion.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushColdFusion.js; sourceTree = ""; }; + C3138BAE11C2F48400BE6CBE /* shBrushCpp.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushCpp.js; sourceTree = ""; }; + C3138BAF11C2F48400BE6CBE /* shBrushCSharp.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushCSharp.js; sourceTree = ""; }; + C3138BB011C2F48400BE6CBE /* shBrushCss.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushCss.js; sourceTree = ""; }; + C3138BB111C2F48400BE6CBE /* shBrushDelphi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushDelphi.js; sourceTree = ""; }; + C3138BB211C2F48400BE6CBE /* shBrushDiff.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushDiff.js; sourceTree = ""; }; + C3138BB311C2F48400BE6CBE /* shBrushErlang.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushErlang.js; sourceTree = ""; }; + C3138BB411C2F48400BE6CBE /* shBrushGroovy.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushGroovy.js; sourceTree = ""; }; + C3138BB511C2F48400BE6CBE /* shBrushJava.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushJava.js; sourceTree = ""; }; + C3138BB611C2F48400BE6CBE /* shBrushJavaFX.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushJavaFX.js; sourceTree = ""; }; + C3138BB711C2F48400BE6CBE /* shBrushJScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushJScript.js; sourceTree = ""; }; + C3138BB811C2F48400BE6CBE /* shBrushObjC.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushObjC.js; sourceTree = ""; }; + C3138BB911C2F48400BE6CBE /* shBrushPerl.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPerl.js; sourceTree = ""; }; + C3138BBA11C2F48400BE6CBE /* shBrushPhp.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPhp.js; sourceTree = ""; }; + C3138BBB11C2F48400BE6CBE /* shBrushPlain.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPlain.js; sourceTree = ""; }; + C3138BBC11C2F48400BE6CBE /* shBrushPowerShell.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPowerShell.js; sourceTree = ""; }; + C3138BBD11C2F48400BE6CBE /* shBrushPython.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushPython.js; sourceTree = ""; }; + C3138BBE11C2F48400BE6CBE /* shBrushRuby.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushRuby.js; sourceTree = ""; }; + C3138BBF11C2F48400BE6CBE /* shBrushScala.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushScala.js; sourceTree = ""; }; + C3138BC011C2F48400BE6CBE /* shBrushSql.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushSql.js; sourceTree = ""; }; + C3138BC111C2F48400BE6CBE /* shBrushVb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushVb.js; sourceTree = ""; }; + C3138BC211C2F48400BE6CBE /* shBrushXml.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shBrushXml.js; sourceTree = ""; }; + C3138BC311C2F48400BE6CBE /* shCore.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shCore.js; sourceTree = ""; }; + C3138BC411C2F48400BE6CBE /* shLegacy.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shLegacy.js; sourceTree = ""; }; + C3138BC611C2F48400BE6CBE /* shCore.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shCore.js; sourceTree = ""; }; + C3138BC711C2F48400BE6CBE /* shLegacy.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = shLegacy.js; sourceTree = ""; }; + C3138BC911C2F48400BE6CBE /* help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = help.png; sourceTree = ""; }; + C3138BCA11C2F48400BE6CBE /* magnifier.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = magnifier.png; sourceTree = ""; }; + C3138BCB11C2F48400BE6CBE /* page_white_code.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page_white_code.png; sourceTree = ""; }; + C3138BCC11C2F48400BE6CBE /* page_white_copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page_white_copy.png; sourceTree = ""; }; + C3138BCD11C2F48400BE6CBE /* printer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = printer.png; sourceTree = ""; }; + C3138BCE11C2F48400BE6CBE /* shCore.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shCore.css; sourceTree = ""; }; + C3138BCF11C2F48400BE6CBE /* shThemeDefault.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeDefault.css; sourceTree = ""; }; + C3138BD011C2F48400BE6CBE /* shThemeDjango.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeDjango.css; sourceTree = ""; }; + C3138BD111C2F48400BE6CBE /* shThemeEclipse.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeEclipse.css; sourceTree = ""; }; + C3138BD211C2F48400BE6CBE /* shThemeEmacs.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeEmacs.css; sourceTree = ""; }; + C3138BD311C2F48400BE6CBE /* shThemeFadeToGrey.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeFadeToGrey.css; sourceTree = ""; }; + C3138BD411C2F48400BE6CBE /* shThemeMidnight.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeMidnight.css; sourceTree = ""; }; + C3138BD511C2F48400BE6CBE /* shThemeRDark.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = shThemeRDark.css; sourceTree = ""; }; + C3138BD611C2F48400BE6CBE /* test.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = test.html; sourceTree = ""; }; + C3138BD811C2F48400BE6CBE /* added.acorn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = added.acorn; sourceTree = ""; }; + C3138BD911C2F48400BE6CBE /* added.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = added.png; sourceTree = ""; }; + C3138BDA11C2F48400BE6CBE /* modified.acorn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = modified.acorn; sourceTree = ""; }; + C3138BDB11C2F48400BE6CBE /* modified.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = modified.png; sourceTree = ""; }; + C3138BDC11C2F48400BE6CBE /* removed.acorn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = removed.acorn; sourceTree = ""; }; + C3138BDD11C2F48400BE6CBE /* removed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = removed.png; sourceTree = ""; }; + C3138BDE11C2F48400BE6CBE /* renamed.acorn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = renamed.acorn; sourceTree = ""; }; + C3138BDF11C2F48400BE6CBE /* renamed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = renamed.png; sourceTree = ""; }; + C3138BE011C2F48400BE6CBE /* spinner.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = spinner.gif; sourceTree = ""; }; + C3138BE111C2F48400BE6CBE /* dragtest.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = dragtest.html; path = html/dragtest.html; sourceTree = ""; }; + C3138BE311C2F48400BE6CBE /* diff.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = diff.css; sourceTree = ""; }; + C3138BE411C2F48400BE6CBE /* GitX.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = GitX.css; sourceTree = ""; }; + C3138BE511C2F48400BE6CBE /* notification.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = notification.css; sourceTree = ""; }; D26DC6440E782C9000C777B2 /* gitx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = gitx.icns; sourceTree = ""; }; D8083A2D111E045300337480 /* PBRemoteProgressSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBRemoteProgressSheet.h; sourceTree = ""; }; D8083A42111E045D00337480 /* PBRemoteProgressSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBRemoteProgressSheet.m; sourceTree = ""; }; @@ -603,7 +665,7 @@ 29B97314FDCFA39411CA2CEA /* GitTest */ = { isa = PBXGroup; children = ( - 31F8A73911C0CE6C00517F78 /* html */, + C3138B6211C2F39900BE6CBE /* html */, F5886A080ED5D26B0066E74C /* SpeedTest */, 913D5E420E5563FD00CECEA2 /* cli */, F57CC43E0E05E472000472E2 /* Aux */, @@ -688,34 +750,6 @@ name = Frameworks; sourceTree = ""; }; - 31F8A73411C0CE5300517F78 /* blame */ = { - isa = PBXGroup; - children = ( - 31F8A73511C0CE5300517F78 /* index.html */, - 31F8A75311C0D0F800517F78 /* blame.js */, - 314E974511C17BB4007E9610 /* blame.css */, - ); - name = blame; - path = html/views/blame; - sourceTree = ""; - }; - 31F8A73911C0CE6C00517F78 /* html */ = { - isa = PBXGroup; - children = ( - C3F478EE11C1F0260020E7C1 /* syntaxhighlighter */, - 31F8A73A11C0CE7400517F78 /* views */, - ); - name = html; - sourceTree = ""; - }; - 31F8A73A11C0CE7400517F78 /* views */ = { - isa = PBXGroup; - children = ( - 31F8A73411C0CE5300517F78 /* blame */, - ); - name = views; - sourceTree = ""; - }; 47DBDB920E94F47200671A1E /* Preference Icons */ = { isa = PBXGroup; children = ( @@ -742,82 +776,199 @@ name = cli; sourceTree = ""; }; - C3F478EE11C1F0260020E7C1 /* syntaxhighlighter */ = { + C3138B6211C2F39900BE6CBE /* html */ = { isa = PBXGroup; children = ( - C3F478EF11C1F0260020E7C1 /* LGPLv3.txt */, - C3F478F011C1F0260020E7C1 /* scripts */, - C3F4790B11C1F0260020E7C1 /* src */, - C3F4790E11C1F0260020E7C1 /* styles */, - C3F4791C11C1F0260020E7C1 /* test.html */, + C3138B8B11C2F48400BE6CBE /* views */, + C3138BA211C2F48400BE6CBE /* lib */, + C3138BD711C2F48400BE6CBE /* images */, + C3138BE111C2F48400BE6CBE /* dragtest.html */, + C3138BE211C2F48400BE6CBE /* css */, ); - name = syntaxhighlighter; - path = html/lib/syntaxhighlighter_2.1.364; + name = html; sourceTree = ""; }; - C3F478F011C1F0260020E7C1 /* scripts */ = { + C3138B8B11C2F48400BE6CBE /* views */ = { isa = PBXGroup; children = ( - C3F478F111C1F0260020E7C1 /* clipboard.swf */, - C3F478F211C1F0260020E7C1 /* shBrushAS3.js */, - C3F478F311C1F0260020E7C1 /* shBrushBash.js */, - C3F478F411C1F0260020E7C1 /* shBrushColdFusion.js */, - C3F478F511C1F0260020E7C1 /* shBrushCpp.js */, - C3F478F611C1F0260020E7C1 /* shBrushCSharp.js */, - C3F478F711C1F0260020E7C1 /* shBrushCss.js */, - C3F478F811C1F0260020E7C1 /* shBrushDelphi.js */, - C3F478F911C1F0260020E7C1 /* shBrushDiff.js */, - C3F478FA11C1F0260020E7C1 /* shBrushErlang.js */, - C3F478FB11C1F0260020E7C1 /* shBrushGroovy.js */, - C3F478FC11C1F0260020E7C1 /* shBrushJava.js */, - C3F478FD11C1F0260020E7C1 /* shBrushJavaFX.js */, - C3F478FE11C1F0260020E7C1 /* shBrushJScript.js */, - C3F478FF11C1F0260020E7C1 /* shBrushPerl.js */, - C3F4790011C1F0260020E7C1 /* shBrushPhp.js */, - C3F4790111C1F0260020E7C1 /* shBrushPlain.js */, - C3F4790211C1F0260020E7C1 /* shBrushPowerShell.js */, - C3F4790311C1F0260020E7C1 /* shBrushPython.js */, - C3F4790411C1F0260020E7C1 /* shBrushRuby.js */, - C3F4790511C1F0260020E7C1 /* shBrushScala.js */, - C3F4790611C1F0260020E7C1 /* shBrushSql.js */, - C3F4790711C1F0260020E7C1 /* shBrushVb.js */, - C3F4790811C1F0260020E7C1 /* shBrushXml.js */, - C3F4790911C1F0260020E7C1 /* shCore.js */, - C3F4790A11C1F0260020E7C1 /* shLegacy.js */, - 31D5F72411C21F7500BC94E4 /* shBrushObjC.js */, + C3138B8C11C2F48400BE6CBE /* blame */, + C3138B9111C2F48400BE6CBE /* commit */, + C3138B9611C2F48400BE6CBE /* diff */, + C3138B9A11C2F48400BE6CBE /* history */, + C3138B9E11C2F48400BE6CBE /* source */, + ); + name = views; + path = html/views; + sourceTree = ""; + }; + C3138B8C11C2F48400BE6CBE /* blame */ = { + isa = PBXGroup; + children = ( + C3138B8D11C2F48400BE6CBE /* blame.css */, + C3138B8E11C2F48400BE6CBE /* blame.js */, + C3138B8F11C2F48400BE6CBE /* index copy.html */, + C3138B9011C2F48400BE6CBE /* index.html */, + ); + path = blame; + sourceTree = ""; + }; + C3138B9111C2F48400BE6CBE /* commit */ = { + isa = PBXGroup; + children = ( + C3138B9211C2F48400BE6CBE /* commit.css */, + C3138B9311C2F48400BE6CBE /* commit.js */, + C3138B9411C2F48400BE6CBE /* index.html */, + C3138B9511C2F48400BE6CBE /* multipleSelection.js */, + ); + path = commit; + sourceTree = ""; + }; + C3138B9611C2F48400BE6CBE /* diff */ = { + isa = PBXGroup; + children = ( + C3138B9711C2F48400BE6CBE /* diffWindow.css */, + C3138B9811C2F48400BE6CBE /* diffWindow.js */, + C3138B9911C2F48400BE6CBE /* index.html */, + ); + path = diff; + sourceTree = ""; + }; + C3138B9A11C2F48400BE6CBE /* history */ = { + isa = PBXGroup; + children = ( + C3138B9B11C2F48400BE6CBE /* history.css */, + C3138B9C11C2F48400BE6CBE /* history.js */, + C3138B9D11C2F48400BE6CBE /* index.html */, + ); + path = history; + sourceTree = ""; + }; + C3138B9E11C2F48400BE6CBE /* source */ = { + isa = PBXGroup; + children = ( + C3138B9F11C2F48400BE6CBE /* index.html */, + C3138BA011C2F48400BE6CBE /* source.css */, + C3138BA111C2F48400BE6CBE /* source.js */, + ); + path = source; + sourceTree = ""; + }; + C3138BA211C2F48400BE6CBE /* lib */ = { + isa = PBXGroup; + children = ( + C3138BA311C2F48400BE6CBE /* diffHighlighter.js */, + C3138BA411C2F48400BE6CBE /* GitX.js */, + C3138BA511C2F48400BE6CBE /* keyboardNavigation.js */, + C3138BA611C2F48400BE6CBE /* md5.js */, + C3138BA711C2F48400BE6CBE /* syntaxhighlighter_2.1.364 */, + ); + name = lib; + path = html/lib; + sourceTree = ""; + }; + C3138BA711C2F48400BE6CBE /* syntaxhighlighter_2.1.364 */ = { + isa = PBXGroup; + children = ( + C3138BA811C2F48400BE6CBE /* LGPLv3.txt */, + C3138BA911C2F48400BE6CBE /* scripts */, + C3138BC511C2F48400BE6CBE /* src */, + C3138BC811C2F48400BE6CBE /* styles */, + C3138BD611C2F48400BE6CBE /* test.html */, + ); + path = syntaxhighlighter_2.1.364; + sourceTree = ""; + }; + C3138BA911C2F48400BE6CBE /* scripts */ = { + isa = PBXGroup; + children = ( + C3138BAA11C2F48400BE6CBE /* clipboard.swf */, + C3138BAB11C2F48400BE6CBE /* shBrushAS3.js */, + C3138BAC11C2F48400BE6CBE /* shBrushBash.js */, + C3138BAD11C2F48400BE6CBE /* shBrushColdFusion.js */, + C3138BAE11C2F48400BE6CBE /* shBrushCpp.js */, + C3138BAF11C2F48400BE6CBE /* shBrushCSharp.js */, + C3138BB011C2F48400BE6CBE /* shBrushCss.js */, + C3138BB111C2F48400BE6CBE /* shBrushDelphi.js */, + C3138BB211C2F48400BE6CBE /* shBrushDiff.js */, + C3138BB311C2F48400BE6CBE /* shBrushErlang.js */, + C3138BB411C2F48400BE6CBE /* shBrushGroovy.js */, + C3138BB511C2F48400BE6CBE /* shBrushJava.js */, + C3138BB611C2F48400BE6CBE /* shBrushJavaFX.js */, + C3138BB711C2F48400BE6CBE /* shBrushJScript.js */, + C3138BB811C2F48400BE6CBE /* shBrushObjC.js */, + C3138BB911C2F48400BE6CBE /* shBrushPerl.js */, + C3138BBA11C2F48400BE6CBE /* shBrushPhp.js */, + C3138BBB11C2F48400BE6CBE /* shBrushPlain.js */, + C3138BBC11C2F48400BE6CBE /* shBrushPowerShell.js */, + C3138BBD11C2F48400BE6CBE /* shBrushPython.js */, + C3138BBE11C2F48400BE6CBE /* shBrushRuby.js */, + C3138BBF11C2F48400BE6CBE /* shBrushScala.js */, + C3138BC011C2F48400BE6CBE /* shBrushSql.js */, + C3138BC111C2F48400BE6CBE /* shBrushVb.js */, + C3138BC211C2F48400BE6CBE /* shBrushXml.js */, + C3138BC311C2F48400BE6CBE /* shCore.js */, + C3138BC411C2F48400BE6CBE /* shLegacy.js */, ); path = scripts; sourceTree = ""; }; - C3F4790B11C1F0260020E7C1 /* src */ = { + C3138BC511C2F48400BE6CBE /* src */ = { isa = PBXGroup; children = ( - C3F4790C11C1F0260020E7C1 /* shCore.js */, - C3F4790D11C1F0260020E7C1 /* shLegacy.js */, + C3138BC611C2F48400BE6CBE /* shCore.js */, + C3138BC711C2F48400BE6CBE /* shLegacy.js */, ); path = src; sourceTree = ""; }; - C3F4790E11C1F0260020E7C1 /* styles */ = { + C3138BC811C2F48400BE6CBE /* styles */ = { isa = PBXGroup; children = ( - C3F4790F11C1F0260020E7C1 /* help.png */, - C3F4791011C1F0260020E7C1 /* magnifier.png */, - C3F4791111C1F0260020E7C1 /* page_white_code.png */, - C3F4791211C1F0260020E7C1 /* page_white_copy.png */, - C3F4791311C1F0260020E7C1 /* printer.png */, - C3F4791411C1F0260020E7C1 /* shCore.css */, - C3F4791511C1F0260020E7C1 /* shThemeDefault.css */, - C3F4791611C1F0260020E7C1 /* shThemeDjango.css */, - C3F4791711C1F0260020E7C1 /* shThemeEclipse.css */, - C3F4791811C1F0260020E7C1 /* shThemeEmacs.css */, - C3F4791911C1F0260020E7C1 /* shThemeFadeToGrey.css */, - C3F4791A11C1F0260020E7C1 /* shThemeMidnight.css */, - C3F4791B11C1F0260020E7C1 /* shThemeRDark.css */, + C3138BC911C2F48400BE6CBE /* help.png */, + C3138BCA11C2F48400BE6CBE /* magnifier.png */, + C3138BCB11C2F48400BE6CBE /* page_white_code.png */, + C3138BCC11C2F48400BE6CBE /* page_white_copy.png */, + C3138BCD11C2F48400BE6CBE /* printer.png */, + C3138BCE11C2F48400BE6CBE /* shCore.css */, + C3138BCF11C2F48400BE6CBE /* shThemeDefault.css */, + C3138BD011C2F48400BE6CBE /* shThemeDjango.css */, + C3138BD111C2F48400BE6CBE /* shThemeEclipse.css */, + C3138BD211C2F48400BE6CBE /* shThemeEmacs.css */, + C3138BD311C2F48400BE6CBE /* shThemeFadeToGrey.css */, + C3138BD411C2F48400BE6CBE /* shThemeMidnight.css */, + C3138BD511C2F48400BE6CBE /* shThemeRDark.css */, ); path = styles; sourceTree = ""; }; + C3138BD711C2F48400BE6CBE /* images */ = { + isa = PBXGroup; + children = ( + C3138BD811C2F48400BE6CBE /* added.acorn */, + C3138BD911C2F48400BE6CBE /* added.png */, + C3138BDA11C2F48400BE6CBE /* modified.acorn */, + C3138BDB11C2F48400BE6CBE /* modified.png */, + C3138BDC11C2F48400BE6CBE /* removed.acorn */, + C3138BDD11C2F48400BE6CBE /* removed.png */, + C3138BDE11C2F48400BE6CBE /* renamed.acorn */, + C3138BDF11C2F48400BE6CBE /* renamed.png */, + C3138BE011C2F48400BE6CBE /* spinner.gif */, + ); + name = images; + path = html/images; + sourceTree = ""; + }; + C3138BE211C2F48400BE6CBE /* css */ = { + isa = PBXGroup; + children = ( + C3138BE311C2F48400BE6CBE /* diff.css */, + C3138BE411C2F48400BE6CBE /* GitX.css */, + C3138BE511C2F48400BE6CBE /* notification.css */, + ); + name = css; + path = html/css; + sourceTree = ""; + }; D82F435F111B9C6D00A25A39 /* Sheets */ = { isa = PBXGroup; children = ( @@ -1243,24 +1394,46 @@ D8A4BD081134AD2900E92D51 /* MergeTemplate.png in Resources */, D8A4BD091134AD2900E92D51 /* RebaseTemplate.png in Resources */, D828AEEC112F411100F09D11 /* CloneRepositoryTemplate.png in Resources */, - 31F8A73611C0CE5300517F78 /* index.html in Resources */, - 314E974611C17BB4007E9610 /* blame.css in Resources */, - C3F4791D11C1F0260020E7C1 /* LGPLv3.txt in Resources */, - C3F4791E11C1F0260020E7C1 /* clipboard.swf in Resources */, - C3F4793A11C1F0260020E7C1 /* help.png in Resources */, - C3F4793B11C1F0260020E7C1 /* magnifier.png in Resources */, - C3F4793C11C1F0260020E7C1 /* page_white_code.png in Resources */, - C3F4793D11C1F0260020E7C1 /* page_white_copy.png in Resources */, - C3F4793E11C1F0260020E7C1 /* printer.png in Resources */, - C3F4793F11C1F0260020E7C1 /* shCore.css in Resources */, - C3F4794011C1F0260020E7C1 /* shThemeDefault.css in Resources */, - C3F4794111C1F0260020E7C1 /* shThemeDjango.css in Resources */, - C3F4794211C1F0260020E7C1 /* shThemeEclipse.css in Resources */, - C3F4794311C1F0260020E7C1 /* shThemeEmacs.css in Resources */, - C3F4794411C1F0260020E7C1 /* shThemeFadeToGrey.css in Resources */, - C3F4794511C1F0260020E7C1 /* shThemeMidnight.css in Resources */, - C3F4794611C1F0260020E7C1 /* shThemeRDark.css in Resources */, - C3F4794711C1F0260020E7C1 /* test.html in Resources */, + C3138BE611C2F48400BE6CBE /* blame.css in Resources */, + C3138BE811C2F48400BE6CBE /* index copy.html in Resources */, + C3138BE911C2F48400BE6CBE /* index.html in Resources */, + C3138BEA11C2F48400BE6CBE /* commit.css in Resources */, + C3138BEC11C2F48400BE6CBE /* index.html in Resources */, + C3138BEE11C2F48400BE6CBE /* diffWindow.css in Resources */, + C3138BF011C2F48400BE6CBE /* index.html in Resources */, + C3138BF111C2F48400BE6CBE /* history.css in Resources */, + C3138BF311C2F48400BE6CBE /* index.html in Resources */, + C3138BF411C2F48400BE6CBE /* index.html in Resources */, + C3138BF511C2F48400BE6CBE /* source.css in Resources */, + C3138BFB11C2F48400BE6CBE /* LGPLv3.txt in Resources */, + C3138BFC11C2F48400BE6CBE /* clipboard.swf in Resources */, + C3138C1911C2F48400BE6CBE /* help.png in Resources */, + C3138C1A11C2F48400BE6CBE /* magnifier.png in Resources */, + C3138C1B11C2F48400BE6CBE /* page_white_code.png in Resources */, + C3138C1C11C2F48400BE6CBE /* page_white_copy.png in Resources */, + C3138C1D11C2F48400BE6CBE /* printer.png in Resources */, + C3138C1E11C2F48400BE6CBE /* shCore.css in Resources */, + C3138C1F11C2F48400BE6CBE /* shThemeDefault.css in Resources */, + C3138C2011C2F48400BE6CBE /* shThemeDjango.css in Resources */, + C3138C2111C2F48400BE6CBE /* shThemeEclipse.css in Resources */, + C3138C2211C2F48400BE6CBE /* shThemeEmacs.css in Resources */, + C3138C2311C2F48400BE6CBE /* shThemeFadeToGrey.css in Resources */, + C3138C2411C2F48400BE6CBE /* shThemeMidnight.css in Resources */, + C3138C2511C2F48400BE6CBE /* shThemeRDark.css in Resources */, + C3138C2611C2F48400BE6CBE /* test.html in Resources */, + C3138C2711C2F48400BE6CBE /* added.acorn in Resources */, + C3138C2811C2F48400BE6CBE /* added.png in Resources */, + C3138C2911C2F48400BE6CBE /* modified.acorn in Resources */, + C3138C2A11C2F48400BE6CBE /* modified.png in Resources */, + C3138C2B11C2F48400BE6CBE /* removed.acorn in Resources */, + C3138C2C11C2F48400BE6CBE /* removed.png in Resources */, + C3138C2D11C2F48400BE6CBE /* renamed.acorn in Resources */, + C3138C2E11C2F48400BE6CBE /* renamed.png in Resources */, + C3138C2F11C2F48400BE6CBE /* spinner.gif in Resources */, + C3138C3011C2F48400BE6CBE /* dragtest.html in Resources */, + C3138C3111C2F48400BE6CBE /* diff.css in Resources */, + C3138C3211C2F48400BE6CBE /* GitX.css in Resources */, + C3138C3311C2F48400BE6CBE /* notification.css in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1402,35 +1575,44 @@ D8295D2A1130A1DC00C838E8 /* PBGitHistoryList.m in Sources */, D8295DE01130E43900C838E8 /* PBGitHistoryGrapher.m in Sources */, D8E105471157C18200FC28A4 /* PBQLTextView.m in Sources */, - 31F8A75411C0D0F800517F78 /* blame.js in Sources */, - C3F4791F11C1F0260020E7C1 /* shBrushAS3.js in Sources */, - C3F4792011C1F0260020E7C1 /* shBrushBash.js in Sources */, - C3F4792111C1F0260020E7C1 /* shBrushColdFusion.js in Sources */, - C3F4792211C1F0260020E7C1 /* shBrushCpp.js in Sources */, - C3F4792311C1F0260020E7C1 /* shBrushCSharp.js in Sources */, - C3F4792411C1F0260020E7C1 /* shBrushCss.js in Sources */, - C3F4792511C1F0260020E7C1 /* shBrushDelphi.js in Sources */, - C3F4792611C1F0260020E7C1 /* shBrushDiff.js in Sources */, - C3F4792711C1F0260020E7C1 /* shBrushErlang.js in Sources */, - C3F4792811C1F0260020E7C1 /* shBrushGroovy.js in Sources */, - C3F4792911C1F0260020E7C1 /* shBrushJava.js in Sources */, - C3F4792A11C1F0260020E7C1 /* shBrushJavaFX.js in Sources */, - C3F4792B11C1F0260020E7C1 /* shBrushJScript.js in Sources */, - C3F4792C11C1F0260020E7C1 /* shBrushPerl.js in Sources */, - C3F4792D11C1F0260020E7C1 /* shBrushPhp.js in Sources */, - C3F4792E11C1F0260020E7C1 /* shBrushPlain.js in Sources */, - C3F4792F11C1F0260020E7C1 /* shBrushPowerShell.js in Sources */, - C3F4793011C1F0260020E7C1 /* shBrushPython.js in Sources */, - C3F4793111C1F0260020E7C1 /* shBrushRuby.js in Sources */, - C3F4793211C1F0260020E7C1 /* shBrushScala.js in Sources */, - C3F4793311C1F0260020E7C1 /* shBrushSql.js in Sources */, - C3F4793411C1F0260020E7C1 /* shBrushVb.js in Sources */, - C3F4793511C1F0260020E7C1 /* shBrushXml.js in Sources */, - C3F4793611C1F0260020E7C1 /* shCore.js in Sources */, - C3F4793711C1F0260020E7C1 /* shLegacy.js in Sources */, - C3F4793811C1F0260020E7C1 /* shCore.js in Sources */, - C3F4793911C1F0260020E7C1 /* shLegacy.js in Sources */, - 31D5F72511C21F7500BC94E4 /* shBrushObjC.js in Sources */, + C3138BE711C2F48400BE6CBE /* blame.js in Sources */, + C3138BEB11C2F48400BE6CBE /* commit.js in Sources */, + C3138BED11C2F48400BE6CBE /* multipleSelection.js in Sources */, + C3138BEF11C2F48400BE6CBE /* diffWindow.js in Sources */, + C3138BF211C2F48400BE6CBE /* history.js in Sources */, + C3138BF611C2F48400BE6CBE /* source.js in Sources */, + C3138BF711C2F48400BE6CBE /* diffHighlighter.js in Sources */, + C3138BF811C2F48400BE6CBE /* GitX.js in Sources */, + C3138BF911C2F48400BE6CBE /* keyboardNavigation.js in Sources */, + C3138BFA11C2F48400BE6CBE /* md5.js in Sources */, + C3138BFD11C2F48400BE6CBE /* shBrushAS3.js in Sources */, + C3138BFE11C2F48400BE6CBE /* shBrushBash.js in Sources */, + C3138BFF11C2F48400BE6CBE /* shBrushColdFusion.js in Sources */, + C3138C0011C2F48400BE6CBE /* shBrushCpp.js in Sources */, + C3138C0111C2F48400BE6CBE /* shBrushCSharp.js in Sources */, + C3138C0211C2F48400BE6CBE /* shBrushCss.js in Sources */, + C3138C0311C2F48400BE6CBE /* shBrushDelphi.js in Sources */, + C3138C0411C2F48400BE6CBE /* shBrushDiff.js in Sources */, + C3138C0511C2F48400BE6CBE /* shBrushErlang.js in Sources */, + C3138C0611C2F48400BE6CBE /* shBrushGroovy.js in Sources */, + C3138C0711C2F48400BE6CBE /* shBrushJava.js in Sources */, + C3138C0811C2F48400BE6CBE /* shBrushJavaFX.js in Sources */, + C3138C0911C2F48400BE6CBE /* shBrushJScript.js in Sources */, + C3138C0A11C2F48400BE6CBE /* shBrushObjC.js in Sources */, + C3138C0B11C2F48400BE6CBE /* shBrushPerl.js in Sources */, + C3138C0C11C2F48400BE6CBE /* shBrushPhp.js in Sources */, + C3138C0D11C2F48400BE6CBE /* shBrushPlain.js in Sources */, + C3138C0E11C2F48400BE6CBE /* shBrushPowerShell.js in Sources */, + C3138C0F11C2F48400BE6CBE /* shBrushPython.js in Sources */, + C3138C1011C2F48400BE6CBE /* shBrushRuby.js in Sources */, + C3138C1111C2F48400BE6CBE /* shBrushScala.js in Sources */, + C3138C1211C2F48400BE6CBE /* shBrushSql.js in Sources */, + C3138C1311C2F48400BE6CBE /* shBrushVb.js in Sources */, + C3138C1411C2F48400BE6CBE /* shBrushXml.js in Sources */, + C3138C1511C2F48400BE6CBE /* shCore.js in Sources */, + C3138C1611C2F48400BE6CBE /* shLegacy.js in Sources */, + C3138C1711C2F48400BE6CBE /* shCore.js in Sources */, + C3138C1811C2F48400BE6CBE /* shLegacy.js in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/PBEasyPipe.m b/PBEasyPipe.m index f375a4a..8ac4570 100644 --- a/PBEasyPipe.m +++ b/PBEasyPipe.m @@ -110,7 +110,7 @@ + (NSString*) outputForCommand: (NSString*) cmd withArgs: (NSArray*) args inDir: (NSString*) dir { - //NSLog(@"cmd=%@ args=%@ dir=%@",cmd,args,dir); + NSLog(@"cmd=%@ args=%@ dir=%@",cmd,args,dir); NSTask *task = [self taskForCommand:cmd withArgs:args inDir:dir]; NSFileHandle* handle = [task.standardOutput fileHandleForReading]; diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m index 386f592..51d5275 100644 --- a/PBGitHistoryController.m +++ b/PBGitHistoryController.m @@ -693,8 +693,16 @@ - (IBAction)updateFileViwer:(id)sender { - NSString *path = [NSString stringWithFormat:@"html/views/%@", @"blame"]; - NSString* file = [[NSBundle mainBundle] pathForResource:@"index" ofType:@"html" inDirectory:path]; + NSString *type=@"source"; + if([displayControl selectedSegment]==1){ + type=@"blame"; + }else if([displayControl selectedSegment]==2){ + type=@"diff"; + } + + NSString *path = [NSString stringWithFormat:@"html/views/%@", type]; + NSString *file = [[NSBundle mainBundle] pathForResource:@"index" ofType:@"html" inDirectory:path]; + NSLog(@"updateFileViwer -> file: '%@'",file); NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL fileURLWithPath:file]]; [[webViewFileViwer mainFrame] loadRequest:request]; } @@ -708,15 +716,17 @@ PBGitTree *treeItem = [objects objectAtIndex:0]; currentFileBrowserSelectionPath = [treeItem.fullPath componentsSeparatedByString:@"/"]; + NSString *txt=[treeItem contents:[displayControl selectedSegment]]; + NSLog(@"didFinishLoadForFrame -> txt: '%@'",[txt substringToIndex:80]); + id script = [webViewFileViwer windowScriptObject]; [script callWebScriptMethod:@"showFile" - withArguments:[NSArray arrayWithObjects:[treeItem contents:[displayControl selectedSegment]], nil]]; + withArguments:[NSArray arrayWithObjects:txt, nil]]; } } - (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame { - NSString *titleString = @"Error Loading Page"; NSString *messageString = [error localizedDescription]; NSString *moreString = [error localizedFailureReason] ? [error localizedFailureReason] : diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib index 799df17..cece172 100644 --- a/PBGitHistoryView.xib +++ b/PBGitHistoryView.xib @@ -21,7 +21,7 @@ YES - + YES @@ -1018,7 +1018,7 @@ 292 - {{41, 3}, {118, 25}} + {{20, 3}, {162, 25}} YES @@ -1040,6 +1040,10 @@ 9 2 + + Diff + 0 + 2 @@ -2625,9 +2629,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.WebKitIBPlugin - {{178, 101}, {895, 613}} + {{1414, 293}, {895, 613}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin diff --git a/PBGitTree.m b/PBGitTree.m index b4fc226..8898137 100644 --- a/PBGitTree.m +++ b/PBGitTree.m @@ -129,9 +129,11 @@ return [NSString stringWithFormat:@"%@ is too big to be displayed (%d bytes)", [self fullPath], [self fileSize]]; if(option==0) - contents= [repository outputForArguments:[NSArray arrayWithObjects:@"show", [self refSpec], nil]]; - else - contents=[PBGitTree parseBlame:[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"blame", @"-p", self.fullPath, nil]]]; + contents=[repository outputForArguments:[NSArray arrayWithObjects:@"show", [self refSpec], nil]]; + else if(option==1) + contents=[PBGitTree parseBlame:[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"blame", @"-p", self.fullPath, self.sha, nil]]]; + else if(option==2) + contents=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", self.sha, self.fullPath, nil]]; if ([self hasBinaryHeader:contents]) return [NSString stringWithFormat:@"%@ appears to be a binary file of %d bytes", [self fullPath], [self fileSize]]; @@ -337,7 +339,7 @@ [res appendString:@"\n"]; } [res appendString:@"\n"]; - NSLog(@"%@",res); + //NSLog(@"%@",res); return (NSString *)res; } diff --git a/html/views/diff/diffWindow.js b/html/views/diff/diffWindow.js index 6cef3d7..e301795 100644 --- a/html/views/diff/diffWindow.js +++ b/html/views/diff/diffWindow.js @@ -1,5 +1,9 @@ // for diffs shown in the PBDiffWindow +var showFile = function(message) { + highlightDiff(message,$("diff")); +} + var setMessage = function(message) { $("message").style.display = ""; $("message").innerHTML = message.escapeHTML(); diff --git a/html/views/source/index.html b/html/views/source/index.html new file mode 100644 index 0000000..fc4effe --- /dev/null +++ b/html/views/source/index.html @@ -0,0 +1,14 @@ + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/html/views/source/source.css b/html/views/source/source.css new file mode 100644 index 0000000..e69de29 diff --git a/html/views/source/source.js b/html/views/source/source.js new file mode 100644 index 0000000..2168e9e --- /dev/null +++ b/html/views/source/source.js @@ -0,0 +1,9 @@ +var showFile = function(txt) { + $("source").style.display = ""; + $("source").innerHTML="
"+txt+"
"; + + SyntaxHighlighter.defaults['toolbar'] = false; + SyntaxHighlighter.highlight(); + + return; +} diff --git a/source.css b/source.css new file mode 100644 index 0000000..e69de29