From d284c74eaf4d98beec44351fa854b3bc729072bc Mon Sep 17 00:00:00 2001
From: John <jjenko@volian.com>
Date: Thu, 10 Dec 2009 19:44:43 +0000
Subject: [PATCH] fixes for Enter key logic

---
 .../Volian.Controls.Library/StepTabRibbon.cs  |   8 ++++++--
 .../StepTabRibbon.designer.cs                 | Bin 229356 -> 229366 bytes
 .../StepTabRibbon.resx                        |  18 +++++++++---------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index 4eee2aa6..b49bea0c 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -974,7 +974,7 @@ namespace Volian.Controls.Library
 						MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO
 					else if (deletedRNO)
 					{
-						if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.Equals(MyStepItem.MyItemInfo))
+						if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.ItemID == MyStepItem.MyID)
 						{
 							MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
 							InsertSiblingBeforeOrAfter("before");
@@ -1005,8 +1005,12 @@ namespace Volian.Controls.Library
 			else if (MyItemInfo.IsInRNO && MyItemInfo.IsSubStep)
 			{
 				if (deletedEmpty)
+				{
 					MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlLeft);
-				InsertSiblingBeforeOrAfter("after");
+					ShortCutContextMenu("InsRNO"); // create a new RNO
+				}
+				else
+					InsertSiblingBeforeOrAfter("after");
 			}
 			else if (MyItemInfo.IsSubStep)
 			{
diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs
index decba4c6d15c38b01fcffbf2b60ed301881f972b..1ca4a1259998f4c21b482792b3d155cfac482b24 100644
GIT binary patch
delta 218
zcmaF!pZD8;-VHNSrZ13T<eAKunl$-9KF8z*DM_0PQtjBM@6ckl+WaENiDUXYCB~4+
z4P_$J&%I+z0W##KFHmO80Wvx!^A*TUPx!#-vRSD-igo%WEk>ouANF%hHmG6SysGAb
z1VqGPvcTqDQ~R`F@*<mS4wUgjcni++Y?iygW)9{}cVJ``*&e~p=psA)-6cke=?!*_
zEYqc;nYr3|R2jGPs4@xpO?LYuw!Na5DS>hNk$;Rv(*uf`IHn7fGV!(FC}G-uql8(6
F8vwe;RKEZK

delta 215
zcmezNpZCpw-VHNSCLhS>n9P@&H2s4NBhTa|DM_0PQtjBM_g!NY+I%1<i-XyK!EidG
zGGpN6hBA@qGFuqqHh(CUVBG9iUc$<3$zVQNai8jBfhv~GA8H;+fCUN#WG4qq7nq)w
z#ncC62u<h6W)j)FW7;iEsCxa)#|~8RgE@ld)i-Bd;4p`2oG!r3D6)M8JEM#2^m{Ul
z3X@gJUE0}H8Mm{kGRgT(pH;$SHM!1;WAc(G65FkcnGzVMr!_H(wf`t#+Ww=2`5zYm
D<)Tdo

diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.resx b/PROMS/Volian.Controls.Library/StepTabRibbon.resx
index 51d55bc6..cad7ec98 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.resx
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.resx
@@ -121,6 +121,15 @@
     <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnInsRO.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
+        EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1
+        gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k
+        hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="btnCut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -131,15 +140,6 @@
         t0ekztKvaA7ibixOyvoLADqYiGMXHIUWy7uQa+cSuZGUDb7FswWYwclx9oES/hqzGAmV1UTdSPiQ8Uqw
         DCdiNtgFHwAtVpjbIvESaA4ZqUrP2xELFPEBUMwlqmH7iDiNNQAph2DskIMaIF16YfCVIoZOmtyveQF9
         2CVVWYKhQwAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="btnInsRO.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1
-        gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k
-        hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="btnListUsers.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">