Skip to content

Commit ff53bcd

Browse files
laullonlaullon
committed
Added filtering to File Browser
Conflicts: GitX.xcodeproj/project.pbxproj PBGitHistoryView.xib
1 parent 6beb754 commit ff53bcd

File tree

7 files changed

+2409
-274
lines changed

7 files changed

+2409
-274
lines changed

‎GitX.xcodeproj/project.pbxproj

Lines changed: 51 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
212A49AB12A31328009DAFAD /* deleted_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49A912A31328009DAFAD /* deleted_file.png */; };
5050
212A49AD12A31350009DAFAD /* ignored_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49AC12A31350009DAFAD /* ignored_file.png */; };
5151
212A49AF12A3135C009DAFAD /* modified_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49AE12A3135C009DAFAD /* modified_file.png */; };
52+
213C598D12EB8BEB006F0CAE /* PBResetSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 213C598C12EB8BEB006F0CAE /* PBResetSheet.xib */; };
53+
213C599012EB8BFC006F0CAE /* PBResetSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 213C598F12EB8BFC006F0CAE /* PBResetSheet.m */; };
54+
213C5A6812EB8E95006F0CAE /* GTTopBlackGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 213C5A6712EB8E95006F0CAE /* GTTopBlackGradientView.m */; };
55+
213C5A6B12EB8EC5006F0CAE /* GTGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 213C5A6A12EB8EC5006F0CAE /* GTGradientView.m */; };
56+
213C5AC512EB91F5006F0CAE /* GTSheetWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 213C5AC112EB91F5006F0CAE /* GTSheetWindow.m */; };
57+
213C5AC612EB91F5006F0CAE /* GTWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 213C5AC312EB91F5006F0CAE /* GTWindow.m */; };
5258
217FF0B912A1CB3300785A65 /* PBStashController.m in Sources */ = {isa = PBXBuildFile; fileRef = 217FF0B312A1CB3300785A65 /* PBStashController.m */; };
5359
217FF0BA12A1CB3300785A65 /* PBSubmoduleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 217FF0B512A1CB3300785A65 /* PBSubmoduleController.m */; };
5460
217FF0BB12A1CB3300785A65 /* PBGitResetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 217FF0B712A1CB3300785A65 /* PBGitResetController.m */; };
@@ -60,7 +66,6 @@
6066
31460CD4124185BA00B90AED /* ReadMe.txt in Resources */ = {isa = PBXBuildFile; fileRef = 31460CAF124185BA00B90AED /* ReadMe.txt */; };
6167
31460CD5124185BA00B90AED /* Source Code License.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 31460CB0124185BA00B90AED /* Source Code License.rtf */; };
6268
31460CD6124185BA00B90AED /* TODO in Resources */ = {isa = PBXBuildFile; fileRef = 31460CB1124185BA00B90AED /* TODO */; };
63-
31DAA7ED1317737100463846 /* gitx_l_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 31DAA7EC1317737100463846 /* gitx_l_pub.pem */; };
6469
3BC07F4C0ED5A5C5009A7768 /* HistoryViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */; };
6570
3BC07F4D0ED5A5C5009A7768 /* CommitViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */; };
6671
47DBDB580E94EDE700671A1E /* DBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 47DBDB570E94EDE700671A1E /* DBPrefsWindowController.m */; };
@@ -83,9 +88,6 @@
8388
91B103CC0E898EC300C84364 /* PBIconAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B103CB0E898EC300C84364 /* PBIconAndTextCell.m */; };
8489
93CB42C20EAB7B2200530609 /* PBGitDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CB42C10EAB7B2200530609 /* PBGitDefaults.m */; };
8590
93F7857F0EA3ABF100C1F443 /* PBCommitMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F7857E0EA3ABF100C1F443 /* PBCommitMessageView.m */; };
86-
C3B13DD812F3A89D0045437C /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B13DD712F3A89D0045437C /* SecurityFoundation.framework */; };
87-
C3B13DE412F3A8D70045437C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B13DE312F3A8D70045437C /* Security.framework */; };
88-
C3B13E2312F3A9130045437C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B13DE312F3A8D70045437C /* Security.framework */; };
8991
D26DC6450E782C9000C777B2 /* gitx.icns in Resources */ = {isa = PBXBuildFile; fileRef = D26DC6440E782C9000C777B2 /* gitx.icns */; };
9092
D8022FE811E124A0003C21F6 /* PBGitXMessageSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8022FE711E124A0003C21F6 /* PBGitXMessageSheet.xib */; };
9193
D8022FED11E124C8003C21F6 /* PBGitXMessageSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8022FEC11E124C8003C21F6 /* PBGitXMessageSheet.m */; };
@@ -322,6 +324,17 @@
322324
212A49A912A31328009DAFAD /* deleted_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = deleted_file.png; sourceTree = "<group>"; };
323325
212A49AC12A31350009DAFAD /* ignored_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ignored_file.png; sourceTree = "<group>"; };
324326
212A49AE12A3135C009DAFAD /* modified_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = modified_file.png; sourceTree = "<group>"; };
327+
213C598C12EB8BEB006F0CAE /* PBResetSheet.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PBResetSheet.xib; sourceTree = "<group>"; };
328+
213C598E12EB8BFC006F0CAE /* PBResetSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBResetSheet.h; sourceTree = "<group>"; };
329+
213C598F12EB8BFC006F0CAE /* PBResetSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBResetSheet.m; sourceTree = "<group>"; };
330+
213C5A6612EB8E95006F0CAE /* GTTopBlackGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTTopBlackGradientView.h; sourceTree = "<group>"; };
331+
213C5A6712EB8E95006F0CAE /* GTTopBlackGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTTopBlackGradientView.m; sourceTree = "<group>"; };
332+
213C5A6912EB8EB3006F0CAE /* GTGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTGradientView.h; sourceTree = "<group>"; };
333+
213C5A6A12EB8EC5006F0CAE /* GTGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTGradientView.m; sourceTree = "<group>"; };
334+
213C5AC112EB91F5006F0CAE /* GTSheetWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTSheetWindow.m; sourceTree = "<group>"; };
335+
213C5AC212EB91F5006F0CAE /* GTWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTWindow.h; sourceTree = "<group>"; };
336+
213C5AC312EB91F5006F0CAE /* GTWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTWindow.m; sourceTree = "<group>"; };
337+
213C5AC412EB91F5006F0CAE /* GTSheetWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTSheetWindow.h; sourceTree = "<group>"; };
325338
217FF0B312A1CB3300785A65 /* PBStashController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBStashController.m; sourceTree = SOURCE_ROOT; };
326339
217FF0B412A1CB3300785A65 /* PBStashController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBStashController.h; sourceTree = SOURCE_ROOT; };
327340
217FF0B512A1CB3300785A65 /* PBSubmoduleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBSubmoduleController.m; sourceTree = "<group>"; };
@@ -347,7 +360,6 @@
347360
31460CAF124185BA00B90AED /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
348361
31460CB0124185BA00B90AED /* Source Code License.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "Source Code License.rtf"; sourceTree = "<group>"; };
349362
31460CB1124185BA00B90AED /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
350-
31DAA7EC1317737100463846 /* gitx_l_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gitx_l_pub.pem; sourceTree = "<group>"; };
351363
32CA4F630368D1EE00C91783 /* GitX_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitX_Prefix.pch; sourceTree = "<group>"; };
352364
3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HistoryViewTemplate.png; path = Images/HistoryViewTemplate.png; sourceTree = "<group>"; };
353365
3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CommitViewTemplate.png; path = Images/CommitViewTemplate.png; sourceTree = "<group>"; };
@@ -380,8 +392,6 @@
380392
93F7857D0EA3ABF100C1F443 /* PBCommitMessageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCommitMessageView.h; sourceTree = "<group>"; };
381393
93F7857E0EA3ABF100C1F443 /* PBCommitMessageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBCommitMessageView.m; sourceTree = "<group>"; };
382394
93FCCBA80EA8AF450061B02B /* PBGitConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitConfig.m; sourceTree = "<group>"; };
383-
C3B13DD712F3A89D0045437C /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = System/Library/Frameworks/SecurityFoundation.framework; sourceTree = SDKROOT; };
384-
C3B13DE312F3A8D70045437C /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
385395
D26DC6440E782C9000C777B2 /* gitx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = gitx.icns; sourceTree = "<group>"; };
386396
D8022A3411DFCCA5003C21F6 /* build_libgit2.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build_libgit2.sh; sourceTree = "<group>"; };
387397
D8022FE711E124A0003C21F6 /* PBGitXMessageSheet.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PBGitXMessageSheet.xib; sourceTree = "<group>"; };
@@ -580,7 +590,6 @@
580590
isa = PBXFrameworksBuildPhase;
581591
buildActionMask = 2147483647;
582592
files = (
583-
C3B13E2312F3A9130045437C /* Security.framework in Frameworks */,
584593
);
585594
runOnlyForDeploymentPostprocessing = 0;
586595
};
@@ -596,8 +605,6 @@
596605
F5C580E50EDA250900995434 /* libgit2.a in Frameworks */,
597606
D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */,
598607
D87127011229A21C00012334 /* QuartzCore.framework in Frameworks */,
599-
C3B13DD812F3A89D0045437C /* SecurityFoundation.framework in Frameworks */,
600-
C3B13DE412F3A8D70045437C /* Security.framework in Frameworks */,
601608
);
602609
runOnlyForDeploymentPostprocessing = 0;
603610
};
@@ -711,6 +718,8 @@
711718
21230ED41285ED760046E5A1 /* View */ = {
712719
isa = PBXGroup;
713720
children = (
721+
213C5AC012EB91F5006F0CAE /* Window */,
722+
213C5A5D12EB8E72006F0CAE /* Gradient */,
714723
21230ED71285EDAF0046E5A1 /* PBArgumentPicker.h */,
715724
21230ED81285EDAF0046E5A1 /* PBArgumentPicker.m */,
716725
21CF0B22129C7ED90065B37C /* TrackableOutlineView.h */,
@@ -749,6 +758,28 @@
749758
path = "File Markers";
750759
sourceTree = "<group>";
751760
};
761+
213C5A5D12EB8E72006F0CAE /* Gradient */ = {
762+
isa = PBXGroup;
763+
children = (
764+
213C5A6612EB8E95006F0CAE /* GTTopBlackGradientView.h */,
765+
213C5A6712EB8E95006F0CAE /* GTTopBlackGradientView.m */,
766+
213C5A6912EB8EB3006F0CAE /* GTGradientView.h */,
767+
213C5A6A12EB8EC5006F0CAE /* GTGradientView.m */,
768+
);
769+
path = Gradient;
770+
sourceTree = "<group>";
771+
};
772+
213C5AC012EB91F5006F0CAE /* Window */ = {
773+
isa = PBXGroup;
774+
children = (
775+
213C5AC412EB91F5006F0CAE /* GTSheetWindow.h */,
776+
213C5AC112EB91F5006F0CAE /* GTSheetWindow.m */,
777+
213C5AC212EB91F5006F0CAE /* GTWindow.h */,
778+
213C5AC312EB91F5006F0CAE /* GTWindow.m */,
779+
);
780+
path = Window;
781+
sourceTree = "<group>";
782+
};
752783
29B97314FDCFA39411CA2CEA /* GitTest */ = {
753784
isa = PBXGroup;
754785
children = (
@@ -769,7 +800,6 @@
769800
F5886A120ED5D33D0066E74C /* SpeedTest-Info.plist */,
770801
F567CC3A106E6B910059BB9D /* GitXTesting-Info.plist */,
771802
D89E9AB21218A9DA0097A90B /* ScriptingBridge.framework */,
772-
C3B13DD712F3A89D0045437C /* SecurityFoundation.framework */,
773803
);
774804
name = GitTest;
775805
sourceTree = "<group>";
@@ -817,7 +847,6 @@
817847
21025C1112947AB200D87200 /* sourceListActionOver.png */,
818848
02B41A5F123E307F00DFC531 /* PBCommitHookFailedSheet.xib */,
819849
F5F7D0641062E7940072C81C /* UpdateKey.pem */,
820-
31DAA7EC1317737100463846 /* gitx_l_pub.pem */,
821850
F50A41130EBB872D00208746 /* Widgets */,
822851
47DBDB920E94F47200671A1E /* Preference Icons */,
823852
D26DC6440E782C9000C777B2 /* gitx.icns */,
@@ -840,6 +869,7 @@
840869
21230ED11285EB5A0046E5A1 /* PBArgumentPicker.xib */,
841870
F58DB55F10566E3900CFDF4A /* PBGitSidebarView.xib */,
842871
D8022FE711E124A0003C21F6 /* PBGitXMessageSheet.xib */,
872+
213C598C12EB8BEB006F0CAE /* PBResetSheet.xib */,
843873
);
844874
name = Resources;
845875
sourceTree = "<group>";
@@ -850,7 +880,6 @@
850880
F5C580E40EDA250900995434 /* libgit2.a */,
851881
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
852882
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
853-
C3B13DE312F3A8D70045437C /* Security.framework */,
854883
);
855884
name = Frameworks;
856885
sourceTree = "<group>";
@@ -931,6 +960,8 @@
931960
D8083E02111FA33700337480 /* PBCloneRepositoryPanel.m */,
932961
D8022FEB11E124C8003C21F6 /* PBGitXMessageSheet.h */,
933962
D8022FEC11E124C8003C21F6 /* PBGitXMessageSheet.m */,
963+
213C598E12EB8BFC006F0CAE /* PBResetSheet.h */,
964+
213C598F12EB8BFC006F0CAE /* PBResetSheet.m */,
934965
);
935966
name = Sheets;
936967
sourceTree = "<group>";
@@ -1338,6 +1369,7 @@
13381369
isa = PBXProject;
13391370
buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */;
13401371
compatibilityVersion = "Xcode 3.1";
1372+
developmentRegion = English;
13411373
hasScannedForEncodings = 1;
13421374
knownRegions = (
13431375
English,
@@ -1427,7 +1459,7 @@
14271459
212A49AB12A31328009DAFAD /* deleted_file.png in Resources */,
14281460
212A49AD12A31350009DAFAD /* ignored_file.png in Resources */,
14291461
212A49AF12A3135C009DAFAD /* modified_file.png in Resources */,
1430-
31DAA7ED1317737100463846 /* gitx_l_pub.pem in Resources */,
1462+
213C598D12EB8BEB006F0CAE /* PBResetSheet.xib in Resources */,
14311463
);
14321464
runOnlyForDeploymentPostprocessing = 0;
14331465
};
@@ -1597,6 +1629,11 @@
15971629
217FF0BA12A1CB3300785A65 /* PBSubmoduleController.m in Sources */,
15981630
217FF0BB12A1CB3300785A65 /* PBGitResetController.m in Sources */,
15991631
217FF0BE12A1CB3E00785A65 /* PBRevealWithFinderCommand.m in Sources */,
1632+
213C599012EB8BFC006F0CAE /* PBResetSheet.m in Sources */,
1633+
213C5A6812EB8E95006F0CAE /* GTTopBlackGradientView.m in Sources */,
1634+
213C5A6B12EB8EC5006F0CAE /* GTGradientView.m in Sources */,
1635+
213C5AC512EB91F5006F0CAE /* GTSheetWindow.m in Sources */,
1636+
213C5AC612EB91F5006F0CAE /* GTWindow.m in Sources */,
16001637
);
16011638
runOnlyForDeploymentPostprocessing = 0;
16021639
};
@@ -1818,12 +1855,10 @@
18181855
GCC_ENABLE_OBJC_GC = required;
18191856
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
18201857
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = DEBUG_BUILD;
1821-
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
18221858
GCC_WARN_ABOUT_RETURN_TYPE = YES;
18231859
GCC_WARN_UNUSED_VARIABLE = YES;
18241860
INFOPLIST_PREPROCESS = YES;
18251861
PREBINDING = NO;
1826-
RUN_CLANG_STATIC_ANALYZER = YES;
18271862
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
18281863
};
18291864
name = Debug;
@@ -1837,13 +1872,11 @@
18371872
x86_64,
18381873
);
18391874
GCC_ENABLE_OBJC_GC = required;
1840-
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
18411875
GCC_WARN_ABOUT_RETURN_TYPE = YES;
18421876
GCC_WARN_UNUSED_VARIABLE = YES;
18431877
INFOPLIST_PREFIX_HEADER = $PROJECT_TEMP_DIR/revision;
18441878
INFOPLIST_PREPROCESS = YES;
18451879
PREBINDING = NO;
1846-
RUN_CLANG_STATIC_ANALYZER = YES;
18471880
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
18481881
};
18491882
name = Release;

0 commit comments

Comments
 (0)