UI.Shared.EmergencyStopForm removed.
This commit is contained in:
Milan Hanajik
parent
bb3a6ff4f3
commit
b63408cc68
@ -404,7 +404,7 @@ namespace TBF.Rig.ControlBoard.Legacy
|
||||
}
|
||||
|
||||
/// <summary>Initialize this device</summary>
|
||||
public void Initialize()
|
||||
public override void Initialize()
|
||||
{
|
||||
//int divertersCount = Rig.Uni.Diverter.Diverter.DivertersCount;
|
||||
|
||||
@ -474,7 +474,7 @@ namespace TBF.Rig.ControlBoard.Legacy
|
||||
}
|
||||
else if (!emergencyStop && previousEmergencyStop)
|
||||
{
|
||||
UiBridge.Bridge.OnEmergencyStopChanged(this, UiBridge.EmergencyStopEventArgs.State.CloseForm);
|
||||
//UiBridge.Bridge.OnEmergencyStopChanged(this, UiBridge.EmergencyStopEventArgs.State.CloseForm);
|
||||
}
|
||||
|
||||
|
||||
@ -560,7 +560,7 @@ namespace TBF.Rig.ControlBoard.Legacy
|
||||
///
|
||||
void ShowEmergencyStopForm()
|
||||
{
|
||||
(new TBF.UI.Shared.EmergencyStopForm()).Show();
|
||||
//(new TBF.UI.Shared.EmergencyStopForm()).Show();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -2364,12 +2364,6 @@
|
||||
<Compile Include="UI\Shared\ClosingTbfForm.designer.cs">
|
||||
<DependentUpon>ClosingTbfForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UI\Shared\EmergencyStopForm.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="UI\Shared\EmergencyStopForm.designer.cs">
|
||||
<DependentUpon>EmergencyStopForm.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UI\Shared\ErrorDlg.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@ -3211,9 +3205,6 @@
|
||||
<EmbeddedResource Include="UI\Shared\ClosingTbfForm.resx">
|
||||
<DependentUpon>ClosingTbfForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="UI\Shared\EmergencyStopForm.resx">
|
||||
<DependentUpon>EmergencyStopForm.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="UI\Shared\ErrorDlg.resx">
|
||||
<DependentUpon>ErrorDlg.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
///
|
||||
/// Copyright (c) 2013-2015 Senus Slovensko a.s.
|
||||
///
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
using TBF.Resources;
|
||||
|
||||
namespace TBF.UI.Shared
|
||||
{
|
||||
public partial class EmergencyStopForm : Form
|
||||
{
|
||||
bool closingForm = false;
|
||||
|
||||
/// <summary>
|
||||
/// Parameterless constructor (does the localization)
|
||||
/// </summary>
|
||||
public EmergencyStopForm()
|
||||
{
|
||||
Visible = true;
|
||||
InitializeComponent();
|
||||
|
||||
emergencyStopMsgLabel.Text = Strings.Emergency_STOP;
|
||||
emergencyStopMsgLabel.Enabled = true;
|
||||
emergencyStopMsgLabel.Visible = true;
|
||||
|
||||
UiBridge.Bridge.EmergencyStopChangedHandler += delegate(object sender, UiBridge.EmergencyStopEventArgs args)
|
||||
{
|
||||
if (closingForm) return;
|
||||
|
||||
if (InvokeRequired)
|
||||
{
|
||||
Invoke(new EventHandler<UiBridge.EmergencyStopEventArgs>(OnEmergencyStopStateChanged), sender, args);
|
||||
}
|
||||
else OnEmergencyStopStateChanged(sender, args);
|
||||
};
|
||||
}
|
||||
|
||||
void OnEmergencyStopStateChanged(Object sender, UiBridge.EmergencyStopEventArgs args)
|
||||
{
|
||||
if (args.EmergencyStopState == UiBridge.EmergencyStopEventArgs.State.CloseForm)
|
||||
{
|
||||
closingForm = true;
|
||||
Close();
|
||||
}
|
||||
//else if (args.EmergencyStopState == UiBridge.EmergencyStopEventArgs.State.Active)
|
||||
//{
|
||||
// Visible = true;
|
||||
// emergencyStopMsgLabel.Enabled = true;
|
||||
// emergencyStopMsgLabel.Visible = true;
|
||||
//}
|
||||
//else if (args.EmergencyStopState == UiBridge.EmergencyStopEventArgs.State.Inactive)
|
||||
//{
|
||||
// Visible = false;
|
||||
// emergencyStopMsgLabel.Enabled = false;
|
||||
// emergencyStopMsgLabel.Visible = false;
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
73
TBF/UI/Shared/EmergencyStopForm.designer.cs
generated
73
TBF/UI/Shared/EmergencyStopForm.designer.cs
generated
@ -1,73 +0,0 @@
|
||||
///
|
||||
/// Copyright (c) 2013-2015 Senus Slovensko a.s.
|
||||
///
|
||||
namespace TBF.UI.Shared
|
||||
{
|
||||
partial class EmergencyStopForm
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.emergencyStopMsgLabel = new System.Windows.Forms.Label();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// emergencyStopMsgLabel
|
||||
//
|
||||
this.emergencyStopMsgLabel.AutoSize = true;
|
||||
this.emergencyStopMsgLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
|
||||
this.emergencyStopMsgLabel.ForeColor = System.Drawing.Color.Yellow;
|
||||
this.emergencyStopMsgLabel.Location = new System.Drawing.Point(67, 86);
|
||||
this.emergencyStopMsgLabel.Name = "emergencyStopMsgLabel";
|
||||
this.emergencyStopMsgLabel.Size = new System.Drawing.Size(287, 37);
|
||||
this.emergencyStopMsgLabel.TabIndex = 1;
|
||||
this.emergencyStopMsgLabel.Text = "Emergency STOP";
|
||||
//
|
||||
// EmergencyStopForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.AutoSize = true;
|
||||
this.BackColor = System.Drawing.Color.Red;
|
||||
this.ClientSize = new System.Drawing.Size(412, 212);
|
||||
this.Controls.Add(this.emergencyStopMsgLabel);
|
||||
this.ForeColor = System.Drawing.Color.Transparent;
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
||||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "EmergencyStopForm";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
this.Text = "Emergency STOP";
|
||||
this.TopMost = true;
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.Label emergencyStopMsgLabel;
|
||||
}
|
||||
}
|
||||
@ -1,120 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@ -201,18 +201,6 @@ namespace TBF.UiBridge
|
||||
public static event EventHandler<StateChangedEventArgs> StateChangedHandler;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called from the state machine when 'Activity' information changes.
|
||||
/// </summary>
|
||||
public static void OnEmergencyStopChanged(object sender, EmergencyStopEventArgs.State state)
|
||||
{
|
||||
if (EmergencyStopChangedHandler == null) return;
|
||||
try { EmergencyStopChangedHandler(sender, new EmergencyStopEventArgs(state)); }
|
||||
catch (Exception e) { log.Error("EmergencyStopHandler(...) failed", e); }
|
||||
}
|
||||
public static event EventHandler<EmergencyStopEventArgs> EmergencyStopChangedHandler;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Called from the state machine when an operation forces a modeless dialog close.
|
||||
/// </summary>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user