From e063da6198dcfca9c5278afff7c0477d0df8de56 Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 12 Mar 2013 15:01:46 +0000 Subject: [PATCH] Fixed code to initialize MS Word sections if Document Style does not specify font. Added code to handle refreshing the Edit Screen when a section is moved. Added code to refresh the Edit Screen when a section is moved. --- PROMS/Volian.Controls.Library/DSOTabPanel.cs | 4 ++-- PROMS/Volian.Controls.Library/StepPanel.cs | 7 ++++++- PROMS/Volian.Controls.Library/vlnTreeView.cs | 6 ++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DSOTabPanel.cs b/PROMS/Volian.Controls.Library/DSOTabPanel.cs index 52242ee9..de778d60 100644 --- a/PROMS/Volian.Controls.Library/DSOTabPanel.cs +++ b/PROMS/Volian.Controls.Library/DSOTabPanel.cs @@ -220,8 +220,8 @@ namespace Volian.Controls.Library if (MyDocumentInfo.Config == null || MyDocumentInfo.Config == "") { DocStyle ds = MyDocumentInfo.DocumentEntries[0].MyContent.ContentItems[0].MyDocStyle; - doc.Application.Selection.Font.Name = ds.Font.Family; - doc.Application.Selection.Font.Size = (float)ds.Font.Size; + if (ds.Font.Family != null) doc.Application.Selection.Font.Name = ds.Font.Family; + if (ds.Font.Size != null) doc.Application.Selection.Font.Size = (float)ds.Font.Size; doc.Application.Selection.ParagraphFormat.SpaceBefore = 0; doc.Application.Selection.ParagraphFormat.SpaceAfter = 0; doc.Application.Selection.ParagraphFormat.LineSpacingRule = LBWdLineSpacing.wdLineSpaceExactly; diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs index d4a5eb7a..6003357b 100644 --- a/PROMS/Volian.Controls.Library/StepPanel.cs +++ b/PROMS/Volian.Controls.Library/StepPanel.cs @@ -413,7 +413,12 @@ namespace Volian.Controls.Library ExpandAsNeeded(itemInfo); if (_SelectedItemInfo == null) _SelectedItemInfo = itemInfo; //if (!_LookupEditItems.ContainsKey(itemInfo.ItemID)) Reset(); - if (!_LookupEditItems.ContainsKey(itemInfo.ItemID)) Reset(itemInfo); + if (itemInfo.Moving) + { + Reset(itemInfo); + itemInfo.Moving = false; + } + else if ( !_LookupEditItems.ContainsKey(itemInfo.ItemID)) Reset(itemInfo); if (!_LookupEditItems.ContainsKey(itemInfo.ItemID)) return null; return _LookupEditItems[itemInfo.ItemID]; } diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 46901853..4c71a4d3 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1946,7 +1946,7 @@ namespace Volian.Controls.Library { DragDropEffects ee = e.Effect; if ((e.KeyState & 8) == 8) - ee = DragDropEffects.Copy; // Copy it + ee = DragDropEffects.None; // Don't allow copy this way - Copy it else ee = DragDropEffects.Move; // Move it if (IsChild(dragNode, dl.DropNode)) // Don't copy or move to a child node @@ -2081,9 +2081,11 @@ namespace Volian.Controls.Library return; } pdropi = ((VETreeNode)_LastDropLocation.DropNode).VEObject as ProcedureInfo; - if (pdropi != null && sdragi.MyParent.ItemID == pdropi.ItemID) + if (pdropi != null && ((ItemInfo)(sdragi.ActiveParent)).ItemID == pdropi.ItemID) { sdragi.MoveSection(pdropi, myIndex); + sdragi.Moving = true; + OnNodeSelect(dragNode, new vlnTreeEventArgs(dragNode)); return; } }