This commit is contained in:
2011-02-08 11:27:37 +00:00
parent bbe29f2b0a
commit 3363e0f69a
3 changed files with 57 additions and 52 deletions

View File

@@ -32,7 +32,7 @@ namespace Volian.Controls.Library
/// </summary>
private int _UniqueBarCount;
private ItemInfo _MyItemInfo = null;
private RTBItem _MyRTBItem = null;
private EditItem _MyEditItem = null;
private bool _RibbonExpanded=true;
public bool RibbonExpanded
{
@@ -154,12 +154,12 @@ namespace Volian.Controls.Library
if (args != null)
{
_MyItemInfo = args.MyItemInfo;
_MyRTBItem = args.MyRTBItem;
_MyEditItem = args.MyEditItem;
}
else
{
_MyItemInfo = null;
_MyRTBItem = null;
_MyEditItem = null;
}
if (ItemSelectedChanged != null) ItemSelectedChanged(sender, args);
}
@@ -213,8 +213,8 @@ namespace Volian.Controls.Library
void DisplayTabControl_Resize(object sender, EventArgs e)
{
// If the currently selected Item is in a Step, then adjust the scroll as necessary to keep it visible
if (_MyRTBItem != null)
_MyRTBItem.ItemShow();
if (_MyEditItem != null)
_MyEditItem.ItemShow();
}
private void SetupBar(Bar myBar)
{
@@ -313,20 +313,20 @@ namespace Volian.Controls.Library
if (_MyDisplayTabItems.ContainsKey(key)) // If procedure page open use it
{
DisplayTabItem pg = _MyDisplayTabItems[key];
if (pg.MyStepTabPanel.MyStepPanel._LookupRTBItems.ContainsKey(myItemInfo.ItemID))
if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID))
{
RTBItem stpitm = pg.MyStepTabPanel.MyStepPanel._LookupRTBItems[myItemInfo.ItemID];
EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID];
switch (pasteType)
{
case ItemInfo.EAddpingPart.Before:
stpitm.PasteSiblingBefore(copyStartID);
edtitm.PasteSiblingBefore(copyStartID);
break;
case ItemInfo.EAddpingPart.After:
stpitm.PasteSiblingAfter(copyStartID);
edtitm.PasteSiblingAfter(copyStartID);
break;
case ItemInfo.EAddpingPart.Replace:
stpitm.PasteReplace(copyStartID);
stpitm.Dispose();
edtitm.PasteReplace(copyStartID);
edtitm.Dispose();
break;
default:
return false; ;
@@ -354,10 +354,10 @@ namespace Volian.Controls.Library
CloseTabItem(pg);
return false;
}
if (pg.MyStepTabPanel.MyStepPanel._LookupRTBItems.ContainsKey(myItemInfo.ItemID))
if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID))
{
RTBItem stpitm = pg.MyStepTabPanel.MyStepPanel._LookupRTBItems[myItemInfo.ItemID];
stpitm.RemoveItem();
EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID];
edtitm.RemoveItem();
return true;
}
}
@@ -372,19 +372,19 @@ namespace Volian.Controls.Library
if (_MyDisplayTabItems.ContainsKey(key)) // If procedure page open use it
{
DisplayTabItem pg = _MyDisplayTabItems[key];
if (pg.MyStepTabPanel.MyStepPanel._LookupRTBItems.ContainsKey(myItemInfo.ItemID))
if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID))
{
RTBItem stpitm = pg.MyStepTabPanel.MyStepPanel._LookupRTBItems[myItemInfo.ItemID];
EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID];
switch (insertType)
{
case E_InsertType.Before:
stpitm.AddSiblingBefore(text,updateSelection);
edtitm.AddSiblingBefore(text,updateSelection);
break;
case E_InsertType.After:
stpitm.AddSiblingAfter(text,updateSelection);
edtitm.AddSiblingAfter(text,updateSelection);
break;
case E_InsertType.Child:
stpitm.AddChild(text, fromType, type);
edtitm.AddChild(text, fromType, type);
break;
default:
return false; ;