diff --git a/CapsLockIndicatorV3.sln b/CapsLockIndicatorV3.sln index efb286f..fd58ba7 100644 --- a/CapsLockIndicatorV3.sln +++ b/CapsLockIndicatorV3.sln @@ -1,7 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -# SharpDevelop 5.1 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31105.61 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CapsLockIndicatorV3", "CapsLockIndicatorV3\CapsLockIndicatorV3.csproj", "{D73D960D-7FF8-4F22-A19F-C555AAB7DD52}" EndProject Global diff --git a/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj b/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj index 29b59dd..894f9ce 100644 --- a/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj +++ b/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj @@ -74,6 +74,10 @@ Component + + Form + + Form @@ -191,16 +195,21 @@ ResXFileCodeGenerator resources.Designer.cs + + + + ResXFileCodeGenerator strings.Designer.cs + UpdateDialog.cs @@ -208,6 +217,13 @@ + + + + + + + diff --git a/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj.user b/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj.user index c10e84b..a9d953f 100644 --- a/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj.user +++ b/CapsLockIndicatorV3/CapsLockIndicatorV3.csproj.user @@ -1,6 +1,10 @@ - - - - ProjectFiles - + + + + ProjectFiles + + + + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/DarkModeForm.cs b/CapsLockIndicatorV3/DarkModeForm.cs new file mode 100644 index 0000000..8b7b337 --- /dev/null +++ b/CapsLockIndicatorV3/DarkModeForm.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace CapsLockIndicatorV3 +{ + public class DarkModeForm : Form + { + public event EventHandler DarkModeChanged; + + internal void OnDarkModeChanged() + { + DarkModeChanged?.Invoke(this, EventArgs.Empty); + } + + protected void ControlScheduleSetDarkMode(Control control, bool isDark) + { + if (control.IsHandleCreated) + Native.ControlSetDarkMode(control, isDark); + else + control.HandleCreated += (sender, e) => + { + Native.ControlSetDarkMode(control, isDark); + }; + } + } +} diff --git a/CapsLockIndicatorV3/DarkModeProvider.cs b/CapsLockIndicatorV3/DarkModeProvider.cs new file mode 100644 index 0000000..335dac8 --- /dev/null +++ b/CapsLockIndicatorV3/DarkModeProvider.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace CapsLockIndicatorV3 +{ + public static class DarkModeProvider + { + public static bool IsDark => Environment.OSVersion.Version.Major >= 10 && SettingsManager.Get("darkMode"); + + private static List registeredForms = new List(); + + public static void RegisterForm(DarkModeForm form) + { + registeredForms.Add(form); + form.FormClosing += Form_FormClosing; + form.OnDarkModeChanged(); + } + + public static void SetDarkModeEnabled(bool enabled) + { + SettingsManager.Set("darkMode", enabled); + UpdateForms(); + } + + private static void UpdateForms() + { + foreach (var f in registeredForms) + f.OnDarkModeChanged(); + } + + private static void Form_FormClosing(object sender, FormClosingEventArgs e) + { + registeredForms.Remove(sender as DarkModeForm); + } + } +} diff --git a/CapsLockIndicatorV3/DownloadDialog.cs b/CapsLockIndicatorV3/DownloadDialog.cs index 6e0bd42..eb1c844 100644 --- a/CapsLockIndicatorV3/DownloadDialog.cs +++ b/CapsLockIndicatorV3/DownloadDialog.cs @@ -1,148 +1,143 @@ -using Microsoft.Win32; -using System; -using System.ComponentModel; -using System.Diagnostics; +using Microsoft.Win32; +using System; +using System.ComponentModel; +using System.Diagnostics; using System.Drawing; -using System.IO; +using System.IO; using System.Linq; -using System.Net; +using System.Net; using System.Threading; -using System.Windows.Forms; - -namespace CapsLockIndicatorV3 -{ - public partial class DownloadDialog : Form - { - WebClient Client; - Stopwatch sw = new Stopwatch(); - string newPath; - +using System.Windows.Forms; + +namespace CapsLockIndicatorV3 +{ + public partial class DownloadDialog : DarkModeForm + { + WebClient Client; + Stopwatch sw = new Stopwatch(); + string newPath; + public string DownloadURL; - + protected override void WndProc(ref Message message) { if (message.Msg == 0x0084) // WM_NCHITTEST message.Result = (IntPtr)1; else base.WndProc(ref message); - } - - public DownloadDialog() - { - InitializeComponent(); - - if (SettingsManager.Get("beta_enableDarkMode")) + } + + public DownloadDialog() + { + InitializeComponent(); + + HandleCreated += (sender, e) => { - HandleCreated += DownloadDialog_HandleCreated; + DarkModeChanged += DownloadDialog_DarkModeChanged; + DarkModeProvider.RegisterForm(this); + }; + } - statusLabel.ForeColor = - infoLabel.ForeColor = - Color.White; + private void DownloadDialog_DarkModeChanged(object sender, EventArgs e) + { + var dark = DarkModeProvider.IsDark; - BackColor = Color.FromArgb(255, 32, 32, 32); - ForeColor = Color.White; + Native.UseImmersiveDarkModeColors(Handle, dark); - ControlScheduleSetDarkMode(downloadProgress); - ControlScheduleSetDarkMode(restartButton); - ControlScheduleSetDarkMode(closeButton); - ControlScheduleSetDarkMode(cancelButton); - } + statusLabel.ForeColor = + infoLabel.ForeColor = + ForeColor = + dark ? Color.White : SystemColors.WindowText; + + BackColor = dark ? Color.FromArgb(255, 32, 32, 32) : SystemColors.Window; + + ControlScheduleSetDarkMode(downloadProgress, dark); + ControlScheduleSetDarkMode(restartButton, dark); + ControlScheduleSetDarkMode(closeButton, dark); + ControlScheduleSetDarkMode(cancelButton, dark); } - private void DownloadDialog_HandleCreated(object sender, EventArgs e) + public void Download(string url) { - Native.UseImmersiveDarkModeColors(Handle, true); +#if !DEBUG + Uri uri = new Uri(url); + string filename = Path.GetFileName(uri.LocalPath); + string currentPath = Path.GetDirectoryName(Application.ExecutablePath); + string path = Path.Combine(currentPath, filename); + //string path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Jonas_Kohl\" + filename); + + sw.Start(); + + Client = new WebClient(); + Client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(DownloadProgressCallback); + Client.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadFileCompleteCallback); + Client.DownloadFileAsync(new Uri(url), path); + + newPath = path; +#endif + } + + private void DownloadProgressCallback(object sender, DownloadProgressChangedEventArgs e) + { + downloadProgress.Value = e.ProgressPercentage; + + infoLabel.Text = string.Format("Downloaded {0}/{1}KB ({2}%) @ {3} KB/s", (e.BytesReceived / 1024d).ToString("0.0"), (e.TotalBytesToReceive / 1024d).ToString("0.0"), e.ProgressPercentage, (e.BytesReceived / 1024d / sw.Elapsed.TotalSeconds).ToString("0.00")); } - private void ControlScheduleSetDarkMode(Control control) + private void DownloadFileCompleteCallback(object sender, AsyncCompletedEventArgs e) { - control.HandleCreated += (sender, e) => + infoLabel.Text = ""; + cancelButton.Hide(); + cancelButton.Enabled = false; + + if (e.Cancelled == true) { - Native.ControlSetDarkMode(control, true); - }; + closeButton.Show(); + closeButton.Enabled = true; + statusLabel.Text = "Download aborted."; + downloadProgress.Value = 0; + } + else + { + restartButton.Show(); + restartButton.Enabled = true; + statusLabel.Text = "Download completed."; + } + } + + private void DownloadDialog_Load(object sender, EventArgs e) + { + Download(DownloadURL); } - public void Download(string url) + private void button1_Click(object sender, EventArgs e) { -#if !DEBUG - Uri uri = new Uri(url); - string filename = Path.GetFileName(uri.LocalPath); - string currentPath = Path.GetDirectoryName(Application.ExecutablePath); - string path = Path.Combine(currentPath, filename); - //string path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Jonas_Kohl\" + filename); - - sw.Start(); - - Client = new WebClient(); - Client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(DownloadProgressCallback); - Client.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadFileCompleteCallback); - Client.DownloadFileAsync(new Uri(url), path); - - newPath = path; -#endif - } - - private void DownloadProgressCallback(object sender, DownloadProgressChangedEventArgs e) - { - downloadProgress.Value = e.ProgressPercentage; - - infoLabel.Text = string.Format("Downloaded {0}/{1}KB ({2}%) @ {3} KB/s", (e.BytesReceived / 1024d).ToString("0.0"), (e.TotalBytesToReceive / 1024d).ToString("0.0"), e.ProgressPercentage, (e.BytesReceived / 1024d / sw.Elapsed.TotalSeconds).ToString("0.00")); - } - - private void DownloadFileCompleteCallback(object sender, AsyncCompletedEventArgs e) - { - infoLabel.Text = ""; - cancelButton.Hide(); - cancelButton.Enabled = false; - - if (e.Cancelled == true) - { - closeButton.Show(); - closeButton.Enabled = true; - statusLabel.Text = "Download aborted."; - downloadProgress.Value = 0; - } - else - { - restartButton.Show(); - restartButton.Enabled = true; - statusLabel.Text = "Download completed."; - } - } - - private void DownloadDialog_Load(object sender, EventArgs e) - { - Download(DownloadURL); - } - - private void button1_Click(object sender, EventArgs e) - { - Client.CancelAsync(); - } - - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - private void restartButton_Click(object sender, EventArgs e) - { - bool runAtStarup = Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run", "CapsLock Indicator", null) != null; - - if (runAtStarup) - { - RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Run", true); - rk.SetValue("CapsLock Indicator", newPath); - } - - MainForm mainForm = Application.OpenForms.OfType().First(); - - mainForm.askCancel = false; - Program.ReleaseMutex(); - - Thread.Sleep(100); - - Process.Start(newPath); - Application.Exit(); - } - } -} + Client?.CancelAsync(); + } + + private void button2_Click(object sender, EventArgs e) + { + Close(); + } + + private void restartButton_Click(object sender, EventArgs e) + { + bool runAtStarup = Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run", "CapsLock Indicator", null) != null; + + if (runAtStarup) + { + RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Run", true); + rk.SetValue("CapsLock Indicator", newPath); + } + + MainForm mainForm = Application.OpenForms.OfType().First(); + + mainForm.askCancel = false; + Program.ReleaseMutex(); + + Thread.Sleep(100); + + Process.Start(newPath); + Application.Exit(); + } + } +} diff --git a/CapsLockIndicatorV3/FirstRunDialog.Designer.cs b/CapsLockIndicatorV3/FirstRunDialog.Designer.cs index cd1d0f7..7754ffa 100644 --- a/CapsLockIndicatorV3/FirstRunDialog.Designer.cs +++ b/CapsLockIndicatorV3/FirstRunDialog.Designer.cs @@ -32,17 +32,20 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FirstRunDialog)); this.headerLabel = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); - this.exitButton = new System.Windows.Forms.Button(); - this.okButton = new System.Windows.Forms.Button(); this.messageLabel = new System.Windows.Forms.Label(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.allowUpdatesCheckBox = new System.Windows.Forms.CheckBox(); - this.lnkLabel1 = new CapsLockIndicatorV3.LnkLabel(); + this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); + this.exitButton = new System.Windows.Forms.Button(); + this.okButton = new System.Windows.Forms.Button(); + this.themeLabel = new System.Windows.Forms.Label(); + this.lightButton = new System.Windows.Forms.Button(); + this.darkButton = new System.Windows.Forms.Button(); this.lnkLabel2 = new CapsLockIndicatorV3.LnkLabel(); + this.lnkLabel1 = new CapsLockIndicatorV3.LnkLabel(); this.tableLayoutPanel1.SuspendLayout(); - this.flowLayoutPanel2.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); + this.flowLayoutPanel2.SuspendLayout(); this.SuspendLayout(); // // headerLabel @@ -63,29 +66,75 @@ private void InitializeComponent() this.tableLayoutPanel1.ColumnCount = 2; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Controls.Add(this.lnkLabel2, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.lnkLabel2, 0, 5); this.tableLayoutPanel1.Controls.Add(this.headerLabel, 0, 0); this.tableLayoutPanel1.Controls.Add(this.messageLabel, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 1, 5); + this.tableLayoutPanel1.Controls.Add(this.themeLabel, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.lightButton, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.darkButton, 1, 3); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(9, 9); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 4; + this.tableLayoutPanel1.RowCount = 6; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(343, 239); + this.tableLayoutPanel1.Size = new System.Drawing.Size(339, 292); this.tableLayoutPanel1.TabIndex = 1; // + // messageLabel + // + this.messageLabel.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.messageLabel, 2); + this.messageLabel.Dock = System.Windows.Forms.DockStyle.Top; + this.messageLabel.Location = new System.Drawing.Point(0, 30); + this.messageLabel.Margin = new System.Windows.Forms.Padding(0); + this.messageLabel.Name = "messageLabel"; + this.messageLabel.Size = new System.Drawing.Size(339, 75); + this.messageLabel.TabIndex = 1; + this.messageLabel.Text = resources.GetString("messageLabel.Text"); + // + // flowLayoutPanel1 + // + this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 2); + this.flowLayoutPanel1.Controls.Add(this.allowUpdatesCheckBox); + this.flowLayoutPanel1.Controls.Add(this.lnkLabel1); + this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 182); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(339, 81); + this.flowLayoutPanel1.TabIndex = 3; + // + // allowUpdatesCheckBox + // + this.allowUpdatesCheckBox.Checked = true; + this.allowUpdatesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.allowUpdatesCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.allowUpdatesCheckBox.Location = new System.Drawing.Point(0, 0); + this.allowUpdatesCheckBox.Margin = new System.Windows.Forms.Padding(0); + this.allowUpdatesCheckBox.Name = "allowUpdatesCheckBox"; + this.allowUpdatesCheckBox.Size = new System.Drawing.Size(312, 38); + this.allowUpdatesCheckBox.TabIndex = 0; + this.allowUpdatesCheckBox.Text = "Allow CapsLock Indicator to periodically check for updates online (can be changed" + + " later)"; + this.allowUpdatesCheckBox.UseCompatibleTextRendering = true; + this.allowUpdatesCheckBox.UseVisualStyleBackColor = true; + this.allowUpdatesCheckBox.CheckedChanged += new System.EventHandler(this.allowUpdatesCheckBox_CheckedChanged); + // // flowLayoutPanel2 // this.flowLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.flowLayoutPanel2.AutoSize = true; this.flowLayoutPanel2.Controls.Add(this.exitButton); this.flowLayoutPanel2.Controls.Add(this.okButton); - this.flowLayoutPanel2.Location = new System.Drawing.Point(184, 210); + this.flowLayoutPanel2.Location = new System.Drawing.Point(180, 263); this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel2.Name = "flowLayoutPanel2"; this.flowLayoutPanel2.Size = new System.Drawing.Size(159, 29); @@ -118,66 +167,47 @@ private void InitializeComponent() this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // - // messageLabel + // themeLabel // - this.messageLabel.AutoSize = true; - this.tableLayoutPanel1.SetColumnSpan(this.messageLabel, 2); - this.messageLabel.Dock = System.Windows.Forms.DockStyle.Top; - this.messageLabel.Location = new System.Drawing.Point(0, 30); - this.messageLabel.Margin = new System.Windows.Forms.Padding(0); - this.messageLabel.Name = "messageLabel"; - this.messageLabel.Size = new System.Drawing.Size(343, 75); - this.messageLabel.TabIndex = 1; - this.messageLabel.Text = resources.GetString("messageLabel.Text"); + this.themeLabel.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.themeLabel, 2); + this.themeLabel.Location = new System.Drawing.Point(0, 113); + this.themeLabel.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0); + this.themeLabel.Name = "themeLabel"; + this.themeLabel.Size = new System.Drawing.Size(194, 15); + this.themeLabel.TabIndex = 5; + this.themeLabel.Text = "Which color scheme do you prefer?"; // - // flowLayoutPanel1 - // - this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 2); - this.flowLayoutPanel1.Controls.Add(this.allowUpdatesCheckBox); - this.flowLayoutPanel1.Controls.Add(this.lnkLabel1); - this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown; - this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 111); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(343, 99); - this.flowLayoutPanel1.TabIndex = 3; + // lightButton // - // allowUpdatesCheckBox - // - this.allowUpdatesCheckBox.Checked = true; - this.allowUpdatesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.allowUpdatesCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System; - this.allowUpdatesCheckBox.Location = new System.Drawing.Point(0, 0); - this.allowUpdatesCheckBox.Margin = new System.Windows.Forms.Padding(0); - this.allowUpdatesCheckBox.Name = "allowUpdatesCheckBox"; - this.allowUpdatesCheckBox.Size = new System.Drawing.Size(312, 38); - this.allowUpdatesCheckBox.TabIndex = 0; - this.allowUpdatesCheckBox.Text = "Allow CapsLock Indicator to periodically check for updates online (can be changed" + - " later)"; - this.allowUpdatesCheckBox.UseCompatibleTextRendering = true; - this.allowUpdatesCheckBox.UseVisualStyleBackColor = true; - this.allowUpdatesCheckBox.CheckedChanged += new System.EventHandler(this.allowUpdatesCheckBox_CheckedChanged); + this.lightButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.lightButton.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.lightButton.Location = new System.Drawing.Point(3, 131); + this.lightButton.Name = "lightButton"; + this.lightButton.Size = new System.Drawing.Size(163, 42); + this.lightButton.TabIndex = 6; + this.lightButton.Text = "Light"; + this.lightButton.UseVisualStyleBackColor = true; + this.lightButton.Click += new System.EventHandler(this.lightButton_Click); // - // lnkLabel1 + // darkButton // - this.lnkLabel1.AutoSize = true; - this.lnkLabel1.LinkColor = System.Drawing.SystemColors.HotTrack; - this.lnkLabel1.Location = new System.Drawing.Point(13, 38); - this.lnkLabel1.Margin = new System.Windows.Forms.Padding(13, 0, 0, 0); - this.lnkLabel1.Name = "lnkLabel1"; - this.lnkLabel1.Size = new System.Drawing.Size(168, 15); - this.lnkLabel1.TabIndex = 1; - this.lnkLabel1.TabStop = true; - this.lnkLabel1.Text = "What information will be sent?"; - this.lnkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkLabel1_LinkClicked); + this.darkButton.Dock = System.Windows.Forms.DockStyle.Fill; + this.darkButton.FlatStyle = System.Windows.Forms.FlatStyle.System; + this.darkButton.Location = new System.Drawing.Point(172, 131); + this.darkButton.Name = "darkButton"; + this.darkButton.Size = new System.Drawing.Size(164, 42); + this.darkButton.TabIndex = 7; + this.darkButton.Text = "Dark"; + this.darkButton.UseVisualStyleBackColor = true; + this.darkButton.Click += new System.EventHandler(this.darkButton_Click); // // lnkLabel2 // this.lnkLabel2.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lnkLabel2.AutoSize = true; this.lnkLabel2.LinkColor = System.Drawing.SystemColors.HotTrack; - this.lnkLabel2.Location = new System.Drawing.Point(0, 217); + this.lnkLabel2.Location = new System.Drawing.Point(0, 270); this.lnkLabel2.Margin = new System.Windows.Forms.Padding(0); this.lnkLabel2.Name = "lnkLabel2"; this.lnkLabel2.Size = new System.Drawing.Size(64, 15); @@ -186,6 +216,19 @@ private void InitializeComponent() this.lnkLabel2.Text = "Contribute"; this.lnkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkLabel2_LinkClicked); // + // lnkLabel1 + // + this.lnkLabel1.AutoSize = true; + this.lnkLabel1.LinkColor = System.Drawing.SystemColors.HotTrack; + this.lnkLabel1.Location = new System.Drawing.Point(13, 38); + this.lnkLabel1.Margin = new System.Windows.Forms.Padding(13, 0, 0, 0); + this.lnkLabel1.Name = "lnkLabel1"; + this.lnkLabel1.Size = new System.Drawing.Size(168, 15); + this.lnkLabel1.TabIndex = 1; + this.lnkLabel1.TabStop = true; + this.lnkLabel1.Text = "What information will be sent?"; + this.lnkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkLabel1_LinkClicked); + // // FirstRunDialog // this.AcceptButton = this.okButton; @@ -193,7 +236,7 @@ private void InitializeComponent() this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.Window; this.CancelButton = this.exitButton; - this.ClientSize = new System.Drawing.Size(361, 257); + this.ClientSize = new System.Drawing.Size(357, 310); this.ControlBox = false; this.Controls.Add(this.tableLayoutPanel1); this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -208,9 +251,9 @@ private void InitializeComponent() this.Text = "CapsLock Indicator"; this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.flowLayoutPanel2.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); + this.flowLayoutPanel2.ResumeLayout(false); this.ResumeLayout(false); } @@ -227,5 +270,8 @@ private void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2; private System.Windows.Forms.Button exitButton; private LnkLabel lnkLabel2; + private System.Windows.Forms.Label themeLabel; + private System.Windows.Forms.Button lightButton; + private System.Windows.Forms.Button darkButton; } } \ No newline at end of file diff --git a/CapsLockIndicatorV3/FirstRunDialog.cs b/CapsLockIndicatorV3/FirstRunDialog.cs index 960b2f5..ca2cbc9 100644 --- a/CapsLockIndicatorV3/FirstRunDialog.cs +++ b/CapsLockIndicatorV3/FirstRunDialog.cs @@ -11,30 +11,19 @@ namespace CapsLockIndicatorV3 { - public partial class FirstRunDialog : Form + public partial class FirstRunDialog : DarkModeForm { public FirstRunDialog() { InitializeComponent(); - if (SettingsManager.Get("beta_enableDarkMode")) - { - HandleCreated += FirstRunDialog_HandleCreated; - - headerLabel.ForeColor = - messageLabel.ForeColor = - lnkLabel1.LinkColor = - lnkLabel2.LinkColor = - allowUpdatesCheckBox.ForeColor = - Color.White; - allowUpdatesCheckBox.FlatStyle = FlatStyle.Standard; - - BackColor = Color.FromArgb(255, 32, 32, 32); - ForeColor = Color.White; + HandleCreated += (object sender, EventArgs e) => + { + DarkModeChanged += FirstRunDialog_DarkModeChanged; + DarkModeProvider.RegisterForm(this); + }; - ControlScheduleSetDarkMode(okButton); - ControlScheduleSetDarkMode(exitButton); - } + ControlScheduleSetDarkMode(darkButton, true); headerLabel.Text = strings.firstRunHeading; messageLabel.Text = strings.firstRunMessage; @@ -43,19 +32,40 @@ public FirstRunDialog() lnkLabel2.Text = strings.firstRunContribute; okButton.Text = strings.firstRunStart; exitButton.Text = strings.firstRunExit; - } - - private void FirstRunDialog_HandleCreated(object sender, EventArgs e) - { - Native.UseImmersiveDarkModeColors(Handle, true); + themeLabel.Text = strings.firstRunColorSchemePreference; + lightButton.Text = strings.firstRunColorSchemeLight; + darkButton.Text = strings.firstRunColorSchemeDark; + + if (Environment.OSVersion.Version.Major < 10) + { + darkButton.Enabled = false; + darkButton.Text += "\r\n" + strings.firstRunColorSchemeWin10Only; + } } - private void ControlScheduleSetDarkMode(Control control) + private void FirstRunDialog_DarkModeChanged(object sender, EventArgs e) { - control.HandleCreated += (sender, e) => - { - Native.ControlSetDarkMode(control, true); - }; + var dark = DarkModeProvider.IsDark; + + Native.UseImmersiveDarkModeColors(Handle, dark); + + headerLabel.ForeColor = dark ? Color.White : Color.FromArgb(255, 0, 51, 153); + + lnkLabel1.LinkColor = + lnkLabel2.LinkColor = + dark ? Color.White : SystemColors.HotTrack; + + messageLabel.ForeColor = + allowUpdatesCheckBox.ForeColor = + dark ? Color.White : SystemColors.WindowText; + + allowUpdatesCheckBox.FlatStyle = dark ? FlatStyle.Standard: FlatStyle.System; + + BackColor = dark ? Color.FromArgb(255, 32, 32, 32) : SystemColors.Window; + ForeColor = dark ? Color.White : SystemColors.WindowText; + + ControlScheduleSetDarkMode(okButton, dark); + ControlScheduleSetDarkMode(exitButton, dark); } private void allowUpdatesCheckBox_CheckedChanged(object sender, EventArgs e) @@ -79,5 +89,15 @@ private void lnkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs { Process.Start("https://github.com/jonaskohl/CapsLockIndicator"); } + + private void lightButton_Click(object sender, EventArgs e) + { + DarkModeProvider.SetDarkModeEnabled(false); + } + + private void darkButton_Click(object sender, EventArgs e) + { + DarkModeProvider.SetDarkModeEnabled(true); + } } } diff --git a/CapsLockIndicatorV3/IndSettingsWindow.cs b/CapsLockIndicatorV3/IndSettingsWindow.cs index c125aad..074d43c 100644 --- a/CapsLockIndicatorV3/IndSettingsWindow.cs +++ b/CapsLockIndicatorV3/IndSettingsWindow.cs @@ -1,284 +1,288 @@ -using System; +using System; using System.Diagnostics; -using System.Drawing; -using System.Windows.Forms; - -namespace CapsLockIndicatorV3 -{ - public partial class IndSettingsWindow : Form - { - public IndSettingsWindow() - { - InitializeComponent(); - - if (SettingsManager.Get("beta_enableDarkMode")) - { - HandleCreated += IndSettingsWindow_HandleCreated; - - displayTimeGroup.ForeColor = - displayTimeLabel.ForeColor = - fontGroupBox.ForeColor = - fontButton.ForeColor = - positionGroup.ForeColor = - opacityGroup.ForeColor = - opacityLabel.ForeColor = - coloursGroup.ForeColor = - backgroundColourActivatedButton.ForeColor = - backgroundColourDeactivatedButton.ForeColor = - foregroundColourActivatedButton.ForeColor = - foregroundColourDeactivatedButton.ForeColor = - borderColourActivatedButton.ForeColor = - borderColourDeactivatedButton.ForeColor = - borderGroup.ForeColor = - bdSizeLabel.ForeColor = - lnkLabel1.LinkColor = - onlyShowWhenActiveCheckBox.ForeColor = - Color.White; - - onlyShowWhenActiveCheckBox.FlatStyle = FlatStyle.Standard; - - BackColor = Color.FromArgb(255, 32, 32, 32); - ForeColor = Color.White; - - ControlScheduleSetDarkMode(fontButton); - ControlScheduleSetDarkMode(backgroundColourActivatedButton); - ControlScheduleSetDarkMode(backgroundColourDeactivatedButton); - ControlScheduleSetDarkMode(foregroundColourActivatedButton); - ControlScheduleSetDarkMode(foregroundColourDeactivatedButton); - ControlScheduleSetDarkMode(borderColourActivatedButton); - ControlScheduleSetDarkMode(borderColourDeactivatedButton); - ControlScheduleSetDarkMode(positionTopLeft); - ControlScheduleSetDarkMode(positionTopCenter); - ControlScheduleSetDarkMode(positionTopRight); - ControlScheduleSetDarkMode(positionMiddleLeft); - ControlScheduleSetDarkMode(positionMiddleCenter); - ControlScheduleSetDarkMode(positionMiddleRight); - ControlScheduleSetDarkMode(positionBottomLeft); - ControlScheduleSetDarkMode(positionBottomCenter); - ControlScheduleSetDarkMode(positionBottomRight); - ControlScheduleSetDarkMode(displayTimeSlider); - ControlScheduleSetDarkMode(opacitySlider); - ControlScheduleSetDarkMode(bdSizeSlider); - ControlScheduleSetDarkMode(saveButton); - } - - MaximumSize = new Size(int.MaxValue, Screen.FromControl(this).WorkingArea.Height); - AutoScroll = true; - - displayTimeSlider.Value = SettingsManager.Get("indDisplayTime") > 0 ? SettingsManager.Get("indDisplayTime") : 2001; - displayTimeLabel.Text = displayTimeSlider.Value < 2001 ? string.Format("{0} ms", displayTimeSlider.Value) : strings.permanentIndicator; - - opacitySlider.Value = SettingsManager.Get("indOpacity"); - opacityLabel.Text = string.Format("{0} %", opacitySlider.Value); - - bdSizeSlider.Value = SettingsManager.Get("bdSize"); - bdSizeLabel.Text = string.Format("{0}", bdSizeSlider.Value); - - backgroundColourActivatedPreview.BackColor = SettingsManager.Get("indBgColourActive"); - backgroundColourDeactivatedPreview.BackColor = SettingsManager.Get("indBgColourInactive"); - - foregroundColourActivatedPreview.BackColor = SettingsManager.Get("indFgColourActive"); - foregroundColourDeactivatedPreview.BackColor = SettingsManager.Get("indFgColourInactive"); - - borderColourActivatedPreview.BackColor = SettingsManager.Get("indBdColourActive"); - borderColourDeactivatedPreview.BackColor = SettingsManager.Get("indBdColourInactive"); - - fontButton.Font = SettingsManager.GetOrDefault("indFont"); - - onlyShowWhenActiveCheckBox.Checked = SettingsManager.Get("alwaysShowWhenActive"); - - switch (SettingsManager.Get("overlayPosition")) - { - case IndicatorDisplayPosition.TopLeft: - positionTopLeft.Checked = true; - break; - case IndicatorDisplayPosition.TopCenter: - positionTopCenter.Checked = true; - break; - case IndicatorDisplayPosition.TopRight: - positionTopRight.Checked = true; - break; - case IndicatorDisplayPosition.MiddleLeft: - positionMiddleLeft.Checked = true; - break; - case IndicatorDisplayPosition.MiddleCenter: - positionMiddleCenter.Checked = true; - break; - case IndicatorDisplayPosition.MiddleRight: - positionMiddleRight.Checked = true; - break; - case IndicatorDisplayPosition.BottomLeft: - positionBottomLeft.Checked = true; - break; - case IndicatorDisplayPosition.BottomCenter: - positionBottomCenter.Checked = true; - break; - case IndicatorDisplayPosition.BottomRight: - positionBottomRight.Checked = true; - break; - default: - break; - } - - Text = strings.notificationSettingsTitle; - displayTimeGroup.Text = strings.displayTime; - opacityGroup.Text = strings.opacity; - fontGroupBox.Text = strings.fontGroup; - coloursGroup.Text = strings.coloursGroup; - fontButton.Text = string.Format(strings.keyIsOff, strings.capsLock); - saveButton.Text = strings.saveAndCloseButton; - backgroundColourActivatedButton.Text = strings.backgroundColourActivatedButton; - backgroundColourDeactivatedButton.Text = strings.backgroundColourDeactivatedButton; - borderColourActivatedButton.Text = strings.borderColourActivatedButton; - borderColourDeactivatedButton.Text = strings.borderColourDeactivatedButton; - foregroundColourActivatedButton.Text = strings.foregroundColourActivatedButton; - foregroundColourDeactivatedButton.Text = strings.foregroundColourDeactivatedButton; - positionGroup.Text = strings.overlayPositionGroup; - onlyShowWhenActiveCheckBox.Text = strings.showOverlayOnlyWhenActive; - lnkLabel1.Text = strings.advancedSettings; - borderGroup.Text = strings.borderThicknessGroup; +using System.Drawing; +using System.Reflection; +using System.Resources; +using System.Windows.Forms; + +namespace CapsLockIndicatorV3 +{ + public partial class IndSettingsWindow : DarkModeForm + { + ResourceManager resources; + + public IndSettingsWindow() + { + InitializeComponent(); + + resources = new ResourceManager("CapsLockIndicatorV3.resources", Assembly.GetExecutingAssembly()); + + HandleCreated += (sender, e) => + { + DarkModeChanged += IndSettingsWindow_DarkModeChanged; + DarkModeProvider.RegisterForm(this); + }; + + MaximumSize = new Size(int.MaxValue, Screen.FromControl(this).WorkingArea.Height); + AutoScroll = true; + + displayTimeSlider.Value = SettingsManager.Get("indDisplayTime") > 0 ? SettingsManager.Get("indDisplayTime") : 2001; + displayTimeLabel.Text = displayTimeSlider.Value < 2001 ? string.Format("{0} ms", displayTimeSlider.Value) : strings.permanentIndicator; + + opacitySlider.Value = SettingsManager.Get("indOpacity"); + opacityLabel.Text = string.Format("{0} %", opacitySlider.Value); + + bdSizeSlider.Value = SettingsManager.Get("bdSize"); + bdSizeLabel.Text = string.Format("{0}", bdSizeSlider.Value); + + backgroundColourActivatedPreview.BackColor = SettingsManager.Get("indBgColourActive"); + backgroundColourDeactivatedPreview.BackColor = SettingsManager.Get("indBgColourInactive"); + + foregroundColourActivatedPreview.BackColor = SettingsManager.Get("indFgColourActive"); + foregroundColourDeactivatedPreview.BackColor = SettingsManager.Get("indFgColourInactive"); + + borderColourActivatedPreview.BackColor = SettingsManager.Get("indBdColourActive"); + borderColourDeactivatedPreview.BackColor = SettingsManager.Get("indBdColourInactive"); + + fontButton.Font = SettingsManager.GetOrDefault("indFont"); + + onlyShowWhenActiveCheckBox.Checked = SettingsManager.Get("alwaysShowWhenActive"); + + switch (SettingsManager.Get("overlayPosition")) + { + case IndicatorDisplayPosition.TopLeft: + positionTopLeft.Checked = true; + break; + case IndicatorDisplayPosition.TopCenter: + positionTopCenter.Checked = true; + break; + case IndicatorDisplayPosition.TopRight: + positionTopRight.Checked = true; + break; + case IndicatorDisplayPosition.MiddleLeft: + positionMiddleLeft.Checked = true; + break; + case IndicatorDisplayPosition.MiddleCenter: + positionMiddleCenter.Checked = true; + break; + case IndicatorDisplayPosition.MiddleRight: + positionMiddleRight.Checked = true; + break; + case IndicatorDisplayPosition.BottomLeft: + positionBottomLeft.Checked = true; + break; + case IndicatorDisplayPosition.BottomCenter: + positionBottomCenter.Checked = true; + break; + case IndicatorDisplayPosition.BottomRight: + positionBottomRight.Checked = true; + break; + default: + break; + } + + Text = strings.notificationSettingsTitle; + displayTimeGroup.Text = strings.displayTime; + opacityGroup.Text = strings.opacity; + fontGroupBox.Text = strings.fontGroup; + coloursGroup.Text = strings.coloursGroup; + fontButton.Text = string.Format(strings.keyIsOff, strings.capsLock); + saveButton.Text = strings.saveAndCloseButton; + backgroundColourActivatedButton.Text = strings.backgroundColourActivatedButton; + backgroundColourDeactivatedButton.Text = strings.backgroundColourDeactivatedButton; + borderColourActivatedButton.Text = strings.borderColourActivatedButton; + borderColourDeactivatedButton.Text = strings.borderColourDeactivatedButton; + foregroundColourActivatedButton.Text = strings.foregroundColourActivatedButton; + foregroundColourDeactivatedButton.Text = strings.foregroundColourDeactivatedButton; + positionGroup.Text = strings.overlayPositionGroup; + onlyShowWhenActiveCheckBox.Text = strings.showOverlayOnlyWhenActive; + lnkLabel1.Text = strings.advancedSettings; + borderGroup.Text = strings.borderThicknessGroup; + } + + private void IndSettingsWindow_DarkModeChanged(object sender, EventArgs e) + { + var dark = DarkModeProvider.IsDark; + + Native.UseImmersiveDarkMode(Handle, dark); + Native.UseImmersiveDarkModeColors(Handle, dark); + Native.UseImmersiveDarkModeColors(mainColourPicker.PInstance, dark); + + Icon = (Icon)resources.GetObject("settings" + (dark ? "_dark" : "")); + + displayTimeGroup.ForeColor = + displayTimeLabel.ForeColor = + fontGroupBox.ForeColor = + fontButton.ForeColor = + positionGroup.ForeColor = + opacityGroup.ForeColor = + opacityLabel.ForeColor = + coloursGroup.ForeColor = + backgroundColourActivatedButton.ForeColor = + backgroundColourDeactivatedButton.ForeColor = + foregroundColourActivatedButton.ForeColor = + foregroundColourDeactivatedButton.ForeColor = + borderColourActivatedButton.ForeColor = + borderColourDeactivatedButton.ForeColor = + borderGroup.ForeColor = + bdSizeLabel.ForeColor = + onlyShowWhenActiveCheckBox.ForeColor = + dark ? Color.White : SystemColors.WindowText; + + + lnkLabel1.LinkColor = dark ? Color.White : SystemColors.HotTrack; + + onlyShowWhenActiveCheckBox.FlatStyle = dark ? FlatStyle.Standard : FlatStyle.System; + + BackColor = dark ? Color.FromArgb(255, 32, 32, 32) : SystemColors.Window; + ForeColor = dark ? Color.White : SystemColors.WindowText; + + ControlScheduleSetDarkMode(fontButton, dark); + ControlScheduleSetDarkMode(backgroundColourActivatedButton, dark); + ControlScheduleSetDarkMode(backgroundColourDeactivatedButton, dark); + ControlScheduleSetDarkMode(foregroundColourActivatedButton, dark); + ControlScheduleSetDarkMode(foregroundColourDeactivatedButton, dark); + ControlScheduleSetDarkMode(borderColourActivatedButton, dark); + ControlScheduleSetDarkMode(borderColourDeactivatedButton, dark); + ControlScheduleSetDarkMode(positionTopLeft, dark); + ControlScheduleSetDarkMode(positionTopCenter, dark); + ControlScheduleSetDarkMode(positionTopRight, dark); + ControlScheduleSetDarkMode(positionMiddleLeft, dark); + ControlScheduleSetDarkMode(positionMiddleCenter, dark); + ControlScheduleSetDarkMode(positionMiddleRight, dark); + ControlScheduleSetDarkMode(positionBottomLeft, dark); + ControlScheduleSetDarkMode(positionBottomCenter, dark); + ControlScheduleSetDarkMode(positionBottomRight, dark); + ControlScheduleSetDarkMode(displayTimeSlider, dark); + ControlScheduleSetDarkMode(opacitySlider, dark); + ControlScheduleSetDarkMode(bdSizeSlider, dark); + ControlScheduleSetDarkMode(saveButton, dark); + } + + private void displayTimeSlider_Scroll(object sender, EventArgs e) + { + SettingsManager.Set("indDisplayTime", displayTimeSlider.Value < 2001 ? displayTimeSlider.Value : -1); + displayTimeLabel.Text = displayTimeSlider.Value < 2001 ? string.Format("{0} ms", displayTimeSlider.Value) : strings.permanentIndicator; } - private void IndSettingsWindow_HandleCreated(object sender, EventArgs e) + private void button1_Click(object sender, EventArgs e) { - Native.UseImmersiveDarkMode(Handle, true); - Native.UseImmersiveDarkModeColors(Handle, true); + DialogResult = DialogResult.OK; + SettingsManager.Save(); + Close(); + } - Native.UseImmersiveDarkModeColors(mainColourPicker.PInstance, true); + private void displayTimeLabel_Click(object sender, EventArgs e) + { + if (displayTimeSlider.Value > 2000) + return; + NumberInputDialog numberInputDialog = new NumberInputDialog(displayTimeSlider.Value, displayTimeSlider.Minimum, displayTimeSlider.Maximum - 1); + if (numberInputDialog.ShowDialog() == DialogResult.OK) + { + displayTimeSlider.Value = numberInputDialog.Value; + SettingsManager.Set("indDisplayTime", numberInputDialog.Value); + displayTimeLabel.Text = string.Format("{0} ms", displayTimeSlider.Value); + } } - private void ControlScheduleSetDarkMode(Control control) + private void backgroundColourActivatedButton_Click(object sender, EventArgs e) { - control.HandleCreated += (sender, e) => + mainColourPicker.Color = SettingsManager.Get("indBgColourActive"); + if (mainColourPicker.ShowDialog() == DialogResult.OK) { - Native.ControlSetDarkMode(control, true); - }; - } - - private void displayTimeSlider_Scroll(object sender, EventArgs e) - { - SettingsManager.Set("indDisplayTime", displayTimeSlider.Value < 2001 ? displayTimeSlider.Value : -1); - displayTimeLabel.Text = displayTimeSlider.Value < 2001 ? string.Format("{0} ms", displayTimeSlider.Value) : strings.permanentIndicator; - } - - private void button1_Click(object sender, EventArgs e) - { - DialogResult = DialogResult.OK; - SettingsManager.Save(); - Close(); - } - - private void displayTimeLabel_Click(object sender, EventArgs e) - { - if (displayTimeSlider.Value > 2000) - return; - NumberInputDialog numberInputDialog = new NumberInputDialog(displayTimeSlider.Value, displayTimeSlider.Minimum, displayTimeSlider.Maximum - 1); - if (numberInputDialog.ShowDialog() == DialogResult.OK) - { - displayTimeSlider.Value = numberInputDialog.Value; - SettingsManager.Set("indDisplayTime", numberInputDialog.Value); - displayTimeLabel.Text = string.Format("{0} ms", displayTimeSlider.Value); - } - } - - private void backgroundColourActivatedButton_Click(object sender, EventArgs e) - { - mainColourPicker.Color = SettingsManager.Get("indBgColourActive"); - if (mainColourPicker.ShowDialog() == DialogResult.OK) - { - SettingsManager.Set("indBgColourActive", mainColourPicker.Color); - } - backgroundColourActivatedPreview.BackColor = mainColourPicker.Color; - } - - private void backgroundColourDeactivatedButton_Click(object sender, EventArgs e) - { - mainColourPicker.Color = SettingsManager.Get("indBgColourInactive"); - if (mainColourPicker.ShowDialog() == DialogResult.OK) - { - SettingsManager.Set("indBgColourInactive", mainColourPicker.Color); - } - backgroundColourDeactivatedPreview.BackColor = mainColourPicker.Color; - } - - private void foregroundColourActivatedButton_Click(object sender, EventArgs e) - { - mainColourPicker.Color = SettingsManager.Get("indFgColourActive"); - if (mainColourPicker.ShowDialog() == DialogResult.OK) - { - SettingsManager.Set("indFgColourActive", mainColourPicker.Color); - } - foregroundColourActivatedPreview.BackColor = mainColourPicker.Color; - } - - private void foregroundColourDeactivatedButton_Click(object sender, EventArgs e) - { - mainColourPicker.Color = SettingsManager.Get("indFgColourInactive"); - if (mainColourPicker.ShowDialog() == DialogResult.OK) - { - SettingsManager.Set("indFgColourInactive", mainColourPicker.Color); - } - foregroundColourDeactivatedPreview.BackColor = mainColourPicker.Color; - } - - private void borderColourActivatedButton_Click(object sender, EventArgs e) - { - mainColourPicker.Color = SettingsManager.Get("indBdColourActive"); - if (mainColourPicker.ShowDialog() == DialogResult.OK) - { - SettingsManager.Set("indBdColourActive", mainColourPicker.Color); - } - borderColourActivatedPreview.BackColor = mainColourPicker.Color; - } - - private void borderColourDeactivatedButton_Click(object sender, EventArgs e) - { - mainColourPicker.Color = SettingsManager.Get("indBdColourInactive"); - if (mainColourPicker.ShowDialog() == DialogResult.OK) - { - SettingsManager.Set("indBdColourInactive", mainColourPicker.Color); - } - borderColourDeactivatedPreview.BackColor = mainColourPicker.Color; - } - - private void fontButton_Click(object sender, EventArgs e) - { - indFontChooser.Font = SettingsManager.GetOrDefault("indFont"); - if (indFontChooser.ShowDialog() == DialogResult.OK) - { - SettingsManager.Set("indFont", indFontChooser.Font); - fontButton.Font = indFontChooser.Font; - } - } - - private void cancelButton_Click(object sender, EventArgs e) - { - - } - - private void positionButton_CheckedChanged(object sender, EventArgs e) - { - RadioButton _sender = sender as RadioButton; - string posName = _sender.Name.Substring(8); - Enum.TryParse(posName, out IndicatorDisplayPosition position); - SettingsManager.Set("overlayPosition", position); - } - - private void opacityLabel_Click(object sender, EventArgs e) - { - NumberInputDialog numberInputDialog = new NumberInputDialog(opacitySlider.Value, opacitySlider.Minimum, opacitySlider.Maximum); - if (numberInputDialog.ShowDialog() == DialogResult.OK) - { - opacitySlider.Value = numberInputDialog.Value; - SettingsManager.Set("indOpacity", numberInputDialog.Value); - opacityLabel.Text = string.Format("{0} %", opacitySlider.Value); - } - } - - private void opacitySlider_Scroll(object sender, EventArgs e) - { - SettingsManager.Set("indOpacity", opacitySlider.Value); - opacityLabel.Text = string.Format("{0} %", opacitySlider.Value); + SettingsManager.Set("indBgColourActive", mainColourPicker.Color); + } + backgroundColourActivatedPreview.BackColor = mainColourPicker.Color; + } + + private void backgroundColourDeactivatedButton_Click(object sender, EventArgs e) + { + mainColourPicker.Color = SettingsManager.Get("indBgColourInactive"); + if (mainColourPicker.ShowDialog() == DialogResult.OK) + { + SettingsManager.Set("indBgColourInactive", mainColourPicker.Color); + } + backgroundColourDeactivatedPreview.BackColor = mainColourPicker.Color; + } + + private void foregroundColourActivatedButton_Click(object sender, EventArgs e) + { + mainColourPicker.Color = SettingsManager.Get("indFgColourActive"); + if (mainColourPicker.ShowDialog() == DialogResult.OK) + { + SettingsManager.Set("indFgColourActive", mainColourPicker.Color); + } + foregroundColourActivatedPreview.BackColor = mainColourPicker.Color; + } + + private void foregroundColourDeactivatedButton_Click(object sender, EventArgs e) + { + mainColourPicker.Color = SettingsManager.Get("indFgColourInactive"); + if (mainColourPicker.ShowDialog() == DialogResult.OK) + { + SettingsManager.Set("indFgColourInactive", mainColourPicker.Color); + } + foregroundColourDeactivatedPreview.BackColor = mainColourPicker.Color; + } + + private void borderColourActivatedButton_Click(object sender, EventArgs e) + { + mainColourPicker.Color = SettingsManager.Get("indBdColourActive"); + if (mainColourPicker.ShowDialog() == DialogResult.OK) + { + SettingsManager.Set("indBdColourActive", mainColourPicker.Color); + } + borderColourActivatedPreview.BackColor = mainColourPicker.Color; + } + + private void borderColourDeactivatedButton_Click(object sender, EventArgs e) + { + mainColourPicker.Color = SettingsManager.Get("indBdColourInactive"); + if (mainColourPicker.ShowDialog() == DialogResult.OK) + { + SettingsManager.Set("indBdColourInactive", mainColourPicker.Color); + } + borderColourDeactivatedPreview.BackColor = mainColourPicker.Color; + } + + private void fontButton_Click(object sender, EventArgs e) + { + indFontChooser.Font = SettingsManager.GetOrDefault("indFont"); + if (indFontChooser.ShowDialog() == DialogResult.OK) + { + SettingsManager.Set("indFont", indFontChooser.Font); + fontButton.Font = indFontChooser.Font; + } + } + + private void cancelButton_Click(object sender, EventArgs e) + { + + } + + private void positionButton_CheckedChanged(object sender, EventArgs e) + { + RadioButton _sender = sender as RadioButton; + string posName = _sender.Name.Substring(8); + Enum.TryParse(posName, out IndicatorDisplayPosition position); + SettingsManager.Set("overlayPosition", position); + } + + private void opacityLabel_Click(object sender, EventArgs e) + { + NumberInputDialog numberInputDialog = new NumberInputDialog(opacitySlider.Value, opacitySlider.Minimum, opacitySlider.Maximum); + if (numberInputDialog.ShowDialog() == DialogResult.OK) + { + opacitySlider.Value = numberInputDialog.Value; + SettingsManager.Set("indOpacity", numberInputDialog.Value); + opacityLabel.Text = string.Format("{0} %", opacitySlider.Value); + } + } + + private void opacitySlider_Scroll(object sender, EventArgs e) + { + SettingsManager.Set("indOpacity", opacitySlider.Value); + opacityLabel.Text = string.Format("{0} %", opacitySlider.Value); } private void onlyShowWhenActiveCheckBox_CheckedChanged(object sender, EventArgs e) @@ -288,18 +292,18 @@ private void onlyShowWhenActiveCheckBox_CheckedChanged(object sender, EventArgs private void bdSizeLabel_Click(object sender, EventArgs e) { - NumberInputDialog numberInputDialog = new NumberInputDialog(bdSizeSlider.Value, bdSizeSlider.Minimum, bdSizeSlider.Maximum); - if (numberInputDialog.ShowDialog() == DialogResult.OK) - { - bdSizeSlider.Value = numberInputDialog.Value; - SettingsManager.Set("bdSize", numberInputDialog.Value); - bdSizeLabel.Text = string.Format("{0}", bdSizeSlider.Value); + NumberInputDialog numberInputDialog = new NumberInputDialog(bdSizeSlider.Value, bdSizeSlider.Minimum, bdSizeSlider.Maximum); + if (numberInputDialog.ShowDialog() == DialogResult.OK) + { + bdSizeSlider.Value = numberInputDialog.Value; + SettingsManager.Set("bdSize", numberInputDialog.Value); + bdSizeLabel.Text = string.Format("{0}", bdSizeSlider.Value); } } private void bdSizeSlider_Scroll(object sender, EventArgs e) { - SettingsManager.Set("bdSize", bdSizeSlider.Value); + SettingsManager.Set("bdSize", bdSizeSlider.Value); bdSizeLabel.Text = string.Format("{0}", bdSizeSlider.Value); } @@ -313,5 +317,5 @@ private void lnkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs } Process.Start("explorer", "/select,\"" + SettingsManager.GetActualPath() + "\""); } - } -} + } +} diff --git a/CapsLockIndicatorV3/IndicatorOverlay.cs b/CapsLockIndicatorV3/IndicatorOverlay.cs index 07f896e..5659a7d 100644 --- a/CapsLockIndicatorV3/IndicatorOverlay.cs +++ b/CapsLockIndicatorV3/IndicatorOverlay.cs @@ -1,30 +1,30 @@ -/* - * Created 09.07.2017 20:22 - * - * Copyright (c) Jonas Kohl - */ -using System; -using System.Drawing; -using System.Runtime.InteropServices; -using System.Windows.Forms; - -namespace CapsLockIndicatorV3 +/* + * Created 09.07.2017 20:22 + * + * Copyright (c) Jonas Kohl + */ +using System; +using System.Drawing; +using System.Runtime.InteropServices; +using System.Windows.Forms; + +namespace CapsLockIndicatorV3 { - /// - /// A form that indicates if a keystate has changed. - /// + /// + /// A form that indicates if a keystate has changed. + /// public partial class IndicatorOverlay : Form - { - [DllImport("user32.dll", SetLastError = true)] - static extern uint GetWindowLong(IntPtr hWnd, int nIndex); - [DllImport("user32.dll", EntryPoint = "SetWindowLong")] - private static extern int SetWindowLong32(IntPtr hWnd, int nIndex, uint dwNewLong); - [DllImport("user32.dll", CharSet = CharSet.Ansi, SetLastError = true)] - static extern int SetLayeredWindowAttributes(IntPtr hWnd, int crKey, byte bAlpha, uint dwFlags); - [DllImport("user32.dll", SetLastError = true, EntryPoint = "GetWindowLong")] - static extern int GetWindowLongInt(IntPtr hWnd, int nIndex); - [DllImport("user32.dll")] - static extern int SetWindowLong(IntPtr hWnd, int nIndex, uint dwNewLong); + { + [DllImport("user32.dll", SetLastError = true)] + static extern uint GetWindowLong(IntPtr hWnd, int nIndex); + [DllImport("user32.dll", EntryPoint = "SetWindowLong")] + private static extern int SetWindowLong32(IntPtr hWnd, int nIndex, uint dwNewLong); + [DllImport("user32.dll", CharSet = CharSet.Ansi, SetLastError = true)] + static extern int SetLayeredWindowAttributes(IntPtr hWnd, int crKey, byte bAlpha, uint dwFlags); + [DllImport("user32.dll", SetLastError = true, EntryPoint = "GetWindowLong")] + static extern int GetWindowLongInt(IntPtr hWnd, int nIndex); + [DllImport("user32.dll")] + static extern int SetWindowLong(IntPtr hWnd, int nIndex, uint dwNewLong); [DllImport("user32.dll")] static extern int GetDpiForWindow(IntPtr hWnd); @@ -40,43 +40,43 @@ static float GetDisplayScaleFactor(IntPtr windowHandle) } } - const int GWL_EXSTYLE = -20; - const uint WS_EX_LAYERED = 0x80000; - const uint LWA_ALPHA = 0x2; - const uint LWA_COLORKEY = 0x1; + const int GWL_EXSTYLE = -20; + const uint WS_EX_LAYERED = 0x80000; + const uint LWA_ALPHA = 0x2; + const uint LWA_COLORKEY = 0x1; const uint WS_EX_TRANSPARENT = 0x00000020; const int WM_NCHITTEST = 0x84; - const int HTTRANSPARENT = -1; - + const int HTTRANSPARENT = -1; + private Size originalSize; private IndicatorDisplayPosition pos = IndicatorDisplayPosition.BottomRight; - const int WINDOW_MARGIN = 16; - private double lastOpacity = 1; - double opacity_timer_value = 2.0; - - Color BorderColour = Color.FromArgb( - 0xFF, - 0x34, - 0x4D, - 0xB4 - ); - int BorderSize = 4; - + const int WINDOW_MARGIN = 16; + private double lastOpacity = 1; + double opacity_timer_value = 2.0; + + Color BorderColour = Color.FromArgb( + 0xFF, + 0x34, + 0x4D, + 0xB4 + ); + int BorderSize = 4; + protected override void OnFormClosing(FormClosingEventArgs e) { fadeTimer.Stop(); windowCloseTimer.Stop(); positionUpdateTimer.Stop(); base.OnFormClosing(e); - } - + } + protected override bool ShowWithoutActivation { get { return true; } - } - + } + protected override CreateParams CreateParams { get @@ -96,258 +96,282 @@ protected override void WndProc(ref Message m) } protected override void OnShown(EventArgs e) - { - UpdatePosition(); - + { + UpdatePosition(); + base.OnShown(e); - } - - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - } - - void UpdatePosition() - { - Rectangle workingArea = Screen.GetWorkingArea(Cursor.Position); - + } + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + } + + void UpdatePosition() + { + Rectangle workingArea = Screen.GetWorkingArea(Cursor.Position); + var factor = GetDisplayScaleFactor(Handle); Size = new Size( - (int)(originalSize.Width * factor), - (int)(originalSize.Height * factor) + Width, + Height + //(int)(originalSize.Width * factor), + //(int)(originalSize.Height * factor) ); - switch (pos) - { - case IndicatorDisplayPosition.TopLeft: - Left = workingArea.X + WINDOW_MARGIN; - Top = workingArea.Y + WINDOW_MARGIN; - break; - case IndicatorDisplayPosition.TopCenter: - Left = workingArea.X + (workingArea.Width / 2 - Width / 2); - Top = workingArea.Y + WINDOW_MARGIN; - break; - case IndicatorDisplayPosition.TopRight: - Left = workingArea.X + workingArea.Left + (workingArea.Width - Width - WINDOW_MARGIN - workingArea.Left); - Top = workingArea.Y + WINDOW_MARGIN; - break; - case IndicatorDisplayPosition.MiddleLeft: - Left = workingArea.X + WINDOW_MARGIN; - Top = workingArea.Y + (workingArea.Height / 2 - Height / 2); - break; - case IndicatorDisplayPosition.MiddleCenter: - Left = workingArea.X + (workingArea.Width / 2 - Width / 2); - Top = workingArea.Y + (workingArea.Height / 2 - Height / 2); - break; - case IndicatorDisplayPosition.MiddleRight: - Left = workingArea.X + workingArea.Left + (workingArea.Width - Width - WINDOW_MARGIN - workingArea.Left); - Top = workingArea.Y + (workingArea.Height / 2 - Height / 2); - break; - case IndicatorDisplayPosition.BottomLeft: - Left = workingArea.X + WINDOW_MARGIN; - Top = workingArea.Y + workingArea.Top + (workingArea.Height - Height - WINDOW_MARGIN - workingArea.Top); - break; - case IndicatorDisplayPosition.BottomCenter: - Left = workingArea.X + (workingArea.Width / 2 - Width / 2); - Top = workingArea.Y + workingArea.Top + (workingArea.Height - Height - WINDOW_MARGIN - workingArea.Top); - break; - case IndicatorDisplayPosition.BottomRight: - Left = workingArea.X + workingArea.Left + (workingArea.Width - Width - WINDOW_MARGIN - workingArea.Left); - Top = workingArea.Y + workingArea.Top + (workingArea.Height - Height - WINDOW_MARGIN - workingArea.Top); - break; - default: - break; - } + switch (pos) + { + case IndicatorDisplayPosition.TopLeft: + Left = workingArea.X + WINDOW_MARGIN; + Top = workingArea.Y + WINDOW_MARGIN; + break; + case IndicatorDisplayPosition.TopCenter: + Left = workingArea.X + (workingArea.Width / 2 - Width / 2); + Top = workingArea.Y + WINDOW_MARGIN; + break; + case IndicatorDisplayPosition.TopRight: + Left = workingArea.X + workingArea.Left + (workingArea.Width - Width - WINDOW_MARGIN - workingArea.Left); + Top = workingArea.Y + WINDOW_MARGIN; + break; + case IndicatorDisplayPosition.MiddleLeft: + Left = workingArea.X + WINDOW_MARGIN; + Top = workingArea.Y + (workingArea.Height / 2 - Height / 2); + break; + case IndicatorDisplayPosition.MiddleCenter: + Left = workingArea.X + (workingArea.Width / 2 - Width / 2); + Top = workingArea.Y + (workingArea.Height / 2 - Height / 2); + break; + case IndicatorDisplayPosition.MiddleRight: + Left = workingArea.X + workingArea.Left + (workingArea.Width - Width - WINDOW_MARGIN - workingArea.Left); + Top = workingArea.Y + (workingArea.Height / 2 - Height / 2); + break; + case IndicatorDisplayPosition.BottomLeft: + Left = workingArea.X + WINDOW_MARGIN; + Top = workingArea.Y + workingArea.Top + (workingArea.Height - Height - WINDOW_MARGIN - workingArea.Top); + break; + case IndicatorDisplayPosition.BottomCenter: + Left = workingArea.X + (workingArea.Width / 2 - Width / 2); + Top = workingArea.Y + workingArea.Top + (workingArea.Height - Height - WINDOW_MARGIN - workingArea.Top); + break; + case IndicatorDisplayPosition.BottomRight: + Left = workingArea.X + workingArea.Left + (workingArea.Width - Width - WINDOW_MARGIN - workingArea.Left); + Top = workingArea.Y + workingArea.Top + (workingArea.Height - Height - WINDOW_MARGIN - workingArea.Top); + break; + default: + break; + } } protected override void OnPaint(PaintEventArgs e) { - base.OnPaint(e); - + base.OnPaint(e); + if (BorderSize > 0) - e.Graphics.DrawRectangle(new Pen(BorderColour, BorderSize), e.ClipRectangle); - + e.Graphics.DrawRectangle(new Pen(BorderColour, BorderSize), e.ClipRectangle); + using (var sf = new StringFormat() { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }) - using (var b = new SolidBrush(contentLabel.ForeColor)) - e.Graphics.DrawString(contentLabel.Text, contentLabel.Font, b, ClientRectangle, sf); - } - - private void ClickThroughWindow(double opacity = 1d) - { - //Opacity = opacity; - try - { - IntPtr Handle = this.Handle; - uint windowLong = GetWindowLong(Handle, GWL_EXSTYLE); - SetWindowLong32(Handle, GWL_EXSTYLE, windowLong ^ WS_EX_LAYERED); - SetLayeredWindowAttributes(Handle, 0, (byte)(opacity * 255), LWA_ALPHA); + using (var b = new SolidBrush(contentLabel.ForeColor)) + e.Graphics.DrawString(contentLabel.Text, contentLabel.Font, b, ClientRectangle, sf); + } + + private int ClickThroughWindow(double opacity = 1d) + { + if (IsDisposed) + return -1; + + uint windowLong = GetWindowLong(Handle, GWL_EXSTYLE); + SetWindowLong32(Handle, GWL_EXSTYLE, windowLong ^ WS_EX_LAYERED); + SetLayeredWindowAttributes(Handle, 0, (byte)(opacity * 255), LWA_ALPHA); + + var style = GetWindowLong(Handle, GWL_EXSTYLE); + SetWindowLong(Handle, GWL_EXSTYLE, style | WS_EX_LAYERED | WS_EX_TRANSPARENT); + + return 0; + } - var style = GetWindowLong(this.Handle, GWL_EXSTYLE); - SetWindowLong(this.Handle, GWL_EXSTYLE, style | WS_EX_LAYERED | WS_EX_TRANSPARENT); - } - catch (ObjectDisposedException) - { } - } - public IndicatorOverlay(string content) { - InitializeComponent(); - - originalSize = Size; + InitializeComponent(); + + //if (IsDisposed) + // return; + + //originalSize = Size; + + //contentLabel.Text = content; + + //ClickThroughWindow(); + } + + public IndicatorOverlay(string content, int timeoutInMs, IndicatorDisplayPosition position) + { + pos = position; + + if (IsDisposed) + return; - contentLabel.Text = content; - - ClickThroughWindow(); - } - - public IndicatorOverlay(string content, int timeoutInMs, IndicatorDisplayPosition position) - { - pos = position; InitializeComponent(); - contentLabel.Text = content; - Application.DoEvents(); - originalSize = Size; - - if (timeoutInMs < 1) - { + if (IsDisposed) + return; + + contentLabel.Text = content; + originalSize = Size; + + if (timeoutInMs < 1) + { windowCloseTimer.Enabled = false; - fadeTimer.Enabled = false; - } - else - { - windowCloseTimer.Interval = timeoutInMs; - fadeTimer.Interval = (int)Math.Floor((decimal)(timeoutInMs / 20)); - } - ClickThroughWindow(); - } - - public IndicatorOverlay(string content, int timeoutInMs, Color bgColour, Color fgColour, Color bdColour, int bdSize, Font font, IndicatorDisplayPosition position, int indOpacity, bool alwaysShow) - { - pos = position; - InitializeComponent(); - - contentLabel.Text = content; - Font = font; - Application.DoEvents(); + fadeTimer.Enabled = false; + } + else + { + windowCloseTimer.Interval = timeoutInMs; + fadeTimer.Interval = (int)Math.Floor((decimal)(timeoutInMs / 20)); + } + ClickThroughWindow(); + } + + public IndicatorOverlay(string content, int timeoutInMs, Color bgColour, Color fgColour, Color bdColour, int bdSize, Font font, IndicatorDisplayPosition position, int indOpacity, bool alwaysShow) + { + var ret = 0; + + pos = position; + + InitializeComponent(); + + + contentLabel.Text = content; + Font = font; originalSize = Size; - var op = indOpacity / 100d; - lastOpacity = op; - SetOpacity(op); - if (timeoutInMs < 0 || alwaysShow) - { - windowCloseTimer.Enabled = false; - fadeTimer.Enabled = false; - } - else - { - windowCloseTimer.Interval = timeoutInMs; - fadeTimer.Interval = (int)Math.Floor((decimal)(timeoutInMs / 20)); - } - BackColor = bgColour; - ForeColor = fgColour; - BorderColour = bdColour; - BorderSize = bdSize; - ClickThroughWindow(op); - } - - private void SetOpacity(double op) - { - if (IsDisposed) - return; - + var op = indOpacity / 100d; + lastOpacity = op; + ret |= SetOpacity(op); + if (timeoutInMs < 0 || alwaysShow) + { + windowCloseTimer.Enabled = false; + fadeTimer.Enabled = false; + } + else + { + windowCloseTimer.Interval = timeoutInMs; + fadeTimer.Interval = (int)Math.Floor((decimal)(timeoutInMs / 20)); + } + BackColor = bgColour; + ForeColor = fgColour; + BorderColour = bdColour; + BorderSize = bdSize; + ret |= ClickThroughWindow(op); + if (ret != -1) + Show(); + } + + private int SetOpacity(double op) + { + if (IsDisposed) + return -1; + + byte opb = 0xFF; + try { - //Opacity = op; - byte opb = (byte)Math.Min(255, op * 0xFF); - SetLayeredWindowAttributes(Handle, 0, opb, LWA_ALPHA); + opb = (byte)Math.Min(255, Math.Max(op * 0xFF, 0)); } - catch (ObjectDisposedException) - { } - } - - public void UpdateIndicator(string content, IndicatorDisplayPosition position) - { - pos = position; - Opacity = 1; - contentLabel.Text = content; - opacity_timer_value = 2.0; - windowCloseTimer.Stop(); - windowCloseTimer.Start(); - fadeTimer.Stop(); - fadeTimer.Start(); - UpdatePosition(); - } - - public void UpdateIndicator(string content, int timeoutInMs, IndicatorDisplayPosition position) - { - pos = position; - Opacity = 1; - contentLabel.Text = content; - opacity_timer_value = 2.0; - if (timeoutInMs < 0) - { - windowCloseTimer.Enabled = false; - fadeTimer.Enabled = false; - } - else - { - windowCloseTimer.Stop(); - windowCloseTimer.Interval = timeoutInMs; - windowCloseTimer.Start(); - fadeTimer.Stop(); - fadeTimer.Start(); - } - UpdatePosition(); - } - - public void UpdateIndicator(string content, int timeoutInMs, Color bgColour, Color fgColour, Color bdColour, int bdSize, Font font, IndicatorDisplayPosition position, int indOpacity, bool alwaysShow) - { - pos = position; - var op = indOpacity / 100d; - lastOpacity = op; - contentLabel.Text = content; - Font = font; - opacity_timer_value = 2.0; - if (timeoutInMs < 0 || alwaysShow) - { - windowCloseTimer.Enabled = false; - fadeTimer.Enabled = false; - } - else - { - windowCloseTimer.Stop(); - windowCloseTimer.Interval = timeoutInMs; - windowCloseTimer.Start(); - fadeTimer.Stop(); - fadeTimer.Start(); - } - SetOpacity(op); - BackColor = bgColour; - ForeColor = fgColour; - BorderColour = bdColour; - BorderSize = bdSize; - Invalidate(); - UpdatePosition(); - } - + catch (OverflowException) { } + SetLayeredWindowAttributes(Handle, 0, opb, LWA_ALPHA); + return 0; + } + + public void UpdateIndicator(string content, IndicatorDisplayPosition position) + { + pos = position; + Opacity = 1; + contentLabel.Text = content; + opacity_timer_value = 2.0; + windowCloseTimer.Stop(); + windowCloseTimer.Start(); + fadeTimer.Stop(); + fadeTimer.Start(); + Show(); + UpdatePosition(); + } + + public void UpdateIndicator(string content, int timeoutInMs, IndicatorDisplayPosition position) + { + pos = position; + Opacity = 1; + contentLabel.Text = content; + opacity_timer_value = 2.0; + if (timeoutInMs < 0) + { + windowCloseTimer.Enabled = false; + fadeTimer.Enabled = false; + } + else + { + windowCloseTimer.Stop(); + windowCloseTimer.Interval = timeoutInMs; + windowCloseTimer.Start(); + fadeTimer.Stop(); + fadeTimer.Interval = (int)Math.Floor((decimal)(timeoutInMs / 20)); + fadeTimer.Start(); + } + Show(); + UpdatePosition(); + } + + public void UpdateIndicator(string content, int timeoutInMs, Color bgColour, Color fgColour, Color bdColour, int bdSize, Font font, IndicatorDisplayPosition position, int indOpacity, bool alwaysShow) + { + pos = position; + var op = indOpacity / 100d; + lastOpacity = op; + SetOpacity(op); + contentLabel.Text = content; + Font = font; + opacity_timer_value = 2.0; + if (timeoutInMs < 0 || alwaysShow) + { + windowCloseTimer.Enabled = false; + fadeTimer.Enabled = false; + } + else + { + windowCloseTimer.Stop(); + windowCloseTimer.Interval = timeoutInMs; + windowCloseTimer.Start(); + fadeTimer.Stop(); + fadeTimer.Interval = (int)Math.Floor((decimal)(timeoutInMs / 20)); + fadeTimer.Start(); + } + BackColor = bgColour; + ForeColor = fgColour; + BorderColour = bdColour; + BorderSize = bdSize; + Show(); + Invalidate(); + UpdatePosition(); + } + void WindowCloseTimerTick(object sender, EventArgs e) { - Close(); - } - - private void fadeTimer_Tick(object sender, EventArgs e) - { - opacity_timer_value -= 0.1; - if (opacity_timer_value <= 1.0) - SetOpacity(opacity_timer_value * lastOpacity); + Hide(); + } + + private void fadeTimer_Tick(object sender, EventArgs e) + { + if (opacity_timer_value > 0) + { + opacity_timer_value -= 0.1; + opacity_timer_value = Math.Max(opacity_timer_value, 0); + if (opacity_timer_value <= 1.0) + SetOpacity(opacity_timer_value * lastOpacity); + } } private void positionUpdateTimer_Tick(object sender, EventArgs e) { UpdatePosition(); } - } -} + } +} diff --git a/CapsLockIndicatorV3/MainForm.cs b/CapsLockIndicatorV3/MainForm.cs index c83f239..bf37c25 100644 --- a/CapsLockIndicatorV3/MainForm.cs +++ b/CapsLockIndicatorV3/MainForm.cs @@ -1,90 +1,91 @@ -/* - * Created 09.07.2017 18:16 - * - * Copyright (c) Jonas Kohl - */ - -// Use project namespace, for easier access to e.g helper classes -using CapsLockIndicatorV3; - -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Diagnostics; -using System.Windows.Forms; -using System.Reflection; -using System.Resources; -using System.Linq; -using Microsoft.Win32; -using System.Xml.Linq; -using System.Globalization; -using System.Threading; -using System.IO; - -namespace CapsLockIndicatorV3 -{ - public partial class MainForm : Form - { - public bool isHidden = false; - - // Define variables used to load the icons from resources.resx - ResourceManager resources; - - Icon CapsOff; - Icon CapsOn; - - Icon NumOff; - Icon NumOn; - - Icon ScrollOff; - Icon ScrollOn; - - // Store the key states of the previous timer tick - bool numState; - bool capsState; - bool scrollState; - - public bool askCancel = true; - private bool shouldClose = false; - - private int previousLocaleIndex = -1; - - public MainForm() - { - Assembly assembly = Assembly.GetExecutingAssembly(); - FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location); - string version = fvi.FileVersion; - - // Initialize component - InitializeComponent(); - - Opacity = 0; - ShowInTaskbar = false; - - // Load "resources.resx" into a ResourceManager to access its resources - resources = new ResourceManager("CapsLockIndicatorV3.resources", Assembly.GetExecutingAssembly()); - - // Load the icons into variables - ReloadIcons(); - - // Set the values - numState = KeyHelper.isNumlockActive; - capsState = KeyHelper.isCapslockActive; - scrollState = KeyHelper.isScrolllockActive; - - // Load settings - enableNumIcon.Checked = SettingsManager.Get("numIco"); - enableCapsIcon.Checked = SettingsManager.Get("capsIco"); - enableScrollIcon.Checked = SettingsManager.Get("scrollIco"); - - enableNumInd.Checked = SettingsManager.Get("numInd"); - enableCapsInd.Checked = SettingsManager.Get("capsInd"); - enableScrollInd.Checked = SettingsManager.Get("scrollInd"); - - showNoIcons.Checked = SettingsManager.Get("noIco"); - showNoNotification.Checked = SettingsManager.Get("noInd"); - - iconsGroup.Enabled = !showNoIcons.Checked; +/* + * Created 09.07.2017 18:16 + * + * Copyright (c) Jonas Kohl + */ + +// Use project namespace, for easier access to e.g helper classes +using CapsLockIndicatorV3; + +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Diagnostics; +using System.Windows.Forms; +using System.Reflection; +using System.Resources; +using System.Linq; +using Microsoft.Win32; +using System.Xml.Linq; +using System.Globalization; +using System.Threading; +using System.IO; +using System.ComponentModel; + +namespace CapsLockIndicatorV3 +{ + public partial class MainForm : DarkModeForm + { + public bool isHidden = false; + + // Define variables used to load the icons from resources.resx + ResourceManager resources; + + Icon CapsOff; + Icon CapsOn; + + Icon NumOff; + Icon NumOn; + + Icon ScrollOff; + Icon ScrollOn; + + // Store the key states of the previous timer tick + bool numState; + bool capsState; + bool scrollState; + + public bool askCancel = true; + private bool shouldClose = false; + + private int previousLocaleIndex = -1; + + public MainForm() + { + Assembly assembly = Assembly.GetExecutingAssembly(); + FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location); + string version = fvi.FileVersion; + + // Initialize component + InitializeComponent(); + + Opacity = 0; + ShowInTaskbar = false; + + // Load "resources.resx" into a ResourceManager to access its resources + resources = new ResourceManager("CapsLockIndicatorV3.resources", Assembly.GetExecutingAssembly()); + + // Load the icons into variables + ReloadIcons(); + + // Set the values + numState = KeyHelper.isNumlockActive; + capsState = KeyHelper.isCapslockActive; + scrollState = KeyHelper.isScrolllockActive; + + // Load settings + enableNumIcon.Checked = SettingsManager.Get("numIco"); + enableCapsIcon.Checked = SettingsManager.Get("capsIco"); + enableScrollIcon.Checked = SettingsManager.Get("scrollIco"); + + enableNumInd.Checked = SettingsManager.Get("numInd"); + enableCapsInd.Checked = SettingsManager.Get("capsInd"); + enableScrollInd.Checked = SettingsManager.Get("scrollInd"); + + showNoIcons.Checked = SettingsManager.Get("noIco"); + showNoNotification.Checked = SettingsManager.Get("noInd"); + + iconsGroup.Enabled = !showNoIcons.Checked; indicatorGroup.Enabled = !showNoNotification.Checked; generalIcon.ContextMenu = @@ -93,570 +94,647 @@ public MainForm() scrollLockIcon.ContextMenu = contextMenu1; - if (SettingsManager.Get("beta_enableDarkMode")) - { - HandleCreated += MainForm_HandleCreated; - - iconsGroup.ForeColor = - indicatorGroup.ForeColor = - enableNumInd.ForeColor = - enableCapsInd.ForeColor = - enableScrollInd.ForeColor = - enableNumIcon.ForeColor = - enableCapsIcon.ForeColor = - enableScrollIcon.ForeColor = - showNoIcons.ForeColor = - showNoNotification.ForeColor = - startonlogonCheckBox.ForeColor = - hideOnStartupCheckBox.ForeColor = - Color.White; - - enableNumInd.FlatStyle = - enableCapsInd.FlatStyle = - enableScrollInd.FlatStyle = - enableNumIcon.FlatStyle = - enableCapsIcon.FlatStyle = - enableScrollIcon.FlatStyle = - showNoIcons.FlatStyle = - showNoNotification.FlatStyle = - startonlogonCheckBox.FlatStyle = - hideOnStartupCheckBox.FlatStyle = - FlatStyle.Standard; - - BackColor = Color.FromArgb(255, 32, 32, 32); - ForeColor = Color.White; - aboutPanelTopBorder.BackColor = Color.FromArgb(255, 196, 204, 238); - appNameLabel.LinkColor = - appNameLabel.ActiveLinkColor = - Color.FromArgb(255, 196, 204, 238); - logo.Image = (Bitmap)resources.GetObject("logo_dark"); - - ControlScheduleSetDarkMode(checkForUpdatesButton); - ControlScheduleSetDarkMode(indSettings); - ControlScheduleSetDarkMode(exitApplication); - ControlScheduleSetDarkMode(hideWindow); - ControlScheduleSetDarkMode(enableNumInd); - ControlScheduleSetDarkMode(enableCapsInd); - ControlScheduleSetDarkMode(enableScrollInd); - ControlScheduleSetDarkMode(enableNumIcon); - ControlScheduleSetDarkMode(enableCapsIcon); - ControlScheduleSetDarkMode(enableScrollIcon); - ControlScheduleSetDarkMode(localeComboBox); - } - - // Check if application is in startup - startonlogonCheckBox.Checked = Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run", "CapsLock Indicator", null) != null; - - // Hides the window on startup if enabled - if (SettingsManager.Get("hideOnStartup")) - { - hideOnStartupCheckBox.Checked = true; - hideWindowTimer.Start(); - } - else - { - Opacity = 1; - ShowInTaskbar = true; - } - - checkForUpdatedCheckBox.Checked = SettingsManager.Get("checkForUpdates"); - - AddCultures(); - - ApplyLocales(); - } - - private void MainForm_HandleCreated(object sender, EventArgs e) - { - Native.UseImmersiveDarkModeColors(Handle, true); - } - - private void ControlScheduleSetDarkMode(Control control) - { - control.HandleCreated += (sender, e) => + HandleCreated += (sender, e) => { - Native.ControlSetDarkMode(control, true); + DarkModeChanged += MainForm_DarkModeChanged; + DarkModeProvider.RegisterForm(this); }; + + // Check if application is in startup + startonlogonCheckBox.Checked = Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Run", "CapsLock Indicator", null) != null; + + // Hides the window on startup if enabled + if (SettingsManager.Get("hideOnStartup")) + { + hideOnStartupCheckBox.Checked = true; + hideWindowTimer.Start(); + } + else + { + Opacity = 1; + ShowInTaskbar = true; + } + + checkForUpdatedCheckBox.Checked = SettingsManager.Get("checkForUpdates"); + + AddCultures(); + + ApplyLocales(); + + SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged; + } + + protected override void OnClosing(CancelEventArgs e) + { + base.OnClosing(e); + + SystemEvents.PowerModeChanged -= SystemEvents_PowerModeChanged; + } + + private void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e) + { + if (e.Mode == PowerModes.Resume) + { + if (SettingsManager.Get("searchForUpdatesAfterResume")) + doVersionCheck(false); + } + } + + private void MainForm_DarkModeChanged(object sender, EventArgs e) + { + var dark = DarkModeProvider.IsDark; + + Native.UseImmersiveDarkModeColors(Handle, dark); + generalIcon.Icon = (Icon)resources.GetObject("generalIcon"); + Icon = (Icon)resources.GetObject("CLIv3_Icon" + (dark ? "_Dark" : "")); + + iconsGroup.ForeColor = + indicatorGroup.ForeColor = + enableNumInd.ForeColor = + enableCapsInd.ForeColor = + enableScrollInd.ForeColor = + enableNumIcon.ForeColor = + enableCapsIcon.ForeColor = + enableScrollIcon.ForeColor = + showNoIcons.ForeColor = + showNoNotification.ForeColor = + startonlogonCheckBox.ForeColor = + hideOnStartupCheckBox.ForeColor = + dark ? Color.White : SystemColors.WindowText; + + enableNumInd.FlatStyle = + enableCapsInd.FlatStyle = + enableScrollInd.FlatStyle = + enableNumIcon.FlatStyle = + enableCapsIcon.FlatStyle = + enableScrollIcon.FlatStyle = + showNoIcons.FlatStyle = + showNoNotification.FlatStyle = + startonlogonCheckBox.FlatStyle = + hideOnStartupCheckBox.FlatStyle = + dark ? FlatStyle.Standard : FlatStyle.System; + + BackColor = dark ? Color.FromArgb(255, 32, 32, 32) : SystemColors.Window; + ForeColor = dark ? Color.White : SystemColors.WindowText; + aboutPanelTopBorder.BackColor = + appNameLabel.LinkColor = + appNameLabel.ActiveLinkColor = + dark ? Color.FromArgb(255, 196, 204, 238) : Color.FromArgb(255, 52, 77, 180); ; + logo.Image = (Bitmap)resources.GetObject("logo" + (dark ? "_dark" : "")); + + ControlScheduleSetDarkMode(checkForUpdatesButton, dark); + ControlScheduleSetDarkMode(indSettings, dark); + ControlScheduleSetDarkMode(exitApplication, dark); + ControlScheduleSetDarkMode(hideWindow, dark); + ControlScheduleSetDarkMode(enableNumInd, dark); + ControlScheduleSetDarkMode(enableCapsInd, dark); + ControlScheduleSetDarkMode(enableScrollInd, dark); + ControlScheduleSetDarkMode(enableNumIcon, dark); + ControlScheduleSetDarkMode(enableCapsIcon, dark); + ControlScheduleSetDarkMode(enableScrollIcon, dark); + ControlScheduleSetDarkMode(localeComboBox, dark); } - private void ReloadIcons() - { - var dir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - - CapsOff = File.Exists(Path.Combine(dir, "caps0.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "caps0.ico")) : (Icon)resources.GetObject("CLIv3_Caps_Off"); - CapsOn = File.Exists(Path.Combine(dir, "caps1.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "caps1.ico")) : (Icon)resources.GetObject("CLIv3_Caps_On"); - - NumOff = File.Exists(Path.Combine(dir, "num0.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "num0.ico")) : (Icon)resources.GetObject("CLIv3_Num_Off"); - NumOn = File.Exists(Path.Combine(dir, "num1.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "num1.ico")) : (Icon)resources.GetObject("CLIv3_Num_On"); - - ScrollOff = File.Exists(Path.Combine(dir, "scroll0.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "scroll0.ico")) : (Icon)resources.GetObject("CLIv3_Scroll_Off"); - ScrollOn = File.Exists(Path.Combine(dir, "scroll1.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "scroll1.ico")) : (Icon)resources.GetObject("CLIv3_Scroll_On"); - } - - private void AddCultures() - { - int index = 1; - int selectIndex = 0; - - localeComboBox.Items.Clear(); - - localeComboBox.Items.Add(new DropDownLocale("en-GB", "English (United Kingdom)")); - - foreach (CultureInfo c in GetSupportedCulture()) - { - if (c.Name.Trim().Length < 1) - continue; - else - { - localeComboBox.Items.Add(new DropDownLocale(c.Name, c.NativeName)); - - if (c.TwoLetterISOLanguageName == Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName) - selectIndex = index; - - index++; - } - } - - if (SettingsManager.Get("selectedUICulture") < 0) - localeComboBox.SelectedIndex = selectIndex; - else if (SettingsManager.Get("selectedUICulture") < localeComboBox.Items.Count) - localeComboBox.SelectedIndex = SettingsManager.Get("selectedUICulture"); - else - localeComboBox.SelectedIndex = 0; - - localeComboBox.Items.Add(new DropDownLocale("--ln", "")); - localeComboBox.Items.Add(new DropDownLocale("--get-more", strings.downloadMoreTranslations)); - } - - public IEnumerable GetSupportedCulture() - { - //Get all culture - CultureInfo[] culture = CultureInfo.GetCultures(CultureTypes.AllCultures); - - //Find the location where application installed. - string exeLocation = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path)); - - //Return all culture for which satellite folder found with culture code. - return culture.Where(cultureInfo => Directory.Exists(Path.Combine(exeLocation, cultureInfo.Name))); - } - - void ApplyLocales() - { - iconsGroup.Text = strings.showIconsFor; - indicatorGroup.Text = strings.showNotificationWhen; - enableNumIcon.Text = strings.numLock; - enableCapsIcon.Text = strings.capsLock; - enableScrollIcon.Text = strings.scrollLock; - enableNumInd.Text = string.Format(strings.keyChanged, strings.numLock); - enableCapsInd.Text = string.Format(strings.keyChanged, strings.capsLock); - enableScrollInd.Text = string.Format(strings.keyChanged, strings.scrollLock); - showNoIcons.Text = strings.showNoIcons; - showNoNotification.Text = strings.showNoNotification; - hideWindow.Text = strings.hideWindow; - exitApplication.Text = strings.exitApplication; - indSettings.Text = strings.notificationSettings; - checkForUpdatesButton.Text = strings.checkForUpdates; - startonlogonCheckBox.Text = strings.startOnLogon; - generalIcon.BalloonTipText = strings.generalIconBalloonText; - showToolStripMenuItem.Text = strings.contextMenuShow; - showMenuItem.Text = strings.contextMenuShow; - exitToolStripMenuItem.Text = strings.contextMenuExit; - exitMenuItem.Text = strings.contextMenuExit; - hideOnStartupCheckBox.Text = strings.hideOnStartup; - } - - // This timer ticks approx. 60 times a second (overkill?) - void UpdateTimerTick(object sender, EventArgs e) - { - // Set the icons for the NotifyIcons depending on the key state - if (enableNumIcon.Checked && !showNoIcons.Checked) - numLockIcon.Icon = KeyHelper.isNumlockActive ? NumOn : NumOff; - else - numLockIcon.Icon = null; - - if (enableCapsIcon.Checked && !showNoIcons.Checked) - capsLockIcon.Icon = KeyHelper.isCapslockActive ? CapsOn : CapsOff; - else - capsLockIcon.Icon = null; - - if (enableScrollIcon.Checked && !showNoIcons.Checked) - scrollLockIcon.Icon = KeyHelper.isScrolllockActive ? ScrollOn : ScrollOff; - else - scrollLockIcon.Icon = null; - + private void ReloadIcons(bool isUserInitiated = false) + { + var dir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + + CapsOff = File.Exists(Path.Combine(dir, "caps0.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "caps0.ico")) : (Icon)resources.GetObject("CLIv3_Caps_Off"); + CapsOn = File.Exists(Path.Combine(dir, "caps1.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "caps1.ico")) : (Icon)resources.GetObject("CLIv3_Caps_On"); + + NumOff = File.Exists(Path.Combine(dir, "num0.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "num0.ico")) : (Icon)resources.GetObject("CLIv3_Num_Off"); + NumOn = File.Exists(Path.Combine(dir, "num1.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "num1.ico")) : (Icon)resources.GetObject("CLIv3_Num_On"); + + ScrollOff = File.Exists(Path.Combine(dir, "scroll0.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "scroll0.ico")) : (Icon)resources.GetObject("CLIv3_Scroll_Off"); + ScrollOn = File.Exists(Path.Combine(dir, "scroll1.ico")) ? Icon.ExtractAssociatedIcon(Path.Combine(dir, "scroll1.ico")) : (Icon)resources.GetObject("CLIv3_Scroll_On"); + + if (isUserInitiated) + ShowOverlayInfo(strings.reloadedIconsInfo); + } + + private void AddCultures() + { + int index = 1; + int selectIndex = 0; + + localeComboBox.Items.Clear(); + + localeComboBox.Items.Add(new DropDownLocale("en-GB", "English (United Kingdom)")); + + var cultures = GetSupportedCulture(); + + foreach (CultureInfo c in cultures) + { + if (c.Name.Trim().Length < 1) + continue; + else + { + localeComboBox.Items.Add(new DropDownLocale(c.Name, c.NativeName)); + + if (c.TwoLetterISOLanguageName == Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName) + selectIndex = index; + + index++; + } + } + + //if (SettingsManager.Get("selectedUICulture") < 0) + // localeComboBox.SelectedIndex = selectIndex; + //else if (SettingsManager.Get("selectedUICulture") < localeComboBox.Items.Count) + // localeComboBox.SelectedIndex = SettingsManager.Get("selectedUICulture"); + //else + // localeComboBox.SelectedIndex = 0; + + if (SettingsManager.Has("selectedUICulture")) + { + var legacySelectedUICulture = SettingsManager.Get("selectedUICulture"); + SettingsManager.Unset("selectedUICulture"); + selectIndex = legacySelectedUICulture; + } + + var cultureCodes = cultures.Select(c => c.TwoLetterISOLanguageName); + var selLang = SettingsManager.Get("selectedLanguage"); + + if (selLang == "") + localeComboBox.SelectedIndex = selectIndex; + else if (cultureCodes.Contains(selLang)) + localeComboBox.SelectedIndex = cultureCodes.ToList().FindIndex(c => c == selLang); + else + localeComboBox.SelectedIndex = 0; + + localeComboBox.Items.Add(new DropDownLocale("--ln", "")); + localeComboBox.Items.Add(new DropDownLocale("--get-more", strings.downloadMoreTranslations)); + } + + public IEnumerable GetSupportedCulture() + { + //Get all culture + CultureInfo[] culture = CultureInfo.GetCultures(CultureTypes.AllCultures); + + //Find the location where application installed. + string exeLocation = Path.GetDirectoryName(Uri.UnescapeDataString(new UriBuilder(Assembly.GetExecutingAssembly().CodeBase).Path)); + + //Return all culture for which satellite folder found with culture code. + return culture.Where(cultureInfo => Directory.Exists(Path.Combine(exeLocation, cultureInfo.Name))); + } + + void ApplyLocales() + { + iconsGroup.Text = strings.showIconsFor; + indicatorGroup.Text = strings.showNotificationWhen; + enableNumIcon.Text = strings.numLock; + enableCapsIcon.Text = strings.capsLock; + enableScrollIcon.Text = strings.scrollLock; + enableNumInd.Text = string.Format(strings.keyChanged, strings.numLock); + enableCapsInd.Text = string.Format(strings.keyChanged, strings.capsLock); + enableScrollInd.Text = string.Format(strings.keyChanged, strings.scrollLock); + showNoIcons.Text = strings.showNoIcons; + showNoNotification.Text = strings.showNoNotification; + hideWindow.Text = strings.hideWindow; + exitApplication.Text = strings.exitApplication; + indSettings.Text = strings.notificationSettings; + checkForUpdatesButton.Text = strings.checkForUpdates; + startonlogonCheckBox.Text = strings.startOnLogon; + generalIcon.BalloonTipText = strings.generalIconBalloonText; + showToolStripMenuItem.Text = strings.contextMenuShow; + showMenuItem.Text = strings.contextMenuShow; + exitToolStripMenuItem.Text = strings.contextMenuExit; + exitMenuItem.Text = strings.contextMenuExit; + hideOnStartupCheckBox.Text = strings.hideOnStartup; + } + + // This timer ticks approx. 60 times a second (overkill?) + void UpdateTimerTick(object sender, EventArgs e) + { + // Set the icons for the NotifyIcons depending on the key state + if (enableNumIcon.Checked && !showNoIcons.Checked) + numLockIcon.Icon = KeyHelper.isNumlockActive ? NumOn : NumOff; + else + numLockIcon.Icon = null; + + if (enableCapsIcon.Checked && !showNoIcons.Checked) + capsLockIcon.Icon = KeyHelper.isCapslockActive ? CapsOn : CapsOff; + else + capsLockIcon.Icon = null; + + if (enableScrollIcon.Checked && !showNoIcons.Checked) + scrollLockIcon.Icon = KeyHelper.isScrolllockActive ? ScrollOn : ScrollOff; + else + scrollLockIcon.Icon = null; + generalIcon.Visible = - !(enableNumIcon.Checked && !showNoIcons.Checked) && - !(enableCapsIcon.Checked && !showNoIcons.Checked) && - !(enableScrollIcon.Checked && !showNoIcons.Checked) - ; - - // Handle the overlay - if (numState != KeyHelper.isNumlockActive && enableNumInd.Checked && !showNoNotification.Checked) - ShowOverlay( - KeyHelper.isNumlockActive ? - (SettingsManager.Get("customMessageNumOn").Trim().Length > 0 ? SettingsManager.Get("customMessageNumOn") : string.Format(strings.keyIsOn, strings.numLock)) : - (SettingsManager.Get("customMessageNumOff").Trim().Length > 0 ? SettingsManager.Get("customMessageNumOff") : string.Format(strings.keyIsOff, strings.numLock)), - KeyHelper.isNumlockActive); - //ShowOverlay("Numlock is " + (KeyHelper.isNumlockActive ? "on" : "off"), KeyHelper.isNumlockActive); - - if (capsState != KeyHelper.isCapslockActive && enableCapsInd.Checked && !showNoNotification.Checked) - ShowOverlay( - KeyHelper.isCapslockActive ? - (SettingsManager.Get("customMessageCapsOn").Trim().Length > 0 ? SettingsManager.Get("customMessageCapsOn") : string.Format(strings.keyIsOn, strings.capsLock)) : - (SettingsManager.Get("customMessageCapsOff").Trim().Length > 0 ? SettingsManager.Get("customMessageCapsOff") : string.Format(strings.keyIsOff, strings.capsLock)), - KeyHelper.isCapslockActive); - - if (scrollState != KeyHelper.isScrolllockActive && enableScrollInd.Checked && !showNoNotification.Checked) - ShowOverlay( - KeyHelper.isScrolllockActive ? - (SettingsManager.Get("customMessageScrollOn").Trim().Length > 0 ? SettingsManager.Get("customMessageScrollOn") : string.Format(strings.keyIsOn, strings.scrollLock)) : - (SettingsManager.Get("customMessageScrollOff").Trim().Length > 0 ? SettingsManager.Get("customMessageScrollOff") : string.Format(strings.keyIsOff, strings.scrollLock)), - KeyHelper.isScrolllockActive); - - // Reset the values - numState = KeyHelper.isNumlockActive; - capsState = KeyHelper.isCapslockActive; - scrollState = KeyHelper.isScrolllockActive; - } - - void ShowOverlay(string message, bool isActive) - { - int timeOut = SettingsManager.Get("indDisplayTime"); - var alwaysShow = SettingsManager.Get("alwaysShowWhenActive") && isActive; - if (Application.OpenForms.OfType().Any() && Application.OpenForms.OfType().Where(f => !f.IsDisposed).Any()) - { - IndicatorOverlay indicatorOverlay = Application.OpenForms.OfType().Where(f => !f.IsDisposed).First(); - indicatorOverlay.UpdateIndicator( - message - , timeOut - , isActive ? SettingsManager.Get("indBgColourActive") : SettingsManager.Get("indBgColourInactive") - , isActive ? SettingsManager.Get("indFgColourActive") : SettingsManager.Get("indFgColourInactive") - , isActive ? SettingsManager.Get("indBdColourActive") : SettingsManager.Get("indBdColourInactive") - , SettingsManager.Get("bdSize") - , SettingsManager.GetOrDefault("indFont") - , SettingsManager.Get("overlayPosition") - , SettingsManager.Get("indOpacity") - , alwaysShow - ); - } - else - { - IndicatorOverlay indicatorOverlay = new IndicatorOverlay( - message - , timeOut - , isActive ? SettingsManager.Get("indBgColourActive") : SettingsManager.Get("indBgColourInactive") - , isActive ? SettingsManager.Get("indFgColourActive") : SettingsManager.Get("indFgColourInactive") - , isActive ? SettingsManager.Get("indBdColourActive") : SettingsManager.Get("indBdColourInactive") - , SettingsManager.Get("bdSize") - , SettingsManager.GetOrDefault("indFont") - , SettingsManager.Get("overlayPosition") - , SettingsManager.Get("indOpacity") - , alwaysShow - ); - indicatorOverlay.Show(); - } - } - void ShowNoIconsCheckedChanged(object sender, EventArgs e) - { - iconsGroup.Enabled = !showNoIcons.Checked; - SettingsManager.Set("noIco", showNoIcons.Checked); - SettingsManager.Save(); - } - void ShowNoNotificationCheckedChanged(object sender, EventArgs e) - { - indicatorGroup.Enabled = !showNoNotification.Checked; - SettingsManager.Set("noInd", showNoNotification.Checked); - SettingsManager.Save(); - } - - void handleVersion(string xmlData) - { - try - { - Assembly assembly = Assembly.GetExecutingAssembly(); - FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location); - string currentVersion = fvi.FileVersion; - - XDocument doc = XDocument.Parse(xmlData); - - IEnumerable parent = doc.Descendants("cli"); - - string latestVersion = parent.Descendants() - .Where(x => (string)x.Attribute("name") == "version_number") - .FirstOrDefault() - .Value; - - string release_date = parent.Descendants() - .Where(x => (string)x.Attribute("name") == "release_date") - .FirstOrDefault() - .Value; - - string release_url = parent.Descendants() - .Where(x => (string)x.Attribute("name") == "release_url") - .FirstOrDefault() - .Value; - - string download_url = parent.Descendants() - .Where(x => (string)x.Attribute("name") == "download_url") - .FirstOrDefault() - .Value; - - string changelog = parent.Descendants() - .Where(x => (string)x.Attribute("name") == "changelog") - .FirstOrDefault() - .Value; - - Version cVersion = new Version(currentVersion); + !(enableNumIcon.Checked && !showNoIcons.Checked) && + !(enableCapsIcon.Checked && !showNoIcons.Checked) && + !(enableScrollIcon.Checked && !showNoIcons.Checked) + ; + + // Handle the overlay + if (numState != KeyHelper.isNumlockActive && enableNumInd.Checked && !showNoNotification.Checked) + ShowOverlay( + KeyHelper.isNumlockActive ? + (SettingsManager.Get("customMessageNumOn").Trim().Length > 0 ? SettingsManager.Get("customMessageNumOn") : string.Format(strings.keyIsOn, strings.numLock)) : + (SettingsManager.Get("customMessageNumOff").Trim().Length > 0 ? SettingsManager.Get("customMessageNumOff") : string.Format(strings.keyIsOff, strings.numLock)), + KeyHelper.isNumlockActive); + //ShowOverlay("Numlock is " + (KeyHelper.isNumlockActive ? "on" : "off"), KeyHelper.isNumlockActive); + + if (capsState != KeyHelper.isCapslockActive && enableCapsInd.Checked && !showNoNotification.Checked) + ShowOverlay( + KeyHelper.isCapslockActive ? + (SettingsManager.Get("customMessageCapsOn").Trim().Length > 0 ? SettingsManager.Get("customMessageCapsOn") : string.Format(strings.keyIsOn, strings.capsLock)) : + (SettingsManager.Get("customMessageCapsOff").Trim().Length > 0 ? SettingsManager.Get("customMessageCapsOff") : string.Format(strings.keyIsOff, strings.capsLock)), + KeyHelper.isCapslockActive); + + if (scrollState != KeyHelper.isScrolllockActive && enableScrollInd.Checked && !showNoNotification.Checked) + ShowOverlay( + KeyHelper.isScrolllockActive ? + (SettingsManager.Get("customMessageScrollOn").Trim().Length > 0 ? SettingsManager.Get("customMessageScrollOn") : string.Format(strings.keyIsOn, strings.scrollLock)) : + (SettingsManager.Get("customMessageScrollOff").Trim().Length > 0 ? SettingsManager.Get("customMessageScrollOff") : string.Format(strings.keyIsOff, strings.scrollLock)), + KeyHelper.isScrolllockActive); + + // Reset the values + numState = KeyHelper.isNumlockActive; + capsState = KeyHelper.isCapslockActive; + scrollState = KeyHelper.isScrolllockActive; + } + + void ShowOverlay(string message, bool isActive) + { + int timeOut = SettingsManager.Get("indDisplayTime"); + var alwaysShow = SettingsManager.Get("alwaysShowWhenActive") && isActive; + if (Application.OpenForms.OfType().Any() && Application.OpenForms.OfType().Where(f => !f.IsDisposed).Any()) + { + IndicatorOverlay indicatorOverlay = Application.OpenForms.OfType().Where(f => !f.IsDisposed).First(); + indicatorOverlay.UpdateIndicator( + message + , timeOut + , isActive ? SettingsManager.Get("indBgColourActive") : SettingsManager.Get("indBgColourInactive") + , isActive ? SettingsManager.Get("indFgColourActive") : SettingsManager.Get("indFgColourInactive") + , isActive ? SettingsManager.Get("indBdColourActive") : SettingsManager.Get("indBdColourInactive") + , SettingsManager.Get("bdSize") + , SettingsManager.GetOrDefault("indFont") + , SettingsManager.Get("overlayPosition") + , SettingsManager.Get("indOpacity") + , alwaysShow + ); + } + else + { + IndicatorOverlay indicatorOverlay = new IndicatorOverlay( + message + , timeOut + , isActive ? SettingsManager.Get("indBgColourActive") : SettingsManager.Get("indBgColourInactive") + , isActive ? SettingsManager.Get("indFgColourActive") : SettingsManager.Get("indFgColourInactive") + , isActive ? SettingsManager.Get("indBdColourActive") : SettingsManager.Get("indBdColourInactive") + , SettingsManager.Get("bdSize") + , SettingsManager.GetOrDefault("indFont") + , SettingsManager.Get("overlayPosition") + , SettingsManager.Get("indOpacity") + , alwaysShow + ); + } + } + + void ShowOverlayInfo(string message) + { + int timeOut = SettingsManager.Get("indDisplayTime"); + if (timeOut < 0) + timeOut = 2000; + var alwaysShow = false; + if (Application.OpenForms.OfType().Any() && Application.OpenForms.OfType().Where(f => !f.IsDisposed).Any()) + { + IndicatorOverlay indicatorOverlay = Application.OpenForms.OfType().Where(f => !f.IsDisposed).First(); + indicatorOverlay.UpdateIndicator( + message + , timeOut + , SettingsManager.Get("indBgColourInactive") + , SettingsManager.Get("indFgColourInactive") + , SettingsManager.Get("indFgColourInactive") + , SettingsManager.Get("bdSize") + , SettingsManager.GetOrDefault("indFont") + , SettingsManager.Get("overlayPosition") + , SettingsManager.Get("indOpacity") + , alwaysShow + ); + } + else + { + IndicatorOverlay indicatorOverlay = new IndicatorOverlay( + message + , timeOut + , SettingsManager.Get("indBgColourInactive") + , SettingsManager.Get("indFgColourInactive") + , SettingsManager.Get("indFgColourInactive") + , SettingsManager.Get("bdSize") + , SettingsManager.GetOrDefault("indFont") + , SettingsManager.Get("overlayPosition") + , SettingsManager.Get("indOpacity") + , alwaysShow + ); + } + } + + void ShowNoIconsCheckedChanged(object sender, EventArgs e) + { + iconsGroup.Enabled = !showNoIcons.Checked; + SettingsManager.Set("noIco", showNoIcons.Checked); + SettingsManager.Save(); + } + void ShowNoNotificationCheckedChanged(object sender, EventArgs e) + { + indicatorGroup.Enabled = !showNoNotification.Checked; + SettingsManager.Set("noInd", showNoNotification.Checked); + SettingsManager.Save(); + } + + void handleVersion(string xmlData) + { + try + { + Assembly assembly = Assembly.GetExecutingAssembly(); + FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location); + string currentVersion = fvi.FileVersion; + + XDocument doc = XDocument.Parse(xmlData); + + IEnumerable parent = doc.Descendants("cli"); + + string latestVersion = parent.Descendants() + .Where(x => (string)x.Attribute("name") == "version_number") + .FirstOrDefault() + .Value; + + string release_date = parent.Descendants() + .Where(x => (string)x.Attribute("name") == "release_date") + .FirstOrDefault() + .Value; + + string release_url = parent.Descendants() + .Where(x => (string)x.Attribute("name") == "release_url") + .FirstOrDefault() + .Value; + + string download_url = parent.Descendants() + .Where(x => (string)x.Attribute("name") == "download_url") + .FirstOrDefault() + .Value; + + string changelog = parent.Descendants() + .Where(x => (string)x.Attribute("name") == "changelog") + .FirstOrDefault() + .Value; + + Version cVersion = new Version(currentVersion); Version lVersion = new Version(latestVersion); -#if !DEBUG - if (lVersion > cVersion) -#endif - { - UpdateDialog ud = new UpdateDialog(); - ud.ShowInTaskbar = isHidden; - ud.SetNewVersion(lVersion); - ud.changelogRtf.Rtf = changelog; - ud.infoLabel.Text = string.Format(strings.updateInfoFormat, latestVersion, release_date); - DialogResult res = ud.ShowDialog(); - - if (res == DialogResult.OK) - { - DownloadDialog dd = new DownloadDialog(); - dd.DownloadURL = download_url; - dd.ShowDialog(); - } - else if (res == DialogResult.Ignore) // Download manually - { - Process.Start(release_url + "&ov=" + currentVersion); - } - } - } - catch (Exception) - { - - } - - checkForUpdatesButton.Text = strings.checkForUpdates; - checkForUpdatesButton.Enabled = true; - } - - void doVersionCheck(bool isManualCheck) - { - VersionCheck.IsLatestVersion(handleVersion, isManualCheck); - } - - void MainFormLoad(object sender, EventArgs e) - { - Assembly assembly = Assembly.GetExecutingAssembly(); - FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location); - string version = fvi.FileVersion; - string copyright = fvi.LegalCopyright; - aboutText.Text = string.Format(resources.GetString("aboutTextFormat"), version, copyright); - - if (SettingsManager.Get("checkForUpdates")) - doVersionCheck(false); - } - - void ExitApplicationClick(object sender, EventArgs e) - { - if (MessageBox.Show(strings.exitMessage, "CapsLock Indicator", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes) - { - shouldClose = true; - Close(); - } - } - void HideWindowClick(object sender, EventArgs e) - { - HideForm(); - } - - private void HideForm() - { - //generalIcon.Visible = true; - //generalIcon.ShowBalloonTip(100); - Hide(); - isHidden = true; - Opacity = 1; - } - - void GeneralIconMouseDoubleClick(object sender, MouseEventArgs e) - { - Show(); - Focus(); - generalIcon.Visible = false; - isHidden = false; - ShowInTaskbar = true; - } - - private void enableNumIcon_CheckedChanged(object sender, EventArgs e) - { - SettingsManager.Set("numIco", enableNumIcon.Checked); - SettingsManager.Save(); - } - - private void enableCapsIcon_CheckedChanged(object sender, EventArgs e) - { - SettingsManager.Set("capsIco", enableCapsIcon.Checked); - SettingsManager.Save(); - } - - private void enableScrollIcon_CheckedChanged(object sender, EventArgs e) - { - SettingsManager.Set("scrollIco", enableScrollIcon.Checked); - SettingsManager.Save(); - } - - private void enableNumInd_CheckedChanged(object sender, EventArgs e) - { - SettingsManager.Set("numInd", enableNumInd.Checked); - SettingsManager.Save(); - } - - private void enableCapsInd_CheckedChanged(object sender, EventArgs e) - { - SettingsManager.Set("capsInd", enableCapsInd.Checked); - SettingsManager.Save(); - } - - private void enableScrollInd_CheckedChanged(object sender, EventArgs e) - { - SettingsManager.Set("scrollInd", enableScrollInd.Checked); - SettingsManager.Save(); - } - - private void indSettings_Click(object sender, EventArgs e) - { - IndSettingsWindow indSettingsWindow = new IndSettingsWindow(); - indSettingsWindow.ShowDialog(); - } - - private void checkForUpdatesButton_Click(object sender, EventArgs e) - { - checkForUpdatesButton.Enabled = false; - checkForUpdatesButton.Text = strings.checkingForUpdates; - doVersionCheck(true); - } - - private void startonlogonCheckBox_CheckedChanged(object sender, EventArgs e) - { - RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Run", true); - - if (startonlogonCheckBox.Checked) - rk.SetValue("CapsLock Indicator", Application.ExecutablePath); - else - rk.DeleteValue("CapsLock Indicator", false); - } - - private void hideOnStartupCheckBox_CheckedChanged(object sender, EventArgs e) - { - SettingsManager.Set("hideOnStartup", hideOnStartupCheckBox.Checked); - SettingsManager.Save(); - } - - - // This timer is required for some reason - private void hideWindowTimer_Tick(object sender, EventArgs e) - { - hideWindowTimer.Stop(); - hideWindow.PerformClick(); - } - - private void MainForm_FormClosing(object sender, FormClosingEventArgs e) - { - if (e.CloseReason == CloseReason.UserClosing && !shouldClose) - { - e.Cancel = true; - HideForm(); - } - } - - private void lnkLabel1_Click(object sender, EventArgs e) - { - Process.Start("https://jonaskohl.de/"); - } - - private void showToolStripMenuItem_Click(object sender, EventArgs e) - { - Show(); - Focus(); - generalIcon.Visible = false; - isHidden = false; - ShowInTaskbar = true; - } - - private void exitToolStripMenuItem_Click(object sender, EventArgs e) - { - shouldClose = true; - Close(); - } - - private void appNameLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - Process.Start("https://cli.jonaskohl.de/"); - } - - private void checkForUpdatedCheckBox_CheckedChanged(object sender, EventArgs e) - { - SettingsManager.Set("checkForUpdates", checkForUpdatedCheckBox.Checked); - SettingsManager.Save(); - } - - private void localeComboBox_SelectedIndexChanged(object sender, EventArgs e) - { - DropDownLocale locale = (DropDownLocale)localeComboBox.SelectedItem; - - if (locale.localeString == "__default") - { - Thread.CurrentThread.CurrentUICulture = CultureInfo.DefaultThreadCurrentCulture; - previousLocaleIndex = localeComboBox.SelectedIndex; - } - else if (locale.localeString == "--get-more") - { - localeComboBox.SelectedIndex = previousLocaleIndex; - Process.Start("https://cli.jonaskohl.de/!/translations#download-translations"); - } - else - { - Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(locale.localeString); - previousLocaleIndex = localeComboBox.SelectedIndex; - } - - SettingsManager.Set("selectedUICulture", localeComboBox.SelectedIndex); - SettingsManager.Save(); - - ApplyLocales(); - } - - private void MainForm_KeyDown(object sender, KeyEventArgs e) - { - if (e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.P) - { - e.Handled = true; - e.SuppressKeyPress = true; - ReloadIcons(); - } - } - - private void localeComboBox_Format(object sender, ListControlConvertEventArgs e) - { - var itm = (DropDownLocale)e.ListItem; - if (itm.localeString == "--get-more") - e.Value = strings.downloadMoreTranslations; - else if (itm.localeString == "__default") - e.Value = itm.displayText; - else if (itm.localeString == "--ln") - e.Value = "--LINE--"; - else - e.Value = string.Format("{0} ({1})", itm.displayText, itm.localeString); +#if !DEBUG + if (lVersion > cVersion) +#endif + { + UpdateDialog ud = new UpdateDialog(); + ud.ShowInTaskbar = isHidden; + ud.SetNewVersion(lVersion); + ud.changelogRtf.Rtf = changelog; + ud.infoLabel.Text = string.Format(strings.updateInfoFormat, latestVersion, release_date); + DialogResult res = ud.ShowDialog(); + + if (res == DialogResult.OK) + { + DownloadDialog dd = new DownloadDialog(); + dd.DownloadURL = download_url; + dd.ShowDialog(); + } + else if (res == DialogResult.Ignore) // Download manually + { + Process.Start(release_url + "&ov=" + currentVersion); + } + } + } + catch (Exception) + { + + } + + checkForUpdatesButton.Text = strings.checkForUpdates; + checkForUpdatesButton.Enabled = true; + } + + void doVersionCheck(bool isManualCheck) + { + VersionCheck.IsLatestVersion(handleVersion, isManualCheck); + } + + void MainFormLoad(object sender, EventArgs e) + { + Assembly assembly = Assembly.GetExecutingAssembly(); + FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location); + string version = fvi.FileVersion; + string copyright = fvi.LegalCopyright; + aboutText.Text = string.Format(resources.GetString("aboutTextFormat"), version, copyright); + + if (SettingsManager.Get("checkForUpdates")) + doVersionCheck(false); + } + + void ExitApplicationClick(object sender, EventArgs e) + { + if (MessageBox.Show(strings.exitMessage, "CapsLock Indicator", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes) + { + shouldClose = true; + Close(); + } + } + void HideWindowClick(object sender, EventArgs e) + { + HideForm(); + } + + private void HideForm() + { + //generalIcon.Visible = true; + //generalIcon.ShowBalloonTip(100); + Hide(); + isHidden = true; + Opacity = 1; + } + + void GeneralIconMouseDoubleClick(object sender, MouseEventArgs e) + { + Show(); + Focus(); + generalIcon.Visible = false; + isHidden = false; + ShowInTaskbar = true; + } + + private void enableNumIcon_CheckedChanged(object sender, EventArgs e) + { + SettingsManager.Set("numIco", enableNumIcon.Checked); + SettingsManager.Save(); + } + + private void enableCapsIcon_CheckedChanged(object sender, EventArgs e) + { + SettingsManager.Set("capsIco", enableCapsIcon.Checked); + SettingsManager.Save(); + } + + private void enableScrollIcon_CheckedChanged(object sender, EventArgs e) + { + SettingsManager.Set("scrollIco", enableScrollIcon.Checked); + SettingsManager.Save(); + } + + private void enableNumInd_CheckedChanged(object sender, EventArgs e) + { + SettingsManager.Set("numInd", enableNumInd.Checked); + SettingsManager.Save(); + } + + private void enableCapsInd_CheckedChanged(object sender, EventArgs e) + { + SettingsManager.Set("capsInd", enableCapsInd.Checked); + SettingsManager.Save(); + } + + private void enableScrollInd_CheckedChanged(object sender, EventArgs e) + { + SettingsManager.Set("scrollInd", enableScrollInd.Checked); + SettingsManager.Save(); + } + + private void indSettings_Click(object sender, EventArgs e) + { + IndSettingsWindow indSettingsWindow = new IndSettingsWindow(); + indSettingsWindow.ShowDialog(); + } + + private void checkForUpdatesButton_Click(object sender, EventArgs e) + { + checkForUpdatesButton.Enabled = false; + checkForUpdatesButton.Text = strings.checkingForUpdates; + doVersionCheck(true); + } + + private void startonlogonCheckBox_CheckedChanged(object sender, EventArgs e) + { + RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Run", true); + + if (startonlogonCheckBox.Checked) + rk.SetValue("CapsLock Indicator", Application.ExecutablePath); + else + rk.DeleteValue("CapsLock Indicator", false); + } + + private void hideOnStartupCheckBox_CheckedChanged(object sender, EventArgs e) + { + SettingsManager.Set("hideOnStartup", hideOnStartupCheckBox.Checked); + SettingsManager.Save(); + } + + + // This timer is required for some reason + private void hideWindowTimer_Tick(object sender, EventArgs e) + { + hideWindowTimer.Stop(); + hideWindow.PerformClick(); + } + + private void MainForm_FormClosing(object sender, FormClosingEventArgs e) + { + if (e.CloseReason == CloseReason.UserClosing && !shouldClose) + { + e.Cancel = true; + HideForm(); + } + } + + private void lnkLabel1_Click(object sender, EventArgs e) + { + Process.Start("https://jonaskohl.de/"); + } + + private void showToolStripMenuItem_Click(object sender, EventArgs e) + { + Show(); + Focus(); + generalIcon.Visible = false; + isHidden = false; + ShowInTaskbar = true; + } + + private void exitToolStripMenuItem_Click(object sender, EventArgs e) + { + shouldClose = true; + Close(); + } + + private void appNameLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Process.Start("https://cli.jonaskohl.de/"); + } + + private void checkForUpdatedCheckBox_CheckedChanged(object sender, EventArgs e) + { + SettingsManager.Set("checkForUpdates", checkForUpdatedCheckBox.Checked); + SettingsManager.Save(); + } + + private void localeComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + DropDownLocale locale = (DropDownLocale)localeComboBox.SelectedItem; + + if (locale.localeString == "__default") + { + Thread.CurrentThread.CurrentUICulture = CultureInfo.DefaultThreadCurrentCulture; + previousLocaleIndex = localeComboBox.SelectedIndex; + } + else if (locale.localeString == "--get-more") + { + localeComboBox.SelectedIndex = previousLocaleIndex; + Process.Start("https://cli.jonaskohl.de/!/translations#download-translations"); + } + else + { + Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(locale.localeString); + previousLocaleIndex = localeComboBox.SelectedIndex; + } + + //SettingsManager.Set("selectedUICulture", localeComboBox.SelectedIndex); + SettingsManager.Set("selectedLanguage", locale.localeString); + SettingsManager.Save(); + + ApplyLocales(); + } + + private void MainForm_KeyDown(object sender, KeyEventArgs e) + { + if (e.Control && e.Shift && !e.Alt && e.KeyCode == Keys.P) + { + e.Handled = true; + e.SuppressKeyPress = true; + ReloadIcons(true); + } + } + + private void localeComboBox_Format(object sender, ListControlConvertEventArgs e) + { + var itm = (DropDownLocale)e.ListItem; + if (itm.localeString == "--get-more") + e.Value = strings.downloadMoreTranslations; + else if (itm.localeString == "__default") + e.Value = itm.displayText; + else if (itm.localeString == "--ln") + e.Value = "--LINE--"; + else + e.Value = string.Format("{0} ({1})", itm.displayText, itm.localeString); } private void showMenuItem_Click(object sender, EventArgs e) { - Show(); - Focus(); - generalIcon.Visible = false; - isHidden = false; + Show(); + Focus(); + generalIcon.Visible = false; + isHidden = false; ShowInTaskbar = true; } @@ -665,5 +743,5 @@ private void exitMenuItem_Click(object sender, EventArgs e) shouldClose = true; Close(); } - } -} + } +} diff --git a/CapsLockIndicatorV3/NumberInputDialog.cs b/CapsLockIndicatorV3/NumberInputDialog.cs index 76a0b15..4102e85 100644 --- a/CapsLockIndicatorV3/NumberInputDialog.cs +++ b/CapsLockIndicatorV3/NumberInputDialog.cs @@ -9,7 +9,7 @@ namespace CapsLockIndicatorV3 { - public partial class NumberInputDialog : Form + public partial class NumberInputDialog : DarkModeForm { protected override void WndProc(ref Message message) { @@ -29,6 +29,30 @@ public NumberInputDialog(int defaultValue, int minValue, int maxValue) min = minValue; max = maxValue; inputTextBox.Text = defaultValue.ToString(); + + HandleCreated += (sender, e) => + { + DarkModeChanged += NumberInputDialog_DarkModeChanged; + DarkModeProvider.RegisterForm(this); + }; + } + + private void NumberInputDialog_DarkModeChanged(object sender, EventArgs e) + { + var dark = DarkModeProvider.IsDark; + + Native.UseImmersiveDarkModeColors(Handle, dark); + + ForeColor = + inputTextBox.ForeColor = dark ? Color.White : SystemColors.WindowText; + + inputTextBox.BackColor = dark ? Color.FromArgb(255, 56, 56, 56) : SystemColors.Window; + inputTextBox.BorderStyle = dark ? BorderStyle.FixedSingle : BorderStyle.Fixed3D; + + BackColor = dark ? Color.FromArgb(255, 32, 32, 32) : SystemColors.Window; + + ControlScheduleSetDarkMode(inputTextBox, dark); + ControlScheduleSetDarkMode(okButton, dark); } private void button1_Click(object sender, EventArgs e) diff --git a/CapsLockIndicatorV3/Program.cs b/CapsLockIndicatorV3/Program.cs index 212b7eb..7e6026c 100644 --- a/CapsLockIndicatorV3/Program.cs +++ b/CapsLockIndicatorV3/Program.cs @@ -1,159 +1,159 @@ -/* - * Created 09.07.2017 18:16 - * - * Copyright (c) Jonas Kohl - */ -using Microsoft.Win32; -using Mono.Options; -using System; -using System.Collections.Generic; +/* + * Created 09.07.2017 18:16 + * + * Copyright (c) Jonas Kohl + */ +using Microsoft.Win32; +using Mono.Options; +using System; +using System.Collections.Generic; using System.Diagnostics; -using System.Globalization; -using System.IO; +using System.Globalization; +using System.IO; using System.Reflection; -using System.Threading; -using System.Windows.Forms; - -namespace CapsLockIndicatorV3 +using System.Threading; +using System.Windows.Forms; + +namespace CapsLockIndicatorV3 { internal sealed class Program - { - [Flags] - enum KeyType - { - None = 0, - NumLock = 1, - CapsLock = 2, - ScrollLock = 4 - } - - enum DisplayType - { - Icon, - Notification - } - - static void SetDisplay(DisplayType type, int keys) - { - switch (type) - { - case DisplayType.Icon: - SettingsManager.Set("numIco", (keys & (int)KeyType.NumLock) != 0); - SettingsManager.Set("capsIco", (keys & (int)KeyType.CapsLock) != 0); - SettingsManager.Set("scrollIco", (keys & (int)KeyType.ScrollLock) != 0); - break; - case DisplayType.Notification: - SettingsManager.Set("numInd", (keys & (int)KeyType.NumLock) != 0); - SettingsManager.Set("capsInd", (keys & (int)KeyType.CapsLock) != 0); - SettingsManager.Set("scrollInd", (keys & (int)KeyType.ScrollLock) != 0); - break; - default: - break; - } - } - static void SetHideStartup(bool v) - { - SettingsManager.Set("hideOnStartup", v); - } - static void SetStartup(bool v) - { - RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Run", true); - - if (v) - rk.SetValue("CapsLock Indicator", Application.ExecutablePath); - else - rk.DeleteValue("CapsLock Indicator", false); - } - static void SetVerCheck(bool v) - { - SettingsManager.Set("checkForUpdates", v); - } - static void DisplayHelp(OptionSet p) - { + { + [Flags] + enum KeyType + { + None = 0, + NumLock = 1, + CapsLock = 2, + ScrollLock = 4 + } + + enum DisplayType + { + Icon, + Notification + } + + static void SetDisplay(DisplayType type, int keys) + { + switch (type) + { + case DisplayType.Icon: + SettingsManager.Set("numIco", (keys & (int)KeyType.NumLock) != 0); + SettingsManager.Set("capsIco", (keys & (int)KeyType.CapsLock) != 0); + SettingsManager.Set("scrollIco", (keys & (int)KeyType.ScrollLock) != 0); + break; + case DisplayType.Notification: + SettingsManager.Set("numInd", (keys & (int)KeyType.NumLock) != 0); + SettingsManager.Set("capsInd", (keys & (int)KeyType.CapsLock) != 0); + SettingsManager.Set("scrollInd", (keys & (int)KeyType.ScrollLock) != 0); + break; + default: + break; + } + } + static void SetHideStartup(bool v) + { + SettingsManager.Set("hideOnStartup", v); + } + static void SetStartup(bool v) + { + RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Run", true); + + if (v) + rk.SetValue("CapsLock Indicator", Application.ExecutablePath); + else + rk.DeleteValue("CapsLock Indicator", false); + } + static void SetVerCheck(bool v) + { + SettingsManager.Set("checkForUpdates", v); + } + static void DisplayHelp(OptionSet p) + { StringWriter sw = new StringWriter(); - sw.WriteLine("CapsLock Indicator"); - sw.WriteLine(); - sw.WriteLine("Options:"); - p.WriteOptionDescriptions(sw); - sw.WriteLine(); + sw.WriteLine("CapsLock Indicator"); + sw.WriteLine(); + sw.WriteLine("Options:"); + p.WriteOptionDescriptions(sw); + sw.WriteLine(); sw.WriteLine("For more information, visit: http://cli.jonaskohl.de/!/commandline"); - string result = sw.ToString(); - - sw.Close(); - sw.Dispose(); - - //MessageBox.Show(result, "CapsLock Indicator", MessageBoxButtons.OK, MessageBoxIcon.Information); - - HelpWindow h = new HelpWindow(result); - Application.Run(h); - } - static void SetLocale(string l) - { - Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(l); - } - static void SetDisplayLocation(string v) - { - if (Enum.TryParse(v, out IndicatorDisplayPosition position)) - SettingsManager.Set("overlayPosition", position); - } - - // Create a mutex to check if an instance is already running - static Mutex mutex = new Mutex(true, "{6f54c357-0542-4d7d-9225-338bc3cd7834}"); + string result = sw.ToString(); + + sw.Close(); + sw.Dispose(); + + //MessageBox.Show(result, "CapsLock Indicator", MessageBoxButtons.OK, MessageBoxIcon.Information); + + HelpWindow h = new HelpWindow(result); + Application.Run(h); + } + static void SetLocale(string l) + { + Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo(l); + } + static void SetDisplayLocation(string v) + { + if (Enum.TryParse(v, out IndicatorDisplayPosition position)) + SettingsManager.Set("overlayPosition", position); + } + + // Create a mutex to check if an instance is already running + static Mutex mutex = new Mutex(true, "{6f54c357-0542-4d7d-9225-338bc3cd7834}"); [STAThread] private static void Main(string[] args) - { - //__FIXME__.SettingsKey = Environment.ExpandEnvironmentVariables(@"%appdata%\Jonas Kohl\CapsLock Indicator\settings\any\user.config"); - SettingsManager.Load(); - - if (mutex.WaitOne(TimeSpan.Zero, true)) // No instance is open - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - - #region Parse command line - - bool show_help = false; - - OptionSet oSet = new OptionSet() - { - { "h|?|help", "Display help", v => show_help = v != null }, - { "i|icons=", "The icons to show (Type: IconMask)", (int v) => SetDisplay(DisplayType.Icon, v) }, - { "n|notifs=", "The notifications to show (Type: IconMask)", (int v) => SetDisplay(DisplayType.Notification, v) }, - { "a|autostart=", "Enable auto start (Type: Boolean)", (bool v) => SetStartup(v) }, - { "s|hidestarup=", "Enable or disable hide on startup setting (Type: Boolean)", (bool v) => SetHideStartup(v) }, - { "v|disverchk=", "Disable the automatic version checking (Type: Boolean)", (bool v) => SetVerCheck(v) }, - { "l|locale=", "Override the UI locale (Type: String)", (string v) => SetLocale(v) }, - { "p|position=", "Set the indicator display position (Type: IndicatorDisplayPosition)", (string v) => SetDisplayLocation(v) } - }; - - List extra; - try - { - extra = oSet.Parse(args); - } - catch (OptionException) - { - //MessageBox.Show("Failed to parse command line:\n" + e.ToString(), "error", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - - if (show_help) - { - DisplayHelp(oSet); - return; - } - + { + //__FIXME__.SettingsKey = Environment.ExpandEnvironmentVariables(@"%appdata%\Jonas Kohl\CapsLock Indicator\settings\any\user.config"); + SettingsManager.Load(); + + if (mutex.WaitOne(TimeSpan.Zero, true)) // No instance is open + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + + #region Parse command line + + bool show_help = false; + + OptionSet oSet = new OptionSet() + { + { "h|?|help", "Display help", v => show_help = v != null }, + { "i|icons=", "The icons to show (Type: IconMask)", (int v) => SetDisplay(DisplayType.Icon, v) }, + { "n|notifs=", "The notifications to show (Type: IconMask)", (int v) => SetDisplay(DisplayType.Notification, v) }, + { "a|autostart=", "Enable auto start (Type: Boolean)", (bool v) => SetStartup(v) }, + { "s|hidestarup=", "Enable or disable hide on startup setting (Type: Boolean)", (bool v) => SetHideStartup(v) }, + { "v|disverchk=", "Disable the automatic version checking (Type: Boolean)", (bool v) => SetVerCheck(v) }, + { "l|locale=", "Override the UI locale (Type: String)", (string v) => SetLocale(v) }, + { "p|position=", "Set the indicator display position (Type: IndicatorDisplayPosition)", (string v) => SetDisplayLocation(v) } + }; + + List extra; + try + { + extra = oSet.Parse(args); + } + catch (OptionException) + { + //MessageBox.Show("Failed to parse command line:\n" + e.ToString(), "error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + if (show_help) + { + DisplayHelp(oSet); + return; + } + SettingsManager.Save(); - + if (SettingsManager.Get("beta_enableDarkMode")) - Native.SetPrefferDarkMode(true); + Native.SetPrefferDarkMode(true); var runApp = true; - #endregion + #endregion -#if DEBUG +#if DEBUG if (SettingsManager.Get("firstRun")) #else if (SettingsManager.Get("firstRun") && new Version(SettingsManager.Get("versionNo")) >= Assembly.GetExecutingAssembly().GetName().Version) @@ -166,20 +166,20 @@ private static void Main(string[] args) else runApp = false; } - } - - if (runApp) - Application.Run(new MainForm()); - - // Release the mutex - mutex.ReleaseMutex(); - - SettingsManager.Save(); - } - else // An instance is already open - { - Application.EnableVisualStyles(); - MessageBox.Show("An instance is already open!"); + } + + if (runApp) + Application.Run(new MainForm()); + + // Release the mutex + mutex.ReleaseMutex(); + + SettingsManager.Save(); + } + else // An instance is already open + { + Application.EnableVisualStyles(); + MessageBox.Show("An instance is already open!"); } } @@ -189,5 +189,5 @@ public static void ReleaseMutex() mutex.Close(); mutex.Dispose(); } - } -} + } +} diff --git a/CapsLockIndicatorV3/Properties/AssemblyInfo.cs b/CapsLockIndicatorV3/Properties/AssemblyInfo.cs index 06dd573..6bf5105 100644 --- a/CapsLockIndicatorV3/Properties/AssemblyInfo.cs +++ b/CapsLockIndicatorV3/Properties/AssemblyInfo.cs @@ -24,6 +24,6 @@ // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("3.10.0.0")] -[assembly: AssemblyFileVersion("3.10.0.0")] +[assembly: AssemblyVersion("3.11.0.0")] +[assembly: AssemblyFileVersion("3.11.0.0")] [assembly: Guid ("6f54c357-0542-4d7d-9225-338bc3cd7834")] diff --git a/CapsLockIndicatorV3/Resources/CLIv3_Icon_Dark.ico b/CapsLockIndicatorV3/Resources/CLIv3_Icon_Dark.ico new file mode 100644 index 0000000..1b6573e Binary files /dev/null and b/CapsLockIndicatorV3/Resources/CLIv3_Icon_Dark.ico differ diff --git a/CapsLockIndicatorV3/Resources/MainWindow.Icon.ico b/CapsLockIndicatorV3/Resources/MainWindow.Icon.ico new file mode 100644 index 0000000..1e406e1 Binary files /dev/null and b/CapsLockIndicatorV3/Resources/MainWindow.Icon.ico differ diff --git a/CapsLockIndicatorV3/Resources/defaultSettings.txt b/CapsLockIndicatorV3/Resources/defaultSettings.txt index 802a905..f16eb0e 100644 --- a/CapsLockIndicatorV3/Resources/defaultSettings.txt +++ b/CapsLockIndicatorV3/Resources/defaultSettings.txt @@ -6,12 +6,13 @@ b:capsInd=True b:scrollInd=True b:noIco=False b:noInd=False -b:beta_enableDarkMode=False +b:darkMode=False b:hideOnStartup=False b:checkForUpdates=True b:upgradeRequired=True b:alwaysShowWhenActive=False b:firstRun=True +b:searchForUpdatesAfterResume=True b:advSettingsWarnShown=False c:indBgColourActive=255;66;66;66 c:indFgColourActive=255;255;255;255 @@ -21,7 +22,7 @@ c:indFgColourInactive=255;255;255;255 c:indBdColourInactive=255;180;52;77 f:indFont=Segoe UI; 12pt i:indDisplayTime=500 -i:selectedUICulture=1 +i:selectedUICulture=0 i:indOpacity=100 i:bdSize=4 s:versionNo=3.10.0.0 @@ -32,3 +33,4 @@ s:customMessageNumOn= s:customMessageNumOff= s:customMessageScrollOn= s:customMessageScrollOff= +s:selectedLanguage= diff --git a/CapsLockIndicatorV3/Resources/generalIcon.Icon.ico b/CapsLockIndicatorV3/Resources/generalIcon.Icon.ico new file mode 100644 index 0000000..c109f13 Binary files /dev/null and b/CapsLockIndicatorV3/Resources/generalIcon.Icon.ico differ diff --git a/CapsLockIndicatorV3/Resources/generalIcon_dark.Icon.ico b/CapsLockIndicatorV3/Resources/generalIcon_dark.Icon.ico new file mode 100644 index 0000000..fad3723 Binary files /dev/null and b/CapsLockIndicatorV3/Resources/generalIcon_dark.Icon.ico differ diff --git a/CapsLockIndicatorV3/Resources/logo.Image.png b/CapsLockIndicatorV3/Resources/logo.Image.png new file mode 100644 index 0000000..2e5ba86 Binary files /dev/null and b/CapsLockIndicatorV3/Resources/logo.Image.png differ diff --git a/CapsLockIndicatorV3/Resources/settings.ico b/CapsLockIndicatorV3/Resources/settings.ico new file mode 100644 index 0000000..f6d8646 Binary files /dev/null and b/CapsLockIndicatorV3/Resources/settings.ico differ diff --git a/CapsLockIndicatorV3/Resources/settings_w.ico b/CapsLockIndicatorV3/Resources/settings_w.ico new file mode 100644 index 0000000..cf9c1a1 Binary files /dev/null and b/CapsLockIndicatorV3/Resources/settings_w.ico differ diff --git a/CapsLockIndicatorV3/UpdateDialog.cs b/CapsLockIndicatorV3/UpdateDialog.cs index 707a8e0..fb88c81 100644 --- a/CapsLockIndicatorV3/UpdateDialog.cs +++ b/CapsLockIndicatorV3/UpdateDialog.cs @@ -1,59 +1,55 @@ using Microsoft.Win32; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace CapsLockIndicatorV3 -{ - public partial class UpdateDialog : Form - { - private Version newVersion; - - public UpdateDialog() - { - InitializeComponent(); - - Text = strings.updateAvailable; - updateNowButton.Text = strings.updateNow; - dismissButton.Text = strings.dismissButton; - downloadManuallyButton.Text = strings.downloadManuallyButton; - - if (SettingsManager.Get("beta_enableDarkMode")) - { - HandleCreated += UpdateDialog_HandleCreated; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; - lnkLabel1.ForeColor = - lnkLabel1.LinkColor = - Color.White; +namespace CapsLockIndicatorV3 +{ + public partial class UpdateDialog : DarkModeForm + { + private Version newVersion; - BackColor = Color.FromArgb(255, 32, 32, 32); - ForeColor = Color.White; - infoLabel.ForeColor = Color.FromArgb(255, 196, 204, 238); - changelogRtf.BackColor = Color.FromArgb(255, 56, 56, 56); + public UpdateDialog() + { + InitializeComponent(); - ControlScheduleSetDarkMode(dismissButton); - ControlScheduleSetDarkMode(updateNowButton); - ControlScheduleSetDarkMode(downloadManuallyButton); - } - } + Text = strings.updateAvailable; + updateNowButton.Text = strings.updateNow; + dismissButton.Text = strings.dismissButton; + downloadManuallyButton.Text = strings.downloadManuallyButton; - private void UpdateDialog_HandleCreated(object sender, EventArgs e) - { - Native.UseImmersiveDarkModeColors(Handle, true); + HandleCreated += (sender, e) => + { + DarkModeChanged += UpdateDialog_DarkModeChanged; + DarkModeProvider.RegisterForm(this); + }; } - private void ControlScheduleSetDarkMode(Control control) + private void UpdateDialog_DarkModeChanged(object sender, EventArgs e) { - control.HandleCreated += (sender, e) => - { - Native.ControlSetDarkMode(control, true); - }; + var dark = DarkModeProvider.IsDark; + + Native.UseImmersiveDarkModeColors(Handle, dark); + + lnkLabel1.ForeColor = + lnkLabel1.LinkColor = + dark ? Color.White : SystemColors.HotTrack; + + BackColor = dark ? Color.FromArgb(255, 32, 32, 32) : SystemColors.Window; + ForeColor = dark ? Color.White : SystemColors.WindowText; + infoLabel.ForeColor = dark ? Color.FromArgb(255, 196, 204, 238) : Color.FromArgb(255, 52, 77, 180); + changelogRtf.BackColor = dark ? Color.FromArgb(255, 56, 56, 56) : SystemColors.Window; + + ControlScheduleSetDarkMode(changelogRtf, dark); + ControlScheduleSetDarkMode(dismissButton, dark); + ControlScheduleSetDarkMode(updateNowButton, dark); + ControlScheduleSetDarkMode(downloadManuallyButton, dark); } public void SetNewVersion(Version v) @@ -72,12 +68,12 @@ public void SetNewVersion(Version v) downloadManuallyButton.Location.Y ); } - } - - private void downloadManuallyButton_Click(object sender, EventArgs e) - { - DialogResult = DialogResult.Ignore; - Close(); + } + + private void downloadManuallyButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Ignore; + Close(); } private void lnkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -106,5 +102,5 @@ public string FriendlyName() } return "an unknown OS"; } - } -} + } +} diff --git a/CapsLockIndicatorV3/VersionCheck.cs b/CapsLockIndicatorV3/VersionCheck.cs index b136482..541fbaf 100644 --- a/CapsLockIndicatorV3/VersionCheck.cs +++ b/CapsLockIndicatorV3/VersionCheck.cs @@ -27,7 +27,7 @@ public static async void IsLatestVersion(Action callback, bool isManualC ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; try { - string data = await client.DownloadStringTaskAsync(CheckURL + (SettingsManager.Get("beta_enableDarkMode") ? "&dark=true" : "")); + string data = await client.DownloadStringTaskAsync(CheckURL + (DarkModeProvider.IsDark ? "&dark=true" : "")); callback(data); } catch (Exception e) diff --git a/CapsLockIndicatorV3/bin/Release/pack-lang-files.ps1 b/CapsLockIndicatorV3/bin/Release/pack-lang-files.ps1 new file mode 100644 index 0000000..c9d038c --- /dev/null +++ b/CapsLockIndicatorV3/bin/Release/pack-lang-files.ps1 @@ -0,0 +1,3 @@ +Get-ChildItem -Recurse -Directory | ForEach-Object { + Compress-Archive -Path "$($_.FullName)\*.dll" -DestinationPath ".\$($_.Name).zip" +} diff --git a/CapsLockIndicatorV3/resources.Designer.cs b/CapsLockIndicatorV3/resources.Designer.cs index cc7086f..66e5e0e 100644 --- a/CapsLockIndicatorV3/resources.Designer.cs +++ b/CapsLockIndicatorV3/resources.Designer.cs @@ -89,6 +89,26 @@ internal static System.Drawing.Icon CLIv3_Caps_On { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon CLIv3_Icon { + get { + object obj = ResourceManager.GetObject("CLIv3_Icon", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon CLIv3_Icon_Dark { + get { + object obj = ResourceManager.GetObject("CLIv3_Icon_Dark", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// @@ -138,20 +158,20 @@ internal static System.Drawing.Icon CLIv3_Scroll_On { ///b:scrollInd=True ///b:noIco=False ///b:noInd=False - ///b:beta_enableDarkMode=False + ///b:darkMode=False ///b:hideOnStartup=False ///b:checkForUpdates=True ///b:upgradeRequired=True ///b:alwaysShowWhenActive=False ///b:firstRun=True + ///b:advSettingsWarnShown=False ///c:indBgColourActive=255;66;66;66 ///c:indFgColourActive=255;255;255;255 ///c:indBdColourActive=255;77;180;52 ///c:indBgColourInactive=255;66;66;66 ///c:indFgColourInactive=255;255;255;255 ///c:indBdColourInactive=255;180;52;77 - ///f:indFont=Segoe UI; 12pt - ///i:indDisplayTi [rest of string was truncated]";. + ///f:indFont=Segoe UI; 1 [rest of string was truncated]";. /// internal static string defaultSettings { get { @@ -159,6 +179,36 @@ internal static string defaultSettings { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon generalIcon { + get { + object obj = ResourceManager.GetObject("generalIcon", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon generalIcon_dark { + get { + object obj = ResourceManager.GetObject("generalIcon_dark", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap logo { + get { + object obj = ResourceManager.GetObject("logo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -168,5 +218,25 @@ internal static System.Drawing.Bitmap logo_dark { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon settings { + get { + object obj = ResourceManager.GetObject("settings", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon settings_dark { + get { + object obj = ResourceManager.GetObject("settings_dark", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } } } diff --git a/CapsLockIndicatorV3/resources.resx b/CapsLockIndicatorV3/resources.resx index c95a6b5..522f620 100644 --- a/CapsLockIndicatorV3/resources.resx +++ b/CapsLockIndicatorV3/resources.resx @@ -127,6 +127,12 @@ Resources\CLIv3_Caps_On.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\MainWindow.Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\CLIv3_Icon_Dark.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\CLIv3_Num_Off.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,7 +148,22 @@ Resources\defaultSettings.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + Resources\generalIcon.Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\generalIcon_dark.Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\logo.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\logo_dark.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Resources\settings.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Resources\settings_w.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.Designer.cs b/CapsLockIndicatorV3/strings.Designer.cs index 0d12261..fe847e0 100644 --- a/CapsLockIndicatorV3/strings.Designer.cs +++ b/CapsLockIndicatorV3/strings.Designer.cs @@ -223,7 +223,7 @@ internal static string exitMessage { } /// - /// Looks up a localized string similar to Allow CapsLock Indicator to periodically check for updates online (can be changed later). + /// Looks up a localized string similar to &Allow CapsLock Indicator to periodically check for updates online (can be changed later). /// internal static string firstRunAllowUpdateCheck { get { @@ -231,6 +231,42 @@ internal static string firstRunAllowUpdateCheck { } } + /// + /// Looks up a localized string similar to &Dark. + /// + internal static string firstRunColorSchemeDark { + get { + return ResourceManager.GetString("firstRunColorSchemeDark", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to L&ight. + /// + internal static string firstRunColorSchemeLight { + get { + return ResourceManager.GetString("firstRunColorSchemeLight", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Which color scheme do you prefer?. + /// + internal static string firstRunColorSchemePreference { + get { + return ResourceManager.GetString("firstRunColorSchemePreference", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Only available on Windows 10. + /// + internal static string firstRunColorSchemeWin10Only { + get { + return ResourceManager.GetString("firstRunColorSchemeWin10Only", resourceCulture); + } + } + /// /// Looks up a localized string similar to Contribute. /// @@ -420,6 +456,15 @@ internal static string permanentIndicator { } } + /// + /// Looks up a localized string similar to Reloaded icons. + /// + internal static string reloadedIconsInfo { + get { + return ResourceManager.GetString("reloadedIconsInfo", resourceCulture); + } + } + /// /// Looks up a localized string similar to &Save && close. /// diff --git a/CapsLockIndicatorV3/strings.cs.resx b/CapsLockIndicatorV3/strings.cs.resx new file mode 100644 index 0000000..3ede48a --- /dev/null +++ b/CapsLockIndicatorV3/strings.cs.resx @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Pokročilá nastavení + Label of the hyperlink that opens the settings file + + + Barva pozadí při aktivování + The caption for the "Background colour activated" button. + + + Barva pozadí při deaktivování + The caption for the "Background colour deactivated" button. + + + Barva rámečku při aktivování + The caption for the "Border colour activated" button. + + + Barva rámečku při deaktivování + The caption for the "Border colour deactivated" button. + + + Tloušťka rámečku + Label of the border thickness groupbox + + + Caps lock + The name of the caps lock key + + + Zkontrolovat &aktualizace + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + Kontrola aktualizací… + The caption for the "Check for updates" button when it's searching for updates. + + + Barvy + The title for the "Colours" group box + + + &Ukončit + Used in the context menu of the CLI tray icon. + + + &Zobrazit + Used in the context menu of the CLI tray icon. + + + &Zavřít + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Čas zobrazení + The title for the "Display time" group box + + + Stáhnout &manuálně + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Stáhnout více překladů… + The last dropdown item in the locale dropdown. + + + &Ukončit aplikaci + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Ukončení aplikace způsobí skrytí ikon a oznámení. Pokračovat? + The message to display on application exit + + + Povolit automatické kontroly aktualizací (možno změnit později) + Label of the checkbox that determines whether or not CLI should search for updates + + + Přispět + Label of the hyperlink that takes you to CLI's GitHub page + + + &Ukončit + Button that exists the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Vítejte v programu CapsLock Indicator + The heading of the first-run dialog + + + Děkujeme za to, že jste si zvolili CapsLock Indicator! Tento program je open-source a zdarma, vždy byl a vždy bude! Rádi byste sami přispívali? Klikněte na odkaz níže pro více informací! Také se, prosíme, podívejte na nastavení níže! + The message of the first-run dialog + + + Jaké informace budou odeslány? + The label of the hyperlink that shows which information will be sent on each update check + + + &Začít! + Button that starts the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Písmo + The title for the "Font" group box + + + Barva písma při aktivování + The caption for the "Text colour activated" button. + + + Barva písma při deaktivování + The caption for the "Text colour deactivated" button. + + + Můžete ukázat indikátor klávesy „CapsLock“ dvojitým kliknutím na tuto ikonu. + The text that is shown in the icon balloon tip when CLI is being hidden. + + + Skrýt při spuštění + Used for the hide on startup checkbox + + + &Skrýt okno + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + Stav klávesy „{0}“ změněn + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + Klávesa „{0}“ je deaktivována + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + Klávesa „{0}“ je aktivována + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + Nastavení &oznámení + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + Nastavení oznámení + The caption of the notification settings window + + + Num lock + The name of the num lock key + + + Krytí (neprůhlednost) + The title for the "Opacity" group box + + + Pozice překrytí + The title for the "Overlay position" group box + + + Trvale + Text to display instead of the time if indicator overlay display is set to permanently. + + + &Uložit a zavřít + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Scroll lock + The name of the scroll lock key + + + Zobrazit ikony pro… + The title for the "Show icons for..." group box + + + Skrýt všechny ikony + The label for the check box that enables or disables all icons + + + Skrýt všechna oznámení + The label for the check box that enables or disables all notifications + + + Zobrazovat oznámení, pokud… + The title for the "Show notification when..." group box + + + Nechat zobrazené po dobu aktivace + The label for the check box that indicates whether overlay should only be shown when active + + + Spustit při přihlášení + The label for the check box that enables or disabled the auto start. + + + Dostupná aktualizace programu „CapsLock Indicator“ + The title for the update window. + + + Verze {0}, vydána {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + &Aktualizovat teď + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.de.resx b/CapsLockIndicatorV3/strings.de.resx index aa726c0..4f87931 100644 --- a/CapsLockIndicatorV3/strings.de.resx +++ b/CapsLockIndicatorV3/strings.de.resx @@ -174,6 +174,18 @@ Zulassen, dass CapsLock Indicator online nach Aktualisierungen sucht + + &Dunkel + + + &Hell + + + Welches Farbschema bevorzugen Sie? + + + Nur auf Windows 10 + Mitarbeiten @@ -237,6 +249,9 @@ Dauerhaft + + Symbole neu geladen + &Speichern && schließen diff --git a/CapsLockIndicatorV3/strings.es.resx b/CapsLockIndicatorV3/strings.es.resx index 5ea4563..3a9c4fc 100644 --- a/CapsLockIndicatorV3/strings.es.resx +++ b/CapsLockIndicatorV3/strings.es.resx @@ -1,284 +1,325 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - Color de fondo activado - The caption for the "Background colour activated" button. - - - Color de fondo desactivado - The caption for the "Background colour deactivated" button. - - - Color del borde activado - The caption for the "Border colour activated" button. - - - Color del borde desactivado - The caption for the "Border colour deactivated" button. - - - Bloq. Mayúsculas - The name of the caps lock key - - - Comprobar &actualizaciones - The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. - - - Comprobando actualizaciones... - The caption for the "Check for updates" button when it's searching for updates. - - - Colores - The title for the "Colours" group box - - - &Salir - Used in the context menu of the CLI tray icon. - - - &Mostrar - Used in the context menu of the CLI tray icon. - - - &Descartar - The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Mostrar tiempo - The title for the "Display time" group box - - - Descargar &manualmente - The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Descargar más traducciones... - The last dropdown item in the locale dropdown. - - - &Cerrar aplicación - The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. - - - Saliendo de la aplicación, los iconos y notificaciones no se mostrarán. ¿Salir de todas maneras?. - The message to display on application exit - - - Fuente - The title for the "Font" group box - - - Color de texto activado - The caption for the "Text colour activated" button. - - - Color de texto desactivado - The caption for the "Text colour deactivated" button. - - - Puedes mostrar el indicador de Bloq mayús nuevamente haciendo doble clic en este icono. - The text that is shown in the icon balloon tip when CLI is being hidden. - - - Esconder al inicio - Used for the hide on startup checkbox - - - &Esconder ventana - The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. - - - {0} cambiado - Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name - - - {0} desactivado - The text to display in the notification when a key is off. "{0}" will be replaced with the key name - - - {0} activado - The text to display in the notification when a key is on. "{0}" will be replaced with the key name - - - &Ajuste de notificaciones - The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. - - - Ajuste de notificaciones - The caption of the notification settings window - - - Bloq Núm - The name of the num lock key - - - Opacidad - The title for the "Opacity" group box - - - Posición sobre la pantalla - The title for the "Overlay position" group box - - - Permanente - Text to display instead of the time if indicator overlay display is set to permanently. - - - &Guardar && cerrar - The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character - - - Bloq Despl - The name of the scroll lock key - - - Mostrar iconos para... - The title for the "Show icons for..." group box - - - No mostrar iconos - The label for the check box that enables or disables all icons - - - No mostrar notificación - The label for the check box that enables or disables all notifications - - - Mostrar notificación cuando... - The title for the "Show notification when..." group box - - - Activar al iniciar sesión - The label for the check box that enables or disabled the auto start. - - - ¡Actualización de CapsLock Indicator disponible! - The title for the update window. - - - Versión {0}, lanzada {1} - Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. - - - &Actualizar ahora - The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Ajustes avanzados + Label of the hyperlink that opens the settings file + + + Color de fondo activado + The caption for the "Background colour activated" button. + + + Color de fondo desactivado + The caption for the "Background colour deactivated" button. + + + Color del borde activado + The caption for the "Border colour activated" button. + + + Color del borde desactivado + The caption for the "Border colour deactivated" button. + + + Grosor del borde + Label of the border thickness groupbox + + + Bloq. Mayúsculas + The name of the caps lock key + + + Comprobar &actualizaciones + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + Comprobando actualizaciones... + The caption for the "Check for updates" button when it's searching for updates. + + + Colores + The title for the "Colours" group box + + + &Salir + Used in the context menu of the CLI tray icon. + + + &Mostrar + Used in the context menu of the CLI tray icon. + + + &Descartar + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Mostrar tiempo + The title for the "Display time" group box + + + Descargar &manualmente + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Descargar más traducciones... + The last dropdown item in the locale dropdown. + + + &Cerrar aplicación + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Saliendo de la aplicación, íconos y notificaciones no se mostrarán. ¿Salir de todas formas? + The message to display on application exit + + + Permitir que CapsLock Indicator verifique periódicamente si hay actualizaciones en línea (se puede cambiar después). + Label of the checkbox that determines whether or not CLI should search for updates + + + Contribuir + Label of the hyperlink that takes you to CLI's GitHub page + + + &Salir + Button that exists the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Bienvenido a CapsLock Indicator + The heading of the first-run dialog + + + ¡Gracias por elegir CapsLock Indicator! Este programa es de código abierto y gratuito, ¡siempre lo ha sido y siempre lo será! ¿Tienes interes en contribuir a CapsLock Indicator? Visita el siguiente enlace para obtener más información. ¡También, tómese un momento para revisar la configuración de abajo! + The message of the first-run dialog + + + ¿Qué información se enviará? + The label of the hyperlink that shows which information will be sent on each update check + + + ¡&Vamos! + Button that starts the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Fuente + The title for the "Font" group box + + + Color de texto activado + The caption for the "Text colour activated" button. + + + Color de texto desactivado + The caption for the "Text colour deactivated" button. + + + Puedes mostrar CapsLock Indicator nuevamente dando doble clic en este ícono. + The text that is shown in the icon balloon tip when CLI is being hidden. + + + Ocultar al iniciar + Used for the hide on startup checkbox + + + &Ocultar ventana + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + {0} cambiado + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} desactivado + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} activado + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + &Ajustes de notificaciones + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + Ajustes de notificaciones + The caption of the notification settings window + + + Bloq Núm + The name of the num lock key + + + Opacidad + The title for the "Opacity" group box + + + Posición sobre la pantalla + The title for the "Overlay position" group box + + + Permanente + Text to display instead of the time if indicator overlay display is set to permanently. + + + &Guardar && cerrar + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Bloq Despl + The name of the scroll lock key + + + Ver íconos de + The title for the "Show icons for..." group box + + + Sin íconos + The label for the check box that enables or disables all icons + + + Sin notificaciones + The label for the check box that enables or disables all notifications + + + Ver notificaciones de + The title for the "Show notification when..." group box + + + Mostrar siempre la superposición cuando se active + The label for the check box that indicates whether overlay should only be shown when active + + + Activar tras iniciar + The label for the check box that enables or disabled the auto start. + + + ¡Actualización de CapsLock Indicator disponible! + The title for the update window. + + + Versión {0}, lanzada {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + &Actualizar ahora + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.fr.resx b/CapsLockIndicatorV3/strings.fr.resx index d22b914..0808996 100644 --- a/CapsLockIndicatorV3/strings.fr.resx +++ b/CapsLockIndicatorV3/strings.fr.resx @@ -1,284 +1,355 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - Couleur de fond activée - The caption for the "Background colour activated" button. - - - Couleur de fond désactivée - The caption for the "Background colour deactivated" button. - - - Couleur de bord activée - The caption for the "Border colour activated" button. - - - Couleur de bord désactivée - The caption for the "Border colour deactivated" button. - - - Verrouillage majuscules - The name of the caps lock key - - - Mettre à &jour - The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. - - - Recherche de mises à jour... - The caption for the "Check for updates" button when it's searching for updates. - - - Couleurs - The title for the "Colours" group box - - - &Quitter - Used in the context menu of the CLI tray icon. - - - &Afficher - Used in the context menu of the CLI tray icon. - - - &Annuler - The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Durée d'affichage - The title for the "Display time" group box - - - Télécharger &manuellement - The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Télécharger plus de traductions.... - The last dropdown item in the locale dropdown. - - - &Quitter l'application - The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. - - - Quitter l'application signifie que les icônes et notifications ne seront plus affichées. Quitter quand même ? - The message to display on application exit - - - Police - The title for the "Font" group box - - - Couleur de texte activée - The caption for the "Text colour activated" button. - - - Couleur de texte désactivée - The caption for the "Text colour deactivated" button. - - - Vous pouvez afficher CapsLock Indicator à nouveau en double cliquant sur cette icône. - The text that is shown in the icon balloon tip when CLI is being hidden. - - - Cacher au démarrage - Used for the hide on startup checkbox - - - &Cacher la fenêtre - The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. - - - {0} mis à jour - Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name - - - {0} inactif - The text to display in the notification when a key is off. "{0}" will be replaced with the key name - - - {0} actif - The text to display in the notification when a key is on. "{0}" will be replaced with the key name - - - &Paramètres de notifications - The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. - - - Paramètres de notifications - The caption of the notification settings window - - - Verrouillage Numérique - The name of the num lock key - - - Transparence - The title for the "Opacity" group box - - - Position de la notification - The title for the "Overlay position" group box - - - En permanence - Text to display instead of the time if indicator overlay display is set to permanently. - - - &Sauvegarder && et quitter - The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character - - - Arrêt défil. - The name of the scroll lock key - - - Afficher les icônes pour... - The title for the "Show icons for..." group box - - - Ne pas afficher d'icônes - The label for the check box that enables or disables all icons - - - Ne pas afficher de notifications - The label for the check box that enables or disables all notifications - - - Afficher les notifications quand... - The title for the "Show notification when..." group box - - - Lancer à l'ouverture de la session - The label for the check box that enables or disabled the auto start. - - - Une mise à jour de CapsLock Indicator est disponible ! - The title for the update window. - - - Version {0}, publiée le {1} - Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. - - - &Mettre à jour maintenant - The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + Couleur de fond activée + The caption for the "Background colour activated" button. + + + Couleur de fond désactivée + The caption for the "Background colour deactivated" button. + + + Couleur de bord activée + The caption for the "Border colour activated" button. + + + Couleur de bord désactivée + The caption for the "Border colour deactivated" button. + + + + + Verrouillage majuscules + The name of the caps lock key + + + Mettre à &jour + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + Recherche de mises à jour... + The caption for the "Check for updates" button when it's searching for updates. + + + Couleurs + The title for the "Colours" group box + + + &Quitter + Used in the context menu of the CLI tray icon. + + + &Afficher + Used in the context menu of the CLI tray icon. + + + &Annuler + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Durée d'affichage + The title for the "Display time" group box + + + Télécharger &manuellement + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Télécharger plus de traductions.... + The last dropdown item in the locale dropdown. + + + &Quitter l'application + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + En quittant l'application, les icônes et notifications ne seront plus affichées. Quitter quand même ? + The message to display on application exit + + + + + + + + + + + + + + + + + Police + The title for the "Font" group box + + + Couleur de texte activée + The caption for the "Text colour activated" button. + + + Couleur de texte désactivée + The caption for the "Text colour deactivated" button. + + + Vous pouvez afficher CapsLock Indicator à nouveau en double cliquant sur cette icône. + The text that is shown in the icon balloon tip when CLI is being hidden. + + + Cacher au démarrage + Used for the hide on startup checkbox + + + &Cacher la fenêtre + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + {0} mis à jour + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} inactif + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} actif + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + &Paramètres de notifications + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + Paramètres de notifications + The caption of the notification settings window + + + Verrouillage Numérique + The name of the num lock key + + + Transparence + The title for the "Opacity" group box + + + Position de la notification + The title for the "Overlay position" group box + + + En permanence + Text to display instead of the time if indicator overlay display is set to permanently. + + + &Sauvegarder && et quitter + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Arrêt défil. + The name of the scroll lock key + + + Afficher les icônes pour... + The title for the "Show icons for..." group box + + + Ne pas afficher d'icônes + The label for the check box that enables or disables all icons + + + Ne pas afficher de notifications + The label for the check box that enables or disables all notifications + + + Afficher les notifications quand... + The title for the "Show notification when..." group box + + + + + Démarrer à l'ouverture de session + The label for the check box that enables or disabled the auto start. + + + Une mise à jour de CapsLock Indicator est disponible ! + The title for the update window. + + + Version {0}, publiée le {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + &Mettre à jour maintenant + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.it.resx b/CapsLockIndicatorV3/strings.it.resx index a1ad455..760aba8 100644 --- a/CapsLockIndicatorV3/strings.it.resx +++ b/CapsLockIndicatorV3/strings.it.resx @@ -1,284 +1,330 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - Colore sfondo attivato - The caption for the "Background colour activated" button. - - - Colore sfondo disattivato - The caption for the "Background colour deactivated" button. - - - Colore bordo attivato - The caption for the "Border colour activated" button. - - - Colore bordo disattivato - The caption for the "Border colour deactivated" button. - - - Blocco maiuscole - The name of the caps lock key - - - Controllo a&ggiornamenti - The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. - - - Sto controllando gli aggiornamenti... - The caption for the "Check for updates" button when it's searching for updates. - - - Colori - The title for the "Colours" group box - - - &Uscita - Used in the context menu of the CLI tray icon. - - - &Mostra - Used in the context menu of the CLI tray icon. - - - A&nnulla - The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Tempo di visualizzazione - The title for the "Display time" group box - - - Scarica manua&lmente - The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Scarica altre lingue... - The last dropdown item in the locale dropdown. - - - &Chiudi il programma - The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. - - - Chiudendo il programma le icone e le notifiche non verranno più mostrate. Uscire comunque? - The message to display on application exit - - - Carattere - The title for the "Font" group box - - - Colore testo attivato - The caption for the "Text colour activated" button. - - - Colore testo disattivato - The caption for the "Text colour deactivated" button. - - - Potrai vedere ancora l'indicatore del blocco maiuscole facendo doppio click su questa icona - The text that is shown in the icon balloon tip when CLI is being hidden. - - - Nascondi all'avvio - Used for the hide on startup checkbox - - - Na&scondi finestra - The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. - - - {0} modificato - Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name - - - {0} è spento - The text to display in the notification when a key is off. "{0}" will be replaced with the key name - - - {0} è acceso - The text to display in the notification when a key is on. "{0}" will be replaced with the key name - - - Impostazioni no&tifiche - The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. - - - Impostazioni notifiche - The caption of the notification settings window - - - Tastierino numerico - The name of the num lock key - - - Opacita - The title for the "Opacity" group box - - - Posizione - The title for the "Overlay position" group box - - - Permanente - Text to display instead of the time if indicator overlay display is set to permanently. - - - Sal&va e chiudi - The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character - - - Blocco scorrimento - The name of the scroll lock key - - - Mostra icone per... - The title for the "Show icons for..." group box - - - Non mostrare icone - The label for the check box that enables or disables all icons - - - Non mostrare notifiche - The label for the check box that enables or disables all notifications - - - Mostra notifiche quando... - The title for the "Show notification when..." group box - - - Avvia all'accesso (esegui automaticamente all'avvio) - The label for the check box that enables or disabled the auto start. - - - Aggiornamento disponibile per CapsLock Indicator! - The title for the update window. - - - Versione {0}, rilasciata il {1} - Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. - - - &Aggiorna adesso - The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Impostazioni avanzate + Label of the hyperlink that opens the settings file + + + Colore sfondo attivato + The caption for the "Background colour activated" button. + + + Colore sfondo disattivato + The caption for the "Background colour deactivated" button. + + + Colore bordo attivato + The caption for the "Border colour activated" button. + + + Colore bordo disattivato + The caption for the "Border colour deactivated" button. + + + Spessore bordo + Label of the border thickness groupbox + + + Blocco maiuscole + The name of the caps lock key + + + Controllo a&ggiornamenti + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + Controllo aggiornamenti... + The caption for the "Check for updates" button when it's searching for updates. + + + Colori + The title for the "Colours" group box + + + &Esci + Used in the context menu of the CLI tray icon. + + + Vi&sualizza + Used in the context menu of the CLI tray icon. + + + A&nnulla + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Tempo visualizzazione + The title for the "Display time" group box + + + Scarica &manualmente + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Scarica altre lingue... + The last dropdown item in the locale dropdown. + + + &Esci dall'applicazione + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Chiudendo il programma le icone e le notifiche non verranno più visualizzate. +Vuoi uscire comunque? + The message to display on application exit + + + Consenti a CapsLock Indicator di verificare periodicamente la presenza di aggiornamenti online (può essere modificato in seguito) + Label of the checkbox that determines whether or not CLI should search for updates + + + Contribuisci + Label of the hyperlink that takes you to CLI's GitHub page + + + &Esci + Button that exists the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Benvenuto in CapsLock Indicator + The heading of the first-run dialog + + + Grazie per aver scelto CapsLock Indicator! +Questo programma è open-source e gratuito, lo è sempre stato, lo sarà sempre! +Sei interessato a contribuire personalmente a CapsLock Indicator? +Visita il link sottostante per maggiori informazioni! +Inoltre, prenditi un momento per rivedere le impostazioni di seguito! + The message of the first-run dialog + + + Quali informazioni verranno inviate? + The label of the hyperlink that shows which information will be sent on each update check + + + &Cominciamo! + Button that starts the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Font + The title for the "Font" group box + + + Colore testo attivato + The caption for the "Text colour activated" button. + + + Colore testo disattivato + The caption for the "Text colour deactivated" button. + + + Potrai visualizzare l'indicatore del blocco maiuscole facendo doppio clic su questa icona + The text that is shown in the icon balloon tip when CLI is being hidden. + + + Nascondi all'avvio + Used for the hide on startup checkbox + + + Na&scondi finestra + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + {0} modificato + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} è disattivato + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} è attivato + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + Impostazioni &notifiche + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + Impostazioni notifiche + The caption of the notification settings window + + + Blocco numerico + The name of the num lock key + + + Opacità + The title for the "Opacity" group box + + + Posizione overlay + The title for the "Overlay position" group box + + + Permanentemente + Text to display instead of the time if indicator overlay display is set to permanently. + + + &Salva e chiudi + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Blocco scorrimento + The name of the scroll lock key + + + Visualizza icone per... + The title for the "Show icons for..." group box + + + Non visualizzare icone + The label for the check box that enables or disables all icons + + + Non visualizzare notifiche + The label for the check box that enables or disables all notifications + + + Visualizza notifiche quando... + The title for the "Show notification when..." group box + + + Visualizza sempre l'overlay quando è attiva + The label for the check box that indicates whether overlay should only be shown when active + + + Esegui automaticamente all'avvio + The label for the check box that enables or disabled the auto start. + + + Aggiornamento disponibile per CapsLock Indicator! + The title for the update window. + + + Versione {0}, rilasciata il {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + &Aggiorna adesso + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.ko.resx b/CapsLockIndicatorV3/strings.ko.resx new file mode 100644 index 0000000..85f8c71 --- /dev/null +++ b/CapsLockIndicatorV3/strings.ko.resx @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 고급 설정 + Label of the hyperlink that opens the settings file + + + 활성화시 배경 색 + The caption for the "Background colour activated" button. + + + 비활성화시 배경 색 + The caption for the "Background colour deactivated" button. + + + 활성화시 테두리 색 + The caption for the "Border colour activated" button. + + + 비활성화시 테두리 색 + The caption for the "Border colour deactivated" button. + + + 경계선 두께 + Label of the border thickness groupbox + + + Caps lock + The name of the caps lock key + + + 업데이트 확인(&u) + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + 업데이트 확인중... + The caption for the "Check for updates" button when it's searching for updates. + + + 색상 + The title for the "Colours" group box + + + 종료(&E) + Used in the context menu of the CLI tray icon. + + + 창 보이기(&S) + Used in the context menu of the CLI tray icon. + + + 창 숨기기(&D) + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + 노출 시간 + The title for the "Display time" group box + + + 수동 다운로드(&m) + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + 다른 언어 다운로드... + The last dropdown item in the locale dropdown. + + + 프로그램 종료(&E) + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + 프로그램을 종료하면 트레이 아이콘과 알림이 표시되지 않습니다. 그래도 종료 하시겠습니까? + The message to display on application exit + + + 주기적인 업데이트 확인을 허용합니다. (설정 변경 가능) + Label of the checkbox that determines whether or not CLI should search for updates + + + 기여하기 + Label of the hyperlink that takes you to CLI's GitHub page + + + 종료(&E) + Button that exists the application. The character after the "&" is the hotkey that is used with the ALT key. + + + CapsLock Indicator 사용을 환영합니다. + The heading of the first-run dialog + + + CapsLock Indicator를 사용해 주셔서 고맙습니다! 이 프로그램은 지금까지 그랬듯이 오픈소스이며 무료입니다. 앞으로도 그럴 것입니다. 만약 CapsLock Indicator에 기여하고 싶다면 아래 링크를 눌러 정보를 얻기 바랍니다. 그리고 사용 전에 아래 설정들을 확인하기 바랍니다. + The message of the first-run dialog + + + 어떤 정보가 보내지나요? + The label of the hyperlink that shows which information will be sent on each update check + + + 시작(&L) + Button that starts the application. The character after the "&" is the hotkey that is used with the ALT key. + + + 글꼴 + The title for the "Font" group box + + + 활성화시 글자색 + The caption for the "Text colour activated" button. + + + 비활성화시 글자색 + The caption for the "Text colour deactivated" button. + + + 이 아이콘을 더블클릭하면 CapsLock Indicator를 볼 수 있습니다. + The text that is shown in the icon balloon tip when CLI is being hidden. + + + 시작시 창 숨기기 + Used for the hide on startup checkbox + + + 창 숨기기(&H) + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + {0} 변경됨 + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} 꺼짐 + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} 켜짐 + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + 알림 설정(&N) + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + 알림 설정 + The caption of the notification settings window + + + Num lock + The name of the num lock key + + + 투명도 + The title for the "Opacity" group box + + + 알림 표시 위치 + The title for the "Overlay position" group box + + + 계속 유지 + Text to display instead of the time if indicator overlay display is set to permanently. + + + 저장 후 종료(&S) + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Scroll lock + The name of the scroll lock key + + + 아이콘 설정 + The title for the "Show icons for..." group box + + + 모든 아이콘 숨기기 + The label for the check box that enables or disables all icons + + + 모든 알림 숨기기 + The label for the check box that enables or disables all notifications + + + 알림 설정 + The title for the "Show notification when..." group box + + + 활성시 항상 오버레이 보이기 + The label for the check box that indicates whether overlay should only be shown when active + + + 시작시 자동 시작 + The label for the check box that enables or disabled the auto start. + + + CapsLock Indicator 업데이트가 있습니다. + The title for the update window. + + + 버전 {0} , 배포일 {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + 지금 업데이트(&U) + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.nl.resx b/CapsLockIndicatorV3/strings.nl.resx new file mode 100644 index 0000000..3debfd2 --- /dev/null +++ b/CapsLockIndicatorV3/strings.nl.resx @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Geavanceerde instellingen + Label of the hyperlink that opens the settings file + + + Achtergrondkleur geactiveerd + The caption for the "Background colour activated" button. + + + Achtergrondkleur gedeactiveerd + The caption for the "Background colour deactivated" button. + + + Randkleur geactiveerd + The caption for the "Border colour activated" button. + + + Randkleur gedeactiveerd + The caption for the "Border colour deactivated" button. + + + Randdikte + Label of the border thickness groupbox + + + Caps lock + The name of the caps lock key + + + Controleer op &updates + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + Controleren op updates... + The caption for the "Check for updates" button when it's searching for updates. + + + Kleuren + The title for the "Colours" group box + + + &Afsluiten + Used in the context menu of the CLI tray icon. + + + &Toon + Used in the context menu of the CLI tray icon. + + + &Annuleren + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Toon tijd + The title for the "Display time" group box + + + Download &handmatig + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Download meer vertalingen... + The last dropdown item in the locale dropdown. + + + &Programma sluiten + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + De pictogrammen en notificaties zullen niet meer worden getoond als het programma wordt afgesloten. Toch afsluiten? + The message to display on application exit + + + Sta CapsLock Indicator toe om periodiek op updates te controleren (kan later aangepast worden) + Label of the checkbox that determines whether or not CLI should search for updates + + + Bijdragen + Label of the hyperlink that takes you to CLI's GitHub page + + + &Afsluiten + Button that exists the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Welkom bij CapsLock indicator + The heading of the first-run dialog + + + Bedankt dat je gekozen hebt voor CapsLock Indicator! Dit programma is open-source en gratis, is dit altijd geweest en zal ook zo blijven! Wil je bijdragen aan CapsLock Indicator? Bezoek dan de onderstaande link voor meer informatie. Neem ook even de tijd om onderstaande instellingen door te controleren. + The message of the first-run dialog + + + Welke informatie zal verzonden worden? + The label of the hyperlink that shows which information will be sent on each update check + + + &Start! + Button that starts the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Lettertype + The title for the "Font" group box + + + Tekst kleur geactiveerd + The caption for the "Text colour activated" button. + + + Tekstkleur gedeactiveerd + The caption for the "Text colour deactivated" button. + + + Activeer de CapsLock indicator opnieuw door te dubbelklikken op het pictogram. + The text that is shown in the icon balloon tip when CLI is being hidden. + + + Verberg bij opstarten + Used for the hide on startup checkbox + + + &Verberg scherm + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + {0} gewijzigd + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} is uit + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} is aan + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + &Notificatie instellingen + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + Notificatie Instellingen + The caption of the notification settings window + + + Num lock + The name of the num lock key + + + Ondoorzichtigheid + The title for the "Opacity" group box + + + Overlay positie + The title for the "Overlay position" group box + + + Permanent + Text to display instead of the time if indicator overlay display is set to permanently. + + + &Bewaar && sluit + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Scrol lock + The name of the scroll lock key + + + Toon pictogrammen voor... + The title for the "Show icons for..." group box + + + Toon geen pictogrammen + The label for the check box that enables or disables all icons + + + Toon geen notificaties + The label for the check box that enables or disables all notifications + + + Toon notificaties als ... + The title for the "Show notification when..." group box + + + Overlays is altijd zichtbaar als programma actief is + The label for the check box that indicates whether overlay should only be shown when active + + + Start bij aanloggen + The label for the check box that enables or disabled the auto start. + + + CapsLock Indicator Update beschikbaar! + The title for the update window. + + + Versie {0}, vrijgegeven {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + &Update nu + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.pt-BR.resx b/CapsLockIndicatorV3/strings.pt-BR.resx index 8099f95..e39cd15 100644 --- a/CapsLockIndicatorV3/strings.pt-BR.resx +++ b/CapsLockIndicatorV3/strings.pt-BR.resx @@ -117,6 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Configurações Avançadas + Label of the hyperlink that opens the settings file + Cor de fundo ativada The caption for the "Background colour activated" button. @@ -133,6 +137,10 @@ Cor de borda desativada The caption for the "Border colour deactivated" button. + + Espessura da borda + Label of the border thickness groupbox + Caps lock The name of the caps lock key @@ -181,6 +189,34 @@ Sair da aplicação implica que os ícones e notificações não serão mais mostrados. Sair mesmo assim? The message to display on application exit + + Permitir que CapsLock Indicator procure por versões atualizadas periodicamente (pode ser modificado depois) + Label of the checkbox that determines whether or not CLI should search for updates + + + Contribua + Label of the hyperlink that takes you to CLI's GitHub page + + + &Sair + Button that exists the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Bem-vindo ao CapsLock Indicator + The heading of the first-run dialog + + + Obrigado por escolher CapsLock Indicator! Esse programa possui código-fonte aberto e é grátis. Sempre foi e sempre será! Tem interesse em contribuir com o CapsLock Indicator? Visite o link abaixo para mais informações! Além disso, reserve um momento para revisar as configurações abaixo! + The message of the first-run dialog + + + Quais informações serão enviadas? + The label of the hyperlink that shows which information will be sent on each update check + + + &Vamos lá! + Button that starts the application. The character after the "&" is the hotkey that is used with the ALT key. + Fonte The title for the "Font" group box @@ -265,6 +301,10 @@ Mostrar notificação quando... The title for the "Show notification when..." group box + + Sempre mostrar sobreposição quando ativo + The label for the check box that indicates whether overlay should only be shown when active + Inicializar automaticamente The label for the check box that enables or disabled the auto start. diff --git a/CapsLockIndicatorV3/strings.pt-PT.resx b/CapsLockIndicatorV3/strings.pt-PT.resx index d088dfe..eedd7f4 100644 --- a/CapsLockIndicatorV3/strings.pt-PT.resx +++ b/CapsLockIndicatorV3/strings.pt-PT.resx @@ -1,284 +1,355 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - Fundo de cor ativado - The caption for the "Background colour activated" button. - - - Fundo de cor desativado - The caption for the "Background colour deactivated" button. - - - Contorno de cor ativado - The caption for the "Border colour activated" button. - - - Contorno de cor desativado - The caption for the "Border colour deactivated" button. - - - Caps lock - The name of the caps lock key - - - Procurar por atualizações - The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. - - - A procurar por atualizações... - The caption for the "Check for updates" button when it's searching for updates. - - - Cores - The title for the "Colours" group box - - - &Sair - Used in the context menu of the CLI tray icon. - - - &Mostrar - Used in the context menu of the CLI tray icon. - - - &Descartar - The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Mostar tempo - The title for the "Display time" group box - - - transferir &manualmente - The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. - - - transferir mais traduções... - The last dropdown item in the locale dropdown. - - - &Sair da aplicação - The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. - - - Sair da aplicação significa que os ícones e as notificações vão deixar de aparecer. Sair na mesma? - The message to display on application exit - - - Fonte - The title for the "Font" group box - - - Texto com cor ativado - The caption for the "Text colour activated" button. - - - Texto com cor desativado - The caption for the "Text colour deactivated" button. - - - Pode abrir o CapsLock Indicator novamente, carregando neste ícone duas vezes - The text that is shown in the icon balloon tip when CLI is being hidden. - - - Esconder no arranque do Windows - Used for the hide on startup checkbox - - - &Esconder janela - The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. - - - {0} alterado - Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name - - - {0} desligado - The text to display in the notification when a key is off. "{0}" will be replaced with the key name - - - {0} ligado - The text to display in the notification when a key is on. "{0}" will be replaced with the key name - - - &definições das notificações - The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. - - - definições das notificações - The caption of the notification settings window - - - Num lock - The name of the num lock key - - - Transparência - The title for the "Opacity" group box - - - posição da sobreposição - The title for the "Overlay position" group box - - - Permanente - Text to display instead of the time if indicator overlay display is set to permanently. - - - &Guardar && Sair - The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character - - - Scroll lock - The name of the scroll lock key - - - Mostrar ícones para... - The title for the "Show icons for..." group box - - - Não mostar ícones - The label for the check box that enables or disables all icons - - - Não mostrar notificações - The label for the check box that enables or disables all notifications - - - Mostar notificações quando... - The title for the "Show notification when..." group box - - - Iniciar aplicação no arranque do Windows - The label for the check box that enables or disabled the auto start. - - - atualização do CapsLock Indicator disponível!! - The title for the update window. - - - Versão {0}, lançada a {1} - Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. - - - &Atualizar agora - The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + Fundo de cor ativado + The caption for the "Background colour activated" button. + + + Fundo de cor desativado + The caption for the "Background colour deactivated" button. + + + Contorno de cor ativado + The caption for the "Border colour activated" button. + + + Contorno de cor desativado + The caption for the "Border colour deactivated" button. + + + + + Caps lock + The name of the caps lock key + + + Procurar por atualizações + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + A procurar por atualizações... + The caption for the "Check for updates" button when it's searching for updates. + + + Cores + The title for the "Colours" group box + + + &Sair + Used in the context menu of the CLI tray icon. + + + &Mostrar + Used in the context menu of the CLI tray icon. + + + &Descartar + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Mostar tempo + The title for the "Display time" group box + + + transferir &manualmente + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + transferir mais traduções... + The last dropdown item in the locale dropdown. + + + &Sair da aplicação + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Sair da aplicação significa que os ícones e as notificações vão deixar de aparecer. Sair na mesma? + The message to display on application exit + + + + + + + + + + + + + + + + + Fonte + The title for the "Font" group box + + + Texto com cor ativado + The caption for the "Text colour activated" button. + + + Texto com cor desativado + The caption for the "Text colour deactivated" button. + + + Pode abrir o CapsLock Indicator novamente, carregando neste ícone duas vezes + The text that is shown in the icon balloon tip when CLI is being hidden. + + + Esconder no arranque do Windows + Used for the hide on startup checkbox + + + &Esconder janela + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + {0} alterado + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} desligado + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} ligado + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + &definições das notificações + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + definições das notificações + The caption of the notification settings window + + + Num lock + The name of the num lock key + + + Transparência + The title for the "Opacity" group box + + + posição da sobreposição + The title for the "Overlay position" group box + + + Permanente + Text to display instead of the time if indicator overlay display is set to permanently. + + + &Guardar && Sair + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Scroll lock + The name of the scroll lock key + + + Mostrar ícones para... + The title for the "Show icons for..." group box + + + Não mostar ícones + The label for the check box that enables or disables all icons + + + Não mostrar notificações + The label for the check box that enables or disables all notifications + + + Mostar notificações quando... + The title for the "Show notification when..." group box + + + + + Iniciar aplicação no arranque do Windows + The label for the check box that enables or disabled the auto start. + + + atualização do CapsLock Indicator disponível!! + The title for the update window. + + + Versão {0}, lançada a {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + &Atualizar agora + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.resx b/CapsLockIndicatorV3/strings.resx index 89a02ce..ee23ba3 100644 --- a/CapsLockIndicatorV3/strings.resx +++ b/CapsLockIndicatorV3/strings.resx @@ -190,9 +190,25 @@ The message to display on application exit - Allow CapsLock Indicator to periodically check for updates online (can be changed later) + &Allow CapsLock Indicator to periodically check for updates online (can be changed later) Label of the checkbox that determines whether or not CLI should search for updates + + &Dark + Button for selecting dark color scheme + + + L&ight + Button for selecting light color scheme + + + Which color scheme do you prefer? + Label for selecting color scheme + + + Only available on Windows 10 + Added to dark button if not running on Windows 10 + Contribute Label of the hyperlink that takes you to CLI's GitHub page @@ -277,6 +293,10 @@ Permanently Text to display instead of the time if indicator overlay display is set to permanently. + + Reloaded icons + Shown in a notification when hot-reloading icons. + &Save && close The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character diff --git a/CapsLockIndicatorV3/strings.ru.resx b/CapsLockIndicatorV3/strings.ru.resx index 68b9b0d..c38fef6 100644 --- a/CapsLockIndicatorV3/strings.ru.resx +++ b/CapsLockIndicatorV3/strings.ru.resx @@ -1,284 +1,325 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - Цвет фона активированного - The caption for the "Background colour activated" button. - - - Цвет фона деактивированного - The caption for the "Background colour deactivated" button. - - - Цвет границы активированного - The caption for the "Border colour activated" button. - - - Цвет границы деактивированного - The caption for the "Border colour deactivated" button. - - - Caps lock - The name of the caps lock key - - - Проверить &обновления - The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. - - - Проверка обновлений... - The caption for the "Check for updates" button when it's searching for updates. - - - Цвета - The title for the "Colours" group box - - - &Выход - Used in the context menu of the CLI tray icon. - - - &Показать - Used in the context menu of the CLI tray icon. - - - &Отклонить - The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Отображать время - The title for the "Display time" group box - - - Скачать &вручную - The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. - - - Загрузить другие языки... - The last dropdown item in the locale dropdown. - - - &Выход - The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. - - - Выход из приложения означает, что значки и уведомления больше не отображаются. Выйти все-равно? - The message to display on application exit - - - Шрифт - The title for the "Font" group box - - - Цвет текста активированного - The caption for the "Text colour activated" button. - - - Цвет текста деактивированного - The caption for the "Text colour deactivated" button. - - - Вы можете снова показать индикатор CapsLock, дважды щелкнув по этому значку. - The text that is shown in the icon balloon tip when CLI is being hidden. - - - Скрыть при запуске - Used for the hide on startup checkbox - - - &Скрыть окно - The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. - - - {0} изменено - Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name - - - {0} выключен - The text to display in the notification when a key is off. "{0}" will be replaced with the key name - - - {0} включен - The text to display in the notification when a key is on. "{0}" will be replaced with the key name - - - &Настройка уведомлений - The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. - - - Настройка уведомлений - The caption of the notification settings window - - - Num Lock - The name of the num lock key - - - Непрозрачность - The title for the "Opacity" group box - - - Позиция - The title for the "Overlay position" group box - - - Постоянно - Text to display instead of the time if indicator overlay display is set to permanently. - - - &Сохранить &и выйти - The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character - - - Scroll lock - The name of the scroll lock key - - - Показать иконки для... - The title for the "Show icons for..." group box - - - Не показывать иконки - The label for the check box that enables or disables all icons - - - Не показывать уведомления - The label for the check box that enables or disables all notifications - - - Показывать уведомления когда... - The title for the "Show notification when..." group box - - - Запускать при загрузке - The label for the check box that enables or disabled the auto start. - - - Доступно обновление CapsLock Indicator - The title for the update window. - - - Версия {0}, релиз {1} - Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. - - - &Обновить сейчас - The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Расш. настройки + Label of the hyperlink that opens the settings file + + + Фон при включении + The caption for the "Background colour activated" button. + + + Фон при отключении + The caption for the "Background colour deactivated" button. + + + Рамка при включении + The caption for the "Border colour activated" button. + + + Рамка при отключении + The caption for the "Border colour deactivated" button. + + + Толщина границы + Label of the border thickness groupbox + + + Caps lock + The name of the caps lock key + + + Проверить &обновления + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + Проверка обновлений... + The caption for the "Check for updates" button when it's searching for updates. + + + Цвета + The title for the "Colours" group box + + + &Выход + Used in the context menu of the CLI tray icon. + + + &Показать + Used in the context menu of the CLI tray icon. + + + &Отмена + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Время отображения + The title for the "Display time" group box + + + Скачать &вручную + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Загрузить больше переводов… + The last dropdown item in the locale dropdown. + + + &Выйти из CLI + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + После выхода значки и уведомления не будут отображаться. Вы уверены? + The message to display on application exit + + + Разрешить CapsLock Indicator периодически проверять наличие обновлений в Интернете (параметр можно изменить потом) + Label of the checkbox that determines whether or not CLI should search for updates + + + Помочь проекту + Label of the hyperlink that takes you to CLI's GitHub page + + + &Выйти + Button that exists the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Приветствуем в CapsLock Indicator + The heading of the first-run dialog + + + Спасибо, что выбрали CapsLock Indicator! Эта программа с открытым исходным кодом всегда была, есть и останется бесплатной! Хотите внести свой вклад в CapsLock Indicator? Перейдите по ссылке ниже для подробностей! Кроме того, уделите минутку времени, чтобы ознакомиться с нижеприведенными настройками! + The message of the first-run dialog + + + Какие данные будет отправляться? + The label of the hyperlink that shows which information will be sent on each update check + + + &Погнали! + Button that starts the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Шрифт + The title for the "Font" group box + + + Текст при включении + The caption for the "Text colour activated" button. + + + Текст при отключении + The caption for the "Text colour deactivated" button. + + + По двойному нажатию на этот значок можно снова вернуться к CapsLock Indicator. + The text that is shown in the icon balloon tip when CLI is being hidden. + + + Скрыть окно при запуске + Used for the hide on startup checkbox + + + &Скрыть окно + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + переключении {0} + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} выключен + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} включен + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + &Настройка уведомлений + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + Настройка уведомлений + The caption of the notification settings window + + + Num lock + The name of the num lock key + + + Непрозрачность + The title for the "Opacity" group box + + + Расположение на экране + The title for the "Overlay position" group box + + + Постоянно + Text to display instead of the time if indicator overlay display is set to permanently. + + + &Сохранить &и выйти + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Scroll lock + The name of the scroll lock key + + + Показать значки + The title for the "Show icons for..." group box + + + Без значков в трее + The label for the check box that enables or disables all icons + + + Без уведомлений + The label for the check box that enables or disables all notifications + + + Уведомлять при + The title for the "Show notification when..." group box + + + Оставлять на экране, пока работает + The label for the check box that indicates whether overlay should only be shown when active + + + Автозагрузка + The label for the check box that enables or disabled the auto start. + + + Доступна новая версия CapsLock Indicator! + The title for the update window. + + + Версия {0}, вышла {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + &Обновиться + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.tr-TR.resx b/CapsLockIndicatorV3/strings.tr-TR.resx new file mode 100644 index 0000000..e45ca26 --- /dev/null +++ b/CapsLockIndicatorV3/strings.tr-TR.resx @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Gelişmiş Seçenekler + Label of the hyperlink that opens the settings file + + + Etkin arkaplan rengi + The caption for the "Background colour activated" button. + + + Devre dışı arkaplan rengi + The caption for the "Background colour deactivated" button. + + + Etkin kenarlık rengi + The caption for the "Border colour activated" button. + + + Devre dışı kenarlık rengi + The caption for the "Border colour deactivated" button. + + + Kenar kalınlığı + Label of the border thickness groupbox + + + Caps lock + The name of the caps lock key + + + Güncellemelere gözat + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + Güncellemeler denetleniyor... + The caption for the "Check for updates" button when it's searching for updates. + + + Renkler + The title for the "Colours" group box + + + &Çıkış + Used in the context menu of the CLI tray icon. + + + &Göster + Used in the context menu of the CLI tray icon. + + + Reddet + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Görüntüleme süresi + The title for the "Display time" group box + + + Manuel olarak indir + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + Daha fazla çeviri indir + The last dropdown item in the locale dropdown. + + + &Uygulamadan çık + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Eğer uygulamadan çıkarsanız simgeler ve bildirimler görüntülenemeyecek. Yine de çıkmak istiyor musunuz? + The message to display on application exit + + + CapsLock Indicator'a belirli aralıklarla çevrimiçi güncellenmesi için izin verin (bu izin daha sonra değiştirilebilir) + Label of the checkbox that determines whether or not CLI should search for updates + + + Katkıda bulun + Label of the hyperlink that takes you to CLI's GitHub page + + + &Çıkış + Button that exists the application. The character after the "&" is the hotkey that is used with the ALT key. + + + CapsLock Indicator'e Hoşgeldiniz + The heading of the first-run dialog + + + CapsLock Indicator'ı tercih ettiğiniz için Teşekkürler! Bu program açık-kaynak ve ücretsiz, her zaman öyleydi, her zaman öyle olacak! CapsLock Indicator'a katkıda bulunmak mı istiyorsunuz? Bilgi için linki kullanın! Ayrıca, aşağıdaki ayarlara lütfen gözatın! + The message of the first-run dialog + + + Hangi bilgiler gönderilecek? + The label of the hyperlink that shows which information will be sent on each update check + + + &Hadi gidelim! + Button that starts the application. The character after the "&" is the hotkey that is used with the ALT key. + + + Yazı tipi + The title for the "Font" group box + + + Etkin metin rengi + The caption for the "Text colour activated" button. + + + Devre dışı metin rengi + The caption for the "Text colour deactivated" button. + + + Simgeye çift tıklayarak CapsLock Indicator'u tekrar görebilirsiniz. + The text that is shown in the icon balloon tip when CLI is being hidden. + + + Başlarken gizle + Used for the hide on startup checkbox + + + &Pencereyi gizle + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + {0} değişmiş + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} kapalı + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} açık + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + Bildirim ayarları + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + Bildirim seçenekleri + The caption of the notification settings window + + + Num lock + The name of the num lock key + + + Opaklık + The title for the "Opacity" group box + + + Kaplama konumu + The title for the "Overlay position" group box + + + Kalıcı + Text to display instead of the time if indicator overlay display is set to permanently. + + + Kaydet ve çık + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Scroll lock + The name of the scroll lock key + + + Simgeleri şunun için göster... + The title for the "Show icons for..." group box + + + Simgeleri gösterme + The label for the check box that enables or disables all icons + + + Bildirimleri gösterme + The label for the check box that enables or disables all notifications + + + Bildirim şu zaman göster... + The title for the "Show notification when..." group box + + + Katmanı yalnızca etkin iken göster + The label for the check box that indicates whether overlay should only be shown when active + + + Oturum açta başlat + The label for the check box that enables or disabled the auto start. + + + CapsLock Indicator güncelleme mevcut! + The title for the update window. + + + Versiyon {0}, yayınlandı {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + &Şimdi güncelle + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + + \ No newline at end of file diff --git a/CapsLockIndicatorV3/strings.zh-CN.resx b/CapsLockIndicatorV3/strings.zh-CN.resx index a78c4e4..2f35852 100644 --- a/CapsLockIndicatorV3/strings.zh-CN.resx +++ b/CapsLockIndicatorV3/strings.zh-CN.resx @@ -1,284 +1,355 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 背景色-激活 - The caption for the "Background colour activated" button. - - - 背景色-未激活 - The caption for the "Background colour deactivated" button. - - - 边框-激活 - The caption for the "Border colour activated" button. - - - 边框-未激活 - The caption for the "Border colour deactivated" button. - - - Caps lock - The name of the caps lock key - - - 检查更新 - The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. - - - 正在检查更新... - The caption for the "Check for updates" button when it's searching for updates. - - - 颜色 - The title for the "Colours" group box - - - 退出 - Used in the context menu of the CLI tray icon. - - - 显示主界面 - Used in the context menu of the CLI tray icon. - - - 消除 - The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. - - - 展示时间 - The title for the "Display time" group box - - - 手动下载 - The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. - - - 下载更多语言... - The last dropdown item in the locale dropdown. - - - 退出程序 - The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. - - - 退出程序后，托盘指示器图标和切换通知将不再显示，确定要退出么？ - The message to display on application exit - - - 字体 - The title for the "Font" group box - - - 文字颜色-激活 - The caption for the "Text colour activated" button. - - - 文字颜色 - 不活跃 - The caption for the "Text colour deactivated" button. - - - 双击图标显示软件主界面 - The text that is shown in the icon balloon tip when CLI is being hidden. - - - 启动时隐藏 - Used for the hide on startup checkbox - - - 隐藏窗口 - The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. - - - 切换{0}状态时 - Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name - - - {0}已关闭 - The text to display in the notification when a key is off. "{0}" will be replaced with the key name - - - {0}已打开 - The text to display in the notification when a key is on. "{0}" will be replaced with the key name - - - 通知设置 - The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. - - - 通知设置 - The caption of the notification settings window - - - Num lock - The name of the num lock key - - - 透明度 - The title for the "Opacity" group box - - - 通知出现位置 - The title for the "Overlay position" group box - - - 一直显示 - Text to display instead of the time if indicator overlay display is set to permanently. - - - 保存并关闭 - The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character - - - Scroll lock - The name of the scroll lock key - - - 在系统托盘中展示以下指示器 - The title for the "Show icons for..." group box - - - 不展示托盘指示器 - The label for the check box that enables or disables all icons - - - 不显示通知 - The label for the check box that enables or disables all notifications - - - 显示通知： - The title for the "Show notification when..." group box - - - 开机启动 - The label for the check box that enables or disabled the auto start. - - - CapsLock Indicator 有可用升级！ - The title for the update window. - - - Version {0}, released {1} - Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. - - - 立即升级 - The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + 打开 - 背景颜色 + The caption for the "Background colour activated" button. + + + 关闭 - 背景颜色 + The caption for the "Background colour deactivated" button. + + + 打开 - 边框颜色 + The caption for the "Border colour activated" button. + + + 关闭 - 边框颜色 + The caption for the "Border colour deactivated" button. + + + + + Caps lock + The name of the caps lock key + + + 检查更新 (&U) + The caption for the button that manually checks for updates. The character after the "&" is the hotkey that is used with the ALT key. + + + 正在检查更新… + The caption for the "Check for updates" button when it's searching for updates. + + + 颜色 + The title for the "Colours" group box + + + 退出 (&E) + Used in the context menu of the CLI tray icon. + + + 显示主界面 (&S) + Used in the context menu of the CLI tray icon. + + + 忽略 (&D) + The caption for the "Dismiss" button. The character after the "&" is the hotkey that is used with the ALT key. + + + 展示时长 + The title for the "Display time" group box + + + 手动下载 (&M) + The caption for the "Download manually" button. The character after the "&" is the hotkey that is used with the ALT key. + + + 下载更多翻译… + The last dropdown item in the locale dropdown. + + + 退出程序 (&E) + The caption for the button that exits the application. The character after the "&" is the hotkey that is used with the ALT key. + + + 退出程序后，托盘指示器图标和切换通知将不再显示，确定要退出吗？ + The message to display on application exit + + + + + + + + + + + + + + + + + 字体 + The title for the "Font" group box + + + 打开 - 文本颜色 + The caption for the "Text colour activated" button. + + + 关闭 - 文字颜色 + The caption for the "Text colour deactivated" button. + + + 双击此图标即可显示 CapsLock 指示器主界面 + The text that is shown in the icon balloon tip when CLI is being hidden. + + + 启动时隐藏 + Used for the hide on startup checkbox + + + 隐藏窗口 (&H) + The caption for the button that hides the window. The character after the "&" is the hotkey that is used with the ALT key. + + + 切换 {0} 时 + Used for the check boxes in the "Show notification when..." group box. "{0}" will be replaced with the key name + + + {0} 已关闭 + The text to display in the notification when a key is off. "{0}" will be replaced with the key name + + + {0} 已打开 + The text to display in the notification when a key is on. "{0}" will be replaced with the key name + + + 通知设置 (&N) + The caption for the button that opens the notification settings. The character after the "&" is the hotkey that is used with the ALT key. + + + 通知设置 + The caption of the notification settings window + + + Num lock + The name of the num lock key + + + 透明度 + The title for the "Opacity" group box + + + 通知位置 + The title for the "Overlay position" group box + + + 一直显示 + Text to display instead of the time if indicator overlay display is set to permanently. + + + 保存并关闭 (&S) + The caption for the "Save & Close" button. The character after the "&" is the hotkey that is used with the ALT key. Use two "&" to display a "&" character + + + Scroll lock + The name of the scroll lock key + + + 显示托盘图标： + The title for the "Show icons for..." group box + + + 不显示托盘图标 + The label for the check box that enables or disables all icons + + + 不显示通知 + The label for the check box that enables or disables all notifications + + + 显示通知： + The title for the "Show notification when..." group box + + + + + 开机自启动 + The label for the check box that enables or disabled the auto start. + + + CapsLock 指示器有可用更新了！ + The title for the update window. + + + 版本 {0}，发布于 {1} + Displayed in the "Update Available" dialog. {0} is the version, {1} is the release date and time. + + + 立即更新 (&U) + The caption for the "Update now" button. The character after the "&" is the hotkey that is used with the ALT key. + + \ No newline at end of file diff --git a/README.md b/README.md index f6da728..cf22366 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,36 @@ -| | -| --- | -| ⚠ **HEADS UP**: CapsLock Indicator 4 is on the way. Completely rewritten with many new features and a new UI using WPF! However, it may still take some time until that version releases. | +

+ CapsLock Indicator +

----- +

+ Visit project page + License + Version + Build Status +

-![CapsLock Indicator](https://cli.jonaskohl.de/capslock-indicator-logo.png) +

+ CapsLock Indicator is a small utility that indicates the state of the Num lock, Caps lock and Scroll lock key. +

-[![Visit project page](https://static.jonaskohl.de/q50c4wp6/cli-project-page_vlecvcbtz80tqvtt.svg)](https://cli.jonaskohl.de/) -[![License](https://img.shields.io/badge/License-Apache%202.0-red.svg)](https://opensource.org/licenses/Apache-2.0) -[![Version](https://cli.jonaskohl.de/version.php?shield=true&_=2)](https://cli.jonaskohl.de/!/download#latest) -[![Build Status](https://travis-ci.org/jonaskohl/CapsLockIndicator.svg?branch=master)](https://travis-ci.org/jonaskohl/CapsLockIndicator) +


-CapsLock Indicator is a small utility that indicates the state of the Num lock, Caps lock and Scroll lock key. +

+ + Download now + +

-# [Download](https://cli.jonaskohl.de/!/download) +


+ +

+ Screenshot +

+ +


# Edit & compile source code -You need at least SharpDevelop 5.1 or Microsoft Visual Studio 2010 to edit and compile the source code, however Microsoft Visual Studio 2017 is recommended. CapsLock Indicator has no other dependencies other than the Microsoft .NET SDK 4.5. +You need Microsoft Visual Studio 2019 to edit and compile the source code. CapsLock Indicator has no other dependencies other than the Microsoft .NET SDK 4.5. # Contributing If you have a feature suggestion or a bug to file **and you are able to implement this in the code**, feel free to [open a pull request](https://github.com/jonaskohl/CapsLockIndicator/pulls). If you only want to report a bug or suggest a feature, [open a new issue](https://github.com/jonaskohl/CapsLockIndicator/issues/new).