Skip to content

Commit 33e21e2

Browse files
Added new icons for file status. When untracked file is
added to index than it has added file icon.
1 parent cb59e86 commit 33e21e2

11 files changed

+58
-11
lines changed

File Markers/added_file.png

397 Bytes
Loading

File Markers/conflicted_file.png

387 Bytes
Loading

File Markers/deleted_file.png

397 Bytes
Loading

File Markers/ignored_file.png

286 Bytes
Loading

File Markers/modified_file.png

425 Bytes
Loading

File Markers/renamed_file.png

419 Bytes
Loading

File Markers/unversioned_file.png

392 Bytes
Loading

GitX.xcodeproj/project.pbxproj

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@
4242
21231220128735E90046E5A1 /* submodule-empty.png in Resources */ = {isa = PBXBuildFile; fileRef = 2123121D128735E90046E5A1 /* submodule-empty.png */; };
4343
2123138A128756ED0046E5A1 /* PBRemoteCommandFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 21231389128756ED0046E5A1 /* PBRemoteCommandFactory.m */; };
4444
212313B5128759C00046E5A1 /* PBOpenDocumentCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 212313B4128759C00046E5A1 /* PBOpenDocumentCommand.m */; };
45+
212A49A312A31292009DAFAD /* renamed_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49A212A31292009DAFAD /* renamed_file.png */; };
46+
212A49A512A312B2009DAFAD /* unversioned_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49A412A312B2009DAFAD /* unversioned_file.png */; };
47+
212A49A712A312BE009DAFAD /* added_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49A612A312BE009DAFAD /* added_file.png */; };
48+
212A49AA12A31328009DAFAD /* conflicted_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49A812A31328009DAFAD /* conflicted_file.png */; };
49+
212A49AB12A31328009DAFAD /* deleted_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49A912A31328009DAFAD /* deleted_file.png */; };
50+
212A49AD12A31350009DAFAD /* ignored_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49AC12A31350009DAFAD /* ignored_file.png */; };
51+
212A49AF12A3135C009DAFAD /* modified_file.png in Resources */ = {isa = PBXBuildFile; fileRef = 212A49AE12A3135C009DAFAD /* modified_file.png */; };
4552
217FF0B912A1CB3300785A65 /* PBStashController.m in Sources */ = {isa = PBXBuildFile; fileRef = 217FF0B312A1CB3300785A65 /* PBStashController.m */; };
4653
217FF0BA12A1CB3300785A65 /* PBSubmoduleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 217FF0B512A1CB3300785A65 /* PBSubmoduleController.m */; };
4754
217FF0BB12A1CB3300785A65 /* PBGitResetController.m in Sources */ = {isa = PBXBuildFile; fileRef = 217FF0B712A1CB3300785A65 /* PBGitResetController.m */; };
@@ -160,7 +167,6 @@
160167
F56ADDD90ED19F9E002AC78F /* AddBranchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = F56ADDD70ED19F9E002AC78F /* AddBranchTemplate.png */; };
161168
F56ADDDA0ED19F9E002AC78F /* AddLabelTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = F56ADDD80ED19F9E002AC78F /* AddLabelTemplate.png */; };
162169
F56CC7320E65E0E5004307B4 /* PBGraphCellInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F56CC7310E65E0E5004307B4 /* PBGraphCellInfo.m */; };
163-
F57240BB0E9678EA00D8EE66 /* deleted_file.png in Resources */ = {isa = PBXBuildFile; fileRef = F57240BA0E9678EA00D8EE66 /* deleted_file.png */; };
164170
F574A2850EAE2EAC003F2CB1 /* PBRefController.m in Sources */ = {isa = PBXBuildFile; fileRef = F574A2840EAE2EAC003F2CB1 /* PBRefController.m */; };
165171
F574A2910EAE2FF4003F2CB1 /* PBGitConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 93FCCBA80EA8AF450061B02B /* PBGitConfig.m */; };
166172
F57CC3910E05DDF2000472E2 /* PBEasyPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */; };
@@ -276,7 +282,6 @@
276282
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
277283
21025C1012947AB200D87200 /* sourceListAction.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sourceListAction.png; sourceTree = "<group>"; };
278284
21025C1112947AB200D87200 /* sourceListActionOver.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sourceListActionOver.png; sourceTree = "<group>"; };
279-
21025CA6129487C200D87200 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; };
280285
21230CAF1284B26A0046E5A1 /* PBGitMenuItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitMenuItem.h; sourceTree = "<group>"; };
281286
21230CB01284B26A0046E5A1 /* PBGitMenuItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitMenuItem.m; sourceTree = "<group>"; };
282287
21230D331284C5080046E5A1 /* PBGitStash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitStash.h; sourceTree = "<group>"; };
@@ -306,6 +311,13 @@
306311
21231389128756ED0046E5A1 /* PBRemoteCommandFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBRemoteCommandFactory.m; sourceTree = "<group>"; };
307312
212313B3128759C00046E5A1 /* PBOpenDocumentCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBOpenDocumentCommand.h; sourceTree = "<group>"; };
308313
212313B4128759C00046E5A1 /* PBOpenDocumentCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBOpenDocumentCommand.m; sourceTree = "<group>"; };
314+
212A49A212A31292009DAFAD /* renamed_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = renamed_file.png; sourceTree = "<group>"; };
315+
212A49A412A312B2009DAFAD /* unversioned_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unversioned_file.png; sourceTree = "<group>"; };
316+
212A49A612A312BE009DAFAD /* added_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = added_file.png; sourceTree = "<group>"; };
317+
212A49A812A31328009DAFAD /* conflicted_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = conflicted_file.png; sourceTree = "<group>"; };
318+
212A49A912A31328009DAFAD /* deleted_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = deleted_file.png; sourceTree = "<group>"; };
319+
212A49AC12A31350009DAFAD /* ignored_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ignored_file.png; sourceTree = "<group>"; };
320+
212A49AE12A3135C009DAFAD /* modified_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = modified_file.png; sourceTree = "<group>"; };
309321
217FF0B312A1CB3300785A65 /* PBStashController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBStashController.m; sourceTree = SOURCE_ROOT; };
310322
217FF0B412A1CB3300785A65 /* PBStashController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBStashController.h; sourceTree = SOURCE_ROOT; };
311323
217FF0B512A1CB3300785A65 /* PBSubmoduleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBSubmoduleController.m; sourceTree = "<group>"; };
@@ -689,7 +701,6 @@
689701
21230ED41285ED760046E5A1 /* View */ = {
690702
isa = PBXGroup;
691703
children = (
692-
21025CA6129487C200D87200 /* defs.h */,
693704
21230ED71285EDAF0046E5A1 /* PBArgumentPicker.h */,
694705
21230ED81285EDAF0046E5A1 /* PBArgumentPicker.m */,
695706
21CF0B22129C7ED90065B37C /* TrackableOutlineView.h */,
@@ -714,6 +725,20 @@
714725
path = Controller;
715726
sourceTree = "<group>";
716727
};
728+
212A499412A3121D009DAFAD /* File Markers */ = {
729+
isa = PBXGroup;
730+
children = (
731+
212A49A812A31328009DAFAD /* conflicted_file.png */,
732+
212A49A912A31328009DAFAD /* deleted_file.png */,
733+
212A49A612A312BE009DAFAD /* added_file.png */,
734+
212A49A412A312B2009DAFAD /* unversioned_file.png */,
735+
212A49A212A31292009DAFAD /* renamed_file.png */,
736+
212A49AC12A31350009DAFAD /* ignored_file.png */,
737+
212A49AE12A3135C009DAFAD /* modified_file.png */,
738+
);
739+
path = "File Markers";
740+
sourceTree = "<group>";
741+
};
717742
29B97314FDCFA39411CA2CEA /* GitTest */ = {
718743
isa = PBXGroup;
719744
children = (
@@ -741,6 +766,7 @@
741766
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
742767
isa = PBXGroup;
743768
children = (
769+
212A499412A3121D009DAFAD /* File Markers */,
744770
2123121B128735E90046E5A1 /* submodule-notmatching-index.png */,
745771
2123121C128735E90046E5A1 /* submodule-matching-index.png */,
746772
2123121D128735E90046E5A1 /* submodule-empty.png */,
@@ -1337,7 +1363,6 @@
13371363
F52BCE030E84208300AA3741 /* PBGitHistoryView.xib in Resources */,
13381364
F59116E60E843BB50072CCB1 /* PBGitCommitView.xib in Resources */,
13391365
F5E92A230E88569500056E75 /* new_file.png in Resources */,
1340-
F57240BB0E9678EA00D8EE66 /* deleted_file.png in Resources */,
13411366
F5E424110EA3E4D60046E362 /* PBDiffWindow.xib in Resources */,
13421367
F50A411F0EBB874C00208746 /* mainSplitterBar.tiff in Resources */,
13431368
F50A41200EBB874C00208746 /* mainSplitterDimple.tiff in Resources */,
@@ -1383,6 +1408,13 @@
13831408
21231220128735E90046E5A1 /* submodule-empty.png in Resources */,
13841409
21025C1212947AB200D87200 /* sourceListAction.png in Resources */,
13851410
21025C1312947AB200D87200 /* sourceListActionOver.png in Resources */,
1411+
212A49A312A31292009DAFAD /* renamed_file.png in Resources */,
1412+
212A49A512A312B2009DAFAD /* unversioned_file.png in Resources */,
1413+
212A49A712A312BE009DAFAD /* added_file.png in Resources */,
1414+
212A49AA12A31328009DAFAD /* conflicted_file.png in Resources */,
1415+
212A49AB12A31328009DAFAD /* deleted_file.png in Resources */,
1416+
212A49AD12A31350009DAFAD /* ignored_file.png in Resources */,
1417+
212A49AF12A3135C009DAFAD /* modified_file.png in Resources */,
13861418
);
13871419
runOnlyForDeploymentPostprocessing = 0;
13881420
};

PBChangedFile.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
typedef enum {
1313
NEW,
1414
MODIFIED,
15-
DELETED
15+
DELETED,
16+
ADDED
1617
} PBChangedFileStatus;
1718

1819
@interface PBChangedFile : NSObject {
@@ -35,5 +36,6 @@ typedef enum {
3536
- (NSImage *)icon;
3637
- (NSString *)indexInfo;
3738

39+
+ (NSImage *) iconForStatus:(PBChangedFileStatus) aStatus;
3840
- (id) initWithPath:(NSString *)p;
3941
@end

PBChangedFile.m

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,31 @@ - (NSString *)indexInfo
3131
return [NSString stringWithFormat:@"%@ %@\t%@\0", self.commitBlobMode, self.commitBlobSHA, self.path];
3232
}
3333

34-
- (NSImage *) icon
35-
{
34+
+ (NSImage *) iconForStatus:(PBChangedFileStatus) aStatus {
3635
NSString *filename;
37-
switch (status) {
36+
switch (aStatus) {
3837
case NEW:
39-
filename = @"new_file";
38+
filename = @"unversioned_file";
4039
break;
4140
case DELETED:
4241
filename = @"deleted_file";
4342
break;
43+
case ADDED:
44+
filename = @"added_file";
45+
break;
4446
default:
45-
filename = @"empty_file";
47+
filename = @"modified_file";
4648
break;
4749
}
4850
NSString *p = [[NSBundle mainBundle] pathForResource:filename ofType:@"png"];
4951
return [[NSImage alloc] initByReferencingFile: p];
5052
}
5153

54+
- (NSImage *) icon
55+
{
56+
return [PBChangedFile iconForStatus:status];
57+
}
58+
5259
+ (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
5360
{
5461
return NO;

0 commit comments

Comments
 (0)