From ef54983d1969a4d707719b40941a616594eaefc3 Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 1 Oct 2015 15:28:23 +0300 Subject: [PATCH] Added note text for scrolling capture --- .../Forms/ScrollingCaptureForm.Designer.cs | 10 +- .../Forms/ScrollingCaptureForm.resx | 960 ++++++++++++------ 2 files changed, 669 insertions(+), 301 deletions(-) diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs index 2f648b15c..ec0d593a1 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs @@ -73,6 +73,7 @@ private void InitializeComponent() this.pOutput = new System.Windows.Forms.Panel(); this.lblProcessing = new System.Windows.Forms.Label(); this.pbOutput = new System.Windows.Forms.PictureBox(); + this.lblNote = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.nudScrollDelay)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMaximumScrollCount)).BeginInit(); this.tcScrollingCapture.SuspendLayout(); @@ -153,6 +154,7 @@ private void InitializeComponent() // // tpCapture // + this.tpCapture.Controls.Add(this.lblNote); this.tpCapture.Controls.Add(this.cbStartSelectionAutomatically); this.tpCapture.Controls.Add(this.cbAutoCombine); this.tpCapture.Controls.Add(this.lblSelectedRectangle); @@ -298,7 +300,7 @@ private void InitializeComponent() // resources.ApplyResources(this.nudIgnoreLast, "nudIgnoreLast"); this.nudIgnoreLast.Maximum = new decimal(new int[] { - 5, + 0, 0, 0, 0}); @@ -478,6 +480,11 @@ private void InitializeComponent() this.pbOutput.Name = "pbOutput"; this.pbOutput.TabStop = false; // + // lblNote + // + resources.ApplyResources(this.lblNote, "lblNote"); + this.lblNote.Name = "lblNote"; + // // ScrollingCaptureForm // resources.ApplyResources(this, "$this"); @@ -562,5 +569,6 @@ private void InitializeComponent() private Label lblIgnoreLast; private GroupBox gbImages; private TextBox txtImagesCount; + private Label lblNote; } } \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx index a19330bf2..1098be2d6 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx @@ -117,6 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + 16, 16 @@ -141,7 +145,7 @@ tpCapture - 12 + 13 True @@ -165,11 +169,14 @@ tpCapture - 14 + 15 False + + NoControl + 16, 312 @@ -192,7 +199,7 @@ tpCapture - 16 + 17 17, 17 @@ -206,7 +213,6 @@ 9 - Center @@ -220,7 +226,7 @@ tpCapture - 18 + 19 160, 140 @@ -244,7 +250,7 @@ tpCapture - 17 + 18 True @@ -271,7 +277,7 @@ tpCapture - 15 + 16 True @@ -298,22 +304,19 @@ tpCapture - 13 + 14 - - True + + lblNote - - 16, 168 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 359, 17 + + tpCapture - - 12 - - - Automatically start selecting capture region before opening this window + + 0 cbStartSelectionAutomatically @@ -325,22 +328,7 @@ tpCapture - 0 - - - True - - - 16, 288 - - - 280, 17 - - - 17 - - - Automatically guess offsets and combine after capture + 1 cbAutoCombine @@ -352,19 +340,7 @@ tpCapture - 1 - - - True - - - 368, 45 - - - 0, 13 - - - 3 + 2 lblSelectedRectangle @@ -376,22 +352,7 @@ tpCapture - 2 - - - False - - - 16, 40 - - - 344, 23 - - - 2 - - - (Optional) Select custom region in window... + 3 btnSelectRectangle @@ -403,22 +364,7 @@ tpCapture - 3 - - - True - - - 13, 96 - - - 60, 13 - - - 6 - - - Start delay: + 4 lblStartDelay @@ -430,19 +376,7 @@ tpCapture - 4 - - - 160, 92 - - - 80, 20 - - - 7 - - - Center + 5 nudStartDelay @@ -454,22 +388,7 @@ tpCapture - 5 - - - True - - - 16, 216 - - - 223, 17 - - - 14 - - - Attempt scrolling to the top before capture + 6 cbScrollTopBeforeCapture @@ -481,22 +400,7 @@ tpCapture - 6 - - - True - - - 16, 192 - - - 325, 17 - - - 13 - - - Start scrolling capture immediately after capture region selection + 7 cbStartCaptureAutomatically @@ -508,22 +412,7 @@ tpCapture - 7 - - - True - - - 16, 264 - - - 148, 17 - - - 16 - - - Remove duplicate images + 8 cbRemoveDuplicates @@ -535,22 +424,7 @@ tpCapture - 8 - - - True - - - 16, 240 - - - 169, 17 - - - 15 - - - Automatically detect scroll end + 9 cbAutoDetectScrollEnd @@ -562,22 +436,7 @@ tpCapture - 9 - - - True - - - 13, 72 - - - 74, 13 - - - 4 - - - Scroll method: + 10 lblScrollMethod @@ -589,16 +448,7 @@ tpCapture - 10 - - - 160, 68 - - - 312, 21 - - - 5 + 11 cbScrollMethod @@ -610,7 +460,7 @@ tpCapture - 11 + 12 4, 22 @@ -897,6 +747,615 @@ 4 + + lblCombineLastVertical + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 0 + + + lblCombineVertical + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 1 + + + nudCombineVertical + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 2 + + + nudCombineLastVertical + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbCombineAdjustments + + + 3 + + + 368, 8 + + + 184, 120 + + + 2 + + + Combine adjustments + + + gbCombineAdjustments + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 5 + + + lblTrimBottom + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 0 + + + lblTrimRight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 1 + + + lblTrimTop + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 2 + + + lblTrimLeft + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 3 + + + nudTrimLeft + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 4 + + + nudTrimBottom + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 5 + + + nudTrimTop + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 6 + + + nudTrimRight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbTrimEdges + + + 7 + + + 200, 8 + + + 160, 120 + + + 1 + + + Trim edges + + + gbTrimEdges + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 6 + + + Top, Bottom, Left, Right + + + True + + + lblProcessing + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pOutput + + + 0 + + + pbOutput + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pOutput + + + 1 + + + 8, 136 + + + 961, 490 + + + 7 + + + pOutput + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOutput + + + 7 + + + 4, 22 + + + 3, 3, 3, 3 + + + 976, 635 + + + 1 + + + Output + + + tpOutput + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcScrollingCapture + + + 1 + + + Fill + + + 0, 0 + + + 984, 661 + + + 0 + + + tcScrollingCapture + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 16, 168 + + + 359, 17 + + + 12 + + + Automatically start selecting capture region before opening this window + + + cbStartSelectionAutomatically + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 1 + + + True + + + 16, 288 + + + 280, 17 + + + 17 + + + Automatically guess offsets and combine after capture + + + cbAutoCombine + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 2 + + + True + + + 368, 45 + + + 0, 13 + + + 3 + + + lblSelectedRectangle + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 3 + + + False + + + NoControl + + + 16, 40 + + + 344, 23 + + + 2 + + + (Optional) Select custom region in window... + + + btnSelectRectangle + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 4 + + + True + + + 13, 96 + + + 60, 13 + + + 6 + + + Start delay: + + + lblStartDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 5 + + + 160, 92 + + + 80, 20 + + + 7 + + + Center + + + nudStartDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 6 + + + True + + + 16, 216 + + + 223, 17 + + + 14 + + + Attempt scrolling to the top before capture + + + cbScrollTopBeforeCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 7 + + + True + + + 16, 192 + + + 325, 17 + + + 13 + + + Start scrolling capture immediately after capture region selection + + + cbStartCaptureAutomatically + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 8 + + + True + + + 16, 264 + + + 148, 17 + + + 16 + + + Remove duplicate images + + + cbRemoveDuplicates + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 9 + + + True + + + 16, 240 + + + 169, 17 + + + 15 + + + Automatically detect scroll end + + + cbAutoDetectScrollEnd + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 10 + + + True + + + 13, 72 + + + 74, 13 + + + 4 + + + Scroll method: + + + lblScrollMethod + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 11 + + + 160, 68 + + + 312, 21 + + + 5 + + + cbScrollMethod + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 12 + True @@ -999,30 +1458,6 @@ 3 - - 368, 8 - - - 184, 120 - - - 2 - - - Combine adjustments - - - gbCombineAdjustments - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOutput - - - 5 - True @@ -1227,36 +1662,6 @@ 7 - - 200, 8 - - - 160, 120 - - - 1 - - - Trim edges - - - gbTrimEdges - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpOutput - - - 6 - - - Top, Bottom, Left, Right - - - True - True @@ -1314,76 +1719,31 @@ 1 - - 8, 136 + + Top, Bottom, Left, Right - - 961, 490 + + 16, 360 - - 7 + + 944, 256 - - pOutput + + 19 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Please note that whilst ShareX attempts its best effort to render an accurate scrolling capture it is still not possible for every scrolling content to be captured correctly. Main reasons which can cause issues while combining are movements on screen while capturing e.g. if a web page has animated GIF or having static objects on screen while scrolling e.g. having static menu or buttons on web page which does not change its position but the rest of the web page scrolls. - - tpOutput + + lblNote - - 7 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 22 + + tpCapture - - 3, 3, 3, 3 - - - 976, 635 - - - 1 - - - Output - - - tpOutput - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcScrollingCapture - - - 1 - - - Fill - - - 0, 0 - - - 984, 661 - - - 0 - - - tcScrollingCapture - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - + 0