From 37fae02e3a2d713e65f8f2c073c857d068dda955 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 17 Dec 2018 16:52:59 +0300 Subject: [PATCH] Added screenshot delay shortcut to also tray menu --- ShareX/Forms/MainForm.Designer.cs | 128 +++- ShareX/Forms/MainForm.cs | 14 +- ShareX/Forms/MainForm.resx | 916 +++++++++++++----------- ShareX/Properties/Resources.Designer.cs | 2 +- ShareX/Properties/Resources.resx | 2 +- 5 files changed, 624 insertions(+), 438 deletions(-) diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 14e6c0ae6..563561152 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -61,6 +61,12 @@ private void InitializeComponent() this.tssCapture1 = new System.Windows.Forms.ToolStripSeparator(); this.tsmiShowCursor = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiScreenshotDelay = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiScreenshotDelay0 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiScreenshotDelay1 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiScreenshotDelay2 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiScreenshotDelay3 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiScreenshotDelay4 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiScreenshotDelay5 = new System.Windows.Forms.ToolStripMenuItem(); this.tsddbUpload = new System.Windows.Forms.ToolStripDropDownButton(); this.tsmiUploadFile = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiUploadFolder = new System.Windows.Forms.ToolStripMenuItem(); @@ -196,6 +202,7 @@ private void InitializeComponent() this.tsmiTrayAutoCapture = new System.Windows.Forms.ToolStripMenuItem(); this.tssTrayCapture1 = new System.Windows.Forms.ToolStripSeparator(); this.tsmiTrayShowCursor = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScreenshotDelay = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayUpload = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayUploadFile = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayUploadFolder = new System.Windows.Forms.ToolStripMenuItem(); @@ -263,12 +270,12 @@ private void InitializeComponent() this.ucNews = new ShareX.NewsListControl(); this.flpCommunity = new System.Windows.Forms.FlowLayoutPanel(); this.flpDiscord = new System.Windows.Forms.FlowLayoutPanel(); - this.tsmiScreenshotDelay5 = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiScreenshotDelay4 = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiScreenshotDelay3 = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiScreenshotDelay2 = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiScreenshotDelay1 = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiScreenshotDelay0 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScreenshotDelay0 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScreenshotDelay1 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScreenshotDelay2 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScreenshotDelay3 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScreenshotDelay4 = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayScreenshotDelay5 = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -562,9 +569,44 @@ private void InitializeComponent() this.tsmiScreenshotDelay3, this.tsmiScreenshotDelay4, this.tsmiScreenshotDelay5}); - this.tsmiScreenshotDelay.Image = global::ShareX.Properties.Resources.clock_select; - this.tsmiScreenshotDelay.Name = "tsmiScreenshotDelay"; resources.ApplyResources(this.tsmiScreenshotDelay, "tsmiScreenshotDelay"); + this.tsmiScreenshotDelay.Name = "tsmiScreenshotDelay"; + // + // tsmiScreenshotDelay0 + // + this.tsmiScreenshotDelay0.Name = "tsmiScreenshotDelay0"; + resources.ApplyResources(this.tsmiScreenshotDelay0, "tsmiScreenshotDelay0"); + this.tsmiScreenshotDelay0.Click += new System.EventHandler(this.tsmiScreenshotDelay0_Click); + // + // tsmiScreenshotDelay1 + // + this.tsmiScreenshotDelay1.Name = "tsmiScreenshotDelay1"; + resources.ApplyResources(this.tsmiScreenshotDelay1, "tsmiScreenshotDelay1"); + this.tsmiScreenshotDelay1.Click += new System.EventHandler(this.tsmiScreenshotDelay1_Click); + // + // tsmiScreenshotDelay2 + // + this.tsmiScreenshotDelay2.Name = "tsmiScreenshotDelay2"; + resources.ApplyResources(this.tsmiScreenshotDelay2, "tsmiScreenshotDelay2"); + this.tsmiScreenshotDelay2.Click += new System.EventHandler(this.tsmiScreenshotDelay2_Click); + // + // tsmiScreenshotDelay3 + // + this.tsmiScreenshotDelay3.Name = "tsmiScreenshotDelay3"; + resources.ApplyResources(this.tsmiScreenshotDelay3, "tsmiScreenshotDelay3"); + this.tsmiScreenshotDelay3.Click += new System.EventHandler(this.tsmiScreenshotDelay3_Click); + // + // tsmiScreenshotDelay4 + // + this.tsmiScreenshotDelay4.Name = "tsmiScreenshotDelay4"; + resources.ApplyResources(this.tsmiScreenshotDelay4, "tsmiScreenshotDelay4"); + this.tsmiScreenshotDelay4.Click += new System.EventHandler(this.tsmiScreenshotDelay4_Click); + // + // tsmiScreenshotDelay5 + // + this.tsmiScreenshotDelay5.Name = "tsmiScreenshotDelay5"; + resources.ApplyResources(this.tsmiScreenshotDelay5, "tsmiScreenshotDelay5"); + this.tsmiScreenshotDelay5.Click += new System.EventHandler(this.tsmiScreenshotDelay5_Click); // // tsddbUpload // @@ -1493,7 +1535,8 @@ private void InitializeComponent() this.tsmiTrayTextCapture, this.tsmiTrayAutoCapture, this.tssTrayCapture1, - this.tsmiTrayShowCursor}); + this.tsmiTrayShowCursor, + this.tsmiTrayScreenshotDelay}); this.tsmiTrayCapture.Image = global::ShareX.Properties.Resources.camera; this.tsmiTrayCapture.Name = "tsmiTrayCapture"; resources.ApplyResources(this.tsmiTrayCapture, "tsmiTrayCapture"); @@ -1594,6 +1637,18 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayShowCursor, "tsmiTrayShowCursor"); this.tsmiTrayShowCursor.Click += new System.EventHandler(this.tsmiShowCursor_Click); // + // tsmiTrayScreenshotDelay + // + this.tsmiTrayScreenshotDelay.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsmiTrayScreenshotDelay0, + this.tsmiTrayScreenshotDelay1, + this.tsmiTrayScreenshotDelay2, + this.tsmiTrayScreenshotDelay3, + this.tsmiTrayScreenshotDelay4, + this.tsmiTrayScreenshotDelay5}); + resources.ApplyResources(this.tsmiTrayScreenshotDelay, "tsmiTrayScreenshotDelay"); + this.tsmiTrayScreenshotDelay.Name = "tsmiTrayScreenshotDelay"; + // // tsmiTrayUpload // this.tsmiTrayUpload.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -2085,41 +2140,41 @@ private void InitializeComponent() this.flpDiscord.Controls.Add(this.pbDiscordHide); this.flpDiscord.Name = "flpDiscord"; // - // tsmiScreenshotDelay5 + // tsmiTrayScreenshotDelay0 // - this.tsmiScreenshotDelay5.Name = "tsmiScreenshotDelay5"; - resources.ApplyResources(this.tsmiScreenshotDelay5, "tsmiScreenshotDelay5"); - this.tsmiScreenshotDelay5.Click += new System.EventHandler(this.tsmiScreenshotDelay5_Click); + this.tsmiTrayScreenshotDelay0.Name = "tsmiTrayScreenshotDelay0"; + resources.ApplyResources(this.tsmiTrayScreenshotDelay0, "tsmiTrayScreenshotDelay0"); + this.tsmiTrayScreenshotDelay0.Click += new System.EventHandler(this.tsmiScreenshotDelay0_Click); // - // tsmiScreenshotDelay4 + // tsmiTrayScreenshotDelay1 // - this.tsmiScreenshotDelay4.Name = "tsmiScreenshotDelay4"; - resources.ApplyResources(this.tsmiScreenshotDelay4, "tsmiScreenshotDelay4"); - this.tsmiScreenshotDelay4.Click += new System.EventHandler(this.tsmiScreenshotDelay4_Click); + this.tsmiTrayScreenshotDelay1.Name = "tsmiTrayScreenshotDelay1"; + resources.ApplyResources(this.tsmiTrayScreenshotDelay1, "tsmiTrayScreenshotDelay1"); + this.tsmiTrayScreenshotDelay1.Click += new System.EventHandler(this.tsmiScreenshotDelay1_Click); // - // tsmiScreenshotDelay3 + // tsmiTrayScreenshotDelay2 // - this.tsmiScreenshotDelay3.Name = "tsmiScreenshotDelay3"; - resources.ApplyResources(this.tsmiScreenshotDelay3, "tsmiScreenshotDelay3"); - this.tsmiScreenshotDelay3.Click += new System.EventHandler(this.tsmiScreenshotDelay3_Click); + this.tsmiTrayScreenshotDelay2.Name = "tsmiTrayScreenshotDelay2"; + resources.ApplyResources(this.tsmiTrayScreenshotDelay2, "tsmiTrayScreenshotDelay2"); + this.tsmiTrayScreenshotDelay2.Click += new System.EventHandler(this.tsmiScreenshotDelay2_Click); // - // tsmiScreenshotDelay2 + // tsmiTrayScreenshotDelay3 // - this.tsmiScreenshotDelay2.Name = "tsmiScreenshotDelay2"; - resources.ApplyResources(this.tsmiScreenshotDelay2, "tsmiScreenshotDelay2"); - this.tsmiScreenshotDelay2.Click += new System.EventHandler(this.tsmiScreenshotDelay2_Click); + this.tsmiTrayScreenshotDelay3.Name = "tsmiTrayScreenshotDelay3"; + resources.ApplyResources(this.tsmiTrayScreenshotDelay3, "tsmiTrayScreenshotDelay3"); + this.tsmiTrayScreenshotDelay3.Click += new System.EventHandler(this.tsmiScreenshotDelay3_Click); // - // tsmiScreenshotDelay1 + // tsmiTrayScreenshotDelay4 // - this.tsmiScreenshotDelay1.Name = "tsmiScreenshotDelay1"; - resources.ApplyResources(this.tsmiScreenshotDelay1, "tsmiScreenshotDelay1"); - this.tsmiScreenshotDelay1.Click += new System.EventHandler(this.tsmiScreenshotDelay1_Click); + this.tsmiTrayScreenshotDelay4.Name = "tsmiTrayScreenshotDelay4"; + resources.ApplyResources(this.tsmiTrayScreenshotDelay4, "tsmiTrayScreenshotDelay4"); + this.tsmiTrayScreenshotDelay4.Click += new System.EventHandler(this.tsmiScreenshotDelay4_Click); // - // tsmiScreenshotDelay0 + // tsmiTrayScreenshotDelay5 // - this.tsmiScreenshotDelay0.Name = "tsmiScreenshotDelay0"; - resources.ApplyResources(this.tsmiScreenshotDelay0, "tsmiScreenshotDelay0"); - this.tsmiScreenshotDelay0.Click += new System.EventHandler(this.tsmiScreenshotDelay0_Click); + this.tsmiTrayScreenshotDelay5.Name = "tsmiTrayScreenshotDelay5"; + resources.ApplyResources(this.tsmiTrayScreenshotDelay5, "tsmiTrayScreenshotDelay5"); + this.tsmiTrayScreenshotDelay5.Click += new System.EventHandler(this.tsmiScreenshotDelay5_Click); // // MainForm // @@ -2407,5 +2462,12 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiScreenshotDelay3; private System.Windows.Forms.ToolStripMenuItem tsmiScreenshotDelay4; private System.Windows.Forms.ToolStripMenuItem tsmiScreenshotDelay5; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenshotDelay; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenshotDelay0; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenshotDelay1; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenshotDelay2; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenshotDelay3; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenshotDelay4; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenshotDelay5; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index a75e2ae16..fdea153c4 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -174,7 +174,8 @@ private void InitializeControls() { tsddbAfterCaptureTasks, tsddbAfterUploadTasks, tsmiImageUploaders, tsmiImageFileUploaders, tsmiTextUploaders, tsmiTextFileUploaders, tsmiFileUploaders, tsmiURLShorteners, tsmiURLSharingServices, tsmiTrayAfterCaptureTasks, tsmiTrayAfterUploadTasks, tsmiTrayImageUploaders, tsmiTrayImageFileUploaders, - tsmiTrayTextUploaders, tsmiTrayTextFileUploaders, tsmiTrayFileUploaders, tsmiTrayURLShorteners, tsmiTrayURLSharingServices, tsmiScreenshotDelay + tsmiTrayTextUploaders, tsmiTrayTextFileUploaders, tsmiTrayFileUploaders, tsmiTrayURLShorteners, tsmiTrayURLSharingServices, tsmiScreenshotDelay, + tsmiTrayScreenshotDelay }) { dropDownItem.DisableMenuCloseOnClick(); @@ -1036,29 +1037,36 @@ private void SetScreenshotDelay(decimal delay) { default: tsmiScreenshotDelay.UpdateCheckedAll(false); + tsmiTrayScreenshotDelay.UpdateCheckedAll(false); break; case 0: tsmiScreenshotDelay0.RadioCheck(); + tsmiTrayScreenshotDelay0.RadioCheck(); break; case 1: tsmiScreenshotDelay1.RadioCheck(); + tsmiTrayScreenshotDelay1.RadioCheck(); break; case 2: tsmiScreenshotDelay2.RadioCheck(); + tsmiTrayScreenshotDelay2.RadioCheck(); break; case 3: tsmiScreenshotDelay3.RadioCheck(); + tsmiTrayScreenshotDelay3.RadioCheck(); break; case 4: tsmiScreenshotDelay4.RadioCheck(); + tsmiTrayScreenshotDelay4.RadioCheck(); break; case 5: tsmiScreenshotDelay5.RadioCheck(); + tsmiTrayScreenshotDelay5.RadioCheck(); break; } - tsmiScreenshotDelay.Text = string.Format("Screenshot delay: {0}s", (int)delay); - tsmiScreenshotDelay.Checked = delay > 0; + tsmiScreenshotDelay.Text = tsmiTrayScreenshotDelay.Text = string.Format("Screenshot delay: {0}s", (int)delay); + tsmiScreenshotDelay.Checked = tsmiTrayScreenshotDelay.Checked = delay > 0; } private async Task PrepareCaptureMenuAsync(ToolStripMenuItem tsmiWindow, EventHandler handlerWindow, ToolStripMenuItem tsmiMonitor, EventHandler handlerMonitor) diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 6844b2512..3865c56b0 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -426,6 +426,42 @@ Left + + 0, 0 + + + 6, 6, 6, 6 + + + 160, 429 + + + 1 + + + tsMain + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 5 + + + MiddleLeft + + + Magenta + + + 147, 20 + + + Capture + 191, 22 @@ -507,6 +543,28 @@ Show cursor + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACOElEQVQ4T6WR72sScRzH7w+w + jB6Kj5uIoAgy8YGBzaPOHwjqk9UkhGqy9aQH3fagB4MKhCYLxirHGOSDrKQCqSAJwahB6hnbyp03dTvn + WezHOXxijz7d55iHsvWkHrzuPnw/7/frvnAEAPwX8sPr9RI+n4/w+/1EIBA4FQwGhyX8EuEjcB7GHWYw + i52TBLqr4XBkYXn5RaFcrjf39roIzniGO8z8TaC7Nj4+lWWYBtdqwe7hIcSfr8HbLyJkGREKnCC9mcb1 + SGQKswMCj8dz+vLY2GS2WGx829qCX+22LKDvvYL05zYkMwcwl/wJrz/VIFcqNa6EQpPYUQQURdnm4vFU + oVqFiiDIZWRi+im8W2nLvMmJcPvhBnwobsLC0lIKO4qAJMnRj/n8Ngr6cY3ehURmRyGa4ODOozysrK5u + Y0cROByOiQLHdXvF3g3snmnlBkgquwsXb7yHHzzfxY4isNvtN5lqVRb0yhaLBWiaBr3zMejIBAyRz+Ac + mYShSy+BbTa72FEENpstlGMYvl+wWa+D1WqV3z04iQLLQqlc5rGjCKSvnY/Nz6fxD7REcUDSmxHcrfE8 + PFlcTGNHEZjN5jMXRkbor+vrws7+/kCpn6a0+16pCE6nk8aOIjCZTITBYDBSLlcUAwedzrEynnG1muB2 + u6OYxc6AQK/XE1qt1mw0GmcezM5myiwriJ3O77bEhiSNxWIZKTeDGcyeKNBoNIRarT6rUqkoiVsS94/A + mcIdZo4J/h0g/gAVQYjNzkYDsgAAAABJRU5ErkJggg== + + + + 191, 22 + + + Screenshot delay + 180, 22 @@ -543,24 +601,6 @@ 5 seconds - - 191, 22 - - - Screenshot delay - - - MiddleLeft - - - Magenta - - - 147, 20 - - - Capture - MiddleLeft @@ -573,6 +613,48 @@ Upload + + 203, 22 + + + Upload file... + + + 203, 22 + + + Upload folder... + + + 203, 22 + + + Upload from clipboard... + + + 203, 22 + + + Upload text... + + + 203, 22 + + + Upload from URL... + + + 203, 22 + + + Drag and drop upload... + + + 203, 22 + + + Shorten URL... + BottomLeft @@ -597,6 +679,96 @@ Tools + + 184, 22 + + + Color picker... + + + 184, 22 + + + Screen color picker... + + + 184, 22 + + + Image editor... + + + 184, 22 + + + Image effects... + + + 184, 22 + + + Hash check... + + + 184, 22 + + + DNS changer... + + + 184, 22 + + + QR code... + + + 184, 22 + + + Ruler... + + + 184, 22 + + + Directory indexer... + + + 184, 22 + + + Image combiner... + + + 184, 22 + + + Image thumbnailer... + + + 184, 22 + + + Video thumbnailer... + + + 184, 22 + + + FTP client... + + + 184, 22 + + + Tweet message... + + + 184, 22 + + + Monitor test... + 147, 6 @@ -636,6 +808,45 @@ Destinations + + 187, 22 + + + Image uploaders + + + 187, 22 + + + Text uploaders + + + 187, 22 + + + File uploaders + + + 187, 22 + + + URL shorteners + + + 187, 22 + + + URL sharing services + + + 184, 6 + + + 187, 22 + + + Destination settings... + MiddleLeft @@ -735,225 +946,6 @@ Debug - - MiddleLeft - - - Magenta - - - 147, 20 - - - Donate... - - - MiddleLeft - - - Magenta - - - 147, 20 - - - About... - - - 0, 0 - - - 6, 6, 6, 6 - - - 160, 429 - - - 1 - - - tsMain - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=12.4.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 5 - - - 203, 22 - - - Upload file... - - - 203, 22 - - - Upload folder... - - - 203, 22 - - - Upload from clipboard... - - - 203, 22 - - - Upload text... - - - 203, 22 - - - Upload from URL... - - - 203, 22 - - - Drag and drop upload... - - - 203, 22 - - - Shorten URL... - - - 184, 22 - - - Color picker... - - - 184, 22 - - - Screen color picker... - - - 184, 22 - - - Image editor... - - - 184, 22 - - - Image effects... - - - 184, 22 - - - Hash check... - - - 184, 22 - - - DNS changer... - - - 184, 22 - - - QR code... - - - 184, 22 - - - Ruler... - - - 184, 22 - - - Directory indexer... - - - 184, 22 - - - Image combiner... - - - 184, 22 - - - Image thumbnailer... - - - 184, 22 - - - Video thumbnailer... - - - 184, 22 - - - FTP client... - - - 184, 22 - - - Tweet message... - - - 184, 22 - - - Monitor test... - - - 187, 22 - - - Image uploaders - - - 187, 22 - - - Text uploaders - - - 187, 22 - - - File uploaders - - - 187, 22 - - - URL shorteners - - - 187, 22 - - - URL sharing services - - - 184, 6 - - - 187, 22 - - - Destination settings... - 172, 22 @@ -990,6 +982,30 @@ Test URL sharing + + MiddleLeft + + + Magenta + + + 147, 20 + + + Donate... + + + MiddleLeft + + + Magenta + + + 147, 20 + + + About... + 286, 17 @@ -1404,24 +1420,6 @@ 190, 17 - - 193, 484 - - - cmsTray - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ShareX - - - 192, 22 - - - Capture - 191, 22 @@ -1503,12 +1501,214 @@ Show cursor + + 180, 22 + + + No delay + + + 180, 22 + + + 1 second + + + 180, 22 + + + 2 seconds + + + 180, 22 + + + 3 seconds + + + 180, 22 + + + 4 seconds + + + 180, 22 + + + 5 seconds + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACOElEQVQ4T6WR72sScRzH7w+w + jB6Kj5uIoAgy8YGBzaPOHwjqk9UkhGqy9aQH3fagB4MKhCYLxirHGOSDrKQCqSAJwahB6hnbyp03dTvn + WezHOXxijz7d55iHsvWkHrzuPnw/7/frvnAEAPwX8sPr9RI+n4/w+/1EIBA4FQwGhyX8EuEjcB7GHWYw + i52TBLqr4XBkYXn5RaFcrjf39roIzniGO8z8TaC7Nj4+lWWYBtdqwe7hIcSfr8HbLyJkGREKnCC9mcb1 + SGQKswMCj8dz+vLY2GS2WGx829qCX+22LKDvvYL05zYkMwcwl/wJrz/VIFcqNa6EQpPYUQQURdnm4vFU + oVqFiiDIZWRi+im8W2nLvMmJcPvhBnwobsLC0lIKO4qAJMnRj/n8Ngr6cY3ehURmRyGa4ODOozysrK5u + Y0cROByOiQLHdXvF3g3snmnlBkgquwsXb7yHHzzfxY4isNvtN5lqVRb0yhaLBWiaBr3zMejIBAyRz+Ac + mYShSy+BbTa72FEENpstlGMYvl+wWa+D1WqV3z04iQLLQqlc5rGjCKSvnY/Nz6fxD7REcUDSmxHcrfE8 + PFlcTGNHEZjN5jMXRkbor+vrws7+/kCpn6a0+16pCE6nk8aOIjCZTITBYDBSLlcUAwedzrEynnG1muB2 + u6OYxc6AQK/XE1qt1mw0GmcezM5myiwriJ3O77bEhiSNxWIZKTeDGcyeKNBoNIRarT6rUqkoiVsS94/A + mcIdZo4J/h0g/gAVQYjNzkYDsgAAAABJRU5ErkJggg== + + + + 191, 22 + + + Screenshot delay + + + 192, 22 + + + Capture + 192, 22 Upload + + 192, 22 + + + Workflows + + + 192, 22 + + + Tools + + + 189, 6 + + + 192, 22 + + + After capture tasks + + + 192, 22 + + + After upload tasks + + + 192, 22 + + + Destinations + + + 192, 22 + + + Task settings... + + + 192, 22 + + + Application settings... + + + 192, 22 + + + Hotkey settings... + + + 192, 22 + + + Disable hotkeys + + + 189, 6 + + + 192, 22 + + + Screenshots folder... + + + 192, 22 + + + History... + + + 192, 22 + + + Image history... + + + 192, 22 + + + Debug + + + 192, 22 + + + Donate... + + + 192, 22 + + + About... + + + 189, 6 + + + 192, 22 + + + Recent links + + + False + + + 192, 22 + + + Toggle actions toolbar + + + 192, 22 + + + Open main window + + + 192, 22 + + + Exit + + + 193, 484 + + + cmsTray + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX + 203, 22 @@ -1551,18 +1751,6 @@ Shorten URL... - - 192, 22 - - - Workflows - - - 192, 22 - - - Tools - 184, 22 @@ -1653,27 +1841,6 @@ Monitor test... - - 189, 6 - - - 192, 22 - - - After capture tasks - - - 192, 22 - - - After upload tasks - - - 192, 22 - - - Destinations - 187, 22 @@ -1713,57 +1880,6 @@ Destination settings... - - 192, 22 - - - Task settings... - - - 192, 22 - - - Application settings... - - - 192, 22 - - - Hotkey settings... - - - 192, 22 - - - Disable hotkeys - - - 189, 6 - - - 192, 22 - - - Screenshots folder... - - - 192, 22 - - - History... - - - 192, 22 - - - Image history... - - - 192, 22 - - - Debug - 172, 22 @@ -1800,48 +1916,6 @@ Test URL sharing - - 192, 22 - - - Donate... - - - 192, 22 - - - About... - - - 189, 6 - - - 192, 22 - - - Recent links - - - False - - - 192, 22 - - - Toggle actions toolbar - - - 192, 22 - - - Open main window - - - 192, 22 - - - Exit - 405, 17 @@ -2098,7 +2172,7 @@ True - 49 + 51 6, 13 @@ -2250,6 +2324,42 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiScreenshotDelay0 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiScreenshotDelay1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiScreenshotDelay2 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiScreenshotDelay3 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiScreenshotDelay4 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiScreenshotDelay5 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsddbUpload @@ -3048,6 +3158,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTrayScreenshotDelay + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsmiTrayUpload @@ -3408,40 +3524,40 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiScreenshotDelay5 + + tsmiTrayScreenshotDelay0 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiScreenshotDelay4 + + tsmiTrayScreenshotDelay1 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiScreenshotDelay3 + + tsmiTrayScreenshotDelay2 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiScreenshotDelay2 + + tsmiTrayScreenshotDelay3 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiScreenshotDelay1 + + tsmiTrayScreenshotDelay4 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiScreenshotDelay0 + + tsmiTrayScreenshotDelay5 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 54675cce7..b92b34366 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -891,7 +891,7 @@ public static System.Drawing.Bitmap clock__arrow { /// public static System.Drawing.Bitmap clock_select { get { - object obj = ResourceManager.GetObject("clock-select", resourceCulture); + object obj = ResourceManager.GetObject("clock_select", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 577c9fb85..b4f1e0317 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -991,7 +991,7 @@ Middle click to close ..\Resources\application-home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\clock-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file