From 97fda95805bb28eefee3865414bcb70820bc86b5 Mon Sep 17 00:00:00 2001 From: Markus Hofknecht Date: Sun, 27 Jun 2021 11:35:07 +0200 Subject: [PATCH] [Feature] High resolution compatibility (#188), version 1.0.17.65 --- Business/KeyboardInput.cs | 2 +- Business/Menus.cs | 4 +- Config/Config.cs | 1 + DataClasses/RowData.cs | 2 +- Helpers/DragDropHelper.cs | 30 +-- Helpers/ImagingHelper.cs | 9 +- Properties/AssemblyInfo.cs | 4 +- Properties/Resources.Designer.cs | 10 + Properties/Resources.resx | 3 + Properties/Settings.Designer.cs | 24 ++- Resources/ic_fluent_search_48_regular.svg | 3 + Resources/lang.Designer.cs | 9 + Resources/lang.resx | 3 + UserInterface/AppNotifyIcon.cs | 10 +- .../Menu.ControlsTheDesignerRemoves.cs | 6 +- UserInterface/Menu.Designer.cs | 25 +-- UserInterface/Menu.cs | 3 +- UserInterface/SettingsForm.Designer.cs | 176 +++++++++++++++--- UserInterface/SettingsForm.cs | 29 ++- Utilities/Scaling.cs | 10 +- 20 files changed, 278 insertions(+), 85 deletions(-) create mode 100644 Resources/ic_fluent_search_48_regular.svg diff --git a/Business/KeyboardInput.cs b/Business/KeyboardInput.cs index d18c0a6..462777e 100644 --- a/Business/KeyboardInput.cs +++ b/Business/KeyboardInput.cs @@ -12,7 +12,7 @@ namespace SystemTrayMenu.Handler using SystemTrayMenu.DataClasses; using SystemTrayMenu.Helper; using SystemTrayMenu.Utilities; - using Menu = UserInterface.Menu; + using Menu = SystemTrayMenu.UserInterface.Menu; internal class KeyboardInput : IDisposable { diff --git a/Business/Menus.cs b/Business/Menus.cs index 217c5e8..fef131e 100644 --- a/Business/Menus.cs +++ b/Business/Menus.cs @@ -18,7 +18,7 @@ namespace SystemTrayMenu.Business using SystemTrayMenu.Handler; using SystemTrayMenu.Helper; using SystemTrayMenu.Utilities; - using Menu = UserInterface.Menu; + using Menu = SystemTrayMenu.UserInterface.Menu; using Timer = System.Windows.Forms.Timer; internal class Menus : IDisposable @@ -988,9 +988,9 @@ namespace SystemTrayMenu.Business { menu.AdjustSizeAndLocation(screenBounds, menuPredecessor, startLocation); } -#warning workaround added also as else, because need adjust scrollbar after search else { + // workaround added also as else, because need adjust scrollbar after search menu.AdjustSizeAndLocation(screenBounds, menuPredecessor, startLocation); } diff --git a/Config/Config.cs b/Config/Config.cs index 21e99c3..e1d8f5c 100644 --- a/Config/Config.cs +++ b/Config/Config.cs @@ -21,6 +21,7 @@ namespace SystemTrayMenu internal static readonly Bitmap BitmapOpenFolder = ReadSvg(Properties.Resources.ic_fluent_folder_48_regular); internal static readonly Bitmap BitmapPin = ReadSvg(Properties.Resources.ic_fluent_pin_48_regular); internal static readonly Bitmap BitmapPinActive = ReadSvg(Properties.Resources.ic_fluent_pin_48_filled); + internal static readonly Bitmap BitmapSearch = ReadSvg(Properties.Resources.ic_fluent_search_48_regular); private static bool readDarkModeDone; private static bool isDarkMode; diff --git a/DataClasses/RowData.cs b/DataClasses/RowData.cs index f2a5cdd..3bf46b0 100644 --- a/DataClasses/RowData.cs +++ b/DataClasses/RowData.cs @@ -18,7 +18,7 @@ namespace SystemTrayMenu.DataClasses using IWshRuntimeLibrary; using SystemTrayMenu.Utilities; using TAFactory.IconPack; - using Menu = UserInterface.Menu; + using Menu = SystemTrayMenu.UserInterface.Menu; internal class RowData : IDisposable { diff --git a/Helpers/DragDropHelper.cs b/Helpers/DragDropHelper.cs index 4865140..ad4f112 100644 --- a/Helpers/DragDropHelper.cs +++ b/Helpers/DragDropHelper.cs @@ -1,4 +1,8 @@ -namespace SystemTrayMenu.Helpers +// +// Copyright (c) PlaceholderCompany. All rights reserved. +// + +namespace SystemTrayMenu.Helpers { using System; using System.IO; @@ -70,30 +74,6 @@ var title = url; - // e.g. not working for https://web.skype.com/ - // var webGet = new HtmlWeb(); - // var document = webGet.Load(url); - // var matchingElements = document.DocumentNode.Descendants() - // .Where(x => x.Name.Equals("title", StringComparison.InvariantCultureIgnoreCase)); - // if (matchingElements != null && matchingElements.Count() > 0) - // { - // var titleNode = matchingElements.Last(); - // if (titleNode != null) - // { - // title = titleNode.InnerText; - // } - // } - - // e.g. not working for https://web.skype.com/ - ////var titleNode = document.DocumentNode.SelectNodes("title").Last(); //.SelectSingleNode("html/head/title"); - - // e.g. not working for https://web.skype.com/ - ////WebClient client = new WebClient(); - // client.Headers.Add("user-agent", "Mozilla/5.0"); - // string source = client.DownloadString(url); - // title = Regex.Match(source, @"\]*\>\s*(?[\s\S]*?)\</title\>", - // RegexOptions.IgnoreCase).Groups["Title"].Value; - title = title.Replace("/", " "). Replace("https", string.Empty). Replace("http", string.Empty); diff --git a/Helpers/ImagingHelper.cs b/Helpers/ImagingHelper.cs index 22c7b1e..e28b2e6 100644 --- a/Helpers/ImagingHelper.cs +++ b/Helpers/ImagingHelper.cs @@ -1,4 +1,8 @@ -namespace SystemTrayMenu.Helpers +// <copyright file="ImagingHelper.cs" company="PlaceholderCompany"> +// Copyright (c) PlaceholderCompany. All rights reserved. +// </copyright> + +namespace SystemTrayMenu.Helpers { using System.Drawing; using System.Drawing.Imaging; @@ -32,6 +36,7 @@ { width = height = size; } + Bitmap newBitmap = new Bitmap(inputBitmap, new Size(width, height)); if (newBitmap != null) { @@ -88,8 +93,10 @@ } } } + return false; } + return false; } diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 207efc9..f74de93 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.17.64")] -[assembly: AssemblyFileVersion("1.0.17.64")] +[assembly: AssemblyVersion("1.0.17.65")] +[assembly: AssemblyFileVersion("1.0.17.65")] diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index b96cf5d..d2b48d0 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -90,6 +90,16 @@ namespace SystemTrayMenu.Properties { } } + /// <summary> + /// Looks up a localized resource of type System.Byte[]. + /// </summary> + public static byte[] ic_fluent_search_48_regular { + get { + object obj = ResourceManager.GetObject("ic_fluent_search_48_regular", resourceCulture); + return ((byte[])(obj)); + } + } + /// <summary> /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// </summary> diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 8183ac5..081e7ae 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -190,4 +190,7 @@ <data name="ic_fluent_folder_48_regular" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\ic_fluent_folder_48_regular.svg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </data> + <data name="ic_fluent_search_48_regular" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ic_fluent_search_48_regular.svg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> </root> \ No newline at end of file diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index be2b44b..653f4df 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -142,16 +142,16 @@ namespace SystemTrayMenu.Properties [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool AppearAtMouseLocation + [global::System.Configuration.DefaultSettingValueAttribute("100")] + public int SizeInPercentage { get { - return ((bool)(this["AppearAtMouseLocation"])); + return ((int)(this["SizeInPercentage"])); } set { - this["AppearAtMouseLocation"] = value; + this["SizeInPercentage"] = value; } } @@ -187,6 +187,22 @@ namespace SystemTrayMenu.Properties } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool AppearAtMouseLocation + { + get + { + return ((bool)(this["AppearAtMouseLocation"])); + } + set + { + this["AppearAtMouseLocation"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/Resources/ic_fluent_search_48_regular.svg b/Resources/ic_fluent_search_48_regular.svg new file mode 100644 index 0000000..a4d83fb --- /dev/null +++ b/Resources/ic_fluent_search_48_regular.svg @@ -0,0 +1,3 @@ +<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill="#585858" d="M20 6C12.268 6 6 12.268 6 20C6 27.732 12.268 34 20 34C23.4159 34 26.5461 32.7766 28.9763 30.7441L39.8662 41.6339C40.3543 42.122 41.1458 42.122 41.6339 41.6339C42.1221 41.1457 42.1221 40.3543 41.6339 39.8661L30.7441 28.9763C32.7766 26.5461 34 23.4159 34 20C34 12.268 27.732 6 20 6ZM8.5 20C8.5 13.6487 13.6487 8.5 20 8.5C26.3513 8.5 31.5 13.6487 31.5 20C31.5 26.3513 26.3513 31.5 20 31.5C13.6487 31.5 8.5 26.3513 8.5 20Z"/> +</svg> diff --git a/Resources/lang.Designer.cs b/Resources/lang.Designer.cs index 72ec2c1..73c85f1 100644 --- a/Resources/lang.Designer.cs +++ b/Resources/lang.Designer.cs @@ -547,6 +547,15 @@ namespace SystemTrayMenu.Resources { } } + /// <summary> + /// Looks up a localized string similar to Size. + /// </summary> + internal static string Size { + get { + return ResourceManager.GetString("Size", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to Size and location. /// </summary> diff --git a/Resources/lang.resx b/Resources/lang.resx index 7154862..4457a11 100644 --- a/Resources/lang.resx +++ b/Resources/lang.resx @@ -321,4 +321,7 @@ <data name="Use icon from folder" xml:space="preserve"> <value>Use icon from folder</value> </data> + <data name="Size" xml:space="preserve"> + <value>Size</value> + </data> </root> \ No newline at end of file diff --git a/UserInterface/AppNotifyIcon.cs b/UserInterface/AppNotifyIcon.cs index 489f222..c807b5b 100644 --- a/UserInterface/AppNotifyIcon.cs +++ b/UserInterface/AppNotifyIcon.cs @@ -11,13 +11,13 @@ namespace SystemTrayMenu.UserInterface using System.Windows.Forms; using SystemTrayMenu.Helper; using SystemTrayMenu.Utilities; - using R = Properties.Resources; + using R = SystemTrayMenu.Properties.Resources; using Timer = System.Windows.Forms.Timer; internal class AppNotifyIcon : IDisposable { private const int Interval60FPS = 16; // 60fps=>1s/60fps=~16.6ms - private static Icon SystemTrayMenu = R.SystemTrayMenu; + private static Icon systemTrayMenu = R.SystemTrayMenu; private readonly Timer load = new Timer(); private readonly NotifyIcon notifyIcon = new NotifyIcon(); private readonly int indexLoad; @@ -43,13 +43,13 @@ namespace SystemTrayMenu.UserInterface if (Properties.Settings.Default.UseIconFromRootFolder) { - SystemTrayMenu = IconReader.GetFolderIconSTA( + systemTrayMenu = IconReader.GetFolderIconSTA( Config.Path, IconReader.FolderType.Closed, false); } - notifyIcon.Icon = SystemTrayMenu; + notifyIcon.Icon = systemTrayMenu; AppContextMenu contextMenus = new AppContextMenu(); contextMenus.ClickedOpenLog += ClickedOpenLog; @@ -132,7 +132,7 @@ namespace SystemTrayMenu.UserInterface } else { - notifyIcon.Icon = SystemTrayMenu; + notifyIcon.Icon = systemTrayMenu; load.Stop(); } } diff --git a/UserInterface/Menu.ControlsTheDesignerRemoves.cs b/UserInterface/Menu.ControlsTheDesignerRemoves.cs index 90afd86..aacfecc 100644 --- a/UserInterface/Menu.ControlsTheDesignerRemoves.cs +++ b/UserInterface/Menu.ControlsTheDesignerRemoves.cs @@ -1,4 +1,8 @@ -namespace SystemTrayMenu.UserInterface +// <copyright file="Menu.ControlsTheDesignerRemoves.cs" company="PlaceholderCompany"> +// Copyright (c) PlaceholderCompany. All rights reserved. +// </copyright> + +namespace SystemTrayMenu.UserInterface { using System; using System.Drawing; diff --git a/UserInterface/Menu.Designer.cs b/UserInterface/Menu.Designer.cs index d7f2ce3..0cc0be8 100644 --- a/UserInterface/Menu.Designer.cs +++ b/UserInterface/Menu.Designer.cs @@ -59,7 +59,7 @@ this.tableLayoutPanelDgvAndScrollbar.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanelDgvAndScrollbar.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanelDgvAndScrollbar.Controls.Add(this.dgv, 0, 0); - this.tableLayoutPanelDgvAndScrollbar.Location = new System.Drawing.Point(0, 16); + this.tableLayoutPanelDgvAndScrollbar.Location = new System.Drawing.Point(0, 22); this.tableLayoutPanelDgvAndScrollbar.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanelDgvAndScrollbar.Name = "tableLayoutPanelDgvAndScrollbar"; this.tableLayoutPanelDgvAndScrollbar.RowCount = 1; @@ -111,7 +111,7 @@ this.tableLayoutPanelSearch.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanelSearch.Controls.Add(this.textBoxSearch, 1, 0); this.tableLayoutPanelSearch.Controls.Add(this.pictureBoxSearch, 0, 0); - this.tableLayoutPanelSearch.Location = new System.Drawing.Point(0, 57); + this.tableLayoutPanelSearch.Location = new System.Drawing.Point(0, 63); this.tableLayoutPanelSearch.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); this.tableLayoutPanelSearch.Name = "tableLayoutPanelSearch"; this.tableLayoutPanelSearch.RowCount = 1; @@ -138,9 +138,10 @@ // this.pictureBoxSearch.BackColor = System.Drawing.Color.White; this.pictureBoxSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBoxSearch.Location = new System.Drawing.Point(3, 3); + this.pictureBoxSearch.Location = new System.Drawing.Point(1, 1); + this.pictureBoxSearch.Margin = new System.Windows.Forms.Padding(1); this.pictureBoxSearch.Name = "pictureBoxSearch"; - this.pictureBoxSearch.Size = new System.Drawing.Size(16, 16); + this.pictureBoxSearch.Size = new System.Drawing.Size(20, 20); this.pictureBoxSearch.TabIndex = 1; this.pictureBoxSearch.TabStop = false; this.pictureBoxSearch.Paint += new System.Windows.Forms.PaintEventHandler(this.PictureBoxSearch_Paint); @@ -162,7 +163,7 @@ this.tableLayoutPanelMenu.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelMenu.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelMenu.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanelMenu.Size = new System.Drawing.Size(83, 79); + this.tableLayoutPanelMenu.Size = new System.Drawing.Size(83, 85); this.tableLayoutPanelMenu.TabIndex = 4; this.tableLayoutPanelMenu.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.DgvMouseWheel); // @@ -182,17 +183,17 @@ this.tableLayoutPanelTitle.Name = "tableLayoutPanelTitle"; this.tableLayoutPanelTitle.RowCount = 1; this.tableLayoutPanelTitle.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanelTitle.Size = new System.Drawing.Size(83, 16); + this.tableLayoutPanelTitle.Size = new System.Drawing.Size(83, 22); this.tableLayoutPanelTitle.TabIndex = 5; // // pictureBoxOpenFolder // this.pictureBoxOpenFolder.BackColor = System.Drawing.Color.Transparent; this.pictureBoxOpenFolder.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBoxOpenFolder.Location = new System.Drawing.Point(0, 0); - this.pictureBoxOpenFolder.Margin = new System.Windows.Forms.Padding(0); + this.pictureBoxOpenFolder.Location = new System.Drawing.Point(1, 1); + this.pictureBoxOpenFolder.Margin = new System.Windows.Forms.Padding(1); this.pictureBoxOpenFolder.Name = "pictureBoxOpenFolder"; - this.pictureBoxOpenFolder.Size = new System.Drawing.Size(16, 16); + this.pictureBoxOpenFolder.Size = new System.Drawing.Size(20, 20); this.pictureBoxOpenFolder.TabIndex = 1; this.pictureBoxOpenFolder.TabStop = false; this.pictureBoxOpenFolder.Paint += new System.Windows.Forms.PaintEventHandler(this.PictureBoxMenuOpenFolder_Paint); @@ -205,10 +206,10 @@ // this.pictureBoxMenuAlwaysOpen.BackColor = System.Drawing.Color.Transparent; this.pictureBoxMenuAlwaysOpen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBoxMenuAlwaysOpen.Location = new System.Drawing.Point(67, 0); - this.pictureBoxMenuAlwaysOpen.Margin = new System.Windows.Forms.Padding(0); + this.pictureBoxMenuAlwaysOpen.Location = new System.Drawing.Point(62, 1); + this.pictureBoxMenuAlwaysOpen.Margin = new System.Windows.Forms.Padding(1); this.pictureBoxMenuAlwaysOpen.Name = "pictureBoxMenuAlwaysOpen"; - this.pictureBoxMenuAlwaysOpen.Size = new System.Drawing.Size(16, 16); + this.pictureBoxMenuAlwaysOpen.Size = new System.Drawing.Size(20, 20); this.pictureBoxMenuAlwaysOpen.TabIndex = 1; this.pictureBoxMenuAlwaysOpen.TabStop = false; this.pictureBoxMenuAlwaysOpen.Click += new System.EventHandler(this.PictureBoxMenuAlwaysOpen_Click); diff --git a/UserInterface/Menu.cs b/UserInterface/Menu.cs index fa2b861..78cad23 100644 --- a/UserInterface/Menu.cs +++ b/UserInterface/Menu.cs @@ -695,7 +695,8 @@ namespace SystemTrayMenu.UserInterface private void PictureBoxSearch_Paint(object sender, PaintEventArgs e) { - e.Graphics.DrawIcon(Search, new Rectangle(0, 0, pictureBoxSearch.Width, pictureBoxSearch.Height)); + PictureBox pictureBox = (PictureBox)sender; + e.Graphics.DrawImage(Config.BitmapSearch, new Rectangle(Point.Empty, pictureBox.ClientSize)); } private void PictureBoxMenuAlwaysOpen_Paint(object sender, PaintEventArgs e) diff --git a/UserInterface/SettingsForm.Designer.cs b/UserInterface/SettingsForm.Designer.cs index 03a0fcc..77de37e 100644 --- a/UserInterface/SettingsForm.Designer.cs +++ b/UserInterface/SettingsForm.Designer.cs @@ -63,13 +63,16 @@ namespace SystemTrayMenu.UserInterface this.checkBoxOpenItemWithOneClick = new System.Windows.Forms.CheckBox(); this.groupBoxSizeAndLocation = new System.Windows.Forms.GroupBox(); this.tableLayoutPanelSizeAndLocation = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.numericUpDownSizeInPercentage = new System.Windows.Forms.NumericUpDown(); + this.labelSize = new System.Windows.Forms.Label(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.numericUpDownMenuHeight = new System.Windows.Forms.NumericUpDown(); this.labelMaxMenuHeight = new System.Windows.Forms.Label(); - this.checkBoxAppearAtMouseLocation = new System.Windows.Forms.CheckBox(); this.tableLayoutPanelMaxMenuWidth = new System.Windows.Forms.TableLayoutPanel(); this.numericUpDownMenuWidth = new System.Windows.Forms.NumericUpDown(); this.labelMaxMenuWidth = new System.Windows.Forms.Label(); + this.checkBoxAppearAtMouseLocation = new System.Windows.Forms.CheckBox(); this.groupBoxStaysOpen = new System.Windows.Forms.GroupBox(); this.tableLayoutPanelStaysOpen = new System.Windows.Forms.TableLayoutPanel(); this.checkBoxStayOpenWhenItemClicked = new System.Windows.Forms.CheckBox(); @@ -265,6 +268,8 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelClick.SuspendLayout(); this.groupBoxSizeAndLocation.SuspendLayout(); this.tableLayoutPanelSizeAndLocation.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSizeInPercentage)).BeginInit(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMenuHeight)).BeginInit(); this.tableLayoutPanelMaxMenuWidth.SuspendLayout(); @@ -381,7 +386,7 @@ namespace SystemTrayMenu.UserInterface this.tabControl.Location = new System.Drawing.Point(6, 3); this.tabControl.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); this.tabControl.Name = "tabControl"; - this.tabControl.SelectedIndex = 2; + this.tabControl.SelectedIndex = 1; this.tabControl.Size = new System.Drawing.Size(422, 441); this.tabControl.TabIndex = 0; // @@ -815,7 +820,7 @@ namespace SystemTrayMenu.UserInterface this.groupBoxSizeAndLocation.MinimumSize = new System.Drawing.Size(400, 0); this.groupBoxSizeAndLocation.Name = "groupBoxSizeAndLocation"; this.groupBoxSizeAndLocation.Padding = new System.Windows.Forms.Padding(3, 3, 3, 6); - this.groupBoxSizeAndLocation.Size = new System.Drawing.Size(400, 108); + this.groupBoxSizeAndLocation.Size = new System.Drawing.Size(400, 137); this.groupBoxSizeAndLocation.TabIndex = 0; this.groupBoxSizeAndLocation.TabStop = false; this.groupBoxSizeAndLocation.Text = "groupBoxSizeAndLocation"; @@ -826,19 +831,59 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelSizeAndLocation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.tableLayoutPanelSizeAndLocation.ColumnCount = 1; this.tableLayoutPanelSizeAndLocation.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanelSizeAndLocation.Controls.Add(this.tableLayoutPanel2, 0, 0); this.tableLayoutPanelSizeAndLocation.Controls.Add(this.tableLayoutPanel1, 0, 2); - this.tableLayoutPanelSizeAndLocation.Controls.Add(this.checkBoxAppearAtMouseLocation, 0, 0); this.tableLayoutPanelSizeAndLocation.Controls.Add(this.tableLayoutPanelMaxMenuWidth, 0, 1); + this.tableLayoutPanelSizeAndLocation.Controls.Add(this.checkBoxAppearAtMouseLocation, 0, 3); this.tableLayoutPanelSizeAndLocation.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanelSizeAndLocation.Location = new System.Drawing.Point(3, 19); this.tableLayoutPanelSizeAndLocation.Name = "tableLayoutPanelSizeAndLocation"; - this.tableLayoutPanelSizeAndLocation.RowCount = 3; + this.tableLayoutPanelSizeAndLocation.RowCount = 4; this.tableLayoutPanelSizeAndLocation.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelSizeAndLocation.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanelSizeAndLocation.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanelSizeAndLocation.Size = new System.Drawing.Size(394, 83); + this.tableLayoutPanelSizeAndLocation.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelSizeAndLocation.Size = new System.Drawing.Size(394, 112); this.tableLayoutPanelSizeAndLocation.TabIndex = 0; // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel2.AutoSize = true; + this.tableLayoutPanel2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.Controls.Add(this.numericUpDownSizeInPercentage, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.labelSize, 1, 0); + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 1; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.Size = new System.Drawing.Size(394, 29); + this.tableLayoutPanel2.TabIndex = 0; + // + // numericUpDownSizeInPercentage + // + this.numericUpDownSizeInPercentage.Location = new System.Drawing.Point(3, 3); + this.numericUpDownSizeInPercentage.Name = "numericUpDownSizeInPercentage"; + this.numericUpDownSizeInPercentage.Size = new System.Drawing.Size(55, 23); + this.numericUpDownSizeInPercentage.TabIndex = 1; + this.numericUpDownSizeInPercentage.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.numericUpDownSizeInPercentage.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); + // + // labelSize + // + this.labelSize.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.labelSize.AutoSize = true; + this.labelSize.Location = new System.Drawing.Point(64, 7); + this.labelSize.MaximumSize = new System.Drawing.Size(330, 0); + this.labelSize.Name = "labelSize"; + this.labelSize.Size = new System.Drawing.Size(121, 15); + this.labelSize.TabIndex = 0; + this.labelSize.Text = "labelSizeInPercentage"; + // // tableLayoutPanel1 // this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); @@ -849,7 +894,7 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.Controls.Add(this.numericUpDownMenuHeight, 0, 0); this.tableLayoutPanel1.Controls.Add(this.labelMaxMenuHeight, 1, 0); - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 54); + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 58); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; @@ -863,6 +908,8 @@ namespace SystemTrayMenu.UserInterface this.numericUpDownMenuHeight.Name = "numericUpDownMenuHeight"; this.numericUpDownMenuHeight.Size = new System.Drawing.Size(55, 23); this.numericUpDownMenuHeight.TabIndex = 1; + this.numericUpDownMenuHeight.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.numericUpDownMenuHeight.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelMaxMenuHeight // @@ -875,17 +922,6 @@ namespace SystemTrayMenu.UserInterface this.labelMaxMenuHeight.TabIndex = 0; this.labelMaxMenuHeight.Text = "labelMaxMenuHeight"; // - // checkBoxAppearAtMouseLocation - // - this.checkBoxAppearAtMouseLocation.AutoSize = true; - this.checkBoxAppearAtMouseLocation.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBoxAppearAtMouseLocation.Location = new System.Drawing.Point(3, 3); - this.checkBoxAppearAtMouseLocation.Name = "checkBoxAppearAtMouseLocation"; - this.checkBoxAppearAtMouseLocation.Size = new System.Drawing.Size(388, 19); - this.checkBoxAppearAtMouseLocation.TabIndex = 0; - this.checkBoxAppearAtMouseLocation.Text = "checkBoxAppearAtMouseLocation"; - this.checkBoxAppearAtMouseLocation.UseVisualStyleBackColor = true; - // // tableLayoutPanelMaxMenuWidth // this.tableLayoutPanelMaxMenuWidth.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); @@ -896,7 +932,7 @@ namespace SystemTrayMenu.UserInterface this.tableLayoutPanelMaxMenuWidth.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanelMaxMenuWidth.Controls.Add(this.numericUpDownMenuWidth, 0, 0); this.tableLayoutPanelMaxMenuWidth.Controls.Add(this.labelMaxMenuWidth, 1, 0); - this.tableLayoutPanelMaxMenuWidth.Location = new System.Drawing.Point(0, 25); + this.tableLayoutPanelMaxMenuWidth.Location = new System.Drawing.Point(0, 29); this.tableLayoutPanelMaxMenuWidth.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanelMaxMenuWidth.Name = "tableLayoutPanelMaxMenuWidth"; this.tableLayoutPanelMaxMenuWidth.RowCount = 1; @@ -910,6 +946,8 @@ namespace SystemTrayMenu.UserInterface this.numericUpDownMenuWidth.Name = "numericUpDownMenuWidth"; this.numericUpDownMenuWidth.Size = new System.Drawing.Size(55, 23); this.numericUpDownMenuWidth.TabIndex = 1; + this.numericUpDownMenuWidth.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.numericUpDownMenuWidth.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelMaxMenuWidth // @@ -922,12 +960,23 @@ namespace SystemTrayMenu.UserInterface this.labelMaxMenuWidth.TabIndex = 0; this.labelMaxMenuWidth.Text = "labelMaxMenuWidth"; // + // checkBoxAppearAtMouseLocation + // + this.checkBoxAppearAtMouseLocation.AutoSize = true; + this.checkBoxAppearAtMouseLocation.Dock = System.Windows.Forms.DockStyle.Fill; + this.checkBoxAppearAtMouseLocation.Location = new System.Drawing.Point(3, 90); + this.checkBoxAppearAtMouseLocation.Name = "checkBoxAppearAtMouseLocation"; + this.checkBoxAppearAtMouseLocation.Size = new System.Drawing.Size(388, 19); + this.checkBoxAppearAtMouseLocation.TabIndex = 0; + this.checkBoxAppearAtMouseLocation.Text = "checkBoxAppearAtMouseLocation"; + this.checkBoxAppearAtMouseLocation.UseVisualStyleBackColor = true; + // // groupBoxStaysOpen // this.groupBoxStaysOpen.AutoSize = true; this.groupBoxStaysOpen.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.groupBoxStaysOpen.Controls.Add(this.tableLayoutPanelStaysOpen); - this.groupBoxStaysOpen.Location = new System.Drawing.Point(3, 170); + this.groupBoxStaysOpen.Location = new System.Drawing.Point(3, 199); this.groupBoxStaysOpen.MaximumSize = new System.Drawing.Size(400, 0); this.groupBoxStaysOpen.MinimumSize = new System.Drawing.Size(400, 0); this.groupBoxStaysOpen.Name = "groupBoxStaysOpen"; @@ -1016,13 +1065,15 @@ namespace SystemTrayMenu.UserInterface this.numericUpDownTimeUntilClose.Name = "numericUpDownTimeUntilClose"; this.numericUpDownTimeUntilClose.Size = new System.Drawing.Size(55, 23); this.numericUpDownTimeUntilClose.TabIndex = 1; + this.numericUpDownTimeUntilClose.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.numericUpDownTimeUntilClose.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // groupBoxOpenSubmenus // this.groupBoxOpenSubmenus.AutoSize = true; this.groupBoxOpenSubmenus.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.groupBoxOpenSubmenus.Controls.Add(this.tableLayoutPanelTimeUntilOpen); - this.groupBoxOpenSubmenus.Location = new System.Drawing.Point(3, 280); + this.groupBoxOpenSubmenus.Location = new System.Drawing.Point(3, 309); this.groupBoxOpenSubmenus.MaximumSize = new System.Drawing.Size(400, 0); this.groupBoxOpenSubmenus.MinimumSize = new System.Drawing.Size(400, 0); this.groupBoxOpenSubmenus.Name = "groupBoxOpenSubmenus"; @@ -1055,6 +1106,8 @@ namespace SystemTrayMenu.UserInterface this.numericUpDownTimeUntilOpens.Name = "numericUpDownTimeUntilOpens"; this.numericUpDownTimeUntilOpens.Size = new System.Drawing.Size(55, 23); this.numericUpDownTimeUntilOpens.TabIndex = 2; + this.numericUpDownTimeUntilOpens.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.numericUpDownTimeUntilOpens.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelTimeUntilOpen // @@ -1071,7 +1124,7 @@ namespace SystemTrayMenu.UserInterface // this.buttonAdvancedDefault.AutoSize = true; this.buttonAdvancedDefault.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.buttonAdvancedDefault.Location = new System.Drawing.Point(9, 346); + this.buttonAdvancedDefault.Location = new System.Drawing.Point(9, 375); this.buttonAdvancedDefault.Margin = new System.Windows.Forms.Padding(9, 9, 3, 9); this.buttonAdvancedDefault.MinimumSize = new System.Drawing.Size(75, 25); this.buttonAdvancedDefault.Name = "buttonAdvancedDefault"; @@ -1227,6 +1280,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorTitle.TabIndex = 2; this.textBoxColorTitle.Text = "#ffffff"; this.textBoxColorTitle.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorTitle.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorBackground.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelTitle // @@ -1278,6 +1333,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorBackground.TabIndex = 2; this.textBoxColorBackground.Text = "#ffffff"; this.textBoxColorBackground.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorBackground.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorBackground.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelBackground // @@ -1329,6 +1386,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSearchField.TabIndex = 2; this.textBoxColorSearchField.Text = "#ffffff"; this.textBoxColorSearchField.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSearchField.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSearchField.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelSearchField // @@ -1380,6 +1439,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorOpenFolder.TabIndex = 2; this.textBoxColorOpenFolder.Text = "#ffffff"; this.textBoxColorOpenFolder.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorOpenFolder.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorOpenFolder.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelOpenFolder // @@ -1430,6 +1491,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorOpenFolderBorder.TabIndex = 2; this.textBoxColorOpenFolderBorder.Text = "#ffffff"; this.textBoxColorOpenFolderBorder.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorOpenFolderBorder.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorOpenFolderBorder.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelOpenFolderBorder // @@ -1481,6 +1544,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSelectedItem.TabIndex = 2; this.textBoxColorSelectedItem.Text = "#ffffff"; this.textBoxColorSelectedItem.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSelectedItem.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSelectedItem.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelSelectedItem // @@ -1532,6 +1597,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSelectedItemBorder.TabIndex = 2; this.textBoxColorSelectedItemBorder.Text = "#ffffff"; this.textBoxColorSelectedItemBorder.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSelectedItemBorder.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSelectedItemBorder.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelSelectedItemBorder // @@ -1581,6 +1648,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorWarning.TabIndex = 2; this.textBoxColorWarning.Text = "#ffffff"; this.textBoxColorWarning.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorWarning.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorWarning.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // pictureBoxWarning // @@ -1643,6 +1712,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorScrollbarBackground.TabIndex = 2; this.textBoxColorScrollbarBackground.Text = "#ffffff"; this.textBoxColorScrollbarBackground.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorScrollbarBackground.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorScrollbarBackground.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelScrollbarBackground // @@ -1694,6 +1765,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSlider.TabIndex = 2; this.textBoxColorSlider.Text = "#ffffff"; this.textBoxColorSlider.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSlider.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSlider.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelSlider // @@ -1746,6 +1819,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSliderDragging.TabIndex = 2; this.textBoxColorSliderDragging.Text = "#ffffff"; this.textBoxColorSliderDragging.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSliderDragging.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSliderDragging.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelSliderDragging // @@ -1797,6 +1872,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSliderHover.TabIndex = 2; this.textBoxColorSliderHover.Text = "#ffffff"; this.textBoxColorSliderHover.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSliderHover.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSliderHover.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelSliderHover // @@ -1848,6 +1925,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSliderArrowsAndTrackHover.TabIndex = 2; this.textBoxColorSliderArrowsAndTrackHover.Text = "#ffffff"; this.textBoxColorSliderArrowsAndTrackHover.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSliderArrowsAndTrackHover.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSliderArrowsAndTrackHover.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelSliderArrowsAndTrackHover // @@ -1899,6 +1978,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrow.TabIndex = 2; this.textBoxColorArrow.Text = "#ffffff"; this.textBoxColorArrow.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrow.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrow.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelArrow // @@ -1950,6 +2031,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowClick.TabIndex = 2; this.textBoxColorArrowClick.Text = "#ffffff"; this.textBoxColorArrowClick.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowClick.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowClick.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelArrowClick // @@ -2001,6 +2084,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowClickBackground.TabIndex = 2; this.textBoxColorArrowClickBackground.Text = "#ffffff"; this.textBoxColorArrowClickBackground.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowClickBackground.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowClickBackground.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelArrowClickBackground // @@ -2052,6 +2137,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowHover.TabIndex = 2; this.textBoxColorArrowHover.Text = "#ffffff"; this.textBoxColorArrowHover.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowHover.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowHover.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelArrowHover // @@ -2103,6 +2190,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowHoverBackground.TabIndex = 2; this.textBoxColorArrowHoverBackground.Text = "#ffffff"; this.textBoxColorArrowHoverBackground.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowHoverBackground.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowHoverBackground.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelArrowHoverBackground // @@ -2270,6 +2359,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorTitleDarkMode.TabIndex = 2; this.textBoxColorTitleDarkMode.Text = "#ffffff"; this.textBoxColorTitleDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorTitleDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorTitleDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // tableLayoutPanelBackgroundDarkMode // @@ -2321,6 +2412,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorBackgroundDarkMode.TabIndex = 2; this.textBoxColorBackgroundDarkMode.Text = "#ffffff"; this.textBoxColorBackgroundDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorBackgroundDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorBackgroundDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // tableLayoutPanelSearchFieldDarkMode // @@ -2372,6 +2465,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSearchFieldDarkMode.TabIndex = 2; this.textBoxColorSearchFieldDarkMode.Text = "#ffffff"; this.textBoxColorSearchFieldDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSearchFieldDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSearchFieldDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // tableLayoutPanelOpenFolderDarkMode // @@ -2423,6 +2518,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorOpenFolderDarkMode.TabIndex = 2; this.textBoxColorOpenFolderDarkMode.Text = "#ffffff"; this.textBoxColorOpenFolderDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorOpenFolderDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorOpenFolderDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // tableLayoutPanelOpenFolderBorderDarkMode // @@ -2473,6 +2570,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorOpenFolderBorderDarkMode.TabIndex = 2; this.textBoxColorOpenFolderBorderDarkMode.Text = "#ffffff"; this.textBoxColorOpenFolderBorderDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorOpenFolderBorderDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorOpenFolderBorderDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // tableLayoutPanelSelectedItemDarkMode // @@ -2524,6 +2623,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSelecetedItemDarkMode.TabIndex = 2; this.textBoxColorSelecetedItemDarkMode.Text = "#ffffff"; this.textBoxColorSelecetedItemDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSelecetedItemDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSelecetedItemDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // tableLayoutPanelSelectedItemBorderDarkMode // @@ -2575,6 +2676,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSelectedItemBorderDarkMode.TabIndex = 2; this.textBoxColorSelectedItemBorderDarkMode.Text = "#ffffff"; this.textBoxColorSelectedItemBorderDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSelectedItemBorderDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSelectedItemBorderDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // tableLayoutPanelWarningDarkMode // @@ -2626,6 +2729,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorWarningDarkMode.TabIndex = 2; this.textBoxColorWarningDarkMode.Text = "#ffffff"; this.textBoxColorWarningDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorWarningDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorWarningDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelScrollbarDarkMode // @@ -2676,6 +2781,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorScrollbarBackgroundDarkMode.TabIndex = 2; this.textBoxColorScrollbarBackgroundDarkMode.Text = "#ffffff"; this.textBoxColorScrollbarBackgroundDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorScrollbarBackgroundDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorScrollbarBackgroundDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeScrollbarBackground // @@ -2727,6 +2834,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSliderDarkMode.TabIndex = 2; this.textBoxColorSliderDarkMode.Text = "#ffffff"; this.textBoxColorSliderDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSliderDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSliderDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeSlider // @@ -2778,6 +2887,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSliderDraggingDarkMode.TabIndex = 2; this.textBoxColorSliderDraggingDarkMode.Text = "#ffffff"; this.textBoxColorSliderDraggingDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSliderDraggingDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSliderDraggingDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeSliderDragging // @@ -2829,6 +2940,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSliderHoverDarkMode.TabIndex = 2; this.textBoxColorSliderHoverDarkMode.Text = "#ffffff"; this.textBoxColorSliderHoverDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSliderHoverDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSliderHoverDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeSliderHover // @@ -2880,6 +2993,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorSliderArrowsAndTrackHoverDarkMode.TabIndex = 2; this.textBoxColorSliderArrowsAndTrackHoverDarkMode.Text = "#ffffff"; this.textBoxColorSliderArrowsAndTrackHoverDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorSliderArrowsAndTrackHoverDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorSliderArrowsAndTrackHoverDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeSliderArrowsAndTrackHover // @@ -2931,6 +3046,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowDarkMode.TabIndex = 2; this.textBoxColorArrowDarkMode.Text = "#ffffff"; this.textBoxColorArrowDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeArrow // @@ -2982,6 +3099,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowClickDarkMode.TabIndex = 2; this.textBoxColorArrowClickDarkMode.Text = "#ffffff"; this.textBoxColorArrowClickDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowClickDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowClickDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeArrowClick // @@ -3033,6 +3152,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowClickBackgroundDarkMode.TabIndex = 2; this.textBoxColorArrowClickBackgroundDarkMode.Text = "#ffffff"; this.textBoxColorArrowClickBackgroundDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowClickBackgroundDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowClickBackgroundDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeArrowClickBackground // @@ -3084,6 +3205,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowHoverDarkMode.TabIndex = 2; this.textBoxColorArrowHoverDarkMode.Text = "#ffffff"; this.textBoxColorArrowHoverDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowHoverDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowHoverDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeArrowHover // @@ -3135,6 +3258,8 @@ namespace SystemTrayMenu.UserInterface this.textBoxColorArrowHoverBackgroundDarkMode.TabIndex = 2; this.textBoxColorArrowHoverBackgroundDarkMode.Text = "#ffffff"; this.textBoxColorArrowHoverBackgroundDarkMode.TextChanged += new System.EventHandler(this.TextBoxColorsChanged); + this.textBoxColorArrowHoverBackgroundDarkMode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyDown); + this.textBoxColorArrowHoverBackgroundDarkMode.KeyUp += new System.Windows.Forms.KeyEventHandler(this.StopPlayingDingSoundEnterKeyPressed_KeyUp); // // labelColorDarkModeArrowHoverBackground // @@ -3265,6 +3390,9 @@ namespace SystemTrayMenu.UserInterface this.groupBoxSizeAndLocation.PerformLayout(); this.tableLayoutPanelSizeAndLocation.ResumeLayout(false); this.tableLayoutPanelSizeAndLocation.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSizeInPercentage)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMenuHeight)).EndInit(); @@ -3625,8 +3753,10 @@ namespace SystemTrayMenu.UserInterface private System.Windows.Forms.PictureBox pictureBoxSliderDarkMode; private System.Windows.Forms.TextBox textBoxColorSliderDarkMode; private System.Windows.Forms.Label labelColorDarkModeSlider; - private System.Windows.Forms.Button C; private System.Windows.Forms.Button buttonColorsDefaultDarkMode; private System.Windows.Forms.CheckBox checkBoxUseIconFromRootFolder; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.NumericUpDown numericUpDownSizeInPercentage; + private System.Windows.Forms.Label labelSize; } } \ No newline at end of file diff --git a/UserInterface/SettingsForm.cs b/UserInterface/SettingsForm.cs index eafdb6f..adebb27 100644 --- a/UserInterface/SettingsForm.cs +++ b/UserInterface/SettingsForm.cs @@ -114,9 +114,10 @@ namespace SystemTrayMenu.UserInterface groupBoxClick.Text = Translator.GetText("Click"); checkBoxOpenItemWithOneClick.Text = Translator.GetText("Single click to start item"); groupBoxSizeAndLocation.Text = Translator.GetText("Size and location"); - checkBoxAppearAtMouseLocation.Text = Translator.GetText("Appear at mouse location"); + labelSize.Text = $"% {Translator.GetText("Size")}"; labelMaxMenuWidth.Text = Translator.GetText("Pixels maximum menu width"); labelMaxMenuHeight.Text = Translator.GetText("Pixels maximum menu height"); + checkBoxAppearAtMouseLocation.Text = Translator.GetText("Appear at mouse location"); groupBoxStaysOpen.Text = Translator.GetText("Stays open"); checkBoxStayOpenWhenItemClicked.Text = Translator.GetText("If an item was clicked"); checkBoxStayOpenWhenFocusLost.Text = Translator.GetText("If the focus is lost and if the mouse is still on the menu"); @@ -230,7 +231,11 @@ namespace SystemTrayMenu.UserInterface checkBoxStoreConfigAtAssemblyLocation.Checked = CustomSettingsProvider.IsActivatedConfigPathAssembly(); checkBoxOpenItemWithOneClick.Checked = Settings.Default.OpenItemWithOneClick; - checkBoxAppearAtMouseLocation.Checked = Settings.Default.AppearAtMouseLocation; + + numericUpDownSizeInPercentage.Minimum = 100; + numericUpDownSizeInPercentage.Maximum = 200; + numericUpDownSizeInPercentage.Increment = 25; + numericUpDownSizeInPercentage.Value = Settings.Default.SizeInPercentage; numericUpDownMenuWidth.Minimum = 50; numericUpDownMenuWidth.Maximum = 1000; @@ -242,6 +247,8 @@ namespace SystemTrayMenu.UserInterface numericUpDownMenuHeight.Increment = 10; numericUpDownMenuHeight.Value = Settings.Default.MaximumMenuHeight; + checkBoxAppearAtMouseLocation.Checked = Settings.Default.AppearAtMouseLocation; + checkBoxStayOpenWhenItemClicked.Checked = Settings.Default.StaysOpenWhenItemClicked; checkBoxStayOpenWhenFocusLost.Checked = Settings.Default.StaysOpenWhenFocusLost; @@ -483,6 +490,7 @@ namespace SystemTrayMenu.UserInterface Settings.Default.OpenItemWithOneClick = checkBoxOpenItemWithOneClick.Checked; Settings.Default.AppearAtMouseLocation = checkBoxAppearAtMouseLocation.Checked; + Settings.Default.SizeInPercentage = (int)numericUpDownSizeInPercentage.Value; Settings.Default.MaximumMenuWidth = (int)numericUpDownMenuWidth.Value; Settings.Default.MaximumMenuHeight = (int)numericUpDownMenuHeight.Value; Settings.Default.StaysOpenWhenItemClicked = checkBoxStayOpenWhenItemClicked.Checked; @@ -516,6 +524,7 @@ namespace SystemTrayMenu.UserInterface { checkBoxOpenItemWithOneClick.Checked = true; checkBoxAppearAtMouseLocation.Checked = false; + numericUpDownSizeInPercentage.Value = 100; numericUpDownMenuWidth.Value = 300; numericUpDownMenuHeight.Value = 600; checkBoxStayOpenWhenItemClicked.Checked = true; @@ -697,5 +706,21 @@ namespace SystemTrayMenu.UserInterface textBoxColorSliderDraggingDarkMode.Text = "#a6a6a6"; textBoxColorScrollbarBackgroundDarkMode.Text = "#171717"; } + + private void StopPlayingDingSoundEnterKeyPressed_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + e.Handled = e.SuppressKeyPress = true; + } + } + + private void StopPlayingDingSoundEnterKeyPressed_KeyUp(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + e.Handled = e.SuppressKeyPress = true; + } + } } } diff --git a/Utilities/Scaling.cs b/Utilities/Scaling.cs index 5f714e9..104e812 100644 --- a/Utilities/Scaling.cs +++ b/Utilities/Scaling.cs @@ -19,11 +19,7 @@ namespace SystemTrayMenu.Utilities internal static void Initialize() { -#warning [Feature(s)] High resolution compatibility #188 - Factor = 1f; // todo put factor to options - - // Not more necesssary, i think since upgrade to .net core - // CalculateScalingFactor(); + Factor = Properties.Settings.Default.SizeInPercentage / 100f; } internal static int Scale(int width) @@ -31,6 +27,10 @@ namespace SystemTrayMenu.Utilities return (int)Math.Round(width * Factor, 0, MidpointRounding.AwayFromZero); } + /// <summary> + /// https://stackoverflow.com/questions/5977445/how-to-get-windows-display-settings + /// Since .net core 3.1 not more necessary / always returns 1. + /// </summary> private static void CalculateScalingFactor() { Graphics g = Graphics.FromHwnd(IntPtr.Zero);