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-16 20:08:08
|
Revision: 3081 http://urakawa.svn.sourceforge.net/urakawa/?rev=3081&view=rev Author: julienq Date: 2008-05-16 13:07:54 -0700 (Fri, 16 May 2008) Log Message: ----------- Fix to bug 1930398 While using Edit role, crash is triggered Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Presentation.cs Modified: trunk/urakawa/application/Obi/Obi/Presentation.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Presentation.cs 2008-05-16 20:06:10 UTC (rev 3080) +++ trunk/urakawa/application/Obi/Obi/Presentation.cs 2008-05-16 20:07:54 UTC (rev 3081) @@ -137,6 +137,7 @@ if (customClass == null || customClass == "") return; if (!mCustomClasses.ContainsKey(customClass)) { + mCustomClasses.Add(customClass, new List<EmptyNode>(1)); if (node != null) mCustomClasses.Add(customClass, new List<EmptyNode>()); if (CustomClassAddded != null) CustomClassAddded(this, new CustomClassEventArgs(customClass)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <avn...@us...> - 2008-05-16 20:06:15
|
Revision: 3080 http://urakawa.svn.sourceforge.net/urakawa/?rev=3080&view=rev Author: avneeshsingh Date: 2008-05-16 13:06:10 -0700 (Fri, 16 May 2008) Log Message: ----------- Fix to bugg: Empty phrases do not gain keyboard focus. Actually keyboard focus was accepted but accessible label was problem Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-16 19:58:23 UTC (rev 3079) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-16 20:06:10 UTC (rev 3080) @@ -116,6 +116,7 @@ { mLabel.Text = Node.BaseStringShort(); mLabel.AccessibleName = Node.BaseString(); + AccessibleName = mLabel.AccessibleName; Size = new Size(LabelFullWidth, Height); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-16 19:58:26
|
Revision: 3079 http://urakawa.svn.sourceforge.net/urakawa/?rev=3079&view=rev Author: julienq Date: 2008-05-16 12:58:23 -0700 (Fri, 16 May 2008) Log Message: ----------- Fixed bug 1965539 stopping recording after pausing it crash Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs 2008-05-16 19:02:00 UTC (rev 3078) +++ trunk/urakawa/application/Obi/Obi/Dialogs/EditRoles.Designer.cs 2008-05-16 19:58:23 UTC (rev 3079) @@ -39,25 +39,32 @@ // // mCustomRolesList // + this.mCustomRolesList.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.mCustomRolesList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.mCustomRolesList.FormattingEnabled = true; - this.mCustomRolesList.Location = new System.Drawing.Point(6, 50); + this.mCustomRolesList.Location = new System.Drawing.Point(12, 52); this.mCustomRolesList.Name = "mCustomRolesList"; - this.mCustomRolesList.Size = new System.Drawing.Size(179, 108); + this.mCustomRolesList.Size = new System.Drawing.Size(287, 132); this.mCustomRolesList.TabIndex = 2; this.mCustomRolesList.KeyUp += new System.Windows.Forms.KeyEventHandler(this.mCustomRolesList_KeyUp); // // mNewCustomRole // - this.mNewCustomRole.Location = new System.Drawing.Point(6, 20); + this.mNewCustomRole.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mNewCustomRole.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.mNewCustomRole.Location = new System.Drawing.Point(12, 25); this.mNewCustomRole.Name = "mNewCustomRole"; - this.mNewCustomRole.Size = new System.Drawing.Size(179, 20); + this.mNewCustomRole.Size = new System.Drawing.Size(287, 20); this.mNewCustomRole.TabIndex = 0; this.mNewCustomRole.KeyUp += new System.Windows.Forms.KeyEventHandler(this.mNewCustomRole_KeyUp); // // mInstructions // this.mInstructions.AutoSize = true; - this.mInstructions.Location = new System.Drawing.Point(3, 4); + this.mInstructions.Location = new System.Drawing.Point(12, 9); this.mInstructions.Name = "mInstructions"; this.mInstructions.Size = new System.Drawing.Size(187, 13); this.mInstructions.TabIndex = 3; @@ -65,8 +72,10 @@ // // mOk // + this.mOk.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.mOk.DialogResult = System.Windows.Forms.DialogResult.OK; - this.mOk.Location = new System.Drawing.Point(11, 164); + this.mOk.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.mOk.Location = new System.Drawing.Point(118, 220); this.mOk.Name = "mOk"; this.mOk.Size = new System.Drawing.Size(75, 23); this.mOk.TabIndex = 4; @@ -76,8 +85,10 @@ // // mCancel // + this.mCancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.mCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.mCancel.Location = new System.Drawing.Point(105, 164); + this.mCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.mCancel.Location = new System.Drawing.Point(199, 220); this.mCancel.Name = "mCancel"; this.mCancel.Size = new System.Drawing.Size(75, 23); this.mCancel.TabIndex = 5; @@ -87,7 +98,9 @@ // // mAdd // - this.mAdd.Location = new System.Drawing.Point(205, 20); + this.mAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.mAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.mAdd.Location = new System.Drawing.Point(305, 22); this.mAdd.Name = "mAdd"; this.mAdd.Size = new System.Drawing.Size(75, 23); this.mAdd.TabIndex = 1; @@ -97,7 +110,9 @@ // // mRemove // - this.mRemove.Location = new System.Drawing.Point(205, 50); + this.mRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.mRemove.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.mRemove.Location = new System.Drawing.Point(305, 51); this.mRemove.Name = "mRemove"; this.mRemove.Size = new System.Drawing.Size(75, 23); this.mRemove.TabIndex = 3; @@ -109,7 +124,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(293, 189); + this.ClientSize = new System.Drawing.Size(392, 255); this.Controls.Add(this.mRemove); this.Controls.Add(this.mAdd); this.Controls.Add(this.mCancel); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 19:02:00 UTC (rev 3078) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 19:58:23 UTC (rev 3079) @@ -1369,9 +1369,7 @@ { if (mSelection != null && mSelection.Control != mStripsView) { - NodeSelection s = mSelection; - s.Control = mStripsView; - Selection = s; + Selection = new NodeSelection(mSelection.Node, mStripsView); } } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 19:02:00 UTC (rev 3078) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 19:58:23 UTC (rev 3079) @@ -735,7 +735,7 @@ else { // Stopping again deselects everything - if (mCurrentPlaylist.State == Obi.Audio.AudioPlayerState.Stopped) + if (mState == State.Stopped) { mView.Selection = null; } @@ -858,8 +858,10 @@ } else { - command.append(new Commands.Node.AddNode(mView, phrase, mRecordingSection, - mRecordingInitPhraseIndex + e.PhraseIndex)); + Commands.Node.AddNode add = new Commands.Node.AddNode(mView, phrase, mRecordingSection, + mRecordingInitPhraseIndex + e.PhraseIndex); + add.UpdateSelection = false; + command.append(add); if (emptyNode != null) { phrase.CopyKind(emptyNode); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-16 19:02:10
|
Revision: 3078 http://urakawa.svn.sourceforge.net/urakawa/?rev=3078&view=rev Author: julienq Date: 2008-05-16 12:02:00 -0700 (Fri, 16 May 2008) Log Message: ----------- Fix for scroll selection into view bug, and more importantly for bug 1964797: while recording next phrase after next section crash Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs trunk/urakawa/application/Obi/Obi/Playlist.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.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-16 16:44:30 UTC (rev 3077) +++ trunk/urakawa/application/Obi/Obi/Commands/Node/SplitAudio.cs 2008-05-16 19:02:00 UTC (rev 3078) @@ -24,6 +24,9 @@ public override void execute() { mNewNode = View.Presentation.CreatePhraseNode(mNode.SplitAudio(mSplitPoint)); + mNewNode.CustomClass = mNode.CustomClass; + mNewNode.NodeKind = mNode.NodeKind; + mNewNode.Used = mNode.Used; mNode.InsertAfterSelf(mNewNode); if (UpdateSelection) View.SelectedBlockNode = mNewNode; } Modified: trunk/urakawa/application/Obi/Obi/Playlist.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-16 16:44:30 UTC (rev 3077) +++ trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-16 19:02:00 UTC (rev 3078) @@ -95,7 +95,7 @@ /// </summary> public AudioPlayer Audioplayer { get { return mPlayer; } } - public bool CanNavigatePrevPhrase { get { return mCurrentPhraseIndex > 0; } } + public bool CanNavigatePrevPhrase { get { return true; } } public bool CanNavigateNextPhrase { get { return mCurrentPhraseIndex < mPhrases.Count - 1; } } public bool CanNavigateNextSection { get { return NextSectionIndex < mPhrases.Count - 1; } } public bool CanNavigateNextPage { get { return true; } } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 16:44:30 UTC (rev 3077) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 19:02:00 UTC (rev 3078) @@ -604,13 +604,13 @@ } // select in the control mSelection = value; + UpdateShowOnlySelected(mSelection == null ? false : mShowOnlySelected); if (mSelection != null) { if (mSelection.Control == mTOCView) TOCViewVisible = true; else if (mSelection.Control == mMetadataView) MetadataViewVisible = true; mSelection.Control.Selection = value; } - UpdateShowOnlySelected(mSelection == null ? false : mShowOnlySelected); if (SelectionChanged != null) SelectionChanged(this, new EventArgs()); } } @@ -993,7 +993,7 @@ public void SplitPhrase() { - if (CanSplitPhrase) mPresentation.getUndoRedoManager().execute(new Commands.Node.SplitAudio(this)); + if (CanSplitPhrase) { mPresentation.getUndoRedoManager().execute(new Commands.Node.SplitAudio(this)); } } /// <summary> Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 16:44:30 UTC (rev 3077) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 19:02:00 UTC (rev 3078) @@ -270,10 +270,10 @@ if (s != null) { s.SelectionFromView = mSelection; - mLayoutPanel.ScrollControlIntoView((Control)s); SectionNode section = value.Node is SectionNode ? (SectionNode)value.Node : value.Node.ParentAs<SectionNode>(); mView.MakeTreeNodeVisibleForSection(section); + mLayoutPanel.ScrollControlIntoView((Control)s); mFocusing = true; if (!((Control)s).Focused) ((Control)s).Focus(); mFocusing = false; Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 16:44:30 UTC (rev 3077) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 19:02:00 UTC (rev 3078) @@ -851,8 +851,10 @@ mRecordingPhrase = phrase; if (e.PhraseIndex > 0) { - mView.Presentation.getUndoRedoManager().execute(new Commands.Node.AddNode(mView, phrase, mRecordingSection, - mRecordingInitPhraseIndex + e.PhraseIndex)); + Commands.Node.AddNode add = new Commands.Node.AddNode(mView, phrase, mRecordingSection, + mRecordingInitPhraseIndex + e.PhraseIndex); + add.UpdateSelection = false; + mView.Presentation.getUndoRedoManager().execute(add); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-16 16:44:49
|
Revision: 3077 http://urakawa.svn.sourceforge.net/urakawa/?rev=3077&view=rev Author: julienq Date: 2008-05-16 09:44:30 -0700 (Fri, 16 May 2008) Log Message: ----------- Alpha 9 release Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs trunk/urakawa/application/Obi/Setup/Setup.vdproj Modified: trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-16 11:57:15 UTC (rev 3076) +++ trunk/urakawa/application/Obi/Obi/Properties/AssemblyInfo.cs 2008-05-16 16:44:30 UTC (rev 3077) @@ -29,7 +29,7 @@ // Build Number // Revision // -[assembly: AssemblyVersion("0.10.8.*")] +[assembly: AssemblyVersion("0.10.9.*")] // There is a warning about this but it is harmless (1607) -[assembly: AssemblyInformationalVersion("1.0 alpha 8")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("1.0 alpha 9")] \ No newline at end of file Modified: trunk/urakawa/application/Obi/Setup/Setup.vdproj =================================================================== --- trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-16 11:57:15 UTC (rev 3076) +++ trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-16 16:44:30 UTC (rev 3077) @@ -1173,7 +1173,7 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:Obi 0.10.8" + "ProductName" = "8:Obi 0.10.9" "ProductCode" = "8:{85A99D0A-5FF6-4CC7-A480-101BF4E080F0}" "PackageCode" = "8:{685FA0E0-A285-4B18-BD6A-350237A923FB}" "UpgradeCode" = "8:{358C2C3A-3686-4461-A8BA-9D766218CC5E}" @@ -1296,7 +1296,7 @@ { "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_0F34FEE7392245ED8C33C78EB0D2823B" { - "Name" = "8:Obi 0.10.8" + "Name" = "8:Obi 0.10.9" "Arguments" = "8:" "Description" = "8:" "ShowCmd" = "3:1" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <avn...@us...> - 2008-05-16 11:57:26
|
Revision: 3076 http://urakawa.svn.sourceforge.net/urakawa/?rev=3076&view=rev Author: avneeshsingh Date: 2008-05-16 04:57:15 -0700 (Fri, 16 May 2008) Log Message: ----------- improvements to record submenu Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ObiForm.cs trunk/urakawa/application/Obi/Obi/ObiForm.resx Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 11:50:36 UTC (rev 3075) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 11:57:15 UTC (rev 3076) @@ -641,17 +641,26 @@ // update recording menu items mStartRecordingToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive; - if (mProjectView.TransportBar.IsRecorderActive) + if (mProjectView.TransportBar.IsListening) { + mStartListeningToolStripMenuItem.Text = "Start Recording"; + mStartListeningToolStripMenuItem.AccessibleName = "Start Recording ctrl+r"; + mStartRecordingToolStripMenuItem.Enabled = false; + } + else if (mProjectView.TransportBar.IsRecorderActive) // actual recording is going on + { mStartListeningToolStripMenuItem.Enabled = false; + mStartRecordingToolStripMenuItem.Enabled = false; } - else + else // neither listening nor actual recording is going on { - mStartListeningToolStripMenuItem.Enabled = true; - mStartRecordingToolStripMenuItem.Enabled = true; + mStartListeningToolStripMenuItem.Text = "Start Monitering"; + mStartListeningToolStripMenuItem.AccessibleName = "Start Monitering ctrl+r"; + + mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; + mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; } - mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; - mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; + } private void mPlayAllToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PlayAll(); } Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 11:50:36 UTC (rev 3075) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 11:57:15 UTC (rev 3076) @@ -1204,7 +1204,7 @@ <value>215, 22</value> </data> <data name="mStartRecordingToolStripMenuItem.Text" xml:space="preserve"> - <value>Start &recording</value> + <value>Start &recording directly</value> </data> <data name="mAllowOverwriteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>215, 22</value> @@ -2444,6 +2444,6 @@ <value>Start Monitering ctrl+r</value> </data> <data name="mStartRecordingToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Start Recording ctrl+shift+r</value> + <value>Start Recording directly ctrl+shift+r</value> </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-16 11:50:39
|
Revision: 3075 http://urakawa.svn.sourceforge.net/urakawa/?rev=3075&view=rev Author: julienq Date: 2008-05-16 04:50:36 -0700 (Fri, 16 May 2008) Log Message: ----------- Finished navigation. Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Dialogs/SetPageNumber.Designer.cs trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs trunk/urakawa/application/Obi/Obi/ObiForm.cs trunk/urakawa/application/Obi/Obi/Playlist.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/Dialogs/SetPageNumber.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Dialogs/SetPageNumber.Designer.cs 2008-05-16 10:30:48 UTC (rev 3074) +++ trunk/urakawa/application/Obi/Obi/Dialogs/SetPageNumber.Designer.cs 2008-05-16 11:50:36 UTC (rev 3075) @@ -57,6 +57,7 @@ // mOKButton // this.mOKButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.mOKButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.mOKButton.Location = new System.Drawing.Point(123, 116); this.mOKButton.Name = "mOKButton"; this.mOKButton.Size = new System.Drawing.Size(75, 23); @@ -67,6 +68,7 @@ // mCancelButton // this.mCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.mCancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.mCancelButton.Location = new System.Drawing.Point(204, 116); this.mCancelButton.Name = "mCancelButton"; this.mCancelButton.Size = new System.Drawing.Size(75, 23); @@ -77,9 +79,10 @@ // mRenumber // this.mRenumber.AutoSize = true; + this.mRenumber.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.mRenumber.Location = new System.Drawing.Point(12, 64); this.mRenumber.Name = "mRenumber"; - this.mRenumber.Size = new System.Drawing.Size(151, 17); + this.mRenumber.Size = new System.Drawing.Size(148, 17); this.mRenumber.TabIndex = 3; this.mRenumber.Text = "&Renumber following pages"; this.mRenumber.UseVisualStyleBackColor = true; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-16 10:30:48 UTC (rev 3074) +++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-16 11:50:36 UTC (rev 3075) @@ -143,7 +143,7 @@ this.mPreviousPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mPreviousPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mNextPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.nextPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mNextPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mNextSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); this.mPlayOnNavigateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -951,7 +951,7 @@ this.mPreviousPageToolStripMenuItem, this.mPreviousPhraseToolStripMenuItem, this.mNextPhraseToolStripMenuItem, - this.nextPageToolStripMenuItem, + this.mNextPageToolStripMenuItem, this.mNextSectionToolStripMenuItem, this.toolStripSeparator14, this.mPlayOnNavigateToolStripMenuItem}); @@ -984,9 +984,9 @@ // // nextPageToolStripMenuItem // - resources.ApplyResources(this.nextPageToolStripMenuItem, "nextPageToolStripMenuItem"); - this.nextPageToolStripMenuItem.Name = "nextPageToolStripMenuItem"; - this.nextPageToolStripMenuItem.Click += new System.EventHandler(this.nextPageToolStripMenuItem_Click); + resources.ApplyResources(this.mNextPageToolStripMenuItem, "nextPageToolStripMenuItem"); + this.mNextPageToolStripMenuItem.Name = "nextPageToolStripMenuItem"; + this.mNextPageToolStripMenuItem.Click += new System.EventHandler(this.nextPageToolStripMenuItem_Click); // // mNextSectionToolStripMenuItem // @@ -1206,7 +1206,7 @@ private System.Windows.Forms.ToolStripMenuItem mPreviousPageToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mPreviousPhraseToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mNextPhraseToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem nextPageToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mNextPageToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mNextSectionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mRewindToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mFastForwardToolStripMenuItem; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 10:30:48 UTC (rev 3074) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 11:50:36 UTC (rev 3075) @@ -626,8 +626,12 @@ mPreviewFromToolStripMenuItem.Enabled = mProjectView.CanPreview; mPreviewUpToToolStripMenuItem.Enabled = mProjectView.CanPreview; mPreviewSelectedToolStripMenuItem.Enabled = mProjectView.CanPreviewAudioSelection; + mPreviousSectionToolStripMenuItem.Enabled = mProjectView.CanNavigatePrevSection; + mPreviousPageToolStripMenuItem.Enabled = mProjectView.CanNavigatePrevPage; mPreviousPhraseToolStripMenuItem.Enabled = mProjectView.CanNavigatePrevPhrase; mNextPhraseToolStripMenuItem.Enabled = mProjectView.CanNavigateNextPhrase; + mNextPageToolStripMenuItem.Enabled = mProjectView.CanNavigateNextPage; + mNextSectionToolStripMenuItem.Enabled = mProjectView.CanNavigateNextSection; mFastForwardToolStripMenuItem.Enabled = mProjectView.CanFastForward; mRewindToolStripMenuItem.Enabled = mProjectView.CanRewind; @@ -665,8 +669,12 @@ private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); } private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); } private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); } + private void previousSectionToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevSection(); } + private void previousPageToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevPage(); } private void previousPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevPhrase(); } private void nextPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.NextPhrase(); } + private void nextPageToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.NextPage(); } + private void nextSectionToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.NextSection(); } private void rewindToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Rewind(); } private void fastForwardToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.FastForward(); } @@ -687,27 +695,11 @@ - private void previousSectionToolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PrevSection(); - } - private void previousPageToolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PrevPage(); - } - private void nextSectionToolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.NextSection(); - } - private void nextPageToolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.NextPage(); - } private void NormalSpeedtoolStripMenuItem_Click(object sender, EventArgs e) { Modified: trunk/urakawa/application/Obi/Obi/Playlist.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-16 10:30:48 UTC (rev 3074) +++ trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-16 11:50:36 UTC (rev 3075) @@ -98,11 +98,13 @@ public bool CanNavigatePrevPhrase { get { return mCurrentPhraseIndex > 0; } } public bool CanNavigateNextPhrase { get { return mCurrentPhraseIndex < mPhrases.Count - 1; } } public bool CanNavigateNextSection { get { return NextSectionIndex < mPhrases.Count - 1; } } + public bool CanNavigateNextPage { get { return true; } } - public PhraseNode PrevPhrase(PhraseNode node) + public PhraseNode NextPage(PhraseNode node) { - int index = mPhrases.IndexOf(node) - 1; - return index >= 0 ? mPhrases[index] : null; + int index = mPhrases.IndexOf(node) + 1; + for (; index < mPhrases.Count && mPhrases[index].NodeKind != EmptyNode.Kind.Page; ++index) { } + return index >= 0 && index < mPhrases.Count ? mPhrases[index] : null; } public PhraseNode NextPhrase(PhraseNode node) @@ -121,7 +123,36 @@ return index >= 0 && index < mPhrases.Count ? mPhrases[index] : null; } + public PhraseNode PrevPage(PhraseNode node) + { + int index = mPhrases.IndexOf(node) - 1; + for (; index >= 0 && mPhrases[index].NodeKind != EmptyNode.Kind.Page; --index) { } + return index >= 0 ? mPhrases[index] : null; + } + public PhraseNode PrevPhrase(PhraseNode node) + { + int index = mPhrases.IndexOf(node) - 1; + return index >= 0 ? mPhrases[index] : null; + } + + + public PhraseNode PrevSection(PhraseNode node) + { + int index = mPhrases.IndexOf(node); + if (node != null) + { + for (; index >= 0 && mPhrases[index].AncestorAs<SectionNode>() == node.AncestorAs<SectionNode>(); --index) { } + if (index >= 0) + { + SectionNode prev = mPhrases[index].AncestorAs<SectionNode>(); + for (; index >= 0 && mPhrases[index].AncestorAs<SectionNode>() == prev; --index) { } + ++index; + } + } + return index >= 0 ? mPhrases[index] : null; + } + /// <summary> /// Set the currently playing phrase directly. /// If playing, move to the beginning of the phrase. Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 10:30:48 UTC (rev 3074) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 11:50:36 UTC (rev 3075) @@ -205,8 +205,12 @@ public bool CanInsertSection { get { return CanInsertStrip || mTOCView.Selection != null; } } public bool CanInsertStrip { get { return mStripsView.Selection != null; } } public bool CanMergeStripWithNext { get { return mStripsView.CanMergeStripWithNext; } } + public bool CanNavigateNextPage { get { return mTransportBar.CanNavigateNextPage; } } + public bool CanNavigateNextPhrase { get { return mTransportBar.CanNavigateNextPhrase; } } + public bool CanNavigateNextSection { get { return mTransportBar.CanNavigateNextSection; } } + public bool CanNavigatePrevPage { get { return mTransportBar.CanNavigatePrevPage; } } public bool CanNavigatePrevPhrase { get { return mTransportBar.CanNavigatePrevPhrase; } } - public bool CanNavigateNextPhrase { get { return mTransportBar.CanNavigateNextPhrase; } } + public bool CanNavigatePrevSection { get { return mTransportBar.CanNavigatePrevSection; } } public bool CanPaste { get { return mSelection != null && mSelection.CanPaste(mClipboard); } } public bool CanPasteBefore { get { return mTOCView.CanPasteBefore(mClipboard); } } public bool CanPasteInside { get { return mTOCView.CanPasteInside(mClipboard); } } @@ -1373,7 +1377,7 @@ public void SelectPhraseInContentView(PhraseNode node) { - Selection = node == null ? null : new NodeSelection(node, mStripsView); + if (node != null) Selection = new NodeSelection(node, mStripsView); } /// <summary> Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 10:30:48 UTC (rev 3074) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 11:50:36 UTC (rev 3075) @@ -621,20 +621,18 @@ { mShortcutKeys = new Dictionary<Keys, HandledShortcutKey>(); + mShortcutKeys[Keys.A] = delegate() { return mView.TransportBar.MarkSelectionWholePhrase(); }; mShortcutKeys[Keys.C] = delegate() { return mView.TransportBar.PreviewAudioSelection(); }; mShortcutKeys[Keys.H] = delegate() { return mView.TransportBar.NextSection(); }; + 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.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.A] = MarkSelectionWholePhrase; // playback shortcuts. - mShortcutKeys[Keys.Shift | Keys.H] = NavigatePrevSection; - mShortcutKeys[Keys.Shift | Keys.P] = NavigatePrevPage; - mShortcutKeys[Keys.P] = NavigateNextPage; mShortcutKeys[Keys.S] = FastPlayRateStepDown; mShortcutKeys[Keys.F] = FastPlayRateStepUp; @@ -991,24 +989,8 @@ - private bool NavigateNextPage() - { - mView.TransportBar.NextPage(); - return true; - } - private bool NavigatePrevPage() - { - mView.TransportBar.PrevPage(); - return true; - } - private bool NavigatePrevSection() - { - mView.TransportBar.PrevSection(); - return true; - } - // Toggle play/pause in the transport bar public bool TogglePlayPause() { @@ -1066,10 +1048,6 @@ return mView.TransportBar.MarkSelectionToCursor(); } - private bool MarkSelectionWholePhrase() - { - return mView.TransportBar.MarkSelectionWholePhrase(); - } #endregion Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs 2008-05-16 10:30:48 UTC (rev 3074) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs 2008-05-16 11:50:36 UTC (rev 3075) @@ -166,7 +166,7 @@ this.mPrevSectionButton.Name = "mPrevSectionButton"; this.mPrevSectionButton.Size = new System.Drawing.Size(32, 35); this.mPrevSectionButton.TabIndex = 0; - this.mTransportBarTooltip.SetToolTip(this.mPrevSectionButton, "Go to the preceding section."); + this.mTransportBarTooltip.SetToolTip(this.mPrevSectionButton, "Go to the preceding section. (Shift+H)"); this.mPrevSectionButton.UseVisualStyleBackColor = true; this.mPrevSectionButton.Click += new System.EventHandler(this.mPrevSectionButton_Click); // @@ -252,7 +252,7 @@ this.mNextPageButton.Name = "mNextPageButton"; this.mNextPageButton.Size = new System.Drawing.Size(32, 35); this.mNextPageButton.TabIndex = 10; - this.mTransportBarTooltip.SetToolTip(this.mNextPageButton, "Go to the following page."); + this.mTransportBarTooltip.SetToolTip(this.mNextPageButton, "Go to the following page. (P)"); this.mNextPageButton.UseVisualStyleBackColor = true; this.mNextPageButton.Click += new System.EventHandler(this.mNextPageButton_Click); // @@ -268,7 +268,7 @@ this.mPreviousPageButton.Name = "mPreviousPageButton"; this.mPreviousPageButton.Size = new System.Drawing.Size(32, 35); this.mPreviousPageButton.TabIndex = 1; - this.mTransportBarTooltip.SetToolTip(this.mPreviousPageButton, "Go to the preceding page."); + this.mTransportBarTooltip.SetToolTip(this.mPreviousPageButton, "Go to the preceding page. (Shift+P)"); this.mPreviousPageButton.UseVisualStyleBackColor = true; this.mPreviousPageButton.Click += new System.EventHandler(this.mPreviousPageButton_Click); // @@ -284,7 +284,7 @@ this.mCustomClassMarkButton.Name = "mCustomClassMarkButton"; this.mCustomClassMarkButton.Size = new System.Drawing.Size(32, 35); this.mCustomClassMarkButton.TabIndex = 12; - this.mTransportBarTooltip.SetToolTip(this.mCustomClassMarkButton, "Add a phrase marker while recording."); + this.mTransportBarTooltip.SetToolTip(this.mCustomClassMarkButton, "Add a TODO mark while recording. (F9)"); this.mCustomClassMarkButton.UseVisualStyleBackColor = true; this.mCustomClassMarkButton.Click += new System.EventHandler(this.mCustomClassMarkButton_Click); // Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 10:30:48 UTC (rev 3074) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 11:50:36 UTC (rev 3075) @@ -107,7 +107,6 @@ public bool CanFastForward { get { return Enabled && !IsRecorderActive; } } public bool CanMarkCustomClass { get { return Enabled && mView.CanMarkPhrase; } } - public bool CanNavigateNextPage { get { return Enabled; } } 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); } } @@ -136,6 +135,16 @@ } } + public bool CanNavigateNextPage + { + get + { + return IsRecorderActive || + (IsPlayerActive && mCurrentPlaylist.CanNavigateNextPage) || + CanPlay; + } + } + public bool CanNavigateNextSection { get @@ -929,43 +938,61 @@ private void mNextSectionButton_Click(object sender, EventArgs e) { NextSection(); } /// <summary> - /// Move to or play the previous page. - /// </summary> - public void PrevPage() - { - if (Enabled && mRecordingSession == null) - { - mCurrentPlaylist.NavigateToPreviousPage(); - } - } - - /// <summary> /// Move to the previous section (i.e. first phrase of the previous section.) /// </summary> - public void PrevSection() + public bool PrevSection() { - if (Enabled && mRecordingSession == null) + if (CanNavigatePrevSection) { - mCurrentPlaylist.NavigateToPreviousSection(); + if (mState == State.Stopped) + { + if (mView.ObiForm.Settings.PlayOnNavigate) + { + PlayCurrentPlaylistFromSelection(); + mCurrentPlaylist.NavigateToPreviousSection(); + } + else + { + mView.SelectPhraseInContentView(mCurrentPlaylist.PrevSection( + FindPlaybackStartNode(mView.Selection == null ? null : mView.Selection.Node))); + } + } + else + { + mCurrentPlaylist.NavigateToPreviousSection(); + } + return true; } + return false; } /// <summary> - /// Go to the next page. + /// Move to or play the previous page. /// </summary> - public void NextPage() + public bool PrevPage() { - if (Enabled) + if (CanNavigatePrevPage) { - if (mState == State.Recording) + if (mState == State.Stopped) { - mRecordingSession.MarkPage(); + if (mView.ObiForm.Settings.PlayOnNavigate) + { + PlayCurrentPlaylistFromSelection(); + mCurrentPlaylist.NavigateToPreviousPage(); + } + else + { + mView.SelectPhraseInContentView(mCurrentPlaylist.PrevPage( + FindPlaybackStartNode(mView.Selection == null ? null : mView.Selection.Node))); + } } - else if (mState != State.Monitoring) + else { - mCurrentPlaylist.NavigateToNextPage(); + mCurrentPlaylist.NavigateToPreviousPage(); } + return true; } + return false; } /// <summary> @@ -973,7 +1000,7 @@ /// </summary> public bool PrevPhrase() { - if (CanNavigateNextPhrase) + if (CanNavigatePrevPhrase) { if (mState == State.Stopped) { @@ -1040,6 +1067,44 @@ } /// <summary> + /// Go to the next page. + /// </summary> + public bool NextPage() + { + if (CanNavigateNextPage) + { + if (mState == State.Recording) + { + mRecordingSession.MarkPage(); + } + else if (mState == State.Monitoring) + { + return false; + } + else if (mState == State.Stopped) + { + if (mView.ObiForm.Settings.PlayOnNavigate) + { + PlayCurrentPlaylistFromSelection(); + mCurrentPlaylist.NavigateToNextPage(); + } + else + { + mView.SelectPhraseInContentView(mCurrentPlaylist.NextPage( + FindPlaybackStartNode(mView.Selection == null ? null : mView.Selection.Node))); + } + } + + else if (mState != State.Monitoring) + { + mCurrentPlaylist.NavigateToNextPage(); + } + return true; + } + return false; + } + + /// <summary> /// Move to the next section (i.e. the first phrase of the next section) /// </summary> public bool NextSection() @@ -1053,6 +1118,10 @@ mView.AddSection(); PrepareForRecording(true, null); } + else if (mState == State.Monitoring) + { + return false; + } else if (mState == State.Stopped) { if (mView.ObiForm.Settings.PlayOnNavigate) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-16 10:30:50
|
Revision: 3074 http://urakawa.svn.sourceforge.net/urakawa/?rev=3074&view=rev Author: julienq Date: 2008-05-16 03:30:48 -0700 (Fri, 16 May 2008) Log Message: ----------- Navigate to next selection. Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ObiForm.cs trunk/urakawa/application/Obi/Obi/Playlist.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.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-16 10:07:36 UTC (rev 3073) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 10:30:48 UTC (rev 3074) @@ -626,6 +626,7 @@ mPreviewFromToolStripMenuItem.Enabled = mProjectView.CanPreview; mPreviewUpToToolStripMenuItem.Enabled = mProjectView.CanPreview; mPreviewSelectedToolStripMenuItem.Enabled = mProjectView.CanPreviewAudioSelection; + mPreviousPhraseToolStripMenuItem.Enabled = mProjectView.CanNavigatePrevPhrase; mNextPhraseToolStripMenuItem.Enabled = mProjectView.CanNavigateNextPhrase; mFastForwardToolStripMenuItem.Enabled = mProjectView.CanFastForward; mRewindToolStripMenuItem.Enabled = mProjectView.CanRewind; @@ -664,6 +665,7 @@ private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); } private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); } private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); } + private void previousPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevPhrase(); } private void nextPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.NextPhrase(); } private void rewindToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Rewind(); } @@ -690,10 +692,6 @@ mProjectView.TransportBar.PrevSection(); } - private void previousPhraseToolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PrevPhrase(); - } private void previousPageToolStripMenuItem_Click(object sender, EventArgs e) { Modified: trunk/urakawa/application/Obi/Obi/Playlist.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-16 10:07:36 UTC (rev 3073) +++ trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-16 10:30:48 UTC (rev 3074) @@ -95,14 +95,33 @@ /// </summary> public AudioPlayer Audioplayer { get { return mPlayer; } } + public bool CanNavigatePrevPhrase { get { return mCurrentPhraseIndex > 0; } } public bool CanNavigateNextPhrase { get { return mCurrentPhraseIndex < mPhrases.Count - 1; } } + public bool CanNavigateNextSection { get { return NextSectionIndex < mPhrases.Count - 1; } } + public PhraseNode PrevPhrase(PhraseNode node) + { + int index = mPhrases.IndexOf(node) - 1; + return index >= 0 ? mPhrases[index] : null; + } + public PhraseNode NextPhrase(PhraseNode node) { int index = mPhrases.IndexOf(node) + 1; return index < mPhrases.Count ? mPhrases[index] : null; } + public PhraseNode NextSection(PhraseNode node) + { + int index = mPhrases.IndexOf(node); + if (node != null) + { + for (; index < mPhrases.Count && mPhrases[index].AncestorAs<SectionNode>() == node.AncestorAs<SectionNode>(); ++index) { } + } + return index >= 0 && index < mPhrases.Count ? mPhrases[index] : null; + } + + /// <summary> /// Set the currently playing phrase directly. /// If playing, move to the beginning of the phrase. @@ -735,13 +754,6 @@ } /// <summary> - /// Move to the next phrase from a given node. - /// </summary> - public void NavigateToNextPhrase(ObiNode node) - { - } - - /// <summary> /// Move to the first phrase of the next section. Do nothing if we are already in the last section. /// </summary> public void NavigateToNextSection() Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 10:07:36 UTC (rev 3073) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 10:30:48 UTC (rev 3074) @@ -205,6 +205,7 @@ public bool CanInsertSection { get { return CanInsertStrip || mTOCView.Selection != null; } } public bool CanInsertStrip { get { return mStripsView.Selection != null; } } public bool CanMergeStripWithNext { get { return mStripsView.CanMergeStripWithNext; } } + public bool CanNavigatePrevPhrase { get { return mTransportBar.CanNavigatePrevPhrase; } } public bool CanNavigateNextPhrase { get { return mTransportBar.CanNavigateNextPhrase; } } public bool CanPaste { get { return mSelection != null && mSelection.CanPaste(mClipboard); } } public bool CanPasteBefore { get { return mTOCView.CanPasteBefore(mClipboard); } } @@ -1372,7 +1373,7 @@ public void SelectPhraseInContentView(PhraseNode node) { - Selection = new NodeSelection(node, mStripsView); + Selection = node == null ? null : new NodeSelection(node, mStripsView); } /// <summary> Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 10:07:36 UTC (rev 3073) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 10:30:48 UTC (rev 3074) @@ -621,13 +621,18 @@ { mShortcutKeys = new Dictionary<Keys, HandledShortcutKey>(); + mShortcutKeys[Keys.C] = delegate() { return mView.TransportBar.PreviewAudioSelection(); }; + mShortcutKeys[Keys.H] = delegate() { return mView.TransportBar.NextSection(); }; + mShortcutKeys[Keys.J] = delegate() { return mView.TransportBar.PrevPhrase(); }; + mShortcutKeys[Keys.K] = delegate() { return mView.TransportBar.NextPhrase(); }; + mShortcutKeys[Keys.V] = delegate() { return mView.TransportBar.Preview(true); }; + mShortcutKeys[Keys.X] = delegate() { return mView.TransportBar.Preview(false); }; + + mShortcutKeys[Keys.A] = MarkSelectionWholePhrase; // playback shortcuts. - mShortcutKeys[Keys.J] = NavigatePrevPhrase; - mShortcutKeys[Keys.K] = NavigateNextPhrase; mShortcutKeys[Keys.Shift | Keys.H] = NavigatePrevSection; - mShortcutKeys[Keys.H] = NavigateNextSection; mShortcutKeys[Keys.Shift | Keys.P] = NavigatePrevPage; mShortcutKeys[Keys.P] = NavigateNextPage; @@ -640,9 +645,6 @@ mShortcutKeys[Keys.Shift | Keys.OemOpenBrackets] = MarkSelectionFromCursor; mShortcutKeys[Keys.Shift | Keys.OemCloseBrackets] = MarkSelectionToCursor; - mShortcutKeys[Keys.C] = delegate() { return mView.TransportBar.PreviewAudioSelection(); }; - mShortcutKeys[Keys.V] = delegate() { return mView.TransportBar.Preview(true); }; - mShortcutKeys[Keys.X] = delegate() { return mView.TransportBar.Preview(false); }; // Strips navigation mShortcutKeys[Keys.Left] = SelectPrecedingBlock; @@ -995,30 +997,12 @@ return true; } - private bool NavigateNextPhrase() - { - mView.TransportBar.NextPhrase(); - return true; - } - - private bool NavigateNextSection() - { - mView.TransportBar.NextSection(); - return true; - } - private bool NavigatePrevPage() { mView.TransportBar.PrevPage(); return true; } - private bool NavigatePrevPhrase() - { - mView.TransportBar.PrevPhrase(); - return true; - } - private bool NavigatePrevSection() { mView.TransportBar.PrevSection(); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs 2008-05-16 10:07:36 UTC (rev 3073) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs 2008-05-16 10:30:48 UTC (rev 3074) @@ -98,7 +98,7 @@ this.mStopButton.Name = "mStopButton"; this.mStopButton.Size = new System.Drawing.Size(32, 35); this.mStopButton.TabIndex = 6; - this.mTransportBarTooltip.SetToolTip(this.mStopButton, "Stop audio playback or recording."); + this.mTransportBarTooltip.SetToolTip(this.mStopButton, "Stop audio playback or recording. (Ctrl+Space)"); this.mStopButton.UseVisualStyleBackColor = true; this.mStopButton.Click += new System.EventHandler(this.mStopButton_Click); // @@ -115,7 +115,7 @@ this.mNextPhrase.Name = "mNextPhrase"; this.mNextPhrase.Size = new System.Drawing.Size(32, 35); this.mNextPhrase.TabIndex = 9; - this.mTransportBarTooltip.SetToolTip(this.mNextPhrase, "Go to the following phrase."); + this.mTransportBarTooltip.SetToolTip(this.mNextPhrase, "Go to the following phrase. (K)"); this.mNextPhrase.UseVisualStyleBackColor = true; this.mNextPhrase.Click += new System.EventHandler(this.mNextPhrase_Click); // @@ -132,7 +132,7 @@ this.mPrevPhraseButton.Name = "mPrevPhraseButton"; this.mPrevPhraseButton.Size = new System.Drawing.Size(32, 35); this.mPrevPhraseButton.TabIndex = 2; - this.mTransportBarTooltip.SetToolTip(this.mPrevPhraseButton, "Go to the preceding phrase."); + this.mTransportBarTooltip.SetToolTip(this.mPrevPhraseButton, "Go to the preceding phrase. (J)"); this.mPrevPhraseButton.UseVisualStyleBackColor = true; this.mPrevPhraseButton.Click += new System.EventHandler(this.mPrevPhraseButton_Click); // @@ -149,7 +149,7 @@ this.mNextSectionButton.Name = "mNextSectionButton"; this.mNextSectionButton.Size = new System.Drawing.Size(32, 35); this.mNextSectionButton.TabIndex = 11; - this.mTransportBarTooltip.SetToolTip(this.mNextSectionButton, "Go to the following section."); + this.mTransportBarTooltip.SetToolTip(this.mNextSectionButton, "Go to the following section. (H)"); this.mNextSectionButton.UseVisualStyleBackColor = true; this.mNextSectionButton.Click += new System.EventHandler(this.mNextSectionButton_Click); // @@ -184,7 +184,7 @@ this.mRecordButton.Name = "mRecordButton"; this.mRecordButton.Size = new System.Drawing.Size(32, 35); this.mRecordButton.TabIndex = 7; - this.mTransportBarTooltip.SetToolTip(this.mRecordButton, "Start monitoring or recording."); + this.mTransportBarTooltip.SetToolTip(this.mRecordButton, "Start monitoring or recording. (Ctrl+R)"); this.mRecordButton.UseVisualStyleBackColor = true; this.mRecordButton.Click += new System.EventHandler(this.mRecordButton_Click); // Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 10:07:36 UTC (rev 3073) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 10:30:48 UTC (rev 3074) @@ -108,9 +108,7 @@ public bool CanFastForward { get { return Enabled && !IsRecorderActive; } } public bool CanMarkCustomClass { get { return Enabled && mView.CanMarkPhrase; } } public bool CanNavigateNextPage { get { return Enabled; } } - public bool CanNavigateNextSection { get { return Enabled; } } public bool CanNavigatePrevPage { get { return Enabled && mRecordingSession == null; } } - public bool CanNavigatePrevPhrase { 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 CanPlay { get { return Enabled && mState == State.Stopped; } } @@ -120,17 +118,34 @@ public bool CanRewind { get { return Enabled && !IsRecorderActive; } } public bool CanStop { get { return Enabled && (mState != State.Stopped || mView.Selection != null); } } + public bool CanNavigatePrevPhrase + { + get + { + return (IsPlayerActive && mCurrentPlaylist.CanNavigatePrevPhrase) || CanPlay; + } + } + public bool CanNavigateNextPhrase { get { - return Enabled && - (IsRecorderActive || + return IsRecorderActive || (IsPlayerActive && mCurrentPlaylist.CanNavigateNextPhrase) || - CanPlay); + CanPlay; } } + public bool CanNavigateNextSection + { + get + { + return IsRecorderActive || + (IsPlayerActive && mCurrentPlaylist.CanNavigateNextSection) || + CanPlay; + } + } + public bool CanPreview { get @@ -925,17 +940,6 @@ } /// <summary> - /// Move to or play the previous phrase. - /// </summary> - public void PrevPhrase() - { - if (Enabled && mRecordingSession == null) - { - mCurrentPlaylist.NavigateToPreviousPhrase(); - } - } - - /// <summary> /// Move to the previous section (i.e. first phrase of the previous section.) /// </summary> public void PrevSection() @@ -965,11 +969,40 @@ } /// <summary> + /// Move to or play the previous phrase. + /// </summary> + public bool PrevPhrase() + { + if (CanNavigateNextPhrase) + { + if (mState == State.Stopped) + { + if (mView.ObiForm.Settings.PlayOnNavigate) + { + PlayCurrentPlaylistFromSelection(); + mCurrentPlaylist.NavigateToPreviousPhrase(); + } + else + { + mView.SelectPhraseInContentView(mCurrentPlaylist.PrevPhrase( + FindPlaybackStartNode(mView.Selection == null ? null : mView.Selection.Node))); + } + } + else + { + mCurrentPlaylist.NavigateToPreviousPhrase(); + } + return true; + } + return false; + } + + /// <summary> /// Go to the next phrase. /// If recording, create a new phrase to record in. /// If playing or paused, /// </summary> - public void NextPhrase() + public bool NextPhrase() { if (CanNavigateNextPhrase) { @@ -1001,15 +1034,17 @@ { mCurrentPlaylist.NavigateToNextPhrase(); } + return true; } + return false; } /// <summary> /// Move to the next section (i.e. the first phrase of the next section) /// </summary> - public void NextSection() + public bool NextSection() { - if (Enabled) + if (CanNavigateNextSection) { if (mState == State.Recording) { @@ -1018,11 +1053,26 @@ mView.AddSection(); PrepareForRecording(true, null); } + else if (mState == State.Stopped) + { + if (mView.ObiForm.Settings.PlayOnNavigate) + { + PlayCurrentPlaylistFromSelection(); + mCurrentPlaylist.NavigateToNextSection(); + } + else + { + mView.SelectPhraseInContentView(mCurrentPlaylist.NextSection( + FindPlaybackStartNode(mView.Selection == null ? null : mView.Selection.Node))); + } + } else { mCurrentPlaylist.NavigateToNextSection(); } + return true; } + return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dan...@us...> - 2008-05-16 10:07:41
|
Revision: 3073 http://urakawa.svn.sourceforge.net/urakawa/?rev=3073&view=rev Author: daniel_weck Date: 2008-05-16 03:07:36 -0700 (Fri, 16 May 2008) Log Message: ----------- gradually updating the website contents in preparation for the 1.0 release Modified Paths: -------------- trunk/urakawa/website/Urakawa_Web.tmproj trunk/urakawa/website/sdk/Urakawa_SDK_ReferenceGuide.html trunk/urakawa/website/xhtmlsideboxes.php Added Paths: ----------- trunk/urakawa/website/sdk/Release_1.0.html Modified: trunk/urakawa/website/Urakawa_Web.tmproj =================================================================== --- trunk/urakawa/website/Urakawa_Web.tmproj 2008-05-16 05:34:10 UTC (rev 3072) +++ trunk/urakawa/website/Urakawa_Web.tmproj 2008-05-16 10:07:36 UTC (rev 3073) @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>currentDocument</key> - <string>newsdata.php</string> + <string>xhtmlheader.php</string> <key>documents</key> <array> <dict> @@ -40,7 +40,7 @@ <key>filename</key> <string>index.php</string> <key>lastUsed</key> - <date>2006-10-05T13:25:59Z</date> + <date>2008-02-20T15:53:45Z</date> </dict> <dict> <key>filename</key> @@ -82,9 +82,7 @@ <key>filename</key> <string>newsdata.php</string> <key>lastUsed</key> - <date>2008-01-25T15:13:48Z</date> - <key>selected</key> - <true/> + <date>2008-02-20T15:53:42Z</date> </dict> <dict> <key>filename</key> @@ -96,7 +94,9 @@ <key>filename</key> <string>xhtmlheader.php</string> <key>lastUsed</key> - <date>2007-02-12T18:17:01Z</date> + <date>2008-02-20T15:53:53Z</date> + <key>selected</key> + <true/> </dict> <dict> <key>filename</key> @@ -150,7 +150,7 @@ <key>filename</key> <string>xhtmlsideboxes.php</string> <key>lastUsed</key> - <date>2008-01-14T16:24:51Z</date> + <date>2008-02-20T13:30:23Z</date> </dict> <dict> <key>filename</key> @@ -362,7 +362,7 @@ <key>filename</key> <string>sdk_documentation.php</string> <key>lastUsed</key> - <date>2008-01-25T15:05:59Z</date> + <date>2008-02-20T15:53:53Z</date> </dict> <dict> <key>filename</key> @@ -374,7 +374,7 @@ <key>filename</key> <string>sdk_uml-diagrams_introduction.php</string> <key>lastUsed</key> - <date>2008-01-25T15:13:47Z</date> + <date>2008-02-20T13:39:49Z</date> </dict> <dict> <key>filename</key> @@ -705,48 +705,64 @@ <integer>168</integer> </dict> </dict> - <key>newsdata.php</key> + <key>obi/help_en_OLD.html</key> <dict> <key>caret</key> <dict> <key>column</key> - <integer>70</integer> + <integer>22</integer> <key>line</key> - <integer>7</integer> + <integer>118</integer> </dict> + <key>columnSelection</key> + <false/> <key>firstVisibleColumn</key> <integer>0</integer> <key>firstVisibleLine</key> - <integer>0</integer> + <integer>87</integer> + <key>selectFrom</key> + <dict> + <key>column</key> + <integer>0</integer> + <key>line</key> + <integer>118</integer> + </dict> + <key>selectTo</key> + <dict> + <key>column</key> + <integer>0</integer> + <key>line</key> + <integer>119</integer> + </dict> </dict> - <key>obi/help_en_OLD.html</key> + <key>sdk_documentation.php</key> <dict> <key>caret</key> <dict> <key>column</key> - <integer>22</integer> + <integer>0</integer> <key>line</key> - <integer>118</integer> + <integer>28</integer> </dict> <key>columnSelection</key> <false/> <key>firstVisibleColumn</key> <integer>0</integer> <key>firstVisibleLine</key> - <integer>87</integer> + <integer>25</integer> <key>selectFrom</key> <dict> <key>column</key> - <integer>0</integer> + <integer>11</integer> <key>line</key> - <integer>118</integer> + <integer>53</integer> </dict> <key>selectTo</key> <dict> <key>column</key> <integer>0</integer> <key>line</key> - <integer>119</integer> + <integer>28</integer> </dict> </dict> <key>sdk_uml-diagrams_media-data.php</key> @@ -810,35 +826,36 @@ <key>caret</key> <dict> <key>column</key> - <integer>88</integer> + <integer>0</integer> <key>line</key> - <integer>45</integer> + <integer>360</integer> </dict> <key>columnSelection</key> <false/> <key>firstVisibleColumn</key> <integer>0</integer> <key>firstVisibleLine</key> - <integer>29</integer> + <integer>343</integer> <key>selectFrom</key> <dict> <key>column</key> - <integer>108</integer> + <integer>4</integer> <key>line</key> - <integer>45</integer> + <integer>362</integer> </dict> <key>selectTo</key> <dict> <key>column</key> - <integer>88</integer> + <integer>0</integer> <key>line</key> - <integer>45</integer> + <integer>360</integer> </dict> </dict> </dict> <key>openDocuments</key> <array> - <string>newsdata.php</string> + <string>xhtmlheader.php</string> + <string>sdk_documentation.php</string> </array> <key>showFileHierarchyDrawer</key> <true/> Added: trunk/urakawa/website/sdk/Release_1.0.html =================================================================== --- trunk/urakawa/website/sdk/Release_1.0.html (rev 0) +++ trunk/urakawa/website/sdk/Release_1.0.html 2008-05-16 10:07:36 UTC (rev 3073) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11-flat.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"><head><style type="text/css">table thead tr th{padding:0.3em;background-color:#eeeeee;border-bottom:2px #cccccc solid;}table tbody tr td,table thead tr td{padding:0.3em;border-bottom:1px #cccccc solid;}table{border:1px #cccccc solid;}.pay{border:2px orange solid;color:#333333;padding:0.3em;background-color: #FFF28f}.red{color:red;}h4{color:black;padding:0.3em;border:3px #D7DEBD solid;}h3{padding:0.3em;border:1px #666666 solid;background-color:#D7DEBD;}h2{border:2px #333333 solid;background-color:#cccccc;padding:0.3em;}h1,h2,h3,h4{font-family:verdana}body{padding:1em;padding-left:4em;padding-right:4em;background-color:#ffffff;color:#333333;font-size:1.11em;font-family:"Lucida Grande",verdana,lucida,"Lucida Sans Unicode",arial,sans-serif;}.framed{color:black;border:3px #FFFF52 solid;background-color: #FFFFCC;margin:1em;padding:1em;font-size:1em;}ul li{margin-bottom:0.5em;}</style><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /><title>DAISY SDK - Multimedia Authoring Toolkit (codename "Urakawa SDK")</title></head><body> + +<hr /> + +<div style="float: left; margin-right: 2em;"> +<img src="http://urakawa.sourceforge.net/images/Logo.png" alt="Urakawa logo"/> +</div> + +<h1 id="daisysdk-multimediaauthoringtoolkit">DAISY SDK - Multimedia Authoring Toolkit</h1> + +<h1 id="release1.0-16may2008">Release 1.0 (16 May 2008)</h1> + +<hr /> + +<p>This is the official 1.0 release document for the "DAISY SDK - Multimedia Authoring Toolkit", +otherwise known as the "Urakawa SDK" (Software Development Kit).</p> + +<p>The software is distributed under the open-source and business-friendly <a href="http://www.gnu.org/licenses/lgpl.html" title="LGPL homepage">LGPL</a> license.</p> + + +<h2 id="releasenotes">Release Notes</h2> + +<h3 id="changes">Change Log</h3> + +<p>This release fixes a few issues identified in the <a href="http://urakawa.sourceforge.net/sdk/Release_1.0beta.html" title="beta 1.0 announcement page">previous 1.0-beta</a> distribution, mostly related to Quality Assurance. This includes improvements to the XML Schema of the XUK format, added documentation, refined diagrams, and minor changes in the unit-tests. +</p> +<p> +Unfortunately due to the lack of resources, unit-tests coverage is not as complete as we originally envisioned it. We decided to release 1.0 anyway, based on the following rationale:</p> + +<ol> +<li><a href="http://urakawa.sourceforge.net/obi/" title="Obi homepage">Obi</a> is currently the only application that uses the Urakawa SDK, and so far test reports have not revealed any instability issues. +</li> +<li> +More importantly, our resources are quite limited and we now need to focus on the next generation of the SDK, which will be used by <a href="http://daisy-trac.cvsdude.com/tobi" title="Tobi homepage">Tobi</a> (the full-text full-audio DAISY authoring tool). Read-on for more information. +</li> +</ol> + +<h3 id="strategy">Development Strategy</h3> + +<p>Our plan is to maintain the SDK 1.0 in terms of fixing bugs and improving performance, essentially to support the development of Obi. However, any feature addition will take place in the SDK 2.0. The goal is to encourage new application developers to adopt the more up-to-date version of the toolkit.</p> + +<p> +Version 2.0 will provide more complete support for DTBook semantics, a new API for the rich DAISY navigation, and a refined extension model for XUK (to allow cross-processor interoperability). The C# API will also be updated to adopt language patterns from C# 2.0 more rigorously (e.g. getters and setters, generics). +</p> + +<h3 id="moved">Sourceforge to Trac Migration</h3> + +<p>As part of the ongoing effort to gradually migrate all DAISY software projects to a unique online collaborative space for developers, the Urakawa SDK has moved to a <a href="http://daisy-trac.cvsdude.com/urakawa-sdk/" title="Urakawa-SDK developer homepage">new location</a>. Instead of Sourceforge, the project is now hosted at "CVS-Dude", where programmers (and to some extent, end-users too) benefit from a great software management environment called "Trac". +</p> +<p> +This solution provides a coherent set of tools that integrate with each other to facilitate documentation writing, iteration planning and tracking, bug-reporting, etc. The core components are: a wiki, an issue-tracker (bug/enhancement/feature-request database), an SVN repository (with built-in change-log and source browser), a roadmap planner (with milestone-based progress tracker), and a timeline view to keep up to date (with configurable RSS feeds). Additionally, a Bugzilla database is offered as a more complex alternative tracking tool, and a WebDav space is available for sharing files. +</p> + +<h2 id="deliverables">Deliverables</h2> + +<h3 id="abstractdatamodelandapi">Abstract Data Model and API</h3> + +<ul> +<li><a href="http://urakawa.sf.net/sdk/Urakawa_SDK_ReferenceGuide.html" title="www">Reference Guide</a></li> +<li>API (Application Programming Interface) documentation: +<ul><li><a href="http://urakawa.sf.net/sdk/urakawa-api-doc.zip" title="www">ZIP archive</a></li> +<li><a href="http://urakawa.sf.net/sdk/apidoc/" title="www">online browsing</a></li></ul></li> +<li>UML Class Diagrams (large images): +<ul><li><a href="http://urakawa.sf.net/sdk/uml-diagrams.zip" title="www">ZIP archive</a></li> +</ul></li> +<li>Source Code +<ul><li><a href="http://daisy-trac.cvsdude.com/urakawa-sdk/browser/trunk/java" title="www">online browsing</a></li> +<li>Local SVN checkout: +<pre>svn co https://daisy-svn.cvsdude.com/urakawa-sdk/trunk/java</pre> +</li></ul></li> +</ul> + +<h3 id="csharpcreferenceimplementation">CSharp (C#) Reference Implementation</h3> + +<ul> +<li>C#-specific API documentation: +<ul><li><a href="http://urakawa.sf.net/sdk/urakawa-csharp-doc.zip" title="www">ZIP archive</a></li> +<li><a href="http://urakawa.sf.net/sdk/csharpdoc/" title="www">online browsing</a></li></ul></li> +<li>Binaries (for Microsoft .NET): +<ul><li><a href="http://urakawa.sf.net/sdk/urakawa-csharp-bin.zip" title="www">ZIP archive</a></li> +<li><a href="http://urakawa.sf.net/sdk/csharpbin/" title="www">individual downloads</a></li></ul></li> +<li>Source Code +<ul><li><a href="http://daisy-trac.cvsdude.com/urakawa-sdk/browser/trunk/csharp" title="www">online browsing</a></li> +<li>Local SVN checkout: +<pre>svn co https://daisy-svn.cvsdude.com/urakawa-sdk/trunk/csharp</pre> +</li></ul></li> +</ul> + +<h2 id="support">Support</h2> + +<p>The Urakawa project's <a href="http://urakawa.sf.net/" title="www">public website</a> on Sourceforge will remain the central access point for the general audience. However, developers are encouraged to use the new Trac-based <a href="http://daisy-trac.cvsdude.com/urakawa-sdk/" title="Urakawa-SDK developer homepage">online collaborative environment</a>. +The Sourceforge.net <a href="http://sf.net/projects/urakawa" title="www">developer page</a> (issue-tracking, mailing-lists, etc.) is totally deprecated and is not used at all by the development team. +Although the <a href="http://forums.daisy.org/" title="www">DAISY forums</a> could eventually be a nice place for SDK-related discussions, we are currently not using this facility. Please contact us by <a href="mailto:dan...@gm..." title="Daniel WECK email">email</a> for further information, or if you wish to participate in any way. +</p> + +<hr /> + +<p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml11" alt="Valid XHTML 1.1" style="border:0;width:88px;height:31px;"/></a><a href="http://jigsaw.w3.org/css-validator/check/referer"><img style="border:0;width:88px;height:31px;" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS"/></a></p> + +<div style="height: 600px;"> </div> + +</body></html> \ No newline at end of file Modified: trunk/urakawa/website/sdk/Urakawa_SDK_ReferenceGuide.html =================================================================== --- trunk/urakawa/website/sdk/Urakawa_SDK_ReferenceGuide.html 2008-05-16 05:34:10 UTC (rev 3072) +++ trunk/urakawa/website/sdk/Urakawa_SDK_ReferenceGuide.html 2008-05-16 10:07:36 UTC (rev 3073) @@ -1,17 +1,18 @@ -<?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11-flat.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"><head><style type="text/css">table thead tr th{padding:0.3em;background-color:#eeeeee;border-bottom:2px #cccccc solid;}table tbody tr td,table thead tr td{padding:0.3em;border-bottom:1px #cccccc solid;}table{border:1px #cccccc solid;}.pay{border:2px orange solid;color:#333333;padding:0.3em;background-color: #FFF28f}.red{color:red;}h4{color:black;padding:0.3em;border:3px #D7DEBD solid;}h3{padding:0.3em;border:1px #666666 solid;background-color:#D7DEBD;}h2{border:2px #333333 solid;background-color:#cccccc;padding:0.3em;}h1,h2,h3,h4{font-family:verdana}body{padding:1em;background-color:#ffffff;color:#333333;font-size:1.11em;font-family:"Lucida Grande",verdana,lucida,"Lucida Sans Unicode",arial,sans-serif;}.framed{color:black;border:3px #FFFF52 solid;background-color: #FFFFCC;margin:1em;padding:1em;font-size:1em;}ul li{margin-bottom:0.5em;}</style><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /><title>The Urakawa Project - Software Development Kit (SDK) - Reference Guide for the Data Model and Application Programmer Interface</title></head><body> +<?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11-flat.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"><head><style type="text/css">table thead tr th{padding:0.3em;background-color:#eeeeee;border-bottom:2px #cccccc solid;}table tbody tr td,table thead tr td{padding:0.3em;border-bottom:1px #cccccc solid;}table{border:1px #cccccc solid;}.pay{border:2px orange solid;color:#333333;padding:0.3em;background-color: #FFF28f}.red{color:red;}h4{color:black;padding:0.3em;border:3px #D7DEBD solid;}h3{padding:0.3em;border:1px #666666 solid;background-color:#D7DEBD;}h2{border:2px #333333 solid;background-color:#cccccc;padding:0.3em;}h1,h2,h3,h4{font-family:verdana}body{padding:1em;padding-left:4em;padding-right:4em;background-color:#ffffff;color:#333333;font-size:1.11em;font-family:"Lucida Grande",verdana,lucida,"Lucida Sans Unicode",arial,sans-serif;}.framed{color:black;border:3px #FFFF52 solid;background-color: #FFFFCC;margin:1em;padding:1em;font-size:1em;}ul li{margin-bottom:0.5em;}</style><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /><title>The Urakawa SDK (Software Development Kit) - Reference Guide for the Data Model and API (Application Programmer Interface)</title></head><body> <hr /> -<h1 id="theurakawaprojectsoftwaredevelopmentkitsdk">The Urakawa Project, Software Development Kit (SDK)</h1> +<h1 id="title">The Urakawa SDK (Software Development Kit)</h1> -<h1 id="referenceguideforthedatamodelandapplicationprogrammerinterface">Reference Guide for the Data Model and Application Programmer Interface</h1> +<h1>Reference Guide for the Data Model and API (Application Programmer Interface)</h1> +<hr /> + <p><em>Author/Editor</em> : <a href="mailto:dan...@gm..." title="Daniel WECK email"><strong>Daniel WECK</strong></a> <br /> -<em>Last revision</em> : <strong>2008 January 23</strong></p> +<em>Last revision</em> : <strong>2008 May 15</strong></p> -<hr /> -<h1 id="tableofcontents">Table of Contents</h1> +<h2 id="tableofcontents">Table of Contents</h2> <ol> <li><a href="#introduction" title="Introduction">Introduction</a> @@ -33,8 +34,6 @@ <li><a href="#glossaryofterms" title="Glossary of Terms">Glossary of Terms</a></li> </ol> -<hr /> - <h2 id="introduction">Introduction</h2> <h3 id="projectorganization">Project Organization</h3> Modified: trunk/urakawa/website/xhtmlsideboxes.php =================================================================== --- trunk/urakawa/website/xhtmlsideboxes.php 2008-05-16 05:34:10 UTC (rev 3072) +++ trunk/urakawa/website/xhtmlsideboxes.php 2008-05-16 10:07:36 UTC (rev 3073) @@ -12,6 +12,19 @@ require dirname(__FILE__).'/xhtmlsearchbox.php'; ?> + + <div style="width:100%; text-align:center;"> +<a href="http://cvsdude.com" title="CVSDude : CVS, Subversion, Trac source control and project management hosting"> + <img border="0" src="http://cvsdude.com/image/cvsdude_tag.jpg" alt="CVSDude : CVS, Subversion, Trac source control and project management hosting"/> +</a> +<br/> +and +</div> + +<div style="width:100%; text-align:center;"> +<img src="<?php if (! $genstatic) {echo ($strRootHttpDir);} ?>images/SourceForge_Logo.png" alt="The Sourceforge logo"/> +</div> + <div id="box2" class="box"> <h3 id="builds">Latest Builds</h3> <ul> @@ -36,13 +49,4 @@ if (! $genstatic) { require dirname(__FILE__).'/xhtmldisplayoptions.php'; } - ?> - <div style="width:100%; text-align:center;"> - <a href="http://cvsdude.com" title="CVSDude : CVS, Subversion, Trac source control and project management hosting"/> - <img border="0" src="http://cvsdude.com/image/cvsdude_tag.jpg"/ alt="CVSDude : CVS, Subversion, Trac source control and project management hosting"> - </a> - </div> - - <div style="width:100%; text-align:center;"> - <img src="<?php if (! $genstatic) {echo ($strRootHttpDir);} ?>images/SourceForge_Logo.png" alt="The Sourceforge logo"/> - </div> \ No newline at end of file + ?> \ 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-16 05:34:11
|
Revision: 3072 http://urakawa.svn.sourceforge.net/urakawa/?rev=3072&view=rev Author: avneeshsingh Date: 2008-05-15 22:34:10 -0700 (Thu, 15 May 2008) Log Message: ----------- Commiting again menu items changes which missed out commit previous time Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ObiForm.resx Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 01:45:09 UTC (rev 3071) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 05:34:10 UTC (rev 3072) @@ -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> - <metadata name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing"> <value>0, 0</value> - </metadata> + </data> <data name="mFileToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>New project Ctrl+N</value> + <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> @@ -372,7 +372,7 @@ <value>Re&wind</value> </data> <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Fast forward Ctrl+.</value> + <value>Fast forward Ctrl+period</value> </data> <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Ctrl+.</value> @@ -1225,7 +1225,7 @@ <value>Previous &section</value> </data> <data name="mPreviousPageToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous page Alt+PgUp</value> + <value>Previous page Alt+PageUp</value> </data> <data name="mPreviousPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+PgUp</value> @@ -1261,7 +1261,7 @@ <value>Next ph&rase</value> </data> <data name="nextPageToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next page Alt+PgDn</value> + <value>Next page Alt+PageDown</value> </data> <data name="nextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+PgDn</value> @@ -1347,9 +1347,9 @@ <data name="aboutObiToolStripMenuItem.Text" xml:space="preserve"> <value>&About Obi</value> </data> - <metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <data name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing"> <value>0, 606</value> - </metadata> + </data> <data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 606</value> </data> @@ -1404,9 +1404,9 @@ <data name=">>mProjectView.ZOrder" xml:space="preserve"> <value>0</value> </data> - <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="$this.Localizable" type="System.Boolean, mscorlib"> <value>True</value> - </metadata> + </data> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <value>6, 13</value> </data> @@ -2440,4 +2440,10 @@ <data name=">>$this.Type" xml:space="preserve"> <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name="mStartListeningToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Start Monitering ctrl+r</value> + </data> + <data name="mStartRecordingToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Start Recording ctrl+shift+r</value> + </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-16 01:45:14
|
Revision: 3071 http://urakawa.svn.sourceforge.net/urakawa/?rev=3071&view=rev Author: julienq Date: 2008-05-15 18:45:09 -0700 (Thu, 15 May 2008) Log Message: ----------- Navigate to next phrase behavior complete; will finish all other five tomorrow. 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/StripsView.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-16 00:23:51 UTC (rev 3070) +++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-16 01:45:09 UTC (rev 3071) @@ -118,7 +118,7 @@ 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.mPlayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mPlayAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mPlaySelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mPauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -796,7 +796,7 @@ // transportToolStripMenuItem // this.transportToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.playToolStripMenuItem, + this.mPlayToolStripMenuItem, this.mPauseToolStripMenuItem, this.mResumeToolStripMenuItem, this.mStopToolStripMenuItem, @@ -810,13 +810,13 @@ this.transportToolStripMenuItem.Name = "transportToolStripMenuItem"; resources.ApplyResources(this.transportToolStripMenuItem, "transportToolStripMenuItem"); // - // playToolStripMenuItem + // mPlayToolStripMenuItem // - this.playToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mPlayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mPlayAllToolStripMenuItem, this.mPlaySelectionToolStripMenuItem}); - this.playToolStripMenuItem.Name = "playToolStripMenuItem"; - resources.ApplyResources(this.playToolStripMenuItem, "playToolStripMenuItem"); + this.mPlayToolStripMenuItem.Name = "mPlayToolStripMenuItem"; + resources.ApplyResources(this.mPlayToolStripMenuItem, "mPlayToolStripMenuItem"); // // mPlayAllToolStripMenuItem // @@ -1190,7 +1190,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripMenuItem mExitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem transportToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem playToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPlayToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mPlayAllToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mPlaySelectionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mPauseToolStripMenuItem; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 00:23:51 UTC (rev 3070) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 01:45:09 UTC (rev 3071) @@ -607,17 +607,9 @@ // Update the transport manu private void UpdateTransportMenu() { + mPlayToolStripMenuItem.Enabled = mProjectView.CanPlay || mProjectView.CanPlaySelection; mPlayAllToolStripMenuItem.Enabled = mProjectView.CanPlay; mPlaySelectionToolStripMenuItem.Enabled = mProjectView.CanPlaySelection; - mPreviewToolStripMenuItem.Enabled = mProjectView.CanPreview || mProjectView.CanPreviewAudioSelection; - mPreviewFromToolStripMenuItem.Enabled = mProjectView.CanPreview; - mPreviewUpToToolStripMenuItem.Enabled = mProjectView.CanPreview; - mPreviewSelectedToolStripMenuItem.Enabled = mProjectView.CanPreviewAudioSelection; - - - mPreviewToolStripMenuItem.Enabled = mProjectView.CanPlay; - FastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay; - if (mProjectView.CanResume) { mPauseToolStripMenuItem.Visible = false; @@ -630,7 +622,18 @@ mResumeToolStripMenuItem.Visible = false; } mStopToolStripMenuItem.Enabled = mProjectView.CanStop; + mPreviewToolStripMenuItem.Enabled = mProjectView.CanPreview || mProjectView.CanPreviewAudioSelection; + mPreviewFromToolStripMenuItem.Enabled = mProjectView.CanPreview; + mPreviewUpToToolStripMenuItem.Enabled = mProjectView.CanPreview; + mPreviewSelectedToolStripMenuItem.Enabled = mProjectView.CanPreviewAudioSelection; + mNextPhraseToolStripMenuItem.Enabled = mProjectView.CanNavigateNextPhrase; + mFastForwardToolStripMenuItem.Enabled = mProjectView.CanFastForward; + mRewindToolStripMenuItem.Enabled = mProjectView.CanRewind; + + FastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay; + + // update recording menu items mStartRecordingToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive; if (mProjectView.TransportBar.IsRecorderActive) @@ -644,7 +647,6 @@ } mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; - } private void mPlayAllToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PlayAll(); } @@ -652,27 +654,24 @@ { if (mProjectView.CanPlaySelection) mProjectView.TransportBar.PlayOrResume(mProjectView.Selection.Node); } + private void mPauseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Pause(); } + private void mResumeToolStripMenuItem_Click(object sender, EventArgs e) + { + if (mProjectView.CanResume) mProjectView.TransportBar.PlayOrResume(); + } + private void mStopToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Stop(); } private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); } private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); } private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); } + private void nextPhraseToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.NextPhrase(); } + private void rewindToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Rewind(); } + private void fastForwardToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.FastForward(); } - private void mPauseToolStripMenuItem_Click(object sender, EventArgs e) - { - if (mProjectView.CanPause) mProjectView.TransportBar.Pause(); - } - private void mResumeToolStripMenuItem_Click(object sender, EventArgs e) - { - if (mProjectView.CanResume) mProjectView.TransportBar.PlayOrResume(); - } - private void mStopToolStripMenuItem_Click(object sender, EventArgs e) - { - if (mProjectView.CanStop) mProjectView.TransportBar.Stop(); - } private void mStartListeningToolStripMenuItem_Click(object sender, EventArgs e) { @@ -685,16 +684,7 @@ } - private void rewindToolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.Rewind(); - } - private void fastForwardToolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.FastForward(); - } - private void previousSectionToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PrevSection(); @@ -710,10 +700,6 @@ mProjectView.TransportBar.PrevPage(); } - private void nextPhraseToolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.NextPhrase(); - } private void nextSectionToolStripMenuItem_Click(object sender, EventArgs e) { Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 00:23:51 UTC (rev 3070) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-16 01:45:09 UTC (rev 3071) @@ -287,10 +287,10 @@ <data name="mPhrasesToolStripMenuItem.Text" xml:space="preserve"> <value>&Phrases</value> </data> - <data name="playToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <data name="mPlayToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>172, 22</value> </data> - <data name="playToolStripMenuItem.Text" xml:space="preserve"> + <data name="mPlayToolStripMenuItem.Text" xml:space="preserve"> <value>&Play</value> </data> <data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve"> @@ -335,30 +335,6 @@ <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> - <data name="mPreviewFromToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+P</value> - </data> - <data name="mPreviewFromToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="mPreviewFromToolStripMenuItem.Text" xml:space="preserve"> - <value>Preview &from...</value> - </data> - <data name="mPreviewUpToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="mPreviewUpToToolStripMenuItem.Text" xml:space="preserve"> - <value>Preview &up to...</value> - </data> - <data name="mPreviewSelectedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve"> - <value>Preview &selected</value> - </data> <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>172, 22</value> </data> @@ -1188,6 +1164,30 @@ <data name="mElapseBacktoolStripMenuItem.Text" xml:space="preserve"> <value>Normal speed with &elapse back</value> </data> + <data name="mPreviewFromToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Preview from... Ctrl+P</value> + </data> + <data name="mPreviewFromToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+P</value> + </data> + <data name="mPreviewFromToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewFromToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &from...</value> + </data> + <data name="mPreviewUpToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewUpToToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &up to...</value> + </data> + <data name="mPreviewSelectedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &selected</value> + </data> <data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+R</value> </data> @@ -1396,7 +1396,7 @@ <value>mProjectView</value> </data> <data name=">>mProjectView.Type" xml:space="preserve"> - <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.43039, Culture=neutral, PublicKeyToken=null</value> + <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.2461, Culture=neutral, PublicKeyToken=null</value> </data> <data name=">>mProjectView.Parent" xml:space="preserve"> <value>$this</value> @@ -2200,10 +2200,10 @@ <data name=">>transportToolStripMenuItem.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=">>playToolStripMenuItem.Name" xml:space="preserve"> - <value>playToolStripMenuItem</value> + <data name=">>mPlayToolStripMenuItem.Name" xml:space="preserve"> + <value>mPlayToolStripMenuItem</value> </data> - <data name=">>playToolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPlayToolStripMenuItem.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=">>mPlayAllToolStripMenuItem.Name" xml:space="preserve"> Modified: trunk/urakawa/application/Obi/Obi/Playlist.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-16 00:23:51 UTC (rev 3070) +++ trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-16 01:45:09 UTC (rev 3071) @@ -94,7 +94,15 @@ /// Get the audio player for the playlist. Useful for setting up event listeners. /// </summary> public AudioPlayer Audioplayer { get { return mPlayer; } } - + + public bool CanNavigateNextPhrase { get { return mCurrentPhraseIndex < mPhrases.Count - 1; } } + + public PhraseNode NextPhrase(PhraseNode node) + { + int index = mPhrases.IndexOf(node) + 1; + return index < mPhrases.Count ? mPhrases[index] : null; + } + /// <summary> /// Set the currently playing phrase directly. /// If playing, move to the beginning of the phrase. Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 00:23:51 UTC (rev 3070) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-16 01:45:09 UTC (rev 3071) @@ -198,12 +198,14 @@ 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 CanFastForward { get { return mTransportBar.CanFastForward; } } 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; } } public bool CanMergeStripWithNext { get { return mStripsView.CanMergeStripWithNext; } } + public bool CanNavigateNextPhrase { get { return mTransportBar.CanNavigateNextPhrase; } } public bool CanPaste { get { return mSelection != null && mSelection.CanPaste(mClipboard); } } public bool CanPasteBefore { get { return mTOCView.CanPasteBefore(mClipboard); } } public bool CanPasteInside { get { return mTOCView.CanPasteInside(mClipboard); } } @@ -220,6 +222,7 @@ public bool CanResume { get { return mTransportBar.CanResumePlayback; } } public bool CanRenameSection { get { return Selection != null && (CanRenameStrip || mTOCView.CanRenameSection) ; } } public bool CanRenameStrip { get { return Selection != null && ( mStripsView.CanRenameStrip ); } } + public bool CanRewind { get { return mTransportBar.CanRewind; } } public bool CanSetBlockUsedStatus { get { return mStripsView.CanSetBlockUsedStatus; } } public bool CanSetSectionUsedStatus { get { return mTOCView.CanSetSectionUsedStatus; } } public bool CanSetStripUsedStatus { get { return mStripsView.CanSetStripUsedStatus; } } @@ -1367,6 +1370,11 @@ } } + public void SelectPhraseInContentView(PhraseNode node) + { + Selection = new NodeSelection(node, mStripsView); + } + /// <summary> /// Get the phrase node to split depending on the selection or the playback node. /// </summary> Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 00:23:51 UTC (rev 3070) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-16 01:45:09 UTC (rev 3071) @@ -622,8 +622,7 @@ mShortcutKeys = new Dictionary<Keys, HandledShortcutKey>(); mShortcutKeys[Keys.A] = MarkSelectionWholePhrase; - //mShortcutKeys[Keys.Space] = TogglePlayPause; - + // playback shortcuts. mShortcutKeys[Keys.J] = NavigatePrevPhrase; mShortcutKeys[Keys.K] = NavigateNextPhrase; @@ -677,10 +676,7 @@ if (CanUseKeys && ((msg.Msg == WM_KEYDOWN) || (msg.Msg == WM_SYSKEYDOWN)) && mShortcutKeys.ContainsKey(key) && mShortcutKeys[key]()) return true; - - if (ProcessTabKeyInContentsView(key)) - return true; - + if (ProcessTabKeyInContentsView(key)) return true; return base.ProcessCmdKey(ref msg, key); } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 00:23:51 UTC (rev 3070) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 01:45:09 UTC (rev 3071) @@ -105,10 +105,9 @@ /// </summary> public Audio.AudioPlayer AudioPlayer { get { return mPlayer; } } - public bool CanFastForward { get { return Enabled && mRecordingSession == null; } } + public bool CanFastForward { get { return Enabled && !IsRecorderActive; } } 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; } } public bool CanNavigatePrevPage { get { return Enabled && mRecordingSession == null; } } public bool CanNavigatePrevPhrase { get { return Enabled && mRecordingSession == null; } } @@ -118,9 +117,20 @@ public bool CanRecord { get { return Enabled && mState == State.Stopped; } } public bool CanResumePlayback { get { return Enabled && mState == State.Paused; } } public bool CanResumeRecording { get { return Enabled && mState == State.Monitoring; } } - public bool CanRewind { get { return Enabled && mRecordingSession == null; } } + public bool CanRewind { get { return Enabled && !IsRecorderActive; } } public bool CanStop { get { return Enabled && (mState != State.Stopped || mView.Selection != null); } } + public bool CanNavigateNextPhrase + { + get + { + return Enabled && + (IsRecorderActive || + (IsPlayerActive && mCurrentPlaylist.CanNavigateNextPhrase) || + CanPlay); + } + } + public bool CanPreview { get @@ -692,7 +702,7 @@ /// </summary> public void Stop() { - if (Enabled) + if (CanStop) { if (IsRecorderActive) { @@ -961,7 +971,7 @@ /// </summary> public void NextPhrase() { - if (Enabled) + if (CanNavigateNextPhrase) { if (mState == State.Recording) { @@ -971,18 +981,20 @@ else if (mState == State.Monitoring) { // start recording - + mRecordingSession.Stop(); + mRecordingSession.Record(); } else if (mState == State.Stopped) { if (mView.ObiForm.Settings.PlayOnNavigate) { - mCurrentPlaylist.CurrentPhrase = mView.Selection.Node as PhraseNode; + PlayCurrentPlaylistFromSelection(); mCurrentPlaylist.NavigateToNextPhrase(); } else { - mView.SelectNextPhrase(); + mView.SelectPhraseInContentView(mCurrentPlaylist.NextPhrase( + FindPlaybackStartNode(mView.Selection == null ? null : mView.Selection.Node))); } } else @@ -1024,9 +1036,9 @@ /// </summary> public void FastForward() { - if (Enabled && mRecordingSession == null) + if (CanFastForward) { - if (mCurrentPlaylist.Audioplayer.State == Obi.Audio.AudioPlayerState.Stopped) PlayOrResume(); + if (mState == State.Stopped) PlayOrResume(); mCurrentPlaylist.FastForward(); } } @@ -1036,9 +1048,9 @@ /// </summary> public void Rewind() { - if (Enabled && mRecordingSession == null) + if (CanRewind) { - if (mCurrentPlaylist.Audioplayer.State == Obi.Audio.AudioPlayerState.Stopped) PlayOrResume(); + if (mState == State.Stopped) PlayOrResume(); mCurrentPlaylist.Rewind(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-16 00:23:52
|
Revision: 3070 http://urakawa.svn.sourceforge.net/urakawa/?rev=3070&view=rev Author: julienq Date: 2008-05-15 17:23:51 -0700 (Thu, 15 May 2008) Log Message: ----------- Play/play all behave correctly. 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-15 23:03:22 UTC (rev 3069) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-16 00:23:51 UTC (rev 3070) @@ -609,6 +609,12 @@ { mPlayAllToolStripMenuItem.Enabled = mProjectView.CanPlay; mPlaySelectionToolStripMenuItem.Enabled = mProjectView.CanPlaySelection; + mPreviewToolStripMenuItem.Enabled = mProjectView.CanPreview || mProjectView.CanPreviewAudioSelection; + mPreviewFromToolStripMenuItem.Enabled = mProjectView.CanPreview; + mPreviewUpToToolStripMenuItem.Enabled = mProjectView.CanPreview; + mPreviewSelectedToolStripMenuItem.Enabled = mProjectView.CanPreviewAudioSelection; + + mPreviewToolStripMenuItem.Enabled = mProjectView.CanPlay; FastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay; @@ -639,22 +645,20 @@ mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; - mPreviewToolStripMenuItem.Enabled = mProjectView.CanPreview || mProjectView.CanPreviewAudioSelection; - mPreviewFromToolStripMenuItem.Enabled = mProjectView.CanPreview; - mPreviewUpToToolStripMenuItem.Enabled = mProjectView.CanPreview; - mPreviewSelectedToolStripMenuItem.Enabled = mProjectView.CanPreviewAudioSelection; } - private void mPlayAllToolStripMenuItem_Click(object sender, EventArgs e) - { - if (mProjectView.CanPlay) mProjectView.TransportBar.PlayAll(); - } - + private void mPlayAllToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PlayAll(); } private void mPlaySelectionToolStripMenuItem_Click(object sender, EventArgs e) { if (mProjectView.CanPlaySelection) mProjectView.TransportBar.PlayOrResume(mProjectView.Selection.Node); } + private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); } + private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); } + private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); } + + + private void mPauseToolStripMenuItem_Click(object sender, EventArgs e) { if (mProjectView.CanPause) mProjectView.TransportBar.Pause(); @@ -741,9 +745,6 @@ mProjectView.TransportBar.FastPlayNormaliseWithLapseBack(); } - private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); } - private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); } - private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); } private void PhraseDetectionToolStripMenuItem_Click(object sender, EventArgs e) { Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 23:03:22 UTC (rev 3069) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-16 00:23:51 UTC (rev 3070) @@ -32,7 +32,6 @@ 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 private string mPrevSectionAccessibleName; // Normal accessible name for the previous section button ??? @@ -541,8 +540,11 @@ /// </summary> public void PlayAll() { - mCurrentPlaylist = mMasterPlaylist; - PlayCurrentPlaylistFromSelection(); + if (CanPlay) + { + mCurrentPlaylist = mMasterPlaylist; + PlayCurrentPlaylistFromSelection(); + } } /// <summary> @@ -582,43 +584,59 @@ } } + // Find the node to start playback from. + private PhraseNode FindPlaybackStartNode(ObiNode node) + { + ObiNode n; + // start from this node (or the first leaf for a section) + // and go through every node to find the first one in the playlist. + for (n = node is SectionNode ? node.FirstLeaf : node; + n != null && !mCurrentPlaylist.ContainsPhrase(n as PhraseNode); + n = n.FollowingNode) { } + return n as PhraseNode; + } + // Play the current playlist from the current selection. private void PlayCurrentPlaylistFromSelection() { - if (mView.Selection is AudioSelection - && mView.Selection.Node is PhraseNode - && (!((AudioSelection)mView.Selection).AudioRange.HasCursor || mIsSelectionMarked) - && ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime > ((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime) + if (mView.Selection is AudioSelection) { - // Play the current selection - mCurrentPlaylist.CurrentPhrase = (PhraseNode)mView.Selection.Node; - if (mCurrentPlaylist == mMasterPlaylist) + if (!((AudioSelection)mView.Selection).AudioRange.HasCursor && mCurrentPlaylist != mMasterPlaylist) { - // when "play all", ignore the end time - mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime); + // Play the audio selection (only for local playlist; play all ignores the end of the selection.) + mCurrentPlaylist.CurrentPhrase = (PhraseNode)mView.Selection.Node; + mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime, + ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime); } else { - mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime, ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime); + mCurrentPlaylist.CurrentPhrase = FindPlaybackStartNode(mView.Selection.Node); + if (mCurrentPlaylist.CurrentPhrase == mView.Selection.Node) + { + // The selected node is in the playlist so play from the cursor + mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.CursorTime); + } + else + { + // The selected node is not in the playlist so play from the beginning + mCurrentPlaylist.Play(); + } } } - 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); - } else if (mView.Selection is StripCursorSelection) { + // Play from the first phrase in the playlist following the strip cursor, + // or the beginning of the strip. StripCursorSelection s = (StripCursorSelection)mView.Selection; - if (s.Index < s.Section.PhraseChildCount) - { - mCurrentPlaylist.CurrentPhrase = (PhraseNode)s.Section.PhraseChild(s.Index); - } + mCurrentPlaylist.CurrentPhrase = FindPlaybackStartNode(s.Index < s.Section.PhraseChildCount ? + (ObiNode)s.Section.PhraseChild(s.Index) : (ObiNode)s.Section); mCurrentPlaylist.Play(); } + else if (mView.Selection is NodeSelection) + { + mCurrentPlaylist.CurrentPhrase = FindPlaybackStartNode(mView.Selection.Node); + mCurrentPlaylist.Play(); + } else { mCurrentPlaylist.Play(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-15 23:03:23
|
Revision: 3069 http://urakawa.svn.sourceforge.net/urakawa/?rev=3069&view=rev Author: julienq Date: 2008-05-15 16:03:22 -0700 (Thu, 15 May 2008) Log Message: ----------- Updated preview (keyboard shortcut + transport menu) Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Audio/AudioPlayer.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/Playlist.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/Audio/AudioPlayer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Audio/AudioPlayer.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/Audio/AudioPlayer.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -59,7 +59,7 @@ // Member variables changed by user private int m_VolumeLevel; - private int m_FwdRwdRate; // holds skip time multiplier for forward / rewind mode , value is 0 for normal playback, positive for FastForward and negetive for Rewind + private int mFwdRwdRate; // holds skip time multiplier for forward / rewind mode , value is 0 for normal playback, positive for FastForward and negetive for Rewind private float m_fFastPlayFactor; /// fholds fast play multiplier private bool m_IsPreviewing; // Is true when playback is used for previewing a selection or marking. @@ -92,7 +92,7 @@ mPreviewTimer.Tick += new System.EventHandler(this.PreviewTimer_Tick); mPreviewTimer.Interval = 100; //mPlaybackMode = PlaybackMode.Normal; - m_FwdRwdRate = 0 ; + mFwdRwdRate = 0 ; m_fFastPlayFactor = 1; mIsFwdRwd = false; mEventsEnabled = true; @@ -183,11 +183,11 @@ {//2 lCurrentPosition = m_lPausePosition; }//-2 - if (m_FwdRwdRate != 0 ) lCurrentPosition = m_lChunkStartPosition; + if (mFwdRwdRate != 0 ) lCurrentPosition = m_lChunkStartPosition; lCurrentPosition = CalculationFunctions.AdaptToFrame(lCurrentPosition, m_FrameSize); }//-1 - if (PrevBytePosition > lCurrentPosition && m_FwdRwdRate >= 0) + if (PrevBytePosition > lCurrentPosition && mFwdRwdRate >= 0) return PrevBytePosition; PrevBytePosition = lCurrentPosition; @@ -202,20 +202,20 @@ /// <param name="mode">The new mode.</param> private void SetPlaybackMode( int rate ) { - if (rate != m_FwdRwdRate ) + if (rate != mFwdRwdRate ) { if (State == AudioPlayerState.Playing) { long restartPos = GetCurrentBytePosition(); StopPlayback(); mState = AudioPlayerState.Paused; - m_FwdRwdRate = rate ; + mFwdRwdRate = rate ; InitPlay( mCurrentAudio , restartPos, 0); } else if (mState == AudioPlayerState.Paused || mState == AudioPlayerState.Stopped) { - m_FwdRwdRate = rate ; + mFwdRwdRate = rate ; } } } @@ -255,7 +255,7 @@ { get { - return m_FwdRwdRate; + return mFwdRwdRate; } set { @@ -410,7 +410,7 @@ void SetPlayFrequency(float l_frequency) { if (mSoundBuffer != null - && m_FwdRwdRate == 0 ) + && mFwdRwdRate == 0 ) { try { @@ -508,36 +508,38 @@ } } + + // Get a byte position from a time in ms. for the given PCM format info. + private long BytePositionFromTime(double time, PCMFormatInfo info) + { + ushort align = info.getBlockAlign(); + return CalculationFunctions.AdaptToFrame(CalculationFunctions.ConvertTimeToByte(time, (int)info.getSampleRate(), align), align); + } + /// <summary> /// Starts a preview playback /// playback time returns back to restore time after previewing /// end of asset is not triggered after previewing /// pause and stop functions work as same as that during normal playback - /// <see cref=""/> /// </summary> - /// <param name="asset"></param> - /// <param name="timeFrom"></param> - /// <param name="timeTo"></param> - /// <param name="RestoreTime"></param> - public void PlayPreview(AudioMediaData asset, double timeFrom, double timeTo, double RestoreTime) + public void PlayPreview(AudioMediaData asset, double from, double timeTo, double RestoreTime) { // it is public function so API state will be used if (State == AudioPlayerState.Stopped || State == AudioPlayerState.Paused) { if ( asset != null && asset.getAudioDuration().getTimeDeltaAsMillisecondFloat() > 0) { - long lStartPosition = CalculationFunctions.ConvertTimeToByte(timeFrom, (int)asset.getPCMFormat().getSampleRate(), asset.getPCMFormat().getBlockAlign()); + long lStartPosition = CalculationFunctions.ConvertTimeToByte(from, (int)asset.getPCMFormat().getSampleRate(), asset.getPCMFormat().getBlockAlign()); lStartPosition = CalculationFunctions.AdaptToFrame(lStartPosition, asset.getPCMFormat().getBlockAlign()); long lEndPosition = CalculationFunctions.ConvertTimeToByte(timeTo, (int)asset.getPCMFormat().getSampleRate(), asset.getPCMFormat().getBlockAlign()); lEndPosition = CalculationFunctions.AdaptToFrame(lEndPosition, asset.getPCMFormat().getBlockAlign()); // check for valid arguments - if (lStartPosition < 0) - lStartPosition = 0; + if (lStartPosition < 0) lStartPosition = 0; if (lEndPosition > asset.getPCMLength()) lEndPosition = asset.getPCMLength(); - if ( m_FwdRwdRate == 0 ) + if ( mFwdRwdRate == 0 ) { m_IsPreviewing = true ; m_StateBeforePreview = State; @@ -575,13 +577,13 @@ { InitialiseWithAsset (asset ) ; - if (m_FwdRwdRate == 0) + if (mFwdRwdRate == 0) PlayAssetStream(lStartPosition, lEndPosition); - else if (m_FwdRwdRate > 0) + else if (mFwdRwdRate > 0) { FastForward(lStartPosition); } - else if (m_FwdRwdRate < 0) + else if (mFwdRwdRate < 0) { if (lStartPosition == 0) lStartPosition = mCurrentAudio.getPCMLength(); @@ -719,23 +721,23 @@ /// Thread function which is responsible for refreshing half of sound buffer after every 0.5 second and also for stopping play at end of asset /// <see cref=""/> /// </summary> - private void RefreshBuffer () - { - - int ReadPosition; - - // variable to prevent least count errors in clip end time + private void RefreshBuffer() + { + + int ReadPosition; + + // variable to prevent least count errors in clip end time long SafeMargin = CalculationFunctions.ConvertTimeToByte(1, m_SamplingRate, m_FrameSize); - while ( m_lPlayed < ( m_lLength - SafeMargin ) ) - {//1 - if (mSoundBuffer.Status.BufferLost ) - mSoundBuffer.Restore () ; + while (m_lPlayed < (m_lLength - SafeMargin)) + {//1 + if (mSoundBuffer.Status.BufferLost) + mSoundBuffer.Restore(); - - Thread.Sleep (50) ; + Thread.Sleep(50); + if (UpdateVuMeter != null) { ReadPosition = mSoundBuffer.PlayPosition; @@ -743,89 +745,89 @@ if (ReadPosition < ((m_SizeBuffer) - m_UpdateVMArrayLength)) { Array.Copy(mSoundBuffer.Read(ReadPosition, typeof(byte), LockFlag.None, m_UpdateVMArrayLength), arUpdateVM, m_UpdateVMArrayLength); - if ( mEventsEnabled == true) - UpdateVuMeter(this, new Events.Audio.Player.UpdateVuMeterEventArgs()); // JQ // temp for debugging tk + if (mEventsEnabled == true) + UpdateVuMeter(this, new Events.Audio.Player.UpdateVuMeterEventArgs()); // JQ // temp for debugging tk } } - // check if play cursor is in second half , then refresh first half else second + // check if play cursor is in second half , then refresh first half else second // refresh front part for odd count - if ((m_BufferCheck% 2) == 1 && mSoundBuffer.PlayPosition > m_RefreshLength) - {//2 - mSoundBuffer.Write (0 , mAudioStream , m_RefreshLength, 0) ; - m_lPlayed = m_lPlayed + m_RefreshLength ; - m_BufferCheck++ ; - }//-1 - // refresh Rear half of buffer for even count - else if ((m_BufferCheck % 2 == 0) && mSoundBuffer.PlayPosition < m_RefreshLength) - {//1 - mSoundBuffer.Write (m_RefreshLength, mAudioStream, m_RefreshLength, 0) ; - m_lPlayed = m_lPlayed + m_RefreshLength ; - m_BufferCheck++ ; - // end of even/ odd part of buffer; - }//-1 + if ((m_BufferCheck % 2) == 1 && mSoundBuffer.PlayPosition > m_RefreshLength) + {//2 + mSoundBuffer.Write(0, mAudioStream, m_RefreshLength, 0); + m_lPlayed = m_lPlayed + m_RefreshLength; + m_BufferCheck++; + }//-1 + // refresh Rear half of buffer for even count + else if ((m_BufferCheck % 2 == 0) && mSoundBuffer.PlayPosition < m_RefreshLength) + {//1 + mSoundBuffer.Write(m_RefreshLength, mAudioStream, m_RefreshLength, 0); + m_lPlayed = m_lPlayed + m_RefreshLength; + m_BufferCheck++; + // end of even/ odd part of buffer; + }//-1 - // end of while - } - + // end of while + } + m_IsEndOfAsset = false; - int LengthDifference = (int)(m_lPlayed - m_lLength ); - mBufferStopPosition= -1 ; - // if there is no refresh after first load thenrefresh maps directly - if ( m_BufferCheck == 1 ) - { - mBufferStopPosition = Convert.ToInt32(m_SizeBuffer - LengthDifference ); + int LengthDifference = (int)(m_lPlayed - m_lLength); + mBufferStopPosition = -1; + // if there is no refresh after first load thenrefresh maps directly + if (m_BufferCheck == 1) + { + mBufferStopPosition = Convert.ToInt32(m_SizeBuffer - LengthDifference); } // if last refresh is to Front, BufferCheck is even and stop position is at front of buffer. else if ((m_BufferCheck % 2) == 0) { - mBufferStopPosition = Convert.ToInt32(m_RefreshLength - LengthDifference ); - } - else if ((m_BufferCheck > 1) && (m_BufferCheck % 2) == 1) + mBufferStopPosition = Convert.ToInt32(m_RefreshLength - LengthDifference); + } + else if ((m_BufferCheck > 1) && (m_BufferCheck % 2) == 1) { mBufferStopPosition = Convert.ToInt32(m_SizeBuffer - LengthDifference); } - + int CurrentPlayPosition; CurrentPlayPosition = mSoundBuffer.PlayPosition; - int StopMargin = Convert.ToInt32 (CalculationFunctions.ConvertTimeToByte( 70 , m_SamplingRate, m_FrameSize)); - StopMargin = (int) (StopMargin * m_fFastPlayFactor); + int StopMargin = Convert.ToInt32(CalculationFunctions.ConvertTimeToByte(70, m_SamplingRate, m_FrameSize)); + StopMargin = (int)(StopMargin * m_fFastPlayFactor); - if ( mBufferStopPosition < StopMargin) - mBufferStopPosition = StopMargin; + if (mBufferStopPosition < StopMargin) + mBufferStopPosition = StopMargin; - while (CurrentPlayPosition < (mBufferStopPosition - StopMargin) || CurrentPlayPosition > ( mBufferStopPosition )) - { - Thread.Sleep(50); - CurrentPlayPosition = mSoundBuffer.PlayPosition; - } + while (CurrentPlayPosition < (mBufferStopPosition - StopMargin) || CurrentPlayPosition > (mBufferStopPosition)) + { + Thread.Sleep(50); + CurrentPlayPosition = mSoundBuffer.PlayPosition; + } - - // Stopping process begins - mBufferStopPosition = -1 ; - m_lPausePosition = 0; - mSoundBuffer.Stop () ; + + // Stopping process begins + mBufferStopPosition = -1; + m_lPausePosition = 0; + mSoundBuffer.Stop(); if (ResetVuMeter != null) ResetVuMeter(this, new Obi.Events.Audio.Player.UpdateVuMeterEventArgs()); mAudioStream.Close(); - // changes the state and trigger events + // changes the state and trigger events Events.Audio.Player.StateChangedEventArgs e = new Events.Audio.Player.StateChangedEventArgs(mState); mState = AudioPlayerState.Stopped; - TriggerStateChangedEvent(e); + TriggerStateChangedEvent(e); if (mEventsEnabled) - m_IsEventEnabledDelayedTillTimer= true; + m_IsEventEnabledDelayedTillTimer = true; else - m_IsEventEnabledDelayedTillTimer= false; + m_IsEventEnabledDelayedTillTimer = false; m_IsEndOfAsset = true; PreviewPlaybackStop(); - // RefreshBuffer ends - } + // RefreshBuffer ends + } private bool m_IsEventEnabledDelayedTillTimer= true ; private void PreviewPlaybackStop() @@ -1001,7 +1003,7 @@ private void Rewind( long lStartPosition ) { // let's play backward! - if ( m_FwdRwdRate != 0 ) + if ( mFwdRwdRate != 0 ) { m_lChunkStartPosition = lStartPosition ; mEventsEnabled = false; @@ -1022,7 +1024,7 @@ { // let's play forward! - if (m_FwdRwdRate != 0 ) + if (mFwdRwdRate != 0 ) { m_lChunkStartPosition = lStartPosition; mEventsEnabled = false; @@ -1038,7 +1040,7 @@ private void PreviewTimer_Tick(object sender, EventArgs e) { //1 - double StepInMs = Math.Abs( 4000 * m_FwdRwdRate ) ; + double StepInMs = Math.Abs( 4000 * mFwdRwdRate ) ; long lStepInBytes = CalculationFunctions.ConvertTimeToByte(StepInMs, (int) mCurrentAudio.getPCMFormat().getSampleRate () , mCurrentAudio.getPCMFormat().getBlockAlign ()); int PlayChunkLength = 1200; long lPlayChunkLength = CalculationFunctions.ConvertTimeToByte( PlayChunkLength , (int)mCurrentAudio.getPCMFormat().getSampleRate(), mCurrentAudio.getPCMFormat().getBlockAlign()); @@ -1046,7 +1048,7 @@ long PlayStartPos = 0; long PlayEndPos = 0; - if ( m_FwdRwdRate > 0 ) + if ( mFwdRwdRate > 0 ) { //2 if (( mCurrentAudio.getPCMLength () - ( lStepInBytes + m_lChunkStartPosition ) ) > lPlayChunkLength ) { //3 @@ -1071,7 +1073,7 @@ EndOfAudioAsset(this, new Events.Audio.Player.EndOfAudioAssetEventArgs()); } //-3 } //-2 - else if ( m_FwdRwdRate < 0 ) + else if ( mFwdRwdRate < 0 ) { //2 //if (m_lChunkStartPosition > (lStepInBytes ) && lPlayChunkLength <= m_Asset.getPCMLength () ) if (m_lChunkStartPosition > 0 ) @@ -1103,7 +1105,7 @@ /// </summary> private void StopForwardRewind() { - if (m_FwdRwdRate != 0 || mPreviewTimer.Enabled) + if (mFwdRwdRate != 0 || mPreviewTimer.Enabled) { mPreviewTimer.Enabled = false; //m_FwdRwdRate = 0 ; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -129,10 +129,10 @@ this.SpeedUptoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mSpeedDowntoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mElapseBacktoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PlayPreviewtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mPreviewFromtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviewUptotoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviewSelectedAudiotoolStripMenuItem = 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(); + this.mPreviewSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mRecordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mStartListeningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mStartRecordingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -801,7 +801,7 @@ this.mResumeToolStripMenuItem, this.mStopToolStripMenuItem, this.FastPlaytoolStripMenuItem, - this.PlayPreviewtoolStripMenuItem, + this.mPreviewToolStripMenuItem, this.mRecordToolStripMenuItem, this.toolStripSeparator5, this.navigationToolStripMenuItem, @@ -882,32 +882,32 @@ resources.ApplyResources(this.mElapseBacktoolStripMenuItem, "mElapseBacktoolStripMenuItem"); this.mElapseBacktoolStripMenuItem.Click += new System.EventHandler(this.ElapseBacktoolStripMenuItem_Click); // - // PlayPreviewtoolStripMenuItem + // mPreviewToolStripMenuItem // - this.PlayPreviewtoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mPreviewFromtoolStripMenuItem, - this.PreviewUptotoolStripMenuItem, - this.PreviewSelectedAudiotoolStripMenuItem}); - this.PlayPreviewtoolStripMenuItem.Name = "PlayPreviewtoolStripMenuItem"; - resources.ApplyResources(this.PlayPreviewtoolStripMenuItem, "PlayPreviewtoolStripMenuItem"); + this.mPreviewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mPreviewFromToolStripMenuItem, + this.mPreviewUpToToolStripMenuItem, + this.mPreviewSelectedToolStripMenuItem}); + this.mPreviewToolStripMenuItem.Name = "mPreviewToolStripMenuItem"; + resources.ApplyResources(this.mPreviewToolStripMenuItem, "mPreviewToolStripMenuItem"); // - // mPreviewFromtoolStripMenuItem + // mPreviewFromToolStripMenuItem // - resources.ApplyResources(this.mPreviewFromtoolStripMenuItem, "mPreviewFromtoolStripMenuItem"); - this.mPreviewFromtoolStripMenuItem.Name = "mPreviewFromtoolStripMenuItem"; - this.mPreviewFromtoolStripMenuItem.Click += new System.EventHandler(this.PreviewFromtoolStripMenuItem_Click); + resources.ApplyResources(this.mPreviewFromToolStripMenuItem, "mPreviewFromToolStripMenuItem"); + this.mPreviewFromToolStripMenuItem.Name = "mPreviewFromToolStripMenuItem"; + this.mPreviewFromToolStripMenuItem.Click += new System.EventHandler(this.PreviewFromtoolStripMenuItem_Click); // - // PreviewUptotoolStripMenuItem + // mPreviewUpToToolStripMenuItem // - this.PreviewUptotoolStripMenuItem.Name = "PreviewUptotoolStripMenuItem"; - resources.ApplyResources(this.PreviewUptotoolStripMenuItem, "PreviewUptotoolStripMenuItem"); - this.PreviewUptotoolStripMenuItem.Click += new System.EventHandler(this.PreviewUptotoolStripMenuItem_Click); + this.mPreviewUpToToolStripMenuItem.Name = "mPreviewUpToToolStripMenuItem"; + resources.ApplyResources(this.mPreviewUpToToolStripMenuItem, "mPreviewUpToToolStripMenuItem"); + this.mPreviewUpToToolStripMenuItem.Click += new System.EventHandler(this.PreviewUptotoolStripMenuItem_Click); // - // PreviewSelectedAudiotoolStripMenuItem + // mPreviewSelectedToolStripMenuItem // - this.PreviewSelectedAudiotoolStripMenuItem.Name = "PreviewSelectedAudiotoolStripMenuItem"; - resources.ApplyResources(this.PreviewSelectedAudiotoolStripMenuItem, "PreviewSelectedAudiotoolStripMenuItem"); - this.PreviewSelectedAudiotoolStripMenuItem.Click += new System.EventHandler(this.PreviewSelectedAudiotoolStripMenuItem_Click); + this.mPreviewSelectedToolStripMenuItem.Name = "mPreviewSelectedToolStripMenuItem"; + resources.ApplyResources(this.mPreviewSelectedToolStripMenuItem, "mPreviewSelectedToolStripMenuItem"); + this.mPreviewSelectedToolStripMenuItem.Click += new System.EventHandler(this.PreviewSelectedAudiotoolStripMenuItem_Click); // // mRecordToolStripMenuItem // @@ -1022,10 +1022,11 @@ // // mToolsToolStripMenuItem // - resources.ApplyResources(this.mToolsToolStripMenuItem, "mToolsToolStripMenuItem"); + this.mToolsToolStripMenuItem.AccessibleName = global::Obi.messages.phrase_extra_Plain; this.mToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.preferencesToolStripMenuItem1}); this.mToolsToolStripMenuItem.Name = "mToolsToolStripMenuItem"; + resources.ApplyResources(this.mToolsToolStripMenuItem, "mToolsToolStripMenuItem"); // // preferencesToolStripMenuItem1 // @@ -1216,14 +1217,14 @@ private System.Windows.Forms.ToolStripMenuItem mFocusOnTransportBarToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mPhraseDetectionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem FastPlaytoolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem PlayPreviewtoolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPreviewToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem NormalSpeedtoolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SpeedUptoolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mSpeedDowntoolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mElapseBacktoolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem mPreviewFromtoolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem PreviewUptotoolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem PreviewSelectedAudiotoolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPreviewFromToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPreviewUpToToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPreviewSelectedToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mInPhraseSelectionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mBeginInPhraseSelectionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mEndInPhraseSelectionToolStripMenuItem; Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -609,7 +609,7 @@ { mPlayAllToolStripMenuItem.Enabled = mProjectView.CanPlay; mPlaySelectionToolStripMenuItem.Enabled = mProjectView.CanPlaySelection; - PlayPreviewtoolStripMenuItem.Enabled = mProjectView.CanPlay; + mPreviewToolStripMenuItem.Enabled = mProjectView.CanPlay; FastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay; if (mProjectView.CanResume) @@ -638,6 +638,11 @@ } mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled; + + mPreviewToolStripMenuItem.Enabled = mProjectView.CanPreview || mProjectView.CanPreviewAudioSelection; + mPreviewFromToolStripMenuItem.Enabled = mProjectView.CanPreview; + mPreviewUpToToolStripMenuItem.Enabled = mProjectView.CanPreview; + mPreviewSelectedToolStripMenuItem.Enabled = mProjectView.CanPreviewAudioSelection; } private void mPlayAllToolStripMenuItem_Click(object sender, EventArgs e) @@ -736,21 +741,10 @@ mProjectView.TransportBar.FastPlayNormaliseWithLapseBack(); } - private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PlayPreviewFromCurrentPosition(); - } + private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); } + private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); } + private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); } - private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PlayPreviewUptoCurrentPosition(); - } - - private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) - { - mProjectView.TransportBar.PlayPreviewSelectedFragment(); - } - private void PhraseDetectionToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.ApplyPhraseDetection(); Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 23:03:22 UTC (rev 3069) @@ -236,15 +236,6 @@ <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> @@ -272,6 +263,205 @@ <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="mPreviewFromToolStripMenuItem.AccessibleName" xml:space="preserve"> + <value>Preview from... Ctrl+P</value> + </data> + <data name="mPreviewFromToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> + <value>Ctrl+P</value> + </data> + <data name="mPreviewFromToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewFromToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &from...</value> + </data> + <data name="mPreviewUpToToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewUpToToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &up to...</value> + </data> + <data name="mPreviewSelectedToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>187, 22</value> + </data> + <data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve"> + <value>Preview &selected</value> + </data> + <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <value>172, 22</value> + </data> + <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve"> + <value>Pre&view</value> + </data> + <data name="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="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.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> @@ -431,12 +621,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.AccessibleName" xml:space="preserve"> <value>Show TOC view Ctrl+Alt+T</value> </data> @@ -590,12 +774,6 @@ <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> @@ -710,12 +888,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.AccessibleName" xml:space="preserve"> <value>Add blank phrase Ctrl+B</value> </data> @@ -791,6 +963,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> @@ -827,12 +1005,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> @@ -869,10 +1041,15 @@ <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> @@ -909,11 +1086,11 @@ <data name="mDeselectInPhraseSelectionToolStripMenuItem.Text" xml:space="preserve"> <value>&Deselect</value> </data> - <data name="mInPhraseSelectionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> + <data name="mGoToToolStripMenuItem.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 name="mGoToToolStripMenuItem.Text" xml:space="preserve"> + <value>&Go to...</value> </data> <data name="mNextTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Next TODO phrase Ctrl+F9</value> @@ -939,18 +1116,6 @@ <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> @@ -975,48 +1140,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.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> @@ -1065,42 +1188,6 @@ <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> - <data name="mPreviewFromtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> - <value>Ctrl+P</value> - </data> - <data name="mPreviewFromtoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="mPreviewFromtoolStripMenuItem.Text" xml:space="preserve"> - <value>Preview &from...</value> - </data> - <data name="PreviewUptotoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <data name="PreviewUptotoolStripMenuItem.Text" xml:space="preserve"> - <value>Preview &up to...</value> - </data> - <data name="PreviewSelectedAudiotoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> - <value>187, 22</value> - </data> - <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> @@ -1125,15 +1212,6 @@ <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> @@ -1215,51 +1293,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="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> @@ -1272,12 +1305,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="mContentsToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>Contents F1</value> </data> @@ -1320,42 +1347,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> - <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> @@ -1380,6 +1374,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> @@ -1399,7 +1396,7 @@ <value>mProjectView</value> </data> <data name=">>mProjectView.Type" xml:space="preserve"> - <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.30052, Culture=neutral, PublicKeyToken=null</value> + <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.43039, Culture=neutral, PublicKeyToken=null</value> </data> <data name=">>mProjectView.Parent" xml:space="preserve"> <value>$this</value> @@ -2269,28 +2266,28 @@ <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=">>PlayPreviewtoolStripMenuItem.Name" xml:space="preserve"> - <value>PlayPreviewtoolStripMenuItem</value> + <data name=">>mPreviewToolStripMenuItem.Name" xml:space="preserve"> + <value>mPreviewToolStripMenuItem</value> </data> - <data name=">>PlayPreviewtoolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPreviewToolStripMenuItem.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=">>mPreviewFromtoolStripMenuItem.Name" xml:space="preserve"> - <value>mPreviewFromtoolStripMenuItem</value> + <data name=">>mPreviewFromToolStripMenuItem.Name" xml:space="preserve"> + <value>mPreviewFromToolStripMenuItem</value> </data> - <data name=">>mPreviewFromtoolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPreviewFromToolStripMenuItem.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=">>PreviewUptotoolStripMenuItem.Name" xml:space="preserve"> - <value>PreviewUptotoolStripMenuItem</value> + <data name=">>mPreviewUpToToolStripMenuItem.Name" xml:space="preserve"> + <value>mPreviewUpToToolStripMenuItem</value> </data> - <data name=">>PreviewUptotoolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPreviewUpToToolStripMenuItem.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=">>PreviewSelectedAudiotoolStripMenuItem.Name" xml:space="preserve"> - <value>PreviewSelectedAudiotoolStripMenuItem</value> + <data name=">>mPreviewSelectedToolStripMenuItem.Name" xml:space="preserve"> + <value>mPreviewSelectedToolStripMenuItem</value> </data> - <data name=">>PreviewSelectedAudiotoolStripMenuItem.Type" xml:space="preserve"> + <data name=">>mPreviewSelectedToolStripMenuItem.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=">>mRecordToolStripMenuItem.Name" xml:space="preserve"> Modified: trunk/urakawa/application/Obi/Obi/Playlist.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/Playlist.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -865,31 +865,7 @@ - public void PreviewFromCurrentPosition( double StartTime , double duration) - { - AudioMediaData AudioData = mPhrases[mCurrentPhraseIndex].Audio.getMediaData(); - - double EndTime = StartTime + duration; - - if (EndTime > AudioData.getAudioDuration().getTimeDeltaAsMillisecondFloat()) - EndTime = AudioData.getAudioDuration().getTimeDeltaAsMillisecondFloat(); - - mPlayer.PlayPreview(AudioData, StartTime, EndTime, StartTime); - } - - public void PreviewUptoCurrentPosition( double EndTime , double duration) - { - AudioMediaData AudioData = mPhrases[mCurrentPhraseIndex].Audio.getMediaData(); - - double StartTime = EndTime - duration; - - if (StartTime < 0) - StartTime = 0; - - mPlayer.PlayPreview(AudioData, StartTime, EndTime, EndTime); - } - public void PreviewSelectedFragment(double StartTime , double EndTime ) { AudioMediaData AudioData = mPhrases[mCurrentPhraseIndex].Audio.getMediaData(); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -210,6 +210,8 @@ public bool CanPause { get { return mTransportBar.CanPause; } } public bool CanPlay { get { return mTransportBar.CanPlay; } } public bool CanPlaySelection { get { return mTransportBar.CanPlay && mSelection != null; } } + public bool CanPreview { get { return mTransportBar.CanPreview; } } + public bool CanPreviewAudioSelection { get { return mTransportBar.CanPreviewAudioSelection; } } public bool CanRemoveAudio { get { return mStripsView.CanRemoveAudio; } } public bool CanRemoveBlock { get { return mStripsView.CanRemoveBlock; } } public bool CanRemoveMetadata { get { return mMetadataView.CanRemoveMetadata; } } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-15 15:50:48 UTC (rev 3068) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-15 23:03:22 UTC (rev 3069) @@ -640,10 +640,11 @@ mShortcutKeys[Keys.OemCloseBrackets] = MarkSelectionEndTime; mShortcutKeys[Keys.Shift | Keys.OemOpenBrackets] = MarkSelectionFromCursor; mShortcutKeys[Keys.Shift | Keys.OemCloseBrackets] = MarkSelectionToCursor; - mShortcutKeys[Keys.X ] = PlayPreviewUptoCurrentPosition; - mShortcutKeys[Keys.C] = PlayPreviewSelectedFragment; - mShortcutKeys[Keys.V ] = PlayPreviewFromCurrentPosition; + mShortcutKeys[Keys.C] = delegate() { return mView.TransportBar.PreviewAudioSelection(); }; + mShortcutKeys[Keys.V] = delegate() { return mView.TransportBar.Preview(true); }; + mShortcutKeys[Keys.X] = delegate() { return mView.TransportBar.Preview(false); }; + // Strips navigation mShortcutKeys[Keys.Left] = SelectPrecedingBlock; mShortcutKeys[Keys.Right] = SelectFollowingBlock; @@ -653,8 +654,6 @@ 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.Up] = SelectPreviousStrip; mShortcutKeys[Keys.Down] = SelectNextStrip; @@ -1092,21 +1091,7 @@ return mView.TransportBar.MarkSelectionWholePhrase(); } - private bool PlayPreviewFromCurrentPosition () - { - return mView.TransportBar.PlayPreviewFromCurrentPosition () ; - } - private bool PlayPreviewSelectedFragment() - { - return mView.TransportBar.PlayPreviewSelectedFra... [truncated message content] |
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. |
From: <avn...@us...> - 2008-05-15 15:38:55
|
Revision: 3067 http://urakawa.svn.sourceforge.net/urakawa/?rev=3067&view=rev Author: avneeshsingh Date: 2008-05-15 08:38:52 -0700 (Thu, 15 May 2008) Log Message: ----------- some rectification to menu accessible labels Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ObiForm.resx Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 15:09:01 UTC (rev 3066) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 15:38:52 UTC (rev 3067) @@ -122,7 +122,7 @@ <value>0, 0</value> </data> <data name="mFileToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>New project Ctrl+N</value> + <value /> </data> <data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve"> <value>New project Ctrl+N</value> @@ -363,7 +363,7 @@ <value>Previous &section</value> </data> <data name="mPreviousPageToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous page Alt+PgUp</value> + <value>Previous page Alt+PageUp</value> </data> <data name="mPreviousPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+PgUp</value> @@ -399,7 +399,7 @@ <value>Next ph&rase</value> </data> <data name="nextPageToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next page Alt+PgDn</value> + <value>Next page Alt+PageDown</value> </data> <data name="nextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+PgDn</value> @@ -453,7 +453,7 @@ <value>Re&wind</value> </data> <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Fast forward Ctrl+.</value> + <value>Fast forward Ctrl+period</value> </data> <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Ctrl+.</value> @@ -2443,4 +2443,10 @@ <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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <avn...@us...> - 2008-05-15 15:09:08
|
Revision: 3066 http://urakawa.svn.sourceforge.net/urakawa/?rev=3066&view=rev Author: avneeshsingh Date: 2008-05-15 08:09:01 -0700 (Thu, 15 May 2008) Log Message: ----------- Update to menu items accessible names, it is good not to include accelarator keys Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ObiForm.resx Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 14:18:58 UTC (rev 3065) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 15:09:01 UTC (rev 3066) @@ -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> - <metadata name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="mMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing"> <value>0, 0</value> - </metadata> + </data> <data name="mFileToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>New project N Ctrl+N</value> + <value>New project Ctrl+N</value> </data> <data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>New project N Ctrl+N</value> + <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> @@ -141,7 +141,7 @@ <value>&New project</value> </data> <data name="mNewProjectFromImportToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>New project from import I Ctrl+Shift+N</value> + <value>New project from import Ctrl+Shift+N</value> </data> <data name="mNewProjectFromImportToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+N</value> @@ -153,7 +153,7 @@ <value>New project from &import</value> </data> <data name="mOpenProjectToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Open project O Ctrl+O</value> + <value>Open project Ctrl+O</value> </data> <data name="mOpenProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> <value>Magenta</value> @@ -168,7 +168,7 @@ <value>&Open project</value> </data> <data name="mCloseProjectToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Close project C Ctrl+W</value> + <value>Close project Ctrl+W</value> </data> <data name="mCloseProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+W</value> @@ -183,7 +183,7 @@ <value>256, 6</value> </data> <data name="mSaveProjectToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Save project S Ctrl+S</value> + <value>Save project Ctrl+S</value> </data> <data name="mSaveProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing"> <value>Magenta</value> @@ -198,7 +198,7 @@ <value>&Save project</value> </data> <data name="mSaveProjectAsToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Save project as... A Ctrl+Shift+S</value> + <value>Save project as... Ctrl+Shift+S</value> </data> <data name="mSaveProjectAsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+S</value> @@ -210,7 +210,7 @@ <value>Save project &as...</value> </data> <data name="mCleanProjectToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Clean unreferenced audio L Ctrl+L</value> + <value>Clean unreferenced audio Ctrl+L</value> </data> <data name="mCleanProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+L</value> @@ -222,7 +222,7 @@ <value>C&lean unreferenced audio</value> </data> <data name="mExportAsDAISYToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Export as DAISY E Ctrl+E</value> + <value>Export as DAISY Ctrl+E</value> </data> <data name="mExportAsDAISYToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+E</value> @@ -246,7 +246,7 @@ <value>256, 6</value> </data> <data name="mExitToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Exit X Alt+F4</value> + <value>Exit Alt+F4</value> </data> <data name="mExitToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+F4</value> @@ -294,7 +294,7 @@ <value>&Play</value> </data> <data name="mPauseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Pause U Space</value> + <value>Pause Space</value> </data> <data name="mPauseToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Space</value> @@ -306,7 +306,7 @@ <value>Pa&use</value> </data> <data name="mResumeToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Resume U Space</value> + <value>Resume Space</value> </data> <data name="mResumeToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Space</value> @@ -318,7 +318,7 @@ <value>Res&ume</value> </data> <data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Stop S Ctrl+Space</value> + <value>Stop Ctrl+Space</value> </data> <data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Space</value> @@ -351,7 +351,7 @@ <value>169, 6</value> </data> <data name="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous section S Alt+Up</value> + <value>Previous section Alt+Up</value> </data> <data name="mPreviousSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+Up</value> @@ -363,7 +363,7 @@ <value>Previous &section</value> </data> <data name="mPreviousPageToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous page P Alt+PgUp</value> + <value>Previous page Alt+PgUp</value> </data> <data name="mPreviousPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+PgUp</value> @@ -375,7 +375,7 @@ <value>Previous &page</value> </data> <data name="mPreviousPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous phrase H Alt+Left</value> + <value>Previous phrase Alt+Left</value> </data> <data name="mPreviousPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+Left</value> @@ -387,7 +387,7 @@ <value>Previous p&hrase</value> </data> <data name="mNextPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next phrase R Alt+Right</value> + <value>Next phrase Alt+Right</value> </data> <data name="mNextPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+Right</value> @@ -399,7 +399,7 @@ <value>Next ph&rase</value> </data> <data name="nextPageToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next page G Alt+PgDn</value> + <value>Next page Alt+PgDn</value> </data> <data name="nextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+PgDn</value> @@ -411,7 +411,7 @@ <value>Next pa&ge</value> </data> <data name="mNextSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next section C Alt+Down</value> + <value>Next section Alt+Down</value> </data> <data name="mNextSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Alt+Down</value> @@ -438,7 +438,7 @@ <value>&Navigation</value> </data> <data name="mRewindToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Rewind W Ctrl+,</value> + <value>Rewind Ctrl+comma</value> </data> <data name="mRewindToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Ctrl+,</value> @@ -453,7 +453,7 @@ <value>Re&wind</value> </data> <data name="mFastForwardToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Fast forward F Ctrl+.</value> + <value>Fast forward Ctrl+.</value> </data> <data name="mFastForwardToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Ctrl+.</value> @@ -474,7 +474,7 @@ <value>Tr&ansport</value> </data> <data name="mToolsToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Preferences P Ctrl+Alt+F</value> + <value>Preferences Ctrl+Alt+F</value> </data> <data name="mToolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <value>44, 20</value> @@ -523,7 +523,7 @@ <value>&Clear list</value> </data> <data name="mUndoToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Undo U Ctrl+Z</value> + <value>Undo Ctrl+Z</value> </data> <data name="mUndoToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Z</value> @@ -535,7 +535,7 @@ <value>&Undo</value> </data> <data name="mRedoToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Redo R Ctrl+Y</value> + <value>Redo Ctrl+Y</value> </data> <data name="mRedoToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Y</value> @@ -550,7 +550,7 @@ <value>232, 6</value> </data> <data name="mCutToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Cut C Ctrl+X</value> + <value>Cut Ctrl+X</value> </data> <data name="mCutToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+X</value> @@ -562,7 +562,7 @@ <value>&Cut</value> </data> <data name="mCopyToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Copy Y Ctrl+C</value> + <value>Copy Ctrl+C</value> </data> <data name="mCopyToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+C</value> @@ -574,7 +574,7 @@ <value>Cop&y</value> </data> <data name="mPasteToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Paste P Ctrl+V</value> + <value>Paste Ctrl+V</value> </data> <data name="mPasteToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+V</value> @@ -586,7 +586,7 @@ <value>&Paste</value> </data> <data name="mPasteBeforeToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Paste before B Ctrl+Alt+V</value> + <value>Paste before Ctrl+Alt+V</value> </data> <data name="mPasteBeforeToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+V</value> @@ -598,7 +598,7 @@ <value>Paste &before</value> </data> <data name="mPasteInsideToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Paste inside I Ctrl+Shift+V</value> + <value>Paste inside Ctrl+Shift+V</value> </data> <data name="mPasteInsideToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+V</value> @@ -610,7 +610,7 @@ <value>Paste &inside</value> </data> <data name="mDeleteToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Delete D Del</value> + <value>Delete Del</value> </data> <data name="mDeleteToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Del</value> @@ -631,7 +631,7 @@ <value>232, 6</value> </data> <data name="mDeleteUnusedDataToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Delete unused data E Ctrl+Shift+L</value> + <value>Delete unused data Ctrl+Shift+L</value> </data> <data name="mDeleteUnusedDataToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+L</value> @@ -646,7 +646,7 @@ <value>232, 6</value> </data> <data name="mFindInTextToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Find F Ctrl+F</value> + <value>Find Ctrl+F</value> </data> <data name="mFindInTextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+F</value> @@ -658,7 +658,7 @@ <value>&Find</value> </data> <data name="mFindNextToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Find next N F3</value> + <value>Find next F3</value> </data> <data name="mFindNextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>F3</value> @@ -670,7 +670,7 @@ <value>Find &next</value> </data> <data name="mFindPreviousToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Find previous V Shift+F3</value> + <value>Find previous Shift+F3</value> </data> <data name="mFindPreviousToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Shift+F3</value> @@ -682,7 +682,7 @@ <value>Find pre&vious</value> </data> <data name="mShowTOCViewToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Show TOC view T Ctrl+Alt+T</value> + <value>Show TOC view Ctrl+Alt+T</value> </data> <data name="mShowTOCViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+T</value> @@ -694,7 +694,7 @@ <value>Show &TOC view</value> </data> <data name="mShowMetadataViewToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Show metata view M Ctrl+Alt+M</value> + <value>Show metata view Ctrl+Alt+M</value> </data> <data name="mShowMetadataViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+M</value> @@ -706,7 +706,7 @@ <value>Show &metadata view</value> </data> <data name="mShowTransportBarToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Show transport bar B Ctrl+Alt+B</value> + <value>Show transport bar Ctrl+Alt+B</value> </data> <data name="mShowTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+B</value> @@ -718,7 +718,7 @@ <value>Show transport &bar</value> </data> <data name="mShowStatusBarToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Show status bar U Ctrl+Alt+U</value> + <value>Show status bar Ctrl+Alt+U</value> </data> <data name="mShowStatusBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+U</value> @@ -733,7 +733,7 @@ <value>256, 6</value> </data> <data name="mFocusOnTOCViewToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Focus on TOC view C F6</value> + <value>Focus on TOC view F6</value> </data> <data name="mFocusOnTOCViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>F6</value> @@ -745,7 +745,7 @@ <value>Focus on TO&C view</value> </data> <data name="mFocusOnStripsViewToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Focus on content view N F7</value> + <value>Focus on content view F7</value> </data> <data name="mFocusOnStripsViewToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>F7</value> @@ -757,7 +757,7 @@ <value>Focus on co&ntent view</value> </data> <data name="mFocusOnTransportBarToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Focus on transport bar A F8</value> + <value>Focus on transport bar F8</value> </data> <data name="mFocusOnTransportBarToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>F8</value> @@ -769,7 +769,7 @@ <value>Focus on tr&ansport bar</value> </data> <data name="mSynchronizeViewsToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Synchronize views Y Ctrl+Alt+Y</value> + <value>Synchronize views Ctrl+Alt+Y</value> </data> <data name="mSynchronizeViewsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+Y</value> @@ -784,7 +784,7 @@ <value>256, 6</value> </data> <data name="mShowOnlySelectedSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Show only selected section S F5</value> + <value>Show only selected section F5</value> </data> <data name="mShowOnlySelectedSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>F5</value> @@ -811,7 +811,7 @@ <value>256, 6</value> </data> <data name="mShowPeakMeterMenuItem.AccessibleName" xml:space="preserve"> - <value>Show peak meter P Ctrl+Alt+P</value> + <value>Show peak meter Ctrl+Alt+P</value> </data> <data name="mShowPeakMeterMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+P</value> @@ -823,7 +823,7 @@ <value>Show &peak meter</value> </data> <data name="mShowSourceToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Show source view R Ctrl+Alt+O</value> + <value>Show source view Ctrl+Alt+O</value> </data> <data name="mShowSourceToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+O</value> @@ -835,7 +835,7 @@ <value>Show sou&rce view</value> </data> <data name="mAddSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Add section A Ctrl+H</value> + <value>Add section Ctrl+H</value> </data> <data name="mAddSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+H</value> @@ -847,7 +847,7 @@ <value>&Add section</value> </data> <data name="mAddSubsectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Add subsection S Ctrl+Shift+H</value> + <value>Add subsection Ctrl+Shift+H</value> </data> <data name="mAddSubsectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+H</value> @@ -859,7 +859,7 @@ <value>Add &subsection</value> </data> <data name="mInsertSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Insert section I Ctrl+Alt+H</value> + <value>Insert section Ctrl+Alt+H</value> </data> <data name="mInsertSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+H</value> @@ -871,7 +871,7 @@ <value>&Insert section</value> </data> <data name="mRenameSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Rename section M F2</value> + <value>Rename section F2</value> </data> <data name="mRenameSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>F2</value> @@ -886,7 +886,7 @@ <value>262, 6</value> </data> <data name="mDecreaseSectionLevelToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Decrease section level D Ctrl+Shift+Left</value> + <value>Decrease section level Ctrl+Shift+Left</value> </data> <data name="mDecreaseSectionLevelToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+Left</value> @@ -898,7 +898,7 @@ <value>&Decrease section level</value> </data> <data name="mIncreaseSectionLevelToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Increase section level N Ctrl+Shift+Right</value> + <value>Increase section level Ctrl+Shift+Right</value> </data> <data name="mIncreaseSectionLevelToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+Right</value> @@ -910,7 +910,7 @@ <value>I&ncrease section level</value> </data> <data name="mSplitSectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Split section P Ctrl+Shift+Q</value> + <value>Split section Ctrl+Shift+Q</value> </data> <data name="mSplitSectionToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+Q</value> @@ -922,7 +922,7 @@ <value>S&plit section</value> </data> <data name="mMergeSectionWithNextToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Merge section with next G Ctrl+Shift+M</value> + <value>Merge section with next Ctrl+Shift+M</value> </data> <data name="mMergeSectionWithNextToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+M</value> @@ -937,7 +937,7 @@ <value>262, 6</value> </data> <data name="mSectionIsUsedToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Section is used U Ctrl+K</value> + <value>Section is used Ctrl+K</value> </data> <data name="mSectionIsUsedToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+K</value> @@ -949,7 +949,7 @@ <value>Section is &used</value> </data> <data name="mAddBlankPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Add blank phrase B Ctrl+B</value> + <value>Add blank phrase Ctrl+B</value> </data> <data name="mAddBlankPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+B</value> @@ -961,7 +961,7 @@ <value>Add &blank phrase</value> </data> <data name="mAddEmptyPagesToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Add empty pages P Ctrl+Shift+B</value> + <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> @@ -973,7 +973,7 @@ <value>Add empty &pages</value> </data> <data name="mImportAudioFileToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Import audio files I Ctrl+I</value> + <value>Import audio files Ctrl+I</value> </data> <data name="mImportAudioFileToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+I</value> @@ -985,7 +985,7 @@ <value>&Import audio files</value> </data> <data name="mSplitPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Split phrase S Ctrl+Q</value> + <value>Split phrase Ctrl+Q</value> </data> <data name="mSplitPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Q</value> @@ -997,7 +997,7 @@ <value>&Split phrase</value> </data> <data name="mMergePhraseWithNextToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Merge phrase with next M Ctrl+M</value> + <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> @@ -1009,7 +1009,7 @@ <value>&Merge phrase with next</value> </data> <data name="mPhraseIsUsedToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Phrase is used U Ctrl+K</value> + <value>Phrase is used Ctrl+K</value> </data> <data name="mPhraseIsUsedToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+K</value> @@ -1078,7 +1078,7 @@ <value>&Clear role</value> </data> <data name="mPhraseDetectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Apply phrase detection H Ctrl+Shift+P</value> + <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> @@ -1090,7 +1090,7 @@ <value>Apply p&hrase detection</value> </data> <data name="mMarkDefaultCustomClassToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Mark default custom class K Ctrl+U</value> + <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> @@ -1111,7 +1111,7 @@ <value>In-ph&rase audio selection</value> </data> <data name="mBeginInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Begin in-phrase selection B Ctrl+[</value> + <value>Begin in-phrase selection Ctrl+[</value> </data> <data name="mBeginInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Ctrl+[</value> @@ -1126,7 +1126,7 @@ <value>&Begin in-phrase selection</value> </data> <data name="mEndInPhraseSelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>End in-phrase selection E Ctrl+]</value> + <value>End in-phrase selection Ctrl+]</value> </data> <data name="mEndInPhraseSelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Ctrl+]</value> @@ -1153,7 +1153,7 @@ <value>&Go to...</value> </data> <data name="mNextTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Next TODO phrase N Ctrl+F9</value> + <value>Next TODO phrase Ctrl+F9</value> </data> <data name="mNextTODOPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+F9</value> @@ -1165,7 +1165,7 @@ <value>&Next TODO phrase</value> </data> <data name="mPreviousTODOPhraseToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Previous TODO phrase P Ctrl+Shift+F9</value> + <value>Previous TODO phrase Ctrl+Shift+F9</value> </data> <data name="mPreviousTODOPhraseToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+F9</value> @@ -1177,7 +1177,7 @@ <value>&Previous TODO phrase</value> </data> <data name="mPlayAllToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Play all A Ctrl+Shift+Space</value> + <value>Play all Ctrl+Shift+Space</value> </data> <data name="mPlayAllToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Shift+Space</value> @@ -1189,7 +1189,7 @@ <value>Play &all</value> </data> <data name="mPlaySelectionToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Play selection S Space</value> + <value>Play selection Space</value> </data> <data name="mPlaySelectionToolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Space</value> @@ -1201,7 +1201,7 @@ <value>Play &selection</value> </data> <data name="NormalSpeedtoolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Normal speed N Ctrl+0</value> + <value>Normal speed Ctrl+0</value> </data> <data name="NormalSpeedtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+0</value> @@ -1213,7 +1213,7 @@ <value>&Normal speed</value> </data> <data name="SpeedUptoolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Speed up U Ctrl++</value> + <value>Speed up Ctrl++</value> </data> <data name="SpeedUptoolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Ctrl++</value> @@ -1228,7 +1228,7 @@ <value>Speed &up</value> </data> <data name="mSpeedDowntoolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Speed down D Ctrl+-</value> + <value>Speed down Ctrl+-</value> </data> <data name="mSpeedDowntoolStripMenuItem.ShortcutKeyDisplayString" xml:space="preserve"> <value>Ctrl+-</value> @@ -1249,7 +1249,7 @@ <value>Normal speed with &elapse back</value> </data> <data name="mPreviewFromtoolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Preview from... F Ctrl+P</value> + <value>Preview from... Ctrl+P</value> </data> <data name="mPreviewFromtoolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+P</value> @@ -1306,7 +1306,7 @@ <value>&Preferences</value> </data> <data name="mContentsToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Contents C F1</value> + <value>Contents F1</value> </data> <data name="mContentsToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>F1</value> @@ -1318,7 +1318,7 @@ <value>&Contents</value> </data> <data name="mViewHelpInExternalBrowserToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>View help in external browser V Shift+F1</value> + <value>View help in external browser Shift+F1</value> </data> <data name="mViewHelpInExternalBrowserToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Shift+F1</value> @@ -1330,7 +1330,7 @@ <value>&View help in external browser</value> </data> <data name="mReportBugToolStripMenuItem.AccessibleName" xml:space="preserve"> - <value>Report bug R Ctrl+Alt+R</value> + <value>Report bug Ctrl+Alt+R</value> </data> <data name="mReportBugToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms"> <value>Ctrl+Alt+R</value> @@ -1347,9 +1347,9 @@ <data name="aboutObiToolStripMenuItem.Text" xml:space="preserve"> <value>&About Obi</value> </data> - <metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <data name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing"> <value>0, 606</value> - </metadata> + </data> <data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing"> <value>0, 606</value> </data> @@ -1404,9 +1404,9 @@ <data name=">>mProjectView.ZOrder" xml:space="preserve"> <value>0</value> </data> - <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <data name="$this.Localizable" type="System.Boolean, mscorlib"> <value>True</value> - </metadata> + </data> <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> <value>6, 13</value> </data> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-15 14:19:26
|
Revision: 3065 http://urakawa.svn.sourceforge.net/urakawa/?rev=3065&view=rev Author: julienq Date: 2008-05-15 07:18:58 -0700 (Thu, 15 May 2008) Log Message: ----------- Added accessible names to menu items in the hope that screenreaders will report shortcut keys. Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs trunk/urakawa/application/Obi/Obi/ObiForm.cs trunk/urakawa/application/Obi/Obi/ObiForm.resx Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-15 12:02:41 UTC (rev 3064) +++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2008-05-15 14:18:58 UTC (rev 3065) @@ -41,7 +41,7 @@ this.mCleanProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mExportAsDAISYToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.mOpenRecentProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mRecentProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openrecentSeparator = new System.Windows.Forms.ToolStripSeparator(); this.mClearListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); @@ -108,12 +108,12 @@ this.mAddRoleToolStripTextBox = new System.Windows.Forms.ToolStripTextBox(); this.mEditRolesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mClearRoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PhraseDetectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPhraseDetectionToolStripMenuItem = 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(); - this.DeselectInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mBeginInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mEndInPhraseSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mDeselectInPhraseSelectionToolStripMenuItem = 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(); @@ -127,10 +127,10 @@ this.FastPlaytoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NormalSpeedtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SpeedUptoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SpeedDowntoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ElapseBacktoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mSpeedDowntoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mElapseBacktoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PlayPreviewtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviewFromtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPreviewFromtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PreviewUptotoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PreviewSelectedAudiotoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mRecordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -139,20 +139,20 @@ this.mAllowOverwriteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.navigationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.previousSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.previousPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.previousPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.nextPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPreviousSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPreviousPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPreviousPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mNextPhraseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.nextPageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.nextSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mNextSectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); this.mPlayOnNavigateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fastForwardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mRewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mFastForwardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.preferencesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.mHelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mHelpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.mContentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mViewHelpInExternalBrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mReportBugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutObiToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -179,6 +179,7 @@ // // mFileToolStripMenuItem // + resources.ApplyResources(this.mFileToolStripMenuItem, "mFileToolStripMenuItem"); this.mFileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mNewProjectToolStripMenuItem, this.mNewProjectFromImportToolStripMenuItem, @@ -190,11 +191,10 @@ this.mCleanProjectToolStripMenuItem, this.mExportAsDAISYToolStripMenuItem, this.toolStripSeparator2, - this.mOpenRecentProjectToolStripMenuItem, + this.mRecentProjectToolStripMenuItem, this.toolStripSeparator3, this.mExitToolStripMenuItem}); this.mFileToolStripMenuItem.Name = "mFileToolStripMenuItem"; - resources.ApplyResources(this.mFileToolStripMenuItem, "mFileToolStripMenuItem"); // // mNewProjectToolStripMenuItem // @@ -204,8 +204,8 @@ // // mNewProjectFromImportToolStripMenuItem // + resources.ApplyResources(this.mNewProjectFromImportToolStripMenuItem, "mNewProjectFromImportToolStripMenuItem"); this.mNewProjectFromImportToolStripMenuItem.Name = "mNewProjectFromImportToolStripMenuItem"; - resources.ApplyResources(this.mNewProjectFromImportToolStripMenuItem, "mNewProjectFromImportToolStripMenuItem"); this.mNewProjectFromImportToolStripMenuItem.Click += new System.EventHandler(this.mNewProjectFromImportToolStripMenuItem_Click); // // mOpenProjectToolStripMenuItem @@ -216,8 +216,8 @@ // // mCloseProjectToolStripMenuItem // + resources.ApplyResources(this.mCloseProjectToolStripMenuItem, "mCloseProjectToolStripMenuItem"); this.mCloseProjectToolStripMenuItem.Name = "mCloseProjectToolStripMenuItem"; - resources.ApplyResources(this.mCloseProjectToolStripMenuItem, "mCloseProjectToolStripMenuItem"); this.mCloseProjectToolStripMenuItem.Click += new System.EventHandler(this.mCloseProjectToolStripMenuItem_Click); // // toolStripSeparator9 @@ -233,20 +233,20 @@ // // mSaveProjectAsToolStripMenuItem // + resources.ApplyResources(this.mSaveProjectAsToolStripMenuItem, "mSaveProjectAsToolStripMenuItem"); this.mSaveProjectAsToolStripMenuItem.Name = "mSaveProjectAsToolStripMenuItem"; - resources.ApplyResources(this.mSaveProjectAsToolStripMenuItem, "mSaveProjectAsToolStripMenuItem"); this.mSaveProjectAsToolStripMenuItem.Click += new System.EventHandler(this.mSaveProjectAsToolStripMenuItem_Click); // // mCleanProjectToolStripMenuItem // + resources.ApplyResources(this.mCleanProjectToolStripMenuItem, "mCleanProjectToolStripMenuItem"); this.mCleanProjectToolStripMenuItem.Name = "mCleanProjectToolStripMenuItem"; - resources.ApplyResources(this.mCleanProjectToolStripMenuItem, "mCleanProjectToolStripMenuItem"); this.mCleanProjectToolStripMenuItem.Click += new System.EventHandler(this.mCleanProjectToolStripMenuItem_Click); // // mExportAsDAISYToolStripMenuItem // + resources.ApplyResources(this.mExportAsDAISYToolStripMenuItem, "mExportAsDAISYToolStripMenuItem"); this.mExportAsDAISYToolStripMenuItem.Name = "mExportAsDAISYToolStripMenuItem"; - resources.ApplyResources(this.mExportAsDAISYToolStripMenuItem, "mExportAsDAISYToolStripMenuItem"); this.mExportAsDAISYToolStripMenuItem.Click += new System.EventHandler(this.mExportAsDAISYToolStripMenuItem_Click); // // toolStripSeparator2 @@ -254,13 +254,13 @@ this.toolStripSeparator2.Name = "toolStripSeparator2"; resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2"); // - // mOpenRecentProjectToolStripMenuItem + // mRecentProjectToolStripMenuItem // - this.mOpenRecentProjectToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mRecentProjectToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openrecentSeparator, this.mClearListToolStripMenuItem}); - this.mOpenRecentProjectToolStripMenuItem.Name = "mOpenRecentProjectToolStripMenuItem"; - resources.ApplyResources(this.mOpenRecentProjectToolStripMenuItem, "mOpenRecentProjectToolStripMenuItem"); + this.mRecentProjectToolStripMenuItem.Name = "mRecentProjectToolStripMenuItem"; + resources.ApplyResources(this.mRecentProjectToolStripMenuItem, "mRecentProjectToolStripMenuItem"); // // openrecentSeparator // @@ -280,8 +280,8 @@ // // mExitToolStripMenuItem // + resources.ApplyResources(this.mExitToolStripMenuItem, "mExitToolStripMenuItem"); this.mExitToolStripMenuItem.Name = "mExitToolStripMenuItem"; - resources.ApplyResources(this.mExitToolStripMenuItem, "mExitToolStripMenuItem"); this.mExitToolStripMenuItem.Click += new System.EventHandler(this.mExitToolStripMenuItem_Click); // // toolStripMenuItem1 @@ -308,14 +308,14 @@ // // mUndoToolStripMenuItem // + resources.ApplyResources(this.mUndoToolStripMenuItem, "mUndoToolStripMenuItem"); this.mUndoToolStripMenuItem.Name = "mUndoToolStripMenuItem"; - resources.ApplyResources(this.mUndoToolStripMenuItem, "mUndoToolStripMenuItem"); this.mUndoToolStripMenuItem.Click += new System.EventHandler(this.mUndoToolStripMenuItem_Click); // // mRedoToolStripMenuItem // + resources.ApplyResources(this.mRedoToolStripMenuItem, "mRedoToolStripMenuItem"); this.mRedoToolStripMenuItem.Name = "mRedoToolStripMenuItem"; - resources.ApplyResources(this.mRedoToolStripMenuItem, "mRedoToolStripMenuItem"); this.mRedoToolStripMenuItem.Click += new System.EventHandler(this.mRedoToolStripMenuItem_Click); // // toolStripSeparator1 @@ -325,38 +325,38 @@ // // mCutToolStripMenuItem // + resources.ApplyResources(this.mCutToolStripMenuItem, "mCutToolStripMenuItem"); this.mCutToolStripMenuItem.Name = "mCutToolStripMenuItem"; - resources.ApplyResources(this.mCutToolStripMenuItem, "mCutToolStripMenuItem"); this.mCutToolStripMenuItem.Click += new System.EventHandler(this.mCutToolStripMenuItem_Click); // // mCopyToolStripMenuItem // + resources.ApplyResources(this.mCopyToolStripMenuItem, "mCopyToolStripMenuItem"); this.mCopyToolStripMenuItem.Name = "mCopyToolStripMenuItem"; - resources.ApplyResources(this.mCopyToolStripMenuItem, "mCopyToolStripMenuItem"); this.mCopyToolStripMenuItem.Click += new System.EventHandler(this.mCopyToolStripMenuItem_Click); // // mPasteToolStripMenuItem // + resources.ApplyResources(this.mPasteToolStripMenuItem, "mPasteToolStripMenuItem"); this.mPasteToolStripMenuItem.Name = "mPasteToolStripMenuItem"; - resources.ApplyResources(this.mPasteToolStripMenuItem, "mPasteToolStripMenuItem"); this.mPasteToolStripMenuItem.Click += new System.EventHandler(this.mPasteToolStripMenuItem_Click); // // mPasteBeforeToolStripMenuItem // + resources.ApplyResources(this.mPasteBeforeToolStripMenuItem, "mPasteBeforeToolStripMenuItem"); this.mPasteBeforeToolStripMenuItem.Name = "mPasteBeforeToolStripMenuItem"; - resources.ApplyResources(this.mPasteBeforeToolStripMenuItem, "mPasteBeforeToolStripMenuItem"); this.mPasteBeforeToolStripMenuItem.Click += new System.EventHandler(this.mPasteBeforeToolStripMenuItem_Click); // // mPasteInsideToolStripMenuItem // + resources.ApplyResources(this.mPasteInsideToolStripMenuItem, "mPasteInsideToolStripMenuItem"); this.mPasteInsideToolStripMenuItem.Name = "mPasteInsideToolStripMenuItem"; - resources.ApplyResources(this.mPasteInsideToolStripMenuItem, "mPasteInsideToolStripMenuItem"); this.mPasteInsideToolStripMenuItem.Click += new System.EventHandler(this.mPasteInsideToolStripMenuItem_Click); // // mDeleteToolStripMenuItem // + resources.ApplyResources(this.mDeleteToolStripMenuItem, "mDeleteToolStripMenuItem"); this.mDeleteToolStripMenuItem.Name = "mDeleteToolStripMenuItem"; - resources.ApplyResources(this.mDeleteToolStripMenuItem, "mDeleteToolStripMenuItem"); this.mDeleteToolStripMenuItem.Click += new System.EventHandler(this.mDeleteToolStripMenuItem_Click); // // mSelectNothingToolStripMenuItem @@ -372,8 +372,8 @@ // // mDeleteUnusedDataToolStripMenuItem // + resources.ApplyResources(this.mDeleteUnusedDataToolStripMenuItem, "mDeleteUnusedDataToolStripMenuItem"); this.mDeleteUnusedDataToolStripMenuItem.Name = "mDeleteUnusedDataToolStripMenuItem"; - resources.ApplyResources(this.mDeleteUnusedDataToolStripMenuItem, "mDeleteUnusedDataToolStripMenuItem"); this.mDeleteUnusedDataToolStripMenuItem.Click += new System.EventHandler(this.mDeleteUnusedDataToolStripMenuItem_Click); // // toolStripSeparator4 @@ -383,20 +383,20 @@ // // mFindInTextToolStripMenuItem // + resources.ApplyResources(this.mFindInTextToolStripMenuItem, "mFindInTextToolStripMenuItem"); this.mFindInTextToolStripMenuItem.Name = "mFindInTextToolStripMenuItem"; - resources.ApplyResources(this.mFindInTextToolStripMenuItem, "mFindInTextToolStripMenuItem"); this.mFindInTextToolStripMenuItem.Click += new System.EventHandler(this.mFindInTextToolStripMenuItem_Click); // // mFindNextToolStripMenuItem // + resources.ApplyResources(this.mFindNextToolStripMenuItem, "mFindNextToolStripMenuItem"); this.mFindNextToolStripMenuItem.Name = "mFindNextToolStripMenuItem"; - resources.ApplyResources(this.mFindNextToolStripMenuItem, "mFindNextToolStripMenuItem"); this.mFindNextToolStripMenuItem.Click += new System.EventHandler(this.mFindNextToolStripMenuItem_Click); // // mFindPreviousToolStripMenuItem // + resources.ApplyResources(this.mFindPreviousToolStripMenuItem, "mFindPreviousToolStripMenuItem"); this.mFindPreviousToolStripMenuItem.Name = "mFindPreviousToolStripMenuItem"; - resources.ApplyResources(this.mFindPreviousToolStripMenuItem, "mFindPreviousToolStripMenuItem"); this.mFindPreviousToolStripMenuItem.Click += new System.EventHandler(this.mFindPreviousToolStripMenuItem_Click); // // mViewToolStripMenuItem @@ -422,38 +422,38 @@ // // mShowTOCViewToolStripMenuItem // + resources.ApplyResources(this.mShowTOCViewToolStripMenuItem, "mShowTOCViewToolStripMenuItem"); this.mShowTOCViewToolStripMenuItem.Checked = true; this.mShowTOCViewToolStripMenuItem.CheckOnClick = true; this.mShowTOCViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.mShowTOCViewToolStripMenuItem.Name = "mShowTOCViewToolStripMenuItem"; - resources.ApplyResources(this.mShowTOCViewToolStripMenuItem, "mShowTOCViewToolStripMenuItem"); this.mShowTOCViewToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowTOCViewToolStripMenuItem_CheckedChanged); // // mShowMetadataViewToolStripMenuItem // + resources.ApplyResources(this.mShowMetadataViewToolStripMenuItem, "mShowMetadataViewToolStripMenuItem"); this.mShowMetadataViewToolStripMenuItem.Checked = true; this.mShowMetadataViewToolStripMenuItem.CheckOnClick = true; this.mShowMetadataViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.mShowMetadataViewToolStripMenuItem.Name = "mShowMetadataViewToolStripMenuItem"; - resources.ApplyResources(this.mShowMetadataViewToolStripMenuItem, "mShowMetadataViewToolStripMenuItem"); this.mShowMetadataViewToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowMetadataViewToolStripMenuItem_CheckedChanged); // // mShowTransportBarToolStripMenuItem // + resources.ApplyResources(this.mShowTransportBarToolStripMenuItem, "mShowTransportBarToolStripMenuItem"); this.mShowTransportBarToolStripMenuItem.Checked = true; this.mShowTransportBarToolStripMenuItem.CheckOnClick = true; this.mShowTransportBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.mShowTransportBarToolStripMenuItem.Name = "mShowTransportBarToolStripMenuItem"; - resources.ApplyResources(this.mShowTransportBarToolStripMenuItem, "mShowTransportBarToolStripMenuItem"); this.mShowTransportBarToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowTransportBarToolStripMenuItem_CheckedChanged); // // mShowStatusBarToolStripMenuItem // + resources.ApplyResources(this.mShowStatusBarToolStripMenuItem, "mShowStatusBarToolStripMenuItem"); this.mShowStatusBarToolStripMenuItem.Checked = true; this.mShowStatusBarToolStripMenuItem.CheckOnClick = true; this.mShowStatusBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.mShowStatusBarToolStripMenuItem.Name = "mShowStatusBarToolStripMenuItem"; - resources.ApplyResources(this.mShowStatusBarToolStripMenuItem, "mShowStatusBarToolStripMenuItem"); this.mShowStatusBarToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowStatusBarToolStripMenuItem_CheckedChanged); // // toolStripSeparator12 @@ -463,29 +463,29 @@ // // mFocusOnTOCViewToolStripMenuItem // + resources.ApplyResources(this.mFocusOnTOCViewToolStripMenuItem, "mFocusOnTOCViewToolStripMenuItem"); this.mFocusOnTOCViewToolStripMenuItem.Name = "mFocusOnTOCViewToolStripMenuItem"; - resources.ApplyResources(this.mFocusOnTOCViewToolStripMenuItem, "mFocusOnTOCViewToolStripMenuItem"); this.mFocusOnTOCViewToolStripMenuItem.Click += new System.EventHandler(this.mFocusOnTOCViewToolStripMenuItem_Click); // // mFocusOnStripsViewToolStripMenuItem // + resources.ApplyResources(this.mFocusOnStripsViewToolStripMenuItem, "mFocusOnStripsViewToolStripMenuItem"); this.mFocusOnStripsViewToolStripMenuItem.Name = "mFocusOnStripsViewToolStripMenuItem"; - resources.ApplyResources(this.mFocusOnStripsViewToolStripMenuItem, "mFocusOnStripsViewToolStripMenuItem"); this.mFocusOnStripsViewToolStripMenuItem.Click += new System.EventHandler(this.mFocusOnStripsViewToolStripMenuItem_Click); // // mFocusOnTransportBarToolStripMenuItem // + resources.ApplyResources(this.mFocusOnTransportBarToolStripMenuItem, "mFocusOnTransportBarToolStripMenuItem"); this.mFocusOnTransportBarToolStripMenuItem.Name = "mFocusOnTransportBarToolStripMenuItem"; - resources.ApplyResources(this.mFocusOnTransportBarToolStripMenuItem, "mFocusOnTransportBarToolStripMenuItem"); this.mFocusOnTransportBarToolStripMenuItem.Click += new System.EventHandler(this.mFocusOnTransportBarToolStripMenuItem_Click); // // mSynchronizeViewsToolStripMenuItem // + resources.ApplyResources(this.mSynchronizeViewsToolStripMenuItem, "mSynchronizeViewsToolStripMenuItem"); this.mSynchronizeViewsToolStripMenuItem.Checked = true; this.mSynchronizeViewsToolStripMenuItem.CheckOnClick = true; this.mSynchronizeViewsToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.mSynchronizeViewsToolStripMenuItem.Name = "mSynchronizeViewsToolStripMenuItem"; - resources.ApplyResources(this.mSynchronizeViewsToolStripMenuItem, "mSynchronizeViewsToolStripMenuItem"); this.mSynchronizeViewsToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mSynchronizeViewsToolStripMenuItem_CheckedChanged); // // toolStripSeparator8 @@ -495,18 +495,18 @@ // // mShowOnlySelectedSectionToolStripMenuItem // + resources.ApplyResources(this.mShowOnlySelectedSectionToolStripMenuItem, "mShowOnlySelectedSectionToolStripMenuItem"); this.mShowOnlySelectedSectionToolStripMenuItem.CheckOnClick = true; this.mShowOnlySelectedSectionToolStripMenuItem.Name = "mShowOnlySelectedSectionToolStripMenuItem"; - resources.ApplyResources(this.mShowOnlySelectedSectionToolStripMenuItem, "mShowOnlySelectedSectionToolStripMenuItem"); this.mShowOnlySelectedSectionToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mShowOnlySelectedSectionToolStripMenuItem_CheckedChanged); // // mWrappingInContentViewToolStripMenuItem // + resources.ApplyResources(this.mWrappingInContentViewToolStripMenuItem, "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 @@ -516,14 +516,14 @@ // // mShowPeakMeterMenuItem // + resources.ApplyResources(this.mShowPeakMeterMenuItem, "mShowPeakMeterMenuItem"); this.mShowPeakMeterMenuItem.Name = "mShowPeakMeterMenuItem"; - resources.ApplyResources(this.mShowPeakMeterMenuItem, "mShowPeakMeterMenuItem"); this.mShowPeakMeterMenuItem.Click += new System.EventHandler(this.mShowPeakMeterMenuItem_Click); // // mShowSourceToolStripMenuItem // + resources.ApplyResources(this.mShowSourceToolStripMenuItem, "mShowSourceToolStripMenuItem"); this.mShowSourceToolStripMenuItem.Name = "mShowSourceToolStripMenuItem"; - resources.ApplyResources(this.mShowSourceToolStripMenuItem, "mShowSourceToolStripMenuItem"); this.mShowSourceToolStripMenuItem.Click += new System.EventHandler(this.mShowSourceToolStripMenuItem_Click); // // mSectionsToolStripMenuItem @@ -545,26 +545,26 @@ // // mAddSectionToolStripMenuItem // + resources.ApplyResources(this.mAddSectionToolStripMenuItem, "mAddSectionToolStripMenuItem"); this.mAddSectionToolStripMenuItem.Name = "mAddSectionToolStripMenuItem"; - resources.ApplyResources(this.mAddSectionToolStripMenuItem, "mAddSectionToolStripMenuItem"); this.mAddSectionToolStripMenuItem.Click += new System.EventHandler(this.mAddSectionToolStripMenuItem_Click); // // mAddSubsectionToolStripMenuItem // + resources.ApplyResources(this.mAddSubsectionToolStripMenuItem, "mAddSubsectionToolStripMenuItem"); this.mAddSubsectionToolStripMenuItem.Name = "mAddSubsectionToolStripMenuItem"; - resources.ApplyResources(this.mAddSubsectionToolStripMenuItem, "mAddSubsectionToolStripMenuItem"); this.mAddSubsectionToolStripMenuItem.Click += new System.EventHandler(this.mAddSubsectionToolStripMenuItem_Click); // // mInsertSectionToolStripMenuItem // + resources.ApplyResources(this.mInsertSectionToolStripMenuItem, "mInsertSectionToolStripMenuItem"); this.mInsertSectionToolStripMenuItem.Name = "mInsertSectionToolStripMenuItem"; - resources.ApplyResources(this.mInsertSectionToolStripMenuItem, "mInsertSectionToolStripMenuItem"); this.mInsertSectionToolStripMenuItem.Click += new System.EventHandler(this.mInsertSectionToolStripMenuItem_Click); // // mRenameSectionToolStripMenuItem // + resources.ApplyResources(this.mRenameSectionToolStripMenuItem, "mRenameSectionToolStripMenuItem"); this.mRenameSectionToolStripMenuItem.Name = "mRenameSectionToolStripMenuItem"; - resources.ApplyResources(this.mRenameSectionToolStripMenuItem, "mRenameSectionToolStripMenuItem"); this.mRenameSectionToolStripMenuItem.Click += new System.EventHandler(this.mRenameSectionToolStripMenuItem_Click); // // toolStripSeparator11 @@ -574,26 +574,26 @@ // // mDecreaseSectionLevelToolStripMenuItem // + resources.ApplyResources(this.mDecreaseSectionLevelToolStripMenuItem, "mDecreaseSectionLevelToolStripMenuItem"); this.mDecreaseSectionLevelToolStripMenuItem.Name = "mDecreaseSectionLevelToolStripMenuItem"; - resources.ApplyResources(this.mDecreaseSectionLevelToolStripMenuItem, "mDecreaseSectionLevelToolStripMenuItem"); this.mDecreaseSectionLevelToolStripMenuItem.Click += new System.EventHandler(this.mDecreaseSectionLevelToolStripMenuItem_Click); // // mIncreaseSectionLevelToolStripMenuItem // + resources.ApplyResources(this.mIncreaseSectionLevelToolStripMenuItem, "mIncreaseSectionLevelToolStripMenuItem"); this.mIncreaseSectionLevelToolStripMenuItem.Name = "mIncreaseSectionLevelToolStripMenuItem"; - resources.ApplyResources(this.mIncreaseSectionLevelToolStripMenuItem, "mIncreaseSectionLevelToolStripMenuItem"); this.mIncreaseSectionLevelToolStripMenuItem.Click += new System.EventHandler(this.mIncreaseSectionLevelToolStripMenuItem_Click); // // mSplitSectionToolStripMenuItem // + resources.ApplyResources(this.mSplitSectionToolStripMenuItem, "mSplitSectionToolStripMenuItem"); this.mSplitSectionToolStripMenuItem.Name = "mSplitSectionToolStripMenuItem"; - resources.ApplyResources(this.mSplitSectionToolStripMenuItem, "mSplitSectionToolStripMenuItem"); this.mSplitSectionToolStripMenuItem.Click += new System.EventHandler(this.mSplitSectionToolStripMenuItem_Click); // // mMergeSectionWithNextToolStripMenuItem // + resources.ApplyResources(this.mMergeSectionWithNextToolStripMenuItem, "mMergeSectionWithNextToolStripMenuItem"); this.mMergeSectionWithNextToolStripMenuItem.Name = "mMergeSectionWithNextToolStripMenuItem"; - resources.ApplyResources(this.mMergeSectionWithNextToolStripMenuItem, "mMergeSectionWithNextToolStripMenuItem"); this.mMergeSectionWithNextToolStripMenuItem.Click += new System.EventHandler(this.mMergeSectionWithNextToolStripMenuItem_Click); // // toolStripSeparator13 @@ -603,11 +603,11 @@ // // mSectionIsUsedToolStripMenuItem // + resources.ApplyResources(this.mSectionIsUsedToolStripMenuItem, "mSectionIsUsedToolStripMenuItem"); this.mSectionIsUsedToolStripMenuItem.Checked = true; this.mSectionIsUsedToolStripMenuItem.CheckOnClick = true; this.mSectionIsUsedToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.mSectionIsUsedToolStripMenuItem.Name = "mSectionIsUsedToolStripMenuItem"; - resources.ApplyResources(this.mSectionIsUsedToolStripMenuItem, "mSectionIsUsedToolStripMenuItem"); this.mSectionIsUsedToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mSectionIsUsedToolStripMenuItem_CheckedChanged); // // mPhrasesToolStripMenuItem @@ -623,50 +623,50 @@ this.mAssignRoleToolStripMenuItem, this.mEditRolesToolStripMenuItem, this.mClearRoleToolStripMenuItem, - this.PhraseDetectionToolStripMenuItem, + this.mPhraseDetectionToolStripMenuItem, this.mMarkDefaultCustomClassToolStripMenuItem, - this.InPhraseSelectionToolStripMenuItem, + this.mInPhraseSelectionToolStripMenuItem, this.mGoToToolStripMenuItem}); this.mPhrasesToolStripMenuItem.Name = "mPhrasesToolStripMenuItem"; resources.ApplyResources(this.mPhrasesToolStripMenuItem, "mPhrasesToolStripMenuItem"); // // mAddBlankPhraseToolStripMenuItem // + resources.ApplyResources(this.mAddBlankPhraseToolStripMenuItem, "mAddBlankPhraseToolStripMenuItem"); this.mAddBlankPhraseToolStripMenuItem.Name = "mAddBlankPhraseToolStripMenuItem"; - resources.ApplyResources(this.mAddBlankPhraseToolStripMenuItem, "mAddBlankPhraseToolStripMenuItem"); this.mAddBlankPhraseToolStripMenuItem.Click += new System.EventHandler(this.mAddBlankPhraseToolStripMenuItem_Click); // // mAddEmptyPagesToolStripMenuItem // + resources.ApplyResources(this.mAddEmptyPagesToolStripMenuItem, "mAddEmptyPagesToolStripMenuItem"); this.mAddEmptyPagesToolStripMenuItem.Name = "mAddEmptyPagesToolStripMenuItem"; - resources.ApplyResources(this.mAddEmptyPagesToolStripMenuItem, "mAddEmptyPagesToolStripMenuItem"); this.mAddEmptyPagesToolStripMenuItem.Click += new System.EventHandler(this.mAddEmptyPagesToolStripMenuItem_Click); // // mImportAudioFileToolStripMenuItem // + resources.ApplyResources(this.mImportAudioFileToolStripMenuItem, "mImportAudioFileToolStripMenuItem"); this.mImportAudioFileToolStripMenuItem.Name = "mImportAudioFileToolStripMenuItem"; - resources.ApplyResources(this.mImportAudioFileToolStripMenuItem, "mImportAudioFileToolStripMenuItem"); this.mImportAudioFileToolStripMenuItem.Click += new System.EventHandler(this.mImportAudioFileToolStripMenuItem_Click); // // mSplitPhraseToolStripMenuItem // + resources.ApplyResources(this.mSplitPhraseToolStripMenuItem, "mSplitPhraseToolStripMenuItem"); this.mSplitPhraseToolStripMenuItem.Name = "mSplitPhraseToolStripMenuItem"; - resources.ApplyResources(this.mSplitPhraseToolStripMenuItem, "mSplitPhraseToolStripMenuItem"); this.mSplitPhraseToolStripMenuItem.Click += new System.EventHandler(this.mSplitPhraseToolStripMenuItem_Click); // // mMergePhraseWithNextToolStripMenuItem // + resources.ApplyResources(this.mMergePhraseWithNextToolStripMenuItem, "mMergePhraseWithNextToolStripMenuItem"); this.mMergePhraseWithNextToolStripMenuItem.Name = "mMergePhraseWithNextToolStripMenuItem"; - resources.ApplyResources(this.mMergePhraseWithNextToolStripMenuItem, "mMergePhraseWithNextToolStripMenuItem"); this.mMergePhraseWithNextToolStripMenuItem.Click += new System.EventHandler(this.mMergePhraseWithNextToolStripMenuItem_Click); // // mPhraseIsUsedToolStripMenuItem // + resources.ApplyResources(this.mPhraseIsUsedToolStripMenuItem, "mPhraseIsUsedToolStripMenuItem"); this.mPhraseIsUsedToolStripMenuItem.Checked = true; this.mPhraseIsUsedToolStripMenuItem.CheckOnClick = true; this.mPhraseIsUsedToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.mPhraseIsUsedToolStripMenuItem.Name = "mPhraseIsUsedToolStripMenuItem"; - resources.ApplyResources(this.mPhraseIsUsedToolStripMenuItem, "mPhraseIsUsedToolStripMenuItem"); this.mPhraseIsUsedToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mPhraseIsUsedToolStripMenuItem_CheckedChanged); // // toolStripSeparator6 @@ -734,44 +734,44 @@ resources.ApplyResources(this.mClearRoleToolStripMenuItem, "mClearRoleToolStripMenuItem"); this.mClearRoleToolStripMenuItem.Click += new System.EventHandler(this.mClearRoleToolStripMenuItem_Click); // - // PhraseDetectionToolStripMenuItem + // mPhraseDetectionToolStripMenuItem // - this.PhraseDetectionToolStripMenuItem.Name = "PhraseDetectionToolStripMenuItem"; - resources.ApplyResources(this.PhraseDetectionToolStripMenuItem, "PhraseDetectionToolStripMenuItem"); - this.PhraseDetectionToolStripMenuItem.Click += new System.EventHandler(this.PhraseDetectionToolStripMenuItem_Click); + resources.ApplyResources(this.mPhraseDetectionToolStripMenuItem, "mPhraseDetectionToolStripMenuItem"); + this.mPhraseDetectionToolStripMenuItem.Name = "mPhraseDetectionToolStripMenuItem"; + this.mPhraseDetectionToolStripMenuItem.Click += new System.EventHandler(this.PhraseDetectionToolStripMenuItem_Click); // // mMarkDefaultCustomClassToolStripMenuItem // + resources.ApplyResources(this.mMarkDefaultCustomClassToolStripMenuItem, "mMarkDefaultCustomClassToolStripMenuItem"); this.mMarkDefaultCustomClassToolStripMenuItem.Name = "mMarkDefaultCustomClassToolStripMenuItem"; - resources.ApplyResources(this.mMarkDefaultCustomClassToolStripMenuItem, "mMarkDefaultCustomClassToolStripMenuItem"); this.mMarkDefaultCustomClassToolStripMenuItem.Click += new System.EventHandler(this.mMarkDefaultCustomClassToolStripMenuItem_Click); // - // InPhraseSelectionToolStripMenuItem + // mInPhraseSelectionToolStripMenuItem // - this.InPhraseSelectionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.BeginInPhraseSelectionToolStripMenuItem, - this.EndInPhraseSelectionToolStripMenuItem, - this.DeselectInPhraseSelectionToolStripMenuItem}); - this.InPhraseSelectionToolStripMenuItem.Name = "InPhraseSelectionToolStripMenuItem"; - resources.ApplyResources(this.InPhraseSelectionToolStripMenuItem, "InPhraseSelectionToolStripMenuItem"); + this.mInPhraseSelectionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mBeginInPhraseSelectionToolStripMenuItem, + this.mEndInPhraseSelectionToolStripMenuItem, + this.mDeselectInPhraseSelectionToolStripMenuItem}); + this.mInPhraseSelectionToolStripMenuItem.Name = "mInPhraseSelectionToolStripMenuItem"; + resources.ApplyResources(this.mInPhraseSelectionToolStripMenuItem, "mInPhraseSelectionToolStripMenuItem"); // - // BeginInPhraseSelectionToolStripMenuItem + // mBeginInPhraseSelectionToolStripMenuItem // - this.BeginInPhraseSelectionToolStripMenuItem.Name = "BeginInPhraseSelectionToolStripMenuItem"; - resources.ApplyResources(this.BeginInPhraseSelectionToolStripMenuItem, "BeginInPhraseSelectionToolStripMenuItem"); - this.BeginInPhraseSelectionToolStripMenuItem.Click += new System.EventHandler(this.BeginInPhraseSelectionToolStripMenuItem_Click); + resources.ApplyResources(this.mBeginInPhraseSelectionToolStripMenuItem, "mBeginInPhraseSelectionToolStripMenuItem"); + this.mBeginInPhraseSelectionToolStripMenuItem.Name = "mBeginInPhraseSelectionToolStripMenuItem"; + this.mBeginInPhraseSelectionToolStripMenuItem.Click += new System.EventHandler(this.BeginInPhraseSelectionToolStripMenuItem_Click); // - // EndInPhraseSelectionToolStripMenuItem + // mEndInPhraseSelectionToolStripMenuItem // - this.EndInPhraseSelectionToolStripMenuItem.Name = "EndInPhraseSelectionToolStripMenuItem"; - resources.ApplyResources(this.EndInPhraseSelectionToolStripMenuItem, "EndInPhraseSelectionToolStripMenuItem"); - this.EndInPhraseSelectionToolStripMenuItem.Click += new System.EventHandler(this.EndInPhraseSelectionToolStripMenuItem_Click); + resources.ApplyResources(this.mEndInPhraseSelectionToolStripMenuItem, "mEndInPhraseSelectionToolStripMenuItem"); + this.mEndInPhraseSelectionToolStripMenuItem.Name = "mEndInPhraseSelectionToolStripMenuItem"; + this.mEndInPhraseSelectionToolStripMenuItem.Click += new System.EventHandler(this.EndInPhraseSelectionToolStripMenuItem_Click); // - // DeselectInPhraseSelectionToolStripMenuItem + // mDeselectInPhraseSelectionToolStripMenuItem // - this.DeselectInPhraseSelectionToolStripMenuItem.Name = "DeselectInPhraseSelectionToolStripMenuItem"; - resources.ApplyResources(this.DeselectInPhraseSelectionToolStripMenuItem, "DeselectInPhraseSelectionToolStripMenuItem"); - this.DeselectInPhraseSelectionToolStripMenuItem.Click += new System.EventHandler(this.DeselectInPhraseSelectionToolStripMenuItem_Click); + this.mDeselectInPhraseSelectionToolStripMenuItem.Name = "mDeselectInPhraseSelectionToolStripMenuItem"; + resources.ApplyResources(this.mDeselectInPhraseSelectionToolStripMenuItem, "mDeselectInPhraseSelectionToolStripMenuItem"); + this.mDeselectInPhraseSelectionToolStripMenuItem.Click += new System.EventHandler(this.DeselectInPhraseSelectionToolStripMenuItem_Click); // // mGoToToolStripMenuItem // @@ -783,14 +783,14 @@ // // mNextTODOPhraseToolStripMenuItem // + resources.ApplyResources(this.mNextTODOPhraseToolStripMenuItem, "mNextTODOPhraseToolStripMenuItem"); this.mNextTODOPhraseToolStripMenuItem.Name = "mNextTODOPhraseToolStripMenuItem"; - resources.ApplyResources(this.mNextTODOPhraseToolStripMenuItem, "mNextTODOPhraseToolStripMenuItem"); this.mNextTODOPhraseToolStripMenuItem.Click += new System.EventHandler(this.mNextTODOPhraseToolStripMenuItem_Click); // // mPreviousTODOPhraseToolStripMenuItem // + resources.ApplyResources(this.mPreviousTODOPhraseToolStripMenuItem, "mPreviousTODOPhraseToolStripMenuItem"); this.mPreviousTODOPhraseToolStripMenuItem.Name = "mPreviousTODOPhraseToolStripMenuItem"; - resources.ApplyResources(this.mPreviousTODOPhraseToolStripMenuItem, "mPreviousTODOPhraseToolStripMenuItem"); this.mPreviousTODOPhraseToolStripMenuItem.Click += new System.EventHandler(this.mPreviousTODOPhraseToolStripMenuItem_Click); // // transportToolStripMenuItem @@ -805,8 +805,8 @@ this.mRecordToolStripMenuItem, this.toolStripSeparator5, this.navigationToolStripMenuItem, - this.rewindToolStripMenuItem, - this.fastForwardToolStripMenuItem}); + this.mRewindToolStripMenuItem, + this.mFastForwardToolStripMenuItem}); this.transportToolStripMenuItem.Name = "transportToolStripMenuItem"; resources.ApplyResources(this.transportToolStripMenuItem, "transportToolStripMenuItem"); // @@ -820,32 +820,32 @@ // // mPlayAllToolStripMenuItem // + resources.ApplyResources(this.mPlayAllToolStripMenuItem, "mPlayAllToolStripMenuItem"); this.mPlayAllToolStripMenuItem.Name = "mPlayAllToolStripMenuItem"; - resources.ApplyResources(this.mPlayAllToolStripMenuItem, "mPlayAllToolStripMenuItem"); this.mPlayAllToolStripMenuItem.Click += new System.EventHandler(this.mPlayAllToolStripMenuItem_Click); // // mPlaySelectionToolStripMenuItem // + resources.ApplyResources(this.mPlaySelectionToolStripMenuItem, "mPlaySelectionToolStripMenuItem"); this.mPlaySelectionToolStripMenuItem.Name = "mPlaySelectionToolStripMenuItem"; - resources.ApplyResources(this.mPlaySelectionToolStripMenuItem, "mPlaySelectionToolStripMenuItem"); this.mPlaySelectionToolStripMenuItem.Click += new System.EventHandler(this.mPlaySelectionToolStripMenuItem_Click); // // mPauseToolStripMenuItem // + resources.ApplyResources(this.mPauseToolStripMenuItem, "mPauseToolStripMenuItem"); this.mPauseToolStripMenuItem.Name = "mPauseToolStripMenuItem"; - resources.ApplyResources(this.mPauseToolStripMenuItem, "mPauseToolStripMenuItem"); this.mPauseToolStripMenuItem.Click += new System.EventHandler(this.mPauseToolStripMenuItem_Click); // // mResumeToolStripMenuItem // + resources.ApplyResources(this.mResumeToolStripMenuItem, "mResumeToolStripMenuItem"); this.mResumeToolStripMenuItem.Name = "mResumeToolStripMenuItem"; - resources.ApplyResources(this.mResumeToolStripMenuItem, "mResumeToolStripMenuItem"); this.mResumeToolStripMenuItem.Click += new System.EventHandler(this.mResumeToolStripMenuItem_Click); // // mStopToolStripMenuItem // + resources.ApplyResources(this.mStopToolStripMenuItem, "mStopToolStripMenuItem"); this.mStopToolStripMenuItem.Name = "mStopToolStripMenuItem"; - resources.ApplyResources(this.mStopToolStripMenuItem, "mStopToolStripMenuItem"); this.mStopToolStripMenuItem.Click += new System.EventHandler(this.mStopToolStripMenuItem_Click); // // FastPlaytoolStripMenuItem @@ -853,49 +853,49 @@ this.FastPlaytoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NormalSpeedtoolStripMenuItem, this.SpeedUptoolStripMenuItem, - this.SpeedDowntoolStripMenuItem, - this.ElapseBacktoolStripMenuItem}); + this.mSpeedDowntoolStripMenuItem, + this.mElapseBacktoolStripMenuItem}); this.FastPlaytoolStripMenuItem.Name = "FastPlaytoolStripMenuItem"; resources.ApplyResources(this.FastPlaytoolStripMenuItem, "FastPlaytoolStripMenuItem"); // // NormalSpeedtoolStripMenuItem // + resources.ApplyResources(this.NormalSpeedtoolStripMenuItem, "NormalSpeedtoolStripMenuItem"); this.NormalSpeedtoolStripMenuItem.Name = "NormalSpeedtoolStripMenuItem"; - resources.ApplyResources(this.NormalSpeedtoolStripMenuItem, "NormalSpeedtoolStripMenuItem"); this.NormalSpeedtoolStripMenuItem.Click += new System.EventHandler(this.NormalSpeedtoolStripMenuItem_Click); // // SpeedUptoolStripMenuItem // + resources.ApplyResources(this.SpeedUptoolStripMenuItem, "SpeedUptoolStripMenuItem"); this.SpeedUptoolStripMenuItem.Name = "SpeedUptoolStripMenuItem"; - resources.ApplyResources(this.SpeedUptoolStripMenuItem, "SpeedUptoolStripMenuItem"); this.SpeedUptoolStripMenuItem.Click += new System.EventHandler(this.SpeedUptoolStripMenuItem_Click); // - // SpeedDowntoolStripMenuItem + // mSpeedDowntoolStripMenuItem // - this.SpeedDowntoolStripMenuItem.Name = "SpeedDowntoolStripMenuItem"; - resources.ApplyResources(this.SpeedDowntoolStripMenuItem, "SpeedDowntoolStripMenuItem"); - this.SpeedDowntoolStripMenuItem.Click += new System.EventHandler(this.SpeedDowntoolStripMenuItem_Click); + resources.ApplyResources(this.mSpeedDowntoolStripMenuItem, "mSpeedDowntoolStripMenuItem"); + this.mSpeedDowntoolStripMenuItem.Name = "mSpeedDowntoolStripMenuItem"; + this.mSpeedDowntoolStripMenuItem.Click += new System.EventHandler(this.SpeedDowntoolStripMenuItem_Click); // - // ElapseBacktoolStripMenuItem + // mElapseBacktoolStripMenuItem // - this.ElapseBacktoolStripMenuItem.Name = "ElapseBacktoolStripMenuItem"; - resources.ApplyResources(this.ElapseBacktoolStripMenuItem, "ElapseBacktoolStripMenuItem"); - this.ElapseBacktoolStripMenuItem.Click += new System.EventHandler(this.ElapseBacktoolStripMenuItem_Click); + this.mElapseBacktoolStripMenuItem.Name = "mElapseBacktoolStripMenuItem"; + resources.ApplyResources(this.mElapseBacktoolStripMenuItem, "mElapseBacktoolStripMenuItem"); + this.mElapseBacktoolStripMenuItem.Click += new System.EventHandler(this.ElapseBacktoolStripMenuItem_Click); // // PlayPreviewtoolStripMenuItem // this.PlayPreviewtoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PreviewFromtoolStripMenuItem, + this.mPreviewFromtoolStripMenuItem, this.PreviewUptotoolStripMenuItem, this.PreviewSelectedAudiotoolStripMenuItem}); this.PlayPreviewtoolStripMenuItem.Name = "PlayPreviewtoolStripMenuItem"; resources.ApplyResources(this.PlayPreviewtoolStripMenuItem, "PlayPreviewtoolStripMenuItem"); // - // PreviewFromtoolStripMenuItem + // mPreviewFromtoolStripMenuItem // - this.PreviewFromtoolStripMenuItem.Name = "PreviewFromtoolStripMenuItem"; - resources.ApplyResources(this.PreviewFromtoolStripMenuItem, "PreviewFromtoolStripMenuItem"); - this.PreviewFromtoolStripMenuItem.Click += new System.EventHandler(this.PreviewFromtoolStripMenuItem_Click); + resources.ApplyResources(this.mPreviewFromtoolStripMenuItem, "mPreviewFromtoolStripMenuItem"); + this.mPreviewFromtoolStripMenuItem.Name = "mPreviewFromtoolStripMenuItem"; + this.mPreviewFromtoolStripMenuItem.Click += new System.EventHandler(this.PreviewFromtoolStripMenuItem_Click); // // PreviewUptotoolStripMenuItem // @@ -947,52 +947,52 @@ // navigationToolStripMenuItem // this.navigationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.previousSectionToolStripMenuItem, - this.previousPageToolStripMenuItem, - this.previousPhraseToolStripMenuItem, - this.nextPhraseToolStripMenuItem, + this.mPreviousSectionToolStripMenuItem, + this.mPreviousPageToolStripMenuItem, + this.mPreviousPhraseToolStripMenuItem, + this.mNextPhraseToolStripMenuItem, this.nextPageToolStripMenuItem, - this.nextSectionToolStripMenuItem, + this.mNextSectionToolStripMenuItem, this.toolStripSeparator14, this.mPlayOnNavigateToolStripMenuItem}); this.navigationToolStripMenuItem.Name = "navigationToolStripMenuItem"; resources.ApplyResources(this.navigationToolStripMenuItem, "navigationToolStripMenuItem"); // - // previousSectionToolStripMenuItem + // mPreviousSectionToolStripMenuItem // - this.previousSectionToolStripMenuItem.Name = "previousSectionToolStripMenuItem"; - resources.ApplyResources(this.previousSectionToolStripMenuItem, "previousSectionToolStripMenuItem"); - this.previousSectionToolStripMenuItem.Click += new System.EventHandler(this.previousSectionToolStripMenuItem_Click); + resources.ApplyResources(this.mPreviousSectionToolStripMenuItem, "mPreviousSectionToolStripMenuItem"); + this.mPreviousSectionToolStripMenuItem.Name = "mPreviousSectionToolStripMenuItem"; + this.mPreviousSectionToolStripMenuItem.Click += new System.EventHandler(this.previousSectionToolStripMenuItem_Click); // - // previousPageToolStripMenuItem + // mPreviousPageToolStripMenuItem // - this.previousPageToolStripMenuItem.Name = "previousPageToolStripMenuItem"; - resources.ApplyResources(this.previousPageToolStripMenuItem, "previousPageToolStripMenuItem"); - this.previousPageToolStripMenuItem.Click += new System.EventHandler(this.previousPageToolStripMenuItem_Click); + resources.ApplyResources(this.mPreviousPageToolStripMenuItem, "mPreviousPageToolStripMenuItem"); + this.mPreviousPageToolStripMenuItem.Name = "mPreviousPageToolStripMenuItem"; + this.mPreviousPageToolStripMenuItem.Click += new System.EventHandler(this.previousPageToolStripMenuItem_Click); // - // previousPhraseToolStripMenuItem + // mPreviousPhraseToolStripMenuItem // - this.previousPhraseToolStripMenuItem.Name = "previousPhraseToolStripMenuItem"; - resources.ApplyResources(this.previousPhraseToolStripMenuItem, "previousPhraseToolStripMenuItem"); - this.previousPhraseToolStripMenuItem.Click += new System.EventHandler(this.previousPhraseToolStripMenuItem_Click); + resources.ApplyResources(this.mPreviousPhraseToolStripMenuItem, "mPreviousPhraseToolStripMenuItem"); + this.mPreviousPhraseToolStripMenuItem.Name = "mPreviousPhraseToolStripMenuItem"; + this.mPreviousPhraseToolStripMenuItem.Click += new System.EventHandler(this.previousPhraseToolStripMenuItem_Click); // - // nextPhraseToolStripMenuItem + // mNextPhraseToolStripMenuItem // - this.nextPhraseToolStripMenuItem.Name = "nextPhraseToolStripMenuItem"; - resources.ApplyResources(this.nextPhraseToolStripMenuItem, "nextPhraseToolStripMenuItem"); - this.nextPhraseToolStripMenuItem.Click += new System.EventHandler(this.nextPhraseToolStripMenuItem_Click); + resources.ApplyResources(this.mNextPhraseToolStripMenuItem, "mNextPhraseToolStripMenuItem"); + this.mNextPhraseToolStripMenuItem.Name = "mNextPhraseToolStripMenuItem"; + this.mNextPhraseToolStripMenuItem.Click += new System.EventHandler(this.nextPhraseToolStripMenuItem_Click); // // nextPageToolStripMenuItem // + resources.ApplyResources(this.nextPageToolStripMenuItem, "nextPageToolStripMenuItem"); this.nextPageToolStripMenuItem.Name = "nextPageToolStripMenuItem"; - resources.ApplyResources(this.nextPageToolStripMenuItem, "nextPageToolStripMenuItem"); this.nextPageToolStripMenuItem.Click += new System.EventHandler(this.nextPageToolStripMenuItem_Click); // - // nextSectionToolStripMenuItem + // mNextSectionToolStripMenuItem // - this.nextSectionToolStripMenuItem.Name = "nextSectionToolStripMenuItem"; - resources.ApplyResources(this.nextSectionToolStripMenuItem, "nextSectionToolStripMenuItem"); - this.nextSectionToolStripMenuItem.Click += new System.EventHandler(this.nextSectionToolStripMenuItem_Click); + resources.ApplyResources(this.mNextSectionToolStripMenuItem, "mNextSectionToolStripMenuItem"); + this.mNextSectionToolStripMenuItem.Name = "mNextSectionToolStripMenuItem"; + this.mNextSectionToolStripMenuItem.Click += new System.EventHandler(this.nextSectionToolStripMenuItem_Click); // // toolStripSeparator14 // @@ -1008,24 +1008,24 @@ resources.ApplyResources(this.mPlayOnNavigateToolStripMenuItem, "mPlayOnNavigateToolStripMenuItem"); this.mPlayOnNavigateToolStripMenuItem.CheckedChanged += new System.EventHandler(this.mPlayOnNavigateToolStripMenuItem_CheckedChanged); // - // rewindToolStripMenuItem + // mRewindToolStripMenuItem // - this.rewindToolStripMenuItem.Name = "rewindToolStripMenuItem"; - resources.ApplyResources(this.rewindToolStripMenuItem, "rewindToolStripMenuItem"); - this.rewindToolStripMenuItem.Click += new System.EventHandler(this.rewindToolStripMenuItem_Click); + resources.ApplyResources(this.mRewindToolStripMenuItem, "mRewindToolStripMenuItem"); + this.mRewindToolStripMenuItem.Name = "mRewindToolStripMenuItem"; + this.mRewindToolStripMenuItem.Click += new System.EventHandler(this.rewindToolStripMenuItem_Click); // - // fastForwardToolStripMenuItem + // mFastForwardToolStripMenuItem // - this.fastForwardToolStripMenuItem.Name = "fastForwardToolStripMenuItem"; - resources.ApplyResources(this.fastForwardToolStripMenuItem, "fastForwardToolStripMenuItem"); - this.fastForwardToolStripMenuItem.Click += new System.EventHandler(this.fastForwardToolStripMenuItem_Click); + resources.ApplyResources(this.mFastForwardToolStripMenuItem, "mFastForwardToolStripMenuItem"); + this.mFastForwardToolStripMenuItem.Name = "mFastForwardToolStripMenuItem"; + this.mFastForwardToolStripMenuItem.Click += new System.EventHandler(this.fastForwardToolStripMenuItem_Click); // // mToolsToolStripMenuItem // + resources.ApplyResources(this.mToolsToolStripMenuItem, "mToolsToolStripMenuItem"); this.mToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.preferencesToolStripMenuItem1}); this.mToolsToolStripMenuItem.Name = "mToolsToolStripMenuItem"; - resources.ApplyResources(this.mToolsToolStripMenuItem, "mToolsToolStripMenuItem"); // // preferencesToolStripMenuItem1 // @@ -1036,29 +1036,29 @@ // mHelpToolStripMenuItem // this.mHelpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mHelpToolStripMenuItem1, + this.mContentsToolStripMenuItem, this.mViewHelpInExternalBrowserToolStripMenuItem, this.mReportBugToolStripMenuItem, this.aboutObiToolStripMenuItem}); this.mHelpToolStripMenuItem.Name = "mHelpToolStripMenuItem"; resources.ApplyResources(this.mHelpToolStripMenuItem, "mHelpToolStripMenuItem"); // - // mHelpToolStripMenuItem1 + // mContentsToolStripMenuItem // - this.mHelpToolStripMenuItem1.Name = "mHelpToolStripMenuItem1"; - resources.ApplyResources(this.mHelpToolStripMenuItem1, "mHelpToolStripMenuItem1"); - this.mHelpToolStripMenuItem1.Click += new System.EventHandler(this.mHelpToolStripMenuItem1_Click); + resources.ApplyResources(this.mContentsToolStripMenuItem, "mContentsToolStripMenuItem"); + this.mContentsToolStripMenuItem.Name = "mContentsToolStripMenuItem"; + this.mContentsToolStripMenuItem.Click += new System.EventHandler(this.mContentsToolStripMenuItem_Click); // // mViewHelpInExternalBrowserToolStripMenuItem // + resources.ApplyResources(this.mViewHelpInExternalBrowserToolStripMenuItem, "mViewHelpInExternalBrowserToolStripMenuItem"); this.mViewHelpInExternalBrowserToolStripMenuItem.Name = "mViewHelpInExternalBrowserToolStripMenuItem"; - resources.ApplyResources(this.mViewHelpInExternalBrowserToolSt... [truncated message content] |
From: <ju...@us...> - 2008-05-15 12:02:45
|
Revision: 3064 http://urakawa.svn.sourceforge.net/urakawa/?rev=3064&view=rev Author: julienq Date: 2008-05-15 05:02:41 -0700 (Thu, 15 May 2008) Log Message: ----------- Working on playback/navigation. Fixed crash on cut/delete during playback. Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 10:56:17 UTC (rev 3063) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 12:02:41 UTC (rev 3064) @@ -277,6 +277,7 @@ /// </summary> public void Cut() { + if (CanDelete && mTransportBar.IsPlayerActive) mTransportBar.Stop(); if (CanRemoveSection || CanRemoveStrip) { bool isSection = mSelection.Control is TOCView; @@ -311,6 +312,7 @@ /// </summary> public void Delete() { + if (CanDelete && mTransportBar.IsPlayerActive) mTransportBar.Stop(); if (CanRemoveSection) { mPresentation.getUndoRedoManager().execute(new Commands.Node.Delete(this, mTOCView.Selection.Section, Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 10:56:17 UTC (rev 3063) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 12:02:41 UTC (rev 3064) @@ -520,12 +520,14 @@ /// <summary> /// Play all in the project. (Used when nothing is selected, or from the play all menu item.) + /// Start from the current selection, or from the first phrase. /// </summary> public void PlayAll() { mCurrentPlaylist = mMasterPlaylist; - mCurrentPlaylist.CurrentPhrase = mCurrentPlaylist.FirstPhrase; - mCurrentPlaylist.Play(); + PlayCurrentPlaylistFromSelection(); + // mCurrentPlaylist.CurrentPhrase = mCurrentPlaylist.FirstPhrase; + // mCurrentPlaylist.Play(); } /// <summary> @@ -561,22 +563,41 @@ mLocalPlaylist = new Playlist(mPlayer, mView.Selection); SetPlaylistEvents(mLocalPlaylist); mCurrentPlaylist = mLocalPlaylist; - if (mView.Selection is AudioSelection - && (!((AudioSelection)mView.Selection).AudioRange.HasCursor || mIsSelectionMarked) - && ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime > ((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime) + PlayCurrentPlaylistFromSelection(); + } + } + + // Play the current playlist from the current selection. + private void PlayCurrentPlaylistFromSelection() + { + if (mView.Selection is AudioSelection + && mView.Selection.Node is PhraseNode + && (!((AudioSelection)mView.Selection).AudioRange.HasCursor || mIsSelectionMarked) + && ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime > ((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime) + { + mCurrentPlaylist.CurrentPhrase = (PhraseNode)mView.Selection.Node; + 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) + { + mCurrentPlaylist.CurrentPhrase = (PhraseNode)mView.Selection.Node; + mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.CursorTime); + } + else if (mView.Selection is StripCursorSelection) + { + StripCursorSelection s = (StripCursorSelection)mView.Selection; + if (s.Index < s.Section.PhraseChildCount) { - mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.SelectionBeginTime, ((AudioSelection)mView.Selection).AudioRange.SelectionEndTime); + mCurrentPlaylist.CurrentPhrase = (PhraseNode)s.Section.PhraseChild(s.Index); } - else if (mView.Selection is AudioSelection - && ((AudioSelection)mView.Selection).AudioRange.HasCursor) - { - mCurrentPlaylist.Play(((AudioSelection)mView.Selection).AudioRange.CursorTime); - } - else - { - mCurrentPlaylist.Play(); - } + mCurrentPlaylist.Play(); } + else + { + mCurrentPlaylist.Play(); + } } @@ -639,7 +660,7 @@ // Stopping again deselects everything if (mCurrentPlaylist.State == Obi.Audio.AudioPlayerState.Stopped) { - //mView.Selection = null; + mView.Selection = null; } else { @@ -1186,7 +1207,7 @@ 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; } } + public bool IsPlayerActive { get { return IsPaused || IsPlaying; } } private bool IsPaused { get { return mPlayer.State == Obi.Audio.AudioPlayerState.Paused; } } public bool IsRecorderActive { get { return IsListening || IsRecording; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-15 10:56:20
|
Revision: 3063 http://urakawa.svn.sourceforge.net/urakawa/?rev=3063&view=rev Author: julienq Date: 2008-05-15 03:56:17 -0700 (Thu, 15 May 2008) Log Message: ----------- Updated selection behavior on click. Clicking on strips, blocks and strip cursors toggles the selection (easier to unselect.) Clicking on the strip label does not make it editable anymore; behaves like the block labels. Use F2 or rename to edit strip labels. Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.cs trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs 2008-05-15 10:18:15 UTC (rev 3062) +++ trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs 2008-05-15 10:56:17 UTC (rev 3063) @@ -12,7 +12,6 @@ private ObiNode mParent; // its original parent node private NodeSelection mAfter; // selection after deletion private int mIndex; // its original index - private ProjectView.ProjectView mView; /// <summary> @@ -21,7 +20,6 @@ public Delete(ProjectView.ProjectView view, ObiNode node, string label) : base(view) { - mView = view; mNode = node; mParent = node.ParentAs<ObiNode>(); mIndex = mNode.Index; @@ -37,7 +35,7 @@ public override void execute() { - mNode.Detach(); + mNode.Detach(); if (UpdateSelection) View.Selection = mAfter; } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs 2008-05-15 10:18:15 UTC (rev 3062) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs 2008-05-15 10:56:17 UTC (rev 3063) @@ -40,7 +40,7 @@ this.mLabel.Name = "mLabel"; this.mLabel.Size = new System.Drawing.Size(0, 13); this.mLabel.TabIndex = 2; - this.mLabel.Click += new System.EventHandler(this.mLabel_Click); + this.mLabel.Click += new System.EventHandler(this.Label_Click); // // Block // Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-15 10:18:15 UTC (rev 3062) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.cs 2008-05-15 10:56:17 UTC (rev 3063) @@ -13,39 +13,41 @@ protected EmptyNode mNode; // the corresponding node private bool mSelected; // selected flag private ISelectableInStripView mParentContainer; // not necessarily a strip! + private bool mEntering; // entering flag (for selection/deselection) + + // Used by the designer + public Block() { InitializeComponent(); } + + /// <summary> + /// Create a new empty block from an empty node. + /// </summary> public Block(EmptyNode node, ISelectableInStripView parent): this() { mNode = node; mParentContainer = parent; mSelected = false; - node.ChangedKind += new EmptyNode.ChangedKindEventHandler(node_ChangedKind); - node.ChangedPageNumber += new NodeEventHandler<EmptyNode>(node_ChangedPageNumber); + mEntering = false; + node.ChangedKind += new EmptyNode.ChangedKindEventHandler(Node_ChangedKind); + node.ChangedPageNumber += new NodeEventHandler<EmptyNode>(Node_ChangedPageNumber); UpdateColors(); UpdateLabel(); } - public Block() { InitializeComponent(); } + /// <summary> + /// Get the tab index of the block. + /// </summary> + public int LastTabIndex { get { return TabIndex; } } - // Width of the label (including margins) - protected int LabelFullWidth { get { return mLabel.Margin.Left + mLabel.Width + mLabel.Margin.Right; } } + /// <summary> + /// The empty node for this block. + /// </summary> + public EmptyNode Node { get { return mNode; } } - // Generate the label string for this block. - protected virtual void UpdateLabel() - { - mLabel.Text = Node.BaseStringShort(); - mLabel.AccessibleName = Node.BaseString(); - Size = new Size(LabelFullWidth, Height); - } - - private void node_ChangedPageNumber(object sender, NodeEventArgs<EmptyNode> e) { UpdateLabel(); } - private void node_ChangedKind(object sender, ChangedKindEventArgs e) { UpdateLabel(); } - /// <summary> - /// The phrase node for this block. + /// The Obi node for this block. /// </summary> - public EmptyNode Node { get { return mNode; } } public ObiNode ObiNode { get { return mNode; } } /// <summary> @@ -61,8 +63,20 @@ } } + /// <summary> + /// Set the selection from the parent view + /// </summary> + public virtual NodeSelection SelectionFromView { set { Selected = value != null; } } /// <summary> + /// The strip that contains this block. + /// </summary> + public Strip Strip + { + get { return mParentContainer is Strip ? (Strip)mParentContainer : ((Block)mParentContainer).Strip; } + } + + /// <summary> /// Update the colors of the block when the state of its node has changed. /// </summary> public void UpdateColors() @@ -75,63 +89,70 @@ } /// <summary> - /// Set the selection from the parent view - /// </summary> - public virtual NodeSelection SelectionFromView { set { Selected = value != null; } } - - /// <summary> - /// Get the tab index of the block. - /// </summary> - public int LastTabIndex { get { return TabIndex; } } - - /// <summary> /// Update the tab index of the block with the new value and return the next index. /// </summary> public int UpdateTabIndex(int index) { TabIndex = index; - ++index; - return index; + return index + 1; } - /// <summary> - /// The strip that contains this block. - /// </summary> - public Strip Strip + #region ISearchable Members + + public string ToMatch() { - get { return mParentContainer is Strip ? (Strip)mParentContainer : ((Block)mParentContainer).Strip; } - + return mLabel.Text.ToLowerInvariant(); } - // Select on click and tabbing - private void Block_Click(object sender, EventArgs e) + #endregion + + + // Width of the label (including margins) + protected int LabelFullWidth { get { return mLabel.Margin.Left + mLabel.Width + mLabel.Margin.Right; } } + + // Generate the label string for this block. + // Since there is no content, the width is always that of the label's. + protected virtual void UpdateLabel() { - System.Diagnostics.Debug.Print("Click on {0}", this); - Strip.SelectedBlock = this; + mLabel.Text = Node.BaseStringShort(); + mLabel.AccessibleName = Node.BaseString(); + Size = new Size(LabelFullWidth, Height); } + // Select/deselect on click + private void Block_Click(object sender, EventArgs e) { ToggleSelection(); } + + // Select on tabbing protected void Block_Enter(object sender, EventArgs e) { - System.Diagnostics.Debug.Print("Enter {0}?", this); if (!Strip.ParentView.Focusing) { - System.Diagnostics.Debug.Print("Yes."); + mEntering = true; Strip.SelectedBlock = this; } - else - { - System.Diagnostics.Debug.Print("No."); - } } - private void mLabel_Click(object sender, EventArgs e) { Strip.SelectedBlock = this; } - #region ISearchable Members + // Select when clickin the label too. + private void Label_Click(object sender, EventArgs e) { ToggleSelection(); } - public string ToMatch() + // Update label when the page number changes + private void Node_ChangedPageNumber(object sender, NodeEventArgs<EmptyNode> e) { UpdateLabel(); } + + // Update the label when the role of the node changes + private void Node_ChangedKind(object sender, ChangedKindEventArgs e) { UpdateLabel(); } + + // Toggle selection when clicking. + private void ToggleSelection() { - return mLabel.Text.ToLowerInvariant(); + if (!mSelected || mEntering) + { + Strip.SelectedBlock = this; + } + else + { + Strip.UnselectInStrip(); + } + mEntering = false; } - - #endregion } } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.Designer.cs 2008-05-15 10:18:15 UTC (rev 3062) +++ trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.Designer.cs 2008-05-15 10:56:17 UTC (rev 3063) @@ -43,7 +43,6 @@ this.mLabel.Size = new System.Drawing.Size(35, 13); this.mLabel.TabIndex = 0; this.mLabel.Text = "label1"; - this.mLabel.Click += new System.EventHandler(this.EditableLabel_Click); // // mTextBox // @@ -91,7 +90,6 @@ this.Margin = new System.Windows.Forms.Padding(0); this.Name = "EditableLabel"; this.Size = new System.Drawing.Size(150, 52); - this.Click += new System.EventHandler(this.EditableLabel_Click); this.Leave += new System.EventHandler(this.EditableLabel_Leave); this.ResumeLayout(false); this.PerformLayout(); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.cs 2008-05-15 10:18:15 UTC (rev 3062) +++ trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.cs 2008-05-15 10:56:17 UTC (rev 3063) @@ -125,14 +125,6 @@ } /// <summary> - /// Clicking the label makes it editable. - /// </summary> - private void EditableLabel_Click(object sender, EventArgs e) - { - if (!mEditable) Editable = true; - } - - /// <summary> /// Pressing enter is like pressing OK. /// Escape is like cancel. /// </summary> Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-15 10:18:15 UTC (rev 3062) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-15 10:56:17 UTC (rev 3063) @@ -61,6 +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.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-15 10:18:15 UTC (rev 3062) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-15 10:56:17 UTC (rev 3063) @@ -271,6 +271,14 @@ } /// <summary> + /// Clear the selection in the strip from its contents. + /// </summary> + public void UnselectInStrip() + { + mParentView.Selection = null; + } + + /// <summary> /// Update the colors of the block when the state of its node has changed. /// </summary> public void UpdateColors() @@ -343,8 +351,15 @@ mBlocksPanel.Controls.SetChildIndex(cursor, index); cursor.Click += new EventHandler(delegate(object sender, EventArgs e) { - mParentView.SelectionFromStrip = new StripCursorSelection(mNode, mParentView, - mBlocksPanel.Controls.IndexOf((Control)cursor) / 2); + if (!cursor.Selected) + { + mParentView.SelectionFromStrip = new StripCursorSelection(mNode, mParentView, + mBlocksPanel.Controls.IndexOf((Control)cursor) / 2); + } + else + { + mParentView.Selection = null; + } } ); } @@ -361,6 +376,12 @@ } } + // 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) { @@ -398,9 +419,15 @@ // Set verbose accessible name for the strip private void SetAccessibleName() { mLabel.AccessibleName = mNode.ToString(); } - // Toggle selection + // Toggle selection when clicking private void Strip_Click(object sender, EventArgs e) { + ToggleSelection(); + } + + // Toggle selection + private void ToggleSelection() + { if (mSelected && !mEntering) { mParentView.SelectionFromStrip = null; Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 10:18:15 UTC (rev 3062) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 10:56:17 UTC (rev 3063) @@ -901,27 +901,30 @@ { if (mState == State.Recording) { + // record into to next phrase. mRecordingSession.NextPhrase(); } - else if (mState != State.Monitoring) + else if (mState == State.Monitoring) { - if (mState == State.Stopped) + // start recording + + } + else if (mState == State.Stopped) + { + if (mView.ObiForm.Settings.PlayOnNavigate) { - if (mView.ObiForm.Settings.PlayOnNavigate) - { - mCurrentPlaylist.CurrentPhrase = mView.Selection.Node as PhraseNode; - mCurrentPlaylist.NavigateToNextPhrase(); - } - else - { - mView.SelectNextPhrase(); - } + mCurrentPlaylist.CurrentPhrase = mView.Selection.Node as PhraseNode; + mCurrentPlaylist.NavigateToNextPhrase(); } else { - mCurrentPlaylist.NavigateToNextPhrase(); + mView.SelectNextPhrase(); } } + else + { + mCurrentPlaylist.NavigateToNextPhrase(); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <avn...@us...> - 2008-05-15 10:18:24
|
Revision: 3062 http://urakawa.svn.sourceforge.net/urakawa/?rev=3062&view=rev Author: avneeshsingh Date: 2008-05-15 03:18:15 -0700 (Thu, 15 May 2008) Log Message: ----------- update to insert recording bugg Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 10:10:47 UTC (rev 3061) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 10:18:15 UTC (rev 3062) @@ -695,7 +695,7 @@ mRecordingInitPhraseIndex = 1 + selected.Index; if (mAllowOverwrite && (IsInPhraseSelectionMarked || mState == State.Paused)) { //1 - if (mState == State.Paused) + if (mState == State.Paused && !(mView.Selection is AudioSelection)) { // 2 command.append(new Commands.Node.SplitAudio(mView , SplitTime)); } //-2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <avn...@us...> - 2008-05-15 10:10:49
|
Revision: 3061 http://urakawa.svn.sourceforge.net/urakawa/?rev=3061&view=rev Author: avneeshsingh Date: 2008-05-15 03:10:47 -0700 (Thu, 15 May 2008) Log Message: ----------- Fix to bugg: 1963594 Insert recording do not work Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 08:08:45 UTC (rev 3060) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.cs 2008-05-15 10:10:47 UTC (rev 3061) @@ -693,39 +693,47 @@ // Record after or inside the phrase node mRecordingSection = selected.ParentAs<SectionNode>(); mRecordingInitPhraseIndex = 1 + selected.Index; - if (mAllowOverwrite && IsInPhraseSelectionMarked) - { - AudioRange range = ((AudioSelection)mView.Selection).AudioRange; - if (range.HasCursor) - { - // Split the phrase at the cursor - command.append(new Commands.Node.SplitAudio(mView)); - } - else if (range.SelectionBeginTime == 0) - { - if (range.SelectionEndTime < ((PhraseNode)selected).Audio.getDuration().getTimeDeltaAsMillisecondFloat()) - { - // Split at the end of the selection (if there is something after the end...) - command.append(new Commands.Node.SplitAudio(mView, range.SelectionEndTime)); - } - // ... and remove the first half. - command.append(new Commands.Node.Delete(mView, mView.Selection.Node)); - // Now we must recorde *before* the selected node - --mRecordingInitPhraseIndex; - } - else - { - if (range.SelectionEndTime < ((PhraseNode)selected).Audio.getDuration().getTimeDeltaAsMillisecondFloat()) - { - // Split at the end if necessary (do it first so that times are correct) - command.append(new Commands.Node.SplitAudio(mView, range.SelectionEndTime)); - } - // Split at the beginning of the selection - command.append(new Commands.Node.SplitAudio(mView, range.SelectionBeginTime)); - // ... and remove the split part. - command.append(new Commands.Node.DeleteWithOffset(mView, selected, 1)); - } - } + if (mAllowOverwrite && (IsInPhraseSelectionMarked || mState == State.Paused)) + { //1 + if (mState == State.Paused) + { // 2 + command.append(new Commands.Node.SplitAudio(mView , SplitTime)); + } //-2 + else if (mView.Selection is AudioSelection) + { //2 + AudioRange range = ((AudioSelection)mView.Selection).AudioRange; + if (range.HasCursor) + { //3 + // Split the phrase at the cursor + command.append(new Commands.Node.SplitAudio(mView)); + } //-3 + else if (range.SelectionBeginTime == 0) + { //3 + if (range.SelectionEndTime < ((PhraseNode)selected).Audio.getDuration().getTimeDeltaAsMillisecondFloat()) + { //4 + // Split at the end of the selection (if there is something after the end...) + command.append(new Commands.Node.SplitAudio(mView, range.SelectionEndTime)); + } //-4 + // ... and remove the first half. + command.append(new Commands.Node.Delete(mView, mView.Selection.Node)); + // Now we must recorde *before* the selected node + --mRecordingInitPhraseIndex; + } //-3 + else + { //3 + if (range.SelectionEndTime < ((PhraseNode)selected).Audio.getDuration().getTimeDeltaAsMillisecondFloat()) + { //4 + // Split at the end if necessary (do it first so that times are correct) + command.append(new Commands.Node.SplitAudio(mView, range.SelectionEndTime)); + } //-4 + // Split at the beginning of the selection + command.append(new Commands.Node.SplitAudio(mView, range.SelectionBeginTime)); + // ... and remove the split part. + command.append(new Commands.Node.DeleteWithOffset(mView, selected, 1)); + } //-3 + } //-2 + } //-1 overwrite if ends + if (mCurrentPlaylist.State == Audio.AudioPlayerState.Paused) mCurrentPlaylist.Stop(); } else if (selected is EmptyNode) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <avn...@us...> - 2008-05-15 08:08:56
|
Revision: 3060 http://urakawa.svn.sourceforge.net/urakawa/?rev=3060&view=rev Author: avneeshsingh Date: 2008-05-15 01:08:45 -0700 (Thu, 15 May 2008) Log Message: ----------- fix to bugg: Recording do not work for empty phrases. 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-15 01:42:36 UTC (rev 3059) +++ trunk/urakawa/application/Obi/Obi/Commands/Node/Delete.cs 2008-05-15 08:08:45 UTC (rev 3060) @@ -37,10 +37,7 @@ public override void execute() { - if (mView.TransportBar.IsActive) - mView.TransportBar.Stop(); - - mNode.Detach(); + 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: <ju...@us...> - 2008-05-15 01:42:38
|
Revision: 3059 http://urakawa.svn.sourceforge.net/urakawa/?rev=3059&view=rev Author: julienq Date: 2008-05-14 18:42:36 -0700 (Wed, 14 May 2008) Log Message: ----------- Update installer for alpha 8 release. Modified Paths: -------------- trunk/urakawa/application/Obi/Setup/Setup.vdproj Modified: trunk/urakawa/application/Obi/Setup/Setup.vdproj =================================================================== --- trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-15 01:32:56 UTC (rev 3058) +++ trunk/urakawa/application/Obi/Setup/Setup.vdproj 2008-05-15 01:42:36 UTC (rev 3059) @@ -1173,9 +1173,9 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:Obi 0.10.7" + "ProductName" = "8:Obi 0.10.8" "ProductCode" = "8:{85A99D0A-5FF6-4CC7-A480-101BF4E080F0}" - "PackageCode" = "8:{3816FC4F-0599-4D14-9D57-40017D11D1DD}" + "PackageCode" = "8:{685FA0E0-A285-4B18-BD6A-350237A923FB}" "UpgradeCode" = "8:{358C2C3A-3686-4461-A8BA-9D766218CC5E}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" @@ -1296,7 +1296,7 @@ { "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_0F34FEE7392245ED8C33C78EB0D2823B" { - "Name" = "8:Obi 0.10.7" + "Name" = "8:Obi 0.10.8" "Arguments" = "8:" "Description" = "8:" "ShowCmd" = "3:1" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-15 01:32:57
|
Revision: 3058 http://urakawa.svn.sourceforge.net/urakawa/?rev=3058&view=rev Author: julienq Date: 2008-05-14 18:32:56 -0700 (Wed, 14 May 2008) Log Message: ----------- Wrapping works but drawing is not so nice... Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripCursor.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs Modified: trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/AudioBlock.Designer.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -33,6 +33,7 @@ // // mWaveform // + this.mWaveform.AccessibleRole = System.Windows.Forms.AccessibleRole.None; this.mWaveform.Cursor = System.Windows.Forms.Cursors.IBeam; this.mWaveform.Location = new System.Drawing.Point(3, 3); this.mWaveform.Name = "mWaveform"; @@ -41,10 +42,10 @@ this.mWaveform.TabIndex = 1; this.mWaveform.Text = "waveform1"; this.mWaveform.DoubleClick += new System.EventHandler(this.mWaveform_DoubleClick); + this.mWaveform.MouseMove += new System.Windows.Forms.MouseEventHandler(this.mWaveform_MouseMove); this.mWaveform.Click += new System.EventHandler(this.mWaveform_Click); + this.mWaveform.KeyUp += new System.Windows.Forms.KeyEventHandler(this.mWaveform_KeyUp); this.mWaveform.MouseDown += new System.Windows.Forms.MouseEventHandler(this.mWaveform_MouseDown); - this.mWaveform.MouseMove += new System.Windows.Forms.MouseEventHandler(this.mWaveform_MouseMove); - this.mWaveform.KeyUp += new System.Windows.Forms.KeyEventHandler(this.mWaveform_KeyUp); this.mWaveform.MouseUp += new System.Windows.Forms.MouseEventHandler(this.mWaveform_MouseUp); this.mWaveform.KeyDown += new System.Windows.Forms.KeyEventHandler(this.mWaveform_KeyDown); // @@ -52,6 +53,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.Controls.Add(this.mWaveform); + this.DoubleBuffered = true; this.Name = "AudioBlock"; this.Controls.SetChildIndex(this.mWaveform, 0); this.Controls.SetChildIndex(this.mLabel, 0); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Block.Designer.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -48,6 +48,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.HotPink; this.Controls.Add(this.mLabel); + this.DoubleBuffered = true; this.Margin = new System.Windows.Forms.Padding(0, 0, 3, 3); this.Name = "Block"; this.Size = new System.Drawing.Size(104, 104); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -32,13 +32,13 @@ this.mFindInTextSplitter = new System.Windows.Forms.SplitContainer(); this.mTOCSplitter = new System.Windows.Forms.SplitContainer(); this.mMetadataSplitter = new System.Windows.Forms.SplitContainer(); - this.mPanelInfoLabelButton = new System.Windows.Forms.Button(); - this.mNoProjectLabel = new System.Windows.Forms.Label(); this.mTOCView = new Obi.ProjectView.TOCView(); this.mMetadataView = new Obi.ProjectView.MetadataView(); + this.mPanelInfoLabelButton = new System.Windows.Forms.Button(); this.mStripsView = new Obi.ProjectView.StripsView(); this.mFindInText = new Obi.ProjectView.FindInText(); this.mTransportBar = new Obi.ProjectView.TransportBar(); + this.mNoProjectLabel = new System.Windows.Forms.Label(); this.mTransportBarSplitter.Panel1.SuspendLayout(); this.mTransportBarSplitter.Panel2.SuspendLayout(); this.mTransportBarSplitter.SuspendLayout(); @@ -132,33 +132,6 @@ this.mMetadataSplitter.SplitterDistance = 379; this.mMetadataSplitter.TabIndex = 0; // - // mPanelInfoLabelButton - // - this.mPanelInfoLabelButton.AccessibleName = "Panel Splitter"; - this.mPanelInfoLabelButton.AccessibleRole = System.Windows.Forms.AccessibleRole.None; - this.mPanelInfoLabelButton.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.mPanelInfoLabelButton.AutoSize = true; - this.mPanelInfoLabelButton.BackColor = System.Drawing.Color.Transparent; - this.mPanelInfoLabelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mPanelInfoLabelButton.Location = new System.Drawing.Point(-5, -1); - this.mPanelInfoLabelButton.Name = "mPanelInfoLabelButton"; - this.mPanelInfoLabelButton.Size = new System.Drawing.Size(6, 6); - this.mPanelInfoLabelButton.TabIndex = 2; - this.mPanelInfoLabelButton.UseVisualStyleBackColor = false; - this.mPanelInfoLabelButton.Leave += new System.EventHandler(this.mPanelInfoLabelButton_Leave); - this.mPanelInfoLabelButton.Enter += new System.EventHandler(this.mPanelInfoLabelButton_Enter); - // - // mNoProjectLabel - // - this.mNoProjectLabel.Anchor = System.Windows.Forms.AnchorStyles.None; - this.mNoProjectLabel.AutoSize = true; - this.mNoProjectLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mNoProjectLabel.Location = new System.Drawing.Point(442, 340); - this.mNoProjectLabel.Name = "mNoProjectLabel"; - this.mNoProjectLabel.Size = new System.Drawing.Size(81, 20); - this.mNoProjectLabel.TabIndex = 1; - this.mNoProjectLabel.Text = "No project"; - // // mTOCView // this.mTOCView.AutoScroll = true; @@ -180,6 +153,22 @@ this.mMetadataView.Size = new System.Drawing.Size(271, 244); this.mMetadataView.TabIndex = 0; // + // mPanelInfoLabelButton + // + this.mPanelInfoLabelButton.AccessibleName = "Panel Splitter"; + this.mPanelInfoLabelButton.AccessibleRole = System.Windows.Forms.AccessibleRole.None; + this.mPanelInfoLabelButton.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.mPanelInfoLabelButton.AutoSize = true; + this.mPanelInfoLabelButton.BackColor = System.Drawing.Color.Transparent; + this.mPanelInfoLabelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mPanelInfoLabelButton.Location = new System.Drawing.Point(-5, -1); + this.mPanelInfoLabelButton.Name = "mPanelInfoLabelButton"; + this.mPanelInfoLabelButton.Size = new System.Drawing.Size(6, 6); + this.mPanelInfoLabelButton.TabIndex = 2; + this.mPanelInfoLabelButton.UseVisualStyleBackColor = false; + this.mPanelInfoLabelButton.Leave += new System.EventHandler(this.mPanelInfoLabelButton_Leave); + this.mPanelInfoLabelButton.Enter += new System.EventHandler(this.mPanelInfoLabelButton_Enter); + // // mStripsView // this.mStripsView.BackColor = System.Drawing.Color.Transparent; @@ -208,6 +197,17 @@ 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); @@ -215,6 +215,7 @@ this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.mNoProjectLabel); this.Controls.Add(this.mTransportBarSplitter); + this.DoubleBuffered = true; this.Name = "ProjectView"; this.Size = new System.Drawing.Size(964, 700); this.mTransportBarSplitter.Panel1.ResumeLayout(false); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -73,6 +73,7 @@ this.BackColor = System.Drawing.Color.LightSkyBlue; this.Controls.Add(this.mLabel); this.Controls.Add(this.mBlocksPanel); + this.DoubleBuffered = true; this.Margin = new System.Windows.Forms.Padding(0, 0, 0, 3); this.Name = "Strip"; this.Padding = new System.Windows.Forms.Padding(3); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -308,10 +308,23 @@ { mWrap = value; UpdateSize(); + if (mWrap) + { + mParentView.SizeChanged += new EventHandler(mParentView_SizeChanged); + } + else + { + mParentView.SizeChanged -= new EventHandler(mParentView_SizeChanged); + } } } + void mParentView_SizeChanged(object sender, EventArgs e) + { + UpdateSize(); + } + #region ISearchable Members public string ToMatch() @@ -325,7 +338,6 @@ private void AddCursor(int index) { StripCursor cursor = new StripCursor(this); - cursor.Size = new Size(12, mBlocksPanel.Height); cursor.BackColor = Color.SkyBlue; mBlocksPanel.Controls.Add(cursor); mBlocksPanel.Controls.SetChildIndex(cursor, index); @@ -418,11 +430,25 @@ // Update the size of the strip to use the available width of the view private void UpdateSize() { - // Compute the minimum width of the block panel - int minBlockPanelWidth = 0; - foreach (Control c in mBlocksPanel.Controls) minBlockPanelWidth += c.Width; - MinimumSize = new Size(minBlockPanelWidth + mBlocksPanel.Margin.Left + mBlocksPanel.Margin.Right, MinimumSize.Height); - System.Diagnostics.Debug.Print(">-< Strip minimum size is " + MinimumSize); + // System.Diagnostics.Debug.Print("<-> Update size"); + if (mWrap) + { + MinimumSize = new Size(ParentView.Width, MinimumSize.Height); + Width = ParentView.Width; + mBlocksPanel.AutoSize = true; + mBlocksPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink; + mBlocksPanel.WrapContents = true; + Height = mBlocksPanel.Location.Y + mBlocksPanel.Height + mBlocksPanel.Margin.Bottom; + } + else + { + mBlocksPanel.AutoSize = false; + mBlocksPanel.WrapContents = false; + // Compute the minimum width of the block panel + int minBlockPanelWidth = 0; + foreach (Control c in mBlocksPanel.Controls) minBlockPanelWidth += c.Width; + MinimumSize = new Size(minBlockPanelWidth + mBlocksPanel.Margin.Left + mBlocksPanel.Margin.Right, MinimumSize.Height); + } } private void Strip_SizeChanged(object sender, EventArgs e) Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripCursor.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripCursor.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripCursor.Designer.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -33,7 +33,8 @@ // StripCursor // this.AccessibleName = "Strip Cursor"; - this.Margin = new System.Windows.Forms.Padding(0); + this.Margin = new System.Windows.Forms.Padding(0, 0, 0, 3); + this.Size = new System.Drawing.Size(12, 104); this.TabStop = false; this.ResumeLayout(false); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.Designer.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -50,6 +50,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Transparent; this.Controls.Add(this.mLayoutPanel); + this.DoubleBuffered = true; this.Name = "StripsView"; this.Size = new System.Drawing.Size(398, 297); this.Enter += new System.EventHandler(this.StripsView_Enter); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TOCView.Designer.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -54,6 +54,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.Controls.Add(this.mTOCTree); + this.DoubleBuffered = true; this.Name = "TOCView"; this.ResumeLayout(false); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) +++ trunk/urakawa/application/Obi/Obi/ProjectView/TransportBar.Designer.cs 2008-05-15 01:32:56 UTC (rev 3058) @@ -364,10 +364,11 @@ this.Controls.Add(this.mStopButton); this.Controls.Add(this.mPlayButton); this.Controls.Add(this.mPauseButton); + this.DoubleBuffered = true; this.Name = "TransportBar"; this.Size = new System.Drawing.Size(945, 35); + this.Leave += new System.EventHandler(this.TransportBar_Leave); this.Enter += new System.EventHandler(this.TransportBar_Enter); - this.Leave += new System.EventHandler(this.TransportBar_Leave); this.ResumeLayout(false); this.PerformLayout(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ju...@us...> - 2008-05-15 00:49:55
|
Revision: 3057 http://urakawa.svn.sourceforge.net/urakawa/?rev=3057&view=rev Author: julienq Date: 2008-05-14 17:49:53 -0700 (Wed, 14 May 2008) Log Message: ----------- Less screwy strip display; wrapping is currently disabled. Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/ObiForm.resx trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.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.Designer.cs trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs trunk/urakawa/application/Obi/Obi/messages.Designer.cs trunk/urakawa/application/Obi/Obi/messages.resx Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2008-05-15 00:49:53 UTC (rev 3057) @@ -1168,7 +1168,7 @@ <value>mProjectView</value> </data> <data name=">>mProjectView.Type" xml:space="preserve"> - <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.29799, Culture=neutral, PublicKeyToken=null</value> + <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.40286, Culture=neutral, PublicKeyToken=null</value> </data> <data name=">>mProjectView.Parent" xml:space="preserve"> <value>$this</value> Modified: trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.Designer.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -60,7 +60,7 @@ // mOKButton // this.mOKButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.mOKButton.Location = new System.Drawing.Point(3, 29); + this.mOKButton.Location = new System.Drawing.Point(3, 26); this.mOKButton.Name = "mOKButton"; this.mOKButton.Size = new System.Drawing.Size(35, 23); this.mOKButton.TabIndex = 2; @@ -71,7 +71,7 @@ // mCancelButton // this.mCancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.mCancelButton.Location = new System.Drawing.Point(44, 29); + this.mCancelButton.Location = new System.Drawing.Point(44, 26); this.mCancelButton.Name = "mCancelButton"; this.mCancelButton.Size = new System.Drawing.Size(50, 23); this.mCancelButton.TabIndex = 3; @@ -90,7 +90,7 @@ this.Controls.Add(this.mLabel); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "EditableLabel"; - this.Size = new System.Drawing.Size(150, 55); + this.Size = new System.Drawing.Size(150, 52); this.Click += new System.EventHandler(this.EditableLabel_Click); this.Leave += new System.EventHandler(this.EditableLabel_Leave); this.ResumeLayout(false); Modified: trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ProjectView/EditableLabel.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -97,7 +97,7 @@ mLabel.Text = value; mTextBox.Text = value; int wb = mCancelButton.Location.X + mCancelButton.Width + mCancelButton.Margin.Right; - int wl = mTextBox.Location.X + mTextBox.Width + mTextBox.Margin.Right; + int wl = mLabel.Location.X + mLabel.Width + mLabel.Margin.Right; MinimumSize = new Size(wb > wl ? wb : wl, MinimumSize.Height); } } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -517,8 +517,11 @@ { set { - mStripsView.PlaybackPhrase = value; - if (value != null) MakePhraseNodeVisible(value); + if (mStripsView != null) + { + mStripsView.PlaybackPhrase = value; + if (value != null) MakePhraseNodeVisible(value); + } } } @@ -643,14 +646,19 @@ private void UpdateShowOnlySelected(bool showOnly) { + ObiNode node = SelectedNodeAs<ObiNode>(); + node = node is SectionNode ? (SectionNode)node : + node == null || node is RootNode ? null : + node.AncestorAs<SectionNode>(); if (showOnly) { - mStripsView.ShowOnlySelectedSection(SelectedNodeAs<ObiNode>()); + mStripsView.ShowOnlySelectedSection(node); } else { SynchronizeViews = mSynchronizeViews; } + mStripsView.MakeStripVisibleForSection((SectionNode)node); } public bool WrapStrips { set { mStripsView.WrapStrips = value; } } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ProjectView/ProjectView.designer.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -92,7 +92,7 @@ this.mFindInTextSplitter.Panel2.Controls.Add(this.mFindInText); this.mFindInTextSplitter.Panel2MinSize = 29; this.mFindInTextSplitter.Size = new System.Drawing.Size(964, 660); - this.mFindInTextSplitter.SplitterDistance = 629; + this.mFindInTextSplitter.SplitterDistance = 627; this.mFindInTextSplitter.TabIndex = 0; // // mTOCSplitter @@ -110,7 +110,7 @@ // mTOCSplitter.Panel2 // this.mTOCSplitter.Panel2.Controls.Add(this.mStripsView); - this.mTOCSplitter.Size = new System.Drawing.Size(964, 629); + this.mTOCSplitter.Size = new System.Drawing.Size(964, 627); this.mTOCSplitter.SplitterDistance = 271; this.mTOCSplitter.TabIndex = 0; // @@ -128,8 +128,8 @@ // mMetadataSplitter.Panel2 // this.mMetadataSplitter.Panel2.Controls.Add(this.mMetadataView); - this.mMetadataSplitter.Size = new System.Drawing.Size(271, 629); - this.mMetadataSplitter.SplitterDistance = 381; + this.mMetadataSplitter.Size = new System.Drawing.Size(271, 627); + this.mMetadataSplitter.SplitterDistance = 379; this.mMetadataSplitter.TabIndex = 0; // // mPanelInfoLabelButton @@ -140,7 +140,7 @@ 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.Location = new System.Drawing.Point(-5, -1); this.mPanelInfoLabelButton.Name = "mPanelInfoLabelButton"; this.mPanelInfoLabelButton.Size = new System.Drawing.Size(6, 6); this.mPanelInfoLabelButton.TabIndex = 2; @@ -162,11 +162,12 @@ // mTOCView // this.mTOCView.AutoScroll = true; + this.mTOCView.BackColor = System.Drawing.Color.Transparent; this.mTOCView.Dock = System.Windows.Forms.DockStyle.Fill; this.mTOCView.Location = new System.Drawing.Point(0, 0); this.mTOCView.Name = "mTOCView"; this.mTOCView.Selection = null; - this.mTOCView.Size = new System.Drawing.Size(271, 381); + this.mTOCView.Size = new System.Drawing.Size(271, 379); this.mTOCView.TabIndex = 0; // // mMetadataView @@ -181,21 +182,21 @@ // // mStripsView // - this.mStripsView.BackColor = System.Drawing.Color.LightYellow; + this.mStripsView.BackColor = System.Drawing.Color.Transparent; this.mStripsView.Dock = System.Windows.Forms.DockStyle.Fill; this.mStripsView.Location = new System.Drawing.Point(0, 0); this.mStripsView.Name = "mStripsView"; this.mStripsView.Selection = null; - this.mStripsView.Size = new System.Drawing.Size(689, 629); + this.mStripsView.Size = new System.Drawing.Size(689, 627); this.mStripsView.TabIndex = 0; // // mFindInText // - this.mFindInText.BackColor = System.Drawing.Color.Honeydew; + this.mFindInText.BackColor = System.Drawing.SystemColors.Control; this.mFindInText.Dock = System.Windows.Forms.DockStyle.Fill; this.mFindInText.Location = new System.Drawing.Point(0, 0); this.mFindInText.Name = "mFindInText"; - this.mFindInText.Size = new System.Drawing.Size(964, 27); + this.mFindInText.Size = new System.Drawing.Size(964, 29); this.mFindInText.TabIndex = 0; // // mTransportBar Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -36,15 +36,15 @@ // 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.BackColor = System.Drawing.SystemColors.Control; + this.mBlocksPanel.Location = new System.Drawing.Point(3, 43); this.mBlocksPanel.Name = "mBlocksPanel"; - this.mBlocksPanel.Size = new System.Drawing.Size(0, 0); + this.mBlocksPanel.Size = new System.Drawing.Size(300, 104); this.mBlocksPanel.TabIndex = 0; this.mBlocksPanel.WrapContents = false; this.mBlocksPanel.Click += new System.EventHandler(this.Strip_Click); + this.mBlocksPanel.SizeChanged += new System.EventHandler(this.BlocksPanel_SizeChanged); // // mLabel // @@ -53,13 +53,13 @@ | System.Windows.Forms.AnchorStyles.Right))); this.mLabel.BackColor = System.Drawing.Color.Thistle; this.mLabel.Editable = false; - this.mLabel.FontSize = 8.25F; - this.mLabel.Label = "*** NOT YET INITIALIZED ***"; + this.mLabel.FontSize = 18F; + this.mLabel.Label = "Label"; this.mLabel.Location = new System.Drawing.Point(3, 3); - this.mLabel.Margin = new System.Windows.Forms.Padding(0, 0, 0, 3); - this.mLabel.MinimumSize = new System.Drawing.Size(150, 0); + this.mLabel.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.mLabel.MinimumSize = new System.Drawing.Size(300, 0); this.mLabel.Name = "mLabel"; - this.mLabel.Size = new System.Drawing.Size(284, 21); + this.mLabel.Size = new System.Drawing.Size(300, 37); this.mLabel.TabIndex = 0; this.mLabel.LabelEditedByUser += new System.EventHandler(this.Label_LabelEditedByUser); this.mLabel.EditableChanged += new System.EventHandler(this.Label_EditableChanged); @@ -76,11 +76,11 @@ this.Margin = new System.Windows.Forms.Padding(0, 0, 0, 3); this.Name = "Strip"; this.Padding = new System.Windows.Forms.Padding(3); - this.Size = new System.Drawing.Size(290, 132); + this.Size = new System.Drawing.Size(306, 150); this.Click += new System.EventHandler(this.Strip_Click); this.Enter += new System.EventHandler(this.Strip_Enter); + this.SizeChanged += new System.EventHandler(this.Strip_SizeChanged); this.ResumeLayout(false); - this.PerformLayout(); } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ProjectView/Strip.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -14,6 +14,8 @@ private SectionNode mNode; // the section node for this strip private bool mSelected; // selected flag private StripsView mParentView; // parent strip view + private bool mWrap; // wrap contents + private bool mEntering; // entering flag /// <summary> /// This constructor is used by the designer. @@ -21,9 +23,10 @@ public Strip() { InitializeComponent(); - mLabel.FontSize = 18.0F; mNode = null; Selected = false; + mWrap = false; + mEntering = false; } /// <summary> @@ -42,8 +45,6 @@ } - private void SetAccessibleName() { mLabel.AccessibleName = mNode.ToString(); } - /// <summary> /// Add a new block for a phrase node. /// </summary> @@ -53,14 +54,14 @@ block.Margin = new Padding(0, 0, 0, 0); mBlocksPanel.Controls.Add(block); mBlocksPanel.Controls.SetChildIndex(block, 1 + node.Index * 2); - UpdateWidth(); AddCursor(2 * (1 + node.Index)); + UpdateSize(); return block; } /// <summary> - /// Return the block after the selected block or strip. In the case of a strip is the first block. - /// Return null if this the last block, there are no blocks, or nothing was selected in the first place. + /// Return the block after the selected block or strip. In the case of a strip it is the first block. + /// Return null if this is the last block, there are no blocks, or nothing was selected in the first place. /// This is used for arrow navigation. /// </summary> public Block BlockAfter(ISelectableInStripView item) @@ -114,8 +115,13 @@ } /// <summary> - /// The label of the strip (i.e. the title of the section; editable.) + /// Focus on the label. /// </summary> + public void FocusStripLabel() { mLabel.Focus(); } + + /// <summary> + /// The label of the strip where the title of the section can be edited. + /// </summary> public string Label { get { return mLabel.Label; } @@ -126,7 +132,7 @@ mLabel.Label = value; SetAccessibleName(); } - int w = mLabel.Location.X + mLabel.MinimumSize.Width + mLabel.Margin.Right; + int w = mLabel.MinimumSize.Width + mLabel.Margin.Left + mLabel.Margin.Right; if (w > MinimumSize.Width) MinimumSize = new Size(w, MinimumSize.Height); } } @@ -142,6 +148,7 @@ null; } } + /// <summary> /// Get the tab index of the last control in the strip /// </summary> @@ -155,15 +162,18 @@ } /// <summary> - /// The section node for this strip. + /// Get the section node for this strip. /// </summary> public SectionNode Node { get { return mNode; } } /// <summary> - /// The (generic) node for this strip; used for selection. + /// Get the (generic) node for this strip; used for selection. /// </summary> public ObiNode ObiNode { get { return mNode; } } + /// <summary> + /// Get the strips view to which this strip belongs. + /// </summary> public StripsView ParentView { get { return mParentView; } } /// <summary> @@ -177,7 +187,7 @@ int index = mBlocksPanel.Controls.IndexOf(block); mBlocksPanel.Controls.RemoveAt(index + 1); // remove the cursor after the block mBlocksPanel.Controls.RemoveAt(index); // and the block itself - UpdateWidth(); + UpdateSize(); } } @@ -245,7 +255,7 @@ int index = item is Strip ? 0 : item is StripCursor ? mBlocksPanel.Controls.IndexOf((Control)item) + 2 : item is Block ? mBlocksPanel.Controls.IndexOf((Control)item) + 1 : -2; - return index < mBlocksPanel.Controls.Count ? index / 2: -1; + return index < mBlocksPanel.Controls.Count ? index / 2 : -1; } /// <summary> @@ -267,11 +277,11 @@ { if (mNode != null) { - // Get colors from profile - mLabel.BackColor = mNode.Used ? Color.Thistle : Color.LightGray; + // TODO: get colors from profile + mLabel.BackColor = BackColor = mBlocksPanel.BackColor = mSelected ? Color.Yellow : - mNode.Used ? Color.LightBlue : Color.LightGray; + mNode.Used ? Color.LightSkyBlue : Color.LightGray; } } @@ -289,6 +299,19 @@ return index; } + /// <summary> + /// Set the wrap parameter. + /// </summary> + public bool Wrap + { + set + { + mWrap = value; + UpdateSize(); + } + } + + #region ISearchable Members public string ToMatch() @@ -298,12 +321,12 @@ #endregion - // Add a cursor at the end of the strip private void AddCursor(int index) { StripCursor cursor = new StripCursor(this); cursor.Size = new Size(12, mBlocksPanel.Height); + cursor.BackColor = Color.SkyBlue; mBlocksPanel.Controls.Add(cursor); mBlocksPanel.Controls.SetChildIndex(cursor, index); cursor.Click += new EventHandler(delegate(object sender, EventArgs e) @@ -314,6 +337,18 @@ ); } + // Add content view label to the accessible name of the strip when entering. + private void AddContentsViewLabel() + { + SetAccessibleName(); + if (mParentView.IsEnteringView) + { + mLabel.AccessibleName = string.Format("{0} {1}", Localizer.Message("content_view"), mLabel.AccessibleName); + Thread TrimAccessibleName = new Thread(new ThreadStart(TrimContentsViewAccessibleLabel)); + TrimAccessibleName.Start(); + } + } + // Select the label when it is clicked (i.e. made editable) by the user. private void Label_EditableChanged(object sender, EventArgs e) { @@ -338,7 +373,7 @@ } } - // Resize the strip according to the editable label, whose size can change. + // Resize the strip according to the editable label, which size can change. // TODO since there are really two possible heights, we should cache these values. private void Label_SizeChanged(object sender, EventArgs e) { @@ -348,78 +383,56 @@ mBlocksPanel.Location.Y + mBlocksPanel.Height + mBlocksPanel.Margin.Bottom); } - // The user clicked on this strip, so select it if it wasn't already selected + // Set verbose accessible name for the strip + private void SetAccessibleName() { mLabel.AccessibleName = mNode.ToString(); } + + // Toggle selection private void Strip_Click(object sender, EventArgs e) { - if (!mSelected) mParentView.SelectedNode = mNode; + if (mSelected && !mEntering) + { + mParentView.SelectionFromStrip = null; + } + else + { + mParentView.SelectedNode = mNode; + } + mEntering = false; } // Select when tabbed into private void Strip_Enter(object sender, EventArgs e) { + mEntering = true; AddContentsViewLabel(); - if (mParentView.SelectedSection != mNode && !mParentView.Focusing) mParentView.SelectedNode = mNode; } - // Update the width of the strip to use the available width of the view - private void UpdateWidth() + // Reset the accessible name after a short while. + private void TrimContentsViewAccessibleLabel() { - int w = 0; - foreach (Control c in mBlocksPanel.Controls) w += c.Width + c.Margin.Right; - if (mBlocksPanel.Controls.Count > 0) w -= mBlocksPanel.Controls[mBlocksPanel.Controls.Count - 1].Margin.Right; - if (w > mBlocksPanel.Width) mBlocksPanel.Size = new Size(w, mBlocksPanel.Height); - w += mBlocksPanel.Location.X + mBlocksPanel.Margin.Right; - if (w > MinimumSize.Width) MinimumSize = new Size(w, MinimumSize.Height); + Thread.Sleep(750); + SetAccessibleName(); } - /// <summary> - /// Wrap or unwrap strip contents. - /// </summary> - public void WrapToWidth(int width, bool wrap) + // Update the size of the strip to use the available width of the view + private void UpdateSize() { - if (wrap) - { - MinimumSize = new Size(width, MinimumSize.Height); - Width = width; - mBlocksPanel.WrapContents = true; - mBlocksPanel.Width = width; - Height = Padding.Top + mLabel.Height + mLabel.Margin.Bottom + mBlocksPanel.Height + Padding.Bottom; - } - else - { - mBlocksPanel.WrapContents = false; - UpdateWidth(); - } + // Compute the minimum width of the block panel + int minBlockPanelWidth = 0; + foreach (Control c in mBlocksPanel.Controls) minBlockPanelWidth += c.Width; + MinimumSize = new Size(minBlockPanelWidth + mBlocksPanel.Margin.Left + mBlocksPanel.Margin.Right, MinimumSize.Height); + System.Diagnostics.Debug.Print(">-< Strip minimum size is " + MinimumSize); } - - public void FocusStripLabel() + private void Strip_SizeChanged(object sender, EventArgs e) { - mLabel.Focus(); - - -} - - - private void AddContentsViewLabel() - { - if (ParentView.IsEnteringStripsView) - { - ParentView.IsEnteringStripsView = false; - SetAccessibleName(); - mLabel.AccessibleName = string.Concat ( Localizer.Message ("ContentsView_Label") , " " , mLabel.AccessibleName) ; - Thread TrimAccessibleName = new Thread(new ThreadStart(TrimContentsViewAccessibleLabel)); - TrimAccessibleName.Start(); - } - else - SetAccessibleName(); + // System.Diagnostics.Debug.Print("<-> Resize strip to " + Size); } - private void TrimContentsViewAccessibleLabel () + private void BlocksPanel_SizeChanged(object sender, EventArgs e) { - Thread.Sleep(750); - SetAccessibleName(); + // System.Diagnostics.Debug.Print("<---> Resize block panel to " + mBlocksPanel.Size); } } } Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.Designer.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -42,7 +42,7 @@ this.mLayoutPanel.TabIndex = 0; this.mLayoutPanel.WrapContents = false; this.mLayoutPanel.Click += new System.EventHandler(this.mLayoutPanel_Click); - this.mLayoutPanel.SizeChanged += new System.EventHandler(this.mLayoutPanel_SizeChanged); + this.mLayoutPanel.SizeChanged += new System.EventHandler(this.LayoutPanel_SizeChanged); // // StripsView // Modified: trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/ProjectView/StripsView.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -25,6 +25,7 @@ private ISelectableInStripView mSelectedItem; // the actual item for the selection private Dictionary<Keys, HandledShortcutKey> mShortcutKeys; // list of all shortcuts private bool mWrapStrips; // wrapping of strips + private bool mIsEnteringView; // flag set when entering the view // cursor stuff private AudioBlock mPlaybackBlock; @@ -40,9 +41,27 @@ mView = null; mSelection = null; mFocusing = false; + mIsEnteringView = false; + mWrapStrips = false; } + /// <summary> + /// Get the entering flag; and turn down the flag immediatly. + /// </summary> + public bool IsEnteringView + { + get + { + bool isEntering = mIsEnteringView; + mIsEnteringView = false; + return isEntering; + } + } + + /// <summary> + /// String to be shown in the status bar. + /// </summary> public override string ToString() { return Localizer.Message("strips_view_to_string"); } /// <summary> @@ -332,16 +351,16 @@ #region Event handlers // Handle resizing of the layout panel: all strips are resized to be at least as wide. - private void mLayoutPanel_SizeChanged(object sender, EventArgs e) + private void LayoutPanel_SizeChanged(object sender, EventArgs e) { if (mLayoutPanel.Controls.Count > 0) { Control last = mLayoutPanel.Controls[mLayoutPanel.Controls.Count - 1]; - int scrollbarW = last.Location.Y + last.Height > Height ? SystemInformation.VerticalScrollBarWidth : 0; + int scrollbarW = last.Location.Y + last.Height > Height ? SystemInformation.VerticalScrollBarWidth + Margin.Right : 0; foreach (Control c in mLayoutPanel.Controls) { int w = mLayoutPanel.Width - c.Location.X - c.Margin.Right - scrollbarW; - c.Size = new Size(w, c.Height); + c.Width = w; } } } @@ -419,16 +438,17 @@ return strip; } + // Add a single strip for a section node private Strip AddStripForSection_(ObiNode node) { Strip strip = null; if (node is SectionNode) { strip = new Strip((SectionNode)node, this); + strip.Wrap = mWrapStrips; mLayoutPanel.Controls.Add(strip); mLayoutPanel.Controls.SetChildIndex(strip, ((SectionNode)node).Position); - int w = mLayoutPanel.Width - strip.Location.X - strip.Margin.Right; - strip.Size = new Size(w, strip.Height); + strip.Width = Width; } for (int i = 0; i < node.SectionChildCount; ++i) AddStripForSection_(node.SectionChild(i)); for (int i = 0; i < node.PhraseChildCount; ++i) strip.AddBlockForNode(node.PhraseChild(i)); @@ -1107,10 +1127,9 @@ } } - internal bool IsEnteringStripsView = false; private void StripsView_Enter(object sender, EventArgs e) { - IsEnteringStripsView = true; + mIsEnteringView = true; } /// <summary> @@ -1198,7 +1217,8 @@ foreach (Control c in mLayoutPanel.Controls) { Strip strip = c as Strip; - if (strip != null) strip.WrapToWidth(Width, mWrapStrips); + if (strip != null) strip.Wrap = mWrapStrips; + // if (strip != null) strip.WrapToWidth(Width, mWrapStrips); } } } Modified: trunk/urakawa/application/Obi/Obi/messages.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/messages.Designer.cs 2008-05-15 00:49:53 UTC (rev 3057) @@ -342,11 +342,11 @@ } /// <summary> - /// Looks up a localized string similar to Contents View. + /// Looks up a localized string similar to Content view. /// </summary> - internal static string ContentsView_Label { + internal static string content_view { get { - return ResourceManager.GetString("ContentsView_Label", resourceCulture); + return ResourceManager.GetString("content_view", resourceCulture); } } Modified: trunk/urakawa/application/Obi/Obi/messages.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-14 20:44:45 UTC (rev 3056) +++ trunk/urakawa/application/Obi/Obi/messages.resx 2008-05-15 00:49:53 UTC (rev 3057) @@ -672,8 +672,8 @@ <value>Start monitoring</value> <comment>Button label</comment> </data> - <data name="ContentsView_Label" xml:space="preserve"> - <value>Contents View</value> + <data name="content_view" xml:space="preserve"> + <value>Content view</value> </data> <data name="audio_block_label" xml:space="preserve"> <value>{0} {1} of {2}{3}</value> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |