WebpageCaptureForm moved to ScreenCaptureLib

This commit is contained in:
Jaex 2016-03-21 15:16:33 +02:00
parent 4a0fa96558
commit 52100685b4
30 changed files with 118 additions and 120 deletions

View file

@ -1,4 +1,4 @@
namespace ShareX
namespace ShareX.ScreenCaptureLib
{
partial class WebpageCaptureForm
{

View file

@ -24,28 +24,29 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using ShareX.Properties;
using ShareX.ScreenCaptureLib;
using ShareX.ScreenCaptureLib.Properties;
using System;
using System.Drawing;
using System.Windows.Forms;
namespace ShareX
namespace ShareX.ScreenCaptureLib
{
public partial class WebpageCaptureForm : Form
{
public event Action<Image> OnImageUploadRequested;
public event Action<Image> OnImageCopyRequested;
public WebpageCaptureOptions Options { get; set; }
public bool IsBusy { get; private set; }
private WebpageCapture webpageCapture;
private bool stopRequested;
public WebpageCaptureForm()
public WebpageCaptureForm(WebpageCaptureOptions options)
{
InitializeComponent();
Icon = ShareXResources.Icon;
Options = options;
LoadSettings();
webpageCapture = new WebpageCapture();
webpageCapture.CaptureCompleted += webpageCapture_CaptureCompleted;
@ -55,13 +56,13 @@ private void LoadSettings()
{
CheckClipboardURL();
Size browserSize = Program.Settings.WebpageCaptureBrowserSize;
Size browserSize = Options.BrowserSize;
if (browserSize.Width == 0) browserSize.Width = Screen.PrimaryScreen.Bounds.Width;
nudWebpageWidth.SetValue(browserSize.Width);
if (browserSize.Height == 0) browserSize.Height = Screen.PrimaryScreen.Bounds.Height;
nudWebpageHeight.SetValue(browserSize.Height);
nudCaptureDelay.SetValue((decimal)Program.Settings.WebpageCaptureDelay);
nudCaptureDelay.SetValue((decimal)Options.Delay);
UpdateControls();
}
@ -95,17 +96,17 @@ private void txtURL_TextChanged(object sender, EventArgs e)
private void nudWebpageWidth_ValueChanged(object sender, EventArgs e)
{
Program.Settings.WebpageCaptureBrowserSize.Width = (int)nudWebpageWidth.Value;
Options.BrowserSize = new Size((int)nudWebpageWidth.Value, Options.BrowserSize.Height);
}
private void nudWebpageHeight_ValueChanged(object sender, EventArgs e)
{
Program.Settings.WebpageCaptureBrowserSize.Height = (int)nudWebpageHeight.Value;
Options.BrowserSize = new Size(Options.BrowserSize.Width, (int)nudWebpageHeight.Value);
}
private void nudCaptureDelay_ValueChanged(object sender, EventArgs e)
{
Program.Settings.WebpageCaptureDelay = (float)nudCaptureDelay.Value;
Options.Delay = (float)nudCaptureDelay.Value;
}
private void btnCapture_Click(object sender, EventArgs e)

View file

@ -669,5 +669,23 @@ internal static string Surface_InitializeComponent_Region_capture {
return ResourceManager.GetString("Surface_InitializeComponent_Region_capture", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Capture.
/// </summary>
internal static string WebpageCaptureForm_UpdateControls_Capture {
get {
return ResourceManager.GetString("WebpageCaptureForm_UpdateControls_Capture", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Stop.
/// </summary>
internal static string WebpageCaptureForm_UpdateControls_Stop {
get {
return ResourceManager.GetString("WebpageCaptureForm_UpdateControls_Stop", resourceCulture);
}
}
}
}

View file

@ -324,4 +324,10 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<data name="RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_pen_size" xml:space="preserve">
<value>[Ctrl + Mouse wheel] Change pen size</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Capture</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Stop</value>
</data>
</root>

View file

@ -311,4 +311,10 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°</value>
<data name="RectangleAnnotate_WriteTips__Shift__Change_pen_color" xml:space="preserve">
<value>[Shift] Kalem rengini değiştir</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Yakala</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Durdur</value>
</data>
</root>

View file

@ -23,10 +23,9 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using ShareX.ScreenCaptureLib;
using System.ComponentModel;
namespace ShareX
namespace ShareX.ScreenCaptureLib
{
public class ScrollingCaptureOptions
{

View file

@ -72,6 +72,12 @@
<Compile Include="Forms\ScrollingCaptureForm.Designer.cs">
<DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
</Compile>
<Compile Include="Forms\WebpageCaptureForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\WebpageCaptureForm.Designer.cs">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</Compile>
<Compile Include="MonitorRegion.cs" />
<Compile Include="MonitorRegionDefaultCreator.cs" />
<Compile Include="RectangleAnnotateOptions.cs" />
@ -125,6 +131,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Screenshot_Transparent.cs" />
<Compile Include="WebpageCapture.cs" />
<Compile Include="WebpageCaptureOptions.cs" />
<Compile Include="WindowInfo.cs" />
<Compile Include="WindowsList.cs" />
<Compile Include="WindowsRectangleList.cs" />
@ -167,6 +174,33 @@
<EmbeddedResource Include="Forms\ScrollingCaptureForm.zh-CN.resx">
<DependentUpon>ScrollingCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.de.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.fr.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.nl-NL.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.pt-BR.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.ru.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.tr.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.vi-VN.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.zh-CN.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.de.resx">
<SubType>Designer</SubType>
</EmbeddedResource>

View file

@ -0,0 +1,39 @@
#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (c) 2007-2016 ShareX Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
*/
#endregion License Information (GPL v3)
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
namespace ShareX.ScreenCaptureLib
{
public class WebpageCaptureOptions
{
public Size BrowserSize { get; set; } = Size.Empty;
public float Delay { get; set; } = 0f;
}
}

View file

@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using ShareX.ScreenCaptureLib;
using ShareX.UploadersLib;
using System.Collections.Generic;
using System.ComponentModel;
@ -249,8 +250,7 @@ public ApplicationConfig()
#region Webpage Capture Form
public Size WebpageCaptureBrowserSize = Size.Empty;
public float WebpageCaptureDelay = 0f;
public WebpageCaptureOptions WebpageCaptureOptions = new WebpageCaptureOptions();
#endregion Webpage Capture Form
}

View file

@ -2215,24 +2215,6 @@ public static string WatchFolderForm_btnPathBrowse_Click_Choose_folder_path {
}
}
/// <summary>
/// Looks up a localized string similar to Capture.
/// </summary>
public static string WebpageCaptureForm_UpdateControls_Capture {
get {
return ResourceManager.GetString("WebpageCaptureForm_UpdateControls_Capture", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Stop.
/// </summary>
public static string WebpageCaptureForm_UpdateControls_Stop {
get {
return ResourceManager.GetString("WebpageCaptureForm_UpdateControls_Stop", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View file

@ -468,12 +468,6 @@ Drücke Ja um das Bild aus der Zwischenablage zu öffnen. Drücke Nein um die Da
<value>Du versuchst eine große Datei hochzuladen.
Sind Sie sich sicher?</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Aufnehmen</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Stopp</value>
</data>
<data name="ImageData_Write_Error" xml:space="preserve">
<value>Konnte Bild nicht in den Pfad {0} schreiben.</value>
</data>

View file

@ -434,12 +434,6 @@ Merci de sélectionner un raccourci différent ou quitter l'application en confl
<data name="TaskHelpers_ToggleHotkeys_Hotkeys_enabled_" xml:space="preserve">
<value>Raccourcis clavier activés.</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Capturer</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Arrêter</value>
</data>
<data name="MainForm_AfterShownJobs_You_can_single_left_click_the_ShareX_tray_icon_to_start_region_capture_" xml:space="preserve">
<value>Vous pouvez faire un clic gauche sur l'icône de ShareX pour commencer la capture de région.</value>
</data>

View file

@ -464,12 +464,6 @@ Ben je zeker dat je door wilt gaan?</value>
<data name="UploadTask_DownloadAndUpload_Downloading" xml:space="preserve">
<value>Downloaden</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Vastleggen</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Stop</value>
</data>
<data name="AboutForm_AboutForm_Changelog" xml:space="preserve">
<value>Updategeschiedenis</value>
</data>

View file

@ -434,12 +434,6 @@ Por favor, selecione um atalho diferente ou feche o programa conflituoso e reabr
<data name="TaskHelpers_ToggleHotkeys_Hotkeys_enabled_" xml:space="preserve">
<value>Atalhos ativados.</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Capturar</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Parar</value>
</data>
<data name="BeforeUploadControl_AddDestination_Custom" xml:space="preserve">
<value>Personalizado</value>
</data>

View file

@ -145,9 +145,6 @@ Are you sure you want to continue?</value>
<value>Are you sure you want to upload this screenshot?
Press 'No' to cancel the current upload and disable screenshot auto uploading.</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Stop</value>
</data>
<data name="UploadTask_DoUploadJob_Uploading" xml:space="preserve">
<value>Uploading</value>
</data>
@ -367,9 +364,6 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
<data name="TaskSettingsForm_UpdateWindowTitle_Task_settings_for__0_" xml:space="preserve">
<value>Task settings for {0}</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Capture</value>
</data>
<data name="tr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

View file

@ -468,12 +468,6 @@
<data name="WatchFolderForm_btnPathBrowse_Click_Choose_folder_path" xml:space="preserve">
<value>Выберите путь к папке</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Захват</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Стоп</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Эти приложения могут быть причиной конфликта:</value>
</data>

View file

@ -440,12 +440,6 @@ Lütfen başka bir kısayol seçin veya çakışan uygulamayı kapatın ve Share
<data name="BeforeUploadControl_AddDestination_Custom" xml:space="preserve">
<value>Özel</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Yakala</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Durdur</value>
</data>
<data name="UploadTask_DoUploadJob_You_are_attempting_to_upload_a_large_file" xml:space="preserve">
<value>Büyük bir dosya yüklüyorsunuz.
Devam etmek istediğinizden emin misiniz?</value>

View file

@ -187,12 +187,6 @@ Bạn có muốn khởi động lại ShareX không?</value>
<data name="ChromeForm_btnUnregister_Click_Chrome_support_disabled_" xml:space="preserve">
<value>Hỗ trợ từ Chrome đã tắt</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>Dừng lại</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Chụp</value>
</data>
<data name="WatchFolderForm_btnPathBrowse_Click_Choose_folder_path" xml:space="preserve">
<value>Chọn đường dẫn thư mục</value>
</data>

View file

@ -411,9 +411,6 @@
<value>你正在尝试上传一个大文件。
你确定要继续吗?</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Stop" xml:space="preserve">
<value>停止</value>
</data>
<data name="BeforeUploadControl_AddDestination_Custom" xml:space="preserve">
<value>自定义</value>
</data>
@ -437,9 +434,6 @@
按“Yes”从剪贴板中打开图像。或者按“No”打开图像文件对话框。</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>捕捉</value>
</data>
<data name="MainForm_UpdateToggleHotkeyButton_Enable_hotkeys" xml:space="preserve">
<value>启用热键</value>
</data>

View file

@ -230,12 +230,6 @@
<Compile Include="Forms\AfterUploadForm.designer.cs">
<DependentUpon>AfterUploadForm.cs</DependentUpon>
</Compile>
<Compile Include="Forms\WebpageCaptureForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\WebpageCaptureForm.Designer.cs">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</Compile>
<Compile Include="HotkeysConfig.cs" />
<Compile Include="HotkeyManager.cs" />
<Compile Include="HotkeySettings.cs" />
@ -1030,33 +1024,6 @@
<EmbeddedResource Include="Forms\WatchFolderForm.zh-CN.resx">
<DependentUpon>WatchFolderForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.de.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.fr.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.nl-NL.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.pt-BR.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.ru.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.tr.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.vi-VN.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\WebpageCaptureForm.zh-CN.resx">
<DependentUpon>WebpageCaptureForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.de.resx" />
<EmbeddedResource Include="Properties\Resources.es.resx" />
<EmbeddedResource Include="Properties\Resources.fr.resx" />

View file

@ -444,7 +444,7 @@ public static void OpenWebpageCapture(TaskSettings taskSettings = null)
{
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
WebpageCaptureForm webpageCaptureForm = new WebpageCaptureForm();
WebpageCaptureForm webpageCaptureForm = new WebpageCaptureForm(Program.Settings.WebpageCaptureOptions);
webpageCaptureForm.OnImageUploadRequested += img => UploadManager.RunImageTask(img, taskSettings);
webpageCaptureForm.OnImageCopyRequested += img =>
{