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-05-14 20:44:47
|
Revision: 3056
http://urakawa.svn.sourceforge.net/urakawa/?rev=3056&view=rev
Author: julienq
Date: 2008-05-14 13:44:45 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Updated search bar a bit.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
trunk/urakawa/application/Obi/Obi/ObiForm.resx
trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs
trunk/urakawa/application/Obi/Obi/ProjectView/FindInText.Designer.cs
trunk/urakawa/application/Obi/Obi/ProjectView/FindInText.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-14 20:09:51 UTC (rev 3055)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-14 20:44:45 UTC (rev 3056)
@@ -114,6 +114,9 @@
this.BeginInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.EndInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DeselectInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mGoToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mNextTODOPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mPreviousTODOPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.transportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.playToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mPlayAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -155,9 +158,6 @@
this.aboutObiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mStatusStrip = new System.Windows.Forms.StatusStrip();
this.mStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
- this.mGoToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mNextTODOPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.mPreviousTODOPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mProjectView = new Obi.ProjectView.ProjectView();
this.mMenuStrip.SuspendLayout();
this.mStatusStrip.SuspendLayout();
@@ -773,6 +773,26 @@
resources.ApplyResources(this.DeselectInPhraseSelectionToolStripMenuItem, "DeselectInPhraseSelectionToolStripMenuItem");
this.DeselectInPhraseSelectionToolStripMenuItem.Click += new System.EventHandler(this.DeselectInPhraseSelectionToolStripMenuItem_Click);
//
+ // mGoToToolStripMenuItem
+ //
+ this.mGoToToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mNextTODOPhraseToolStripMenuItem,
+ this.mPreviousTODOPhraseToolStripMenuItem});
+ this.mGoToToolStripMenuItem.Name = "mGoToToolStripMenuItem";
+ resources.ApplyResources(this.mGoToToolStripMenuItem, "mGoToToolStripMenuItem");
+ //
+ // mNextTODOPhraseToolStripMenuItem
+ //
+ this.mNextTODOPhraseToolStripMenuItem.Name = "mNextTODOPhraseToolStripMenuItem";
+ resources.ApplyResources(this.mNextTODOPhraseToolStripMenuItem, "mNextTODOPhraseToolStripMenuItem");
+ this.mNextTODOPhraseToolStripMenuItem.Click += new System.EventHandler(this.mNextTODOPhraseToolStripMenuItem_Click);
+ //
+ // mPreviousTODOPhraseToolStripMenuItem
+ //
+ this.mPreviousTODOPhraseToolStripMenuItem.Name = "mPreviousTODOPhraseToolStripMenuItem";
+ resources.ApplyResources(this.mPreviousTODOPhraseToolStripMenuItem, "mPreviousTODOPhraseToolStripMenuItem");
+ this.mPreviousTODOPhraseToolStripMenuItem.Click += new System.EventHandler(this.mPreviousTODOPhraseToolStripMenuItem_Click);
+ //
// transportToolStripMenuItem
//
this.transportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1061,26 +1081,6 @@
this.mStatusLabel.Name = "mStatusLabel";
resources.ApplyResources(this.mStatusLabel, "mStatusLabel");
//
- // mGoToToolStripMenuItem
- //
- this.mGoToToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.mNextTODOPhraseToolStripMenuItem,
- this.mPreviousTODOPhraseToolStripMenuItem});
- this.mGoToToolStripMenuItem.Name = "mGoToToolStripMenuItem";
- resources.ApplyResources(this.mGoToToolStripMenuItem, "mGoToToolStripMenuItem");
- //
- // mNextTODOPhraseToolStripMenuItem
- //
- this.mNextTODOPhraseToolStripMenuItem.Name = "mNextTODOPhraseToolStripMenuItem";
- resources.ApplyResources(this.mNextTODOPhraseToolStripMenuItem, "mNextTODOPhraseToolStripMenuItem");
- this.mNextTODOPhraseToolStripMenuItem.Click += new System.EventHandler(this.mNextTODOPhraseToolStripMenuItem_Click);
- //
- // mPreviousTODOPhraseToolStripMenuItem
- //
- this.mPreviousTODOPhraseToolStripMenuItem.Name = "mPreviousTODOPhraseToolStripMenuItem";
- resources.ApplyResources(this.mPreviousTODOPhraseToolStripMenuItem, "mPreviousTODOPhraseToolStripMenuItem");
- this.mPreviousTODOPhraseToolStripMenuItem.Click += new System.EventHandler(this.mPreviousTODOPhraseToolStripMenuItem_Click);
- //
// mProjectView
//
this.mProjectView.BackColor = System.Drawing.Color.Transparent;
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-14 20:09:51 UTC (rev 3055)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-14 20:44:45 UTC (rev 3056)
@@ -1168,7 +1168,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.941, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.29799, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1441,9 +1441,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>
@@ -1951,6 +1948,24 @@
<data name=">>DeselectInPhraseSelectionToolStripMenuItem.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=">>mGoToToolStripMenuItem.Name" xml:space="preserve">
+ <value>mGoToToolStripMenuItem</value>
+ </data>
+ <data name=">>mGoToToolStripMenuItem.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=">>mNextTODOPhraseToolStripMenuItem.Name" xml:space="preserve">
+ <value>mNextTODOPhraseToolStripMenuItem</value>
+ </data>
+ <data name=">>mNextTODOPhraseToolStripMenuItem.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=">>mPreviousTODOPhraseToolStripMenuItem.Name" xml:space="preserve">
+ <value>mPreviousTODOPhraseToolStripMenuItem</value>
+ </data>
+ <data name=">>mPreviousTODOPhraseToolStripMenuItem.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=">>transportToolStripMenuItem.Name" xml:space="preserve">
<value>transportToolStripMenuItem</value>
</data>
@@ -2191,24 +2206,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=">>mGoToToolStripMenuItem.Name" xml:space="preserve">
- <value>mGoToToolStripMenuItem</value>
- </data>
- <data name=">>mGoToToolStripMenuItem.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=">>mNextTODOPhraseToolStripMenuItem.Name" xml:space="preserve">
- <value>mNextTODOPhraseToolStripMenuItem</value>
- </data>
- <data name=">>mNextTODOPhraseToolStripMenuItem.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=">>mPreviousTODOPhraseToolStripMenuItem.Name" xml:space="preserve">
- <value>mPreviousTODOPhraseToolStripMenuItem</value>
- </data>
- <data name=">>mPreviousTODOPhraseToolStripMenuItem.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/ProjectView/Block.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-14 20:09:51 UTC (rev 3055)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-14 20:44:45 UTC (rev 3056)
@@ -127,16 +127,11 @@
#region ISearchable Members
- public bool Matches(string search)
+ public string ToMatch()
{
- return FindInText.Match(this.mLabel.Text, search);
+ return mLabel.Text.ToLowerInvariant();
}
- public void Replace(string search, string replace)
- {
- throw new Exception("The method or operation is not implemented.");
- }
-
#endregion
}
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/FindInText.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/FindInText.Designer.cs 2008-05-14 20:09:51 UTC (rev 3055)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/FindInText.Designer.cs 2008-05-14 20:44:45 UTC (rev 3056)
@@ -30,13 +30,16 @@
{
this.mLabel = new System.Windows.Forms.Label();
this.mString = new System.Windows.Forms.TextBox();
+ this.mPreviousButton = new System.Windows.Forms.Button();
+ this.mNextButton = new System.Windows.Forms.Button();
+ this.mCloseButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// mLabel
//
this.mLabel.AutoSize = true;
this.mLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.mLabel.Location = new System.Drawing.Point(3, 6);
+ this.mLabel.Location = new System.Drawing.Point(3, 8);
this.mLabel.Name = "mLabel";
this.mLabel.Size = new System.Drawing.Size(51, 13);
this.mLabel.TabIndex = 0;
@@ -44,25 +47,65 @@
//
// mString
//
- this.mString.Location = new System.Drawing.Point(60, 3);
+ this.mString.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mString.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mString.Location = new System.Drawing.Point(60, 6);
this.mString.Name = "mString";
- this.mString.Size = new System.Drawing.Size(146, 20);
+ this.mString.Size = new System.Drawing.Size(206, 20);
this.mString.TabIndex = 1;
- this.mString.Enter += new System.EventHandler(this.mString_Enter);
this.mString.TextChanged += new System.EventHandler(this.mString_TextChanged);
this.mString.KeyDown += new System.Windows.Forms.KeyEventHandler(this.mString_KeyDown);
+ this.mString.Enter += new System.EventHandler(this.mString_Enter);
//
+ // mPreviousButton
+ //
+ this.mPreviousButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.mPreviousButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mPreviousButton.Location = new System.Drawing.Point(272, 3);
+ this.mPreviousButton.Name = "mPreviousButton";
+ this.mPreviousButton.Size = new System.Drawing.Size(75, 23);
+ this.mPreviousButton.TabIndex = 2;
+ this.mPreviousButton.Text = "Previo&us";
+ this.mPreviousButton.UseVisualStyleBackColor = true;
+ //
+ // mNextButton
+ //
+ this.mNextButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.mNextButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mNextButton.Location = new System.Drawing.Point(353, 3);
+ this.mNextButton.Name = "mNextButton";
+ this.mNextButton.Size = new System.Drawing.Size(75, 23);
+ this.mNextButton.TabIndex = 3;
+ this.mNextButton.Text = "&Next";
+ this.mNextButton.UseVisualStyleBackColor = true;
+ //
+ // mCloseButton
+ //
+ this.mCloseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.mCloseButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mCloseButton.Location = new System.Drawing.Point(434, 3);
+ this.mCloseButton.Name = "mCloseButton";
+ this.mCloseButton.Size = new System.Drawing.Size(75, 23);
+ this.mCloseButton.TabIndex = 4;
+ this.mCloseButton.Text = "&Close";
+ this.mCloseButton.UseVisualStyleBackColor = true;
+ this.mCloseButton.Click += new System.EventHandler(this.mCloseButton_Click);
+ //
// FindInText
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Honeydew;
+ this.Controls.Add(this.mCloseButton);
+ this.Controls.Add(this.mNextButton);
+ this.Controls.Add(this.mPreviousButton);
this.Controls.Add(this.mString);
this.Controls.Add(this.mLabel);
this.Name = "FindInText";
- this.Size = new System.Drawing.Size(972, 26);
+ this.Size = new System.Drawing.Size(512, 29);
+ this.Leave += new System.EventHandler(this.FindInText_Leave);
this.Enter += new System.EventHandler(this.FindInText_Enter);
- this.Leave += new System.EventHandler(this.FindInText_Leave);
this.ResumeLayout(false);
this.PerformLayout();
@@ -72,5 +115,8 @@
private System.Windows.Forms.Label mLabel;
private System.Windows.Forms.TextBox mString;
+ private System.Windows.Forms.Button mPreviousButton;
+ private System.Windows.Forms.Button mNextButton;
+ private System.Windows.Forms.Button mCloseButton;
}
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/FindInText.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/FindInText.cs 2008-05-14 20:09:51 UTC (rev 3055)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/FindInText.cs 2008-05-14 20:44:45 UTC (rev 3056)
@@ -14,18 +14,11 @@
public interface ISearchable
{
/// <summary>
- /// True if there is text that matches the search string.
+ /// The string to match for this item.
/// </summary>
- bool Matches(string search);
-
- /// <summary>
- /// Replace the text that matched the search string with the replace string.
- /// </summary>
- /// <remarks>Throw an exception if the search doesn't match.</remarks>
- void Replace(string search, string replace);
+ string ToMatch();
}
-
/// <summary>
/// Find text in searchable controls (right now this means that we search strip titles, block annotations)
/// </summary>
@@ -57,7 +50,7 @@
mFoundFirst = false;
InitializeComponent();
mTimer = new Timer();
- mTimer.Interval = 40000;
+ mTimer.Interval = 4000;
mTimer.Tick += new EventHandler(mTimer_Tick);
}
@@ -208,7 +201,8 @@
}
mNumberSearched++;
- if (mStripsView.Searchables[startIndex].Matches(mString.Text))
+ string to_match = mString.Text.ToLowerInvariant();
+ if (mStripsView.Searchables[startIndex].ToMatch().Contains(to_match))
{
SetSelection(mStripsView.Searchables[startIndex]);
found = true;
@@ -368,5 +362,20 @@
{
mTimer.Stop();
}
+
+ private void mPreviousButton_Click(object sender, EventArgs e)
+ {
+ mProjectView.FindNextInText();
+ }
+
+ private void mNextButton_Click(object sender, EventArgs e)
+ {
+ mProjectView.FindPreviousInText();
+ }
+
+ private void mCloseButton_Click(object sender, EventArgs e)
+ {
+ mProjectView.FindInTextVisible = false;
+ }
}
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-14 20:09:51 UTC (rev 3055)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-14 20:44:45 UTC (rev 3056)
@@ -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();
@@ -90,7 +90,7 @@
// mFindInTextSplitter.Panel2
//
this.mFindInTextSplitter.Panel2.Controls.Add(this.mFindInText);
- this.mFindInTextSplitter.Panel2MinSize = 26;
+ this.mFindInTextSplitter.Panel2MinSize = 29;
this.mFindInTextSplitter.Size = new System.Drawing.Size(964, 660);
this.mFindInTextSplitter.SplitterDistance = 629;
this.mFindInTextSplitter.TabIndex = 0;
@@ -132,6 +132,33 @@
this.mMetadataSplitter.SplitterDistance = 381;
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, 0);
+ 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;
@@ -152,22 +179,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, 0);
- 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.LightYellow;
@@ -196,17 +207,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);
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-14 20:09:51 UTC (rev 3055)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-14 20:44:45 UTC (rev 3056)
@@ -291,16 +291,11 @@
#region ISearchable Members
- public bool Matches(string search)
+ public string ToMatch()
{
- return FindInText.Match(Label, search);
+ return Label.ToLowerInvariant();
}
- public void Replace(string search, string replace)
- {
- throw new Exception("The method or operation is not implemented.");
- }
-
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-14 20:10:03
|
Revision: 3055
http://urakawa.svn.sourceforge.net/urakawa/?rev=3055&view=rev
Author: avneeshsingh
Date: 2008-05-14 13:09:51 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Fix to buggs:
- Accessible label for To do phrases is not updated
- Metadata view do not catch focus when it appears.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs
trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.Designer.cs
trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs 2008-05-14 15:34:33 UTC (rev 3054)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs 2008-05-14 20:09:51 UTC (rev 3055)
@@ -92,6 +92,8 @@
mNode.Used ? "" : Localizer.Message("audio_block_label_unused"));*/
mLabel.Text = Node.BaseStringShort();
AccessibleName = Node.BaseString();
+ if (mWaveform != null)
+ mWaveform.AccessibleName = AccessibleName;
if (LabelFullWidth > WaveformDefaultWidth)
{
if (mWaveform != null) mWaveform.Width = mLabel.Width;
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.Designer.cs 2008-05-14 15:34:33 UTC (rev 3054)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.Designer.cs 2008-05-14 20:09:51 UTC (rev 3055)
@@ -32,7 +32,7 @@
this.mNameColumn = new System.Windows.Forms.ColumnHeader();
this.mContentColumn = new System.Windows.Forms.ColumnHeader();
this.mContentTextbox = new System.Windows.Forms.TextBox();
- this.mCommitButton = new System.Windows.Forms.Button();
+ this.mUpdateButton = new System.Windows.Forms.Button();
this.mNameTextbox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
@@ -81,17 +81,17 @@
this.mContentTextbox.Size = new System.Drawing.Size(225, 20);
this.mContentTextbox.TabIndex = 4;
//
- // mCommitButton
+ // mUpdateButton
//
- this.mCommitButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.mCommitButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.mCommitButton.Location = new System.Drawing.Point(206, 318);
- this.mCommitButton.Name = "mCommitButton";
- this.mCommitButton.Size = new System.Drawing.Size(75, 25);
- this.mCommitButton.TabIndex = 5;
- this.mCommitButton.Text = "&Commit";
- this.mCommitButton.UseVisualStyleBackColor = true;
- this.mCommitButton.Click += new System.EventHandler(this.mCommitButton_Click);
+ this.mUpdateButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.mUpdateButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mUpdateButton.Location = new System.Drawing.Point(206, 318);
+ this.mUpdateButton.Name = "mUpdateButton";
+ this.mUpdateButton.Size = new System.Drawing.Size(75, 25);
+ this.mUpdateButton.TabIndex = 5;
+ this.mUpdateButton.Text = "&Update";
+ this.mUpdateButton.UseVisualStyleBackColor = true;
+ this.mUpdateButton.Click += new System.EventHandler(this.mCommitButton_Click);
//
// mNameTextbox
//
@@ -131,10 +131,11 @@
this.Controls.Add(this.label1);
this.Controls.Add(this.mMetadataListView);
this.Controls.Add(this.mNameTextbox);
- this.Controls.Add(this.mCommitButton);
+ this.Controls.Add(this.mUpdateButton);
this.Controls.Add(this.mContentTextbox);
this.Name = "MetadataView";
this.Size = new System.Drawing.Size(284, 346);
+ this.VisibleChanged += new System.EventHandler(this.MetadataView_VisibleChanged);
this.ResumeLayout(false);
this.PerformLayout();
@@ -144,7 +145,7 @@
private System.Windows.Forms.ListView mMetadataListView;
private System.Windows.Forms.TextBox mContentTextbox;
- private System.Windows.Forms.Button mCommitButton;
+ private System.Windows.Forms.Button mUpdateButton;
private System.Windows.Forms.TextBox mNameTextbox;
private System.Windows.Forms.ColumnHeader mNameColumn;
private System.Windows.Forms.ColumnHeader mContentColumn;
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs 2008-05-14 15:34:33 UTC (rev 3054)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs 2008-05-14 20:09:51 UTC (rev 3055)
@@ -554,6 +554,26 @@
|
|
From: <ju...@us...> - 2008-05-14 15:34:36
|
Revision: 3054
http://urakawa.svn.sourceforge.net/urakawa/?rev=3054&view=rev
Author: julienq
Date: 2008-05-14 08:34:33 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Show selection in status bar.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Selection.cs
trunk/urakawa/application/Obi/Obi/messages.Designer.cs
trunk/urakawa/application/Obi/Obi/messages.resx
Modified: trunk/urakawa/application/Obi/Obi/Selection.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Selection.cs 2008-05-14 15:17:46 UTC (rev 3053)
+++ trunk/urakawa/application/Obi/Obi/Selection.cs 2008-05-14 15:34:33 UTC (rev 3054)
@@ -44,7 +44,11 @@
public override string ToString()
{
- return HasCursor ? SelectionBeginTime.ToString() : String.Format("{0}-{1}", SelectionBeginTime, SelectionEndTime);
+ return HasCursor ?
+ String.Format(Localizer.Message("time_in_seconds"), CursorTime / 1000.0) :
+ String.Format("{0}-{1}",
+ String.Format(Localizer.Message("time_in_seconds"), SelectionBeginTime / 1000.0),
+ String.Format(Localizer.Message("time_in_seconds"), SelectionEndTime / 1000.0));
}
}
@@ -178,7 +182,7 @@
public override string ToString()
{
- return String.Format("\"{0}\" in {1}", mText, base.ToString());
+ return String.Format(Localizer.Message("text_selection_to_string"), Node.ToString(), Control.ToString(), mText);
}
}
@@ -216,7 +220,7 @@
public override string ToString()
{
- return String.Format("Audio<{0}> in {1}", AudioRange.ToString(), base.ToString());
+ return String.Format(Localizer.Message("audio_selection_to_string"), AudioRange.ToString(), Node.ToString(), Control.ToString());
}
}
@@ -265,7 +269,7 @@
public override string ToString()
{
- return String.Format("Index {0} in {1}", mIndex, base.ToString());
+ return String.Format(Localizer.Message("strip_cursor_selection_to_string"), mIndex, Node.ToString(), Control.ToString());
}
}
Modified: trunk/urakawa/application/Obi/Obi/messages.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-14 15:17:46 UTC (rev 3053)
+++ trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-14 15:34:33 UTC (rev 3054)
@@ -151,6 +151,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Selected audio at {0} in {1} in {2}.
+ /// </summary>
+ internal static string audio_selection_to_string {
+ get {
+ return ResourceManager.GetString("audio_selection_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Blank phrase.
/// </summary>
internal static string blank_phrase {
@@ -1814,6 +1823,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Selection position {0} in {1} in {2}.
+ /// </summary>
+ internal static string strip_cursor_selection_to_string {
+ get {
+ return ResourceManager.GetString("strip_cursor_selection_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to content view.
/// </summary>
internal static string strips_view_to_string {
@@ -1823,6 +1841,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Selected text in {0} in {1}: "{2}".
+ /// </summary>
+ internal static string text_selection_to_string {
+ get {
+ return ResourceManager.GetString("text_selection_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to {0:0.00}s.
/// </summary>
internal static string time_in_seconds {
Modified: trunk/urakawa/application/Obi/Obi/messages.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-14 15:17:46 UTC (rev 3053)
+++ trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-14 15:34:33 UTC (rev 3054)
@@ -930,4 +930,16 @@
<value>unused </value>
<comment>ToString()</comment>
</data>
+ <data name="audio_selection_to_string" xml:space="preserve">
+ <value>Selected audio at {0} in {1} in {2}</value>
+ <comment>ToString() audio selection</comment>
+ </data>
+ <data name="strip_cursor_selection_to_string" xml:space="preserve">
+ <value>Selection position {0} in {1} in {2}</value>
+ <comment>ToString() strip cursor selection</comment>
+ </data>
+ <data name="text_selection_to_string" xml:space="preserve">
+ <value>Selected text in {0} in {1}: "{2}"</value>
+ <comment>ToString() text selection</comment>
+ </data>
</root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-14 15:17:53
|
Revision: 3053
http://urakawa.svn.sourceforge.net/urakawa/?rev=3053&view=rev
Author: julienq
Date: 2008-05-14 08:17:46 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Fix to bug #1963296 crash on splitting phrase
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
trunk/urakawa/application/Obi/Obi/messages.Designer.cs
trunk/urakawa/application/Obi/Obi/messages.resx
Modified: trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs 2008-05-14 14:49:25 UTC (rev 3052)
+++ trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs 2008-05-14 15:17:46 UTC (rev 3053)
@@ -16,7 +16,7 @@
public SplitAudio(ProjectView.ProjectView view, double splitTime): base(view)
{
- mNode = view.SelectedNodeAs<PhraseNode>();
+ mNode = view.GetNodeForSplit();
mSplitPoint = new Time(splitTime);
Label = Localizer.Message("split_phrase");
}
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-14 14:49:25 UTC (rev 3052)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-14 15:17:46 UTC (rev 3053)
@@ -1172,7 +1172,7 @@
mAddBlankPhraseToolStripMenuItem.Enabled = mProjectView.CanAddEmptyBlock;
mAddEmptyPagesToolStripMenuItem.Enabled = mProjectView.CanAddEmptyBlock;
mImportAudioFileToolStripMenuItem.Enabled = mProjectView.CanImportPhrases;
- mSplitPhraseToolStripMenuItem.Enabled = mProjectView.CanSplitBlock;
+ mSplitPhraseToolStripMenuItem.Enabled = mProjectView.CanSplitPhrase;
mMergePhraseWithNextToolStripMenuItem.Enabled = mProjectView.CanMergeBlockWithNext;
mPhraseIsUsedToolStripMenuItem.Enabled = mProjectView.CanSetBlockUsedStatus;
mPhraseIsUsedToolStripMenuItem.CheckedChanged -= new System.EventHandler(mPhraseIsUsedToolStripMenuItem_CheckedChanged);
@@ -1229,7 +1229,7 @@
private void mAddBlankPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.AddEmptyBlock(); }
private void mAddEmptyPagesToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.AddEmptyPages(); }
private void mImportAudioFileToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.ImportPhrases(); }
- private void mSplitPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.SplitBlock(); }
+ private void mSplitPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.SplitPhrase(); }
private void mMergePhraseWithNextToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.MergeBlockWithNext(); }
private void mPhraseIsUsedToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
{
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-14 14:49:25 UTC (rev 3052)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-14 15:17:46 UTC (rev 3053)
@@ -834,7 +834,7 @@
public bool CanMarkSectionUnused { get { return mTOCView.CanSetSectionUsedStatus && mSelection.Node.Used; } }
public bool CanMarkStripUnused { get { return !mStripsView.CanSetStripUsedStatus || mSelection.Node.Used; } }
public bool CanMergeBlockWithNext { get { return mStripsView.CanMergeBlockWithNext; } }
- public bool CanSplitBlock { get { return mTransportBar.CanSplitPhrase; } }
+ public bool CanSplitPhrase { get { return mTransportBar.CanSplitPhrase; } }
public bool IsBlockUsed { get { return mStripsView.IsBlockUsed; } }
public bool IsStripUsed { get { return mStripsView.IsStripUsed; } }
@@ -997,9 +997,9 @@
}
}
- public void SplitBlock()
+ public void SplitPhrase()
{
- if (CanSplitBlock) mPresentation.getUndoRedoManager().execute(new Commands.Node.SplitAudio(this));
+ if (CanSplitPhrase) mPresentation.getUndoRedoManager().execute(new Commands.Node.SplitAudio(this));
}
/// <summary>
@@ -1380,6 +1380,15 @@
Selection = s;
}
}
+
+ /// <summary>
+ /// Get the phrase node to split depending on the selection or the playback node.
+ /// </summary>
+ public PhraseNode GetNodeForSplit()
+ {
+ PhraseNode playing = mTransportBar.PlaybackPhrase;
+ return playing == null ? SelectedNodeAs<PhraseNode>() : playing;
+ }
}
public class ImportingFileEventArgs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-14 14:49:25 UTC (rev 3052)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-14 15:17:46 UTC (rev 3053)
@@ -35,6 +35,10 @@
private bool mIsSelectionMarked = false; // this should probably go I think
+ private string mPrevSectionAccessibleName; // Normal accessible name for the previous section button ???
+ private string mStopButtonAccessibleName; // Normal accessible name for the stop button ???
+
+
// Constants from the display combo box
private static readonly int ELAPSED_INDEX = 0;
private static readonly int ELAPSED_TOTAL_INDEX = 1;
@@ -74,6 +78,24 @@
/// <summary>
+ /// Get the phrase currently playing (or paused) if playback is active; null otherwise.
+ /// </summary>
+ public PhraseNode PlaybackPhrase
+ {
+ get { return IsPlayerActive ? mCurrentPlaylist.CurrentPhrase : null; }
+ }
+
+ // Set the accessible name of previous section/stop buttons (???)
+ private void AddTransportBarAccessibleName()
+ {
+ mPrevSectionAccessibleName = mPrevSectionButton.AccessibleName;
+ mStopButtonAccessibleName = mStopButton.AccessibleName;
+ mPrevSectionButton.AccessibleName = string.Format("{0} {1}", Localizer.Message("transport_bar"), mPrevSectionAccessibleName);
+ mStopButton.AccessibleName = string.Format("{0} {1}", Localizer.Message("transport_bar"), mStopButtonAccessibleName);
+ }
+
+
+ /// <summary>
/// Flag to enable/disable overwrite during recording.
/// Set from an Obi preference.
/// </summary>
@@ -1215,43 +1237,32 @@
#endregion
- string m_OriginalAccessibleName1;
- string m_OriginalAccessibleName2;
private void TransportBar_Leave(object sender, EventArgs e)
{
- mPrevSectionButton.AccessibleName = string.Concat(Localizer.Message("TransportBar_Label"), " ", m_OriginalAccessibleName1);
- mStopButton.AccessibleName = string.Concat(Localizer.Message("TransportBar_Label"), " ", m_OriginalAccessibleName2);
- }
+ mPrevSectionButton.AccessibleName = string.Format("{0} {1}", Localizer.Message("transport_bar"), mPrevSectionAccessibleName);
+ mStopButton.AccessibleName = string.Format("{0} {1}", Localizer.Message("transport_bar"), mStopButtonAccessibleName);
+ }
- private void AddTransportBarAccessibleName()
- {
- m_OriginalAccessibleName1 = mPrevSectionButton.AccessibleName;
- m_OriginalAccessibleName2 = mStopButton.AccessibleName;
- mPrevSectionButton.AccessibleName = string.Concat(Localizer.Message("TransportBar_Label"), " ", m_OriginalAccessibleName1);
- mStopButton.AccessibleName = string.Concat(Localizer.Message("TransportBar_Label"), " ", m_OriginalAccessibleName2);
- }
-
private void TransportBar_Enter(object sender, EventArgs e)
{
- mPrevSectionButton.AccessibleName = string.Concat(Localizer.Message("TransportBar_Label"), " ", m_OriginalAccessibleName1);
- mStopButton.AccessibleName = string.Concat(Localizer.Message("TransportBar_Label"), " ", m_OriginalAccessibleName2);
-
- Thread TrimAccessibleName = new Thread(new ThreadStart(TrimTransportBarAccessibleLabel));
+ mPrevSectionButton.AccessibleName = string.Format("{0} {1}", Localizer.Message("transport_bar"), mPrevSectionAccessibleName);
+ mStopButton.AccessibleName = string.Format("{0} {1}", Localizer.Message("transport_bar"), mStopButtonAccessibleName);
+ Thread TrimAccessibleName = new Thread(new ThreadStart(TrimTransportBarAccessibleLabel));
TrimAccessibleName.Start();
}
private void TrimTransportBarAccessibleLabel()
{
Thread.Sleep(750);
- mPrevSectionButton.AccessibleName = m_OriginalAccessibleName1;
- mStopButton.AccessibleName = m_OriginalAccessibleName2;
+ mPrevSectionButton.AccessibleName = mPrevSectionAccessibleName;
+ mStopButton.AccessibleName = mStopButtonAccessibleName;
}
/// <summary>
/// Process dialog key overridden to prevent tab from moving focus out of transportbar
- /// </summary>
+ /// </summary>
/// <param name="KeyData"></param>
/// <returns></returns>
protected override bool ProcessDialogKey(Keys KeyData)
Modified: trunk/urakawa/application/Obi/Obi/messages.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-14 14:49:25 UTC (rev 3052)
+++ trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-14 15:17:46 UTC (rev 3053)
@@ -1852,9 +1852,9 @@
/// <summary>
/// Looks up a localized string similar to Transport Bar.
/// </summary>
- internal static string TransportBar_Label {
+ internal static string transport_bar {
get {
- return ResourceManager.GetString("TransportBar_Label", resourceCulture);
+ return ResourceManager.GetString("transport_bar", resourceCulture);
}
}
Modified: trunk/urakawa/application/Obi/Obi/messages.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-14 14:49:25 UTC (rev 3052)
+++ trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-14 15:17:46 UTC (rev 3053)
@@ -695,7 +695,7 @@
<value>Stopped</value>
<comment>Status message</comment>
</data>
- <data name="TransportBar_Label" xml:space="preserve">
+ <data name="transport_bar" xml:space="preserve">
<value>Transport Bar</value>
</data>
<data name="dc_contributor_description" xml:space="preserve">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-14 14:49:27
|
Revision: 3052
http://urakawa.svn.sourceforge.net/urakawa/?rev=3052&view=rev
Author: julienq
Date: 2008-05-14 07:49:25 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Fix for bug #1906227 Crash on starting recording while focus is in TOC view.
This uncovers some more problems, actually : (
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.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-14 13:59:25 UTC (rev 3051)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-14 14:49:25 UTC (rev 3052)
@@ -1367,6 +1367,19 @@
{
mStripsView.SelectPrecedingTODONode();
}
+
+ /// <summary>
+ /// Ensure that the selection is in the content view.
+ /// </summary>
+ public void SelectInContentView()
+ {
+ if (mSelection != null && mSelection.Control != mStripsView)
+ {
+ NodeSelection s = mSelection;
+ s.Control = mStripsView;
+ Selection = s;
+ }
+ }
}
public class ImportingFileEventArgs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs 2008-05-14 13:59:25 UTC (rev 3051)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs 2008-05-14 14:49:25 UTC (rev 3052)
@@ -262,11 +262,8 @@
return false;
}
- // True if a section (not dummy, or not its text) is selected.
- private bool IsSectionSelected
- {
- get { return mSelection != null && mSelection.GetType() == typeof(NodeSelection); }
- }
+ // True if a section (not its text) is selected.
+ private bool IsSectionSelected { get { return mSelection is NodeSelection; } }
// Reflect changes in the presentation (added or deleted nodes)
private void Presentation_changed(object sender, urakawa.events.DataModelChangedEventArgs e)
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-14 13:59:25 UTC (rev 3051)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-14 14:49:25 UTC (rev 3052)
@@ -777,6 +777,7 @@
// creating the new section.)
private ObiNode GetRecordingSection(ObiNode selected, urakawa.undo.CompositeCommand command)
{
+ mView.SelectInContentView();
if (selected == null) selected = mView.SelectedNodeAs<ObiNode>();
if (selected == null)
{
@@ -1078,7 +1079,7 @@
/// <summary>
/// Start recording directly without going through listening
- /// </summary>
+ /// </summary>
public void StartRecordingDirectly()
{
if (mRecordingSession == null && mCurrentPlaylist.Audioplayer.State != Obi.Audio.AudioPlayerState.Playing)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-14 13:59:27
|
Revision: 3051
http://urakawa.svn.sourceforge.net/urakawa/?rev=3051&view=rev
Author: julienq
Date: 2008-05-14 06:59:25 -0700 (Wed, 14 May 2008)
Log Message:
-----------
Showing more info in status bar on node selection (Todo: text/audio selection)
Normalized with accessible names as well.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/EmptyNode.cs
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ObiNode.cs
trunk/urakawa/application/Obi/Obi/PhraseNode.cs
trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs
trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs
trunk/urakawa/application/Obi/Obi/SectionNode.cs
trunk/urakawa/application/Obi/Obi/Selection.cs
trunk/urakawa/application/Obi/Obi/messages.Designer.cs
trunk/urakawa/application/Obi/Obi/messages.resx
Modified: trunk/urakawa/application/Obi/Obi/EmptyNode.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/EmptyNode.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/EmptyNode.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -30,6 +30,36 @@
/// </summary>
public enum Kind { Plain, Page, Heading, Silence, TODO, Custom };
+
+ public override string ToString() { return BaseString(); }
+
+ public virtual string BaseString(double duration)
+ {
+ return String.Format(Localizer.Message("phrase_to_string"),
+ Used ? "" : Localizer.Message("unused"),
+ 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) :
+ mKind == Kind.Page ? String.Format(Localizer.Message("phrase_extra_page"), mPageNumber) :
+ Localizer.Message("phrase_extra_" + mKind.ToString()));
+ }
+
+ public virtual string BaseString() { return BaseString(0.0); }
+
+ public virtual string BaseStringShort(double duration)
+ {
+ return String.Format(Localizer.Message("phrase_short_to_string"),
+ mKind == Kind.Custom ? String.Format(Localizer.Message("phrase_short_custom"), mCustomClass) :
+ mKind == Kind.Page ? String.Format(Localizer.Message("phrase_short_page"), mPageNumber) :
+ Localizer.Message("phrase_short_" + mKind.ToString()),
+ duration == 0.0 ? Localizer.Message("empty") : String.Format(Localizer.Message("time_in_seconds"), duration));
+ }
+
+ public virtual string BaseStringShort() { return BaseStringShort(0.0); }
+
+ public override double Duration { get { return 0.0; } }
+
/// <summary>
/// This event is sent when we change the kind or custom class of a node.
/// </summary>
@@ -149,12 +179,6 @@
}
}
- public override string ToString()
- {
- return String.Format("{0}[{1}] ({2})", GetType(), getParent() == null ? "detached" : Index.ToString(),
- mKind == Kind.Custom ? mCustomClass : mKind.ToString());
- }
-
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; } }
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -640,13 +640,19 @@
// Undo
private void Undo()
{
- if (mProjectView.TransportBar.IsActive)
- mProjectView.TransportBar.Stop();
-
+ if (mProjectView.TransportBar.IsActive) mProjectView.TransportBar.Stop();
if (mSession.CanUndo) { mSession.Presentation.getUndoRedoManager().undo(); }
}
/// <summary>
+ /// Show the current selection in the status bar.
+ /// </summary>
+ private void ShowSelectionInStatusBar()
+ {
+ if (mProjectView.Selection != null) Status(mProjectView.Selection.ToString());
+ }
+
+ /// <summary>
/// Set view synchronization and update the menu and settings accordingly.
/// </summary>
private bool SynchronizeViews
@@ -699,7 +705,11 @@
#region Event handlers
- private void ProjectView_SelectionChanged(object sender, EventArgs e) { UpdateMenus(); }
+ private void ProjectView_SelectionChanged(object sender, EventArgs e)
+ {
+ UpdateMenus();
+ ShowSelectionInStatusBar();
+ }
private void Session_ProjectCreated(object sender, EventArgs e)
{
@@ -1180,7 +1190,7 @@
private void UpdateAudioSelectionBlockMenuItems()
{
- string AudioSelectionStatusMessage = "";
+ //string AudioSelectionStatusMessage = "";
if (mProjectView.Selection is AudioSelection)
{
BeginInPhraseSelectionToolStripMenuItem.Enabled = true;
@@ -1196,13 +1206,13 @@
string BeginTime = Math.Round(((AudioSelection)mProjectView.Selection).AudioRange.SelectionBeginTime / 1000, 1).ToString();
string EndTime = Math.Round(((AudioSelection)mProjectView.Selection).AudioRange.SelectionEndTime / 1000, 1).ToString();
//AudioSelectionStatusMessage = string.Concat(" Selected:", ((AudioSelection)mProjectView.Selection).AudioRange.SelectionBeginTime.ToString(), " - ", ((AudioSelection)mProjectView.Selection).AudioRange.SelectionEndTime.ToString());
- AudioSelectionStatusMessage = string.Concat(Localizer.Message("AudioSelected"), BeginTime, " - ", EndTime, "s");
+ //AudioSelectionStatusMessage = string.Concat(Localizer.Message("AudioSelected"), BeginTime, " - ", EndTime, "s");
}
else
{
DeselectInPhraseSelectionToolStripMenuItem.Enabled = false;
- AudioSelectionStatusMessage = "";
+ //AudioSelectionStatusMessage = "";
}
}
else
@@ -1210,10 +1220,10 @@
BeginInPhraseSelectionToolStripMenuItem.Enabled = false;
EndInPhraseSelectionToolStripMenuItem.Enabled = false;
DeselectInPhraseSelectionToolStripMenuItem.Enabled = false;
- AudioSelectionStatusMessage = "";
+ //AudioSelectionStatusMessage = "";
}
- if (AudioSelectionStatusMessage != "")
- Status(Localizer.Message(mProjectView.TransportBar.CurrentPlaylist.State.ToString()) + AudioSelectionStatusMessage);
+ //if (AudioSelectionStatusMessage != "")
+ // Status(Localizer.Message(mProjectView.TransportBar.CurrentPlaylist.State.ToString()) + AudioSelectionStatusMessage);
}
private void mAddBlankPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.AddEmptyBlock(); }
Modified: trunk/urakawa/application/Obi/Obi/ObiNode.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiNode.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/ObiNode.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -22,7 +22,6 @@
mUsed = true;
}
-
/// <summary>
/// Get the nearest ancestor of the given type. This is useful to get the section ancestor of a phrase
/// regardless of its nesting level.
@@ -126,6 +125,7 @@
public abstract int SectionChildCount { get; }
public abstract EmptyNode PhraseChild(int index);
public abstract int PhraseChildCount { get; }
+ public abstract double Duration { get; }
public abstract PhraseNode FirstUsedPhrase { get; }
@@ -238,6 +238,21 @@
public override int SectionChildCount { get { return getChildCount(); } }
public override EmptyNode PhraseChild(int index) { throw new Exception("A root node has no phrase children."); }
public override int PhraseChildCount { get { return 0; } }
+
+ public override double Duration
+ {
+ get
+ {
+ double duration = 0.0;
+ acceptDepthFirst(delegate(urakawa.core.TreeNode n)
+ {
+ if (n is SectionNode) duration += ((SectionNode)n).Duration;
+ return true;
+ }, delegate(urakawa.core.TreeNode n) { });
+ return duration;
+ }
+ }
+
public override string getXukLocalName() { return XUK_ELEMENT_NAME; }
}
}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/PhraseNode.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/PhraseNode.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/PhraseNode.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -100,12 +100,8 @@
/// </summary>
public override string getXukLocalName() { return XUK_ELEMENT_NAME; }
- /// <summary>
- /// Short text description of the phrase, including audio duration.
- /// </summary>
- public override string ToString()
- {
- return String.Format("{0} {1}", base.ToString(), Audio.getDuration().ToString());
- }
+ public override string BaseString() { return base.BaseString(Audio.getDuration().getTimeDeltaAsMillisecondFloat() / 1000.0); }
+ public override string BaseStringShort() { return base.BaseStringShort(Audio.getDuration().getTimeDeltaAsMillisecondFloat() / 1000.0); }
+ public override double Duration { get { return Audio.getDuration().getTimeDeltaAsMillisecondFloat(); } }
}
}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -80,7 +80,7 @@
// Update label and waveform when there is new information to display.
protected override void UpdateLabel()
{
- string name = mNode.NodeKind == EmptyNode.Kind.Plain ? Localizer.Message("blank_phrase") :
+ /*string name = mNode.NodeKind == EmptyNode.Kind.Plain ? Localizer.Message("blank_phrase") :
mNode.NodeKind == EmptyNode.Kind.Page ? String.Format(Localizer.Message("page_number"), mNode.PageNumber) :
String.Format(Localizer.Message("kind_phrase"),
mNode.NodeKind == EmptyNode.Kind.Custom ? mNode.CustomClass : mNode.NodeKind.ToString());
@@ -89,7 +89,9 @@
((PhraseNode)Node).Audio.getDuration().getTimeDeltaAsMillisecondFloat() / 1000);
AccessibleName = String.Format(Localizer.Message("audio_block_label"),
mLabel.Text, mNode.Index + 1, mNode.ParentAs<SectionNode>().PhraseChildCount,
- mNode.Used ? "" : Localizer.Message("audio_block_label_unused"));
+ mNode.Used ? "" : Localizer.Message("audio_block_label_unused"));*/
+ mLabel.Text = Node.BaseStringShort();
+ AccessibleName = Node.BaseString();
if (LabelFullWidth > WaveformDefaultWidth)
{
if (mWaveform != null) mWaveform.Width = mLabel.Width;
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -34,21 +34,11 @@
// Generate the label string for this block.
protected virtual 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) :
- String.Format(Localizer.Message("kind_phrase"),
- mNode.NodeKind == EmptyNode.Kind.Custom ? mNode.CustomClass : mNode.NodeKind.ToString());
- mLabel.Text = name;
+ mLabel.Text = Node.BaseStringShort();
+ mLabel.AccessibleName = Node.BaseString();
Size = new Size(LabelFullWidth, Height);
- AccessibleName = name;
}
- /*protected virtual void UpdateAccessibleName()
- {
- AccessibleName = mCustomClassLabel.Text + String.Format(Localizer.Message("audio_accessible_name"),
- mNode.Index + 1, mNode.ParentAs<ObiNode>().PhraseChildCount);
- }*/
-
private void node_ChangedPageNumber(object sender, NodeEventArgs<EmptyNode> e) { UpdateLabel(); }
private void node_ChangedKind(object sender, ChangedKindEventArgs e) { UpdateLabel(); }
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -42,22 +42,8 @@
}
- private void SetAccessibleName()
- {
- string Unused_Tag = "";
+ private void SetAccessibleName() { mLabel.AccessibleName = mNode.ToString(); }
- if (mNode != null)
- {
- if (!mNode.Used)
- Unused_Tag = Localizer.Message("Accessible_Label_Unused");
-
- mLabel.AccessibleName = this.Label + " - depth " + mNode.Level + Unused_Tag ;
- }
- else
- mLabel.AccessibleName = this.Label;
- }
-
-
/// <summary>
/// Add a new block for a phrase node.
/// </summary>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -43,6 +43,8 @@
}
+ public override string ToString() { return Localizer.Message("strips_view_to_string"); }
+
/// <summary>
/// The parent project view. Should be set ASAP, and only once.
/// </summary>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -20,6 +20,8 @@
public TOCView() { InitializeComponent(); }
+ public override string ToString() { return Localizer.Message("toc_view_to_string"); }
+
/// <summary>
/// Can add a section as long as the selection is not a text selection.
/// </summary>
Modified: trunk/urakawa/application/Obi/Obi/SectionNode.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/SectionNode.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/SectionNode.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -265,9 +265,28 @@
/// </summary>
public override string ToString()
{
- return string.Format("SectionNode<{0}>\"{1}\"", IsRooted ? Level.ToString() : "unrooted", Label);
+ return string.Format(Localizer.Message("section_to_string"),
+ Used ? "" : Localizer.Message("unused"),
+ Label,
+ Duration == 0.0 ? Localizer.Message("empty") : string.Format(Localizer.Message("time_in_seconds"), Duration / 1000.0),
+ string.Format(Localizer.Message("section_level_to_string"), IsRooted ? Level : 0),
+ PhraseChildCount == 0 ? "" :
+ PhraseChildCount == 1 ? Localizer.Message("section_one_phrase_to_string") :
+ string.Format(Localizer.Message("section_phrases_to_string"), PhraseChildCount));
}
+ /// <summary>
+ /// Total duration of the section.
+ /// </summary>
+ public override double Duration
+ {
+ get
+ {
+ double duration = 0;
+ for (int i = 0; i < PhraseChildCount; ++i) duration += PhraseChild(i).Duration;
+ return duration;
+ }
+ }
/// <summary>
/// Copy the children of a section node.
Modified: trunk/urakawa/application/Obi/Obi/Selection.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Selection.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/Selection.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -67,9 +67,12 @@
}
/// <summary>
- /// Stringify the selection for debug printing.
+ /// Stringify the selection for showing in the status bar.
/// </summary>
- public override string ToString() { return String.Format("{0} in {1}", Node, Control); }
+ public override string ToString()
+ {
+ return String.Format(Localizer.Message("node_selection_to_string"), Node.ToString(), Control.ToString());
+ }
public SectionNode Section { get { return Node as SectionNode; } }
public SectionNode SectionOf { get { return Node is PhraseNode ? Node.ParentAs<SectionNode>() : Node as SectionNode; } }
Modified: trunk/urakawa/application/Obi/Obi/messages.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-14 13:59:25 UTC (rev 3051)
@@ -124,15 +124,6 @@
}
/// <summary>
- /// Looks up a localized string similar to Audio {0} of {1}.
- /// </summary>
- internal static string audio_accessible_name {
- get {
- return ResourceManager.GetString("audio_accessible_name", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to {0} {1} of {2}{3}.
/// </summary>
internal static string audio_block_label {
@@ -855,6 +846,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to empty.
+ /// </summary>
+ internal static string empty {
+ get {
+ return ResourceManager.GetString("empty", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Exporting to a non-empty directory.
/// </summary>
internal static string empty_directory_caption {
@@ -1244,6 +1244,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Selected {0} in {1}.
+ /// </summary>
+ internal static string node_selection_to_string {
+ get {
+ return ResourceManager.GetString("node_selection_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Phrase.
/// </summary>
internal static string normal_phrase {
@@ -1379,6 +1388,141 @@
}
/// <summary>
+ /// Looks up a localized string similar to , {0}.
+ /// </summary>
+ internal static string phrase_extra_custom {
+ get {
+ return ResourceManager.GetString("phrase_extra_custom", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to , heading.
+ /// </summary>
+ internal static string phrase_extra_Heading {
+ get {
+ return ResourceManager.GetString("phrase_extra_Heading", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to , page number {0}.
+ /// </summary>
+ internal static string phrase_extra_page {
+ get {
+ return ResourceManager.GetString("phrase_extra_page", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to .
+ /// </summary>
+ internal static string phrase_extra_Plain {
+ get {
+ return ResourceManager.GetString("phrase_extra_Plain", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to , silence.
+ /// </summary>
+ internal static string phrase_extra_Silence {
+ get {
+ return ResourceManager.GetString("phrase_extra_Silence", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to , TODO.
+ /// </summary>
+ internal static string phrase_extra_TODO {
+ get {
+ return ResourceManager.GetString("phrase_extra_TODO", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to phrase (length: {0}).
+ /// </summary>
+ internal static string phrase_node_to_string {
+ get {
+ return ResourceManager.GetString("phrase_node_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to "{0}".
+ /// </summary>
+ internal static string phrase_short_custom {
+ get {
+ return ResourceManager.GetString("phrase_short_custom", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Heading.
+ /// </summary>
+ internal static string phrase_short_Heading {
+ get {
+ return ResourceManager.GetString("phrase_short_Heading", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Page {0}.
+ /// </summary>
+ internal static string phrase_short_page {
+ get {
+ return ResourceManager.GetString("phrase_short_page", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Phrase.
+ /// </summary>
+ internal static string phrase_short_Plain {
+ get {
+ return ResourceManager.GetString("phrase_short_Plain", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Silence.
+ /// </summary>
+ internal static string phrase_short_Silence {
+ get {
+ return ResourceManager.GetString("phrase_short_Silence", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to {0} ({1}).
+ /// </summary>
+ internal static string phrase_short_to_string {
+ get {
+ return ResourceManager.GetString("phrase_short_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to TODO.
+ /// </summary>
+ internal static string phrase_short_TODO {
+ get {
+ return ResourceManager.GetString("phrase_short_TODO", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to {0}phrase {1} of {2} ({3}){4}.
+ /// </summary>
+ internal static string phrase_to_string {
+ get {
+ return ResourceManager.GetString("phrase_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Playback rate x{0}.
/// </summary>
internal static string playback_rate {
@@ -1571,6 +1715,42 @@
}
/// <summary>
+ /// Looks up a localized string similar to , level {0}.
+ /// </summary>
+ internal static string section_level_to_string {
+ get {
+ return ResourceManager.GetString("section_level_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to , 1 phrase.
+ /// </summary>
+ internal static string section_one_phrase_to_string {
+ get {
+ return ResourceManager.GetString("section_one_phrase_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to , {0} phrases.
+ /// </summary>
+ internal static string section_phrases_to_string {
+ get {
+ return ResourceManager.GetString("section_phrases_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to {0}section "{1}" ({2}{3}{4}).
+ /// </summary>
+ internal static string section_to_string {
+ get {
+ return ResourceManager.GetString("section_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to set page number.
/// </summary>
internal static string set_page_number_ {
@@ -1634,6 +1814,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to content view.
+ /// </summary>
+ internal static string strips_view_to_string {
+ get {
+ return ResourceManager.GetString("strips_view_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to {0:0.00}s.
+ /// </summary>
+ internal static string time_in_seconds {
+ get {
+ return ResourceManager.GetString("time_in_seconds", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to {0}{1} - {2}.
/// </summary>
internal static string title_bar {
@@ -1643,6 +1841,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to TOC view.
+ /// </summary>
+ internal static string toc_view_to_string {
+ get {
+ return ResourceManager.GetString("toc_view_to_string", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Transport Bar.
/// </summary>
internal static string TransportBar_Label {
@@ -1670,6 +1877,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to unused .
+ /// </summary>
+ internal static string unused {
+ get {
+ return ResourceManager.GetString("unused", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to XHTML | *.html.
/// </summary>
internal static string xhtml_filter {
Modified: trunk/urakawa/application/Obi/Obi/messages.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-14 06:43:00 UTC (rev 3050)
+++ trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-14 13:59:25 UTC (rev 3051)
@@ -520,10 +520,6 @@
<value>paste phrase</value>
<comment>Command</comment>
</data>
- <data name="audio_accessible_name" xml:space="preserve">
- <value>Audio {0} of {1}</value>
- <comment>Accessible name</comment>
- </data>
<data name="add_role" xml:space="preserve">
<value>(Add role)</value>
<comment>For the custom types dropdown</comment>
@@ -838,4 +834,100 @@
<value>custom</value>
<comment>Custom metadata name</comment>
</data>
+ <data name="empty" xml:space="preserve">
+ <value>empty</value>
+ <comment>ToString() for empty phrases</comment>
+ </data>
+ <data name="node_selection_to_string" xml:space="preserve">
+ <value>Selected {0} in {1}</value>
+ <comment>ToString()</comment>
+ </data>
+ <data name="phrase_extra_custom" xml:space="preserve">
+ <value>, {0}</value>
+ <comment>ToString() for custom class</comment>
+ </data>
+ <data name="phrase_extra_Heading" xml:space="preserve">
+ <value>, heading</value>
+ <comment>ToString()</comment>
+ </data>
+ <data name="phrase_extra_page" xml:space="preserve">
+ <value>, page number {0}</value>
+ <comment>ToString() for page numbers</comment>
+ </data>
+ <data name="phrase_extra_Plain" xml:space="preserve">
+ <value />
+ <comment>ToString() (empty)</comment>
+ </data>
+ <data name="phrase_extra_Silence" xml:space="preserve">
+ <value>, silence</value>
+ <comment>ToString()</comment>
+ </data>
+ <data name="phrase_extra_TODO" xml:space="preserve">
+ <value>, TODO</value>
+ <comment>ToString()</comment>
+ </data>
+ <data name="phrase_node_to_string" xml:space="preserve">
+ <value>phrase (length: {0})</value>
+ <comment>ToString()</comment>
+ </data>
+ <data name="phrase_short_custom" xml:space="preserve">
+ <value>"{0}"</value>
+ <comment>ToString() short</comment>
+ </data>
+ <data name="phrase_short_Heading" xml:space="preserve">
+ <value>Heading</value>
+ <comment>ToString() short</comment>
+ </data>
+ <data name="phrase_short_page" xml:space="preserve">
+ <value>Page {0}</value>
+ <comment>ToString() short</comment>
+ </data>
+ <data name="phrase_short_Plain" xml:space="preserve">
+ <value>Phrase</value>
+ <comment>ToString() short</comment>
+ </data>
+ <data name="phrase_short_Silence" xml:space="preserve">
+ <value>Silence</value>
+ <comment>ToString() short</comment>
+ </data>
+ <data name="phrase_short_to_string" xml:space="preserve">
+ <value>{0} ({1})</value>
+ <comment>ToStirng() short version for labels</comment>
+ </data>
+ <data name="phrase_short_TODO" xml:space="preserve">
+ <value>TODO</value>
+ <comment>ToString() short</comment>
+ </data>
+ <data name="phrase_to_string" xml:space="preserve">
+ <value>{0}phrase {1} of {2} ({3}){4}</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">
+ <value>, level {0}</value>
+ </data>
+ <data name="section_one_phrase_to_string" xml:space="preserve">
+ <value>, 1 phrase</value>
+ </data>
+ <data name="section_phrases_to_string" xml:space="preserve">
+ <value>, {0} phrases</value>
+ </data>
+ <data name="section_to_string" xml:space="preserve">
+ <value>{0}section "{1}" ({2}{3}{4})</value>
+ </data>
+ <data name="strips_view_to_string" xml:space="preserve">
+ <value>content view</value>
+ <comment>ToString()</comment>
+ </data>
+ <data name="time_in_seconds" xml:space="preserve">
+ <value>{0:0.00}s</value>
+ <comment>ToString()</comment>
+ </data>
+ <data name="toc_view_to_string" xml:space="preserve">
+ <value>TOC view</value>
+ <comment>ToString()</comment>
+ </data>
+ <data name="unused" xml:space="preserve">
+ <value>unused </value>
+ <comment>ToString()</comment>
+ </data>
</root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-14 06:43:02
|
Revision: 3050
http://urakawa.svn.sourceforge.net/urakawa/?rev=3050&view=rev
Author: avneeshsingh
Date: 2008-05-13 23:43:00 -0700 (Tue, 13 May 2008)
Log Message:
-----------
Fix to bugg: #1963563
closing project while live recording crash
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-14 06:38:01 UTC (rev 3049)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-14 06:43:00 UTC (rev 3050)
@@ -175,6 +175,10 @@
if (result == DialogResult.Cancel) return false;
if (result == DialogResult.Yes) mSession.Save();
}
+
+ if (mProjectView.TransportBar.IsActive)
+ mProjectView.TransportBar.Stop();
+
mSession.Close();
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-14 06:38:07
|
Revision: 3049
http://urakawa.svn.sourceforge.net/urakawa/?rev=3049&view=rev
Author: avneeshsingh
Date: 2008-05-13 23:38:01 -0700 (Tue, 13 May 2008)
Log Message:
-----------
Fix to bug:
Starting recording crash on no project open.
previous fix did nt work so fix applied again
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-13 23:45:09 UTC (rev 3048)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-14 06:38:01 UTC (rev 3049)
@@ -1371,8 +1371,7 @@
mStopToolStripMenuItem.Enabled = mProjectView.CanStop;
// update recording menu items
- mRecordToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
- mStartRecordingToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive;
+ mStartRecordingToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive;
if (mProjectView.TransportBar.IsRecorderActive)
{
mStartListeningToolStripMenuItem.Enabled = false;
@@ -1382,6 +1381,8 @@
mStartListeningToolStripMenuItem.Enabled = true;
mStartRecordingToolStripMenuItem.Enabled = true;
}
+ mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
+ mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
}
private void mPlayAllToolStripMenuItem_Click(object sender, EventArgs e)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-13 23:45:20
|
Revision: 3048
http://urakawa.svn.sourceforge.net/urakawa/?rev=3048&view=rev
Author: julienq
Date: 2008-05-13 16:45:09 -0700 (Tue, 13 May 2008)
Log Message:
-----------
TODO blocks.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Audio/AudioRecorder.cs
trunk/urakawa/application/Obi/Obi/EmptyNode.cs
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/Block.Designer.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
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/Audio/AudioRecorder.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Audio/AudioRecorder.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/Audio/AudioRecorder.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -503,9 +503,9 @@
m_MutexCaptureData.ReleaseMutex();
}
-int m_PrevBufferPos = 0;
-long m_PrevSampleCount = 0;
+ long m_PrevSampleCount = 0;
+
void CaptureTimer_Tick(object sender, EventArgs e)
{
Modified: trunk/urakawa/application/Obi/Obi/EmptyNode.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/EmptyNode.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/EmptyNode.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -171,7 +171,8 @@
if (kind != null) mKind = kind == Kind.Custom.ToString() ? Kind.Custom :
kind == Kind.Heading.ToString() ? Kind.Heading :
kind == Kind.Page.ToString() ? Kind.Page :
- kind == Kind.Silence.ToString () ? Kind.Silence : Kind.Plain;
+ kind == Kind.Silence.ToString () ? Kind.Silence :
+ kind == Kind.TODO.ToString() ? Kind.TODO : Kind.Plain;
if (kind != null && kind != mKind.ToString()) throw new Exception("Unknown kind: " + kind);
mCustomClass = source.GetAttribute(XUK_ATTR_NAME_CUSTOM);
if (mKind == Kind.Page) mPageNumber = SafeParsePageNumber(source.GetAttribute(XUK_ATTR_NAME_PAGE));
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -73,7 +73,9 @@
this.mFocusOnStripsViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mFocusOnTransportBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mSynchronizeViewsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.mShowOnlySelectedSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mWrappingInContentViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.mShowPeakMeterMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mShowSourceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -128,7 +130,7 @@
this.PreviewFromtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PreviewUptotoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PreviewSelectedAudiotoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.recordToolStripMenuItem = 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.mAllowOverwriteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -153,9 +155,10 @@
this.aboutObiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mStatusStrip = new System.Windows.Forms.StatusStrip();
this.mStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
+ this.mGoToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mNextTODOPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mPreviousTODOPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mProjectView = new Obi.ProjectView.ProjectView();
- this.mWrappingInContentViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.mMenuStrip.SuspendLayout();
this.mStatusStrip.SuspendLayout();
this.SuspendLayout();
@@ -485,6 +488,11 @@
resources.ApplyResources(this.mSynchronizeViewsToolStripMenuItem, "mSynchronizeViewsToolStripMenuItem");
this.mSynchronizeViewsToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mSynchronizeViewsToolStripMenuItem_CheckedChanged);
//
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
+ //
// mShowOnlySelectedSectionToolStripMenuItem
//
this.mShowOnlySelectedSectionToolStripMenuItem.CheckOnClick = true;
@@ -492,6 +500,15 @@
resources.ApplyResources(this.mShowOnlySelectedSectionToolStripMenuItem, "mShowOnlySelectedSectionToolStripMenuItem");
this.mShowOnlySelectedSectionToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowOnlySelectedSectionToolStripMenuItem_CheckedChanged);
//
+ // mWrappingInContentViewToolStripMenuItem
+ //
+ this.mWrappingInContentViewToolStripMenuItem.Checked = true;
+ this.mWrappingInContentViewToolStripMenuItem.CheckOnClick = true;
+ this.mWrappingInContentViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.mWrappingInContentViewToolStripMenuItem.Name = "mWrappingInContentViewToolStripMenuItem";
+ resources.ApplyResources(this.mWrappingInContentViewToolStripMenuItem, "mWrappingInContentViewToolStripMenuItem");
+ this.mWrappingInContentViewToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mWrappingInContentViewToolStripMenuItem_CheckedChanged);
+ //
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
@@ -608,7 +625,8 @@
this.mClearRoleToolStripMenuItem,
this.PhraseDetectionToolStripMenuItem,
this.mMarkDefaultCustomClassToolStripMenuItem,
- this.InPhraseSelectionToolStripMenuItem});
+ this.InPhraseSelectionToolStripMenuItem,
+ this.mGoToToolStripMenuItem});
this.mPhrasesToolStripMenuItem.Name = "mPhrasesToolStripMenuItem";
resources.ApplyResources(this.mPhrasesToolStripMenuItem, "mPhrasesToolStripMenuItem");
//
@@ -764,7 +782,7 @@
this.mStopToolStripMenuItem,
this.FastPlaytoolStripMenuItem,
this.PlayPreviewtoolStripMenuItem,
- this.recordToolStripMenuItem,
+ this.mRecordToolStripMenuItem,
this.toolStripSeparator5,
this.navigationToolStripMenuItem,
this.rewindToolStripMenuItem,
@@ -871,14 +889,14 @@
resources.ApplyResources(this.PreviewSelectedAudiotoolStripMenuItem, "PreviewSelectedAudiotoolStripMenuItem");
this.PreviewSelectedAudiotoolStripMenuItem.Click += new System.EventHandler(this.PreviewSelectedAudiotoolStripMenuItem_Click);
//
- // recordToolStripMenuItem
+ // mRecordToolStripMenuItem
//
- this.recordToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mRecordToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mStartListeningToolStripMenuItem,
this.mStartRecordingToolStripMenuItem,
this.mAllowOverwriteToolStripMenuItem});
- this.recordToolStripMenuItem.Name = "recordToolStripMenuItem";
- resources.ApplyResources(this.recordToolStripMenuItem, "recordToolStripMenuItem");
+ this.mRecordToolStripMenuItem.Name = "mRecordToolStripMenuItem";
+ resources.ApplyResources(this.mRecordToolStripMenuItem, "mRecordToolStripMenuItem");
//
// mStartListeningToolStripMenuItem
//
@@ -1043,6 +1061,26 @@
this.mStatusLabel.Name = "mStatusLabel";
resources.ApplyResources(this.mStatusLabel, "mStatusLabel");
//
+ // mGoToToolStripMenuItem
+ //
+ this.mGoToToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mNextTODOPhraseToolStripMenuItem,
+ this.mPreviousTODOPhraseToolStripMenuItem});
+ this.mGoToToolStripMenuItem.Name = "mGoToToolStripMenuItem";
+ resources.ApplyResources(this.mGoToToolStripMenuItem, "mGoToToolStripMenuItem");
+ //
+ // mNextTODOPhraseToolStripMenuItem
+ //
+ this.mNextTODOPhraseToolStripMenuItem.Name = "mNextTODOPhraseToolStripMenuItem";
+ resources.ApplyResources(this.mNextTODOPhraseToolStripMenuItem, "mNextTODOPhraseToolStripMenuItem");
+ this.mNextTODOPhraseToolStripMenuItem.Click += new System.EventHandler(this.mNextTODOPhraseToolStripMenuItem_Click);
+ //
+ // mPreviousTODOPhraseToolStripMenuItem
+ //
+ this.mPreviousTODOPhraseToolStripMenuItem.Name = "mPreviousTODOPhraseToolStripMenuItem";
+ resources.ApplyResources(this.mPreviousTODOPhraseToolStripMenuItem, "mPreviousTODOPhraseToolStripMenuItem");
+ this.mPreviousTODOPhraseToolStripMenuItem.Click += new System.EventHandler(this.mPreviousTODOPhraseToolStripMenuItem_Click);
+ //
// mProjectView
//
this.mProjectView.BackColor = System.Drawing.Color.Transparent;
@@ -1058,20 +1096,6 @@
this.mProjectView.TOCViewVisible = true;
this.mProjectView.TransportBarVisible = false;
//
- // mWrappingInContentViewToolStripMenuItem
- //
- this.mWrappingInContentViewToolStripMenuItem.Checked = true;
- this.mWrappingInContentViewToolStripMenuItem.CheckOnClick = true;
- this.mWrappingInContentViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
- this.mWrappingInContentViewToolStripMenuItem.Name = "mWrappingInContentViewToolStripMenuItem";
- resources.ApplyResources(this.mWrappingInContentViewToolStripMenuItem, "mWrappingInContentViewToolStripMenuItem");
- this.mWrappingInContentViewToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mWrappingInContentViewToolStripMenuItem_CheckedChanged);
- //
- // toolStripSeparator8
- //
- this.toolStripSeparator8.Name = "toolStripSeparator8";
- resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
- //
// ObiForm
//
resources.ApplyResources(this, "$this");
@@ -1172,7 +1196,7 @@
private System.Windows.Forms.ToolStripMenuItem mPauseToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mResumeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mStopToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem recordToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mRecordToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mStartListeningToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mStartRecordingToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mAllowOverwriteToolStripMenuItem;
@@ -1226,6 +1250,9 @@
private System.Windows.Forms.ToolStripMenuItem mShowOnlySelectedSectionToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mWrappingInContentViewToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.ToolStripMenuItem mGoToToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mNextTODOPhraseToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mPreviousTODOPhraseToolStripMenuItem;
}
}
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -1169,7 +1169,8 @@
mEditRolesToolStripMenuItem.Enabled = mSession.Presentation != null;
mClearRoleToolStripMenuItem.Enabled = mProjectView.CanClearRole;
PhraseDetectionToolStripMenuItem.Enabled = mProjectView.CanApplyPhraseDetection;
- mMarkDefaultCustomClassToolStripMenuItem.Enabled = mProjectView.CanMarkPhrase;
+ // mMarkDefaultCustomClassToolStripMenuItem.Enabled = mProjectView.CanMarkPhrase;
+ mGoToToolStripMenuItem.Enabled = mSession.Presentation != null;
UpdateAudioSelectionBlockMenuItems();
}
@@ -1370,18 +1371,14 @@
mStopToolStripMenuItem.Enabled = mProjectView.CanStop;
// update recording menu items
- recordToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
+ mRecordToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
mStartRecordingToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive;
- if (mProjectView.TransportBar.IsListening)
- mStartListeningToolStripMenuItem.Text = "&Start Recording";
- else if (mProjectView.TransportBar.IsRecorderActive)
+ if (mProjectView.TransportBar.IsRecorderActive)
{
- mStartListeningToolStripMenuItem.Text = "&Start Listening";
mStartListeningToolStripMenuItem.Enabled = false;
}
else
{
- mStartListeningToolStripMenuItem.Text = "&Start Listening";
mStartListeningToolStripMenuItem.Enabled = true;
mStartRecordingToolStripMenuItem.Enabled = true;
}
@@ -1560,5 +1557,15 @@
mSettings.PlayOnNavigate = mPlayOnNavigateToolStripMenuItem.Checked;
}
}
+
+ private void mNextTODOPhraseToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ mProjectView.SelectNextTODOPhrase();
+ }
+
+ private void mPreviousTODOPhraseToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ mProjectView.SelectPreviousTODOPhrase();
+ }
}
}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-13 23:45:09 UTC (rev 3048)
@@ -121,200 +121,10 @@
<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>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="mShowTOCViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+T</value>
- </data>
- <data name="mShowTOCViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowTOCViewToolStripMenuItem.Text" xml:space="preserve">
- <value>Show &TOC view</value>
- </data>
- <data name="mShowMetadataViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+M</value>
- </data>
- <data name="mShowMetadataViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowMetadataViewToolStripMenuItem.Text" xml:space="preserve">
- <value>Show &metadata view</value>
- </data>
- <data name="mShowTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+B</value>
- </data>
- <data name="mShowTransportBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowTransportBarToolStripMenuItem.Text" xml:space="preserve">
- <value>Show transport &bar</value>
- </data>
- <data name="mShowStatusBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+U</value>
- </data>
- <data name="mShowStatusBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowStatusBarToolStripMenuItem.Text" xml:space="preserve">
- <value>Show stat&us bar</value>
- </data>
- <data name="toolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
- <value>232, 6</value>
- </data>
- <data name="mFocusOnTOCViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F6</value>
- </data>
- <data name="mFocusOnTOCViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mFocusOnTOCViewToolStripMenuItem.Text" xml:space="preserve">
- <value>Focus on TO&C view</value>
- </data>
- <data name="mFocusOnStripsViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F7</value>
- </data>
- <data name="mFocusOnStripsViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mFocusOnStripsViewToolStripMenuItem.Text" xml:space="preserve">
- <value>Focus on co&ntent view</value>
- </data>
- <data name="mFocusOnTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F8</value>
- </data>
- <data name="mFocusOnTransportBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mFocusOnTransportBarToolStripMenuItem.Text" xml:space="preserve">
- <value>Focus on tr&ansport bar</value>
- </data>
- <data name="mSynchronizeViewsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+Y</value>
- </data>
- <data name="mSynchronizeViewsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mSynchronizeViewsToolStripMenuItem.Text" xml:space="preserve">
- <value>S&ynchronize views</value>
- </data>
- <data name="toolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
- <value>256, 6</value>
- </data>
- <data name="mShowOnlySelectedSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F5</value>
- </data>
- <data name="mShowOnlySelectedSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowOnlySelectedSectionToolStripMenuItem.Text" xml:space="preserve">
- <value>Show only &selected section</value>
- </data>
- <data name="mWrappingInContentViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+W</value>
- </data>
- <data name="mWrappingInContentViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mWrappingInContentViewToolStripMenuItem.Text" xml:space="preserve">
- <value>&Wrapping in content view</value>
- </data>
- <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
- <value>232, 6</value>
- </data>
- <data name="mShowPeakMeterMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+P</value>
- </data>
- <data name="mShowPeakMeterMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowPeakMeterMenuItem.Text" xml:space="preserve">
- <value>Show &peak meter</value>
- </data>
- <data name="mShowSourceToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+O</value>
- </data>
- <data name="mShowSourceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <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="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="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>
- <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>
- <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.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>
@@ -399,12 +209,6 @@
<data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 6</value>
</data>
- <data name="mOpenRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mOpenRecentProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&Recent projects</value>
- </data>
<data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing">
<value>112, 6</value>
</data>
@@ -414,6 +218,12 @@
<data name="mClearListToolStripMenuItem.Text" xml:space="preserve">
<value>&Clear list</value>
</data>
+ <data name="mOpenRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mOpenRecentProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Recent projects</value>
+ </data>
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 6</value>
</data>
@@ -426,6 +236,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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Z</value>
</data>
@@ -549,6 +365,135 @@
<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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+T</value>
+ </data>
+ <data name="mShowTOCViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mShowTOCViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show &TOC view</value>
+ </data>
+ <data name="mShowMetadataViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+M</value>
+ </data>
+ <data name="mShowMetadataViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mShowMetadataViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show &metadata view</value>
+ </data>
+ <data name="mShowTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+B</value>
+ </data>
+ <data name="mShowTransportBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mShowTransportBarToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show transport &bar</value>
+ </data>
+ <data name="mShowStatusBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+U</value>
+ </data>
+ <data name="mShowStatusBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mShowStatusBarToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show stat&us bar</value>
+ </data>
+ <data name="toolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
+ <value>256, 6</value>
+ </data>
+ <data name="mFocusOnTOCViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F6</value>
+ </data>
+ <data name="mFocusOnTOCViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mFocusOnTOCViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Focus on TO&C view</value>
+ </data>
+ <data name="mFocusOnStripsViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F7</value>
+ </data>
+ <data name="mFocusOnStripsViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mFocusOnStripsViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Focus on co&ntent view</value>
+ </data>
+ <data name="mFocusOnTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F8</value>
+ </data>
+ <data name="mFocusOnTransportBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mFocusOnTransportBarToolStripMenuItem.Text" xml:space="preserve">
+ <value>Focus on tr&ansport bar</value>
+ </data>
+ <data name="mSynchronizeViewsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+Y</value>
+ </data>
+ <data name="mSynchronizeViewsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mSynchronizeViewsToolStripMenuItem.Text" xml:space="preserve">
+ <value>S&ynchronize views</value>
+ </data>
+ <data name="toolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
+ <value>256, 6</value>
+ </data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F5</value>
+ </data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show only &selected section</value>
+ </data>
+ <data name="mWrappingInContentViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+W</value>
+ </data>
+ <data name="mWrappingInContentViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mWrappingInContentViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Wrapping in content view</value>
+ </data>
+ <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
+ <value>256, 6</value>
+ </data>
+ <data name="mShowPeakMeterMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+P</value>
+ </data>
+ <data name="mShowPeakMeterMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mShowPeakMeterMenuItem.Text" xml:space="preserve">
+ <value>Show &peak meter</value>
+ </data>
+ <data name="mShowSourceToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+O</value>
+ </data>
+ <data name="mShowSourceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+H</value>
</data>
@@ -636,6 +581,12 @@
<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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+B</value>
</data>
@@ -693,12 +644,6 @@
<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>
@@ -735,6 +680,12 @@
<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>
@@ -765,12 +716,10 @@
<data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
<value>Mar&k default custom class</value>
</data>
- <data name="InPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 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="InPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>In-ph&rase audio selection</value>
- </data>
<data name="BeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+[</value>
</data>
@@ -801,12 +750,42 @@
<data name="DeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
<value>&Deselect</value>
</data>
- <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="InPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="playToolStripMenuItem.Text" xml:space="preserve">
- <value>&Play</value>
+ <data name="InPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>In-ph&rase audio selection</value>
</data>
+ <data name="mNextTODOPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+F9</value>
+ </data>
+ <data name="mNextTODOPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>257, 22</value>
+ </data>
+ <data name="mNextTODOPhraseToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Next TODO phrase</value>
+ </data>
+ <data name="mPreviousTODOPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Shift+F9</value>
+ </data>
+ <data name="mPreviousTODOPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>257, 22</value>
+ </data>
+ <data name="mPreviousTODOPhraseToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Previous TODO phrase</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="mPlayAllToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Shift+Space</value>
</data>
@@ -825,6 +804,12 @@
<data name="mPlaySelectionToolStripMenuItem.Text" xml:space="preserve">
<value>Play &selection</value>
</data>
+ <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="playToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Play</value>
+ </data>
<data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Space</value>
</data>
@@ -852,12 +837,6 @@
<data name="mStopToolStripMenuItem.Text" xml:space="preserve">
<value>&Stop</value>
</data>
- <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
- </data>
- <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve">
- <value>Fast p&lay</value>
- </data>
<data name="NormalSpeedtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+0</value>
</data>
@@ -897,11 +876,11 @@
<data name="ElapseBacktoolStripMenuItem.Text" xml:space="preserve">
<value>Normal speed with &elapse back</value>
</data>
- <data name="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="PlayPreviewtoolStripMenuItem.Text" xml:space="preserve">
- <value>Pre&view</value>
+ <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve">
+ <value>Fast p&lay</value>
</data>
<data name="PreviewFromtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+P</value>
@@ -924,11 +903,11 @@
<data name="PreviewSelectedAudiotoolStripMenuItem.Text" xml:space="preserve">
<value>Preview &selected</value>
</data>
- <data name="recordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="recordToolStripMenuItem.Text" xml:space="preserve">
- <value>&Record</value>
+ <data name="PlayPreviewtoolStripMenuItem.Text" xml:space="preserve">
+ <value>Pre&view</value>
</data>
<data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+R</value>
@@ -954,15 +933,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="previousSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Alt+Up</value>
</data>
@@ -1026,6 +1005,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="rewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+,</value>
</data>
@@ -1050,6 +1035,12 @@
<data name="fastForwardToolStripMenuItem.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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Alt+F</value>
</data>
@@ -1059,6 +1050,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="mHelpToolStripMenuItem1.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>F1</value>
</data>
@@ -1092,9 +1089,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>
@@ -1119,9 +1149,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>
@@ -1141,7 +1168,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.42651, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.941, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1414,6 +1441,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>
@@ -1675,12 +1705,24 @@
<data name=">>mSynchronizeViewsToolStripMenuItem.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=">>toolStripSeparator8.Name" xml:space="preserve">
+ <value>toolStripSeparator8</value>
+ </data>
+ <data name=">>toolStripSeparator8.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>mShowOnlySelectedSectionToolStripMenuItem.Name" xml:space="preserve">
<value>mShowOnlySelectedSectionToolStripMenuItem</value>
</data>
<data name=">>mShowOnlySelectedSectionToolStripMenuItem.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=">>mWrappingInContentViewToolStripMenuItem.Name" xml:space="preserve">
+ <value>mWrappingInContentViewToolStripMenuItem</value>
+ </data>
+ <data name=">>mWrappingInContentViewToolStripMenuItem.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=">>toolStripSeparator10.Name" xml:space="preserve">
<value>toolStripSeparator10</value>
</data>
@@ -2005,10 +2047,10 @@
<data name=">>PreviewSelectedAudiotoolStripMenuItem.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=">>recordToolStripMenuItem.Name" xml:space="preserve">
- <value>recordToolStripMenuItem</value>
+ <data name=">>mRecordToolStripMenuItem.Name" xml:space="preserve">
+ <value>mRecordToolStripMenuItem</value>
</data>
- <data name=">>recordToolStripMenuItem.Type" xml:space="preserve">
+ <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">
@@ -2149,18 +2191,24 @@
<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=">>mWrappingInContentViewToolStripMenuItem.Name" xml:space="preserve">
- <value>mWrappingInContentViewToolStripMenuItem</value>
+ <data name=">>mGoToToolStripMenuItem.Name" xml:space="preserve">
+ <value>mGoToToolStripMenuItem</value>
</data>
- <data name=">>mWrappingInContentViewToolStripMenuItem.Type" xml:space="preserve">
+ <data name=">>mGoToToolStripMenuItem.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=">>toolStripSeparator8.Name" xml:space="preserve">
- <value>toolStripSeparator8</value>
+ <data name=">>mNextTODOPhraseToolStripMenuItem.Name" xml:space="preserve">
+ <value>mNextTODOPhraseToolStripMenuItem</value>
</data>
- <data name=">>toolStripSeparator8.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>mNextTODOPhraseToolStripMenuItem.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=">>mPreviousTODOPhraseToolStripMenuItem.Name" xml:space="preserve">
+ <value>mPreviousTODOPhraseToolStripMenuItem</value>
+ </data>
+ <data name=">>mPreviousTODOPhraseToolStripMenuItem.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/ProjectView/Block.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -48,11 +48,11 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.HotPink;
this.Controls.Add(this.mLabel);
- this.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+ this.Margin = new System.Windows.Forms.Padding(0, 0, 3, 3);
this.Name = "Block";
this.Size = new System.Drawing.Size(104, 104);
+ this.Click += new System.EventHandler(this.Block_Click);
this.Enter += new System.EventHandler(this.Block_Enter);
- this.Click += new System.EventHandler(this.Block_Click);
this.ResumeLayout(false);
this.PerformLayout();
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -50,8 +50,10 @@
mClipboard = null;
mTabbingTimer = null;
- mMarkRole = EmptyNode.Kind.Custom;
- mMarkCustomRole = Localizer.Message("default_custom_class_name");
+ // mMarkRole = EmptyNode.Kind.Custom;
+ // mMarkCustomRole = Localizer.Message("default_custom_class_name");
+ mMarkRole = EmptyNode.Kind.TODO;
+ mMarkCustomRole = "";
}
@@ -1355,6 +1357,16 @@
mPanelInfoLabelButton.Size = new Size(1, 1);
mPanelInfoLabelButton.Text = "";
}
+
+ public void SelectNextTODOPhrase()
+ {
+ mStripsView.SelectNextTODONode();
+ }
+
+ public void SelectPreviousTODOPhrase()
+ {
+ mStripsView.SelectPrecedingTODONode();
+ }
}
public class ImportingFileEventArgs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -392,6 +392,9 @@
if (w > MinimumSize.Width) MinimumSize = new Size(w, MinimumSize.Height);
}
+ /// <summary>
+ /// Wrap or unwrap strip contents.
+ /// </summary>
public void WrapToWidth(int width, bool wrap)
{
if (wrap)
@@ -400,7 +403,7 @@
Width = width;
mBlocksPanel.WrapContents = true;
mBlocksPanel.Width = width;
- Height = mBlocksPanel.Height;
+ Height = Padding.Top + mLabel.Height + mLabel.Margin.Bottom + mBlocksPanel.Height + Padding.Bottom;
}
else
{
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -631,8 +631,8 @@
mShortcutKeys[Keys.Control | Keys.PageUp] = SelectPrecedingPageNode;
mShortcutKeys[Keys.F4] = SelectNextSpecialRoleNode ;
mShortcutKeys[ Keys.Shift | Keys.F4] = SelectPreviousSpecialRoleNode ;
- mShortcutKeys[Keys.Control | Keys.F9 ] = SelectNextTo_DoNode ;
- mShortcutKeys[Keys.Control | Keys.Shift | Keys.F9] = SelectPreviousTo_DoNode;
+ //mShortcutKeys[Keys.Control | Keys.F9 ] = SelectNextTo_DoNode ;
+ //mShortcutKeys[Keys.Control | Keys.Shift | Keys.F9] = SelectPreviousTo_DoNode;
mShortcutKeys[Keys.Up] = SelectPreviousStrip;
mShortcutKeys[Keys.Down] = SelectNextStrip;
@@ -916,46 +916,62 @@
/// <summary>
- /// Select previous to do node in contents view
- /// </summary>
- /// <returns></returns>
- public bool SelectPreviousTo_DoNode ()
+ /// Select previous to do node in contents view
+ /// </summary>
+ public void SelectNextTODONode()
{
- if (mView.SelectedNodeAs<EmptyNode>() != null)
+ if (mView.SelectedNodeAs<ObiNode>() != null)
{
- for (ObiNode n = mView.SelectedNodeAs<EmptyNode>().PrecedingNode; n != null; n = n.PrecedingNode)
+ 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).NodeKind == EmptyNode.Kind.TODO)
{
mView.Selection = new NodeSelection(n, this);
- return true;
+ return;
}
}
- } // check end for empty node
- return false;
+ }
+ for (ObiNode n = mView.Presentation.RootNode.FirstLeaf; n != null; n = n.FollowingNode)
+ {
+ if (n is EmptyNode && ((EmptyNode)n).NodeKind == EmptyNode.Kind.TODO)
+ {
+ mView.Selection = new NodeSelection(n, this);
+ return;
+ }
+ }
}
/// <summary>
- /// Select next To_Do node in contents view
- /// </summary>
- /// <returns></returns>
- public bool SelectNextTo_DoNode ()
+ /// Select previous to do node in contents view
+ /// </summary>
+ public void SelectPrecedingTODONode()
{
- if (mView.SelectedNodeAs<EmptyNode>() != null)
+ if (mView.SelectedNodeAs<ObiNode>() != null)
{
- for (ObiNode n = mView.SelectedNodeAs<EmptyNode>().FollowingNode; n != null; n = n.FollowingNode)
+ 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).NodeKind == EmptyNode.Kind.TODO)
{
mView.Selection = new NodeSelection(n, this);
- return true;
+ return;
}
}
- }// check ends for empty node
- return false;
+ }
+ for (ObiNode n = mView.Presentation.RootNode.LastLeaf; n != null; n = n.PrecedingNode)
+ {
+ if (n is EmptyNode && ((EmptyNode)n).NodeKind == EmptyNode.Kind.TODO)
+ {
+ mView.Selection = new NodeSelection(n, this);
+ return;
+ }
+ }
}
+
+
+
+
private bool NavigateNextPage()
{
mView.TransportBar.NextPage();
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-13 10:27:15 UTC (rev 3047)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-13 23:45:09 UTC (rev 3048)
@@ -30,6 +30,7 @@
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)
private int mRecordingInitPhraseIndex; // Phrase child in which we are recording
private bool mIsSelectionMarked = false; // this should probably go I think
@@ -308,6 +309,7 @@
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(); });
}
}
@@ -717,7 +719,8 @@
delegate(object sender, Obi.Events.Audio.Recorder.PhraseEventArgs e)
{
mView.Presentation.changed -= new EventHandler<urakawa.events.DataModelChangedEventArgs>(Presentation_Changed);
- PhraseNode phrase = mView.Presentation.CreatePhraseNode(e.Audio);
+ PhraseNode phrase = mView.Presentation.CreatePhraseNode(e.Audio);
+ mRecordingPhrase = phrase;
if (e.PhraseIndex > 0)
{
mView.Presentation.getUndoRedoManager().execute(new Commands.Node.AddNode(mView, phrase, mRecordingSection,
@@ -743,6 +746,7 @@
{
PhraseNode phrase = (PhraseNode)mRecordingSection.PhraseChild(e.PhraseIndex + mRecordingInitPhraseIndex);
phrase.SignalAudioChanged(this, e.Audio);
+ mRecordingPhrase = null;
});
mRecordingSession.FinishingPage += new Events.Audio.Recorder.FinishingPageHandler(
delegate(object sender, Obi.Events.Audio.Recorder.PhraseEventArgs e)
@@ -1083,12 +1087,12 @@
}
}
- private void SetPageNumberWhileRecording( Obi.Events.Audio.Recorder.PhraseEventArgs e )
+ private void SetPageNumberWhileRecording(Obi.Events.Audio.Recorder.PhraseEventArgs e)
{
- int PageNumbe...
[truncated message content] |
|
From: <ju...@us...> - 2008-05-13 10:27:19
|
Revision: 3047
http://urakawa.svn.sourceforge.net/urakawa/?rev=3047&view=rev
Author: julienq
Date: 2008-05-13 03:27:15 -0700 (Tue, 13 May 2008)
Log Message:
-----------
Rudimentary strip wrapping; needs fine tuning.
New preferences file will be created.
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/Settings.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-12 22:44:57 UTC (rev 3046)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-13 10:27:15 UTC (rev 3047)
@@ -73,6 +73,7 @@
this.mFocusOnStripsViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mFocusOnTransportBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mSynchronizeViewsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mShowOnlySelectedSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.mShowPeakMeterMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mShowSourceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -153,7 +154,8 @@
this.mStatusStrip = new System.Windows.Forms.StatusStrip();
this.mStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.mProjectView = new Obi.ProjectView.ProjectView();
- this.mShowOnlySelectedSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mWrappingInContentViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.mMenuStrip.SuspendLayout();
this.mStatusStrip.SuspendLayout();
this.SuspendLayout();
@@ -406,7 +408,9 @@
this.mFocusOnStripsViewToolStripMenuItem,
this.mFocusOnTransportBarToolStripMenuItem,
this.mSynchronizeViewsToolStripMenuItem,
+ this.toolStripSeparator8,
this.mShowOnlySelectedSectionToolStripMenuItem,
+ this.mWrappingInContentViewToolStripMenuItem,
this.toolStripSeparator10,
this.mShowPeakMeterMenuItem,
this.mShowSourceToolStripMenuItem});
@@ -481,6 +485,13 @@
resources.ApplyResources(this.mSynchronizeViewsToolStripMenuItem, "mSynchronizeViewsToolStripMenuItem");
this.mSynchronizeViewsToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mSynchronizeViewsToolStripMenuItem_CheckedChanged);
//
+ // mShowOnlySelectedSectionToolStripMenuItem
+ //
+ this.mShowOnlySelectedSectionToolStripMenuItem.CheckOnClick = true;
+ this.mShowOnlySelectedSectionToolStripMenuItem.Name = "mShowOnlySelectedSectionToolStripMenuItem";
+ resources.ApplyResources(this.mShowOnlySelectedSectionToolStripMenuItem, "mShowOnlySelectedSectionToolStripMenuItem");
+ this.mShowOnlySelectedSectionToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowOnlySelectedSectionToolStripMenuItem_CheckedChanged);
+ //
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
@@ -1047,13 +1058,20 @@
this.mProjectView.TOCViewVisible = true;
this.mProjectView.TransportBarVisible = false;
//
- // mShowOnlySelectedSectionToolStripMenuItem
+ // mWrappingInContentViewToolStripMenuItem
//
- this.mShowOnlySelectedSectionToolStripMenuItem.CheckOnClick = true;
- this.mShowOnlySelectedSectionToolStripMenuItem.Name = "mShowOnlySelectedSectionToolStripMenuItem";
- resources.ApplyResources(this.mShowOnlySelectedSectionToolStripMenuItem, "mShowOnlySelectedSectionToolStripMenuItem");
- this.mShowOnlySelectedSectionToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowOnlySelectedSectionToolStripMenuItem_CheckedChanged);
+ this.mWrappingInContentViewToolStripMenuItem.Checked = true;
+ this.mWrappingInContentViewToolStripMenuItem.CheckOnClick = true;
+ this.mWrappingInContentViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.mWrappingInContentViewToolStripMenuItem.Name = "mWrappingInContentViewToolStripMenuItem";
+ resources.ApplyResources(this.mWrappingInContentViewToolStripMenuItem, "mWrappingInContentViewToolStripMenuItem");
+ this.mWrappingInContentViewToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mWrappingInContentViewToolStripMenuItem_CheckedChanged);
//
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
+ //
// ObiForm
//
resources.ApplyResources(this, "$this");
@@ -1206,6 +1224,8 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
private System.Windows.Forms.ToolStripMenuItem mPlayOnNavigateToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mShowOnlySelectedSectionToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mWrappingInContentViewToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
}
}
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-12 22:44:57 UTC (rev 3046)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-13 10:27:15 UTC (rev 3047)
@@ -336,9 +336,11 @@
mShowTransportBarToolStripMenuItem.Enabled = mSession.HasProject;
mShowStatusBarToolStripMenuItem.Enabled = true;
mFocusOnTOCViewToolStripMenuItem.Enabled = mProjectView.CanFocusOnTOCView;
- mFocusOnStripsViewToolStripMenuItem.Enabled = mSession.HasProject;
+ mFocusOnStripsViewToolStripMenuItem.Enabled = mProjectView.CanFocusOnContentView;
+ mFocusOnTransportBarToolStripMenuItem.Enabled = mSession.HasProject;
mSynchronizeViewsToolStripMenuItem.Enabled = mSession.HasProject;
mShowOnlySelectedSectionToolStripMenuItem.Enabled = mProjectView.CanShowOnlySelectedSection;
+ mWrappingInContentViewToolStripMenuItem.Enabled = mSession.HasProject;
mShowPeakMeterMenuItem.Enabled = mSession.HasProject;
mShowSourceToolStripMenuItem.Enabled = mSession.HasProject;
}
@@ -383,6 +385,7 @@
SynchronizeViews = mSynchronizeViewsToolStripMenuItem.Checked;
}
+ // Check/uncheck "Show only selected section"
private void mShowOnlySelectedSectionToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
{
if (mProjectView.CanShowOnlySelectedSection)
@@ -391,6 +394,11 @@
}
}
+ // Check/uncheck "Wrapping in content view"
+ private void mWrappingInContentViewToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
+ {
+ WrapStrips = mWrappingInContentViewToolStripMenuItem.Checked;
+ }
private void mShowSourceToolStripMenuItem_Click(object sender, EventArgs e) { ShowSource(); }
@@ -674,6 +682,17 @@
Localizer.Message("obi");
}
+ // Set wrapping strips
+ private bool WrapStrips
+ {
+ set
+ {
+ mSettings.WrapStrips = value;
+ mWrappingInContentViewToolStripMenuItem.Checked = value;
+ mProjectView.WrapStrips = value;
+ }
+ }
+
#region Event handlers
private void ProjectView_SelectionChanged(object sender, EventArgs e) { UpdateMenus(); }
@@ -902,8 +921,8 @@
}
// Synchronize views
SynchronizeViews = mSettings.SynchronizeViews;
+ WrapStrips = mSettings.WrapStrips;
// Transport bar settings
- // TODO: first two items should have a preference setting
mProjectView.TransportBar.PreviewDuration = mSettings.PreviewDuration;
mProjectView.TransportBar.PlayIfNoSelection = mSettings.PlayIfNoSelection;
AllowOverwrite = mSettings.AllowOverwrite;
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-12 22:44:57 UTC (rev 3046)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-13 10:27:15 UTC (rev 3047)
@@ -121,10 +121,200 @@
<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>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="mShowTOCViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+T</value>
+ </data>
+ <data name="mShowTOCViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mShowTOCViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show &TOC view</value>
+ </data>
+ <data name="mShowMetadataViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+M</value>
+ </data>
+ <data name="mShowMetadataViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mShowMetadataViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show &metadata view</value>
+ </data>
+ <data name="mShowTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+B</value>
+ </data>
+ <data name="mShowTransportBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mShowTransportBarToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show transport &bar</value>
+ </data>
+ <data name="mShowStatusBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+U</value>
+ </data>
+ <data name="mShowStatusBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mShowStatusBarToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show stat&us bar</value>
+ </data>
+ <data name="toolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
+ <value>232, 6</value>
+ </data>
+ <data name="mFocusOnTOCViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F6</value>
+ </data>
+ <data name="mFocusOnTOCViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mFocusOnTOCViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Focus on TO&C view</value>
+ </data>
+ <data name="mFocusOnStripsViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F7</value>
+ </data>
+ <data name="mFocusOnStripsViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mFocusOnStripsViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>Focus on co&ntent view</value>
+ </data>
+ <data name="mFocusOnTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F8</value>
+ </data>
+ <data name="mFocusOnTransportBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mFocusOnTransportBarToolStripMenuItem.Text" xml:space="preserve">
+ <value>Focus on tr&ansport bar</value>
+ </data>
+ <data name="mSynchronizeViewsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+Y</value>
+ </data>
+ <data name="mSynchronizeViewsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mSynchronizeViewsToolStripMenuItem.Text" xml:space="preserve">
+ <value>S&ynchronize views</value>
+ </data>
+ <data name="toolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
+ <value>256, 6</value>
+ </data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F5</value>
+ </data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show only &selected section</value>
+ </data>
+ <data name="mWrappingInContentViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+W</value>
+ </data>
+ <data name="mWrappingInContentViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mWrappingInContentViewToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Wrapping in content view</value>
+ </data>
+ <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
+ <value>232, 6</value>
+ </data>
+ <data name="mShowPeakMeterMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+P</value>
+ </data>
+ <data name="mShowPeakMeterMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mShowPeakMeterMenuItem.Text" xml:space="preserve">
+ <value>Show &peak meter</value>
+ </data>
+ <data name="mShowSourceToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+O</value>
+ </data>
+ <data name="mShowSourceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <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="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="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>
+ <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>
+ <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.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>
@@ -209,6 +399,12 @@
<data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 6</value>
</data>
+ <data name="mOpenRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mOpenRecentProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Recent projects</value>
+ </data>
<data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing">
<value>112, 6</value>
</data>
@@ -218,12 +414,6 @@
<data name="mClearListToolStripMenuItem.Text" xml:space="preserve">
<value>&Clear list</value>
</data>
- <data name="mOpenRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mOpenRecentProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&Recent projects</value>
- </data>
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 6</value>
</data>
@@ -236,12 +426,6 @@
<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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Z</value>
</data>
@@ -365,123 +549,6 @@
<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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+T</value>
- </data>
- <data name="mShowTOCViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowTOCViewToolStripMenuItem.Text" xml:space="preserve">
- <value>Show &TOC view</value>
- </data>
- <data name="mShowMetadataViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+M</value>
- </data>
- <data name="mShowMetadataViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowMetadataViewToolStripMenuItem.Text" xml:space="preserve">
- <value>Show &metadata view</value>
- </data>
- <data name="mShowTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+B</value>
- </data>
- <data name="mShowTransportBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowTransportBarToolStripMenuItem.Text" xml:space="preserve">
- <value>Show transport &bar</value>
- </data>
- <data name="mShowStatusBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+U</value>
- </data>
- <data name="mShowStatusBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowStatusBarToolStripMenuItem.Text" xml:space="preserve">
- <value>Show stat&us bar</value>
- </data>
- <data name="toolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
- <value>232, 6</value>
- </data>
- <data name="mFocusOnTOCViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F6</value>
- </data>
- <data name="mFocusOnTOCViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mFocusOnTOCViewToolStripMenuItem.Text" xml:space="preserve">
- <value>Focus on TO&C view</value>
- </data>
- <data name="mFocusOnStripsViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F7</value>
- </data>
- <data name="mFocusOnStripsViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mFocusOnStripsViewToolStripMenuItem.Text" xml:space="preserve">
- <value>Focus on co&ntent view</value>
- </data>
- <data name="mFocusOnTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F8</value>
- </data>
- <data name="mFocusOnTransportBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mFocusOnTransportBarToolStripMenuItem.Text" xml:space="preserve">
- <value>Focus on tr&ansport bar</value>
- </data>
- <data name="mSynchronizeViewsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+Y</value>
- </data>
- <data name="mSynchronizeViewsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mSynchronizeViewsToolStripMenuItem.Text" xml:space="preserve">
- <value>S&ynchronize views</value>
- </data>
- <data name="mShowOnlySelectedSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>F5</value>
- </data>
- <data name="mShowOnlySelectedSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowOnlySelectedSectionToolStripMenuItem.Text" xml:space="preserve">
- <value>Show only &selected section</value>
- </data>
- <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
- <value>232, 6</value>
- </data>
- <data name="mShowPeakMeterMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+P</value>
- </data>
- <data name="mShowPeakMeterMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mShowPeakMeterMenuItem.Text" xml:space="preserve">
- <value>Show &peak meter</value>
- </data>
- <data name="mShowSourceToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+O</value>
- </data>
- <data name="mShowSourceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+H</value>
</data>
@@ -569,12 +636,6 @@
<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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+B</value>
</data>
@@ -632,6 +693,12 @@
<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>
@@ -668,12 +735,6 @@
<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>
@@ -704,6 +765,12 @@
<data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
<value>Mar&k default custom class</value>
</data>
+ <data name="InPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
+ </data>
+ <data name="InPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>In-ph&rase audio selection</value>
+ </data>
<data name="BeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+[</value>
</data>
@@ -734,18 +801,12 @@
<data name="DeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
<value>&Deselect</value>
</data>
- <data name="InPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
+ <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
</data>
- <data name="InPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>In-ph&rase audio selection</value>
+ <data name="playToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Play</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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Shift+Space</value>
</data>
@@ -764,12 +825,6 @@
<data name="mPlaySelectionToolStripMenuItem.Text" xml:space="preserve">
<value>Play &selection</value>
</data>
- <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
- </data>
- <data name="playToolStripMenuItem.Text" xml:space="preserve">
- <value>&Play</value>
- </data>
<data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Space</value>
</data>
@@ -797,6 +852,12 @@
<data name="mStopToolStripMenuItem.Text" xml:space="preserve">
<value>&Stop</value>
</data>
+ <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve">
+ <value>Fast p&lay</value>
+ </data>
<data name="NormalSpeedtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+0</value>
</data>
@@ -836,11 +897,11 @@
<data name="ElapseBacktoolStripMenuItem.Text" xml:space="preserve">
<value>Normal speed with &elapse back</value>
</data>
- <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve">
- <value>Fast p&lay</value>
+ <data name="PlayPreviewtoolStripMenuItem.Text" xml:space="preserve">
+ <value>Pre&view</value>
</data>
<data name="PreviewFromtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+P</value>
@@ -863,11 +924,11 @@
<data name="PreviewSelectedAudiotoolStripMenuItem.Text" xml:space="preserve">
<value>Preview &selected</value>
</data>
- <data name="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="recordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="PlayPreviewtoolStripMenuItem.Text" xml:space="preserve">
- <value>Pre&view</value>
+ <data name="recordToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Record</value>
</data>
<data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+R</value>
@@ -893,15 +954,15 @@
<data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
<value>Allow &overwrite</value>
</data>
- <data name="recordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <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="recordToolStripMenuItem.Text" xml:space="preserve">
- <value>&Record</value>
+ <data name="navigationToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Navigation</value>
</data>
- <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
- <value>169, 6</value>
- </data>
<data name="previousSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Alt+Up</value>
</data>
@@ -965,12 +1026,6 @@
<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="rewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+,</value>
</data>
@@ -995,12 +1050,6 @@
<data name="fastForwardToolStripMenuItem.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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Alt+F</value>
</data>
@@ -1010,12 +1059,6 @@
<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="mHelpToolStripMenuItem1.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>F1</value>
</data>
@@ -1049,43 +1092,9 @@
<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>
- <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>
- <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>
@@ -1110,6 +1119,9 @@
<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>
@@ -1129,7 +1141,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.38705, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.42651, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1663,6 +1675,12 @@
<data name=">>mSynchronizeViewsToolStripMenuItem.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=">>mShowOnlySelectedSectionToolStripMenuItem.Name" xml:space="preserve">
+ <value>mShowOnlySelectedSectionToolStripMenuItem</value>
+ </data>
+ <data name=">>mShowOnlySelectedSectionToolStripMenuItem.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=">>toolStripSeparator10.Name" xml:space="preserve">
<value>toolStripSeparator10</value>
</data>
@@ -2131,12 +2149,18 @@
<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=">>mShowOnlySelectedSectionToolStripMenuItem.Name" xml:space="preserve">
- <value>mShowOnlySelectedSectionToolStripMenuItem</value>
+ <data name=">>mWrappingInContentViewToolStripMenuItem.Name" xml:space="preserve">
+ <value>mWrappingInContentViewToolStripMenuItem</value>
</data>
- <data name=">>mShowOnlySelectedSectionToolStripMenuItem.Type" xml:space="preserve">
+ <data name=">>mWrappingInContentViewToolStripMenuItem.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=">>toolStripSeparator8.Name" xml:space="preserve">
+ <value>toolStripSeparator8</value>
+ </data>
+ <data name=">>toolStripSeparator8.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripSeparator, 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/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-12 22:44:57 UTC (rev 3046)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-13 10:27:15 UTC (rev 3047)
@@ -196,7 +196,8 @@
public bool CanCut { get { return CanDelete; } }
public bool CanDecreaseLevel { get { return mTOCView.CanDecreaseLevel; } }
public bool CanDelete { get { return Selection != null && ( CanRemoveSection || CanRemoveStrip || CanRemoveBlock || CanRemoveAudio || CanRemoveMetadata ) ; } }
- public bool CanFocusOnTOCView { get { return !mTOCView.Focused && mTOCView.Selection == null; } }
+ public bool CanFocusOnContentView { get { return mPresentation != null && !mStripsView.Focused && mStripsView.Selection == null; } }
+ public bool CanFocusOnTOCView { get { return mPresentation != null && !mTOCView.Focused && mTOCView.Selection == null; } }
public bool CanIncreaseLevel { get { return mTOCView.CanIncreaseLevel; } }
public bool CanInsertSection { get { return CanInsertStrip || mTOCView.Selection != null; } }
public bool CanInsertStrip { get { return mStripsView.Selection != null; } }
@@ -650,6 +651,8 @@
}
}
+ public bool WrapStrips { set { mStripsView.WrapStrips = value; } }
+
/// <summary>
/// Select the name field of the selected section and start editing it.
/// </summary>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-12 22:44:57 UTC (rev 3046)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-13 10:27:15 UTC (rev 3047)
@@ -36,10 +36,12 @@
//
this.mBlocksPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.mBlocksPanel.AutoSize = true;
+ this.mBlocksPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.mBlocksPanel.BackColor = System.Drawing.Color.CornflowerBlue;
this.mBlocksPanel.Location = new System.Drawing.Point(3, 25);
this.mBlocksPanel.Name = "mBlocksPanel";
- this.mBlocksPanel.Size = new System.Drawing.Size(284, 104);
+ this.mBlocksPanel.Size = new System.Drawing.Size(0, 0);
this.mBlocksPanel.TabIndex = 0;
this.mBlocksPanel.WrapContents = false;
this.mBlocksPanel.Click += new System.EventHandler(this.Strip_Click);
@@ -67,6 +69,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.BackColor = System.Drawing.Color.LightSkyBlue;
this.Controls.Add(this.mLabel);
this.Controls.Add(this.mBlocksPanel);
@@ -74,9 +77,10 @@
this.Name = "Strip";
this.Padding = new System.Windows.Forms.Padding(3);
this.Size = new System.Drawing.Size(290, 132);
+ this.Click += new System.EventHandler(this.Strip_Click);
this.Enter += new System.EventHandler(this.Strip_Enter);
- this.Click += new System.EventHandler(this.Strip_Click);
this.ResumeLayout(false);
+ this.PerformLayout();
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-12 22:44:57 UTC (rev 3046)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-13 10:27:15 UTC (rev 3047)
@@ -392,7 +392,24 @@
if (w > MinimumSize.Width) MinimumSize = new Size(w, MinimumSize.Height);
}
+ public void WrapToWidth(int width, bool wrap)
+ {
+ if (wrap)
+ {
+ MinimumSize = new Size(width, MinimumSize.Height);
+ Width = width;
+ mBlocksPanel.WrapContents = true;
+ mBlocksPanel.Width = width;
+ Height = mBlocksPanel.Height;
+ }
+ else
+ {
+ mBlocksPanel.WrapContents = false;
+ UpdateWidth();
+ }
+ }
+
public void FocusStripLabel()
{
mLabel.Focus();
@@ -420,6 +437,5 @@
Thread.Sleep(750);
SetAccessibleName();
}
-
}
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-12 22:44:57 UTC (rev 3046)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-13 10:27:15 UTC (rev 3047)
@@ -24,6 +24,7 @@
private NodeSelection mSelection; // current selection
private ISelectableInStripView mSelectedItem; // the actual item for the selection
private Dictionary<Keys, HandledShortcutKey> mShortcutKeys; // list of all shortcuts
+ private bool mWrapStrips; // wrapping of strips
// cursor stuff
private AudioBlock mPlaybackBlock;
@@ -1170,5 +1171,18 @@
if (c is Strip) c.Visible = ((Strip)c).Node == section;
}
}
+
+ public bool WrapStrips
+ {
+ set
+ {
+ mWrapStrips = value;
+ foreach (Control c in mLayoutPanel.Controls)
+ {
+ Strip strip = c as Strip;
+ if (strip != null) strip.WrapToWidth(Width, mWrapStrips);
+ }
+ }
+ }
}
}
Modified: trunk/urakawa/application/Obi/Obi/Settings.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Settings.cs 2008-05-12 22:44:57 UTC (rev 3046)
+++ trunk/urakawa/application/Obi/Obi/Settings.cs 2008-05-13 10:27:15 UTC (rev 3047)
@@ -37,8 +37,9 @@
public ArrayList RecentProjects; // paths to projects recently opened
public int SampleRate; // sample rate in Hertz
public UserProfile UserProfile; // the user profile
+ public bool WrapStrips; // wrapping in content view
- private static readonly string SETTINGS_FILE_NAME = "obi_settings.xml";
+ private static readonly string SETTINGS_FILE_NAME = "obi_settings_alpha8.xml";
/// <summary>
@@ -67,6 +68,7 @@
settings.PreviewDuration = 1500;
settings.PlayIfNoSelection = true;
settings.PlayOnNavigate = true;
+ settings.WrapStrips = false;
IsolatedStorageFile file = IsolatedStorageFile.GetUserStoreForDomain();
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-12 22:44:59
|
Revision: 3046
http://urakawa.svn.sourceforge.net/urakawa/?rev=3046&view=rev
Author: julienq
Date: 2008-05-12 15:44:57 -0700 (Mon, 12 May 2008)
Log Message:
-----------
Implemented "show only selected section."
Next: wrapping in section strips.
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/StripsView.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-12 20:32:46 UTC (rev 3045)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-12 22:44:57 UTC (rev 3046)
@@ -153,6 +153,7 @@
this.mStatusStrip = new System.Windows.Forms.StatusStrip();
this.mStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.mProjectView = new Obi.ProjectView.ProjectView();
+ this.mShowOnlySelectedSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mMenuStrip.SuspendLayout();
this.mStatusStrip.SuspendLayout();
this.SuspendLayout();
@@ -405,6 +406,7 @@
this.mFocusOnStripsViewToolStripMenuItem,
this.mFocusOnTransportBarToolStripMenuItem,
this.mSynchronizeViewsToolStripMenuItem,
+ this.mShowOnlySelectedSectionToolStripMenuItem,
this.toolStripSeparator10,
this.mShowPeakMeterMenuItem,
this.mShowSourceToolStripMenuItem});
@@ -1045,6 +1047,13 @@
this.mProjectView.TOCViewVisible = true;
this.mProjectView.TransportBarVisible = false;
//
+ // mShowOnlySelectedSectionToolStripMenuItem
+ //
+ this.mShowOnlySelectedSectionToolStripMenuItem.CheckOnClick = true;
+ this.mShowOnlySelectedSectionToolStripMenuItem.Name = "mShowOnlySelectedSectionToolStripMenuItem";
+ resources.ApplyResources(this.mShowOnlySelectedSectionToolStripMenuItem, "mShowOnlySelectedSectionToolStripMenuItem");
+ this.mShowOnlySelectedSectionToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowOnlySelectedSectionToolStripMenuItem_CheckedChanged);
+ //
// ObiForm
//
resources.ApplyResources(this, "$this");
@@ -1196,6 +1205,7 @@
private System.Windows.Forms.ToolStripMenuItem mSectionIsUsedToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
private System.Windows.Forms.ToolStripMenuItem mPlayOnNavigateToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mShowOnlySelectedSectionToolStripMenuItem;
}
}
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-12 20:32:46 UTC (rev 3045)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-12 22:44:57 UTC (rev 3046)
@@ -338,6 +338,7 @@
mFocusOnTOCViewToolStripMenuItem.Enabled = mProjectView.CanFocusOnTOCView;
mFocusOnStripsViewToolStripMenuItem.Enabled = mSession.HasProject;
mSynchronizeViewsToolStripMenuItem.Enabled = mSession.HasProject;
+ mShowOnlySelectedSectionToolStripMenuItem.Enabled = mProjectView.CanShowOnlySelectedSection;
mShowPeakMeterMenuItem.Enabled = mSession.HasProject;
mShowSourceToolStripMenuItem.Enabled = mSession.HasProject;
}
@@ -374,8 +375,7 @@
private void mFocusOnTransportBarToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (mProjectView.TransportBar.Enabled)
- mProjectView.TransportBar.Focus();
+ if (mProjectView.TransportBar.Enabled) mProjectView.TransportBar.Focus();
}
private void mSynchronizeViewsToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
@@ -383,6 +383,15 @@
SynchronizeViews = mSynchronizeViewsToolStripMenuItem.Checked;
}
+ private void mShowOnlySelectedSectionToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
+ {
+ if (mProjectView.CanShowOnlySelectedSection)
+ {
+ mProjectView.ShowOnlySelectedSection = mShowOnlySelectedSectionToolStripMenuItem.Checked;
+ }
+ }
+
+
private void mShowSourceToolStripMenuItem_Click(object sender, EventArgs e) { ShowSource(); }
#endregion
@@ -460,6 +469,7 @@
mSession.Presentation.getUndoRedoManager().commandDone += new EventHandler<urakawa.events.undo.DoneEventArgs>(ObiForm_commandDone);
mSession.Presentation.getUndoRedoManager().commandReDone += new EventHandler<urakawa.events.undo.ReDoneEventArgs>(ObiForm_commandReDone);
mSession.Presentation.getUndoRedoManager().commandUnDone += new EventHandler<urakawa.events.undo.UnDoneEventArgs>(ObiForm_commandUnDone);
+ mShowOnlySelectedSectionToolStripMenuItem.Checked = false;
UpdateCustomClassMenu();
}
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-12 20:32:46 UTC (rev 3045)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-12 22:44:57 UTC (rev 3046)
@@ -121,92 +121,10 @@
<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="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>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="preferencesToolStripMenuItem1.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+F</value>
- </data>
- <data name="preferencesToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
- <value>191, 22</value>
- </data>
- <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="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>
- <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>
- <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.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>
@@ -291,12 +209,6 @@
<data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 6</value>
</data>
- <data name="mOpenRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>259, 22</value>
- </data>
- <data name="mOpenRecentProjectToolStripMenuItem.Text" xml:space="preserve">
- <value>&Recent projects</value>
- </data>
<data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing">
<value>112, 6</value>
</data>
@@ -306,6 +218,12 @@
<data name="mClearListToolStripMenuItem.Text" xml:space="preserve">
<value>&Clear list</value>
</data>
+ <data name="mOpenRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>259, 22</value>
+ </data>
+ <data name="mOpenRecentProjectToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Recent projects</value>
+ </data>
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 6</value>
</data>
@@ -318,6 +236,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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Z</value>
</data>
@@ -441,6 +365,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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Alt+T</value>
</data>
@@ -516,6 +446,15 @@
<data name="mSynchronizeViewsToolStripMenuItem.Text" xml:space="preserve">
<value>S&ynchronize views</value>
</data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>F5</value>
+ </data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="mShowOnlySelectedSectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>Show only &selected section</value>
+ </data>
<data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
<value>232, 6</value>
</data>
@@ -537,6 +476,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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+H</value>
</data>
@@ -624,6 +569,12 @@
<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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+B</value>
</data>
@@ -681,12 +632,6 @@
<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>
@@ -723,6 +668,12 @@
<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>
@@ -753,12 +704,6 @@
<data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
<value>Mar&k default custom class</value>
</data>
- <data name="InPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>253, 22</value>
- </data>
- <data name="InPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
- <value>In-ph&rase audio selection</value>
- </data>
<data name="BeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+[</value>
</data>
@@ -789,12 +734,18 @@
<data name="DeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
<value>&Deselect</value>
</data>
- <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
+ <data name="InPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>253, 22</value>
</data>
- <data name="playToolStripMenuItem.Text" xml:space="preserve">
- <value>&Play</value>
+ <data name="InPhraseSelectionToolStripMenuItem.Text" xml:space="preserve">
+ <value>In-ph&rase audio selection</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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+Shift+Space</value>
</data>
@@ -813,6 +764,12 @@
<data name="mPlaySelectionToolStripMenuItem.Text" xml:space="preserve">
<value>Play &selection</value>
</data>
+ <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="playToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Play</value>
+ </data>
<data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Space</value>
</data>
@@ -840,12 +797,6 @@
<data name="mStopToolStripMenuItem.Text" xml:space="preserve">
<value>&Stop</value>
</data>
- <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>172, 22</value>
- </data>
- <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve">
- <value>Fast p&lay</value>
- </data>
<data name="NormalSpeedtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+0</value>
</data>
@@ -885,11 +836,11 @@
<data name="ElapseBacktoolStripMenuItem.Text" xml:space="preserve">
<value>Normal speed with &elapse back</value>
</data>
- <data name="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="PlayPreviewtoolStripMenuItem.Text" xml:space="preserve">
- <value>Pre&view</value>
+ <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve">
+ <value>Fast p&lay</value>
</data>
<data name="PreviewFromtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+P</value>
@@ -912,11 +863,11 @@
<data name="PreviewSelectedAudiotoolStripMenuItem.Text" xml:space="preserve">
<value>Preview &selected</value>
</data>
- <data name="recordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
- <data name="recordToolStripMenuItem.Text" xml:space="preserve">
- <value>&Record</value>
+ <data name="PlayPreviewtoolStripMenuItem.Text" xml:space="preserve">
+ <value>Pre&view</value>
</data>
<data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+R</value>
@@ -942,15 +893,15 @@
<data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
<value>Allow &overwrite</value>
</data>
+ <data name="recordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>172, 22</value>
+ </data>
+ <data name="recordToolStripMenuItem.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="previousSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Alt+Up</value>
</data>
@@ -1014,6 +965,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="rewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
<value>Ctrl+,</value>
</data>
@@ -1038,6 +995,27 @@
<data name="fastForwardToolStripMenuItem.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.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <value>Ctrl+Alt+F</value>
+ </data>
+ <data name="preferencesToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>191, 22</value>
+ </data>
+ <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="mHelpToolStripMenuItem1.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>F1</value>
</data>
@@ -1071,9 +1049,43 @@
<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>
+ <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>
+ <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>
@@ -1098,9 +1110,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>
@@ -1120,7 +1129,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.22154, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.38705, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -2122,6 +2131,12 @@
<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=">>mShowOnlySelectedSectionToolStripMenuItem.Name" xml:space="preserve">
+ <value>mShowOnlySelectedSectionToolStripMenuItem</value>
+ </data>
+ <data name=">>mShowOnlySelectedSectionToolStripMenuItem.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/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-12 20:32:46 UTC (rev 3045)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-12 22:44:57 UTC (rev 3046)
@@ -14,6 +14,7 @@
private Presentation mPresentation; // presentation
private NodeSelection mSelection; // currently selected node
private Clipboard mClipboard; // the clipboard
+ private bool mShowOnlySelected; // show only selected section
private bool mSynchronizeViews; // synchronize views flag
private ObiForm mForm; // parent form
private bool mTOCViewVisible; // keep track of the TOC view visibility (don't reopen it accidentally)
@@ -218,6 +219,7 @@
public bool CanSetSectionUsedStatus { get { return mTOCView.CanSetSectionUsedStatus; } }
public bool CanSetStripUsedStatus { get { return mStripsView.CanSetStripUsedStatus; } }
public bool CanSetSelectedNodeUsedStatus { get { return CanSetSectionUsedStatus || CanSetBlockUsedStatus || CanSetStripUsedStatus; } }
+ public bool CanShowOnlySelectedSection { get { return SelectedNodeAs<ObiNode>() != null; } }
public bool CanSplitStrip { get { return mStripsView.CanSplitStrip; } }
public bool CanStop { get { return mTransportBar.CanStop; } }
public bool CanApplyPhraseDetection { get { return mPresentation != null && Selection != null && Selection.Node is PhraseNode; } }
@@ -600,6 +602,7 @@
else if (mSelection.Control == mMetadataView) MetadataViewVisible = true;
mSelection.Control.Selection = value;
}
+ UpdateShowOnlySelected(mSelection == null ? false : mShowOnlySelected);
if (SelectionChanged != null) SelectionChanged(this, new EventArgs());
}
}
@@ -626,6 +629,27 @@
}
}
+ public bool ShowOnlySelectedSection
+ {
+ set
+ {
+ mShowOnlySelected = value;
+ UpdateShowOnlySelected(value);
+ }
+ }
+
+ private void UpdateShowOnlySelected(bool showOnly)
+ {
+ if (showOnly)
+ {
+ mStripsView.ShowOnlySelectedSection(SelectedNodeAs<ObiNode>());
+ }
+ else
+ {
+ SynchronizeViews = mSynchronizeViews;
+ }
+ }
+
/// <summary>
/// Select the name field of the selected section and start editing it.
/// </summary>
@@ -657,18 +681,21 @@
set
{
mSynchronizeViews = value;
- if (mSynchronizeViews)
+ if (!mShowOnlySelected || !CanShowOnlySelectedSection)
{
- mTOCView.ResyncViews();
- if (mSelection != null && mSelection.Control == mTOCView)
+ if (mSynchronizeViews)
{
- mStripsView.MakeStripVisibleForSection(SelectedNodeAs<SectionNode>());
+ mTOCView.ResyncViews();
+ if (mSelection != null && mSelection.Control == mTOCView)
+ {
+ mStripsView.MakeStripVisibleForSection(SelectedNodeAs<SectionNode>());
+ }
}
+ else
+ {
+ mStripsView.UnsyncViews();
+ }
}
- else
- {
- mStripsView.UnsyncViews();
- }
}
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-12 20:32:46 UTC (rev 3045)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-12 22:44:57 UTC (rev 3046)
@@ -1160,5 +1160,15 @@
SelectFirstBlockInStrip();
}
}
+
+ public void ShowOnlySelectedSection(ObiNode node)
+ {
+ // Show only one strip
+ SectionNode section = node is SectionNode ? (SectionNode)node : node.AncestorAs<SectionNode>();
+ foreach (Control c in mLayoutPanel.Controls)
+ {
+ if (c is Strip) c.Visible = ((Strip)c).Node == section;
+ }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-12 20:32:51
|
Revision: 3045
http://urakawa.svn.sourceforge.net/urakawa/?rev=3045&view=rev
Author: julienq
Date: 2008-05-12 13:32:46 -0700 (Mon, 12 May 2008)
Log Message:
-----------
Preference changes are committed.
Style update for the new project dialog.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs
trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.Designer.cs
trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.cs
trunk/urakawa/application/Obi/Obi/Obi.csproj
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
trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs
Removed Paths:
-------------
trunk/urakawa/application/Obi/Obi/Dialogs/UserProfile.Designer.cs
trunk/urakawa/application/Obi/Obi/Dialogs/UserProfile.cs
trunk/urakawa/application/Obi/Obi/Dialogs/UserProfile.resx
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs 2008-05-12 07:59:39 UTC (rev 3044)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/NewProject.Designer.cs 2008-05-12 20:32:46 UTC (rev 3045)
@@ -53,6 +53,7 @@
this.mTitleBox.AccessibleName = "Title:";
this.mTitleBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.mTitleBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.mTitleBox.Location = new System.Drawing.Point(73, 13);
this.mTitleBox.Name = "mTitleBox";
this.mTitleBox.Size = new System.Drawing.Size(507, 20);
@@ -73,6 +74,7 @@
this.mFileBox.AccessibleName = "Location:";
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.Name = "mFileBox";
this.mFileBox.Size = new System.Drawing.Size(426, 20);
@@ -82,6 +84,7 @@
// 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.Name = "mSelectButton";
this.mSelectButton.Size = new System.Drawing.Size(75, 25);
@@ -94,6 +97,7 @@
//
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.Name = "mOKButton";
this.mOKButton.Size = new System.Drawing.Size(75, 25);
@@ -106,6 +110,7 @@
//
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.Name = "mCancelButton";
this.mCancelButton.Size = new System.Drawing.Size(75, 25);
@@ -116,9 +121,10 @@
// mAutoTitleCheckBox
//
this.mAutoTitleCheckBox.AutoSize = true;
+ this.mAutoTitleCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.mAutoTitleCheckBox.Location = new System.Drawing.Point(73, 39);
this.mAutoTitleCheckBox.Name = "mAutoTitleCheckBox";
- this.mAutoTitleCheckBox.Size = new System.Drawing.Size(246, 17);
+ this.mAutoTitleCheckBox.Size = new System.Drawing.Size(243, 17);
this.mAutoTitleCheckBox.TabIndex = 2;
this.mAutoTitleCheckBox.Text = "&Automatically create a title section with this title";
this.mAutoTitleCheckBox.UseVisualStyleBackColor = true;
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.Designer.cs 2008-05-12 07:59:39 UTC (rev 3044)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.Designer.cs 2008-05-12 20:32:46 UTC (rev 3045)
@@ -30,58 +30,66 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Preferences));
this.label2 = new System.Windows.Forms.Label();
- this.mDirectoryBox = new System.Windows.Forms.TextBox();
+ this.mDirectoryTextbox = new System.Windows.Forms.TextBox();
this.mBrowseButton = new System.Windows.Forms.Button();
this.mOKButton = new System.Windows.Forms.Button();
this.mCancelButton = new System.Windows.Forms.Button();
this.labelInputDeviceName = new System.Windows.Forms.Label();
- this.comboInputDevice = new System.Windows.Forms.ComboBox();
+ this.mInputDeviceCombo = new System.Windows.Forms.ComboBox();
this.labelOutputDeviceName = new System.Windows.Forms.Label();
- this.comboOutputDevice = new System.Windows.Forms.ComboBox();
+ this.mOutputDeviceCombo = new System.Windows.Forms.ComboBox();
this.mTab = new System.Windows.Forms.TabControl();
this.mProjectTab = new System.Windows.Forms.TabPage();
- this.mTooltipsCheckBox = new System.Windows.Forms.CheckBox();
this.mLastOpenCheckBox = new System.Windows.Forms.CheckBox();
- this.mExportBox = new System.Windows.Forms.TextBox();
+ this.mExportTextbox = new System.Windows.Forms.TextBox();
this.mBrowseExportButton = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.mAudioTab = new System.Windows.Forms.TabPage();
- this.m_txtBitDepth = new System.Windows.Forms.TextBox();
- this.label_BitDepth = new System.Windows.Forms.Label();
- this.m_txtChannels = new System.Windows.Forms.TextBox();
- this.m_txtSamplingRate = new System.Windows.Forms.TextBox();
- this.comboChannels = new System.Windows.Forms.ComboBox();
+ this.mChannelsTextbox = new System.Windows.Forms.TextBox();
+ this.mSampleRateTextbox = new System.Windows.Forms.TextBox();
+ this.mChannelsCombo = new System.Windows.Forms.ComboBox();
this.labelChannels = new System.Windows.Forms.Label();
- this.comboSampleRate = new System.Windows.Forms.ComboBox();
+ this.mSampleRateCombo = new System.Windows.Forms.ComboBox();
this.labelSampleRate = new System.Windows.Forms.Label();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.label6 = new System.Windows.Forms.Label();
+ this.mCultureBox = new System.Windows.Forms.ComboBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.mOrganizationTextbox = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.mFullNameTextbox = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
this.mTab.SuspendLayout();
this.mProjectTab.SuspendLayout();
this.mAudioTab.SuspendLayout();
+ this.tabPage1.SuspendLayout();
this.SuspendLayout();
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(8, 41);
+ this.label2.Location = new System.Drawing.Point(19, 12);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(127, 13);
this.label2.TabIndex = 2;
this.label2.Text = "Default projects &directory:";
//
- // mDirectoryBox
+ // mDirectoryTextbox
//
- this.mDirectoryBox.AccessibleName = "Default projects directory:";
- this.mDirectoryBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ this.mDirectoryTextbox.AccessibleName = "Default projects directory:";
+ this.mDirectoryTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.mDirectoryBox.Location = new System.Drawing.Point(152, 38);
- this.mDirectoryBox.Name = "mDirectoryBox";
- this.mDirectoryBox.Size = new System.Drawing.Size(372, 20);
- this.mDirectoryBox.TabIndex = 3;
+ this.mDirectoryTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mDirectoryTextbox.Location = new System.Drawing.Point(152, 9);
+ this.mDirectoryTextbox.Name = "mDirectoryTextbox";
+ this.mDirectoryTextbox.Size = new System.Drawing.Size(361, 20);
+ this.mDirectoryTextbox.TabIndex = 3;
//
// mBrowseButton
//
this.mBrowseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.mBrowseButton.Location = new System.Drawing.Point(530, 36);
+ this.mBrowseButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mBrowseButton.Location = new System.Drawing.Point(519, 6);
this.mBrowseButton.Name = "mBrowseButton";
this.mBrowseButton.Size = new System.Drawing.Size(75, 25);
this.mBrowseButton.TabIndex = 4;
@@ -93,7 +101,8 @@
//
this.mOKButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.mOKButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.mOKButton.Location = new System.Drawing.Point(243, 466);
+ this.mOKButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mOKButton.Location = new System.Drawing.Point(238, 235);
this.mOKButton.Name = "mOKButton";
this.mOKButton.Size = new System.Drawing.Size(75, 25);
this.mOKButton.TabIndex = 5;
@@ -105,7 +114,8 @@
//
this.mCancelButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.mCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.mCancelButton.Location = new System.Drawing.Point(324, 466);
+ this.mCancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mCancelButton.Location = new System.Drawing.Point(319, 235);
this.mCancelButton.Name = "mCancelButton";
this.mCancelButton.Size = new System.Drawing.Size(75, 25);
this.mCancelButton.TabIndex = 6;
@@ -121,16 +131,19 @@
this.labelInputDeviceName.TabIndex = 7;
this.labelInputDeviceName.Text = "&Input device name:";
//
- // comboInputDevice
+ // mInputDeviceCombo
//
- this.comboInputDevice.AccessibleName = "Input device name:";
- this.comboInputDevice.AllowDrop = true;
- this.comboInputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboInputDevice.FormattingEnabled = true;
- this.comboInputDevice.Location = new System.Drawing.Point(121, 7);
- this.comboInputDevice.Name = "comboInputDevice";
- this.comboInputDevice.Size = new System.Drawing.Size(484, 21);
- this.comboInputDevice.TabIndex = 8;
+ this.mInputDeviceCombo.AccessibleName = "Input device name:";
+ this.mInputDeviceCombo.AllowDrop = true;
+ this.mInputDeviceCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mInputDeviceCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.mInputDeviceCombo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mInputDeviceCombo.FormattingEnabled = true;
+ this.mInputDeviceCombo.Location = new System.Drawing.Point(121, 7);
+ this.mInputDeviceCombo.Name = "mInputDeviceCombo";
+ this.mInputDeviceCombo.Size = new System.Drawing.Size(473, 21);
+ this.mInputDeviceCombo.TabIndex = 8;
//
// labelOutputDeviceName
//
@@ -141,79 +154,78 @@
this.labelOutputDeviceName.TabIndex = 9;
this.labelOutputDeviceName.Text = "O&utput device name:";
//
- // comboOutputDevice
+ // mOutputDeviceCombo
//
- this.comboOutputDevice.AccessibleName = "Output device name:";
- this.comboOutputDevice.AllowDrop = true;
- this.comboOutputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboOutputDevice.FormattingEnabled = true;
- this.comboOutputDevice.Location = new System.Drawing.Point(121, 35);
- this.comboOutputDevice.Name = "comboOutputDevice";
- this.comboOutputDevice.Size = new System.Drawing.Size(484, 21);
- this.comboOutputDevice.TabIndex = 10;
+ this.mOutputDeviceCombo.AccessibleName = "Output device name:";
+ this.mOutputDeviceCombo.AllowDrop = true;
+ this.mOutputDeviceCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mOutputDeviceCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.mOutputDeviceCombo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mOutputDeviceCombo.FormattingEnabled = true;
+ this.mOutputDeviceCombo.Location = new System.Drawing.Point(121, 35);
+ this.mOutputDeviceCombo.Name = "mOutputDeviceCombo";
+ this.mOutputDeviceCombo.Size = new System.Drawing.Size(473, 21);
+ this.mOutputDeviceCombo.TabIndex = 10;
//
// mTab
//
+ this.mTab.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.mTab.Controls.Add(this.mProjectTab);
this.mTab.Controls.Add(this.mAudioTab);
+ this.mTab.Controls.Add(this.tabPage1);
this.mTab.Location = new System.Drawing.Point(12, 13);
this.mTab.Name = "mTab";
this.mTab.SelectedIndex = 0;
- this.mTab.Size = new System.Drawing.Size(619, 446);
+ this.mTab.Size = new System.Drawing.Size(608, 215);
this.mTab.TabIndex = 11;
//
// mProjectTab
//
- this.mProjectTab.Controls.Add(this.mTooltipsCheckBox);
this.mProjectTab.Controls.Add(this.mLastOpenCheckBox);
- this.mProjectTab.Controls.Add(this.mExportBox);
+ this.mProjectTab.Controls.Add(this.mExportTextbox);
this.mProjectTab.Controls.Add(this.mBrowseExportButton);
this.mProjectTab.Controls.Add(this.label3);
this.mProjectTab.Controls.Add(this.label2);
this.mProjectTab.Controls.Add(this.mBrowseButton);
- this.mProjectTab.Controls.Add(this.mDirectoryBox);
+ this.mProjectTab.Controls.Add(this.mDirectoryTextbox);
this.mProjectTab.Location = new System.Drawing.Point(4, 22);
this.mProjectTab.Name = "mProjectTab";
this.mProjectTab.Padding = new System.Windows.Forms.Padding(3);
- this.mProjectTab.Size = new System.Drawing.Size(611, 420);
+ this.mProjectTab.Size = new System.Drawing.Size(600, 189);
this.mProjectTab.TabIndex = 0;
this.mProjectTab.Text = "Project";
this.mProjectTab.UseVisualStyleBackColor = true;
//
- // mTooltipsCheckBox
- //
- this.mTooltipsCheckBox.AutoSize = true;
- this.mTooltipsCheckBox.Location = new System.Drawing.Point(6, 127);
- this.mTooltipsCheckBox.Name = "mTooltipsCheckBox";
- this.mTooltipsCheckBox.Size = new System.Drawing.Size(95, 17);
- this.mTooltipsCheckBox.TabIndex = 9;
- this.mTooltipsCheckBox.Text = "&Enable tooltips";
- this.mTooltipsCheckBox.UseVisualStyleBackColor = true;
- //
// mLastOpenCheckBox
//
this.mLastOpenCheckBox.AutoSize = true;
- this.mLastOpenCheckBox.Location = new System.Drawing.Point(6, 103);
+ this.mLastOpenCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mLastOpenCheckBox.Location = new System.Drawing.Point(6, 66);
this.mLastOpenCheckBox.Name = "mLastOpenCheckBox";
- this.mLastOpenCheckBox.Size = new System.Drawing.Size(191, 17);
+ this.mLastOpenCheckBox.Size = new System.Drawing.Size(188, 17);
this.mLastOpenCheckBox.TabIndex = 8;
this.mLastOpenCheckBox.Text = "Open &last project when starting Obi";
this.mLastOpenCheckBox.UseVisualStyleBackColor = true;
//
- // mExportBox
+ // mExportTextbox
//
- this.mExportBox.AccessibleName = "Default export directory:";
- this.mExportBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ this.mExportTextbox.AccessibleName = "Default export directory:";
+ this.mExportTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.mExportBox.Location = new System.Drawing.Point(152, 69);
- this.mExportBox.Name = "mExportBox";
- this.mExportBox.Size = new System.Drawing.Size(372, 20);
- this.mExportBox.TabIndex = 6;
+ this.mExportTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mExportTextbox.Location = new System.Drawing.Point(152, 40);
+ this.mExportTextbox.Name = "mExportTextbox";
+ this.mExportTextbox.Size = new System.Drawing.Size(361, 20);
+ this.mExportTextbox.TabIndex = 6;
//
// mBrowseExportButton
//
this.mBrowseExportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.mBrowseExportButton.Location = new System.Drawing.Point(530, 67);
+ this.mBrowseExportButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mBrowseExportButton.Location = new System.Drawing.Point(519, 37);
this.mBrowseExportButton.Name = "mBrowseExportButton";
this.mBrowseExportButton.Size = new System.Drawing.Size(75, 25);
this.mBrowseExportButton.TabIndex = 7;
@@ -224,7 +236,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(17, 73);
+ this.label3.Location = new System.Drawing.Point(27, 43);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(119, 13);
this.label3.TabIndex = 5;
@@ -232,75 +244,64 @@
//
// mAudioTab
//
- this.mAudioTab.Controls.Add(this.m_txtBitDepth);
- this.mAudioTab.Controls.Add(this.label_BitDepth);
- this.mAudioTab.Controls.Add(this.m_txtChannels);
- this.mAudioTab.Controls.Add(this.m_txtSamplingRate);
- this.mAudioTab.Controls.Add(this.comboChannels);
+ this.mAudioTab.Controls.Add(this.mChannelsTextbox);
+ this.mAudioTab.Controls.Add(this.mSampleRateTextbox);
+ this.mAudioTab.Controls.Add(this.mChannelsCombo);
this.mAudioTab.Controls.Add(this.labelChannels);
- this.mAudioTab.Controls.Add(this.comboSampleRate);
+ this.mAudioTab.Controls.Add(this.mSampleRateCombo);
this.mAudioTab.Controls.Add(this.labelSampleRate);
- this.mAudioTab.Controls.Add(this.comboOutputDevice);
- this.mAudioTab.Controls.Add(this.comboInputDevice);
+ this.mAudioTab.Controls.Add(this.mOutputDeviceCombo);
+ this.mAudioTab.Controls.Add(this.mInputDeviceCombo);
this.mAudioTab.Controls.Add(this.labelOutputDeviceName);
this.mAudioTab.Controls.Add(this.labelInputDeviceName);
this.mAudioTab.Location = new System.Drawing.Point(4, 22);
this.mAudioTab.Name = "mAudioTab";
this.mAudioTab.Padding = new System.Windows.Forms.Padding(3);
- this.mAudioTab.Size = new System.Drawing.Size(611, 420);
+ this.mAudioTab.Size = new System.Drawing.Size(600, 189);
this.mAudioTab.TabIndex = 1;
this.mAudioTab.Text = "Audio";
this.mAudioTab.UseVisualStyleBackColor = true;
//
- // m_txtBitDepth
+ // mChannelsTextbox
//
- this.m_txtBitDepth.AccessibleName = "Bit Depth (fixed):";
- this.m_txtBitDepth.Location = new System.Drawing.Point(121, 124);
- this.m_txtBitDepth.Name = "m_txtBitDepth";
- this.m_txtBitDepth.ReadOnly = true;
- this.m_txtBitDepth.Size = new System.Drawing.Size(100, 20);
- this.m_txtBitDepth.TabIndex = 20;
+ this.mChannelsTextbox.AccessibleName = "Project channels:";
+ this.mChannelsTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mChannelsTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mChannelsTextbox.Location = new System.Drawing.Point(121, 91);
+ this.mChannelsTextbox.Name = "mChannelsTextbox";
+ this.mChannelsTextbox.ReadOnly = true;
+ this.mChannelsTextbox.Size = new System.Drawing.Size(473, 20);
+ this.mChannelsTextbox.TabIndex = 18;
+ this.mChannelsTextbox.Visible = false;
//
- // label_BitDepth
+ // mSampleRateTextbox
//
- this.label_BitDepth.AutoSize = true;
- this.label_BitDepth.Location = new System.Drawing.Point(30, 124);
- this.label_BitDepth.Name = "label_BitDepth";
- this.label_BitDepth.Size = new System.Drawing.Size(85, 13);
- this.label_BitDepth.TabIndex = 19;
- this.label_BitDepth.Text = "&Bit Depth (fixed):";
+ this.mSampleRateTextbox.AccessibleName = "Project sample rate:";
+ this.mSampleRateTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mSampleRateTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mSampleRateTextbox.Location = new System.Drawing.Point(121, 63);
+ this.mSampleRateTextbox.Name = "mSampleRateTextbox";
+ this.mSampleRateTextbox.ReadOnly = true;
+ this.mSampleRateTextbox.Size = new System.Drawing.Size(473, 20);
+ this.mSampleRateTextbox.TabIndex = 17;
+ this.mSampleRateTextbox.Visible = false;
//
- // m_txtChannels
+ // mChannelsCombo
//
- this.m_txtChannels.AccessibleName = "Project channels:";
- this.m_txtChannels.Location = new System.Drawing.Point(121, 91);
- this.m_txtChannels.Name = "m_txtChannels";
- this.m_txtChannels.ReadOnly = true;
- this.m_txtChannels.Size = new System.Drawing.Size(100, 20);
- this.m_txtChannels.TabIndex = 18;
- this.m_txtChannels.Visible = false;
+ this.mChannelsCombo.AccessibleName = "Default channels:";
+ this.mChannelsCombo.AllowDrop = true;
+ this.mChannelsCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mChannelsCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.mChannelsCombo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mChannelsCombo.FormattingEnabled = true;
+ this.mChannelsCombo.Location = new System.Drawing.Point(121, 91);
+ this.mChannelsCombo.Name = "mChannelsCombo";
+ this.mChannelsCombo.Size = new System.Drawing.Size(473, 21);
+ this.mChannelsCombo.TabIndex = 16;
//
- // m_txtSamplingRate
- //
- this.m_txtSamplingRate.AccessibleName = "Project sample rate:";
- this.m_txtSamplingRate.Location = new System.Drawing.Point(121, 63);
- this.m_txtSamplingRate.Name = "m_txtSamplingRate";
- this.m_txtSamplingRate.ReadOnly = true;
- this.m_txtSamplingRate.Size = new System.Drawing.Size(100, 20);
- this.m_txtSamplingRate.TabIndex = 17;
- this.m_txtSamplingRate.Visible = false;
- //
- // comboChannels
- //
- this.comboChannels.AccessibleName = "Default channels:";
- this.comboChannels.AllowDrop = true;
- this.comboChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboChannels.FormattingEnabled = true;
- this.comboChannels.Location = new System.Drawing.Point(121, 91);
- this.comboChannels.Name = "comboChannels";
- this.comboChannels.Size = new System.Drawing.Size(484, 21);
- this.comboChannels.TabIndex = 16;
- //
// labelChannels
//
this.labelChannels.AutoSize = true;
@@ -310,16 +311,19 @@
this.labelChannels.TabIndex = 15;
this.labelChannels.Text = "Audio &channels:";
//
- // comboSampleRate
+ // mSampleRateCombo
//
- this.comboSampleRate.AccessibleName = "Default sample rate:";
- this.comboSampleRate.AllowDrop = true;
- this.comboSampleRate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboSampleRate.FormattingEnabled = true;
- this.comboSampleRate.Location = new System.Drawing.Point(121, 63);
- this.comboSampleRate.Name = "comboSampleRate";
- this.comboSampleRate.Size = new System.Drawing.Size(484, 21);
- this.comboSampleRate.TabIndex = 14;
+ this.mSampleRateCombo.AccessibleName = "Default sample rate:";
+ this.mSampleRateCombo.AllowDrop = true;
+ this.mSampleRateCombo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mSampleRateCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.mSampleRateCombo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mSampleRateCombo.FormattingEnabled = true;
+ this.mSampleRateCombo.Location = new System.Drawing.Point(121, 63);
+ this.mSampleRateCombo.Name = "mSampleRateCombo";
+ this.mSampleRateCombo.Size = new System.Drawing.Size(473, 21);
+ this.mSampleRateCombo.TabIndex = 14;
//
// labelSampleRate
//
@@ -330,13 +334,100 @@
this.labelSampleRate.TabIndex = 13;
this.labelSampleRate.Text = "&Sample rate:";
//
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.label6);
+ this.tabPage1.Controls.Add(this.mCultureBox);
+ this.tabPage1.Controls.Add(this.label5);
+ this.tabPage1.Controls.Add(this.mOrganizationTextbox);
+ this.tabPage1.Controls.Add(this.label4);
+ this.tabPage1.Controls.Add(this.mFullNameTextbox);
+ this.tabPage1.Controls.Add(this.label1);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(600, 189);
+ this.tabPage1.TabIndex = 2;
+ this.tabPage1.Text = "User profile";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(17, 118);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(0, 13);
+ this.label6.TabIndex = 7;
+ //
+ // mCultureBox
+ //
+ this.mCultureBox.AccessibleName = "Language:";
+ this.mCultureBox.AllowDrop = true;
+ this.mCultureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mCultureBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.mCultureBox.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.mCultureBox.FormattingEnabled = true;
+ this.mCultureBox.Location = new System.Drawing.Point(81, 57);
+ this.mCultureBox.Name = "mCultureBox";
+ this.mCultureBox.Size = new System.Drawing.Size(513, 21);
+ this.mCultureBox.Sorted = true;
+ this.mCultureBox.TabIndex = 6;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(17, 60);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(58, 13);
+ this.label5.TabIndex = 4;
+ this.label5.Text = "&Language:";
+ //
+ // mOrganizationTextbox
+ //
+ this.mOrganizationTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mOrganizationTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mOrganizationTextbox.Location = new System.Drawing.Point(81, 32);
+ this.mOrganizationTextbox.Name = "mOrganizationTextbox";
+ this.mOrganizationTextbox.Size = new System.Drawing.Size(513, 20);
+ this.mOrganizationTextbox.TabIndex = 3;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(6, 34);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(69, 13);
+ this.label4.TabIndex = 2;
+ this.label4.Text = "&Organization:";
+ //
+ // mFullNameTextbox
+ //
+ this.mFullNameTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.mFullNameTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.mFullNameTextbox.Location = new System.Drawing.Point(81, 6);
+ this.mFullNameTextbox.Name = "mFullNameTextbox";
+ this.mFullNameTextbox.Size = new System.Drawing.Size(513, 20);
+ this.mFullNameTextbox.TabIndex = 1;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(20, 8);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(55, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Full &name:";
+ //
// Preferences
//
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(643, 504);
+ this.ClientSize = new System.Drawing.Size(632, 273);
this.Controls.Add(this.mTab);
this.Controls.Add(this.mCancelButton);
this.Controls.Add(this.mOKButton);
@@ -344,12 +435,13 @@
this.MinimumSize = new System.Drawing.Size(8, 173);
this.Name = "Preferences";
this.Text = "Edit preferences";
- this.Load += new System.EventHandler(this.Preferences_Load);
this.mTab.ResumeLayout(false);
this.mProjectTab.ResumeLayout(false);
this.mProjectTab.PerformLayout();
this.mAudioTab.ResumeLayout(false);
this.mAudioTab.PerformLayout();
+ this.tabPage1.ResumeLayout(false);
+ this.tabPage1.PerformLayout();
this.ResumeLayout(false);
}
@@ -357,29 +449,34 @@
#endregion
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox mDirectoryBox;
+ private System.Windows.Forms.TextBox mDirectoryTextbox;
private System.Windows.Forms.Button mBrowseButton;
private System.Windows.Forms.Button mOKButton;
private System.Windows.Forms.Button mCancelButton;
private System.Windows.Forms.Label labelInputDeviceName;
- private System.Windows.Forms.ComboBox comboInputDevice;
+ private System.Windows.Forms.ComboBox mInputDeviceCombo;
private System.Windows.Forms.Label labelOutputDeviceName;
- private System.Windows.Forms.ComboBox comboOutputDevice;
+ private System.Windows.Forms.ComboBox mOutputDeviceCombo;
private System.Windows.Forms.TabControl mTab;
private System.Windows.Forms.TabPage mProjectTab;
private System.Windows.Forms.TabPage mAudioTab;
private System.Windows.Forms.Label labelSampleRate;
- private System.Windows.Forms.ComboBox comboSampleRate;
- private System.Windows.Forms.ComboBox comboChannels;
+ private System.Windows.Forms.ComboBox mSampleRateCombo;
+ private System.Windows.Forms.ComboBox mChannelsCombo;
private System.Windows.Forms.Label labelChannels;
private System.Windows.Forms.CheckBox mLastOpenCheckBox;
- private System.Windows.Forms.TextBox mExportBox;
+ private System.Windows.Forms.TextBox mExportTextbox;
private System.Windows.Forms.Button mBrowseExportButton;
private System.Windows.Forms.Label label3;
- private System.Windows.Forms.CheckBox mTooltipsCheckBox;
- private System.Windows.Forms.TextBox m_txtChannels;
- private System.Windows.Forms.TextBox m_txtSamplingRate;
- private System.Windows.Forms.Label label_BitDepth;
- private System.Windows.Forms.TextBox m_txtBitDepth;
+ private System.Windows.Forms.TextBox mChannelsTextbox;
+ private System.Windows.Forms.TextBox mSampleRateTextbox;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox mFullNameTextbox;
+ private System.Windows.Forms.TextBox mOrganizationTextbox;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.ComboBox mCultureBox;
+ private System.Windows.Forms.Label label6;
}
}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.cs 2008-05-12 07:59:39 UTC (rev 3044)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.cs 2008-05-12 20:32:46 UTC (rev 3045)
@@ -3,6 +3,7 @@
using System.ComponentModel;
using System.Data;
using System.Drawing;
+using System.Globalization;
using System.Text;
using System.Windows.Forms;
using System.Collections;
@@ -13,208 +14,161 @@
{
public partial class Preferences : Form
{
- private string mIdTemplate; // identifier template
- private string mDefaultXUKDirectory; // default project directory
- private string mDefaultDAISYDirectory; // default export directory
- private bool mOpenLastProject; // automatically open last project
- private bool mEnableTooltips; // enable/disable tooltips
- private InputDevice mInputDevice; // preferred input device
- private OutputDevice mOutputDevice; // preferred output device
- private int mAudioChannels; // preferred number of audio channels
- private int mSampleRate; // preferred sample rate
- private int mBitDepth; // preferred bit depth
- private bool mCanChangeAudioSettings; // if the settings come from the project they cannot change
- private Presentation mPresentation; // presentation of active project
+ private ObiForm mForm; // parent form
+ private Settings mSettings; // the settings to modify
+ private bool mCanChangeAudioSettings; // if the settings come from the project they cannot change
+ private Presentation mPresentation; // current presentation (may be null)
+ private ProjectView.TransportBar mTransportBar; // application transport bar
- private Audio.AudioPlayer mPlayer; // audio player
- private Audio.AudioRecorder mRecorder; // Recorder instance
/// <summary>
/// Initialize the preferences with the user settings.
/// </summary>
- public Preferences(Settings settings, Presentation presentation, ProjectView.TransportBar transportbar)
+ public Preferences(ObiForm form, Settings settings, Presentation presentation, ProjectView.TransportBar transportbar)
{
InitializeComponent();
- mDefaultXUKDirectory = settings.DefaultPath;
- mDefaultDAISYDirectory = settings.DefaultExportPath;
- mDirectoryBox.Text = mDefaultXUKDirectory;
- mExportBox.Text = mDefaultDAISYDirectory;
- mLastOpenCheckBox.Checked = settings.OpenLastProject;
- mTooltipsCheckBox.Checked = settings.EnableTooltips;
- mPlayer = transportbar.AudioPlayer;
- mRecorder = transportbar.Recorder;
- mInputDevice = mRecorder.InputDevice;
- mOutputDevice = mPlayer.OutputDevice;
+ mForm = form;
+ mSettings = settings;
mPresentation = presentation;
+ mTransportBar = transportbar;
+ InitializeProjectTab();
+ InitializeAudioTab();
+ InitializeProfileTab();
+ }
- if (presentation != null )
- {
- mSampleRate = (int) presentation.DataManager.getDefaultPCMFormat ().getSampleRate () ;
- mAudioChannels = presentation.DataManager.getDefaultPCMFormat ().getNumberOfChannels () ;
- mBitDepth = presentation.DataManager.getDefaultPCMFormat().getBitDepth() ;
+ // Initialize the project tab
+ private void InitializeProjectTab()
+ {
+ mDirectoryTextbox.Text = mSettings.DefaultPath;
+ mExportTextbox.Text = mSettings.DefaultExportPath;
+ mLastOpenCheckBox.Checked = mSettings.OpenLastProject;
+ }
- // do not allow change in audio properties if project contains any audio
- if ( presentation.getMediaDataManager().getListOfMediaData().Count > 0 )
- mCanChangeAudioSettings = false ;
- else
- mCanChangeAudioSettings = true ;
+ // Initialize audio tab
+ private void InitializeAudioTab()
+ {
+ AudioRecorder recorder = mTransportBar.Recorder;
+ mInputDeviceCombo.DataSource = recorder.InputDevices;
+ mInputDeviceCombo.SelectedIndex = recorder.InputDevices.IndexOf(recorder.InputDevice);
+
+ AudioPlayer player = mTransportBar.AudioPlayer;
+ mOutputDeviceCombo.DataSource = player.OutputDevices;
+ mOutputDeviceCombo.SelectedIndex = player.OutputDevices.IndexOf(player.OutputDevice);
+
+ int sampleRate;
+ int audioChannels;
+ if (mPresentation != null)
+ {
+ sampleRate = (int)mPresentation.DataManager.getDefaultPCMFormat().getSampleRate();
+ audioChannels = mPresentation.DataManager.getDefaultPCMFormat().getNumberOfChannels();
+ mCanChangeAudioSettings = mPresentation.getMediaDataManager().getListOfMediaData().Count == 0;
}
else
{
- mSampleRate = settings.SampleRate;
- mAudioChannels = settings.AudioChannels;
- mBitDepth = settings.BitDepth;
+ sampleRate = mSettings.SampleRate;
+ audioChannels = mSettings.AudioChannels;
mCanChangeAudioSettings = true;
}
+ ArrayList sampleRates = new ArrayList();
+ // TODO: replace this with a list obtained from the player or the device
+ sampleRates.Add("11025");
+ sampleRates.Add("22050");
+ sampleRates.Add("44100");
+ sampleRates.Add("48000");
+ mSampleRateCombo.DataSource = sampleRates;
+ mSampleRateCombo.SelectedIndex = sampleRates.IndexOf(sampleRate.ToString());
+ mSampleRateCombo.Visible = mCanChangeAudioSettings;
+ mSampleRateTextbox.Text = sampleRate.ToString();
+ mSampleRateTextbox.Visible = !mCanChangeAudioSettings;
+ ArrayList channels = new ArrayList();
+ channels.Add(Localizer.Message("mono"));
+ channels.Add(Localizer.Message("stereo"));
+ mChannelsCombo.DataSource = channels;
+ mChannelsCombo.SelectedIndex = channels.IndexOf(Localizer.Message(audioChannels == 1 ? "mono" : "stereo"));
+ mChannelsCombo.Visible = mCanChangeAudioSettings;
+ mChannelsTextbox.Text = Localizer.Message(audioChannels == 1 ? "mono" : "stereo");
+ mChannelsTextbox.Visible = !mCanChangeAudioSettings;
}
+ // Initialize user profile preferences
+ private void InitializeProfileTab()
+ {
+ mFullNameTextbox.Text = mSettings.UserProfile.Name;
+ mOrganizationTextbox.Text = mSettings.UserProfile.Organization;
+ mCultureBox.Items.AddRange(CultureInfo.GetCultures(CultureTypes.AllCultures));
+ mCultureBox.SelectedItem = mSettings.UserProfile.Culture;
+ }
/// <summary>
- /// Current number of audio channels.
- /// </summary>
- public int AudioChannels { get { return mAudioChannels; } }
-
- /// <summary>
- /// Current bit depth.
- /// </summary>
- public int BitDepth { get { return mBitDepth; } }
-
- public bool CanChangeAudioSettings { get {return mCanChangeAudioSettings; } }
-
- /// <summary>
- /// Default directory for exported DAISY books
- /// </summary>
- public string DefaultDAISYDirectory { get { return mDefaultDAISYDirectory; } }
-
- /// <summary>
- /// Default directory for new projects
- /// </summary>
- public string DefaultXUKDirectory { get { return mDefaultXUKDirectory; } }
-
- /// <summary>
- /// Enable or disable tooltips.
- /// </summary>
- public bool EnableTooltips { get { return mEnableTooltips; } }
-
- /// <summary>
- /// Identifier template for new projects
- /// </summary>
- public string IdTemplate { get { return mIdTemplate; } }
-
- /// <summary>
- /// The current input device.
- /// </summary>
- public InputDevice InputDevice { get { return mInputDevice; } }
-
- /// <summary>
- /// Automatically open last open project on startup.
- /// </summary>
- public bool OpenLastProject { get { return mOpenLastProject; } }
-
- /// <summary>
- /// The current output device.
- /// </summary>
- public OutputDevice OutputDevice { get { return mOutputDevice; } }
-
- /// <summary>
- /// Current sample rate.
- /// </summary>
- public int SampleRate { get { return mSampleRate; } }
-
- /// <summary>
/// Browse for a project directory.
/// </summary>
private void mBrowseButton_Click(object sender, EventArgs e)
{
- FolderBrowserDialog dialog = new FolderBrowserDialog();
- dialog.SelectedPath = mDefaultXUKDirectory;
- dialog.Description = Localizer.Message("default_directory_browser");
- if (dialog.ShowDialog() == DialogResult.OK)
- {
- mDefaultXUKDirectory = dialog.SelectedPath;
- mDirectoryBox.Text = mDefaultXUKDirectory;
- }
+ SelectFolder(mSettings.DefaultPath, "default_directory_browser", mDirectoryTextbox);
}
-
/// <summary>
/// Browse for the export directory.
/// </summary>
private void mBrowseExportButton_Click(object sender, EventArgs e)
{
+ SelectFolder(mSettings.DefaultExportPath, "export_directory_browser", mExportTextbox);
+ }
+
+ private void SelectFolder(string path, string description, TextBox textBox)
+ {
FolderBrowserDialog dialog = new FolderBrowserDialog();
- dialog.SelectedPath = mDefaultXUKDirectory;
- dialog.Description = Localizer.Message("export_directory_browser");
- if (dialog.ShowDialog() == DialogResult.OK)
- {
- mDefaultDAISYDirectory = dialog.SelectedPath;
- mExportBox.Text = mDefaultDAISYDirectory;
- }
+ dialog.SelectedPath = path;
+ dialog.Description = Localizer.Message(description);
+ if (dialog.ShowDialog() == DialogResult.OK) textBox.Text = dialog.SelectedPath;
}
- /// <summary>
- /// Validate the changes.
- /// </summary>
+ // Update settings
private void mOKButton_Click(object sender, EventArgs e)
{
- //mg: rewrite of the above to try to make sure dir exists
- //only if the value changed since showdialog...
- if (mDefaultXUKDirectory != mDirectoryBox.Text)
+ UpdateProjectSettings();
+ UpdateAudioSettings();
+ UpdateUserProfile();
+ }
+
+ // Update project settings
+ private void UpdateProjectSettings()
+ {
+ if (ObiForm.CanUseDirectory(mDirectoryTextbox.Text, false))
{
- //...do we go through the test to avoid annyoing repeats
- if (ObiForm.CanUseDirectory(mDirectoryBox.Text, false))
- mDefaultXUKDirectory = mDirectoryBox.Text;
+ mSettings.DefaultPath = mDirectoryTextbox.Text;
}
- if (mDefaultDAISYDirectory != mExportBox.Text &&
- ObiForm.CanUseDirectory(mExportBox.Text, false))
+ if (ObiForm.CanUseDirectory(mExportTextbox.Text, false))
{
- mDefaultDAISYDirectory = mExportBox.Text;
+ mSettings.DefaultExportPath = mExportTextbox.Text;
}
- mOpenLastProject = mLastOpenCheckBox.Checked;
- mEnableTooltips = mTooltipsCheckBox.Checked;
- mInputDevice = (InputDevice)comboInputDevice.SelectedItem;
- mOutputDevice = (OutputDevice)comboOutputDevice.SelectedItem;
- if (comboChannels.SelectedItem.ToString() == "Mono")
- mAudioChannels = 1;
- else
- mAudioChannels = 2;
- mSampleRate = Convert.ToInt32(comboSampleRate.SelectedItem);
- mBitDepth = 16;
-
+ mSettings.OpenLastProject = mLastOpenCheckBox.Checked;
}
-
- private void Preferences_Load(object sender, EventArgs e)
+ // Update audio settings
+ private void UpdateAudioSettings()
{
- comboInputDevice.DataSource = mRecorder.InputDevices;
- comboInputDevice.SelectedIndex =mRecorder.InputDevices.IndexOf(mInputDevice);
- comboOutputDevice.DataSource = mPlayer.OutputDevices;
- comboOutputDevice.SelectedIndex = mPlayer.OutputDevices.IndexOf(mOutputDevice);
- ArrayList mSample = new ArrayList();
- // TODO: replace this with a list obtained from the player or the device
- mSample.Add("11025");
- mSample.Add("22050");
- mSample.Add("44100");
- mSample.Add("48000");
- comboSampleRate.DataSource = mSample;
- comboSampleRate.SelectedIndex = mSample.IndexOf(mSampleRate.ToString());
- comboSampleRate.Visible = mCanChangeAudioSettings;
- m_txtSamplingRate.Text = mSampleRate.ToString();
- m_txtSamplingRate.Visible = !mCanChangeAudioSettings;
+ mTransportBar.AudioPlayer.SetDevice(mForm, (OutputDevice)mOutputDeviceCombo.SelectedItem);
+ mTransportBar.Recorder.InputDevice = (InputDevice)mInputDeviceCombo.SelectedItem;
+ if (mCanChangeAudioSettings)
+ {
+ mSettings.LastInputDevice = ((InputDevice)mInputDeviceCombo.SelectedItem).Name;
+ mSettings.LastOutputDevice = ((OutputDevice)mOutputDeviceCombo.SelectedItem).Name;
+ mSettings.AudioChannels = mChannelsCombo.SelectedItem.ToString() == Localizer.Message("mono") ? 1 : 2;
+ mSettings.SampleRate = Convert.ToInt32(mSampleRateCombo.SelectedItem);
+ if (mPresentation != null)
+ {
+ mPresentation.UpdatePresentationAudioProperties(mSettings.AudioChannels, mSettings.BitDepth, mSettings.SampleRate);
+ }
+ }
+ }
- ArrayList mArrayChannels = new ArrayList();
- mArrayChannels.Add(Localizer.Message("mono"));
- mArrayChannels.Add(Localizer.Message("stereo"));
- comboChannels.DataSource = mArrayChannels;
- comboChannels.SelectedIndex = mArrayChannels.IndexOf(Localizer.Message(mAudioChannels == 1 ? "mono" : "stereo"));
- comboChannels.Visible = mCanChangeAudioSettings;
- m_txtChannels.Text = Localizer.Message(mAudioChannels == 1 ? "mono" : "stereo") ;
- m_txtChannels.Visible = !mCanChangeAudioSettings;
-
- m_txtBitDepth.Text = mBitDepth.ToString();
+ // Update user profile
+ private void UpdateUserProfile()
+ {
+ mSettings.UserProfile.Name = mFullNameTextbox.Text;
+ mSettings.UserProfile.Organization = mOrganizationTextbox.Text;
+ mSettings.UserProfile.Culture = (CultureInfo)mCultureBox.SelectedItem;
}
-
- public void SelectProjectTab() { mTab.SelectedTab = mProjectTab; }
- public void SelectAudioTab() { mTab.SelectedTab = mAudioTab; }
}
}
\ No newline at end of file
Deleted: trunk/urakawa/application/Obi/Obi/Dialogs/UserProfile.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Dialogs/UserProfile.Designer.cs 2008-05-12 07:59:39 UTC (rev 3044)
+++ trunk/urakawa/application/Obi/Obi/Dialogs/UserProfile.Designer.cs 2008-05-12 20:32:46 UTC (rev 3045)
@@ -1,161 +0,0 @@
-namespace Obi.Dialogs
-{
- partial class UserProfile
- {
- /// <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 Windows Form 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()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserProfile));
- this.label1 = new System.Windows.Forms.Label();
- this.mNameBox = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.mOrganizationBox = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.mCultureBox = new System.Windows.Forms.ComboBox();
- this.mOKButton = new System.Windows.Forms.Button();
- this.mCancelButton = new System.Windows.Forms.Button();
- this.SuspendLayout();
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(25, 16);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(55, 13);
- this.label1.TabIndex = 0;
- this.label1.Text = "Full &name:";
- //
- // mNameBox
- //
- this.mNameBox.AccessibleName = "Full &name:";
- this.mNameBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.mNameBox.Location = new System.Drawing.Point(88, 13);
- this.mNameBox.Name = "mNameBox";
- this.mNameBox.Size = new System.Drawing.Size(292, 20);
- this.mNameBox.TabIndex = 1;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(12, 43);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(69, 13);
- this.label2.TabIndex = 2;
- this.label2.Text = "&Organization:";
- //
- // mOrganizationBox
- //
- this.mOrganizationBox.AccessibleName = "Organization:";
- this.mOrganizationBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.mOrganizationBox.Location = new System.Drawing.Point(88, 40);
- this.mOrganizationBox.Name = "mOrganizationBox";
- this.mOrganizationBox.Size = new System.Drawing.Size(292, 20);
- this.mOrganizationBox.TabIndex = 3;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(27, 70);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(58, 13);
- this.label3.TabIndex = 4;
- this.label3.Text = "&Language:";
- //
- // mCultureBox
- //
- this.mCultureBox.AccessibleName = "Language:";
- this.mCultureBox.AllowDrop = true;
- this.mCultureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.mCultureBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.mCultureBox.FormattingEnabled = true;
- this.mCultureBox.Location = new System.Drawing.Point(88, 67);
- this.mCultureBox.Name = "mCultureBox";
- this.mCultureBox.Size = new System.Drawing.Size(292, 21);
- this.mCultureBox.Sorted = true;
- this.mCultureBox.TabIndex = 5;
- //
- // mOKButton
- //
- this.mOKButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.mOKButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.mOKButton.Location = new System.Drawing.Point(118, 127);
- this.mOKButton.Name = "mOKButton";
- this.mOKButton.Size = new System.Drawing.Size(75, 25);
- this.mOKButton.TabIndex = 6;
- this.mOKButton.Text = "&OK";
- this.mOKButton.UseVisualStyleBackColor = true;
- this.mOKButton.Click += new System.EventHandler(this.button1_Click);
- //
- // mCancelButton
- //
- this.mCancelButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.mCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.mCancelButton.Location = new System.Drawing.Point(199, 127);
- this.mCancelButton.Name = "mCancelButton";
- this.mCancelButton.Size = new System.Drawing.Size(75, 25);
- this.mCancelButton.TabIndex = 7;
- this.mCancelButton.Text = "&Cancel";
- this.mCancelButton.UseVisualStyleBackColor = true;
- //
- // UserProfile
- //
- this.AcceptButton = this.mOKButton;
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- thi...
[truncated message content] |
|
From: <avn...@us...> - 2008-05-12 07:59:42
|
Revision: 3044
http://urakawa.svn.sourceforge.net/urakawa/?rev=3044&view=rev
Author: avneeshsingh
Date: 2008-05-12 00:59:39 -0700 (Mon, 12 May 2008)
Log Message:
-----------
Fix to buggs:
- Keyboard focus lost on using stop playback.
- Using undo for copy/ paste phrase crash due to playback.
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-12 07:22:19 UTC (rev 3043)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-12 07:59:39 UTC (rev 3044)
@@ -548,6 +548,9 @@
// Redo
private void Redo()
{
+ if (mProjectView.TransportBar.IsActive)
+ mProjectView.TransportBar.Stop();
+
if (mSession.CanRedo) mSession.Presentation.getUndoRedoManager().redo();
}
@@ -615,6 +618,9 @@
// Undo
private void Undo()
{
+ if (mProjectView.TransportBar.IsActive)
+ mProjectView.TransportBar.Stop();
+
if (mSession.CanUndo) { mSession.Presentation.getUndoRedoManager().undo(); }
}
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-12 07:22:19 UTC (rev 3043)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-12 07:59:39 UTC (rev 3044)
@@ -615,7 +615,7 @@
// Stopping again deselects everything
if (mCurrentPlaylist.State == Obi.Audio.AudioPlayerState.Stopped)
{
- mView.Selection = null;
+ //mView.Selection = null;
}
else
{
@@ -1146,7 +1146,7 @@
}
}
- public bool IsActive { get { return IsPlayerActive || IsRecorderActive; } }
+ public bool IsActive { get { return Enabled && ( IsPlayerActive || IsRecorderActive ); } }
private bool IsPlaying { get { return mPlayer.State == Obi.Audio.AudioPlayerState.Playing; } }
private bool IsPlayerActive { get { return IsPaused || IsPlaying; } }
private bool IsPaused { get { return mPlayer.State == Obi.Audio.AudioPlayerState.Paused; } }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-12 07:22:27
|
Revision: 3043
http://urakawa.svn.sourceforge.net/urakawa/?rev=3043&view=rev
Author: avneeshsingh
Date: 2008-05-12 00:22:19 -0700 (Mon, 12 May 2008)
Log Message:
-----------
Fix to buggs:
Crash triggered if cut and delete commands are given during playing or paused state.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs
Modified: trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs 2008-05-11 12:27:31 UTC (rev 3042)
+++ trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs 2008-05-12 07:22:19 UTC (rev 3043)
@@ -12,6 +12,7 @@
private ObiNode mParent; // its original parent node
private NodeSelection mAfter; // selection after deletion
private int mIndex; // its original index
+ private ProjectView.ProjectView mView;
/// <summary>
@@ -20,6 +21,7 @@
public Delete(ProjectView.ProjectView view, ObiNode node, string label)
: base(view)
{
+ mView = view;
mNode = node;
mParent = node.ParentAs<ObiNode>();
mIndex = mNode.Index;
@@ -35,6 +37,9 @@
public override void execute()
{
+ if (mView.TransportBar.IsActive)
+ mView.TransportBar.Stop();
+
mNode.Detach();
if (UpdateSelection) View.Selection = mAfter;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-11 12:27:36
|
Revision: 3042
http://urakawa.svn.sourceforge.net/urakawa/?rev=3042&view=rev
Author: avneeshsingh
Date: 2008-05-11 05:27:31 -0700 (Sun, 11 May 2008)
Log Message:
-----------
fix to buggs:
- Record triggeres crash if Obi is started and no project is active.
- Menu items trigger crash after an active project is closed.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.cs
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-11 00:36:38 UTC (rev 3041)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-11 12:27:31 UTC (rev 3042)
@@ -674,6 +674,7 @@
{
Status(String.Format(Localizer.Message("closed_project"), e.ClosedPresentation.Title));
}
+ mProjectView.Selection = null;
mProjectView.Presentation = null;
UpdateObi();
if (mSourceView != null) mSourceView.Close();
@@ -1377,6 +1378,9 @@
{
mPlayAllToolStripMenuItem.Enabled = mProjectView.CanPlay;
mPlaySelectionToolStripMenuItem.Enabled = mProjectView.CanPlaySelection;
+ PlayPreviewtoolStripMenuItem.Enabled = mProjectView.CanPlay;
+ FastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay;
+
if (mProjectView.CanResume)
{
mPauseToolStripMenuItem.Visible = false;
@@ -1391,6 +1395,7 @@
mStopToolStripMenuItem.Enabled = mProjectView.CanStop;
// update recording menu items
+ recordToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
mStartRecordingToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive;
if (mProjectView.TransportBar.IsListening)
mStartListeningToolStripMenuItem.Text = "&Start Recording";
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-11 00:36:38 UTC (rev 3041)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-11 12:27:31 UTC (rev 3042)
@@ -194,7 +194,7 @@
public bool CanCopyBlock { get { return mStripsView.CanCopyBlock; } }
public bool CanCut { get { return CanDelete; } }
public bool CanDecreaseLevel { get { return mTOCView.CanDecreaseLevel; } }
- public bool CanDelete { get { return CanRemoveSection || CanRemoveStrip || CanRemoveBlock || CanRemoveAudio || CanRemoveMetadata; } }
+ public bool CanDelete { get { return Selection != null && ( CanRemoveSection || CanRemoveStrip || CanRemoveBlock || CanRemoveAudio || CanRemoveMetadata ) ; } }
public bool CanFocusOnTOCView { get { return !mTOCView.Focused && mTOCView.Selection == null; } }
public bool CanIncreaseLevel { get { return mTOCView.CanIncreaseLevel; } }
public bool CanInsertSection { get { return CanInsertStrip || mTOCView.Selection != null; } }
@@ -212,8 +212,8 @@
public bool CanRemoveSection { get { return mTOCView.CanRemoveSection; } }
public bool CanRemoveStrip { get { return mStripsView.CanRemoveStrip; } }
public bool CanResume { get { return mTransportBar.CanResumePlayback; } }
- public bool CanRenameSection { get { return CanRenameStrip || mTOCView.CanRenameSection; } }
- public bool CanRenameStrip { get { return mStripsView.CanRenameStrip; } }
+ public bool CanRenameSection { get { return Selection != null && (CanRenameStrip || mTOCView.CanRenameSection) ; } }
+ public bool CanRenameStrip { get { return Selection != null && ( mStripsView.CanRenameStrip ); } }
public bool CanSetBlockUsedStatus { get { return mStripsView.CanSetBlockUsedStatus; } }
public bool CanSetSectionUsedStatus { get { return mTOCView.CanSetSectionUsedStatus; } }
public bool CanSetStripUsedStatus { get { return mStripsView.CanSetStripUsedStatus; } }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-11 00:36:39
|
Revision: 3041
http://urakawa.svn.sourceforge.net/urakawa/?rev=3041&view=rev
Author: julienq
Date: 2008-05-10 17:36:38 -0700 (Sat, 10 May 2008)
Log Message:
-----------
Updated to version 0.10.7. Hope I didn't screw up the installer too bad.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs
trunk/urakawa/application/Obi/Obi.sln
trunk/urakawa/application/Obi/Setup/Setup.vdproj
Added Paths:
-----------
trunk/urakawa/application/Obi/Setup/CustomActions/CheckDX/CheckDX/bin/Debug/CheckDX.dll
Property Changed:
----------------
trunk/urakawa/application/Obi/Setup/CustomActions/CheckDX/CheckDX/
Modified: trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-11 00:26:29 UTC (rev 3040)
+++ trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-11 00:36:38 UTC (rev 3041)
@@ -29,7 +29,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.10.6.*")]
+[assembly: AssemblyVersion("0.10.7.*")]
// There is a warning about this but it is harmless (1607)
-[assembly: AssemblyInformationalVersion("1.0 alpha")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0 alpha 7")]
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Obi.sln
===================================================================
--- trunk/urakawa/application/Obi/Obi.sln 2008-05-11 00:26:29 UTC (rev 3040)
+++ trunk/urakawa/application/Obi/Obi.sln 2008-05-11 00:36:38 UTC (rev 3041)
@@ -13,6 +13,8 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CheckDX", "Setup\CustomActions\CheckDX\CheckDX\CheckDX.csproj", "{27BFE0B9-BCF1-4B68-8FE9-828037A48F4D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -25,6 +27,10 @@
{1553F3D3-A820-400E-9B98-BCCA970E1D58}.Release|Any CPU.Build.0 = Release|Any CPU
{3A8E7FDE-EBBE-4757-BAD2-35CDB25D5138}.Debug|Any CPU.ActiveCfg = Debug
{3A8E7FDE-EBBE-4757-BAD2-35CDB25D5138}.Release|Any CPU.ActiveCfg = Release
+ {27BFE0B9-BCF1-4B68-8FE9-828037A48F4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {27BFE0B9-BCF1-4B68-8FE9-828037A48F4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {27BFE0B9-BCF1-4B68-8FE9-828037A48F4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {27BFE0B9-BCF1-4B68-8FE9-828037A48F4D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: trunk/urakawa/application/Obi/Setup/CustomActions/CheckDX/CheckDX
___________________________________________________________________
Name: svn:ignore
+ [Bb]in
obj
[Dd]ebug
[Rr]elease
*.user
*.aps
*.eto
Added: trunk/urakawa/application/Obi/Setup/CustomActions/CheckDX/CheckDX/bin/Debug/CheckDX.dll
===================================================================
(Binary files differ)
Property changes on: trunk/urakawa/application/Obi/Setup/CustomActions/CheckDX/CheckDX/bin/Debug/CheckDX.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/urakawa/application/Obi/Setup/Setup.vdproj
===================================================================
--- trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-11 00:26:29 UTC (rev 3040)
+++ trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-11 00:36:38 UTC (rev 3041)
@@ -15,12 +15,6 @@
{
"Entry"
{
- "MsmKey" = "8:_01278A6965C227E561A274E1E0D50066"
- "OwnerKey" = "8:_5D74C0D378D74D17BD753426073D0BF5"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_0D0652AF33114FC2B6DFBD57DF2FF296"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -99,6 +93,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_8D91DBDC5910739EF90DFA0C2BE6073A"
+ "OwnerKey" = "8:_5D74C0D378D74D17BD753426073D0BF5"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_91C5D5E86F42A0A1FD79279998BBCB50"
"OwnerKey" = "8:_5D74C0D378D74D17BD753426073D0BF5"
"MsmSig" = "8:_UNDEFINED"
@@ -111,12 +111,18 @@
}
"Entry"
{
- "MsmKey" = "8:_A85046C63552DA81A6A561E630915FC4"
+ "MsmKey" = "8:_9DB27E00CC7421F13B82DB96624C7B70"
"OwnerKey" = "8:_5D74C0D378D74D17BD753426073D0BF5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_A44060C9ADC6476F89FAF9488DA56ABA"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_ACAC4279C4A5484799788897BBC116EE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -147,12 +153,6 @@
}
"Entry"
{
- "MsmKey" = "8:_BCC0870F63CF4902AE7BC93AB912FC3E"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_BD396C467A4244BF912AC4679292E96D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -220,7 +220,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_BCC0870F63CF4902AE7BC93AB912FC3E"
+ "OwnerKey" = "8:_A44060C9ADC6476F89FAF9488DA56ABA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -244,13 +244,13 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_01278A6965C227E561A274E1E0D50066"
+ "OwnerKey" = "8:_8D91DBDC5910739EF90DFA0C2BE6073A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_A85046C63552DA81A6A561E630915FC4"
+ "OwnerKey" = "8:_9DB27E00CC7421F13B82DB96624C7B70"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -320,31 +320,31 @@
{
"CustomAction"
{
- "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_33535EE0402C4CDDA25A19BF54308853"
+ "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_A26DE1EF6B844159B45A55978067A9BB"
{
- "Name" = "8:CheckDX"
+ "Name" = "8:CheckDX.dll"
"Condition" = "8:"
- "Object" = "8:_BCC0870F63CF4902AE7BC93AB912FC3E"
+ "Object" = "8:_A44060C9ADC6476F89FAF9488DA56ABA"
"FileType" = "3:1"
- "InstallAction" = "3:1"
+ "InstallAction" = "3:2"
"Arguments" = "8:"
"EntryPoint" = "8:"
"Sequence" = "3:1"
- "Identifier" = "8:_D6480794_B765_4510_9A87_4C116A35A3AC"
+ "Identifier" = "8:_C92ECAB2_DEE2_440F_BD8D_B2DE208E6191"
"InstallerClass" = "11:TRUE"
"CustomActionData" = "8:"
}
- "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_4FF6952BA1184B06A30E1DAFF24ECAFC"
+ "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_FB50B462AB674E16B16445AEC77B6A98"
{
"Name" = "8:CheckDX.dll"
"Condition" = "8:"
- "Object" = "8:_BCC0870F63CF4902AE7BC93AB912FC3E"
+ "Object" = "8:_A44060C9ADC6476F89FAF9488DA56ABA"
"FileType" = "3:1"
- "InstallAction" = "3:2"
+ "InstallAction" = "3:1"
"Arguments" = "8:"
"EntryPoint" = "8:"
"Sequence" = "3:1"
- "Identifier" = "8:_BD85A1E2_A44F_4AA5_8F0B_A1ED7300B4A0"
+ "Identifier" = "8:_2C0124FE_FD93_467F_8A8F_892312861A04"
"InstallerClass" = "11:TRUE"
"CustomActionData" = "8:"
}
@@ -371,37 +371,6 @@
}
"File"
{
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_01278A6965C227E561A274E1E0D50066"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:AudioEngine.PPMeter, Version=1.0.2918.27249, Culture=neutral, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_01278A6965C227E561A274E1E0D50066"
- {
- "Name" = "8:AudioEngine.PPMeter.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:AudioEngine.PPMeter.dll"
- "TargetName" = "8:"
- "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:TRUE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D0652AF33114FC2B6DFBD57DF2FF296"
{
"SourcePath" = "8:..\\Obi\\images\\obird256.png"
@@ -624,6 +593,37 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8D91DBDC5910739EF90DFA0C2BE6073A"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:urakawa, Version=1.0.0.30598, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_8D91DBDC5910739EF90DFA0C2BE6073A"
+ {
+ "Name" = "8:urakawa.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:urakawa.dll"
+ "TargetName" = "8:"
+ "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:TRUE"
+ "IsolateTo" = "8:"
+ }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_91C5D5E86F42A0A1FD79279998BBCB50"
{
"AssemblyRegister" = "3:1"
@@ -675,20 +675,20 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A85046C63552DA81A6A561E630915FC4"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9DB27E00CC7421F13B82DB96624C7B70"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:urakawa, Version=1.0.0.18108, Culture=neutral, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:AudioEngine.PPMeter, Version=1.0.2897.24541, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_A85046C63552DA81A6A561E630915FC4"
+ "_9DB27E00CC7421F13B82DB96624C7B70"
{
- "Name" = "8:urakawa.dll"
+ "Name" = "8:AudioEngine.PPMeter.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:urakawa.dll"
+ "SourcePath" = "8:AudioEngine.PPMeter.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4D3BED1A25304BAD92EA81B4D13F5EF1"
@@ -706,6 +706,37 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A44060C9ADC6476F89FAF9488DA56ABA"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:CheckDX, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ "_A44060C9ADC6476F89FAF9488DA56ABA"
+ {
+ "Name" = "8:CheckDX.dll"
+ "Attributes" = "3:512"
+ }
+ }
+ "SourcePath" = "8:CustomActions\\CheckDX\\CheckDX\\bin\\Debug\\CheckDX.dll"
+ "TargetName" = "8:"
+ "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:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ACAC4279C4A5484799788897BBC116EE"
{
"SourcePath" = "8:..\\Obi\\images\\icons\\media-record.png"
@@ -806,37 +837,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BCC0870F63CF4902AE7BC93AB912FC3E"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:CheckDX, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_BCC0870F63CF4902AE7BC93AB912FC3E"
- {
- "Name" = "8:CheckDX.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:CustomActions\\CheckDX\\CheckDX\\bin\\Debug\\CheckDX.dll"
- "TargetName" = "8:"
- "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:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BD396C467A4244BF912AC4679292E96D"
{
"SourcePath" = "8:..\\Obi\\images\\icons\\go-up.png"
@@ -1173,7 +1173,7 @@
"Product"
{
"Name" = "8:Microsoft Visual Studio"
- "ProductName" = "8:Obi 0.10.6"
+ "ProductName" = "8:Obi 0.10.7"
"ProductCode" = "8:{85A99D0A-5FF6-4CC7-A480-101BF4E080F0}"
"PackageCode" = "8:{3816FC4F-0599-4D14-9D57-40017D11D1DD}"
"UpgradeCode" = "8:{358C2C3A-3686-4461-A8BA-9D766218CC5E}"
@@ -1296,7 +1296,7 @@
{
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_0F34FEE7392245ED8C33C78EB0D2823B"
{
- "Name" = "8:Obi 0.10.6"
+ "Name" = "8:Obi 0.10.7"
"Arguments" = "8:"
"Description" = "8:"
"ShowCmd" = "3:1"
@@ -1310,7 +1310,7 @@
}
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_C26CA4074EF24904B9E49A74044A43B0"
{
- "Name" = "8:Obi 0.10.6"
+ "Name" = "8:Obi 0.10.7"
"Arguments" = "8:"
"Description" = "8:"
"ShowCmd" = "3:1"
@@ -1811,8 +1811,5 @@
}
}
}
- "VJSharpPlugin"
- {
- }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-11 00:26:31
|
Revision: 3040
http://urakawa.svn.sourceforge.net/urakawa/?rev=3040&view=rev
Author: julienq
Date: 2008-05-10 17:26:29 -0700 (Sat, 10 May 2008)
Log Message:
-----------
Updated custom class mark to apply to currently playing/recording phrase.
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/TransportBar.cs
trunk/urakawa/application/Obi/Obi/messages.Designer.cs
trunk/urakawa/application/Obi/Obi/messages.resx
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-10 21:49:26 UTC (rev 3039)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-11 00:26:29 UTC (rev 3040)
@@ -106,7 +106,7 @@
this.mEditRolesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mClearRoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PhraseDetectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.MarkDefaultCustomClassToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.mMarkDefaultCustomClassToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.InPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.BeginInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.EndInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -597,7 +597,7 @@
this.mEditRolesToolStripMenuItem,
this.mClearRoleToolStripMenuItem,
this.PhraseDetectionToolStripMenuItem,
- this.MarkDefaultCustomClassToolStripMenuItem,
+ this.mMarkDefaultCustomClassToolStripMenuItem,
this.InPhraseSelectionToolStripMenuItem});
this.mPhrasesToolStripMenuItem.Name = "mPhrasesToolStripMenuItem";
resources.ApplyResources(this.mPhrasesToolStripMenuItem, "mPhrasesToolStripMenuItem");
@@ -712,11 +712,11 @@
resources.ApplyResources(this.PhraseDetectionToolStripMenuItem, "PhraseDetectionToolStripMenuItem");
this.PhraseDetectionToolStripMenuItem.Click += new System.EventHandler(this.PhraseDetectionToolStripMenuItem_Click);
//
- // MarkDefaultCustomClassToolStripMenuItem
+ // mMarkDefaultCustomClassToolStripMenuItem
//
- this.MarkDefaultCustomClassToolStripMenuItem.Name = "MarkDefaultCustomClassToolStripMenuItem";
- resources.ApplyResources(this.MarkDefaultCustomClassToolStripMenuItem, "MarkDefaultCustomClassToolStripMenuItem");
- this.MarkDefaultCustomClassToolStripMenuItem.Click += new System.EventHandler(this.MarkDefaultCustomClassToolStripMenuItem_Click);
+ this.mMarkDefaultCustomClassToolStripMenuItem.Name = "mMarkDefaultCustomClassToolStripMenuItem";
+ resources.ApplyResources(this.mMarkDefaultCustomClassToolStripMenuItem, "mMarkDefaultCustomClassToolStripMenuItem");
+ this.mMarkDefaultCustomClassToolStripMenuItem.Click += new System.EventHandler(this.mMarkDefaultCustomClassToolStripMenuItem_Click);
//
// InPhraseSelectionToolStripMenuItem
//
@@ -1204,7 +1204,7 @@
private System.Windows.Forms.ToolStripMenuItem BeginInPhraseSelectionToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem EndInPhraseSelectionToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem DeselectInPhraseSelectionToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem MarkDefaultCustomClassToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem mMarkDefaultCustomClassToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mTodoClasstoolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem preferencesToolStripMenuItem1;
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-10 21:49:26 UTC (rev 3039)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-11 00:26:29 UTC (rev 3040)
@@ -1193,7 +1193,7 @@
mEditRolesToolStripMenuItem.Enabled = mSession.Presentation != null;
mClearRoleToolStripMenuItem.Enabled = mProjectView.CanClearRole;
PhraseDetectionToolStripMenuItem.Enabled = mProjectView.CanApplyPhraseDetection;
-
+ mMarkDefaultCustomClassToolStripMenuItem.Enabled = mProjectView.CanMarkPhrase;
UpdateAudioSelectionBlockMenuItems();
}
@@ -1545,10 +1545,9 @@
UpdateAudioSelectionBlockMenuItems();
}
- private void MarkDefaultCustomClassToolStripMenuItem_Click(object sender, EventArgs e)
+ private void mMarkDefaultCustomClassToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (mProjectView.TransportBar.Enabled)
- mProjectView.TransportBar.MarkCustomClass();
+ if (mProjectView.TransportBar.Enabled) mProjectView.TransportBar.MarkCustomClass();
}
private void mTodoClasstoolStripMenuItem_Click(object sender, EventArgs e)
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-10 21:49:26 UTC (rev 3039)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-11 00:26:29 UTC (rev 3040)
@@ -686,13 +686,13 @@
<data name="PhraseDetectionToolStripMenuItem.Text" xml:space="preserve">
<value>Apply p&hrase detection</value>
</data>
- <data name="MarkDefaultCustomClassToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+U</value>
</data>
- <data name="MarkDefaultCustomClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>253, 22</value>
</data>
- <data name="MarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
+ <data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve">
<value>Mar&k default custom class</value>
</data>
<data name="BeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve">
@@ -1147,7 +1147,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.6.43172, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.6.41015, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1879,10 +1879,10 @@
<data name=">>PhraseDetectionToolStripMenuItem.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=">>MarkDefaultCustomClassToolStripMenuItem.Name" xml:space="preserve">
- <value>MarkDefaultCustomClassToolStripMenuItem</value>
+ <data name=">>mMarkDefaultCustomClassToolStripMenuItem.Name" xml:space="preserve">
+ <value>mMarkDefaultCustomClassToolStripMenuItem</value>
</data>
- <data name=">>MarkDefaultCustomClassToolStripMenuItem.Type" xml:space="preserve">
+ <data name=">>mMarkDefaultCustomClassToolStripMenuItem.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=">>InPhraseSelectionToolStripMenuItem.Name" xml:space="preserve">
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-10 21:49:26 UTC (rev 3039)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-11 00:26:29 UTC (rev 3040)
@@ -18,8 +18,11 @@
private ObiForm mForm; // parent form
private bool mTOCViewVisible; // keep track of the TOC view visibility (don't reopen it accidentally)
private bool mMetadataViewVisible; // keep track of the Metadata view visibility
- private Timer mTabbingTimer;
+ private Timer mTabbingTimer; // ???
+ private EmptyNode.Kind mMarkRole; // role to use as the on-the-fly custom role mark
+ private string mMarkCustomRole; // custom role (if applicable)
+
public event EventHandler SelectionChanged; // triggered when the selection changes
public event EventHandler FindInTextVisibilityChanged; // triggered when the search bar is shown or hidden
public event ImportingFileEventHandler ImportingFile; // triggered when a file is being imported
@@ -45,8 +48,15 @@
mForm = null;
mClipboard = null;
mTabbingTimer = null;
+
+ mMarkRole = EmptyNode.Kind.Custom;
+ mMarkCustomRole = Localizer.Message("default_custom_class_name");
}
+
+ public EmptyNode.Kind MarkRole { get { return mMarkRole; } }
+ public string MarkCustomRole { get { return mMarkCustomRole; } }
+
/// <summary>
/// Add a new empty block.
/// </summary>
@@ -212,6 +222,19 @@
public bool CanStop { get { return mTransportBar.CanStop; } }
public bool CanApplyPhraseDetection { get { return mPresentation != null && Selection != null && Selection.Node is PhraseNode; } }
+ public bool CanMarkPhrase
+ {
+ get
+ {
+ EmptyNode node = mTransportBar.HasAudioCursor ?
+ mTransportBar.CurrentPlaylist.CurrentPhrase :
+ SelectedNodeAs<EmptyNode>();
+ return mTransportBar.CurrentState == TransportBar.State.Recording ||
+ mTransportBar.CurrentState == TransportBar.State.Paused ||
+ (node != null && (node.NodeKind != mMarkRole || node.CustomClass != mMarkCustomRole));
+ }
+ }
+
/// <summary>
/// Contents of the clipboard
/// </summary>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-10 21:49:26 UTC (rev 3039)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-11 00:26:29 UTC (rev 3040)
@@ -84,7 +84,7 @@
public Audio.AudioPlayer AudioPlayer { get { return mPlayer; } }
public bool CanFastForward { get { return Enabled && mRecordingSession == null; } }
- public bool CanMarkCustomClass { get { return Enabled && mState == State.Recording; } }
+ public bool CanMarkCustomClass { get { return Enabled && mView.CanMarkPhrase; } }
public bool CanNavigateNextPage { get { return Enabled; } }
public bool CanNavigateNextPhrase { get { return Enabled; } }
public bool CanNavigateNextSection { get { return Enabled; } }
@@ -102,13 +102,14 @@
/// <summary>
/// A phrase can be split if there is an audio selection, or when audio is playing or paused.
/// </summary>
- public bool CanSplitPhrase
+ public bool CanSplitPhrase { get { return HasAudioCursor || mView.Selection is AudioSelection; } }
+
+ public bool HasAudioCursor
{
get
{
return mPlayer.State == Obi.Audio.AudioPlayerState.Paused ||
- mPlayer.State == Obi.Audio.AudioPlayerState.Playing ||
- mView.Selection is AudioSelection;
+ mPlayer.State == Obi.Audio.AudioPlayerState.Playing;
}
}
@@ -1156,11 +1157,11 @@
/// <summary>
/// Mark custom class on current block with default name as "Custom"
/// If recording, create new phrase and mark custom class this new phrase block
- /// else mark on currently selected block
+ /// else mark on currently playing block; otherwise on selected block
/// </summary>
public void MarkCustomClass()
{
- if (mView.Selection != null)
+ if (mView.CanMarkPhrase)
{
EmptyNode node;
if (IsRecording)
@@ -1170,10 +1171,18 @@
}
else
{
- node = mView.SelectedNodeAs<EmptyNode>();
+ if (mPlayer.State == Obi.Audio.AudioPlayerState.Paused ||
+ mPlayer.State == Obi.Audio.AudioPlayerState.Playing)
+ {
+ node = mCurrentPlaylist.CurrentPhrase;
+ }
+ else
+ {
+ node = mView.SelectedNodeAs<EmptyNode>();
+ }
}
mView.Presentation.getUndoRedoManager().execute(new Commands.Node.ChangeCustomType(mView, node,
- EmptyNode.Kind.Custom, Localizer.Message("default_custom_class_name")));
+ mView.MarkRole, mView.MarkCustomRole));
}
}
Modified: trunk/urakawa/application/Obi/Obi/messages.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-10 21:49:26 UTC (rev 3039)
+++ trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-11 00:26:29 UTC (rev 3040)
@@ -594,7 +594,7 @@
}
/// <summary>
- /// Looks up a localized string similar to Custom.
+ /// Looks up a localized string similar to Marked.
/// </summary>
internal static string default_custom_class_name {
get {
Modified: trunk/urakawa/application/Obi/Obi/messages.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-10 21:49:26 UTC (rev 3039)
+++ trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-11 00:26:29 UTC (rev 3040)
@@ -561,7 +561,7 @@
<comment>Command</comment>
</data>
<data name="default_custom_class_name" xml:space="preserve">
- <value>Custom</value>
+ <value>Marked</value>
<comment>Role stuff</comment>
</data>
<data name="no_preceding_silent_phrase" xml:space="preserve">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-10 21:49:29
|
Revision: 3039
http://urakawa.svn.sourceforge.net/urakawa/?rev=3039&view=rev
Author: julienq
Date: 2008-05-10 14:49:26 -0700 (Sat, 10 May 2008)
Log Message:
-----------
Split at cursor time, or audio selection time.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs
trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
trunk/urakawa/application/Obi/Obi/ObiForm.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
Modified: trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs 2008-05-09 23:27:42 UTC (rev 3038)
+++ trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs 2008-05-10 21:49:26 UTC (rev 3039)
@@ -10,7 +10,7 @@
private Time mSplitPoint; // split point
public SplitAudio(ProjectView.ProjectView view) :
- this(view, ((AudioSelection)view.Selection).AudioRange.CursorTime)
+ this(view, view.TransportBar.SplitTime)
{
}
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-09 23:27:42 UTC (rev 3038)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-10 21:49:26 UTC (rev 3039)
@@ -1055,7 +1055,6 @@
//
// mProjectView
//
- this.mProjectView.AudioCursor = null;
this.mProjectView.BackColor = System.Drawing.Color.Transparent;
this.mProjectView.Clipboard = null;
resources.ApplyResources(this.mProjectView, "mProjectView");
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-09 23:27:42 UTC (rev 3038)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-10 21:49:26 UTC (rev 3039)
@@ -266,10 +266,6 @@
}
#endregion
-
-
-
- public bool IsTransportActive { get { return mProjectView.TransportBar.IsActive; } }
/// <summary>
/// Application settings.
@@ -706,6 +702,7 @@
void TransportBar_StateChanged(object sender, EventArgs e )
{
Status(Localizer.Message(mProjectView.TransportBar.CurrentState.ToString()));
+ UpdatePhrasesMenu();
UpdateTransportMenu();
}
@@ -1218,15 +1215,15 @@
string BeginTime = Math.Round(((AudioSelection)mProjectView.Selection).AudioRange.SelectionBeginTime / 1000, 1).ToString();
string EndTime = Math.Round(((AudioSelection)mProjectView.Selection).AudioRange.SelectionEndTime / 1000, 1).ToString();
//AudioSelectionStatusMessage = string.Concat(" Selected:", ((AudioSelection)mProjectView.Selection).AudioRange.SelectionBeginTime.ToString(), " - ", ((AudioSelection)mProjectView.Selection).AudioRange.SelectionEndTime.ToString());
- AudioSelectionStatusMessage = string.Concat( Localizer.Message ("AudioSelected") , BeginTime, " - ", EndTime , "s" );
-
+ AudioSelectionStatusMessage = string.Concat(Localizer.Message("AudioSelected"), BeginTime, " - ", EndTime, "s");
+
}
else
{
DeselectInPhraseSelectionToolStripMenuItem.Enabled = false;
AudioSelectionStatusMessage = "";
}
- }
+ }
else
{
BeginInPhraseSelectionToolStripMenuItem.Enabled = false;
@@ -1234,9 +1231,9 @@
DeselectInPhraseSelectionToolStripMenuItem.Enabled = false;
AudioSelectionStatusMessage = "";
}
- if ( AudioSelectionStatusMessage != "" )
- Status(Localizer.Message(mProjectView.TransportBar.CurrentPlaylist.State.ToString()) + AudioSelectionStatusMessage);
- }
+ if (AudioSelectionStatusMessage != "")
+ Status(Localizer.Message(mProjectView.TransportBar.CurrentPlaylist.State.ToString()) + AudioSelectionStatusMessage);
+ }
private void mAddBlankPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.AddEmptyBlock(); }
private void mAddEmptyPagesToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.AddEmptyPages(); }
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-09 23:27:42 UTC (rev 3038)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-10 21:49:26 UTC (rev 3039)
@@ -13,13 +13,12 @@
private bool mEnableTooltips; // tooltips flag
private Presentation mPresentation; // presentation
private NodeSelection mSelection; // currently selected node
- private AudioSelection mCursor; // audio cursor
private Clipboard mClipboard; // the clipboard
private bool mSynchronizeViews; // synchronize views flag
private ObiForm mForm; // parent form
private bool mTOCViewVisible; // keep track of the TOC view visibility (don't reopen it accidentally)
private bool mMetadataViewVisible; // keep track of the Metadata view visibility
- private System.Windows.Forms.Timer TabbingTimer= null;
+ private Timer mTabbingTimer;
public event EventHandler SelectionChanged; // triggered when the selection changes
public event EventHandler FindInTextVisibilityChanged; // triggered when the search bar is shown or hidden
@@ -43,20 +42,11 @@
mMetadataViewVisible = !mTOCSplitter.Panel1Collapsed && !mMetadataSplitter.Panel2Collapsed;
mPresentation = null;
mSelection = null;
- mCursor = null;
mForm = null;
mClipboard = null;
+ mTabbingTimer = null;
}
- void InitialiseTabbingTimer()
- {
- if ( TabbingTimer == null )
- {
- TabbingTimer = new System.Windows.Forms.Timer();
- TabbingTimer.Tick += new System.EventHandler(this.TabbingTimer_Tick);
- TabbingTimer.Interval = 500;
- }
- }
/// <summary>
/// Add a new empty block.
/// </summary>
@@ -254,15 +244,6 @@
}
}
- public AudioSelection AudioCursor
- {
- get { return mCursor; }
- set
- {
- mCursor = value;
- }
- }
-
/// <summary>
/// Cut (delete) the selection and store it in the clipboard.
/// </summary>
@@ -798,7 +779,7 @@
public bool CanMarkSectionUnused { get { return mTOCView.CanSetSectionUsedStatus && mSelection.Node.Used; } }
public bool CanMarkStripUnused { get { return !mStripsView.CanSetStripUsedStatus || mSelection.Node.Used; } }
public bool CanMergeBlockWithNext { get { return mStripsView.CanMergeBlockWithNext; } }
- public bool CanSplitBlock { get { return mSelection is AudioSelection; } }
+ public bool CanSplitBlock { get { return mTransportBar.CanSplitPhrase; } }
public bool IsBlockUsed { get { return mStripsView.IsBlockUsed; } }
public bool IsStripUsed { get { return mStripsView.IsStripUsed; } }
@@ -1289,32 +1270,38 @@
return false;
}
- private void mPanelInfoLabelButton_Enter ( object sender , EventArgs e )
+ // Initialize timer for tabbing
+ private void InitialiseTabbingTimer()
{
+ if (mTabbingTimer == null)
+ {
+ mTabbingTimer = new System.Windows.Forms.Timer();
+ mTabbingTimer.Tick += new System.EventHandler(TabbingTimer_Tick);
+ mTabbingTimer.Interval = 500;
+ }
+ }
+
+ private void mPanelInfoLabelButton_Enter(object sender, EventArgs e)
+ {
mPanelInfoLabelButton.Size = new Size(150, 20);
mPanelInfoLabelButton.BackColor = System.Drawing.SystemColors.ControlLight;
mPanelInfoLabelButton.Text = mPanelInfoLabelButton.AccessibleName;
-
InitialiseTabbingTimer();
- TabbingTimer.Start () ;
+ mTabbingTimer.Start();
}
private void TabbingTimer_Tick(object sender, EventArgs e)
{
- if ( mPanelInfoLabelButton.ContainsFocus)
- SendKeys.Send("{tab}");
-
- TabbingTimer.Stop();
+ if (mPanelInfoLabelButton.ContainsFocus) SendKeys.Send("{tab}");
+ mTabbingTimer.Stop();
}
- private void mPanelInfoLabelButton_Leave ( object sender ,EventArgs e )
+ private void mPanelInfoLabelButton_Leave(object sender, EventArgs e)
{
mPanelInfoLabelButton.BackColor = System.Drawing.Color.Transparent;
mPanelInfoLabelButton.Size = new Size(1, 1);
mPanelInfoLabelButton.Text = "";
}
-
-
}
public class ImportingFileEventArgs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-09 23:27:42 UTC (rev 3038)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-10 21:49:26 UTC (rev 3039)
@@ -68,7 +68,6 @@
mAllowOverwrite = true;
mPlayIfNoSelection = true;
mState = State.Stopped;
-
AddTransportBarAccessibleName();
}
@@ -99,8 +98,35 @@
public bool CanResumeRecording { get { return Enabled && mState == State.Monitoring; } }
public bool CanRewind { get { return Enabled && mRecordingSession == null; } }
public bool CanStop { get { return Enabled && (mState != State.Stopped || mView.Selection != null); } }
+
+ /// <summary>
+ /// A phrase can be split if there is an audio selection, or when audio is playing or paused.
+ /// </summary>
+ public bool CanSplitPhrase
+ {
+ get
+ {
+ return mPlayer.State == Obi.Audio.AudioPlayerState.Paused ||
+ mPlayer.State == Obi.Audio.AudioPlayerState.Playing ||
+ mView.Selection is AudioSelection;
+ }
+ }
/// <summary>
+ /// Split time is either
+ /// </summary>
+ public double SplitTime
+ {
+ get
+ {
+ return mPlayer.State == Obi.Audio.AudioPlayerState.Paused ||
+ mPlayer.State == Obi.Audio.AudioPlayerState.Playing ?
+ mCurrentPlaylist.CurrentTimeInAsset :
+ ((AudioSelection)mView.Selection).AudioRange.CursorTime;
+ }
+ }
+
+ /// <summary>
/// Get the current playlist.
/// </summary>
public Playlist CurrentPlaylist { get { return mCurrentPlaylist; } }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-09 23:27:44
|
Revision: 3038
http://urakawa.svn.sourceforge.net/urakawa/?rev=3038&view=rev
Author: julienq
Date: 2008-05-09 16:27:42 -0700 (Fri, 09 May 2008)
Log Message:
-----------
Moved to the wiki.
Removed Paths:
-------------
trunk/urakawa/application/docs/menus.txt
Deleted: trunk/urakawa/application/docs/menus.txt
===================================================================
--- trunk/urakawa/application/docs/menus.txt 2008-05-09 23:26:09 UTC (rev 3037)
+++ trunk/urakawa/application/docs/menus.txt 2008-05-09 23:27:42 UTC (rev 3038)
@@ -1,251 +0,0 @@
-List of menu items in Obi
-$Id$
-
-
-Main form
-
- + [F] File ......................... Alt+F
- + [N] New project ................ Ctrl+N
- + [I] New project from import .... Ctrl+Shift+N
- + [O] Open project ............... Ctrl+O
- + [C] Close project .............. Ctrl+W
- -----------------------------------------------
- + [S] Save project ............... Ctrl+S
- + [A] Save project as... ......... Ctrl+Shift+S
- + [L] Clean unreferenced audio ... Ctrl+L
- + [E] Export as DAISY ............ Ctrl+E
- -----------------------------------------------
- + [R] Recent projects ............ (None)
- -----------------------------------------------
- + [X] Exit ....................... Alt+F4
-
- + [E] Edit ......................... Alt+E
- + [U] Undo ....................... Ctrl+Z
- + [R] Redo ....................... Ctrl+Y
- -----------------------------------------------
- + [C] Cut ........................ Ctrl+X
- + [Y] Copy ....................... Ctrl+C
- + [P] Paste ...................... Ctrl+V
- + [B] Paste before ............... Ctrl+Alt+V
- + [I] Paste inside ............... Ctrl+Shift+V
- + [D] Delete ..................... Del
- + [S] Select nothing ............. (None)
- -----------------------------------------------
- + [E] Delete unused data ......... Ctrl+Shift+L
- -----------------------------------------------
- + [F] Find ....................... Ctrl+F
- + [N] Find next .................. F3
- + [V] Find previous .............. Shift+F3
- -----------------------------------------------
- + [M] Add metadata entry ......... (None)
-
- + [V] View ........................ Alt+V
- + [T] Show TOC view ............. Ctrl+Alt+T
- + [M] Show metadata view ........ Ctrl+Alt+M
- + [B] Show transport bar ........ Ctrl+Alt+B
- + [U] Show status bar ........... Ctrl+Alt+U
- --------------------------------------------
- + [C] Focus on TOC view ......... F6
- + [N] Focus on content view ..... F7
- + [A] Focus on transport bar .... F8
- + [Y] Synchronize views ......... Ctrl+Alt+Y
- --------------------------------------------
- + [P] Show peak meter ........... Ctrl+Alt+P
- + [R] Show source view .......... Ctrl+Alt+O
-
- + [S] Sections .................... Alt+S
- + [A] Add section ............... Ctrl+J
- + [S] Add subsection ............ Ctrl+Shift+J
- + [I] Insert section ............ Ctrl+Alt+J
- + [M] Rename section ............ F2
- --------------------------------------------------
- + [D] Decrease section level .... Ctrl+Shift+Left
- + [N] Increase section level .... Ctrl+Shift+Right
- + [P] Split section ............. Ctrl+Shift+Q
- + [G] Merge with next section ... Ctrl+Shift+M
- --------------------------------------------------
- + [U] Section is used ........... Ctrl+K
-
- + [P] Phrases ......................... Alt+P
- + [B] Add blank phrase .............. Ctrl+B
- + [P] Add blank pages ............... Ctrl+Shift+B
- + [I] Import audio files ............ Ctrl+I
- + [S] Split phrase .................. Ctrl+Q
- + [M] Merge phrase with next ........ Ctrl+M
- + [U] Phrase is used ................ Ctrl+K
- --------------------------------------------------
- + [A] Assign role ................... (None)
- + [H] Heading ..................... (None)
- + [P] Page ........................ (None)
- + [S] Silence ..................... (None)
- + [T] TODO ........................ F4
- ------------------------------------------------
- + (Add role) ...................... (None)
- + [D] Edit roles... ................. (None)
- + [C] Clear role .................... (None)
- + [H] Apply phrase detection ........ Ctrl+Shift+P
- + [K] Mark default custom class ..... Ctrl+U
- + [R] In-phrase audio selection ..... (None)
- + [B] Begin in-phrase selection ... Ctrl+[
- + [E] End in-phrase selection ..... Ctrl+]
- + [D] Deselect .................... (None)
-
- + [R] Transport ......................... Alt+A
- + [P] Play ............................ (None)
- + [A] Play all ...................... Ctrl+Space
- + [S] Play selection ................ Ctrl+Shift+Space
- + [U] Pause/Resume .................... (None)
- + [S] Stop ............................ Ctrl+T
- + [L] Fast play ....................... (None)
- + [N] Normal speed .................. Ctrl+0
- + [U] Speed up ...................... Ctrl++
- + [D] Speed down .................... Ctrl+-
- + [E] Normal speed with elapse back ... (None) !!!
- + [V] Preview ......................... (None)
- + [F] Preview from... ............... Ctrl+P
- + [U] Preview up to... .............. (None)
- + [S] Preview selected .............. (None)
- + [R] Record .......................... (None)
- + [M] Start monitoring .............. Ctrl+R
- + [R] Start recording ............... Ctrl+Shift+R
- + [O] Allow overwrite ............... (None)
- --------------------------------------------------------
- + [N] Navigation ...................... (None)
- + [S] Previous section .............. Alt+Up
- + [P] Previous page ................. Alt+PgUp
- + [H] Previous phrase ............... Alt+Left
- + [R] Next phrase ................... Alt+Right
- + [G] Next page ..................... Alt+PgDn
- + [C] Next section .................. Alt+Down
- + [W] Rewind .......................... Ctrl+,
- + [F] Fast forward .................... Ctrl+.
-
- + [T] Tools ............................. Alt+T
- + [U] User profile .................... Ctrl+Alt+S
- + [P] Project preferences ............. Ctrl+Alt+C
- + [A] Audio preferences ............... Ctrl+Alt+A
-
- + [H] Help .............................. Alt+H
- + [C] Contents ........................ F1
- + [V] View help in external browser ... Shift+F1
- + [R] Report bug ...................... Ctrl+Alt+R
- + [A] About Obi ....................... (None)
-
-
-Transport bar
-
- + A .................. Select whole audio in phrase
- + C .................. Preview selected fragment
- + D .................. Return to normal speed
- + E .................. Return to normal speed with lapse back !!!
- + F .................. Increase fast play rate
- + I .................. Navigate to previous section
- + J .................. Navigate to previous phrase
- + K .................. Navigate to next section
- + L .................. Navigate to next phrase
- + O .................. Navigate to next page
- + P .................. Play/pause
- + S .................. Decrease fast play rate
- + Space .............. Play/pause
- + U .................. Navigate to previous page
- + V .................. Preview from current position
- + X .................. Preview up to current position
- + [ .................. Selection begin mark
- + Shift+[ ............ Select from beginning to audio cursor
- + ] .................. Selection end mark
- + Shift+] ............ Select from audio cursor to end
-
-
-Index of shortcuts
-
- + Del ................ Edit > Delete
- + F1 ................. Help > Contents
- + Shift+F1 ........... Help > View help in external browser
- + F2 ................. Sections > Rename section
- + F3 ................. Edit > Find next
- + Shift+F3 ........... Edit > Find previous
- + Alt+F4 ............. File > Exit
- + F6 ................. View > Focus on TOC view
- + F7 ................. View > Focus on content view
- + F8 ................. View > Focus on transport bar
- + F9 ................. Phrases > Assign role > TODO
-+ Ctrl + F9 ... Move to next To do block.
-+ Ctrl + Shift + F9 ... move to prev To do block
- + Alt+Up ............. Transport > Navigation > Previous section
- + Alt+PgUp ........... Transport > Navigation > Previous page
- + Alt+Dn ............. Transport > Navigation > Next section
- + Alt+PgDn ........... Transport > Navigation > Next page
- + Ctrl+Shift+Left .... Sections > Decrease section level
- + Alt+Left ........... Transport > Navigation > Previous phrase
- + Ctrl+Shift+Right ... Sections > Increase section level
- + Alt+Right .......... Transport > Navigation > Next phrase
-+ Space ...... transport> Play selection / pause
- + Ctrl+Space ......... Transport > Play > Stop
- + Ctrl+Shift+Space ... Transport > Play > Play all
- + Ctrl+[ ............. Phrases > In-phrase audio selection > Begin...
- + Ctrl+] ............. Phrases > In-phrase audio selection > End...
- + Ctrl+0 ............. Transport > Fast play > Normal speed
- + Ctrl++ ............. Transport > Fast play > Speed up
- + Ctrl+- ............. Transport > Fast play > Speed down
- + Ctrl+, ............. Transport > Rewind
- + Ctrl+. ............. Transport > Fast forward
-
- + Alt+A .............. Transport menu
- + Ctrl+A ............. FREE [Reserved for select all]
- + Ctrl+Alt+A ......... Tools > Audio preferences
- + Ctrl+B ............. Phrases > Add blank phrase
- + Ctrl+Alt+B ......... View > Show transport bar
- + Ctrl+Shift+B ....... Phrases > Add empty pages
- + Ctrl+C ............. Edit > Copy
- + Ctrl+Alt+C ......... Tools > Ctrl+Alt+C
- + Ctrl+D ............. FREE
- + Alt+E .............. Edit menu
- + Ctrl+E ............. File > Export as DAISY
- + Alt+F .............. File menu
- + Ctrl+F ............. Edit > Find
- + Ctrl+G ............. FREE
- + Alt+H .............. Help menu
- + Ctrl+H ............. FREE
- + Ctrl+I ............. Phrases > Import audio files
- + Ctrl+J ............. Sections > Add section
- + Ctrl+Shift+J ....... Sections > Add subsection
- + Ctrl+Alt+J ......... Sections > Insert section
- + Ctrl+K ............. Phrases > Phrase is used
- + Ctrl+K ............. Sections > Section is used
- + Alt+L .............. Transport bar > Text VU meter left channel
- + Ctrl+L ............. File > Clean project
- + Ctrl+Shift+L ....... Edit > Delete unused data
- + Ctrl+M ............. Phrases > Merge phrase with next
- + Ctrl+Alt+M ......... View > Show metadata view
- + Ctrl+Shift+M ....... Sections > Merge with next section
- + Ctrl+N ............. File > New project
- + Ctrl+Shift+N ....... File > New project from import
- + Ctrl+O ............. File > Open
- + Ctrl+Alt+O ......... View > Show source view
- + Alt+P .............. Phrases menu
- + Ctrl+P ............. Transport > Preview > Preview from...
- + Ctrl+Shift+P ....... Phrases > Apply phrase detection
- + Ctrl+Alt+P ......... View > Show peak meter
- + Ctrl+Q ............. Phrases > Split phrase
- + Ctrl+Shift+Q ....... Sections > Split section
- + Alt+R .............. Transport bar > Text VU meter right channel
- + Ctrl+R ............. Transport > Record > Start monitoring
- + Ctrl+Shift+R ....... Transport > Record > Start recording
- + Ctrl+Alt+R ......... Help > Report bug
- + Alt+S .............. Sections menu
- + Ctrl+S ............. File > Save project
- + Ctrl+Alt+S ......... Tools > User profile
- + Ctrl+Shift+S ....... File > Save project as...
- + Alt+T .............. Tools menu
- + Ctrl+Alt+T ......... View > Show TOC view
- + Ctrl+U ............. Phrases > Mark default custom class
- + Ctrl+Alt+U ......... View > Show status bar
- + Alt+V .............. View menu
- + Ctrl+V ............. Edit > Paste
- + Ctrl+Alt+V ......... Edit > Paste before
- + Ctrl+Shift+V ....... Edit > Paste inside
- + Ctrl+W ............. File > Close project
- + Ctrl+X ............. Edit > Cut
- + Ctrl+Y ............. Edit > Redo
- + Ctrl+Alt+Y ......... View > Synchronize views
- + Ctrl+Z ............. Edit > Undo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ju...@us...> - 2008-05-09 23:26:14
|
Revision: 3037
http://urakawa.svn.sourceforge.net/urakawa/?rev=3037&view=rev
Author: julienq
Date: 2008-05-09 16:26:09 -0700 (Fri, 09 May 2008)
Log Message:
-----------
Metadata view back to functional.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/Commands/Metadata/AddEntry.cs
trunk/urakawa/application/Obi/Obi/Metadata.cs
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/MetadataView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/messages.Designer.cs
trunk/urakawa/application/Obi/Obi/messages.resx
Modified: trunk/urakawa/application/Obi/Obi/Commands/Metadata/AddEntry.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Commands/Metadata/AddEntry.cs 2008-05-09 13:08:22 UTC (rev 3036)
+++ trunk/urakawa/application/Obi/Obi/Commands/Metadata/AddEntry.cs 2008-05-09 23:26:09 UTC (rev 3037)
@@ -21,6 +21,8 @@
mEntry.setName(name);
}
+ public urakawa.metadata.Metadata Entry { get { return mEntry; } }
+
public override void execute()
{
View.Presentation.AddMetadata(mEntry);
Modified: trunk/urakawa/application/Obi/Obi/Metadata.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Metadata.cs 2008-05-09 13:08:22 UTC (rev 3036)
+++ trunk/urakawa/application/Obi/Obi/Metadata.cs 2008-05-09 23:26:09 UTC (rev 3037)
@@ -135,6 +135,14 @@
if (DAISY_ENTRIES.Count == 0) CreateDAISYEntries();
return DAISY_ENTRIES;
}
+
+ /// <summary>
+ /// Get an entry from the list of DAISY entries, or null if custom.
+ /// </summary>
+ public static MetadataEntryDescription GetDAISYEntry(string name)
+ {
+ return GetDAISYEntries().ContainsKey(name) ? GetDAISYEntries()[name] : null;
+ }
/// <summary>
/// Name of the entry.
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-09 13:08:22 UTC (rev 3036)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-09 23:26:09 UTC (rev 3037)
@@ -63,9 +63,6 @@
this.mFindInTextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mFindNextToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mFindPreviousToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
- this.mAddMetadataEntryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.placeholderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mShowTOCViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mShowMetadataViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -302,9 +299,7 @@
this.toolStripSeparator4,
this.mFindInTextToolStripMenuItem,
this.mFindNextToolStripMenuItem,
- this.mFindPreviousToolStripMenuItem,
- this.toolStripSeparator8,
- this.mAddMetadataEntryToolStripMenuItem});
+ this.mFindPreviousToolStripMenuItem});
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
//
@@ -401,24 +396,6 @@
resources.ApplyResources(this.mFindPreviousToolStripMenuItem, "mFindPreviousToolStripMenuItem");
this.mFindPreviousToolStripMenuItem.Click += new System.EventHandler(this.mFindPreviousToolStripMenuItem_Click);
//
- // toolStripSeparator8
- //
- this.toolStripSeparator8.Name = "toolStripSeparator8";
- resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
- //
- // mAddMetadataEntryToolStripMenuItem
- //
- this.mAddMetadataEntryToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.placeholderToolStripMenuItem});
- this.mAddMetadataEntryToolStripMenuItem.Name = "mAddMetadataEntryToolStripMenuItem";
- resources.ApplyResources(this.mAddMetadataEntryToolStripMenuItem, "mAddMetadataEntryToolStripMenuItem");
- this.mAddMetadataEntryToolStripMenuItem.DropDownOpening += new System.EventHandler(this.mAddMetadataEntryToolStripMenuItem_DropDownOpening);
- //
- // placeholderToolStripMenuItem
- //
- this.placeholderToolStripMenuItem.Name = "placeholderToolStripMenuItem";
- resources.ApplyResources(this.placeholderToolStripMenuItem, "placeholderToolStripMenuItem");
- //
// mViewToolStripMenuItem
//
this.mViewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1228,9 +1205,6 @@
private System.Windows.Forms.ToolStripMenuItem BeginInPhraseSelectionToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem EndInPhraseSelectionToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem DeselectInPhraseSelectionToolStripMenuItem;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
- private System.Windows.Forms.ToolStripMenuItem mAddMetadataEntryToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem placeholderToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem MarkDefaultCustomClassToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mTodoClasstoolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-09 13:08:22 UTC (rev 3036)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-09 23:26:09 UTC (rev 3037)
@@ -315,7 +315,6 @@
mFindInTextToolStripMenuItem.Enabled = mSession.HasProject;
mFindNextToolStripMenuItem.Enabled = mProjectView.CanFindNextPreviousText;
mFindPreviousToolStripMenuItem.Enabled = mProjectView.CanFindNextPreviousText;
- mAddMetadataEntryToolStripMenuItem.Enabled = mProjectView.CanAddMetadataEntry();
}
private void mUndoToolStripMenuItem_Click(object sender, EventArgs e) { Undo(); }
@@ -1573,22 +1572,6 @@
}
}
- private void mAddMetadataEntryToolStripMenuItem_DropDownOpening(object sender, EventArgs e)
- {
- mAddMetadataEntryToolStripMenuItem.DropDownItems.Clear();
- foreach (string name in mProjectView.AddableMetadataNames)
- {
- string n = name;
- ToolStripMenuItem item = new ToolStripMenuItem();
- item.Text = n;
- item.Click += new EventHandler(delegate(object _sender, EventArgs _e)
- {
- mProjectView.AddMetadataEntry(n);
- });
- mAddMetadataEntryToolStripMenuItem.DropDownItems.Add(item);
- }
- }
-
private void mAllowOverwriteToolStripMenuItem_CheckedChanged(object sender, EventArgs e)
{
AllowOverwrite = mAllowOverwriteToolStripMenuItem.Checked;
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-09 13:08:22 UTC (rev 3036)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-09 23:26:09 UTC (rev 3037)
@@ -365,21 +365,6 @@
<data name="mFindPreviousToolStripMenuItem.Text" xml:space="preserve">
<value>Find pre&vious</value>
</data>
- <data name="toolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
- <value>232, 6</value>
- </data>
- <data name="placeholderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>137, 22</value>
- </data>
- <data name="placeholderToolStripMenuItem.Text" xml:space="preserve">
- <value>(placeholder)</value>
- </data>
- <data name="mAddMetadataEntryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="mAddMetadataEntryToolStripMenuItem.Text" xml:space="preserve">
- <value>Add &metadata entry</value>
- </data>
<data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 20</value>
</data>
@@ -1162,7 +1147,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.6.19523, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.6.43172, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1636,24 +1621,6 @@
<data name=">>mFindPreviousToolStripMenuItem.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=">>toolStripSeparator8.Name" xml:space="preserve">
- <value>toolStripSeparator8</value>
- </data>
- <data name=">>toolStripSeparator8.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>mAddMetadataEntryToolStripMenuItem.Name" xml:space="preserve">
- <value>mAddMetadataEntryToolStripMenuItem</value>
- </data>
- <data name=">>mAddMetadataEntryToolStripMenuItem.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=">>placeholderToolStripMenuItem.Name" xml:space="preserve">
- <value>placeholderToolStripMenuItem</value>
- </data>
- <data name=">>placeholderToolStripMenuItem.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=">>mViewToolStripMenuItem.Name" xml:space="preserve">
<value>mViewToolStripMenuItem</value>
</data>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs 2008-05-09 13:08:22 UTC (rev 3036)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs 2008-05-09 23:26:09 UTC (rev 3037)
@@ -56,8 +56,12 @@
|
|
From: <ju...@us...> - 2008-05-09 13:08:31
|
Revision: 3036
http://urakawa.svn.sourceforge.net/urakawa/?rev=3036&view=rev
Author: julienq
Date: 2008-05-09 06:08:22 -0700 (Fri, 09 May 2008)
Log Message:
-----------
Changed "add section" shortcuts from Ctrl+J to Ctrl+H.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ObiForm.resx
trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs
Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-09 09:53:45 UTC (rev 3035)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-09 13:08:22 UTC (rev 3036)
@@ -117,10 +117,10 @@
<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="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing">
+ <metadata name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>0, 0</value>
- </data>
+ </metadata>
+ <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>
@@ -489,7 +489,7 @@
<value>&View</value>
</data>
<data name="mAddSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+J</value>
+ <value>Ctrl+H</value>
</data>
<data name="mAddSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>265, 22</value>
@@ -498,7 +498,7 @@
<value>&Add section</value>
</data>
<data name="mAddSubsectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Shift+J</value>
+ <value>Ctrl+Shift+H</value>
</data>
<data name="mAddSubsectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>265, 22</value>
@@ -507,7 +507,7 @@
<value>Add &subsection</value>
</data>
<data name="mInsertSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
- <value>Ctrl+Alt+J</value>
+ <value>Ctrl+Alt+H</value>
</data>
<data name="mInsertSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>265, 22</value>
@@ -756,7 +756,7 @@
<value>Ctrl+Shift+Space</value>
</data>
<data name="mPlayAllToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>175, 22</value>
+ <value>198, 22</value>
</data>
<data name="mPlayAllToolStripMenuItem.Text" xml:space="preserve">
<value>Play &all</value>
@@ -765,7 +765,7 @@
<value>Space</value>
</data>
<data name="mPlaySelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>175, 22</value>
+ <value>198, 22</value>
</data>
<data name="mPlaySelectionToolStripMenuItem.Text" xml:space="preserve">
<value>Play &selection</value>
@@ -1113,9 +1113,9 @@
<data name=">>mMenuStrip.ZOrder" xml:space="preserve">
<value>2</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="mStatusLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>0, 17</value>
</data>
@@ -1162,7 +1162,7 @@
<value>mProjectView</value>
</data>
<data name=">>mProjectView.Type" xml:space="preserve">
- <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.6.25568, Culture=neutral, PublicKeyToken=null</value>
+ <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.6.19523, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>mProjectView.Parent" xml:space="preserve">
<value>$this</value>
@@ -1170,9 +1170,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>
@@ -1435,9 +1435,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>
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs 2008-05-09 09:53:45 UTC (rev 3035)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/MetadataView.cs 2008-05-09 13:08:22 UTC (rev 3036)
@@ -106,6 +106,8 @@
|
|
From: <ju...@us...> - 2008-05-09 09:53:48
|
Revision: 3035
http://urakawa.svn.sourceforge.net/urakawa/?rev=3035&view=rev
Author: julienq
Date: 2008-05-09 02:53:45 -0700 (Fri, 09 May 2008)
Log Message:
-----------
Fixed spacebar bug that I introduced by mistake :(
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-08 10:49:23 UTC (rev 3034)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-09 09:53:45 UTC (rev 3035)
@@ -1172,7 +1172,7 @@
{
return (key == (Keys)(Keys.Control | Keys.Tab) && SelectViewsInCycle(true)) ||
(key == (Keys)(Keys.Control | Keys.Shift | Keys.Tab) && SelectViewsInCycle(false)) ||
- (key == Keys.Space) ||
+ (key == Keys.Space && TogglePlayPause()) ||
base.ProcessCmdKey(ref msg, key);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-08 10:49:34
|
Revision: 3034
http://urakawa.svn.sourceforge.net/urakawa/?rev=3034&view=rev
Author: avneeshsingh
Date: 2008-05-08 03:49:23 -0700 (Thu, 08 May 2008)
Log Message:
-----------
Installer - Removed licence shortcut from program menu: by mistake added directly to program menu.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Setup/Licences/License.rtf
trunk/urakawa/application/Obi/Setup/Setup.vdproj
Modified: trunk/urakawa/application/Obi/Setup/Licences/License.rtf
===================================================================
--- trunk/urakawa/application/Obi/Setup/Licences/License.rtf 2008-05-08 09:15:59 UTC (rev 3033)
+++ trunk/urakawa/application/Obi/Setup/Licences/License.rtf 2008-05-08 10:49:23 UTC (rev 3034)
@@ -1,5 +1,5 @@
{\rtf1\adeflang1081\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch11\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1041{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\f11\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt ?l?r ??\'81\'66c};}{\f36\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}@MS Mincho;}{\f37\froman\fcharset238\fprq2 Times New Roman CE;}
+{\f11\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt ?l?r ??\'81\'66c};}{\f36\fmodern\fcharset128\fprq1{\*\panose 00000000000000000000}@MS Mincho;}{\f37\froman\fcharset238\fprq2 Times New Roman CE;}
{\f38\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f40\froman\fcharset161\fprq2 Times New Roman Greek;}{\f41\froman\fcharset162\fprq2 Times New Roman Tur;}{\f42\froman\fcharset177\fprq2 Times New Roman (Hebrew);}
{\f43\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f44\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f45\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f149\fmodern\fcharset0\fprq1 MS Mincho Western{\*\falt ?l?r ??\'81\'66c};}
{\f147\fmodern\fcharset238\fprq1 MS Mincho CE{\*\falt ?l?r ??\'81\'66c};}{\f148\fmodern\fcharset204\fprq1 MS Mincho Cyr{\*\falt ?l?r ??\'81\'66c};}{\f150\fmodern\fcharset161\fprq1 MS Mincho Greek{\*\falt ?l?r ??\'81\'66c};}
@@ -10,8 +10,8 @@
\fs24\lang1033\langfe1041\loch\f0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fcs1 \af0\afs20 \fcs0 \fs20\lang1024\langfe1024\loch\f0\hich\af0\dbch\af11\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}}
-{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid621581\rsid3475521\rsid3757280\rsid5397031\rsid6313309\rsid9072953\rsid11604130\rsid15096070\rsid15611445}{\*\generator Microsoft Word 11.0.5604;}{\info{\author hp}{\operator hp}
-{\creatim\yr2008\mo4\dy22\hr12\min51}{\revtim\yr2008\mo5\dy5\hr23\min29}{\version6}{\edmins5}{\nofpages4}{\nofwords1223}{\nofchars6976}{\*\company hp}{\nofcharsws8183}{\vern24689}}
+{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid621581\rsid3475521\rsid3757280\rsid5397031\rsid6313309\rsid9072953\rsid10958120\rsid11604130\rsid15096070\rsid15611445}{\*\generator Microsoft Word 11.0.5604;}{\info{\author hp}{\operator hp}
+{\creatim\yr2008\mo4\dy22\hr12\min51}{\revtim\yr2008\mo5\dy8\hr16\min15}{\version7}{\edmins5}{\nofpages4}{\nofwords1223}{\nofchars6976}{\*\company hp}{\nofcharsws8183}{\vern24689}}
\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow1\dgvshow1
\jexpand\viewkind5\viewscale88\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\viewnobound1\snaptogridincell\allowfieldendsel
\wrppunct\asianbrkrule\nojkernpunct\rsidroot15096070 \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3
@@ -24,185 +24,176 @@
\par \hich\af0\dbch\af11\loch\f0 (at your option) \hich\af0\dbch\af11\loch\f0 any later version.
\par
\par \hich\af0\dbch\af11\loch\f0 This program is distributed in the hope that it will be useful,
-\par \hich\af0\dbch\af11\loch\f0 but WITHOUT ANY WARRANTY; without even the implied warranty of
-\par \hich\af0\dbch\af11\loch\f0 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-\par \hich\af0\dbch\af11\loch\f0 GNU General Public License }{\fcs1 \af0 \fcs0 \insrsid3475521 \hich\af0\dbch\af11\loch\f0 below }{\fcs1 \af0 \fcs0 \insrsid9072953 \hich\af0\dbch\af11\loch\f0 for more details.
-\par }{\fcs1 \af0 \fcs0 \insrsid6313309 \hich\af0\dbch\af11\loch\f0 This \hich\af0\dbch\af11\loch\f0 l}{\fcs1 \af0 \fcs0 \insrsid15611445 \hich\af0\dbch\af11\loch\f0 icense}{\fcs1 \af0 \fcs0 \insrsid3475521 \hich\af0\dbch\af11\loch\f0
- can also be obtained from \hich\af0\dbch\af11\loch\f0
+\par \hich\af0\dbch\af11\loch\f0 but WITHOUT ANY WARRANTY; without even the implied warranty of}{\fcs1 \af0 \fcs0 \insrsid10958120 \hich\af0\dbch\af11\loch\f0 }{\fcs1 \af0 \fcs0 \insrsid9072953 \hich\af0\dbch\af11\loch\f0
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+\par \hich\af0\dbch\af11\loch\f0 GNU General Public License }{\fcs1 \af0 \fcs0 \insrsid3475521 \hich\af0\dbch\af11\loch\f0 below }{\fcs1 \af0 \fcs0 \insrsid9072953 \hich\af0\dbch\af11\loch\f0 for more detai\hich\af0\dbch\af11\loch\f0 ls.
+\par }{\fcs1 \af0 \fcs0 \insrsid6313309 \hich\af0\dbch\af11\loch\f0 This l}{\fcs1 \af0 \fcs0 \insrsid15611445 \hich\af0\dbch\af11\loch\f0 icense}{\fcs1 \af0 \fcs0 \insrsid3475521 \hich\af0\dbch\af11\loch\f0 can also be obtained from
\par }{\fcs1 \af0 \fcs0 \insrsid9072953 \hich\af0\dbch\af11\loch\f0 <http://www.gnu.org/licenses/>.}{\fcs1 \af0 \fcs0 \insrsid5397031
\par }{\fcs1 \af0 \fcs0 \insrsid3475521
\par
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3475521 {\fcs1 \af0 \fcs0 \insrsid3475521 \tab \tab \hich\af0\dbch\af11\loch\f0 GNU LESSER GENERAL PUBLIC LICENSE
-\par \hich\af0\dbch\af11\loch\f0 Version \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 29\hich\af0\dbch\af11\loch\f0 June \hich\af0\dbch\af11\loch\f0 2007
+\par \hich\af0\dbch\af11\loch\f0 Version 3, 29 June 2007
\par
-\par \hich\af0\dbch\af11\loch\f0 Copyright \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 C\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 2007\hich\af0\dbch\af11\loch\f0 Free Software Foundation\hich\af0\dbch\af11\loch\f0 ,
-\hich\af0\dbch\af11\loch\f0 Inc\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 <\hich\af0\dbch\af11\loch\f0 http\hich\af0\dbch\af11\loch\f0 ://\hich\af0\dbch\af11\loch\f0 fsf\hich\af0\dbch\af11\loch\f0 .\hich\af0\dbch\af11\loch\f0 org
-\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 >
-\par \hich\af0\dbch\af11\loch\f0 Everyone is permitted to copy and distribute verbatim copies
-\par \hich\af0\dbch\af11\loch\f0 of this license document\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but changi\hich\af0\dbch\af11\loch\f0 ng it is not allowed\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+\par \hich\af0\dbch\af11\loch\f0 Everyone is permitte\hich\af0\dbch\af11\loch\f0 d to copy and distribute verbatim copies
+\par \hich\af0\dbch\af11\loch\f0 of this license document, but changing it is not allowed.
\par
\par
\par \hich\af0\dbch\af11\loch\f0 This version of the GNU Lesser General Public License incorporates
-\par \hich\af0\dbch\af11\loch\f0 the terms and conditions of version \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the GNU General Public
-\par \hich\af0\dbch\af11\loch\f0 License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 supplemented by the additional permissions listed below\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 the terms and conditions of version 3 of the GNU General Public
+\par \hich\af0\dbch\af11\loch\f0 License, supplemented\hich\af0\dbch\af11\loch\f0 by the additional permissions listed below.
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 0\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Additional Definitions\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 0. Additional Definitions.
\par
-\par \hich\af0\dbch\af11\loch\f0 As used herein\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 this License\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 refers to version \hich\af0\dbch\af11\loch\f0 3
-\hich\af0\dbch\af11\loch\f0 of the GNU Lesser
-\par \hich\af0\dbch\af11\loch\f0 General Public License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and the \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 GNU GPL\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0
-refers to version \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the GNU
-\par \hich\af0\dbch\af11\loch\f0 General Public License\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 As used herein, "this License" refers to version 3 of the GNU Lesser
+\par \hich\af0\dbch\af11\loch\f0 General Public License, and the "GNU GPL" refers to version 3 of the GNU
+\par \hich\af0\dbch\af11\loch\f0 General Public License.
\par
-\par \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 The Library\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 refers to a covered work governed by this License\hich\af0\dbch\af11\loch\f0 ,
-\par \hich\af0\dbch\af11\loch\f0 other than an Applic\hich\af0\dbch\af11\loch\f0 ation or a Combined Work as defined below\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 The Library" refers to a covered work governed by this License,
+\par \hich\af0\dbch\af11\loch\f0 other than an Application or a Combined Work as defined below.
\par
-\par \hich\af0\dbch\af11\loch\f0 An \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Application\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 is any work that makes use of an interface provided
-\par \hich\af0\dbch\af11\loch\f0 by the Library\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but which is not otherwise based on the Library\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 An "Application" is any work that makes use of an interface provided
+\par \hich\af0\dbch\af11\loch\f0 by the Library, but which is not otherwise based on the L\hich\af0\dbch\af11\loch\f0 ibrary.
\par \hich\af0\dbch\af11\loch\f0 Defining a subclass of a class defined by the Library is deemed a mode
-\par \hich\af0\dbch\af11\loch\f0 of us\hich\af0\dbch\af11\loch\f0 ing an interface provided by the Library\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 of using an interface provided by the Library.
\par
-\par \hich\af0\dbch\af11\loch\f0 A \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Combined Work\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 is a work produced by combining or linking an
-\par \hich\af0\dbch\af11\loch\f0 Application with the Library\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 The particular version of the Library
-\par \hich\af0\dbch\af11\loch\f0 with which the Combined Work was made is also called the \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Linked
-\par \hich\af0\dbch\af11\loch\f0 Version\hich\af0\dbch\af11\loch\f0 ".
+\par \hich\af0\dbch\af11\loch\f0 A "Combined Work" is a work produced by combining or linking an
+\par \hich\af0\dbch\af11\loch\f0 Application with the Library. The particular version of the Li\hich\af0\dbch\af11\loch\f0 brary
+\par \hich\af0\dbch\af11\loch\f0 with which the Combined Work was made is also called the "Linked
+\par \hich\af0\dbch\af11\loch\f0 Version".
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 The \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Minimal Corresponding Source\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 for a Combined Work means the
-\par \hich\af0\dbch\af11\loch\f0 Corresponding Source for the Combined Work\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 excluding any source code
-\par \hich\af0\dbch\af11\loch\f0 for portions of the Combined Work that\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 considered in isolation\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 are
-\par \hich\af0\dbch\af11\loch\f0 based on the Application\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and not on the Linked Vers\hich\af0\dbch\af11\loch\f0 ion\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 The "Minimal Corresponding Source" for a Combined Work means the
+\par \hich\af0\dbch\af11\loch\f0 Corresponding Source for the Combined Work, excluding any source code
+\par \hich\af0\dbch\af11\loch\f0 for portions of the Combined Work tha\hich\af0\dbch\af11\loch\f0 t, considered in isolation, are
+\par \hich\af0\dbch\af11\loch\f0 based on the Application, and not on the Linked Version.
\par
-\par \hich\af0\dbch\af11\loch\f0 The \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Corresponding Application Code\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 for a Combined Work means the
-\par \hich\af0\dbch\af11\loch\f0 object code and\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 or source code for the Application\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 including any data
-\par \hich\af0\dbch\af11\loch\f0 and utility programs needed for reproducing the Combined Work from the
-\par \hich\af0\dbch\af11\loch\f0 Application\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but excluding the System L\hich\af0\dbch\af11\loch\f0 ibraries of the Combined Work\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 The "Corresponding Application Code" for a Combined Work means the
+\par \hich\af0\dbch\af11\loch\f0 object code and/or source code for the Application, including any data
+\par \hich\af0\dbch\af11\loch\f0 and utility programs neede\hich\af0\dbch\af11\loch\f0 d for reproducing the Combined Work from the
+\par \hich\af0\dbch\af11\loch\f0 Application, but excluding the System Libraries of the Combined Work.
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 1\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Exception to Section \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the GNU GPL\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 1. Exception to Section 3 of the GNU GPL.
\par
-\par \hich\af0\dbch\af11\loch\f0 You may convey a covered work under sections \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 and \hich\af0\dbch\af11\loch\f0 4\hich\af0\dbch\af11\loch\f0 of this License
-\par \hich\af0\dbch\af11\loch\f0 without being bound by section \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the GNU GPL\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 You may convey a covered work under sections 3 and 4 of this License
+\par \hich\af0\dbch\af11\loch\f0 without being bound by s\hich\af0\dbch\af11\loch\f0 ection 3 of the GNU GPL.
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 2\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Conveying Modified Versions\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 2. Conveying Modified Versions.
\par
-\par \hich\af0\dbch\af11\loch\f0 If you modify a copy of the Library\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 in your modifications\hich\af0\dbch\af11\loch\f0 ,
-\hich\af0\dbch\af11\loch\f0 a
+\par \hich\af0\dbch\af11\loch\f0 If you modify a copy of the Library, and, in your modifications, a
\par \hich\af0\dbch\af11\loch\f0 facility refers to a function or data to be supplied by an Application
-\par \hich\af0\dbch\af11\loch\f0 that uses the facility \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 other than as an argument passed when the
-\par \hich\af0\dbch\af11\loch\f0 facility is invoked\hich\af0\dbch\af11\loch\f0 )\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 then you may convey a copy o\hich\af0\dbch\af11\loch\f0 f the modified
-\par \hich\af0\dbch\af11\loch\f0 version\hich\af0\dbch\af11\loch\f0 :
+\par \hich\af0\dbch\af11\loch\f0 that uses the facility (\hich\af0\dbch\af11\loch\f0 other than as an argument passed when the
+\par \hich\af0\dbch\af11\loch\f0 facility is invoked), then you may convey a copy of the modified
+\par \hich\af0\dbch\af11\loch\f0 version:
\par
-\par \hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 under this License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 provided that you make a good faith effort to
-\par \hich\af0\dbch\af11\loch\f0 ensure that\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 in the event an Application does not supply the
-\par \hich\af0\dbch\af11\loch\f0 function or data\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 the facility still operates\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and performs
-\par \hich\af0\dbch\af11\loch\f0 whatever part of its purpose \hich\af0\dbch\af11\loch\f0 remains meaningful\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 or
+\par \hich\af0\dbch\af11\loch\f0 a) under this License, provided that you make a good faith effort to
+\par \hich\af0\dbch\af11\loch\f0 ensure that, in the event an Application does not supply the
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 function or data, the facility still operates, and performs
+\par \hich\af0\dbch\af11\loch\f0 whatever part of its purpose remains meaningful, or
\par
-\par \hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 under the GNU GPL\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 with none of the additional permissions of
-\par \hich\af0\dbch\af11\loch\f0 this License applicable to that copy\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 b) under the GNU GPL, with none of the additional permissions of
+\par \hich\af0\dbch\af11\loch\f0 this License applicable to that copy.
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Object Code Incorporating Material from Library Header Files\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 3. Object Code Incorporating\hich\af0\dbch\af11\loch\f0 Material from Library Header Files.
\par
-\par \hich\af0\dbch\af11\loch\f0 The object code form of an Application may incorpora\hich\af0\dbch\af11\loch\f0 te material from
-\par \hich\af0\dbch\af11\loch\f0 a header file that is part of the Library\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 You may convey such object
-\par \hich\af0\dbch\af11\loch\f0 code under terms of your choice\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 provided that\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 if the incorporated
-\par \hich\af0\dbch\af11\loch\f0 material is not limited to numerical parameters\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 data structure
-\par \hich\af0\dbch\af11\loch\f0 layouts and accessors\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 or small macr\hich\af0\dbch\af11\loch\f0 os\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 inline functions and templates
-\par \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 ten or fewer lines in length\hich\af0\dbch\af11\loch\f0 )\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 you do both of the following\hich\af0\dbch\af11\loch\f0 :
+\par \hich\af0\dbch\af11\loch\f0 The object code form of an Application may incorporate material from
+\par \hich\af0\dbch\af11\loch\f0 a header file that is part of the Library. You may convey such object
+\par \hich\af0\dbch\af11\loch\f0 code under terms of your choice, provided that, if the incorporated
+\par \hich\af0\dbch\af11\loch\f0 material\hich\af0\dbch\af11\loch\f0 is not limited to numerical parameters, data structure
+\par \hich\af0\dbch\af11\loch\f0 layouts and accessors, or small macros, inline functions and templates
+\par \hich\af0\dbch\af11\loch\f0 (ten or fewer lines in length), you do both of the following:
\par
-\par \hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Give prominent notice with each copy of the object code that the
+\par \hich\af0\dbch\af11\loch\f0 a) Give prominent notice with each copy of the object code that\hich\af0\dbch\af11\loch\f0 the
\par \hich\af0\dbch\af11\loch\f0 Library is used in it and that the Library and its use are
-\par \hich\af0\dbch\af11\loch\f0 covered by this License\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 covered by this License.
\par
-\par \hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Accompany the object code with a copy of the GNU GPL and this license
-\par \hich\af0\dbch\af11\loch\f0 document\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 b) Accompany the object code with a copy of the GNU GPL and this license
+\par \hich\af0\dbch\af11\loch\f0 document.
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 4\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Combined Works\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 4. Combined Works.
\par
-\par \hich\af0\dbch\af11\loch\f0 You may convey a Combined Work under terms of your choice that\hich\af0\dbch\af11\loch\f0 ,
-\par \hich\af0\dbch\af11\loch\f0 taken together\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 effectively do not restrict modif\hich\af0\dbch\af11\loch\f0 ication of the
+\par \hich\af0\dbch\af11\loch\f0 You may convey a Combined Work under terms of your choice that,
+\par \hich\af0\dbch\af11\loch\f0 taken together, effectively do not restrict modification of the
\par \hich\af0\dbch\af11\loch\f0 portions of the Library contained in the Combined Work and reverse
-\par \hich\af0\dbch\af11\loch\f0 engineering for debugging such modifications\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 if you also do each of
-\par \hich\af0\dbch\af11\loch\f0 the following\hich\af0\dbch\af11\loch\f0 :
+\par \hich\af0\dbch\af11\loch\f0 engineering for debugging such modifications, if you also d\hich\af0\dbch\af11\loch\f0 o each of
+\par \hich\af0\dbch\af11\loch\f0 the following:
\par
-\par \hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Give prominent notice with each copy of the Combined Work that
-\par \hich\af0\dbch\af11\loch\f0 the Library is us\hich\af0\dbch\af11\loch\f0 ed in it and that the Library and its use are
-\par \hich\af0\dbch\af11\loch\f0 covered by this License\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 a) Give prominent notice with each copy of the Combined Work that
+\par \hich\af0\dbch\af11\loch\f0 the Library is used in it and that the Library and its use are
+\par \hich\af0\dbch\af11\loch\f0 covered by this License.
\par
-\par \hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Accompany the Combined Work with a copy of the GNU GPL and this license
-\par \hich\af0\dbch\af11\loch\f0 document\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 b) Accompany the Combined Work with a copy of the GNU GPL and t\hich\af0\dbch\af11\loch\f0 his license
+\par \hich\af0\dbch\af11\loch\f0 document.
\par
-\par \hich\af0\dbch\af11\loch\f0 c\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 For a Combined Work that displays copyright notices during
-\par \hich\af0\dbch\af11\loch\f0 execution\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 include th\hich\af0\dbch\af11\loch\f0 e copyright notice for the Library among
-\par \hich\af0\dbch\af11\loch\f0 these notices\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 as well as a reference directing the user to the
-\par \hich\af0\dbch\af11\loch\f0 copies of the GNU GPL and this license document\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 c) For a Combined Work that displays copyright notices during
+\par \hich\af0\dbch\af11\loch\f0 execution, include the copyright notice for the Library among
+\par \hich\af0\dbch\af11\loch\f0 these notices, as well as a reference directing the user to the
+\par \hich\af0\dbch\af11\loch\f0 copies of the GNU GPL and this\hich\af0\dbch\af11\loch\f0 license document.
\par
-\par \hich\af0\dbch\af11\loch\f0 d\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Do one of the following\hich\af0\dbch\af11\loch\f0 :
+\par \hich\af0\dbch\af11\loch\f0 d) Do one of the following:
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 0\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Convey the Minimal Corresponding Source under the ter\hich\af0\dbch\af11\loch\f0 ms of this
-\par \hich\af0\dbch\af11\loch\f0 License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and the Corresponding Application Code in a form
-\par \hich\af0\dbch\af11\loch\f0 suitable for\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and under terms that permit\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 the user to
+\par \hich\af0\dbch\af11\loch\f0 0) Convey the Minimal Corresponding Source under the terms of this
+\par \hich\af0\dbch\af11\loch\f0 License, and the Corresponding Application Code in a form
+\par \hich\af0\dbch\af11\loch\f0 suitable for, and under terms that permit, the user to
\par \hich\af0\dbch\af11\loch\f0 recombine or relink the Application with a modified version of
-\par \hich\af0\dbch\af11\loch\f0 the Linked Version to produce a modified Combined Work\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 in the
-\par \hich\af0\dbch\af11\loch\f0 manner specified by section \hich\af0\dbch\af11\loch\f0 6\hich\af0\dbch\af11\loch\f0 of the GNU GPL for conveying
-\par \hich\af0\dbch\af11\loch\f0 Corresponding Source\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 the Linked Version to produce a modified Combined Work, in the
+\par \hich\af0\dbch\af11\loch\f0 manner specified by section 6 of the GNU GPL for conveying
+\par \hich\af0\dbch\af11\loch\f0 Corresponding Source.
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 1\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Use a suitable shared library mechanism for linking with the
-\par \hich\af0\dbch\af11\loch\f0 Library\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 A \hich\af0\dbch\af11\loch\f0 suitable mechanism is one that \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 )
-\hich\af0\dbch\af11\loch\f0 uses at run time
-\par \hich\af0\dbch\af11\loch\f0 a copy of the Library already present on the user\hich\af0\dbch\af11\loch\f0 '\hich\af0\dbch\af11\loch\f0 s computer
-\par \hich\af0\dbch\af11\loch\f0 system\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0
-will operate properly with a modified version
-\par \hich\af0\dbch\af11\loch\f0 of the Library that is interface\hich\af0\dbch\af11\loch\f0 -\hich\af0\dbch\af11\loch\f0 compatible with the Linked
-\par \hich\af0\dbch\af11\loch\f0 Version\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 1) Use a suit\hich\af0\dbch\af11\loch\f0 able shared library mechanism for linking with the
+\par \hich\af0\dbch\af11\loch\f0 Library. A suitable mechanism is one that (a) uses at run time
+\par \hich\af0\dbch\af11\loch\f0 a copy of the Library already present on the user's computer
+\par \hich\af0\dbch\af11\loch\f0 system, and (b) will operate properly with a modified versi\hich\af0\dbch\af11\loch\f0 on
+\par \hich\af0\dbch\af11\loch\f0 of the Library that is interface-compatible with the Linked
+\par \hich\af0\dbch\af11\loch\f0 Version.
\par
-\par \hich\af0\dbch\af11\loch\f0 e\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Provide Installation Information\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but only if you would otherwise
-\par \hich\af0\dbch\af11\loch\f0 be required to provide such information under section \hich\af0\dbch\af11\loch\f0 6\hich\af0\dbch\af11\loch\f0 of the
-\par \hich\af0\dbch\af11\loch\f0 GNU GPL\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and only to the extent that such information is
-\par \hich\af0\dbch\af11\loch\f0 necessary to install and execute a mo\hich\af0\dbch\af11\loch\f0 dified version of the
+\par \hich\af0\dbch\af11\loch\f0 e) Provide Installation Information, but only if you would otherwise
+\par \hich\af0\dbch\af11\loch\f0 be required to provide such information under section 6 of the
+\par \hich\af0\dbch\af11\loch\f0 GNU GPL, and only to the ex\hich\af0\dbch\af11\loch\f0 tent that such information is
+\par \hich\af0\dbch\af11\loch\f0 necessary to install and execute a modified version of the
\par \hich\af0\dbch\af11\loch\f0 Combined Work produced by recombining or relinking the
-\par \hich\af0\dbch\af11\loch\f0 Application with a modified version of the Linked Version\hich\af0\dbch\af11\loch\f0 . (\hich\af0\dbch\af11\loch\f0 If
-\par \hich\af0\dbch\af11\loch\f0 you use option \hich\af0\dbch\af11\loch\f0 4\hich\af0\dbch\af11\loch\f0 d\hich\af0\dbch\af11\loch\f0 0\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 the Installation Information must accompany
-\par \hich\af0\dbch\af11\loch\f0 the Minimal Corresponding Source and Cor\hich\af0\dbch\af11\loch\f0 responding Application
-\par \hich\af0\dbch\af11\loch\f0 Code\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 If you use option \hich\af0\dbch\af11\loch\f0 4\hich\af0\dbch\af11\loch\f0 d\hich\af0\dbch\af11\loch\f0 1\hich\af0\dbch\af11\loch\f0 ,
-\hich\af0\dbch\af11\loch\f0 you must provide the Installation
-\par \hich\af0\dbch\af11\loch\f0 Information in the manner specified by section \hich\af0\dbch\af11\loch\f0 6\hich\af0\dbch\af11\loch\f0 of the GNU GPL
-\par \hich\af0\dbch\af11\loch\f0 for conveying Corresponding Source\hich\af0\dbch\af11\loch\f0 .)
+\par \hich\af0\dbch\af11\loch\f0 Application with a modified version of the Linked Version. (If
+\par \hich\af0\dbch\af11\loch\f0 you use option 4d0, the Installation \hich\af0\dbch\af11\loch\f0 Information must accompany
+\par \hich\af0\dbch\af11\loch\f0 the Minimal Corresponding Source and Corresponding Application
+\par \hich\af0\dbch\af11\loch\f0 Code. If you use option 4d1, you must provide the Installation
+\par \hich\af0\dbch\af11\loch\f0 Information in the manner specified by section 6 of the GNU GPL
+\par \hich\af0\dbch\af11\loch\f0 for conveying Corresponding\hich\af0\dbch\af11\loch\f0 Source.)
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 5\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Combined Libraries\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 5. Combined Libraries.
\par
-\par \hich\af0\dbch\af11\loch\f0 You may place library facilitie\hich\af0\dbch\af11\loch\f0 s that are a work based on the
+\par \hich\af0\dbch\af11\loch\f0 You may place library facilities that are a work based on the
\par \hich\af0\dbch\af11\loch\f0 Library side by side in a single library together with other library
\par \hich\af0\dbch\af11\loch\f0 facilities that are not Applications and are not covered by this
-\par \hich\af0\dbch\af11\loch\f0 License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and convey such a combined library under terms of your
-\par \hich\af0\dbch\af11\loch\f0 choice\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 if you do both of the following\hich\af0\dbch\af11\loch\f0 :
+\par \hich\af0\dbch\af11\loch\f0 License, \hich\af0\dbch\af11\loch\f0 and convey such a combined library under terms of your
+\par \hich\af0\dbch\af11\loch\f0 choice, if you do both of the following:
\par
-\par \hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Accompany the combined library with a copy of the same work based
-\par \hich\af0\dbch\af11\loch\f0 on the Library\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 uncombined with any other library facilities\hich\af0\dbch\af11\loch\f0 ,
-\par \hich\af0\dbch\af11\loch\f0 conveyed under the terms of this License\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 a) Accompany the combined library with a copy of the same work based
+\par \hich\af0\dbch\af11\loch\f0 on the Library, uncombined with any other library facilities,
+\par \hich\af0\dbch\af11\loch\f0 conveyed under the \hich\af0\dbch\af11\loch\f0 terms of this License.
\par
-\par \hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Give prominent notice wit\hich\af0\dbch\af11\loch\f0 h the combined library that part of it
-\par \hich\af0\dbch\af11\loch\f0 is a work based on the Library\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and explaining where to find the
-\par \hich\af0\dbch\af11\loch\f0 accompanying uncombined form of the same work\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 b) Give prominent notice with the combined library that part of it
+\par \hich\af0\dbch\af11\loch\f0 is a work based on the Library, and explaining where to find the
+\par \hich\af0\dbch\af11\loch\f0 accompanying uncombined form of the same work.
\par
-\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 6\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Revised Versions of the GNU Lesser General Public License\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 6. Revised Versions of the GNU Lesser Gen\hich\af0\dbch\af11\loch\f0 eral Public License.
\par
-\par \hich\af0\dbch\af11\loch\f0 The Free Software Foundation ma\hich\af0\dbch\af11\loch\f0 y publish revised and\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 or new versions
-\par \hich\af0\dbch\af11\loch\f0 of the GNU Lesser General Public License from time to time\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Such new
-\par \hich\af0\dbch\af11\loch\f0 versions will be similar in spirit to the present version\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but may
-\par \hich\af0\dbch\af11\loch\f0 differ in detail to address new problems or concerns\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 The Free Software Foundation may publish revised and/or new versions
+\par \hich\af0\dbch\af11\loch\f0 of the GNU Lesser General Public License from time to time. Such new
+\par \hich\af0\dbch\af11\loch\f0 versions will be similar in spirit to the present version, but may
+\par \hich\af0\dbch\af11\loch\f0 differ in detail to address\hich\af0\dbch\af11\loch\f0 new problems or concerns.
\par
-\par \hich\af0\dbch\af11\loch\f0 Each version is given a d\hich\af0\dbch\af11\loch\f0 istinguishing version number\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 If the
+\par \hich\af0\dbch\af11\loch\f0 Each version is given a distinguishing version number. If the
\par \hich\af0\dbch\af11\loch\f0 Library as you received it specifies that a certain numbered version
-\par \hich\af0\dbch\af11\loch\f0 of the GNU Lesser General Public License \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 or any later version\hich\af0\dbch\af11\loch\f0 "
-\par \hich\af0\dbch\af11\loch\f0 applies to it\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 you have the option of following the terms and
-\par \hich\af0\dbch\af11\loch\f0 conditions either of tha\hich\af0\dbch\af11\loch\f0 t published version or of any later version
-\par \hich\af0\dbch\af11\loch\f0 published by the Free Software Foundation\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 If the Library as you
+\par \hich\af0\dbch\af11\loch\f0 of the GNU Lesser General Public License "or any later version"
+\par \hich\af0\dbch\af11\loch\f0 applies to it, you have the opt\hich\af0\dbch\af11\loch\f0 ion of following the terms and
+\par \hich\af0\dbch\af11\loch\f0 conditions either of that published version or of any later version
+\par \hich\af0\dbch\af11\loch\f0 published by the Free Software Foundation. If the Library as you
\par \hich\af0\dbch\af11\loch\f0 received it does not specify a version number of the GNU Lesser
-\par \hich\af0\dbch\af11\loch\f0 General Public License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 you may choose any version of the GNU Lesser
-\par \hich\af0\dbch\af11\loch\f0 General Public\hich\af0\dbch\af11\loch\f0 License ever published by the Free Software Foundation\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 General Public License, you \hich\af0\dbch\af11\loch\f0 may choose any version of the GNU Lesser
+\par \hich\af0\dbch\af11\loch\f0 General Public License ever published by the Free Software Foundation.
\par
\par \hich\af0\dbch\af11\loch\f0 If the Library as you received it specifies that a proxy can decide
\par \hich\af0\dbch\af11\loch\f0 whether future versions of the GNU Lesser General Public License shall
-\par \hich\af0\dbch\af11\loch\f0 apply\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 that proxy\hich\af0\dbch\af11\loch\f0 '\hich\af0\dbch\af11\loch\f0 s public statement of acceptance of any version is
+\par \hich\af0\dbch\af11\loch\f0 apply, that proxy's public statement of acceptance of any version is
\par \hich\af0\dbch\af11\loch\f0 permanent authorization for you to choose that version for the
-\par \hich\af0\dbch\af11\loch\f0 Library\hich\af0\dbch\af11\loch\f0 .}{\fcs1 \af0 \fcs0 \insrsid3475521\charrsid9072953
+\par \hich\af0\dbch\af11\loch\f0 Library.}{\fcs1 \af0 \fcs0 \insrsid3475521\charrsid9072953
\par }}
\ No newline at end of file
Modified: trunk/urakawa/application/Obi/Setup/Setup.vdproj
===================================================================
--- trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-08 09:15:59 UTC (rev 3033)
+++ trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-08 10:49:23 UTC (rev 3034)
@@ -1336,20 +1336,6 @@
"Icon" = "8:"
"Feature" = "8:"
}
- "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_E589401193274ACA97B5625591EC947A"
- {
- "Name" = "8:License"
- "Arguments" = "8:"
- "Description" = "8:"
- "ShowCmd" = "3:1"
- "IconIndex" = "3:0"
- "Transitive" = "11:FALSE"
- "Target" = "8:_BF79706BAEEE421381CB56E45BBD7479"
- "Folder" = "8:_3CDB3BD0D5C747F6AEDB25A8E625AA31"
- "WorkingFolder" = "8:_3CDB3BD0D5C747F6AEDB25A8E625AA31"
- "Icon" = "8:"
- "Feature" = "8:"
- }
}
"UserInterface"
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-08 09:16:04
|
Revision: 3033
http://urakawa.svn.sourceforge.net/urakawa/?rev=3033&view=rev
Author: avneeshsingh
Date: 2008-05-08 02:15:59 -0700 (Thu, 08 May 2008)
Log Message:
-----------
update to installer licenses
Modified Paths:
--------------
trunk/urakawa/application/Obi/Setup/Licences/License.rtf
Modified: trunk/urakawa/application/Obi/Setup/Licences/License.rtf
===================================================================
--- trunk/urakawa/application/Obi/Setup/Licences/License.rtf 2008-05-08 09:08:03 UTC (rev 3032)
+++ trunk/urakawa/application/Obi/Setup/Licences/License.rtf 2008-05-08 09:15:59 UTC (rev 3033)
@@ -1,5 +1,5 @@
{\rtf1\adeflang1081\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch11\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1041{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\f11\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt ?l?r ??\'81\'66c};}{\f36\fmodern\fcharset128\fprq1{\*\panose 00000000000000000000}@MS Mincho;}{\f37\froman\fcharset238\fprq2 Times New Roman CE;}
+{\f11\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt ?l?r ??\'81\'66c};}{\f36\fmodern\fcharset128\fprq1{\*\panose 02020609040205080304}@MS Mincho;}{\f37\froman\fcharset238\fprq2 Times New Roman CE;}
{\f38\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f40\froman\fcharset161\fprq2 Times New Roman Greek;}{\f41\froman\fcharset162\fprq2 Times New Roman Tur;}{\f42\froman\fcharset177\fprq2 Times New Roman (Hebrew);}
{\f43\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f44\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f45\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f149\fmodern\fcharset0\fprq1 MS Mincho Western{\*\falt ?l?r ??\'81\'66c};}
{\f147\fmodern\fcharset238\fprq1 MS Mincho CE{\*\falt ?l?r ??\'81\'66c};}{\f148\fmodern\fcharset204\fprq1 MS Mincho Cyr{\*\falt ?l?r ??\'81\'66c};}{\f150\fmodern\fcharset161\fprq1 MS Mincho Greek{\*\falt ?l?r ??\'81\'66c};}
@@ -10,27 +10,199 @@
\fs24\lang1033\langfe1041\loch\f0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fcs1 \af0\afs20 \fcs0 \fs20\lang1024\langfe1024\loch\f0\hich\af0\dbch\af11\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}}
-{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid621581\rsid3757280\rsid5397031\rsid9072953\rsid11604130\rsid15096070}{\*\generator Microsoft Word 11.0.5604;}{\info{\author hp}{\operator hp}{\creatim\yr2008\mo4\dy22\hr12\min51}
-{\revtim\yr2008\mo4\dy22\hr13\min15}{\version3}{\edmins1}{\nofpages1}{\nofwords91}{\nofchars525}{\*\company hp}{\nofcharsws615}{\vern24689}}
+{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid621581\rsid3475521\rsid3757280\rsid5397031\rsid6313309\rsid9072953\rsid11604130\rsid15096070\rsid15611445}{\*\generator Microsoft Word 11.0.5604;}{\info{\author hp}{\operator hp}
+{\creatim\yr2008\mo4\dy22\hr12\min51}{\revtim\yr2008\mo5\dy5\hr23\min29}{\version6}{\edmins5}{\nofpages4}{\nofwords1223}{\nofchars6976}{\*\company hp}{\nofcharsws8183}{\vern24689}}
\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1701\dgvorigin1984\dghshow1\dgvshow1
\jexpand\viewkind5\viewscale88\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\viewnobound1\snaptogridincell\allowfieldendsel
\wrppunct\asianbrkrule\nojkernpunct\rsidroot15096070 \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3
\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9072953 \fcs1 \af0\afs24\alang1025 \fcs0 \fs24\lang1033\langfe1041\loch\af0\hich\af0\dbch\af11\cgrid\langnp1033\langfenp1041 {\fcs1 \af0 \fcs0 \insrsid9072953
-\hich\af0\dbch\af11\loch\f0 This program is free software\hich\af0\dbch\af11\loch\f0 : \hich\af0\dbch\af11\loch\f0 you can redistribute it and\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 or modify
+\hich\af0\dbch\af11\loch\f0 This program is free software: you can redistribute it and/or modify
\par \hich\af0\dbch\af11\loch\f0 it under the terms of the GNU General Public License as published by
-\par \hich\af0\dbch\af11\loch\f0 the Free Software Foundation\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 either version \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the License\hich\af0\dbch\af11\loch\f0 ,
-\hich\af0\dbch\af11\loch\f0 or
-\par \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 at your option\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 any later version\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 the Free Software Foundation, either version 3 of the License, or
+\par \hich\af0\dbch\af11\loch\f0 (at your option) \hich\af0\dbch\af11\loch\f0 any later version.
\par
-\par \hich\af0\dbch\af11\loch\f0 This progra\hich\af0\dbch\af11\loch\f0 m is distributed in the hope that it will be useful\hich\af0\dbch\af11\loch\f0 ,
-\par \hich\af0\dbch\af11\loch\f0 but WITHOUT ANY WARRANTY\hich\af0\dbch\af11\loch\f0 ; \hich\af0\dbch\af11\loch\f0 without even the implied warranty of
-\par \hich\af0\dbch\af11\loch\f0 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 See the
-\par \hich\af0\dbch\af11\loch\f0 GNU General Public License for more details\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 This program is distributed in the hope that it will be useful,
+\par \hich\af0\dbch\af11\loch\f0 but WITHOUT ANY WARRANTY; without even the implied warranty of
+\par \hich\af0\dbch\af11\loch\f0 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+\par \hich\af0\dbch\af11\loch\f0 GNU General Public License }{\fcs1 \af0 \fcs0 \insrsid3475521 \hich\af0\dbch\af11\loch\f0 below }{\fcs1 \af0 \fcs0 \insrsid9072953 \hich\af0\dbch\af11\loch\f0 for more details.
+\par }{\fcs1 \af0 \fcs0 \insrsid6313309 \hich\af0\dbch\af11\loch\f0 This \hich\af0\dbch\af11\loch\f0 l}{\fcs1 \af0 \fcs0 \insrsid15611445 \hich\af0\dbch\af11\loch\f0 icense}{\fcs1 \af0 \fcs0 \insrsid3475521 \hich\af0\dbch\af11\loch\f0
+ can also be obtained from \hich\af0\dbch\af11\loch\f0
+\par }{\fcs1 \af0 \fcs0 \insrsid9072953 \hich\af0\dbch\af11\loch\f0 <http://www.gnu.org/licenses/>.}{\fcs1 \af0 \fcs0 \insrsid5397031
+\par }{\fcs1 \af0 \fcs0 \insrsid3475521
\par
-\par \hich\af0\dbch\af11\loch\f0 You should have received a copy \hich\af0\dbch\af11\loch\f0 of the GNU General Public License
-\par \hich\af0\dbch\af11\loch\f0 along with this program\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 If not\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 see \hich\af0\dbch\af11\loch\f0 <\hich\af0\dbch\af11\loch\f0 http
-\hich\af0\dbch\af11\loch\f0 ://\hich\af0\dbch\af11\loch\f0 www\hich\af0\dbch\af11\loch\f0 .\hich\af0\dbch\af11\loch\f0 gnu\hich\af0\dbch\af11\loch\f0 .\hich\af0\dbch\af11\loch\f0 org\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 licenses
-\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 >\hich\af0\dbch\af11\loch\f0 .}{\fcs1 \af0 \fcs0 \insrsid5397031\charrsid9072953
+\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3475521 {\fcs1 \af0 \fcs0 \insrsid3475521 \tab \tab \hich\af0\dbch\af11\loch\f0 GNU LESSER GENERAL PUBLIC LICENSE
+\par \hich\af0\dbch\af11\loch\f0 Version \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 29\hich\af0\dbch\af11\loch\f0 June \hich\af0\dbch\af11\loch\f0 2007
+\par
+\par \hich\af0\dbch\af11\loch\f0 Copyright \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 C\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 2007\hich\af0\dbch\af11\loch\f0 Free Software Foundation\hich\af0\dbch\af11\loch\f0 ,
+\hich\af0\dbch\af11\loch\f0 Inc\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 <\hich\af0\dbch\af11\loch\f0 http\hich\af0\dbch\af11\loch\f0 ://\hich\af0\dbch\af11\loch\f0 fsf\hich\af0\dbch\af11\loch\f0 .\hich\af0\dbch\af11\loch\f0 org
+\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 >
+\par \hich\af0\dbch\af11\loch\f0 Everyone is permitted to copy and distribute verbatim copies
+\par \hich\af0\dbch\af11\loch\f0 of this license document\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but changi\hich\af0\dbch\af11\loch\f0 ng it is not allowed\hich\af0\dbch\af11\loch\f0 .
+\par
+\par
+\par \hich\af0\dbch\af11\loch\f0 This version of the GNU Lesser General Public License incorporates
+\par \hich\af0\dbch\af11\loch\f0 the terms and conditions of version \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the GNU General Public
+\par \hich\af0\dbch\af11\loch\f0 License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 supplemented by the additional permissions listed below\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 0\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Additional Definitions\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 As used herein\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 this License\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 refers to version \hich\af0\dbch\af11\loch\f0 3
+\hich\af0\dbch\af11\loch\f0 of the GNU Lesser
+\par \hich\af0\dbch\af11\loch\f0 General Public License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and the \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 GNU GPL\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0
+refers to version \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the GNU
+\par \hich\af0\dbch\af11\loch\f0 General Public License\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 The Library\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 refers to a covered work governed by this License\hich\af0\dbch\af11\loch\f0 ,
+\par \hich\af0\dbch\af11\loch\f0 other than an Applic\hich\af0\dbch\af11\loch\f0 ation or a Combined Work as defined below\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 An \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Application\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 is any work that makes use of an interface provided
+\par \hich\af0\dbch\af11\loch\f0 by the Library\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but which is not otherwise based on the Library\hich\af0\dbch\af11\loch\f0 .
+\par \hich\af0\dbch\af11\loch\f0 Defining a subclass of a class defined by the Library is deemed a mode
+\par \hich\af0\dbch\af11\loch\f0 of us\hich\af0\dbch\af11\loch\f0 ing an interface provided by the Library\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 A \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Combined Work\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 is a work produced by combining or linking an
+\par \hich\af0\dbch\af11\loch\f0 Application with the Library\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 The particular version of the Library
+\par \hich\af0\dbch\af11\loch\f0 with which the Combined Work was made is also called the \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Linked
+\par \hich\af0\dbch\af11\loch\f0 Version\hich\af0\dbch\af11\loch\f0 ".
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 The \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Minimal Corresponding Source\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 for a Combined Work means the
+\par \hich\af0\dbch\af11\loch\f0 Corresponding Source for the Combined Work\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 excluding any source code
+\par \hich\af0\dbch\af11\loch\f0 for portions of the Combined Work that\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 considered in isolation\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 are
+\par \hich\af0\dbch\af11\loch\f0 based on the Application\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and not on the Linked Vers\hich\af0\dbch\af11\loch\f0 ion\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 The \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 Corresponding Application Code\hich\af0\dbch\af11\loch\f0 " \hich\af0\dbch\af11\loch\f0 for a Combined Work means the
+\par \hich\af0\dbch\af11\loch\f0 object code and\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 or source code for the Application\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 including any data
+\par \hich\af0\dbch\af11\loch\f0 and utility programs needed for reproducing the Combined Work from the
+\par \hich\af0\dbch\af11\loch\f0 Application\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but excluding the System L\hich\af0\dbch\af11\loch\f0 ibraries of the Combined Work\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 1\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Exception to Section \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the GNU GPL\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 You may convey a covered work under sections \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 and \hich\af0\dbch\af11\loch\f0 4\hich\af0\dbch\af11\loch\f0 of this License
+\par \hich\af0\dbch\af11\loch\f0 without being bound by section \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 of the GNU GPL\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 2\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Conveying Modified Versions\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 If you modify a copy of the Library\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 in your modifications\hich\af0\dbch\af11\loch\f0 ,
+\hich\af0\dbch\af11\loch\f0 a
+\par \hich\af0\dbch\af11\loch\f0 facility refers to a function or data to be supplied by an Application
+\par \hich\af0\dbch\af11\loch\f0 that uses the facility \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 other than as an argument passed when the
+\par \hich\af0\dbch\af11\loch\f0 facility is invoked\hich\af0\dbch\af11\loch\f0 )\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 then you may convey a copy o\hich\af0\dbch\af11\loch\f0 f the modified
+\par \hich\af0\dbch\af11\loch\f0 version\hich\af0\dbch\af11\loch\f0 :
+\par
+\par \hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 under this License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 provided that you make a good faith effort to
+\par \hich\af0\dbch\af11\loch\f0 ensure that\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 in the event an Application does not supply the
+\par \hich\af0\dbch\af11\loch\f0 function or data\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 the facility still operates\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and performs
+\par \hich\af0\dbch\af11\loch\f0 whatever part of its purpose \hich\af0\dbch\af11\loch\f0 remains meaningful\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 or
+\par
+\par \hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 under the GNU GPL\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 with none of the additional permissions of
+\par \hich\af0\dbch\af11\loch\f0 this License applicable to that copy\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 3\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Object Code Incorporating Material from Library Header Files\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 The object code form of an Application may incorpora\hich\af0\dbch\af11\loch\f0 te material from
+\par \hich\af0\dbch\af11\loch\f0 a header file that is part of the Library\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 You may convey such object
+\par \hich\af0\dbch\af11\loch\f0 code under terms of your choice\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 provided that\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 if the incorporated
+\par \hich\af0\dbch\af11\loch\f0 material is not limited to numerical parameters\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 data structure
+\par \hich\af0\dbch\af11\loch\f0 layouts and accessors\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 or small macr\hich\af0\dbch\af11\loch\f0 os\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 inline functions and templates
+\par \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 ten or fewer lines in length\hich\af0\dbch\af11\loch\f0 )\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 you do both of the following\hich\af0\dbch\af11\loch\f0 :
+\par
+\par \hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Give prominent notice with each copy of the object code that the
+\par \hich\af0\dbch\af11\loch\f0 Library is used in it and that the Library and its use are
+\par \hich\af0\dbch\af11\loch\f0 covered by this License\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Accompany the object code with a copy of the GNU GPL and this license
+\par \hich\af0\dbch\af11\loch\f0 document\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 4\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Combined Works\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 You may convey a Combined Work under terms of your choice that\hich\af0\dbch\af11\loch\f0 ,
+\par \hich\af0\dbch\af11\loch\f0 taken together\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 effectively do not restrict modif\hich\af0\dbch\af11\loch\f0 ication of the
+\par \hich\af0\dbch\af11\loch\f0 portions of the Library contained in the Combined Work and reverse
+\par \hich\af0\dbch\af11\loch\f0 engineering for debugging such modifications\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 if you also do each of
+\par \hich\af0\dbch\af11\loch\f0 the following\hich\af0\dbch\af11\loch\f0 :
+\par
+\par \hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Give prominent notice with each copy of the Combined Work that
+\par \hich\af0\dbch\af11\loch\f0 the Library is us\hich\af0\dbch\af11\loch\f0 ed in it and that the Library and its use are
+\par \hich\af0\dbch\af11\loch\f0 covered by this License\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Accompany the Combined Work with a copy of the GNU GPL and this license
+\par \hich\af0\dbch\af11\loch\f0 document\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 c\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 For a Combined Work that displays copyright notices during
+\par \hich\af0\dbch\af11\loch\f0 execution\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 include th\hich\af0\dbch\af11\loch\f0 e copyright notice for the Library among
+\par \hich\af0\dbch\af11\loch\f0 these notices\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 as well as a reference directing the user to the
+\par \hich\af0\dbch\af11\loch\f0 copies of the GNU GPL and this license document\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 d\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Do one of the following\hich\af0\dbch\af11\loch\f0 :
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 0\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Convey the Minimal Corresponding Source under the ter\hich\af0\dbch\af11\loch\f0 ms of this
+\par \hich\af0\dbch\af11\loch\f0 License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and the Corresponding Application Code in a form
+\par \hich\af0\dbch\af11\loch\f0 suitable for\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and under terms that permit\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 the user to
+\par \hich\af0\dbch\af11\loch\f0 recombine or relink the Application with a modified version of
+\par \hich\af0\dbch\af11\loch\f0 the Linked Version to produce a modified Combined Work\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 in the
+\par \hich\af0\dbch\af11\loch\f0 manner specified by section \hich\af0\dbch\af11\loch\f0 6\hich\af0\dbch\af11\loch\f0 of the GNU GPL for conveying
+\par \hich\af0\dbch\af11\loch\f0 Corresponding Source\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 1\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Use a suitable shared library mechanism for linking with the
+\par \hich\af0\dbch\af11\loch\f0 Library\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 A \hich\af0\dbch\af11\loch\f0 suitable mechanism is one that \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 )
+\hich\af0\dbch\af11\loch\f0 uses at run time
+\par \hich\af0\dbch\af11\loch\f0 a copy of the Library already present on the user\hich\af0\dbch\af11\loch\f0 '\hich\af0\dbch\af11\loch\f0 s computer
+\par \hich\af0\dbch\af11\loch\f0 system\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and \hich\af0\dbch\af11\loch\f0 (\hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0
+will operate properly with a modified version
+\par \hich\af0\dbch\af11\loch\f0 of the Library that is interface\hich\af0\dbch\af11\loch\f0 -\hich\af0\dbch\af11\loch\f0 compatible with the Linked
+\par \hich\af0\dbch\af11\loch\f0 Version\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 e\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Provide Installation Information\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but only if you would otherwise
+\par \hich\af0\dbch\af11\loch\f0 be required to provide such information under section \hich\af0\dbch\af11\loch\f0 6\hich\af0\dbch\af11\loch\f0 of the
+\par \hich\af0\dbch\af11\loch\f0 GNU GPL\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and only to the extent that such information is
+\par \hich\af0\dbch\af11\loch\f0 necessary to install and execute a mo\hich\af0\dbch\af11\loch\f0 dified version of the
+\par \hich\af0\dbch\af11\loch\f0 Combined Work produced by recombining or relinking the
+\par \hich\af0\dbch\af11\loch\f0 Application with a modified version of the Linked Version\hich\af0\dbch\af11\loch\f0 . (\hich\af0\dbch\af11\loch\f0 If
+\par \hich\af0\dbch\af11\loch\f0 you use option \hich\af0\dbch\af11\loch\f0 4\hich\af0\dbch\af11\loch\f0 d\hich\af0\dbch\af11\loch\f0 0\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 the Installation Information must accompany
+\par \hich\af0\dbch\af11\loch\f0 the Minimal Corresponding Source and Cor\hich\af0\dbch\af11\loch\f0 responding Application
+\par \hich\af0\dbch\af11\loch\f0 Code\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 If you use option \hich\af0\dbch\af11\loch\f0 4\hich\af0\dbch\af11\loch\f0 d\hich\af0\dbch\af11\loch\f0 1\hich\af0\dbch\af11\loch\f0 ,
+\hich\af0\dbch\af11\loch\f0 you must provide the Installation
+\par \hich\af0\dbch\af11\loch\f0 Information in the manner specified by section \hich\af0\dbch\af11\loch\f0 6\hich\af0\dbch\af11\loch\f0 of the GNU GPL
+\par \hich\af0\dbch\af11\loch\f0 for conveying Corresponding Source\hich\af0\dbch\af11\loch\f0 .)
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 5\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Combined Libraries\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 You may place library facilitie\hich\af0\dbch\af11\loch\f0 s that are a work based on the
+\par \hich\af0\dbch\af11\loch\f0 Library side by side in a single library together with other library
+\par \hich\af0\dbch\af11\loch\f0 facilities that are not Applications and are not covered by this
+\par \hich\af0\dbch\af11\loch\f0 License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and convey such a combined library under terms of your
+\par \hich\af0\dbch\af11\loch\f0 choice\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 if you do both of the following\hich\af0\dbch\af11\loch\f0 :
+\par
+\par \hich\af0\dbch\af11\loch\f0 a\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Accompany the combined library with a copy of the same work based
+\par \hich\af0\dbch\af11\loch\f0 on the Library\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 uncombined with any other library facilities\hich\af0\dbch\af11\loch\f0 ,
+\par \hich\af0\dbch\af11\loch\f0 conveyed under the terms of this License\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 b\hich\af0\dbch\af11\loch\f0 ) \hich\af0\dbch\af11\loch\f0 Give prominent notice wit\hich\af0\dbch\af11\loch\f0 h the combined library that part of it
+\par \hich\af0\dbch\af11\loch\f0 is a work based on the Library\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 and explaining where to find the
+\par \hich\af0\dbch\af11\loch\f0 accompanying uncombined form of the same work\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 \hich\af0\dbch\af11\loch\f0 6\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Revised Versions of the GNU Lesser General Public License\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 The Free Software Foundation ma\hich\af0\dbch\af11\loch\f0 y publish revised and\hich\af0\dbch\af11\loch\f0 /\hich\af0\dbch\af11\loch\f0 or new versions
+\par \hich\af0\dbch\af11\loch\f0 of the GNU Lesser General Public License from time to time\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 Such new
+\par \hich\af0\dbch\af11\loch\f0 versions will be similar in spirit to the present version\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 but may
+\par \hich\af0\dbch\af11\loch\f0 differ in detail to address new problems or concerns\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 Each version is given a d\hich\af0\dbch\af11\loch\f0 istinguishing version number\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 If the
+\par \hich\af0\dbch\af11\loch\f0 Library as you received it specifies that a certain numbered version
+\par \hich\af0\dbch\af11\loch\f0 of the GNU Lesser General Public License \hich\af0\dbch\af11\loch\f0 "\hich\af0\dbch\af11\loch\f0 or any later version\hich\af0\dbch\af11\loch\f0 "
+\par \hich\af0\dbch\af11\loch\f0 applies to it\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 you have the option of following the terms and
+\par \hich\af0\dbch\af11\loch\f0 conditions either of tha\hich\af0\dbch\af11\loch\f0 t published version or of any later version
+\par \hich\af0\dbch\af11\loch\f0 published by the Free Software Foundation\hich\af0\dbch\af11\loch\f0 . \hich\af0\dbch\af11\loch\f0 If the Library as you
+\par \hich\af0\dbch\af11\loch\f0 received it does not specify a version number of the GNU Lesser
+\par \hich\af0\dbch\af11\loch\f0 General Public License\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 you may choose any version of the GNU Lesser
+\par \hich\af0\dbch\af11\loch\f0 General Public\hich\af0\dbch\af11\loch\f0 License ever published by the Free Software Foundation\hich\af0\dbch\af11\loch\f0 .
+\par
+\par \hich\af0\dbch\af11\loch\f0 If the Library as you received it specifies that a proxy can decide
+\par \hich\af0\dbch\af11\loch\f0 whether future versions of the GNU Lesser General Public License shall
+\par \hich\af0\dbch\af11\loch\f0 apply\hich\af0\dbch\af11\loch\f0 , \hich\af0\dbch\af11\loch\f0 that proxy\hich\af0\dbch\af11\loch\f0 '\hich\af0\dbch\af11\loch\f0 s public statement of acceptance of any version is
+\par \hich\af0\dbch\af11\loch\f0 permanent authorization for you to choose that version for the
+\par \hich\af0\dbch\af11\loch\f0 Library\hich\af0\dbch\af11\loch\f0 .}{\fcs1 \af0 \fcs0 \insrsid3475521\charrsid9072953
\par }}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <avn...@us...> - 2008-05-08 09:08:34
|
Revision: 3032
http://urakawa.svn.sourceforge.net/urakawa/?rev=3032&view=rev
Author: avneeshsingh
Date: 2008-05-08 02:08:03 -0700 (Thu, 08 May 2008)
Log Message:
-----------
Workaround added for focussing on panel splitter. will try to find better solution.
Modified Paths:
--------------
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-07 12:34:25 UTC (rev 3031)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-08 09:08:03 UTC (rev 3032)
@@ -19,13 +19,14 @@
private ObiForm mForm; // parent form
private bool mTOCViewVisible; // keep track of the TOC view visibility (don't reopen it accidentally)
private bool mMetadataViewVisible; // keep track of the Metadata view visibility
+ private System.Windows.Forms.Timer TabbingTimer= null;
public event EventHandler SelectionChanged; // triggered when the selection changes
public event EventHandler FindInTextVisibilityChanged; // triggered when the search bar is shown or hidden
public event ImportingFileEventHandler ImportingFile; // triggered when a file is being imported
public event EventHandler FinishedImportingFiles; // triggered when all files were imported
+
-
/// <summary>
/// Create a new project view with no project yet.
/// </summary>
@@ -47,7 +48,15 @@
mClipboard = null;
}
-
+ void InitialiseTabbingTimer()
+ {
+ if ( TabbingTimer == null )
+ {
+ TabbingTimer = new System.Windows.Forms.Timer();
+ TabbingTimer.Tick += new System.EventHandler(this.TabbingTimer_Tick);
+ TabbingTimer.Interval = 500;
+ }
+ }
/// <summary>
/// Add a new empty block.
/// </summary>
@@ -1283,8 +1292,19 @@
mPanelInfoLabelButton.Size = new Size(150, 20);
mPanelInfoLabelButton.BackColor = System.Drawing.SystemColors.ControlLight;
mPanelInfoLabelButton.Text = mPanelInfoLabelButton.AccessibleName;
+
+ InitialiseTabbingTimer();
+ TabbingTimer.Start () ;
}
+ private void TabbingTimer_Tick(object sender, EventArgs e)
+ {
+ if ( mPanelInfoLabelButton.ContainsFocus)
+ SendKeys.Send("{tab}");
+
+ TabbingTimer.Stop();
+ }
+
private void mPanelInfoLabelButton_Leave ( object sender ,EventArgs e )
{
mPanelInfoLabelButton.BackColor = System.Drawing.Color.Transparent;
Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-07 12:34:25 UTC (rev 3031)
+++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-08 09:08:03 UTC (rev 3032)
@@ -154,7 +154,7 @@
//
// mPanelInfoLabelButton
//
- this.mPanelInfoLabelButton.AccessibleName = "Press tab to jump to Panel Splitter";
+ 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 was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|