Bumped version number to 1.5
DSplash: Changes intended to support Asynchronous invokation of Splash Screen. CGDocumentManager: Extensive changes to increase speed and invoke Splash screen async.
This commit is contained in:
parent
034801884f
commit
eaad41e08e
|
@ -27,7 +27,7 @@ using System.Runtime.InteropServices;
|
||||||
// You can specify all the values or you can default the Revision and Build Numbers
|
// You can specify all the values or you can default the Revision and Build Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.4.2.*")]
|
[assembly: AssemblyVersion("1.5.0.*")]
|
||||||
|
|
||||||
//
|
//
|
||||||
// In order to sign your assembly you must specify a key to use. Refer to the
|
// In order to sign your assembly you must specify a key to use. Refer to the
|
||||||
|
@ -57,5 +57,5 @@ using System.Runtime.InteropServices;
|
||||||
[assembly: AssemblyDelaySign(false)]
|
[assembly: AssemblyDelaySign(false)]
|
||||||
[assembly: AssemblyKeyFile("")]
|
[assembly: AssemblyKeyFile("")]
|
||||||
[assembly: AssemblyKeyName("")]
|
[assembly: AssemblyKeyName("")]
|
||||||
[assembly: AssemblyFileVersionAttribute("1.4.2.0")]
|
[assembly: AssemblyFileVersionAttribute("1.5.0.0")]
|
||||||
[assembly: ComVisibleAttribute(false)]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
|
|
|
@ -429,7 +429,6 @@ namespace IndianHealthService.ClinicalScheduling
|
||||||
{
|
{
|
||||||
m_DocManager.ConnectInfo.LoadConnectInfo();
|
m_DocManager.ConnectInfo.LoadConnectInfo();
|
||||||
}
|
}
|
||||||
System.IntPtr pHandle = m_DocManager.Handle;
|
|
||||||
|
|
||||||
m_pAvArray.Clear();
|
m_pAvArray.Clear();
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -191,9 +191,7 @@
|
||||||
<Compile Include="CGDocument.cs">
|
<Compile Include="CGDocument.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="CGDocumentManager.cs">
|
<Compile Include="CGDocumentManager.cs" />
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="CGRange.cs" />
|
<Compile Include="CGRange.cs" />
|
||||||
<Compile Include="CGResource.cs" />
|
<Compile Include="CGResource.cs" />
|
||||||
<Compile Include="CGSchedLib.cs">
|
<Compile Include="CGSchedLib.cs">
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
<RemoteDebugMachine>
|
<RemoteDebugMachine>
|
||||||
</RemoteDebugMachine>
|
</RemoteDebugMachine>
|
||||||
<StartAction>Project</StartAction>
|
<StartAction>Project</StartAction>
|
||||||
<StartArguments>/s=172.16.16.51 /p=9250 /a=s.habiel /v=catdog.55</StartArguments>
|
<StartArguments>/s=10.161.20.25 /p=9280 /a=s.habiel /v=catdog.55</StartArguments>
|
||||||
<StartPage>
|
<StartPage>
|
||||||
</StartPage>
|
</StartPage>
|
||||||
<StartProgram>C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe</StartProgram>
|
<StartProgram>C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\IEExec.exe</StartProgram>
|
||||||
|
|
Binary file not shown.
|
@ -12,9 +12,10 @@ namespace IndianHealthService.ClinicalScheduling
|
||||||
public class DSplash : System.Windows.Forms.Form
|
public class DSplash : System.Windows.Forms.Form
|
||||||
{
|
{
|
||||||
private System.Windows.Forms.Label label1;
|
private System.Windows.Forms.Label label1;
|
||||||
//private System.Windows.Forms.Label lblVersion;
|
|
||||||
private System.Windows.Forms.LinkLabel lnkMail;
|
private System.Windows.Forms.LinkLabel lnkMail;
|
||||||
private System.Windows.Forms.Label lblStatus;
|
private System.Windows.Forms.Label lblStatus;
|
||||||
|
private Label lblVersion;
|
||||||
|
private Label label2;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Required designer variable.
|
/// Required designer variable.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -54,19 +55,22 @@ namespace IndianHealthService.ClinicalScheduling
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DSplash));
|
||||||
this.label1 = new System.Windows.Forms.Label();
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
this.lnkMail = new System.Windows.Forms.LinkLabel();
|
this.lnkMail = new System.Windows.Forms.LinkLabel();
|
||||||
this.lblStatus = new System.Windows.Forms.Label();
|
this.lblStatus = new System.Windows.Forms.Label();
|
||||||
|
this.lblVersion = new System.Windows.Forms.Label();
|
||||||
|
this.label2 = new System.Windows.Forms.Label();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// label1
|
// label1
|
||||||
//
|
//
|
||||||
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
this.label1.Location = new System.Drawing.Point(24, 32);
|
this.label1.Location = new System.Drawing.Point(12, 67);
|
||||||
this.label1.Name = "label1";
|
this.label1.Name = "label1";
|
||||||
this.label1.Size = new System.Drawing.Size(448, 40);
|
this.label1.Size = new System.Drawing.Size(464, 40);
|
||||||
this.label1.TabIndex = 0;
|
this.label1.TabIndex = 0;
|
||||||
this.label1.Text = "VistA Clinical Scheduling";
|
this.label1.Text = "Clinical Scheduling";
|
||||||
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||||
//
|
//
|
||||||
// lnkMail
|
// lnkMail
|
||||||
|
@ -79,55 +83,90 @@ namespace IndianHealthService.ClinicalScheduling
|
||||||
// lblStatus
|
// lblStatus
|
||||||
//
|
//
|
||||||
this.lblStatus.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
|
this.lblStatus.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
|
||||||
this.lblStatus.Location = new System.Drawing.Point(88, 160);
|
this.lblStatus.Location = new System.Drawing.Point(80, 159);
|
||||||
this.lblStatus.Name = "lblStatus";
|
this.lblStatus.Name = "lblStatus";
|
||||||
this.lblStatus.Size = new System.Drawing.Size(328, 16);
|
this.lblStatus.Size = new System.Drawing.Size(328, 16);
|
||||||
this.lblStatus.TabIndex = 3;
|
this.lblStatus.TabIndex = 3;
|
||||||
this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||||
//
|
//
|
||||||
|
// lblVersion
|
||||||
|
//
|
||||||
|
this.lblVersion.AutoSize = true;
|
||||||
|
this.lblVersion.Location = new System.Drawing.Point(210, 117);
|
||||||
|
this.lblVersion.Name = "lblVersion";
|
||||||
|
this.lblVersion.Size = new System.Drawing.Size(52, 13);
|
||||||
|
this.lblVersion.TabIndex = 5;
|
||||||
|
this.lblVersion.Text = "lblVersion";
|
||||||
|
this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||||
|
//
|
||||||
|
// label2
|
||||||
|
//
|
||||||
|
this.label2.AutoSize = true;
|
||||||
|
this.label2.Font = new System.Drawing.Font("Book Antiqua", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
this.label2.Location = new System.Drawing.Point(180, 21);
|
||||||
|
this.label2.Name = "label2";
|
||||||
|
this.label2.Size = new System.Drawing.Size(130, 46);
|
||||||
|
this.label2.TabIndex = 6;
|
||||||
|
this.label2.Text = "VISTA";
|
||||||
|
//
|
||||||
// DSplash
|
// DSplash
|
||||||
//
|
//
|
||||||
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
|
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
|
||||||
|
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
|
||||||
this.ClientSize = new System.Drawing.Size(488, 252);
|
this.ClientSize = new System.Drawing.Size(488, 252);
|
||||||
this.ControlBox = false;
|
this.ControlBox = false;
|
||||||
|
this.Controls.Add(this.label2);
|
||||||
|
this.Controls.Add(this.lblVersion);
|
||||||
this.Controls.Add(this.lblStatus);
|
this.Controls.Add(this.lblStatus);
|
||||||
this.Controls.Add(this.lnkMail);
|
this.Controls.Add(this.lnkMail);
|
||||||
this.Controls.Add(this.label1);
|
this.Controls.Add(this.label1);
|
||||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
||||||
|
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||||
this.Name = "DSplash";
|
this.Name = "DSplash";
|
||||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||||
this.Text = "Clinical Scheduling";
|
this.Text = "Clinical Scheduling";
|
||||||
this.Load += new System.EventHandler(this.DSplash_Load);
|
this.Load += new System.EventHandler(this.DSplash_Load);
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
|
this.PerformLayout();
|
||||||
|
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
public void SetStatus(string sStatus)
|
public delegate void dSetStatus(string sStatus);
|
||||||
|
public delegate void dAny();
|
||||||
|
|
||||||
|
public void SetStatus(string sStatus)
|
||||||
{
|
{
|
||||||
this.Status = sStatus;
|
if (this.InvokeRequired == true)
|
||||||
|
{
|
||||||
|
dSetStatus d = new dSetStatus(SetStatus);
|
||||||
|
this.Invoke(d, new object[] { sStatus });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
System.Diagnostics.Debug.Assert(this.InvokeRequired == false);
|
||||||
|
this.lblStatus.Text = sStatus;
|
||||||
|
this.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DSplash_Load(object sender, System.EventArgs e)
|
private void DSplash_Load(object sender, System.EventArgs e)
|
||||||
{
|
{
|
||||||
//this.lblVersion.Text = "Version " + Application.ProductVersion;
|
this.lblVersion.Text = "Version " + Application.ProductVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Properties
|
public void RemoteClose()
|
||||||
/// <summary>
|
{
|
||||||
/// Gets or sets the value of the Status displayed on the splash screen
|
dAny d = new dAny(this.Close);
|
||||||
/// </summary>
|
this.Invoke(d);
|
||||||
public String Status
|
}
|
||||||
{
|
|
||||||
get
|
public void RemoteHide()
|
||||||
{
|
{
|
||||||
return lblStatus.Text;
|
dAny d = new dAny(this.Hide);
|
||||||
}
|
this.Invoke(d);
|
||||||
set
|
}
|
||||||
{
|
|
||||||
lblStatus.Text = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endregion Properties
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,4 +117,27 @@
|
||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
|
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
|
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
AAABAAIAICAQAAAAAADoAgAAJgAAABAQEAAAAAAAKAEAAA4DAAAoAAAAIAAAAEAAAAABAAQAAAAAAIAC
|
||||||
|
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAAAACAAIAAgIAAAMDAwACAgIAAAAD/AAD/
|
||||||
|
AAAA//8A/wAAAP8A/wD//wAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIh3iI
|
||||||
|
iId4iAAAAAAAAAAACId4iIiHeIAiIiIggAAAAAAAAAAAAAgCqqqqoggAAAAAAAAAAACAKqqqqiAIAAiH
|
||||||
|
eId4iIiIAqqqqqIAAIAIh3iHeIiIgCqqqqogAACAAAAAAAAACAKqqqqiAAAAgAAAAAAAAIAqqqqqIAAA
|
||||||
|
AIAAAAAAAAgCqqqqogAAAAgAAAAAAAAAIiIiIiAAAACAAAAA////8AAAAAAAAAAIAAAAAP////8Aqqqq
|
||||||
|
IAAAgAAAAAD/iIj/gCqqqqIACAAAAAAA/4iI/4gCqqqqIIAAAAAAAP//////8AAAAAgAAAAAAAD/////
|
||||||
|
//+IiIiPAAAAAAAA/4iI/4iI/4iI/wAAAAAAAP+IiP+IiP+IiP8AAAAAAAD/////////////AAAAAAAA
|
||||||
|
/////////////wAAAAAAAP+IiP+IiP+IiP8AAAAAAAD/iIj/iIj/iIj/AAAAAAAA/////////////wAA
|
||||||
|
AAAAAP////////////8AAAAAAERERERERERERERERAAAAABEREREREREREREREQAAAAARERERERERERE
|
||||||
|
REREAAAAAERERERERERERERERAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
|
||||||
|
///4AAAP+AAAB///gAP//wADgAAAAYAAAAH/+AAB//AAAcAAAAPAAAAHwAAAD8AAAB/AAAA/wAAAP8AA
|
||||||
|
AD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/////////
|
||||||
|
//8oAAAAEAAAACAAAAABAAQAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAA
|
||||||
|
AACAAIAAgIAAAMDAwACAgIAAAAD/AAD/AAAA//8A/wAAAP8A/wD//wAA////AAAAAAAAAAAAAHh4iHgA
|
||||||
|
CAAAAAAAACIiAAh4eIgCqqIIAAAAACqqIAAAAAACqqIAAAAP/wAAAAAAAA+IgKqiAAAAD//4AADwAAAP
|
||||||
|
iPiPiPAAAA//////8AAAD4j4j4jwAAAP//////AAAERERERERAAAREREREREAAAAAAAAAAAA//8AAMAD
|
||||||
|
AAD/gQAAgAAAAP4AAADAAQAAwAMAAMADAADAAwAAwAMAAMADAADAAwAAwAMAAMADAADAAwAA//8AAA==
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
Loading…
Reference in New Issue