Compare commits
5 Commits
B2025-036-
...
C2025-044
Author | SHA1 | Date | |
---|---|---|---|
09d3995e6c | |||
db20385a6d | |||
d701935ddf | |||
94f0795247 | |||
4def73d738 |
@@ -24026,7 +24026,7 @@ Begin -- Rofst Tables
|
|||||||
CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED
|
CONSTRAINT [PK_EPFormats] PRIMARY KEY CLUSTERED
|
||||||
(
|
(
|
||||||
[FormatID] ASC
|
[FormatID] ASC
|
||||||
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
|
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
|
||||||
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
||||||
|
|
||||||
IF (@@Error = 0) PRINT 'Table Creation: [EPFormats] Succeeded'
|
IF (@@Error = 0) PRINT 'Table Creation: [EPFormats] Succeeded'
|
||||||
|
@@ -1483,11 +1483,9 @@ namespace VEPROMS
|
|||||||
// and if they are not the same, use the CurrentItem from the main frmVEPROMS.
|
// and if they are not the same, use the CurrentItem from the main frmVEPROMS.
|
||||||
ProcedureInfo piThis = null;
|
ProcedureInfo piThis = null;
|
||||||
if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
|
if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
|
||||||
|
|
||||||
ProcedureInfo pi = args.Proc as ProcedureInfo;
|
ProcedureInfo pi = args.Proc as ProcedureInfo;
|
||||||
if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
|
|
||||||
{
|
|
||||||
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
||||||
}
|
|
||||||
|
|
||||||
// Check if Procedure Info is null
|
// Check if Procedure Info is null
|
||||||
if (pi == null) return;
|
if (pi == null) return;
|
||||||
@@ -1529,11 +1527,8 @@ namespace VEPROMS
|
|||||||
if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
|
if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
|
||||||
|
|
||||||
ProcedureInfo pi = args.Proc as ProcedureInfo;
|
ProcedureInfo pi = args.Proc as ProcedureInfo;
|
||||||
|
|
||||||
if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
|
|
||||||
{
|
|
||||||
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
|
||||||
}
|
|
||||||
// Check if Procedure Info is null
|
// Check if Procedure Info is null
|
||||||
if (pi == null) return;
|
if (pi == null) return;
|
||||||
|
|
||||||
|
@@ -38,6 +38,9 @@ EndProject
|
|||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baseline", "..\Baseline\Baseline.csproj", "{8B29E0DE-B6C9-4041-8817-319FDE3123C4}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Baseline", "..\Baseline\Baseline.csproj", "{8B29E0DE-B6C9-4041-8817-319FDE3123C4}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAccessToSql\RoAccessToSql.csproj", "{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoAccessToSql", "..\RoAccessToSql\RoAccessToSql.csproj", "{1EC96BDA-01E7-4153-A95D-6A4A36FA278E}"
|
||||||
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
|
{AEEE9FD1-6892-45E2-A67E-418C06D46FF9} = {AEEE9FD1-6892-45E2-A67E-418C06D46FF9}
|
||||||
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
@@ -1284,7 +1284,7 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}";
|
selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}";
|
||||||
if (!isFixed)
|
if (!isFixed)
|
||||||
selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;}"); // C2017-036 get best available proportional font for symbols
|
selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}"); // C2017-036 get best available proportional font for symbols - B2025-039 add Blue for Colored Replace Words
|
||||||
else
|
else
|
||||||
selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}"); // FreeMono is now used for the edit screen only. VESymbFix and Consolas are used for printing
|
selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}"); // FreeMono is now used for the edit screen only. VESymbFix and Consolas are used for printing
|
||||||
selectedRtfSB.Append("\r\n");
|
selectedRtfSB.Append("\r\n");
|
||||||
|
@@ -618,15 +618,6 @@ namespace Volian.Controls.Library
|
|||||||
}
|
}
|
||||||
private int _MyLastFormatID = -1;
|
private int _MyLastFormatID = -1;
|
||||||
private StepRTB _MyStepRTB;
|
private StepRTB _MyStepRTB;
|
||||||
private static int _OringFlg;
|
|
||||||
public static int OringFlg
|
|
||||||
{
|
|
||||||
get { return _OringFlg; }
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_OringFlg = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
public StepRTB MyStepRTB
|
public StepRTB MyStepRTB
|
||||||
{
|
{
|
||||||
get { return _MyStepRTB; }
|
get { return _MyStepRTB; }
|
||||||
@@ -4152,22 +4143,16 @@ namespace Volian.Controls.Library
|
|||||||
|
|
||||||
private void btnPdfCreate_Click(object sender, EventArgs e)
|
private void btnPdfCreate_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
|
|
||||||
_OringFlg = 0;
|
|
||||||
DevComponents.DotNetBar.eEventSource oring = ((DevComponents.DotNetBar.Events.EventSourceArgs)e).Source;
|
|
||||||
if (oring == eEventSource.Keyboard)
|
|
||||||
_OringFlg = 1;
|
|
||||||
|
|
||||||
if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return;
|
if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return;
|
||||||
if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
|
if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
|
||||||
OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
|
OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnPdfQuickCreate_Click(object sender, EventArgs e)
|
private void btnPdfQuickCreate_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return;
|
if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return;
|
||||||
if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
|
if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
|
||||||
OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
|
OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnCASCreate_Click(object sender, EventArgs e)
|
private void btnCASCreate_Click(object sender, EventArgs e)
|
||||||
@@ -4829,10 +4814,9 @@ namespace Volian.Controls.Library
|
|||||||
public class StepTabRibbonEventArgs : EventArgs
|
public class StepTabRibbonEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
public StepTabRibbonEventArgs() { ; }
|
public StepTabRibbonEventArgs() { ; }
|
||||||
public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
|
public StepTabRibbonEventArgs(ItemInfo proc)
|
||||||
{
|
{
|
||||||
_Proc = proc;
|
_Proc = proc;
|
||||||
OringFlg = oringFlg;
|
|
||||||
}
|
}
|
||||||
private ItemInfo _Proc;
|
private ItemInfo _Proc;
|
||||||
|
|
||||||
@@ -4841,13 +4825,6 @@ namespace Volian.Controls.Library
|
|||||||
get { return _Proc; }
|
get { return _Proc; }
|
||||||
set { _Proc = value; }
|
set { _Proc = value; }
|
||||||
}
|
}
|
||||||
// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
|
|
||||||
private int _OringFlg;
|
|
||||||
public int OringFlg
|
|
||||||
{
|
|
||||||
get { return _OringFlg; }
|
|
||||||
set { _OringFlg = value; }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);
|
public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user