CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-06-14 16:35:11 +12:00
Code Issues Projects Releases Wiki Activity

[BUG] FileLoadException: Could not load file or assembly 'System.Drawing.Common, Version=4.0.2.2 (#165), version 1.0.17.40

Browse source
This commit is contained in:
Markus Hofknecht 2021-05-09 13:14:37 +02:00
parent 313d786555
commit 600d73d40e
4 changed files with 5 additions and 2029 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
UserInterface/AppNotifyIcon.cs
View file

@ -17,6 +17,7 @@ namespace SystemTrayMenu.UserInterface
internal class AppNotifyIcon : IDisposable
{
private const int Interval60FPS = 16; // 60fps=>1s/60fps=~16.6ms
private static readonly Icon SystemTrayMenu = R.SystemTrayMenu;
private readonly Timer load = new Timer();
private readonly NotifyIcon notifyIcon = new NotifyIcon();
private readonly int indexLoad;
@ -39,7 +40,7 @@ namespace SystemTrayMenu.UserInterface
load.Interval = Interval60FPS;
notifyIcon.Text = Translator.GetText("SystemTrayMenu");
notifyIcon.Visible = true;
notifyIcon.Icon = R.SystemTrayMenu;
notifyIcon.Icon = SystemTrayMenu;
AppContextMenu contextMenus = new AppContextMenu();
contextMenus.ClickedOpenLog += ClickedOpenLog;
@ -120,7 +121,7 @@ namespace SystemTrayMenu.UserInterface
}
else
{
notifyIcon.Icon = R.SystemTrayMenu;
notifyIcon.Icon = SystemTrayMenu;
load.Stop();
}
}

2
UserInterface/SettingsForm.Designer.cs generated
View file

@ -30,7 +30,6 @@ namespace SystemTrayMenu.UserInterface
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsForm));
this.tableLayoutPanelMain = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanelBottom = new System.Windows.Forms.TableLayoutPanel();
this.buttonOk = new System.Windows.Forms.Button();
@ -1365,7 +1364,6 @@ namespace SystemTrayMenu.UserInterface
this.ClientSize = new System.Drawing.Size(1115, 520);
this.Controls.Add(this.tableLayoutPanelMain);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "SettingsForm";

2
UserInterface/SettingsForm.cs
View file

@ -18,6 +18,7 @@ namespace SystemTrayMenu.UserInterface
public partial class SettingsForm : Form
{
private static readonly Icon SystemTrayMenu = Resources.SystemTrayMenu;
private readonly string newHotKey = string.Empty;
private bool inHotkey;
private ColorConverter colorConverter = new ColorConverter();
@ -25,6 +26,7 @@ namespace SystemTrayMenu.UserInterface
public SettingsForm()
{
InitializeComponent();
Icon = SystemTrayMenu;
// Initialize and replace here here, because designer always removes it
InitializeTextBoxHotkeyAndReplacetextBoxHotkeyPlaceholder();

2025
UserInterface/SettingsForm.resx
View file

File diff suppressed because it is too large Load diff