diff --git a/ShareX.ScreenCaptureLib/Enums.cs b/ShareX.ScreenCaptureLib/Enums.cs index b61767f12..3adfd2fbf 100644 --- a/ShareX.ScreenCaptureLib/Enums.cs +++ b/ShareX.ScreenCaptureLib/Enums.cs @@ -158,4 +158,16 @@ public enum ScrollingCaptureScrollMethod [Description("Simulate mouse wheel scrolling")] MouseWheel } + + public enum ScrollingCaptureScrollTopMethod + { + [Description("First simulate pressing \"Home\" key then send scroll top message")] + All, + [Description("Send scroll top message")] + SendMessageTop, + [Description("Simulate pressing \"Home\" key")] + KeyPressHome, + [Description("Disable scrolling to top")] + None + } } \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs index 65531a841..9016d6c42 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs @@ -34,6 +34,7 @@ private void InitializeComponent() this.lblMaximumScrollCount = new System.Windows.Forms.Label(); this.tcScrollingCapture = new System.Windows.Forms.TabControl(); this.tpCapture = new System.Windows.Forms.TabPage(); + this.chkAutoUpload = new System.Windows.Forms.CheckBox(); this.lblNote = new System.Windows.Forms.Label(); this.cbStartSelectionAutomatically = new System.Windows.Forms.CheckBox(); this.cbAutoCombine = new System.Windows.Forms.CheckBox(); @@ -41,7 +42,6 @@ private void InitializeComponent() this.btnSelectRectangle = new System.Windows.Forms.Button(); this.lblStartDelay = new System.Windows.Forms.Label(); this.nudStartDelay = new System.Windows.Forms.NumericUpDown(); - this.cbScrollTopBeforeCapture = new System.Windows.Forms.CheckBox(); this.cbStartCaptureAutomatically = new System.Windows.Forms.CheckBox(); this.cbRemoveDuplicates = new System.Windows.Forms.CheckBox(); this.cbAutoDetectScrollEnd = new System.Windows.Forms.CheckBox(); @@ -74,7 +74,12 @@ 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.chkAutoUpload = new System.Windows.Forms.CheckBox(); + this.lblScrollTopMethodBeforeCapture = new System.Windows.Forms.Label(); + this.cbScrollTopMethodBeforeCapture = new System.Windows.Forms.ComboBox(); + this.gbBeforeCapture = new System.Windows.Forms.GroupBox(); + this.gbWhileCapturing = new System.Windows.Forms.GroupBox(); + this.gbAfterCapture = new System.Windows.Forms.GroupBox(); + this.cbAutoClose = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.nudScrollDelay)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMaximumScrollCount)).BeginInit(); this.tcScrollingCapture.SuspendLayout(); @@ -93,6 +98,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.nudTrimRight)).BeginInit(); this.pOutput.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbOutput)).BeginInit(); + this.gbBeforeCapture.SuspendLayout(); + this.gbWhileCapturing.SuspendLayout(); + this.gbAfterCapture.SuspendLayout(); this.SuspendLayout(); // // btnSelectHandle @@ -155,31 +163,24 @@ private void InitializeComponent() // // tpCapture // - this.tpCapture.Controls.Add(this.chkAutoUpload); + this.tpCapture.Controls.Add(this.gbAfterCapture); + this.tpCapture.Controls.Add(this.gbWhileCapturing); + this.tpCapture.Controls.Add(this.gbBeforeCapture); this.tpCapture.Controls.Add(this.lblNote); - this.tpCapture.Controls.Add(this.cbStartSelectionAutomatically); - this.tpCapture.Controls.Add(this.cbAutoCombine); this.tpCapture.Controls.Add(this.lblSelectedRectangle); - this.tpCapture.Controls.Add(this.btnSelectRectangle); - this.tpCapture.Controls.Add(this.lblStartDelay); - this.tpCapture.Controls.Add(this.nudStartDelay); - this.tpCapture.Controls.Add(this.cbScrollTopBeforeCapture); - this.tpCapture.Controls.Add(this.cbStartCaptureAutomatically); - this.tpCapture.Controls.Add(this.cbRemoveDuplicates); - this.tpCapture.Controls.Add(this.cbAutoDetectScrollEnd); - this.tpCapture.Controls.Add(this.lblScrollMethod); - this.tpCapture.Controls.Add(this.cbScrollMethod); - this.tpCapture.Controls.Add(this.btnSelectHandle); - this.tpCapture.Controls.Add(this.lblMaximumScrollCount); this.tpCapture.Controls.Add(this.lblControlText); - this.tpCapture.Controls.Add(this.lblScrollDelay); this.tpCapture.Controls.Add(this.btnCapture); - this.tpCapture.Controls.Add(this.nudMaximumScrollCount); - this.tpCapture.Controls.Add(this.nudScrollDelay); resources.ApplyResources(this.tpCapture, "tpCapture"); this.tpCapture.Name = "tpCapture"; this.tpCapture.UseVisualStyleBackColor = true; // + // chkAutoUpload + // + resources.ApplyResources(this.chkAutoUpload, "chkAutoUpload"); + this.chkAutoUpload.Name = "chkAutoUpload"; + this.chkAutoUpload.UseVisualStyleBackColor = true; + this.chkAutoUpload.CheckedChanged += new System.EventHandler(this.chkAutoUpload_CheckedChanged); + // // lblNote // resources.ApplyResources(this.lblNote, "lblNote"); @@ -227,13 +228,6 @@ private void InitializeComponent() this.nudStartDelay.Name = "nudStartDelay"; this.nudStartDelay.ValueChanged += new System.EventHandler(this.nudStartDelay_ValueChanged); // - // cbScrollTopBeforeCapture - // - resources.ApplyResources(this.cbScrollTopBeforeCapture, "cbScrollTopBeforeCapture"); - this.cbScrollTopBeforeCapture.Name = "cbScrollTopBeforeCapture"; - this.cbScrollTopBeforeCapture.UseVisualStyleBackColor = true; - this.cbScrollTopBeforeCapture.CheckedChanged += new System.EventHandler(this.cbScrollTopBeforeCapture_CheckedChanged); - // // cbStartCaptureAutomatically // resources.ApplyResources(this.cbStartCaptureAutomatically, "cbStartCaptureAutomatically"); @@ -487,12 +481,62 @@ private void InitializeComponent() this.pbOutput.Name = "pbOutput"; this.pbOutput.TabStop = false; // - // chkAutoUpload + // lblScrollTopMethodBeforeCapture // - resources.ApplyResources(this.chkAutoUpload, "chkAutoUpload"); - this.chkAutoUpload.Name = "chkAutoUpload"; - this.chkAutoUpload.UseVisualStyleBackColor = true; - this.chkAutoUpload.CheckedChanged += new System.EventHandler(this.chkAutoUpload_CheckedChanged); + resources.ApplyResources(this.lblScrollTopMethodBeforeCapture, "lblScrollTopMethodBeforeCapture"); + this.lblScrollTopMethodBeforeCapture.Name = "lblScrollTopMethodBeforeCapture"; + // + // cbScrollTopMethodBeforeCapture + // + this.cbScrollTopMethodBeforeCapture.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbScrollTopMethodBeforeCapture.FormattingEnabled = true; + resources.ApplyResources(this.cbScrollTopMethodBeforeCapture, "cbScrollTopMethodBeforeCapture"); + this.cbScrollTopMethodBeforeCapture.Name = "cbScrollTopMethodBeforeCapture"; + this.cbScrollTopMethodBeforeCapture.SelectedIndexChanged += new System.EventHandler(this.cbScrollTopMethodBeforeCapture_SelectedIndexChanged); + // + // gbBeforeCapture + // + resources.ApplyResources(this.gbBeforeCapture, "gbBeforeCapture"); + this.gbBeforeCapture.Controls.Add(this.lblScrollTopMethodBeforeCapture); + this.gbBeforeCapture.Controls.Add(this.cbScrollTopMethodBeforeCapture); + this.gbBeforeCapture.Controls.Add(this.lblStartDelay); + this.gbBeforeCapture.Controls.Add(this.cbStartSelectionAutomatically); + this.gbBeforeCapture.Controls.Add(this.nudStartDelay); + this.gbBeforeCapture.Controls.Add(this.cbStartCaptureAutomatically); + this.gbBeforeCapture.Controls.Add(this.btnSelectHandle); + this.gbBeforeCapture.Controls.Add(this.btnSelectRectangle); + this.gbBeforeCapture.Name = "gbBeforeCapture"; + this.gbBeforeCapture.TabStop = false; + // + // gbWhileCapturing + // + resources.ApplyResources(this.gbWhileCapturing, "gbWhileCapturing"); + this.gbWhileCapturing.Controls.Add(this.lblScrollDelay); + this.gbWhileCapturing.Controls.Add(this.nudScrollDelay); + this.gbWhileCapturing.Controls.Add(this.nudMaximumScrollCount); + this.gbWhileCapturing.Controls.Add(this.lblMaximumScrollCount); + this.gbWhileCapturing.Controls.Add(this.lblScrollMethod); + this.gbWhileCapturing.Controls.Add(this.cbScrollMethod); + this.gbWhileCapturing.Controls.Add(this.cbAutoDetectScrollEnd); + this.gbWhileCapturing.Name = "gbWhileCapturing"; + this.gbWhileCapturing.TabStop = false; + // + // gbAfterCapture + // + resources.ApplyResources(this.gbAfterCapture, "gbAfterCapture"); + this.gbAfterCapture.Controls.Add(this.cbAutoClose); + this.gbAfterCapture.Controls.Add(this.cbRemoveDuplicates); + this.gbAfterCapture.Controls.Add(this.cbAutoCombine); + this.gbAfterCapture.Controls.Add(this.chkAutoUpload); + this.gbAfterCapture.Name = "gbAfterCapture"; + this.gbAfterCapture.TabStop = false; + // + // cbAutoClose + // + resources.ApplyResources(this.cbAutoClose, "cbAutoClose"); + this.cbAutoClose.Name = "cbAutoClose"; + this.cbAutoClose.UseVisualStyleBackColor = true; + this.cbAutoClose.CheckedChanged += new System.EventHandler(this.cbAutoClose_CheckedChanged); // // ScrollingCaptureForm // @@ -523,6 +567,12 @@ private void InitializeComponent() this.pOutput.ResumeLayout(false); this.pOutput.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbOutput)).EndInit(); + this.gbBeforeCapture.ResumeLayout(false); + this.gbBeforeCapture.PerformLayout(); + this.gbWhileCapturing.ResumeLayout(false); + this.gbWhileCapturing.PerformLayout(); + this.gbAfterCapture.ResumeLayout(false); + this.gbAfterCapture.PerformLayout(); this.ResumeLayout(false); } @@ -565,7 +615,6 @@ private void InitializeComponent() private CheckBox cbAutoDetectScrollEnd; private CheckBox cbRemoveDuplicates; private CheckBox cbStartCaptureAutomatically; - private CheckBox cbScrollTopBeforeCapture; private Label lblProcessing; private Label lblImageCount; private Label lblStartDelay; @@ -580,5 +629,11 @@ private void InitializeComponent() private TextBox txtImagesCount; private Label lblNote; private CheckBox chkAutoUpload; + private Label lblScrollTopMethodBeforeCapture; + private ComboBox cbScrollTopMethodBeforeCapture; + private GroupBox gbAfterCapture; + private GroupBox gbWhileCapturing; + private GroupBox gbBeforeCapture; + private CheckBox cbAutoClose; } } \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs index 1e5c94087..c35c54402 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs @@ -57,12 +57,13 @@ public ScrollingCaptureForm(ScrollingCaptureOptions options, bool forceSelection cbScrollMethod.Items.AddRange(Helpers.GetEnumDescriptions()); cbScrollMethod.SelectedIndex = (int)Options.ScrollMethod; + cbScrollTopMethodBeforeCapture.Items.AddRange(Helpers.GetEnumDescriptions()); + cbScrollTopMethodBeforeCapture.SelectedIndex = (int)Options.ScrollTopMethodBeforeCapture; nudStartDelay.Value = Options.StartDelay; nudScrollDelay.Value = Options.ScrollDelay; nudMaximumScrollCount.Value = Options.MaximumScrollCount; cbStartSelectionAutomatically.Checked = Options.StartSelectionAutomatically; cbStartCaptureAutomatically.Checked = Options.StartCaptureAutomatically; - cbScrollTopBeforeCapture.Checked = Options.ScrollTopBeforeCapture; cbAutoDetectScrollEnd.Checked = Options.AutoDetectScrollEnd; cbRemoveDuplicates.Checked = Options.RemoveDuplicates; cbAutoCombine.Checked = Options.AfterCaptureAutomaticallyCombine; @@ -315,10 +316,18 @@ private void captureTimer_Tick(object sender, EventArgs e) firstCapture = false; captureTimer.Interval = Options.ScrollDelay; - if (Options.ScrollTopBeforeCapture) + if (Options.ScrollTopMethodBeforeCapture == ScrollingCaptureScrollTopMethod.All || Options.ScrollTopMethodBeforeCapture == ScrollingCaptureScrollTopMethod.KeyPressHome) { InputHelpers.SendKeyPress(VirtualKeyCode.HOME); + } + + if (Options.ScrollTopMethodBeforeCapture == ScrollingCaptureScrollTopMethod.All || Options.ScrollTopMethodBeforeCapture == ScrollingCaptureScrollTopMethod.SendMessageTop) + { NativeMethods.SendMessage(selectedWindow.Handle, (int)WindowsMessages.VSCROLL, (int)ScrollBarCommands.SB_TOP, 0); + } + + if (Options.ScrollTopMethodBeforeCapture != ScrollingCaptureScrollTopMethod.None) + { return; } } @@ -377,6 +386,11 @@ private void cbScrollMethod_SelectedIndexChanged(object sender, EventArgs e) Options.ScrollMethod = (ScrollingCaptureScrollMethod)cbScrollMethod.SelectedIndex; } + private void cbScrollTopMethodBeforeCapture_SelectedIndexChanged(object sender, EventArgs e) + { + Options.ScrollTopMethodBeforeCapture = (ScrollingCaptureScrollTopMethod)cbScrollTopMethodBeforeCapture.SelectedIndex; + } + private void nudStartDelay_ValueChanged(object sender, EventArgs e) { Options.StartDelay = (int)nudStartDelay.Value; @@ -402,11 +416,6 @@ private void cbStartCaptureAutomatically_CheckedChanged(object sender, EventArgs Options.StartCaptureAutomatically = cbStartCaptureAutomatically.Checked; } - private void cbScrollTopBeforeCapture_CheckedChanged(object sender, EventArgs e) - { - Options.ScrollTopBeforeCapture = cbScrollTopBeforeCapture.Checked; - } - private void cbAutoDetectScrollEnd_CheckedChanged(object sender, EventArgs e) { Options.AutoDetectScrollEnd = cbAutoDetectScrollEnd.Checked; @@ -673,6 +682,11 @@ private void chkAutoUpload_CheckedChanged(object sender, EventArgs e) Options.AutoUpload = chkAutoUpload.Checked; } + private void cbAutoClose_CheckedChanged(object sender, EventArgs e) + { + Options.AutoClose = cbAutoClose.Checked; + } + private Padding GuessEdges(Image img1, Image img2) { Padding result = new Padding(); diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx index 4302d89f2..2beb84632 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx @@ -123,10 +123,10 @@ - 16, 16 + 16, 24 - 344, 23 + 376, 23 @@ -142,10 +142,10 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbBeforeCapture - 14 + 6 True @@ -169,25 +169,31 @@ tpCapture - 16 + 5 + + + Top, Left, Right False + + Microsoft Sans Serif, 12pt + NoControl - 16, 336 + 8, 480 - 344, 48 + 960, 48 18 - Start capture + Start scrolling capture btnCapture @@ -199,13 +205,13 @@ tpCapture - 18 + 6 17, 17 - 160, 116 + 256, 44 80, 20 @@ -223,13 +229,13 @@ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbWhileCapturing - 20 + 1 - 160, 140 + 256, 68 80, 20 @@ -247,16 +253,16 @@ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbWhileCapturing - 19 + 2 True - 13, 120 + 13, 48 64, 13 @@ -274,16 +280,16 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbWhileCapturing - 17 + 0 True - 13, 144 + 13, 72 111, 13 @@ -301,10 +307,145 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbWhileCapturing - 15 + 3 + + + tpCapture + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcScrollingCapture + + + 0 + + + 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 + + + gbAfterCapture + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 0 + + + gbWhileCapturing + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 1 + + + gbBeforeCapture + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 2 + + + lblNote + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 3 + + + lblSelectedRectangle + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 4 + + + 4, 22 + + + 3, 3, 3, 3 + + + 976, 635 + + + 0 + + + Capture + + + tpCapture + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcScrollingCapture + + + 0 True @@ -313,16 +454,16 @@ NoControl - 16, 312 + 16, 72 - 370, 17 + 258, 17 20 - Automatically upload/save depending on after capture settings and close + Upload/save depending on after capture settings chkAutoUpload @@ -331,19 +472,19 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbAfterCapture - 0 + 3 Top, Bottom, Left, Right - 16, 400 + 8, 544 - 944, 216 + 960, 80 19 @@ -361,22 +502,22 @@ tpCapture - 1 + 3 True - 16, 168 + 16, 80 - 359, 17 + 296, 17 12 - Automatically start selecting capture region before opening this window + Start selecting capture region before opening this window cbStartSelectionAutomatically @@ -385,25 +526,25 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbBeforeCapture - 2 + 3 True - 16, 288 + 16, 48 - 280, 17 + 190, 17 17 - Automatically guess offsets and combine after capture + Guess offsets and combine images cbAutoCombine @@ -412,10 +553,10 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbAfterCapture - 3 + 2 True @@ -448,10 +589,10 @@ NoControl - 16, 40 + 16, 48 - 344, 23 + 376, 23 2 @@ -466,16 +607,16 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbBeforeCapture - 5 + 7 True - 13, 96 + 13, 160 60, 13 @@ -493,13 +634,13 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbBeforeCapture - 6 + 2 - 160, 92 + 256, 156 80, 20 @@ -517,43 +658,16 @@ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbBeforeCapture - 7 - - - 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 - - - 8 + 4 True - 16, 192 + 16, 104 325, 17 @@ -571,16 +685,16 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbBeforeCapture - 9 + 5 True - 16, 264 + 16, 24 148, 17 @@ -598,25 +712,25 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbAfterCapture - 10 + 1 True - 16, 240 + 16, 96 - 169, 17 + 106, 17 15 - Automatically detect scroll end + Detect scroll end cbAutoDetectScrollEnd @@ -625,16 +739,16 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbWhileCapturing - 11 + 6 True - 13, 72 + 13, 24 74, 13 @@ -652,16 +766,16 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbWhileCapturing - 12 + 4 - 160, 68 + 256, 20 - 312, 21 + 400, 21 5 @@ -673,37 +787,10 @@ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpCapture + gbWhileCapturing - 13 - - - 4, 22 - - - 3, 3, 3, 3 - - - 976, 635 - - - 0 - - - Capture - - - tpCapture - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcScrollingCapture - - - 0 + 5 gbImages @@ -828,30 +915,6 @@ 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 - txtImagesCount @@ -1764,9 +1827,339 @@ 1 + + True + + + 13, 136 + + + 164, 13 + + + 21 + + + Scroll top method before capture: + + + lblScrollTopMethodBeforeCapture + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 0 + + + 256, 132 + + + 400, 21 + + + 22 + + + cbScrollTopMethodBeforeCapture + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 1 + + + Top, Left, Right + + + lblScrollTopMethodBeforeCapture + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 0 + + + cbScrollTopMethodBeforeCapture + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 1 + + + lblStartDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 2 + + + cbStartSelectionAutomatically + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 3 + + + nudStartDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 4 + + + cbStartCaptureAutomatically + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 5 + + + btnSelectRectangle + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbBeforeCapture + + + 7 + + + 8, 8 + + + 960, 192 + + + 23 + + + Before capture + + + gbBeforeCapture + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 2 + + + Top, Left, Right + + + lblScrollMethod + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbWhileCapturing + + + 4 + + + cbScrollMethod + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbWhileCapturing + + + 5 + + + cbAutoDetectScrollEnd + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbWhileCapturing + + + 6 + + + 8, 208 + + + 960, 128 + + + 24 + + + While capturing + + + gbWhileCapturing + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 1 + + + Top, Left, Right + + + cbAutoClose + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAfterCapture + + + 0 + + + cbRemoveDuplicates + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAfterCapture + + + 1 + + + cbAutoCombine + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAfterCapture + + + 2 + + + chkAutoUpload + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAfterCapture + + + 3 + + + 8, 344 + + + 960, 128 + + + 25 + + + After capture + + + gbAfterCapture + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 0 + + + True + + + NoControl + + + 16, 96 + + + 188, 17 + + + 21 + + + Close this window after processing + + + cbAutoClose + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbAfterCapture + + + 0 + True + + 57 + 6, 13 diff --git a/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs b/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs index 1f5fcc7c0..1c1d784b4 100644 --- a/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs +++ b/ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs @@ -48,8 +48,8 @@ public class ScrollingCaptureOptions [DefaultValue(false)] public bool StartCaptureAutomatically { get; set; } = false; - [DefaultValue(true)] - public bool ScrollTopBeforeCapture { get; set; } = true; + [DefaultValue(ScrollingCaptureScrollTopMethod.All)] + public ScrollingCaptureScrollTopMethod ScrollTopMethodBeforeCapture { get; set; } = ScrollingCaptureScrollTopMethod.All; [DefaultValue(true)] public bool AutoDetectScrollEnd { get; set; } = true; diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj index d721c556a..88c227c03 100644 --- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj +++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj @@ -79,7 +79,7 @@ - ..\packages\AWSSDK.Core.3.1.3.1\lib\net35\AWSSDK.Core.dll + ..\packages\AWSSDK.Core.3.1.3.2\lib\net35\AWSSDK.Core.dll True diff --git a/ShareX.UploadersLib/packages.config b/ShareX.UploadersLib/packages.config index cebbcc1be..52169f84a 100644 --- a/ShareX.UploadersLib/packages.config +++ b/ShareX.UploadersLib/packages.config @@ -1,6 +1,6 @@  - +