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

Added quick image combine buttons to sub menu

Browse source
This commit is contained in:
Jaex 2021-06-14 15:43:52 +03:00
parent d7aa0ab7f5
commit 1d442ade59
9 changed files with 295 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,25 +72,30 @@ private void InitializeComponent()
this.tsmiUploadURL = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiUploadDragDrop = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiShortenURL = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTweetMessage = new System.Windows.Forms.ToolStripMenuItem();
this.tsddbWorkflows = new System.Windows.Forms.ToolStripDropDownButton();
this.tsddbTools = new System.Windows.Forms.ToolStripDropDownButton();
this.tsmiColorPicker = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiScreenColorPicker = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiRuler = new System.Windows.Forms.ToolStripMenuItem();
this.tssTools1 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiImageEditor = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImageEffects = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImageCombiner = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImageSplitter = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImageThumbnailer = new System.Windows.Forms.ToolStripMenuItem();
this.tssTools2 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiVideoConverter = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiVideoThumbnailer = new System.Windows.Forms.ToolStripMenuItem();
this.tssTools3 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiQRCode = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiHashCheck = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiIndexFolder = new System.Windows.Forms.ToolStripMenuItem();
this.tssTools4 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiClipboardViewer = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiInspectWindow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiDNSChanger = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiMonitorTest = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiDNSChanger = new System.Windows.Forms.ToolStripMenuItem();
this.tssMain1 = new System.Windows.Forms.ToolStripSeparator();
this.tsddbAfterCaptureTasks = new System.Windows.Forms.ToolStripDropDownButton();
this.tsddbAfterUploadTasks = new System.Windows.Forms.ToolStripDropDownButton();
@ -176,6 +181,8 @@ private void InitializeComponent()
this.tsmiShowQRCode = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiOCRImage = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiCombineImages = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiCombineImagesHorizontally = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiCombineImagesVertically = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiShowResponse = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiClearList = new System.Windows.Forms.ToolStripMenuItem();
this.tssUploadInfo1 = new System.Windows.Forms.ToolStripSeparator();
@ -228,25 +235,30 @@ private void InitializeComponent()
this.tsmiTrayUploadURL = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayUploadDragDrop = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayShortenURL = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayTweetMessage = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayWorkflows = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayTools = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayColorPicker = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayScreenColorPicker = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayRuler = new System.Windows.Forms.ToolStripMenuItem();
this.tssTrayTools1 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiTrayImageEditor = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayImageEffects = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayImageCombiner = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayImageSplitter = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayImageThumbnailer = new System.Windows.Forms.ToolStripMenuItem();
this.tssTrayTools2 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiTrayVideoConverter = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayVideoThumbnailer = new System.Windows.Forms.ToolStripMenuItem();
this.tssTrayTools3 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiTrayQRCode = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayHashCheck = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayIndexFolder = new System.Windows.Forms.ToolStripMenuItem();
this.tssTrayTools4 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiTrayClipboardViewer = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayInspectWindow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayDNSChanger = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayMonitorTest = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayDNSChanger = new System.Windows.Forms.ToolStripMenuItem();
this.tssTray1 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiTrayAfterCaptureTasks = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayAfterUploadTasks = new System.Windows.Forms.ToolStripMenuItem();
@ -297,16 +309,6 @@ 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();
this.tssTools1 = new System.Windows.Forms.ToolStripSeparator();
this.tssTools2 = new System.Windows.Forms.ToolStripSeparator();
this.tssTools3 = new System.Windows.Forms.ToolStripSeparator();
this.tssTools4 = new System.Windows.Forms.ToolStripSeparator();
this.tssTrayTools1 = new System.Windows.Forms.ToolStripSeparator();
this.tssTrayTools2 = new System.Windows.Forms.ToolStripSeparator();
this.tssTrayTools3 = new System.Windows.Forms.ToolStripSeparator();
this.tssTrayTools4 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
this.scMain.Panel1.SuspendLayout();
this.scMain.Panel2.SuspendLayout();
@ -676,6 +678,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiShortenURL, "tsmiShortenURL");
this.tsmiShortenURL.Click += new System.EventHandler(this.tsmiShortenURL_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);
//
// tsddbWorkflows
//
this.tsddbWorkflows.Image = global::ShareX.Properties.Resources.categories;
@ -731,6 +740,11 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiRuler, "tsmiRuler");
this.tsmiRuler.Click += new System.EventHandler(this.tsmiRuler_Click);
//
// tssTools1
//
this.tssTools1.Name = "tssTools1";
resources.ApplyResources(this.tssTools1, "tssTools1");
//
// tsmiImageEditor
//
this.tsmiImageEditor.Image = global::ShareX.Properties.Resources.image_pencil;
@ -766,6 +780,11 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiImageThumbnailer, "tsmiImageThumbnailer");
this.tsmiImageThumbnailer.Click += new System.EventHandler(this.tsmiImageThumbnailer_Click);
//
// tssTools2
//
this.tssTools2.Name = "tssTools2";
resources.ApplyResources(this.tssTools2, "tssTools2");
//
// tsmiVideoConverter
//
this.tsmiVideoConverter.Image = global::ShareX.Properties.Resources.camcorder_pencil;
@ -780,6 +799,11 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiVideoThumbnailer, "tsmiVideoThumbnailer");
this.tsmiVideoThumbnailer.Click += new System.EventHandler(this.tsmiVideoThumbnailer_Click);
//
// tssTools3
//
this.tssTools3.Name = "tssTools3";
resources.ApplyResources(this.tssTools3, "tssTools3");
//
// tsmiQRCode
//
this.tsmiQRCode.Image = global::ShareX.Properties.Resources.barcode_2d;
@ -801,6 +825,11 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiIndexFolder, "tsmiIndexFolder");
this.tsmiIndexFolder.Click += new System.EventHandler(this.tsmiIndexFolder_Click);
//
// tssTools4
//
this.tssTools4.Name = "tssTools4";
resources.ApplyResources(this.tssTools4, "tssTools4");
//
// tsmiClipboardViewer
//
this.tsmiClipboardViewer.Image = global::ShareX.Properties.Resources.clipboard_block;
@ -815,13 +844,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiInspectWindow, "tsmiInspectWindow");
this.tsmiInspectWindow.Click += new System.EventHandler(this.tsmiInspectWindow_Click);
//
// tsmiDNSChanger
//
this.tsmiDNSChanger.Image = global::ShareX.Properties.Resources.network_ip;
this.tsmiDNSChanger.Name = "tsmiDNSChanger";
resources.ApplyResources(this.tsmiDNSChanger, "tsmiDNSChanger");
this.tsmiDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click);
//
// tsmiMonitorTest
//
this.tsmiMonitorTest.Image = global::ShareX.Properties.Resources.monitor;
@ -829,6 +851,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiMonitorTest, "tsmiMonitorTest");
this.tsmiMonitorTest.Click += new System.EventHandler(this.tsmiMonitorTest_Click);
//
// tsmiDNSChanger
//
this.tsmiDNSChanger.Image = global::ShareX.Properties.Resources.network_ip;
this.tsmiDNSChanger.Name = "tsmiDNSChanger";
resources.ApplyResources(this.tsmiDNSChanger, "tsmiDNSChanger");
this.tsmiDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click);
//
// tssMain1
//
this.tssMain1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
@ -1440,11 +1469,28 @@ private void InitializeComponent()
//
// tsmiCombineImages
//
this.tsmiCombineImages.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsmiCombineImagesHorizontally,
this.tsmiCombineImagesVertically});
this.tsmiCombineImages.Image = global::ShareX.Properties.Resources.document_break;
this.tsmiCombineImages.Name = "tsmiCombineImages";
resources.ApplyResources(this.tsmiCombineImages, "tsmiCombineImages");
this.tsmiCombineImages.Click += new System.EventHandler(this.tsmiCombineImages_Click);
//
// tsmiCombineImagesHorizontally
//
this.tsmiCombineImagesHorizontally.Image = global::ShareX.Properties.Resources.application_tile_horizontal;
this.tsmiCombineImagesHorizontally.Name = "tsmiCombineImagesHorizontally";
resources.ApplyResources(this.tsmiCombineImagesHorizontally, "tsmiCombineImagesHorizontally");
this.tsmiCombineImagesHorizontally.Click += new System.EventHandler(this.tsmiCombineImagesHorizontally_Click);
//
// tsmiCombineImagesVertically
//
this.tsmiCombineImagesVertically.Image = global::ShareX.Properties.Resources.application_tile_vertical;
this.tsmiCombineImagesVertically.Name = "tsmiCombineImagesVertically";
resources.ApplyResources(this.tsmiCombineImagesVertically, "tsmiCombineImagesVertically");
this.tsmiCombineImagesVertically.Click += new System.EventHandler(this.tsmiCombineImagesVertically_Click);
//
// tsmiShowResponse
//
this.tsmiShowResponse.Image = global::ShareX.Properties.Resources.application_browser;
@ -1868,6 +1914,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayShortenURL, "tsmiTrayShortenURL");
this.tsmiTrayShortenURL.Click += new System.EventHandler(this.tsmiShortenURL_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);
//
// tsmiTrayWorkflows
//
this.tsmiTrayWorkflows.Image = global::ShareX.Properties.Resources.categories;
@ -1923,6 +1976,11 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayRuler, "tsmiTrayRuler");
this.tsmiTrayRuler.Click += new System.EventHandler(this.tsmiRuler_Click);
//
// tssTrayTools1
//
this.tssTrayTools1.Name = "tssTrayTools1";
resources.ApplyResources(this.tssTrayTools1, "tssTrayTools1");
//
// tsmiTrayImageEditor
//
this.tsmiTrayImageEditor.Image = global::ShareX.Properties.Resources.image_pencil;
@ -1958,6 +2016,11 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayImageThumbnailer, "tsmiTrayImageThumbnailer");
this.tsmiTrayImageThumbnailer.Click += new System.EventHandler(this.tsmiImageThumbnailer_Click);
//
// tssTrayTools2
//
this.tssTrayTools2.Name = "tssTrayTools2";
resources.ApplyResources(this.tssTrayTools2, "tssTrayTools2");
//
// tsmiTrayVideoConverter
//
this.tsmiTrayVideoConverter.Image = global::ShareX.Properties.Resources.camcorder_pencil;
@ -1972,6 +2035,11 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayVideoThumbnailer, "tsmiTrayVideoThumbnailer");
this.tsmiTrayVideoThumbnailer.Click += new System.EventHandler(this.tsmiVideoThumbnailer_Click);
//
// tssTrayTools3
//
this.tssTrayTools3.Name = "tssTrayTools3";
resources.ApplyResources(this.tssTrayTools3, "tssTrayTools3");
//
// tsmiTrayQRCode
//
this.tsmiTrayQRCode.Image = global::ShareX.Properties.Resources.barcode_2d;
@ -1993,6 +2061,11 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayIndexFolder, "tsmiTrayIndexFolder");
this.tsmiTrayIndexFolder.Click += new System.EventHandler(this.tsmiIndexFolder_Click);
//
// tssTrayTools4
//
this.tssTrayTools4.Name = "tssTrayTools4";
resources.ApplyResources(this.tssTrayTools4, "tssTrayTools4");
//
// tsmiTrayClipboardViewer
//
this.tsmiTrayClipboardViewer.Image = global::ShareX.Properties.Resources.clipboard_block;
@ -2007,13 +2080,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayInspectWindow, "tsmiTrayInspectWindow");
this.tsmiTrayInspectWindow.Click += new System.EventHandler(this.tsmiInspectWindow_Click);
//
// tsmiTrayDNSChanger
//
this.tsmiTrayDNSChanger.Image = global::ShareX.Properties.Resources.network_ip;
this.tsmiTrayDNSChanger.Name = "tsmiTrayDNSChanger";
resources.ApplyResources(this.tsmiTrayDNSChanger, "tsmiTrayDNSChanger");
this.tsmiTrayDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click);
//
// tsmiTrayMonitorTest
//
this.tsmiTrayMonitorTest.Image = global::ShareX.Properties.Resources.monitor;
@ -2021,6 +2087,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiTrayMonitorTest, "tsmiTrayMonitorTest");
this.tsmiTrayMonitorTest.Click += new System.EventHandler(this.tsmiMonitorTest_Click);
//
// tsmiTrayDNSChanger
//
this.tsmiTrayDNSChanger.Image = global::ShareX.Properties.Resources.network_ip;
this.tsmiTrayDNSChanger.Name = "tsmiTrayDNSChanger";
resources.ApplyResources(this.tsmiTrayDNSChanger, "tsmiTrayDNSChanger");
this.tsmiTrayDNSChanger.Click += new System.EventHandler(this.tsmiDNSChanger_Click);
//
// tssTray1
//
this.tssTray1.Name = "tssTray1";
@ -2395,60 +2468,6 @@ 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);
//
// tssTools1
//
this.tssTools1.Name = "tssTools1";
resources.ApplyResources(this.tssTools1, "tssTools1");
//
// tssTools2
//
this.tssTools2.Name = "tssTools2";
resources.ApplyResources(this.tssTools2, "tssTools2");
//
// tssTools3
//
this.tssTools3.Name = "tssTools3";
resources.ApplyResources(this.tssTools3, "tssTools3");
//
// tssTools4
//
this.tssTools4.Name = "tssTools4";
resources.ApplyResources(this.tssTools4, "tssTools4");
//
// tssTrayTools1
//
this.tssTrayTools1.Name = "tssTrayTools1";
resources.ApplyResources(this.tssTrayTools1, "tssTrayTools1");
//
// tssTrayTools2
//
this.tssTrayTools2.Name = "tssTrayTools2";
resources.ApplyResources(this.tssTrayTools2, "tssTrayTools2");
//
// tssTrayTools3
//
this.tssTrayTools3.Name = "tssTrayTools3";
resources.ApplyResources(this.tssTrayTools3, "tssTrayTools3");
//
// tssTrayTools4
//
this.tssTrayTools4.Name = "tssTrayTools4";
resources.ApplyResources(this.tssTrayTools4, "tssTrayTools4");
//
// MainForm
//
this.AllowDrop = true;
@ -2770,5 +2789,7 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripSeparator tssTrayTools2;
private System.Windows.Forms.ToolStripSeparator tssTrayTools3;
private System.Windows.Forms.ToolStripSeparator tssTrayTools4;
private System.Windows.Forms.ToolStripMenuItem tsmiCombineImagesHorizontally;
private System.Windows.Forms.ToolStripMenuItem tsmiCombineImagesVertically;
}
}

10
ShareX/Forms/MainForm.cs
View file

@ -2436,6 +2436,16 @@ private void tsmiCombineImages_Click(object sender, EventArgs e)
uim.CombineImages();
}
private void tsmiCombineImagesHorizontally_Click(object sender, EventArgs e)
{
uim.CombineImages(Orientation.Horizontal);
}
private void tsmiCombineImagesVertically_Click(object sender, EventArgs e)
{
uim.CombineImages(Orientation.Vertical);
}
private void tsmiShowResponse_Click(object sender, EventArgs e)
{
uim.ShowResponse();

168
ShareX/Forms/MainForm.resx
View file

@ -1245,6 +1245,18 @@
<data name="tsmiOCRImage.Text" xml:space="preserve">
<value>OCR image...</value>
</data>
<data name="tsmiCombineImagesHorizontally.Size" type="System.Drawing.Size, System.Drawing">
<value>188, 22</value>
</data>
<data name="tsmiCombineImagesHorizontally.Text" xml:space="preserve">
<value>Combine horizontally</value>
</data>
<data name="tsmiCombineImagesVertically.Size" type="System.Drawing.Size, System.Drawing">
<value>188, 22</value>
</data>
<data name="tsmiCombineImagesVertically.Text" xml:space="preserve">
<value>Combine vertically</value>
</data>
<data name="tsmiCombineImages.Size" type="System.Drawing.Size, System.Drawing">
<value>228, 22</value>
</data>
@ -2439,6 +2451,12 @@
<data name="&gt;&gt;tsmiShortenURL.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTweetMessage.Name" xml:space="preserve">
<value>tsmiTweetMessage</value>
</data>
<data name="&gt;&gt;tsmiTweetMessage.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsddbWorkflows.Name" xml:space="preserve">
<value>tsddbWorkflows</value>
</data>
@ -2469,6 +2487,12 @@
<data name="&gt;&gt;tsmiRuler.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTools1.Name" xml:space="preserve">
<value>tssTools1</value>
</data>
<data name="&gt;&gt;tssTools1.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;tsmiImageEditor.Name" xml:space="preserve">
<value>tsmiImageEditor</value>
</data>
@ -2499,6 +2523,12 @@
<data name="&gt;&gt;tsmiImageThumbnailer.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTools2.Name" xml:space="preserve">
<value>tssTools2</value>
</data>
<data name="&gt;&gt;tssTools2.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;tsmiVideoConverter.Name" xml:space="preserve">
<value>tsmiVideoConverter</value>
</data>
@ -2511,6 +2541,12 @@
<data name="&gt;&gt;tsmiVideoThumbnailer.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTools3.Name" xml:space="preserve">
<value>tssTools3</value>
</data>
<data name="&gt;&gt;tssTools3.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;tsmiQRCode.Name" xml:space="preserve">
<value>tsmiQRCode</value>
</data>
@ -2529,6 +2565,12 @@
<data name="&gt;&gt;tsmiIndexFolder.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTools4.Name" xml:space="preserve">
<value>tssTools4</value>
</data>
<data name="&gt;&gt;tssTools4.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;tsmiClipboardViewer.Name" xml:space="preserve">
<value>tsmiClipboardViewer</value>
</data>
@ -2541,18 +2583,18 @@
<data name="&gt;&gt;tsmiInspectWindow.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiDNSChanger.Name" xml:space="preserve">
<value>tsmiDNSChanger</value>
</data>
<data name="&gt;&gt;tsmiDNSChanger.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiMonitorTest.Name" xml:space="preserve">
<value>tsmiMonitorTest</value>
</data>
<data name="&gt;&gt;tsmiMonitorTest.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiDNSChanger.Name" xml:space="preserve">
<value>tsmiDNSChanger</value>
</data>
<data name="&gt;&gt;tsmiDNSChanger.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssMain1.Name" xml:space="preserve">
<value>tssMain1</value>
</data>
@ -3057,6 +3099,18 @@
<data name="&gt;&gt;tsmiCombineImages.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiCombineImagesHorizontally.Name" xml:space="preserve">
<value>tsmiCombineImagesHorizontally</value>
</data>
<data name="&gt;&gt;tsmiCombineImagesHorizontally.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiCombineImagesVertically.Name" xml:space="preserve">
<value>tsmiCombineImagesVertically</value>
</data>
<data name="&gt;&gt;tsmiCombineImagesVertically.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiShowResponse.Name" xml:space="preserve">
<value>tsmiShowResponse</value>
</data>
@ -3363,6 +3417,12 @@
<data name="&gt;&gt;tsmiTrayShortenURL.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayTweetMessage.Name" xml:space="preserve">
<value>tsmiTrayTweetMessage</value>
</data>
<data name="&gt;&gt;tsmiTrayTweetMessage.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayWorkflows.Name" xml:space="preserve">
<value>tsmiTrayWorkflows</value>
</data>
@ -3393,6 +3453,12 @@
<data name="&gt;&gt;tsmiTrayRuler.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTrayTools1.Name" xml:space="preserve">
<value>tssTrayTools1</value>
</data>
<data name="&gt;&gt;tssTrayTools1.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;tsmiTrayImageEditor.Name" xml:space="preserve">
<value>tsmiTrayImageEditor</value>
</data>
@ -3423,6 +3489,12 @@
<data name="&gt;&gt;tsmiTrayImageThumbnailer.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTrayTools2.Name" xml:space="preserve">
<value>tssTrayTools2</value>
</data>
<data name="&gt;&gt;tssTrayTools2.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;tsmiTrayVideoConverter.Name" xml:space="preserve">
<value>tsmiTrayVideoConverter</value>
</data>
@ -3435,6 +3507,12 @@
<data name="&gt;&gt;tsmiTrayVideoThumbnailer.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTrayTools3.Name" xml:space="preserve">
<value>tssTrayTools3</value>
</data>
<data name="&gt;&gt;tssTrayTools3.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;tsmiTrayQRCode.Name" xml:space="preserve">
<value>tsmiTrayQRCode</value>
</data>
@ -3453,6 +3531,12 @@
<data name="&gt;&gt;tsmiTrayIndexFolder.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTrayTools4.Name" xml:space="preserve">
<value>tssTrayTools4</value>
</data>
<data name="&gt;&gt;tssTrayTools4.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;tsmiTrayClipboardViewer.Name" xml:space="preserve">
<value>tsmiTrayClipboardViewer</value>
</data>
@ -3465,18 +3549,18 @@
<data name="&gt;&gt;tsmiTrayInspectWindow.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayDNSChanger.Name" xml:space="preserve">
<value>tsmiTrayDNSChanger</value>
</data>
<data name="&gt;&gt;tsmiTrayDNSChanger.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayMonitorTest.Name" xml:space="preserve">
<value>tsmiTrayMonitorTest</value>
</data>
<data name="&gt;&gt;tsmiTrayMonitorTest.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayDNSChanger.Name" xml:space="preserve">
<value>tsmiTrayDNSChanger</value>
</data>
<data name="&gt;&gt;tsmiTrayDNSChanger.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTray1.Name" xml:space="preserve">
<value>tssTray1</value>
</data>
@ -3729,66 +3813,6 @@
<data name="&gt;&gt;tsbGitHub.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;tsmiTweetMessage.Name" xml:space="preserve">
<value>tsmiTweetMessage</value>
</data>
<data name="&gt;&gt;tsmiTweetMessage.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiTrayTweetMessage.Name" xml:space="preserve">
<value>tsmiTrayTweetMessage</value>
</data>
<data name="&gt;&gt;tsmiTrayTweetMessage.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tssTools1.Name" xml:space="preserve">
<value>tssTools1</value>
</data>
<data name="&gt;&gt;tssTools1.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;tssTools2.Name" xml:space="preserve">
<value>tssTools2</value>
</data>
<data name="&gt;&gt;tssTools2.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;tssTools3.Name" xml:space="preserve">
<value>tssTools3</value>
</data>
<data name="&gt;&gt;tssTools3.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;tssTools4.Name" xml:space="preserve">
<value>tssTools4</value>
</data>
<data name="&gt;&gt;tssTools4.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;tssTrayTools1.Name" xml:space="preserve">
<value>tssTrayTools1</value>
</data>
<data name="&gt;&gt;tssTrayTools1.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;tssTrayTools2.Name" xml:space="preserve">
<value>tssTrayTools2</value>
</data>
<data name="&gt;&gt;tssTrayTools2.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;tssTrayTools3.Name" xml:space="preserve">
<value>tssTrayTools3</value>
</data>
<data name="&gt;&gt;tssTrayTools3.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;tssTrayTools4.Name" xml:space="preserve">
<value>tssTrayTools4</value>
</data>
<data name="&gt;&gt;tssTrayTools4.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>

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

@ -498,6 +498,26 @@ public static System.Drawing.Bitmap application_text_image {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap application_tile_horizontal {
get {
object obj = ResourceManager.GetObject("application-tile-horizontal", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap application_tile_vertical {
get {
object obj = ResourceManager.GetObject("application-tile-vertical", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized string similar to Choose screenshots folder path.
/// </summary>

90
ShareX/Properties/Resources.resx
View file

@ -270,6 +270,9 @@ Would you like to restart ShareX?</value>
<data name="application_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FFmpeg_Download_of_FFmpeg_failed" xml:space="preserve">
<value>Download of FFmpeg failed.</value>
</data>
<data name="UploadTask_ThreadDoWork_URL_is_empty_" xml:space="preserve">
<value>URL is empty.</value>
</data>
@ -285,6 +288,9 @@ Would you like to restart ShareX?</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>
@ -297,6 +303,9 @@ Would you like to restart ShareX?</value>
<data name="MainForm_UpdateToggleHotkeyButton_Disable_hotkeys" xml:space="preserve">
<value>Disable hotkeys</value>
</data>
<data name="FFmpeg_Missing" xml:space="preserve">
<value>Missing</value>
</data>
<data name="QuickTaskMenuEditorForm_Reset_all_quick_tasks_to_defaults_Confirmation" xml:space="preserve">
<value>Reset all quick tasks to defaults?</value>
</data>
@ -330,9 +339,6 @@ Would you like to restart ShareX?</value>
<data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clipboard_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UploadTask_DoUploadJob_First_time_upload_warning_text" xml:space="preserve">
<value>Are you sure you want to upload this screenshot?
Press 'No' to cancel the current upload and disable screenshot auto uploading.</value>
@ -343,6 +349,9 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
<data name="MainForm_UpdateMenu_Show_menu" xml:space="preserve">
<value>Show menu</value>
</data>
<data name="FFmpeg_FFmpeg_video_and_audio_source_both_can_t_be__None__" xml:space="preserve">
<value>FFmpeg video and audio source can't both be "None".</value>
</data>
<data name="globe__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -382,6 +391,11 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
<data name="globe_share" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FFmpeg_does_not_exist" xml:space="preserve">
<value>{0} does not exist.
Would you like to automatically download it?</value>
</data>
<data name="ui_thumbnail_title" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-thumbnail-title.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -441,8 +455,8 @@ Are you sure you want to continue?</value>
<data name="application_list" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="YourAntiVirusSoftwareOrTheControlledFolderAccessFeatureInWindows10CouldBeBlockingShareX" xml:space="preserve">
<value>Your anti-virus software or the controlled folder access feature in Windows 10 could be blocking ShareX.</value>
<data name="crown" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\crown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UploadTask_DoAfterCaptureJobs_Choose_a_folder_to_save" xml:space="preserve">
<value>Choose a folder to save</value>
@ -483,6 +497,9 @@ Are you sure you want to continue?</value>
<data name="application_home" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="YourAntiVirusSoftwareOrTheControlledFolderAccessFeatureInWindows10CouldBeBlockingShareX" xml:space="preserve">
<value>Your anti-virus software or the controlled folder access feature in Windows 10 could be blocking ShareX.</value>
</data>
<data name="drive_globe" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drive-globe.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -525,8 +542,8 @@ Are you sure you want to continue?</value>
<data name="globe_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="crown" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\crown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ir" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ui_scroll_pane_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-scroll-pane-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -569,12 +586,18 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="IntegrationHelpers_EditWithShareX" xml:space="preserve">
<value>Edit with ShareX</value>
</data>
<data name="disk_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>Error</value>
</data>
<data name="disk_rename" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk-rename.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clipboard_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -605,9 +628,6 @@ You can later disable it from "After capture tasks" menu.</value>
<data name="ChromeForm_btnRegister_Click_Chrome_support_enabled_" xml:space="preserve">
<value>Chrome support enabled.</value>
</data>
<data name="ir" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="cn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -709,15 +729,12 @@ Would you like to restart ShareX?</value>
<data name="AboutForm_AboutForm_Language_uk" xml:space="preserve">
<value>Ukrainian</value>
</data>
<data name="disk_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="FFmpeg_FFmpeg_error" xml:space="preserve">
<value>FFmpeg error</value>
</data>
<data name="folder_stand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application-search-result" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-search-result.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_URL_shortener___0_" xml:space="preserve">
<value>URL shortener: {0}</value>
</data>
@ -745,8 +762,8 @@ Would you like to restart ShareX?</value>
<data name="AboutForm_AboutForm_External_libraries" xml:space="preserve">
<value>External libraries</value>
</data>
<data name="megaphone" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\megaphone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="application-search-result" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-search-result.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UploadManager_ShowShortenURLDialog_Shorten" xml:space="preserve">
<value>Shorten</value>
@ -873,6 +890,9 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="nl" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\nl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="megaphone" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\megaphone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ImageData_Write_Error" xml:space="preserve">
<value>Could not write image to path {0}.</value>
</data>
@ -888,9 +908,6 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="FailedToSaveSettings" xml:space="preserve">
<value>Failed to save settings</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="HotkeyManager_ShowFailedHotkeys_hotkey" xml:space="preserve">
<value>hotkey</value>
</data>
@ -924,6 +941,9 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="MainForm_UpdateToggleHotkeyButton_Enable_hotkeys" xml:space="preserve">
<value>Enable hotkeys</value>
</data>
<data name="application-tile-horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-tile-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HotkeySettingsForm_Reset_all_hotkeys_to_defaults_Confirmation" xml:space="preserve">
<value>Reset all hotkeys to defaults?</value>
</data>
@ -975,6 +995,9 @@ 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>
@ -1031,6 +1054,9 @@ Middle click to close</value>
<data name="UploadManager_UploadFolder_Folder_upload" xml:space="preserve">
<value>Folder upload</value>
</data>
<data name="FFmpeg_FFmpeg_successfully_downloaded" xml:space="preserve">
<value>FFmpeg successfully downloaded.</value>
</data>
<data name="UploadTask_Prepare_Preparing" xml:space="preserve">
<value>Preparing</value>
</data>
@ -1053,27 +1079,7 @@ Middle click to close</value>
<data name="TaskCompletedSound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TaskCompletedSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</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="FFmpeg_does_not_exist" xml:space="preserve">
<value>{0} does not exist.
Would you like to automatically download it?</value>
</data>
<data name="FFmpeg_Download_of_FFmpeg_failed" xml:space="preserve">
<value>Download of FFmpeg failed.</value>
</data>
<data name="FFmpeg_FFmpeg_error" xml:space="preserve">
<value>FFmpeg error</value>
</data>
<data name="FFmpeg_FFmpeg_successfully_downloaded" xml:space="preserve">
<value>FFmpeg successfully downloaded.</value>
</data>
<data name="FFmpeg_FFmpeg_video_and_audio_source_both_can_t_be__None__" xml:space="preserve">
<value>FFmpeg video and audio source can't both be "None".</value>
</data>
<data name="FFmpeg_Missing" xml:space="preserve">
<value>Missing</value>
<data name="application-tile-vertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-tile-vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ShareX/Resources/application-tile-horizontal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 411 B

BIN
ShareX/Resources/application-tile-vertical.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

6
ShareX/ShareX.csproj
View file

@ -1881,6 +1881,12 @@
<ItemGroup>
<None Include="Resources\Twitter-16x16.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\application-tile-horizontal.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\application-tile-vertical.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>

14
ShareX/UploadInfoManager.cs
View file

@ -31,6 +31,7 @@ You should have received a copy of the GNU General Public License
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ShareX
{
@ -399,6 +400,19 @@ public void CombineImages()
}
}
public void CombineImages(Orientation orientation)
{
if (IsItemSelected)
{
IEnumerable<string> imageFiles = SelectedItems.Where(x => x.IsImageFile).Select(x => x.Info.FilePath);
if (imageFiles.Count() > 1)
{
TaskHelpers.CombineImages(imageFiles, orientation);
}
}
}
public void ShowResponse()
{
if (IsItemSelected && SelectedItem.Info.Result != null)