Menu
▾
▴
urakawa-cvs — Track cvs activity
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(30) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(27) |
Feb
(27) |
Mar
(157) |
Apr
(26) |
May
(152) |
Jun
(56) |
Jul
(193) |
Aug
(209) |
Sep
(53) |
Oct
(131) |
Nov
(105) |
Dec
(118) |
| 2007 |
Jan
(131) |
Feb
(89) |
Mar
(121) |
Apr
(53) |
May
(188) |
Jun
(184) |
Jul
(99) |
Aug
(56) |
Sep
(84) |
Oct
(93) |
Nov
(100) |
Dec
(210) |
| 2008 |
Jan
(79) |
Feb
(55) |
Mar
(68) |
Apr
(27) |
May
(84) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ju...@us...> - 2008-06-06 17:52:22
|
Revision: 3106
http://urakawa.svn.sourceforge.net/urakawa/?rev=3106&view=rev
Author: julienq
Date: 2008-06-06 10:52:18 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
Removed from SF...
Removed Paths:
-------------
trunk/urakawa/application/prototype/Bobi/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-06-06 17:48:09
|
Revision: 3105
http://urakawa.svn.sourceforge.net/urakawa/?rev=3105&view=rev
Author: julienq
Date: 2008-06-06 10:48:04 -0700 (Fri, 06 Jun 2008)
Log Message:
-----------
Adding new prototype project for GUI improvement tests.
Added Paths:
-----------
trunk/urakawa/application/prototype/Bobi/
trunk/urakawa/application/prototype/Bobi/Bobi/
trunk/urakawa/application/prototype/Bobi/Bobi/BobiForm.resx
trunk/urakawa/application/prototype/Bobi/Bobi/Commands/
trunk/urakawa/application/prototype/Bobi/Bobi/Commands/NewTrack.cs
trunk/urakawa/application/prototype/Bobi/Bobi/Project.cs
trunk/urakawa/application/prototype/Bobi/Bobi/View/
trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.Designer.cs
trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.cs
trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.resx
trunk/urakawa/application/prototype/Bobi/Bobi/View/Track.Designer.cs
trunk/urakawa/application/prototype/Bobi/Bobi/View/Track.cs
Added: trunk/urakawa/application/prototype/Bobi/Bobi/BobiForm.resx
===================================================================
--- trunk/urakawa/application/prototype/Bobi/Bobi/BobiForm.resx (rev 0)
+++ trunk/urakawa/application/prototype/Bobi/Bobi/BobiForm.resx 2008-06-06 17:48:04 UTC (rev 3105)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>125, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
Added: trunk/urakawa/application/prototype/Bobi/Bobi/Commands/NewTrack.cs
===================================================================
--- trunk/urakawa/application/prototype/Bobi/Bobi/Commands/NewTrack.cs (rev 0)
+++ trunk/urakawa/application/prototype/Bobi/Bobi/Commands/NewTrack.cs 2008-06-06 17:48:04 UTC (rev 3105)
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bobi.Commands
+{
+ class NewTrack : urakawa.undo.ICommand
+ {
+ private urakawa.Presentation presentation; // presentation in which the track is added
+ private urakawa.core.TreeNode node; // node for the new track
+
+ public NewTrack(urakawa.Presentation presentation)
+ {
+ this.presentation = presentation;
+ this.node = this.presentation.getTreeNodeFactory().createNode();
+ }
+
+ #region ICommand Members
+
+ public event EventHandler<urakawa.events.undo.ExecutedEventArgs> executed;
+ public event EventHandler<urakawa.events.undo.UnExecutedEventArgs> unExecuted;
+
+ public bool canUnExecute() { return true; }
+ public List<urakawa.media.data.MediaData> getListOfUsedMediaData() { return new List<urakawa.media.data.MediaData>(); }
+
+ public string getLongDescription()
+ {
+ return string.Format("Added new track (number of tracks in project: {0}.)",
+ ((Project)this.presentation.getProject()).NumberOfTracks);
+ }
+
+ public string getShortDescription() { return "new track"; }
+
+ public void execute()
+ {
+ this.presentation.getRootNode().appendChild(this.node);
+ if (executed != null) executed(this, new urakawa.events.undo.ExecutedEventArgs(this));
+ }
+
+ public void unExecute()
+ {
+ this.node.detach();
+ if (unExecuted != null) unExecuted(this, new urakawa.events.undo.UnExecutedEventArgs(this));
+ }
+
+
+ #endregion
+
+ #region IWithPresentation Members
+
+ public urakawa.Presentation getPresentation() { return this.presentation; }
+ public void setPresentation(urakawa.Presentation newPres) { this.presentation = newPres; }
+
+ #endregion
+
+ #region IXukAble Members
+
+ public string getXukLocalName() { return GetType().Name; }
+ public string getXukNamespaceUri() { return ""; }
+ public void xukIn(System.Xml.XmlReader source) { }
+ public void xukOut(System.Xml.XmlWriter destination, Uri baseUri) { }
+
+ #endregion
+
+ #region IChangeNotifier Members
+
+ public event EventHandler<urakawa.events.DataModelChangedEventArgs> changed;
+
+ #endregion
+ }
+}
Added: trunk/urakawa/application/prototype/Bobi/Bobi/Project.cs
===================================================================
--- trunk/urakawa/application/prototype/Bobi/Bobi/Project.cs (rev 0)
+++ trunk/urakawa/application/prototype/Bobi/Bobi/Project.cs 2008-06-06 17:48:04 UTC (rev 3105)
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Bobi
+{
+ public class Project : urakawa.Project
+ {
+ public Uri Path; // path to .xuk file
+ private int changes; // changes since last save
+ private bool initialized; // flag set once the project is properly initialized
+
+
+ /// <summary>
+ /// Create a new empty project.
+ /// </summary>
+ public Project() : base()
+ {
+ Path = null;
+ this.changes = 0;
+ setPresentation(getDataModelFactory().createPresentation(), 0);
+ SetUndoRedoEvents();
+ this.initialized = true;
+ }
+
+ /// <summary>
+ /// Create a new, uninitialized project ready for reading.
+ /// </summary>
+ public Project(Uri path) : base()
+ {
+ Path = path;
+ this.initialized = false;
+ }
+
+
+ /// <summary>
+ /// True if there are changes since the last time the project was saved (or created.)
+ /// </summary>
+ public bool HasChanges { get { return this.changes != 0; } }
+
+ /// <summary>
+ /// True once the project has been properly initialized.
+ /// </summary>
+ public bool Initialized { get { return this.initialized; } }
+
+ /// <summary>
+ /// Append a new track to the project.
+ /// </summary>
+ public void NewTrack()
+ {
+ getPresentation(0).getUndoRedoManager().execute(new Commands.NewTrack(getPresentation(0)));
+ }
+
+ /// <summary>
+ /// Get the number of tracks in the current project.
+ /// </summary>
+ public int NumberOfTracks { get { return getPresentation(0).getRootNode().getChildCount(); } }
+
+ /// <summary>
+ /// Open a XUK file at the set path.
+ /// </summary>
+ public void Open()
+ {
+ openXUK(Path);
+ SetUndoRedoEvents();
+ this.initialized = true;
+ }
+
+ // Redo the last undone change.
+ public void Redo()
+ {
+ urakawa.undo.UndoRedoManager redo = getPresentation(0).getUndoRedoManager();
+ if (redo.canRedo()) redo.redo();
+ }
+
+ // Save changes to the current path (only if set.)
+ public void Save()
+ {
+ if (Path != null)
+ {
+ saveXUK(Path);
+ Changes(-this.changes);
+ }
+ }
+
+ // Undo the last change.
+ public void Undo()
+ {
+ urakawa.undo.UndoRedoManager undo = getPresentation(0).getUndoRedoManager();
+ if (undo.canUndo()) undo.undo();
+ }
+
+
+ // Keep track of the number of changes since open, and send an event when it changes.
+ private void Changes(int n)
+ {
+ if (this.initialized)
+ {
+ this.changes += n;
+ notifyChanged(new urakawa.events.DataModelChangedEventArgs(this));
+ }
+ }
+
+ private void Project_commandDone(object sender, urakawa.events.undo.DoneEventArgs e) { Changes(+1); }
+ private void Project_commandReDone(object sender, urakawa.events.undo.ReDoneEventArgs e) { Changes(+1); }
+ private void Project_commandUnDone(object sender, urakawa.events.undo.UnDoneEventArgs e) { Changes(-1); }
+
+ private void SetUndoRedoEvents()
+ {
+ getPresentation(0).getUndoRedoManager().commandDone += new EventHandler<urakawa.events.undo.DoneEventArgs>(Project_commandDone);
+ getPresentation(0).getUndoRedoManager().commandReDone += new EventHandler<urakawa.events.undo.ReDoneEventArgs>(Project_commandReDone);
+ getPresentation(0).getUndoRedoManager().commandUnDone += new EventHandler<urakawa.events.undo.UnDoneEventArgs>(Project_commandUnDone);
+ }
+ }
+}
Added: trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.Designer.cs
===================================================================
--- trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.Designer.cs (rev 0)
+++ trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.Designer.cs 2008-06-06 17:48:04 UTC (rev 3105)
@@ -0,0 +1,42 @@
+namespace Bobi.View
+{
+ partial class ProjectView
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.SuspendLayout();
+ //
+ // ProjectView
+ //
+ this.AutoScroll = true;
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ }
+}
Added: trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.cs
===================================================================
--- trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.cs (rev 0)
+++ trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.cs 2008-06-06 17:48:04 UTC (rev 3105)
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Bobi.View
+{
+ public partial class ProjectView : FlowLayoutPanel
+ {
+ private Project project;
+ private double zoom;
+
+ /// <summary>
+ /// New project view
+ /// </summary>
+ public ProjectView()
+ {
+ InitializeComponent();
+ DoubleBuffered = true;
+ Project = null;
+ Zoom = 1.0;
+ }
+
+
+ /// <summary>
+ /// Set the project for this view.
+ /// </summary>
+ public Project Project
+ {
+ get { return this.project; }
+ set
+ {
+ Controls.Clear();
+ this.project = value;
+ if (value != null)
+ {
+ this.project.changed += new EventHandler<urakawa.events.DataModelChangedEventArgs>(project_changed);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Zoom factor for the view
+ /// </summary>
+ public double Zoom
+ {
+ get { return this.zoom; }
+ set
+ {
+ this.zoom = value;
+ foreach (Control c in Controls)
+ {
+ if (c is Track) ((Track)c).Zoom = value;
+ }
+ }
+ }
+
+
+ // Let's custom paint
+ protected override void OnPaint(PaintEventArgs pe)
+ {
+ // TODO: Add custom paint code here
+ // Calling the base class OnPaint
+ base.OnPaint(pe);
+ }
+
+ // React to changes in the project
+ private void project_changed(object sender, urakawa.events.DataModelChangedEventArgs e)
+ {
+ System.Diagnostics.Debug.Print(e.ToString());
+ if (e is urakawa.events.presentation.RootNodeChangedEventArgs)
+ {
+ }
+ else if (e is urakawa.events.core.ChildAddedEventArgs)
+ {
+ Track t = new Track();
+ t.Zoom = this.zoom;
+ Controls.Add(t);
+ SetFlowBreak(t, true);
+ }
+ else if (e is urakawa.events.core.ChildRemovedEventArgs)
+ {
+ Controls.RemoveAt(((urakawa.events.core.ChildRemovedEventArgs)e).RemovedPosition);
+ }
+ }
+ }
+}
Added: trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.resx
===================================================================
--- trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.resx (rev 0)
+++ trunk/urakawa/application/prototype/Bobi/Bobi/View/ProjectView.resx 2008-06-06 17:48:04 UTC (rev 3105)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </metadata>
+</root>
\ No newline at end of file
Added: trunk/urakawa/application/prototype/Bobi/Bobi/View/Track.Designer.cs
===================================================================
--- trunk/urakawa/application/prototype/Bobi/Bobi/View/Track.Designer.cs (rev 0)
+++ trunk/urakawa/application/prototype/Bobi/Bobi/View/Track.Designer.cs 2008-06-06 17:48:04 UTC (rev 3105)
@@ -0,0 +1,36 @@
+namespace Bobi.View
+{
+ partial class Track
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ components = new System.ComponentModel.Container();
+ }
+
+ #endregion
+ }
+}
Added: trunk/urakawa/application/prototype/Bobi/Bobi/View/Track.cs
===================================================================
--- trunk/urakawa/application/prototype/Bobi/Bobi/View/Track.cs (rev 0)
+++ trunk/urakawa/application/prototype/Bobi/Bobi/View/Track.cs 2008-06-06 17:48:04 UTC (rev 3105)
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Bobi.View
+{
+ public partial class Track : Control
+ {
+ private Size baseSize; // size at zoom factor 1
+ private double zoom; // zoom factor
+
+ public Track()
+ {
+ InitializeComponent();
+ DoubleBuffered = true;
+ this.baseSize = new Size(512, 144);
+ this.BackColor = Color.AliceBlue;
+ Zoom = 1.0;
+ }
+
+ [Browsable(true)]
+ public Size BaseSize
+ {
+ get { return this.baseSize; }
+ set
+ {
+ this.baseSize = value;
+ Zoom = this.Zoom; // resize the window using the current zoom factor
+ }
+ }
+
+ [Browsable(true)]
+ public double Zoom
+ {
+ get { return this.zoom; }
+ set
+ {
+ this.zoom = value;
+ this.Size = new Size((int)Math.Round(baseSize.Width * value), (int)Math.Round(baseSize.Height * value));
+ }
+ }
+
+ protected override void OnPaint(PaintEventArgs pe)
+ {
+ // TODO: Add custom paint code here
+ // Calling the base class OnPaint
+ base.OnPaint(pe);
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-06-02 08:05:21
|
Revision: 3104
http://urakawa.svn.sourceforge.net/urakawa/?rev=3104&view=rev
Author: avneeshsingh
Date: 2008-06-02 01:05:18 -0700 (Mon, 02 Jun 2008)
Log Message:
-----------
While playback is on, toggle views (F6) lands to playing phrase in contents view.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-30 15:20:00 UTC (rev 3103)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-06-02 08:05:18 UTC (rev 3104)
@@ -375,7 +375,13 @@
{
if (CanFocusOnContentView)
{
- if (mSelection != null && mSelection.Control is TOCView) Selection = new NodeSelection(mSelection.Node, mStripsView);
+ if (mSelection != null && mSelection.Control is TOCView)
+ {
+if ( TransportBar.IsPlayerActive )
+ Selection = new NodeSelection(mStripsView.PlaybackPhrase , mStripsView);
+ else
+ Selection = new NodeSelection(mSelection.Node, mStripsView);
+ }
mStripsView.Focus();
}
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-30 15:20:00 UTC (rev 3103)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-06-02 08:05:18 UTC (rev 3104)
@@ -1703,13 +1703,13 @@
if (PNode != null && mCurrentPlaylist.ContainsPhrase(PNode))
{
- if (PNode != mCurrentPlaylist.CurrentPhrase) // if selected node is not currently playing phrase
- {
+ if (PNode != mCurrentPlaylist.CurrentPhrase ) // if selected node is not currently playing phrase
+ {
if (mPlayer.State == Obi.Audio.AudioPlayerState.Paused) mCurrentPlaylist.Stop();
mCurrentPlaylist.CurrentPhrase = PNode;
- mCurrentPlaylist.CurrentTimeInAsset = ((AudioSelection)mView.Selection).AudioRange.CursorTime;
- }
+ if (mView.Selection is AudioSelection ) mCurrentPlaylist.CurrentTimeInAsset = ((AudioSelection)mView.Selection).AudioRange.CursorTime;
+ }
else if (mView.Selection is AudioSelection && ((AudioSelection)mView.Selection).AudioRange.HasCursor) // clicked on the same phrase
mCurrentPlaylist.CurrentTimeInAsset = ((AudioSelection)mView.Selection).AudioRange.CursorTime;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-30 15:20:07
|
Revision: 3103
http://urakawa.svn.sourceforge.net/urakawa/?rev=3103&view=rev
Author: avneeshsingh
Date: 2008-05-30 08:20:00 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Update to Playback in transport bar w.r.t. mouse clicks
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-29 18:06:13 UTC (rev 3102)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-30 15:20:00 UTC (rev 3103)
@@ -1703,12 +1703,18 @@
if (PNode != null && mCurrentPlaylist.ContainsPhrase(PNode))
{
- if (PNode != mCurrentPlaylist.CurrentPhrase)
+ if (PNode != mCurrentPlaylist.CurrentPhrase) // if selected node is not currently playing phrase
{
if (mPlayer.State == Obi.Audio.AudioPlayerState.Paused) mCurrentPlaylist.Stop();
+
mCurrentPlaylist.CurrentPhrase = PNode;
+ mCurrentPlaylist.CurrentTimeInAsset = ((AudioSelection)mView.Selection).AudioRange.CursorTime;
}
+ else if (mView.Selection is AudioSelection && ((AudioSelection)mView.Selection).AudioRange.HasCursor) // clicked on the same phrase
+ mCurrentPlaylist.CurrentTimeInAsset = ((AudioSelection)mView.Selection).AudioRange.CursorTime;
}
+
+
if (mCurrentPlaylist != mMasterPlaylist
&& !mCurrentPlaylist.ContainsPhrase(PNode))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-29 18:06:20
|
Revision: 3102
http://urakawa.svn.sourceforge.net/urakawa/?rev=3102&view=rev
Author: avneeshsingh
Date: 2008-05-29 11:06:13 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Added play heading phrase behaviour to play on navigate
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Playlist.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/Playlist.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-29 14:06:35 UTC (rev 3101)
+++ trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-29 18:06:13 UTC (rev 3102)
@@ -91,6 +91,23 @@
/// <summary>
+ /// If phrase node is passed as parameter, adds this phrase in playlist
+ /// else if section node is passed, add phrases of this section excluding child section to playlist
+ /// This is done independent of current selection
+ /// </summary>
+ /// <param name="player"></param>
+ /// <param name="node"></param>
+ public Playlist(AudioPlayer player,ObiNode node )
+ {
+ mPlayer = player;
+ Reset(LocalPlaylist);
+ AddPhraseNodes(node);
+ }
+
+
+
+
+ /// <summary>
/// Get the audio player for the playlist. Useful for setting up event listeners.
/// </summary>
public AudioPlayer Audioplayer { get { return mPlayer; } }
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-29 14:06:35 UTC (rev 3101)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-29 18:06:13 UTC (rev 3102)
@@ -1718,6 +1718,8 @@
mCurrentPlaylist.Stop();
//if (mView.Selection.Node is PhraseNode)
//PlayOrResume();
+ if (mView.Selection.Node is SectionNode && mView.ObiForm.Settings.PlayOnNavigate)
+ PlayHeadingPhrase(mView.SelectedNodeAs<SectionNode>());
}
else
{
@@ -1726,11 +1728,15 @@
}
}
}
- if (mView.ObiForm.Settings.PlayOnNavigate
- &&
- (mState == State.Paused || mState == State.Stopped )
- && mView.Selection.Node is PhraseNode )
- PlayOrResume () ;
+ if (mView.ObiForm.Settings.PlayOnNavigate
+ &&
+ (mState == State.Paused || mState == State.Stopped))
+ {
+ if (mView.Selection.Node is SectionNode)
+ PlayHeadingPhrase(mView.SelectedNodeAs<SectionNode>());
+ else if (mView.Selection.Node is PhraseNode)
+ PlayOrResume();
+ }
}// end of selection null check
}
@@ -1746,14 +1752,18 @@
if (((EmptyNode)node.PhraseChild(i)).NodeKind == EmptyNode.Kind.Heading)
{
ENode = node.PhraseChild(i);
- System.Media.SystemSounds.Asterisk.Play();
- break;
+ break;
}
}
if (ENode is PhraseNode)
{
- PlayOrResume(node.PhraseChild(0));
+ mLocalPlaylist = new Playlist(mPlayer, ENode);
+ SetPlaylistEvents(mLocalPlaylist);
+ mCurrentPlaylist = mLocalPlaylist;
+ mCurrentPlaylist.CurrentPhrase = (PhraseNode) ENode ;
+ mCurrentPlaylist.Play();
+ //PlayOrResume(node.PhraseChild(0));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-29 14:06:37
|
Revision: 3101
http://urakawa.svn.sourceforge.net/urakawa/?rev=3101&view=rev
Author: avneeshsingh
Date: 2008-05-29 07:06:35 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Some updates to playback in transport bar
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-28 15:09:48 UTC (rev 3100)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-29 14:06:35 UTC (rev 3101)
@@ -1687,7 +1687,7 @@
{
if ( mView.Selection != null )
{
- if (mState != State.Stopped)
+ if (mState == State.Playing || mState == State.Paused)
{
ObiNode node = mView.Selection.Node;
PhraseNode PNode = null;
@@ -1716,7 +1716,8 @@
{
mView.PlaybackPhrase = null;
mCurrentPlaylist.Stop();
- PlayOrResume();
+ //if (mView.Selection.Node is PhraseNode)
+ //PlayOrResume();
}
else
{
@@ -1734,7 +1735,29 @@
}
+ private void PlayHeadingPhrase( SectionNode node )
+ {
+ if ( node != null && node.PhraseChildCount > 0 )
+ {
+ EmptyNode ENode = node.PhraseChild(0);
+
+ for (int i = 0; i < node.PhraseChildCount ; i++)
+ {
+ if (((EmptyNode)node.PhraseChild(i)).NodeKind == EmptyNode.Kind.Heading)
+ {
+ ENode = node.PhraseChild(i);
+ System.Media.SystemSounds.Asterisk.Play();
+ break;
+ }
+ }
+ if (ENode is PhraseNode)
+ {
+ PlayOrResume(node.PhraseChild(0));
+ }
+ }
+ }
+
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-28 15:09:52
|
Revision: 3100
http://urakawa.svn.sourceforge.net/urakawa/?rev=3100&view=rev
Author: avneeshsingh
Date: 2008-05-28 08:09:48 -0700 (Wed, 28 May 2008)
Log Message:
-----------
Play on navigates works but may misbehave right now - needs more refinement
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-28 06:32:17 UTC (rev 3099)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-28 15:09:48 UTC (rev 3100)
@@ -383,7 +383,10 @@
if (mView != null) throw new Exception("Cannot set the project view again!");
mView = value;
UpdateButtons();
- mView.SelectionChanged += new EventHandler(delegate(object sender, EventArgs e) { UpdateButtons(); });
+ mView.SelectionChanged += new EventHandler(delegate(object sender, EventArgs e) {
+ UpdateButtons();
+ PlaybackOnSelectionChange();
+ });
}
}
@@ -1679,6 +1682,59 @@
}
}
+
+ private void PlaybackOnSelectionChange ()
+ {
+ if ( mView.Selection != null )
+ {
+ if (mState != State.Stopped)
+ {
+ ObiNode node = mView.Selection.Node;
+ PhraseNode PNode = null;
+
+ if (node is PhraseNode)
+ PNode = (PhraseNode)node;
+ else if (node is SectionNode)
+ {
+ if (((SectionNode)node).PhraseChildCount > 0
+ && ((SectionNode)node).PhraseChild(0) is PhraseNode)
+ PNode = (PhraseNode)((SectionNode)node).PhraseChild(0);
+ }
+
+ if (PNode != null && mCurrentPlaylist.ContainsPhrase(PNode))
+ {
+ if (PNode != mCurrentPlaylist.CurrentPhrase)
+ {
+ if (mPlayer.State == Obi.Audio.AudioPlayerState.Paused) mCurrentPlaylist.Stop();
+ mCurrentPlaylist.CurrentPhrase = PNode;
+ }
+ }
+ if (mCurrentPlaylist != mMasterPlaylist
+ && !mCurrentPlaylist.ContainsPhrase(PNode))
+ {
+ if (mState == State.Playing)
+ {
+ mView.PlaybackPhrase = null;
+ mCurrentPlaylist.Stop();
+ PlayOrResume();
+ }
+ else
+ {
+ mView.PlaybackPhrase = null;
+ mCurrentPlaylist.Stop();
+ }
+ }
+ }
+ if (mView.ObiForm.Settings.PlayOnNavigate
+ &&
+ (mState == State.Paused || mState == State.Stopped )
+ && mView.Selection.Node is PhraseNode )
+ PlayOrResume () ;
+ }// end of selection null check
+
+ }
+
+
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-28 06:32:25
|
Revision: 3099
http://urakawa.svn.sourceforge.net/urakawa/?rev=3099&view=rev
Author: avneeshsingh
Date: 2008-05-27 23:32:17 -0700 (Tue, 27 May 2008)
Log Message:
-----------
Transition from play all to play selection and vice versa added during paused state.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-27 12:28:12 UTC (rev 3098)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-28 06:32:17 UTC (rev 3099)
@@ -614,9 +614,9 @@
// Update the transport manu
private void UpdateTransportMenu()
{
- mPlayToolStripMenuItem.Enabled = mProjectView.CanPlay || mProjectView.CanPlaySelection;
- mPlayAllToolStripMenuItem.Enabled = mProjectView.CanPlay;
- mPlaySelectionToolStripMenuItem.Enabled = mProjectView.CanPlaySelection;
+ mPlayToolStripMenuItem.Enabled = mProjectView.CanPlay || mProjectView.CanPlaySelection || mProjectView.CanResume ;
+ mPlayAllToolStripMenuItem.Enabled = mProjectView.CanPlay || mProjectView.CanResume;
+ mPlaySelectionToolStripMenuItem.Enabled = mProjectView.CanPlaySelection || mProjectView.CanResume ;
if (mProjectView.CanResume)
{
mPauseToolStripMenuItem.Visible = false;
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-27 12:28:12 UTC (rev 3098)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-28 06:32:17 UTC (rev 3099)
@@ -576,12 +576,24 @@
/// </summary>
public void PlayAll()
{
- if (CanPlay)
+ if (CanPlay)
{
mCurrentPlaylist = mMasterPlaylist;
PlayCurrentPlaylistFromSelection();
}
- }
+ else if (CanResumePlayback)
+ {
+ if (mCurrentPlaylist != mMasterPlaylist) // if this is local playlist, start playing master playlist from the point where local playlist has paused
+ {
+ UpdateSelectionForPlayModeTransition();
+ Thread.Sleep(200);
+ mCurrentPlaylist = mMasterPlaylist;
+ PlayCurrentPlaylistFromSelection();
+ }
+ else
+ mCurrentPlaylist.Resume();
+ }
+ }
/// <summary>
/// All-purpose play function for the play button.
@@ -591,17 +603,38 @@
/// </summary>
public void PlayOrResume()
{
- if (CanPlay)
+ if (CanPlay )
{
- PlayOrResume(mView.Selection == null ? null : mView.Selection.Node);
+ PlayOrResume(mView.Selection == null ? null : mView.Selection.Node);
}
else if (CanResumePlayback)
{
+ if (mCurrentPlaylist == mMasterPlaylist) // if this is master playlist, start playing local playlist from the point where master playlist is paused
+ {
+ UpdateSelectionForPlayModeTransition();
+ Thread.Sleep(200);
+ PlayOrResume(mView.Selection == null ? null : mView.Selection.Node);
+ }
+ else
mCurrentPlaylist.Resume();
}
}
+
/// <summary>
+ /// Select currently playing phrase with current time and stops current playlist for transition to other playlist
+ /// </summary>
+ private void UpdateSelectionForPlayModeTransition()
+ {
+ PhraseNode PlaybackStartNode = mCurrentPlaylist.CurrentPhrase;
+ double StartTime = mCurrentPlaylist.CurrentTimeInAsset;
+ mCurrentPlaylist.Stop();
+ mView.SelectedBlockNode = PlaybackStartNode;
+ mView.Selection = new AudioSelection((PhraseNode)mView.Selection.Node, mView.Selection.Control,
+ new AudioRange(StartTime));
+ }
+
+ /// <summary>
/// Play a single node (phrase or section), or everything if the node is null
/// (and the mPlayIfNoSelection flag is set.)
/// </summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-27 12:28:17
|
Revision: 3098
http://urakawa.svn.sourceforge.net/urakawa/?rev=3098&view=rev
Author: avneeshsingh
Date: 2008-05-27 05:28:12 -0700 (Tue, 27 May 2008)
Log Message:
-----------
To_do improvement implemented in transport bar.
But slight misbehaviour observed due to already submitted bugg no. 1970511
Remaining clean up of old implementation.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-22 19:45:22 UTC (rev 3097)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-27 12:28:12 UTC (rev 3098)
@@ -1625,9 +1625,11 @@
EmptyNode node;
if (IsRecording)
{
- node = mRecordingSection.PhraseChild(mRecordingSection.PhraseChildCount - 1);
- mView.Presentation.getUndoRedoManager().execute(new Commands.Node.ChangeCustomType(mView, node,
- EmptyNode.Kind.TODO));
+ node =(EmptyNode) mRecordingSection.PhraseChild(mRecordingSection.PhraseChildCount - 1);
+
+ mView.Presentation.getUndoRedoManager ().execute ( new Commands.Node.ToggleNodeTo_Do(mView , node) );
+ //mView.Presentation.getUndoRedoManager().execute(new Commands.Node.ChangeCustomType(mView, node,
+ //EmptyNode.Kind.TODO));
NextPhrase();
}
else
@@ -1636,8 +1638,10 @@
if (node != null)
{
- mView.Presentation.getUndoRedoManager().execute(new Commands.Node.ChangeCustomType(mView, node,
- EmptyNode.Kind.TODO));
+ mView.Presentation.getUndoRedoManager().execute(new Commands.Node.ToggleNodeTo_Do(mView, node));
+
+ //mView.Presentation.getUndoRedoManager().execute(new Commands.Node.ChangeCustomType(mView, node,
+ //EmptyNode.Kind.TODO));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-22 19:45:28
|
Revision: 3097
http://urakawa.svn.sourceforge.net/urakawa/?rev=3097&view=rev
Author: avneeshsingh
Date: 2008-05-22 12:45:22 -0700 (Thu, 22 May 2008)
Log Message:
-----------
New To_do implementation works from front end. remaining work : make it work for transport bar and cleaning of old implementation.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-22 19:09:54 UTC (rev 3096)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-22 19:45:22 UTC (rev 3097)
@@ -1557,12 +1557,15 @@
}
else
{
+ mProjectView.ToggleEmptyNodeTo_DoMark();
+ /*
EmptyNode node = mProjectView.SelectedNodeAs<EmptyNode>();
if (node != null)
{
mProjectView.Presentation.getUndoRedoManager().execute(new Commands.Node.ChangeCustomType(mProjectView, node,
EmptyNode.Kind.TODO));
}
+ */
}
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-22 19:09:54 UTC (rev 3096)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-22 19:45:22 UTC (rev 3097)
@@ -945,7 +945,7 @@
{
for (ObiNode n = mView.SelectedNodeAs<ObiNode>().FollowingNode; n != null; n = n.FollowingNode)
{
- if (n is EmptyNode && ((EmptyNode)n).NodeKind == EmptyNode.Kind.TODO)
+ if (n is EmptyNode && ((EmptyNode)n).IsTo_Do)
{
mView.Selection = new NodeSelection(n, this);
return;
@@ -954,7 +954,7 @@
}
for (ObiNode n = mView.Presentation.RootNode.FirstLeaf; n != null; n = n.FollowingNode)
{
- if (n is EmptyNode && ((EmptyNode)n).NodeKind == EmptyNode.Kind.TODO)
+ if (n is EmptyNode && ((EmptyNode)n).IsTo_Do)
{
mView.Selection = new NodeSelection(n, this);
return;
@@ -971,7 +971,7 @@
{
for (ObiNode n = mView.SelectedNodeAs<ObiNode>().PrecedingNode; n != null; n = n.PrecedingNode)
{
- if (n is EmptyNode && ((EmptyNode)n).NodeKind == EmptyNode.Kind.TODO)
+ if (n is EmptyNode && ((EmptyNode)n).IsTo_Do )
{
mView.Selection = new NodeSelection(n, this);
return;
@@ -980,7 +980,7 @@
}
for (ObiNode n = mView.Presentation.RootNode.LastLeaf; n != null; n = n.PrecedingNode)
{
- if (n is EmptyNode && ((EmptyNode)n).NodeKind == EmptyNode.Kind.TODO)
+ if (n is EmptyNode && ((EmptyNode)n).IsTo_Do)
{
mView.Selection = new NodeSelection(n, this);
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <avn...@us...> - 2008-05-22 10:23:28
|
Revision: 3095
http://urakawa.svn.sourceforge.net/urakawa/?rev=3095&view=rev
Author: avneeshsingh
Date: 2008-05-22 03:23:24 -0700 (Thu, 22 May 2008)
Log Message:
-----------
fix to bugg 1930391:
Renaming strip followed by undo make loose keyboard focus.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Commands/Node/RenameSection.cs
Modified: trunk/urakawa/application/Obi/Obi/Commands/Node/RenameSection.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Commands/Node/RenameSection.cs 2008-05-22 09:34:39 UTC (rev 3094)
+++ trunk/urakawa/application/Obi/Obi/Commands/Node/RenameSection.cs 2008-05-22 10:23:24 UTC (rev 3095)
@@ -34,6 +34,7 @@
{
View.Presentation.RenameSectionNode(mNode, mOldLabel);
base.unExecute();
+ View.Selection = new NodeSelection(mNode, SelectionBefore.Control);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-22 09:34:44
|
Revision: 3094
http://urakawa.svn.sourceforge.net/urakawa/?rev=3094&view=rev
Author: julienq
Date: 2008-05-22 02:34:39 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Reviewing recording. Restored selection of recorded phrase.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-22 08:14:17 UTC (rev 3093)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-22 09:34:39 UTC (rev 3094)
@@ -101,10 +101,12 @@
dialog.DisableAutoTitleCheckbox();
dialog.Text = Localizer.Message("create_new_project_from_import");
if (dialog.ShowDialog() != DialogResult.OK) return;
+ mSettings.NewProjectDialogSize = dialog.Size;
CreateNewProject(dialog.Path, dialog.Title, false, dialog.ID);
try
{
(new ImportStructure()).ImportFromXHTML(openFile.FileName, mSession.Presentation);
+ mSession.ForceSave();
}
catch (Exception e)
{
@@ -113,7 +115,6 @@
File.Delete(dialog.Path);
return;
}
- mSettings.NewProjectDialogSize = dialog.Size;
}
// Open a new project from a file chosen by the user.
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-22 08:14:17 UTC (rev 3093)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-22 09:34:39 UTC (rev 3094)
@@ -1437,6 +1437,12 @@
PhraseNode playing = mTransportBar.PlaybackPhrase;
return playing == null ? SelectedNodeAs<PhraseNode>() : playing;
}
+
+ private void ProjectView_Layout(object sender, LayoutEventArgs e)
+ {
+ System.Diagnostics.Debug.Print("LAYOUT form ProjectView: control={0}, component={1}, property={2}",
+ e.AffectedControl, e.AffectedComponent, e.AffectedProperty);
+ }
}
public class ImportingFileEventArgs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-22 08:14:17 UTC (rev 3093)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-22 09:34:39 UTC (rev 3094)
@@ -32,13 +32,13 @@
this.mFindInTextSplitter = new System.Windows.Forms.SplitContainer();
this.mTOCSplitter = new System.Windows.Forms.SplitContainer();
this.mMetadataSplitter = new System.Windows.Forms.SplitContainer();
+ this.mPanelInfoLabelButton = new System.Windows.Forms.Button();
+ this.mNoProjectLabel = new System.Windows.Forms.Label();
this.mTOCView = new Obi.ProjectView.TOCView();
this.mMetadataView = new Obi.ProjectView.MetadataView();
- this.mPanelInfoLabelButton = new System.Windows.Forms.Button();
this.mStripsView = new Obi.ProjectView.StripsView();
this.mFindInText = new Obi.ProjectView.FindInText();
this.mTransportBar = new Obi.ProjectView.TransportBar();
- this.mNoProjectLabel = new System.Windows.Forms.Label();
this.mTransportBarSplitter.Panel1.SuspendLayout();
this.mTransportBarSplitter.Panel2.SuspendLayout();
this.mTransportBarSplitter.SuspendLayout();
@@ -132,6 +132,33 @@
this.mMetadataSplitter.SplitterDistance = 379;
this.mMetadataSplitter.TabIndex = 0;
//
+ // mPanelInfoLabelButton
+ //
+ this.mPanelInfoLabelButton.AccessibleName = "Panel Splitter";
+ this.mPanelInfoLabelButton.AccessibleRole = System.Windows.Forms.AccessibleRole.None;
+ this.mPanelInfoLabelButton.Anchor = System.Windows.Forms.AnchorStyles.Right;
+ this.mPanelInfoLabelButton.AutoSize = true;
+ this.mPanelInfoLabelButton.BackColor = System.Drawing.Color.Transparent;
+ this.mPanelInfoLabelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.mPanelInfoLabelButton.Location = new System.Drawing.Point(-5, -1);
+ this.mPanelInfoLabelButton.Name = "mPanelInfoLabelButton";
+ this.mPanelInfoLabelButton.Size = new System.Drawing.Size(6, 6);
+ this.mPanelInfoLabelButton.TabIndex = 2;
+ this.mPanelInfoLabelButton.UseVisualStyleBackColor = false;
+ this.mPanelInfoLabelButton.Leave += new System.EventHandler(this.mPanelInfoLabelButton_Leave);
+ this.mPanelInfoLabelButton.Enter += new System.EventHandler(this.mPanelInfoLabelButton_Enter);
+ //
+ // mNoProjectLabel
+ //
+ this.mNoProjectLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.mNoProjectLabel.AutoSize = true;
+ this.mNoProjectLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.mNoProjectLabel.Location = new System.Drawing.Point(442, 340);
+ this.mNoProjectLabel.Name = "mNoProjectLabel";
+ this.mNoProjectLabel.Size = new System.Drawing.Size(81, 20);
+ this.mNoProjectLabel.TabIndex = 1;
+ this.mNoProjectLabel.Text = "No project";
+ //
// mTOCView
//
this.mTOCView.AutoScroll = true;
@@ -153,22 +180,6 @@
this.mMetadataView.Size = new System.Drawing.Size(271, 244);
this.mMetadataView.TabIndex = 0;
//
- // mPanelInfoLabelButton
- //
- this.mPanelInfoLabelButton.AccessibleName = "Panel Splitter";
- this.mPanelInfoLabelButton.AccessibleRole = System.Windows.Forms.AccessibleRole.None;
- this.mPanelInfoLabelButton.Anchor = System.Windows.Forms.AnchorStyles.Right;
- this.mPanelInfoLabelButton.AutoSize = true;
- this.mPanelInfoLabelButton.BackColor = System.Drawing.Color.Transparent;
- this.mPanelInfoLabelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.mPanelInfoLabelButton.Location = new System.Drawing.Point(-5, -1);
- this.mPanelInfoLabelButton.Name = "mPanelInfoLabelButton";
- this.mPanelInfoLabelButton.Size = new System.Drawing.Size(6, 6);
- this.mPanelInfoLabelButton.TabIndex = 2;
- this.mPanelInfoLabelButton.UseVisualStyleBackColor = false;
- this.mPanelInfoLabelButton.Leave += new System.EventHandler(this.mPanelInfoLabelButton_Leave);
- this.mPanelInfoLabelButton.Enter += new System.EventHandler(this.mPanelInfoLabelButton_Enter);
- //
// mStripsView
//
this.mStripsView.BackColor = System.Drawing.Color.Transparent;
@@ -197,17 +208,6 @@
this.mTransportBar.Size = new System.Drawing.Size(1060, 35);
this.mTransportBar.TabIndex = 0;
//
- // mNoProjectLabel
- //
- this.mNoProjectLabel.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.mNoProjectLabel.AutoSize = true;
- this.mNoProjectLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.mNoProjectLabel.Location = new System.Drawing.Point(442, 340);
- this.mNoProjectLabel.Name = "mNoProjectLabel";
- this.mNoProjectLabel.Size = new System.Drawing.Size(81, 20);
- this.mNoProjectLabel.TabIndex = 1;
- this.mNoProjectLabel.Text = "No project";
- //
// ProjectView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -218,6 +218,7 @@
this.DoubleBuffered = true;
this.Name = "ProjectView";
this.Size = new System.Drawing.Size(964, 700);
+ this.Layout += new System.Windows.Forms.LayoutEventHandler(this.ProjectView_Layout);
this.mTransportBarSplitter.Panel1.ResumeLayout(false);
this.mTransportBarSplitter.Panel2.ResumeLayout(false);
this.mTransportBarSplitter.ResumeLayout(false);
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs 2008-05-22 08:14:17 UTC (rev 3093)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs 2008-05-22 09:34:39 UTC (rev 3094)
@@ -396,9 +396,6 @@
else
return base.ProcessDialogKey(KeyData);
}
-
-
-
}
/// <summary>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-22 08:14:17 UTC (rev 3093)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-22 09:34:39 UTC (rev 3094)
@@ -27,7 +27,7 @@
private bool mPlayIfNoSelection; // play all when no selection if true; play nothing otherwise
private int mPreviewDuration; // duration of preview playback in milliseconds (from the settings)
- private PhraseNode mResumerecordingPhrase; // last phrase recorded (?)
+ private PhraseNode mResumeRecordingPhrase; // last phrase recorded (?)
private SectionNode mRecordingSection; // Section in which we are recording
private PhraseNode mRecordingPhrase; // Phrase which we are recording in (after start, before end)
@@ -188,7 +188,8 @@
}
/// <summary>
- /// Split time is either
+ /// Split time is either the current playback position,
+ /// or when stopped, the selection position.
/// </summary>
public double SplitTime
{
@@ -712,7 +713,7 @@
mView.Presentation.UpdateAudioForPhrase(mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + i),
mRecordingSession.RecordedAudio[i]);
}
- mResumerecordingPhrase = (PhraseNode)mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + mRecordingSession.RecordedAudio.Count - 1);
+ mResumeRecordingPhrase = (PhraseNode)mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + mRecordingSession.RecordedAudio.Count - 1);
mRecordingSession = null;
UpdateTimeDisplay();
}
@@ -766,19 +767,138 @@
}
else if (CanResumeRecording)
{
- PrepareForRecording(true, mResumerecordingPhrase);
+ SetupRecording(Recording);
+ // PrepareForRecording(true, mResumeRecordingPhrase);
}
else
{
- PrepareForRecording(false, null);
+ SetupRecording(Monitoring);
+ // PrepareForRecording(false, null);
}
}
+
+ // Parameters for StartRecordingOrMonitoring
+ private static readonly bool Recording = true;
+ private static readonly bool Monitoring = false;
+
+ // Setup recording and start recording or monitoring
+ private void SetupRecording(bool recording)
+ {
+ urakawa.undo.CompositeCommand command = CreateRecordingCommand();
+ ObiNode node = GetRecordingNode(command);
+ InitRecordingSectionAndPhraseIndex(node, mView.ObiForm.Settings.AllowOverwrite, command);
+ // Set events
+ mRecordingSession = new RecordingSession(mView.Presentation, mRecorder);
+ mRecordingSession.StartingPhrase += new Obi.Events.Audio.Recorder.StartingPhraseHandler(
+ delegate(object sender, Obi.Events.Audio.Recorder.PhraseEventArgs e)
+ {
+ RecordingPhraseStarted(e, command, (EmptyNode)(node.GetType() == typeof(EmptyNode) ? node : null));
+ });
+ mRecordingSession.FinishingPhrase += new Obi.Events.Audio.Recorder.FinishingPhraseHandler(
+ delegate(object sender, Obi.Events.Audio.Recorder.PhraseEventArgs e) { RecordingPhraseEnded(e); });
+ mRecordingSession.FinishingPage += new Events.Audio.Recorder.FinishingPageHandler(
+ delegate(object sender, Obi.Events.Audio.Recorder.PhraseEventArgs e) { RecordingPage(e); });
+ // Actually start monitoring or recording
+ if (recording)
+ {
+ StartRecording();
+ }
+ else
+ {
+ mRecordingSession.StartMonitoring();
+ }
+ }
+
+ // Create a new recording command.
+ private urakawa.undo.CompositeCommand CreateRecordingCommand()
+ {
+ urakawa.undo.CompositeCommand command = mView.Presentation.getCommandFactory().createCompositeCommand();
+ command.setShortDescription(Localizer.Message("recording_command"));
+ return command;
+ }
+
+ // Initialize recording section/phrase index depending on the
+ // context node for recording and the settings.
+ private void InitRecordingSectionAndPhraseIndex(ObiNode node, bool overwrite, urakawa.undo.CompositeCommand command)
+ {
+ if (node is SectionNode)
+ {
+ // Record at the end of the section, or after the cursor
+ // in case of a cursor selection in the section.
+ mRecordingSection = (SectionNode)node;
+ mRecordingInitPhraseIndex = mView.Selection is StripCursorSelection ?
+ ((StripCursorSelection)mView.Selection).Index : mRecordingSection.PhraseChildCount;
+ }
+ else if (node is PhraseNode)
+ {
+ // Record in or after the phrase node, depending on overwrite settings.
+ mRecordingSection = node.AncestorAs<SectionNode>();
+ mRecordingInitPhraseIndex = 1 + node.Index;
+ if (overwrite && (mState == State.Paused ||
+ (mView.Selection is AudioSelection && ((AudioSelection)mView.Selection).AudioRange.HasCursor)))
+ {
+ // TODO: we cannot record from pause at the moment; maybe that's not so bad actually.
+ command.append(new Commands.Node.SplitAudio(mView, SplitTime));
+ }
+ }
+ else if (node is EmptyNode)
+ {
+ // Record inside the empty node
+ mRecordingSection = node.AncestorAs<SectionNode>();
+ mRecordingInitPhraseIndex = node.Index;
+ }
+ }
+
+ // Start recording a phrase, possibly replacing an empty node (only for the first one.)
+ private void RecordingPhraseStarted(Obi.Events.Audio.Recorder.PhraseEventArgs e,
+ urakawa.undo.CompositeCommand command, EmptyNode emptyNode)
+ {
+ // Suspend presentation change handler so that we don't stop when new nodes are added.
+ mView.Presentation.changed -= new EventHandler<urakawa.events.DataModelChangedEventArgs>(Presentation_Changed);
+ PhraseNode phrase = mView.Presentation.CreatePhraseNode(e.Audio);
+ mRecordingPhrase = phrase;
+ Commands.Node.AddNode add = new Commands.Node.AddNode(mView, phrase, mRecordingSection,
+ mRecordingInitPhraseIndex + e.PhraseIndex);
+ //add.UpdateSelection = false;
+ if (e.PhraseIndex == 0)
+ {
+ command.append(add);
+ if (emptyNode != null && e.PhraseIndex == 0)
+ {
+ phrase.CopyKind(emptyNode);
+ phrase.Used = emptyNode.Used;
+ command.append(new Commands.Node.Delete(mView, emptyNode));
+ }
+ mView.Presentation.getUndoRedoManager().execute(command);
+ }
+ else
+ {
+ mView.Presentation.getUndoRedoManager().execute(add);
+ }
+ mView.Presentation.changed += new EventHandler<urakawa.events.DataModelChangedEventArgs>(Presentation_Changed);
+ }
+
+ // Stop recording a phrase
+ private void RecordingPhraseEnded(Obi.Events.Audio.Recorder.PhraseEventArgs e)
+ {
+ PhraseNode phrase = (PhraseNode)mRecordingSection.PhraseChild(e.PhraseIndex + mRecordingInitPhraseIndex);
+ phrase.SignalAudioChanged(this, e.Audio);
+ mRecordingPhrase = null;
+ }
+
+ // Start recording a new page, set the right page number
+ private void RecordingPage(Obi.Events.Audio.Recorder.PhraseEventArgs e)
+ {
+ PhraseNode phrase = (PhraseNode)mRecordingSection.PhraseChild(e.PhraseIndex + mRecordingInitPhraseIndex + 1);
+ phrase.PageNumber = mView.Presentation.PageNumberFor(phrase);
+ }
+
// Prepare for recording and return the corresponding recording command.
- private void PrepareForRecording(bool startRecording, ObiNode selected)
+ private void __PrepareForRecording(bool startRecording, ObiNode selected)
{
urakawa.undo.CompositeCommand command = CreateRecordingCommand();
- selected = GetRecordingSection(selected, command);
+ selected = __GetRecordingSection(selected, command);
EmptyNode emptyNode = null; // empty node to record in
// TODO: record at the position in the block, or replace the waveform selection
if (selected is SectionNode)
@@ -884,7 +1004,7 @@
mRecordingSession.FinishingPage += new Events.Audio.Recorder.FinishingPageHandler(
delegate(object sender, Obi.Events.Audio.Recorder.PhraseEventArgs e)
{
- SetPageNumberWhileRecording(e);
+ RecordingPage(e);
});
if (startRecording)
{
@@ -896,19 +1016,11 @@
}
}
- // Create a new recording command.
- private urakawa.undo.CompositeCommand CreateRecordingCommand()
- {
- urakawa.undo.CompositeCommand command = mView.Presentation.getCommandFactory().createCompositeCommand();
- command.setShortDescription(Localizer.Message("recording_command"));
- return command;
- }
-
// Get the recording section from the initial selection argument.
// If the argument is null, get the selection, otherwise add a new
// top-level section to record in (so the recording command includes
// creating the new section.)
- private ObiNode GetRecordingSection(ObiNode selected, urakawa.undo.CompositeCommand command)
+ private ObiNode __GetRecordingSection(ObiNode selected, urakawa.undo.CompositeCommand command)
{
mView.SelectInContentView();
if (selected == null) selected = mView.SelectedNodeAs<ObiNode>();
@@ -925,6 +1037,28 @@
return selected;
}
+ // Get a node to record in. If we are resuming, this is the node to resume from;
+ // otherwise the selected node (section or phrase) for node selection, audio selection
+ // or strip cursor selection. If there is no node, add to the recording command a
+ // command to create a new section to record in.
+ public ObiNode GetRecordingNode(urakawa.undo.CompositeCommand command)
+ {
+ ObiNode node = mResumeRecordingPhrase == null ?
+ mView.Selection is NodeSelection || mView.Selection is AudioSelection || mView.Selection is StripCursorSelection ?
+ mView.Selection.Node : null :
+ mResumeRecordingPhrase;
+ if (node == null)
+ {
+ SectionNode section = mView.Presentation.CreateSectionNode();
+ Commands.Node.AddNode add = new Commands.Node.AddNode(mView, section, mView.Presentation.RootNode,
+ mView.Presentation.RootNode.SectionChildCount);
+ add.UpdateSelection = false;
+ command.append(add);
+ node = section;
+ }
+ return node;
+ }
+
// Start recording
void StartRecording()
{
@@ -1118,10 +1252,10 @@
{
if (mState == State.Recording)
{
- // mark section
PauseRecording();
mView.AddSection();
- PrepareForRecording(true, null);
+ SetupRecording(Recording);
+ // PrepareForRecording(true, null);
}
else if (mState == State.Monitoring)
{
@@ -1383,22 +1517,14 @@
{
if (mRecordingSession == null && mCurrentPlaylist.Audioplayer.State != Obi.Audio.AudioPlayerState.Playing)
{
- PrepareForRecording(true, null);
+ SetupRecording(Recording);
+ //PrepareForRecording(true, null);
}
}
- private void SetPageNumberWhileRecording(Obi.Events.Audio.Recorder.PhraseEventArgs e)
- {
- // argument e contains index of last phrase of just finished page
- //so index should be incremented by one to get page of newly created page.
- int PageNumber = mView.Presentation.PageNumberFor(mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + e.PhraseIndex + 1 ));
- urakawa.undo.ICommand cmd = new Commands.Node.SetPageNumber(mView, (EmptyNode)mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + e.PhraseIndex + 1), PageNumber);
- cmd.execute();
- }
-
// Stop recording
private void StopRecording()
{
@@ -1406,9 +1532,6 @@
(mRecordingSession.AudioRecorder.State == Obi.Audio.AudioRecorderState.Monitoring ||
mRecordingSession.AudioRecorder.State == Obi.Audio.AudioRecorderState.Recording))
{
- //ResetTimeDisplayForFinishedRecording();
-
-
mRecordingSession.Stop();
// update phrases with audio assets
for (int i = 0; i < mRecordingSession.RecordedAudio.Count; ++i)
@@ -1416,19 +1539,24 @@
mView.Presentation.UpdateAudioForPhrase(mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + i),
mRecordingSession.RecordedAudio[i]);
}
- mRecordButton.Enabled = true;
- mRecordButton.AccessibleName = Localizer.Message("record");
+ UpdateButtons();
+ /*if (mRecordingSession.RecordedAudio.Count > 0)
+ {
+ mView.SelectPhraseInContentView((PhraseNode)
+ mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + mRecordingSession.RecordedAudio.Count - 1));
+ }*/
mRecordingSession = null;
- mResumerecordingPhrase = null;
-
+ mResumeRecordingPhrase = null;
// enable playback controls
+ /* mRecordButton.Enabled = true;
+ mRecordButton.AccessibleName = Localizer.Message("record");
mPlayButton.Enabled = true;
mPrevPhraseButton.Enabled = true;
mPrevSectionButton.Enabled = true;
mPreviousPageButton.Enabled = true;
mFastForwardButton.Enabled = true;
mRewindButton.Enabled = true;
- mFastPlayRateCombobox.Enabled = true;
+ mFastPlayRateCombobox.Enabled = true; */
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-22 08:14:21
|
Revision: 3093
http://urakawa.svn.sourceforge.net/urakawa/?rev=3093&view=rev
Author: avneeshsingh
Date: 2008-05-22 01:14:17 -0700 (Thu, 22 May 2008)
Log Message:
-----------
fix to bugg 1967718:
Screenreader speak too much info in section in contents view
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
trunk/urakawa/application/Obi/Obi/messages.Designer.cs
trunk/urakawa/application/Obi/Obi/messages.resx
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-20 11:17:21 UTC (rev 3092)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-22 08:14:17 UTC (rev 3093)
@@ -411,7 +411,16 @@
}
// Set verbose accessible name for the strip
- private void SetAccessibleName() { mLabel.AccessibleName = mNode.ToString(); }
+ private void SetAccessibleName()
+ {
+ mLabel.AccessibleName = string.Concat ( mNode.Used ? "" : Localizer.Message("unused"),
+ mNode.Label,
+ mNode.Duration== 0.0 ? Localizer.Message("empty") : string.Format(Localizer.Message("time_in_seconds"), mNode.Duration / 1000.0),
+ string.Format(Localizer.Message("section_level_to_string"), mNode.IsRooted ? mNode.Level: 0),
+ mNode.PhraseChildCount == 0 ? "" :
+ mNode.PhraseChildCount== 1 ? Localizer.Message("section_one_phrase_to_string") :
+ string.Format(Localizer.Message("section_phrases_to_string"), mNode.PhraseChildCount));
+ }
// Toggle selection when clicking
private void Strip_Click(object sender, EventArgs e)
Modified: trunk/urakawa/application/Obi/Obi/messages.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-20 11:17:21 UTC (rev 3092)
+++ trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-22 08:14:17 UTC (rev 3093)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1433
+// Runtime Version:2.0.50727.42
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -1733,7 +1733,7 @@
}
/// <summary>
- /// Looks up a localized string similar to , level {0}.
+ /// Looks up a localized string similar to , depth {0}.
/// </summary>
internal static string section_level_to_string {
get {
Modified: trunk/urakawa/application/Obi/Obi/messages.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-20 11:17:21 UTC (rev 3092)
+++ trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-22 08:14:17 UTC (rev 3093)
@@ -903,7 +903,7 @@
<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">
- <value>, level {0}</value>
+ <value>, depth {0}</value>
</data>
<data name="section_one_phrase_to_string" xml:space="preserve">
<value>, 1 phrase</value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-20 11:18:13
|
Revision: 3092
http://urakawa.svn.sourceforge.net/urakawa/?rev=3092&view=rev
Author: julienq
Date: 2008-05-20 04:17:21 -0700 (Tue, 20 May 2008)
Log Message:
-----------
Some cosmetic changes
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Dialogs/About.Designer.cs
trunk/urakawa/application/Obi/Obi/Dialogs/About.cs
trunk/urakawa/application/Obi/Obi/Dialogs/About.resx
trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs
trunk/urakawa/application/Obi/Obi/Obi.csproj
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/Settings.cs
trunk/urakawa/application/Obi/Obi/about_en.html
trunk/urakawa/application/Obi/Obi/messages.Designer.cs
trunk/urakawa/application/Obi/Obi/messages.resx
Added Paths:
-----------
trunk/urakawa/application/Obi/Obi/images/obird_right_48.png
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/About.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/About.Designer.cs 2008-05-20 11:06:18 UTC (rev 3091)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/About.Designer.cs 2008-05-20 11:17:21 UTC (rev 3092)
@@ -62,8 +62,6 @@
|
|
From: <avn...@us...> - 2008-05-20 11:06:51
|
Revision: 3091
http://urakawa.svn.sourceforge.net/urakawa/?rev=3091&view=rev
Author: avneeshsingh
Date: 2008-05-20 04:06:18 -0700 (Tue, 20 May 2008)
Log Message:
-----------
Menu items updated for toggle TOC views/Content View function. Enabling / Disabling not looking perfect yet.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ObiForm.resx
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-20 07:26:09 UTC (rev 3090)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-20 11:06:18 UTC (rev 3091)
@@ -326,8 +326,8 @@
mShowMetadataViewToolStripMenuItem.Enabled = mSession.HasProject;
mShowTransportBarToolStripMenuItem.Enabled = mSession.HasProject;
mShowStatusBarToolStripMenuItem.Enabled = true;
- mFocusOnTOCViewToolStripMenuItem.Enabled = mProjectView.CanFocusOnTOCView;
- mFocusOnStripsViewToolStripMenuItem.Enabled = mProjectView.CanFocusOnContentView;
+ mFocusOnTOCViewToolStripMenuItem.Enabled = mProjectView.CanFocusOnTOCView && !mProjectView.CanToggleFocusToContentsView ;
+ mFocusOnStripsViewToolStripMenuItem.Enabled = mProjectView.CanFocusOnContentView && mProjectView.CanToggleFocusToContentsView ;
mFocusOnTransportBarToolStripMenuItem.Enabled = mSession.HasProject;
mSynchronizeViewsToolStripMenuItem.Enabled = mSession.HasProject;
mShowOnlySelectedSectionToolStripMenuItem.Enabled = mProjectView.CanShowOnlySelectedSection;
@@ -358,12 +358,13 @@
private void mFocusOnTOCViewToolStripMenuItem_Click(object sender, EventArgs e)
{
- mProjectView.FocusOnTOCView();
+ if (mProjectView != null) mProjectView.ToggleFocusBTWTOCViewAndContentsView();
}
private void mFocusOnStripsViewToolStripMenuItem_Click(object sender, EventArgs e)
{
- mProjectView.FocusOnContentView();
+ if (mProjectView != null)
+ mProjectView.ToggleFocusBTWTOCViewAndContentsView();
}
private void mFocusOnTransportBarToolStripMenuItem_Click(object sender, EventArgs e)
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-20 07:26:09 UTC (rev 3090)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-20 11:06:18 UTC (rev 3091)
@@ -117,13 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
- </metadata>
+ </data>
<data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>New project Ctrl+N</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="mNewProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@@ -498,10 +498,10 @@
<value>Focus on TO&C view</value>
</data>
<data name="mFocusOnStripsViewToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Focus on content view F7</value>
+ <value>Focus on content view F6</value>
</data>
<data name="mFocusOnStripsViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F7</value>
+ <value>F6</value>
</data>
<data name="mFocusOnStripsViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>259, 22</value>
@@ -1368,9 +1368,9 @@
<data name=">>mMenuStrip.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <data name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing">
<value>0, 606</value>
- </metadata>
+ </data>
<data name="mStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 17</value>
</data>
@@ -1425,9 +1425,9 @@
<data name=">>mProjectView.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <data name="$this.Localizable" type="System.Boolean, mscorlib">
<value>True</value>
- </metadata>
+ </data>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-20 07:26:09 UTC (rev 3090)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-20 11:06:18 UTC (rev 3091)
@@ -1208,9 +1208,9 @@
{
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)) ||
- (key == Keys.Space && TogglePlayPause(UseAudioCursor)) ||
+ (key == (Keys)(Keys.F6) && ToggleFocusBTWTOCViewAndContentsView() ) ||
+ (key == (Keys)(Keys.Shift | Keys.Space) && TogglePlayPause(UseSelection)) ||
+ (key == Keys.Space && TogglePlayPause(UseAudioCursor)) ||
base.ProcessCmdKey(ref msg, key);
}
@@ -1372,6 +1372,22 @@
mPanelInfoLabelButton.Text = "";
}
+ public bool CanToggleFocusToContentsView
+ {
+ get
+ {
+ if (mTOCView.ContainsFocus)
+ return true;
+ else if (mStripsView.ContainsFocus)
+ return false;
+ else if (mTOCView.Visible) // if neither of views has focus then check if toc is visible, if visible and focus on it
+ return false;
+ else // if neither of view has focus and TOC is not visible, focus on contents view.
+ return true;
+ }
+ }
+
+
public bool ToggleFocusBTWTOCViewAndContentsView ()
{
if (mTOCView.ContainsFocus)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-20 07:26:16
|
Revision: 3090
http://urakawa.svn.sourceforge.net/urakawa/?rev=3090&view=rev
Author: avneeshsingh
Date: 2008-05-20 00:26:09 -0700 (Tue, 20 May 2008)
Log Message:
-----------
Trying F6 for toggling focus between TOC view and contents view.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-20 03:44:13 UTC (rev 3089)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-20 07:26:09 UTC (rev 3090)
@@ -1208,6 +1208,7 @@
{
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)) ||
(key == Keys.Space && TogglePlayPause(UseAudioCursor)) ||
base.ProcessCmdKey(ref msg, key);
@@ -1371,6 +1372,21 @@
mPanelInfoLabelButton.Text = "";
}
+ public bool ToggleFocusBTWTOCViewAndContentsView ()
+ {
+ if (mTOCView.ContainsFocus)
+ FocusOnContentView();
+ else if (mStripsView.ContainsFocus)
+ FocusOnTOCView();
+ else if (mTOCView.Visible) // if neither of views has focus then check if toc is visible, if visible and focus on it
+ FocusOnTOCView();
+ else // if neither of view has focus and TOC is not visible, focus on contents view.
+ FocusOnContentView();
+
+
+ return true;
+ }
+
public void SelectNextTODOPhrase()
{
mStripsView.SelectNextTODONode();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-20 03:44:22
|
Revision: 3089
http://urakawa.svn.sourceforge.net/urakawa/?rev=3089&view=rev
Author: julienq
Date: 2008-05-19 20:44:13 -0700 (Mon, 19 May 2008)
Log Message:
-----------
Updated new project dialog to generate a new ID.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs
trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.resx
trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs
trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs
trunk/urakawa/application/Obi/Obi/Obi.csproj
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Waveform.cs
Added Paths:
-----------
trunk/urakawa/application/Obi/Obi/images/obi_new_project_dialog.png
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditRoles));
this.mCustomRolesList = new System.Windows.Forms.ListBox();
this.mNewCustomRole = new System.Windows.Forms.TextBox();
this.mInstructions = new System.Windows.Forms.Label();
@@ -112,7 +113,7 @@
//
this.mRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.mRemove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mRemove.Location = new System.Drawing.Point(305, 51);
+ this.mRemove.Location = new System.Drawing.Point(305, 52);
this.mRemove.Name = "mRemove";
this.mRemove.Size = new System.Drawing.Size(75, 23);
this.mRemove.TabIndex = 3;
@@ -132,9 +133,9 @@
this.Controls.Add(this.mInstructions);
this.Controls.Add(this.mNewCustomRole);
this.Controls.Add(this.mCustomRolesList);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.Name = "EditRoles";
- this.ShowIcon = false;
this.ShowInTaskbar = false;
this.Text = "Edit roles";
this.Load += new System.EventHandler(this.CustomRoles_Load);
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.resx 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.resx 2008-05-20 03:44:13 UTC (rev 3089)
@@ -117,4 +117,261 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAMAMDAAAAEAIACoJQAANgAAACAgAAABACAAqBAAAN4lAAAQEAAAAQAgAGgEAACGNgAAKAAAADAA
+ AABgAAAAAQAgAAAAAAAAAAAARlwAAEZcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAATLgAqFjQAhhk7ALsdQwLkH0cC8CBKAvcgSwL4IUwC+yFMAvohTAL6IUwD+iFM
+ A/ogTAP6IUwD+iFNAvshTQL7IEwC+SBKA/YgSQP1H0gD8x9HA+0eRAPkHD8EwRc3AKQWNACDFC8APhMs
+ AA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAEy4ANBxDAOYhTwD8IU0B+yFKBvMrVhnsNWMn7EBzNu9LhEXzWZhX+V+h
+ XvxkqmX/ZKpl/2SqZf9kqmX/ZKpl/2mybP9kqmX/XZ9d/FaUVPlKgkPyRnw/8D5wM+42ZSjtKFIU7CFK
+ BvMgSgP3IEsB+B9KAfUcQwDoFzcAvRQxAHAULwAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDgAwCBKBPZgo2D3dMJ6/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/brly/1yeW/s/cjTtK1UY6yBJA/YgSwD2GDgArhMsAAgAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0AA2ydRE+52xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9Sjk70IksJ8x1G
+ AO0TLAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIA4itW
+ Gep2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/brly/yFNAfsUMABPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAHEMA5zJfI+t2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/yBLAvgVMwB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAHUYA7jFeIup2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/yBKA/YWNQCXAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEMA5zBdIOt2xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/yBKA/YXNwCnAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIA5C5aHex2xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/yBJ
+ BfMYOQCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0EA3yxY
+ Gut2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9xvXf/Gy0c0xMfE9Q0VzbSZ6xs9XbF
+ fP92xXz/dsV8/yJLCfAZOwPHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAHEIA5DFeIut2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3G9d/9goWXuSnxO3TRXN9IkPCbVAAAA/wAA
+ AP8AAAD/CA4J33K/eP12xXz/dsV8/yZPDuwWOy72CR45YggcMgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAHUUA7DFeIup2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/cb13/1KJVuQxUjTSEh0S1gUIBekEBwToChAK3xgo
+ GdIdMR/SAQIB8gAAAP8AAAD/AAEA9miubfp2xXz/eMZ6/yROEOoZQCr8Di9Y+A4tTe8KHzZiAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkgA8zZlKOt2xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP87Yj7UBQgF6wUIBesWJBfVMlQ11VmV
+ XuZvuXX6dsV8/3bFfP92xXz/X59k8DBQMtcjOyXTQWxE3HbFfP92xXz/eMZ5/yBJCO8aSijrG5P5/w9F
+ d+0PM1f8DCdD0QkcMBQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkYA7zdmKet2xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP91xX3/c8V//3LDf/9wwn7/c8V//3bFfP92xXz/cr94/xgnGdMEBgTtSnxO23PA
+ ef92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/ecd4/yBJ
+ CO8aTC7pG5P4/xyU9/8YfdP/DjFU9A4wUvcJHzVUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkYA7jRj
+ Jup2xXz/dsV8/3bFfP92xXz/dsV8/1l+S+5LNAvuUS4C91UvAftWLwH7Ui8C+E5TJudmsHL4CQ8J3woR
+ C+BstHH8dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/esd3/yBJBvMYU0vnG5T4/xyU9/8clPf/HJT3/xBGduwQNFn+CiA3cQAAAAAAAAAAAAAAAAAA
+ AAAAAAAAH0sA9j1vMu52xXz/dsV8/3bFfP92xXz/UGEz6GI1AP9SLwHyZUMA5XxXAOWCXADkY0EA5lkw
+ APxIJwD/GCYX1XPAef92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/esd2/x9KBPYXWWTnHJT3/xyU9/8clPf/HJT3/xyU9/8SUIfuEDRZ/gkf
+ NVAAAAAAAAAAAAAAAAAAAAAAH0sA9z9yNe52xXz/dsV8/3bFfP9tvHr+Vi8B+2tHAOb3vwD/9L8A//O/
+ AP/zvwD/9L8A/+qxAP9ULwD4TTQK73PFf/92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/esd2/yBLAvgXW2nlHJT3/xyU9/8clPf/HJT3/xyU
+ 9/8clPf/Djlh8Q0rSeYAAAAAAAAAAAAAAAAAAAAAH0sA9kJ3OfB2xXz/dsV8/3bFfP9Tbj7mWDAA/euz
+ AP/zvwD/878A//O/AP/zvwD/878A//O/AP/fqQD9VzAA+1RuPut2xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/esd2/yBLA/gXXXDmHJT3/xyU
+ 9/8clPf/HJT3/xyU9/8SVI3tEDRa/gwoRNUAAAAAAAAAAAAAAAAAAAAAH0sA9zttMO12xXz/dsV8/3XF
+ ff9MSB3jUi8B9fi/AP/zvwD/878A//O/AP/zvwD/878A//O/AP/0vwD/ZUMA6EwyCO5yxX//dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dcV7/3TEev9zxHr/dcV7/3bFfP92xXz/dsV8/3bFfP92xXz/esd2/yBM
+ AvkXXWvlHJT3/xyU9/8bieX/Dz9r7A8xVPsQNVr+CyQ+tAkcMAQAAAAAAAAAAAAAAAAAAAAAH0oA9jZl
+ KOt2xXz/dsV8/3TFfv9LQRblUi8B8/e/AP/zvwD/878A//O/AP/zvwD/878A//O/AP/zvwD/mXEA6lEv
+ AvdwxYL/dsV8/3bFfP92xXz/dsV8/3TEev+Q0JXvxebH1+Lz5Nfo9enYzOnO14nNjvN1xHv/dsV8/3bF
+ fP92xXz/ecVz/yBNAvoWZ5DuHJT3/xFMgu0PM1j9DjBS9woiOpQJHTIfAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAHkYA7jFdIet2xXz/dsV8/3XFfP9QYDLkVC4A+fm/AP/zvwD/878A//O/AP/zvwD/878A//O/
+ AP/zvwD/rYAA7VMvAvhvxYP/dsV8/3bFfP92xXz/gMmG++v37Nz+/v70+fv51e/y79Lv8e/U+vz61Pz+
+ /O3A5MLbc8R5/3bFfP92xXz/dsBv/iFNAfsRPEjwDi9Y+Q8yVvsLIzuhCRwwBgAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAHEMA5S9cH+x2xXz/dsV8/3bFfP9ruXr9VS8B+4phAOjzvwD/878A//O/
+ AP/zvwD/878A//O/AP/0vwD/d1IA6FAvA/VxxYH/dsV8/3bFfP91xHv/9Pr03vr7+tni4uLxoqKi31hY
+ WNJOTk7T09PT7/v7+/z9/v3ov+TB2nXEe/92xXz/dMF1/yJPA/wRN1b+CiE/oQkcMAwAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG0AA3ChRE+x2xXz/dsV8/3bFfP91xX3/Tlgr51Yv
+ APy5hwDu9r8A//O/AP/zvwD/878A//O/AP/zuAD/VC4A+U1MIOd1xX3/dsV8/3bFfP+v3bPb/f796N/f
+ 3/gICAjnAAAA/wAAAP8AAAD/AAAA/4qKitT39/f1+f366HfGff12xXz/b7p0/yFPAPsRKxFcAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGj0AyyRMDe52xXz/dsV8/3bF
+ fP92xXz/dMV+/1FcLehZMQD9Ui8A9KN4AOygeADrgl0A5XBNAOVULwD5UC8D9nHBff92xXz/dsV8/3LD
+ ef/h8+PT6+3r2lxcXNIAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP3Z2dnz+Pz53qTYqOF2xXz/Y6hk+yBN
+ APsULwAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDgAqyFK
+ BvJ2xXz/dsV8/3bFfP92xXz/dsV8/3XFff9kqG36SzQK7l4zAP9WLwD7Uy4A+F0zAP5KOA/rcL57/3bF
+ fP92xXz/dsV8/3HDeP/s9+3Y5eXl3yMjI9EAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP9mZmbQ7vLv1cvp
+ zdF0xHr/SYFC8SFOAPsTLAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAFjQAiCBLAvh2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/abt9/1IvAfjKlwD4+b8A/1Ew
+ AvRXfEntdsV8/3bFfP92xXz/dsV8/3PEev/V7dfV5ujn3ExMTNEAAAD/AAAA/wAAAP8AAAD/AAAA/wAA
+ AP88PDzP6Ozo18joy9N1xHv/MV4i7B1EAOoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAFDEAXCFOAPxst3D+dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/Zahs8lMv
+ AfngqgD9+b8A/1ExAvJWdkTodsV8/3bFfP92xXz/dsV8/3bFfP+d1qHm+f363MPDw+sAAAD/AAAA/wAA
+ AP8AAAD/AAAA/wAAAP+Tk5PZ9/v32q/dstx1xXv/I0wM7xk6AL4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEy4ALiFOAPthpWH7dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/YZ1j8VMvAfjsswD/+b8A/1MzAvBSYzTldsV8/3bFfP92xXz/dsV8/3bFfP9xw3j/9/z44uzs
+ 7OBra2vRAAAA/wAAAP8AAAD/AAAA/xAQENzf39/p/P7863vHgvp2xXz/IEoD9hY0AIcAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9LAPhFez7tdsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/YJtj8FMvAfjttQD/978A/1Y2Au1NSh7mdMV+/3bFfP92xXz/dsV8/3bF
+ fP92xXz/odem5f3+/u7w8PDwr6+v30BAQNMiIiLXMjIy09bW1u/9/v7ov+TC2HXFe/9uuXL/IE0B+hQw
+ AE0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB1E
+ AOoxXiLqdsV8/3bFfP92xXz/dsV8/3bFfP92xXz/YJtj8FMvAfjvtgD/9r8A/1g5AupMQRbqdMV+/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dMR6/7rivd3+//739vf20vj4+Pz/////8vLy9P39/efk8+XYc8N5/3bF
+ fP9XllX5IEsA9xMsAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAABo9AMwkTQzxdsV8/3bFfP92xXz/dsV8/3bFfP92xXz/YJph8FMvAfjvtgD/9b8A/1w7
+ AepMOA3tc8V//3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3XEe/+P0JTu5fTm2Pn8+eX8/vzm/f798dXt
+ 19V1xHv/dsV8/3bFfP87bC/rHUUA6gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAABY0AIMgTAL5dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/YqBm8lMv
+ AfjsswD/9b8A/1s6AepMOQ7sdMV+/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/c8R5/3bF
+ e/+JzY7zfMiB/nTEev92xXz/dsV8/3bFfP8pUhXrGj0AywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQvACAgTQD6WJdW93bFfP92xXz/dsV8/3bF
+ fP92xXz/Zqpv9FIvAffkrQD9978A/1c3AutMRBjpdMV+/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP8gSgP2FjUAjAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQQDhKFIU7HbF
+ fP92xXz/dsV8/3bFfP92xXz/a719/VEvAvbTnwD3+L8A/1IxAvBPUybkdcV9/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/2ataf8gTQH6FC8AOAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAVMwBxIE0B+m65cv92xXz/dsV8/3bFfP92xXz/bMB//1EvAvbKlwDz+L8A/1IxAfFQWSvidcV9/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/zFe
+ Ie0dRgDvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAHUYA7zJfI+52xXz/dsV8/3bFfP92xXz/b8OB/1EvAvfAjwDw+L8A/1Iw
+ AfJRXi/idcV9/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/c8B4/yBMAvkWNACLAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFTIAayFOAPxcnlv8dsV8/3bFfP92xXz/bcKB/1Ev
+ AvfDkwDx+b8A/1EwAvNSaTrldsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/NGIl7B9JAPUTLAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABg5ALEhTQH7bLVv/3bF
+ fP92xXz/bMB//1EvAvbLmAD0+L8A/1EvAfRQXjDjdcV9/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9dn1z6IlEA/RY0AIMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAbPwDZIEsD92+8dP92xXz/a7x8/FEvAvbTnwD1+L8A/1IxAvFQXC3jdcV9/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/2WrZ/0hTgH8GTwAygAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAG0EA4SBMA/hwvHX/Z7F1+lMuAffkrQD8+L8A/1Q0Au9QWCrkdcV9/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/U5BQ9CJRAP4bQQDfAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABo9AMwdTQL4R3I98lUtAfjnrgD/+L8A/1Iw
+ AfJPVynidcV9/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/2y3cP8sVxntI1QA/xg6
+ ALsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUNgB+L0IA9l8x
+ AP6FXwDv7bYA/1IvAfVVcUDodsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/2+6dP9QjEzyKFIU7SJR
+ AP0gTAD5FTIAcwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAHiYACjwgAI9NLQDwUi8A914zAP4yTRbtTopL9FyeW/xeoV78VpRU+UN4O/AzYSXsIksJ8SFP
+ AfwgTQD6G0AA5hQwAHoZOwADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMR8AKTYiAHkgQQbSH0kD9CBMAvohTQL7IEwC+R9I
+ A/IdQwTiGj0ByRUyAGsTLAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAP///////wAA////////AAD4AAAH//8AAOAAAAB//wAAwAAAAA//AADAAAAAB/8AAMAA
+ AAAH/wAAwAAAAAf/AADAAAAAA/8AAMAAAAAD/wAAwAAAAAP/AADAAAAAA/8AAMAAAAAD/wAAwAAAAAD/
+ AADAAAAAAD8AAMAAAAAAHwAAwAAAAAAPAADAAAAAAAcAAMAAAAAAAwAAwAAAAAADAADAAAAAAAcAAMAA
+ AAAAHwAAwAAAAAB/AADAAAAAAf8AAMAAAAAH/wAAwAAAAAf/AADAAAAAB/8AAMAAAAAH/wAA4AAAAAf/
+ AADgAAAAB/8AAOAAAAAP/wAA4AAAAA//AADgAAAAD/8AAOAAAAAP/wAA8AAAAA//AADwAAAAH/8AAPgA
+ AAAf/wAA+AAAAB//AAD8AAAAP/8AAPwAAAA//wAA/gAAAH//AAD/AAAA//8AAP+AAAH//wAA/+AAB///
+ AAD/8AAf//8AAP//AP///wAA////////AAD///////8AACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAEZc
+ AABGXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATLgAfFzcAnhxABM4fRQffIEcI5CJK
+ C+UlTQ/lJk8S5CdPEuMnTxLjJk8R5iVOEOQlTA/gIkoM4CFIC90gRgrSHUEGxho8BKsVMwB+EywAPhMs
+ AAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5DBtgsWBrsVJFR9Gat
+ af9wvHT/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xHz/b7p0/2WrZ/9WlFT4SH5B7DJf
+ I+QlTA/kHkMF2RUyAHMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIUgJ5mWr
+ Z/92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP9psmz/JU0O7BY0AIYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAiSgrra7Nu/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP8+bzLrGDkAtQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAACJKCexstW//dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/0R6PO4ZPADFAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAIkoL52ivav92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9qsW/2bbZy+XbFfP92xXz/SoNF8hs+AcoAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjSwznabJs/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/dMJ6/2esbPBUjFjdRXNI2AIEAugAAAD9Lk0xzXbFfP9YlVD3GD0X6Qog
+ LzgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACFKCO9uuXL/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/Vo9a3ilFK8wbLh3THC4d1ChDKs8+aEHUEh4T0QAAAP8UIhXRdsV8/1mV
+ T+4ZQB/0DDBY6AsmQrgJHTIbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIUoI8G+6dP92xXz/dsV8/3TF
+ fv9svX3+Y6Zr9WOka/NvwX//dcN8/ylFK9AeMiDPU4tY3muzcfZ2xXz/dsV8/3bFfP91w3v/brh0+3K/
+ eP52xXz/TYVF6h1LH+gZkvv/EU+J6w0sTOQJHzVaAAAAAAAAAAAAAAAAAAAAAAAAAAAhSgfycb12/3bF
+ fP90xX7/T1Ej408vA/FQMQPvUDED71AzB+0mKRPZM1c30XbFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFe/9FezzoHE0q6BqT+v8clPf/GHnL/A0vUOsKIThhAAAAAAAAAAAAAAAAAAAAACFL
+ BvZ2xHz/dsV8/1yHUexRLwLy4KYA+fq/AP/7vwD/rX4A600sAvNlpWr2dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dsV8/3bFfP92xXz/d8V7/z1wNOQbTCvnGpP6/xyU9/8clPf/Fmy1+g4vUfMAAAAAAAAAAAAA
+ AAAAAAAAIUsG9nTCev90xX7/T0cb5HRSAuL0vwD/878A//O/AP/0vwD/h2EB5E9CFedzxX//dsV8/3bF
+ fP92xXz/csN4/3DCdv9xw3j/dcV7/3bFfP93xXv/PG4y5RxNK+cak/r/Gojj/xBGduoOLk/vCydCrQAA
+ AAAAAAAAAAAAAAAAAAAhSgb0b7p0/3PFf/9PQhXlh2IB4/S/AP/zvwD/878A//O/AP/UoAD1UTkK6m/F
+ gv92xXz/dMR6/5jTnOTR69PQ4PLhz9fu2dCT0pjpdMR6/3fGe/84aC7jGUo66hJUju0NLU/rCyU/uQke
+ Mz4AAAAAAAAAAAAAAAAAAAAAAAAAACJKCutqs23/dcV9/1dwPedWNwPr+r8A//O/AP/zvwD/878A/8aT
+ APFPOArrcMWC/3TEev+74r7V5enl3LOzs9WKiorQx8fH2enx6dej2KfidcV6/zhoK+QWPTr8CiNIuwkd
+ MywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIUgJ5WOpZf92xXz/ccWA/049D+pjRALo3agA9ee1
+ AP/jrgD6VzcC6lFWJ+V0xX7/ecZ/+/H58dZ5eXnSAAAA/gAAAP8CAgLwurq62uT05tRvwnX/NGMl5xU0
+ CqkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhRwraWZlX+HbFfP92xXz/cMF+/1BW
+ J+VQLwL0VTMA7FMuAPdNRhnnc8V//3bFfP+IzY7t2eDa1xoaGtcAAAD/AAAA/wAAAP8pKSnS4uzi1XTC
+ e/sqVRjnFjQAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9ECclJgULwdsV8/3bF
+ fP92xXz/bsWE/1A+D+fYnwD4XkMH6FyTXPB2xXz/dsV8/3nHf/rh7OLXQkJC0AAAAP8AAAD/AAAA/xsb
+ G9fg6uHVdMF6/yNLDeIULwA+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHT8Hqzpr
+ Lul2xXz/dsV8/3bFfP9vxYL/Uj4N5++yAP9kSAbnXIRO7XbFfP92xXz/csN4/9Ps1dXBwcHaDAwM3AAA
+ AP8AAAD8iYmJ1uT05dRtu3H/H0UH2xMsAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAVMwB8KFEU53bFfP92xXz/dsV8/2/Fg/9SPw3m8bUA/2lMBedXcT7ndcV9/3bFfP92xXz/fciC9uz3
+ 7dXOz87cvb293rW1tdzs8ezbjc6S6GSpZP8cQAXMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAABQvAEMiSgrndsV8/3bFfP92xXz/b8WD/1M/DufwtQD/a0wE51VnNeR1xX3/dsV8/3bF
+ fP92xXz/e8eB98fnytbl9ObV6PXp1ZzVoeJ1xXv/Rnw/6xg5AKwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAEywABB5EBOBlq2f/dsV8/3bFfP9wxYL/U0IP5+yxAP5qTAXnV24753XF
+ ff92xXz/dsV8/3bFfP92xXz/c8N5/2/Cdv9wwnf/dcV8/3bFfP8vWx7mFjMAfQAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFzgAqTlqLel2xXz/dsV8/3HFgf9TRRPn36gA+GJF
+ BeZZekXqdsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/yFICegULwA6AAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATLgA3IEgH6HK/eP92xXz/ccWB/1JF
+ E+fVoADyYEMF5lqBS+x2xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP9LhUbyG0AC0QAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXNwCkK1cZ6nbF
+ fP9xxYH/U0QT59egAPReQQbmW4VP7XbFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/yFJ
+ COwUMQBcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAaPQHJMWEk6nDFgv9VQxLn46oA+GNGBudafkjrdsV8/3bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP8mTxHrGDoAtgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAABMsAAgZPwLKNWAo6U8/DuvtswD+YkYF5lt8R+x2xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP9gol/8IkoK7Rk6AL4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYOgSLRTIB8XNNAOlUNAPwWItS8HbFfP92xXz/cr94/2Km
+ Y/1AczbpJEwO6h1FAukWNAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsIAAVOyIAgz8rAb8jSA3bJE4Q5iRN
+ DuciSQvgH0QH2Rk7AbgUMABsDyUADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////////gAA//wAAB/8AAAH/AAAB/wAAAf8AA
+ AH/AAAB/wAAAH8AAAA/AAAAHwAAAA8AAAAPAAAAPwAAAP8AAAH/AAAB/wAAA/8AAAP/gAAD/4AAA/+AA
+ Af/gAAH/8AAB//AAA//4AAP//AAH//4AH///gH////////////8oAAAAEAAAACAAAAABACAAAAAAAAAA
+ AABGXAAARlwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkShKkN2UryT9yNtBGfD/WR39B1kd+QNZEeDzQP3I1yDZk
+ Kr0sVR2nH0IOZBMsAAIAAAAAAAAAAAAAAAAAAAAANGMn03bFfP92xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/dcR7/0N4OuYWMwJZAAAAAAAAAAAAAAAAAAAAADdmK9N2xXz/dsV8/3bFfP92xXz/dsV8/3bF
+ fP92xXz/b7l09nK+ePhXlFLxGjoKcQAAAAAAAAAAAAAAAAAAAAA2ZivTdsV8/3PFf/9wxYL/c8V+/2qw
+ b+9SiVbaTYBR2iQ7JcsUIRXJX6BZ+RQ4NcsJIUBEAAAAAAAAAAAAAAAANmcr1nTFfv9gcTbjYV4g41Jk
+ MtxFdUzUZahq63K9d/l0wnr9cbx191aVVuwcZX3qE2Gj3gwxU34AAAAAAAAAADtsMNdlllbwgF8G4++z
+ AP14XQfhYotO6nTFff9wwnX/cMN2/3PEd/9Rj1LqHGyM5hd+1P8NM1jRAAAAAAAAAAA5aS7UZI9P7pt0
+ Beb3vwD/yJYA7mZ1NeZ7xof2z+DQ0sPOxM+m2KjpVZNV7BI5RNoKKlCDCR0yHQAAAAAAAAAANGQoy3LF
+ gP9kZifkelgC4mRMCuNtq2b4v+HD2hwcHO0AAAD+s7mz0V+VVuQTLg1iAAAAAAAAAAAAAAAAAAAAADBc
+ Irx2xXz/ZrR593BZDORsaiLnasN//7HeteQ9PT3eAAAA/6esqNRShEnUFTIALQAAAAAAAAAAAAAAAAAA
+ AAAnTxasbrly/2q2dveGbRDmdG0e5W/Fg/93xXz6w9/F2cTNxdKgzqPoOWktwRQvABEAAAAAAAAAAAAA
+ AAAAAAAAHT8LeViWVvJuwH78gmwQ5nFrHuVvxYP/dsV8/3HDd/9zxHn7bblx/yhPF6sAAAAAAAAAAAAA
+ AAAAAAAAAAAAABMtACEyYCXIabh4/35oEeVvayDlb8WD/3bFfP92xXz/dsV8/0d+QeQWMwJfAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAEzEATTdfKNN8Zg/rc2wh5m/Fg/92xXz/dMJ6/0qDResiRg+hAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAULwA4SzgDrklKENBDfULZPW8yzCpTGrkbOghzEywABgAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//43uAHwAAgA/WAIAPIjGAByIggANjb4ABbmeAA1VUgA84IoAP
+ CjyAD09DwA9QRcAfbGngHyBQ8H9MSf//Ii0=
+</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -37,6 +37,9 @@
this.mOKButton = new System.Windows.Forms.Button();
this.mCancelButton = new System.Windows.Forms.Button();
this.mAutoTitleCheckBox = new System.Windows.Forms.CheckBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.mIDBox = new System.Windows.Forms.TextBox();
+ this.mGenerateIDButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// label1
@@ -63,7 +66,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(16, 68);
+ this.label2.Location = new System.Drawing.Point(16, 99);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(51, 13);
this.label2.TabIndex = 3;
@@ -75,20 +78,19 @@
this.mFileBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.mFileBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.mFileBox.Location = new System.Drawing.Point(73, 64);
+ this.mFileBox.Location = new System.Drawing.Point(73, 97);
this.mFileBox.Name = "mFileBox";
this.mFileBox.Size = new System.Drawing.Size(426, 20);
- this.mFileBox.TabIndex = 4;
- this.mFileBox.TextChanged += new System.EventHandler(this.mFileBox_TextChanged);
+ this.mFileBox.TabIndex = 5;
//
// mSelectButton
//
this.mSelectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.mSelectButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mSelectButton.Location = new System.Drawing.Point(505, 62);
+ this.mSelectButton.Location = new System.Drawing.Point(505, 93);
this.mSelectButton.Name = "mSelectButton";
this.mSelectButton.Size = new System.Drawing.Size(75, 25);
- this.mSelectButton.TabIndex = 5;
+ this.mSelectButton.TabIndex = 6;
this.mSelectButton.Text = "&Select";
this.mSelectButton.UseVisualStyleBackColor = true;
this.mSelectButton.Click += new System.EventHandler(this.mSelectButton_Click);
@@ -98,10 +100,10 @@
this.mOKButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.mOKButton.DialogResult = System.Windows.Forms.DialogResult.OK;
this.mOKButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mOKButton.Location = new System.Drawing.Point(218, 122);
+ this.mOKButton.Location = new System.Drawing.Point(218, 154);
this.mOKButton.Name = "mOKButton";
this.mOKButton.Size = new System.Drawing.Size(75, 25);
- this.mOKButton.TabIndex = 6;
+ this.mOKButton.TabIndex = 7;
this.mOKButton.Text = "&OK";
this.mOKButton.UseVisualStyleBackColor = true;
this.mOKButton.Click += new System.EventHandler(this.mOKButton_Click);
@@ -111,10 +113,10 @@
this.mCancelButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.mCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.mCancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mCancelButton.Location = new System.Drawing.Point(299, 122);
+ this.mCancelButton.Location = new System.Drawing.Point(299, 154);
this.mCancelButton.Name = "mCancelButton";
this.mCancelButton.Size = new System.Drawing.Size(75, 25);
- this.mCancelButton.TabIndex = 7;
+ this.mCancelButton.TabIndex = 8;
this.mCancelButton.Text = "&Cancel";
this.mCancelButton.UseVisualStyleBackColor = true;
//
@@ -129,13 +131,48 @@
this.mAutoTitleCheckBox.Text = "&Automatically create a title section with this title";
this.mAutoTitleCheckBox.UseVisualStyleBackColor = true;
//
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(46, 68);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(21, 13);
+ this.label3.TabIndex = 8;
+ this.label3.Text = "&ID:";
+ //
+ // mIDBox
+ //
+ this.mIDBox.AccessibleName = "Location:";
+ this.mIDBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mIDBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mIDBox.Location = new System.Drawing.Point(73, 66);
+ this.mIDBox.Name = "mIDBox";
+ this.mIDBox.Size = new System.Drawing.Size(426, 20);
+ this.mIDBox.TabIndex = 3;
+ //
+ // mGenerateIDButton
+ //
+ this.mGenerateIDButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.mGenerateIDButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mGenerateIDButton.Location = new System.Drawing.Point(505, 62);
+ this.mGenerateIDButton.Name = "mGenerateIDButton";
+ this.mGenerateIDButton.Size = new System.Drawing.Size(75, 25);
+ this.mGenerateIDButton.TabIndex = 4;
+ this.mGenerateIDButton.Text = "&Generate";
+ this.mGenerateIDButton.UseVisualStyleBackColor = true;
+ this.mGenerateIDButton.Click += new System.EventHandler(this.mGenerateIDButton_Click);
+ //
// NewProject
//
this.AcceptButton = this.mOKButton;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.mCancelButton;
- this.ClientSize = new System.Drawing.Size(592, 160);
+ this.ClientSize = new System.Drawing.Size(592, 191);
+ this.Controls.Add(this.mGenerateIDButton);
+ this.Controls.Add(this.mIDBox);
+ this.Controls.Add(this.label3);
this.Controls.Add(this.mAutoTitleCheckBox);
this.Controls.Add(this.mCancelButton);
this.Controls.Add(this.mOKButton);
@@ -145,8 +182,10 @@
this.Controls.Add(this.mTitleBox);
this.Controls.Add(this.label1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MinimumSize = new System.Drawing.Size(8, 173);
+ this.MaximizeBox = false;
+ this.MinimumSize = new System.Drawing.Size(336, 197);
this.Name = "NewProject";
+ this.ShowInTaskbar = false;
this.Text = "Create a new project";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.NewProject_FormClosing);
this.ResumeLayout(false);
@@ -164,5 +203,8 @@
private System.Windows.Forms.Button mOKButton;
private System.Windows.Forms.Button mCancelButton;
private System.Windows.Forms.CheckBox mAutoTitleCheckBox;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox mIDBox;
+ private System.Windows.Forms.Button mGenerateIDButton;
}
}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -34,6 +34,7 @@
{
InitializeComponent();
mTitleBox.Text = title;
+ mIDBox.Text = Guid.NewGuid().ToString();
mBasepath = basepath;
mExtension = extension;
mFilename = filename;
@@ -59,21 +60,20 @@
public void DisableAutoTitleCheckbox() { mAutoTitleCheckBox.Enabled = false; }
/// <summary>
+ /// Generated or user-chosen ID for the project.
+ /// </summary>
+ public string ID { get { return mIDBox.Text; } }
+
+ /// <summary>
/// The chosen path for the XUK project file; derived from the title or chosen
/// by the user.
/// </summary>
- public string Path
- {
- get { return mFileBox.Text; }
- }
+ public string Path { get { return mFileBox.Text; }}
/// <summary>
/// The chosen title for the project.
/// </summary>
- public string Title
- {
- get { return mTitleBox.Text; }
- }
+ public string Title { get { return mTitleBox.Text; } }
// Update the file box to generate a filename for the project
@@ -175,12 +175,7 @@
return safe;
}
- private void mFileBox_TextChanged(object sender, EventArgs e)
- {
- if (mFileBox.Text.Trim() == "")
- mOKButton.Enabled = false;
- else
- mOKButton.Enabled = true;
- }
+ // Generate a new GUID
+ private void mGenerateIDButton_Click(object sender, EventArgs e) { mIDBox.Text = Guid.NewGuid().ToString(); }
}
}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Obi.csproj
===================================================================
--- trunk/urakawa/application/Obi/Obi/Obi.csproj 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/Obi.csproj 2008-05-20 03:44:13 UTC (rev 3089)
@@ -71,9 +71,9 @@
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="urakawa, Version=1.0.0.36257, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="urakawa, Version=1.0.0.21762, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\implementation\UrakawaToolkit\bin\Debug\urakawa.dll</HintPath>
+ <HintPath>..\..\..\SDK\core\obj\Debug\urakawa.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -552,6 +552,7 @@
<Content Include="images\obi_meta_editor_small.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="images\obi_new_project_dialog.png" />
<Content Include="images\obi_phrase_and_cursor.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -76,7 +76,7 @@
dialog.CreateTitleSection = mSettings.CreateTitleSection;
if (dialog.ShowDialog() == DialogResult.OK)
{
- CreateNewProject(dialog.Path, dialog.Title, dialog.CreateTitleSection);
+ CreateNewProject(dialog.Path, dialog.Title, dialog.CreateTitleSection, dialog.ID);
}
}
@@ -97,7 +97,7 @@
dialog.DisableAutoTitleCheckbox();
dialog.Text = Localizer.Message("create_new_project_from_import");
if (dialog.ShowDialog() != DialogResult.OK) return;
- CreateNewProject(dialog.Path, dialog.Title, false);
+ CreateNewProject(dialog.Path, dialog.Title, false, dialog.ID);
try
{
(new ImportStructure()).ImportFromXHTML(openFile.FileName, mSession.Presentation);
@@ -781,7 +781,7 @@
help.WebBrowser.Url = new Uri(Path.Combine(
Path.GetDirectoryName(GetType().Assembly.Location),
Localizer.Message("help_file_name")));
- help.ShowDialog();
+ help.Show();
}
// Show the HTML help page in an external browser.
@@ -884,7 +884,7 @@
private void CloseAndOpenProject(string path) { if (DidCloseProject()) OpenProject(path); }
// Try to create a new project with the given title at the given path.
- private void CreateNewProject(string path, string title, bool createTitleSection)
+ private void CreateNewProject(string path, string title, bool createTitleSection, string id)
{
try
{
@@ -894,7 +894,7 @@
mSettings.CreateTitleSection = createTitleSection;
if (DidCloseProject())
{
- mSession.NewPresentation(path, title, createTitleSection, "(please set id)", mSettings);
+ mSession.NewPresentation(path, title, createTitleSection, id, mSettings);
}
UpdateMenus();
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Waveform.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Waveform.cs 2008-05-19 19:14:36 UTC (rev 3088)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Waveform.cs 2008-05-20 03:44:13 UTC (rev 3089)
@@ -100,8 +100,8 @@
set
{
int x = value < 0 ? 0 : value > Width ? Width : value;
- double start = mSelection.CursorTime;
double end = TimeFromX(x);
+ double start = mSelection == null ? end : mSelection.CursorTime;
if (start == end)
{
mSelection.HasCursor = true;
Added: trunk/urakawa/application/Obi/Obi/images/obi_new_project_dialog.png
===================================================================
(Binary files differ)
Property changes on: trunk/urakawa/application/Obi/Obi/images/obi_new_project_dialog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-19 19:14:40
|
Revision: 3088
http://urakawa.svn.sourceforge.net/urakawa/?rev=3088&view=rev
Author: avneeshsingh
Date: 2008-05-19 12:14:36 -0700 (Mon, 19 May 2008)
Log Message:
-----------
Fix to bugg: 1964061
On the fly Page marks do not increase page nos. while recording
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-19 03:56:41 UTC (rev 3087)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-19 19:14:36 UTC (rev 3088)
@@ -1389,7 +1389,9 @@
private void SetPageNumberWhileRecording(Obi.Events.Audio.Recorder.PhraseEventArgs e)
{
- int PageNumber = mView.Presentation.PageNumberFor(mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + e.PhraseIndex));
+ // argument e contains index of last phrase of just finished page
+ //so index should be incremented by one to get page of newly created page.
+ int PageNumber = mView.Presentation.PageNumberFor(mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + e.PhraseIndex + 1 ));
urakawa.undo.ICommand cmd = new Commands.Node.SetPageNumber(mView, (EmptyNode)mRecordingSection.PhraseChild(mRecordingInitPhraseIndex + e.PhraseIndex + 1), PageNumber);
cmd.execute();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-19 03:56:43
|
Revision: 3087
http://urakawa.svn.sourceforge.net/urakawa/?rev=3087&view=rev
Author: julienq
Date: 2008-05-18 20:56:41 -0700 (Sun, 18 May 2008)
Log Message:
-----------
Added keyboard operations (Shift+Space, Shift+X, Shift+V, and Nudge)
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ObiForm.resx
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs
trunk/urakawa/application/Obi/Obi/Settings.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -126,9 +126,9 @@
this.mStopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mFastPlaytoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NormalSpeedtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mElapseBacktoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SpeedUptoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mSpeedDowntoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mElapseBacktoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mPreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mPreviewFromToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mPreviewUpToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -732,8 +732,8 @@
//
// mClearRoleToolStripMenuItem
//
+ resources.ApplyResources(this.mClearRoleToolStripMenuItem, "mClearRoleToolStripMenuItem");
this.mClearRoleToolStripMenuItem.Name = "mClearRoleToolStripMenuItem";
- resources.ApplyResources(this.mClearRoleToolStripMenuItem, "mClearRoleToolStripMenuItem");
this.mClearRoleToolStripMenuItem.Click += new System.EventHandler(this.mClearRoleToolStripMenuItem_Click);
//
// mPhraseDetectionToolStripMenuItem
@@ -866,6 +866,12 @@
this.NormalSpeedtoolStripMenuItem.Name = "NormalSpeedtoolStripMenuItem";
this.NormalSpeedtoolStripMenuItem.Click += new System.EventHandler(this.NormalSpeedtoolStripMenuItem_Click);
//
+ // mElapseBacktoolStripMenuItem
+ //
+ this.mElapseBacktoolStripMenuItem.Name = "mElapseBacktoolStripMenuItem";
+ resources.ApplyResources(this.mElapseBacktoolStripMenuItem, "mElapseBacktoolStripMenuItem");
+ this.mElapseBacktoolStripMenuItem.Click += new System.EventHandler(this.ElapseBacktoolStripMenuItem_Click);
+ //
// SpeedUptoolStripMenuItem
//
resources.ApplyResources(this.SpeedUptoolStripMenuItem, "SpeedUptoolStripMenuItem");
@@ -878,12 +884,6 @@
this.mSpeedDowntoolStripMenuItem.Name = "mSpeedDowntoolStripMenuItem";
this.mSpeedDowntoolStripMenuItem.Click += new System.EventHandler(this.SpeedDowntoolStripMenuItem_Click);
//
- // mElapseBacktoolStripMenuItem
- //
- this.mElapseBacktoolStripMenuItem.Name = "mElapseBacktoolStripMenuItem";
- resources.ApplyResources(this.mElapseBacktoolStripMenuItem, "mElapseBacktoolStripMenuItem");
- this.mElapseBacktoolStripMenuItem.Click += new System.EventHandler(this.ElapseBacktoolStripMenuItem_Click);
- //
// mPreviewToolStripMenuItem
//
this.mPreviewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -680,8 +680,8 @@
private void mStartRecordingDirectlyToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.StartRecordingDirectly(); }
- private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); }
- private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); }
+ private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(ProjectView.TransportBar.From, ProjectView.TransportBar.UseAudioCursor); }
+ private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(ProjectView.TransportBar.Upto, ProjectView.TransportBar.UseSelection); }
private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); }
private void previousSectionToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevSection(); }
private void previousPageToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevPage(); }
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-19 03:56:41 UTC (rev 3087)
@@ -120,255 +120,14 @@
<metadata name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>0, 0</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="mFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>35, 20</value>
- </data>
- <data name="mFileToolStripMenuItem.Text" xml:space="preserve">
- <value>&File</value>
- </data>
- <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
- <value>37, 20</value>
- </data>
- <data name="toolStripMenuItem1.Text" xml:space="preserve">
- <value>&Edit</value>
- </data>
- <data name="mViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>41, 20</value>
- </data>
- <data name="mViewToolStripMenuItem.Text" xml:space="preserve">
- <value>&View</value>
- </data>
- <data name="mSectionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>59, 20</value>
- </data>
- <data name="mSectionsToolStripMenuItem.Text" xml:space="preserve">
- <value>&Sections</value>
- </data>
- <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Add blank phrase Ctrl+B</value>
- </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="mAddBlankPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+B</value>
- </data>
- <data name="mAddBlankPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mAddBlankPhraseToolStripMenuItem.Text" xml:space="preserve">
- <value>Add &blank phrase</value>
- </data>
- <data name="mAddEmptyPagesToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Add empty pages Ctrl+Shift+B</value>
- </data>
- <data name="mAddEmptyPagesToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+B</value>
- </data>
- <data name="mAddEmptyPagesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mAddEmptyPagesToolStripMenuItem.Text" xml:space="preserve">
- <value>Add empty &pages</value>
- </data>
- <data name="mImportAudioFileToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Import audio files Ctrl+I</value>
- </data>
- <data name="mImportAudioFileToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+I</value>
- </data>
- <data name="mImportAudioFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mImportAudioFileToolStripMenuItem.Text" xml:space="preserve">
- <value>&Import audio files</value>
- </data>
- <data name="mSplitPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Split phrase Ctrl+Q</value>
- </data>
- <data name="mSplitPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Q</value>
- </data>
- <data name="mSplitPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mSplitPhraseToolStripMenuItem.Text" xml:space="preserve">
- <value>&Split phrase</value>
- </data>
- <data name="mMergePhraseWithNextToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Merge phrase with next Ctrl+M</value>
- </data>
- <data name="mMergePhraseWithNextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+M</value>
- </data>
- <data name="mMergePhraseWithNextToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mMergePhraseWithNextToolStripMenuItem.Text" xml:space="preserve">
- <value>&Merge phrase with next</value>
- </data>
- <data name="mPhraseIsUsedToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Phrase is used Ctrl+K</value>
- </data>
- <data name="mPhraseIsUsedToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+K</value>
- </data>
- <data name="mPhraseIsUsedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mPhraseIsUsedToolStripMenuItem.Text" xml:space="preserve">
- <value>Phrase is &used</value>
- </data>
- <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
- <value>250, 6</value>
- </data>
- <data name="mAssignRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mAssignRoleToolStripMenuItem.Text" xml:space="preserve">
- <value>&Assign role</value>
- </data>
- <data name="mEditRolesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mEditRolesToolStripMenuItem.Text" xml:space="preserve">
- <value>E&dit roles...</value>
- </data>
- <data name="mClearRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mClearRoleToolStripMenuItem.Text" xml:space="preserve">
- <value>&Clear role</value>
- </data>
- <data name="mPhraseDetectionToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Apply phrase detection Ctrl+Shift+P</value>
- </data>
- <data name="mPhraseDetectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+P</value>
- </data>
- <data name="mPhraseDetectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mPhraseDetectionToolStripMenuItem.Text" xml:space="preserve">
- <value>Apply p&hrase detection</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Mark default custom class Ctrl+U</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+U</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
- <value>Mar&k default custom class</value>
- </data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="mMarkDefaultCustomClassToolStripMenuItem.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Begin audio selection Ctrl+[</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
- <value>Ctrl+[</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+OemOpenBrackets</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>210, 22</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>&Begin audio selection</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>End audio selection Ctrl+]</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
- <value>Ctrl+]</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Oem6</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>210, 22</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>&End audio selection</value>
- </data>
- <data name="mDeselectInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>229, 22</value>
- </data>
- <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>&Deselect</value>
- </data>
- <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>Audi&o selection</value>
- </data>
- <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mGoToToolStripMenuItem.Text" xml:space="preserve">
- <value>&Go to...</value>
- </data>
- <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>57, 20</value>
- </data>
- <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve">
- <value>&Phrases</value>
- </data>
- <data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>66, 20</value>
- </data>
- <data name="transportToolStripMenuItem.Text" xml:space="preserve">
- <value>Tr&ansport</value>
- </data>
- <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>44, 20</value>
- </data>
- <data name="mToolsToolStripMenuItem.Text" xml:space="preserve">
- <value>&Tools</value>
- </data>
- <data name="mHelpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>40, 20</value>
- </data>
- <data name="mHelpToolStripMenuItem.Text" xml:space="preserve">
- <value>&Help</value>
- </data>
- <data name="mMenuStrip.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
- <value>958, 24</value>
- </data>
- <data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name="mMenuStrip.Text" xml:space="preserve">
- <value>menuStrip1</value>
- </data>
- <data name=">>mMenuStrip.Name" xml:space="preserve">
- <value>mMenuStrip</value>
- </data>
- <data name=">>mMenuStrip.Type" xml:space="preserve">
- <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>mMenuStrip.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>mMenuStrip.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
<data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>New project Ctrl+N</value>
</data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="mNewProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="mNewProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+N</value>
</data>
@@ -474,12 +233,6 @@
<data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 6</value>
</data>
- <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mRecentProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&Recent projects</value>
- </data>
<data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing">
<value>112, 6</value>
</data>
@@ -489,6 +242,12 @@
<data name="mClearListToolStripMenuItem.Text" xml:space="preserve">
<value>&Clear list</value>
</data>
+ <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mRecentProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Recent projects</value>
+ </data>
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 6</value>
</data>
@@ -504,6 +263,12 @@
<data name="mExitToolStripMenuItem.Text" xml:space="preserve">
<value>E&xit</value>
</data>
+ <data name="mFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>35, 20</value>
+ </data>
+ <data name="mFileToolStripMenuItem.Text" xml:space="preserve">
+ <value>&File</value>
+ </data>
<data name="mUndoToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Undo Ctrl+Z</value>
</data>
@@ -663,6 +428,12 @@
<data name="mFindPreviousToolStripMenuItem.Text" xml:space="preserve">
<value>Find pre&vious</value>
</data>
+ <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>37, 20</value>
+ </data>
+ <data name="toolStripMenuItem1.Text" xml:space="preserve">
+ <value>&Edit</value>
+ </data>
<data name="mShowTOCViewToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Show TOC view Ctrl+Alt+T</value>
</data>
@@ -816,6 +587,12 @@
<data name="mShowSourceToolStripMenuItem.Text" xml:space="preserve">
<value>Show sou&rce view</value>
</data>
+ <data name="mViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>41, 20</value>
+ </data>
+ <data name="mViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>&View</value>
+ </data>
<data name="mAddSectionToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Add section Ctrl+H</value>
</data>
@@ -930,6 +707,87 @@
<data name="mSectionIsUsedToolStripMenuItem.Text" xml:space="preserve">
<value>Section is &used</value>
</data>
+ <data name="mSectionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>59, 20</value>
+ </data>
+ <data name="mSectionsToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Sections</value>
+ </data>
+ <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Add blank phrase Ctrl+B</value>
+ </data>
+ <data name="mAddBlankPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+B</value>
+ </data>
+ <data name="mAddBlankPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mAddBlankPhraseToolStripMenuItem.Text" xml:space="preserve">
+ <value>Add &blank phrase</value>
+ </data>
+ <data name="mAddEmptyPagesToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Add empty pages Ctrl+Shift+B</value>
+ </data>
+ <data name="mAddEmptyPagesToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+B</value>
+ </data>
+ <data name="mAddEmptyPagesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mAddEmptyPagesToolStripMenuItem.Text" xml:space="preserve">
+ <value>Add empty &pages</value>
+ </data>
+ <data name="mImportAudioFileToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Import audio files Ctrl+I</value>
+ </data>
+ <data name="mImportAudioFileToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+I</value>
+ </data>
+ <data name="mImportAudioFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mImportAudioFileToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Import audio files</value>
+ </data>
+ <data name="mSplitPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Split phrase Ctrl+Q</value>
+ </data>
+ <data name="mSplitPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Q</value>
+ </data>
+ <data name="mSplitPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mSplitPhraseToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Split phrase</value>
+ </data>
+ <data name="mMergePhraseWithNextToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Merge phrase with next Ctrl+M</value>
+ </data>
+ <data name="mMergePhraseWithNextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+M</value>
+ </data>
+ <data name="mMergePhraseWithNextToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mMergePhraseWithNextToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Merge phrase with next</value>
+ </data>
+ <data name="mPhraseIsUsedToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Phrase is used Ctrl+K</value>
+ </data>
+ <data name="mPhraseIsUsedToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+K</value>
+ </data>
+ <data name="mPhraseIsUsedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mPhraseIsUsedToolStripMenuItem.Text" xml:space="preserve">
+ <value>Phrase is &used</value>
+ </data>
+ <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>250, 6</value>
+ </data>
<data name="mSetAsHeadingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 22</value>
</data>
@@ -966,6 +824,100 @@
<data name="mAddRoleToolStripTextBox.Text" xml:space="preserve">
<value>(Add role)</value>
</data>
+ <data name="mAssignRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mAssignRoleToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Assign role</value>
+ </data>
+ <data name="mEditRolesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mEditRolesToolStripMenuItem.Text" xml:space="preserve">
+ <value>E&dit roles...</value>
+ </data>
+ <data name="mClearRoleToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Clear role Ctrl+Shift+C</value>
+ </data>
+ <data name="mClearRoleToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+C</value>
+ </data>
+ <data name="mClearRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mClearRoleToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Clear role</value>
+ </data>
+ <data name="mPhraseDetectionToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Apply phrase detection Ctrl+Shift+P</value>
+ </data>
+ <data name="mPhraseDetectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+P</value>
+ </data>
+ <data name="mPhraseDetectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mPhraseDetectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>Apply p&hrase detection</value>
+ </data>
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Mark default custom class Ctrl+U</value>
+ </data>
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+U</value>
+ </data>
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
+ <value>Mar&k default custom class</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Begin audio selection Ctrl+[</value>
+ </data>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
+ <value>Ctrl+[</value>
+ </data>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+OemOpenBrackets</value>
+ </data>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 22</value>
+ </data>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Begin audio selection</value>
+ </data>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>End audio selection Ctrl+]</value>
+ </data>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
+ <value>Ctrl+]</value>
+ </data>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Oem6</value>
+ </data>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 22</value>
+ </data>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>&End audio selection</value>
+ </data>
+ <data name="mDeselectInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 22</value>
+ </data>
+ <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Deselect</value>
+ </data>
+ <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>Audi&o selection</value>
+ </data>
<data name="mNextTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Next TODO phrase Ctrl+F9</value>
</data>
@@ -990,12 +942,18 @@
<data name="mPreviousTODOPhraseToolStripMenuItem.Text" xml:space="preserve">
<value>&Previous TODO phrase</value>
</data>
- <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mPlayToolStripMenuItem.Text" xml:space="preserve">
- <value>&Play</value>
+ <data name="mGoToToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Go to...</value>
</data>
+ <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>57, 20</value>
+ </data>
+ <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Phrases</value>
+ </data>
<data name="mPlayAllToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Play all Ctrl+Shift+Space</value>
</data>
@@ -1020,6 +978,12 @@
<data name="mPlaySelectionToolStripMenuItem.Text" xml:space="preserve">
<value>Play &selection</value>
</data>
+ <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mPlayToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Play</value>
+ </data>
<data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Pause Space</value>
</data>
@@ -1056,12 +1020,6 @@
<data name="mStopToolStripMenuItem.Text" xml:space="preserve">
<value>&Stop</value>
</data>
- <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
- </data>
- <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve">
- <value>Fast p&lay</value>
- </data>
<data name="NormalSpeedtoolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Normal speed Ctrl+0</value>
</data>
@@ -1074,6 +1032,12 @@
<data name="NormalSpeedtoolStripMenuItem.Text" xml:space="preserve">
<value>&Normal speed</value>
</data>
+ <data name="mElapseBacktoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>221, 22</value>
+ </data>
+ <data name="mElapseBacktoolStripMenuItem.Text" xml:space="preserve">
+ <value>Normal speed with &elapse back</value>
+ </data>
<data name="SpeedUptoolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Speed up Ctrl++</value>
</data>
@@ -1104,17 +1068,11 @@
<data name="mSpeedDowntoolStripMenuItem.Text" xml:space="preserve">
<value>Slow &down</value>
</data>
- <data name="mElapseBacktoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>221, 22</value>
- </data>
- <data name="mElapseBacktoolStripMenuItem.Text" xml:space="preserve">
- <value>Normal speed with &elapse back</value>
- </data>
- <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve">
- <value>Pre&view</value>
+ <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve">
+ <value>Fast p&lay</value>
</data>
<data name="mPreviewFromToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Preview from... Ctrl+P</value>
@@ -1140,11 +1098,11 @@
<data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve">
<value>Preview &selected</value>
</data>
- <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="mRecordToolStripMenuItem.Text" xml:space="preserve">
- <value>&Record</value>
+ <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Pre&view</value>
</data>
<data name="mStartMonitoringToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Start Monitoring Ctrl+R</value>
@@ -1188,15 +1146,15 @@
<data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
<value>Allow &overwrite</value>
</data>
+ <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mRecordToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Record</value>
+ </data>
<data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
<value>169, 6</value>
</data>
- <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
- </data>
- <data name="navigationToolStripMenuItem.Text" xml:space="preserve">
- <value>&Navigation</value>
- </data>
<data name="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Previous section Alt+Up</value>
</data>
@@ -1278,6 +1236,12 @@
<data name="mPlayOnNavigateToolStripMenuItem.Text" xml:space="preserve">
<value>Play on &navigate</value>
</data>
+ <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="navigationToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Navigation</value>
+ </data>
<data name="mRewindToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Rewind Ctrl+comma</value>
</data>
@@ -1308,6 +1272,12 @@
<data name="mFastForwardToolStripMenuItem.Text" xml:space="preserve">
<value>&Fast forward</value>
</data>
+ <data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>66, 20</value>
+ </data>
+ <data name="transportToolStripMenuItem.Text" xml:space="preserve">
+ <value>Tr&ansport</value>
+ </data>
<data name="preferencesToolStripMenuItem1.AccessibleName" xml:space="preserve">
<value>Preferences Ctrl+Alt+F</value>
</data>
@@ -1320,6 +1290,12 @@
<data name="preferencesToolStripMenuItem1.Text" xml:space="preserve">
<value>&Preferences</value>
</data>
+ <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>44, 20</value>
+ </data>
+ <data name="mToolsToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Tools</value>
+ </data>
<data name="mContentsToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Contents F1</value>
</data>
@@ -1362,9 +1338,42 @@
<data name="aboutObiToolStripMenuItem.Text" xml:space="preserve">
<value>&About Obi</value>
</data>
+ <data name="mHelpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>40, 20</value>
+ </data>
+ <data name="mHelpToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Help</value>
+ </data>
+ <data name="mMenuStrip.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
+ <value>958, 24</value>
+ </data>
+ <data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="mMenuStrip.Text" xml:space="preserve">
+ <value>menuStrip1</value>
+ </data>
+ <data name=">>mMenuStrip.Name" xml:space="preserve">
+ <value>mMenuStrip</value>
+ </data>
+ <data name=">>mMenuStrip.Type" xml:space="preserve">
+ <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>mMenuStrip.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>mMenuStrip.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
<metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>0, 606</value>
</metadata>
+ <data name="mStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>0, 17</value>
+ </data>
<data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 606</value>
</data>
@@ -1389,9 +1398,6 @@
<data name=">>mStatusStrip.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="mStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>0, 17</value>
- </data>
<data name="mProjectView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@@ -1411,7 +1417,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.9.39245, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.11.2.24956, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1684,6 +1690,9 @@
CjyAD09DwA9QRcAfbGngHyBQ8H9MSf//Ii0=
</value>
</data>
+ <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
<data name="$this.Text" xml:space="preserve">
<value>Obi</value>
</data>
@@ -2263,6 +2272,12 @@
<data name=">>NormalSpeedtoolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>mElapseBacktoolStripMenuItem.Name" xml:space="preserve">
+ <value>mElapseBacktoolStripMenuItem</value>
+ </data>
+ <data name=">>mElapseBacktoolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>SpeedUptoolStripMenuItem.Name" xml:space="preserve">
<value>SpeedUptoolStripMenuItem</value>
</data>
@@ -2275,12 +2290,6 @@
<data name=">>mSpeedDowntoolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>mElapseBacktoolStripMenuItem.Name" xml:space="preserve">
- <value>mElapseBacktoolStripMenuItem</value>
- </data>
- <data name=">>mElapseBacktoolStripMenuItem.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name=">>mPreviewToolStripMenuItem.Name" xml:space="preserve">
<value>mPreviewToolStripMenuItem</value>
</data>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -1208,7 +1208,8 @@
{
return (key == (Keys)(Keys.Control | Keys.Tab) && SelectViewsInCycle(true)) ||
(key == (Keys)(Keys.Control | Keys.Shift | Keys.Tab) && SelectViewsInCycle(false)) ||
- (key == Keys.Space && TogglePlayPause()) ||
+ (key == (Keys)(Keys.Shift | Keys.Space) && TogglePlayPause(UseSelection)) ||
+ (key == Keys.Space && TogglePlayPause(UseAudioCursor)) ||
base.ProcessCmdKey(ref msg, key);
}
@@ -1301,21 +1302,35 @@
}
- // Toggle play/pause in the transport bar
- public bool TogglePlayPause()
+ private static readonly bool UseSelection = true;
+ private static readonly bool UseAudioCursor = false;
+
+ // Toggle play/pause in the transport bar.
+ // If the useSelection flag is set, resume from the selection
+ // rather than from the audio cursor.
+ public bool TogglePlayPause(bool useSelection)
{
- if ( !( mSelection is TextSelection ) &&
+ if (!(mSelection is TextSelection) &&
(mStripsView.ContainsFocus
|| mTOCView.ContainsFocus
- || mTransportBar.ContainsFocus) )
+ || mTransportBar.ContainsFocus))
{
- if (TransportBar.CanPause)
+ if ((TransportBar.CanPausePlayback || TransportBar.CanResumePlayback) && useSelection)
{
+ // Resume from selection, not from audio cursor
+ TransportBar.Stop();
+ TransportBar.PlayOrResume();
+ return true;
+ }
+ else if (TransportBar.CanPause)
+ {
+ // Pause playback or recording
TransportBar.Pause();
return true;
}
else if (TransportBar.CanPlay || TransportBar.CanResumePlayback)
{
+ // Start playback or resume from audio cursor
TransportBar.PlayOrResume();
return true;
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -61,7 +61,7 @@
this.mLabel.Name = "mLabel";
this.mLabel.Size = new System.Drawing.Size(300, 37);
this.mLabel.TabIndex = 0;
- this.mLabel.Click += new System.EventHandler(this.Label_Click);
+ this.mLabel.Click += new System.EventHandler(this.Strip_Click);
this.mLabel.LabelEditedByUser += new System.EventHandler(this.Label_LabelEditedByUser);
this.mLabel.EditableChanged += new System.EventHandler(this.Label_EditableChanged);
this.mLabel.SizeChanged += new System.EventHandler(this.Label_SizeChanged);
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -376,12 +376,6 @@
}
}
- // Clicking on the label toggles the strip selection. Use "rename" to rename.
- private void Label_Click(object sender, EventArgs e)
- {
- ToggleSelection();
- }
-
// Select the label when it is clicked (i.e. made editable) by the user.
private void Label_EditableChanged(object sender, EventArgs e)
{
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -627,10 +627,16 @@
mShortcutKeys[Keys.Shift | Keys.H] = delegate() { return mView.TransportBar.PrevSection(); };
mShortcutKeys[Keys.J] = delegate() { return mView.TransportBar.PrevPhrase(); };
mShortcutKeys[Keys.K] = delegate() { return mView.TransportBar.NextPhrase(); };
+ mShortcutKeys[Keys.N] = delegate() { return mView.TransportBar.Nudge(TransportBar.Forward); };
+ mShortcutKeys[Keys.Shift | Keys.N] = delegate() { return mView.TransportBar.Nudge(TransportBar.Backward); };
+ mShortcutKeys[Keys.OemOpenBrackets] = delegate() { return mView.TransportBar.MarkSelectionBeginTime(); };
+ mShortcutKeys[Keys.OemCloseBrackets] = delegate() { return mView.TransportBar.MarkSelectionEndTime(); };
mShortcutKeys[Keys.P] = delegate() { return mView.TransportBar.NextPage(); };
mShortcutKeys[Keys.Shift | Keys.P] = delegate() { return mView.TransportBar.PrevPage(); };
- mShortcutKeys[Keys.V] = delegate() { return mView.TransportBar.Preview(true); };
- mShortcutKeys[Keys.X] = delegate() { return mView.TransportBar.Preview(false); };
+ mShortcutKeys[Keys.V] = delegate() { return mView.TransportBar.Preview(TransportBar.From, TransportBar.UseAudioCursor); };
+ mShortcutKeys[Keys.Shift | Keys.V] = delegate() { return mView.TransportBar.Preview(TransportBar.From, TransportBar.UseSelection); };
+ mShortcutKeys[Keys.X] = delegate() { return mView.TransportBar.Preview(TransportBar.Upto, TransportBar.UseAudioCursor); };
+ mShortcutKeys[Keys.Shift | Keys.X] = delegate() { return mView.TransportBar.Preview(TransportBar.Upto, TransportBar.UseSelection); };
// playback shortcuts.
@@ -638,8 +644,6 @@
mShortcutKeys[Keys.F] = FastPlayRateStepUp;
mShortcutKeys[Keys.D] = FastPlayRateNormalise;
mShortcutKeys[Keys.E] = FastPlayNormaliseWithLapseBack;
- mShortcutKeys[Keys.OemOpenBrackets] = MarkSelectionBeginTime;
- mShortcutKeys[Keys.OemCloseBrackets] = MarkSelectionEndTime;
mShortcutKeys[Keys.Shift | Keys.OemOpenBrackets] = MarkSelectionFromCursor;
mShortcutKeys[Keys.Shift | Keys.OemCloseBrackets] = MarkSelectionToCursor;
@@ -1028,16 +1032,6 @@
return mView.TransportBar.FastPlayNormaliseWithLapseBack();
}
- private bool MarkSelectionBeginTime()
- {
- return mView.TransportBar.MarkSelectionBeginTime();
- }
-
- private bool MarkSelectionEndTime()
- {
- return mView.TransportBar.MarkSelectionEndTime();
- }
-
private bool MarkSelectionFromCursor()
{
return mView.TransportBar.MarkSelectionFromCursor();
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -110,6 +110,7 @@
public bool CanNavigatePrevPage { get { return Enabled && mRecordingSession == null; } }
public bool CanNavigatePrevSection { get { return Enabled && mRecordingSession == null; } }
public bool CanPause { get { return Enabled && (mState == State.Playing || mState == State.Recording); } }
+ public bool CanPausePlayback { get { return Enabled && mState == State.Playing; } }
public bool CanPlay { get { return Enabled && mState == State.Stopped; } }
public bool CanRecord { get { return Enabled && mState == State.Stopped; } }
public bool CanResumePlayback { get { return Enabled && mState == State.Paused; } }
@@ -1262,33 +1263,75 @@
}
- // preview playback functions
+ // nudge selection
+ public static readonly bool Forward = true; // nudge forward
+ public static readonly bool Backward = false; // nudge backward
-
+ // Nudge selection forward or backward.
+ public bool Nudge(bool forward)
+ {
+ double nudge = mView.ObiForm.Settings.NudgeTimeMs * (forward ? 1 : -1);
+ if (!IsRecorderActive && mState == State.Paused)
+ {
+ double time = mCurrentPlaylist.CurrentTimeInAsset + nudge;
+ if (time >= 0.0 && time < mCurrentPlaylist.CurrentPhrase.Duration)
+ {
+ // Move selection to audio cursor, stop, and nudge the selection.
+ mView.SelectedBlockNode = mCurrentPlaylist.CurrentPhrase;
+ mView.Selection = new AudioSelection((PhraseNode)mView.Selection.Node, mView.Selection.Control,
+ new AudioRange(time));
+ Stop();
+ return true;
+ }
+ }
+ else if (mState == State.Stopped)
+ {
+ AudioSelection s = mView.Selection as AudioSelection;
+ if (s != null)
+ {
+ double time = (s.AudioRange.HasCursor ? s.AudioRange.CursorTime : s.AudioRange.SelectionBeginTime) + nudge;
+ if (time >= 0.0 && time < ((PhraseNode)s.Node).Duration)
+ {
+ mView.Selection = new AudioSelection((PhraseNode)s.Node, mView.Selection.Control, new AudioRange(time));
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ // preview playback functions
+ public static readonly bool From = true;
+ public static readonly bool Upto = false;
+ public static readonly bool UseSelection = true;
+ public static readonly bool UseAudioCursor = false;
/// <summary>
- /// Preview from the current position; use the audio cursor, the selection cursor,
- /// or the beginning position of a selection.
+ /// Preview from or upt the current position; use the audio cursor, the selection cursor,
+ /// or the beginning position of a selection. If the useSelection flag is set, use the
+ /// selection position; otherwise, use the audio cursor position (if set.)
/// </summary>
- public bool Preview(bool forward)
+ public bool Preview(bool from, bool useSelection)
{
- if (mState == State.Paused || mState == State.Playing)
+ if (!IsRecorderActive)
{
- // use the audio cursor
- if (mState == State.Playing) Pause();
- PlayPreview(mCurrentPlaylist.CurrentPhrase, mCurrentPlaylist.CurrentTimeInAsset - (forward ? 0.0 : mPreviewDuration),
- mPreviewDuration, forward);
- return true;
+ if ((mState == State.Paused || mState == State.Playing) && !useSelection)
+ {
+ // use the audio cursor
+ if (mState == State.Playing) Pause();
+ PlayPreview(mCurrentPlaylist.CurrentPhrase, mCurrentPlaylist.CurrentTimeInAsset - (from ? 0.0 : mPreviewDuration),
+ mPreviewDuration, from);
+ return true;
+ }
+ else if (mView.Selection is AudioSelection)
+ {
+ AudioSelection s = (AudioSelection)mView.Selection;
+ double time = from ? s.AudioRange.CursorTime :
+ (s.AudioRange.HasCursor ? s.AudioRange.CursorTime : s.AudioRange.SelectionEndTime) - mPreviewDuration;
+ PlayPreview((PhraseNode)s.Node, time, mPreviewDuration, from);
+ return true;
+ }
}
- else if (mState == State.Stopped && mView.Selection is AudioSelection)
- {
- AudioSelection s = (AudioSelection)mView.Selection;
- double time = forward ? s.AudioRange.CursorTime :
- (s.AudioRange.HasCursor ? s.AudioRange.CursorTime : s.AudioRange.SelectionEndTime) - mPreviewDuration;
- PlayPreview((PhraseNode)s.Node, time, mPreviewDuration, forward);
- return true;
- }
return false;
}
Modified: trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -29,7 +29,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.11.1.*")]
+[assembly: AssemblyVersion("0.11.2.*")]
// There is a warning about this but it is harmless (1607)
-[assembly: AssemblyInformationalVersion("1.0 beta 1")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0 beta 2")]
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Settings.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Settings.cs 2008-05-17 18:37:21 UTC (rev 3086)
+++ trunk/urakawa/application/Obi/Obi/Settings.cs 2008-05-19 03:56:41 UTC (rev 3087)
@@ -25,6 +25,7 @@
public string DefaultPath; // default location
public bool EnableTooltips; // enable or disable tooltips
public float FontSize; // global font size (all font sizes must be relative to this one)
+ public double NudgeTimeMs; // nudge time in milliseconds
public string LastInputDevice; // the name of the last input device selected by the user
public string LastOpenProject; // path to the last open project
public string LastOutputDevice; // the name of the last output device selected by the user
@@ -39,7 +40,7 @@
public UserProfile UserProfile; // the user profile
public bool WrapStrips; // wrapping in content view
- private static readonly string SETTINGS_FILE_NAME = "obi_settings_alpha8.xml";
+ private static readonly string SETTINGS_FILE_NAME = "obi_settings_beta2.xml";
/// <summary>
@@ -69,6 +70,7 @@
settings.PlayIfNoSelection = true;
settings.PlayOnNavigate = true;
settings.WrapStrips = false;
+ settings.NudgeTimeMs = 100.0;
IsolatedStorageFile file = IsolatedStorageFile.GetUserStoreForDomain();
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-17 18:37:51
|
Revision: 3086
http://urakawa.svn.sourceforge.net/urakawa/?rev=3086&view=rev
Author: avneeshsingh
Date: 2008-05-17 11:37:21 -0700 (Sat, 17 May 2008)
Log Message:
-----------
Fix to bugg:
accessible label error in phrase count after ph detection
- functions added for this will be useful for other problems also.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs 2008-05-16 21:52:47 UTC (rev 3085)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs 2008-05-17 18:37:21 UTC (rev 3086)
@@ -78,7 +78,7 @@
}
// Update label and waveform when there is new information to display.
- protected override void UpdateLabel()
+ public override void UpdateLabel()
{
/*string name = mNode.NodeKind == EmptyNode.Kind.Plain ? Localizer.Message("blank_phrase") :
mNode.NodeKind == EmptyNode.Kind.Page ? String.Format(Localizer.Message("page_number"), mNode.PageNumber) :
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-16 21:52:47 UTC (rev 3085)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-17 18:37:21 UTC (rev 3086)
@@ -112,7 +112,7 @@
// Generate the label string for this block.
// Since there is no content, the width is always that of the label's.
- protected virtual void UpdateLabel()
+ public virtual void UpdateLabel()
{
mLabel.Text = Node.BaseStringShort();
mLabel.AccessibleName = Node.BaseString();
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 21:52:47 UTC (rev 3085)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-17 18:37:21 UTC (rev 3086)
@@ -1182,7 +1182,11 @@
if (PhraseDetectionDialog.DialogResult == DialogResult.OK)
{
mPresentation.getUndoRedoManager().execute(new Commands.Node.PhraseDetection(this, PhraseDetectionDialog.Threshold, PhraseDetectionDialog.Gap, PhraseDetectionDialog.LeadingSilence));
- }
+
+ // update blocks labels such that error in label due to serial creation of phrases is removed
+ if ( SelectedNodeAs<EmptyNode>() != null )
+ mStripsView.UpdateBlocksLabelInStrip(SelectedNodeAs<EmptyNode>().ParentAs<SectionNode>() );
+ }
}// check for phrase node ends
else
System.Media.SystemSounds.Beep.Play();
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-16 21:52:47 UTC (rev 3085)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-17 18:37:21 UTC (rev 3086)
@@ -487,5 +487,22 @@
{
// System.Diagnostics.Debug.Print("<---> Resize block panel to " + mBlocksPanel.Size);
}
+
+ public void UpdateBlockLabelsInStrip()
+ {
+ int BlocksCount = mBlocksPanel.Controls.Count;
+ Control BlockControl = null ;
+
+ for (int i = 0; i < BlocksCount; i++)
+ {
+ BlockControl = mBlocksPanel.Controls[i] ;
+ if (BlockControl is Block )
+ {
+ ((Block)BlockControl).UpdateLabel();
+ }
+
+ }
+ }
+
}
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 21:52:47 UTC (rev 3085)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-17 18:37:21 UTC (rev 3086)
@@ -1165,5 +1165,13 @@
}
}
}
+
+ public void UpdateBlocksLabelInStrip(SectionNode node)
+ {
+ Strip s = FindStrip(node);
+ if (s != null)
+ s.UpdateBlockLabelsInStrip();
+ }
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-16 21:52:49
|
Revision: 3085
http://urakawa.svn.sourceforge.net/urakawa/?rev=3085&view=rev
Author: julienq
Date: 2008-05-16 14:52:47 -0700 (Fri, 16 May 2008)
Log Message:
-----------
Updated installer for beta version
Modified Paths:
--------------
trunk/urakawa/application/Obi/Setup/Setup.vdproj
Modified: trunk/urakawa/application/Obi/Setup/Setup.vdproj
===================================================================
--- trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-16 21:46:41 UTC (rev 3084)
+++ trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-16 21:52:47 UTC (rev 3085)
@@ -39,12 +39,24 @@
}
"Entry"
{
+ "MsmKey" = "8:_2096DDB22BEE4CB981EAD9FDDF4000C0"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_29B0073336FEECBE1DA769C44A87F89B"
"OwnerKey" = "8:_5D74C0D378D74D17BD753426073D0BF5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_3494D064CD1F4EC497C1E3B3DC664447"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_3B7ECD98981F47919D717BCC603FACEE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -57,6 +69,18 @@
}
"Entry"
{
+ "MsmKey" = "8:_57FD3F9F1AD14277AB7E67518392D58B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_59E5A798773949D4A6FC9F5EF2C1166C"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_5D74C0D378D74D17BD753426073D0BF5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -81,6 +105,24 @@
}
"Entry"
{
+ "MsmKey" = "8:_72190BF0A9D246F196F2DE920941FE3C"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_768E2D588B234F5A8EC739B66FD726F1"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_797E6042DD6447E1877B133751E74EF5"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_827508A28B554BABB8F40933CA886CC8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -93,6 +135,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_857120B771BE47188B2442003FEB9A55"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_8D91DBDC5910739EF90DFA0C2BE6073A"
"OwnerKey" = "8:_5D74C0D378D74D17BD753426073D0BF5"
"MsmSig" = "8:_UNDEFINED"
@@ -183,6 +231,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_D8475CA0C5814EC9AFC53F2AFD18FDC0"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_DD9352CE2474474589A1F7FFD8907821"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -213,6 +267,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_FF0DD0F23E9B45B28F7D9D9F1A89256C"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5D74C0D378D74D17BD753426073D0BF5"
"MsmSig" = "8:_UNDEFINED"
@@ -451,6 +511,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2096DDB22BEE4CB981EAD9FDDF4000C0"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_meta_editor_small.jpg"
+ "TargetName" = "8:obi_meta_editor_small.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_29B0073336FEECBE1DA769C44A87F89B"
{
"AssemblyRegister" = "3:1"
@@ -482,6 +562,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3494D064CD1F4EC497C1E3B3DC664447"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_set_pagenumber_dialog.jpg"
+ "TargetName" = "8:obi_set_pagenumber_dialog.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B7ECD98981F47919D717BCC603FACEE"
{
"SourcePath" = "8:..\\Obi\\bin\\Debug\\Export\\package.xslt"
@@ -522,6 +622,46 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_57FD3F9F1AD14277AB7E67518392D58B"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_prefs_user_profile.jpg"
+ "TargetName" = "8:obi_prefs_user_profile.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_59E5A798773949D4A6FC9F5EF2C1166C"
+ {
+ "SourcePath" = "8:..\\Obi\\help.css"
+ "TargetName" = "8:help.css"
+ "Tag" = "8:"
+ "Folder" = "8:_4D3BED1A25304BAD92EA81B4D13F5EF1"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_69B42FA276EC8EC3A2E3BB8E252CF5AC"
{
"AssemblyRegister" = "3:1"
@@ -553,6 +693,66 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_72190BF0A9D246F196F2DE920941FE3C"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_prefs_project.jpg"
+ "TargetName" = "8:obi_prefs_project.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_768E2D588B234F5A8EC739B66FD726F1"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_tbar_pre_rec.jpg"
+ "TargetName" = "8:obi_tbar_pre_rec.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_797E6042DD6447E1877B133751E74EF5"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_create_new_project.jpg"
+ "TargetName" = "8:obi_create_new_project.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_827508A28B554BABB8F40933CA886CC8"
{
"SourcePath" = "8:..\\Obi\\about_en.html"
@@ -593,6 +793,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_857120B771BE47188B2442003FEB9A55"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_toc_view.jpg"
+ "TargetName" = "8:obi_toc_view.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8D91DBDC5910739EF90DFA0C2BE6073A"
{
"AssemblyRegister" = "3:1"
@@ -937,6 +1157,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D8475CA0C5814EC9AFC53F2AFD18FDC0"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_phrase_and_cursor.jpg"
+ "TargetName" = "8:obi_phrase_and_cursor.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD9352CE2474474589A1F7FFD8907821"
{
"SourcePath" = "8:..\\Obi\\images\\icons\\go-first.png"
@@ -1037,6 +1277,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FF0DD0F23E9B45B28F7D9D9F1A89256C"
+ {
+ "SourcePath" = "8:..\\Obi\\images\\obi_prefs_audio.jpg"
+ "TargetName" = "8:obi_prefs_audio.jpg"
+ "Tag" = "8:"
+ "Folder" = "8:_32F80C511F4B40F1B79B5D7AFD966F83"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
}
"FileType"
{
@@ -1173,15 +1433,15 @@
"Product"
{
"Name" = "8:Microsoft Visual Studio"
- "ProductName" = "8:Obi 0.10.9"
- "ProductCode" = "8:{85A99D0A-5FF6-4CC7-A480-101BF4E080F0}"
- "PackageCode" = "8:{685FA0E0-A285-4B18-BD6A-350237A923FB}"
+ "ProductName" = "8:Obi Beta 1"
+ "ProductCode" = "8:{D71E6772-1ADE-43CF-BC93-AA7428E99577}"
+ "PackageCode" = "8:{E6246717-8595-4AA2-8D50-E20F938D3C33}"
"UpgradeCode" = "8:{358C2C3A-3686-4461-A8BA-9D766218CC5E}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:0.10.6"
+ "ProductVersion" = "8:0.11.1"
"Manufacturer" = "8:The Urakawa Project"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
@@ -1296,7 +1556,7 @@
{
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_0F34FEE7392245ED8C33C78EB0D2823B"
{
- "Name" = "8:Obi 0.10.9"
+ "Name" = "8:Obi Beta 1"
"Arguments" = "8:"
"Description" = "8:"
"ShowCmd" = "3:1"
@@ -1310,7 +1570,7 @@
}
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_C26CA4074EF24904B9E49A74044A43B0"
{
- "Name" = "8:Obi 0.10.7"
+ "Name" = "8:Obi Beta 1"
"Arguments" = "8:"
"Description" = "8:"
"ShowCmd" = "3:1"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-16 21:46:44
|
Revision: 3084
http://urakawa.svn.sourceforge.net/urakawa/?rev=3084&view=rev
Author: julienq
Date: 2008-05-16 14:46:41 -0700 (Fri, 16 May 2008)
Log Message:
-----------
Updated documentation and version numbers.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/DataModelFactory.cs
trunk/urakawa/application/Obi/Obi/Obi.csproj
trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
trunk/urakawa/application/Obi/Obi/ObiForm.resx
trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs
trunk/urakawa/application/Obi/Obi/about_en.html
Modified: trunk/urakawa/application/Obi/Obi/DataModelFactory.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/DataModelFactory.cs 2008-05-16 21:42:04 UTC (rev 3083)
+++ trunk/urakawa/application/Obi/Obi/DataModelFactory.cs 2008-05-16 21:46:41 UTC (rev 3084)
@@ -8,7 +8,7 @@
public class DataModelFactory : urakawa.DataModelFactory
{
public static readonly string NS = "http://www.daisy.org/urakawa/obi"; // Obi-specific namespace
- public static readonly string XUK_VERSION = "xuk/obi;alpha"; // versioning for Obi XUK files
+ public static readonly string XUK_VERSION = "xuk/obi;beta"; // versioning for Obi XUK files
/// <summary>
/// The generator string for XUK export identifies the version of Obi and of the toolkit used.
Modified: trunk/urakawa/application/Obi/Obi/Obi.csproj
===================================================================
--- trunk/urakawa/application/Obi/Obi/Obi.csproj 2008-05-16 21:42:04 UTC (rev 3083)
+++ trunk/urakawa/application/Obi/Obi/Obi.csproj 2008-05-16 21:46:41 UTC (rev 3084)
@@ -498,6 +498,9 @@
<Content Include="Export\Z.xslt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="help.css">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="images\icons\bookmark-new.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -543,6 +546,33 @@
<Content Include="help_en.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="images\obi_create_new_project.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="images\obi_meta_editor_small.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="images\obi_phrase_and_cursor.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="images\obi_prefs_audio.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="images\obi_prefs_project.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="images\obi_prefs_user_profile.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="images\obi_set_pagenumber_dialog.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="images\obi_tbar_pre_rec.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="images\obi_toc_view.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="obi.ico" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-16 21:42:04 UTC (rev 3083)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-16 21:46:41 UTC (rev 3084)
@@ -135,6 +135,7 @@
this.mPreviewSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mRecordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mStartMonitoringToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mStartRecordingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mStartRecordingDirectlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mAllowOverwriteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
@@ -159,7 +160,6 @@
this.mStatusStrip = new System.Windows.Forms.StatusStrip();
this.mStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.mProjectView = new Obi.ProjectView.ProjectView();
- this.mStartRecordingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mMenuStrip.SuspendLayout();
this.mStatusStrip.SuspendLayout();
this.SuspendLayout();
@@ -854,9 +854,9 @@
//
this.mFastPlaytoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NormalSpeedtoolStripMenuItem,
+ this.mElapseBacktoolStripMenuItem,
this.SpeedUptoolStripMenuItem,
- this.mSpeedDowntoolStripMenuItem,
- this.mElapseBacktoolStripMenuItem});
+ this.mSpeedDowntoolStripMenuItem});
this.mFastPlaytoolStripMenuItem.Name = "mFastPlaytoolStripMenuItem";
resources.ApplyResources(this.mFastPlaytoolStripMenuItem, "mFastPlaytoolStripMenuItem");
//
@@ -921,12 +921,18 @@
this.mRecordToolStripMenuItem.Name = "mRecordToolStripMenuItem";
resources.ApplyResources(this.mRecordToolStripMenuItem, "mRecordToolStripMenuItem");
//
- // mStartListeningToolStripMenuItem
+ // mStartMonitoringToolStripMenuItem
//
- resources.ApplyResources(this.mStartMonitoringToolStripMenuItem, "mStartListeningToolStripMenuItem");
- this.mStartMonitoringToolStripMenuItem.Name = "mStartListeningToolStripMenuItem";
+ resources.ApplyResources(this.mStartMonitoringToolStripMenuItem, "mStartMonitoringToolStripMenuItem");
+ this.mStartMonitoringToolStripMenuItem.Name = "mStartMonitoringToolStripMenuItem";
this.mStartMonitoringToolStripMenuItem.Click += new System.EventHandler(this.mStartMonitoringToolStripMenuItem_Click);
//
+ // mStartRecordingToolStripMenuItem
+ //
+ resources.ApplyResources(this.mStartRecordingToolStripMenuItem, "mStartRecordingToolStripMenuItem");
+ this.mStartRecordingToolStripMenuItem.Name = "mStartRecordingToolStripMenuItem";
+ this.mStartRecordingToolStripMenuItem.Click += new System.EventHandler(this.mStartRecordingToolStripMenuItem_Click);
+ //
// mStartRecordingDirectlyToolStripMenuItem
//
resources.ApplyResources(this.mStartRecordingDirectlyToolStripMenuItem, "mStartRecordingDirectlyToolStripMenuItem");
@@ -1099,12 +1105,6 @@
this.mProjectView.TOCViewVisible = true;
this.mProjectView.TransportBarVisible = false;
//
- // mStartRecordingToolStripMenuItem
- //
- resources.ApplyResources(this.mStartRecordingToolStripMenuItem, "mStartRecordingToolStripMenuItem");
- this.mStartRecordingToolStripMenuItem.Name = "mStartRecordingToolStripMenuItem";
- this.mStartRecordingToolStripMenuItem.Click += new System.EventHandler(this.mStartRecordingToolStripMenuItem_Click);
- //
// ObiForm
//
resources.ApplyResources(this, "$this");
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 21:42:04 UTC (rev 3083)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 21:46:41 UTC (rev 3084)
@@ -145,154 +145,182 @@
<data name="mSectionsToolStripMenuItem.Text" xml:space="preserve">
<value>&Sections</value>
</data>
- <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>57, 20</value>
+ <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Add blank phrase Ctrl+B</value>
</data>
- <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve">
- <value>&Phrases</value>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="mAddBlankPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+B</value>
</data>
- <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mAddBlankPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mPlayToolStripMenuItem.Text" xml:space="preserve">
- <value>&Play</value>
+ <data name="mAddBlankPhraseToolStripMenuItem.Text" xml:space="preserve">
+ <value>Add &blank phrase</value>
</data>
- <data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Pause Space</value>
+ <data name="mAddEmptyPagesToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Add empty pages Ctrl+Shift+B</value>
</data>
- <data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
- <value>Space</value>
+ <data name="mAddEmptyPagesToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+B</value>
</data>
- <data name="mPauseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mAddEmptyPagesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mPauseToolStripMenuItem.Text" xml:space="preserve">
- <value>Pa&use</value>
+ <data name="mAddEmptyPagesToolStripMenuItem.Text" xml:space="preserve">
+ <value>Add empty &pages</value>
</data>
- <data name="mResumeToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Resume Space</value>
+ <data name="mImportAudioFileToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Import audio files Ctrl+I</value>
</data>
- <data name="mResumeToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
- <value>Space</value>
+ <data name="mImportAudioFileToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+I</value>
</data>
- <data name="mResumeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mImportAudioFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mResumeToolStripMenuItem.Text" xml:space="preserve">
- <value>Res&ume</value>
+ <data name="mImportAudioFileToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Import audio files</value>
</data>
- <data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Stop Ctrl+Space</value>
+ <data name="mSplitPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Split phrase Ctrl+Q</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Space</value>
+ <data name="mSplitPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Q</value>
</data>
- <data name="mStopToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mSplitPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mStopToolStripMenuItem.Text" xml:space="preserve">
- <value>&Stop</value>
+ <data name="mSplitPhraseToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Split phrase</value>
</data>
- <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mMergePhraseWithNextToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Merge phrase with next Ctrl+M</value>
</data>
- <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve">
- <value>Fast p&lay</value>
+ <data name="mMergePhraseWithNextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+M</value>
</data>
- <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mMergePhraseWithNextToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve">
- <value>Pre&view</value>
+ <data name="mMergePhraseWithNextToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Merge phrase with next</value>
</data>
- <data name="mStartListeningToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Start Monitoring Ctrl+R</value>
+ <data name="mPhraseIsUsedToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Phrase is used Ctrl+K</value>
</data>
- <data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+R</value>
+ <data name="mPhraseIsUsedToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+K</value>
</data>
- <data name="mStartListeningToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mPhraseIsUsedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>253, 22</value>
</data>
- <data name="mStartListeningToolStripMenuItem.Text" xml:space="preserve">
- <value>&Start monitoring</value>
+ <data name="mPhraseIsUsedToolStripMenuItem.Text" xml:space="preserve">
+ <value>Phrase is &used</value>
</data>
- <data name="mStartRecordingToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Start recording Ctrl+R</value>
+ <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>250, 6</value>
</data>
- <data name="mStartRecordingToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+R</value>
+ <data name="mAssignRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mStartRecordingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mAssignRoleToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Assign role</value>
+ </data>
+ <data name="mEditRolesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>253, 22</value>
</data>
- <data name="mStartRecordingToolStripMenuItem.Text" xml:space="preserve">
- <value>&Start recording</value>
+ <data name="mEditRolesToolStripMenuItem.Text" xml:space="preserve">
+ <value>E&dit roles...</value>
</data>
- <data name="mStartRecordingDirectlyToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Start Recording directly ctrl+shift+r</value>
+ <data name="mClearRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mStartRecordingDirectlyToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+R</value>
+ <data name="mClearRoleToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Clear role</value>
</data>
- <data name="mStartRecordingDirectlyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mPhraseDetectionToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Apply phrase detection Ctrl+Shift+P</value>
+ </data>
+ <data name="mPhraseDetectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+P</value>
+ </data>
+ <data name="mPhraseDetectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>253, 22</value>
</data>
- <data name="mStartRecordingDirectlyToolStripMenuItem.Text" xml:space="preserve">
- <value>Start &recording directly</value>
+ <data name="mPhraseDetectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>Apply p&hrase detection</value>
</data>
- <data name="mAllowOverwriteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Mark default custom class Ctrl+U</value>
+ </data>
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+U</value>
+ </data>
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>253, 22</value>
</data>
- <data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
- <value>Allow &overwrite</value>
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
+ <value>Mar&k default custom class</value>
</data>
- <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
</data>
- <data name="mRecordToolStripMenuItem.Text" xml:space="preserve">
- <value>&Record</value>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Begin audio selection Ctrl+[</value>
</data>
- <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
- <value>169, 6</value>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
+ <value>Ctrl+[</value>
</data>
- <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+OemOpenBrackets</value>
</data>
- <data name="navigationToolStripMenuItem.Text" xml:space="preserve">
- <value>&Navigation</value>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 22</value>
</data>
- <data name="mRewindToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Rewind Ctrl+comma</value>
+ <data name="mBeginInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Begin audio selection</value>
</data>
- <data name="mRewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
- <value>Ctrl+,</value>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>End audio selection Ctrl+]</value>
</data>
- <data name="mRewindToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Oemcomma</value>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
+ <value>Ctrl+]</value>
</data>
- <data name="mRewindToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Oem6</value>
</data>
- <data name="mRewindToolStripMenuItem.Text" xml:space="preserve">
- <value>Re&wind</value>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 22</value>
</data>
- <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Fast forward Ctrl+period</value>
+ <data name="mEndInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>&End audio selection</value>
</data>
- <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
- <value>Ctrl+.</value>
+ <data name="mDeselectInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>229, 22</value>
</data>
- <data name="mFastForwardToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+OemPeriod</value>
+ <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Deselect</value>
</data>
- <data name="mFastForwardToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="mFastForwardToolStripMenuItem.Text" xml:space="preserve">
- <value>&Fast forward</value>
+ <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>Audi&o selection</value>
</data>
+ <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mGoToToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Go to...</value>
+ </data>
+ <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>57, 20</value>
+ </data>
+ <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Phrases</value>
+ </data>
<data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 20</value>
</data>
@@ -317,7 +345,6 @@
<data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>958, 24</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
@@ -903,87 +930,6 @@
<data name="mSectionIsUsedToolStripMenuItem.Text" xml:space="preserve">
<value>Section is &used</value>
</data>
- <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Add blank phrase Ctrl+B</value>
- </data>
- <data name="mAddBlankPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+B</value>
- </data>
- <data name="mAddBlankPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mAddBlankPhraseToolStripMenuItem.Text" xml:space="preserve">
- <value>Add &blank phrase</value>
- </data>
- <data name="mAddEmptyPagesToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Add empty pages Ctrl+Shift+B</value>
- </data>
- <data name="mAddEmptyPagesToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+B</value>
- </data>
- <data name="mAddEmptyPagesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mAddEmptyPagesToolStripMenuItem.Text" xml:space="preserve">
- <value>Add empty &pages</value>
- </data>
- <data name="mImportAudioFileToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Import audio files Ctrl+I</value>
- </data>
- <data name="mImportAudioFileToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+I</value>
- </data>
- <data name="mImportAudioFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mImportAudioFileToolStripMenuItem.Text" xml:space="preserve">
- <value>&Import audio files</value>
- </data>
- <data name="mSplitPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Split phrase Ctrl+Q</value>
- </data>
- <data name="mSplitPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Q</value>
- </data>
- <data name="mSplitPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mSplitPhraseToolStripMenuItem.Text" xml:space="preserve">
- <value>&Split phrase</value>
- </data>
- <data name="mMergePhraseWithNextToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Merge phrase with next Ctrl+M</value>
- </data>
- <data name="mMergePhraseWithNextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+M</value>
- </data>
- <data name="mMergePhraseWithNextToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mMergePhraseWithNextToolStripMenuItem.Text" xml:space="preserve">
- <value>&Merge phrase with next</value>
- </data>
- <data name="mPhraseIsUsedToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Phrase is used Ctrl+K</value>
- </data>
- <data name="mPhraseIsUsedToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+K</value>
- </data>
- <data name="mPhraseIsUsedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mPhraseIsUsedToolStripMenuItem.Text" xml:space="preserve">
- <value>Phrase is &used</value>
- </data>
- <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
- <value>250, 6</value>
- </data>
- <data name="mAssignRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mAssignRoleToolStripMenuItem.Text" xml:space="preserve">
- <value>&Assign role</value>
- </data>
<data name="mSetAsHeadingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 22</value>
</data>
@@ -1020,93 +966,6 @@
<data name="mAddRoleToolStripTextBox.Text" xml:space="preserve">
<value>(Add role)</value>
</data>
- <data name="mEditRolesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mEditRolesToolStripMenuItem.Text" xml:space="preserve">
- <value>E&dit roles...</value>
- </data>
- <data name="mClearRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mClearRoleToolStripMenuItem.Text" xml:space="preserve">
- <value>&Clear role</value>
- </data>
- <data name="mPhraseDetectionToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Apply phrase detection Ctrl+Shift+P</value>
- </data>
- <data name="mPhraseDetectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+P</value>
- </data>
- <data name="mPhraseDetectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mPhraseDetectionToolStripMenuItem.Text" xml:space="preserve">
- <value>Apply p&hrase detection</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Mark default custom class Ctrl+U</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+U</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
- <value>Mar&k default custom class</value>
- </data>
- <data name="mMarkDefaultCustomClassToolStripMenuItem.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
- </data>
- <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>In-ph&rase audio selection</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Begin in-phrase selection Ctrl+[</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
- <value>Ctrl+[</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+OemOpenBrackets</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>229, 22</value>
- </data>
- <data name="mBeginInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>&Begin in-phrase selection</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>End in-phrase selection Ctrl+]</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
- <value>Ctrl+]</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Oem6</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>229, 22</value>
- </data>
- <data name="mEndInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>&End in-phrase selection</value>
- </data>
- <data name="mDeselectInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>229, 22</value>
- </data>
- <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>&Deselect</value>
- </data>
- <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="mGoToToolStripMenuItem.Text" xml:space="preserve">
- <value>&Go to...</value>
- </data>
<data name="mNextTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Next TODO phrase Ctrl+F9</value>
</data>
@@ -1131,6 +990,12 @@
<data name="mPreviousTODOPhraseToolStripMenuItem.Text" xml:space="preserve">
<value>&Previous TODO phrase</value>
</data>
+ <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mPlayToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Play</value>
+ </data>
<data name="mPlayAllToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Play all Ctrl+Shift+Space</value>
</data>
@@ -1155,6 +1020,48 @@
<data name="mPlaySelectionToolStripMenuItem.Text" xml:space="preserve">
<value>Play &selection</value>
</data>
+ <data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Pause Space</value>
+ </data>
+ <data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
+ <value>Space</value>
+ </data>
+ <data name="mPauseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mPauseToolStripMenuItem.Text" xml:space="preserve">
+ <value>Pa&use</value>
+ </data>
+ <data name="mResumeToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Resume Space</value>
+ </data>
+ <data name="mResumeToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
+ <value>Space</value>
+ </data>
+ <data name="mResumeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mResumeToolStripMenuItem.Text" xml:space="preserve">
+ <value>Res&ume</value>
+ </data>
+ <data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Stop Ctrl+Space</value>
+ </data>
+ <data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Space</value>
+ </data>
+ <data name="mStopToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mStopToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Stop</value>
+ </data>
+ <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve">
+ <value>Fast p&lay</value>
+ </data>
<data name="NormalSpeedtoolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Normal speed Ctrl+0</value>
</data>
@@ -1183,7 +1090,7 @@
<value>Speed &up</value>
</data>
<data name="mSpeedDowntoolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Speed down Ctrl+-</value>
+ <value>Slow down Ctrl+-</value>
</data>
<data name="mSpeedDowntoolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+-</value>
@@ -1195,7 +1102,7 @@
<value>221, 22</value>
</data>
<data name="mSpeedDowntoolStripMenuItem.Text" xml:space="preserve">
- <value>Speed &down</value>
+ <value>Slow &down</value>
</data>
<data name="mElapseBacktoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>221, 22</value>
@@ -1203,6 +1110,12 @@
<data name="mElapseBacktoolStripMenuItem.Text" xml:space="preserve">
<value>Normal speed with &elapse back</value>
</data>
+ <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Pre&view</value>
+ </data>
<data name="mPreviewFromToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Preview from... Ctrl+P</value>
</data>
@@ -1227,6 +1140,63 @@
<data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve">
<value>Preview &selected</value>
</data>
+ <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mRecordToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Record</value>
+ </data>
+ <data name="mStartMonitoringToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Start Monitoring Ctrl+R</value>
+ </data>
+ <data name="mStartMonitoringToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+R</value>
+ </data>
+ <data name="mStartMonitoringToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mStartMonitoringToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Start monitoring</value>
+ </data>
+ <data name="mStartRecordingToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Start recording Ctrl+R</value>
+ </data>
+ <data name="mStartRecordingToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+R</value>
+ </data>
+ <data name="mStartRecordingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mStartRecordingToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Start recording</value>
+ </data>
+ <data name="mStartRecordingDirectlyToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Start Recording directly ctrl+shift+r</value>
+ </data>
+ <data name="mStartRecordingDirectlyToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+R</value>
+ </data>
+ <data name="mStartRecordingDirectlyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mStartRecordingDirectlyToolStripMenuItem.Text" xml:space="preserve">
+ <value>Start &recording directly</value>
+ </data>
+ <data name="mAllowOverwriteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
+ <value>Allow &overwrite</value>
+ </data>
+ <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
+ <value>169, 6</value>
+ </data>
+ <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="navigationToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Navigation</value>
+ </data>
<data name="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Previous section Alt+Up</value>
</data>
@@ -1308,6 +1278,36 @@
<data name="mPlayOnNavigateToolStripMenuItem.Text" xml:space="preserve">
<value>Play on &navigate</value>
</data>
+ <data name="mRewindToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Rewind Ctrl+comma</value>
+ </data>
+ <data name="mRewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
+ <value>Ctrl+,</value>
+ </data>
+ <data name="mRewindToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Oemcomma</value>
+ </data>
+ <data name="mRewindToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mRewindToolStripMenuItem.Text" xml:space="preserve">
+ <value>Re&wind</value>
+ </data>
+ <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Fast forward Ctrl+period</value>
+ </data>
+ <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
+ <value>Ctrl+.</value>
+ </data>
+ <data name="mFastForwardToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+OemPeriod</value>
+ </data>
+ <data name="mFastForwardToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="mFastForwardToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Fast forward</value>
+ </data>
<data name="preferencesToolStripMenuItem1.AccessibleName" xml:space="preserve">
<value>Preferences Ctrl+Alt+F</value>
</data>
@@ -1411,7 +1411,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.9.38938, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.9.39245, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1684,9 +1684,6 @@
CjyAD09DwA9QRcAfbGngHyBQ8H9MSf//Ii0=
</value>
</data>
- <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
<data name="$this.Text" xml:space="preserve">
<value>Obi</value>
</data>
@@ -2314,12 +2311,18 @@
<data name=">>mRecordToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>mStartListeningToolStripMenuItem.Name" xml:space="preserve">
- <value>mStartListeningToolStripMenuItem</value>
+ <data name=">>mStartMonitoringToolStripMenuItem.Name" xml:space="preserve">
+ <value>mStartMonitoringToolStripMenuItem</value>
</data>
- <data name=">>mStartListeningToolStripMenuItem.Type" xml:space="preserve">
+ <data name=">>mStartMonitoringToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>mStartRecordingToolStripMenuItem.Name" xml:space="preserve">
+ <value>mStartRecordingToolStripMenuItem</value>
+ </data>
+ <data name=">>mStartRecordingToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>mStartRecordingDirectlyToolStripMenuItem.Name" xml:space="preserve">
<value>mStartRecordingDirectlyToolStripMenuItem</value>
</data>
@@ -2452,12 +2455,6 @@
<data name=">>mStatusLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>mStartRecordingToolStripMenuItem.Name" xml:space="preserve">
- <value>mStartRecordingToolStripMenuItem</value>
- </data>
- <data name=">>mStartRecordingToolStripMenuItem.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name=">>$this.Name" xml:space="preserve">
<value>ObiForm</value>
</data>
Modified: trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-16 21:42:04 UTC (rev 3083)
+++ trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-16 21:46:41 UTC (rev 3084)
@@ -29,7 +29,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.10.9.*")]
+[assembly: AssemblyVersion("0.11.1.*")]
// There is a warning about this but it is harmless (1607)
-[assembly: AssemblyInformationalVersion("1.0 alpha 9")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0 beta 1")]
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/about_en.html
===================================================================
--- trunk/urakawa/application/Obi/Obi/about_en.html 2008-05-16 21:42:04 UTC (rev 3083)
+++ trunk/urakawa/application/Obi/Obi/about_en.html 2008-05-16 21:46:41 UTC (rev 3084)
@@ -11,7 +11,7 @@
<p>Website: <a href="http://urakawa.sf.net/obi">http://urakawa.sf.net/obi</a></p>
<p>Contributors (in alphabetical order): Ole Holst Andersen, Romain Deltour, Marisa DeMeglio,
Markus Gylling, Dipendra Manocha, Laust Skat Nielsen, Julien Quint, Suman Sharma, Avneesh Singh,
- Daniel Weck.</p>
+ Jennifer Sutton, Daniel Weck.</p>
<p>Released under the <a href="http://www.gnu.org/licenses/lgpl.html">GNU LGPL</a>.</p>
<p style="text-align:center"><img src="images/obird256.png" alt="Obird, the icon of Obi"/></p>
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-16 21:42:07
|
Revision: 3083
http://urakawa.svn.sourceforge.net/urakawa/?rev=3083&view=rev
Author: julienq
Date: 2008-05-16 14:42:04 -0700 (Fri, 16 May 2008)
Log Message:
-----------
Updated inline documentation
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/help_en.html
Added Paths:
-----------
trunk/urakawa/application/Obi/Obi/help.css
trunk/urakawa/application/Obi/Obi/images/obi_create_new_project.jpg
trunk/urakawa/application/Obi/Obi/images/obi_meta_editor_small.jpg
trunk/urakawa/application/Obi/Obi/images/obi_phrase_and_cursor.jpg
trunk/urakawa/application/Obi/Obi/images/obi_prefs_audio.jpg
trunk/urakawa/application/Obi/Obi/images/obi_prefs_project.jpg
trunk/urakawa/application/Obi/Obi/images/obi_prefs_user_profile.jpg
trunk/urakawa/application/Obi/Obi/images/obi_set_pagenumber_dialog.jpg
trunk/urakawa/application/Obi/Obi/images/obi_tbar_pre_rec.jpg
trunk/urakawa/application/Obi/Obi/images/obi_toc_view.jpg
Removed Paths:
-------------
trunk/urakawa/application/Obi/Obi/images/manual_audioblockeditoptions.png
trunk/urakawa/application/Obi/Obi/images/manual_heading.png
trunk/urakawa/application/Obi/Obi/images/manual_importaudio.png
trunk/urakawa/application/Obi/Obi/images/manual_mainwindow.png
trunk/urakawa/application/Obi/Obi/images/manual_metadata.png
trunk/urakawa/application/Obi/Obi/images/manual_newproject.png
trunk/urakawa/application/Obi/Obi/images/manual_phrasedetection.png
trunk/urakawa/application/Obi/Obi/images/manual_preferences_audio.png
trunk/urakawa/application/Obi/Obi/images/manual_preferences_project.png
trunk/urakawa/application/Obi/Obi/images/manual_record.png
trunk/urakawa/application/Obi/Obi/images/manual_splitdialog.png
trunk/urakawa/application/Obi/Obi/images/manual_stripeditoptions.png
trunk/urakawa/application/Obi/Obi/images/manual_toceditoptions.png
trunk/urakawa/application/Obi/Obi/images/manual_userprofile.png
Added: trunk/urakawa/application/Obi/Obi/help.css
===================================================================
--- trunk/urakawa/application/Obi/Obi/help.css (rev 0)
+++ trunk/urakawa/application/Obi/Obi/help.css 2008-05-16 21:42:04 UTC (rev 3083)
@@ -0,0 +1,2 @@
+body { background-color: white; color: black; }
+img { border: 0 }
Modified: trunk/urakawa/application/Obi/Obi/help_en.html
===================================================================
--- trunk/urakawa/application/Obi/Obi/help_en.html 2008-05-16 20:51:17 UTC (rev 3082)
+++ trunk/urakawa/application/Obi/Obi/help_en.html 2008-05-16 21:42:04 UTC (rev 3083)
@@ -1,899 +1,1692 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Reference manual for Obi 1.0</title>
- <style type="text/css">
- .todo { background-color: yellow; font-weight: bold }
- </style>
+ <title>Obi: User manual</title>
+ <link rel="stylesheet" href="help.css"/>
</head>
- <body>
- <div id="top">
-
- <h1>Reference manual for Obi 1.0</h1>
- </div>
- <p>
- <code>$Id: manual.html 2934 2008-03-08 16:01:59Z julienq $</code>
- </p>
- <div id="toc">
- <h2>Table of contents</h2>
-
- <ul>
- <li>
- <a href="#id18412">Views</a>
- <ul>
- <li>
- <a href="#id18421">Strips view</a>
- <ul>
- <li>
-
- <a href="#id18435">Strips</a>
- </li>
- <li>
- <a href="#id18468">Blocks</a>
- </li>
- <li>
- <a href="#id18487">Different kinds of blocks</a>
-
- </li>
- </ul>
- </li>
- <li>
- <a href="#id18565">TOC view</a>
- </li>
- <li>
- <a href="#id18589">Metadata view</a>
-
- </li>
- <li>
- <a href="#id18602">Transport bar and peak meter</a>
- </li>
- </ul>
- </li>
- <li>
- <a href="#id18617">Selection</a>
-
- <ul>
- <li>
- <a href="#id18633">What is selectable?</a>
- </li>
- <li>
- <a href="#id18706">Label editing</a>
- </li>
- </ul>
-
- </li>
- <li>
- <a href="#id18731">Transport bar and peak meter</a>
- <ul>
- <li>
- <a href="#id18735">Transport bar buttons</a>
- </li>
- <li>
-
- <a href="#id18803">Unedited notes</a>
- </li>
- <li>
- <a href="#id19032">Peak meter</a>
- </li>
- </ul>
- </li>
- <li>
-
- <a href="#id19038">Metadata editing</a>
- </li>
- <li>
- <a href="#id19072">Menus</a>
- <ul>
- <li>
- <a href="#id19080">File menu (<code>Alt+F</code>)</a>
-
- </li>
- <li>
- <a href="#id19301">Edit menu (<code>Alt+E</code>)</a>
- </li>
- <li>
- <a href="#id19602">View menu (<code>Alt+V</code>)</a>
-
- </li>
- <li>
- <a href="#id19752">TOC menu (<code>Alt+C</code>)</a>
- </li>
- <li>
- <a href="#id19858">Strips menu (<code>Alt+S</code>)</a>
-
- </li>
- <li>
- <a href="#id19964">Blocks menu (<code>Alt+B</code>)</a>
- </li>
- <li>
- <a href="#id20077">Transport menu (<code>Alt+R</code>)</a>
-
- </li>
- <li>
- <a href="#id20159">Tools menu</a>
- </li>
- <li>
- <a href="#id20162">Help menu</a>
- </li>
- </ul>
-
- </li>
- </ul>
- </div>
- <p>This is a reference manual for Obi, and for the moment a placeholder for the
-final documentation. If you are a user and not a developer, you can ignore the
-<span class="todo">TODO</span> items below. This manual describes version 1.0 Alpha at the moment and
-may still be incomplete.</p>
- <h2 id="id18412">Views</h2>
- <p>The work area of Obi is composed of several views, as described below. All
-views (except for the strips view) can be shown or hidden as necessary.</p>
-
- <h3 id="id18421">Strips view</h3>
- <p>The main view is the <em>strips view</em>. This is the view in which the contents of
-the book are edited. There is a strip for every section in the book and they
-appear in book order in the strips view. Inside each strip the actual contents
-appear as blocks.</p>
- <h4 id="id18435">Strips</h4>
- <p>A <em>strip</em> represents a section and its contents. Subsections are represented as
-other strips that follow in the strip view. Contents are represented as blocks
-which are shown in book order inside the strip. A strip fills the entire width
-of the strips view and has two parts:</p>
-
- <ol>
- <li>
- <p>an editable label showing the title of the section;</p>
- </li>
- <li>
- <p>a sequence of zero or more blocks.</p>
- </li>
- </ol>
-
- <p><span class="todo">TODO</span>: fix the strip width.</p>
- <h4 id="id18468">Blocks</h4>
- <p>A <em>block</em> is used to represent an unit of content in the strips view. A block
-can be empty or contain audio. The audio content of a block is called a
-<em>phrase</em> as it allows for the reader to skip easily from phrase to phrase
-when the book is exported to DAISY. Obi does not impose any limitations on
-the amount of audio that a block may contain.</p>
- <h4 id="id18487">Different kinds of blocks</h4>
-
- <ul>
- <li>
- <p><em>Empty blocks</em> are blocks that contain no audio. They can be used as
-placeholders for adding audio at a later time. An empty block only contains
-an information label.</p>
- </li>
- <li>
- <p><em>Plain blocks</em> are blocks that contain audio. In addition to the information
-label, the waveform of the audio is displayed.</p>
-
- </li>
- <li>
- <p><em>Page blocks</em> are blocks that represent a page number. The corresponding
-phrase is usually a reading of the page number. An actual number is
-associated with the block. Example: page number 42 in the book can be
-represented by a page block bearing the number 42 and the phrase "page
-42." In the exported DAISY book, a page block will be skippable.</p>
- </li>
- <li>
- <p><em>Heading blocks</em> are used to mark the heading of a section. By default, this
-is the first used block in the section, but any other can be chosen. There
-can be at most one heading block per section. <span class="todo">TODO</span>: maintain this when
-merging sections.</p>
-
- </li>
- <li>
- <p><em>Silence blocks</em> are used for phrase detection; see below.</p>
- </li>
- <li>
- <p><em>Custom blocks</em> are blocks that have some additional property in the current
-book (such as producer notes, side bars, etc.) These can be defined by the
-producer of the book as needed. In the exported DAISY book, custom blocks
-will be skippable.</p>
-
- </li>
- </ul>
- <p><strong>Note:</strong> future versions of Obi will have <em>container blocks</em> that can hold
-other blocks to create escapable structures, such as lists or audio tables,
-but they are not included in the current release of Obi.</p>
- <h3 id="id18565">TOC view</h3>
- <p>The <em>table of contents view</em> (<em>TOC view</em> for short) shows the table of contents
-of the book in a hierarchical way. Each entry in the table of contents is
-called a <em>section</em>; this is a generic Obi term, and can be a book part,
-chapter, section, subsection, etc. The level of each section is shown by its
-indentation. As noted above, there is a corresponding strip for every section
-in the TOC view.</p>
-
- <h3 id="id18589">Metadata view</h3>
- <p>The <em>metadata view</em> shows the metadata of the book: information such as title,
-narrator, date of publication, etc. Metadata entries can be edited in this
-view.</p>
- <h3 id="id18602">Transport bar and peak meter</h3>
- <p>The <em>transport bar</em> is used for recording and playback of the book. It has
-buttons such as play, record, or stop; a time display; and a textual peak
-meter. In addition to the transport bar, an external peak meter can also be
-shown alongside Obi's main window.</p>
-
- <h2 id="id18617">Selection</h2>
- <p>All edits in Obi are based on the current selection. In the current version of
-Obi, only a single selection can be made at once (future versions of Obi will
-have multiple selection.)</p>
- <p class="indent">In general, selection is performed by clicking (and possibly dragging) on the
-object or area to select; keyboard users can navigate to the desired region
-to select (see keyboard navigation below.)</p>
- <h3 id="id18633">What is selectable?</h3>
- <ul>
- <li>In the strips view:
-<ul><li>A strip is selectable.</li><li>The label of a strip is selectable. When selected, the label becomes
-editable.</li><li>A position inside a strip is selectable. The position can be before the
-first block, after the last block, or between two blocks.</li><li>A block inside a strip is selectable. To select a block, click on its label
-or its outer edge.</li><li>The waveform in a block is selectable; either a position or a range of
-audio. To select a position in the waveform, click once; to select a range,
-click then drag, or press shift then click after a position or a range was
-already selected. Finally, double-clicking will select all the audio from
-the block.</li><li><span class="todo">TODO</span>: keyboard alternative.</li></ul></li>
-
- <li>In the TOC view:
-<ul><li>A section is selectable.</li><li>The text label of a section is selectable. When selected, it becomes
-editable.</li></ul></li>
- <li>In the metadata view:
-<ul><li>A metadata entry in the metadata view is selectable.</li><li>The text inside a metadata entry is selectable. When selected, it becomes
-editable.</li></ul></li>
- </ul>
- <h3 id="id18706">Label editing</h3>
- <p>The label of a strip or a section, and the value of a metadata entry (<span class="todo">TODO</span>) can
-be directly edited by clicking them. When typing <code>Enter</code>, the new name is
-committed; typing <code>Esc</code> cancels the edit. Strips also have an <code>OK</code> and <code>Cancel</code>
-
-button which achieve the same effects.</p>
- <h2 id="id18731">Transport bar and peak meter</h2>
- <h3 id="id18735">Transport bar buttons</h3>
- <ul>
- <li>
- <p><strong>Play button</strong> (<code>Ctrl+Space</code>): this button gives Play All command while
-starting playback from currently selected block in strip view or currently
-selected node in tree view.</p>
-
- <ul>
- <li>If there is no in phrase selection, (technically termed as audio
-selection) this button starts playback from starting of selected block or
-selected tree node.</li>
- <li>If there is Audio selection and cursor has a position marked inside
-phrase, this button starts playback from this cursor position.</li>
- <li><span class="todo">TODO</span>: <code>Ctrl+Space</code> doesn't seem to work? And should play all;
-<code>Ctrl+Shift+Space</code> to play selection (see menu)?</li>
-
- </ul>
- </li>
- <li>
- <p><strong>Pause button</strong> (<code>Space</code>): pause both playback as well as recording (which
-ever is active). Pause position and cursor position are synchronised with
-each other so pause position also acts as cursor position for operations
-like split and insert recording.</p>
- </li>
- <li>
-
- <p><strong>Stop button</strong>: stop playback or recording which ever is active.</p>
- </li>
- </ul>
- <h3 id="id18803">Unedited notes</h3>
- <p>This is a temporary write up for transport bar which should be copied to main manual.
-The write up contains description about transportbar buttons and other transport bar functions which are to be invoked through drop down menus and keyboard shortcuts.</p>
- <p class="indent">Description about buttons:
-1. Play button.
-This button gives Play All command while starting playback from currently selected block in strip view or currently selected node in tree view.
-1.1. If there is no in phrase selection, ( technically termed as audio selection ) this button starts playback from starting of selected block or selected tree node.
-1.2. If there is Audio selection and cursor has a position marked inside phrase, this button starts playback from this cursor position.
-Keyboard shortcut: Control+Space.</p>
-
- <ol>
- <li>Pause button:</li>
- <li>It pauses both playback as well as recording ( which ever is active ). </li>
- <li>
- <p>Pause position and cursor position are synchronised with each other so pause position also acts as cursor position for operations like split and insert recording.
-Keyboard shortcut: Space bar.</p>
- </li>
- <li>
-
- <p>Stop button:</p>
- </li>
- <li>
- <p>It stops playback or recording which ever is active.
-Keyboard shortcut: control + T </p>
- </li>
- <li>
- <p>Rewind: It plays small dhunks of audio while jumping backward in time.</p>
-
- </li>
- <li>
- <p>Rewind continues across phrase boundaries.</p>
- </li>
- <li>
- <p>FastForward button:
-It plays small chunks of audio while jumping forward in time.</p>
- </li>
- <li>
-
- <p>FastForward continues across phrase boundaries.</p>
- </li>
- <li>
- <p>Prev phrase, prev section, prev page buttons:
-Currently these buttons work only while playback and move to prev phrase, prev section, prev page phrase nodes in playlist.</p>
- </li>
- <li>
- <p>Next phrase, Next section, Next page buttons:
-During playback:
-These buttons move to next phrase, next section , next page phrase nodes in current playlist.</p>
-
- </li>
- </ol>
- <p>During recording:
-These buttons become markup buttons i.e.
-Next Phrase button create a new phrase on the fly.
-Next section button creates a new section, creates a new phrase in this new section and continue recording in this new phrase.
-The rules for creating new section is same as that of creating a new section in TOC view.
-Next Page creates a new phrase and marks custom page class on this new phrase on the fly. The numbering of pages is automatic i.e. an increment of previous page number and "1" if there is no preceding phrase block.</p>
- <ol>
- <li>
- <p>Custom class mark button:
-While recording it is used for marking custom class on currently recording phrase on the fly. The default name used is "Custom".
-It creats a new audio block and mark custom class on it.
-These custom blocks can later on be reclassed.
-In all other conditions, this button mark custom class on currently selected audio block.</p>
- </li>
- <li>
-
- <p>Fast play rate combobox:
-This combobox increases playback rate above the normal playback rate for quick navigation / editting purpose and proof reading purpose.
-It contains valuse upto 2.0 times which is twice the normal playback rate.
-It works both on the fly with playback and also off the fly.
-The strips view keyboard shortcuts for this combobox are:</p>
- </li>
- <li>F: Increses FastPlay rate by one combobox value.</li>
- <li>S: decreases FastPlay rate by one combobox value.</li>
- <li>D: moves back to normal playback rate.</li>
- <li>
- <p>E: Move back to normal playback rate with 1.5 seconds of rewind. This is helpfull in determining exact splitting position while playing at higher speeds.</p>
-
- </li>
- <li>
- <p>Record button:
-Pressing this button first time starts listening and displays input values of microphone in graphical peak meter as well in text peak meter. Recording starts when this button is pressed second time.
-However user can start direct recording and bypass listening state by pressing
-Control + shift + R.
-or selecting direct recording sub menu item for record menu item of transport drop down menu.
-Recording can be done in normal mode or in append only mode.
-User can check or uncheck Append only sub menu item from recording item of transport drop down menu.
-10.1 In append only mode, recording is non distructive i.e. a new recording is appended to selected block or filled in a null audio block without inserting or overwriting existing recordings.
-10.2. In normal mode recording works as follows:</p>
- </li>
- <li>If selected block do not contain any audio e.g. empty page blocks, recording fills audio inside these blocks.</li>
- <li>If there is a single point in-phrase selection, recording splits the selected block at cursor position and inserts new blocks between two splitted blocks.</li>
- <li>If there is a part of audio selected inside a phrase using in-phrase Selection Start and in-phrase Selection End commands then the selected block is split in three blocks and the middle one is replaced by newly recorded blocks.</li>
-
- </ol>
- <p>Pausing recording:
-Recording can be paused at any time using pause button. When recording is paused, user can use playback to verify recording.
-Recording will resume by pressing record button again ( no listening stage will be there while resuming paused recording ).</p>
- <p class="indent">Other transport bar functions operatable from drop down menus and keyboard shortcuts.
-11. Preview playback:
-It includes three functions.
-1.1. Preview from current position:
-provides 1.5 seconds of playback starting from current cursor position.
-Strips View shortcut: V</p>
- <p class="indent">1.2. Preview upto current position:
-Provides playback of duration of 1.5 seconds starting from 1.5 seconds before current position so that playback ends at current position.
-Strips view shortcut: X</p>
- <p class="indent">1.3. Preview selected audio:
-It provides playback of audio chumk lying between two audio mark points.
-Strips view Shortcut: C</p>
- <ol>
- <li>Play selection:
-It starts playback of currently selected blocks As Obi currently can select only one block at a time so in current senario it plays selected block in strips view or selected tree node in TOC view.</li>
-
- <li>If there is no in-phrase selection i.e. cursor is not active, playback starts from begining of phrase </li>
- <li>
- <p>if there is a in-phrase selection i.e. cursor is active, then playback starts from the cursor position.
-Keyboard shortcut: Space bar.
-This shortcut is same as pause. As it toggles between play selection and pause and also pauses play all command.</p>
- </li>
- <li>
- <p>Time display:
-Transport bar has a time display which displays both playback as well as recording time.
-13.1. Playback time.
-The display of playback time is configurable with an adjusant combobox. The available options are:
-13.1.1. Elapsed: This displays elapsed selection time.
-13.1.2. Elapsed (total): This displays elapsed time with respect to whole book.
-13.1.3. Remaining: This displays remaining time for current selection.
-13.1.4. Remaining (Total): This displays remaining time with respect to whole book.</p>
- </li>
-
- </ol>
- <p>13.2. Recording time:
-This displays time of recording since it was started i.e. recording session time.</p>
- <ol>
- <li>Text Peak Meter:
-This control displays numerical values for peak meter which can be captured by screenreader.
-It has two textboxes for left and right channels.
-Keyboard shortcuts:
-Focus Left channel value: Alt+l
-Focus right channel value: Alt+i
-The value displayed is relative to the peak value of audio with upper range of 0 db.</li>
- </ol>
- <p>Whenever overload is reached, the "OL" tag appears before numerical value of that particular channel.
-This tag remains in text display of respective channel till reset button on text meter is pressed.
-Remark: reset button is not visible till overload is reached.</p>
- <h3 id="id19032">Peak meter</h3>
-
- <p>The peak meter allows to monitor the input sound level (while recording) or
-output level (while playing back), and especially shows when overload occurs.
-Overload should be avoided while recording because the recorded audio is
-clipped. When overload occurs, the red box above the channel while turn red
-with a number indicating the number of occurrences. Users can modify their
-audio settings (getting further away from the microphone or turning its volume
-down) to reach an acceptable audio level. Clicking on a red overload box will
-reset it.</p>
- <h2 id="id19038">Metadata editing</h2>
- <p>Metadata editing is done in the metadata view. For adding and deleting entries,
-see the <code>Edit</code> menu below. There are two simple tasks that can be executed in
-the metadata view:</p>
- <ol>
- <li>
- <p>Editing the content of an entry. The content is treated as a simple text
-string. <span class="todo">TODO</span>: some entries should check for validity of content, and allow
-extra attributes. TODO: add some text for how this is changed.</p>
-
- </li>
- <li>
- <p>Changing the name of an entry. This can be done by selecting an existing
-name from the combo box, or by typing a new name. Note that some names are not
-available if an entry of this kind cannot be added, and if an entry cannot be
-removed, it also cannot be renamed.</p>
- </li>
- </ol>
- <h2 id="id19072">Menus</h2>
- <p>This is a description of the main menubar in Obi.</p>
-
- <h3 id="id19080">File menu (<code>Alt+F</code>)</h3>
- <p>Creating and opening projects:</p>
- <ul>
- <li>
- <p><strong>New project</strong> (<code>Ctrl+N</code>): create a new project. If there is a project
-currently open, Obi will attempt to close it first. A dialog is shown where
-the user can enter a title for the project and choose a location for saving
-it. <span class="todo">TODO</span>: add instructions in the dialog.</p>
-
- </li>
- <li>
- <p><strong>New project from import</strong> (<code>Ctrl+Shift+N</code>): create a new project by
-importing an XHTML file containing the structure of the project. You will
-have to choose a title (if different from the one given in the file) and
-a location for saving the project.</p>
- <ul>
- <li><span class="todo">TODO</span>: better error handling (completely undo the import.)</li>
-
- <li><span class="todo">TODO</span>: the expected input format must be documented.</li>
- </ul>
- </li>
- <li>
- <p><strong>Open project</strong> (<code>Ctrl+O</code>): bring up a file chooser and select a project
-to open. Obi projects are normally named with a <code>.obi</code> suffix, although Obi
-normally saves project inside a directory along with another directory
-containing audio data.</p>
-
- </li>
- <li>
- <p><strong>Close project</strong> (<code>Ctrl+W</code>): close the current project. If there are
-unsaved changes, the user is given the choice to save or not, or cancel.</p>
- </li>
- </ul>
- <p>Saving projects, cleaning and exporting:</p>
-
- <ul>
- <li>
- <p><strong>Save project</strong> (<code>Ctrl+S</code>): save the project and its data. The project is
-saved under the location specified when the project was first created. Saving
-is possible only when a change was made (as shown in the titlebar by an
-asterisk * following the project title.)</p>
- </li>
- <li>
- <p><strong>Save project as</strong> (<code>Ctrl+Shift+S</code>): save the project under a different
-location and switch to the new copy. The original project is <strong>not</strong> saved.
-It is always possible to save a project under a new location.</p>
-
- </li>
- <li>
- <p><strong>Clean unreferenced audio</strong> (<code>Ctrl+L</code>): clean unreferenced audio from the
-project. Obi keeps unused audio data so that changes can be undone, but
-sometime there is audio data in the project that is not referenced anywhere
-(<em>i.e.</em>, there is no phrase with this audio data, nor any command in the
-undo stack that concerns this data.) In order to save disk space, it is
-possible to clean the project by removing all this data. It is recommended
-to save right after cleaning the project, otherwise there may be problems
-when reopening the project. Cleaning the project at the beginning of the
-session makes sure that all of the data not referenced in the project itself
-has been removed.</p>
- </li>
- <li>
-
- <p><strong>Export as DAISY</strong> (<code>Ctrl+E</code>): export the project to DAISY 3. The user can
-choose a directory to export to. The directory should be new or empty; if it
-contains files already (<em>e.g.</em>, from a previous export), those can be
-deleted before export. A note about exporting: a section is exported if and
-only if its corresponding strip has at least one used, non-empty block. If
-a section has no such content, then it is not exported, and neither are its
-subsections, even if <em>those</em> have content.</p>
- <ul>
- <li><span class="todo">TODO</span>: find a way to warn about sections that are not exported.</li>
-
- </ul>
- </li>
- </ul>
- <p>Opening recent projects:</p>
- <ul>
- <li><strong>Recent project</strong>: a list of recently opened project allows the user
-to choose between different recent projects.
-<ul><li><strong>Clear list</strong>: clear the list of recent projects. This cannot be undone.</li></ul></li>
-
- </ul>
- <p>Quitting Obi:</p>
- <ul>
- <li><strong>Exit</strong> (<code>Alt+F4</code>): quit Obi. If there is a project with unsaved changes
-currently opened, changes can be saved before quitting, or quitting can be
-cancelled. Quitting can also be achieved by closing the main Obi window.</li>
- </ul>
- <h3 id="id19301">Edit menu (<code>Alt+E</code>)</h3>
-
- <p>Obi stores all executed commands in an <em>undo stack</em> so that commands can be
-undone later. All commands executed since the current project was loaded are
-stored so an unlimited number of commands can be undone. Undone commands are
-also stored in a <em>redo stack</em> so that an undone command can be redone. Whenever
-a new command is executed, the redo stack is cleared.</p>
- <ul>
- <li>
- <p><strong>Undo</strong> (<code>Ctrl+Z</code>): undo the last executed command.</p>
-
- <ul>
- <li><span class="todo">TODO</span>: save the undo stack in the XUK file.</li>
- </ul>
- </li>
- <li>
- <p><strong>Redo</strong> (<code>Ctrl+Y</code>): redo the last undone command.</p>
-
- </li>
- </ul>
- <p>Obi maintains a clipboard that contains the last cut or copied item. Undoing a
-cut or copy operation restores the previous value of the clipboard.</p>
- <ul>
- <li>
- <p><strong>Cut</strong> (<code>Ctrl+X</code>): delete the selected item (strip, section, block or audio)
-and place it in the clipboard. <span class="todo">TODO</span>: works for text as well, but only through
-shortcut; not well integrated.</p>
-
- </li>
- <li>
- <p><strong>Copy</strong> (<code>Ctrl+C</code>): copy the selected item (strip, section, block or audio)
-and place it in the clipboard. <span class="todo">TODO</span>: works for text as well, but only through
-shortcut; not well integrated.</p>
- </li>
- <li>
-
- <p><strong>Paste</strong> (<code>Ctrl+V</code>): paste the item from the clipboard in or after the
-selection.</p>
- <ul>
- <li>If the clipboard contains a section node, it can be pasted after the
-selected section in the TOC view or the selected strip in the strip view.</li>
- <li>If the clipboard contains a block, it can be pasted after the selected
-block, at the end of the selected strip, or at the selection point inside
-a strip. If the selection is a waveform cursor, then the audio of the block
-is inserted at that point; if it is a waveform selection, then the audio
-of the block is pasted in place of the selection.</li>
- <li>If the clipboard contains audio, the audio can be pasted as a new block
-in the selected strip or at the selected point inside a strip, or at the
-end of the selected block. If the selection is a waveform cursor, then the
-audio is inserted at that point; if it is a waveform selection, then the
-audio is pasted in place of the selection.</li>
-
- <li>Note: metadata entries cannot be cut, copied or pasted. The text inside
-entries (content) can be copied.</li>
- <li><span class="todo">TODO</span>: text.</li>
- </ul>
- </li>
- <li>
- <p><strong>Paste before</strong> (<code>Ctrl+Alt+V</code>): when a section is selected and a section is
-in the clipboard, paste the section from the clipbaord before the selected
-section and at the same level.</p>
-
- </li>
- <li>
- <p><strong>Paste inside</strong> (<code>Ctrl+Shift+V</code>): when a section is selected and a section
-is in the clipboard, paste the section from the clipboard as a subsection of
-the selected section. The child is added last.</p>
- </li>
- <li>
- <p><strong>Delete</strong> (<code>Del</code>): delete the selected item. If it is a section, then all
-subsections are deleted as well. If it is a strip, then only this strip is
-deleted. If the corresponding section has subsection, the first subsection
-is moved to the level of the deleted section so that the consistency of the
-TOC is preserved. If it is a metadata entry, it can only be deleted if the
-deletion of the entry does not render the project invalid (for instance, the
-project <em>must</em> have a <code>dc:Title</code> entry so the last one cannot be deleted.)</p>
-
- </li>
- <li>
- <p><strong>Select nothing</strong>: deselect any item that was selected.</p>
- </li>
- </ul>
- <p>In addition to cleaning up unreferenced audio data, it is possible to also
-clean up <em>unused</em> data from the project.</p>
-
- <ul>
- <li><strong>Delete unused data</strong> (<code>Ctrl+Shift+L</code>): delete all sections and phrases
-marked as being unused. This can be undone, just like any deletion in Obi.</li>
- </ul>
- <p>Athough Obi is an audio editing tool, a large project can still contain a non
-trivial amount of text (section headings, metadata, annotations) so a search
-function is provided.</p>
- <ul>
- <li>
-
- <p><strong>Find</strong> (<code>Ctrl+F</code>): bring the search bar in focus and let the user type some
-text to find. The first item containing this text is selected (in the case
-of section titles, the strip corresponding to the section is selected.)</p>
- </li>
- <li>
- <p><strong>Find next</strong> (<code>F3</code>): find the next item. <span class="todo">TODO</span>: more details.</p>
-
- </li>
- <li>
- <p><strong>Find previous</strong> (<code>Shift+F3</code>): find the previous item. <span class="todo">TODO</span>: more details.</p>
- </li>
- </ul>
-
- <p>New metadata entries can be created through this menu.</p>
- <ul>
- <li><strong>Add metadata entry</strong> (no shortcut): this menu opens a submenu where the
-user can choose which kind of entry they want to add. Only user-modifiable
-entries, as well as entries that can be added at this point are shown. (For
-example, if the project already has a <code>dtb:sourceTitle</code> entry, another such
-entry cannot be added as it is not repeatable.)
-<ul><li><span class="todo">TODO</span>: add a custom kind (like block roles.)</li><li><span class="todo">TODO</span>: delete custom kinds (like block roles.)</li><li><span class="todo">TODO</span>: focus on the entry so that content can be added (like sections.)</li></ul></li>
-
- </ul>
- <h3 id="id19602">View menu (<code>Alt+V</code>)</h3>
- <p>Various views can be shown or hidden. By default, all are shown, except for the
-search bar which only appears when searching. Each menu item has a checkbox
-that indicate the visibility of the corresponding view (checked meaning
-visible.) <span class="todo">TODO</span>: all the shortcuts will change as they interfere with screen
-readers.</p>
- <ul>
- <li>
- <p><strong>Show TOC view</strong> (<code>Alt+Shift+T</code>): show or hide the TOC view.</p>
-
- </li>
- <li>
- <p><strong>Show metadata view</strong> (<code>Alt+Shift+M</code>): show or hide the metadata view.</p>
- </li>
- <li>
- <p><strong>Show search bar</strong> (<code>Alt+Shift+S</code>): show or hide the search bar.</p>
-
- </li>
- <li>
- <p><strong>Show transport bar</strong> (<code>Alt+Shift+B</code>): show or hide the transport bar.</p>
- </li>
- <li>
- <p><strong>Show status bar</strong> (<code>Alt+Shift+U</code>): show or hide the status bar.</p>
-
- </li>
- </ul>
- <p>For easy navigation, there are some shortcuts to move to the main views.</p>
- <ul>
- <li>
- <p><strong>Focus on TOC view</strong> (<code>F6</code>): move the focus to the TOC view. If there was
-a selection in the strips view, the corresponding section is selected. <span class="todo">TODO</span>:
-there is a display bug so the section doesn't appear as being selected, but
-it is.</p>
-
- </li>
- <li>
- <p><strong>Focus on Strips view</strong> (<code>F7</code>): move the focus to the strips view. If a
-section is selected in the TOC view, its strip gets selected in the strips
-view.</p>
- </li>
- <li>
- <p><strong>Focus on Transport bar</strong> (<code>F8*</code>): not yet implemented (<span class="todo">TODO</span>).</p>
-
- </li>
- </ul>
- <p>Obi also has external views which open in different windows. Again, shortcuts
-are subject to change.</p>
- <ul>
- <li>
- <p><strong>Show peak meter</strong> (<code>Alt+Shift+P</code>): show or hide the peak meter view.</p>
-
- </li>
- <li>
- <p><strong>Show source view</strong> (<code>Alt+R</code>): show the source of the XUK file for this
-project. This is mainly useful for debugging and may be removed from the
-release version.</p>
- </li>
- </ul>
- <h3 id="id19752">TOC menu (<code>Alt+C</code>)</h3>
-
- <p>The TOC menu provides operations on the table of contents.</p>
- <ul>
- <li>
- <p><strong>Add section</strong> (<code>Ctrl+A</code>): add a new section after the selected section
-and at the same level. If no section is selected, then add a new section at
-the top level and at the end.</p>
- </li>
- <li>
-
- <p><strong>Ad sub-section</strong> (<code>Ctrl+Shift+A</code>): add a new section as the last child of
-the selected section.</p>
- </li>
- <li>
- <p><strong>Insert section</strong> (<code>Ctrl+Alt+A</code>): insert a new section before the selected
-section and at the same level.</p>
-
- </li>
- <li>
- <p><strong>Rename section</strong> (<code>F2</code>): start editing the label of the section. The new
-name cannot be empty. The change is committed when pressing <code>Return</code> or
-cancelled when pressing <code>Esc</code>.</p>
- </li>
-
- <li>
- <p><strong>Move section in</strong> (<code>Ctrl+Shift+Left</code>): increase the level of the section
-by one. The section becomes the first subsection of its previous sibling
-section; as a consequence, the first subsection of a section cannot be
-moved in. Only the section moves, not its subsections.</p>
- </li>
- <li>
- <p><strong>Move section out</strong> (<code>Ctrl+Shift+Right</code>): decrease the level of the section
-by one. Only sections without subsections can be moved out. Top-level
-sections can obviously not be moved out.</p>
-
- </li>
- <li>
- <p><strong>Section is used</strong> (<code>Ctrl+K</code>): when a section is selected, the menu
-item shows whether the section is used or not with a checkbox. The checkbox
-is checked if the section is currently used. Selecting this item toggles the
-used status of the section (from used to unused, and from unused to used.)
-When the used status of the section changes, all subsections change to the
-same status as well. The status of a section can only be changed if its
-parent section is used (or if it is a top-level section), as there cannot
-be used subsections of unused sections.</p>
- </li>
- </ul>
- <h3 id="id19858">Strips menu (<code>Alt+S</code>)</h3>
-
- <ul>
- <li>
- <p><strong>Add strip</strong> (<code>Ctrl+A</code>): add a new strip after the selected strip. The
-corresponding section will be at the same level as the section of the
-selected strip. If the section of the selected strip had subsections, they
-become subsections of the new section.</p>
- </li>
- <li>
- <p><strong>Insert strip</strong> (<code>Ctrl+Alt+A</code>): insert a new strip before the selected
-strip.</p>
-
- </li>
- <li>
- <p><strong>Rename strip</strong> (<code>F2</code>): start editing the label of the strip. The new name
-cannot be empty. The change is committed when pressing <code>Return</code> or cancelled
-when pressing <code>Esc</code>.</p>
- </li>
-
- <li>
- <p><strong>Split strip</strong> (<code>Ctrl+Shift+P</code>): split the strip at the selected position
-in the strip, or from the selected block. The new strip has the same label
-and level as the original strip, and all the blocks starting from the split
-position. If the first block or position is selected, there is no effect.</p>
- </li>
- <li>
- <p><strong>Merge strip with next</strong> (<code>Ctrl+Shift+M</code>): merge the selected strip with the
-next one; that is, all the blocks in the following strip are appended to the
-selected strip. The following strip is then removed from the project. If the
-following strip has a lower level than the selected strip, merging is not
-possible.</p>
-
- </li>
- <li>
- <p><strong>Strip is used</strong> (<code>Ctrl+K</code>): when a strip is selected, the menu
-item shows whether the strip is used or not with a checkbox. The checkbox
-is checked if the strip is currently used. Selecting this item toggles the
-used status of the strip (from used to unused, and from unused to used.)
-This operation can only be executed if the corresponding section has no
-subsection; <em>i.e.</em> if the operation affects only the selected strip. The
-contents of the strip are affected as well.</p>
- </li>
- </ul>
-
- <h3 id="id19964">Blocks menu (<code>Alt+B</code>)</h3>
- <ul>
- <li>
- <p><strong>Add empty block</strong> (<code>Ctrl+B</code>): add a new empty block at the end of the
-selected strip, or after the selected item in the strip.</p>
- </li>
-
- <li>
- <p><strong>Add empty page blocks</strong> (<code>Ctrl+Shift+B</code>): add one or more empty blocks
-with a page number. A dialog opens where the user can choose the page
-number for the first block, the number of blocks to add, and whether to
-renumber subsequent page blocks automatically. The page number increases by
-one for each block (<em>e.g.</em> if three pages are added starting at page number
-4, the three page blocks will be numbered 4, 5 and 6) and for subsequent
-pages if the user chooses to renumber them (<em>e.g.</em> following pages would be
-renumbered 7, 8, 9, etc.)</p>
- </li>
-
- <li>
- <p><strong>Split block</strong> (<code>Ctrl+P</code>): split the block at the current cursor position.
-The block is split in two blocks, one with all the audio data before the
-cursor position, followed by one with the all the audio data after the cursor
-position.</p>
- <ul>
- <li><span class="todo">TODO</span>: handle different kinds gracefully.</li>
- <li><span class="todo">TODO</span>: how to split nested blocks?</li>
-
- </ul>
- </li>
- <li>
- <p><strong>Merge block with next</strong> (<code>Ctrl+M</code>): merge this audio block with the
-following block. The two blocks are replaced with a block that contains
-the audio of both blocks.</p>
- <ul>
- <li><span class="todo">TODO</span>: if the blocks were of a different kind, the kind of the first block
-is kept. This means that page numbers may disappear, etc.</li>
-
- </ul>
- </li>
- <li>
- <p><strong>Block is used</strong> (<code>Ctrl+K</code>): when a block is selected, the menu item shows
-whether the block is used or not with a checkbox. The checkbox is checked if
-the block is currently used. Selecting this item toggles the used status of
-the block (from used to unused, and from unused to used.)</p>
- </li>
- </ul>
-
- <p><span class="todo">TODO</span>: update the rest of the document!</p>
- <h3 id="id20077">Transport menu (<code>Alt+R</code>)</h3>
- <ul>
- <li>
- <p><strong>Play</strong>: playback sub-menu.</p>
-
- <ul>
- <li><strong>Play all</strong> (Ctrl+Space): play from the current selection, or the
-beginning of the book if nothing is selected, until the end of the book is
-reached.</li>
- <li><strong>Play selection</strong> (<code>Ctrl+Shift+Space</code>): play the current selection, or
-if a cursor is positionned inside a block, until the end of the block.</li>
- </ul>
- </li>
-
- <li>
- <p><strong>Pause/Resume</strong>: pause or resume playback.</p>
- </li>
- <li>
- <p><strong>Stop</strong>: stop playback.</p>
- </li>
- <li>
-
- <p><strong>Record</strong>: recording sub-menu.</p>
- <ul>
- <li><strong>Start listening</strong>:</li>
- <li><strong>Start recording</strong>:</li>
- <li><strong>Allow overwrite</strong>:</li>
-
- </ul>
- </li>
- </ul>
- <h3 id="id20159">Tools menu</h3>
- <h3 id="id20162">Help menu</h3>
- </body>
-
+ <body>
+ <h1 id="ObiUsermanual">Obi User manual</h1>
+ <p>
+This is the Obi User Manual, accompanying Obi version beta 1 (2008-05-16).
+</p>
+ <p>
+ <i>To track the state of the final features being added to Obi, visit the <a class="ext-link" href="http://sourceforge.net/tracker/?group_id=149942&atid=776242"><span class="icon">Obi bug tracker</span></a>, and the Obi <a class="ext-link" href="http://daisy-trac.cvsdude.com/obi/wiki/Beta%20version%20checklist"><span class="icon">Beta version checklist</span></a>.</i>
+ </p>
+ <p>
+This manual is a work in progress, and will be completed at the time of release of Obi 1.0.
+</p>
+ <p>
+ <div class="wiki-toc">
+ <h4>Table of Contents</h4>
+ <ul>
+ <li>
+ <a href="#WhatisObi">What is Obi?</a>
+ </li>
+ <li>
+ <a href="#Obi-Installationandsystemrequirements">Obi - Installation and system requirements</a>
+ </li>
+ <li>
+ <a href="#InformationBeyondthisManual">Information Beyond this Manual</a>
+ </li>
+ <li>
+ <a href="#Obi-GettingStarted">Obi - Getting Started</a>
+ </li>
+ <ul>
+ <li>
+ <a href="#ScreenLayout">Screen Layout</a>
+ </li>
+ <li>
+ <a href="#Step-by-stepGuidetoDTBCreationwithObi">Step-by-step Guide to DTB Creation with Obi</a>
+ </li>
+ <ul>
+ <li>
+ <a href="#CreatingaNewProject">Creating a New Project</a>
+ </li>
+ <li>
+ <a href="#EditingtheTableofContents">Editing the Table of Contents</a>
+ </li>
+ <li>
+ <a href="#AddingandEditingAudioContent">Adding and Editing Audio Content</a>
+ </li>
+ <ul>
+ <li>
+ <a href="#LiveAudioRecording">Live Audio Recording</a>
+ </li>
+ <li>
+ <a href="#ImportingAudioFiles">Importing Audio Files</a>
+ </li>
+ <li>
+ <a href="#EditingContents">Editing Contents</a>
+ </li>
+ <li>
+ <a href="#PagesandSpecialRoles">Pages and Special Roles</a>
+ </li>
+ </ul>
+ <li>
+ <a href="#EditingMetadata">Editing Metadata</a>
+ </li>
+ <li>
+ <a href="#ExportingtoDAISY">Exporting to DAISY</a>
+ </li>
+ </ul>
+ <li>
+ <a href="#UsefulShortcutKeys">Useful Shortcut Keys</a>
+ </li>
+ </ul>
+ <li>
+ <a href="#Obi-ProReference">Obi - Pro Reference</a>
+ </li>
+ <ul>
+ <li>
+ <a href="#ContentsView">Contents View</a>
+ </li>
+ <ul>
+ <li>
+ <a href="#MovingfromPhrasestoSections">Moving from Phrases to Sections</a>
+ </li>
+ <li>
+ <a href="#PlaybackinContentsView">Playback in Contents View</a>
+ </li>
+ <li>
+ <a href="#PlaybackwithRespecttoNavigation">Playback with Respect to Navigation</a>
+ </li>
+ </ul>
+ <li>
+ <a href="#ThePreferencesDialog">The Preferences Dialog</a>
+ </li>
+ <ul>
+ <li>
+ <a href="#ProjectPreferences">Project Preferences</a>
+ </li>
+ <li>
+ <a href="#AudioPreferences">Audio Preferences</a>
+ </li>
+ <li>
+ <a href="#UserProfilePreferences">User Profile Preferences</a>
+ </li>
+ </ul>
+ <li>
+ <a href="#Keyboardshortcuts">Keyboard shortcuts</a>
+ </li>
+ <ul>
+ <li>
+ <a href="#FileMenu">File Menu</a>
+ </li>
+ <li>
+ <a href="#EditMenu">Edit Menu</a>
+ </li>
+ <li>
+ <a href="#ViewMenu">View Menu</a>
+ </li>
+ <li>
+ <a href="#SectionsMenu">Sections Menu</a>
+ </li>
+ <li>
+ <a href="#PhrasesMenu">Phrases Menu</a>
+ </li>
+ <li>
+ <a href="#TransportMenu">Transport Menu</a>
+ </li>
+ <li>
+ <a href="#ToolsMenu">Tools Menu</a>
+ </li>
+ </ul>
+ <li>
+ <a href="#Transportbarshortcutsusefulincontentsview">Transport bar shortcuts useful in contents view</a>
+ </li>
+ <li>
+ <a href="#OtherContentsviewshortcuts">Other Contents view shortcuts</a>
+ </li>
+ <li>
+ <a href="#Indexofshortcuts">Index of shortcuts</a>
+ </li>
+ </ul>
+ </ul>
+ </div>
+ </p>
+ <h2 id="WhatisObi">What is Obi?</h2>
+ <p>
+Obi is a production tool for DAISY DTBs. It can produce DAISY/NISO 2005 "NCX-Only" DTBs natively.
+</p>
+ <p>
+Obi is free to use, internationalized and accessible. Obi has been designed to be easy to learn and use.
+</p>
+ <h2 id="Obi-Installationandsystemrequirements">Obi - Installation and system requirements</h2>
+ <p>
+Obi runs on Windows XP (SP2) and Vista. The software requires the use of Microsoft's .Net and DirectX for audio.
+<i>This section remains to be written</i>
+</p>
+ <h2 id="InformationBeyondthisManual">Information Beyond this Manual</h2>
+ <p>
+If you want more information about Obi, you can
+</p>
+ <ul>
+ <li>Visit the <a class="ext-link" href="http://www.daisy.org/support/forums.shtml"><span class="icon">Obi Forum</span></a>, where you can ask questions, and have them answered by an expert.
+</li>
+ <li>Visit the <a class="ext-link" href="http://daisy-trac.cvsdude.com/obi/wiki/"><span class="icon">Obi Wiki</span></a> which contains additional documentation. The Wiki also always contains the latest version of <a class="ext-link" href="http://daisy-trac.cvsdude.com/obi/wiki/User%20manual"><span class="icon">this manual</span></a>.
+</li>
+ </ul>
+ <p>
+
+</p>
+ <h2 id="Obi-GettingStarted">Obi - Getting Started</h2>
+ <p>
+This section of the Obi manual contains a "quick start" guide briefly describing how to use Obi. A more detailed description of Obi features and functions will be available in the <a href="#Obi-ProReference">Obi - Pro Reference</a> section.
+</p>
+ <h3 id="ScreenLayout">Screen Layout</h3>
+ <p>
+The Obi screen is divided into the following views:
+</p>
+ <ul>
+ <li>Table of Contents (TOC) view (<tt>F6</tt>);
+</li>
+ <li>Content View (<tt>F7</tt>);
+</li>
+ <li>Transport Bar (<tt>F8</tt>);
+</li>
+ <li>Metadata view;
+</li>
+ </ul>
+ <p>
+We can navigate among these views by pressing <tt>Ctrl+Tab</tt> or <tt>Shift+Ctrl+Tab</tt>. There are splitters between the content view, the TOC view, and the metadata views to change the size of these views.
+</p>
+ <h3 id="Step-by-stepGuidetoDTBCreationwithObi">Step-by-step Guide to DTB Creation with Obi</h3>
+ <h4 id="CreatingaNewProject">Creating a New Project</h4>
+ <p>
+Open Obi, and create a new project (<tt>File > New project</tt>, or <tt>Ctrl+N</tt>.) Choose a title for your project, and a location on your system where it will be saved. You can also tell Obi to automatically create a title section using the title of your project.
+</p>
+ <p>
+ <a style="padding:0; border:none" href="images/obi_create_new_project.jpg">
+ <img src="images/obi_create_new_project.jpg" alt="The new project creation dialog" title="Obi New Project Dialog" />
+ </a>
+ </p>
+ <p>
+Alternatively, you can create a new project by importing an existing structure from an XHTML source document containing headings (<tt>h1</tt> through <tt>h6</tt>) and pages (<tt>span</tt>); choose <tt>File > New project from import</tt> or press <tt>Ctrl+Shift+N</tt>. You can choose a title for your project (which defaults to the <tt>title</tt> value in the XHTML file) and a location for saving it.
+</p>
+ <p>
+You can save your project at any time (<tt>File > Save project</tt> or <tt>Ctrl+S</tt>.) There is currently no auto-save in Obi so you should save your changes often to minimize the risk of losing important data. You can then reopen your project at a later time by choosing <tt>File > Open project</tt> or pressing <tt>Ctrl+O</tt>. It is also possible to configure Obi to automatically reopen the last open project when starting, or to quickly find recently open projects through the <tt>File > Recent projects</tt> menu item (<tt>Alt+F, R</tt>.)
+</p>
+ <h4 id="EditingtheTableofContents">Editing the Table of Contents</h4>
+ <p>
+ <a style="padding:0; border:none" href="images/obi_toc_view.jpg">
+ <img src="images/obi_toc_view.jpg" alt="The TOC tree view" title="Obi TOC View" />
+ </a>
+ </p>
+ <p>
+You can then create or modify the main structure elements in the TOC view by the following commands:
+</p>
+ <ul>
+ <li>Adding a new section (<tt>Sections > Add section</tt>, or <tt>Ctrl+H</tt>) <i>after</i> the selected section, or at the end of the project if no section is selected.
+</li>
+ <li>Inserting a new section (<tt>Sections > Insert section</tt>, or <tt>Ctrl+Alt+H</tt>) <i>before</i> the selected section.
+</li>
+ <li>Adding a new subsection (<tt>Sections > Add subsection</tt>, or <tt>Ctrl+Shift+H</tt>) under the selected section.
+</li>
+ </ul>
+ <p>
+When a new section or subsection is created, it appears in both the TOC view (where the TOC is viewed as a tree) and in the content view (as a strip where audio content can be added.) The newly created section is also selected and can be named immediately.
+</p>
+ <p>
+During structure editing, you may also find the following commands useful:
+</p>
+ <ul>
+ <li>Renaming a section (<tt>Sections > Rename section</tt>, or <tt>F2</tt>) to edit the heading of a section.
+</li>
+ <li>Changing the level of a section (<tt>Sections > Decrease section level</tt>, or <tt>Ctrl+Shift+Left</tt>; and <tt>Sections > Increase section level</tt>, or <tt>Ctrl+Shift+Right</tt>).
+</li>
+ <li>Basic edit commands such as copy (<tt>Edit > Copy</tt>, or <tt>Ctrl+C</tt>), paste (<tt>Edit > Paste</tt>, or <tt>Ctrl+V</tt>;<tt>Edit > Paste before</tt>, or <tt>Ctrl+Alt+V</tt>; and <tt>Edit > Paste inside</tt>, or <tt>Ctrl+Shift+V</tt>), delete (<tt>Edit > Delete</tt>, or <tt>Del</tt>) and cut (<tt>Edit > Cut</tt>, or <tt>Ctrl+X</tt>.) Copying and deleting affect the whole selected section, including its subsections.
+</li>
+ </ul>
+ <h4 id="AddingandEditingAudioContent">Adding and Editing Audio Content</h4>
+ <p>
+After creating sections, audio can be added to these sections either by live recording, or by importing existing audio files.
+</p>
+ <h5 id="LiveAudioRecording">Live Audio Recording</h5>
+ <p>
+Select the section that you want to record in in the contents view and click on the record button in the transport bar, or press <tt>Ctrl+R</tt> for starting pre-recording monitoring.
+</p>
+ <p>
+ <a style="padding:0; border:none" href="images/obi_tbar_pre_rec.jpg">
+ <img src="images/obi_tbar_pre_rec.jpg" alt="The transport bar while pre-record monitoring" title="Obi Transport Bar while pre-record monitoring" />
+ </a>
+ </p>
+ <p>
+The amplitude of the microphone input will be displayed in the graphical peak meter (which can be shown or hidden by the command <tt>View > Show peak meter</tt>, or <tt>Ctrl+Alt+P</tt>) as well as a text peak meter located in the transport bar. You can then change the settings for your microphone through system settings. You should set your recording level so that the audio level is loud enough to be heard comfortably, but not so loud as to create clipping and distortion. You should also try to maintain the volume consistently throughout the book.
+</p>
+ <p>
+When the audio levels are to your liking, click the record button one more time in the transport bar, or press <tt>Ctrl+R</tt> again to start recording. If you want to skip pre-recording monitoring and start recording directly, you can also press <tt>Ctrl+Shift+R</tt>. Everytime you start recording, a new phrase is created in the selected section. If nothing is selected, a new section is added to record in, and if a phrase is selected, recording starts after this phrase. You can record <i>before</i> a given phrase by selecting the position before this phrase.
+</p>
+ <p>
+During recording, you can create new phrases, pages and sections on the fly using the transport bar:
+</p>
+ <ul>
+ <li>Press the next phrase button, or <tt>K</tt>, to create a new phrase and continue recording in this phrase.
+</li>
+ <li>Press the next page button, or <tt>P</tt>, to create a new page.
+</li>
+ <li>Press the next section button, or <tt>H</tt>, to create a new section.
+</li>
+ </ul>
+ <h5 id="ImportingAudioFiles">Importing Audio Files</h5>
+ <p>
+You can import external audio files into new phrases with the command <tt>Phrases > Import audio files</tt> (<tt>Ctrl+I</tt>). You are then presented with a file dialog to choose one or several WAV files (usually having a <tt>.wav</tt> extension) to import. Note that the files must have the same audio settings as the book (<i>i.e.</i>, same number of channels, sample rate and bit depth.) For every selected file, a new phrase is created with the corresponding audio in the selected section or after the selected phrase or position in a strip.
+</p>
+ <h5 id="EditingContents">Editing Contents</h5>
+ <p>
+After recording, contents can be edited more finely. You can navigate through the content view by pressing arrow keys (up and down to move from section to section, while left and right move from phrase to phrase); you can also click on a phrase or a section to select it if you are using a mouse.
+</p>
+ <p>
+Phrases can be <i>split</i> and <i>merged</i>. To split a phrase in two, select a phrase and play it using the play button in the transport bar or by pressing the space bar. Pause at the time where the phrase should be split (by pressing the pause button in the transport bar or the space bar again), then choose <tt>Phrases > Split phrase</tt> (<tt>Ctrl+Q</tt>).
+</p>
+ <p>
+ <a style="padding:0; border:none" href="images/obi_phrase_and_cursor.jpg">
+ <img src="images/obi_phrase_and_cursor.jpg" alt="A selected phrase with the cursor positioned at an appropriate split position" />
+ </a>
+ </p>
+ <p>
+A new phrase is created following the current phrase, and the audio following the split point is moved to the new phrase. The converse operation is merging two phrases: select a phrase, then choose <tt>Phrase > Merge phrase with next</tt> (<tt>Ctrl+M</tt>) to merge the audio of the selected phrase with the next one into a single phrase.
+</p>
+ <p>
+A related operation is phrase detection, to split a phrase automatically according to silent chunks within the phrase (<tt>Phrases > Apply phrase detection</tt>, or <tt>Ctrl+Shift+P</tt>.)
+</p>
+ <p>
+Sections can also be split and merged (<tt>Sections > Split section</tt>, or <tt>Ctrl+Shift+Q</tt>; and <tt>Sections > Merge section with next</tt>, or <tt>Ctrl+Shift+M</tt>). The split point for a section is a phrase.
+</p>
+ <p>
+Basic edit commands such as copy (<tt>Edit >...
[truncated message content] |
|
From: <ju...@us...> - 2008-05-16 20:51:19
|
Revision: 3082
http://urakawa.svn.sourceforge.net/urakawa/?rev=3082&view=rev
Author: julienq
Date: 2008-05-16 13:51:17 -0700 (Fri, 16 May 2008)
Log Message:
-----------
Fixed record sub-menu
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ObiForm.resx
trunk/urakawa/application/Obi/Obi/Presentation.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-16 20:07:54 UTC (rev 3081)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-16 20:51:17 UTC (rev 3082)
@@ -124,7 +124,7 @@
this.mPauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mResumeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mStopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.FastPlaytoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mFastPlaytoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NormalSpeedtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SpeedUptoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mSpeedDowntoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -134,8 +134,8 @@
this.mPreviewUpToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mPreviewSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mRecordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mStartListeningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mStartRecordingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mStartMonitoringToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mStartRecordingDirectlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mAllowOverwriteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.navigationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -159,6 +159,7 @@
this.mStatusStrip = new System.Windows.Forms.StatusStrip();
this.mStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.mProjectView = new Obi.ProjectView.ProjectView();
+ this.mStartRecordingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mMenuStrip.SuspendLayout();
this.mStatusStrip.SuspendLayout();
this.SuspendLayout();
@@ -179,7 +180,7 @@
//
// mFileToolStripMenuItem
//
- resources.ApplyResources(this.mFileToolStripMenuItem, "mFileToolStripMenuItem");
+ this.mFileToolStripMenuItem.AccessibleName = global::Obi.messages.phrase_extra_Plain;
this.mFileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mNewProjectToolStripMenuItem,
this.mNewProjectFromImportToolStripMenuItem,
@@ -195,6 +196,7 @@
this.toolStripSeparator3,
this.mExitToolStripMenuItem});
this.mFileToolStripMenuItem.Name = "mFileToolStripMenuItem";
+ resources.ApplyResources(this.mFileToolStripMenuItem, "mFileToolStripMenuItem");
//
// mNewProjectToolStripMenuItem
//
@@ -800,7 +802,7 @@
this.mPauseToolStripMenuItem,
this.mResumeToolStripMenuItem,
this.mStopToolStripMenuItem,
- this.FastPlaytoolStripMenuItem,
+ this.mFastPlaytoolStripMenuItem,
this.mPreviewToolStripMenuItem,
this.mRecordToolStripMenuItem,
this.toolStripSeparator5,
@@ -848,15 +850,15 @@
this.mStopToolStripMenuItem.Name = "mStopToolStripMenuItem";
this.mStopToolStripMenuItem.Click += new System.EventHandler(this.mStopToolStripMenuItem_Click);
//
- // FastPlaytoolStripMenuItem
+ // mFastPlaytoolStripMenuItem
//
- this.FastPlaytoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mFastPlaytoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NormalSpeedtoolStripMenuItem,
this.SpeedUptoolStripMenuItem,
this.mSpeedDowntoolStripMenuItem,
this.mElapseBacktoolStripMenuItem});
- this.FastPlaytoolStripMenuItem.Name = "FastPlaytoolStripMenuItem";
- resources.ApplyResources(this.FastPlaytoolStripMenuItem, "FastPlaytoolStripMenuItem");
+ this.mFastPlaytoolStripMenuItem.Name = "mFastPlaytoolStripMenuItem";
+ resources.ApplyResources(this.mFastPlaytoolStripMenuItem, "mFastPlaytoolStripMenuItem");
//
// NormalSpeedtoolStripMenuItem
//
@@ -912,23 +914,24 @@
// mRecordToolStripMenuItem
//
this.mRecordToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.mStartListeningToolStripMenuItem,
+ this.mStartMonitoringToolStripMenuItem,
this.mStartRecordingToolStripMenuItem,
+ this.mStartRecordingDirectlyToolStripMenuItem,
this.mAllowOverwriteToolStripMenuItem});
this.mRecordToolStripMenuItem.Name = "mRecordToolStripMenuItem";
resources.ApplyResources(this.mRecordToolStripMenuItem, "mRecordToolStripMenuItem");
//
// mStartListeningToolStripMenuItem
//
- this.mStartListeningToolStripMenuItem.Name = "mStartListeningToolStripMenuItem";
- resources.ApplyResources(this.mStartListeningToolStripMenuItem, "mStartListeningToolStripMenuItem");
- this.mStartListeningToolStripMenuItem.Click += new System.EventHandler(this.mStartListeningToolStripMenuItem_Click);
+ resources.ApplyResources(this.mStartMonitoringToolStripMenuItem, "mStartListeningToolStripMenuItem");
+ this.mStartMonitoringToolStripMenuItem.Name = "mStartListeningToolStripMenuItem";
+ this.mStartMonitoringToolStripMenuItem.Click += new System.EventHandler(this.mStartMonitoringToolStripMenuItem_Click);
//
- // mStartRecordingToolStripMenuItem
+ // mStartRecordingDirectlyToolStripMenuItem
//
- this.mStartRecordingToolStripMenuItem.Name = "mStartRecordingToolStripMenuItem";
- resources.ApplyResources(this.mStartRecordingToolStripMenuItem, "mStartRecordingToolStripMenuItem");
- this.mStartRecordingToolStripMenuItem.Click += new System.EventHandler(this.mStartRecordingToolStripMenuItem_Click);
+ resources.ApplyResources(this.mStartRecordingDirectlyToolStripMenuItem, "mStartRecordingDirectlyToolStripMenuItem");
+ this.mStartRecordingDirectlyToolStripMenuItem.Name = "mStartRecordingDirectlyToolStripMenuItem";
+ this.mStartRecordingDirectlyToolStripMenuItem.Click += new System.EventHandler(this.mStartRecordingDirectlyToolStripMenuItem_Click);
//
// mAllowOverwriteToolStripMenuItem
//
@@ -982,10 +985,10 @@
this.mNextPhraseToolStripMenuItem.Name = "mNextPhraseToolStripMenuItem";
this.mNextPhraseToolStripMenuItem.Click += new System.EventHandler(this.nextPhraseToolStripMenuItem_Click);
//
- // nextPageToolStripMenuItem
+ // mNextPageToolStripMenuItem
//
- resources.ApplyResources(this.mNextPageToolStripMenuItem, "nextPageToolStripMenuItem");
- this.mNextPageToolStripMenuItem.Name = "nextPageToolStripMenuItem";
+ resources.ApplyResources(this.mNextPageToolStripMenuItem, "mNextPageToolStripMenuItem");
+ this.mNextPageToolStripMenuItem.Name = "mNextPageToolStripMenuItem";
this.mNextPageToolStripMenuItem.Click += new System.EventHandler(this.nextPageToolStripMenuItem_Click);
//
// mNextSectionToolStripMenuItem
@@ -1096,6 +1099,12 @@
this.mProjectView.TOCViewVisible = true;
this.mProjectView.TransportBarVisible = false;
//
+ // mStartRecordingToolStripMenuItem
+ //
+ resources.ApplyResources(this.mStartRecordingToolStripMenuItem, "mStartRecordingToolStripMenuItem");
+ this.mStartRecordingToolStripMenuItem.Name = "mStartRecordingToolStripMenuItem";
+ this.mStartRecordingToolStripMenuItem.Click += new System.EventHandler(this.mStartRecordingToolStripMenuItem_Click);
+ //
// ObiForm
//
resources.ApplyResources(this, "$this");
@@ -1197,8 +1206,8 @@
private System.Windows.Forms.ToolStripMenuItem mResumeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mStopToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mRecordToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem mStartListeningToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem mStartRecordingToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mStartMonitoringToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mStartRecordingDirectlyToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mAllowOverwriteToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripMenuItem navigationToolStripMenuItem;
@@ -1216,7 +1225,7 @@
private System.Windows.Forms.ToolStripMenuItem mDeleteUnusedDataToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mFocusOnTransportBarToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mPhraseDetectionToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem FastPlaytoolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mFastPlaytoolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mPreviewToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem NormalSpeedtoolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SpeedUptoolStripMenuItem;
@@ -1253,6 +1262,7 @@
private System.Windows.Forms.ToolStripMenuItem mGoToToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mNextTODOPhraseToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mPreviousTODOPhraseToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mStartRecordingToolStripMenuItem;
}
}
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 20:07:54 UTC (rev 3081)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 20:51:17 UTC (rev 3082)
@@ -636,29 +636,29 @@
mRewindToolStripMenuItem.Enabled = mProjectView.CanRewind;
- FastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay;
-
-
- // update recording menu items
- mStartRecordingToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive;
+ mFastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay;
+
+ mStartRecordingDirectlyToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive;
if (mProjectView.TransportBar.IsListening)
{
- mStartListeningToolStripMenuItem.Text = "Start Recording";
- mStartListeningToolStripMenuItem.AccessibleName = "Start Recording ctrl+r";
- mStartRecordingToolStripMenuItem.Enabled = false;
+ mStartMonitoringToolStripMenuItem.Visible = false;
+ mStartRecordingToolStripMenuItem.Visible = true;
+ mStartRecordingToolStripMenuItem.Enabled = true;
+ mStartRecordingDirectlyToolStripMenuItem.Enabled = false;
}
else if (mProjectView.TransportBar.IsRecorderActive) // actual recording is going on
{
- mStartListeningToolStripMenuItem.Enabled = false;
- mStartRecordingToolStripMenuItem.Enabled = false;
+ mStartRecordingToolStripMenuItem.Visible = false;
+ mStartMonitoringToolStripMenuItem.Visible = true;
+ mStartMonitoringToolStripMenuItem.Enabled = false;
+ mStartRecordingDirectlyToolStripMenuItem.Enabled = false;
}
else // neither listening nor actual recording is going on
{
- mStartListeningToolStripMenuItem.Text = "Start Monitering";
- mStartListeningToolStripMenuItem.AccessibleName = "Start Monitering ctrl+r";
-
- mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
- mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
+ mStartMonitoringToolStripMenuItem.Visible = true;
+ mStartMonitoringToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
+ mStartRecordingToolStripMenuItem.Visible = false;
+ mStartRecordingDirectlyToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
}
}
@@ -675,6 +675,11 @@
}
private void mStopToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Stop(); }
+ private void mStartRecordingToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Record(); }
+ private void mStartMonitoringToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Record(); }
+ private void mStartRecordingDirectlyToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.StartRecordingDirectly(); }
+
+
private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); }
private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); }
private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); }
@@ -692,15 +697,7 @@
- private void mStartListeningToolStripMenuItem_Click(object sender, EventArgs e)
- {
- mProjectView.TransportBar.Record();
- }
- private void mStartRecordingToolStripMenuItem_Click(object sender, EventArgs e)
- {
- mProjectView.TransportBar.StartRecordingDirectly();
- }
@@ -710,6 +707,9 @@
+
+
+
private void NormalSpeedtoolStripMenuItem_Click(object sender, EventArgs e)
{
mProjectView.TransportBar.FastPlayRateNormalise();
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 20:07:54 UTC (rev 3081)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 20:51:17 UTC (rev 3082)
@@ -117,146 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>0, 0</value>
+ </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name="mFileToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value />
- </data>
- <data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>New project Ctrl+N</value>
- </data>
- <data name="mNewProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
- <value>Magenta</value>
- </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="mNewProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+N</value>
- </data>
- <data name="mNewProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mNewProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&New project</value>
- </data>
- <data name="mNewProjectFromImportToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>New project from import Ctrl+Shift+N</value>
- </data>
- <data name="mNewProjectFromImportToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+N</value>
- </data>
- <data name="mNewProjectFromImportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mNewProjectFromImportToolStripMenuItem.Text" xml:space="preserve">
- <value>New project from &import</value>
- </data>
- <data name="mOpenProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Open project Ctrl+O</value>
- </data>
- <data name="mOpenProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
- <value>Magenta</value>
- </data>
- <data name="mOpenProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+O</value>
- </data>
- <data name="mOpenProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mOpenProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&Open project</value>
- </data>
- <data name="mCloseProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Close project Ctrl+W</value>
- </data>
- <data name="mCloseProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+W</value>
- </data>
- <data name="mCloseProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mCloseProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&Close project</value>
- </data>
- <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
- <value>256, 6</value>
- </data>
- <data name="mSaveProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Save project Ctrl+S</value>
- </data>
- <data name="mSaveProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
- <value>Magenta</value>
- </data>
- <data name="mSaveProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+S</value>
- </data>
- <data name="mSaveProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mSaveProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&Save project</value>
- </data>
- <data name="mSaveProjectAsToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Save project as... Ctrl+Shift+S</value>
- </data>
- <data name="mSaveProjectAsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+S</value>
- </data>
- <data name="mSaveProjectAsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mSaveProjectAsToolStripMenuItem.Text" xml:space="preserve">
- <value>Save project &as...</value>
- </data>
- <data name="mCleanProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Clean unreferenced audio Ctrl+L</value>
- </data>
- <data name="mCleanProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+L</value>
- </data>
- <data name="mCleanProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mCleanProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>C&lean unreferenced audio</value>
- </data>
- <data name="mExportAsDAISYToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Export as DAISY Ctrl+E</value>
- </data>
- <data name="mExportAsDAISYToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+E</value>
- </data>
- <data name="mExportAsDAISYToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mExportAsDAISYToolStripMenuItem.Text" xml:space="preserve">
- <value>&Export as DAISY</value>
- </data>
- <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
- <value>256, 6</value>
- </data>
- <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mRecentProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&Recent projects</value>
- </data>
- <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
- <value>256, 6</value>
- </data>
- <data name="mExitToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Exit Alt+F4</value>
- </data>
- <data name="mExitToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Alt+F4</value>
- </data>
- <data name="mExitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mExitToolStripMenuItem.Text" xml:space="preserve">
- <value>E&xit</value>
- </data>
<data name="mFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>35, 20</value>
</data>
@@ -320,6 +184,7 @@
<data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Stop Ctrl+Space</value>
</data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Space</value>
</data>
@@ -329,10 +194,10 @@
<data name="mStopToolStripMenuItem.Text" xml:space="preserve">
<value>&Stop</value>
</data>
- <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve">
+ <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve">
<value>Fast p&lay</value>
</data>
<data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
@@ -341,6 +206,48 @@
<data name="mPreviewToolStripMenuItem.Text" xml:space="preserve">
<value>Pre&view</value>
</data>
+ <data name="mStartListeningToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Start Monitoring Ctrl+R</value>
+ </data>
+ <data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+R</value>
+ </data>
+ <data name="mStartListeningToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mStartListeningToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Start monitoring</value>
+ </data>
+ <data name="mStartRecordingToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Start recording Ctrl+R</value>
+ </data>
+ <data name="mStartRecordingToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+R</value>
+ </data>
+ <data name="mStartRecordingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mStartRecordingToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Start recording</value>
+ </data>
+ <data name="mStartRecordingDirectlyToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Start Recording directly ctrl+shift+r</value>
+ </data>
+ <data name="mStartRecordingDirectlyToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+R</value>
+ </data>
+ <data name="mStartRecordingDirectlyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mStartRecordingDirectlyToolStripMenuItem.Text" xml:space="preserve">
+ <value>Start &recording directly</value>
+ </data>
+ <data name="mAllowOverwriteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
+ <value>Allow &overwrite</value>
+ </data>
<data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
@@ -429,6 +336,123 @@
<data name=">>mMenuStrip.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>New project Ctrl+N</value>
+ </data>
+ <data name="mNewProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <value>Magenta</value>
+ </data>
+ <data name="mNewProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+N</value>
+ </data>
+ <data name="mNewProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mNewProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&New project</value>
+ </data>
+ <data name="mNewProjectFromImportToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>New project from import Ctrl+Shift+N</value>
+ </data>
+ <data name="mNewProjectFromImportToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+N</value>
+ </data>
+ <data name="mNewProjectFromImportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mNewProjectFromImportToolStripMenuItem.Text" xml:space="preserve">
+ <value>New project from &import</value>
+ </data>
+ <data name="mOpenProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Open project Ctrl+O</value>
+ </data>
+ <data name="mOpenProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <value>Magenta</value>
+ </data>
+ <data name="mOpenProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+O</value>
+ </data>
+ <data name="mOpenProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mOpenProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Open project</value>
+ </data>
+ <data name="mCloseProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Close project Ctrl+W</value>
+ </data>
+ <data name="mCloseProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+W</value>
+ </data>
+ <data name="mCloseProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mCloseProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Close project</value>
+ </data>
+ <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
+ <value>256, 6</value>
+ </data>
+ <data name="mSaveProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Save project Ctrl+S</value>
+ </data>
+ <data name="mSaveProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <value>Magenta</value>
+ </data>
+ <data name="mSaveProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+S</value>
+ </data>
+ <data name="mSaveProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mSaveProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Save project</value>
+ </data>
+ <data name="mSaveProjectAsToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Save project as... Ctrl+Shift+S</value>
+ </data>
+ <data name="mSaveProjectAsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+S</value>
+ </data>
+ <data name="mSaveProjectAsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mSaveProjectAsToolStripMenuItem.Text" xml:space="preserve">
+ <value>Save project &as...</value>
+ </data>
+ <data name="mCleanProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Clean unreferenced audio Ctrl+L</value>
+ </data>
+ <data name="mCleanProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+L</value>
+ </data>
+ <data name="mCleanProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mCleanProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>C&lean unreferenced audio</value>
+ </data>
+ <data name="mExportAsDAISYToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Export as DAISY Ctrl+E</value>
+ </data>
+ <data name="mExportAsDAISYToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+E</value>
+ </data>
+ <data name="mExportAsDAISYToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mExportAsDAISYToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Export as DAISY</value>
+ </data>
+ <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>256, 6</value>
+ </data>
+ <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mRecentProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Recent projects</value>
+ </data>
<data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing">
<value>112, 6</value>
</data>
@@ -438,6 +462,21 @@
<data name="mClearListToolStripMenuItem.Text" xml:space="preserve">
<value>&Clear list</value>
</data>
+ <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
+ <value>256, 6</value>
+ </data>
+ <data name="mExitToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <value>Exit Alt+F4</value>
+ </data>
+ <data name="mExitToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Alt+F4</value>
+ </data>
+ <data name="mExitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mExitToolStripMenuItem.Text" xml:space="preserve">
+ <value>E&xit</value>
+ </data>
<data name="mUndoToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Undo Ctrl+Z</value>
</data>
@@ -1188,30 +1227,6 @@
<data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve">
<value>Preview &selected</value>
</data>
- <data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+R</value>
- </data>
- <data name="mStartListeningToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>215, 22</value>
- </data>
- <data name="mStartListeningToolStripMenuItem.Text" xml:space="preserve">
- <value>Start &monitoring</value>
- </data>
- <data name="mStartRecordingToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+R</value>
- </data>
- <data name="mStartRecordingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>215, 22</value>
- </data>
- <data name="mStartRecordingToolStripMenuItem.Text" xml:space="preserve">
- <value>Start &recording directly</value>
- </data>
- <data name="mAllowOverwriteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>215, 22</value>
- </data>
- <data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
- <value>Allow &overwrite</value>
- </data>
<data name="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Previous section Alt+Up</value>
</data>
@@ -1260,16 +1275,16 @@
<data name="mNextPhraseToolStripMenuItem.Text" xml:space="preserve">
<value>Next ph&rase</value>
</data>
- <data name="nextPageToolStripMenuItem.AccessibleName" xml:space="preserve">
+ <data name="mNextPageToolStripMenuItem.AccessibleName" xml:space="preserve">
<value>Next page Alt+PageDown</value>
</data>
- <data name="nextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <data name="mNextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Alt+PgDn</value>
</data>
- <data name="nextPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mNextPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>198, 22</value>
</data>
- <data name="nextPageToolStripMenuItem.Text" xml:space="preserve">
+ <data name="mNextPageToolStripMenuItem.Text" xml:space="preserve">
<value>Next pa&ge</value>
</data>
<data name="mNextSectionToolStripMenuItem.AccessibleName" xml:space="preserve">
@@ -1347,9 +1362,9 @@
<data name="aboutObiToolStripMenuItem.Text" xml:space="preserve">
<value>&About Obi</value>
</data>
- <data name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing">
+ <metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>0, 606</value>
- </data>
+ </metadata>
<data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 606</value>
</data>
@@ -1396,7 +1411,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.2461, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.9.38938, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1404,9 +1419,9 @@
<data name=">>mProjectView.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="$this.Localizable" type="System.Boolean, mscorlib">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
- </data>
+ </metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
@@ -1669,6 +1684,9 @@
CjyAD09DwA9QRcAfbGngHyBQ8H9MSf//Ii0=
</value>
</data>
+ <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
<data name="$this.Text" xml:space="preserve">
<value>Obi</value>
</data>
@@ -2236,10 +2254,10 @@
<data name=">>mStopToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>FastPlaytoolStripMenuItem.Name" xml:space="preserve">
- <value>FastPlaytoolStripMenuItem</value>
+ <data name=">>mFastPlaytoolStripMenuItem.Name" xml:space="preserve">
+ <value>mFastPlaytoolStripMenuItem</value>
</data>
- <data name=">>FastPlaytoolStripMenuItem.Type" xml:space="preserve">
+ <data name=">>mFastPlaytoolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>NormalSpeedtoolStripMenuItem.Name" xml:space="preserve">
@@ -2302,10 +2320,10 @@
<data name=">>mStartListeningToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>mStartRecordingToolStripMenuItem.Name" xml:space="preserve">
- <value>mStartRecordingToolStripMenuItem</value>
+ <data name=">>mStartRecordingDirectlyToolStripMenuItem.Name" xml:space="preserve">
+ <value>mStartRecordingDirectlyToolStripMenuItem</value>
</data>
- <data name=">>mStartRecordingToolStripMenuItem.Type" xml:space="preserve">
+ <data name=">>mStartRecordingDirectlyToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>mAllowOverwriteToolStripMenuItem.Name" xml:space="preserve">
@@ -2350,10 +2368,10 @@
<data name=">>mNextPhraseToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>nextPageToolStripMenuItem.Name" xml:space="preserve">
- <value>nextPageToolStripMenuItem</value>
+ <data name=">>mNextPageToolStripMenuItem.Name" xml:space="preserve">
+ <value>mNextPageToolStripMenuItem</value>
</data>
- <data name=">>nextPageToolStripMenuItem.Type" xml:space="preserve">
+ <data name=">>mNextPageToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>mNextSectionToolStripMenuItem.Name" xml:space="preserve">
@@ -2434,16 +2452,16 @@
<data name=">>mStatusLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name=">>mStartRecordingToolStripMenuItem.Name" xml:space="preserve">
+ <value>mStartRecordingToolStripMenuItem</value>
+ </data>
+ <data name=">>mStartRecordingToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>$this.Name" xml:space="preserve">
<value>ObiForm</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="mStartListeningToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Start Monitering ctrl+r</value>
- </data>
- <data name="mStartRecordingToolStripMenuItem.AccessibleName" xml:space="preserve">
- <value>Start Recording directly ctrl+shift+r</value>
- </data>
</root>
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Presentation.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Presentation.cs 2008-05-16 20:07:54 UTC (rev 3081)
+++ trunk/urakawa/application/Obi/Obi/Presentation.cs 2008-05-16 20:51:17 UTC (rev 3082)
@@ -138,7 +138,6 @@
if (!mCustomClasses.ContainsKey(customClass))
{
mCustomClasses.Add(customClass, new List<EmptyNode>(1));
- if (node != null) mCustomClasses.Add(customClass, new List<EmptyNode>());
if (CustomClassAddded != null) CustomClassAddded(this, new CustomClassEventArgs(customClass));
}
mCustomClasses[customClass].Add(node);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|