Added hotkey for rest of tools

This commit is contained in:
Jaex 2015-10-01 02:48:33 +03:00
parent e12a18850d
commit 4a2e0d7680
11 changed files with 1793 additions and 298 deletions

View file

@ -987,6 +987,24 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Image combiner.
/// </summary>
internal static string HotkeyType_ImageCombiner {
get {
return ResourceManager.GetString("HotkeyType_ImageCombiner", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tools.
/// </summary>
internal static string HotkeyType_ImageCombiner_Category {
get {
return ResourceManager.GetString("HotkeyType_ImageCombiner_Category", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Image editor.
/// </summary>
@ -1041,6 +1059,24 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to IRC client.
/// </summary>
internal static string HotkeyType_IRCClient {
get {
return ResourceManager.GetString("HotkeyType_IRCClient", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tools.
/// </summary>
internal static string HotkeyType_IRCClient_Category {
get {
return ResourceManager.GetString("HotkeyType_IRCClient_Category", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Capture last region.
/// </summary>
@ -1464,6 +1500,24 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Video thumbnailer.
/// </summary>
internal static string HotkeyType_VideoThumbnailer {
get {
return ResourceManager.GetString("HotkeyType_VideoThumbnailer", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tools.
/// </summary>
internal static string HotkeyType_VideoThumbnailer_Category {
get {
return ResourceManager.GetString("HotkeyType_VideoThumbnailer_Category", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Capture region (Objects).
/// </summary>

View file

@ -826,4 +826,22 @@ Would you like to download and install it?</value>
<data name="HotkeyType_ScrollingCapture_Category" xml:space="preserve">
<value>Screen capture</value>
</data>
<data name="HotkeyType_IRCClient" xml:space="preserve">
<value>IRC client</value>
</data>
<data name="HotkeyType_IRCClient_Category" xml:space="preserve">
<value>Tools</value>
</data>
<data name="HotkeyType_ImageCombiner" xml:space="preserve">
<value>Image combiner</value>
</data>
<data name="HotkeyType_ImageCombiner_Category" xml:space="preserve">
<value>Tools</value>
</data>
<data name="HotkeyType_VideoThumbnailer" xml:space="preserve">
<value>Video thumbnailer</value>
</data>
<data name="HotkeyType_VideoThumbnailer_Category" xml:space="preserve">
<value>Tools</value>
</data>
</root>

View file

@ -23,6 +23,7 @@ partial class ScrollingCaptureForm
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScrollingCaptureForm));
this.btnSelectHandle = new System.Windows.Forms.Button();
this.lblControlText = new System.Windows.Forms.Label();
this.btnCapture = new System.Windows.Forms.Button();
@ -94,30 +95,20 @@ private void InitializeComponent()
//
// btnSelectHandle
//
this.btnSelectHandle.Location = new System.Drawing.Point(16, 16);
resources.ApplyResources(this.btnSelectHandle, "btnSelectHandle");
this.btnSelectHandle.Name = "btnSelectHandle";
this.btnSelectHandle.Size = new System.Drawing.Size(344, 23);
this.btnSelectHandle.TabIndex = 0;
this.btnSelectHandle.Text = "Select window or control to scroll...";
this.btnSelectHandle.UseVisualStyleBackColor = true;
this.btnSelectHandle.Click += new System.EventHandler(this.btnSelectHandle_Click);
//
// lblControlText
//
this.lblControlText.AutoSize = true;
this.lblControlText.Location = new System.Drawing.Point(368, 21);
resources.ApplyResources(this.lblControlText, "lblControlText");
this.lblControlText.Name = "lblControlText";
this.lblControlText.Size = new System.Drawing.Size(0, 13);
this.lblControlText.TabIndex = 1;
//
// btnCapture
//
this.btnCapture.Enabled = false;
this.btnCapture.Location = new System.Drawing.Point(16, 312);
resources.ApplyResources(this.btnCapture, "btnCapture");
this.btnCapture.Name = "btnCapture";
this.btnCapture.Size = new System.Drawing.Size(344, 32);
this.btnCapture.TabIndex = 18;
this.btnCapture.Text = "Start capture";
this.btnCapture.UseVisualStyleBackColor = true;
this.btnCapture.Click += new System.EventHandler(this.btnCapture_Click);
//
@ -127,55 +118,38 @@ private void InitializeComponent()
//
// nudScrollDelay
//
this.nudScrollDelay.Location = new System.Drawing.Point(160, 116);
resources.ApplyResources(this.nudScrollDelay, "nudScrollDelay");
this.nudScrollDelay.Maximum = new decimal(new int[] {
5000,
0,
0,
0});
this.nudScrollDelay.Name = "nudScrollDelay";
this.nudScrollDelay.Size = new System.Drawing.Size(80, 20);
this.nudScrollDelay.TabIndex = 9;
this.nudScrollDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudScrollDelay.ValueChanged += new System.EventHandler(this.nudScrollDelay_ValueChanged);
//
// nudMaximumScrollCount
//
this.nudMaximumScrollCount.Location = new System.Drawing.Point(160, 140);
resources.ApplyResources(this.nudMaximumScrollCount, "nudMaximumScrollCount");
this.nudMaximumScrollCount.Name = "nudMaximumScrollCount";
this.nudMaximumScrollCount.Size = new System.Drawing.Size(80, 20);
this.nudMaximumScrollCount.TabIndex = 11;
this.nudMaximumScrollCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudMaximumScrollCount.ValueChanged += new System.EventHandler(this.nudMaximumScrollCount_ValueChanged);
//
// lblScrollDelay
//
this.lblScrollDelay.AutoSize = true;
this.lblScrollDelay.Location = new System.Drawing.Point(13, 120);
resources.ApplyResources(this.lblScrollDelay, "lblScrollDelay");
this.lblScrollDelay.Name = "lblScrollDelay";
this.lblScrollDelay.Size = new System.Drawing.Size(64, 13);
this.lblScrollDelay.TabIndex = 8;
this.lblScrollDelay.Text = "Scroll delay:";
//
// lblMaximumScrollCount
//
this.lblMaximumScrollCount.AutoSize = true;
this.lblMaximumScrollCount.Location = new System.Drawing.Point(13, 144);
resources.ApplyResources(this.lblMaximumScrollCount, "lblMaximumScrollCount");
this.lblMaximumScrollCount.Name = "lblMaximumScrollCount";
this.lblMaximumScrollCount.Size = new System.Drawing.Size(111, 13);
this.lblMaximumScrollCount.TabIndex = 10;
this.lblMaximumScrollCount.Text = "Maximum scroll count:";
//
// tcScrollingCapture
//
this.tcScrollingCapture.Controls.Add(this.tpCapture);
this.tcScrollingCapture.Controls.Add(this.tpOutput);
this.tcScrollingCapture.Dock = System.Windows.Forms.DockStyle.Fill;
this.tcScrollingCapture.Location = new System.Drawing.Point(0, 0);
resources.ApplyResources(this.tcScrollingCapture, "tcScrollingCapture");
this.tcScrollingCapture.Name = "tcScrollingCapture";
this.tcScrollingCapture.SelectedIndex = 0;
this.tcScrollingCapture.Size = new System.Drawing.Size(984, 661);
this.tcScrollingCapture.TabIndex = 0;
//
// tpCapture
//
@ -198,139 +172,91 @@ private void InitializeComponent()
this.tpCapture.Controls.Add(this.btnCapture);
this.tpCapture.Controls.Add(this.nudMaximumScrollCount);
this.tpCapture.Controls.Add(this.nudScrollDelay);
this.tpCapture.Location = new System.Drawing.Point(4, 22);
resources.ApplyResources(this.tpCapture, "tpCapture");
this.tpCapture.Name = "tpCapture";
this.tpCapture.Padding = new System.Windows.Forms.Padding(3);
this.tpCapture.Size = new System.Drawing.Size(976, 635);
this.tpCapture.TabIndex = 0;
this.tpCapture.Text = "Capture";
this.tpCapture.UseVisualStyleBackColor = true;
//
// cbStartSelectionAutomatically
//
this.cbStartSelectionAutomatically.AutoSize = true;
this.cbStartSelectionAutomatically.Location = new System.Drawing.Point(16, 168);
resources.ApplyResources(this.cbStartSelectionAutomatically, "cbStartSelectionAutomatically");
this.cbStartSelectionAutomatically.Name = "cbStartSelectionAutomatically";
this.cbStartSelectionAutomatically.Size = new System.Drawing.Size(359, 17);
this.cbStartSelectionAutomatically.TabIndex = 12;
this.cbStartSelectionAutomatically.Text = "Automatically start selecting capture region before opening this window";
this.cbStartSelectionAutomatically.UseVisualStyleBackColor = true;
this.cbStartSelectionAutomatically.CheckedChanged += new System.EventHandler(this.cbStartSelectionAutomatically_CheckedChanged);
//
// cbAutoCombine
//
this.cbAutoCombine.AutoSize = true;
this.cbAutoCombine.Location = new System.Drawing.Point(16, 288);
resources.ApplyResources(this.cbAutoCombine, "cbAutoCombine");
this.cbAutoCombine.Name = "cbAutoCombine";
this.cbAutoCombine.Size = new System.Drawing.Size(280, 17);
this.cbAutoCombine.TabIndex = 17;
this.cbAutoCombine.Text = "Automatically guess offsets and combine after capture";
this.cbAutoCombine.UseVisualStyleBackColor = true;
this.cbAutoCombine.CheckedChanged += new System.EventHandler(this.cbAutoCombine_CheckedChanged);
//
// lblSelectedRectangle
//
this.lblSelectedRectangle.AutoSize = true;
this.lblSelectedRectangle.Location = new System.Drawing.Point(368, 45);
resources.ApplyResources(this.lblSelectedRectangle, "lblSelectedRectangle");
this.lblSelectedRectangle.Name = "lblSelectedRectangle";
this.lblSelectedRectangle.Size = new System.Drawing.Size(0, 13);
this.lblSelectedRectangle.TabIndex = 3;
//
// btnSelectRectangle
//
this.btnSelectRectangle.Enabled = false;
this.btnSelectRectangle.Location = new System.Drawing.Point(16, 40);
resources.ApplyResources(this.btnSelectRectangle, "btnSelectRectangle");
this.btnSelectRectangle.Name = "btnSelectRectangle";
this.btnSelectRectangle.Size = new System.Drawing.Size(344, 23);
this.btnSelectRectangle.TabIndex = 2;
this.btnSelectRectangle.Text = "(Optional) Select custom region in window...";
this.btnSelectRectangle.UseVisualStyleBackColor = true;
this.btnSelectRectangle.Click += new System.EventHandler(this.btnSelectRectangle_Click);
//
// lblStartDelay
//
this.lblStartDelay.AutoSize = true;
this.lblStartDelay.Location = new System.Drawing.Point(13, 96);
resources.ApplyResources(this.lblStartDelay, "lblStartDelay");
this.lblStartDelay.Name = "lblStartDelay";
this.lblStartDelay.Size = new System.Drawing.Size(60, 13);
this.lblStartDelay.TabIndex = 6;
this.lblStartDelay.Text = "Start delay:";
//
// nudStartDelay
//
this.nudStartDelay.Location = new System.Drawing.Point(160, 92);
resources.ApplyResources(this.nudStartDelay, "nudStartDelay");
this.nudStartDelay.Maximum = new decimal(new int[] {
5000,
0,
0,
0});
this.nudStartDelay.Name = "nudStartDelay";
this.nudStartDelay.Size = new System.Drawing.Size(80, 20);
this.nudStartDelay.TabIndex = 7;
this.nudStartDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudStartDelay.ValueChanged += new System.EventHandler(this.nudStartDelay_ValueChanged);
//
// cbScrollTopBeforeCapture
//
this.cbScrollTopBeforeCapture.AutoSize = true;
this.cbScrollTopBeforeCapture.Location = new System.Drawing.Point(16, 216);
resources.ApplyResources(this.cbScrollTopBeforeCapture, "cbScrollTopBeforeCapture");
this.cbScrollTopBeforeCapture.Name = "cbScrollTopBeforeCapture";
this.cbScrollTopBeforeCapture.Size = new System.Drawing.Size(223, 17);
this.cbScrollTopBeforeCapture.TabIndex = 14;
this.cbScrollTopBeforeCapture.Text = "Attempt scrolling to the top before capture";
this.cbScrollTopBeforeCapture.UseVisualStyleBackColor = true;
this.cbScrollTopBeforeCapture.CheckedChanged += new System.EventHandler(this.cbScrollTopBeforeCapture_CheckedChanged);
//
// cbStartCaptureAutomatically
//
this.cbStartCaptureAutomatically.AutoSize = true;
this.cbStartCaptureAutomatically.Location = new System.Drawing.Point(16, 192);
resources.ApplyResources(this.cbStartCaptureAutomatically, "cbStartCaptureAutomatically");
this.cbStartCaptureAutomatically.Name = "cbStartCaptureAutomatically";
this.cbStartCaptureAutomatically.Size = new System.Drawing.Size(325, 17);
this.cbStartCaptureAutomatically.TabIndex = 13;
this.cbStartCaptureAutomatically.Text = "Start scrolling capture immediately after capture region selection";
this.cbStartCaptureAutomatically.UseVisualStyleBackColor = true;
this.cbStartCaptureAutomatically.CheckedChanged += new System.EventHandler(this.cbStartCaptureAutomatically_CheckedChanged);
//
// cbRemoveDuplicates
//
this.cbRemoveDuplicates.AutoSize = true;
this.cbRemoveDuplicates.Location = new System.Drawing.Point(16, 264);
resources.ApplyResources(this.cbRemoveDuplicates, "cbRemoveDuplicates");
this.cbRemoveDuplicates.Name = "cbRemoveDuplicates";
this.cbRemoveDuplicates.Size = new System.Drawing.Size(148, 17);
this.cbRemoveDuplicates.TabIndex = 16;
this.cbRemoveDuplicates.Text = "Remove duplicate images";
this.cbRemoveDuplicates.UseVisualStyleBackColor = true;
this.cbRemoveDuplicates.CheckedChanged += new System.EventHandler(this.cbRemoveDuplicates_CheckedChanged);
//
// cbAutoDetectScrollEnd
//
this.cbAutoDetectScrollEnd.AutoSize = true;
this.cbAutoDetectScrollEnd.Location = new System.Drawing.Point(16, 240);
resources.ApplyResources(this.cbAutoDetectScrollEnd, "cbAutoDetectScrollEnd");
this.cbAutoDetectScrollEnd.Name = "cbAutoDetectScrollEnd";
this.cbAutoDetectScrollEnd.Size = new System.Drawing.Size(169, 17);
this.cbAutoDetectScrollEnd.TabIndex = 15;
this.cbAutoDetectScrollEnd.Text = "Automatically detect scroll end";
this.cbAutoDetectScrollEnd.UseVisualStyleBackColor = true;
this.cbAutoDetectScrollEnd.CheckedChanged += new System.EventHandler(this.cbAutoDetectScrollEnd_CheckedChanged);
//
// lblScrollMethod
//
this.lblScrollMethod.AutoSize = true;
this.lblScrollMethod.Location = new System.Drawing.Point(13, 72);
resources.ApplyResources(this.lblScrollMethod, "lblScrollMethod");
this.lblScrollMethod.Name = "lblScrollMethod";
this.lblScrollMethod.Size = new System.Drawing.Size(74, 13);
this.lblScrollMethod.TabIndex = 4;
this.lblScrollMethod.Text = "Scroll method:";
//
// cbScrollMethod
//
this.cbScrollMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbScrollMethod.FormattingEnabled = true;
this.cbScrollMethod.Location = new System.Drawing.Point(160, 68);
resources.ApplyResources(this.cbScrollMethod, "cbScrollMethod");
this.cbScrollMethod.Name = "cbScrollMethod";
this.cbScrollMethod.Size = new System.Drawing.Size(312, 21);
this.cbScrollMethod.TabIndex = 5;
this.cbScrollMethod.SelectedIndexChanged += new System.EventHandler(this.cbScrollMethod_SelectedIndexChanged);
//
// tpOutput
@ -343,12 +269,8 @@ private void InitializeComponent()
this.tpOutput.Controls.Add(this.gbCombineAdjustments);
this.tpOutput.Controls.Add(this.gbTrimEdges);
this.tpOutput.Controls.Add(this.pOutput);
this.tpOutput.Location = new System.Drawing.Point(4, 22);
resources.ApplyResources(this.tpOutput, "tpOutput");
this.tpOutput.Name = "tpOutput";
this.tpOutput.Padding = new System.Windows.Forms.Padding(3);
this.tpOutput.Size = new System.Drawing.Size(976, 635);
this.tpOutput.TabIndex = 1;
this.tpOutput.Text = "Output";
this.tpOutput.UseVisualStyleBackColor = true;
//
// gbImages
@ -357,105 +279,64 @@ private void InitializeComponent()
this.gbImages.Controls.Add(this.lblImageCount);
this.gbImages.Controls.Add(this.nudIgnoreLast);
this.gbImages.Controls.Add(this.lblIgnoreLast);
this.gbImages.Location = new System.Drawing.Point(8, 8);
resources.ApplyResources(this.gbImages, "gbImages");
this.gbImages.Name = "gbImages";
this.gbImages.Size = new System.Drawing.Size(184, 120);
this.gbImages.TabIndex = 0;
this.gbImages.TabStop = false;
this.gbImages.Text = "Images";
//
// txtImagesCount
//
this.txtImagesCount.Location = new System.Drawing.Point(120, 16);
resources.ApplyResources(this.txtImagesCount, "txtImagesCount");
this.txtImagesCount.Name = "txtImagesCount";
this.txtImagesCount.ReadOnly = true;
this.txtImagesCount.Size = new System.Drawing.Size(56, 20);
this.txtImagesCount.TabIndex = 1;
this.txtImagesCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// lblImageCount
//
this.lblImageCount.AutoSize = true;
this.lblImageCount.Location = new System.Drawing.Point(8, 20);
resources.ApplyResources(this.lblImageCount, "lblImageCount");
this.lblImageCount.Name = "lblImageCount";
this.lblImageCount.Size = new System.Drawing.Size(69, 13);
this.lblImageCount.TabIndex = 0;
this.lblImageCount.Text = "Image count:";
//
// nudIgnoreLast
//
this.nudIgnoreLast.Location = new System.Drawing.Point(120, 40);
resources.ApplyResources(this.nudIgnoreLast, "nudIgnoreLast");
this.nudIgnoreLast.Maximum = new decimal(new int[] {
5,
0,
0,
0});
this.nudIgnoreLast.Name = "nudIgnoreLast";
this.nudIgnoreLast.Size = new System.Drawing.Size(56, 20);
this.nudIgnoreLast.TabIndex = 3;
this.nudIgnoreLast.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudIgnoreLast.ValueChanged += new System.EventHandler(this.nudIgnoreLast_ValueChanged);
//
// lblIgnoreLast
//
this.lblIgnoreLast.AutoSize = true;
this.lblIgnoreLast.Location = new System.Drawing.Point(8, 44);
resources.ApplyResources(this.lblIgnoreLast, "lblIgnoreLast");
this.lblIgnoreLast.Name = "lblIgnoreLast";
this.lblIgnoreLast.Size = new System.Drawing.Size(69, 13);
this.lblIgnoreLast.TabIndex = 2;
this.lblIgnoreLast.Text = "Remove last:";
//
// btnResetCombine
//
this.btnResetCombine.Enabled = false;
this.btnResetCombine.Location = new System.Drawing.Point(560, 96);
resources.ApplyResources(this.btnResetCombine, "btnResetCombine");
this.btnResetCombine.Name = "btnResetCombine";
this.btnResetCombine.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.btnResetCombine.Size = new System.Drawing.Size(376, 23);
this.btnResetCombine.TabIndex = 6;
this.btnResetCombine.Text = "Reset output options";
this.btnResetCombine.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnResetCombine.UseMnemonic = false;
this.btnResetCombine.UseVisualStyleBackColor = true;
this.btnResetCombine.Click += new System.EventHandler(this.btnResetCombine_Click);
//
// btnGuessCombineAdjustments
//
this.btnGuessCombineAdjustments.Enabled = false;
this.btnGuessCombineAdjustments.Location = new System.Drawing.Point(560, 40);
resources.ApplyResources(this.btnGuessCombineAdjustments, "btnGuessCombineAdjustments");
this.btnGuessCombineAdjustments.Name = "btnGuessCombineAdjustments";
this.btnGuessCombineAdjustments.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.btnGuessCombineAdjustments.Size = new System.Drawing.Size(376, 23);
this.btnGuessCombineAdjustments.TabIndex = 4;
this.btnGuessCombineAdjustments.Text = "Guess combine adjustments & combine";
this.btnGuessCombineAdjustments.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnGuessCombineAdjustments.UseMnemonic = false;
this.btnGuessCombineAdjustments.UseVisualStyleBackColor = true;
this.btnGuessCombineAdjustments.Click += new System.EventHandler(this.btnGuessCombineAdjustments_Click);
//
// btnStartTask
//
this.btnStartTask.Enabled = false;
this.btnStartTask.Location = new System.Drawing.Point(560, 64);
resources.ApplyResources(this.btnStartTask, "btnStartTask");
this.btnStartTask.Name = "btnStartTask";
this.btnStartTask.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.btnStartTask.Size = new System.Drawing.Size(376, 23);
this.btnStartTask.TabIndex = 5;
this.btnStartTask.Text = "Upload/save depending on after capture settings";
this.btnStartTask.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnStartTask.UseVisualStyleBackColor = true;
this.btnStartTask.Click += new System.EventHandler(this.btnProcess_Click);
//
// btnGuessEdges
//
this.btnGuessEdges.Enabled = false;
this.btnGuessEdges.Location = new System.Drawing.Point(560, 16);
resources.ApplyResources(this.btnGuessEdges, "btnGuessEdges");
this.btnGuessEdges.Name = "btnGuessEdges";
this.btnGuessEdges.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.btnGuessEdges.Size = new System.Drawing.Size(376, 23);
this.btnGuessEdges.TabIndex = 3;
this.btnGuessEdges.Text = "Guess edge values to trim";
this.btnGuessEdges.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnGuessEdges.UseVisualStyleBackColor = true;
this.btnGuessEdges.Click += new System.EventHandler(this.btnGuessEdges_Click);
//
@ -465,57 +346,40 @@ private void InitializeComponent()
this.gbCombineAdjustments.Controls.Add(this.lblCombineVertical);
this.gbCombineAdjustments.Controls.Add(this.nudCombineVertical);
this.gbCombineAdjustments.Controls.Add(this.nudCombineLastVertical);
this.gbCombineAdjustments.Location = new System.Drawing.Point(368, 8);
resources.ApplyResources(this.gbCombineAdjustments, "gbCombineAdjustments");
this.gbCombineAdjustments.Name = "gbCombineAdjustments";
this.gbCombineAdjustments.Size = new System.Drawing.Size(184, 120);
this.gbCombineAdjustments.TabIndex = 2;
this.gbCombineAdjustments.TabStop = false;
this.gbCombineAdjustments.Text = "Combine adjustments";
//
// lblCombineLastVertical
//
this.lblCombineLastVertical.AutoSize = true;
this.lblCombineLastVertical.Location = new System.Drawing.Point(8, 44);
resources.ApplyResources(this.lblCombineLastVertical, "lblCombineLastVertical");
this.lblCombineLastVertical.Name = "lblCombineLastVertical";
this.lblCombineLastVertical.Size = new System.Drawing.Size(67, 13);
this.lblCombineLastVertical.TabIndex = 2;
this.lblCombineLastVertical.Text = "Last vertical:";
//
// lblCombineVertical
//
this.lblCombineVertical.AutoSize = true;
this.lblCombineVertical.Location = new System.Drawing.Point(8, 20);
resources.ApplyResources(this.lblCombineVertical, "lblCombineVertical");
this.lblCombineVertical.Name = "lblCombineVertical";
this.lblCombineVertical.Size = new System.Drawing.Size(45, 13);
this.lblCombineVertical.TabIndex = 0;
this.lblCombineVertical.Text = "Vertical:";
//
// nudCombineVertical
//
this.nudCombineVertical.Location = new System.Drawing.Point(120, 16);
resources.ApplyResources(this.nudCombineVertical, "nudCombineVertical");
this.nudCombineVertical.Maximum = new decimal(new int[] {
5000,
0,
0,
0});
this.nudCombineVertical.Name = "nudCombineVertical";
this.nudCombineVertical.Size = new System.Drawing.Size(56, 20);
this.nudCombineVertical.TabIndex = 1;
this.nudCombineVertical.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudCombineVertical.ValueChanged += new System.EventHandler(this.nudCombineVertical_ValueChanged);
//
// nudCombineLastVertical
//
this.nudCombineLastVertical.Location = new System.Drawing.Point(120, 40);
resources.ApplyResources(this.nudCombineLastVertical, "nudCombineLastVertical");
this.nudCombineLastVertical.Maximum = new decimal(new int[] {
5000,
0,
0,
0});
this.nudCombineLastVertical.Name = "nudCombineLastVertical";
this.nudCombineLastVertical.Size = new System.Drawing.Size(56, 20);
this.nudCombineLastVertical.TabIndex = 3;
this.nudCombineLastVertical.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudCombineLastVertical.ValueChanged += new System.EventHandler(this.nudCombineLastVertical_ValueChanged);
//
// gbTrimEdges
@ -528,147 +392,98 @@ private void InitializeComponent()
this.gbTrimEdges.Controls.Add(this.nudTrimBottom);
this.gbTrimEdges.Controls.Add(this.nudTrimTop);
this.gbTrimEdges.Controls.Add(this.nudTrimRight);
this.gbTrimEdges.Location = new System.Drawing.Point(200, 8);
resources.ApplyResources(this.gbTrimEdges, "gbTrimEdges");
this.gbTrimEdges.Name = "gbTrimEdges";
this.gbTrimEdges.Size = new System.Drawing.Size(160, 120);
this.gbTrimEdges.TabIndex = 1;
this.gbTrimEdges.TabStop = false;
this.gbTrimEdges.Text = "Trim edges";
//
// lblTrimBottom
//
this.lblTrimBottom.AutoSize = true;
this.lblTrimBottom.Location = new System.Drawing.Point(8, 92);
resources.ApplyResources(this.lblTrimBottom, "lblTrimBottom");
this.lblTrimBottom.Name = "lblTrimBottom";
this.lblTrimBottom.Size = new System.Drawing.Size(43, 13);
this.lblTrimBottom.TabIndex = 6;
this.lblTrimBottom.Text = "Bottom:";
//
// lblTrimRight
//
this.lblTrimRight.AutoSize = true;
this.lblTrimRight.Location = new System.Drawing.Point(8, 68);
resources.ApplyResources(this.lblTrimRight, "lblTrimRight");
this.lblTrimRight.Name = "lblTrimRight";
this.lblTrimRight.Size = new System.Drawing.Size(35, 13);
this.lblTrimRight.TabIndex = 4;
this.lblTrimRight.Text = "Right:";
//
// lblTrimTop
//
this.lblTrimTop.AutoSize = true;
this.lblTrimTop.Location = new System.Drawing.Point(8, 44);
resources.ApplyResources(this.lblTrimTop, "lblTrimTop");
this.lblTrimTop.Name = "lblTrimTop";
this.lblTrimTop.Size = new System.Drawing.Size(29, 13);
this.lblTrimTop.TabIndex = 2;
this.lblTrimTop.Text = "Top:";
//
// lblTrimLeft
//
this.lblTrimLeft.AutoSize = true;
this.lblTrimLeft.Location = new System.Drawing.Point(8, 20);
resources.ApplyResources(this.lblTrimLeft, "lblTrimLeft");
this.lblTrimLeft.Name = "lblTrimLeft";
this.lblTrimLeft.Size = new System.Drawing.Size(28, 13);
this.lblTrimLeft.TabIndex = 0;
this.lblTrimLeft.Text = "Left:";
//
// nudTrimLeft
//
this.nudTrimLeft.Location = new System.Drawing.Point(96, 16);
resources.ApplyResources(this.nudTrimLeft, "nudTrimLeft");
this.nudTrimLeft.Maximum = new decimal(new int[] {
5000,
0,
0,
0});
this.nudTrimLeft.Name = "nudTrimLeft";
this.nudTrimLeft.Size = new System.Drawing.Size(56, 20);
this.nudTrimLeft.TabIndex = 1;
this.nudTrimLeft.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudTrimLeft.ValueChanged += new System.EventHandler(this.nudTrimLeft_ValueChanged);
//
// nudTrimBottom
//
this.nudTrimBottom.Location = new System.Drawing.Point(96, 88);
resources.ApplyResources(this.nudTrimBottom, "nudTrimBottom");
this.nudTrimBottom.Maximum = new decimal(new int[] {
5000,
0,
0,
0});
this.nudTrimBottom.Name = "nudTrimBottom";
this.nudTrimBottom.Size = new System.Drawing.Size(56, 20);
this.nudTrimBottom.TabIndex = 7;
this.nudTrimBottom.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudTrimBottom.ValueChanged += new System.EventHandler(this.nudTrimBottom_ValueChanged);
//
// nudTrimTop
//
this.nudTrimTop.Location = new System.Drawing.Point(96, 40);
resources.ApplyResources(this.nudTrimTop, "nudTrimTop");
this.nudTrimTop.Maximum = new decimal(new int[] {
5000,
0,
0,
0});
this.nudTrimTop.Name = "nudTrimTop";
this.nudTrimTop.Size = new System.Drawing.Size(56, 20);
this.nudTrimTop.TabIndex = 3;
this.nudTrimTop.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudTrimTop.ValueChanged += new System.EventHandler(this.nudTrimTop_ValueChanged);
//
// nudTrimRight
//
this.nudTrimRight.Location = new System.Drawing.Point(96, 64);
resources.ApplyResources(this.nudTrimRight, "nudTrimRight");
this.nudTrimRight.Maximum = new decimal(new int[] {
5000,
0,
0,
0});
this.nudTrimRight.Name = "nudTrimRight";
this.nudTrimRight.Size = new System.Drawing.Size(56, 20);
this.nudTrimRight.TabIndex = 5;
this.nudTrimRight.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudTrimRight.ValueChanged += new System.EventHandler(this.nudTrimRight_ValueChanged);
//
// pOutput
//
this.pOutput.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.pOutput.AutoScroll = true;
resources.ApplyResources(this.pOutput, "pOutput");
this.pOutput.Controls.Add(this.lblProcessing);
this.pOutput.Controls.Add(this.pbOutput);
this.pOutput.Location = new System.Drawing.Point(8, 136);
this.pOutput.Name = "pOutput";
this.pOutput.Size = new System.Drawing.Size(961, 490);
this.pOutput.TabIndex = 7;
//
// lblProcessing
//
this.lblProcessing.AutoSize = true;
this.lblProcessing.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblProcessing.Location = new System.Drawing.Point(8, 8);
resources.ApplyResources(this.lblProcessing, "lblProcessing");
this.lblProcessing.Name = "lblProcessing";
this.lblProcessing.Size = new System.Drawing.Size(137, 25);
this.lblProcessing.TabIndex = 0;
this.lblProcessing.Text = "Processing...";
this.lblProcessing.Visible = false;
//
// pbOutput
//
this.pbOutput.Location = new System.Drawing.Point(0, 0);
resources.ApplyResources(this.pbOutput, "pbOutput");
this.pbOutput.Name = "pbOutput";
this.pbOutput.Size = new System.Drawing.Size(10, 10);
this.pbOutput.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pbOutput.TabIndex = 0;
this.pbOutput.TabStop = false;
//
// ScrollingCaptureForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(984, 661);
this.Controls.Add(this.tcScrollingCapture);
this.Name = "ScrollingCaptureForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ShareX - Scrolling capture";
((System.ComponentModel.ISupportInitialize)(this.nudScrollDelay)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudMaximumScrollCount)).EndInit();
this.tcScrollingCapture.ResumeLayout(false);

View file

@ -24,6 +24,7 @@
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using ShareX.ScreenCaptureLib.Properties;
using System;
using System.Collections.Generic;
using System.Drawing;
@ -206,7 +207,7 @@ private SimpleWindowInfo GetWindowInfo()
private void StartCapture()
{
isCapturing = true;
btnCapture.Text = "Stop capture";
btnCapture.Text = Resources.ScrollingCaptureForm_StartCapture_Stop_capture;
WindowState = FormWindowState.Minimized;
firstCapture = true;
@ -229,7 +230,7 @@ private void StartCapture()
private void StopCapture()
{
captureTimer.Stop();
btnCapture.Text = "Start capture";
btnCapture.Text = Resources.ScrollingCaptureForm_StopCapture_Start_capture;
this.ShowActivate();
tcScrollingCapture.SelectedTab = tpOutput;
StartingProcess();

File diff suppressed because it is too large Load diff

View file

@ -579,6 +579,24 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Stop capture.
/// </summary>
internal static string ScrollingCaptureForm_StartCapture_Stop_capture {
get {
return ResourceManager.GetString("ScrollingCaptureForm_StartCapture_Stop_capture", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Start capture.
/// </summary>
internal static string ScrollingCaptureForm_StopCapture_Start_capture {
get {
return ResourceManager.GetString("ScrollingCaptureForm_StopCapture_Start_capture", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Region capture.
/// </summary>

View file

@ -296,4 +296,10 @@ X: {4} Y: {5}</value>
<data name="RectangleRegion_WriteTips__Hold_Alt__Snap_resizing_to_preset_sizes" xml:space="preserve">
<value>[Hold Alt] Snap selection to preset sizes</value>
</data>
<data name="ScrollingCaptureForm_StartCapture_Stop_capture" xml:space="preserve">
<value>Stop capture</value>
</data>
<data name="ScrollingCaptureForm_StopCapture_Start_capture" xml:space="preserve">
<value>Start capture</value>
</data>
</root>

View file

@ -182,11 +182,14 @@ public enum HotkeyType // Localized + Category
ImageEditor,
ImageEffects,
HashCheck,
IRCClient,
DNSChanger,
QRCode,
Ruler,
Automate,
IndexFolder,
ImageCombiner,
VideoThumbnailer,
FTPClient,
TweetMessage,
MonitorTest,

View file

@ -28,6 +28,7 @@ protected override void Dispose(bool disposing)
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageCombinerForm));
this.btnAdd = new System.Windows.Forms.Button();
this.btnRemove = new System.Windows.Forms.Button();
this.btnMoveUp = new System.Windows.Forms.Button();
@ -45,41 +46,29 @@ private void InitializeComponent()
//
// btnAdd
//
this.btnAdd.Location = new System.Drawing.Point(8, 8);
resources.ApplyResources(this.btnAdd, "btnAdd");
this.btnAdd.Name = "btnAdd";
this.btnAdd.Size = new System.Drawing.Size(120, 23);
this.btnAdd.TabIndex = 0;
this.btnAdd.Text = "Add...";
this.btnAdd.UseVisualStyleBackColor = true;
this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
//
// btnRemove
//
this.btnRemove.Location = new System.Drawing.Point(136, 8);
resources.ApplyResources(this.btnRemove, "btnRemove");
this.btnRemove.Name = "btnRemove";
this.btnRemove.Size = new System.Drawing.Size(120, 23);
this.btnRemove.TabIndex = 1;
this.btnRemove.Text = "Remove";
this.btnRemove.UseVisualStyleBackColor = true;
this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click);
//
// btnMoveUp
//
this.btnMoveUp.Location = new System.Drawing.Point(264, 8);
resources.ApplyResources(this.btnMoveUp, "btnMoveUp");
this.btnMoveUp.Name = "btnMoveUp";
this.btnMoveUp.Size = new System.Drawing.Size(120, 23);
this.btnMoveUp.TabIndex = 2;
this.btnMoveUp.Text = "Move up";
this.btnMoveUp.UseVisualStyleBackColor = true;
this.btnMoveUp.Click += new System.EventHandler(this.btnMoveUp_Click);
//
// btnMoveDown
//
this.btnMoveDown.Location = new System.Drawing.Point(392, 8);
resources.ApplyResources(this.btnMoveDown, "btnMoveDown");
this.btnMoveDown.Name = "btnMoveDown";
this.btnMoveDown.Size = new System.Drawing.Size(120, 23);
this.btnMoveDown.TabIndex = 3;
this.btnMoveDown.Text = "Move down";
this.btnMoveDown.UseVisualStyleBackColor = true;
this.btnMoveDown.Click += new System.EventHandler(this.btnMoveDown_Click);
//
@ -87,98 +76,65 @@ private void InitializeComponent()
//
this.lvImages.AllowDrop = true;
this.lvImages.AllowItemDrag = true;
this.lvImages.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
resources.ApplyResources(this.lvImages, "lvImages");
this.lvImages.AutoFillColumn = true;
this.lvImages.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chFilepath});
this.lvImages.FullRowSelect = true;
this.lvImages.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvImages.Location = new System.Drawing.Point(8, 40);
this.lvImages.Name = "lvImages";
this.lvImages.Size = new System.Drawing.Size(504, 368);
this.lvImages.TabIndex = 4;
this.lvImages.UseCompatibleStateImageBehavior = false;
this.lvImages.View = System.Windows.Forms.View.Details;
//
// chFilepath
//
this.chFilepath.Text = "Image file path";
this.chFilepath.Width = 487;
resources.ApplyResources(this.chFilepath, "chFilepath");
//
// btnCombine
//
this.btnCombine.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCombine.Location = new System.Drawing.Point(8, 472);
resources.ApplyResources(this.btnCombine, "btnCombine");
this.btnCombine.Name = "btnCombine";
this.btnCombine.Size = new System.Drawing.Size(504, 31);
this.btnCombine.TabIndex = 5;
this.btnCombine.Text = "Combine images and save/upload depending on after capture settings";
this.btnCombine.UseVisualStyleBackColor = true;
this.btnCombine.Click += new System.EventHandler(this.btnCombine_Click);
//
// lblSpace
//
this.lblSpace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblSpace.AutoSize = true;
this.lblSpace.Location = new System.Drawing.Point(8, 448);
resources.ApplyResources(this.lblSpace, "lblSpace");
this.lblSpace.Name = "lblSpace";
this.lblSpace.Size = new System.Drawing.Size(121, 13);
this.lblSpace.TabIndex = 6;
this.lblSpace.Text = "Space between images:";
//
// nudSpace
//
this.nudSpace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.nudSpace.Location = new System.Drawing.Point(200, 444);
resources.ApplyResources(this.nudSpace, "nudSpace");
this.nudSpace.Maximum = new decimal(new int[] {
1000,
0,
0,
0});
this.nudSpace.Name = "nudSpace";
this.nudSpace.Size = new System.Drawing.Size(64, 20);
this.nudSpace.TabIndex = 7;
this.nudSpace.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.nudSpace.ValueChanged += new System.EventHandler(this.nudSpace_ValueChanged);
//
// lblOrientation
//
this.lblOrientation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblOrientation.AutoSize = true;
this.lblOrientation.Location = new System.Drawing.Point(8, 424);
resources.ApplyResources(this.lblOrientation, "lblOrientation");
this.lblOrientation.Name = "lblOrientation";
this.lblOrientation.Size = new System.Drawing.Size(103, 13);
this.lblOrientation.TabIndex = 8;
this.lblOrientation.Text = "Combine orientation:";
//
// cbOrientation
//
this.cbOrientation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
resources.ApplyResources(this.cbOrientation, "cbOrientation");
this.cbOrientation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbOrientation.FormattingEnabled = true;
this.cbOrientation.Location = new System.Drawing.Point(200, 420);
this.cbOrientation.Name = "cbOrientation";
this.cbOrientation.Size = new System.Drawing.Size(121, 21);
this.cbOrientation.TabIndex = 9;
this.cbOrientation.SelectedIndexChanged += new System.EventHandler(this.cbOrientation_SelectedIndexChanged);
//
// lblSpacePixel
//
this.lblSpacePixel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblSpacePixel.AutoSize = true;
this.lblSpacePixel.Location = new System.Drawing.Point(272, 448);
resources.ApplyResources(this.lblSpacePixel, "lblSpacePixel");
this.lblSpacePixel.Name = "lblSpacePixel";
this.lblSpacePixel.Size = new System.Drawing.Size(33, 13);
this.lblSpacePixel.TabIndex = 10;
this.lblSpacePixel.Text = "pixels";
//
// ImageCombinerForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(521, 514);
this.Controls.Add(this.lblSpacePixel);
this.Controls.Add(this.cbOrientation);
this.Controls.Add(this.lblOrientation);
@ -191,8 +147,6 @@ private void InitializeComponent()
this.Controls.Add(this.btnRemove);
this.Controls.Add(this.btnAdd);
this.Name = "ImageCombinerForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ShareX - Image combiner";
((System.ComponentModel.ISupportInitialize)(this.nudSpace)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

View file

@ -117,4 +117,328 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 23</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnAdd.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="btnAdd.Text" xml:space="preserve">
<value>Add...</value>
</data>
<data name="&gt;&gt;btnAdd.Name" xml:space="preserve">
<value>btnAdd</value>
</data>
<data name="&gt;&gt;btnAdd.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnAdd.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnAdd.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
<value>136, 8</value>
</data>
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 23</value>
</data>
<data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="btnRemove.Text" xml:space="preserve">
<value>Remove</value>
</data>
<data name="&gt;&gt;btnRemove.Name" xml:space="preserve">
<value>btnRemove</value>
</data>
<data name="&gt;&gt;btnRemove.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnRemove.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="btnMoveUp.Location" type="System.Drawing.Point, System.Drawing">
<value>264, 8</value>
</data>
<data name="btnMoveUp.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 23</value>
</data>
<data name="btnMoveUp.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="btnMoveUp.Text" xml:space="preserve">
<value>Move up</value>
</data>
<data name="&gt;&gt;btnMoveUp.Name" xml:space="preserve">
<value>btnMoveUp</value>
</data>
<data name="&gt;&gt;btnMoveUp.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnMoveUp.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnMoveUp.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="btnMoveDown.Location" type="System.Drawing.Point, System.Drawing">
<value>392, 8</value>
</data>
<data name="btnMoveDown.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 23</value>
</data>
<data name="btnMoveDown.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="btnMoveDown.Text" xml:space="preserve">
<value>Move down</value>
</data>
<data name="&gt;&gt;btnMoveDown.Name" xml:space="preserve">
<value>btnMoveDown</value>
</data>
<data name="&gt;&gt;btnMoveDown.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnMoveDown.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnMoveDown.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lvImages.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="chFilepath.Text" xml:space="preserve">
<value>Image file path</value>
</data>
<data name="chFilepath.Width" type="System.Int32, mscorlib">
<value>487</value>
</data>
<data name="lvImages.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 40</value>
</data>
<data name="lvImages.Size" type="System.Drawing.Size, System.Drawing">
<value>504, 368</value>
</data>
<data name="lvImages.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;lvImages.Name" xml:space="preserve">
<value>lvImages</value>
</data>
<data name="&gt;&gt;lvImages.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvImages.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lvImages.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="btnCombine.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="btnCombine.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 472</value>
</data>
<data name="btnCombine.Size" type="System.Drawing.Size, System.Drawing">
<value>504, 31</value>
</data>
<data name="btnCombine.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="btnCombine.Text" xml:space="preserve">
<value>Combine images and save/upload depending on after capture settings</value>
</data>
<data name="&gt;&gt;btnCombine.Name" xml:space="preserve">
<value>btnCombine</value>
</data>
<data name="&gt;&gt;btnCombine.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnCombine.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnCombine.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="lblSpace.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="lblSpace.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblSpace.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 448</value>
</data>
<data name="lblSpace.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 13</value>
</data>
<data name="lblSpace.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="lblSpace.Text" xml:space="preserve">
<value>Space between images:</value>
</data>
<data name="&gt;&gt;lblSpace.Name" xml:space="preserve">
<value>lblSpace</value>
</data>
<data name="&gt;&gt;lblSpace.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblSpace.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblSpace.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="nudSpace.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="nudSpace.Location" type="System.Drawing.Point, System.Drawing">
<value>200, 444</value>
</data>
<data name="nudSpace.Size" type="System.Drawing.Size, System.Drawing">
<value>64, 20</value>
</data>
<data name="nudSpace.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="nudSpace.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
<value>Center</value>
</data>
<data name="&gt;&gt;nudSpace.Name" xml:space="preserve">
<value>nudSpace</value>
</data>
<data name="&gt;&gt;nudSpace.Type" xml:space="preserve">
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;nudSpace.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;nudSpace.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="lblOrientation.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="lblOrientation.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblOrientation.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 424</value>
</data>
<data name="lblOrientation.Size" type="System.Drawing.Size, System.Drawing">
<value>103, 13</value>
</data>
<data name="lblOrientation.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="lblOrientation.Text" xml:space="preserve">
<value>Combine orientation:</value>
</data>
<data name="&gt;&gt;lblOrientation.Name" xml:space="preserve">
<value>lblOrientation</value>
</data>
<data name="&gt;&gt;lblOrientation.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblOrientation.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblOrientation.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="cbOrientation.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="cbOrientation.Location" type="System.Drawing.Point, System.Drawing">
<value>200, 420</value>
</data>
<data name="cbOrientation.Size" type="System.Drawing.Size, System.Drawing">
<value>121, 21</value>
</data>
<data name="cbOrientation.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="&gt;&gt;cbOrientation.Name" xml:space="preserve">
<value>cbOrientation</value>
</data>
<data name="&gt;&gt;cbOrientation.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbOrientation.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;cbOrientation.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lblSpacePixel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Left</value>
</data>
<data name="lblSpacePixel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblSpacePixel.Location" type="System.Drawing.Point, System.Drawing">
<value>272, 448</value>
</data>
<data name="lblSpacePixel.Size" type="System.Drawing.Size, System.Drawing">
<value>33, 13</value>
</data>
<data name="lblSpacePixel.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
<data name="lblSpacePixel.Text" xml:space="preserve">
<value>pixels</value>
</data>
<data name="&gt;&gt;lblSpacePixel.Name" xml:space="preserve">
<value>lblSpacePixel</value>
</data>
<data name="&gt;&gt;lblSpacePixel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblSpacePixel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblSpacePixel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>521, 514</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>ShareX - Image combiner</value>
</data>
<data name="&gt;&gt;chFilepath.Name" xml:space="preserve">
<value>chFilepath</value>
</data>
<data name="&gt;&gt;chFilepath.Type" xml:space="preserve">
<value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>ImageCombinerForm</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>ShareX.HelpersLib.BaseForm, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

View file

@ -1026,6 +1026,7 @@ private void tsmiImageCombiner_Click(object sender, EventArgs e)
{
TaskHelpers.OpenImageCombiner();
}
private void tsmiVideoThumbnailer_Click(object sender, EventArgs e)
{
TaskHelpers.OpenVideoThumbnailer();
@ -1738,6 +1739,9 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job)
case HotkeyType.HashCheck:
TaskHelpers.OpenHashCheck();
break;
case HotkeyType.IRCClient:
TaskHelpers.OpenIRCClient(safeTaskSettings);
break;
case HotkeyType.DNSChanger:
TaskHelpers.OpenDNSChanger();
break;
@ -1753,6 +1757,12 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job)
case HotkeyType.IndexFolder:
TaskHelpers.OpenIndexFolder();
break;
case HotkeyType.ImageCombiner:
TaskHelpers.OpenImageCombiner(safeTaskSettings);
break;
case HotkeyType.VideoThumbnailer:
TaskHelpers.OpenVideoThumbnailer(safeTaskSettings);
break;
case HotkeyType.FTPClient:
TaskHelpers.OpenFTPClient();
break;
@ -2377,7 +2387,6 @@ private void tsmiTrayRectangleLight_Click(object sender, EventArgs e)
CaptureRectangleLight(null, false);
}
private void tsmiTrayRectangleTransparent_Click(object sender, EventArgs e)
{
CaptureRectangleTransparent(null, false);