diff --git a/FreeControl/Controller.Designer.cs b/FreeControl/Controller.Designer.cs index 94be295..43c7396 100644 --- a/FreeControl/Controller.Designer.cs +++ b/FreeControl/Controller.Designer.cs @@ -163,7 +163,6 @@ private void InitializeComponent() this.flowPanel.Size = new System.Drawing.Size(368, 373); this.flowPanel.TabIndex = 9; this.flowPanel.Text = null; - this.flowPanel.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // btnScreenshot // @@ -190,10 +189,11 @@ private void InitializeComponent() this.Name = "Controller"; this.Padding = new System.Windows.Forms.Padding(2, 0, 2, 2); this.ShowDragStretch = true; + this.ShowIcon = true; this.ShowInTaskbar = false; this.ShowRadius = false; this.ShowTitle = false; - this.Text = "控制器"; + this.Text = "Controller"; this.TopMost = true; this.flowPanel.ResumeLayout(false); this.ResumeLayout(false); diff --git a/FreeControl/Controller.cs b/FreeControl/Controller.cs index c2e3237..ad85920 100644 --- a/FreeControl/Controller.cs +++ b/FreeControl/Controller.cs @@ -11,6 +11,7 @@ public partial class Controller : UIForm public Controller() { InitializeComponent(); + Icon = Properties.Resources.pcm; InitButton(); InitFormSizeAndLocation(); } diff --git a/FreeControl/FodyWeavers.xml b/FreeControl/FodyWeavers.xml new file mode 100644 index 0000000..5029e70 --- /dev/null +++ b/FreeControl/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/FreeControl/FodyWeavers.xsd b/FreeControl/FodyWeavers.xsd new file mode 100644 index 0000000..05e92c1 --- /dev/null +++ b/FreeControl/FodyWeavers.xsd @@ -0,0 +1,141 @@ + + + + + + + + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + + + A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with line breaks. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with line breaks. + + + + + The order of preloaded assemblies, delimited with line breaks. + + + + + + This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. + + + + + Controls if .pdbs for reference assemblies are also embedded. + + + + + Controls if runtime assemblies are also embedded. + + + + + Controls whether the runtime assemblies are embedded with their full path or only with their assembly name. + + + + + Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. + + + + + As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. + + + + + Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. + + + + + Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + + + A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with |. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with |. + + + + + The order of preloaded assemblies, delimited with |. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/FreeControl/FreeControl.csproj b/FreeControl/FreeControl.csproj index 7e8de50..435f844 100644 --- a/FreeControl/FreeControl.csproj +++ b/FreeControl/FreeControl.csproj @@ -1,5 +1,6 @@  + Debug @@ -27,6 +28,8 @@ 1.0.0.%2a false true + + AnyCPU @@ -34,7 +37,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG prompt 4 false @@ -66,20 +69,150 @@ 6D93BF546206628F86A07C83939C359B342D910D + - app.manifest + FreeControl.Program - - False - DLL\SunnyUI.dll - False + + ..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll + + + ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll + True + True + + + ..\packages\SunnyUI.3.0.3\lib\net40\SunnyUI.dll + + + ..\packages\SunnyUI.Common.3.0.3\lib\net40\SunnyUI.Common.dll + + ..\packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll + True + True + + + + ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + True + True + + + ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll + True + True + + + ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll + True + True + + + ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll + True + True + + + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + + + ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll + True + True + + + ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + True + True + + + ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True + + + ..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll + True + True + + + ..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll + True + True + + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + + + ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + True + True + + + + ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll + True + True + + + ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + True + True + + + ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll + True + True + + + ..\packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll + True + True + + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + + ..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll + True + True + @@ -89,6 +222,11 @@ + + ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + True + True + @@ -97,12 +235,6 @@ Controller.cs - - Form - - - Loading.cs - True True @@ -134,9 +266,6 @@ Controller.cs - - Loading.cs - Main.cs @@ -152,8 +281,8 @@ Designer Resources.Designer.cs - + @@ -168,13 +297,13 @@ + + + + - - - - @@ -186,6 +315,16 @@ - copy $(TargetDir)en\FreeControl.resources.dll $(ProjectDir)en.FreeControl.resources.dll /Y + copy $(TargetDir)en\FreeControl.resources.dll $(ProjectDir)Resources\en.FreeControl.resources.dll /Y + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + + + \ No newline at end of file diff --git a/FreeControl/Loading.Designer.cs b/FreeControl/Loading.Designer.cs deleted file mode 100644 index 1715a27..0000000 --- a/FreeControl/Loading.Designer.cs +++ /dev/null @@ -1,77 +0,0 @@ -namespace FreeControl -{ - partial class Loading - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.uiProgressIndicator1 = new Sunny.UI.UIProgressIndicator(); - this.SuspendLayout(); - // - // uiProgressIndicator1 - // - this.uiProgressIndicator1.BackColor = System.Drawing.Color.Transparent; - this.uiProgressIndicator1.Dock = System.Windows.Forms.DockStyle.Fill; - this.uiProgressIndicator1.Font = new System.Drawing.Font("微软雅黑", 12F); - this.uiProgressIndicator1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); - this.uiProgressIndicator1.Location = new System.Drawing.Point(0, 0); - this.uiProgressIndicator1.MinimumSize = new System.Drawing.Size(1, 1); - this.uiProgressIndicator1.Name = "uiProgressIndicator1"; - this.uiProgressIndicator1.Size = new System.Drawing.Size(100, 100); - this.uiProgressIndicator1.Style = Sunny.UI.UIStyle.Gray; - this.uiProgressIndicator1.StyleCustomMode = true; - this.uiProgressIndicator1.TabIndex = 0; - this.uiProgressIndicator1.Text = "uiProgressIndicator1"; - // - // Loading - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(100, 100); - this.Controls.Add(this.uiProgressIndicator1); - this.Cursor = System.Windows.Forms.Cursors.WaitCursor; - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Name = "Loading"; - this.Opacity = 0.9D; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Loading"; - this.TopMost = true; - this.Load += new System.EventHandler(this.Loading_Load); - this.ResumeLayout(false); - - this.BackColor = System.Drawing.Color.Silver;//将窗体背景设置成红色 - this.TransparencyKey = System.Drawing.Color.Silver; //将红色设置成透明色 - - } - - #endregion - - private Sunny.UI.UIProgressIndicator uiProgressIndicator1; - } -} \ No newline at end of file diff --git a/FreeControl/Loading.cs b/FreeControl/Loading.cs deleted file mode 100644 index 035117f..0000000 --- a/FreeControl/Loading.cs +++ /dev/null @@ -1,50 +0,0 @@ -using FreeControl.Utils; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading; -using System.Windows.Forms; - -namespace FreeControl -{ - public partial class Loading : Form - { - private string UserDataPath; - public string ScrcpyPath = string.Empty; - public Loading(string UserDataPath) - { - this.UserDataPath = UserDataPath; - InitializeComponent(); - } - - public Loading() - { - InitializeComponent(); - } - - private void Loading_Load(object sender, EventArgs e) - { - //ScrcpyPath = Path.Combine(UserDataPath, "scrcpy_win32_v1_16/"); - //string tempFileName = "temp.zip"; - //if (!Directory.Exists(ScrcpyPath)) - //{ - // Directory.CreateDirectory(ScrcpyPath); - // File.WriteAllBytes(ScrcpyPath + tempFileName, Properties.Resources.scrcpy_win32_v1_16); - // if (SharpZip.UnpackFiles(ScrcpyPath + tempFileName, ScrcpyPath)) - // { - // File.Delete(ScrcpyPath + tempFileName); - // this.DialogResult = DialogResult.OK; - // } - //} - //else - //{ - // this.DialogResult = DialogResult.OK; - //} - } - } -} diff --git a/FreeControl/Loading.resx b/FreeControl/Loading.resx deleted file mode 100644 index 1af7de1..0000000 --- a/FreeControl/Loading.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/FreeControl/Main.Designer.cs b/FreeControl/Main.Designer.cs index 5389d2d..923f082 100644 --- a/FreeControl/Main.Designer.cs +++ b/FreeControl/Main.Designer.cs @@ -173,6 +173,7 @@ private void InitializeComponent() this.tbxIp.RadiusSides = ((Sunny.UI.UICornerRadiusSides)((Sunny.UI.UICornerRadiusSides.LeftTop | Sunny.UI.UICornerRadiusSides.LeftBottom))); this.tbxIp.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.tbxIp.RectDisableColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); + this.tbxIp.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None; this.tbxIp.Style = Sunny.UI.UIStyle.Custom; this.tbxIp.StyleCustomMode = true; this.tbxIp.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; @@ -265,6 +266,7 @@ private void InitializeComponent() this.btnStart.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(130)))), ((int)(((byte)(130)))), ((int)(((byte)(130))))); this.btnStart.Style = Sunny.UI.UIStyle.Custom; this.btnStart.Symbol = 61671; + this.btnStart.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); // // comboIp // @@ -390,7 +392,6 @@ private void InitializeComponent() this.rbtnShortcuts.Radius = 10; this.rbtnShortcuts.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.rbtnShortcuts.Style = Sunny.UI.UIStyle.Custom; - this.rbtnShortcuts.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // lbAllShortcut // @@ -412,7 +413,6 @@ private void InitializeComponent() this.uiGroupBox1.Name = "uiGroupBox1"; this.uiGroupBox1.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiGroupBox1.Style = Sunny.UI.UIStyle.Custom; - this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // uiLabel4 // @@ -435,7 +435,6 @@ private void InitializeComponent() this.updownWidth.Minimum = 0; this.updownWidth.Name = "updownWidth"; this.updownWidth.Style = Sunny.UI.UIStyle.Custom; - this.updownWidth.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // updownHeight // @@ -446,7 +445,6 @@ private void InitializeComponent() this.updownHeight.Minimum = 0; this.updownHeight.Name = "updownHeight"; this.updownHeight.Style = Sunny.UI.UIStyle.Custom; - this.updownHeight.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // cbxOtherSetting // @@ -465,7 +463,6 @@ private void InitializeComponent() this.cbxOtherSetting.Name = "cbxOtherSetting"; this.cbxOtherSetting.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.cbxOtherSetting.Style = Sunny.UI.UIStyle.Custom; - this.cbxOtherSetting.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter; // // cbxAudioEnabled // @@ -559,6 +556,7 @@ private void InitializeComponent() resources.ApplyResources(this.btnClose, "btnClose"); this.btnClose.Name = "btnClose"; this.btnClose.Style = Sunny.UI.UIStyle.Custom; + this.btnClose.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); // // btnMini // @@ -566,6 +564,7 @@ private void InitializeComponent() resources.ApplyResources(this.btnMini, "btnMini"); this.btnMini.Name = "btnMini"; this.btnMini.Style = Sunny.UI.UIStyle.Custom; + this.btnMini.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); // // Main // @@ -580,7 +579,9 @@ private void InitializeComponent() this.MaximizeBox = false; this.Name = "Main"; this.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); - this.ShowRect = false; + this.ShowIcon = true; + this.ShowRadius = false; + this.ShowShadow = true; this.ShowTitle = false; this.ShowTitleIcon = true; this.Style = Sunny.UI.UIStyle.Custom; diff --git a/FreeControl/Main.cs b/FreeControl/Main.cs index 0f06868..d77f704 100644 --- a/FreeControl/Main.cs +++ b/FreeControl/Main.cs @@ -9,11 +9,9 @@ using System.IO.Compression; using System.Linq; using System.Reflection; -using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace FreeControl { @@ -86,6 +84,11 @@ public class Info } public MultiLanguage i18n; + + /// + /// 是否启用输入法切换 + /// + public readonly bool EnableSwitchIME = false; #endregion #region 构造函数 @@ -103,7 +106,6 @@ public Main() System.Globalization.CultureInfo UICulture = new System.Globalization.CultureInfo(lang); Thread.CurrentThread.CurrentUICulture = UICulture; InitializeComponent(); - InitPdone(); IsInit = false; } @@ -193,6 +195,12 @@ public void InitPdone() StartPosition = FormStartPosition.Manual; Location = new Point(_Setting.MainWindowX, _Setting.MainWindowY); } + + #region 控件状态 + uiLabel7.Visible = EnableSwitchIME; + linkIME.Visible = EnableSwitchIME; + #endregion + #region 事件绑定 // 退出时保存用户配置数据 Application.ApplicationExit += (sender, e) => @@ -248,7 +256,7 @@ public void InitPdone() #endregion #region 设置标题和图标 - Info.NameVersion = $"Free Control v{fvi.ProductVersion}"; + Info.NameVersion = $"FreeControl v{fvi.ProductVersion}"; Text = Info.NameVersion; ledTitle.Text = Info.NameVersion; ledTitle.CharCount = 19; @@ -263,6 +271,8 @@ public void InitPdone() // 设置默认导航条图标 tabHome.ImageIndex = 0; tabSetting.ImageIndex = 2; + this.BackColor = Color.FromArgb(140, 140, 140); + navTab.TabBackColor = Color.FromArgb(222, 222, 222); #endregion #region 切换tab事件 @@ -501,8 +511,7 @@ private void RunScrcpy() scrcpy.Exited += (ss, ee) => { SetUserData(_Setting);// 关闭scrcpy后保存一下配置文件 - string strOriginIme = _Setting.IMEOrigin; - if (_Setting.IME != 0 && _Setting.IMEOrigin.IsNotNull()) + if (EnableSwitchIME && _Setting.IME != 0 && _Setting.IMEOrigin.IsNotNull()) { ADB.Execute($"shell ime set {_Setting.IMEOrigin}"); } @@ -514,19 +523,19 @@ private void RunScrcpy() }; scrcpy.BeginErrorReadLine(); scrcpy.BeginOutputReadLine(); - // 获取当前输入法 - string strCurIME = ADB.Execute($"adb shell settings get secure default_input_method"); - if (strCurIME.IsNotNull()) - { - _Setting.IMEOrigin = strCurIME; - } - if (_Setting.IME != 0) + + if (EnableSwitchIME && _Setting.IME != 0) { + // 获取当前输入法 + string strCurIME = ADB.Execute($"adb shell settings get secure default_input_method"); + if (strCurIME.IsNotNull()) + { + _Setting.IMEOrigin = strCurIME; + } // 启动时切换到该输入法 ADB.Execute($"shell ime set {InputMethodPkgNames[(InputMethod)_Setting.IME]}"); } } - /// /// 显示提示消息 /// @@ -612,7 +621,7 @@ void LoadHistoryIPs(bool isReload = false) else action(); } - #endregion +#endregion #region 配置项改变事件 /// @@ -639,10 +648,15 @@ void UpdateStyle(bool isDark) UIStyles.SetStyle(curStyle); navTab.MenuStyle = UIMenuStyle.Black; - btnStart.SetStyle(curStyle); - tabHome.ImageIndex = 1; tabSetting.ImageIndex = 3; + + btnStart.FillHoverColor = Color.FromArgb(20, 54, 94); + btnStart.FillDisableColor = tabBackColor; + btnStart.FillPressColor = Color.FromArgb(20, 54, 94); + btnStart.ForeHoverColor = Color.White; + btnStart.ForeDisableColor = Color.White; + btnStart.ForePressColor = Color.White; } else { @@ -652,8 +666,6 @@ void UpdateStyle(bool isDark) UIStyles.SetStyle(curStyle); navTab.MenuStyle = UIMenuStyle.White; - btnStart.SetStyle(curStyle); - tabHome.ImageIndex = 0; tabSetting.ImageIndex = 2; @@ -914,7 +926,7 @@ private void linkIssues_Click(object sender, EventArgs e) private void lbAllShortcut_Click(object sender, EventArgs e) { - Form shortcut = new Form() + Form dlgShortcut = new Form() { AutoSize = true, StartPosition = FormStartPosition.CenterScreen, @@ -922,26 +934,40 @@ private void lbAllShortcut_Click(object sender, EventArgs e) MinimizeBox = false, MaximizeBox = false, }; - shortcut.KeyPress += (senderr, ee) => + dlgShortcut.KeyPress += (senderr, ee) => { if (ee.KeyChar == (char)Keys.Escape) { - shortcut.Close(); + dlgShortcut.Close(); } }; Image img = null; + dlgShortcut.Icon = Properties.Resources.pcm; if (_Setting.Language == Lang.zh_cn) - img = Properties.Resources.shortcut_zh; + { + if (_Setting.DarkMode) + img = Properties.Resources.shortcut_zh_dark; + else + img = Properties.Resources.shortcut_zh; + } else if (_Setting.Language == Lang.en) - img = Properties.Resources.shortcut_en; + { + if (_Setting.DarkMode) + img = Properties.Resources.shortcut_en_dark; + else + img = Properties.Resources.shortcut_en; + } PictureBox pictureBox = new PictureBox { Image = img, SizeMode = PictureBoxSizeMode.AutoSize, }; - shortcut.Controls.Add(pictureBox); - shortcut.ShowDialog(); + pictureBox.MouseDown += (ss, ee) => Extend.DragWindow(dlgShortcut.Handle); + pictureBox.BorderStyle = BorderStyle.None; + pictureBox.Margin = new Padding(0); + dlgShortcut.Controls.Add(pictureBox); + dlgShortcut.ShowDialog(); } private void linkIME_Click(object sender, EventArgs e) @@ -974,6 +1000,7 @@ private void linkLang_Click(object sender, EventArgs e) #endregion } + #region 语言相关 /// /// 输入法 /// @@ -1030,6 +1057,9 @@ public MultiLanguage(Lang lang) imes.Add(InputMethod.Sougou, "Sougou IME"); imes.Add(InputMethod.QQPinyin, "QQ IME"); + UILocalize.OK = "OK"; + UILocalize.Cancel = "Cancel"; + break; case Lang.zh_cn: @@ -1073,4 +1103,5 @@ public MultiLanguage(Lang lang) "English", }; } + #endregion } diff --git a/FreeControl/Main.en.resx b/FreeControl/Main.en.resx index 7864f21..90c1384 100644 --- a/FreeControl/Main.en.resx +++ b/FreeControl/Main.en.resx @@ -122,7 +122,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG - GgAAAk1TRnQBSQFMAgEBBAEAAZgBAgGYAQIBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4 + GgAAAk1TRnQBSQFMAgEBBAEAAaABAgGgAQIBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4 AwABPAMAAQEBAAEgBQABgAFw/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AJ4AAzgBXQMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/ @@ -203,7 +203,7 @@ AXgDvwH/AzcBWggABAEDAgEDMAAEAQMCAQMIAAMHAQkDXgHtA2oB+QMPARQYAANNAZIDXgH7AxoB/wNE AXgDAgEDLAADEQEWA14B0gMaAf8DWgHpAyIBMSQAA00BkgNfAfsDvwH/A0QBeAMCAQMsAAMRARYDXgHS A78B/wNjAekDIgExHAADXQHOAxoB/wMbASYDUQGfAxoB/wMaAf8DWgHHAyUBNiAAAwMBBANJAYcDGgH/ - AxoB/wNdAc8DKQE+A1ABnANoAf4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA + AxoB/wNdAc8DKQE+A1ABnANpAf4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA AwMBBANJAYcDvwH/A78B/wNdAc8DKQE+A1EBnAOAAf4DMQFNIAADHgEqA10B3wMaAf8DWwHQAxgBICQA AzkBXgNJAfYDGgH/A1UBrzAAAx4BKgNdAd8DvwH/A18B0AMYASAkAAM5AV4DYgH2A78B/wNVAa8kAAMc AScDSQH2AxoB/wMaAf8DXwHaA10ByQNgAfMDGgH/AxwBJxwAA10B3AMaAf8DYQHrA1sBzQNeAfsDGgH/ @@ -344,9 +344,6 @@ If all of the above methods are useless, please send MiddleRight - - Shortcuts ( ) - 89, 6 @@ -356,8 +353,8 @@ If all of the above methods are useless, please send All - - Size + + Shortcuts ( ) 6, 35 @@ -389,8 +386,8 @@ If all of the above methods are useless, please send 108, 29 - - Other + + Size 455, 70 @@ -470,6 +467,9 @@ If all of the above methods are useless, please send Close Screen + + Other + 419, 248 diff --git a/FreeControl/Main.resx b/FreeControl/Main.resx index 7f67bae..d707c30 100644 --- a/FreeControl/Main.resx +++ b/FreeControl/Main.resx @@ -151,7 +151,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG - GgAAAk1TRnQBSQFMAgEBBAEAAfwBAgH8AQIBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4 + GgAAAk1TRnQBSQFMAgEBBAEAAWgBAwFoAQMBHgEAAR4BAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAF4 AwABPAMAAQEBAAEgBQABgAFw/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AJ4AAzgBXQMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/AxoB/wMaAf8DGgH/ @@ -232,7 +232,7 @@ AXgDvwH/AzcBWggABAEDAgEDMAAEAQMCAQMIAAMHAQkDXgHtA2oB+QMPARQYAANNAZIDXgH7AxoB/wNE AXgDAgEDLAADEQEWA14B0gMaAf8DWgHpAyIBMSQAA00BkgNfAfsDvwH/A0QBeAMCAQMsAAMRARYDXgHS A78B/wNjAekDIgExHAADXQHOAxoB/wMbASYDUQGfAxoB/wMaAf8DWgHHAyUBNiAAAwMBBANJAYcDGgH/ - AxoB/wNdAc8DKQE+A1ABnANmAf4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA + AxoB/wNdAc8DKQE+A1ABnANzAf4DMQFNFAADXwHOA78B/wMbASYDUQGfA78B/wO/Af8DWgHHAyUBNiAA AwMBBANJAYcDvwH/A78B/wNdAc8DKQE+A1EBnAOAAf4DMQFNIAADHgEqA10B3wMaAf8DWwHQAxgBICQA AzkBXgNJAfYDGgH/A1UBrzAAAx4BKgNdAd8DvwH/A18B0AMYASAkAAM5AV4DYgH2A78B/wNVAa8kAAMc AScDSQH2AxoB/wMaAf8DXwHaA10ByQNgAfMDGgH/AxwBJxwAA10B3AMaAf8DYQHrA1sBzQNeAfsDGgH/ @@ -272,6 +272,27 @@ Left + + True + + + 微软雅黑, 10pt + + + 0, 12 + + + 434, 37 + + + 46, 23 + + + 30 + + + 未设置 + linkIME @@ -284,6 +305,27 @@ 0 + + True + + + 微软雅黑, 10pt + + + 356, 35 + + + 79, 20 + + + 29 + + + 自动切换为 + + + MiddleLeft + uiLabel7 @@ -296,6 +338,27 @@ 1 + + 微软雅黑, 11pt + + + 205, 231 + + + 4, 5, 4, 5 + + + 1, 1 + + + 3, 3, 3, 3 + + + 135, 27 + + + 24 + tbxIp @@ -308,6 +371,27 @@ 2 + + True + + + 微软雅黑, 9pt + + + 0, 12 + + + 360, 200 + + + 40, 21 + + + 27 + + + issues + linkIssues @@ -320,6 +404,27 @@ 3 + + 微软雅黑, 11pt + + + 372, 231 + + + 4, 5, 4, 5 + + + 1, 1 + + + 5, 5, 5, 5 + + + 67, 27 + + + 26 + tbxPort @@ -332,6 +437,27 @@ 4 + + 微软雅黑, 11pt + + + 113, 230 + + + 1, 1 + + + 22, 0, 0, 0 + + + 85, 29 + + + 25 + + + 无线访问 + cbxUseWireless @@ -344,6 +470,27 @@ 5 + + True + + + 微软雅黑, 9pt + + + 0, 12 + + + 359, 181 + + + 66, 21 + + + 4 + + + 设置端口号 + linkSetPort @@ -356,6 +503,27 @@ 6 + + True + + + 微软雅黑, 9pt + + + 0, 12 + + + 282, 81 + + + 124, 17 + + + 2 + + + (开启USB调试的方法) + linkEnabledADB @@ -368,6 +536,33 @@ 7 + + True + + + 微软雅黑, 10pt + + + 142, 78 + + + 232, 140 + + + 1 + + + 1、开启USB调试模式 +2、使用数据线将手机连接到电脑上 +3、点击启动按钮 + +无线访问失败请确认IP地址是否正确 +若IP地址正确仍无法使用，请尝试 +若以上操作后仍无法使用，请提交 + + + MiddleLeft + uiLabel1 @@ -380,6 +575,27 @@ 8 + + 微软雅黑, 12pt + + + 203, 19 + + + 1, 1 + + + 28, 0, 0, 0 + + + 145, 51 + + + 0 + + + 启动 + btnStart @@ -392,6 +608,27 @@ 9 + + 微软雅黑, 12pt + + + 203, 230 + + + 0, 0, 0, 0 + + + 63, 0 + + + 0, 0, 30, 2 + + + 165, 29 + + + 28 + comboIp @@ -680,809 +917,32 @@ 4, 5, 4, 5 - - 63, 0 - - - 0, 0, 30, 2 - - - 99, 29 - - - 27 - - - 帧数限制 - - - comboMaxFPS - - - Sunny.UI.UIComboBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabSetting - - - 6 - - - lbAllShortcut - - - Sunny.UI.UILabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - rbtnShortcuts - - - 0 - - - 微软雅黑, 11pt - - - Ctrl - - - Ctrl + Alt - - - Alt - - - 207, 5 - - - 4, 5, 4, 5 - - - 1, 1 - - - 0, 32, 0, 0 - - - 190, 114 - - - 25 - - - 快捷键（ ） - - - rbtnShortcuts - - - Sunny.UI.UIRadioButtonGroup, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabSetting - - - 7 - - - uiLabel4 - - - Sunny.UI.UILabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - uiGroupBox1 - - - 0 - - - uiLabel3 - - - Sunny.UI.UILabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - uiGroupBox1 - - - 1 - - - updownWidth - - - Sunny.UI.UIIntegerUpDown, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - uiGroupBox1 - - - 2 - - - updownHeight - - - Sunny.UI.UIIntegerUpDown, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - uiGroupBox1 - - - 3 - - - 微软雅黑, 11pt - - - 9, 5 - - - 4, 5, 4, 5 - - - 1, 1 - - - 0, 32, 0, 0 - - - 190, 114 - - - 22 - - - 窗口大小 - - - uiGroupBox1 - - - Sunny.UI.UIGroupBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabSetting - - - 8 - - - cbxAudioEnabled - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 0 - - - cbxControllerEnabled - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 1 - - - cbxShowTouches - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 2 - - - cbxTopMost - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 3 - - - cbxReadOnly - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 4 - - - cbxFullScreen - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 5 - - - cbxHideBorder - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 6 - - - cbxUseLog - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 7 - - - cbxKeepAwake - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 8 - - - cbxCloseScreen - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - cbxOtherSetting - - - 9 - - - 微软雅黑, 11pt - - - 9, 129 - - - 4, 5, 4, 5 - - - 1, 1 - - - 0, 32, 0, 0 - - - 586, 110 - - - 3 - - - 其他设置 - - - cbxOtherSetting - - - Sunny.UI.UIGroupBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabSetting - - - 9 - - - True - - - 微软雅黑, 11pt - - - 440, 248 - - - 69, 20 - - - 16 - - - 深色模式 - - - MiddleLeft - - - lbDarkMode - - - Sunny.UI.UILabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabSetting - - - 10 - - - 微软雅黑, 11pt - - - 515, 245 - - - 1, 1 - - - 75, 29 - - - 17 - - - switchDarkMode - - - Sunny.UI.UISwitch, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabSetting - - - 11 - - - 2 - - - 51, 0 - - - 607, 278 - - - 1 - - - tabSetting - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - navTab - - - 1 - - - 微软雅黑, 12pt - - - 50, 50 - - - 0, 63 - - - 658, 278 - - - 6 - - - navTab - - - Sunny.UI.UITabControlMenu, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 3 - - - True - - - 微软雅黑, 10pt - - - 0, 12 - - - 434, 37 - - - 46, 23 - - - 30 - - - 未设置 - - - linkIME - - - Sunny.UI.UILinkLabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 0 - - - True - - - 微软雅黑, 10pt - - - 356, 35 - - - 79, 20 - - - 29 - - - 自动切换为 - - - MiddleLeft - - - uiLabel7 - - - Sunny.UI.UILabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 1 - - - 微软雅黑, 11pt - - - 206, 229 - - - 4, 5, 4, 5 - - - 1, 1 - - - 5, 5, 5, 5 - - - 129, 29 - - - 24 - - - tbxIp - - - Sunny.UI.UITextBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 2 - - - True - - - 微软雅黑, 9pt - - - 0, 12 - - - 360, 200 - - - 40, 21 - - - 27 - - - issues - - - linkIssues - - - Sunny.UI.UILinkLabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 3 - - - 微软雅黑, 11pt - - - 373, 229 - - - 4, 5, 4, 5 - - - 1, 1 - - - 5, 5, 5, 5 - - - 67, 29 - - - 26 - - - tbxPort - - - Sunny.UI.UITextBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 4 - - - 微软雅黑, 11pt - - - 118, 229 - - - 1, 1 - - - 22, 0, 0, 0 - - - 85, 29 - - - 25 - - - 无线访问 - - - cbxUseWireless - - - Sunny.UI.UICheckBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 5 - - - True - - - 微软雅黑, 9pt - - - 0, 12 - - - 359, 181 - - - 66, 21 - - - 4 - - - 设置端口号 - - - linkSetPort - - - Sunny.UI.UILinkLabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 6 - - - True - - - 微软雅黑, 9pt - - - 0, 12 - - - 282, 81 - - - 124, 17 - - - 2 - - - (开启USB调试的方法) - - - linkEnabledADB - - - Sunny.UI.UILinkLabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 7 - - - True - - - 微软雅黑, 10pt - - - 142, 78 - - - 232, 140 - - - 1 - - - 1、开启USB调试模式 -2、使用数据线将手机连接到电脑上 -3、点击启动按钮 - -无线访问失败请确认IP地址是否正确 -若IP地址正确仍无法使用，请尝试 -若以上操作后仍无法使用，请提交 - - - MiddleLeft - - - uiLabel1 - - - Sunny.UI.UILabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 8 - - - 微软雅黑, 12pt - - - 203, 19 - - - 1, 1 - - - 28, 0, 0, 0 - - - 145, 51 - - - 0 - - - 启动 - - - btnStart - - - Sunny.UI.UISymbolButton, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - - tabHome - - - 9 - - - 微软雅黑, 12pt - - - 206, 229 - - - 0, 0, 0, 0 - - + 63, 0 - + 0, 0, 30, 2 - - 159, 29 + + 99, 29 - - 28 + + 27 - - comboIp + + 帧数限制 - + + comboMaxFPS + + Sunny.UI.UIComboBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null - - tabHome + + tabSetting - - 10 + + 6 True @@ -1517,6 +977,51 @@ 0 + + 微软雅黑, 11pt + + + Ctrl + + + Ctrl + Alt + + + Alt + + + 207, 5 + + + 4, 5, 4, 5 + + + 1, 1 + + + 0, 32, 0, 0 + + + 190, 114 + + + 25 + + + 快捷键（ ） + + + rbtnShortcuts + + + Sunny.UI.UIRadioButtonGroup, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null + + + tabSetting + + + 7 + 微软雅黑, 12pt @@ -1643,6 +1148,42 @@ 3 + + 微软雅黑, 11pt + + + 9, 5 + + + 4, 5, 4, 5 + + + 1, 1 + + + 0, 32, 0, 0 + + + 190, 114 + + + 22 + + + 窗口大小 + + + uiGroupBox1 + + + Sunny.UI.UIGroupBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null + + + tabSetting + + + 8 + 微软雅黑, 11pt @@ -1973,6 +1514,153 @@ 9 + + 微软雅黑, 11pt + + + 9, 129 + + + 4, 5, 4, 5 + + + 1, 1 + + + 0, 32, 0, 0 + + + 586, 110 + + + 3 + + + 其他设置 + + + cbxOtherSetting + + + Sunny.UI.UIGroupBox, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null + + + tabSetting + + + 9 + + + True + + + 微软雅黑, 11pt + + + 440, 248 + + + 69, 20 + + + 16 + + + 深色模式 + + + MiddleLeft + + + lbDarkMode + + + Sunny.UI.UILabel, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null + + + tabSetting + + + 10 + + + 微软雅黑, 11pt + + + 515, 245 + + + 1, 1 + + + 75, 29 + + + 17 + + + switchDarkMode + + + Sunny.UI.UISwitch, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null + + + tabSetting + + + 11 + + + 2 + + + 51, 0 + + + 607, 278 + + + 1 + + + tabSetting + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + navTab + + + 1 + + + 微软雅黑, 12pt + + + 50, 50 + + + 0, 63 + + + 658, 278 + + + 6 + + + navTab + + + Sunny.UI.UITabControlMenu, SunnyUI, Version=3.0.3.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + 微软雅黑, 18pt, style=Bold diff --git a/FreeControl/Program.cs b/FreeControl/Program.cs index 15b3730..2f9227c 100644 --- a/FreeControl/Program.cs +++ b/FreeControl/Program.cs @@ -1,8 +1,5 @@ using FreeControl.Utils; using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; using System.Windows.Forms; namespace FreeControl @@ -15,13 +12,11 @@ static class Program [STAThread] static void Main() { - AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; - Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); try { - Application.Run(new Trusteeship()); + Application.Run(Singleton
.Instance); } catch (Exception ex) { @@ -33,28 +28,5 @@ static void Main() } } } - private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) - { - string dllName = new AssemblyName(args.Name).Name; - Assembly assembly = null; - switch (dllName) - { - case "SunnyUI": - assembly = Assembly.Load(Properties.Resources.SunnyUI); - break; - case "SunnyUI.Common": - assembly = Assembly.Load(Properties.Resources.SunnyUI_Common); - break; - //case "ICSharpCode.SharpZipLib": - // assembly = Assembly.Load(Properties.Resources.ICSharpCode_SharpZipLib); - // break; - //case "Newtonsoft.Json": - // assembly = Assembly.Load(Properties.Resources.Newtonsoft_Json); - // break; - default: - break; - } - return assembly; - } } } diff --git a/FreeControl/Properties/AssemblyInfo.cs b/FreeControl/Properties/AssemblyInfo.cs index 6d9893a..d6a1e84 100644 --- a/FreeControl/Properties/AssemblyInfo.cs +++ b/FreeControl/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] //[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("1.6.7")] -[assembly: AssemblyVersion("1.6.7")] +[assembly: AssemblyFileVersion("1.6.8")] +[assembly: AssemblyVersion("1.6.8")] diff --git a/FreeControl/Properties/Resources.Designer.cs b/FreeControl/Properties/Resources.Designer.cs index c7fecd4..a28ca09 100644 --- a/FreeControl/Properties/Resources.Designer.cs +++ b/FreeControl/Properties/Resources.Designer.cs @@ -103,30 +103,30 @@ internal static System.Drawing.Bitmap shortcut_en { /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static System.Drawing.Bitmap shortcut_zh { + internal static System.Drawing.Bitmap shortcut_en_dark { get { - object obj = ResourceManager.GetObject("shortcut_zh", resourceCulture); + object obj = ResourceManager.GetObject("shortcut_en_dark", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// - /// 查找 System.Byte[] 类型的本地化资源。 + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static byte[] SunnyUI { + internal static System.Drawing.Bitmap shortcut_zh { get { - object obj = ResourceManager.GetObject("SunnyUI", resourceCulture); - return ((byte[])(obj)); + object obj = ResourceManager.GetObject("shortcut_zh", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); } } /// - /// 查找 System.Byte[] 类型的本地化资源。 + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// - internal static byte[] SunnyUI_Common { + internal static System.Drawing.Bitmap shortcut_zh_dark { get { - object obj = ResourceManager.GetObject("SunnyUI_Common", resourceCulture); - return ((byte[])(obj)); + object obj = ResourceManager.GetObject("shortcut_zh_dark", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); } } } diff --git a/FreeControl/Properties/Resources.resx b/FreeControl/Properties/Resources.resx index 6302777..6ebc932 100644 --- a/FreeControl/Properties/Resources.resx +++ b/FreeControl/Properties/Resources.resx @@ -128,15 +128,15 @@ ..\Resources\scrcpy-win64-v2.3.1.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\shortcut_en.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\shortcut_en.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shortcut_zh.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shortcut_en_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\SunnyUI.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\shortcut_zh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\SunnyUI.Common.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\shortcut_zh_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/FreeControl/Resources/SunnyUI.Common.dll b/FreeControl/Resources/SunnyUI.Common.dll deleted file mode 100644 index f11b8f4..0000000 Binary files a/FreeControl/Resources/SunnyUI.Common.dll and /dev/null differ diff --git a/FreeControl/Resources/SunnyUI.dll b/FreeControl/Resources/SunnyUI.dll deleted file mode 100644 index 098e130..0000000 Binary files a/FreeControl/Resources/SunnyUI.dll and /dev/null differ diff --git a/FreeControl/Resources/en.FreeControl.resources.dll b/FreeControl/Resources/en.FreeControl.resources.dll index 613e674..be84e90 100644 Binary files a/FreeControl/Resources/en.FreeControl.resources.dll and b/FreeControl/Resources/en.FreeControl.resources.dll differ diff --git a/FreeControl/Resources/shortcut_en.jpg b/FreeControl/Resources/shortcut_en.jpg deleted file mode 100644 index 555d51e..0000000 Binary files a/FreeControl/Resources/shortcut_en.jpg and /dev/null differ diff --git a/FreeControl/Resources/shortcut_en.png b/FreeControl/Resources/shortcut_en.png new file mode 100644 index 0000000..987342d Binary files /dev/null and b/FreeControl/Resources/shortcut_en.png differ diff --git a/FreeControl/Resources/shortcut_en_dark.png b/FreeControl/Resources/shortcut_en_dark.png new file mode 100644 index 0000000..0d169e0 Binary files /dev/null and b/FreeControl/Resources/shortcut_en_dark.png differ diff --git a/FreeControl/Resources/shortcut_zh.jpg b/FreeControl/Resources/shortcut_zh.jpg deleted file mode 100644 index 48d1f50..0000000 Binary files a/FreeControl/Resources/shortcut_zh.jpg and /dev/null differ diff --git a/FreeControl/Resources/shortcut_zh.png b/FreeControl/Resources/shortcut_zh.png new file mode 100644 index 0000000..593da0f Binary files /dev/null and b/FreeControl/Resources/shortcut_zh.png differ diff --git a/FreeControl/Resources/shortcut_zh_dark.png b/FreeControl/Resources/shortcut_zh_dark.png new file mode 100644 index 0000000..1476a6c Binary files /dev/null and b/FreeControl/Resources/shortcut_zh_dark.png differ diff --git a/FreeControl/Trusteeship.Designer.cs b/FreeControl/Trusteeship.Designer.cs index f9225a5..221cebb 100644 --- a/FreeControl/Trusteeship.Designer.cs +++ b/FreeControl/Trusteeship.Designer.cs @@ -39,7 +39,6 @@ private void InitializeComponent() this.Icon = global::FreeControl.Properties.Resources.pcm; this.Name = "Trusteeship"; this.Opacity = 0D; - this.ShowIcon = false; this.ShowInTaskbar = false; this.Text = "Trusteeship"; this.WindowState = System.Windows.Forms.FormWindowState.Minimized; diff --git a/FreeControl/Trusteeship.cs b/FreeControl/Trusteeship.cs index 1c65a6a..ae76f57 100644 --- a/FreeControl/Trusteeship.cs +++ b/FreeControl/Trusteeship.cs @@ -1,11 +1,4 @@ -using Sunny.UI; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; +using FreeControl.Utils; using System.Windows.Forms; namespace FreeControl @@ -18,9 +11,7 @@ public partial class Trusteeship : Form public Trusteeship() { InitializeComponent(); - UIForm main = new Main(); - //UIForm main = new Controller(); - main.Show(); + Singleton
.Instance?.Show(); } } } diff --git a/FreeControl/Update.en.md b/FreeControl/Update.en.md index 208b591..00c329c 100644 --- a/FreeControl/Update.en.md +++ b/FreeControl/Update.en.md @@ -1,5 +1,9 @@ # Free Control Update Record +## v1.6.8 +- Fix bug +- Remove automatic switching IME + ## v1.6.7 - Add main window location memory - Adjust profile save time diff --git a/FreeControl/Update.md b/FreeControl/Update.md index a126b81..2d8cf07 100644 --- a/FreeControl/Update.md +++ b/FreeControl/Update.md @@ -1,5 +1,9 @@ # Free Control 更新记录 +## v1.6.8 +- 修复了一些bug +- 移除自动切换输入法功能 + ## v1.6.7 - 增加主窗口位置记忆 - 调整配置文件保存时机 diff --git a/FreeControl/Utils/Extend.cs b/FreeControl/Utils/Extend.cs index f00c446..bbbac54 100644 --- a/FreeControl/Utils/Extend.cs +++ b/FreeControl/Utils/Extend.cs @@ -114,4 +114,29 @@ public static List GetEnumDescList() where T : Enum return list; } } + + public abstract class Singleton where T : class + { + private static T _Instance; + private static readonly object SyncObject = new object(); + + public static T Instance + { + get + { + if (_Instance == null) + { + lock (SyncObject) + { + if (_Instance == null) + { + _Instance = (T)Activator.CreateInstance(typeof(T), true); + } + } + } + + return _Instance; + } + } + } } diff --git a/FreeControl/app.manifest b/FreeControl/app.manifest deleted file mode 100644 index 75867c2..0000000 --- a/FreeControl/app.manifest +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FreeControl/en.FreeControl.resources.dll b/FreeControl/en.FreeControl.resources.dll deleted file mode 100644 index c7e2a8e..0000000 Binary files a/FreeControl/en.FreeControl.resources.dll and /dev/null differ diff --git a/FreeControl/packages.config b/FreeControl/packages.config new file mode 100644 index 0000000..689991d --- /dev/null +++ b/FreeControl/packages.config @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.en.md b/README.en.md index 5170110..ec66ba3 100644 --- a/README.en.md +++ b/README.en.md @@ -56,14 +56,6 @@ My personal testing found that currently the phone input method apps that suppor This feature requires input method apps to be adapted. If you have any better suggestions, please feel free to recommend them in the comments. -#### ⭐Automatic Switch Input Method Function Description - -Since most of my friends' daily use input methods do not support cross-screen input, I added the feature to automatically switch input methods when starting the app, which is used to automatically switch to non-daily use, but supports cross-screen input, input methods. - -In the main interface, set the input method you want to use, click the start button, and it will automatically switch (ensure that the phone has installed the corresponding input method app). - -When the window is closed, it will switch back to the original input method. - ### Device Connection Issues #### USB connection diff --git a/README.md b/README.md index 9b074eb..2d575e4 100644 --- a/README.md +++ b/README.md @@ -56,14 +56,6 @@ https://cdn.awaw.cc/gh/pdone/FreeControl/releases/latest/download/FreeControl.ex 此功能需要输入法APP适配，有更好用的输入法欢迎留言推荐。 -#### ⭐自动切换输入法功能说明 - -由于大多数朋友日常使用的输入法不支持跨屏输入，所以增加了启动时自动切换输入法的功能，用于自动切换到非日常使用、但支持跨屏输入的输入法。 - -在主界面中设置启动时要切换的输入法，点击启动按钮便会自动切换（确保手机上已安装对应输入法APP）。 - -关闭窗口时，会切换回原来的输入法。 - ### 设备连接问题 #### USB 连接