diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index b49bea0c..9f5df64a 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -983,7 +983,7 @@ namespace Volian.Controls.Library ShortCutContextMenu("InsSubStps"); } else if (!deletedHLS) - ShortCutContextMenu("InsRNO"); // create a new RNO + CreateNewRNO(); } } else if (MyItemInfo.IsRNO) @@ -1007,7 +1007,7 @@ namespace Volian.Controls.Library if (deletedEmpty) { MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlLeft); - ShortCutContextMenu("InsRNO"); // create a new RNO + CreateNewRNO(); } else InsertSiblingBeforeOrAfter("after"); @@ -1024,7 +1024,7 @@ namespace Volian.Controls.Library else if (MyStepItem.MyRNOStepItems != null && MyStepItem.MyRNOStepItems.Count > 0) MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO else - ShortCutContextMenu("InsRNO"); // create a new RNO + CreateNewRNO(); } else if (MyItemInfo.IsCaution) { @@ -1032,7 +1032,7 @@ namespace Volian.Controls.Library { MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown); if (deletedCaution) - ShortCutContextMenu("InsNote"); + CreateNewNote(); } else InsertSiblingBeforeOrAfter("after"); @@ -1054,6 +1054,21 @@ namespace Volian.Controls.Library } } + private void CreateNewRNO() + { + if (btnInsRNO.SubItems.Count > 1) + ShortCutContextMenu("InsRNO"); + else + btnInsRNO.RaiseClick(); + } + + private void CreateNewNote() + { + if (btnInsNote.SubItems.Count > 1) + ShortCutContextMenu("InsNote"); + else + btnInsNote.RaiseClick(); + } } public enum E_FieldToEdit { StepText, Text, Number }; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 1ca4a125..cb4bf029 100644 Binary files a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs and b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs differ diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.resx b/PROMS/Volian.Controls.Library/StepTabRibbon.resx index cad7ec98..3c7ae060 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.resx +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.resx @@ -117,19 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 - gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k - hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -142,6 +130,21 @@ 2CVVWYKhQwAAAABJRU5ErkJggg== + + 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA + EnEB89x6jgAAAIBJREFUOE/FU9ESgCAIy///aAMU0DDYSxecV6KOObB1squRs3VyNY1Z4OWHATYTFHI1 + gp0RXdm+vlGoLC5zPowCHDeiAGkmhMHnAEFpDwwRjcFKV++/6xyLVgEk2UfhnuVTNsVBa5Njk8xV6c1k + hNwGBmaHAP5n4G8q6gFdoZLjBpE7j5KJdaRlAAAAAElFTkSuQmCC + + + + 17, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8