More Segoe UI

This commit is contained in:
Sean Kaim
2019-01-03 12:08:33 -05:00
parent 31744be691
commit bacf832158
3 changed files with 112 additions and 122 deletions

View File

@@ -18,110 +18,111 @@ namespace mRemoteNG.Tools
}
}
//Required by the Windows Form Designer
private System.ComponentModel.Container components = null;
//NOTE: The following procedure is required by the Windows Form Designer
//It can be modified using the Windows Form Designer.
//Do not modify it using the code editor.
[System.Diagnostics.DebuggerStepThrough()]
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.grpAutomaticReconnect = new System.Windows.Forms.GroupBox();
this.lblAnimation = new UI.Controls.Base.NGLabel();
this.btnClose = new UI.Controls.Base.NGButton();
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
this.lblServerStatus = new UI.Controls.Base.NGLabel();
this.chkReconnectWhenReady = new UI.Controls.Base.NGCheckBox();
this.chkReconnectWhenReady.CheckedChanged += new System.EventHandler(this.chkReconnectWhenReady_CheckedChanged);
this.pbServerStatus = new System.Windows.Forms.PictureBox();
this.tmrAnimation = new System.Windows.Forms.Timer(this.components);
this.tmrAnimation.Tick += new System.EventHandler(this.tmrAnimation_Tick);
this.grpAutomaticReconnect.SuspendLayout();
((System.ComponentModel.ISupportInitialize) this.pbServerStatus).BeginInit();
this.SuspendLayout();
//
//grpAutomaticReconnect
//
this.grpAutomaticReconnect.BackColor = System.Drawing.Color.White;
this.grpAutomaticReconnect.Controls.Add(this.lblAnimation);
this.grpAutomaticReconnect.Controls.Add(this.btnClose);
this.grpAutomaticReconnect.Controls.Add(this.lblServerStatus);
this.grpAutomaticReconnect.Controls.Add(this.chkReconnectWhenReady);
this.grpAutomaticReconnect.Controls.Add(this.pbServerStatus);
this.grpAutomaticReconnect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.grpAutomaticReconnect.Location = new System.Drawing.Point(3, 0);
this.grpAutomaticReconnect.Name = "grpAutomaticReconnect";
this.grpAutomaticReconnect.Size = new System.Drawing.Size(171, 98);
this.grpAutomaticReconnect.TabIndex = 8;
this.grpAutomaticReconnect.TabStop = false;
this.grpAutomaticReconnect.Text = Language.strGroupboxAutomaticReconnect;
//
//lblAnimation
//
this.lblAnimation.Location = new System.Drawing.Point(124, 22);
this.lblAnimation.Name = "lblAnimation";
this.lblAnimation.Size = new System.Drawing.Size(32, 17);
this.lblAnimation.TabIndex = 8;
//
//btnClose
//
this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClose.Location = new System.Drawing.Point(6, 67);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(159, 23);
this.btnClose.TabIndex = 7;
this.btnClose.Text = Language.strButtonClose;
this.btnClose.UseVisualStyleBackColor = true;
//
//lblServerStatus
//
this.lblServerStatus.AutoSize = true;
this.lblServerStatus.Location = new System.Drawing.Point(15, 24);
this.lblServerStatus.Name = "lblServerStatus";
this.lblServerStatus.Size = new System.Drawing.Size(74, 13);
this.lblServerStatus.TabIndex = 3;
this.lblServerStatus.Text = "Server Status:";
//
//chkReconnectWhenReady
//
this.chkReconnectWhenReady.AutoSize = true;
this.chkReconnectWhenReady.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.chkReconnectWhenReady.Location = new System.Drawing.Point(18, 44);
this.chkReconnectWhenReady.Name = "chkReconnectWhenReady";
this.chkReconnectWhenReady.Size = new System.Drawing.Size(129, 17);
this.chkReconnectWhenReady.TabIndex = 6;
this.chkReconnectWhenReady.Text = Language.strCheckboxReconnectWhenReady;
this.chkReconnectWhenReady.UseVisualStyleBackColor = true;
//
//pbServerStatus
//
this.pbServerStatus.Image = Resources.HostStatus_Check;
this.pbServerStatus.Location = new System.Drawing.Point(99, 23);
this.pbServerStatus.Name = "pbServerStatus";
this.pbServerStatus.Size = new System.Drawing.Size(16, 16);
this.pbServerStatus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pbServerStatus.TabIndex = 5;
this.pbServerStatus.TabStop = false;
//
//tmrAnimation
//
this.tmrAnimation.Enabled = true;
this.tmrAnimation.Interval = 200;
//
//ReconnectGroup
//
this.AutoScaleDimensions = new System.Drawing.SizeF((float) (6.0F), (float) (13.0F));
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.Controls.Add(this.grpAutomaticReconnect);
this.Name = "ReconnectGroup";
this.Size = new System.Drawing.Size(228, 138);
this.grpAutomaticReconnect.ResumeLayout(false);
this.grpAutomaticReconnect.PerformLayout();
((System.ComponentModel.ISupportInitialize) this.pbServerStatus).EndInit();
this.ResumeLayout(false);
this.components = new System.ComponentModel.Container();
this.grpAutomaticReconnect = new System.Windows.Forms.GroupBox();
this.lblAnimation = new mRemoteNG.UI.Controls.Base.NGLabel();
this.btnClose = new mRemoteNG.UI.Controls.Base.NGButton();
this.lblServerStatus = new mRemoteNG.UI.Controls.Base.NGLabel();
this.chkReconnectWhenReady = new mRemoteNG.UI.Controls.Base.NGCheckBox();
this.pbServerStatus = new System.Windows.Forms.PictureBox();
this.tmrAnimation = new System.Windows.Forms.Timer(this.components);
this.grpAutomaticReconnect.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbServerStatus)).BeginInit();
this.SuspendLayout();
//
// grpAutomaticReconnect
//
this.grpAutomaticReconnect.BackColor = System.Drawing.Color.White;
this.grpAutomaticReconnect.Controls.Add(this.lblAnimation);
this.grpAutomaticReconnect.Controls.Add(this.btnClose);
this.grpAutomaticReconnect.Controls.Add(this.lblServerStatus);
this.grpAutomaticReconnect.Controls.Add(this.chkReconnectWhenReady);
this.grpAutomaticReconnect.Controls.Add(this.pbServerStatus);
this.grpAutomaticReconnect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.grpAutomaticReconnect.Location = new System.Drawing.Point(3, 0);
this.grpAutomaticReconnect.Name = "grpAutomaticReconnect";
this.grpAutomaticReconnect.Size = new System.Drawing.Size(171, 98);
this.grpAutomaticReconnect.TabIndex = 8;
this.grpAutomaticReconnect.TabStop = false;
this.grpAutomaticReconnect.Text = "Automatic Reconnect";
//
// lblAnimation
//
this.lblAnimation.Location = new System.Drawing.Point(124, 22);
this.lblAnimation.Name = "lblAnimation";
this.lblAnimation.Size = new System.Drawing.Size(32, 17);
this.lblAnimation.TabIndex = 8;
//
// btnClose
//
this.btnClose._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER;
this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClose.Location = new System.Drawing.Point(6, 67);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(159, 23);
this.btnClose.TabIndex = 7;
this.btnClose.Text = global::mRemoteNG.Language.strButtonClose;
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// lblServerStatus
//
this.lblServerStatus.AutoSize = true;
this.lblServerStatus.Location = new System.Drawing.Point(15, 24);
this.lblServerStatus.Name = "lblServerStatus";
this.lblServerStatus.Size = new System.Drawing.Size(76, 13);
this.lblServerStatus.TabIndex = 3;
this.lblServerStatus.Text = "Server Status:";
//
// chkReconnectWhenReady
//
this.chkReconnectWhenReady._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER;
this.chkReconnectWhenReady.AutoSize = true;
this.chkReconnectWhenReady.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.chkReconnectWhenReady.Location = new System.Drawing.Point(18, 44);
this.chkReconnectWhenReady.Name = "chkReconnectWhenReady";
this.chkReconnectWhenReady.Size = new System.Drawing.Size(140, 17);
this.chkReconnectWhenReady.TabIndex = 6;
this.chkReconnectWhenReady.Text = global::mRemoteNG.Language.strCheckboxReconnectWhenReady;
this.chkReconnectWhenReady.UseVisualStyleBackColor = true;
this.chkReconnectWhenReady.CheckedChanged += new System.EventHandler(this.chkReconnectWhenReady_CheckedChanged);
//
// pbServerStatus
//
this.pbServerStatus.Image = global::mRemoteNG.Resources.HostStatus_Check;
this.pbServerStatus.Location = new System.Drawing.Point(99, 23);
this.pbServerStatus.Name = "pbServerStatus";
this.pbServerStatus.Size = new System.Drawing.Size(16, 16);
this.pbServerStatus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pbServerStatus.TabIndex = 5;
this.pbServerStatus.TabStop = false;
//
// tmrAnimation
//
this.tmrAnimation.Enabled = true;
this.tmrAnimation.Interval = 200;
this.tmrAnimation.Tick += new System.EventHandler(this.tmrAnimation_Tick);
//
// ReconnectGroup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.Controls.Add(this.grpAutomaticReconnect);
this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Name = "ReconnectGroup";
this.Size = new System.Drawing.Size(228, 138);
this.grpAutomaticReconnect.ResumeLayout(false);
this.grpAutomaticReconnect.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pbServerStatus)).EndInit();
this.ResumeLayout(false);
}
internal System.Windows.Forms.GroupBox grpAutomaticReconnect;
internal UI.Controls.Base.NGButton btnClose;
@@ -130,5 +131,6 @@ namespace mRemoteNG.Tools
internal System.Windows.Forms.PictureBox pbServerStatus;
internal System.Windows.Forms.Timer tmrAnimation;
internal UI.Controls.Base.NGLabel lblAnimation;
}
private System.ComponentModel.IContainer components;
}
}

View File

@@ -12,11 +12,8 @@ namespace mRemoteNG.Tools
private bool _ServerReady;
public bool ServerReady
{
get
{
return _ServerReady;
}
set
get => _ServerReady;
set
{
SetStatusImage(value ? Resources.HostStatus_On : Resources.HostStatus_Off);
@@ -46,11 +43,8 @@ namespace mRemoteNG.Tools
private bool _ReconnectWhenReady;
public bool ReconnectWhenReady
{
get
{
return _ReconnectWhenReady;
}
set
get => _ReconnectWhenReady;
set
{
_ReconnectWhenReady = value;
SetCheckbox(value);
@@ -76,15 +70,9 @@ namespace mRemoteNG.Tools
public event CloseClickedEventHandler CloseClicked
{
add
{
CloseClickedEvent = (CloseClickedEventHandler) Delegate.Combine(CloseClickedEvent, value);
}
remove
{
CloseClickedEvent = (CloseClickedEventHandler) Delegate.Remove(CloseClickedEvent, value);
}
}
add => CloseClickedEvent = (CloseClickedEventHandler) Delegate.Combine(CloseClickedEvent, value);
remove => CloseClickedEvent = (CloseClickedEventHandler) Delegate.Remove(CloseClickedEvent, value);
}
private void btnClose_Click(object sender, EventArgs e)

View File

@@ -112,15 +112,15 @@
<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>
<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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="tmrAnimation.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="tmrAnimation.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>18, 18</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>60</value>
</metadata>
</root>