kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a string truncation category because on a very large commit the showMessage sheet just exploded out of my monitor.

Browse Source
This commit is contained in:
André Berg
2010-03-24 16:29:27 +01:00
parent a3ede54889
commit 95e050398b
5 changed files with 119 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitX.xcodeproj/project.pbxproj
+9 -1
View File
@@ -32,6 +32,7 @@
551BF176112F3F4B00265053 /* gitx_askpasswd in Resources */ = {isa = PBXBuildFile; fileRef = 551BF111112F371800265053 /* gitx_askpasswd */; };
653D930A109BEAFE00B26705 /* PBGitXErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = 653D9309109BEAFE00B26705 /* PBGitXErrors.m */; };
654D16E8108C6CA6008D960C /* PBQLOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = F513085A0E0740F2000C8BCD /* PBQLOutlineView.m */; };
654FEFA0115A2684004C8721 /* NSString_Truncate.m in Sources */ = {isa = PBXBuildFile; fileRef = 654FEF9F115A2684004C8721 /* NSString_Truncate.m */; };
6552BA27109C4CA8003B4892 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47DBDB690E94EF6500671A1E /* Preferences.xib */; };
65C77FA0108BF560003BD3B5 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65C77F9F108BF560003BD3B5 /* Quartz.framework */; };
65F3544011599F3100235D5B /* AddRemoteBranchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 65A102F110A7D9FE0033C593 /* AddRemoteBranchTemplate.png */; };
@@ -247,6 +248,8 @@
654D17E7108C90E8008D960C /* html */ = {isa = PBXFileReference; lastKnownFileType = folder; path = html; sourceTree = "<group>"; };
654D18EF108C9597008D960C /* Install.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Install.xcconfig; sourceTree = "<group>"; };
654D18F6108C96CB008D960C /* install.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = install.sh; sourceTree = "<group>"; };
654FEF9F115A2684004C8721 /* NSString_Truncate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSString_Truncate.m; sourceTree = "<group>"; };
654FEFAF115A2747004C8721 /* NSString_Truncate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSString_Truncate.h; sourceTree = "<group>"; };
65A102F110A7D9FE0033C593 /* AddRemoteBranchTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AddRemoteBranchTemplate.png; path = Images/AddRemoteBranchTemplate.png; sourceTree = "<group>"; };
65C77F9F108BF560003BD3B5 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = GitTest_DataModel.xcdatamodel; sourceTree = "<group>"; };
@@ -791,6 +794,8 @@
F56524BA0E02D22D00F03B52 /* NSFileHandleExt.h */,
F562C8850FE1766C000EC528 /* NSString_RegEx.h */,
F562C8860FE1766C000EC528 /* NSString_RegEx.m */,
654FEFAF115A2747004C8721 /* NSString_Truncate.h */,
654FEF9F115A2684004C8721 /* NSString_Truncate.m */,
F57CC38F0E05DDF2000472E2 /* PBEasyPipe.h */,
F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */,
F5DFFA6A0E075D8800617813 /* PBEasyFS.h */,
@@ -1292,6 +1297,7 @@
D8295D2A1130A1DC00C838E8 /* PBGitHistoryList.m in Sources */,
D8295DE01130E43900C838E8 /* PBGitHistoryGrapher.m in Sources */,
D8E105471157C18200FC28A4 /* PBQLTextView.m in Sources */,
654FEFA0115A2684004C8721 /* NSString_Truncate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1632,11 +1638,13 @@
"$(inherited)",
"\"$(SRCROOT)\"",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = GitX_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
HEADER_SEARCH_PATHS = libgit2/src;
INFOPLIST_FILE = Info.plist;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
NSString_Truncate.h
+32
View File
@@ -0,0 +1,32 @@
//
// NSString_Truncate.h
// GitX
//
// Created by Andre Berg on 24.03.10.
// Copyright 2010 Berg Media. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#import <Cocoa/Cocoa.h>
typedef enum {
PBNSStringTruncateModeCenter = 0,
PBNSStringTruncateModeStart = 1,
PBNSStringTruncateModeEnd = 2
} PBNSStringTruncateMode;
@interface NSString (PBGitXTruncateExtensions)
- (NSString *) truncateToLength:(NSUInteger)length mode:(PBNSStringTruncateMode)mode indicator:(NSString *)indicatorString;
@end
NSString_Truncate.m
+69
View File
@@ -0,0 +1,69 @@
//
// NSString_Truncate.m
// GitX
//
// Created by Andre Berg on 24.03.10.
// Copyright 2010 Berg Media. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#import "NSString_Truncate.h"
@implementation NSString (PBGitXTruncateExtensions)
- (NSString *) truncateToLength:(NSUInteger)targetLength mode:(PBNSStringTruncateMode)mode indicator:(NSString *)indicatorString {
NSString * res = nil;
NSString * firstPart;
NSString * lastPart;
if (!indicatorString) {
indicatorString = @"...";
}
NSUInteger stringLength = [self length];
NSUInteger ilength = [indicatorString length];
if (stringLength <= targetLength) {
return self;
} else if (stringLength <= 0 || (!self)) {
return nil;
} else {
switch (mode) {
case PBNSStringTruncateModeCenter:
firstPart = [self substringToIndex:(targetLength/2)];
lastPart = [self substringFromIndex:(stringLength-((targetLength/2))+ilength)];
res = [NSString stringWithFormat:@"%@%@%@", firstPart, indicatorString, lastPart];
break;
case PBNSStringTruncateModeStart:
res = [NSString stringWithFormat:@"%@%@", indicatorString, [self substringFromIndex:((stringLength-targetLength)+ilength)]];
break;
case PBNSStringTruncateModeEnd:
res = [NSString stringWithFormat:@"%@%@", [self substringToIndex:(targetLength-ilength)], indicatorString];
break;
default:
;
NSException * myException = [NSException exceptionWithName:NSInvalidArgumentException
reason:[NSString stringWithFormat:
@"[%@ %s] called with nonsensical value for 'mode' (mode = %d) ***",
[self class], _cmd, mode]
userInfo:nil];
@throw myException;
return res;
break;
};
}
return res;
}
@end
PBGitWindowController.m
+6
View File
@@ -13,6 +13,9 @@
#import "Terminal.h"
#import "PBCloneRepsitoryToSheet.h"
#import "PBGitSidebarController.h"
#import "NSString_Truncate.h"
#define SHEET_INFOTEXT_CHAR_LIMIT 2000 // character size limit for the message sheet's info text
@implementation PBGitWindowController
@@ -108,6 +111,9 @@
- (void)showMessageSheet:(NSString *)messageText infoText:(NSString *)infoText
{
if ([infoText length] > SHEET_INFOTEXT_CHAR_LIMIT) {
infoText = [infoText truncateToLength:SHEET_INFOTEXT_CHAR_LIMIT mode:PBNSStringTruncateModeCenter indicator:@" ... "];
}
[[NSAlert alertWithMessageText:messageText
defaultButton:nil
alternateButton:nil
PBRemoteProgressSheet.m
+3 -3
View File
@@ -24,7 +24,7 @@ NSString * const kGitXProgressErrorInfo = @"PBGitXProgressErrorInfo";
@interface PBRemoteProgressSheet ()
- (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(PBGitWindowController *)controller;
- (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDirectory:(NSString *)dir windowController:(PBGitWindowController *)controller;
- (void) showSuccessMessage;
- (void) showErrorMessage;
@@ -55,7 +55,7 @@ NSString * const kGitXProgressErrorInfo = @"PBGitXProgressErrorInfo";
+ (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(PBGitWindowController *)windowController
{
PBRemoteProgressSheet *sheet = [[self alloc] initWithWindowNibName:@"PBRemoteProgressSheet"];
[sheet beginRemoteProgressSheetForArguments:args title:theTitle description:theDescription inDir:dir windowController:windowController];
[sheet beginRemoteProgressSheetForArguments:args title:theTitle description:theDescription inDirectory:dir windowController:windowController];
}
@@ -65,7 +65,7 @@ NSString * const kGitXProgressErrorInfo = @"PBGitXProgressErrorInfo";
}
- (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(PBGitWindowController *)windowController
- (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDirectory:(NSString *)dir windowController:(PBGitWindowController *)windowController
{
controller = windowController;
arguments = args;