From: <mar...@us...> - 2006-07-28 22:17:12
|
Revision: 659 Author: marisademeglio Date: 2006-07-25 16:08:00 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/urakawa/?rev=659&view=rev Log Message: ----------- Events related to nodes are a lot simpler. Since the event origin is now in all event arguments, we can probably omit it from a lot of the function parameters. This hasn't been done yet. Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Obi.csproj trunk/urakawa/application/Obi/Obi/Project.cs trunk/urakawa/application/Obi/Obi/UserControls/ProjectPanel.cs trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.cs trunk/urakawa/application/Obi/Obi/UserControls/TOCPanel.cs Added Paths: ----------- trunk/urakawa/application/Obi/Obi/Events/Node/AddedSectionNodeEventArgs.cs trunk/urakawa/application/Obi/Obi/Events/Node/NodeEventArgs.cs trunk/urakawa/application/Obi/Obi/Events/Node/RenameNodeEventArgs.cs Removed Paths: ------------- trunk/urakawa/application/Obi/Obi/Events/Node/AddSectionEventArgs.cs trunk/urakawa/application/Obi/Obi/Events/Node/ChangeSectionLevelEventArgs.cs trunk/urakawa/application/Obi/Obi/Events/Node/DeleteSectionEventArgs.cs trunk/urakawa/application/Obi/Obi/Events/Node/MoveSectionEventArgs.cs trunk/urakawa/application/Obi/Obi/Events/Node/RenameSectionEventArgs.cs trunk/urakawa/application/Obi/Obi/Events/Sync/ Deleted: trunk/urakawa/application/Obi/Obi/Events/Node/AddSectionEventArgs.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Events/Node/AddSectionEventArgs.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/Events/Node/AddSectionEventArgs.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -using urakawa.core; - -namespace Obi.Events.Node -{ - public delegate void AddSiblingSectionHandler(object sender, AddSectionEventArgs e); - public delegate void AddChildSectionHandler(object sender, AddSectionEventArgs e); - - /// <summary> - /// This event is fired when a view wants to add a new sibling section node in the core tree. - /// </summary> - public class AddSectionEventArgs : EventArgs - { - private CoreNode mContextNode; // the node after which to add the new sibling - - public CoreNode ContextNode - { - get - { - return mContextNode; - } - } - - public AddSectionEventArgs(CoreNode contextNode) - { - mContextNode = contextNode; - } - } -} Added: trunk/urakawa/application/Obi/Obi/Events/Node/AddedSectionNodeEventArgs.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Events/Node/AddedSectionNodeEventArgs.cs (rev 0) +++ trunk/urakawa/application/Obi/Obi/Events/Node/AddedSectionNodeEventArgs.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using urakawa.core; + +namespace Obi.Events.Node +{ + public delegate void AddedSectionNodeHandler(object sender, AddedSectionNodeEventArgs e); + + /// <summary> + /// A section node was added. + /// </summary> + class AddedSectionNodeEventArgs: NodeEventArgs + { + private int mPosition; // the position in the flat list of nodes + private int mIndex; // the index of the node in the parent's list of children + + public int Index + { + get + { + return mIndex; + } + } + + public int Position + { + get + { + return mPosition; + } + } + + public AddedSectionNodeEventArgs(object origin, CoreNode node, int index, int position) : + base(origin, node) + { + + mIndex = index; + mPosition = position; + } + } +} Deleted: trunk/urakawa/application/Obi/Obi/Events/Node/ChangeSectionLevelEventArgs.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Events/Node/ChangeSectionLevelEventArgs.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/Events/Node/ChangeSectionLevelEventArgs.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -using urakawa.core; - -namespace Obi.Events.Node -{ - public delegate void IncreaseSectionLevelHandler(object sender, - ChangeSectionLevelEventArgs e); - public delegate void DecreaseSectionLevelHandler(object sender, - ChangeSectionLevelEventArgs e); - - /// <summary> - /// This event is fired to request to increase a section by one level depth - /// </summary> - class ChangeSectionLevelEventArgs : EventArgs - { - private CoreNode mContextNode; // the node to be moved - - public CoreNode ContextNode - { - get - { - return mContextNode; - } - } - - public ChangeSectionLevelEventArgs(CoreNode contextNode) - { - mContextNode = contextNode; - } - } -} Deleted: trunk/urakawa/application/Obi/Obi/Events/Node/DeleteSectionEventArgs.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Events/Node/DeleteSectionEventArgs.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/Events/Node/DeleteSectionEventArgs.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -using urakawa.core; - -namespace Obi.Events.Node -{ - public delegate void DeleteSectionHandler(object sender, DeleteSectionEventArgs e); - - public class DeleteSectionEventArgs : EventArgs - { - private CoreNode mNode; - - public CoreNode Node - { - get - { - return mNode; - } - } - - public DeleteSectionEventArgs(CoreNode node) - { - mNode = node; - } - } -} Deleted: trunk/urakawa/application/Obi/Obi/Events/Node/MoveSectionEventArgs.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Events/Node/MoveSectionEventArgs.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/Events/Node/MoveSectionEventArgs.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -using urakawa.core; - -namespace Obi.Events.Node -{ - public delegate void MoveSectionUpHandler(object sender, MoveSectionEventArgs e); - public delegate void MoveSectionDownHandler(object sender, MoveSectionEventArgs e); - - /// <summary> - /// This event is fired when a view wants to move a node up (reorder) in the core tree. - /// </summary> - public class MoveSectionEventArgs : EventArgs - { - private CoreNode mNode; // the node that will move up - - public CoreNode Node - { - get - { - return mNode; - } - } - - public MoveSectionEventArgs(CoreNode node) - { - mNode = node; - } - } -} Added: trunk/urakawa/application/Obi/Obi/Events/Node/NodeEventArgs.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Events/Node/NodeEventArgs.cs (rev 0) +++ trunk/urakawa/application/Obi/Obi/Events/Node/NodeEventArgs.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using urakawa.core; + +namespace Obi.Events.Node +{ + public delegate void RequestToAddSiblingNodeHandler(object sender, NodeEventArgs e); + public delegate void RequestToAddChildNodeHandler(object sender, NodeEventArgs e); + public delegate void RequestToIncreaseNodeLevelHandler(object sender, NodeEventArgs e); + public delegate void RequestToDecreaseNodeLevelHandler(object sender, NodeEventArgs e); + public delegate void RequestToDeleteNodeHandler(object sender, NodeEventArgs e); + public delegate void RequestToMoveNodeUpHandler(object sender, NodeEventArgs e); + public delegate void RequestToMoveNodeDownHandler(object sender, NodeEventArgs e); + + + public delegate void IncreasedNodeLevelHandler(object sender, NodeEventArgs e); + public delegate void DecreasedNodeLevelHandler(object sender, NodeEventArgs e); + public delegate void DeletedNodeHandler(object sender, NodeEventArgs e); + public delegate void ShallowDeletedNodeHandler(object sender, NodeEventArgs e); + public delegate void MovedNodeUpHandler(object sender, NodeEventArgs e); + public delegate void MovedNodeDownHandler(object sender, NodeEventArgs e); + + public class NodeEventArgs : EventArgs + { + private CoreNode mNode; // the node on which the operation is performed + private object mOrigin; // the origin of the event (initial requester) + + public CoreNode Node + { + get + { + return mNode; + } + } + + public object Origin + { + get + { + return mOrigin; + } + } + + public NodeEventArgs(object origin, CoreNode node) + { + mOrigin = origin; + mNode = node; + } + } +} Added: trunk/urakawa/application/Obi/Obi/Events/Node/RenameNodeEventArgs.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Events/Node/RenameNodeEventArgs.cs (rev 0) +++ trunk/urakawa/application/Obi/Obi/Events/Node/RenameNodeEventArgs.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Text; + +using urakawa.core; + +namespace Obi.Events.Node +{ + public delegate void RequestToRenameNodeHandler(object sender, RenameNodeEventArgs e); + public delegate void RenamedNodeHandler(object sender, RenameNodeEventArgs e); + + /// <summary> + /// This event is fired when a view wants to rename a section. + /// </summary> + public class RenameNodeEventArgs : NodeEventArgs + { + private string mLabel; // the new text label of the node + + public string Label + { + get + { + return mLabel; + } + } + + public RenameNodeEventArgs(object origin, CoreNode node, string label) : + base(origin, node) + { + mLabel = label; + } + } +} Deleted: trunk/urakawa/application/Obi/Obi/Events/Node/RenameSectionEventArgs.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Events/Node/RenameSectionEventArgs.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/Events/Node/RenameSectionEventArgs.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -using urakawa.core; - -namespace Obi.Events.Node -{ - public delegate void RenameSectionHandler(object sender, RenameSectionEventArgs e); - - /// <summary> - /// This event is fired when a view wants to rename a section. - /// </summary> - public class RenameSectionEventArgs : EventArgs - { - private CoreNode mNode; // the node to rename - private string mLabel; // the new text label of the node - - public CoreNode Node - { - get - { - return mNode; - } - } - - public string Label - { - get - { - return mLabel; - } - } - - public RenameSectionEventArgs(CoreNode node, string label) - { - mNode = node; - mLabel = label; - } - } -} Modified: trunk/urakawa/application/Obi/Obi/Obi.csproj =================================================================== --- trunk/urakawa/application/Obi/Obi/Obi.csproj 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/Obi.csproj 2006-07-25 23:08:00 UTC (rev 659) @@ -95,17 +95,11 @@ <Compile Include="Dialogs\UserProfile.Designer.cs"> <DependentUpon>UserProfile.cs</DependentUpon> </Compile> - <Compile Include="Events\Node\DeleteSectionEventArgs.cs" /> - <Compile Include="Events\Node\AddSectionEventArgs.cs" /> - <Compile Include="Events\Node\ChangeSectionLevelEventArgs.cs" /> - <Compile Include="Events\Node\MoveSectionEventArgs.cs" /> - <Compile Include="Events\Node\RenameSectionEventArgs.cs" /> + <Compile Include="Events\Node\NodeEventArgs.cs" /> + <Compile Include="Events\Node\RenameNodeEventArgs.cs" /> <Compile Include="Events\Project\StateChangedEventArgs.cs" /> <Compile Include="Events\Strip\SelectedEventArgs.cs" /> - <Compile Include="Events\Sync\AddedSectionNodeEventArgs.cs" /> - <Compile Include="Events\Sync\DeletedNodeEventArgs.cs" /> - <Compile Include="Events\Sync\MovedNodeEventArgs.cs" /> - <Compile Include="Events\Sync\RenamedNodeEventArgs.cs" /> + <Compile Include="Events\Node\AddedSectionNodeEventArgs.cs" /> <Compile Include="Localizer.cs" /> <Compile Include="messages.Designer.cs"> <AutoGen>True</AutoGen> Modified: trunk/urakawa/application/Obi/Obi/Project.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Project.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/Project.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -35,11 +35,11 @@ public static readonly string AnnotationChannel = "obi.annotation"; // canonical name of the annotation channel public event Events.Project.StateChangedHandler StateChanged; // the state of the project changed (modified, saved...) - public event Events.Sync.AddedSectionNodeHandler AddedSectionNode; // a section node was added to the TOC - public event Events.Sync.DeletedNodeHandler DeletedNode; // a node was deleted from the presentation - public event Events.Sync.RenamedNodeHandler RenamedNode; // a node was renamed in the presentation - public event Events.Sync.MovedNodeUpHandler MovedNodeUp; // a node was moved up in the presentation - public event Events.Sync.MovedNodeDownHandler MovedNodeDown; // a node was moved down in the presentation + public event Events.Node.AddedSectionNodeHandler AddedSectionNode; // a section node was added to the TOC + public event Events.Node.DeletedNodeHandler DeletedNode; // a node was deleted from the presentation + public event Events.Node.RenamedNodeHandler RenamedNode; // a node was renamed in the presentation + public event Events.Node.MovedNodeUpHandler MovedNodeUp; // a node was moved up in the presentation + public event Events.Node.MovedNodeDownHandler MovedNodeDown; // a node was moved down in the presentation /// <summary> /// This flag is set to true if the project contains modifications that have not been saved. /// </summary> @@ -334,7 +334,7 @@ getPresentation().getRootNode().appendChild(sibling); NodePositionVisitor visitor = new NodePositionVisitor(sibling); getPresentation().getRootNode().acceptDepthFirst(visitor); - AddedSectionNode(this, new Events.Sync.AddedSectionNodeEventArgs(origin, sibling, + AddedSectionNode(this, new Events.Node.AddedSectionNodeEventArgs(origin, sibling, ((CoreNode)sibling.getParent()).indexOf(sibling), visitor.Position)); } else @@ -343,17 +343,17 @@ parent.insert(sibling, parent.indexOf(contextNode) + 1); NodePositionVisitor visitor = new NodePositionVisitor(sibling); getPresentation().getRootNode().acceptDepthFirst(visitor); - AddedSectionNode(this, new Events.Sync.AddedSectionNodeEventArgs(origin, sibling, parent.indexOf(sibling), + AddedSectionNode(this, new Events.Node.AddedSectionNodeEventArgs(origin, sibling, parent.indexOf(sibling), visitor.Position)); } mUnsaved = true; StateChanged(this, new Events.Project.StateChangedEventArgs(Events.Project.StateChange.Modified)); } - public void CreateSiblingSectionRequested(object sender, Events.Node.AddSectionEventArgs e) + public void CreateSiblingSectionRequested(object sender, Events.Node.NodeEventArgs e) { System.Diagnostics.Debug.WriteLine("create sibling request from " + sender.ToString() + " with hash: " + sender.GetHashCode()); - CreateSiblingSection(sender, e.ContextNode); + CreateSiblingSection(sender, e.Node); } /// <summary> @@ -366,14 +366,14 @@ parent.appendChild(child); NodePositionVisitor visitor = new NodePositionVisitor(child); getPresentation().getRootNode().acceptDepthFirst(visitor); - AddedSectionNode(this, new Events.Sync.AddedSectionNodeEventArgs(origin, child, parent.indexOf(child), visitor.Position)); + AddedSectionNode(this, new Events.Node.AddedSectionNodeEventArgs(origin, child, parent.indexOf(child), visitor.Position)); mUnsaved = true; StateChanged(this, new Events.Project.StateChangedEventArgs(Events.Project.StateChange.Modified)); } - public void CreateChildSectionRequested(object sender, Events.Node.AddSectionEventArgs e) + public void CreateChildSectionRequested(object sender, Events.Node.NodeEventArgs e) { - CreateChildSection(sender, e.ContextNode); + CreateChildSection(sender, e.Node); } /// <summary> @@ -384,7 +384,7 @@ { CoreNode parent = (CoreNode)node.getParent(); parent.insert(node, index); - AddedSectionNode(this, new Events.Sync.AddedSectionNodeEventArgs(this, node, index, position)); + AddedSectionNode(this, new Events.Node.AddedSectionNodeEventArgs(this, node, index, position)); mUnsaved = true; StateChanged(this, new Events.Project.StateChangedEventArgs(Events.Project.StateChange.Modified)); } @@ -397,13 +397,13 @@ if (node != null) { node.detach(); - DeletedNode(this, new Events.Sync.DeletedNodeEventArgs(origin, node)); + DeletedNode(this, new Events.Node.NodeEventArgs(origin, node)); mUnsaved = true; StateChanged(this, new Events.Project.StateChangedEventArgs(Events.Project.StateChange.Modified)); } } - public void RemoveNodeRequested(object sender, Events.Node.DeleteSectionEventArgs e) + public void RemoveNodeRequested(object sender, Events.Node.NodeEventArgs e) { RemoveNode(sender, e.Node); } @@ -417,7 +417,7 @@ bool moveUpSucceeded = ExecuteMoveNodeUpLogic(node); if (moveUpSucceeded) { - MovedNodeUp(this, new Events.Sync.MovedNodeEventArgs(origin, node)); + MovedNodeUp(this, new Events.Node.NodeEventArgs(origin, node)); mUnsaved = true; StateChanged(this, new Events.Project.StateChangedEventArgs(Events.Project.StateChange.Modified)); } @@ -462,7 +462,7 @@ } } - public void MoveNodeUpRequested(object sender, Events.Node.MoveSectionEventArgs e) + public void MoveNodeUpRequested(object sender, Events.Node.NodeEventArgs e) { MoveNodeUp(sender, e.Node); } @@ -473,7 +473,7 @@ bool moveDownSucceeded = ExecuteMoveNodeDownLogic(node); if (moveDownSucceeded) { - MovedNodeDown(this, new Events.Sync.MovedNodeEventArgs(origin, node)); + MovedNodeDown(this, new Events.Node.NodeEventArgs(origin, node)); mUnsaved = true; StateChanged(this, new Events.Project.StateChangedEventArgs(Events.Project.StateChange.Modified)); } @@ -518,7 +518,7 @@ } } - public void MoveNodeDownRequested(object sender, Events.Node.MoveSectionEventArgs e) + public void MoveNodeDownRequested(object sender, Events.Node.NodeEventArgs e) { MoveNodeDown(sender, e.Node); } @@ -529,12 +529,12 @@ public void RenameNode(object origin, CoreNode node, string label) { GetTextMedia(node).setText(label); - RenamedNode(this, new Events.Sync.RenamedNodeEventArgs(origin, node, label)); + RenamedNode(this, new Events.Node.RenameNodeEventArgs(origin, node, label)); mUnsaved = true; StateChanged(this, new Events.Project.StateChangedEventArgs(Events.Project.StateChange.Modified)); } - public void RenameNodeRequested(object sender, Events.Node.RenameSectionEventArgs e) + public void RenameNodeRequested(object sender, Events.Node.RenameNodeEventArgs e) { RenameNode(sender, e.Node, e.Label); } Modified: trunk/urakawa/application/Obi/Obi/UserControls/ProjectPanel.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/UserControls/ProjectPanel.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/UserControls/ProjectPanel.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -28,63 +28,63 @@ // Reset the handlers from the previous project if (mProject != null) { - mTOCPanel.AddSiblingSection -= new Events.Node.AddSiblingSectionHandler(mProject.CreateSiblingSectionRequested); + mTOCPanel.AddSiblingSection -= new Events.Node.RequestToAddSiblingNodeHandler(mProject.CreateSiblingSectionRequested); mStripManagerPanel.AddSiblingSection -= - new Events.Node.AddSiblingSectionHandler(mProject.CreateSiblingSectionRequested); + new Events.Node.RequestToAddSiblingNodeHandler(mProject.CreateSiblingSectionRequested); //mProject.AddedSiblingNode -= new Events.Sync.AddedSiblingNodeHandler(mTOCPanel.SyncAddedSiblingNode); //mProject.AddedSiblingNode -= new Events.Sync.AddedSiblingNodeHandler(mStripManagerPanel.SyncAddedSiblingNode); - mProject.AddedSectionNode -= new Events.Sync.AddedSectionNodeHandler(mTOCPanel.SyncAddedSectionNode); - mProject.AddedSectionNode -= new Events.Sync.AddedSectionNodeHandler(mStripManagerPanel.SyncAddedSectionNode); + mProject.AddedSectionNode -= new Events.Node.AddedSectionNodeHandler(mTOCPanel.SyncAddedSectionNode); + mProject.AddedSectionNode -= new Events.Node.AddedSectionNodeHandler(mStripManagerPanel.SyncAddedSectionNode); - mTOCPanel.AddChildSection -= new Events.Node.AddChildSectionHandler(mProject.CreateChildSectionRequested); + mTOCPanel.AddChildSection -= new Events.Node.RequestToAddChildNodeHandler(mProject.CreateChildSectionRequested); //mProject.AddedChildNode -= new Events.Sync.AddedChildNodeHandler(mTOCPanel.SyncAddedChildNode); //mProject.AddedChildNode -= new Events.Sync.AddedChildNodeHandler(mStripManagerPanel.SyncAddedChildNode); - mTOCPanel.MoveSectionUp -= new Events.Node.MoveSectionUpHandler(mProject.MoveNodeUpRequested); - mProject.MovedNodeUp -= new Events.Sync.MovedNodeUpHandler(mTOCPanel.SyncMovedNodeUp); + mTOCPanel.MoveSectionUp -= new Events.Node.RequestToMoveNodeUpHandler(mProject.MoveNodeUpRequested); + mProject.MovedNodeUp -= new Events.Node.MovedNodeUpHandler(mTOCPanel.SyncMovedNodeUp); - mTOCPanel.MoveSectionDown -= new Events.Node.MoveSectionDownHandler(mProject.MoveNodeDownRequested); - mProject.MovedNodeDown -= new Events.Sync.MovedNodeDownHandler(mTOCPanel.SyncMovedNodeDown); + mTOCPanel.MoveSectionDown -= new Events.Node.RequestToMoveNodeDownHandler(mProject.MoveNodeDownRequested); + mProject.MovedNodeDown -= new Events.Node.MovedNodeDownHandler(mTOCPanel.SyncMovedNodeDown); - mTOCPanel.RenameSection -= new Events.Node.RenameSectionHandler(mProject.RenameNodeRequested); - mStripManagerPanel.RenameSection -= new Events.Node.RenameSectionHandler(mProject.RenameNodeRequested); - mProject.RenamedNode -= new Events.Sync.RenamedNodeHandler(mTOCPanel.SyncRenamedNode); - mProject.RenamedNode -= new Events.Sync.RenamedNodeHandler(mStripManagerPanel.SyncRenamedNode); + mTOCPanel.RenameSection -= new Events.Node.RequestToRenameNodeHandler(mProject.RenameNodeRequested); + mStripManagerPanel.RenameSection -= new Events.Node.RequestToRenameNodeHandler(mProject.RenameNodeRequested); + mProject.RenamedNode -= new Events.Node.RenamedNodeHandler(mTOCPanel.SyncRenamedNode); + mProject.RenamedNode -= new Events.Node.RenamedNodeHandler(mStripManagerPanel.SyncRenamedNode); - mTOCPanel.DeleteSection -= new Events.Node.DeleteSectionHandler(mProject.RemoveNodeRequested); - mProject.DeletedNode -= new Events.Sync.DeletedNodeHandler(mTOCPanel.SyncDeletedNode); + mTOCPanel.DeleteSection -= new Events.Node.RequestToDeleteNodeHandler(mProject.RemoveNodeRequested); + mProject.DeletedNode -= new Events.Node.DeletedNodeHandler(mTOCPanel.SyncDeletedNode); //comment: this used to say += but I think it was a typo - mProject.DeletedNode -= new Events.Sync.DeletedNodeHandler(mStripManagerPanel.SyncDeletedNode); + mProject.DeletedNode -= new Events.Node.DeletedNodeHandler(mStripManagerPanel.SyncDeletedNode); } // Set up the handlers for the new project if (value != null) { - mTOCPanel.AddSiblingSection += new Events.Node.AddSiblingSectionHandler(value.CreateSiblingSectionRequested); + mTOCPanel.AddSiblingSection += new Events.Node.RequestToAddSiblingNodeHandler(value.CreateSiblingSectionRequested); mStripManagerPanel.AddSiblingSection += - new Events.Node.AddSiblingSectionHandler(value.CreateSiblingSectionRequested); - value.AddedSectionNode += new Events.Sync.AddedSectionNodeHandler(mTOCPanel.SyncAddedSectionNode); - value.AddedSectionNode += new Events.Sync.AddedSectionNodeHandler(mStripManagerPanel.SyncAddedSectionNode); + new Events.Node.RequestToAddSiblingNodeHandler(value.CreateSiblingSectionRequested); + value.AddedSectionNode += new Events.Node.AddedSectionNodeHandler(mTOCPanel.SyncAddedSectionNode); + value.AddedSectionNode += new Events.Node.AddedSectionNodeHandler(mStripManagerPanel.SyncAddedSectionNode); - mTOCPanel.AddChildSection += new Events.Node.AddChildSectionHandler(value.CreateChildSectionRequested); + mTOCPanel.AddChildSection += new Events.Node.RequestToAddChildNodeHandler(value.CreateChildSectionRequested); //value.AddedChildNode += new Events.Sync.AddedChildNodeHandler(mTOCPanel.SyncAddedChildNode); //value.AddedChildNode += new Events.Sync.AddedChildNodeHandler(mStripManagerPanel.SyncAddedChildNode); - mTOCPanel.MoveSectionUp += new Events.Node.MoveSectionUpHandler(value.MoveNodeUpRequested); - value.MovedNodeUp += new Events.Sync.MovedNodeUpHandler(mTOCPanel.SyncMovedNodeUp); + mTOCPanel.MoveSectionUp += new Events.Node.RequestToMoveNodeUpHandler(value.MoveNodeUpRequested); + value.MovedNodeUp += new Events.Node.MovedNodeUpHandler(mTOCPanel.SyncMovedNodeUp); - mTOCPanel.MoveSectionDown += new Events.Node.MoveSectionDownHandler(value.MoveNodeDownRequested); - value.MovedNodeDown += new Events.Sync.MovedNodeDownHandler(mTOCPanel.SyncMovedNodeDown); + mTOCPanel.MoveSectionDown += new Events.Node.RequestToMoveNodeDownHandler(value.MoveNodeDownRequested); + value.MovedNodeDown += new Events.Node.MovedNodeDownHandler(mTOCPanel.SyncMovedNodeDown); - mTOCPanel.RenameSection += new Events.Node.RenameSectionHandler(value.RenameNodeRequested); - mStripManagerPanel.RenameSection += new Events.Node.RenameSectionHandler(value.RenameNodeRequested); - value.RenamedNode += new Events.Sync.RenamedNodeHandler(mTOCPanel.SyncRenamedNode); - value.RenamedNode += new Events.Sync.RenamedNodeHandler(mStripManagerPanel.SyncRenamedNode); + mTOCPanel.RenameSection += new Events.Node.RequestToRenameNodeHandler(value.RenameNodeRequested); + mStripManagerPanel.RenameSection += new Events.Node.RequestToRenameNodeHandler(value.RenameNodeRequested); + value.RenamedNode += new Events.Node.RenamedNodeHandler(mTOCPanel.SyncRenamedNode); + value.RenamedNode += new Events.Node.RenamedNodeHandler(mStripManagerPanel.SyncRenamedNode); - mTOCPanel.DeleteSection += new Events.Node.DeleteSectionHandler(value.RemoveNodeRequested); - value.DeletedNode += new Events.Sync.DeletedNodeHandler(mTOCPanel.SyncDeletedNode); - value.DeletedNode += new Events.Sync.DeletedNodeHandler(mStripManagerPanel.SyncDeletedNode); + mTOCPanel.DeleteSection += new Events.Node.RequestToDeleteNodeHandler(value.RemoveNodeRequested); + value.DeletedNode += new Events.Node.DeletedNodeHandler(mTOCPanel.SyncDeletedNode); + value.DeletedNode += new Events.Node.DeletedNodeHandler(mStripManagerPanel.SyncDeletedNode); } mProject = value; mSplitContainer.Visible = mProject != null; Modified: trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -18,8 +18,8 @@ private Dictionary<CoreNode, SectionStrip> mNodeMap; // find a strip for a given node private CoreNode mSelectedNode; // the selected node - public event Events.Node.AddSiblingSectionHandler AddSiblingSection; - public event Events.Node.RenameSectionHandler RenameSection; + public event Events.Node.RequestToAddSiblingNodeHandler AddSiblingSection; + public event Events.Node.RequestToRenameNodeHandler RenameSection; public event Events.Strip.SelectedHandler SelectedStrip; public CoreNode SelectedNode @@ -99,7 +99,7 @@ #region Sync event handlers - internal void SyncAddedSectionNode(object sender, Events.Sync.AddedSectionNodeEventArgs e) + internal void SyncAddedSectionNode(object sender, Events.Node.AddedSectionNodeEventArgs e) { AddStripFromNode(e.Node, e.Position, e.Origin == this); } @@ -127,7 +127,7 @@ if (rename) strip.StartRenaming(); } - internal void SyncRenamedNode(object sender, Events.Sync.RenamedNodeEventArgs e) + internal void SyncRenamedNode(object sender, Events.Node.RenameNodeEventArgs e) { SectionStrip strip = mNodeMap[e.Node]; strip.Label = e.Label; @@ -136,7 +136,7 @@ /// <summary> /// When deleting a node from the tree, all descendants are deleted as well. /// </summary> - internal void SyncDeletedNode(object sender, Events.Sync.DeletedNodeEventArgs e) + internal void SyncDeletedNode(object sender, Events.Node.NodeEventArgs e) { if (e.Node != null) { @@ -161,7 +161,7 @@ internal void addStripToolStripMenuItem_Click(object sender, EventArgs e) { - AddSiblingSection(this, new Events.Node.AddSectionEventArgs(mSelectedNode)); + AddSiblingSection(this, new Events.Node.NodeEventArgs(this, mSelectedNode)); } internal void renameStripToolStripMenuItem_Click(object sender, EventArgs e) @@ -181,7 +181,7 @@ /// <param name="strip">The renamed strip (with its new name as a label.)</param> internal void RenamedSectionStrip(SectionStrip strip) { - RenameSection(this, new Events.Node.RenameSectionEventArgs(strip.Node, strip.Label)); + RenameSection(this, new Events.Node.RenameNodeEventArgs(this, strip.Node, strip.Label)); } } } \ No newline at end of file Modified: trunk/urakawa/application/Obi/Obi/UserControls/TOCPanel.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/UserControls/TOCPanel.cs 2006-07-25 21:08:03 UTC (rev 658) +++ trunk/urakawa/application/Obi/Obi/UserControls/TOCPanel.cs 2006-07-25 23:08:00 UTC (rev 659) @@ -19,14 +19,14 @@ /// </summary> public partial class TOCPanel : UserControl, ICoreNodeVisitor { - public event Events.Node.AddSiblingSectionHandler AddSiblingSection; - public event Events.Node.AddChildSectionHandler AddChildSection; - public event Events.Node.DecreaseSectionLevelHandler DecreaseSectionLevel; - public event Events.Node.IncreaseSectionLevelHandler IncreaseSectionLevel; - public event Events.Node.MoveSectionDownHandler MoveSectionDown; - public event Events.Node.MoveSectionUpHandler MoveSectionUp; - public event Events.Node.RenameSectionHandler RenameSection; - public event Events.Node.DeleteSectionHandler DeleteSection; + public event Events.Node.RequestToAddSiblingNodeHandler AddSiblingSection; + public event Events.Node.RequestToAddChildNodeHandler AddChildSection; + public event Events.Node.RequestToDecreaseNodeLevelHandler DecreaseSectionLevel; + public event Events.Node.RequestToIncreaseNodeLevelHandler IncreaseSectionLevel; + public event Events.Node.RequestToMoveNodeDownHandler MoveSectionDown; + public event Events.Node.RequestToMoveNodeUpHandler MoveSectionUp; + public event Events.Node.RequestToRenameNodeHandler RenameSection; + public event Events.Node.RequestToDeleteNodeHandler DeleteSection; /// <summary> /// Test whether a node is currently selected or not. @@ -118,16 +118,6 @@ InitializeComponent(); } - //always allowed until level 1 - public void DecreaseCurrentSectionLevel() - { - } - - //allowed if you have a previous sibling - public void IncreaseCurrentSectionLevel() - { - } - public void LimitViewToDepthOfCurrentSection() { } @@ -187,7 +177,7 @@ System.Diagnostics.Debug.WriteLine("TOC panel click!\n"); AddSiblingSection(this, - new Events.Node.AddSectionEventArgs(GetSelectedSection())); + new Events.Node.NodeEventArgs(this, GetSelectedSection())); } /// <summary> @@ -196,7 +186,7 @@ internal void addSubSectionToolStripMenuItem_Click(object sender, EventArgs e) { AddChildSection(this, - new Events.Node.AddSectionEventArgs(GetSelectedSection())); + new Events.Node.NodeEventArgs(this, GetSelectedSection())); } /// <summary> @@ -205,7 +195,7 @@ internal void moveUpToolStripMenuItem_Click(object sender, EventArgs e) { MoveSectionUp(this, - new Events.Node.MoveSectionEventArgs(GetSelectedSection())); + new Events.Node.NodeEventArgs(this, GetSelectedSection())); } /// <summary> @@ -213,7 +203,7 @@ /// </summary> internal void deleteSectionToolStripMenuItem_Click(object sender, EventArgs e) { - DeleteSection(this, new Events.Node.DeleteSectionEventArgs(GetSelectedSection())); + DeleteSection(this, new Events.Node.NodeEventArgs(this, GetSelectedSection())); } internal void editLabelToolStripMenuItem_Click(object sender, EventArgs e) @@ -225,13 +215,13 @@ internal void moveDownToolStripMenuItem_Click(object sender, EventArgs e) { MoveSectionDown(this, - new Events.Node.MoveSectionEventArgs(GetSelectedSection())); + new Events.Node.NodeEventArgs(this, GetSelectedSection())); } internal void increaseLevelToolStripMenuItem_Click(object sender, EventArgs e) { IncreaseSectionLevel(this, - new Events.Node.ChangeSectionLevelEventArgs(GetSelectedSection())); + new Events.Node.NodeEventArgs(this, GetSelectedSection())); } internal void decreaseLevelToolStripMenuItem_Click(object sender, EventArgs e) @@ -240,7 +230,7 @@ sel.BeginEdit(); DecreaseSectionLevel(this, - new Events.Node.ChangeSectionLevelEventArgs(GetSelectedSection())); + new Events.Node.NodeEventArgs(this, GetSelectedSection())); } #endregion @@ -264,7 +254,7 @@ } else if (e.Label != Project.GetTextMedia((CoreNode)e.Node.Tag).getText()) { - RenameSection(this, new Events.Node.RenameSectionEventArgs((CoreNode)e.Node.Tag, e.Label)); + RenameSection(this, new Events.Node.RenameNodeEventArgs(this, (CoreNode)e.Node.Tag, e.Label)); } } } @@ -297,7 +287,7 @@ /// <param name="sender">The sender of this event notification</param> /// <param name="e"><see cref="e.Node"/> is the new heading to add to the tree</param> - internal void SyncAddedSectionNode(object sender, Events.Sync.AddedSectionNodeEventArgs e) + internal void SyncAddedSectionNode(object sender, Events.Node.AddedSectionNodeEventArgs e) { System.Windows.Forms.TreeNode newTreeNode; string label = Project.GetTextMedia(e.Node).getText(); @@ -327,7 +317,7 @@ /// </summary> /// <param name="sender">The sender of this event notification</param> /// <param name="e"><see cref="e.Node"/> is the tree node being renamed.</param> - internal void SyncRenamedNode(object sender, Events.Sync.RenamedNodeEventArgs e) + internal void SyncRenamedNode(object sender, Events.Node.RenameNodeEventArgs e) { if (e.Origin != this) { @@ -342,7 +332,7 @@ /// </summary> /// <param name="sender">The sender of this event notification</param> /// <param name="e"><see cref="e.Node"/> is the node to be removed.</param> - internal void SyncDeletedNode(object sender, Events.Sync.DeletedNodeEventArgs e) + internal void SyncDeletedNode(object sender, Events.Node.NodeEventArgs e) { if (e.Node != null) { @@ -356,7 +346,7 @@ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> - internal void SyncShallowDeletedNode(object sender, Events.Sync.DeletedNodeEventArgs e) + internal void SyncShallowDeletedNode(object sender, Events.Node.NodeEventArgs e) { } @@ -365,7 +355,7 @@ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> - internal void SyncMovedNodeUp(object sender, Events.Sync.MovedNodeEventArgs e) + internal void SyncMovedNodeUp(object sender, Events.Node.NodeEventArgs e) { System.Windows.Forms.TreeNode selected = FindTreeNodeFromCoreNode(e.Node); @@ -425,7 +415,12 @@ } - internal void SyncMovedNodeDown(object sender, Events.Sync.MovedNodeEventArgs e) + /// <summary> + /// Move a tree node down + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + internal void SyncMovedNodeDown(object sender, Events.Node.NodeEventArgs e) { System.Windows.Forms.TreeNode selected = FindTreeNodeFromCoreNode(e.Node); System.Windows.Forms.TreeNode clone = (System.Windows.Forms.TreeNode) @@ -481,6 +476,9 @@ } } + internal void SyncIncreaseNodeLevel(object sender, Events.Node.NodeEventArgs e) + { + } #endregion #region helper functions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |