diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index ee00a8fdd..c1700117d 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -201,15 +201,16 @@ private void InitializeComponent() this.tsmiTrayHashCheck = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayIndexFolder = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayImageEffects = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiScreenshotsFolder = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayHistory = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayImageHistory = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayDonate = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayAbout = new System.Windows.Forms.ToolStripMenuItem(); this.tssTray3 = new System.Windows.Forms.ToolStripSeparator(); + this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem(); this.ssToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiTrayMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tsMain.SuspendLayout(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -1200,6 +1201,7 @@ private void InitializeComponent() this.tsmiTrayDonate, this.tsmiTrayAbout, this.tssTray3, + this.tsmiTrayShow, this.tsmiTrayExit}); this.cmsTray.Name = "cmsTray"; this.cmsTray.Size = new System.Drawing.Size(189, 418); @@ -1503,6 +1505,14 @@ private void InitializeComponent() this.tsmiTrayImageEffects.Text = "Image effects..."; this.tsmiTrayImageEffects.Click += new System.EventHandler(this.tsmiImageEffects_Click); // + // tsmiTrayMonitorTest + // + this.tsmiTrayMonitorTest.Image = global::ShareX.Properties.Resources.monitor; + this.tsmiTrayMonitorTest.Name = "tsmiTrayMonitorTest"; + this.tsmiTrayMonitorTest.Size = new System.Drawing.Size(183, 22); + this.tsmiTrayMonitorTest.Text = "Monitor test..."; + this.tsmiTrayMonitorTest.Click += new System.EventHandler(this.tsmiMonitorTest_Click); + // // tsmiScreenshotsFolder // this.tsmiScreenshotsFolder.Image = global::ShareX.Properties.Resources.folder_open_image; @@ -1548,6 +1558,14 @@ private void InitializeComponent() this.tssTray3.Name = "tssTray3"; this.tssTray3.Size = new System.Drawing.Size(185, 6); // + // tsmiTrayShow + // + this.tsmiTrayShow.Image = global::ShareX.Properties.Resources.tick_button; + this.tsmiTrayShow.Name = "tsmiTrayShow"; + this.tsmiTrayShow.Size = new System.Drawing.Size(188, 22); + this.tsmiTrayShow.Text = "Show ShareX window"; + this.tsmiTrayShow.Click += new System.EventHandler(this.tsmiTrayShow_Click); + // // tsmiTrayExit // this.tsmiTrayExit.Image = global::ShareX.Properties.Resources.cross_button; @@ -1562,14 +1580,6 @@ private void InitializeComponent() this.ssToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.ssToolStripMenuItem.Text = "ss"; // - // tsmiTrayMonitorTest - // - this.tsmiTrayMonitorTest.Image = global::ShareX.Properties.Resources.monitor; - this.tsmiTrayMonitorTest.Name = "tsmiTrayMonitorTest"; - this.tsmiTrayMonitorTest.Size = new System.Drawing.Size(183, 22); - this.tsmiTrayMonitorTest.Text = "Monitor test..."; - this.tsmiTrayMonitorTest.Click += new System.EventHandler(this.tsmiMonitorTest_Click); - // // MainForm // this.AllowDrop = true; @@ -1757,5 +1767,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripButton tsmiDonate; private System.Windows.Forms.ToolStripMenuItem tsmiMonitorTest; private System.Windows.Forms.ToolStripMenuItem tsmiTrayMonitorTest; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayShow; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 41a6015f5..a1067af0a 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -921,6 +921,11 @@ private void niTray_BalloonTipClicked(object sender, EventArgs e) } } + private void tsmiTrayShow_Click(object sender, EventArgs e) + { + this.ShowActivate(); + } + private void tsmiTrayExit_Click(object sender, EventArgs e) { ForceClose(); diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index ad5b79168..62e753991 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -301,7 +301,6 @@ - Designer diff --git a/ShareX/app.config b/ShareX/app.config deleted file mode 100644 index 44298137a..000000000 --- a/ShareX/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file