[Urakawa-vcs] SF.net SVN: urakawa: [3082] trunk/urakawa/application/Obi/Obi

[<ju...@us...>]

Revision: 3082
          http://urakawa.svn.sourceforge.net/urakawa/?rev=3082&view=rev
Author:   julienq
Date:     2008-05-16 13:51:17 -0700 (Fri, 16 May 2008)

Log Message:
-----------
Fixed record sub-menu

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/Presentation.cs

Modified: trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs	2008-05-16 20:07:54 UTC (rev 3081)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.Designer.cs	2008-05-16 20:51:17 UTC (rev 3082)
@@ -124,7 +124,7 @@
             this.mPauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mResumeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mStopToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.FastPlaytoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.mFastPlaytoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.NormalSpeedtoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.SpeedUptoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mSpeedDowntoolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -134,8 +134,8 @@
             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();
+            this.mStartMonitoringToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.mStartRecordingDirectlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mAllowOverwriteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
             this.navigationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -159,6 +159,7 @@
             this.mStatusStrip = new System.Windows.Forms.StatusStrip();
             this.mStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
             this.mProjectView = new Obi.ProjectView.ProjectView();
+            this.mStartRecordingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mMenuStrip.SuspendLayout();
             this.mStatusStrip.SuspendLayout();
             this.SuspendLayout();
@@ -179,7 +180,7 @@
             // 
             // mFileToolStripMenuItem
             // 
-            resources.ApplyResources(this.mFileToolStripMenuItem, "mFileToolStripMenuItem");
+            this.mFileToolStripMenuItem.AccessibleName = global::Obi.messages.phrase_extra_Plain;
             this.mFileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.mNewProjectToolStripMenuItem,
             this.mNewProjectFromImportToolStripMenuItem,
@@ -195,6 +196,7 @@
             this.toolStripSeparator3,
             this.mExitToolStripMenuItem});
             this.mFileToolStripMenuItem.Name = "mFileToolStripMenuItem";
+            resources.ApplyResources(this.mFileToolStripMenuItem, "mFileToolStripMenuItem");
             // 
             // mNewProjectToolStripMenuItem
             // 
@@ -800,7 +802,7 @@
             this.mPauseToolStripMenuItem,
             this.mResumeToolStripMenuItem,
             this.mStopToolStripMenuItem,
-            this.FastPlaytoolStripMenuItem,
+            this.mFastPlaytoolStripMenuItem,
             this.mPreviewToolStripMenuItem,
             this.mRecordToolStripMenuItem,
             this.toolStripSeparator5,
@@ -848,15 +850,15 @@
             this.mStopToolStripMenuItem.Name = "mStopToolStripMenuItem";
             this.mStopToolStripMenuItem.Click += new System.EventHandler(this.mStopToolStripMenuItem_Click);
             // 
-            // FastPlaytoolStripMenuItem
+            // mFastPlaytoolStripMenuItem
             // 
-            this.FastPlaytoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.mFastPlaytoolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.NormalSpeedtoolStripMenuItem,
             this.SpeedUptoolStripMenuItem,
             this.mSpeedDowntoolStripMenuItem,
             this.mElapseBacktoolStripMenuItem});
-            this.FastPlaytoolStripMenuItem.Name = "FastPlaytoolStripMenuItem";
-            resources.ApplyResources(this.FastPlaytoolStripMenuItem, "FastPlaytoolStripMenuItem");
+            this.mFastPlaytoolStripMenuItem.Name = "mFastPlaytoolStripMenuItem";
+            resources.ApplyResources(this.mFastPlaytoolStripMenuItem, "mFastPlaytoolStripMenuItem");
             // 
             // NormalSpeedtoolStripMenuItem
             // 
@@ -912,23 +914,24 @@
             // mRecordToolStripMenuItem
             // 
             this.mRecordToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.mStartListeningToolStripMenuItem,
+            this.mStartMonitoringToolStripMenuItem,
             this.mStartRecordingToolStripMenuItem,
+            this.mStartRecordingDirectlyToolStripMenuItem,
             this.mAllowOverwriteToolStripMenuItem});
             this.mRecordToolStripMenuItem.Name = "mRecordToolStripMenuItem";
             resources.ApplyResources(this.mRecordToolStripMenuItem, "mRecordToolStripMenuItem");
             // 
             // mStartListeningToolStripMenuItem
             // 
-            this.mStartListeningToolStripMenuItem.Name = "mStartListeningToolStripMenuItem";
-            resources.ApplyResources(this.mStartListeningToolStripMenuItem, "mStartListeningToolStripMenuItem");
-            this.mStartListeningToolStripMenuItem.Click += new System.EventHandler(this.mStartListeningToolStripMenuItem_Click);
+            resources.ApplyResources(this.mStartMonitoringToolStripMenuItem, "mStartListeningToolStripMenuItem");
+            this.mStartMonitoringToolStripMenuItem.Name = "mStartListeningToolStripMenuItem";
+            this.mStartMonitoringToolStripMenuItem.Click += new System.EventHandler(this.mStartMonitoringToolStripMenuItem_Click);
             // 
-            // mStartRecordingToolStripMenuItem
+            // mStartRecordingDirectlyToolStripMenuItem
             // 
-            this.mStartRecordingToolStripMenuItem.Name = "mStartRecordingToolStripMenuItem";
-            resources.ApplyResources(this.mStartRecordingToolStripMenuItem, "mStartRecordingToolStripMenuItem");
-            this.mStartRecordingToolStripMenuItem.Click += new System.EventHandler(this.mStartRecordingToolStripMenuItem_Click);
+            resources.ApplyResources(this.mStartRecordingDirectlyToolStripMenuItem, "mStartRecordingDirectlyToolStripMenuItem");
+            this.mStartRecordingDirectlyToolStripMenuItem.Name = "mStartRecordingDirectlyToolStripMenuItem";
+            this.mStartRecordingDirectlyToolStripMenuItem.Click += new System.EventHandler(this.mStartRecordingDirectlyToolStripMenuItem_Click);
             // 
             // mAllowOverwriteToolStripMenuItem
             // 
@@ -982,10 +985,10 @@
             this.mNextPhraseToolStripMenuItem.Name = "mNextPhraseToolStripMenuItem";
             this.mNextPhraseToolStripMenuItem.Click += new System.EventHandler(this.nextPhraseToolStripMenuItem_Click);
             // 
-            // nextPageToolStripMenuItem
+            // mNextPageToolStripMenuItem
             // 
-            resources.ApplyResources(this.mNextPageToolStripMenuItem, "nextPageToolStripMenuItem");
-            this.mNextPageToolStripMenuItem.Name = "nextPageToolStripMenuItem";
+            resources.ApplyResources(this.mNextPageToolStripMenuItem, "mNextPageToolStripMenuItem");
+            this.mNextPageToolStripMenuItem.Name = "mNextPageToolStripMenuItem";
             this.mNextPageToolStripMenuItem.Click += new System.EventHandler(this.nextPageToolStripMenuItem_Click);
             // 
             // mNextSectionToolStripMenuItem
@@ -1096,6 +1099,12 @@
             this.mProjectView.TOCViewVisible = true;
             this.mProjectView.TransportBarVisible = false;
             // 
+            // mStartRecordingToolStripMenuItem
+            // 
+            resources.ApplyResources(this.mStartRecordingToolStripMenuItem, "mStartRecordingToolStripMenuItem");
+            this.mStartRecordingToolStripMenuItem.Name = "mStartRecordingToolStripMenuItem";
+            this.mStartRecordingToolStripMenuItem.Click += new System.EventHandler(this.mStartRecordingToolStripMenuItem_Click);
+            // 
             // ObiForm
             // 
             resources.ApplyResources(this, "$this");
@@ -1197,8 +1206,8 @@
         private System.Windows.Forms.ToolStripMenuItem mResumeToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem mStopToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem mRecordToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem mStartListeningToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem mStartRecordingToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem mStartMonitoringToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem mStartRecordingDirectlyToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem mAllowOverwriteToolStripMenuItem;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
         private System.Windows.Forms.ToolStripMenuItem navigationToolStripMenuItem;
@@ -1216,7 +1225,7 @@
         private System.Windows.Forms.ToolStripMenuItem mDeleteUnusedDataToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem mFocusOnTransportBarToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem mPhraseDetectionToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem FastPlaytoolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem mFastPlaytoolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem mPreviewToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem NormalSpeedtoolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem SpeedUptoolStripMenuItem;
@@ -1253,6 +1262,7 @@
         private System.Windows.Forms.ToolStripMenuItem mGoToToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem mNextTODOPhraseToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem mPreviousTODOPhraseToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem mStartRecordingToolStripMenuItem;
     }
 }
 

Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.cs	2008-05-16 20:07:54 UTC (rev 3081)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.cs	2008-05-16 20:51:17 UTC (rev 3082)
@@ -636,29 +636,29 @@
             mRewindToolStripMenuItem.Enabled = mProjectView.CanRewind;
 
 
-            FastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay;
-
-
-            // update recording menu items
-            mStartRecordingToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive;
+            mFastPlaytoolStripMenuItem.Enabled = mProjectView.CanPlay;
+            
+            mStartRecordingDirectlyToolStripMenuItem.Enabled = !mProjectView.TransportBar.IsActive;
             if (mProjectView.TransportBar.IsListening)
             {
-                mStartListeningToolStripMenuItem.Text = "Start Recording";
-                mStartListeningToolStripMenuItem.AccessibleName = "Start Recording  ctrl+r";
-                mStartRecordingToolStripMenuItem.Enabled = false;
+                mStartMonitoringToolStripMenuItem.Visible = false;
+                mStartRecordingToolStripMenuItem.Visible = true;
+                mStartRecordingToolStripMenuItem.Enabled = true;
+                mStartRecordingDirectlyToolStripMenuItem.Enabled = false;
             }
             else if (mProjectView.TransportBar.IsRecorderActive) // actual recording is going on
             {
-                mStartListeningToolStripMenuItem.Enabled = false;
-                mStartRecordingToolStripMenuItem.Enabled = false;
+                mStartRecordingToolStripMenuItem.Visible = false;
+                mStartMonitoringToolStripMenuItem.Visible = true;
+                mStartMonitoringToolStripMenuItem.Enabled = false;
+                mStartRecordingDirectlyToolStripMenuItem.Enabled = false;
             }
             else // neither listening nor actual recording is going on
             {
-                mStartListeningToolStripMenuItem.Text = "Start Monitering";
-                mStartListeningToolStripMenuItem.AccessibleName = "Start Monitering ctrl+r";
-
-                mStartListeningToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
-                mStartRecordingToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
+                mStartMonitoringToolStripMenuItem.Visible = true;
+                mStartMonitoringToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
+                mStartRecordingToolStripMenuItem.Visible = false;
+                mStartRecordingDirectlyToolStripMenuItem.Enabled = mProjectView.TransportBar.Enabled;
             }
 
         }
@@ -675,6 +675,11 @@
         }
         private void mStopToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Stop(); }
 
+        private void mStartRecordingToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Record(); }
+        private void mStartMonitoringToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Record(); }
+        private void mStartRecordingDirectlyToolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.StartRecordingDirectly(); }
+
+
         private void PreviewFromtoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(true); }
         private void PreviewUptotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.Preview(false); }
         private void PreviewSelectedAudiotoolStripMenuItem_Click(object sender, EventArgs e) { mProjectView.TransportBar.PreviewAudioSelection(); }
@@ -692,15 +697,7 @@
 
 
 
-        private void mStartListeningToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            mProjectView.TransportBar.Record();
-        }
 
-        private void mStartRecordingToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            mProjectView.TransportBar.StartRecordingDirectly();
-        }
 
 
 
@@ -710,6 +707,9 @@
 
 
 
+
+
+
         private void NormalSpeedtoolStripMenuItem_Click(object sender, EventArgs e)
         {
             mProjectView.TransportBar.FastPlayRateNormalise();

Modified: trunk/urakawa/application/Obi/Obi/ObiForm.resx
===================================================================
--- trunk/urakawa/application/Obi/Obi/ObiForm.resx	2008-05-16 20:07:54 UTC (rev 3081)
+++ trunk/urakawa/application/Obi/Obi/ObiForm.resx	2008-05-16 20:51:17 UTC (rev 3082)
@@ -117,146 +117,10 @@
   <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">
+    <value>0, 0</value>
+  </metadata>
   <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>
-  </data>
-  <data name="mFileToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <value />
-  </data>
-  <data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <value>New project Ctrl+N</value>
-  </data>
-  <data name="mNewProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="mNewProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+N</value>
-  </data>
-  <data name="mNewProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mNewProjectToolStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;New project</value>
-  </data>
-  <data name="mNewProjectFromImportToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <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>
-  </data>
-  <data name="mNewProjectFromImportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mNewProjectFromImportToolStripMenuItem.Text" xml:space="preserve">
-    <value>New project from &amp;import</value>
-  </data>
-  <data name="mOpenProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <value>Open project Ctrl+O</value>
-  </data>
-  <data name="mOpenProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="mOpenProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+O</value>
-  </data>
-  <data name="mOpenProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mOpenProjectToolStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;Open project</value>
-  </data>
-  <data name="mCloseProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <value>Close project Ctrl+W</value>
-  </data>
-  <data name="mCloseProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+W</value>
-  </data>
-  <data name="mCloseProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mCloseProjectToolStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;Close project</value>
-  </data>
-  <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 6</value>
-  </data>
-  <data name="mSaveProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <value>Save project Ctrl+S</value>
-  </data>
-  <data name="mSaveProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="mSaveProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+S</value>
-  </data>
-  <data name="mSaveProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mSaveProjectToolStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;Save project</value>
-  </data>
-  <data name="mSaveProjectAsToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <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>
-  </data>
-  <data name="mSaveProjectAsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mSaveProjectAsToolStripMenuItem.Text" xml:space="preserve">
-    <value>Save project &amp;as...</value>
-  </data>
-  <data name="mCleanProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <value>Clean unreferenced audio Ctrl+L</value>
-  </data>
-  <data name="mCleanProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+L</value>
-  </data>
-  <data name="mCleanProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mCleanProjectToolStripMenuItem.Text" xml:space="preserve">
-    <value>C&amp;lean unreferenced audio</value>
-  </data>
-  <data name="mExportAsDAISYToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <value>Export as DAISY Ctrl+E</value>
-  </data>
-  <data name="mExportAsDAISYToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+E</value>
-  </data>
-  <data name="mExportAsDAISYToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mExportAsDAISYToolStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;Export as DAISY</value>
-  </data>
-  <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 6</value>
-  </data>
-  <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mRecentProjectToolStripMenuItem.Text" xml:space="preserve">
-    <value>&amp;Recent projects</value>
-  </data>
-  <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 6</value>
-  </data>
-  <data name="mExitToolStripMenuItem.AccessibleName" xml:space="preserve">
-    <value>Exit Alt+F4</value>
-  </data>
-  <data name="mExitToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Alt+F4</value>
-  </data>
-  <data name="mExitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>259, 22</value>
-  </data>
-  <data name="mExitToolStripMenuItem.Text" xml:space="preserve">
-    <value>E&amp;xit</value>
-  </data>
   <data name="mFileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>35, 20</value>
   </data>
@@ -320,6 +184,7 @@
   <data name="mStopToolStripMenuItem.AccessibleName" xml:space="preserve">
     <value>Stop Ctrl+Space</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="mStopToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+Space</value>
   </data>
@@ -329,10 +194,10 @@
   <data name="mStopToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Stop</value>
   </data>
-  <data name="FastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="mFastPlaytoolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>172, 22</value>
   </data>
-  <data name="FastPlaytoolStripMenuItem.Text" xml:space="preserve">
+  <data name="mFastPlaytoolStripMenuItem.Text" xml:space="preserve">
     <value>Fast p&amp;lay</value>
   </data>
   <data name="mPreviewToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
@@ -341,6 +206,48 @@
   <data name="mPreviewToolStripMenuItem.Text" xml:space="preserve">
     <value>Pre&amp;view</value>
   </data>
+  <data name="mStartListeningToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Start Monitoring Ctrl+R</value>
+  </data>
+  <data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+R</value>
+  </data>
+  <data name="mStartListeningToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>253, 22</value>
+  </data>
+  <data name="mStartListeningToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Start monitoring</value>
+  </data>
+  <data name="mStartRecordingToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Start recording Ctrl+R</value>
+  </data>
+  <data name="mStartRecordingToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+R</value>
+  </data>
+  <data name="mStartRecordingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>253, 22</value>
+  </data>
+  <data name="mStartRecordingToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Start recording</value>
+  </data>
+  <data name="mStartRecordingDirectlyToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Start Recording directly ctrl+shift+r</value>
+  </data>
+  <data name="mStartRecordingDirectlyToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+Shift+R</value>
+  </data>
+  <data name="mStartRecordingDirectlyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>253, 22</value>
+  </data>
+  <data name="mStartRecordingDirectlyToolStripMenuItem.Text" xml:space="preserve">
+    <value>Start &amp;recording directly</value>
+  </data>
+  <data name="mAllowOverwriteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>253, 22</value>
+  </data>
+  <data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
+    <value>Allow &amp;overwrite</value>
+  </data>
   <data name="mRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>172, 22</value>
   </data>
@@ -429,6 +336,123 @@
   <data name="&gt;&gt;mMenuStrip.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="mNewProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>New project Ctrl+N</value>
+  </data>
+  <data name="mNewProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="mNewProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+N</value>
+  </data>
+  <data name="mNewProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mNewProjectToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;New project</value>
+  </data>
+  <data name="mNewProjectFromImportToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <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>
+  </data>
+  <data name="mNewProjectFromImportToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mNewProjectFromImportToolStripMenuItem.Text" xml:space="preserve">
+    <value>New project from &amp;import</value>
+  </data>
+  <data name="mOpenProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Open project Ctrl+O</value>
+  </data>
+  <data name="mOpenProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="mOpenProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+O</value>
+  </data>
+  <data name="mOpenProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mOpenProjectToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Open project</value>
+  </data>
+  <data name="mCloseProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Close project Ctrl+W</value>
+  </data>
+  <data name="mCloseProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+W</value>
+  </data>
+  <data name="mCloseProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mCloseProjectToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Close project</value>
+  </data>
+  <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>256, 6</value>
+  </data>
+  <data name="mSaveProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Save project Ctrl+S</value>
+  </data>
+  <data name="mSaveProjectToolStripMenuItem.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="mSaveProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+S</value>
+  </data>
+  <data name="mSaveProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mSaveProjectToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Save project</value>
+  </data>
+  <data name="mSaveProjectAsToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <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>
+  </data>
+  <data name="mSaveProjectAsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mSaveProjectAsToolStripMenuItem.Text" xml:space="preserve">
+    <value>Save project &amp;as...</value>
+  </data>
+  <data name="mCleanProjectToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Clean unreferenced audio Ctrl+L</value>
+  </data>
+  <data name="mCleanProjectToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+L</value>
+  </data>
+  <data name="mCleanProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mCleanProjectToolStripMenuItem.Text" xml:space="preserve">
+    <value>C&amp;lean unreferenced audio</value>
+  </data>
+  <data name="mExportAsDAISYToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Export as DAISY Ctrl+E</value>
+  </data>
+  <data name="mExportAsDAISYToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Ctrl+E</value>
+  </data>
+  <data name="mExportAsDAISYToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mExportAsDAISYToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Export as DAISY</value>
+  </data>
+  <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>256, 6</value>
+  </data>
+  <data name="mRecentProjectToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mRecentProjectToolStripMenuItem.Text" xml:space="preserve">
+    <value>&amp;Recent projects</value>
+  </data>
   <data name="openrecentSeparator.Size" type="System.Drawing.Size, System.Drawing">
     <value>112, 6</value>
   </data>
@@ -438,6 +462,21 @@
   <data name="mClearListToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Clear list</value>
   </data>
+  <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>256, 6</value>
+  </data>
+  <data name="mExitToolStripMenuItem.AccessibleName" xml:space="preserve">
+    <value>Exit Alt+F4</value>
+  </data>
+  <data name="mExitToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+    <value>Alt+F4</value>
+  </data>
+  <data name="mExitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>259, 22</value>
+  </data>
+  <data name="mExitToolStripMenuItem.Text" xml:space="preserve">
+    <value>E&amp;xit</value>
+  </data>
   <data name="mUndoToolStripMenuItem.AccessibleName" xml:space="preserve">
     <value>Undo Ctrl+Z</value>
   </data>
@@ -1188,30 +1227,6 @@
   <data name="mPreviewSelectedToolStripMenuItem.Text" xml:space="preserve">
     <value>Preview &amp;selected</value>
   </data>
-  <data name="mStartListeningToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+R</value>
-  </data>
-  <data name="mStartListeningToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>215, 22</value>
-  </data>
-  <data name="mStartListeningToolStripMenuItem.Text" xml:space="preserve">
-    <value>Start &amp;monitoring</value>
-  </data>
-  <data name="mStartRecordingToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
-    <value>Ctrl+Shift+R</value>
-  </data>
-  <data name="mStartRecordingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>215, 22</value>
-  </data>
-  <data name="mStartRecordingToolStripMenuItem.Text" xml:space="preserve">
-    <value>Start &amp;recording directly</value>
-  </data>
-  <data name="mAllowOverwriteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>215, 22</value>
-  </data>
-  <data name="mAllowOverwriteToolStripMenuItem.Text" xml:space="preserve">
-    <value>Allow &amp;overwrite</value>
-  </data>
   <data name="mPreviousSectionToolStripMenuItem.AccessibleName" xml:space="preserve">
     <value>Previous section Alt+Up</value>
   </data>
@@ -1260,16 +1275,16 @@
   <data name="mNextPhraseToolStripMenuItem.Text" xml:space="preserve">
     <value>Next ph&amp;rase</value>
   </data>
-  <data name="nextPageToolStripMenuItem.AccessibleName" xml:space="preserve">
+  <data name="mNextPageToolStripMenuItem.AccessibleName" xml:space="preserve">
     <value>Next page Alt+PageDown</value>
   </data>
-  <data name="nextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+  <data name="mNextPageToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Alt+PgDn</value>
   </data>
-  <data name="nextPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="mNextPageToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>198, 22</value>
   </data>
-  <data name="nextPageToolStripMenuItem.Text" xml:space="preserve">
+  <data name="mNextPageToolStripMenuItem.Text" xml:space="preserve">
     <value>Next pa&amp;ge</value>
   </data>
   <data name="mNextSectionToolStripMenuItem.AccessibleName" xml:space="preserve">
@@ -1347,9 +1362,9 @@
   <data name="aboutObiToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;About Obi</value>
   </data>
-  <data name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing">
+  <metadata name="mStatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>0, 606</value>
-  </data>
+  </metadata>
   <data name="mStatusStrip.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 606</value>
   </data>
@@ -1396,7 +1411,7 @@
     <value>mProjectView</value>
   </data>
   <data name="&gt;&gt;mProjectView.Type" xml:space="preserve">
-    <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.8.2461, Culture=neutral, PublicKeyToken=null</value>
+    <value>Obi.ProjectView.ProjectView, Obi, Version=0.10.9.38938, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;mProjectView.Parent" xml:space="preserve">
     <value>$this</value>
@@ -1404,9 +1419,9 @@
   <data name="&gt;&gt;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,6 +1684,9 @@
         CjyAD09DwA9QRcAfbGngHyBQ8H9MSf//Ii0=
 </value>
   </data>
+  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Obi</value>
   </data>
@@ -2236,10 +2254,10 @@
   <data name="&gt;&gt;mStopToolStripMenuItem.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="&gt;&gt;FastPlaytoolStripMenuItem.Name" xml:space="preserve">
-    <value>FastPlaytoolStripMenuItem</value>
+  <data name="&gt;&gt;mFastPlaytoolStripMenuItem.Name" xml:space="preserve">
+    <value>mFastPlaytoolStripMenuItem</value>
   </data>
-  <data name="&gt;&gt;FastPlaytoolStripMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;mFastPlaytoolStripMenuItem.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="&gt;&gt;NormalSpeedtoolStripMenuItem.Name" xml:space="preserve">
@@ -2302,10 +2320,10 @@
   <data name="&gt;&gt;mStartListeningToolStripMenuItem.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="&gt;&gt;mStartRecordingToolStripMenuItem.Name" xml:space="preserve">
-    <value>mStartRecordingToolStripMenuItem</value>
+  <data name="&gt;&gt;mStartRecordingDirectlyToolStripMenuItem.Name" xml:space="preserve">
+    <value>mStartRecordingDirectlyToolStripMenuItem</value>
   </data>
-  <data name="&gt;&gt;mStartRecordingToolStripMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;mStartRecordingDirectlyToolStripMenuItem.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="&gt;&gt;mAllowOverwriteToolStripMenuItem.Name" xml:space="preserve">
@@ -2350,10 +2368,10 @@
   <data name="&gt;&gt;mNextPhraseToolStripMenuItem.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="&gt;&gt;nextPageToolStripMenuItem.Name" xml:space="preserve">
-    <value>nextPageToolStripMenuItem</value>
+  <data name="&gt;&gt;mNextPageToolStripMenuItem.Name" xml:space="preserve">
+    <value>mNextPageToolStripMenuItem</value>
   </data>
-  <data name="&gt;&gt;nextPageToolStripMenuItem.Type" xml:space="preserve">
+  <data name="&gt;&gt;mNextPageToolStripMenuItem.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="&gt;&gt;mNextSectionToolStripMenuItem.Name" xml:space="preserve">
@@ -2434,16 +2452,16 @@
   <data name="&gt;&gt;mStatusLabel.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;mStartRecordingToolStripMenuItem.Name" xml:space="preserve">
+    <value>mStartRecordingToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;mStartRecordingToolStripMenuItem.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="&gt;&gt;$this.Name" xml:space="preserve">
     <value>ObiForm</value>
   </data>
   <data name="&gt;&gt;$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 directly ctrl+shift+r</value>
-  </data>
 </root>
\ No newline at end of file

Modified: trunk/urakawa/application/Obi/Obi/Presentation.cs
===================================================================
--- trunk/urakawa/application/Obi/Obi/Presentation.cs	2008-05-16 20:07:54 UTC (rev 3081)
+++ trunk/urakawa/application/Obi/Obi/Presentation.cs	2008-05-16 20:51:17 UTC (rev 3082)
@@ -138,7 +138,6 @@
             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));
             }
             mCustomClasses[customClass].Add(node);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.