Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Jenko 2010-09-16 18:43:57 +00:00
parent 89f5c2dd98
commit f88bfe84fe
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PROMS/Volian.Controls.Library/StepItem.cs
View File

@ -30,6 +30,23 @@ namespace Volian.Controls.Library
#endregion #endregion
public partial class StepItem : UserControl public partial class StepItem : UserControl
{ {
//private static int _StepItemUnique = 0;
//private static int StepItemUnique
//{
// get
// {
// if (_StepItemUnique == 3)
// Console.WriteLine("here");
// return ++_StepItemUnique;
// }
//}
//private int _MyStepItemUnique = StepItemUnique;
//public int MyStepItemUnique
//{
// get {return _MyStepItemUnique; }
//}
#region Private Fields #region Private Fields
private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private StepPanel _MyStepPanel; private StepPanel _MyStepPanel;

34
PROMS/Volian.Controls.Library/StepTabRibbon.cs
View File

@ -1042,16 +1042,15 @@ namespace Volian.Controls.Library
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO
else if (deletedRNO) else if (deletedRNO)
{ {
if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.ItemID == MyStepItem.MyID) AddSubStep();
{
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
InsertSiblingBeforeOrAfter("before");
}
else
ShortCutContextMenu("InsSubStps");
} }
else if (!deletedHLS) else if (!deletedHLS)
CreateNewRNO(); {
if (MyItemInfo.ColumnMode > 0)
CreateNewRNO();
else
AddSubStep();
}
} }
} }
else if (MyItemInfo.IsRNOPart) else if (MyItemInfo.IsRNOPart)
@ -1060,7 +1059,8 @@ namespace Volian.Controls.Library
if (MyItemInfo.IsHigh) if (MyItemInfo.IsHigh)
{ {
if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.Equals(MyStepItem.MyItemInfo)) if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.Equals(MyStepItem.MyItemInfo))
{ //if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.ItemID == MyStepItem.MyItemInfo.ItemID) //.Equals(MyStepItem.MyItemInfo))
{
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown); MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
InsertSiblingBeforeOrAfter("before"); InsertSiblingBeforeOrAfter("before");
} }
@ -1092,7 +1092,10 @@ namespace Volian.Controls.Library
else if (MyStepItem.MyRNOStepItems != null && MyStepItem.MyRNOStepItems.Count > 0) else if (MyStepItem.MyRNOStepItems != null && MyStepItem.MyRNOStepItems.Count > 0)
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO
else else
CreateNewRNO(); if (MyItemInfo.ColumnMode > 0)
CreateNewRNO();
else
InsertSiblingBeforeOrAfter("after");
} }
else if (MyItemInfo.IsCaution) else if (MyItemInfo.IsCaution)
{ {
@ -1122,6 +1125,17 @@ namespace Volian.Controls.Library
} }
} }
private void AddSubStep()
{
if (MyStepItem.NextDownStepItem.MyItemInfo.MyParent.ItemID == MyStepItem.MyID)
{
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
InsertSiblingBeforeOrAfter("before");
}
else
ShortCutContextMenu("InsSubStps");
}
private void CreateNewRNO() private void CreateNewRNO()
{ {
if (btnInsRNO.SubItems.Count > 1) if (btnInsRNO.SubItems.Count > 1)