From 60fd0d1066d7c8f3472f0b1ecfb59468e9f4692c Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 23 Aug 2021 03:28:47 +0300 Subject: [PATCH] Added Twitter and Discord buttons --- ShareX/Forms/MainForm.Designer.cs | 37 +++++++++-- ShareX/Forms/MainForm.cs | 10 +++ ShareX/Forms/MainForm.resx | 47 +++++++++++++- ShareX/Properties/Resources.Designer.cs | 58 ++---------------- ShareX/Properties/Resources.resx | 27 ++------ ShareX/Resources/Bitcoin-32x32.png | Bin 1227 -> 0 bytes ShareX/Resources/Discord-32x32.png | Bin 614 -> 0 bytes ShareX/Resources/Discord.png | Bin 0 -> 519 bytes ShareX/Resources/GitHub-Black-32x32.png | Bin 1103 -> 0 bytes ShareX/Resources/GitHub-White-32x32.png | Bin 802 -> 0 bytes ShareX/Resources/Patreon-32x32.png | Bin 1229 -> 0 bytes ShareX/Resources/Twitter-32x32.png | Bin 912 -> 0 bytes .../{Twitter-16x16.png => Twitter.png} | Bin ShareX/ShareX.csproj | 23 ++----- ShareX/TaskHelpers.cs | 2 +- 15 files changed, 104 insertions(+), 100 deletions(-) delete mode 100644 ShareX/Resources/Bitcoin-32x32.png delete mode 100644 ShareX/Resources/Discord-32x32.png create mode 100644 ShareX/Resources/Discord.png delete mode 100644 ShareX/Resources/GitHub-Black-32x32.png delete mode 100644 ShareX/Resources/GitHub-White-32x32.png delete mode 100644 ShareX/Resources/Patreon-32x32.png delete mode 100644 ShareX/Resources/Twitter-32x32.png rename ShareX/Resources/{Twitter-16x16.png => Twitter.png} (100%) diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 4a8d1407f..67b15f54c 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -299,6 +299,9 @@ private void InitializeComponent() this.ucTaskThumbnailView = new ShareX.TaskThumbnailView(); this.ttMain = new System.Windows.Forms.ToolTip(this.components); this.pToolbars = new System.Windows.Forms.Panel(); + this.tsbTwitter = new System.Windows.Forms.ToolStripButton(); + this.tsbDiscord = new System.Windows.Forms.ToolStripButton(); + this.tssMain3 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -425,8 +428,11 @@ private void InitializeComponent() this.tsbScreenshotsFolder, this.tsbHistory, this.tsbImageHistory, + this.tssMain3, this.tsddbDebug, this.tsbDonate, + this.tsbTwitter, + this.tsbDiscord, this.tsbAbout}); this.tsMain.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; this.tsMain.Name = "tsMain"; @@ -666,7 +672,7 @@ private void InitializeComponent() // // tsmiTweetMessage // - this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter_16x16; + this.tsmiTweetMessage.Image = global::ShareX.Properties.Resources.Twitter; this.tsmiTweetMessage.Name = "tsmiTweetMessage"; resources.ApplyResources(this.tsmiTweetMessage, "tsmiTweetMessage"); this.tsmiTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click); @@ -846,7 +852,7 @@ private void InitializeComponent() // // tssMain1 // - this.tssMain1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.tssMain1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 6); this.tssMain1.Name = "tssMain1"; resources.ApplyResources(this.tssMain1, "tssMain1"); // @@ -950,7 +956,7 @@ private void InitializeComponent() // // tssMain2 // - this.tssMain2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.tssMain2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 6); this.tssMain2.Name = "tssMain2"; resources.ApplyResources(this.tssMain2, "tssMain2"); // @@ -1897,7 +1903,7 @@ private void InitializeComponent() // // tsmiTrayTweetMessage // - this.tsmiTrayTweetMessage.Image = global::ShareX.Properties.Resources.Twitter_16x16; + this.tsmiTrayTweetMessage.Image = global::ShareX.Properties.Resources.Twitter; this.tsmiTrayTweetMessage.Name = "tsmiTrayTweetMessage"; resources.ApplyResources(this.tsmiTrayTweetMessage, "tsmiTrayTweetMessage"); this.tsmiTrayTweetMessage.Click += new System.EventHandler(this.tsmiTweetMessage_Click); @@ -2367,6 +2373,26 @@ private void InitializeComponent() this.pToolbars.Controls.Add(this.tsMain); this.pToolbars.Name = "pToolbars"; // + // tsbTwitter + // + this.tsbTwitter.Image = global::ShareX.Properties.Resources.Twitter; + resources.ApplyResources(this.tsbTwitter, "tsbTwitter"); + this.tsbTwitter.Name = "tsbTwitter"; + this.tsbTwitter.Click += new System.EventHandler(this.tsbTwitter_Click); + // + // tsbDiscord + // + this.tsbDiscord.Image = global::ShareX.Properties.Resources.Discord; + resources.ApplyResources(this.tsbDiscord, "tsbDiscord"); + this.tsbDiscord.Name = "tsbDiscord"; + this.tsbDiscord.Click += new System.EventHandler(this.tsbDiscord_Click); + // + // tssMain3 + // + this.tssMain3.Margin = new System.Windows.Forms.Padding(0, 3, 0, 6); + this.tssMain3.Name = "tssMain3"; + resources.ApplyResources(this.tssMain3, "tssMain3"); + // // MainForm // this.AllowDrop = true; @@ -2676,5 +2702,8 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiCombineImagesHorizontally; private System.Windows.Forms.ToolStripMenuItem tsmiCombineImagesVertically; private System.Windows.Forms.ToolStripMenuItem tsmiBingVisualSearch; + private System.Windows.Forms.ToolStripButton tsbTwitter; + private System.Windows.Forms.ToolStripButton tsbDiscord; + private System.Windows.Forms.ToolStripSeparator tssMain3; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 792fd0d6b..40398293e 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1965,6 +1965,16 @@ private void tsbDonate_Click(object sender, EventArgs e) URLHelpers.OpenURL(Links.URL_DONATE); } + private void tsbTwitter_Click(object sender, EventArgs e) + { + URLHelpers.OpenURL(Links.URL_TWITTER); + } + + private void tsbDiscord_Click(object sender, EventArgs e) + { + URLHelpers.OpenURL(Links.URL_DISCORD); + } + private void tsbAbout_Click(object sender, EventArgs e) { using (AboutForm aboutForm = new AboutForm()) diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index d5f36cbed..048f634ad 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -462,6 +462,9 @@ Image history... + + 152, 6 + MiddleLeft @@ -486,6 +489,30 @@ Donate... + + MiddleLeft + + + Magenta + + + 152, 20 + + + Twitter... + + + MiddleLeft + + + Magenta + + + 152, 20 + + + Discord... + MiddleLeft @@ -505,7 +532,7 @@ 165, 0 - 6, 6, 6, 0 + 6, 5, 6, 2 165, 471 @@ -3615,6 +3642,24 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsbTwitter + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsbDiscord + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tssMain3 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 086ae26e9..16987446f 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -757,16 +757,6 @@ public class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Bitcoin_32x32 { - get { - object obj = ResourceManager.GetObject("Bitcoin_32x32", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1125,9 +1115,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Discord_32x32 { + public static System.Drawing.Bitmap Discord { get { - object obj = ResourceManager.GetObject("Discord_32x32", resourceCulture); + object obj = ResourceManager.GetObject("Discord", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1515,26 +1505,6 @@ public class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap GitHub_Black_32x32 { - get { - object obj = ResourceManager.GetObject("GitHub_Black_32x32", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap GitHub_White_32x32 { - get { - object obj = ResourceManager.GetObject("GitHub_White_32x32", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -2274,16 +2244,6 @@ public class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Patreon_32x32 { - get { - object obj = ResourceManager.GetObject("Patreon_32x32", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -2782,19 +2742,9 @@ public class Resources { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Twitter_16x16 { + public static System.Drawing.Bitmap Twitter { get { - object obj = ResourceManager.GetObject("Twitter-16x16", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Twitter_32x32 { - get { - object obj = ResourceManager.GetObject("Twitter-32x32", resourceCulture); + object obj = ResourceManager.GetObject("Twitter", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 0914b8944..ca9b9fbd2 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -220,9 +220,6 @@ ..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Bitcoin-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Stay top most @@ -278,9 +275,6 @@ Middle click to close URL is empty. - - ..\Resources\GitHub-Black-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -290,9 +284,6 @@ Middle click to close Currently configured hotkeys: - - ..\Resources\Twitter-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - History @@ -455,9 +446,6 @@ Are you sure you want to continue? ..\Resources\drive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GitHub-White-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - File uploader: {0} @@ -497,9 +485,6 @@ Are you sure you want to continue? ..\Resources\application-monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Patreon-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -786,9 +771,6 @@ Would you like to restart ShareX? ..\Resources\keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Discord-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - In queue @@ -1003,9 +985,6 @@ Please run ShareX as administrator to change personal folder path. Korean - - ..\Resources\Twitter-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\tick-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1112,4 +1091,10 @@ Please run ShareX as administrator to change personal folder path. Window styles + + ..\resources\twitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\discord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShareX/Resources/Bitcoin-32x32.png b/ShareX/Resources/Bitcoin-32x32.png deleted file mode 100644 index 4a753d98092cb740e61f1851446eb14a6044867f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1227 zcmaKqdo)#f6vs~~gVG-(bKP@8Ofd{fRAxrgB(6v1mPaZz9!up_C}+m%wI)`p5OJU6 z#&{FMXqXYkBvVEi%_SwQ@@gj6MRMC9{(ZiCuisib6?1@$1Ed>(a08I=KrW0)xf&@?D}uEWSS#de#oR>+ z4`p}}7Zvh=1O}2NQVg?sCMn{f%s~vZ#=gQp1OryZU1XW1E({}P;3Y=PG+n}2l3{oZ z!;*|K0Lv^@V-Ad#ExXiWImrsSV7b@-_Ww zYl_g_jn%cp=~@$XZ3(*ev-oe9@ds&mcLx3_3xAx0KhDK_gm|w6@0Hplh=FqAStaqjni#4lh8u|CJH$v6`KpB+{e>L=l^pLNC+?FIo#f<0@^u&aS2y|Q z5AsbfIo(fAKc!U9sF^`(_60RJOwEl@Z(mXKW7IpwCa8r;N;5@il$2IUEvhJVjso*E zrlxfoTBoH6Kob~E;xt9j6iL$*GbR;osr#AP3Pl11LC{LQRjb#Sm~qW5EUm0JZMLzs z+v>c{#q|^SU3n%$OhQu5UA&ZWOG?Ws zt844;wvCKWPEF6uzFSahfexoSJfC(z(2DPUJ@*8gaZlgBwm0hxq(7E7)82^sSsj;f zJ^1MpVTJ*ZoQ8x4Jr^y^`-jT1RHXXYDB3oPzHE7u8cyGC&S4vwl_^&!6 z(+4j-T&Js3Wt)|$&8jx8{ycUCwMFka5{fI2tc<#N`FYQl3-&pE`D?wK9TBPc;l0uM z+mDs@W>?nrD2KJAs{PaL>wjvG4tBEEUo~ZK{PR8?7Mk6374oV2T5#iDb5G1`=*1VR zru8+g3wz>fE8~xH)|OX=#ce{{MQN`52!~x?_Ma0Ss<3oD8L3|k3xa!s%E}ly*p49z_0VNuPa7U-GRT6d8sfX1DSRF%tE$K>~5`uv)5}X zRHdE$-uz&{RzcL-2H_3w%$UTM@C)k3@*w2&TO)_cTFohOX_2B^UlDDa&8azGtQbk@ zZT5@F@_69a`VAfTcho_JEyw(PLd9f9VUJgxqsDILz2DvVrh@|tThp#%Hj>rxHYSH( z8W#CtSwU{b&gWlm?b6*(--+~{gt2&$(5JuKP95S{_}vb7!=i5yi`{!Wo~+rxOb6ua LCGf2Gh)DYfIbxgn diff --git a/ShareX/Resources/Discord-32x32.png b/ShareX/Resources/Discord-32x32.png deleted file mode 100644 index ac7417a22bbdbbf02f1068f836b1217e215d730a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 614 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 mw6_@(`ME2iiW&G1Gw=hv`xr6)<9I3n0000 - - - - - - - - - - - - - - - - - - @@ -1894,7 +1876,7 @@ - + @@ -1905,6 +1887,9 @@ + + + diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index b28e37be1..74518fb2f 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -1492,7 +1492,7 @@ public static void OpenCustomUploaderSettingsWindow() case HotkeyType.VideoThumbnailer: return Resources.images_stack; case HotkeyType.InspectWindow: return Resources.application_search_result; case HotkeyType.ClipboardViewer: return Resources.clipboard_block; - case HotkeyType.TweetMessage: return Resources.Twitter_16x16; + case HotkeyType.TweetMessage: return Resources.Twitter; case HotkeyType.MonitorTest: return Resources.monitor; // Other case HotkeyType.DisableHotkeys: return Resources.keyboard__minus;