From: <ju...@us...> - 2008-05-19 03:56:43
|
Revision: 3087 http://urakawa.svn.sourceforge.net/urakawa/?rev=3087&view=rev Author: julienq Date: 2008-05-18 20:56:41 -0700 (Sun, 18 May 2008) Log Message: ----------- Added keyboard operations (Shift+Space, Shift+X, Shift+V, and Nudge) Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs trunk/urakawa/application/Obi/Obi/ObiForm.cs trunk/urakawa/application/Obi/Obi/ObiForm.resx trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs trunk/urakawa/application/Obi/Obi/Settings.cs Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -126,9 +126,9 @@ this.mStopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mFastPlaytoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NormalSpeedtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mElapseBacktoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SpeedUptoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mSpeedDowntoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mElapseBacktoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mPreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mPreviewFromToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mPreviewUpToToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -732,8 +732,8 @@ // // mClearRoleToolStripMenuItem // + resources.ApplyResources(this.mClearRoleToolStripMenuItem, "mClearRoleToolStripMenuItem"); this.mClearRoleToolStripMenuItem.Name = "mClearRoleToolStripMenuItem"; - resources.ApplyResources(this.mClearRoleToolStripMenuItem, "mClearRoleToolStripMenuItem"); this.mClearRoleToolStripMenuItem.Click += new System.EventHandler(this.mClearRoleToolStripMenuItem_Click); // // mPhraseDetectionToolStripMenuItem @@ -866,6 +866,12 @@ this.NormalSpeedtoolStripMenuItem.Name = "NormalSpeedtoolStripMenuItem"; this.NormalSpeedtoolStripMenuItem.Click += new System.EventHandler(this.NormalSpeedtoolStripMenuItem_Click); // + // mElapseBacktoolStripMenuItem + // + this.mElapseBacktoolStripMenuItem.Name = "mElapseBacktoolStripMenuItem"; + resources.ApplyResources(this.mElapseBacktoolStripMenuItem, "mElapseBacktoolStripMenuItem"); + this.mElapseBacktoolStripMenuItem.Click += new System.EventHandler(this.ElapseBacktoolStripMenuItem_Click); + // // SpeedUptoolStripMenuItem // resources.ApplyResources(this.SpeedUptoolStripMenuItem, "SpeedUptoolStripMenuItem"); @@ -878,12 +884,6 @@ this.mSpeedDowntoolStripMenuItem.Name = "mSpeedDowntoolStripMenuItem"; this.mSpeedDowntoolStripMenuItem.Click += new System.EventHandler(this.SpeedDowntoolStripMenuItem_Click); // - // mElapseBacktoolStripMenuItem - // - this.mElapseBacktoolStripMenuItem.Name = "mElapseBacktoolStripMenuItem"; - resources.ApplyResources(this.mElapseBacktoolStripMenuItem, "mElapseBacktoolStripMenuItem"); - this.mElapseBacktoolStripMenuItem.Click += new System.EventHandler(this.ElapseBacktoolStripMenuItem_Click); - // // mPreviewToolStripMenuItem // this.mPreviewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -680,8 +680,8 @@ private void mStartRecordingDirectlyToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.StartRecordingDirectly(); } - private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); } - private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); } + private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(ProjectView.TransportBar.From, ProjectView.TransportBar.UseAudioCursor); } + private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(ProjectView.TransportBar.Upto, ProjectView.TransportBar.UseSelection); } private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); } private void previousSectionToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevSection(); } private void previousPageToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevPage(); } Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-19 03:56:41 UTC (rev 3087) @@ -120,255 +120,14 @@ <metadata name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>0, 0</value> </metadata> - <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="mFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>35, 20</value> - </data> - <data name="mFileToolStripMenuItem.Text" xml:space="preserve"> - <value>&File</value> - </data> - <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> - <value>37, 20</value> - </data> - <data name="toolStripMenuItem1.Text" xml:space="preserve"> - <value>&Edit</value> - </data> - <data name="mViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>41, 20</value> - </data> - <data name="mViewToolStripMenuItem.Text" xml:space="preserve"> - <value>&View</value> - </data> - <data name="mSectionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>59, 20</value> - </data> - <data name="mSectionsToolStripMenuItem.Text" xml:space="preserve"> - <value>&Sections</value> - </data> - <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Add blank phrase Ctrl+B</value> - </data> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="mAddBlankPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+B</value> - </data> - <data name="mAddBlankPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mAddBlankPhraseToolStripMenuItem.Text" xml:space="preserve"> - <value>Add &blank phrase</value> - </data> - <data name="mAddEmptyPagesToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Add empty pages Ctrl+Shift+B</value> - </data> - <data name="mAddEmptyPagesToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+Shift+B</value> - </data> - <data name="mAddEmptyPagesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mAddEmptyPagesToolStripMenuItem.Text" xml:space="preserve"> - <value>Add empty &pages</value> - </data> - <data name="mImportAudioFileToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Import audio files Ctrl+I</value> - </data> - <data name="mImportAudioFileToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+I</value> - </data> - <data name="mImportAudioFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mImportAudioFileToolStripMenuItem.Text" xml:space="preserve"> - <value>&Import audio files</value> - </data> - <data name="mSplitPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Split phrase Ctrl+Q</value> - </data> - <data name="mSplitPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+Q</value> - </data> - <data name="mSplitPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mSplitPhraseToolStripMenuItem.Text" xml:space="preserve"> - <value>&Split phrase</value> - </data> - <data name="mMergePhraseWithNextToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Merge phrase with next Ctrl+M</value> - </data> - <data name="mMergePhraseWithNextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+M</value> - </data> - <data name="mMergePhraseWithNextToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mMergePhraseWithNextToolStripMenuItem.Text" xml:space="preserve"> - <value>&Merge phrase with next</value> - </data> - <data name="mPhraseIsUsedToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Phrase is used Ctrl+K</value> - </data> - <data name="mPhraseIsUsedToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+K</value> - </data> - <data name="mPhraseIsUsedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mPhraseIsUsedToolStripMenuItem.Text" xml:space="preserve"> - <value>Phrase is &used</value> - </data> - <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing"> - <value>250, 6</value> - </data> - <data name="mAssignRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mAssignRoleToolStripMenuItem.Text" xml:space="preserve"> - <value>&Assign role</value> - </data> - <data name="mEditRolesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mEditRolesToolStripMenuItem.Text" xml:space="preserve"> - <value>E&dit roles...</value> - </data> - <data name="mClearRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mClearRoleToolStripMenuItem.Text" xml:space="preserve"> - <value>&Clear role</value> - </data> - <data name="mPhraseDetectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Apply phrase detection Ctrl+Shift+P</value> - </data> - <data name="mPhraseDetectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+Shift+P</value> - </data> - <data name="mPhraseDetectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mPhraseDetectionToolStripMenuItem.Text" xml:space="preserve"> - <value>Apply p&hrase detection</value> - </data> - <data name="mMarkDefaultCustomClassToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Mark default custom class Ctrl+U</value> - </data> - <data name="mMarkDefaultCustomClassToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+U</value> - </data> - <data name="mMarkDefaultCustomClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve"> - <value>Mar&k default custom class</value> - </data> - <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <data name="mMarkDefaultCustomClassToolStripMenuItem.Visible" type="System.Boolean, mscorlib"> - <value>False</value> - </data> - <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Begin audio selection Ctrl+[</value> - </data> - <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Ctrl+[</value> - </data> - <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+OemOpenBrackets</value> - </data> - <data name="mBeginInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>210, 22</value> - </data> - <data name="mBeginInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> - <value>&Begin audio selection</value> - </data> - <data name="mEndInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>End audio selection Ctrl+]</value> - </data> - <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Ctrl+]</value> - </data> - <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+Oem6</value> - </data> - <data name="mEndInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>210, 22</value> - </data> - <data name="mEndInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> - <value>&End audio selection</value> - </data> - <data name="mDeselectInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>229, 22</value> - </data> - <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> - <value>&Deselect</value> - </data> - <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> - <value>Audi&o selection</value> - </data> - <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mGoToToolStripMenuItem.Text" xml:space="preserve"> - <value>&Go to...</value> - </data> - <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>57, 20</value> - </data> - <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve"> - <value>&Phrases</value> - </data> - <data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>66, 20</value> - </data> - <data name="transportToolStripMenuItem.Text" xml:space="preserve"> - <value>Tr&ansport</value> - </data> - <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>44, 20</value> - </data> - <data name="mToolsToolStripMenuItem.Text" xml:space="preserve"> - <value>&Tools</value> - </data> - <data name="mHelpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>40, 20</value> - </data> - <data name="mHelpToolStripMenuItem.Text" xml:space="preserve"> - <value>&Help</value> - </data> - <data name="mMenuStrip.Location" type="System.Drawing.Point, System.Drawing"> - <value>0, 0</value> - </data> - <data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing"> - <value>958, 24</value> - </data> - <data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib"> - <value>1</value> - </data> - <data name="mMenuStrip.Text" xml:space="preserve"> - <value>menuStrip1</value> - </data> - <data name=">>mMenuStrip.Name" xml:space="preserve"> - <value>mMenuStrip</value> - </data> - <data name=">>mMenuStrip.Type" xml:space="preserve"> - <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> - <data name=">>mMenuStrip.Parent" xml:space="preserve"> - <value>$this</value> - </data> - <data name=">>mMenuStrip.ZOrder" xml:space="preserve"> - <value>2</value> - </data> <data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>New project Ctrl+N</value> </data> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="mNewProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> <value>Magenta</value> </data> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="mNewProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+N</value> </data> @@ -474,12 +233,6 @@ <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing"> <value>256, 6</value> </data> - <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>259, 22</value> - </data> - <data name="mRecentProjectToolStripMenuItem.Text" xml:space="preserve"> - <value>&Recent projects</value> - </data> <data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing"> <value>112, 6</value> </data> @@ -489,6 +242,12 @@ <data name="mClearListToolStripMenuItem.Text" xml:space="preserve"> <value>&Clear list</value> </data> + <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>259, 22</value> + </data> + <data name="mRecentProjectToolStripMenuItem.Text" xml:space="preserve"> + <value>&Recent projects</value> + </data> <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing"> <value>256, 6</value> </data> @@ -504,6 +263,12 @@ <data name="mExitToolStripMenuItem.Text" xml:space="preserve"> <value>E&xit</value> </data> + <data name="mFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>35, 20</value> + </data> + <data name="mFileToolStripMenuItem.Text" xml:space="preserve"> + <value>&File</value> + </data> <data name="mUndoToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Undo Ctrl+Z</value> </data> @@ -663,6 +428,12 @@ <data name="mFindPreviousToolStripMenuItem.Text" xml:space="preserve"> <value>Find pre&vious</value> </data> + <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing"> + <value>37, 20</value> + </data> + <data name="toolStripMenuItem1.Text" xml:space="preserve"> + <value>&Edit</value> + </data> <data name="mShowTOCViewToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Show TOC view Ctrl+Alt+T</value> </data> @@ -816,6 +587,12 @@ <data name="mShowSourceToolStripMenuItem.Text" xml:space="preserve"> <value>Show sou&rce view</value> </data> + <data name="mViewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>41, 20</value> + </data> + <data name="mViewToolStripMenuItem.Text" xml:space="preserve"> + <value>&View</value> + </data> <data name="mAddSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Add section Ctrl+H</value> </data> @@ -930,6 +707,87 @@ <data name="mSectionIsUsedToolStripMenuItem.Text" xml:space="preserve"> <value>Section is &used</value> </data> + <data name="mSectionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>59, 20</value> + </data> + <data name="mSectionsToolStripMenuItem.Text" xml:space="preserve"> + <value>&Sections</value> + </data> + <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Add blank phrase Ctrl+B</value> + </data> + <data name="mAddBlankPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+B</value> + </data> + <data name="mAddBlankPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mAddBlankPhraseToolStripMenuItem.Text" xml:space="preserve"> + <value>Add &blank phrase</value> + </data> + <data name="mAddEmptyPagesToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Add empty pages Ctrl+Shift+B</value> + </data> + <data name="mAddEmptyPagesToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Shift+B</value> + </data> + <data name="mAddEmptyPagesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mAddEmptyPagesToolStripMenuItem.Text" xml:space="preserve"> + <value>Add empty &pages</value> + </data> + <data name="mImportAudioFileToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Import audio files Ctrl+I</value> + </data> + <data name="mImportAudioFileToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+I</value> + </data> + <data name="mImportAudioFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mImportAudioFileToolStripMenuItem.Text" xml:space="preserve"> + <value>&Import audio files</value> + </data> + <data name="mSplitPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Split phrase Ctrl+Q</value> + </data> + <data name="mSplitPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Q</value> + </data> + <data name="mSplitPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mSplitPhraseToolStripMenuItem.Text" xml:space="preserve"> + <value>&Split phrase</value> + </data> + <data name="mMergePhraseWithNextToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Merge phrase with next Ctrl+M</value> + </data> + <data name="mMergePhraseWithNextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+M</value> + </data> + <data name="mMergePhraseWithNextToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mMergePhraseWithNextToolStripMenuItem.Text" xml:space="preserve"> + <value>&Merge phrase with next</value> + </data> + <data name="mPhraseIsUsedToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Phrase is used Ctrl+K</value> + </data> + <data name="mPhraseIsUsedToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+K</value> + </data> + <data name="mPhraseIsUsedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mPhraseIsUsedToolStripMenuItem.Text" xml:space="preserve"> + <value>Phrase is &used</value> + </data> + <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing"> + <value>250, 6</value> + </data> <data name="mSetAsHeadingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>160, 22</value> </data> @@ -966,6 +824,100 @@ <data name="mAddRoleToolStripTextBox.Text" xml:space="preserve"> <value>(Add role)</value> </data> + <data name="mAssignRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mAssignRoleToolStripMenuItem.Text" xml:space="preserve"> + <value>&Assign role</value> + </data> + <data name="mEditRolesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mEditRolesToolStripMenuItem.Text" xml:space="preserve"> + <value>E&dit roles...</value> + </data> + <data name="mClearRoleToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Clear role Ctrl+Shift+C</value> + </data> + <data name="mClearRoleToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Shift+C</value> + </data> + <data name="mClearRoleToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mClearRoleToolStripMenuItem.Text" xml:space="preserve"> + <value>&Clear role</value> + </data> + <data name="mPhraseDetectionToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Apply phrase detection Ctrl+Shift+P</value> + </data> + <data name="mPhraseDetectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Shift+P</value> + </data> + <data name="mPhraseDetectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mPhraseDetectionToolStripMenuItem.Text" xml:space="preserve"> + <value>Apply p&hrase detection</value> + </data> + <data name="mMarkDefaultCustomClassToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Mark default custom class Ctrl+U</value> + </data> + <data name="mMarkDefaultCustomClassToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+U</value> + </data> + <data name="mMarkDefaultCustomClassToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mMarkDefaultCustomClassToolStripMenuItem.Text" xml:space="preserve"> + <value>Mar&k default custom class</value> + </data> + <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="mMarkDefaultCustomClassToolStripMenuItem.Visible" type="System.Boolean, mscorlib"> + <value>False</value> + </data> + <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Begin audio selection Ctrl+[</value> + </data> + <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Ctrl+[</value> + </data> + <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+OemOpenBrackets</value> + </data> + <data name="mBeginInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>210, 22</value> + </data> + <data name="mBeginInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> + <value>&Begin audio selection</value> + </data> + <data name="mEndInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>End audio selection Ctrl+]</value> + </data> + <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Ctrl+]</value> + </data> + <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Oem6</value> + </data> + <data name="mEndInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>210, 22</value> + </data> + <data name="mEndInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> + <value>&End audio selection</value> + </data> + <data name="mDeselectInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>210, 22</value> + </data> + <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> + <value>&Deselect</value> + </data> + <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> + </data> + <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> + <value>Audi&o selection</value> + </data> <data name="mNextTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Next TODO phrase Ctrl+F9</value> </data> @@ -990,12 +942,18 @@ <data name="mPreviousTODOPhraseToolStripMenuItem.Text" xml:space="preserve"> <value>&Previous TODO phrase</value> </data> - <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> + <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>253, 22</value> </data> - <data name="mPlayToolStripMenuItem.Text" xml:space="preserve"> - <value>&Play</value> + <data name="mGoToToolStripMenuItem.Text" xml:space="preserve"> + <value>&Go to...</value> </data> + <data name="mPhrasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>57, 20</value> + </data> + <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve"> + <value>&Phrases</value> + </data> <data name="mPlayAllToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Play all Ctrl+Shift+Space</value> </data> @@ -1020,6 +978,12 @@ <data name="mPlaySelectionToolStripMenuItem.Text" xml:space="preserve"> <value>Play &selection</value> </data> + <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mPlayToolStripMenuItem.Text" xml:space="preserve"> + <value>&Play</value> + </data> <data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Pause Space</value> </data> @@ -1056,12 +1020,6 @@ <data name="mStopToolStripMenuItem.Text" xml:space="preserve"> <value>&Stop</value> </data> - <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve"> - <value>Fast p&lay</value> - </data> <data name="NormalSpeedtoolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Normal speed Ctrl+0</value> </data> @@ -1074,6 +1032,12 @@ <data name="NormalSpeedtoolStripMenuItem.Text" xml:space="preserve"> <value>&Normal speed</value> </data> + <data name="mElapseBacktoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>221, 22</value> + </data> + <data name="mElapseBacktoolStripMenuItem.Text" xml:space="preserve"> + <value>Normal speed with &elapse back</value> + </data> <data name="SpeedUptoolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Speed up Ctrl++</value> </data> @@ -1104,17 +1068,11 @@ <data name="mSpeedDowntoolStripMenuItem.Text" xml:space="preserve"> <value>Slow &down</value> </data> - <data name="mElapseBacktoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>221, 22</value> - </data> - <data name="mElapseBacktoolStripMenuItem.Text" xml:space="preserve"> - <value>Normal speed with &elapse back</value> - </data> - <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>172, 22</value> </data> - <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve"> - <value>Pre&view</value> + <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve"> + <value>Fast p&lay</value> </data> <data name="mPreviewFromToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Preview from... Ctrl+P</value> @@ -1140,11 +1098,11 @@ <data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve"> <value>Preview &selected</value> </data> - <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>172, 22</value> </data> - <data name="mRecordToolStripMenuItem.Text" xml:space="preserve"> - <value>&Record</value> + <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve"> + <value>Pre&view</value> </data> <data name="mStartMonitoringToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Start Monitoring Ctrl+R</value> @@ -1188,15 +1146,15 @@ <data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve"> <value>Allow &overwrite</value> </data> + <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mRecordToolStripMenuItem.Text" xml:space="preserve"> + <value>&Record</value> + </data> <data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing"> <value>169, 6</value> </data> - <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="navigationToolStripMenuItem.Text" xml:space="preserve"> - <value>&Navigation</value> - </data> <data name="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Previous section Alt+Up</value> </data> @@ -1278,6 +1236,12 @@ <data name="mPlayOnNavigateToolStripMenuItem.Text" xml:space="preserve"> <value>Play on &navigate</value> </data> + <data name="navigationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="navigationToolStripMenuItem.Text" xml:space="preserve"> + <value>&Navigation</value> + </data> <data name="mRewindToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Rewind Ctrl+comma</value> </data> @@ -1308,6 +1272,12 @@ <data name="mFastForwardToolStripMenuItem.Text" xml:space="preserve"> <value>&Fast forward</value> </data> + <data name="transportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>66, 20</value> + </data> + <data name="transportToolStripMenuItem.Text" xml:space="preserve"> + <value>Tr&ansport</value> + </data> <data name="preferencesToolStripMenuItem1.AccessibleName" xml:space="preserve"> <value>Preferences Ctrl+Alt+F</value> </data> @@ -1320,6 +1290,12 @@ <data name="preferencesToolStripMenuItem1.Text" xml:space="preserve"> <value>&Preferences</value> </data> + <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>44, 20</value> + </data> + <data name="mToolsToolStripMenuItem.Text" xml:space="preserve"> + <value>&Tools</value> + </data> <data name="mContentsToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Contents F1</value> </data> @@ -1362,9 +1338,42 @@ <data name="aboutObiToolStripMenuItem.Text" xml:space="preserve"> <value>&About Obi</value> </data> + <data name="mHelpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>40, 20</value> + </data> + <data name="mHelpToolStripMenuItem.Text" xml:space="preserve"> + <value>&Help</value> + </data> + <data name="mMenuStrip.Location" type="System.Drawing.Point, System.Drawing"> + <value>0, 0</value> + </data> + <data name="mMenuStrip.Size" type="System.Drawing.Size, System.Drawing"> + <value>958, 24</value> + </data> + <data name="mMenuStrip.TabIndex" type="System.Int32, mscorlib"> + <value>1</value> + </data> + <data name="mMenuStrip.Text" xml:space="preserve"> + <value>menuStrip1</value> + </data> + <data name=">>mMenuStrip.Name" xml:space="preserve"> + <value>mMenuStrip</value> + </data> + <data name=">>mMenuStrip.Type" xml:space="preserve"> + <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> + <data name=">>mMenuStrip.Parent" xml:space="preserve"> + <value>$this</value> + </data> + <data name=">>mMenuStrip.ZOrder" xml:space="preserve"> + <value>2</value> + </data> <metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>0, 606</value> </metadata> + <data name="mStatusLabel.Size" type="System.Drawing.Size, System.Drawing"> + <value>0, 17</value> + </data> <data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 606</value> </data> @@ -1389,9 +1398,6 @@ <data name=">>mStatusStrip.ZOrder" xml:space="preserve"> <value>1</value> </data> - <data name="mStatusLabel.Size" type="System.Drawing.Size, System.Drawing"> - <value>0, 17</value> - </data> <data name="mProjectView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <value>Fill</value> </data> @@ -1411,7 +1417,7 @@ <value>mProjectView</value> </data> <data name=">>mProjectView.Type" xml:space="preserve"> - <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.9.39245, Culture=neutral, PublicKeyToken=null</value> + <value>Obi.ProjectView.ProjectView, Obi, Version=0.11.2.24956, Culture=neutral, PublicKeyToken=null</value> </data> <data name=">>mProjectView.Parent" xml:space="preserve"> <value>$this</value> @@ -1684,6 +1690,9 @@ CjyAD09DwA9QRcAfbGngHyBQ8H9MSf//Ii0= </value> </data> + <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms"> + <value>NoControl</value> + </data> <data name="$this.Text" xml:space="preserve"> <value>Obi</value> </data> @@ -2263,6 +2272,12 @@ <data name=">>NormalSpeedtoolStripMenuItem.Type" xml:space="preserve"> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name=">>mElapseBacktoolStripMenuItem.Name" xml:space="preserve"> + <value>mElapseBacktoolStripMenuItem</value> + </data> + <data name=">>mElapseBacktoolStripMenuItem.Type" xml:space="preserve"> + <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> <data name=">>SpeedUptoolStripMenuItem.Name" xml:space="preserve"> <value>SpeedUptoolStripMenuItem</value> </data> @@ -2275,12 +2290,6 @@ <data name=">>mSpeedDowntoolStripMenuItem.Type" xml:space="preserve"> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name=">>mElapseBacktoolStripMenuItem.Name" xml:space="preserve"> - <value>mElapseBacktoolStripMenuItem</value> - </data> - <data name=">>mElapseBacktoolStripMenuItem.Type" xml:space="preserve"> - <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </data> <data name=">>mPreviewToolStripMenuItem.Name" xml:space="preserve"> <value>mPreviewToolStripMenuItem</value> </data> Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -1208,7 +1208,8 @@ { return (key == (Keys)(Keys.Control | Keys.Tab) && SelectViewsInCycle(true)) || (key == (Keys)(Keys.Control | Keys.Shift | Keys.Tab) && SelectViewsInCycle(false)) || - (key == Keys.Space && TogglePlayPause()) || + (key == (Keys)(Keys.Shift | Keys.Space) && TogglePlayPause(UseSelection)) || + (key == Keys.Space && TogglePlayPause(UseAudioCursor)) || base.ProcessCmdKey(ref msg, key); } @@ -1301,21 +1302,35 @@ } - // Toggle play/pause in the transport bar - public bool TogglePlayPause() + private static readonly bool UseSelection = true; + private static readonly bool UseAudioCursor = false; + + // Toggle play/pause in the transport bar. + // If the useSelection flag is set, resume from the selection + // rather than from the audio cursor. + public bool TogglePlayPause(bool useSelection) { - if ( !( mSelection is TextSelection ) && + if (!(mSelection is TextSelection) && (mStripsView.ContainsFocus || mTOCView.ContainsFocus - || mTransportBar.ContainsFocus) ) + || mTransportBar.ContainsFocus)) { - if (TransportBar.CanPause) + if ((TransportBar.CanPausePlayback || TransportBar.CanResumePlayback) && useSelection) { + // Resume from selection, not from audio cursor + TransportBar.Stop(); + TransportBar.PlayOrResume(); + return true; + } + else if (TransportBar.CanPause) + { + // Pause playback or recording TransportBar.Pause(); return true; } else if (TransportBar.CanPlay || TransportBar.CanResumePlayback) { + // Start playback or resume from audio cursor TransportBar.PlayOrResume(); return true; } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -61,7 +61,7 @@ this.mLabel.Name = "mLabel"; this.mLabel.Size = new System.Drawing.Size(300, 37); this.mLabel.TabIndex = 0; - this.mLabel.Click += new System.EventHandler(this.Label_Click); + this.mLabel.Click += new System.EventHandler(this.Strip_Click); this.mLabel.LabelEditedByUser += new System.EventHandler(this.Label_LabelEditedByUser); this.mLabel.EditableChanged += new System.EventHandler(this.Label_EditableChanged); this.mLabel.SizeChanged += new System.EventHandler(this.Label_SizeChanged); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -376,12 +376,6 @@ } } - // Clicking on the label toggles the strip selection. Use "rename" to rename. - private void Label_Click(object sender, EventArgs e) - { - ToggleSelection(); - } - // Select the label when it is clicked (i.e. made editable) by the user. private void Label_EditableChanged(object sender, EventArgs e) { Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -627,10 +627,16 @@ mShortcutKeys[Keys.Shift | Keys.H] = delegate() { return mView.TransportBar.PrevSection(); }; mShortcutKeys[Keys.J] = delegate() { return mView.TransportBar.PrevPhrase(); }; mShortcutKeys[Keys.K] = delegate() { return mView.TransportBar.NextPhrase(); }; + mShortcutKeys[Keys.N] = delegate() { return mView.TransportBar.Nudge(TransportBar.Forward); }; + mShortcutKeys[Keys.Shift | Keys.N] = delegate() { return mView.TransportBar.Nudge(TransportBar.Backward); }; + mShortcutKeys[Keys.OemOpenBrackets] = delegate() { return mView.TransportBar.MarkSelectionBeginTime(); }; + mShortcutKeys[Keys.OemCloseBrackets] = delegate() { return mView.TransportBar.MarkSelectionEndTime(); }; mShortcutKeys[Keys.P] = delegate() { return mView.TransportBar.NextPage(); }; mShortcutKeys[Keys.Shift | Keys.P] = delegate() { return mView.TransportBar.PrevPage(); }; - mShortcutKeys[Keys.V] = delegate() { return mView.TransportBar.Preview(true); }; - mShortcutKeys[Keys.X] = delegate() { return mView.TransportBar.Preview(false); }; + mShortcutKeys[Keys.V] = delegate() { return mView.TransportBar.Preview(TransportBar.From, TransportBar.UseAudioCursor); }; + mShortcutKeys[Keys.Shift | Keys.V] = delegate() { return mView.TransportBar.Preview(TransportBar.From, TransportBar.UseSelection); }; + mShortcutKeys[Keys.X] = delegate() { return mView.TransportBar.Preview(TransportBar.Upto, TransportBar.UseAudioCursor); }; + mShortcutKeys[Keys.Shift | Keys.X] = delegate() { return mView.TransportBar.Preview(TransportBar.Upto, TransportBar.UseSelection); }; // playback shortcuts. @@ -638,8 +644,6 @@ mShortcutKeys[Keys.F] = FastPlayRateStepUp; mShortcutKeys[Keys.D] = FastPlayRateNormalise; mShortcutKeys[Keys.E] = FastPlayNormaliseWithLapseBack; - mShortcutKeys[Keys.OemOpenBrackets] = MarkSelectionBeginTime; - mShortcutKeys[Keys.OemCloseBrackets] = MarkSelectionEndTime; mShortcutKeys[Keys.Shift | Keys.OemOpenBrackets] = MarkSelectionFromCursor; mShortcutKeys[Keys.Shift | Keys.OemCloseBrackets] = MarkSelectionToCursor; @@ -1028,16 +1032,6 @@ return mView.TransportBar.FastPlayNormaliseWithLapseBack(); } - private bool MarkSelectionBeginTime() - { - return mView.TransportBar.MarkSelectionBeginTime(); - } - - private bool MarkSelectionEndTime() - { - return mView.TransportBar.MarkSelectionEndTime(); - } - private bool MarkSelectionFromCursor() { return mView.TransportBar.MarkSelectionFromCursor(); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -110,6 +110,7 @@ public bool CanNavigatePrevPage { get { return Enabled && mRecordingSession == null; } } public bool CanNavigatePrevSection { get { return Enabled && mRecordingSession == null; } } public bool CanPause { get { return Enabled && (mState == State.Playing || mState == State.Recording); } } + public bool CanPausePlayback { get { return Enabled && mState == State.Playing; } } public bool CanPlay { get { return Enabled && mState == State.Stopped; } } public bool CanRecord { get { return Enabled && mState == State.Stopped; } } public bool CanResumePlayback { get { return Enabled && mState == State.Paused; } } @@ -1262,33 +1263,75 @@ } - // preview playback functions + // nudge selection + public static readonly bool Forward = true; // nudge forward + public static readonly bool Backward = false; // nudge backward - + // Nudge selection forward or backward. + public bool Nudge(bool forward) + { + double nudge = mView.ObiForm.Settings.NudgeTimeMs * (forward ? 1 : -1); + if (!IsRecorderActive && mState == State.Paused) + { + double time = mCurrentPlaylist.CurrentTimeInAsset + nudge; + if (time >= 0.0 && time < mCurrentPlaylist.CurrentPhrase.Duration) + { + // Move selection to audio cursor, stop, and nudge the selection. + mView.SelectedBlockNode = mCurrentPlaylist.CurrentPhrase; + mView.Selection = new AudioSelection((PhraseNode)mView.Selection.Node, mView.Selection.Control, + new AudioRange(time)); + Stop(); + return true; + } + } + else if (mState == State.Stopped) + { + AudioSelection s = mView.Selection as AudioSelection; + if (s != null) + { + double time = (s.AudioRange.HasCursor ? s.AudioRange.CursorTime : s.AudioRange.SelectionBeginTime) + nudge; + if (time >= 0.0 && time < ((PhraseNode)s.Node).Duration) + { + mView.Selection = new AudioSelection((PhraseNode)s.Node, mView.Selection.Control, new AudioRange(time)); + return true; + } + } + } + return false; + } + // preview playback functions + public static readonly bool From = true; + public static readonly bool Upto = false; + public static readonly bool UseSelection = true; + public static readonly bool UseAudioCursor = false; /// <summary> - /// Preview from the current position; use the audio cursor, the selection cursor, - /// or the beginning position of a selection. + /// Preview from or upt the current position; use the audio cursor, the selection cursor, + /// or the beginning position of a selection. If the useSelection flag is set, use the + /// selection position; otherwise, use the audio cursor position (if set.) /// </summary> - public bool Preview(bool forward) + public bool Preview(bool from, bool useSelection) { - if (mState == State.Paused || mState == State.Playing) + if (!IsRecorderActive) { - // use the audio cursor - if (mState == State.Playing) Pause(); - PlayPreview(mCurrentPlaylist.CurrentPhrase, mCurrentPlaylist.CurrentTimeInAsset - (forward ? 0.0 : mPreviewDuration), - mPreviewDuration, forward); - return true; + if ((mState == State.Paused || mState == State.Playing) && !useSelection) + { + // use the audio cursor + if (mState == State.Playing) Pause(); + PlayPreview(mCurrentPlaylist.CurrentPhrase, mCurrentPlaylist.CurrentTimeInAsset - (from ? 0.0 : mPreviewDuration), + mPreviewDuration, from); + return true; + } + else if (mView.Selection is AudioSelection) + { + AudioSelection s = (AudioSelection)mView.Selection; + double time = from ? s.AudioRange.CursorTime : + (s.AudioRange.HasCursor ? s.AudioRange.CursorTime : s.AudioRange.SelectionEndTime) - mPreviewDuration; + PlayPreview((PhraseNode)s.Node, time, mPreviewDuration, from); + return true; + } } - else if (mState == State.Stopped && mView.Selection is AudioSelection) - { - AudioSelection s = (AudioSelection)mView.Selection; - double time = forward ? s.AudioRange.CursorTime : - (s.AudioRange.HasCursor ? s.AudioRange.CursorTime : s.AudioRange.SelectionEndTime) - mPreviewDuration; - PlayPreview((PhraseNode)s.Node, time, mPreviewDuration, forward); - return true; - } return false; } Modified: trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -29,7 +29,7 @@ // Build Number // Revision // -[assembly: AssemblyVersion("0.11.1.*")] +[assembly: AssemblyVersion("0.11.2.*")] // There is a warning about this but it is harmless (1607) -[assembly: AssemblyInformationalVersion("1.0 beta 1")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0 beta 2")] \ No newline at end of file Modified: trunk/urakawa/application/Obi/Obi/Settings.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Settings.cs 2008-05-17 18:37:21 UTC (rev 3086) +++ trunk/urakawa/application/Obi/Obi/Settings.cs 2008-05-19 03:56:41 UTC (rev 3087) @@ -25,6 +25,7 @@ public string DefaultPath; // default location public bool EnableTooltips; // enable or disable tooltips public float FontSize; // global font size (all font sizes must be relative to this one) + public double NudgeTimeMs; // nudge time in milliseconds public string LastInputDevice; // the name of the last input device selected by the user public string LastOpenProject; // path to the last open project public string LastOutputDevice; // the name of the last output device selected by the user @@ -39,7 +40,7 @@ public UserProfile UserProfile; // the user profile public bool WrapStrips; // wrapping in content view - private static readonly string SETTINGS_FILE_NAME = "obi_settings_alpha8.xml"; + private static readonly string SETTINGS_FILE_NAME = "obi_settings_beta2.xml"; /// <summary> @@ -69,6 +70,7 @@ settings.PlayIfNoSelection = true; settings.PlayOnNavigate = true; settings.WrapStrips = false; + settings.NudgeTimeMs = 100.0; IsolatedStorageFile file = IsolatedStorageFile.GetUserStoreForDomain(); try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |