This commit is contained in:
@@ -474,7 +474,7 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
_MouseDown = true;
|
||||
//Console.WriteLine("vvvvvvvvvv StepRTB Mouse Down id= {0}",MyItemInfo.ItemID);
|
||||
if (!_ContextMenuStripChanged)
|
||||
if (!_ContextMenuStripChanged && this.MyStepItem != null)
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.SetContextMenu();
|
||||
_ContextMenuStripChanged = false;
|
||||
}
|
||||
@@ -1357,50 +1357,53 @@ namespace Volian.Controls.Library
|
||||
{
|
||||
if (e.Control)
|
||||
{
|
||||
if (e.Alt)
|
||||
if (this.MyStepItem != null)
|
||||
{
|
||||
switch (e.KeyCode)
|
||||
if (e.Alt)
|
||||
{
|
||||
case Keys.M:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.btnAnnots_Click(sender, e);
|
||||
e.Handled = true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
switch (e.KeyCode)
|
||||
{
|
||||
case Keys.M:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.btnAnnots_Click(sender, e);
|
||||
e.Handled = true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (e.Shift)
|
||||
{
|
||||
switch (e.KeyCode)
|
||||
if (e.Shift)
|
||||
{
|
||||
case Keys.F:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsFigure");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.T:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsTable");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.N:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsNote");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.C:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsCaution");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.S:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsSubStps");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.H:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsHLS");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.R:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsRNO");
|
||||
e.Handled = true;
|
||||
break;
|
||||
switch (e.KeyCode)
|
||||
{
|
||||
case Keys.F:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsFigure");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.T:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsTable");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.N:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsNote");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.C:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsCaution");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.S:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsSubStps");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.H:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsHLS");
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.R:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("InsRNO");
|
||||
e.Handled = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1503,8 +1506,11 @@ namespace Volian.Controls.Library
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.Enter:
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.btnInsPgBrk_Click(sender, e);
|
||||
e.Handled = true;
|
||||
if (this.MyStepItem != null)
|
||||
{
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.btnInsPgBrk_Click(sender, e);
|
||||
e.Handled = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1668,15 +1674,18 @@ namespace Volian.Controls.Library
|
||||
e.Handled = true;
|
||||
break;
|
||||
case Keys.F5:
|
||||
if (e.Shift)
|
||||
if (this.MyStepItem != null)
|
||||
{
|
||||
e.Handled = true;
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("StepPaste");
|
||||
}
|
||||
else if (!e.Control && !e.Alt)
|
||||
{
|
||||
e.Handled = true;
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.DoCopyStep();
|
||||
if (e.Shift)
|
||||
{
|
||||
e.Handled = true;
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ShortCutContextMenu("StepPaste");
|
||||
}
|
||||
else if (!e.Control && !e.Alt)
|
||||
{
|
||||
e.Handled = true;
|
||||
this.MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.DoCopyStep();
|
||||
}
|
||||
}
|
||||
break;
|
||||
case Keys.F6:
|
||||
@@ -1690,7 +1699,7 @@ namespace Volian.Controls.Library
|
||||
case Keys.Enter:
|
||||
if (!e.Control && !e.Shift && !e.Alt)
|
||||
{
|
||||
if (!MyStepItem.MyItemInfo.IsTablePart)
|
||||
if (MyStepItem != null && !MyStepItem.MyItemInfo.IsTablePart)
|
||||
{
|
||||
e.Handled = true;
|
||||
MyStepItem.MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ProcessEnterKey();
|
||||
|
Reference in New Issue
Block a user