Author: ericwa
Date: Mon Mar 24 21:34:09 2014
New Revision: 10632
URL: http://svn.gna.org/viewcvs/etoile?rev=10632&view=rev
Log:
History window: check branch's supportsRevert property
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m?rev=10632&r1=10631&r2=10632&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/CommonUI/EWHistoryWindowController.m
Mon Mar 24 21:34:09 2014
@@ -90,6 +90,7 @@
{
[undo setEnabled: [inspectedBranch canUndo]];
[redo setEnabled: [inspectedBranch canRedo]];
+ [selectiveUndo setEnabled: NO];
id<COTrackNode> highlightedNode = [self selectedNode];
@@ -98,12 +99,14 @@
const BOOL canSelectiveUndo = (highlightedNode != nil
&&
highlightedNode != [COEndOfUndoTrackPlaceholderNode sharedInstance]
&&
highlightedNodeIndex != NSNotFound
- &&
highlightedNodeIndex < currentNodeIndex);
+ &&
highlightedNodeIndex < currentNodeIndex
+ &&
inspectedBranch.supportsRevert);
const BOOL canSelectiveRedo = (!canSelectiveUndo
&&
highlightedNode != nil
&&
highlightedNode != [COEndOfUndoTrackPlaceholderNode sharedInstance]
- &&
highlightedNodeIndex != currentNodeIndex);
+ &&
highlightedNodeIndex != currentNodeIndex
+ &&
inspectedBranch.supportsRevert);
if (canSelectiveUndo)
{
@@ -117,16 +120,17 @@
[selectiveUndo setTitle: @"Selective Redo"];
[selectiveUndo setAction: @selector(selectiveRedo:)];
}
- else
- {
- [selectiveUndo setEnabled: NO];
- }
}
/* Target/action */
- (void) doubleClick: (id)sender
{
+ if (!inspectedBranch.supportsRevert)
+ {
+ NSLog(@"%@: Branch doesn't support revert", self);
+ return;
+ }
id<COTrackNode> node = [self selectedNode];
[inspectedBranch setCurrentNode: node];
[self commitWithIdentifier: @"revert" descriptionArguments: @[]];
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
