Menu
▾
▴
[Urakawa-vcs] SF.net SVN: urakawa: [3096] trunk/urakawa/application/Obi/Obi
|
From: <avn...@us...> - 2008-05-22 19:10:05
|
Revision: 3096
http://urakawa.svn.sourceforge.net/urakawa/?rev=3096&view=rev
Author: avneeshsingh
Date: 2008-05-22 12:09:54 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Backend support added for bugg 1964108
To_do mark overwrites node kind
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/EmptyNode.cs
trunk/urakawa/application/Obi/Obi/Obi.csproj
trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/messages.Designer.cs
trunk/urakawa/application/Obi/Obi/messages.resx
Added Paths:
-----------
trunk/urakawa/application/Obi/Obi/Commands/Node/ToggleNodeTo_Do.cs
Added: trunk/urakawa/application/Obi/Obi/Commands/Node/ToggleNodeTo_Do.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Commands/Node/ToggleNodeTo_Do.cs (rev 0)
+++ trunk/urakawa/application/Obi/Obi/Commands/Node/ToggleNodeTo_Do.cs 2008-05-22 19:09:54 UTC (rev 3096)
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Obi.Commands.Node
+{
+ class ToggleNodeTo_Do : Command
+ {
+ private EmptyNode mNode; // the empty node
+ private bool mOriginalStatus; // original used status of the node
+
+ /// <summary>
+ /// Change the used status of a single node.
+ /// </summary>
+ public ToggleNodeTo_Do (ProjectView.ProjectView view, EmptyNode node)
+ : base(view)
+ {
+ mNode = node;
+ mOriginalStatus = node.IsTo_Do;
+ }
+
+ public override void execute()
+ {
+ mNode.AssignTo_DoMark ( !mOriginalStatus );
+ }
+
+ public override void unExecute()
+ {
+ mNode.AssignTo_DoMark(!mOriginalStatus);
+ base.unExecute();
+ }
+
+
+ }
+}
Modified: trunk/urakawa/application/Obi/Obi/EmptyNode.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/EmptyNode.cs 2008-05-22 10:23:24 UTC (rev 3095)
+++ trunk/urakawa/application/Obi/Obi/EmptyNode.cs 2008-05-22 19:09:54 UTC (rev 3096)
@@ -13,11 +13,13 @@
private Kind mKind; // this node's kind
private string mCustomClass; // custom class name
private int mPageNumber; // page number
+ private bool m_ToDo;
public static readonly string XUK_ELEMENT_NAME = "empty"; // name of the element in the XUK file
private static readonly string XUK_ATTR_NAME_KIND = "kind"; // name of the kind attribute
private static readonly string XUK_ATTR_NAME_CUSTOM = "custom"; // name of the custom attribute
private static readonly string XUK_ATTR_NAME_PAGE = "page"; // name of the page attribute
+ private static readonly string To_Do_ATTR_NAME = "To_Do"; // name of the To Do attribute
/// <summary>
/// Different kinds of content nodes.
@@ -36,8 +38,9 @@
public virtual string BaseString(double duration)
{
return String.Format(Localizer.Message("phrase_to_string"),
+ IsTo_Do ? Localizer.Message ("phrase_short_TODO") : "",
Used ? "" : Localizer.Message("unused"),
- IsRooted ? Index + 1 : 0,
+ IsRooted ? Index + 1 : 0,
IsRooted ? ParentAs<ObiNode>().PhraseChildCount : 0,
duration == 0.0 ? Localizer.Message("empty") : String.Format(Localizer.Message("time_in_seconds"), duration),
mKind == Kind.Custom ? String.Format(Localizer.Message("phrase_extra_custom"), mCustomClass) :
@@ -70,6 +73,7 @@
/// This event is sent when the page number changes on a node (for a node which previously had a page number.)
/// </summary>
public event NodeEventHandler<EmptyNode> ChangedPageNumber;
+ public event NodeEventHandler<EmptyNode> ChangedTo_DoStatus;
/// <summary>
@@ -127,6 +131,12 @@
set { SetKind(Kind.Custom, value); }
}
+ public bool IsTo_Do
+ {
+ get { return m_ToDo; }
+ set { m_ToDo = value; }
+ }
+
/// <summary>
/// Has no audio so is never a used phrase.
/// </summary>
@@ -179,6 +189,13 @@
}
}
+ public void AssignTo_DoMark( bool Val )
+ {
+ IsTo_Do = Val;
+ if ( ChangedTo_DoStatus != null )
+ ChangedTo_DoStatus(this, new NodeEventArgs<EmptyNode>(this));
+ }
+
public override void Insert(ObiNode node, int index) { throw new Exception("Empty nodes have no children."); }
public override SectionNode SectionChild(int index) { throw new Exception("Empty nodes have no children."); }
public override int SectionChildCount { get { return 0; } }
@@ -188,7 +205,7 @@
public override string getXukLocalName() { return XUK_ELEMENT_NAME; }
-
+
protected override void xukInAttributes(System.Xml.XmlReader source)
{
string kind = source.GetAttribute(XUK_ATTR_NAME_KIND);
@@ -214,7 +231,14 @@
}
// add it to the presentation
Presentation.AddCustomClass(mCustomClass, this);
- base.xukInAttributes(source);
+
+ string ToDo = source.GetAttribute(To_Do_ATTR_NAME);
+ if (ToDo != null)
+ {
+ if (ToDo == "True") m_ToDo = true;
+ else m_ToDo = false;
+ }
+ base.xukInAttributes(source);
}
protected override void xukOutAttributes(System.Xml.XmlWriter wr, Uri baseUri)
@@ -222,6 +246,7 @@
if (mKind != Kind.Plain) wr.WriteAttributeString(XUK_ATTR_NAME_KIND, mKind.ToString());
if (mKind == Kind.Custom) wr.WriteAttributeString(XUK_ATTR_NAME_CUSTOM, mCustomClass);
if (mKind == Kind.Page) wr.WriteAttributeString(XUK_ATTR_NAME_PAGE, mPageNumber.ToString());
+ if (m_ToDo) wr.WriteAttributeString(To_Do_ATTR_NAME, "True");
base.xukOutAttributes(wr, baseUri);
}
Modified: trunk/urakawa/application/Obi/Obi/Obi.csproj
===================================================================
--- trunk/urakawa/application/Obi/Obi/Obi.csproj 2008-05-22 10:23:24 UTC (rev 3095)
+++ trunk/urakawa/application/Obi/Obi/Obi.csproj 2008-05-22 19:09:54 UTC (rev 3096)
@@ -73,7 +73,7 @@
<Reference Include="System.Xml" />
<Reference Include="urakawa, Version=1.0.0.21762, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\SDK\core\obj\Debug\urakawa.dll</HintPath>
+ <HintPath>..\..\..\implementation\UrakawaToolkit\bin\Debug\urakawa.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -114,6 +114,7 @@
<Compile Include="Commands\Node\RenameSection.cs" />
<Compile Include="Commands\Node\SplitAudio.cs" />
<Compile Include="Commands\Node\SplitAudioSelection.cs" />
+ <Compile Include="Commands\Node\ToggleNodeTo_Do.cs" />
<Compile Include="Commands\Node\ToggleNodeUsed.cs" />
<Compile Include="Commands\Strips\ImportPhrases.cs" />
<Compile Include="Commands\TOC\MoveSectionIn.cs" />
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-22 10:23:24 UTC (rev 3095)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-22 19:09:54 UTC (rev 3096)
@@ -30,6 +30,7 @@
mEntering = false;
node.ChangedKind += new EmptyNode.ChangedKindEventHandler(Node_ChangedKind);
node.ChangedPageNumber += new NodeEventHandler<EmptyNode>(Node_ChangedPageNumber);
+ node.ChangedTo_DoStatus += new NodeEventHandler<EmptyNode>(Node_ChangedTo_DoStatus);
UpdateColors();
UpdateLabel();
}
@@ -142,6 +143,8 @@
// Update the label when the role of the node changes
private void Node_ChangedKind(object sender, ChangedKindEventArgs e) { UpdateLabel(); }
+ // update label when to do status changes
+ private void Node_ChangedTo_DoStatus(object sender, NodeEventArgs<EmptyNode> e) { UpdateLabel(); }
// Toggle selection when clicking.
private void ToggleSelection()
{
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-22 10:23:24 UTC (rev 3095)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-22 19:09:54 UTC (rev 3096)
@@ -1059,6 +1059,16 @@
}
}
+ public void ToggleEmptyNodeTo_DoMark()
+ {
+ if (Selection.Node is EmptyNode)
+ {
+ EmptyNode node = (EmptyNode)Selection.Node;
+ Commands.Node.ToggleNodeTo_Do command = new Commands.Node.ToggleNodeTo_Do(this, node);
+ Presentation.getUndoRedoManager().execute(command);
+ }
+ }
+
public void UpdateCursorPosition(double time) { mStripsView.UpdateCursorPosition(time); }
public void SelectAtCurrentTime() { mStripsView.SelectAtCurrentTime(); }
@@ -1206,7 +1216,7 @@
protected override bool ProcessCmdKey(ref Message msg, Keys key)
{
- return (key == (Keys)(Keys.Control | Keys.Tab) && SelectViewsInCycle(true)) ||
+ return (key == (Keys)(Keys.Control | Keys.Tab) && SelectViewsInCycle(true)) ||
(key == (Keys)(Keys.Control | Keys.Shift | Keys.Tab) && SelectViewsInCycle(false)) ||
(key == (Keys)(Keys.F6) && ToggleFocusBTWTOCViewAndContentsView() ) ||
(key == (Keys)(Keys.Shift | Keys.Space) && TogglePlayPause(UseSelection)) ||
Modified: trunk/urakawa/application/Obi/Obi/messages.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-22 10:23:24 UTC (rev 3095)
+++ trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-22 19:09:54 UTC (rev 3096)
@@ -1460,7 +1460,7 @@
}
/// <summary>
- /// Looks up a localized string similar to phrase (length: {0}).
+ /// Looks up a localized string similar to phrase (length: {1}).
/// </summary>
internal static string phrase_node_to_string {
get {
@@ -1523,7 +1523,7 @@
}
/// <summary>
- /// Looks up a localized string similar to TODO.
+ /// Looks up a localized string similar to To do.
/// </summary>
internal static string phrase_short_TODO {
get {
@@ -1532,7 +1532,7 @@
}
/// <summary>
- /// Looks up a localized string similar to {0}phrase {1} of {2} ({3}){4}.
+ /// Looks up a localized string similar to {0} {1} phrase {2} of {3} ({4}){5}.
/// </summary>
internal static string phrase_to_string {
get {
Modified: trunk/urakawa/application/Obi/Obi/messages.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-22 10:23:24 UTC (rev 3095)
+++ trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-22 19:09:54 UTC (rev 3096)
@@ -867,7 +867,7 @@
<comment>ToString()</comment>
</data>
<data name="phrase_node_to_string" xml:space="preserve">
- <value>phrase (length: {0})</value>
+ <value>phrase (length: {1})</value>
<comment>ToString()</comment>
</data>
<data name="phrase_short_custom" xml:space="preserve">
@@ -895,11 +895,11 @@
<comment>ToStirng() short version for labels</comment>
</data>
<data name="phrase_short_TODO" xml:space="preserve">
- <value>TODO</value>
+ <value>To do</value>
<comment>ToString() short</comment>
</data>
<data name="phrase_to_string" xml:space="preserve">
- <value>{0}phrase {1} of {2} ({3}){4}</value>
+ <value>{0} {1} phrase {2} of {3} ({4}){5}</value>
<comment>ToString(); e.g. [unused] phrase 3 of 5 (2.5s), page number 2</comment>
</data>
<data name="section_level_to_string" xml:space="preserve">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|