CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 11:10:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added Twitter and Discord buttons

Browse source
This commit is contained in:
Jaex 2021-08-23 03:28:47 +03:00
parent 8b1740d13c
commit 60fd0d1066
15 changed files with 104 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ShareX/Forms/MainForm.Designer.cs generated
View file

@ -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;
}
}

10
ShareX/Forms/MainForm.cs
View file

@ -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())

47
ShareX/Forms/MainForm.resx
View file

@ -462,6 +462,9 @@
<data name="tsbImageHistory.Text" xml:space="preserve">
<value>Image history...</value>
</data>
<data name="tssMain3.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 6</value>
</data>
<data name="tsddbDebug.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -486,6 +489,30 @@
<data name="tsbDonate.Text" xml:space="preserve">
<value>Donate...</value>
</data>
<data name="tsbTwitter.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsbTwitter.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbTwitter.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 20</value>
</data>
<data name="tsbTwitter.Text" xml:space="preserve">
<value>Twitter...</value>
</data>
<data name="tsbDiscord.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="tsbDiscord.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsbDiscord.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 20</value>
</data>
<data name="tsbDiscord.Text" xml:space="preserve">
<value>Discord...</value>
</data>
<data name="tsbAbout.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -505,7 +532,7 @@
<value>165, 0</value>
</data>
<data name="tsMain.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 0</value>
<value>6, 5, 6, 2</value>
</data>
<data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>165, 471</value>
@ -3615,6 +3642,24 @@
<data name="&gt;&gt;ttMain.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsbTwitter.Name" xml:space="preserve">
<value>tsbTwitter</value>
</data>
<data name="&gt;&gt;tsbTwitter.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsbDiscord.Name" xml:space="preserve">
<value>tsbDiscord</value>
</data>
<data name="&gt;&gt;tsbDiscord.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssMain3.Name" xml:space="preserve">
<value>tssMain3</value>
</data>
<data name="&gt;&gt;tssMain3.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MainForm</value>
</data>

58
ShareX/Properties/Resources.Designer.cs generated
View file

@ -757,16 +757,6 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap Bitcoin_32x32 {
get {
object obj = ResourceManager.GetObject("Bitcoin_32x32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -1125,9 +1115,9 @@ public class Resources {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
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 {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap GitHub_Black_32x32 {
get {
object obj = ResourceManager.GetObject("GitHub_Black_32x32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap GitHub_White_32x32 {
get {
object obj = ResourceManager.GetObject("GitHub_White_32x32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -2274,16 +2244,6 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap Patreon_32x32 {
get {
object obj = ResourceManager.GetObject("Patreon_32x32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -2782,19 +2742,9 @@ public class Resources {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
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));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
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));
}
}

27
ShareX/Properties/Resources.resx
View file

@ -220,9 +220,6 @@
<data name="exclamation_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bitcoin_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Bitcoin-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ActionsToolbar_StayTopMost" xml:space="preserve">
<value>Stay top most</value>
</data>
@ -278,9 +275,6 @@ Middle click to close</value>
<data name="UploadTask_ThreadDoWork_URL_is_empty_" xml:space="preserve">
<value>URL is empty.</value>
</data>
<data name="GitHub_Black_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GitHub-Black-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -290,9 +284,6 @@ Middle click to close</value>
<data name="MainForm_UpdateMainFormTip_Currently_configured_hotkeys_" xml:space="preserve">
<value>Currently configured hotkeys:</value>
</data>
<data name="Twitter-32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Twitter-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskManager_CreateListViewItem_History" xml:space="preserve">
<value>History</value>
</data>
@ -455,9 +446,6 @@ Are you sure you want to continue?</value>
<data name="drive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="GitHub_White_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GitHub-White-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_File_uploader___0_" xml:space="preserve">
<value>File uploader: {0}</value>
</data>
@ -497,9 +485,6 @@ Are you sure you want to continue?</value>
<data name="application_monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Patreon_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Patreon-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camera" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -786,9 +771,6 @@ Would you like to restart ShareX?</value>
<data name="keyboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Discord_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Discord-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskManager_CreateListViewItem_In_queue" xml:space="preserve">
<value>In queue</value>
</data>
@ -1003,9 +985,6 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="AboutForm_AboutForm_Language_ko_KR" xml:space="preserve">
<value>Korean</value>
</data>
<data name="Twitter-16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Twitter-16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tick_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tick-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -1112,4 +1091,10 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="InspectWindow_WindowStyles" xml:space="preserve">
<value>Window styles</value>
</data>
<data name="Twitter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\twitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Discord" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\discord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ShareX/Resources/Bitcoin-32x32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ShareX/Resources/Discord-32x32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 614 B

BIN
ShareX/Resources/Discord.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 519 B

BIN
ShareX/Resources/GitHub-Black-32x32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
ShareX/Resources/GitHub-White-32x32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 802 B

BIN
ShareX/Resources/Patreon-32x32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
ShareX/Resources/Twitter-32x32.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 912 B

0
ShareX/Resources/Twitter-16x16.png → ShareX/Resources/Twitter.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 497 B

After

Width:  |  Height:  |  Size: 497 B

23
ShareX/ShareX.csproj
View file

@ -1845,24 +1845,6 @@
<ItemGroup>
<None Include="Resources\ir.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Twitter-32x32.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Discord-32x32.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Patreon-32x32.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Bitcoin-32x32.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\GitHub-White-32x32.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\GitHub-Black-32x32.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\image-split.png" />
</ItemGroup>
@ -1894,7 +1876,7 @@
<None Include="Resources\application-search-result.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Twitter-16x16.png" />
<None Include="Resources\Twitter.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\application-tile-horizontal.png" />
@ -1905,6 +1887,9 @@
<ItemGroup>
<None Include="Resources\Bing.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Discord.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

2
ShareX/TaskHelpers.cs
View file

@ -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;