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

Browse Source
This commit is contained in:
Kathy Ruffing 2011-03-01 13:22:25 +00:00
parent bcacc4ed5b
commit eb70c087ff
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -1028,7 +1028,8 @@ namespace VEPROMS
if (_LastStepRTB != null) if (_LastStepRTB != null)
{ {
infotabRO.Visible = infotabTransition.Visible = true; infotabRO.Visible = infotabTransition.Visible = true;
displayRO.Enabled = displayTransition.Enabled = _LastStepRTB.EditMode; displayRO.Enabled = _LastStepRTB.EditMode || _LastStepRTB.IsRoTable;
displayTransition.Enabled = _LastStepRTB.EditMode;
} }
else else
infotabRO.Visible = infotabTransition.Visible = false; infotabRO.Visible = infotabTransition.Visible = false;
@ -1041,18 +1042,24 @@ namespace VEPROMS
// When infotabTags is set to Visible, it is given focus. The next line returns focus to the StepRTB // When infotabTags is set to Visible, it is given focus. The next line returns focus to the StepRTB
args.MyEditItem.SetFocus(); args.MyEditItem.SetFocus();
displayTransition.MyRTB = args.MyEditItem.MyStepRTB; displayTransition.MyRTB = args.MyEditItem.MyStepRTB;
displayRO.MyRTB = args.MyEditItem.MyStepRTB; displayRO.MyRTB = args.MyEditItem.MyStepRTB;
displayTags.MyEditItem = args.MyEditItem; displayTags.MyEditItem = args.MyEditItem;
displayBookMarks.MyEditItem = args.MyEditItem; displayBookMarks.MyEditItem = args.MyEditItem;
displayRO.ProgressBar = bottomProgBar; displayRO.ProgressBar = bottomProgBar;
lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View" ; lblEditView.Text = args.MyEditItem.MyStepPanel.VwMode == E_ViewMode.Edit ? "Edit" : "View" ;
_CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted); _CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted);
dlgFindReplace.MyEditItem = args.MyEditItem; dlgFindReplace.MyEditItem = args.MyEditItem;
SpellChecker.MyEditItem = args.MyEditItem; SpellChecker.MyEditItem = args.MyEditItem;
} }
if (args.MyEditItem != null) if (args.MyEditItem != null)
{
SelectedStepTabPanel = args.MyEditItem.MyStepPanel.MyStepTabPanel; SelectedStepTabPanel = args.MyEditItem.MyStepPanel.MyStepTabPanel;
displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ?
E_ROValueType.Table : E_ROValueType.Text;
}
else else
SelectedDVI = args.MyItemInfo.ActiveParent.ActiveParent as DocVersionInfo; SelectedDVI = args.MyItemInfo.ActiveParent.ActiveParent as DocVersionInfo;
} }
@ -1127,6 +1134,8 @@ namespace VEPROMS
displayRO.MyROFST = SelectedROFst; displayRO.MyROFST = SelectedROFst;
displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB; displayRO.MyRTB = SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyStepRTB;
displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo; displayRO.CurROLink = args.MyLinkText.MyRoUsageInfo;
displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ?
E_ROValueType.Table : E_ROValueType.Text;
displayRO.Mydvi = SelectedDVI; displayRO.Mydvi = SelectedDVI;
displayRO.ProgressBar = bottomProgBar; displayRO.ProgressBar = bottomProgBar;
displayRO.TabControl = tc; displayRO.TabControl = tc;

39
PROMS/VEPROMS User Interface/frmVersionsProperties.cs
View File

@ -9,6 +9,7 @@ using System.IO;
using VEPROMS.CSLA.Library; using VEPROMS.CSLA.Library;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using VEPROMS.Properties; using VEPROMS.Properties;
using Volian.Controls.Library;
using DescriptiveEnum; using DescriptiveEnum;
using DevComponents.DotNetBar; using DevComponents.DotNetBar;
using DevComponents.DotNetBar.Controls; using DevComponents.DotNetBar.Controls;
@ -739,11 +740,47 @@ namespace VEPROMS
break; break;
} }
Cursor = Cursors.WaitCursor; Cursor = Cursors.WaitCursor;
SelectedROFst.ROTableUpdate += new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
ROFst newrofst = ROFstInfo.UpdateRoFst(rdi, dva, _DocVersionConfig.MyDocVersion, SelectedROFst); ROFst newrofst = ROFstInfo.UpdateRoFst(rdi, dva, _DocVersionConfig.MyDocVersion, SelectedROFst);
SelectedROFst.ROTableUpdate -= new ROFstInfoROTableUpdateEvent(roFstInfo_ROTableUpdate);
Cursor = Cursors.Default; Cursor = Cursors.Default;
} }
} }
public List<string> roFstInfo_ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
{
string xml = null;
string srchtxt = null;
using (VlnFlexGrid myGrid = new VlnFlexGrid())
{
using (StringReader sr = new StringReader(args.OldGridXml))
{
myGrid.ReadXml(sr);
sr.Close();
}
string roid = myGrid.ROID;
int rodbid = myGrid.RODbId;
Font GridFont = myGrid.Font;
myGrid.Clear();
myGrid.ParseTableFromText(args.ROText);
myGrid.AutoSizeCols();
myGrid.AutoSizeRows();
myGrid.MakeRTFcells();
myGrid.RODbId = rodbid;
myGrid.ROID = roid;
myGrid.IsRoTable = true;
using (StringWriter sw = new StringWriter())
{
myGrid.WriteXml(sw);
xml = sw.GetStringBuilder().ToString();
sw.Close();
}
srchtxt = myGrid.GetSearchableText();
}
List<string> retlist = new List<string>();
retlist.Add(srchtxt);
retlist.Add(xml);
return retlist;
}
private void ppBtnResetRoVals_Click(object sender, EventArgs e) private void ppBtnResetRoVals_Click(object sender, EventArgs e)
{ {
// This will not be supported in the first release. A discussion was held on 1/6/09 with MRC, JSJ, RHM & // This will not be supported in the first release. A discussion was held on 1/6/09 with MRC, JSJ, RHM &