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

Improve error and tooltip descriptions.

Browse Source
This commit is contained in:
André Berg
2009-11-07 04:16:36 +01:00
committed by André Berg
parent 4c4203a7ce
commit f1fcb18a92
4 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBGitHistoryView.xib
+21 -17
View File
@@ -21,9 +21,9 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="354"/>
<integer value="236"/>
<integer value="4"/>
<integer value="354"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -611,7 +611,7 @@
<object class="NSTextView" id="75600241">
<reference key="NSNextResponder" ref="321980917"/>
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{610, 0}</string>
<string key="NSFrameSize">{610, 98}</string>
<reference key="NSSuperview" ref="321980917"/>
<object class="NSTextContainer" key="NSTextContainer" id="480935218">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -1397,10 +1397,10 @@
</object>
<string key="NSToolbarItemLabel">Push</string>
<string key="NSToolbarItemPaletteLabel">Push</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdXNoIDxyZW1vdGUgb3JpZ2luPjxsb2NhbCBicmFuY2g+JwoKPHJlbW90ZSBvcmlnaW4+IGlz
IHRoZSBkZWZhdWx0IHJlbW90ZSBjb25maWd1cmVkIGZvciB0aGUgY3VycmVudGx5IHNlbGVjdGVkIGJy
YW5jaCBmcm9tIHRoZSBicmFuY2ggcG9wdXAgbWVudS4gCgpOb3RlOiB0aGUgYnJhbmNoIGhhcyB0byBi
ZSBzcGVjaWZpYy4gCidBbGwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdXNoIDxyZW1vdGU+PGxvY2FsIGJyYW5jaD4nCgo8cmVtb3RlPiBpcyB0aGUgZGVmYXVsdCBy
ZW1vdGUgY29uZmlndXJlZCBmb3IgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBicmFuY2ggZnJvbSB0aGUg
YnJhbmNoIHBvcHVwIG1lbnUuIAoKTm90ZTogdGhlIGJyYW5jaCBoYXMgdG8gYmUgc3BlY2lmaWMuIAon
QWxsIGJyYW5jaGVzJyBvciAnTG9jYWwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
<object class="NSButton" key="NSToolbarItemView" id="1070051133">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
@@ -1442,11 +1442,11 @@ ZSBzcGVjaWZpYy4gCidBbGwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
</object>
<string key="NSToolbarItemLabel">Pull</string>
<string key="NSToolbarItemPaletteLabel">Pull</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdWxsIDxyZW1vdGUgb3JpZ2luPjxsb2NhbCBicmFuY2g+JwoKPHJlbW90ZSBvcmlnaW4+IGlz
IHRoZSBkZWZhdWx0IHJlbW90ZSBjb25maWd1cmVkIGZvciA8bG9jYWwgYnJhbmNoPi4KPGxvY2FsIGJy
YW5jaD4gaXMgdGhlIHNlbGVjdGVkIGJyYW5jaCBmcm9tIHRoZSBicmFuY2ggcG9wdXAgbWVudS4gCgpO
b3RlOiB0aGUgYnJhbmNoIGhhcyB0byBiZSBzcGVjaWZpYy4gCidBbGwgYnJhbmNoZXMnIHdpbGwgbm90
IHdvcmsuA</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdWxsIDxyZW1vdGU+PGxvY2FsIGJyYW5jaD4nCgo8cmVtb3RlPiBpcyB0aGUgZGVmYXVsdCBy
ZW1vdGUgY29uZmlndXJlZCBmb3IgPGxvY2FsIGJyYW5jaD4KPGxvY2FsIGJyYW5jaD4gaXMgdGhlIHNl
bGVjdGVkIGJyYW5jaCBmcm9tIHRoZSBicmFuY2ggcG9wdXAgbWVudQoKTm90ZTogdGhlIGJyYW5jaCBo
YXMgdG8gYmUgc3BlY2lmaWMuIAonQWxsIGJyYW5jaGVzJyBvciAnTG9jYWwgYnJhbmNoZXMnIHdpbGwg
bm90IHdvcms</string>
<object class="NSButton" key="NSToolbarItemView" id="665398151">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
@@ -1488,11 +1488,15 @@ IHdvcmsuA</string>
</object>
<string key="NSToolbarItemLabel">Rebase</string>
<string key="NSToolbarItemPaletteLabel">Rebase</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdWxsIDxyZW1vdGUgb3JpZ2luPiAtLXJlYmFzZScKCkluc3RlYWQgb2YgYSBtZXJnZSwgcGVy
Zm9ybSBhIHJlYmFzZSBhZnRlciBmZXRjaGluZy4gCgpJZiB0aGVyZSBpcyBhIHJlbW90ZSByZWYgZm9y
IHRoZSB1cHN0cmVhbSBicmFuY2gsIGFuZCB0aGlzIGJyYW5jaCB3YXMgcmViYXNlZCBzaW5jZSBsYXN0
IGZldGNoZWQsIHRoZSByZWJhc2UgdXNlcyB0aGF0IGluZm9ybWF0aW9uIHRvIGF2b2lkIHJlYmFzaW5n
IG5vbi1sb2NhbCBjaGFuZ2VzLiA</string>
<string type="base64-UTF8" key="NSToolbarItemToolTip">J2dpdCBwdWxsIC0tcmViYXNlIDxyZW1vdGU+IDxyZW1vdGUgYnJhbmNoPicKCkluc3RlYWQgb2YgYSBt
ZXJnZSwgcGVyZm9ybSBhIHJlYmFzZSBhZnRlciBmZXRjaGluZwoKPHJlbW90ZT4gd2lsbCBiZSB0aGUg
ZGVmYXVsdCByZW1vdGUgY29uZmlndXJlZCBmb3IgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBicmFuY2gg
aW4gdGhlIGJyYW5jaCBwb3B1cCBtZW51LiAKCjxyZW1vdGUgYnJhbmNoPiB3aWxsIGJlIHRoZSByZW1v
dGUgSEVBRAoKSWYgdGhlcmUgaXMgYSByZW1vdGUgcmVmIGZvciB0aGUgdXBzdHJlYW0gYnJhbmNoLCBh
bmQgdGhpcyBicmFuY2ggd2FzIHJlYmFzZWQgc2luY2UgbGFzdCBmZXRjaGVkLCB0aGUgcmViYXNlIHVz
ZXMgdGhhdCBpbmZvcm1hdGlvbiB0byBhdm9pZCByZWJhc2luZyBub24tbG9jYWwgY2hhbmdlcwoKTm90
ZTogdGhlIGxvY2FsIGJyYW5jaCBoYXMgdG8gYmUgc3BlY2lmaWMuIAonQWxsIGJyYW5jaGVzJyBvciAn
TG9jYWwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
<object class="NSButton" key="NSToolbarItemView" id="166309462">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
@@ -1592,8 +1596,8 @@ IG5vbi1sb2NhbCBjaGFuZ2VzLiA</string>
<reference ref="773751720"/>
<reference ref="348901587"/>
<reference ref="520297562"/>
<reference ref="412717087"/>
<reference ref="425122427"/>
<reference ref="412717087"/>
<reference ref="1033703265"/>
<reference ref="587605996"/>
</object>
PBGitXErrors.h
+2 -2
View File
@@ -22,8 +22,8 @@
OBJC_EXTERN NSString * const PBGitXErrorDomain;
OBJC_EXTERN NSString * const PBCLIProxyErrorDomain;
OBJC_EXTERN NSString * const PBInvalidBranchErrMsg;
OBJC_EXTERN NSString * const PBMissingRemoteErrMsg;
OBJC_EXTERN NSString * const PBInvalidBranchErrorMessage;
OBJC_EXTERN NSString * const PBMissingRemoteErrorMessage;
OBJC_EXTERN const NSInteger PBFileReadingUnsupportedErrorCode; /* @"Reading files is not supported." */
OBJC_EXTERN const NSInteger PBNotAGitRepositoryErrorCode; /* @"%@ does not appear to be a git repository." */
PBGitXErrors.m
+5 -5
View File
@@ -19,13 +19,13 @@
#import "PBGitXErrors.h"
NSString * const PBGitXErrorDomain = @"GitXErrorDomain";
NSString * const PBCLIProxyErrorDomain = @"CLIProxyErrorDomain";
NSString * const PBGitXErrorDomain = @"PBGitXErrorDomain";
NSString * const PBCLIProxyErrorDomain = @"PBCLIProxyErrorDomain";
NSString * const PBInvalidBranchErrMsg = @"Please select a local branch from the branch popup menu, which has a corresponding remote tracking branch set up.\n\n"
@"You can also use the context menu to choose a branch by right clicking on its label in the history view.";
NSString * const PBInvalidBranchErrorMessage = @"Please select a local branch from the branch popup menu, which has a corresponding remote tracking branch set up.\n\n"
@"You can also use the context menu to choose a branch by right clicking on its label in the history view.";
NSString * const PBMissingRemoteErrMsg = @"This branch does not appear to have a remote tracking branch associated in its config file section.";
NSString * const PBMissingRemoteErrorMessage = @"This branch does not appear to have a remote tracking branch associated in its config file section.";
const NSInteger PBNotAGitRepositoryErrorCode = 1;
const NSInteger PBFileReadingUnsupportedErrorCode = 2;
PBRefController.m
+7 -7
View File
@@ -108,7 +108,7 @@
NSString *remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", refName]];
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"push", remote, refName, nil] retValue: &ret];
if (!remote) {
[self showMessageSheet:@"Push to Remote" message:PBMissingRemoteErrMsg];
[self showMessageSheet:@"Push to Remote" message:PBMissingRemoteErrorMessage];
return success;
}
if (ret) {
@@ -128,7 +128,7 @@
BOOL success = NO;
NSString *remote = [[historyController.repository config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", refName]];
if (!remote) {
[self showMessageSheet:@"Pull from Remote" message:PBMissingRemoteErrMsg];
[self showMessageSheet:@"Pull from Remote" message:PBMissingRemoteErrorMessage];
return success;
}
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"pull", remote, refName, nil] retValue: &ret];
@@ -149,7 +149,7 @@
BOOL success = NO;
NSString *remote = [[[historyController repository] config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", refName]];
if (!remote) {
[self showMessageSheet:@"Pull Rebase from Remote" message:PBMissingRemoteErrMsg];
[self showMessageSheet:@"Pull Rebase from Remote" message:PBMissingRemoteErrorMessage];
return success;
}
NSString *rval = [[historyController repository] outputInWorkdirForArguments:[NSArray arrayWithObjects:@"pull", @"--rebase", remote, refName, nil] retValue: &ret];
@@ -295,7 +295,7 @@
if (refName) {
[self rebaseImpl:refName];
} else {
[self showMessageSheet:@"Pull Rebase from Remote" message:PBInvalidBranchErrMsg];
[self showMessageSheet:@"Pull Rebase from Remote" message:PBInvalidBranchErrorMessage];
}
// NSLog([NSString stringWithFormat:@"Rebase hit for %@!", refName]);
}
@@ -306,7 +306,7 @@
if (refName) {
[self pushImpl:refName];
} else {
[self showMessageSheet:@"Push to Remote" message:PBInvalidBranchErrMsg];
[self showMessageSheet:@"Push to Remote" message:PBInvalidBranchErrorMessage];
}
// NSLog([NSString stringWithFormat:@"Push hit for %@!", refName]);
}
@@ -318,7 +318,7 @@
[self pullImpl:refName];
} else {
[sender setEnabled:YES];
[self showMessageSheet:@"Pull from Remote" message:PBInvalidBranchErrMsg];
[self showMessageSheet:@"Pull from Remote" message:PBInvalidBranchErrorMessage];
}
// NSLog([NSString stringWithFormat:@"Pull hit for %@!", refName]);
}
@@ -330,7 +330,7 @@
[self fetchImpl:refName];
} else {
[sender setEnabled:YES];
[self showMessageSheet:@"Fetch from Remote" message:PBInvalidBranchErrMsg];
[self showMessageSheet:@"Fetch from Remote" message:PBInvalidBranchErrorMessage];
}
// NSLog([NSString stringWithFormat:@"Fetch hit for %@!", refName]);
}