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 4a753d980..000000000 Binary files a/ShareX/Resources/Bitcoin-32x32.png and /dev/null differ diff --git a/ShareX/Resources/Discord-32x32.png b/ShareX/Resources/Discord-32x32.png deleted file mode 100644 index ac7417a22..000000000 Binary files a/ShareX/Resources/Discord-32x32.png and /dev/null differ diff --git a/ShareX/Resources/Discord.png b/ShareX/Resources/Discord.png new file mode 100644 index 000000000..60e92f2a2 Binary files /dev/null and b/ShareX/Resources/Discord.png differ diff --git a/ShareX/Resources/GitHub-Black-32x32.png b/ShareX/Resources/GitHub-Black-32x32.png deleted file mode 100644 index 818e7570e..000000000 Binary files a/ShareX/Resources/GitHub-Black-32x32.png and /dev/null differ diff --git a/ShareX/Resources/GitHub-White-32x32.png b/ShareX/Resources/GitHub-White-32x32.png deleted file mode 100644 index 505fd97ce..000000000 Binary files a/ShareX/Resources/GitHub-White-32x32.png and /dev/null differ diff --git a/ShareX/Resources/Patreon-32x32.png b/ShareX/Resources/Patreon-32x32.png deleted file mode 100644 index c05441637..000000000 Binary files a/ShareX/Resources/Patreon-32x32.png and /dev/null differ diff --git a/ShareX/Resources/Twitter-32x32.png b/ShareX/Resources/Twitter-32x32.png deleted file mode 100644 index 2670097d6..000000000 Binary files a/ShareX/Resources/Twitter-32x32.png and /dev/null differ diff --git a/ShareX/Resources/Twitter-16x16.png b/ShareX/Resources/Twitter.png similarity index 100% rename from ShareX/Resources/Twitter-16x16.png rename to ShareX/Resources/Twitter.png diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index 805d0ee31..024df5263 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -1845,24 +1845,6 @@ - - - - - - - - - - - - - - - - - - @@ -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;