Compare commits

...
5 Commits
5 changed files with 27 additions and 3 deletions

No files matched your search

Binary file not shown.
Binary file not shown.
@@ -3251,6 +3251,7 @@ namespace VEPROMS
_MyLog.WarnFormat("===============Override Close===================="); _MyLog.WarnFormat("===============Override Close====================");
} }
System.Threading.Thread.Sleep(500); //wait 1/2 a second to see if it closes on it's own
tc.CloseTabItem(dti); tc.CloseTabItem(dti);
} }
+17 -1
View File
@@ -3538,7 +3538,23 @@ namespace Volian.Controls.Library
// C2015-028 Add Editorial Mode to PROMS Step Editor // C2015-028 Add Editorial Mode to PROMS Step Editor
// if in Editorial Mode, treat it the same as if the EditorialSpellCheck flag is set in the Format file // if in Editorial Mode, treat it the same as if the EditorialSpellCheck flag is set in the Format file
bool editorialmode = (this.Parent.Parent.Parent as StepTabPanel).MyDisplayTabControl.IsInEditorialMode; bool editorialmode;
try
{
StepTabPanel pnl = null;
Control tempcntrl = Parent;
while (tempcntrl != null && pnl == null)
{
tempcntrl = tempcntrl.Parent;
pnl = tempcntrl as StepTabPanel;
}
editorialmode = pnl.MyDisplayTabControl.IsInEditorialMode;
}
catch
{
editorialmode = false;
}
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck || editorialmode) if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.EditData.EditoralSpellCheck || editorialmode)
DidEditorialSpellCheck = MySpellCheckDlg.DidCorrectSpelling; // B2015-024 spell checker in editoral mode DidEditorialSpellCheck = MySpellCheckDlg.DidCorrectSpelling; // B2015-024 spell checker in editoral mode
+9 -2
View File
@@ -162,18 +162,25 @@ namespace Volian.Print.Library
//Width = 6 * (4 + origTab1.Trim(" ".ToCharArray()).Length); //Width = 6 * (4 + origTab1.Trim(" ".ToCharArray()).Length);
} }
else else
Width = GetTextWidth(MyFont, (Text != null ? Text : origTab), symblFontName); //MyFont.CharsToTwips * (Text != null ? Text.Length : origTab.Length); Width = GetTextWidth(MyFont, (Text != null ? Text : origTab), symblFontName);
// Pairie Island (NSP) Caution and Note tabs use a larger font // Pairie Island (NSP) Caution and Note tabs use a larger font
// When using a bullet, we need to use the font size of the Caution/Note text instead of the tab. // When using a bullet, we need to use the font size of the Caution/Note text instead of the tab.
// To do this we set the TabData.Bullet.Separate to true (currently - 4/26/2013 - only NSP uses this). // To do this we set the TabData.Bullet.Separate to true (currently - 4/26/2013 - only NSP uses this).
// Because of the different font sizes, when the Caution/Note did have have a bullet, the positioning // Because of the different font sizes, when the Caution/Note did have have a bullet, the positioning
// was off by the lenght of IdentB (the bullet string), thus the "alignAsIfBulleted" bool // was off by the lenght of IdentB (the bullet string), thus the "alignAsIfBulleted" bool
// added check if there is previous or next, it must of the same step type to get the bullet
if ((myparent.MyItemInfo.FormatStepData != null) && myparent.MyItemInfo.FormatStepData.TabData.Bullet.Separate) if ((myparent.MyItemInfo.FormatStepData != null) && myparent.MyItemInfo.FormatStepData.TabData.Bullet.Separate)
if (myparent.MyItemInfo.MyPrevious != null || myparent.MyItemInfo.NextItem != null) {
// F2026-023 Farley, when there was a single Note and single Caution off of the same step, the Note was still getting a bullet.
if ((myparent.MyItemInfo.MyPrevious != null && (myparent.MyItemInfo.MyPrevious.FormatStepType == myparent.MyItemInfo.FormatStepType)) ||
(myparent.MyItemInfo.NextItem != null && (myparent.MyItemInfo.NextItem.FormatStepType == myparent.MyItemInfo.FormatStepType)))
{
SeparateBullet = true; SeparateBullet = true;
}
else else
alignAsIfBulleted = true; alignAsIfBulleted = true;
}
if (origTab.Contains(@"{!")) if (origTab.Contains(@"{!"))
{ {