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

Table handling in the ProcessEnterKey logic

Browse Source
This commit is contained in:
John Jenko 2011-06-16 19:29:30 +00:00
parent 273113fbca
commit dd0fef1712
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1548,7 +1548,7 @@ namespace Volian.Controls.Library
bool deletedRNO = false; bool deletedRNO = false;
bool deletedNote = false; bool deletedNote = false;
bool deletedCaution = false; bool deletedCaution = false;
if (MyStepRTB.Text.Length < 1) //empty step text if (!MyItemInfo.IsTable && MyStepRTB.Text.Length < 1) //empty step text
{ {
deletedEmpty = true; deletedEmpty = true;
deletedHLS = MyItemInfo.IsHigh; deletedHLS = MyItemInfo.IsHigh;
@ -1612,11 +1612,20 @@ namespace Volian.Controls.Library
{ {
if (deletedSubStep) if (deletedSubStep)
{ {
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlUp); // jump to HLS //MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlUp); // jump to HLS
SetShortCutContextMenu("InsHLS"); // prompt for new HLS SetShortCutContextMenu("InsHLS"); // prompt for new HLS
} }
else if (deletedRNO || MyItemInfo.IsEquipmentList) //else if (deletedRNO || MyItemInfo.IsEquipmentList)
// InsertSiblingBeforeOrAfter("after");
else if (MyItemInfo.IsEquipmentList)
InsertSiblingBeforeOrAfter("after"); InsertSiblingBeforeOrAfter("after");
else if (deletedRNO)
{
if (MyItemInfo.SearchNext.IsTable)
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
else
InsertSiblingBeforeOrAfter("after");
}
else if (MyEditItem.MyRNOEditItems != null && MyEditItem.MyRNOEditItems.Count > 0) else if (MyEditItem.MyRNOEditItems != null && MyEditItem.MyRNOEditItems.Count > 0)
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlRight); // jump to RNO
else else
@ -1645,9 +1654,21 @@ namespace Volian.Controls.Library
} }
else if (MyItemInfo.IsTable || MyItemInfo.IsFigure) else if (MyItemInfo.IsTable || MyItemInfo.IsFigure)
{ {
ItemInfo next = MyItemInfo.SearchNext;
MyFlexGrid.Select(0, 0); // make sure we are at the first row before doing an up arrow
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlUp); MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlUp);
if (MyItemInfo.IsHigh) if (MyItemInfo.IsHigh)
{
if (deletedSubStep)
SetShortCutContextMenu("InsHLS"); SetShortCutContextMenu("InsHLS");
else if (next.IsFirstSubStep)
{
MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next);
InsertSiblingBeforeOrAfter("before");
}
else
SetShortCutContextMenu("InsSubStps");
}
else else
InsertSiblingBeforeOrAfter("after"); InsertSiblingBeforeOrAfter("after");
} }
@ -1656,18 +1677,18 @@ namespace Volian.Controls.Library
private void AddSubStep() private void AddSubStep()
{ {
EditItem nextDownEditItem = MyEditItem.NextDownEditItem; EditItem nextDownEditItem = MyEditItem.NextDownEditItem;
bool skipTable = false; //bool skipTable = false;
// If the step has a table, move past it before adding a substep // //If the step has a table, move past it before adding a substep
if (nextDownEditItem != null && nextDownEditItem.MyItemInfo.MyParent.ItemID == MyEditItem.MyID && //if (nextDownEditItem != null && nextDownEditItem.MyItemInfo.MyParent.ItemID == MyEditItem.MyID &&
nextDownEditItem.MyItemInfo.IsTablePart) // nextDownEditItem.MyItemInfo.IsTablePart)
{ //{
nextDownEditItem = nextDownEditItem.NextDownEditItem; // nextDownEditItem = nextDownEditItem.NextDownEditItem;
skipTable = true; // skipTable = true;
} //}
if (nextDownEditItem != null && nextDownEditItem.MyItemInfo.MyParent.ItemID == MyEditItem.MyID) if (nextDownEditItem != null && nextDownEditItem.MyItemInfo.MyParent.ItemID == MyEditItem.MyID)
{ {
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown); MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
if (skipTable) MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown); //if (skipTable) MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
InsertSiblingBeforeOrAfter("before"); InsertSiblingBeforeOrAfter("before");
} }
else else