From ce88d947f101f217fe0138568665fb8e06333962 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 7 Jun 2021 23:12:59 +0300 Subject: [PATCH] Tweet message moved to upload menu from tools menu --- ShareX/Forms/MainForm.Designer.cs | 48 ++--- ShareX/Forms/MainForm.cs | 58 +++--- ShareX/Forms/MainForm.resx | 310 +++++++++++++++--------------- 3 files changed, 208 insertions(+), 208 deletions(-) diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 3038ba400..34d2b1d8e 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -90,7 +90,6 @@ private void InitializeComponent() this.tsmiClipboardViewer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiInspectWindow = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiDNSChanger = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tssMain1 = new System.Windows.Forms.ToolStripSeparator(); this.tsddbAfterCaptureTasks = new System.Windows.Forms.ToolStripDropDownButton(); @@ -247,7 +246,6 @@ private void InitializeComponent() this.tsmiTrayClipboardViewer = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayInspectWindow = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayDNSChanger = new System.Windows.Forms.ToolStripMenuItem(); - this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTrayMonitorTest = new System.Windows.Forms.ToolStripMenuItem(); this.tssTray1 = new System.Windows.Forms.ToolStripSeparator(); this.tsmiTrayAfterCaptureTasks = new System.Windows.Forms.ToolStripMenuItem(); @@ -299,6 +297,8 @@ private void InitializeComponent() this.tsbPatreon = new System.Windows.Forms.ToolStripButton(); this.tsbBitcoin = new System.Windows.Forms.ToolStripButton(); this.tsbGitHub = new System.Windows.Forms.ToolStripButton(); + this.tsmiTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -613,7 +613,8 @@ private void InitializeComponent() this.tsmiUploadText, this.tsmiUploadURL, this.tsmiUploadDragDrop, - this.tsmiShortenURL}); + this.tsmiShortenURL, + this.tsmiTweetMessage}); this.tsddbUpload.Image = global::ShareX.Properties.Resources.arrow_090; resources.ApplyResources(this.tsddbUpload, "tsddbUpload"); this.tsddbUpload.Name = "tsddbUpload"; @@ -692,8 +693,7 @@ private void InitializeComponent() this.tsmiClipboardViewer, this.tsmiInspectWindow, this.tsmiMonitorTest, - this.tsmiDNSChanger, - this.tsmiTweetMessage}); + this.tsmiDNSChanger}); this.tsddbTools.Image = global::ShareX.Properties.Resources.toolbox; resources.ApplyResources(this.tsddbTools, "tsddbTools"); this.tsddbTools.Name = "tsddbTools"; @@ -810,13 +810,6 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiDNSChanger, "tsmiDNSChanger"); this.tsmiDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click); // - // tsmiTweetMessage - // - this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter_16x16; - this.tsmiTweetMessage.Name = "tsmiTweetMessage"; - resources.ApplyResources(this.tsmiTweetMessage, "tsmiTweetMessage"); - this.tsmiTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click); - // // tsmiMonitorTest // this.tsmiMonitorTest.Image = global::ShareX.Properties.Resources.monitor; @@ -1808,7 +1801,8 @@ private void InitializeComponent() this.tsmiTrayUploadText, this.tsmiTrayUploadURL, this.tsmiTrayUploadDragDrop, - this.tsmiTrayShortenURL}); + this.tsmiTrayShortenURL, + this.tsmiTrayTweetMessage}); this.tsmiTrayUpload.Image = global::ShareX.Properties.Resources.arrow_090; this.tsmiTrayUpload.Name = "tsmiTrayUpload"; resources.ApplyResources(this.tsmiTrayUpload, "tsmiTrayUpload"); @@ -1887,8 +1881,7 @@ private void InitializeComponent() this.tsmiTrayClipboardViewer, this.tsmiTrayInspectWindow, this.tsmiTrayMonitorTest, - this.tsmiTrayDNSChanger, - this.tsmiTrayTweetMessage}); + this.tsmiTrayDNSChanger}); this.tsmiTrayTools.Image = global::ShareX.Properties.Resources.toolbox; this.tsmiTrayTools.Name = "tsmiTrayTools"; resources.ApplyResources(this.tsmiTrayTools, "tsmiTrayTools"); @@ -2005,13 +1998,6 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTrayDNSChanger, "tsmiTrayDNSChanger"); this.tsmiTrayDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click); // - // tsmiTrayTweetMessage - // - this.tsmiTrayTweetMessage.Image = global::ShareX.Properties.Resources.Twitter_16x16; - this.tsmiTrayTweetMessage.Name = "tsmiTrayTweetMessage"; - resources.ApplyResources(this.tsmiTrayTweetMessage, "tsmiTrayTweetMessage"); - this.tsmiTrayTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click); - // // tsmiTrayMonitorTest // this.tsmiTrayMonitorTest.Image = global::ShareX.Properties.Resources.monitor; @@ -2393,6 +2379,20 @@ private void InitializeComponent() this.tsbGitHub.Padding = new System.Windows.Forms.Padding(1); this.tsbGitHub.Click += new System.EventHandler(this.TsbGitHub_Click); // + // tsmiTweetMessage + // + this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter_16x16; + this.tsmiTweetMessage.Name = "tsmiTweetMessage"; + resources.ApplyResources(this.tsmiTweetMessage, "tsmiTweetMessage"); + this.tsmiTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click); + // + // tsmiTrayTweetMessage + // + this.tsmiTrayTweetMessage.Image = global::ShareX.Properties.Resources.Twitter_16x16; + this.tsmiTrayTweetMessage.Name = "tsmiTrayTweetMessage"; + resources.ApplyResources(this.tsmiTrayTweetMessage, "tsmiTrayTweetMessage"); + this.tsmiTrayTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click); + // // MainForm // this.AllowDrop = true; @@ -2578,8 +2578,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiTrayQRCode; private System.Windows.Forms.ToolStripMenuItem tsmiRectangleLight; private System.Windows.Forms.ToolStripMenuItem tsmiTrayRectangleLight; - private System.Windows.Forms.ToolStripMenuItem tsmiTweetMessage; - private System.Windows.Forms.ToolStripMenuItem tsmiTrayTweetMessage; private System.Windows.Forms.ToolStripMenuItem tsmiImagePreviewShow; private System.Windows.Forms.ToolStripMenuItem tsmiImagePreviewHide; private System.Windows.Forms.ToolStripMenuItem tsmiImagePreviewAutomatic; @@ -2706,5 +2704,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiThumbnailSize; private System.Windows.Forms.ToolStripMenuItem tsmiInspectWindow; private System.Windows.Forms.ToolStripMenuItem tsmiTrayInspectWindow; + private System.Windows.Forms.ToolStripMenuItem tsmiTweetMessage; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayTweetMessage; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 42fa09af6..893d55888 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1786,6 +1786,11 @@ private void tsmiShortenURL_Click(object sender, EventArgs e) UploadManager.ShowShortenURLDialog(); } + private void tsmiTweetMessage_Click(object sender, EventArgs e) + { + TaskHelpers.TweetMessage(); + } + private void tsmiColorPicker_Click(object sender, EventArgs e) { TaskHelpers.ShowScreenColorPickerDialog(); @@ -1796,6 +1801,11 @@ private void tsmiScreenColorPicker_Click(object sender, EventArgs e) TaskHelpers.OpenScreenColorPicker(); } + private void tsmiRuler_Click(object sender, EventArgs e) + { + TaskHelpers.OpenRuler(); + } + private void tsmiImageEditor_Click(object sender, EventArgs e) { TaskHelpers.OpenImageEditor(); @@ -1806,31 +1816,6 @@ private void tsmiImageEffects_Click(object sender, EventArgs e) TaskHelpers.OpenImageEffects(); } - private void tsmiHashCheck_Click(object sender, EventArgs e) - { - TaskHelpers.OpenHashCheck(); - } - - private void tsmiDNSChanger_Click(object sender, EventArgs e) - { - TaskHelpers.OpenDNSChanger(); - } - - private void tsmiQRCode_Click(object sender, EventArgs e) - { - TaskHelpers.OpenQRCode(); - } - - private void tsmiRuler_Click(object sender, EventArgs e) - { - TaskHelpers.OpenRuler(); - } - - private void tsmiIndexFolder_Click(object sender, EventArgs e) - { - TaskHelpers.OpenDirectoryIndexer(); - } - private void tsmiImageCombiner_Click(object sender, EventArgs e) { TaskHelpers.OpenImageCombiner(); @@ -1856,9 +1841,19 @@ private void tsmiVideoThumbnailer_Click(object sender, EventArgs e) TaskHelpers.OpenVideoThumbnailer(); } - private void tsmiInspectWindow_Click(object sender, EventArgs e) + private void tsmiQRCode_Click(object sender, EventArgs e) { - TaskHelpers.OpenInspectWindow(); + TaskHelpers.OpenQRCode(); + } + + private void tsmiHashCheck_Click(object sender, EventArgs e) + { + TaskHelpers.OpenHashCheck(); + } + + private void tsmiIndexFolder_Click(object sender, EventArgs e) + { + TaskHelpers.OpenDirectoryIndexer(); } private void tsmiClipboardViewer_Click(object sender, EventArgs e) @@ -1866,9 +1861,9 @@ private void tsmiClipboardViewer_Click(object sender, EventArgs e) TaskHelpers.OpenClipboardViewer(); } - private void tsmiTweetMessage_Click(object sender, EventArgs e) + private void tsmiInspectWindow_Click(object sender, EventArgs e) { - TaskHelpers.TweetMessage(); + TaskHelpers.OpenInspectWindow(); } private void tsmiMonitorTest_Click(object sender, EventArgs e) @@ -1876,6 +1871,11 @@ private void tsmiMonitorTest_Click(object sender, EventArgs e) TaskHelpers.OpenMonitorTest(); } + private void tsmiDNSChanger_Click(object sender, EventArgs e) + { + TaskHelpers.OpenDNSChanger(); + } + private void TsddbAfterCaptureTasks_DropDownOpening(object sender, EventArgs e) { UpdateImageEffectsMenu(tsddbAfterCaptureTasks); diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 3a1e769dd..4a15ac080 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -636,12 +636,6 @@ DNS changer... - - 184, 22 - - - Tweet message... - 184, 22 @@ -1371,6 +1365,54 @@ 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 @@ -1383,114 +1425,6 @@ Workflows - - 184, 22 - - - Color picker... - - - 184, 22 - - - Screen color picker... - - - 184, 22 - - - Ruler... - - - 184, 22 - - - Image editor... - - - 184, 22 - - - Image effects... - - - 184, 22 - - - Image combiner... - - - 184, 22 - - - Image splitter... - - - 184, 22 - - - Image thumbnailer... - - - 184, 22 - - - Video converter... - - - 184, 22 - - - Video thumbnailer... - - - 184, 22 - - - QR code... - - - 184, 22 - - - Hash check... - - - 184, 22 - - - Directory indexer... - - - 184, 22 - - - Clipboard viewer... - - - 184, 22 - - - Inspect window... - - - 184, 22 - - - Monitor test... - - - 184, 22 - - - DNS changer... - - - 184, 22 - - - Tweet message... - 200, 22 @@ -1621,7 +1555,7 @@ Exit - 201, 506 + 201, 528 cmsTray @@ -1755,47 +1689,107 @@ 5 seconds - - 203, 22 + + 184, 22 - - Upload file... + + Color picker... - - 203, 22 + + 184, 22 - - Upload folder... + + Screen color picker... - - 203, 22 + + 184, 22 - - Upload from clipboard... + + Ruler... - - 203, 22 + + 184, 22 - - Upload text... + + Image editor... - - 203, 22 + + 184, 22 - - Upload from URL... + + Image effects... - - 203, 22 + + 184, 22 - - Drag and drop upload... + + Image combiner... - - 203, 22 + + 184, 22 - - Shorten URL... + + Image splitter... + + + 184, 22 + + + Image thumbnailer... + + + 184, 22 + + + Video converter... + + + 184, 22 + + + Video thumbnailer... + + + 184, 22 + + + QR code... + + + 184, 22 + + + Hash check... + + + 184, 22 + + + Directory indexer... + + + 184, 22 + + + Clipboard viewer... + + + 184, 22 + + + Inspect window... + + + 184, 22 + + + DNS changer... + + + 184, 22 + + + Monitor test... 219, 22 @@ -2238,6 +2232,12 @@ Star our GitHub repo + + 203, 22 + + + Tweet message... + True @@ -2586,12 +2586,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiTweetMessage - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsmiMonitorTest @@ -3516,12 +3510,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmiTrayTweetMessage - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsmiTrayMonitorTest @@ -3780,6 +3768,18 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiTweetMessage + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiTrayTweetMessage + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm