From: <ju...@us...> - 2008-05-15 15:50:52
|
Revision: 3068 http://urakawa.svn.sourceforge.net/urakawa/?rev=3068&view=rev Author: julienq Date: 2008-05-15 08:50:48 -0700 (Thu, 15 May 2008) Log Message: ----------- Fixed playback from cursor. TODO: playback from last cursor/section/unused. Hope that I solved the conflict on ObiForm correctly. 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/Playlist.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-15 15:38:52 UTC (rev 3067) +++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-15 15:50:48 UTC (rev 3068) @@ -1029,8 +1029,8 @@ // // preferencesToolStripMenuItem1 // - this.preferencesToolStripMenuItem1.Name = "preferencesToolStripMenuItem1"; resources.ApplyResources(this.preferencesToolStripMenuItem1, "preferencesToolStripMenuItem1"); + this.preferencesToolStripMenuItem1.Name = "preferencesToolStripMenuItem1"; this.preferencesToolStripMenuItem1.Click += new System.EventHandler(this.mPreferencesToolStripMenuItem_Click); // // mHelpToolStripMenuItem @@ -1086,7 +1086,6 @@ this.mProjectView.BackColor = System.Drawing.Color.Transparent; this.mProjectView.Clipboard = null; resources.ApplyResources(this.mProjectView, "mProjectView"); - this.mProjectView.EnableTooltips = false; this.mProjectView.FindInTextVisible = false; this.mProjectView.MetadataViewVisible = true; this.mProjectView.Name = "mProjectView"; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-15 15:38:52 UTC (rev 3067) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-15 15:50:48 UTC (rev 3068) @@ -363,7 +363,7 @@ private void mFocusOnStripsViewToolStripMenuItem_Click(object sender, EventArgs e) { - mProjectView.ShowSelectedSectionInStripsView(); + mProjectView.FocusOnContentView(); } private void mFocusOnTransportBarToolStripMenuItem_Click(object sender, EventArgs e) @@ -1351,8 +1351,6 @@ MessageBoxButtons.OK, MessageBoxIcon.Error); Application.Exit(); } - // tooltips - mProjectView.EnableTooltips = mSettings.EnableTooltips; if (mSettings.ObiFormSize.Width == 0 || mSettings.ObiFormSize.Height == 0) { mSettings.ObiFormSize = Size; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 15:38:52 UTC (rev 3067) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 15:50:48 UTC (rev 3068) @@ -117,16 +117,16 @@ <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> <data name="mFileToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value /> + <value>New project Ctrl+N</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> @@ -236,6 +236,15 @@ <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing"> <value>256, 6</value> </data> + <data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing"> + <value>112, 6</value> + </data> + <data name="mClearListToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>115, 22</value> + </data> + <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> @@ -263,265 +272,6 @@ <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="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.AccessibleName" xml:space="preserve"> - <value>Pause Space</value> - </data> - <data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Space</value> - </data> - <data name="mPauseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mPauseToolStripMenuItem.Text" xml:space="preserve"> - <value>Pa&use</value> - </data> - <data name="mResumeToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Resume Space</value> - </data> - <data name="mResumeToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Space</value> - </data> - <data name="mResumeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mResumeToolStripMenuItem.Text" xml:space="preserve"> - <value>Res&ume</value> - </data> - <data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Stop Ctrl+Space</value> - </data> - <data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+Space</value> - </data> - <data name="mStopToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mStopToolStripMenuItem.Text" xml:space="preserve"> - <value>&Stop</value> - </data> - <data name="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="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="PlayPreviewtoolStripMenuItem.Text" xml:space="preserve"> - <value>Pre&view</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="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous section Alt+Up</value> - </data> - <data name="mPreviousSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Alt+Up</value> - </data> - <data name="mPreviousSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>198, 22</value> - </data> - <data name="mPreviousSectionToolStripMenuItem.Text" xml:space="preserve"> - <value>Previous &section</value> - </data> - <data name="mPreviousPageToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous page Alt+PageUp</value> - </data> - <data name="mPreviousPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Alt+PgUp</value> - </data> - <data name="mPreviousPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>198, 22</value> - </data> - <data name="mPreviousPageToolStripMenuItem.Text" xml:space="preserve"> - <value>Previous &page</value> - </data> - <data name="mPreviousPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous phrase Alt+Left</value> - </data> - <data name="mPreviousPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Alt+Left</value> - </data> - <data name="mPreviousPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>198, 22</value> - </data> - <data name="mPreviousPhraseToolStripMenuItem.Text" xml:space="preserve"> - <value>Previous p&hrase</value> - </data> - <data name="mNextPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next phrase Alt+Right</value> - </data> - <data name="mNextPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Alt+Right</value> - </data> - <data name="mNextPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>198, 22</value> - </data> - <data name="mNextPhraseToolStripMenuItem.Text" xml:space="preserve"> - <value>Next ph&rase</value> - </data> - <data name="nextPageToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next page Alt+PageDown</value> - </data> - <data name="nextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Alt+PgDn</value> - </data> - <data name="nextPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>198, 22</value> - </data> - <data name="nextPageToolStripMenuItem.Text" xml:space="preserve"> - <value>Next pa&ge</value> - </data> - <data name="mNextSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next section Alt+Down</value> - </data> - <data name="mNextSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Alt+Down</value> - </data> - <data name="mNextSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>198, 22</value> - </data> - <data name="mNextSectionToolStripMenuItem.Text" xml:space="preserve"> - <value>Next se&ction</value> - </data> - <data name="toolStripSeparator14.Size" type="System.Drawing.Size, System.Drawing"> - <value>195, 6</value> - </data> - <data name="mPlayOnNavigateToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>198, 22</value> - </data> - <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> - <data name="mRewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Ctrl+,</value> - </data> - <data name="mRewindToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+Oemcomma</value> - </data> - <data name="mRewindToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mRewindToolStripMenuItem.Text" xml:space="preserve"> - <value>Re&wind</value> - </data> - <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Fast forward Ctrl+period</value> - </data> - <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> - <value>Ctrl+.</value> - </data> - <data name="mFastForwardToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+OemPeriod</value> - </data> - <data name="mFastForwardToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>172, 22</value> - </data> - <data name="mFastForwardToolStripMenuItem.Text" xml:space="preserve"> - <value>&Fast forward</value> - </data> - <data name="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.AccessibleName" xml:space="preserve"> - <value>Preferences Ctrl+Alt+F</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="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing"> - <value>112, 6</value> - </data> - <data name="mClearListToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>115, 22</value> - </data> - <data name="mClearListToolStripMenuItem.Text" xml:space="preserve"> - <value>&Clear list</value> - </data> <data name="mUndoToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Undo Ctrl+Z</value> </data> @@ -681,6 +431,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> @@ -834,6 +590,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> @@ -948,6 +710,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.AccessibleName" xml:space="preserve"> <value>Add blank phrase Ctrl+B</value> </data> @@ -1023,12 +791,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> @@ -1065,6 +827,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> @@ -1101,15 +869,10 @@ <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="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>253, 22</value> - </data> - <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> - <value>In-ph&rase audio selection</value> - </data> <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Begin in-phrase selection Ctrl+[</value> </data> @@ -1146,11 +909,11 @@ <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> <value>&Deselect</value> </data> - <data name="mGoToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>253, 22</value> </data> - <data name="mGoToToolStripMenuItem.Text" xml:space="preserve"> - <value>&Go to...</value> + <data name="mInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> + <value>In-ph&rase audio selection</value> </data> <data name="mNextTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Next TODO phrase Ctrl+F9</value> @@ -1176,6 +939,18 @@ <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.AccessibleName" xml:space="preserve"> <value>Play all Ctrl+Shift+Space</value> </data> @@ -1200,6 +975,48 @@ <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.AccessibleName" xml:space="preserve"> + <value>Pause Space</value> + </data> + <data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Space</value> + </data> + <data name="mPauseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mPauseToolStripMenuItem.Text" xml:space="preserve"> + <value>Pa&use</value> + </data> + <data name="mResumeToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Resume Space</value> + </data> + <data name="mResumeToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Space</value> + </data> + <data name="mResumeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mResumeToolStripMenuItem.Text" xml:space="preserve"> + <value>Res&ume</value> + </data> + <data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Stop Ctrl+Space</value> + </data> + <data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Space</value> + </data> + <data name="mStopToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mStopToolStripMenuItem.Text" xml:space="preserve"> + <value>&Stop</value> + </data> <data name="NormalSpeedtoolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Normal speed Ctrl+0</value> </data> @@ -1248,6 +1065,12 @@ <data name="mElapseBacktoolStripMenuItem.Text" xml:space="preserve"> <value>Normal speed with &elapse back</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="mPreviewFromtoolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Preview from... Ctrl+P</value> </data> @@ -1272,6 +1095,12 @@ <data name="PreviewSelectedAudiotoolStripMenuItem.Text" xml:space="preserve"> <value>Preview &selected</value> </data> + <data name="PlayPreviewtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <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> </data> @@ -1296,6 +1125,144 @@ <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="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Previous section Alt+Up</value> + </data> + <data name="mPreviousSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Alt+Up</value> + </data> + <data name="mPreviousSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>198, 22</value> + </data> + <data name="mPreviousSectionToolStripMenuItem.Text" xml:space="preserve"> + <value>Previous &section</value> + </data> + <data name="mPreviousPageToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Previous page Alt+PgUp</value> + </data> + <data name="mPreviousPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Alt+PgUp</value> + </data> + <data name="mPreviousPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>198, 22</value> + </data> + <data name="mPreviousPageToolStripMenuItem.Text" xml:space="preserve"> + <value>Previous &page</value> + </data> + <data name="mPreviousPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Previous phrase Alt+Left</value> + </data> + <data name="mPreviousPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Alt+Left</value> + </data> + <data name="mPreviousPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>198, 22</value> + </data> + <data name="mPreviousPhraseToolStripMenuItem.Text" xml:space="preserve"> + <value>Previous p&hrase</value> + </data> + <data name="mNextPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Next phrase Alt+Right</value> + </data> + <data name="mNextPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Alt+Right</value> + </data> + <data name="mNextPhraseToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>198, 22</value> + </data> + <data name="mNextPhraseToolStripMenuItem.Text" xml:space="preserve"> + <value>Next ph&rase</value> + </data> + <data name="nextPageToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Next page Alt+PgDn</value> + </data> + <data name="nextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Alt+PgDn</value> + </data> + <data name="nextPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>198, 22</value> + </data> + <data name="nextPageToolStripMenuItem.Text" xml:space="preserve"> + <value>Next pa&ge</value> + </data> + <data name="mNextSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Next section Alt+Down</value> + </data> + <data name="mNextSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Alt+Down</value> + </data> + <data name="mNextSectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>198, 22</value> + </data> + <data name="mNextSectionToolStripMenuItem.Text" xml:space="preserve"> + <value>Next se&ction</value> + </data> + <data name="toolStripSeparator14.Size" type="System.Drawing.Size, System.Drawing"> + <value>195, 6</value> + </data> + <data name="mPlayOnNavigateToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>198, 22</value> + </data> + <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> + <data name="mRewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Ctrl+,</value> + </data> + <data name="mRewindToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+Oemcomma</value> + </data> + <data name="mRewindToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mRewindToolStripMenuItem.Text" xml:space="preserve"> + <value>Re&wind</value> + </data> + <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Fast forward Ctrl+.</value> + </data> + <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> + <value>Ctrl+.</value> + </data> + <data name="mFastForwardToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+OemPeriod</value> + </data> + <data name="mFastForwardToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mFastForwardToolStripMenuItem.Text" xml:space="preserve"> + <value>&Fast forward</value> + </data> + <data name="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.AccessibleName" xml:space="preserve"> + <value /> + </data> + <data name="preferencesToolStripMenuItem1.AccessibleName" xml:space="preserve"> + <value>Preferences Ctrl+Alt+F</value> + </data> <data name="preferencesToolStripMenuItem1.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+F</value> </data> @@ -1305,6 +1272,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> @@ -1347,8 +1320,41 @@ <data name="aboutObiToolStripMenuItem.Text" xml:space="preserve"> <value>&About Obi</value> </data> - <data name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing"> + <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> @@ -1374,9 +1380,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> @@ -1396,7 +1399,7 @@ <value>mProjectView</value> </data> <data name=">>mProjectView.Type" xml:space="preserve"> - <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.27146, Culture=neutral, PublicKeyToken=null</value> + <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.30052, Culture=neutral, PublicKeyToken=null</value> </data> <data name=">>mProjectView.Parent" xml:space="preserve"> <value>$this</value> @@ -1404,9 +1407,9 @@ <data name=">>mProjectView.ZOrder" xml:space="preserve"> <value>0</value> </data> - <data name="$this.Localizable" type="System.Boolean, mscorlib"> + <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> - </data> + </metadata> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <value>6, 13</value> </data> @@ -1669,9 +1672,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> @@ -2443,10 +2443,4 @@ <data name=">>$this.Type" xml:space="preserve"> <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> - <data name="mStartListeningToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Start Monitoring ctrl+r</value> - </data> - <data name="mStartRecordingToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Start Recording ctrl+shift+r</value> - </data> </root> \ No newline at end of file Modified: trunk/urakawa/application/Obi/Obi/Playlist.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-15 15:38:52 UTC (rev 3067) +++ trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-15 15:50:48 UTC (rev 3068) @@ -286,7 +286,8 @@ mPlayer.EndOfAudioAsset += new Events.Audio.Player.EndOfAudioAssetHandler(Playlist_MoveToNextPhrase); } mPlaylistState = AudioPlayerState.Playing; - double from = mCurrentPhraseIndex == 0 ? mPlaybackStartTime : 0.0; + double from = mPlaybackStartTime; + mPlaybackStartTime = 0.0; if (mCurrentPhraseIndex == mPhrases.Count - 1 && mPlaybackEndTime > 0.0) { mPlayer.Play(mPhrases[mCurrentPhraseIndex].Audio.getMediaData(), from, mPlaybackEndTime); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 15:38:52 UTC (rev 3067) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 15:50:48 UTC (rev 3068) @@ -198,8 +198,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 CanFocusOnContentView { get { return mPresentation != null && !mStripsView.Focused && mStripsView.Selection == null; } } - public bool CanFocusOnTOCView { get { return mPresentation != null && !mTOCView.Focused && mTOCView.Selection == null; } } + public bool CanFocusOnContentView { get { return mPresentation != null && !mStripsView.Focused; } } + public bool CanFocusOnTOCView { get { return mPresentation != null && !mTOCView.Focused; } } public bool CanIncreaseLevel { get { return mTOCView.CanIncreaseLevel; } } public bool CanInsertSection { get { return CanInsertStrip || mTOCView.Selection != null; } } public bool CanInsertStrip { get { return mStripsView.Selection != null; } } @@ -357,18 +357,16 @@ if (command.getCount() > 0) mPresentation.getUndoRedoManager().execute(command); } + /// <summary> - /// Enable/disable tooltips in the view (currently mostly disabled.) + /// Show (select) the strip for the current selection /// </summary> - public bool EnableTooltips + public void FocusOnContentView() { - get { return mEnableTooltips; } - set + if (CanFocusOnContentView) { - mEnableTooltips = value; - // mStripManagerPanel.EnableTooltips = value; - // mTOCPanel.EnableTooltips = value; - // mTransportBar.EnableTooltips = value; + if (mSelection != null && mSelection.Control is TOCView) Selection = new NodeSelection(mSelection.Node, mStripsView); + mStripsView.Focus(); } } @@ -382,16 +380,8 @@ SectionNode node = mSelection == null ? null : mSelection.Node is SectionNode ? (SectionNode)mSelection.Node : mSelection.Node.AncestorAs<SectionNode>(); - if (node != null) - { - Selection = new NodeSelection(node, mTOCView); - mTOCView.Focus(); - } - else - { - TOCViewVisible = true; - mTOCView.Focus(); - } + if (node != null) Selection = new NodeSelection(node, mTOCView); + mTOCView.Focus(); } } @@ -839,7 +829,6 @@ public bool CanDeselect { get { return mSelection != null; } } public bool CanShowInStripsView { get { return IsSectionSelected; } } - public bool CanShowInTOCView { get { return IsStripSelected; } } public bool CanMarkSectionUnused { get { return mTOCView.CanSetSectionUsedStatus && mSelection.Node.Used; } } public bool CanMarkStripUnused { get { return !mStripsView.CanSetStripUsedStatus || mSelection.Node.Used; } } @@ -888,21 +877,6 @@ mTOCView.MakeTreeNodeVisibleForSection(section); } - /// <summary> - /// Show (select) the strip for the current selection - /// </summary> - public void ShowSelectedSectionInStripsView() - { - if (CanShowInStripsView) - { - Selection = new NodeSelection(mSelection.Node, mStripsView); - } - else - { - mStripsView.GetFocus(); - } - } - #region Find in Text public void FindInText() Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 15:38:52 UTC (rev 3067) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 15:50:48 UTC (rev 3068) @@ -526,8 +526,6 @@ { mCurrentPlaylist = mMasterPlaylist; PlayCurrentPlaylistFromSelection(); - // mCurrentPlaylist.CurrentPhrase = mCurrentPlaylist.FirstPhrase; - // mCurrentPlaylist.Play(); } /// <summary> @@ -575,13 +573,23 @@ && (!((AudioSelection)mView.Selection).AudioRange.HasCursor || mIsSelectionMarked) && ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime > ((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime) { + // Play the current selection mCurrentPlaylist.CurrentPhrase = (PhraseNode)mView.Selection.Node; - mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime, ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime); + if (mCurrentPlaylist == mMasterPlaylist) + { + // when "play all", ignore the end time + mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime); + } + else + { + mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime, ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime); + } } else if (mView.Selection is AudioSelection && mView.Selection.Node is PhraseNode && ((AudioSelection)mView.Selection).AudioRange.HasCursor) { + // Play from the cursor mCurrentPlaylist.CurrentPhrase = (PhraseNode)mView.Selection.Node; mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.CursorTime); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |