Thread: [Urakawa-vcs] SF.net SVN: urakawa: [3079] trunk/urakawa/application/Obi/Obi (Page 22)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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.




Thread: [Urakawa-vcs] SF.net SVN: urakawa: [3079] trunk/urakawa/application/Obi/Obi (Page 22)

urakawa-cvs