Fixed bug B2016-013 where the step properties would be inactive the first time it’s opened
Bug fix B2016-014 where a change bar was set when you check the CAS checkbox or the Page Break check box Bug Fix B2016-011 where a change bar a compressed table was too short Bug Fix B2015-184 where generate PDF would bomb when it tried to print a change bar related to a null step element.
This commit is contained in:
parent
15d8380fe6
commit
c035370bb0
@ -3013,8 +3013,6 @@ namespace VEPROMS
|
|||||||
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.Mydvi = SelectedDVI;
|
|
||||||
displayBookMarks.MyEditItem = args.MyEditItem;
|
displayBookMarks.MyEditItem = args.MyEditItem;
|
||||||
displayHistory.MyEditItem = args.MyEditItem;
|
displayHistory.MyEditItem = args.MyEditItem;
|
||||||
|
|
||||||
@ -3028,6 +3026,8 @@ namespace VEPROMS
|
|||||||
if (args.MyEditItem != null)
|
if (args.MyEditItem != null)
|
||||||
{
|
{
|
||||||
SelectedStepTabPanel = args.MyEditItem.MyStepPanel.MyStepTabPanel;
|
SelectedStepTabPanel = args.MyEditItem.MyStepPanel.MyStepTabPanel;
|
||||||
|
displayTags.Mydvi = SelectedDVI;
|
||||||
|
displayTags.MyEditItem = args.MyEditItem;
|
||||||
displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ?
|
displayRO.ROTypeFilter = SelectedStepTabPanel.MyStepPanel.SelectedEditItem is Volian.Controls.Library.GridItem && (SelectedStepTabPanel.MyStepPanel.SelectedEditItem as Volian.Controls.Library.GridItem).MyFlexGrid.IsRoTable ?
|
||||||
E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text;
|
E_ROValueType.Table : (SelectedStepTabPanel.MyStepPanel.SelectedEditItem.MyItemInfo.IsFigure) ? E_ROValueType.Image : E_ROValueType.Text;
|
||||||
if (_LastStepRTB.IsRoTable && _LastStepRTB.MyItemInfo.MyContent.ContentRoUsageCount > 0)
|
if (_LastStepRTB.IsRoTable && _LastStepRTB.MyItemInfo.MyContent.ContentRoUsageCount > 0)
|
||||||
|
@ -401,7 +401,9 @@ namespace Volian.Controls.Library
|
|||||||
MyEditItem.SaveContents();
|
MyEditItem.SaveContents();
|
||||||
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
||||||
if (sc == null) return;
|
if (sc == null) return;
|
||||||
|
MyEditItem.ChangeBarForConfigItemChange = false;
|
||||||
sc.Step_NewManualPagebreak = cbPageBreak.Checked;
|
sc.Step_NewManualPagebreak = cbPageBreak.Checked;
|
||||||
|
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||||
}
|
}
|
||||||
private void cbCAS_CheckedChanged(object sender, EventArgs e)
|
private void cbCAS_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
@ -409,7 +411,9 @@ namespace Volian.Controls.Library
|
|||||||
MyEditItem.SaveContents();
|
MyEditItem.SaveContents();
|
||||||
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
||||||
if (sc == null) return;
|
if (sc == null) return;
|
||||||
|
MyEditItem.ChangeBarForConfigItemChange = false;
|
||||||
sc.Step_CAS = (cbCAS.Checked) ? "True" : "False";
|
sc.Step_CAS = (cbCAS.Checked) ? "True" : "False";
|
||||||
|
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||||
}
|
}
|
||||||
private void cbPlacekeeper_CheckedChanged(object sender, EventArgs e)
|
private void cbPlacekeeper_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
@ -417,7 +421,9 @@ namespace Volian.Controls.Library
|
|||||||
MyEditItem.SaveContents();
|
MyEditItem.SaveContents();
|
||||||
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
||||||
if (sc == null) return;
|
if (sc == null) return;
|
||||||
sc.Step_Placekeeper = (cbPlaceKeeper.Checked)?"Y":"N";
|
MyEditItem.ChangeBarForConfigItemChange = false;
|
||||||
|
sc.Step_Placekeeper = (cbPlaceKeeper.Checked) ? "Y" : "N";
|
||||||
|
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||||
if (cbPlaceKeeper.Checked)
|
if (cbPlaceKeeper.Checked)
|
||||||
{
|
{
|
||||||
_Initalizing = true;
|
_Initalizing = true;
|
||||||
@ -431,7 +437,9 @@ namespace Volian.Controls.Library
|
|||||||
MyEditItem.SaveContents();
|
MyEditItem.SaveContents();
|
||||||
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
StepConfig sc = CurItemInfo.MyConfig as StepConfig;
|
||||||
if (sc == null) return;
|
if (sc == null) return;
|
||||||
|
MyEditItem.ChangeBarForConfigItemChange = false;
|
||||||
sc.Step_Placekeeper = (cbPlaceKeeperCont.Checked) ? "C" : "N";
|
sc.Step_Placekeeper = (cbPlaceKeeperCont.Checked) ? "C" : "N";
|
||||||
|
MyEditItem.ChangeBarForConfigItemChange = true;
|
||||||
if (cbPlaceKeeperCont.Checked)
|
if (cbPlaceKeeperCont.Checked)
|
||||||
{
|
{
|
||||||
_Initalizing = true;
|
_Initalizing = true;
|
||||||
|
@ -210,6 +210,14 @@ namespace Volian.Controls.Library
|
|||||||
//if (value.FormatStepData != null && value.FormatStepData.TabData.IdentPrint.Contains("C0")) Circle = true;
|
//if (value.FormatStepData != null && value.FormatStepData.TabData.IdentPrint.Contains("C0")) Circle = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private bool _ChangeBarForConfigItemChange = true;
|
||||||
|
|
||||||
|
public bool ChangeBarForConfigItemChange
|
||||||
|
{
|
||||||
|
get { return _ChangeBarForConfigItemChange; }
|
||||||
|
set { _ChangeBarForConfigItemChange = value; }
|
||||||
|
}
|
||||||
|
|
||||||
void value_Changed(object sender)
|
void value_Changed(object sender)
|
||||||
{
|
{
|
||||||
ChangeBar = _MyItemInfo.HasChangeBar;
|
ChangeBar = _MyItemInfo.HasChangeBar;
|
||||||
@ -2781,6 +2789,7 @@ namespace Volian.Controls.Library
|
|||||||
using (Item itm = MyItemInfo.Get())
|
using (Item itm = MyItemInfo.Get())
|
||||||
{
|
{
|
||||||
itm.MyContent.Config = MyItemInfo.MyConfig.ToString();
|
itm.MyContent.Config = MyItemInfo.MyConfig.ToString();
|
||||||
|
if (ChangeBarForConfigItemChange)
|
||||||
itm.MyContent.DTS = DateTime.Now;
|
itm.MyContent.DTS = DateTime.Now;
|
||||||
itm.MyContent.UserID = Volian.Base.Library.VlnSettings.UserID;
|
itm.MyContent.UserID = Volian.Base.Library.VlnSettings.UserID;
|
||||||
itm.Save();
|
itm.Save();
|
||||||
|
@ -856,7 +856,6 @@ namespace Volian.Print.Library
|
|||||||
if (vcb.Height == heightBefore / MyPageHelper.YMultiplier - 4)
|
if (vcb.Height == heightBefore / MyPageHelper.YMultiplier - 4)
|
||||||
{
|
{
|
||||||
float heightDif = (heightBefore - heightAfter);
|
float heightDif = (heightBefore - heightAfter);
|
||||||
vcb.Height = heightAfter;
|
|
||||||
vcb.YChangeBarBottom += heightDif;
|
vcb.YChangeBarBottom += heightDif;
|
||||||
FixMessages(vcb, heightDif);
|
FixMessages(vcb, heightDif);
|
||||||
break;
|
break;
|
||||||
|
@ -110,7 +110,8 @@ namespace Volian.Print.Library
|
|||||||
{
|
{
|
||||||
// If the paragraph iscompressed, it may have been created as not compressed since compression
|
// If the paragraph iscompressed, it may have been created as not compressed since compression
|
||||||
// is not set when paragraph is initially created, it is set during pagination tests.
|
// is not set when paragraph is initially created, it is set during pagination tests.
|
||||||
if (_IParagraph == null || IsCompressed)
|
//if (_IParagraph == null || IsCompressed)
|
||||||
|
if (Rtf != null && (_IParagraph == null || IsCompressed))
|
||||||
{
|
{
|
||||||
int profileDepth = ProfileTimer.Push(">>>> VlnPrintObject.IParagraph");
|
int profileDepth = ProfileTimer.Push(">>>> VlnPrintObject.IParagraph");
|
||||||
string myRtf = Rtf;
|
string myRtf = Rtf;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user