From 34febe383873f19ce9fc7ac328a6ca6ce547583d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=82=85Fox?= Date: Wed, 12 Aug 2015 17:56:18 +0800 Subject: [PATCH 1/3] MaterialSkin for Auth --- Auth/Auth.csproj | 5 +++ Auth/Properties/AssemblyInfo.cs | 4 +- Auth/Wait.Designer.cs | 44 ++++++++++++++------- Auth/Wait.cs | 14 +++++-- Auth/packages.config | 4 ++ Library/Properties/AssemblyInfo.cs | 4 +- URLSchemeHandler/Properties/AssemblyInfo.cs | 4 +- 7 files changed, 55 insertions(+), 24 deletions(-) create mode 100644 Auth/packages.config diff --git a/Auth/Auth.csproj b/Auth/Auth.csproj index 3d70acb..1cadd01 100644 --- a/Auth/Auth.csproj +++ b/Auth/Auth.csproj @@ -37,6 +37,10 @@ Rap-ID.ico + + ..\packages\MaterialSkin.0.2.1\lib\MaterialSkin.dll + True + @@ -70,6 +74,7 @@ Wait.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Auth/Properties/AssemblyInfo.cs b/Auth/Properties/AssemblyInfo.cs index f47a392..321a4b0 100644 --- a/Auth/Properties/AssemblyInfo.cs +++ b/Auth/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.1.3")] -[assembly: AssemblyFileVersion("1.3.1.3")] +[assembly: AssemblyVersion("1.3.2.7")] +[assembly: AssemblyFileVersion("1.3.2.7")] diff --git a/Auth/Wait.Designer.cs b/Auth/Wait.Designer.cs index c676868..c418d3f 100644 --- a/Auth/Wait.Designer.cs +++ b/Auth/Wait.Designer.cs @@ -1,4 +1,6 @@ -namespace RapID.Auth +using MaterialSkin.Controls; + +namespace RapID.Auth { partial class Wait { @@ -29,9 +31,9 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Wait)); - this.infoLabel = new System.Windows.Forms.Label(); - this.okButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); + this.infoLabel = new MaterialSkin.Controls.MaterialLabel(); + this.okButton = new MaterialSkin.Controls.MaterialRaisedButton(); + this.cancelButton = new MaterialSkin.Controls.MaterialFlatButton(); this.SuspendLayout(); // // infoLabel @@ -39,10 +41,14 @@ private void InitializeComponent() this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.infoLabel.Location = new System.Drawing.Point(14, 9); + this.infoLabel.Depth = 0; + this.infoLabel.Font = new System.Drawing.Font("Roboto", 11F); + this.infoLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.infoLabel.Location = new System.Drawing.Point(14, 69); this.infoLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.infoLabel.MouseState = MaterialSkin.MouseState.HOVER; this.infoLabel.Name = "infoLabel"; - this.infoLabel.Size = new System.Drawing.Size(300, 78); + this.infoLabel.Size = new System.Drawing.Size(287, 69); this.infoLabel.TabIndex = 0; this.infoLabel.Text = "Rap-ID"; this.infoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -50,9 +56,12 @@ private void InitializeComponent() // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.Location = new System.Drawing.Point(138, 90); + this.okButton.Depth = 0; + this.okButton.Location = new System.Drawing.Point(166, 144); + this.okButton.MouseState = MaterialSkin.MouseState.HOVER; this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(85, 29); + this.okButton.Primary = true; + this.okButton.Size = new System.Drawing.Size(64, 36); this.okButton.TabIndex = 1; this.okButton.Text = "OK"; this.okButton.UseVisualStyleBackColor = true; @@ -61,9 +70,15 @@ private void InitializeComponent() // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.cancelButton.Location = new System.Drawing.Point(229, 90); + this.cancelButton.AutoSize = true; + this.cancelButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.cancelButton.Depth = 0; + this.cancelButton.Location = new System.Drawing.Point(237, 144); + this.cancelButton.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + this.cancelButton.MouseState = MaterialSkin.MouseState.HOVER; this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(85, 29); + this.cancelButton.Primary = false; + this.cancelButton.Size = new System.Drawing.Size(64, 36); this.cancelButton.TabIndex = 2; this.cancelButton.Text = "Cancel"; this.cancelButton.UseVisualStyleBackColor = true; @@ -73,7 +88,7 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(326, 131); + this.ClientSize = new System.Drawing.Size(315, 195); this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); this.Controls.Add(this.infoLabel); @@ -86,13 +101,14 @@ private void InitializeComponent() this.TopMost = true; this.Load += new System.EventHandler(this.Wait_Load); this.ResumeLayout(false); + this.PerformLayout(); } #endregion - private System.Windows.Forms.Label infoLabel; - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.Button cancelButton; + private MaterialLabel infoLabel; + private MaterialRaisedButton okButton; + private MaterialFlatButton cancelButton; } } \ No newline at end of file diff --git a/Auth/Wait.cs b/Auth/Wait.cs index 61c1c68..0f295ce 100644 --- a/Auth/Wait.cs +++ b/Auth/Wait.cs @@ -11,24 +11,30 @@ using System.Net; using System.Net.Sockets; using System.IO; +using MaterialSkin; +using MaterialSkin.Controls; namespace RapID.Auth { - public partial class Wait : Form + public partial class Wait : MaterialForm { private string _app; public Wait(string app) { InitializeComponent(); - this._app = app; + _app = app; + var materialSkinManager = MaterialSkinManager.Instance; + materialSkinManager.AddFormToManage(this); + materialSkinManager.Theme = MaterialSkinManager.Themes.LIGHT; + materialSkinManager.ColorScheme = new ColorScheme(Primary.Orange800, Primary.Orange900, Primary.Orange500, Accent.Orange200, TextShade.WHITE); } public void SetInfoText(string text) { this.OverThread = () => { - this.infoLabel.Text = text; - this.Refresh(); + infoLabel.Text = text; + Refresh(); }; this.Invoke(this.OverThread); } diff --git a/Auth/packages.config b/Auth/packages.config new file mode 100644 index 0000000..3491226 --- /dev/null +++ b/Auth/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Library/Properties/AssemblyInfo.cs b/Library/Properties/AssemblyInfo.cs index 1d9f157..8cae014 100644 --- a/Library/Properties/AssemblyInfo.cs +++ b/Library/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0.19")] -[assembly: AssemblyFileVersion("1.2.0.19")] +[assembly: AssemblyVersion("1.2.0.21")] +[assembly: AssemblyFileVersion("1.2.0.21")] diff --git a/URLSchemeHandler/Properties/AssemblyInfo.cs b/URLSchemeHandler/Properties/AssemblyInfo.cs index 28ccaa9..f96c1ef 100644 --- a/URLSchemeHandler/Properties/AssemblyInfo.cs +++ b/URLSchemeHandler/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.1.2")] -[assembly: AssemblyFileVersion("1.1.1.2")] +[assembly: AssemblyVersion("1.1.1.3")] +[assembly: AssemblyFileVersion("1.1.1.3")] From 5f10170807622ded19af04602ef19e8449bd0018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=82=85Fox?= Date: Wed, 12 Aug 2015 18:07:56 +0800 Subject: [PATCH 2/3] MaterialSkin for Configure --- Configure/Configure.csproj | 5 +++ Configure/Picker.Designer.cs | 37 ++++++++++++--------- Configure/Picker.cs | 9 +++++- Configure/Picker.resx | 8 ++--- Configure/Properties/AssemblyInfo.cs | 4 +-- Configure/Setter.Designer.cs | 48 ++++++++++++++++++---------- Configure/Setter.cs | 9 +++++- Configure/packages.config | 4 +++ 8 files changed, 84 insertions(+), 40 deletions(-) create mode 100644 Configure/packages.config diff --git a/Configure/Configure.csproj b/Configure/Configure.csproj index 77becc2..2359fe3 100644 --- a/Configure/Configure.csproj +++ b/Configure/Configure.csproj @@ -56,6 +56,10 @@ Rap-ID.ico + + ..\packages\MaterialSkin.0.2.1\lib\MaterialSkin.dll + True + @@ -105,6 +109,7 @@ Setter.cs + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Configure/Picker.Designer.cs b/Configure/Picker.Designer.cs index e614528..dd65c4b 100644 --- a/Configure/Picker.Designer.cs +++ b/Configure/Picker.Designer.cs @@ -1,4 +1,6 @@ -namespace RapID.Configure +using MaterialSkin.Controls; + +namespace RapID.Configure { partial class Picker { @@ -30,8 +32,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Picker)); - this.listenStateLabel = new System.Windows.Forms.Label(); - this.pairButton = new System.Windows.Forms.Button(); + this.listenStateLabel = new MaterialSkin.Controls.MaterialLabel(); + this.pairButton = new MaterialSkin.Controls.MaterialRaisedButton(); this.RapIDIcon = new System.Windows.Forms.NotifyIcon(this.components); this.iconMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.exitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -42,9 +44,13 @@ private void InitializeComponent() // // listenStateLabel // - this.listenStateLabel.Location = new System.Drawing.Point(12, 9); + this.listenStateLabel.Depth = 0; + this.listenStateLabel.Font = new System.Drawing.Font("Roboto", 11F); + this.listenStateLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.listenStateLabel.Location = new System.Drawing.Point(12, 73); + this.listenStateLabel.MouseState = MaterialSkin.MouseState.HOVER; this.listenStateLabel.Name = "listenStateLabel"; - this.listenStateLabel.Size = new System.Drawing.Size(295, 43); + this.listenStateLabel.Size = new System.Drawing.Size(199, 42); this.listenStateLabel.TabIndex = 0; this.listenStateLabel.Text = "正在等待设备连接……"; this.listenStateLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -54,9 +60,12 @@ private void InitializeComponent() this.pairButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.pairButton.Location = new System.Drawing.Point(13, 359); + this.pairButton.Depth = 0; + this.pairButton.Location = new System.Drawing.Point(162, 359); + this.pairButton.MouseState = MaterialSkin.MouseState.HOVER; this.pairButton.Name = "pairButton"; - this.pairButton.Size = new System.Drawing.Size(294, 57); + this.pairButton.Primary = true; + this.pairButton.Size = new System.Drawing.Size(49, 31); this.pairButton.TabIndex = 2; this.pairButton.Text = "配对"; this.pairButton.UseVisualStyleBackColor = true; @@ -68,7 +77,7 @@ private void InitializeComponent() this.RapIDIcon.BalloonTipText = "配对程序正在运行中"; this.RapIDIcon.BalloonTipTitle = "Rap-ID"; this.RapIDIcon.ContextMenuStrip = this.iconMenu; - this.RapIDIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("Rap-IDIcon.Icon"))); + this.RapIDIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("RapIDIcon.Icon"))); this.RapIDIcon.Text = "Rap-ID配对程序"; this.RapIDIcon.Visible = true; // @@ -92,9 +101,9 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.uidListBox.FormattingEnabled = true; this.uidListBox.ItemHeight = 21; - this.uidListBox.Location = new System.Drawing.Point(13, 55); + this.uidListBox.Location = new System.Drawing.Point(13, 118); this.uidListBox.Name = "uidListBox"; - this.uidListBox.Size = new System.Drawing.Size(294, 298); + this.uidListBox.Size = new System.Drawing.Size(198, 235); this.uidListBox.TabIndex = 4; // // timer @@ -107,12 +116,11 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(319, 428); + this.ClientSize = new System.Drawing.Size(223, 402); this.Controls.Add(this.uidListBox); this.Controls.Add(this.pairButton); this.Controls.Add(this.listenStateLabel); this.Font = new System.Drawing.Font("微软雅黑", 12F); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Margin = new System.Windows.Forms.Padding(5); this.MaximizeBox = false; this.MinimizeBox = false; @@ -125,13 +133,12 @@ private void InitializeComponent() } #endregion - - private System.Windows.Forms.Label listenStateLabel; - private System.Windows.Forms.Button pairButton; private System.Windows.Forms.NotifyIcon RapIDIcon; private System.Windows.Forms.ContextMenuStrip iconMenu; private System.Windows.Forms.ToolStripMenuItem exitMenuItem; private System.Windows.Forms.ListBox uidListBox; private System.Windows.Forms.Timer timer; + private MaterialLabel listenStateLabel; + private MaterialRaisedButton pairButton; } } \ No newline at end of file diff --git a/Configure/Picker.cs b/Configure/Picker.cs index adc1557..3fe49a1 100644 --- a/Configure/Picker.cs +++ b/Configure/Picker.cs @@ -7,10 +7,12 @@ using System.Text; using System.Windows.Forms; using RapID.ClassLibrary; +using MaterialSkin; +using MaterialSkin.Controls; namespace RapID.Configure { - public partial class Picker : Form + public partial class Picker : MaterialForm { private UDPServer udpClient; private List piList = new List(); @@ -20,6 +22,11 @@ public Picker() this.udpClient = new UDPServer(NetworkPorts.Boradcast); this.udpClient.OnMessage += udpClient_OnMessage; this.udpClient.StartListen(); + + var materialSkinManager = MaterialSkinManager.Instance; + materialSkinManager.AddFormToManage(this); + materialSkinManager.Theme = MaterialSkinManager.Themes.LIGHT; + materialSkinManager.ColorScheme = new ColorScheme(Primary.Green800, Primary.Green900, Primary.Green500, Accent.Green200, TextShade.WHITE); } void udpClient_OnMessage(object sender, string message, System.Net.IPEndPoint remote) diff --git a/Configure/Picker.resx b/Configure/Picker.resx index f3563da..7fe7331 100644 --- a/Configure/Picker.resx +++ b/Configure/Picker.resx @@ -117,14 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - 134, 17 + 130, 17 - + AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAABAAAAAAAAAAAAAAAAAAAA AAD///////////////////////////////////////////////////////////////////////////// @@ -1257,6 +1257,6 @@ - 245, 17 + 241, 17 \ No newline at end of file diff --git a/Configure/Properties/AssemblyInfo.cs b/Configure/Properties/AssemblyInfo.cs index 9fb9ce4..4298cc1 100644 --- a/Configure/Properties/AssemblyInfo.cs +++ b/Configure/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.13")] -[assembly: AssemblyFileVersion("1.1.0.13")] +[assembly: AssemblyVersion("1.1.0.17")] +[assembly: AssemblyFileVersion("1.1.0.17")] diff --git a/Configure/Setter.Designer.cs b/Configure/Setter.Designer.cs index f04af83..3e2c0c6 100644 --- a/Configure/Setter.Designer.cs +++ b/Configure/Setter.Designer.cs @@ -1,4 +1,6 @@ -namespace RapID.Configure +using MaterialSkin.Controls; + +namespace RapID.Configure { partial class Setter { @@ -28,30 +30,40 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.passBox = new System.Windows.Forms.TextBox(); - this.okButton = new System.Windows.Forms.Button(); - this.statusLabel = new System.Windows.Forms.Label(); + this.passBox = new MaterialSkin.Controls.MaterialSingleLineTextField(); + this.okButton = new MaterialSkin.Controls.MaterialRaisedButton(); + this.statusLabel = new MaterialSkin.Controls.MaterialLabel(); this.SuspendLayout(); // // passBox // this.passBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.passBox.Depth = 0; this.passBox.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.passBox.Location = new System.Drawing.Point(12, 46); + this.passBox.Hint = ""; + this.passBox.Location = new System.Drawing.Point(12, 106); + this.passBox.MouseState = MaterialSkin.MouseState.HOVER; this.passBox.Name = "passBox"; - this.passBox.Size = new System.Drawing.Size(182, 46); + this.passBox.PasswordChar = '\0'; + this.passBox.SelectedText = ""; + this.passBox.SelectionLength = 0; + this.passBox.SelectionStart = 0; + this.passBox.Size = new System.Drawing.Size(135, 23); this.passBox.TabIndex = 0; - this.passBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.passBox.UseSystemPasswordChar = false; // // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.Location = new System.Drawing.Point(12, 98); + this.okButton.Depth = 0; + this.okButton.Location = new System.Drawing.Point(77, 135); + this.okButton.MouseState = MaterialSkin.MouseState.HOVER; this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(182, 38); + this.okButton.Primary = true; + this.okButton.Size = new System.Drawing.Size(70, 30); this.okButton.TabIndex = 1; this.okButton.Text = "确认"; this.okButton.UseVisualStyleBackColor = true; @@ -61,9 +73,13 @@ private void InitializeComponent() // this.statusLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.statusLabel.Location = new System.Drawing.Point(12, 9); + this.statusLabel.Depth = 0; + this.statusLabel.Font = new System.Drawing.Font("Roboto", 11F); + this.statusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.statusLabel.Location = new System.Drawing.Point(12, 69); + this.statusLabel.MouseState = MaterialSkin.MouseState.HOVER; this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(182, 34); + this.statusLabel.Size = new System.Drawing.Size(135, 34); this.statusLabel.TabIndex = 2; this.statusLabel.Text = "请输入配对密钥"; this.statusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -72,12 +88,11 @@ private void InitializeComponent() // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(206, 148); + this.ClientSize = new System.Drawing.Size(159, 177); this.Controls.Add(this.statusLabel); this.Controls.Add(this.okButton); this.Controls.Add(this.passBox); this.Font = new System.Drawing.Font("微软雅黑", 12F); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Margin = new System.Windows.Forms.Padding(5); this.MaximizeBox = false; this.MinimizeBox = false; @@ -87,14 +102,13 @@ private void InitializeComponent() this.Text = "配对"; this.TopMost = true; this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.TextBox passBox; - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.Label statusLabel; + private MaterialSingleLineTextField passBox; + private MaterialRaisedButton okButton; + private MaterialLabel statusLabel; } } \ No newline at end of file diff --git a/Configure/Setter.cs b/Configure/Setter.cs index 21fb602..78f74d8 100644 --- a/Configure/Setter.cs +++ b/Configure/Setter.cs @@ -10,16 +10,23 @@ using System.Net; using System.Net.Sockets; using System.IO; +using MaterialSkin; +using MaterialSkin.Controls; namespace RapID.Configure { - public partial class Setter : Form + public partial class Setter : MaterialForm { private Device pi; private string key; public Setter() { InitializeComponent(); + + var materialSkinManager = MaterialSkinManager.Instance; + materialSkinManager.AddFormToManage(this); + materialSkinManager.Theme = MaterialSkinManager.Themes.LIGHT; + materialSkinManager.ColorScheme = new ColorScheme(Primary.Green800, Primary.Green900, Primary.Green500, Accent.Green200, TextShade.WHITE); } public Setter(Device pi) : this() diff --git a/Configure/packages.config b/Configure/packages.config new file mode 100644 index 0000000..3491226 --- /dev/null +++ b/Configure/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From 6065c6963f043e28c010c9a099d45683b6f63ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=82=85Fox?= Date: Wed, 12 Aug 2015 18:21:04 +0800 Subject: [PATCH 3/3] MaterialSkin for Installer --- Auth/Properties/AssemblyInfo.cs | 4 +- Configure/Properties/AssemblyInfo.cs | 4 +- CryptionDebugger/Properties/AssemblyInfo.cs | 4 +- Installer/Install.Designer.cs | 59 ++++++++++++++------- Installer/Install.cs | 9 +++- Installer/Installer.csproj | 5 ++ Installer/Properties/AssemblyInfo.cs | 4 +- Installer/packages.config | 4 ++ Library/Properties/AssemblyInfo.cs | 4 +- URLSchemeHandler/Properties/AssemblyInfo.cs | 4 +- 10 files changed, 70 insertions(+), 31 deletions(-) create mode 100644 Installer/packages.config diff --git a/Auth/Properties/AssemblyInfo.cs b/Auth/Properties/AssemblyInfo.cs index 321a4b0..546b6c1 100644 --- a/Auth/Properties/AssemblyInfo.cs +++ b/Auth/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.2.7")] -[assembly: AssemblyFileVersion("1.3.2.7")] +[assembly: AssemblyVersion("1.3.2.8")] +[assembly: AssemblyFileVersion("1.3.2.8")] diff --git a/Configure/Properties/AssemblyInfo.cs b/Configure/Properties/AssemblyInfo.cs index 4298cc1..90d6e77 100644 --- a/Configure/Properties/AssemblyInfo.cs +++ b/Configure/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.17")] -[assembly: AssemblyFileVersion("1.1.0.17")] +[assembly: AssemblyVersion("1.1.1.6")] +[assembly: AssemblyFileVersion("1.1.1.6")] diff --git a/CryptionDebugger/Properties/AssemblyInfo.cs b/CryptionDebugger/Properties/AssemblyInfo.cs index 69370fb..42c2113 100644 --- a/CryptionDebugger/Properties/AssemblyInfo.cs +++ b/CryptionDebugger/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.1.12")] -[assembly: AssemblyFileVersion("1.1.1.12")] +[assembly: AssemblyVersion("1.1.1.14")] +[assembly: AssemblyFileVersion("1.1.1.14")] diff --git a/Installer/Install.Designer.cs b/Installer/Install.Designer.cs index 6fe2745..10e2ee8 100644 --- a/Installer/Install.Designer.cs +++ b/Installer/Install.Designer.cs @@ -1,4 +1,6 @@ -namespace RapID.Installer +using MaterialSkin.Controls; + +namespace RapID.Installer { partial class Install { @@ -28,19 +30,22 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.insButton = new System.Windows.Forms.Button(); - this.uninsButton = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.dirBox = new System.Windows.Forms.TextBox(); + this.insButton = new MaterialSkin.Controls.MaterialRaisedButton(); + this.uninsButton = new MaterialSkin.Controls.MaterialFlatButton(); + this.label1 = new MaterialSkin.Controls.MaterialLabel(); + this.dirBox = new MaterialSkin.Controls.MaterialSingleLineTextField(); this.SuspendLayout(); // // insButton // this.insButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.insButton.Location = new System.Drawing.Point(12, 47); + this.insButton.Depth = 0; + this.insButton.Location = new System.Drawing.Point(12, 119); + this.insButton.MouseState = MaterialSkin.MouseState.HOVER; this.insButton.Name = "insButton"; - this.insButton.Size = new System.Drawing.Size(107, 40); + this.insButton.Primary = true; + this.insButton.Size = new System.Drawing.Size(46, 36); this.insButton.TabIndex = 0; this.insButton.Text = "安装"; this.insButton.UseVisualStyleBackColor = true; @@ -50,9 +55,15 @@ private void InitializeComponent() // this.uninsButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.uninsButton.Location = new System.Drawing.Point(125, 47); + this.uninsButton.AutoSize = true; + this.uninsButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.uninsButton.Depth = 0; + this.uninsButton.Location = new System.Drawing.Point(65, 119); + this.uninsButton.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6); + this.uninsButton.MouseState = MaterialSkin.MouseState.HOVER; this.uninsButton.Name = "uninsButton"; - this.uninsButton.Size = new System.Drawing.Size(111, 40); + this.uninsButton.Primary = false; + this.uninsButton.Size = new System.Drawing.Size(42, 36); this.uninsButton.TabIndex = 1; this.uninsButton.Text = "卸载"; this.uninsButton.UseVisualStyleBackColor = true; @@ -61,9 +72,13 @@ private void InitializeComponent() // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 15); + this.label1.Depth = 0; + this.label1.Font = new System.Drawing.Font("Roboto", 11F); + this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(222)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.label1.Location = new System.Drawing.Point(12, 80); + this.label1.MouseState = MaterialSkin.MouseState.HOVER; this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(42, 21); + this.label1.Size = new System.Drawing.Size(41, 19); this.label1.TabIndex = 2; this.label1.Text = "目录"; // @@ -71,16 +86,24 @@ private void InitializeComponent() // this.dirBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.dirBox.Location = new System.Drawing.Point(73, 12); + this.dirBox.Depth = 0; + this.dirBox.Hint = ""; + this.dirBox.Location = new System.Drawing.Point(73, 77); + this.dirBox.MouseState = MaterialSkin.MouseState.HOVER; this.dirBox.Name = "dirBox"; - this.dirBox.Size = new System.Drawing.Size(321, 29); + this.dirBox.PasswordChar = '\0'; + this.dirBox.SelectedText = ""; + this.dirBox.SelectionLength = 0; + this.dirBox.SelectionStart = 0; + this.dirBox.Size = new System.Drawing.Size(254, 23); this.dirBox.TabIndex = 3; + this.dirBox.UseSystemPasswordChar = false; // // Install // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(406, 99); + this.ClientSize = new System.Drawing.Size(339, 167); this.Controls.Add(this.dirBox); this.Controls.Add(this.label1); this.Controls.Add(this.uninsButton); @@ -97,9 +120,9 @@ private void InitializeComponent() #endregion - private System.Windows.Forms.Button insButton; - private System.Windows.Forms.Button uninsButton; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox dirBox; + private MaterialRaisedButton insButton; + private MaterialFlatButton uninsButton; + private MaterialLabel label1; + private MaterialSingleLineTextField dirBox; } } \ No newline at end of file diff --git a/Installer/Install.cs b/Installer/Install.cs index 7cfd972..7a7157e 100644 --- a/Installer/Install.cs +++ b/Installer/Install.cs @@ -7,14 +7,21 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using MaterialSkin; +using MaterialSkin.Controls; namespace RapID.Installer { - public partial class Install : Form + public partial class Install : MaterialForm { public Install() { InitializeComponent(); + + var materialSkinManager = MaterialSkinManager.Instance; + materialSkinManager.AddFormToManage(this); + materialSkinManager.Theme = MaterialSkinManager.Themes.LIGHT; + materialSkinManager.ColorScheme = new ColorScheme(Primary.Blue800, Primary.Blue900, Primary.Blue500, Accent.Blue200, TextShade.WHITE); } private void Install_Load(object sender, EventArgs e) diff --git a/Installer/Installer.csproj b/Installer/Installer.csproj index 08724b8..3ab4485 100644 --- a/Installer/Installer.csproj +++ b/Installer/Installer.csproj @@ -55,6 +55,10 @@ Rap-ID.ico + + ..\packages\MaterialSkin.0.2.1\lib\MaterialSkin.dll + True + @@ -89,6 +93,7 @@ True + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Installer/Properties/AssemblyInfo.cs b/Installer/Properties/AssemblyInfo.cs index 2c0e480..86f5dc1 100644 --- a/Installer/Properties/AssemblyInfo.cs +++ b/Installer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.9")] -[assembly: AssemblyFileVersion("1.1.0.9")] +[assembly: AssemblyVersion("1.1.1.3")] +[assembly: AssemblyFileVersion("1.1.1.3")] diff --git a/Installer/packages.config b/Installer/packages.config new file mode 100644 index 0000000..3491226 --- /dev/null +++ b/Installer/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Library/Properties/AssemblyInfo.cs b/Library/Properties/AssemblyInfo.cs index 8cae014..835772c 100644 --- a/Library/Properties/AssemblyInfo.cs +++ b/Library/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0.21")] -[assembly: AssemblyFileVersion("1.2.0.21")] +[assembly: AssemblyVersion("1.2.0.22")] +[assembly: AssemblyFileVersion("1.2.0.22")] diff --git a/URLSchemeHandler/Properties/AssemblyInfo.cs b/URLSchemeHandler/Properties/AssemblyInfo.cs index f96c1ef..bda570d 100644 --- a/URLSchemeHandler/Properties/AssemblyInfo.cs +++ b/URLSchemeHandler/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.1.3")] -[assembly: AssemblyFileVersion("1.1.1.3")] +[assembly: AssemblyVersion("1.1.1.5")] +[assembly: AssemblyFileVersion("1.1.1.5")]