mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
Added Show window button to tray menu
This commit is contained in:
parent
7c437c1a6d
commit
98d22dd131
4 changed files with 25 additions and 21 deletions
29
ShareX/Forms/MainForm.Designer.cs
generated
29
ShareX/Forms/MainForm.Designer.cs
generated
|
@ -201,15 +201,16 @@ private void InitializeComponent()
|
||||||
this.tsmiTrayHashCheck = new System.Windows.Forms.ToolStripMenuItem();
|
this.tsmiTrayHashCheck = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tsmiTrayIndexFolder = new System.Windows.Forms.ToolStripMenuItem();
|
this.tsmiTrayIndexFolder = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tsmiTrayImageEffects = 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.tsmiScreenshotsFolder = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tsmiTrayHistory = new System.Windows.Forms.ToolStripMenuItem();
|
this.tsmiTrayHistory = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tsmiTrayImageHistory = new System.Windows.Forms.ToolStripMenuItem();
|
this.tsmiTrayImageHistory = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tsmiTrayDonate = new System.Windows.Forms.ToolStripMenuItem();
|
this.tsmiTrayDonate = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tsmiTrayAbout = new System.Windows.Forms.ToolStripMenuItem();
|
this.tsmiTrayAbout = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tssTray3 = new System.Windows.Forms.ToolStripSeparator();
|
this.tssTray3 = new System.Windows.Forms.ToolStripSeparator();
|
||||||
|
this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem();
|
this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.ssToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.ssToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.tsmiTrayMonitorTest = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.tsMain.SuspendLayout();
|
this.tsMain.SuspendLayout();
|
||||||
this.scMain.Panel1.SuspendLayout();
|
this.scMain.Panel1.SuspendLayout();
|
||||||
this.scMain.Panel2.SuspendLayout();
|
this.scMain.Panel2.SuspendLayout();
|
||||||
|
@ -1200,6 +1201,7 @@ private void InitializeComponent()
|
||||||
this.tsmiTrayDonate,
|
this.tsmiTrayDonate,
|
||||||
this.tsmiTrayAbout,
|
this.tsmiTrayAbout,
|
||||||
this.tssTray3,
|
this.tssTray3,
|
||||||
|
this.tsmiTrayShow,
|
||||||
this.tsmiTrayExit});
|
this.tsmiTrayExit});
|
||||||
this.cmsTray.Name = "cmsTray";
|
this.cmsTray.Name = "cmsTray";
|
||||||
this.cmsTray.Size = new System.Drawing.Size(189, 418);
|
this.cmsTray.Size = new System.Drawing.Size(189, 418);
|
||||||
|
@ -1503,6 +1505,14 @@ private void InitializeComponent()
|
||||||
this.tsmiTrayImageEffects.Text = "Image effects...";
|
this.tsmiTrayImageEffects.Text = "Image effects...";
|
||||||
this.tsmiTrayImageEffects.Click += new System.EventHandler(this.tsmiImageEffects_Click);
|
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
|
// tsmiScreenshotsFolder
|
||||||
//
|
//
|
||||||
this.tsmiScreenshotsFolder.Image = global::ShareX.Properties.Resources.folder_open_image;
|
this.tsmiScreenshotsFolder.Image = global::ShareX.Properties.Resources.folder_open_image;
|
||||||
|
@ -1548,6 +1558,14 @@ private void InitializeComponent()
|
||||||
this.tssTray3.Name = "tssTray3";
|
this.tssTray3.Name = "tssTray3";
|
||||||
this.tssTray3.Size = new System.Drawing.Size(185, 6);
|
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
|
// tsmiTrayExit
|
||||||
//
|
//
|
||||||
this.tsmiTrayExit.Image = global::ShareX.Properties.Resources.cross_button;
|
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.Size = new System.Drawing.Size(152, 22);
|
||||||
this.ssToolStripMenuItem.Text = "ss";
|
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
|
// MainForm
|
||||||
//
|
//
|
||||||
this.AllowDrop = true;
|
this.AllowDrop = true;
|
||||||
|
@ -1757,5 +1767,6 @@ private void InitializeComponent()
|
||||||
private System.Windows.Forms.ToolStripButton tsmiDonate;
|
private System.Windows.Forms.ToolStripButton tsmiDonate;
|
||||||
private System.Windows.Forms.ToolStripMenuItem tsmiMonitorTest;
|
private System.Windows.Forms.ToolStripMenuItem tsmiMonitorTest;
|
||||||
private System.Windows.Forms.ToolStripMenuItem tsmiTrayMonitorTest;
|
private System.Windows.Forms.ToolStripMenuItem tsmiTrayMonitorTest;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem tsmiTrayShow;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -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)
|
private void tsmiTrayExit_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
ForceClose();
|
ForceClose();
|
||||||
|
|
|
@ -301,7 +301,6 @@
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="app.config" />
|
|
||||||
<None Include="app.manifest">
|
<None Include="app.manifest">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</None>
|
</None>
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
|
||||||
<dependentAssembly>
|
|
||||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
|
||||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
Loading…
Reference in a new issue