diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 34d2b1d8e..9e5bcce6c 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -299,6 +299,14 @@ private void InitializeComponent() this.tsbGitHub = new System.Windows.Forms.ToolStripButton(); this.tsmiTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); + this.tssTools1 = new System.Windows.Forms.ToolStripSeparator(); + this.tssTools2 = new System.Windows.Forms.ToolStripSeparator(); + this.tssTools3 = new System.Windows.Forms.ToolStripSeparator(); + this.tssTools4 = new System.Windows.Forms.ToolStripSeparator(); + this.tssTrayTools1 = new System.Windows.Forms.ToolStripSeparator(); + this.tssTrayTools2 = new System.Windows.Forms.ToolStripSeparator(); + this.tssTrayTools3 = new System.Windows.Forms.ToolStripSeparator(); + this.tssTrayTools4 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -680,16 +688,20 @@ private void InitializeComponent() this.tsmiColorPicker, this.tsmiScreenColorPicker, this.tsmiRuler, + this.tssTools1, this.tsmiImageEditor, this.tsmiImageEffects, this.tsmiImageCombiner, this.tsmiImageSplitter, this.tsmiImageThumbnailer, + this.tssTools2, this.tsmiVideoConverter, this.tsmiVideoThumbnailer, + this.tssTools3, this.tsmiQRCode, this.tsmiHashCheck, this.tsmiIndexFolder, + this.tssTools4, this.tsmiClipboardViewer, this.tsmiInspectWindow, this.tsmiMonitorTest, @@ -1868,16 +1880,20 @@ private void InitializeComponent() this.tsmiTrayColorPicker, this.tsmiTrayScreenColorPicker, this.tsmiTrayRuler, + this.tssTrayTools1, this.tsmiTrayImageEditor, this.tsmiTrayImageEffects, this.tsmiTrayImageCombiner, this.tsmiTrayImageSplitter, this.tsmiTrayImageThumbnailer, + this.tssTrayTools2, this.tsmiTrayVideoConverter, this.tsmiTrayVideoThumbnailer, + this.tssTrayTools3, this.tsmiTrayQRCode, this.tsmiTrayHashCheck, this.tsmiTrayIndexFolder, + this.tssTrayTools4, this.tsmiTrayClipboardViewer, this.tsmiTrayInspectWindow, this.tsmiTrayMonitorTest, @@ -2393,6 +2409,46 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayTweetMessage, "tsmiTrayTweetMessage"); this.tsmiTrayTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click); // + // tssTools1 + // + this.tssTools1.Name = "tssTools1"; + resources.ApplyResources(this.tssTools1, "tssTools1"); + // + // tssTools2 + // + this.tssTools2.Name = "tssTools2"; + resources.ApplyResources(this.tssTools2, "tssTools2"); + // + // tssTools3 + // + this.tssTools3.Name = "tssTools3"; + resources.ApplyResources(this.tssTools3, "tssTools3"); + // + // tssTools4 + // + this.tssTools4.Name = "tssTools4"; + resources.ApplyResources(this.tssTools4, "tssTools4"); + // + // tssTrayTools1 + // + this.tssTrayTools1.Name = "tssTrayTools1"; + resources.ApplyResources(this.tssTrayTools1, "tssTrayTools1"); + // + // tssTrayTools2 + // + this.tssTrayTools2.Name = "tssTrayTools2"; + resources.ApplyResources(this.tssTrayTools2, "tssTrayTools2"); + // + // tssTrayTools3 + // + this.tssTrayTools3.Name = "tssTrayTools3"; + resources.ApplyResources(this.tssTrayTools3, "tssTrayTools3"); + // + // tssTrayTools4 + // + this.tssTrayTools4.Name = "tssTrayTools4"; + resources.ApplyResources(this.tssTrayTools4, "tssTrayTools4"); + // // MainForm // this.AllowDrop = true; @@ -2706,5 +2762,13 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiTrayInspectWindow; private System.Windows.Forms.ToolStripMenuItem tsmiTweetMessage; private System.Windows.Forms.ToolStripMenuItem tsmiTrayTweetMessage; + private System.Windows.Forms.ToolStripSeparator tssTools1; + private System.Windows.Forms.ToolStripSeparator tssTools2; + private System.Windows.Forms.ToolStripSeparator tssTools3; + private System.Windows.Forms.ToolStripSeparator tssTools4; + private System.Windows.Forms.ToolStripSeparator tssTrayTools1; + private System.Windows.Forms.ToolStripSeparator tssTrayTools2; + private System.Windows.Forms.ToolStripSeparator tssTrayTools3; + private System.Windows.Forms.ToolStripSeparator tssTrayTools4; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 893d55888..b95c68d9f 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1901,20 +1901,6 @@ private void tsmiCustomUploaderSettings_Click(object sender, EventArgs e) TaskHelpers.OpenCustomUploaderSettingsWindow(); } - private void tsbTaskSettings_Click(object sender, EventArgs e) - { - using (TaskSettingsForm taskSettingsForm = new TaskSettingsForm(Program.DefaultTaskSettings, true)) - { - taskSettingsForm.ShowDialog(); - } - - if (!IsDisposed) - { - AfterTaskSettingsJobs(); - SettingManager.SaveApplicationConfigAsync(); - } - } - private void tsbApplicationSettings_Click(object sender, EventArgs e) { using (ApplicationSettingsForm settingsForm = new ApplicationSettingsForm()) @@ -1930,6 +1916,20 @@ private void tsbApplicationSettings_Click(object sender, EventArgs e) } } + private void tsbTaskSettings_Click(object sender, EventArgs e) + { + using (TaskSettingsForm taskSettingsForm = new TaskSettingsForm(Program.DefaultTaskSettings, true)) + { + taskSettingsForm.ShowDialog(); + } + + if (!IsDisposed) + { + AfterTaskSettingsJobs(); + SettingManager.SaveApplicationConfigAsync(); + } + } + private void tsbHotkeySettings_Click(object sender, EventArgs e) { if (Program.HotkeyManager != null) diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 4a15ac080..a024b1d83 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -159,6 +159,45 @@ 0 + + Filename + + + 150 + + + Status + + + Progress + + + 125 + + + Speed + + + 75 + + + Elapsed + + + 45 + + + Remaining + + + 45 + + + URL + + + 145 + Fill @@ -255,90 +294,12 @@ 4 - - Filename - - - 150 - - - Status - - - Progress - - - 125 - - - Speed - - - 75 - - - Elapsed - - - 45 - - - Remaining - - - 45 - - - URL - - - 145 - 17, 17 Fill - - 0, 0 - - - 165, 0 - - - 6, 6, 6, 0 - - - 165, 429 - - - 1 - - - tsMain - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 0 - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Capture - 191, 22 @@ -420,12 +381,6 @@ Show cursor - - 191, 22 - - - Screenshot delay - 126, 22 @@ -462,17 +417,23 @@ 5 seconds - + + 191, 22 + + + Screenshot delay + + MiddleLeft - + Magenta - + 152, 20 - - Upload + + Capture 203, 22 @@ -516,6 +477,24 @@ Shorten URL... + + 203, 22 + + + Tweet message... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Upload + BottomLeft @@ -528,18 +507,6 @@ Workflows - - MiddleLeft - - - Magenta - - - 152, 20 - - - Tools - 184, 22 @@ -558,6 +525,9 @@ Ruler... + + 181, 6 + 184, 22 @@ -588,6 +558,9 @@ Image thumbnailer... + + 181, 6 + 184, 22 @@ -600,6 +573,9 @@ Video thumbnailer... + + 181, 6 + 184, 22 @@ -618,6 +594,9 @@ Directory indexer... + + 181, 6 + 184, 22 @@ -630,17 +609,29 @@ Inspect window... + + 184, 22 + + + Monitor test... + 184, 22 DNS changer... - - 184, 22 + + MiddleLeft - - Monitor test... + + Magenta + + + 152, 20 + + + Tools 152, 6 @@ -669,18 +660,6 @@ After upload tasks - - MiddleLeft - - - Magenta - - - 152, 20 - - - Destinations - 219, 22 @@ -726,6 +705,18 @@ Custom uploader settings... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Destinations + MiddleLeft @@ -813,18 +804,6 @@ News - - MiddleLeft - - - Magenta - - - 152, 20 - - - Debug - 171, 22 @@ -861,6 +840,18 @@ Test URL sharing + + MiddleLeft + + + Magenta + + + 152, 20 + + + Debug + MiddleLeft @@ -888,18 +879,36 @@ 152, 6 + + 0, 0 + + + 165, 0 + + + 6, 6, 6, 0 + + + 165, 429 + + + 1 + + + tsMain + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null + + + pToolbars + + + 0 + 286, 17 - - 229, 560 - - - cmsTaskInfo - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 228, 22 @@ -912,12 +921,6 @@ Stop upload - - 228, 22 - - - Open - Enter @@ -972,11 +975,11 @@ Thumbnail file - + 228, 22 - - Copy + + Open Ctrl+C @@ -1149,6 +1152,12 @@ False + + 228, 22 + + + Copy + Ctrl+U @@ -1269,12 +1278,6 @@ Hide columns - - 228, 22 - - - Image preview - 130, 22 @@ -1308,11 +1311,11 @@ Bottom - + 228, 22 - - Thumbnail title + + Image preview 114, 22 @@ -1341,6 +1344,12 @@ Bottom + + 228, 22 + + + Thumbnail title + 228, 22 @@ -1353,219 +1362,21 @@ Switch to thumbnail view + + 229, 560 + + + cmsTaskInfo + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 105, 17 190, 17 - - 200, 22 - - - Capture - - - 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... - - - 203, 22 - - - Tweet message... - - - 200, 22 - - - Upload - - - 200, 22 - - - Workflows - - - 200, 22 - - - Tools - - - 197, 6 - - - 200, 22 - - - After capture tasks - - - 200, 22 - - - After upload tasks - - - 200, 22 - - - Destinations - - - 200, 22 - - - Application settings... - - - 200, 22 - - - Task settings... - - - 200, 22 - - - Hotkey settings... - - - 200, 22 - - - Disable hotkeys - - - 197, 6 - - - 200, 22 - - - Screenshots folder... - - - 200, 22 - - - History... - - - 200, 22 - - - Image history... - - - 200, 22 - - - Debug - - - 200, 22 - - - Donate... - - - 200, 22 - - - About... - - - 197, 6 - - - 200, 22 - - - Restart ShareX as admin - - - False - - - 200, 22 - - - Recent links - - - False - - - 200, 22 - - - Toggle actions toolbar - - - 200, 22 - - - Open main window - - - 200, 22 - - - Exit - - - 201, 528 - - - cmsTray - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ShareX - 191, 22 @@ -1647,12 +1458,6 @@ Show cursor - - 191, 22 - - - Screenshot delay - 126, 22 @@ -1689,6 +1494,78 @@ 5 seconds + + 191, 22 + + + Screenshot delay + + + 200, 22 + + + Capture + + + 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... + + + 203, 22 + + + Tweet message... + + + 200, 22 + + + Upload + + + 200, 22 + + + Workflows + 184, 22 @@ -1707,6 +1584,9 @@ Ruler... + + 181, 6 + 184, 22 @@ -1737,6 +1617,9 @@ Image thumbnailer... + + 181, 6 + 184, 22 @@ -1749,6 +1632,9 @@ Video thumbnailer... + + 181, 6 + 184, 22 @@ -1767,6 +1653,9 @@ Directory indexer... + + 181, 6 + 184, 22 @@ -1779,17 +1668,38 @@ Inspect window... + + 184, 22 + + + Monitor test... + 184, 22 DNS changer... - - 184, 22 + + 200, 22 - - Monitor test... + + Tools + + + 197, 6 + + + 200, 22 + + + After capture tasks + + + 200, 22 + + + After upload tasks 219, 22 @@ -1836,6 +1746,57 @@ Custom uploader settings... + + 200, 22 + + + Destinations + + + 200, 22 + + + Application settings... + + + 200, 22 + + + Task settings... + + + 200, 22 + + + Hotkey settings... + + + 200, 22 + + + Disable hotkeys + + + 197, 6 + + + 200, 22 + + + Screenshots folder... + + + 200, 22 + + + History... + + + 200, 22 + + + Image history... + 171, 22 @@ -1872,60 +1833,78 @@ Test URL sharing + + 200, 22 + + + Debug + + + 200, 22 + + + Donate... + + + 200, 22 + + + About... + + + 197, 6 + + + 200, 22 + + + Restart ShareX as admin + + + False + + + 200, 22 + + + Recent links + + + False + + + 200, 22 + + + Toggle actions toolbar + + + 200, 22 + + + Open main window + + + 200, 22 + + + Exit + + + 201, 506 + + + cmsTray + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX + 405, 17 - - btnCloseNews - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pNews - - - 0 - - - ucNews - - - ShareX.NewsListControl, ShareX, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null - - - pNews - - - 1 - - - Fill - - - 165, 0 - - - 679, 471 - - - 5 - - - False - - - pNews - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Bottom, Right @@ -1986,53 +1965,32 @@ 1 - - lblThumbnailViewTip - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pThumbnailView - - - 0 - - - ucTaskThumbnailView - - - ShareX.TaskThumbnailView, ShareX, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null - - - pThumbnailView - - - 1 - - + Fill - + 165, 0 - + 679, 471 - - 7 + + 5 - - pThumbnailView + + False - + + pNews + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 3 + + 2 True @@ -2097,81 +2055,42 @@ 1 + + Fill + + + 165, 0 + + + 679, 471 + + + 7 + + + pThumbnailView + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 567, 17 - - 654, 17 - True - - tsSocialButtons - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 1 - - - Left - - - 0, 0 - - - 165, 471 - - - 8 - - - pToolbars - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - 654, 17 Bottom - - 0, 429 - - - 6, 3, 6, 6 - - - 165, 42 - - - 2 - - - tsSocialButtons - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 1 - Magenta @@ -2232,11 +2151,53 @@ Star our GitHub repo - - 203, 22 + + 0, 429 - - Tweet message... + + 6, 3, 6, 6 + + + 165, 42 + + + 2 + + + tsSocialButtons + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null + + + pToolbars + + + 1 + + + Left + + + 0, 0 + + + 165, 471 + + + 8 + + + pToolbars + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 True @@ -3780,6 +3741,54 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tssTools1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tssTools2 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tssTools3 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tssTools4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tssTrayTools1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tssTrayTools2 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tssTrayTools3 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tssTrayTools4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm