From: <ju...@us...> - 2006-08-12 16:13:06
|
Revision: 856 Author: julienq Date: 2006-08-12 09:12:52 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/urakawa/?rev=856&view=rev Log Message: ----------- Added some menu icons Added global cut/copy/paste/delete (does nothing yet) Added call to record dialog (but need to be completed) Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Dialogs/Record.Designer.cs trunk/urakawa/application/Obi/Obi/Dialogs/Record.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/Project.cs trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.ContextMenu.cs trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.Designer.cs trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.cs Modified: trunk/urakawa/application/Obi/Obi/Dialogs/Record.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Dialogs/Record.Designer.cs 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/Dialogs/Record.Designer.cs 2006-08-12 16:12:52 UTC (rev 856) @@ -40,9 +40,9 @@ // // mRecordButton // - this.mRecordButton.Location = new System.Drawing.Point(24, 131); + this.mRecordButton.Location = new System.Drawing.Point(24, 121); this.mRecordButton.Name = "mRecordButton"; - this.mRecordButton.Size = new System.Drawing.Size(75, 25); + this.mRecordButton.Size = new System.Drawing.Size(75, 23); this.mRecordButton.TabIndex = 0; this.mRecordButton.Text = "&Record"; this.mRecordButton.UseVisualStyleBackColor = true; @@ -51,25 +51,26 @@ // mDisplayTimeLable // this.mDisplayTimeLable.AutoSize = true; - this.mDisplayTimeLable.Location = new System.Drawing.Point(145, 25); + this.mDisplayTimeLable.Location = new System.Drawing.Point(145, 23); this.mDisplayTimeLable.Name = "mDisplayTimeLable"; - this.mDisplayTimeLable.Size = new System.Drawing.Size(73, 13); + this.mDisplayTimeLable.Size = new System.Drawing.Size(75, 12); this.mDisplayTimeLable.TabIndex = 1; this.mDisplayTimeLable.Text = "Running &Time"; // // mTimeTextBox // - this.mTimeTextBox.Location = new System.Drawing.Point(132, 41); + this.mTimeTextBox.Location = new System.Drawing.Point(132, 38); this.mTimeTextBox.Name = "mTimeTextBox"; this.mTimeTextBox.ReadOnly = true; - this.mTimeTextBox.Size = new System.Drawing.Size(100, 20); + this.mTimeTextBox.Size = new System.Drawing.Size(100, 19); this.mTimeTextBox.TabIndex = 2; // // mStopButton // - this.mStopButton.Location = new System.Drawing.Point(123, 131); + this.mStopButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.mStopButton.Location = new System.Drawing.Point(123, 121); this.mStopButton.Name = "mStopButton"; - this.mStopButton.Size = new System.Drawing.Size(75, 23); + this.mStopButton.Size = new System.Drawing.Size(75, 21); this.mStopButton.TabIndex = 3; this.mStopButton.Text = "&Stop"; this.mStopButton.UseVisualStyleBackColor = true; @@ -77,9 +78,9 @@ // // mPhraseMarkerButton // - this.mPhraseMarkerButton.Location = new System.Drawing.Point(238, 132); + this.mPhraseMarkerButton.Location = new System.Drawing.Point(238, 122); this.mPhraseMarkerButton.Name = "mPhraseMarkerButton"; - this.mPhraseMarkerButton.Size = new System.Drawing.Size(88, 23); + this.mPhraseMarkerButton.Size = new System.Drawing.Size(88, 21); this.mPhraseMarkerButton.TabIndex = 4; this.mPhraseMarkerButton.Text = "Phrase &Marker"; this.mPhraseMarkerButton.UseVisualStyleBackColor = true; @@ -91,9 +92,10 @@ // // Record // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AcceptButton = this.mStopButton; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(367, 183); + this.ClientSize = new System.Drawing.Size(367, 169); this.Controls.Add(this.mPhraseMarkerButton); this.Controls.Add(this.mStopButton); this.Controls.Add(this.mTimeTextBox); Modified: trunk/urakawa/application/Obi/Obi/Dialogs/Record.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Dialogs/Record.cs 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/Dialogs/Record.cs 2006-08-12 16:12:52 UTC (rev 856) @@ -24,9 +24,6 @@ private int mBitDepth; // required bit depth private Assets.AssetManager mAssManager; // the asset manager (for creating new assets) private Audio.VuMeter ob_VuMeter = new Audio.VuMeter(); - private event Events.Audio.Recorder.StartingPhraseHandler StartPhrase; - private event Events.Audio.Recorder.ContinuingPhraseHandler ContinuePhrase; - private event Events.Audio.Recorder.FinishingPhraseHandler FinishPhrase; double BeginTime = 0; double CurrentTime ;//time while the phrase is recorded double EndTime;//the end time when finish phrase event is triggered @@ -34,9 +31,9 @@ private List<Assets.AudioMediaAsset> mAssets; // the list of assets created while recording - // public event Events.Audio.Recorder.StartingPhraseHandler StartingPhrase; - // public event Events.Audio.Recorder.ContinuingPhraseHandler ContinuingPhrase; - // public event Events.Audio.Recorder.FinishingPhraseHandler FinishingPhrase; + public event Events.Audio.Recorder.StartingPhraseHandler StartingPhrase; + public event Events.Audio.Recorder.ContinuingPhraseHandler ContinuingPhrase; + public event Events.Audio.Recorder.FinishingPhraseHandler FinishingPhrase; /// <summary> /// The list of assets created. @@ -60,9 +57,6 @@ Audio.AudioRecorder.Instance.StateChanged += new Events.Audio.Recorder.StateChangedHandler(AudioRecorder_StateChanged); Audio.AudioRecorder.Instance.UpdateVuMeterFromRecorder += new Events.Audio.Recorder.UpdateVuMeterHandler(AudioRecorder_UpdateVuMeter); - StartPhrase += new Obi.Events.Audio.Recorder.StartingPhraseHandler(Start_Phrase); - ContinuePhrase += new Obi.Events.Audio.Recorder.ContinuingPhraseHandler(Continue_Phrase); - FinishPhrase += new Events.Audio.Recorder.FinishingPhraseHandler(Finish_Phrase); } private void AudioRecorder_StateChanged(object sender, Events.Audio.Recorder.StateChangedEventArgs state) @@ -72,16 +66,6 @@ private void AudioRecorder_UpdateVuMeter(Object sender, Events.Audio.Recorder.UpdateVuMeterEventArgs update) { } - private void Finish_Phrase(object sender, Events.Audio.Recorder.PhraseEventArgs Finish) - { -} - private void Continue_Phrase(object sender, Events.Audio.Recorder.PhraseEventArgs contine) - { -} - - private void Start_Phrase(object sender, Events.Audio.Recorder.PhraseEventArgs start) - { - } private void Record_Load(object sender, EventArgs e) { @@ -176,17 +160,17 @@ Audio.AudioRecorder.Instance.StopRecording(); EndTime = CurrentTime; Obi.Events.Audio.Recorder.PhraseEventArgs mEnd = new Obi.Events.Audio.Recorder.PhraseEventArgs(1); - FinishPhrase(this, mEnd); + FinishingPhrase(this, mEnd); timer1.Enabled = false; } if (Audio.AudioRecorder.Instance.State.Equals(Audio.AudioRecorderState.Idle)) { Obi.Events.Audio.Recorder.PhraseEventArgs mStart = new Obi.Events.Audio.Recorder.PhraseEventArgs(BeginTime); - StartPhrase(this, mStart); + StartingPhrase(this, mStart); Audio.AudioRecorder.Instance.StartRecording(mPhraseMarkerAsset); CurrentTime = Audio.AudioRecorder.Instance.TimeOfAsset; Obi.Events.Audio.Recorder.PhraseEventArgs mContinue = new Obi.Events.Audio.Recorder.PhraseEventArgs(CurrentTime); - ContinuePhrase(this, mContinue); + ContinuingPhrase(this, mContinue); timer1.Enabled = true; mRecordButton.Enabled = false; } Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs 2006-08-12 16:12:52 UTC (rev 856) @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ObiForm)); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mNewProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -45,6 +46,11 @@ this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mUndoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mRedoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.mCutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mCopyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mPasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mDeleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.metadataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.touchProjectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -70,6 +76,7 @@ this.mImportAudioFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mPlayAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mSplitAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mMergeWithNextAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mDeleteAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mRenameAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); @@ -90,7 +97,6 @@ this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.mProjectPanel = new Obi.UserControls.ProjectPanel(); - this.mMergeWithNextAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -129,6 +135,8 @@ // // mNewProjectToolStripMenuItem // + this.mNewProjectToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mNewProjectToolStripMenuItem.Image"))); + this.mNewProjectToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.mNewProjectToolStripMenuItem.Name = "mNewProjectToolStripMenuItem"; this.mNewProjectToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.mNewProjectToolStripMenuItem.Text = "&New project"; @@ -136,6 +144,8 @@ // // mOpenProjectToolStripMenuItem // + this.mOpenProjectToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mOpenProjectToolStripMenuItem.Image"))); + this.mOpenProjectToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.mOpenProjectToolStripMenuItem.Name = "mOpenProjectToolStripMenuItem"; this.mOpenProjectToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.mOpenProjectToolStripMenuItem.Text = "&Open project"; @@ -169,6 +179,8 @@ // // mSaveProjectToolStripMenuItem // + this.mSaveProjectToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mSaveProjectToolStripMenuItem.Image"))); + this.mSaveProjectToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.mSaveProjectToolStripMenuItem.Name = "mSaveProjectToolStripMenuItem"; this.mSaveProjectToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.mSaveProjectToolStripMenuItem.Size = new System.Drawing.Size(171, 22); @@ -213,6 +225,11 @@ this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mUndoToolStripMenuItem, this.mRedoToolStripMenuItem, + this.toolStripSeparator11, + this.mCutToolStripMenuItem, + this.mCopyToolStripMenuItem, + this.mPasteToolStripMenuItem, + this.mDeleteToolStripMenuItem, this.toolStripSeparator4, this.metadataToolStripMenuItem, this.touchProjectToolStripMenuItem}); @@ -224,7 +241,7 @@ // this.mUndoToolStripMenuItem.Name = "mUndoToolStripMenuItem"; this.mUndoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.mUndoToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.mUndoToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.mUndoToolStripMenuItem.Text = "&Undo"; this.mUndoToolStripMenuItem.Click += new System.EventHandler(this.mUndoToolStripMenuItem_Click); // @@ -232,26 +249,65 @@ // this.mRedoToolStripMenuItem.Name = "mRedoToolStripMenuItem"; this.mRedoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.mRedoToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.mRedoToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.mRedoToolStripMenuItem.Text = "&Redo"; this.mRedoToolStripMenuItem.Click += new System.EventHandler(this.mRedoToolStripMenuItem_Click); // + // toolStripSeparator11 + // + this.toolStripSeparator11.Name = "toolStripSeparator11"; + this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6); + // + // mCutToolStripMenuItem + // + this.mCutToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mCutToolStripMenuItem.Image"))); + this.mCutToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mCutToolStripMenuItem.Name = "mCutToolStripMenuItem"; + this.mCutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); + this.mCutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.mCutToolStripMenuItem.Text = "&Cut"; + // + // mCopyToolStripMenuItem + // + this.mCopyToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mCopyToolStripMenuItem.Image"))); + this.mCopyToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mCopyToolStripMenuItem.Name = "mCopyToolStripMenuItem"; + this.mCopyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); + this.mCopyToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.mCopyToolStripMenuItem.Text = "Cop&y"; + // + // mPasteToolStripMenuItem + // + this.mPasteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("mPasteToolStripMenuItem.Image"))); + this.mPasteToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Magenta; + this.mPasteToolStripMenuItem.Name = "mPasteToolStripMenuItem"; + this.mPasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); + this.mPasteToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.mPasteToolStripMenuItem.Text = "&Paste"; + // + // mDeleteToolStripMenuItem + // + this.mDeleteToolStripMenuItem.Name = "mDeleteToolStripMenuItem"; + this.mDeleteToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; + this.mDeleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.mDeleteToolStripMenuItem.Text = "&Delete"; + // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); // // metadataToolStripMenuItem // this.metadataToolStripMenuItem.Name = "metadataToolStripMenuItem"; - this.metadataToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.metadataToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.metadataToolStripMenuItem.Text = "&Metadata"; this.metadataToolStripMenuItem.Click += new System.EventHandler(this.metadataToolStripMenuItem_Click); // // touchProjectToolStripMenuItem // this.touchProjectToolStripMenuItem.Name = "touchProjectToolStripMenuItem"; - this.touchProjectToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.touchProjectToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.touchProjectToolStripMenuItem.Text = "&Touch project"; this.touchProjectToolStripMenuItem.Click += new System.EventHandler(this.touchProjectToolStripMenuItem_Click); // @@ -416,6 +472,12 @@ this.mSplitAudioBlockToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.mSplitAudioBlockToolStripMenuItem.Text = "&Split audio block"; // + // mMergeWithNextAudioBlockToolStripMenuItem + // + this.mMergeWithNextAudioBlockToolStripMenuItem.Name = "mMergeWithNextAudioBlockToolStripMenuItem"; + this.mMergeWithNextAudioBlockToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.mMergeWithNextAudioBlockToolStripMenuItem.Text = "&Merge with next audio block"; + // // mDeleteAudioBlockToolStripMenuItem // this.mDeleteAudioBlockToolStripMenuItem.Name = "mDeleteAudioBlockToolStripMenuItem"; @@ -523,14 +585,14 @@ // this.mHelpToolStripMenuItem1.Name = "mHelpToolStripMenuItem1"; this.mHelpToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.mHelpToolStripMenuItem1.Size = new System.Drawing.Size(121, 22); - this.mHelpToolStripMenuItem1.Text = "&Help"; + this.mHelpToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); + this.mHelpToolStripMenuItem1.Text = "&Contents"; this.mHelpToolStripMenuItem1.Click += new System.EventHandler(this.mHelpToolStripMenuItem1_Click); // // aboutObiToolStripMenuItem // this.aboutObiToolStripMenuItem.Name = "aboutObiToolStripMenuItem"; - this.aboutObiToolStripMenuItem.Size = new System.Drawing.Size(121, 22); + this.aboutObiToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.aboutObiToolStripMenuItem.Text = "&About Obi"; this.aboutObiToolStripMenuItem.Click += new System.EventHandler(this.aboutObiToolStripMenuItem_Click); // @@ -563,12 +625,6 @@ this.mProjectPanel.Size = new System.Drawing.Size(767, 450); this.mProjectPanel.TabIndex = 4; // - // mMergeWithNextAudioBlockToolStripMenuItem - // - this.mMergeWithNextAudioBlockToolStripMenuItem.Name = "mMergeWithNextAudioBlockToolStripMenuItem"; - this.mMergeWithNextAudioBlockToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.mMergeWithNextAudioBlockToolStripMenuItem.Text = "&Merge with next audio block"; - // // ObiForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -657,6 +713,11 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; private System.Windows.Forms.ToolStripMenuItem dumpTreeDEBUGToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem mMergeWithNextAudioBlockToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mCutToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; + private System.Windows.Forms.ToolStripMenuItem mCopyToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mPasteToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem mDeleteToolStripMenuItem; } Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2006-08-12 16:12:52 UTC (rev 856) @@ -25,6 +25,11 @@ private Settings mSettings; // application settings private Commands.CommandManager mCommandManager; // the undo stack for this project (should it belong to the project?) + internal Settings Settings + { + get { return mSettings; } + } + /// <summary> /// Initialize a new form. No project is opened at creation time. /// </summary> Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.resx 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/ObiForm.resx 2006-08-12 16:12:52 UTC (rev 856) @@ -117,10 +117,100 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <metadata name="menuStrip1.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="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing"> <value>17, 17</value> - </metadata> - <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + </data> + <data name="mNewProjectToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAQ9JREFUOE+t09lq + wkAUBmBfyr5DfY32jaReSOmFCyKCgkKLFrVUBZeKiEbshqRuaNw1xiXmLxMJBJ0Zc+GBw9zMfDPnHMZm + u1ZE35s4zXCqjmC8Al+sgHLjD9y7yGFWPIbecOO45yORtMAEHnxxJHL1IyKI9JeEXqtMwOl50Q8bSS0l + 8PzBBPbqAQQxICrgjeapgKZpkJUdBmNZB+y3d/QSnsIZKrDdqZjMFYj9OR9wB1NngHrQsJC36EkrfIkT + PuDyJ84AZbOHNF2j1Z2h9i3xAVKfOUjjZssN2oMFmq0xSkLfOmBu3E97iurnENlKxzpgbpzwO0Kh1kOy + KFoDjHmzVuYYjRmTDZfyWh9Yd/4B2Mz2w1z7EGUAAAAASUVORK5CYII= +</value> + </data> + <data name="mOpenProjectToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I + k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC + TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p + AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0 + BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr + UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG + CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5 + F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS + rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt + NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp + 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W + AAAAAElFTkSuQmCC +</value> + </data> + <data name="mSaveProjectToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAixJREFUOE+tk91L + k3EUx/cvdN9N0EW3NTWGa7EaPOUcyqphWBG9PZEv5dJlmqhYmUYtXyBb4dJJy+kknFT4BqZIjaFMJUsz + V7TEoabYRDD49ju/6Pm1Mi+iH5zLz+c855zvo1L9j/fsaRRUvvZltHmX8Ni9gMaGCO47ZlBb8wn22yHc + KJ9CackECgteIy93FBfOB6H0JrC3B6ipXsVGb2V1Dca0XhxOe8JLEXhbF7mgsuLLX3mCIwsr2G1+DrVa + huWQRwjcj+a5oLTk87qCn/D78CLiTD4UXJ7GAXOTEDjrZ7ngku3dH4Jf4ZHJCLZJXlhzxpGa4hSCurth + LsjOGo0R/A4PBsPYrHdDlgMwmRxCUF31kQvkMwFFsB7c4/+ATYkNOHL0BZKSaoXgZuU0urvATgkcP/kK + lmMDfNu0MJqZPps6/4D7cNDSCUmyC8HVskl0+MAyADS5vrG7f0X59Tm+VFoYzZyZEVTg5NR2GAwVQnCl + cByeZuChc40FJwpjek5MmU/YkH6uiHdOTmHwfg/0+jIhsOWNMRiouhPlnUnAQoI4rYSht7MYm5qDnHsN + e41tHNbucUGnKxICiqXjHpTPJgHBZ/Nv4U1oHqGZJVwstiNe72JwI+J3PYA2MV8IMjOG2dzLfOatBg+2 + 7JDQ0tEPX9cguvv8GHg5hH0mC9S6eiQweLumDhqNVQgo06dP9fN4UsIoJHRnOhVtmxZGM1NXKoJ3JmTH + Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII= +</value> + </data> + <data name="mCutToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAYdJREFUOE+t001L + QlEQBuB+TdCmRVEJRRIWtRAUlKsQhFmkpZQtIiWyAlMwP5KkXS0shLqGFkgoFqWQmaRR2qIvU7FMwWhd + 8JZXkFx0uVGzOcNh5jkDw6mr+++4SN7B6fbju/uQecYm6a25+/Hdl2IJptWNmmJyL4DwWZwZUJbtayT8 + RxGqIV8oQaaaRfrxkTmw4z2G+WuKbC6PYDgOkUSJp6ccc+AgdI4luwPbHh/UCxb0S0aZN5fHTmefMTVv + wfDEHIiBMegMpt8BZUShNoGQTIKQGxA8TTIHMoUPGF1vEOvTWHTcgqeJQahNwLqVQiRRpIdS+XcM2l4h + 1t2DI3WAP7oGoSYE3kwSPQofljcqm/kxjK4SCH0OXSMetItsUC26wZuOVptYhI0eEOuz1YI2gZnKBdpr + 6iR9V2jkKOkBQpeiCryhFFr4eioft16iU7qNho4h1Dc00QOqlRuwpSSa+UawuZXdByIZsPoUaOmWwrUf + owcOozlwZeto7ZXDuXvCfHV/+dGfqqrf44qgu28AAAAASUVORK5CYII= +</value> + </data> + <data name="mCopyToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAeJJREFUOE+lk9FP + klEYxv1TSsecde0f0FpZrTbbal7URVvZuuJCr7pq2WzLNWy0iSHNwtIB9qG0ltLSYRJpBomUgZPMGSyU + 8SmJIOiv7zssCdrAzXd77s77e5/nnPdUVR20HBPfUCWNB4QsI176HB8IL/9iX2y1ubTMwx6utz0nuLhc + GWIfCxT153Z26ep/g9Md4FJLZ2WIZdQnAM4QSJ/BH5Z5aH6NNCljm0hgdSV4MppAPxQXCq5kil31OTx7 + DjLbOeSNNJFYUgBKq31glfpmN76F9QLEZHOJc73ubXQjMreln7Q+DdP/du0/QIsxhmNK5mjTMJ/m43mI + Qcmr5t5MZVlNpFiKrPM1vIbpVVQAOqSckF+ZekUX5UjTS+ouDFLb+CwPUPNupbN7k7WmEDcMX3hgXSpy + IP/OsrCyhXtuA6M0g+bc4wJATqaZ/x7DF4zg8f9g/OMibb355701kERriHL5fojzd2aFjNI0mjPdBUD9 + 6auUqlU/KwBZJV4skWUuvMmYV8b+Ls6jQQ81DfryO3KtfUoA/p3810G37T3VJ3TlARdvukhldjANeemx + z2B8MS0mq80GyySHj98rD2jQOpXbtgrVNprRnO2h5lQX1Sc7leYODh27W3nN9/WZDnroDx0A5wwhdtmt + AAAAAElFTkSuQmCC +</value> + </data> + <data name="mPasteToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlBJREFUOE+1k1lI + lGEUhn/owm6KFuqqq4LoJooIqouMwixMM4zEjKyJGJUSlcnSITU1RSe3SdPGyGVQc6tEUSkSIXFo13CM + FonUyGmy5p9xz+Lp/z8ZbGjzpgMv5+a8z1n4Pkn6H9HZnEH7zVQayxKYF7+hMg+3ynKO4LBVMWa7xmBf + Nme1vuSl67hi0GNMj/sVqBon5XqmnXVMOqoxF+sYH6kgJyWKF13xnD/tT7xmM7bOY4y0riY6bL8nRAWo + 5mlnDUUZR+m2ZCO/L2C4T89bywmaSgIJD/WmKnEVT/MkIg/v8wTUVeTMAuQbGBLDSNaFoI8K5lxkEDpt + IDEafyJCfciPXiMAIX7enoDqUgNTci1TdhPjQ5nYn0dhrVgu1Fu+jO7iRTwyegmzKp9tGz0BZlMGE/Yy + JgbSGH95irFnB5GbF5Nb3kqmqZELl2uJN5iJSS0hPMFIWGyWJ6C0MJXRQSNjfVpGH/vjur+Jj7dXCLM7 + pme+4XBOMjDsIDgihYDj+jlISW4S8qs0XA99cXWsx9m2ksFySXRWo/RWp5Cppp3efpsw3+2ysidIMwsp + zErgc88ZnO3rkFuWYq/3ov+6JMb+OvOdLy6l8wcHvW9sWHre4Rcag69i3rX3AN7bdyDlX4zD/iBCMS/h + U8NChioXYC2SiFZ2Vsd2T3BVmaDA3EZTh1VkVVs3rEW6lBwrHoj7yu6sVQ72c+d7ltfCXH+nm5rWJ3MA + dY3cpJPKCwtEE7SbgJ1bBFm9trqzu9vvspjgT3FIubZa8C/N67P9regHTvjvLQ3rR38AAAAASUVORK5C + YII= +</value> + </data> + <data name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing"> <value>127, 17</value> - </metadata> + </data> </root> \ No newline at end of file Modified: trunk/urakawa/application/Obi/Obi/Project.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Project.cs 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/Project.cs 2006-08-12 16:12:52 UTC (rev 856) @@ -111,6 +111,11 @@ } } + internal Assets.AssetManager AssetManager + { + get { return mAssManager; } + } + /// <summary> /// Create an empty project. And I mean empty. /// </summary> Modified: trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.ContextMenu.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.ContextMenu.cs 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.ContextMenu.cs 2006-08-12 16:12:52 UTC (rev 856) @@ -61,6 +61,44 @@ } /// <summary> + /// Bring up the record dialog. + /// </summary> + private void mRecordAudioToolStripMenuItem_Click(object sender, EventArgs e) + { + if (mSelectedSection != null) + { + Settings settings = ((ObiForm)ParentForm).Settings; + Dialogs.Record dialog = new Dialogs.Record(settings.AudioChannels, settings.SampleRate, settings.BitDepth, + mProjectPanel.Project.AssetManager); + dialog.StartingPhrase += new Events.Audio.Recorder.StartingPhraseHandler(Record_StartingPhrase); + dialog.ContinuingPhrase += new Events.Audio.Recorder.ContinuingPhraseHandler(Record_ContinuingPhrase); + dialog.FinishingPhrase += new Events.Audio.Recorder.FinishingPhraseHandler(Record_FinishingPhrase); + if (dialog.ShowDialog() == DialogResult.OK) + { + int index = mSelectedPhrase == null ? + Project.GetPhrasesCount(mSelectedSection) : mSelectedSection.indexOf(mSelectedPhrase) + 1; + foreach (Assets.AudioMediaAsset asset in dialog.Assets) + { + + ++index; + } + } + } + } + + private void Record_StartingPhrase(object sender, Events.Audio.Recorder.PhraseEventArgs e) + { + } + + private void Record_ContinuingPhrase(object sender, Events.Audio.Recorder.PhraseEventArgs e) + { + } + + private void Record_FinishingPhrase(object sender, Events.Audio.Recorder.PhraseEventArgs e) + { + } + + /// <summary> /// Play the currently selected audio block. /// </summary> /// <remarks>JQ</remarks> Modified: trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.Designer.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.Designer.cs 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.Designer.cs 2006-08-12 16:12:52 UTC (rev 856) @@ -35,14 +35,14 @@ this.mAddStripToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mRenameStripToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.mPlayAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recordAudioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mImportAudioFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mDeleteAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.moveAudioBlockforwardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.moveAudioBlockbackwardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mEditAudioBlockLabelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mSplitAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.recordAudioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mPlayAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mMergeWithNextAudioBlockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.mShowInTOCViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -93,7 +93,7 @@ this.mShowInTOCViewToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.ShowImageMargin = false; - this.contextMenuStrip1.Size = new System.Drawing.Size(190, 280); + this.contextMenuStrip1.Size = new System.Drawing.Size(190, 302); // // mAddStripToolStripMenuItem // @@ -114,6 +114,20 @@ this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(186, 6); // + // mPlayAudioBlockToolStripMenuItem + // + this.mPlayAudioBlockToolStripMenuItem.Name = "mPlayAudioBlockToolStripMenuItem"; + this.mPlayAudioBlockToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.mPlayAudioBlockToolStripMenuItem.Text = "&Play audio block"; + this.mPlayAudioBlockToolStripMenuItem.Click += new System.EventHandler(this.mPlayAudioBlockToolStripMenuItem_Click); + // + // recordAudioToolStripMenuItem + // + this.recordAudioToolStripMenuItem.Name = "recordAudioToolStripMenuItem"; + this.recordAudioToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.recordAudioToolStripMenuItem.Text = "Re&cord audio"; + this.recordAudioToolStripMenuItem.Click += new System.EventHandler(this.mRecordAudioToolStripMenuItem_Click); + // // mImportAudioFileToolStripMenuItem // this.mImportAudioFileToolStripMenuItem.Name = "mImportAudioFileToolStripMenuItem"; @@ -156,19 +170,6 @@ this.mSplitAudioBlockToolStripMenuItem.Text = "&Split audio block"; this.mSplitAudioBlockToolStripMenuItem.Click += new System.EventHandler(this.mSplitAudioBlockToolStripMenuItem_Click); // - // recordAudioToolStripMenuItem - // - this.recordAudioToolStripMenuItem.Name = "recordAudioToolStripMenuItem"; - this.recordAudioToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.recordAudioToolStripMenuItem.Text = "Re&cord audio"; - // - // mPlayAudioBlockToolStripMenuItem - // - this.mPlayAudioBlockToolStripMenuItem.Name = "mPlayAudioBlockToolStripMenuItem"; - this.mPlayAudioBlockToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.mPlayAudioBlockToolStripMenuItem.Text = "&Play audio block"; - this.mPlayAudioBlockToolStripMenuItem.Click += new System.EventHandler(this.mPlayAudioBlockToolStripMenuItem_Click); - // // mMergeWithNextAudioBlockToolStripMenuItem // this.mMergeWithNextAudioBlockToolStripMenuItem.Name = "mMergeWithNextAudioBlockToolStripMenuItem"; Modified: trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.cs 2006-08-12 15:20:53 UTC (rev 855) +++ trunk/urakawa/application/Obi/Obi/UserControls/StripManagerPanel.cs 2006-08-12 16:12:52 UTC (rev 856) @@ -29,6 +29,7 @@ public event Events.Node.RequestToRenameNodeHandler RenameSection; public event Events.Node.SetMediaHandler SetMediaRequested; public event Events.Strip.RequestToImportAssetHandler ImportAudioAssetRequested; + // public event Events.Strip.RequestToAddAssetHandler AddAudioAssetRequested; public event Events.Node.RequestToDeleteBlockHandler DeleteBlockRequested; public event Events.Node.RequestToMoveBlockHandler MoveAudioBlockForwardRequested; public event Events.Node.RequestToMoveBlockHandler MoveAudioBlockBackwardRequested; @@ -466,10 +467,5 @@ } } - - private void contextMenuStrip1_Opening(object sender, CancelEventArgs e) - { - - } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |