버그 수정

master
CJY 2025-11-28 16:10:08 +09:00
parent 2ab4a5d3a9
commit ab102f6f8e
13 changed files with 847 additions and 647 deletions

Binary file not shown.

View File

@ -28,59 +28,59 @@
/// </summary>
private void InitializeComponent()
{
this.labelStatusExpirePassword = new SmartX.SmartLabel();
this.labelStatusExpireAccount = new SmartX.SmartLabel();
this.labelStatusExpiryPassword = new SmartX.SmartLabel();
this.labelStatusExpiryAccount = new SmartX.SmartLabel();
this.labelExpirePasswordDate = new SmartX.SmartLabel();
this.labelExpireAccountDate = new SmartX.SmartLabel();
this.smartLabel2 = new SmartX.SmartLabel();
this.labelTitleExpireAccount = new SmartX.SmartLabel();
this.labelTitleExpiryDateOfPassword = new SmartX.SmartLabel();
this.labelTitleExpiryDateOfAccount = new SmartX.SmartLabel();
this.labelPassword = new SmartX.SmartLabel();
this.labelTitlePassword = new SmartX.SmartLabel();
this.labelID = new SmartX.SmartLabel();
this.labelTitleID = new SmartX.SmartLabel();
this.SuspendLayout();
//
// labelStatusExpirePassword
// labelStatusExpiryPassword
//
this.labelStatusExpirePassword.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
this.labelStatusExpirePassword.BackPictureBox = null;
this.labelStatusExpirePassword.BackPictureBox1 = null;
this.labelStatusExpirePassword.BackPictureBox2 = null;
this.labelStatusExpirePassword.BorderColor = System.Drawing.Color.Black;
this.labelStatusExpirePassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStatusExpirePassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.labelStatusExpirePassword.ForeColor = System.Drawing.Color.DarkRed;
this.labelStatusExpirePassword.InitVisible = true;
this.labelStatusExpirePassword.LineSpacing = 0F;
this.labelStatusExpirePassword.Location = new System.Drawing.Point(691, 332);
this.labelStatusExpirePassword.Name = "labelStatusExpirePassword";
this.labelStatusExpirePassword.Size = new System.Drawing.Size(100, 30);
this.labelStatusExpirePassword.TabIndex = 230;
this.labelStatusExpirePassword.Text = "비밀번호만료";
this.labelStatusExpirePassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelStatusExpirePassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelStatusExpirePassword.Wordwrap = false;
this.labelStatusExpiryPassword.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
this.labelStatusExpiryPassword.BackPictureBox = null;
this.labelStatusExpiryPassword.BackPictureBox1 = null;
this.labelStatusExpiryPassword.BackPictureBox2 = null;
this.labelStatusExpiryPassword.BorderColor = System.Drawing.Color.Black;
this.labelStatusExpiryPassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStatusExpiryPassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.labelStatusExpiryPassword.ForeColor = System.Drawing.Color.DarkRed;
this.labelStatusExpiryPassword.InitVisible = true;
this.labelStatusExpiryPassword.LineSpacing = 0F;
this.labelStatusExpiryPassword.Location = new System.Drawing.Point(745, 332);
this.labelStatusExpiryPassword.Name = "labelStatusExpiryPassword";
this.labelStatusExpiryPassword.Size = new System.Drawing.Size(148, 30);
this.labelStatusExpiryPassword.TabIndex = 230;
this.labelStatusExpiryPassword.Text = "비밀번호만료";
this.labelStatusExpiryPassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelStatusExpiryPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelStatusExpiryPassword.Wordwrap = false;
//
// labelStatusExpireAccount
// labelStatusExpiryAccount
//
this.labelStatusExpireAccount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
this.labelStatusExpireAccount.BackPictureBox = null;
this.labelStatusExpireAccount.BackPictureBox1 = null;
this.labelStatusExpireAccount.BackPictureBox2 = null;
this.labelStatusExpireAccount.BorderColor = System.Drawing.Color.Black;
this.labelStatusExpireAccount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStatusExpireAccount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.labelStatusExpireAccount.ForeColor = System.Drawing.Color.DarkRed;
this.labelStatusExpireAccount.InitVisible = true;
this.labelStatusExpireAccount.LineSpacing = 0F;
this.labelStatusExpireAccount.Location = new System.Drawing.Point(691, 296);
this.labelStatusExpireAccount.Name = "labelStatusExpireAccount";
this.labelStatusExpireAccount.Size = new System.Drawing.Size(100, 30);
this.labelStatusExpireAccount.TabIndex = 229;
this.labelStatusExpireAccount.Text = "계정만료";
this.labelStatusExpireAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelStatusExpireAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelStatusExpireAccount.Wordwrap = false;
this.labelStatusExpiryAccount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
this.labelStatusExpiryAccount.BackPictureBox = null;
this.labelStatusExpiryAccount.BackPictureBox1 = null;
this.labelStatusExpiryAccount.BackPictureBox2 = null;
this.labelStatusExpiryAccount.BorderColor = System.Drawing.Color.Black;
this.labelStatusExpiryAccount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelStatusExpiryAccount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.labelStatusExpiryAccount.ForeColor = System.Drawing.Color.DarkRed;
this.labelStatusExpiryAccount.InitVisible = true;
this.labelStatusExpiryAccount.LineSpacing = 0F;
this.labelStatusExpiryAccount.Location = new System.Drawing.Point(745, 296);
this.labelStatusExpiryAccount.Name = "labelStatusExpiryAccount";
this.labelStatusExpiryAccount.Size = new System.Drawing.Size(148, 30);
this.labelStatusExpiryAccount.TabIndex = 229;
this.labelStatusExpiryAccount.Text = "계정만료";
this.labelStatusExpiryAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelStatusExpiryAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelStatusExpiryAccount.Wordwrap = false;
//
// labelExpirePasswordDate
//
@ -90,9 +90,10 @@
this.labelExpirePasswordDate.BackPictureBox2 = null;
this.labelExpirePasswordDate.BorderColor = System.Drawing.Color.Black;
this.labelExpirePasswordDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelExpirePasswordDate.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
this.labelExpirePasswordDate.InitVisible = true;
this.labelExpirePasswordDate.LineSpacing = 0F;
this.labelExpirePasswordDate.Location = new System.Drawing.Point(394, 332);
this.labelExpirePasswordDate.Location = new System.Drawing.Point(448, 332);
this.labelExpirePasswordDate.Name = "labelExpirePasswordDate";
this.labelExpirePasswordDate.Size = new System.Drawing.Size(291, 30);
this.labelExpirePasswordDate.TabIndex = 232;
@ -109,9 +110,10 @@
this.labelExpireAccountDate.BackPictureBox2 = null;
this.labelExpireAccountDate.BorderColor = System.Drawing.Color.Black;
this.labelExpireAccountDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelExpireAccountDate.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
this.labelExpireAccountDate.InitVisible = true;
this.labelExpireAccountDate.LineSpacing = 0F;
this.labelExpireAccountDate.Location = new System.Drawing.Point(394, 296);
this.labelExpireAccountDate.Location = new System.Drawing.Point(448, 296);
this.labelExpireAccountDate.Name = "labelExpireAccountDate";
this.labelExpireAccountDate.Size = new System.Drawing.Size(291, 30);
this.labelExpireAccountDate.TabIndex = 231;
@ -120,45 +122,45 @@
this.labelExpireAccountDate.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelExpireAccountDate.Wordwrap = false;
//
// smartLabel2
// labelTitleExpiryDateOfPassword
//
this.smartLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198)))));
this.smartLabel2.BackPictureBox = null;
this.smartLabel2.BackPictureBox1 = null;
this.smartLabel2.BackPictureBox2 = null;
this.smartLabel2.BorderColor = System.Drawing.Color.Black;
this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.smartLabel2.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.smartLabel2.InitVisible = true;
this.smartLabel2.LineSpacing = 0F;
this.smartLabel2.Location = new System.Drawing.Point(234, 332);
this.smartLabel2.Name = "smartLabel2";
this.smartLabel2.Size = new System.Drawing.Size(154, 30);
this.smartLabel2.TabIndex = 227;
this.smartLabel2.Text = "ExpirePassword";
this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel2.Wordwrap = false;
this.labelTitleExpiryDateOfPassword.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198)))));
this.labelTitleExpiryDateOfPassword.BackPictureBox = null;
this.labelTitleExpiryDateOfPassword.BackPictureBox1 = null;
this.labelTitleExpiryDateOfPassword.BackPictureBox2 = null;
this.labelTitleExpiryDateOfPassword.BorderColor = System.Drawing.Color.Black;
this.labelTitleExpiryDateOfPassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitleExpiryDateOfPassword.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelTitleExpiryDateOfPassword.InitVisible = true;
this.labelTitleExpiryDateOfPassword.LineSpacing = 0F;
this.labelTitleExpiryDateOfPassword.Location = new System.Drawing.Point(252, 332);
this.labelTitleExpiryDateOfPassword.Name = "labelTitleExpiryDateOfPassword";
this.labelTitleExpiryDateOfPassword.Size = new System.Drawing.Size(190, 30);
this.labelTitleExpiryDateOfPassword.TabIndex = 227;
this.labelTitleExpiryDateOfPassword.Text = "ExpirePassword";
this.labelTitleExpiryDateOfPassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleExpiryDateOfPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleExpiryDateOfPassword.Wordwrap = false;
//
// labelTitleExpireAccount
// labelTitleExpiryDateOfAccount
//
this.labelTitleExpireAccount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198)))));
this.labelTitleExpireAccount.BackPictureBox = null;
this.labelTitleExpireAccount.BackPictureBox1 = null;
this.labelTitleExpireAccount.BackPictureBox2 = null;
this.labelTitleExpireAccount.BorderColor = System.Drawing.Color.Black;
this.labelTitleExpireAccount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitleExpireAccount.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.labelTitleExpireAccount.InitVisible = true;
this.labelTitleExpireAccount.LineSpacing = 0F;
this.labelTitleExpireAccount.Location = new System.Drawing.Point(234, 296);
this.labelTitleExpireAccount.Name = "labelTitleExpireAccount";
this.labelTitleExpireAccount.Size = new System.Drawing.Size(154, 30);
this.labelTitleExpireAccount.TabIndex = 225;
this.labelTitleExpireAccount.Text = "ExpireAccount";
this.labelTitleExpireAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleExpireAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleExpireAccount.Wordwrap = false;
this.labelTitleExpiryDateOfAccount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198)))));
this.labelTitleExpiryDateOfAccount.BackPictureBox = null;
this.labelTitleExpiryDateOfAccount.BackPictureBox1 = null;
this.labelTitleExpiryDateOfAccount.BackPictureBox2 = null;
this.labelTitleExpiryDateOfAccount.BorderColor = System.Drawing.Color.Black;
this.labelTitleExpiryDateOfAccount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitleExpiryDateOfAccount.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelTitleExpiryDateOfAccount.InitVisible = true;
this.labelTitleExpiryDateOfAccount.LineSpacing = 0F;
this.labelTitleExpiryDateOfAccount.Location = new System.Drawing.Point(252, 296);
this.labelTitleExpiryDateOfAccount.Name = "labelTitleExpiryDateOfAccount";
this.labelTitleExpiryDateOfAccount.Size = new System.Drawing.Size(190, 30);
this.labelTitleExpiryDateOfAccount.TabIndex = 225;
this.labelTitleExpiryDateOfAccount.Text = "ExpireAccount";
this.labelTitleExpiryDateOfAccount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitleExpiryDateOfAccount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitleExpiryDateOfAccount.Wordwrap = false;
//
// labelPassword
//
@ -168,9 +170,10 @@
this.labelPassword.BackPictureBox2 = null;
this.labelPassword.BorderColor = System.Drawing.Color.Black;
this.labelPassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelPassword.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
this.labelPassword.InitVisible = true;
this.labelPassword.LineSpacing = 0F;
this.labelPassword.Location = new System.Drawing.Point(394, 260);
this.labelPassword.Location = new System.Drawing.Point(448, 260);
this.labelPassword.Name = "labelPassword";
this.labelPassword.Size = new System.Drawing.Size(291, 30);
this.labelPassword.TabIndex = 224;
@ -188,12 +191,12 @@
this.labelTitlePassword.BackPictureBox2 = null;
this.labelTitlePassword.BorderColor = System.Drawing.Color.Black;
this.labelTitlePassword.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitlePassword.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.labelTitlePassword.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelTitlePassword.InitVisible = true;
this.labelTitlePassword.LineSpacing = 0F;
this.labelTitlePassword.Location = new System.Drawing.Point(234, 260);
this.labelTitlePassword.Location = new System.Drawing.Point(252, 260);
this.labelTitlePassword.Name = "labelTitlePassword";
this.labelTitlePassword.Size = new System.Drawing.Size(154, 30);
this.labelTitlePassword.Size = new System.Drawing.Size(190, 30);
this.labelTitlePassword.TabIndex = 223;
this.labelTitlePassword.Text = "Password";
this.labelTitlePassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -208,9 +211,10 @@
this.labelID.BackPictureBox2 = null;
this.labelID.BorderColor = System.Drawing.Color.Black;
this.labelID.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelID.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Regular);
this.labelID.InitVisible = true;
this.labelID.LineSpacing = 0F;
this.labelID.Location = new System.Drawing.Point(394, 224);
this.labelID.Location = new System.Drawing.Point(448, 224);
this.labelID.Name = "labelID";
this.labelID.Size = new System.Drawing.Size(291, 30);
this.labelID.TabIndex = 222;
@ -227,12 +231,12 @@
this.labelTitleID.BackPictureBox2 = null;
this.labelTitleID.BorderColor = System.Drawing.Color.Black;
this.labelTitleID.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitleID.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.labelTitleID.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold);
this.labelTitleID.InitVisible = true;
this.labelTitleID.LineSpacing = 0F;
this.labelTitleID.Location = new System.Drawing.Point(234, 224);
this.labelTitleID.Location = new System.Drawing.Point(252, 224);
this.labelTitleID.Name = "labelTitleID";
this.labelTitleID.Size = new System.Drawing.Size(154, 30);
this.labelTitleID.Size = new System.Drawing.Size(190, 30);
this.labelTitleID.TabIndex = 221;
this.labelTitleID.Text = "ID";
this.labelTitleID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
@ -244,12 +248,12 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(151)))), ((int)(((byte)(150)))), ((int)(((byte)(151)))));
this.Controls.Add(this.labelStatusExpirePassword);
this.Controls.Add(this.labelStatusExpireAccount);
this.Controls.Add(this.labelStatusExpiryPassword);
this.Controls.Add(this.labelStatusExpiryAccount);
this.Controls.Add(this.labelExpirePasswordDate);
this.Controls.Add(this.labelExpireAccountDate);
this.Controls.Add(this.smartLabel2);
this.Controls.Add(this.labelTitleExpireAccount);
this.Controls.Add(this.labelTitleExpiryDateOfPassword);
this.Controls.Add(this.labelTitleExpiryDateOfAccount);
this.Controls.Add(this.labelPassword);
this.Controls.Add(this.labelTitlePassword);
this.Controls.Add(this.labelID);
@ -262,12 +266,12 @@
#endregion
private SmartX.SmartLabel labelStatusExpirePassword;
private SmartX.SmartLabel labelStatusExpireAccount;
private SmartX.SmartLabel labelStatusExpiryPassword;
private SmartX.SmartLabel labelStatusExpiryAccount;
private SmartX.SmartLabel labelExpirePasswordDate;
private SmartX.SmartLabel labelExpireAccountDate;
private SmartX.SmartLabel smartLabel2;
private SmartX.SmartLabel labelTitleExpireAccount;
private SmartX.SmartLabel labelTitleExpiryDateOfPassword;
private SmartX.SmartLabel labelTitleExpiryDateOfAccount;
private SmartX.SmartLabel labelPassword;
private SmartX.SmartLabel labelTitlePassword;
private SmartX.SmartLabel labelID;

View File

@ -51,9 +51,18 @@ namespace INT63DC_2C.Controls
}
else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English)
{
this.labelStatusExpiryAccount.Text = "Account Expiration";
this.labelStatusExpiryPassword.Text = "Password Expiration";
}
else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
{
this.labelTitleID.Text = "用户名";
this.labelTitlePassword.Text = "密码";
this.labelTitleExpiryDateOfAccount.Text = "到期日(帐户)";
this.labelTitleExpiryDateOfPassword.Text = "到期日(密码)";
this.labelStatusExpiryAccount.Text = "帐户到期";
this.labelStatusExpiryPassword.Text = "密码过期";
}
else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech)
{
@ -105,8 +114,8 @@ namespace INT63DC_2C.Controls
this.labelPassword.Text = item.Password;
this.labelExpireAccountDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DateIdLogin, item.DateIdExpire);
this.labelExpirePasswordDate.Text = string.Format("{0:yyyy/MM/dd} ~ {1:yyyy/MM/dd}", item.DatePasswordRegister, item.DatePasswordExpire);
this.labelStatusExpireAccount.Visible = item.IsLockAccount;
this.labelStatusExpirePassword.Visible = item.IsLockPassword;
this.labelStatusExpiryAccount.Visible = item.IsLockAccount;
this.labelStatusExpiryPassword.Visible = item.IsLockPassword;
}
public void CallBackUserListModifyInfoDataEvent(UserManager.UserMgr_user_info_t user)
@ -151,7 +160,7 @@ namespace INT63DC_2C.Controls
this.labelPassword.Text = user.user_pw;
this.ParentForm.ParentForm.SystemConfig.CurrentUser.Password = user.user_pw;
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0);
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0, this.ParentForm.ParentForm.SystemConfig.Language);
dlg.ShowDialog();
});
}

View File

@ -0,0 +1,123 @@
<?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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="$this.FormFactorShadowProperty" xml:space="preserve">
<value>WEBPAD</value>
</metadata>
</root>

View File

@ -189,7 +189,7 @@
this.labelTitle1.BackPictureBox2 = null;
this.labelTitle1.BorderColor = System.Drawing.Color.Black;
this.labelTitle1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle1.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold);
this.labelTitle1.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold);
this.labelTitle1.ForeColor = System.Drawing.SystemColors.Control;
this.labelTitle1.InitVisible = true;
this.labelTitle1.LineSpacing = 0F;
@ -210,7 +210,7 @@
this.labelTitle3.BackPictureBox2 = null;
this.labelTitle3.BorderColor = System.Drawing.Color.Black;
this.labelTitle3.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle3.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.labelTitle3.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.labelTitle3.ForeColor = System.Drawing.SystemColors.Control;
this.labelTitle3.InitVisible = true;
this.labelTitle3.LineSpacing = 0F;
@ -231,7 +231,7 @@
this.labelTitle2.BackPictureBox2 = null;
this.labelTitle2.BorderColor = System.Drawing.Color.Black;
this.labelTitle2.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTitle2.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold);
this.labelTitle2.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.labelTitle2.ForeColor = System.Drawing.SystemColors.Control;
this.labelTitle2.InitVisible = true;
this.labelTitle2.LineSpacing = 0F;
@ -281,6 +281,7 @@
this.smartButton1.TextLocation = new System.Drawing.Point(0, 0);
this.smartButton1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton1.UpImage = null;
this.smartButton1.Visible = false;
this.smartButton1.Click += new System.EventHandler(this.smartButton1_Click);
//
// smartButton2
@ -313,6 +314,7 @@
this.smartButton2.TextLocation = new System.Drawing.Point(0, 0);
this.smartButton2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton2.UpImage = null;
this.smartButton2.Visible = false;
this.smartButton2.Click += new System.EventHandler(this.smartButton2_Click);
//
// smartButton3
@ -345,6 +347,7 @@
this.smartButton3.TextLocation = new System.Drawing.Point(0, 0);
this.smartButton3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton3.UpImage = null;
this.smartButton3.Visible = false;
this.smartButton3.Click += new System.EventHandler(this.smartButton3_Click);
//
// smartButton4
@ -377,6 +380,7 @@
this.smartButton4.TextLocation = new System.Drawing.Point(0, 0);
this.smartButton4.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton4.UpImage = null;
this.smartButton4.Visible = false;
this.smartButton4.Click += new System.EventHandler(this.smartButton4_Click);
//
// smartButton5
@ -409,6 +413,7 @@
this.smartButton5.TextLocation = new System.Drawing.Point(0, 0);
this.smartButton5.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.smartButton5.UpImage = null;
this.smartButton5.Visible = false;
this.smartButton5.Click += new System.EventHandler(this.smartButton5_Click);
//
// DialogFormLogOn

File diff suppressed because it is too large Load Diff

View File

@ -1764,7 +1764,7 @@ namespace INT63DC_2C.DialogForms
break;
}
}
public DialogFormMessage(DataStore.MessageBoxIcon icon, string code, string message1, string message2, int autoClose_sec)
public DialogFormMessage(DataStore.MessageBoxIcon icon, string code, string message1, string message2, int autoClose_sec, DataStore.LanguageID language)
{
InitializeComponent();
@ -1775,6 +1775,16 @@ namespace INT63DC_2C.DialogForms
this.pictureBoxHand.Visible = false;
this.pictureBoxQuestion.Visible = false;
switch (language)
{
case DataStore.LanguageID.Chinese:
this.buttonOK.Text = "好";
break;
default:
this.buttonOK.Text = "OK";
break;
}
switch (icon)
{
case DataStore.MessageBoxIcon.Hand:

View File

@ -509,6 +509,9 @@ namespace INT63DC_2C.DialogForms
break;
case DataStore.LanguageID.Chinese:
#region Chinese
this.buttonYes.Text = "是";
this.buttonNo.Text = "否";
switch (ok)
{
case 2:
@ -595,7 +598,7 @@ namespace INT63DC_2C.DialogForms
break;
}
}
public DialogFormYesNo(DataStore.MessageBoxIcon icon, string code, string message1, string message2)
public DialogFormYesNo(DataStore.MessageBoxIcon icon, string code, string message1, string message2, DataStore.LanguageID language)
{
InitializeComponent();
@ -604,6 +607,18 @@ namespace INT63DC_2C.DialogForms
this.pictureBoxHand.Visible = false;
this.pictureBoxQuestion.Visible = false;
switch (language)
{
case DataStore.LanguageID.Chinese:
this.buttonYes.Text = "是";
this.buttonNo.Text = "否";
break;
default:
this.buttonYes.Text = "Yes";
this.buttonNo.Text = "No";
break;
}
switch (icon)
{
case DataStore.MessageBoxIcon.Hand:

View File

@ -1409,8 +1409,6 @@ namespace INT63DC_2C.Forms
id = user.ID;
if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German)
group = "Administrator";
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
group = "行政";
else
group = "Administrator";
@ -1435,8 +1433,6 @@ namespace INT63DC_2C.Forms
id = user.ID;
if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German)
group = "Entwickler";
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
group = "开发商";
else
group = "Developer";
@ -2505,7 +2501,7 @@ namespace INT63DC_2C.Forms
this.UI_Invoke(delegate
{
DialogFormMessage msg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, warningTime);
DialogFormMessage msg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, warningTime, this.ParentForm.SystemConfig.Language);
msg.ShowDialog();
});
}
@ -2552,7 +2548,7 @@ namespace INT63DC_2C.Forms
this.UI_Invoke(delegate
{
DialogFormMessage msg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0);
DialogFormMessage msg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0, this.ParentForm.SystemConfig.Language);
msg.ShowDialog();
});
}

View File

@ -323,7 +323,7 @@ namespace INT63DC_2C.Forms
break;
case DataStore.LanguageID.Chinese:
code = "用户设置";
message1 = "是否要编辑所选用户的信息?";
message1 = "是否要编辑所选用户的信息";
message2 = "";
break;
case DataStore.LanguageID.Czech:
@ -346,7 +346,7 @@ namespace INT63DC_2C.Forms
}
}
DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2);
DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2, this.ParentForm.SystemConfig.Language);
if (dlg.ShowDialog() == DialogResult.Yes)
{
UserItem item = new UserItem();
@ -901,7 +901,7 @@ namespace INT63DC_2C.Forms
this.buttonSave.Visible = false;
this.SetEnableID(false);
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0);
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0, this.ParentForm.SystemConfig.Language);
dlg.ShowDialog();
});
}
@ -957,7 +957,7 @@ namespace INT63DC_2C.Forms
// 메시지 박스 교체
UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString());
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0);
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0, this.ParentForm.SystemConfig.Language);
dlg.ShowDialog();
});
}
@ -1030,7 +1030,7 @@ namespace INT63DC_2C.Forms
this.UserNew();
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0);
DialogFormMessage dlg = new DialogFormMessage(DataStore.MessageBoxIcon.Asterisk, code, message1, message2, 0, this.ParentForm.SystemConfig.Language);
dlg.ShowDialog();
});
@ -1265,30 +1265,35 @@ namespace INT63DC_2C.Forms
message2 = "";
break;
case DataStore.LanguageID.English:
code = "유저설정";
message1 = "사용자 잠금 해제 하시겠습니까?";
code = "User Editor";
message1 = "Do you want to unlock the user?";
message2 = "";
break;
case DataStore.LanguageID.Chinese:
code = "유저설정";
message1 = "사용자 잠금 해제 하시겠습니까?";
code = "用户设置";
message1 = "是否要解锁用户?";
message2 = "";
break;
case DataStore.LanguageID.Czech:
code = "유저설정";
code = "Uživatelské nastavení";
message1 = "사용자 잠금 해제 하시겠습니까?";
message2 = "";
break;
case DataStore.LanguageID.German:
code = "유저설정";
message1 = "사용자 잠금 해제 하시겠습니까?";
code = "Benutzereinstellungen";
message1 = "Möchten Sie den Benutzer entsperren?";
message2 = "";
break;
case DataStore.LanguageID.Japanese:
code = "ユーザー設定";
message1 = "ユーザーのロックを解除しますか?";
message2 = "";
break;
default:
break;
}
DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2);
DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2, this.ParentForm.SystemConfig.Language);
if (dlg.ShowDialog() == DialogResult.Yes)
UserManager.UserManager_UserLockRelease(this.SelectedUserItem.ID, true, false);
}
@ -1304,30 +1309,35 @@ namespace INT63DC_2C.Forms
message2 = "";
break;
case DataStore.LanguageID.English:
code = "유저설정";
message1 = "비밀번호 잠금 해제 하시겠습니까?";
code = "User Editor";
message1 = "Do you want to unlock the password?";
message2 = "";
break;
case DataStore.LanguageID.Chinese:
code = "유저설정";
message1 = "비밀번호 잠금 해제 하시겠습니까?";
code = "用户设置";
message1 = "是否要解锁密码?";
message2 = "";
break;
case DataStore.LanguageID.Czech:
code = "유저설정";
code = "Uživatelské nastavení";
message1 = "비밀번호 잠금 해제 하시겠습니까?";
message2 = "";
break;
case DataStore.LanguageID.German:
code = "유저설정";
message1 = "비밀번호 잠금 해제 하시겠습니까?";
code = "Benutzereinstellungen";
message1 = "Möchten Sie das Passwort entsperren?";
message2 = "";
break;
case DataStore.LanguageID.Japanese:
code = "ユーザー設定";
message1 = "パスワードのロックを解除しますか?";
message2 = "";
break;
default:
break;
}
DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2);
DialogFormYesNo dlg = new DialogFormYesNo(DataStore.MessageBoxIcon.Question, code, message1, message2, this.ParentForm.SystemConfig.Language);
if (dlg.ShowDialog() == DialogResult.Yes)
UserManager.UserManager_UserLockRelease(this.SelectedUserItem.ID, false, true);
}

View File

@ -45,7 +45,7 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup>
<ItemGroup>
<Reference Include="InModbus, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL" />
<Reference Include="InModbus, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL" />
<Reference Include="Microsoft.WindowsCE.Forms" />
<Reference Include="mscorlib" />
<Reference Include="SmartXCommon, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
@ -722,6 +722,10 @@
<DependentUpon>ControlMainDisplayTable15.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Controls\ControlUserSetting.resx">
<DependentUpon>ControlUserSetting.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DialogForms\DialogFormDataStatistics.resx">
<DependentUpon>DialogFormDataStatistics.cs</DependentUpon>
<SubType>Designer</SubType>
@ -780,6 +784,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormDataBackup_Part11.resx">
<DependentUpon>FormDataBackup_Part11.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormDataStatistics.resx">
<DependentUpon>FormDataStatistics.cs</DependentUpon>
@ -787,6 +792,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormDataViewer.resx">
<DependentUpon>FormDataViewer.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormEquipmentSetting.resx">
<DependentUpon>FormEquipmentSetting.cs</DependentUpon>
@ -842,6 +848,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormUserEditor.resx">
<DependentUpon>FormUserEditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\FormUserGroupEditor.resx">
<DependentUpon>FormUserGroupEditor.cs</DependentUpon>