From 13ab8755581d9ab82025bbda3210997dc82e8e63 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 23 Aug 2021 05:28:06 +0300 Subject: [PATCH] Added Twitter & Discord buttons to tray menu --- ShareX/Forms/MainForm.Designer.cs | 30 +- ShareX/Forms/MainForm.resx | 867 +++++++++++++++--------------- 2 files changed, 467 insertions(+), 430 deletions(-) diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 67b15f54c..015b06c82 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -302,6 +302,9 @@ private void InitializeComponent() this.tsbTwitter = new System.Windows.Forms.ToolStripButton(); this.tsbDiscord = new System.Windows.Forms.ToolStripButton(); this.tssMain3 = new System.Windows.Forms.ToolStripSeparator(); + this.tssTray4 = new System.Windows.Forms.ToolStripSeparator(); + this.tsmiTrayTwitter = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiTrayDiscord = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -1656,10 +1659,13 @@ private void InitializeComponent() this.tsmiScreenshotsFolder, this.tsmiTrayHistory, this.tsmiTrayImageHistory, + this.tssTray3, this.tsmiTrayDebug, this.tsmiTrayDonate, + this.tsmiTrayTwitter, + this.tsmiTrayDiscord, this.tsmiTrayAbout, - this.tssTray3, + this.tssTray4, this.tsmiRestartAsAdmin, this.tsmiTrayRecentItems, this.tsmiOpenActionsToolbar, @@ -2393,6 +2399,25 @@ private void InitializeComponent() this.tssMain3.Name = "tssMain3"; resources.ApplyResources(this.tssMain3, "tssMain3"); // + // tssTray4 + // + this.tssTray4.Name = "tssTray4"; + resources.ApplyResources(this.tssTray4, "tssTray4"); + // + // tsmiTrayTwitter + // + this.tsmiTrayTwitter.Image = global::ShareX.Properties.Resources.Twitter; + this.tsmiTrayTwitter.Name = "tsmiTrayTwitter"; + resources.ApplyResources(this.tsmiTrayTwitter, "tsmiTrayTwitter"); + this.tsmiTrayTwitter.Click += new System.EventHandler(this.tsbTwitter_Click); + // + // tsmiTrayDiscord + // + this.tsmiTrayDiscord.Image = global::ShareX.Properties.Resources.Discord; + this.tsmiTrayDiscord.Name = "tsmiTrayDiscord"; + resources.ApplyResources(this.tsmiTrayDiscord, "tsmiTrayDiscord"); + this.tsmiTrayDiscord.Click += new System.EventHandler(this.tsbDiscord_Click); + // // MainForm // this.AllowDrop = true; @@ -2705,5 +2730,8 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripButton tsbTwitter; private System.Windows.Forms.ToolStripButton tsbDiscord; private System.Windows.Forms.ToolStripSeparator tssMain3; + private System.Windows.Forms.ToolStripSeparator tssTray4; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayTwitter; + private System.Windows.Forms.ToolStripMenuItem tsmiTrayDiscord; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 048f634ad..d56a2f2ab 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,303 +294,12 @@ 3 - - Filename - - - 150 - - - Status - - - Progress - - - 125 - - - Speed - - - 75 - - - Elapsed - - - 45 - - - Remaining - - - 45 - - - URL - - - 145 - 17, 17 Fill - - MiddleLeft - - - Magenta - - - 152, 20 - - - Capture - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Upload - - - BottomLeft - - - Magenta - - - 152, 20 - - - Workflows - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Tools - - - 152, 6 - - - MiddleLeft - - - Magenta - - - 152, 20 - - - After capture tasks - - - MiddleLeft - - - Magenta - - - 152, 20 - - - After upload tasks - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Destinations - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Application settings... - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Task settings... - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Hotkey settings... - - - 152, 6 - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Screenshots folder... - - - MiddleLeft - - - Magenta - - - 152, 20 - - - History... - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Image history... - - - 152, 6 - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Debug - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Donate... - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Twitter... - - - MiddleLeft - - - Magenta - - - 152, 20 - - - Discord... - - - MiddleLeft - - - Magenta - - - 152, 20 - - - About... - - - 0, 0 - - - 165, 0 - - - 6, 5, 6, 2 - - - 165, 471 - - - 1 - - - tsMain - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null - - - pToolbars - - - 0 - 191, 22 @@ -633,12 +381,6 @@ Show cursor - - 191, 22 - - - Screenshot delay - 126, 22 @@ -675,6 +417,24 @@ 5 seconds + + 191, 22 + + + Screenshot delay + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Capture + 203, 22 @@ -723,6 +483,30 @@ Tweet message... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Upload + + + BottomLeft + + + Magenta + + + 152, 20 + + + Workflows + 184, 22 @@ -837,6 +621,45 @@ DNS changer... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Tools + + + 152, 6 + + + MiddleLeft + + + Magenta + + + 152, 20 + + + After capture tasks + + + MiddleLeft + + + Magenta + + + 152, 20 + + + After upload tasks + 219, 22 @@ -882,6 +705,96 @@ Custom uploader settings... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Destinations + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Application settings... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Task settings... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Hotkey settings... + + + 152, 6 + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Screenshots folder... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + History... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Image history... + + + 152, 6 + 180, 22 @@ -918,18 +831,96 @@ Test URL sharing + + MiddleLeft + + + Magenta + + + 152, 20 + + + Debug + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Donate... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Twitter... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Discord... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + About... + + + 0, 0 + + + 165, 0 + + + 6, 5, 6, 2 + + + 165, 471 + + + 1 + + + tsMain + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=13.5.1.0, Culture=neutral, PublicKeyToken=null + + + pToolbars + + + 0 + 286, 17 - - 229, 582 - - - cmsTaskInfo - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 228, 22 @@ -942,12 +933,6 @@ Stop upload - - 228, 22 - - - Open - Enter @@ -1002,11 +987,11 @@ Thumbnail file - + 228, 22 - - Copy + + Open Ctrl+C @@ -1179,6 +1164,12 @@ False + + 228, 22 + + + Copy + Ctrl+U @@ -1272,12 +1263,6 @@ OCR image... - - 228, 22 - - - Combine images... - 188, 22 @@ -1290,6 +1275,12 @@ Combine vertically + + 228, 22 + + + Combine images... + 228, 22 @@ -1317,12 +1308,6 @@ Hide columns - - 228, 22 - - - Image preview - 130, 22 @@ -1356,11 +1341,11 @@ Bottom - + 228, 22 - - Thumbnail title + + Image preview 114, 22 @@ -1389,6 +1374,12 @@ Bottom + + 228, 22 + + + Thumbnail title + 228, 22 @@ -1401,30 +1392,21 @@ Switch to thumbnail view + + 229, 582 + + + cmsTaskInfo + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 105, 17 190, 17 - - 201, 506 - - - cmsTray - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ShareX - - - 200, 22 - - - Capture - 191, 22 @@ -1506,12 +1488,6 @@ Show cursor - - 191, 22 - - - Screenshot delay - 126, 22 @@ -1548,11 +1524,17 @@ 5 seconds - + + 191, 22 + + + Screenshot delay + + 200, 22 - - Upload + + Capture 203, 22 @@ -1602,18 +1584,18 @@ Tweet message... + + 200, 22 + + + Upload + 200, 22 Workflows - - 200, 22 - - - Tools - 184, 22 @@ -1728,6 +1710,12 @@ DNS changer... + + 200, 22 + + + Tools + 197, 6 @@ -1743,12 +1731,6 @@ After upload tasks - - 200, 22 - - - Destinations - 219, 22 @@ -1794,6 +1776,12 @@ Custom uploader settings... + + 200, 22 + + + Destinations + 200, 22 @@ -1839,61 +1827,76 @@ Image history... - - 200, 22 - - - Debug + + 197, 6 - 171, 22 + 180, 22 Debug log... - 171, 22 + 180, 22 Test image upload - 171, 22 + 180, 22 Test text upload - 171, 22 + 180, 22 Test file upload - 171, 22 + 180, 22 Test URL shortener - 171, 22 + 180, 22 Test URL sharing + + 200, 22 + + + Debug + 200, 22 Donate... + + 200, 22 + + + Twitter... + + + 200, 22 + + + Discord... + 200, 22 About... - + 197, 6 @@ -1932,57 +1935,21 @@ Exit + + 201, 556 + + + cmsTray + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX + 405, 17 - - 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 - - - pThumbnailView - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - True @@ -2046,6 +2013,30 @@ 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 + + + 2 + 567, 17 @@ -3660,6 +3651,24 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tssTray4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiTrayTwitter + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsmiTrayDiscord + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm