mirror of https://github.com/ShareX/ShareX.git
Compare commits
6 Commits
53e7ff0925
...
dec4d13d6e
Author | SHA1 | Date |
---|---|---|
jcommander | dec4d13d6e | |
Jaex | ff15620896 | |
Jaex | 47bc35bf99 | |
Jaex | 34b23fcd37 | |
Jaex | 40f546d10b | |
jcommander | 0704453dfc |
|
@ -793,17 +793,6 @@ namespace ShareX.HelpersLib.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Progress: {0:0.0}%
|
||||
///Download speed: {1:0.0} KB/s
|
||||
///File size: {2:n0} / {3:n0} KB.
|
||||
/// </summary>
|
||||
internal static string DownloaderForm_ChangeProgress_Progress {
|
||||
get {
|
||||
return ResourceManager.GetString("DownloaderForm_ChangeProgress_Progress", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Status: {0}.
|
||||
/// </summary>
|
||||
|
@ -823,7 +812,7 @@ namespace ShareX.HelpersLib.Properties {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Waiting..
|
||||
/// Looks up a localized string similar to Waiting....
|
||||
/// </summary>
|
||||
internal static string DownloaderForm_DownloaderForm_Waiting_ {
|
||||
get {
|
||||
|
@ -849,6 +838,33 @@ namespace ShareX.HelpersLib.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Download speed.
|
||||
/// </summary>
|
||||
internal static string DownloaderForm_FileDownloader_ProgressChanged_DownloadSpeed {
|
||||
get {
|
||||
return ResourceManager.GetString("DownloaderForm_FileDownloader_ProgressChanged_DownloadSpeed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to File size.
|
||||
/// </summary>
|
||||
internal static string DownloaderForm_FileDownloader_ProgressChanged_FileSize {
|
||||
get {
|
||||
return ResourceManager.GetString("DownloaderForm_FileDownloader_ProgressChanged_FileSize", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Progress.
|
||||
/// </summary>
|
||||
internal static string DownloaderForm_FileDownloader_ProgressChanged_Progress {
|
||||
get {
|
||||
return ResourceManager.GetString("DownloaderForm_FileDownloader_ProgressChanged_Progress", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Cancel.
|
||||
/// </summary>
|
||||
|
@ -859,7 +875,7 @@ namespace ShareX.HelpersLib.Properties {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Downloading..
|
||||
/// Looks up a localized string similar to Downloading....
|
||||
/// </summary>
|
||||
internal static string DownloaderForm_StartDownload_Downloading_ {
|
||||
get {
|
||||
|
@ -868,7 +884,7 @@ namespace ShareX.HelpersLib.Properties {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Getting file size..
|
||||
/// Looks up a localized string similar to Getting file size....
|
||||
/// </summary>
|
||||
internal static string DownloaderForm_StartDownload_Getting_file_size_ {
|
||||
get {
|
||||
|
|
|
@ -575,11 +575,6 @@ Would you like to download it?</value>
|
|||
<data name="MyPictureBox_LoadImageAsync_Loading_image___" xml:space="preserve">
|
||||
<value>Loading image...</value>
|
||||
</data>
|
||||
<data name="DownloaderForm_ChangeProgress_Progress" xml:space="preserve">
|
||||
<value>Progress: {0:0.0}%
|
||||
Download speed: {1:0.0} KB/s
|
||||
File size: {2:n0} / {3:n0} KB</value>
|
||||
</data>
|
||||
<data name="HotkeyType_LastRegion" xml:space="preserve">
|
||||
<value>Capture last region</value>
|
||||
</data>
|
||||
|
@ -645,7 +640,7 @@ Would you like to download and install it?</value>
|
|||
<value>Save thumbnail image to file</value>
|
||||
</data>
|
||||
<data name="DownloaderForm_StartDownload_Downloading_" xml:space="preserve">
|
||||
<value>Downloading.</value>
|
||||
<value>Downloading...</value>
|
||||
</data>
|
||||
<data name="RegionCaptureAction_RemoveShapeCancelCapture" xml:space="preserve">
|
||||
<value>Remove shape or cancel capture</value>
|
||||
|
@ -705,7 +700,7 @@ Would you like to download and install it?</value>
|
|||
<value>Process name of window</value>
|
||||
</data>
|
||||
<data name="DownloaderForm_DownloaderForm_Waiting_" xml:space="preserve">
|
||||
<value>Waiting.</value>
|
||||
<value>Waiting...</value>
|
||||
</data>
|
||||
<data name="HotkeyType_ImageEditor" xml:space="preserve">
|
||||
<value>Image editor</value>
|
||||
|
@ -861,7 +856,7 @@ Would you like to download and install it?</value>
|
|||
<value>Capture active monitor</value>
|
||||
</data>
|
||||
<data name="DownloaderForm_StartDownload_Getting_file_size_" xml:space="preserve">
|
||||
<value>Getting file size.</value>
|
||||
<value>Getting file size...</value>
|
||||
</data>
|
||||
<data name="HotkeyType_Category_Other" xml:space="preserve">
|
||||
<value>Other</value>
|
||||
|
@ -1295,4 +1290,13 @@ Would you like to download and install it?</value>
|
|||
<data name="UpdateChannel_Release" xml:space="preserve">
|
||||
<value>Release</value>
|
||||
</data>
|
||||
<data name="DownloaderForm_FileDownloader_ProgressChanged_Progress" xml:space="preserve">
|
||||
<value>Progress</value>
|
||||
</data>
|
||||
<data name="DownloaderForm_FileDownloader_ProgressChanged_DownloadSpeed" xml:space="preserve">
|
||||
<value>Download speed</value>
|
||||
</data>
|
||||
<data name="DownloaderForm_FileDownloader_ProgressChanged_FileSize" xml:space="preserve">
|
||||
<value>File size</value>
|
||||
</data>
|
||||
</root>
|
|
@ -26,7 +26,6 @@
|
|||
using ShareX.HelpersLib.Properties;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
@ -251,8 +250,10 @@ namespace ShareX.HelpersLib
|
|||
if (fileDownloader != null)
|
||||
{
|
||||
pbProgress.Value = (int)Math.Round(fileDownloader.DownloadPercentage);
|
||||
lblProgress.Text = Helpers.SafeStringFormat(CultureInfo.CurrentCulture, Resources.DownloaderForm_ChangeProgress_Progress,
|
||||
fileDownloader.DownloadPercentage, fileDownloader.DownloadSpeed / 1024, fileDownloader.DownloadedSize / 1024, fileDownloader.FileSize / 1024);
|
||||
|
||||
lblProgress.Text = $@"{Resources.DownloaderForm_FileDownloader_ProgressChanged_Progress}: {fileDownloader.DownloadPercentage:0.0}%
|
||||
{Resources.DownloaderForm_FileDownloader_ProgressChanged_DownloadSpeed}: {((long)fileDownloader.DownloadSpeed).ToSizeString()}/s
|
||||
{Resources.DownloaderForm_FileDownloader_ProgressChanged_FileSize}: {fileDownloader.DownloadedSize.ToSizeString()} / {fileDownloader.FileSize.ToSizeString()}";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -360,9 +360,9 @@ namespace ShareX.ScreenCaptureLib
|
|||
|
||||
internal void InitBackground(Bitmap canvas, bool centerCanvas = true)
|
||||
{
|
||||
if (Canvas != null) Canvas.Dispose();
|
||||
if (backgroundBrush != null) backgroundBrush.Dispose();
|
||||
if (backgroundHighlightBrush != null) backgroundHighlightBrush.Dispose();
|
||||
Canvas?.Dispose();
|
||||
backgroundBrush?.Dispose();
|
||||
backgroundHighlightBrush?.Dispose();
|
||||
|
||||
Canvas = canvas;
|
||||
|
||||
|
@ -404,13 +404,15 @@ namespace ShareX.ScreenCaptureLib
|
|||
CenterCanvas();
|
||||
}
|
||||
}
|
||||
else if (Options.UseDimming)
|
||||
else if (Options.BackgroundDimStrength > 0)
|
||||
{
|
||||
DimmedCanvas?.Dispose();
|
||||
DimmedCanvas = (Bitmap)Canvas.Clone();
|
||||
|
||||
int alpha = (int)Math.Round(255 * (Options.BackgroundDimStrength / 100f));
|
||||
|
||||
using (Graphics g = Graphics.FromImage(DimmedCanvas))
|
||||
using (Brush brush = new SolidBrush(Color.FromArgb(30, Color.Black)))
|
||||
using (Brush brush = new SolidBrush(Color.FromArgb(alpha, Color.Black)))
|
||||
{
|
||||
g.FillRectangle(brush, 0, 0, DimmedCanvas.Width, DimmedCanvas.Height);
|
||||
|
||||
|
@ -956,7 +958,7 @@ namespace ShareX.ScreenCaptureLib
|
|||
UpdateRegionPath();
|
||||
|
||||
// If background is dimmed then draw non dimmed background to region selections
|
||||
if (!IsEditorMode && Options.UseDimming)
|
||||
if (!IsEditorMode && Options.BackgroundDimStrength > 0 && backgroundHighlightBrush != null)
|
||||
{
|
||||
using (Region region = new Region(regionDrawPath))
|
||||
{
|
||||
|
|
|
@ -49,7 +49,9 @@ namespace ShareX.ScreenCaptureLib
|
|||
public RegionCaptureAction RegionCaptureActionX2Click = RegionCaptureAction.CaptureActiveMonitor;
|
||||
public bool DetectWindows = true;
|
||||
public bool DetectControls = true;
|
||||
// TEMP: For backward compatibility
|
||||
public bool UseDimming = true;
|
||||
public int BackgroundDimStrength = 10;
|
||||
public bool UseCustomInfoText = false;
|
||||
public string CustomInfoText = "X: $x, Y: $y$nR: $r, G: $g, B: $b$nHex: $hex"; // Formats: $x, $y, $r, $g, $b, $hex, $HEX, $n
|
||||
public List<SnapSize> SnapSizes = new List<SnapSize>()
|
||||
|
|
|
@ -105,7 +105,7 @@ namespace ShareX.ScreenCaptureLib
|
|||
{
|
||||
RegionCaptureOptions newOptions = GetRegionCaptureOptions(options);
|
||||
newOptions.DetectWindows = false;
|
||||
newOptions.UseDimming = false;
|
||||
newOptions.BackgroundDimStrength = 0;
|
||||
|
||||
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.ScreenColorPicker, newOptions, canvas))
|
||||
{
|
||||
|
@ -126,7 +126,7 @@ namespace ShareX.ScreenCaptureLib
|
|||
public static SimpleWindowInfo GetWindowInfo(RegionCaptureOptions options)
|
||||
{
|
||||
RegionCaptureOptions newOptions = GetRegionCaptureOptions(options);
|
||||
newOptions.UseDimming = false;
|
||||
newOptions.BackgroundDimStrength = 0;
|
||||
newOptions.ShowMagnifier = false;
|
||||
|
||||
using (RegionCaptureForm form = new RegionCaptureForm(RegionCaptureMode.OneClick, newOptions))
|
||||
|
|
|
@ -47,7 +47,7 @@ namespace ShareX
|
|||
switch (info.DataType)
|
||||
{
|
||||
case EDataType.Image:
|
||||
InitCapture(info.TaskSettings);
|
||||
InitCapture(info.TaskSettings, info.DataType);
|
||||
break;
|
||||
case EDataType.Text:
|
||||
Helpers.GetEnums<TextDestination>().ForEach(x =>
|
||||
|
@ -61,7 +61,7 @@ namespace ShareX
|
|||
overrideText = GetCustomUploaderName(Program.UploadersConfig.CustomTextUploaderSelected, info.TaskSettings);
|
||||
}
|
||||
|
||||
AddDestination<TextDestination>((int)x, EDataType.Text, info.TaskSettings, overrideText);
|
||||
AddDestination<TextDestination>((int)x, EDataType.Text, info.TaskSettings, overrideText, info.DataType);
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -74,7 +74,7 @@ namespace ShareX
|
|||
overrideText = GetCustomUploaderName(Program.UploadersConfig.CustomFileUploaderSelected, info.TaskSettings);
|
||||
}
|
||||
|
||||
AddDestination<FileDestination>((int)x, EDataType.Text, info.TaskSettings, overrideText);
|
||||
AddDestination<FileDestination>((int)x, EDataType.Text, info.TaskSettings, overrideText, info.DataType);
|
||||
});
|
||||
|
||||
flp.Controls.OfType<RadioButton>().ForEach(x =>
|
||||
|
@ -99,7 +99,7 @@ namespace ShareX
|
|||
overrideText = GetCustomUploaderName(Program.UploadersConfig.CustomFileUploaderSelected, info.TaskSettings);
|
||||
}
|
||||
|
||||
AddDestination<FileDestination>((int)x, EDataType.File, info.TaskSettings, overrideText);
|
||||
AddDestination<FileDestination>((int)x, EDataType.File, info.TaskSettings, overrideText, info.DataType);
|
||||
});
|
||||
|
||||
flp.Controls.OfType<RadioButton>().ForEach(x =>
|
||||
|
@ -117,7 +117,7 @@ namespace ShareX
|
|||
overrideText = GetCustomUploaderName(Program.UploadersConfig.CustomURLShortenerSelected, info.TaskSettings);
|
||||
}
|
||||
|
||||
AddDestination<UrlShortenerType>((int)x, EDataType.URL, info.TaskSettings, overrideText);
|
||||
AddDestination<UrlShortenerType>((int)x, EDataType.URL, info.TaskSettings, overrideText, info.DataType);
|
||||
});
|
||||
|
||||
flp.Controls.OfType<RadioButton>().ForEach(x =>
|
||||
|
@ -131,7 +131,7 @@ namespace ShareX
|
|||
OnInitCompleted();
|
||||
}
|
||||
|
||||
public void InitCapture(TaskSettings taskSettings)
|
||||
public void InitCapture(TaskSettings taskSettings, EDataType trueDateType = EDataType.Default)
|
||||
{
|
||||
Helpers.GetEnums<ImageDestination>().ForEach(x =>
|
||||
{
|
||||
|
@ -144,7 +144,7 @@ namespace ShareX
|
|||
overrideText = GetCustomUploaderName(Program.UploadersConfig.CustomImageUploaderSelected, taskSettings);
|
||||
}
|
||||
|
||||
AddDestination<ImageDestination>((int)x, EDataType.Image, taskSettings, overrideText);
|
||||
AddDestination<ImageDestination>((int)x, EDataType.Image, taskSettings, overrideText, trueDateType);
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -157,7 +157,7 @@ namespace ShareX
|
|||
overrideText = GetCustomUploaderName(Program.UploadersConfig.CustomFileUploaderSelected, taskSettings);
|
||||
}
|
||||
|
||||
AddDestination<FileDestination>((int)x, EDataType.File, taskSettings, overrideText);
|
||||
AddDestination<FileDestination>((int)x, EDataType.File, taskSettings, overrideText, trueDateType);
|
||||
});
|
||||
|
||||
flp.Controls.OfType<RadioButton>().ForEach(x =>
|
||||
|
@ -187,23 +187,67 @@ namespace ShareX
|
|||
}
|
||||
}
|
||||
|
||||
private void AddDestination<T>(int index, EDataType dataType, TaskSettings taskSettings, string overrideText = null)
|
||||
private void AddDestination<T>(int index, EDataType dataType, TaskSettings taskSettings, string overrideText = null, EDataType trueDataType = EDataType.Default)
|
||||
{
|
||||
Enum destination = (Enum)Enum.ToObject(typeof(T), index);
|
||||
|
||||
if (UploadersConfigValidator.Validate<T>(index, Program.UploadersConfig))
|
||||
if (destination.Equals(FileDestination.FTP))
|
||||
{
|
||||
RadioButton rb = new RadioButton() { AutoSize = true };
|
||||
|
||||
rb.Text = string.IsNullOrEmpty(overrideText) ? destination.GetLocalizedDescription() :
|
||||
string.Format("{0} [{1}]", Resources.BeforeUploadControl_AddDestination_Custom, overrideText);
|
||||
rb.Text = string.Format("FTP");
|
||||
rb.Tag = destination;
|
||||
rb.CheckedChanged += (sender, e) => SetDestinations(rb.Checked, dataType, rb.Tag, taskSettings);
|
||||
|
||||
ComboBox ftpComboBox = new ComboBox() { Size = new System.Drawing.Size(250, 100) };
|
||||
Program.UploadersConfig.FTPAccountList.ForEach(ftpAcc => { ftpComboBox.Items.Add(ftpAcc.Name); });
|
||||
ftpComboBox.SelectedIndexChanged += (sender, e) => SetFTPOverrideIndex(ftpComboBox.SelectedIndex, taskSettings);
|
||||
switch (trueDataType)
|
||||
{
|
||||
case EDataType.Image:
|
||||
ftpComboBox.SelectedIndex = Program.UploadersConfig.FTPSelectedImage;
|
||||
break;
|
||||
case EDataType.Text:
|
||||
ftpComboBox.SelectedIndex = Program.UploadersConfig.FTPSelectedText;
|
||||
break;
|
||||
default:
|
||||
case EDataType.File:
|
||||
ftpComboBox.SelectedIndex = Program.UploadersConfig.FTPSelectedFile;
|
||||
break;
|
||||
}
|
||||
rb.CheckedChanged += (sender, e) => SetFTPOverride(rb.Checked, ftpComboBox.SelectedIndex, taskSettings);
|
||||
flp.Controls.Add(rb);
|
||||
flp.Controls.Add(ftpComboBox);
|
||||
} else {
|
||||
if (UploadersConfigValidator.Validate<T>(index, Program.UploadersConfig))
|
||||
{
|
||||
RadioButton rb = new RadioButton() { AutoSize = true };
|
||||
|
||||
rb.Text = string.IsNullOrEmpty(overrideText) ? destination.GetLocalizedDescription() :
|
||||
string.Format("{0} [{1}]", Resources.BeforeUploadControl_AddDestination_Custom, overrideText);
|
||||
rb.Tag = destination;
|
||||
rb.CheckedChanged += (sender, e) => SetDestinations(rb.Checked, dataType, rb.Tag, taskSettings);
|
||||
|
||||
flp.Controls.Add(rb);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void SetFTPOverrideIndex(int ftpAccIndex, TaskSettings taskSettings)
|
||||
{
|
||||
DebugHelper.WriteLine(ftpAccIndex.ToString());
|
||||
taskSettings.FTPIndex = ftpAccIndex;
|
||||
}
|
||||
|
||||
private void SetFTPOverride(bool isActive, int ftpAccIndex, TaskSettings taskSettings)
|
||||
{
|
||||
if (!isActive) return;
|
||||
DebugHelper.WriteLine(ftpAccIndex.ToString());
|
||||
taskSettings.OverrideFTP = true;
|
||||
taskSettings.FTPIndex = ftpAccIndex;
|
||||
taskSettings.ImageDestination = ImageDestination.FileUploader;
|
||||
taskSettings.TextDestination = TextDestination.FileUploader;
|
||||
taskSettings.ImageFileDestination = taskSettings.TextFileDestination = taskSettings.FileDestination = FileDestination.FTP;
|
||||
}
|
||||
|
||||
private void SetDestinations(bool isActive, EDataType dataType, object destination, TaskSettings taskSettings)
|
||||
{
|
||||
if (!isActive) return;
|
||||
|
|
|
@ -50,7 +50,7 @@ namespace ShareX
|
|||
lvAfterCaptureTasks.SmallImageList = imageList;
|
||||
lvAfterUploadTasks.SmallImageList = imageList;
|
||||
|
||||
ucBeforeUpload.InitCapture(TaskSettings);
|
||||
ucBeforeUpload.InitCapture(TaskSettings, EDataType.Image);
|
||||
|
||||
AddAfterCaptureItems(TaskSettings.AfterCaptureJob);
|
||||
AddAfterUploadItems(TaskSettings.AfterUploadJob);
|
||||
|
|
|
@ -181,7 +181,7 @@
|
|||
<value>lvUploads</value>
|
||||
</data>
|
||||
<data name=">>lvUploads.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lvUploads.Parent" xml:space="preserve">
|
||||
<value>scMain.Panel1</value>
|
||||
|
@ -217,7 +217,7 @@
|
|||
<value>pbPreview</value>
|
||||
</data>
|
||||
<data name=">>pbPreview.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=15.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>pbPreview.Parent" xml:space="preserve">
|
||||
<value>scMain.Panel2</value>
|
||||
|
@ -253,7 +253,7 @@
|
|||
<value>scMain</value>
|
||||
</data>
|
||||
<data name=">>scMain.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=15.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>scMain.Parent" xml:space="preserve">
|
||||
<value>pMain</value>
|
||||
|
@ -861,14 +861,11 @@
|
|||
<data name="tsbDiscord.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
</data>
|
||||
<data name="tsbDiscord.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
|
||||
<value>None</value>
|
||||
</data>
|
||||
<data name="tsbDiscord.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
|
||||
<value>Magenta</value>
|
||||
</data>
|
||||
<data name="tsbDiscord.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>152, 19</value>
|
||||
<value>152, 20</value>
|
||||
</data>
|
||||
<data name="tsbDiscord.Text" xml:space="preserve">
|
||||
<value>Discord...</value>
|
||||
|
@ -904,7 +901,7 @@
|
|||
<value>tsMain</value>
|
||||
</data>
|
||||
<data name=">>tsMain.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=15.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>tsMain.Parent" xml:space="preserve">
|
||||
<value>pToolbars</value>
|
||||
|
@ -1843,7 +1840,7 @@
|
|||
<value>ucTaskThumbnailView</value>
|
||||
</data>
|
||||
<data name=">>ucTaskThumbnailView.Type" xml:space="preserve">
|
||||
<value>ShareX.TaskThumbnailView, ShareX, Version=15.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.TaskThumbnailView, ShareX, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>ucTaskThumbnailView.Parent" xml:space="preserve">
|
||||
<value>pMain</value>
|
||||
|
@ -3502,6 +3499,6 @@
|
|||
<value>MainForm</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.HotkeyForm, ShareX.HelpersLib, Version=15.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.HotkeyForm, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
|
@ -199,7 +199,6 @@
|
|||
this.RegionCaptureSnapSizesHeight = new System.Windows.Forms.Label();
|
||||
this.nudRegionCaptureSnapSizesWidth = new System.Windows.Forms.NumericUpDown();
|
||||
this.lblRegionCaptureSnapSizesWidth = new System.Windows.Forms.Label();
|
||||
this.cbRegionCaptureUseDimming = new System.Windows.Forms.CheckBox();
|
||||
this.txtRegionCaptureCustomInfoText = new System.Windows.Forms.TextBox();
|
||||
this.nudRegionCaptureMagnifierPixelCount = new System.Windows.Forms.NumericUpDown();
|
||||
this.nudRegionCaptureMagnifierPixelSize = new System.Windows.Forms.NumericUpDown();
|
||||
|
@ -302,6 +301,9 @@
|
|||
this.pgTaskSettings = new System.Windows.Forms.PropertyGrid();
|
||||
this.cbOverrideAdvancedSettings = new System.Windows.Forms.CheckBox();
|
||||
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
|
||||
this.lblRegionCaptureBackgroundDimStrength = new System.Windows.Forms.Label();
|
||||
this.nudRegionCaptureBackgroundDimStrength = new System.Windows.Forms.NumericUpDown();
|
||||
this.lblRegionCaptureBackgroundDimStrengthHint = new System.Windows.Forms.Label();
|
||||
this.tcTaskSettings.SuspendLayout();
|
||||
this.tpTask.SuspendLayout();
|
||||
this.cmsDestinations.SuspendLayout();
|
||||
|
@ -363,6 +365,7 @@
|
|||
this.tpTools.SuspendLayout();
|
||||
this.pTools.SuspendLayout();
|
||||
this.tpAdvanced.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudRegionCaptureBackgroundDimStrength)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// cmsAfterCapture
|
||||
|
@ -1434,6 +1437,9 @@
|
|||
// tpRegionCapture
|
||||
//
|
||||
this.tpRegionCapture.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.tpRegionCapture.Controls.Add(this.lblRegionCaptureBackgroundDimStrengthHint);
|
||||
this.tpRegionCapture.Controls.Add(this.nudRegionCaptureBackgroundDimStrength);
|
||||
this.tpRegionCapture.Controls.Add(this.lblRegionCaptureBackgroundDimStrength);
|
||||
this.tpRegionCapture.Controls.Add(this.cbRegionCaptureActiveMonitorMode);
|
||||
this.tpRegionCapture.Controls.Add(this.nudRegionCaptureFPSLimit);
|
||||
this.tpRegionCapture.Controls.Add(this.lblRegionCaptureFPSLimit);
|
||||
|
@ -1463,7 +1469,6 @@
|
|||
this.tpRegionCapture.Controls.Add(this.lblRegionCaptureMouseRightClickAction);
|
||||
this.tpRegionCapture.Controls.Add(this.cbRegionCaptureMultiRegionMode);
|
||||
this.tpRegionCapture.Controls.Add(this.pRegionCaptureSnapSizes);
|
||||
this.tpRegionCapture.Controls.Add(this.cbRegionCaptureUseDimming);
|
||||
this.tpRegionCapture.Controls.Add(this.txtRegionCaptureCustomInfoText);
|
||||
this.tpRegionCapture.Controls.Add(this.nudRegionCaptureMagnifierPixelCount);
|
||||
this.tpRegionCapture.Controls.Add(this.nudRegionCaptureMagnifierPixelSize);
|
||||
|
@ -1798,13 +1803,6 @@
|
|||
resources.ApplyResources(this.lblRegionCaptureSnapSizesWidth, "lblRegionCaptureSnapSizesWidth");
|
||||
this.lblRegionCaptureSnapSizesWidth.Name = "lblRegionCaptureSnapSizesWidth";
|
||||
//
|
||||
// cbRegionCaptureUseDimming
|
||||
//
|
||||
resources.ApplyResources(this.cbRegionCaptureUseDimming, "cbRegionCaptureUseDimming");
|
||||
this.cbRegionCaptureUseDimming.Name = "cbRegionCaptureUseDimming";
|
||||
this.cbRegionCaptureUseDimming.UseVisualStyleBackColor = true;
|
||||
this.cbRegionCaptureUseDimming.CheckedChanged += new System.EventHandler(this.cbRegionCaptureUseDimming_CheckedChanged);
|
||||
//
|
||||
// txtRegionCaptureCustomInfoText
|
||||
//
|
||||
resources.ApplyResources(this.txtRegionCaptureCustomInfoText, "txtRegionCaptureCustomInfoText");
|
||||
|
@ -2626,6 +2624,27 @@
|
|||
this.tttvMain.TreeViewSize = 190;
|
||||
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
|
||||
//
|
||||
// lblRegionCaptureBackgroundDimStrength
|
||||
//
|
||||
resources.ApplyResources(this.lblRegionCaptureBackgroundDimStrength, "lblRegionCaptureBackgroundDimStrength");
|
||||
this.lblRegionCaptureBackgroundDimStrength.Name = "lblRegionCaptureBackgroundDimStrength";
|
||||
//
|
||||
// nudRegionCaptureBackgroundDimStrength
|
||||
//
|
||||
resources.ApplyResources(this.nudRegionCaptureBackgroundDimStrength, "nudRegionCaptureBackgroundDimStrength");
|
||||
this.nudRegionCaptureBackgroundDimStrength.Maximum = new decimal(new int[] {
|
||||
50,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.nudRegionCaptureBackgroundDimStrength.Name = "nudRegionCaptureBackgroundDimStrength";
|
||||
this.nudRegionCaptureBackgroundDimStrength.ValueChanged += new System.EventHandler(this.nudRegionCaptureBackgroundDimStrength_ValueChanged);
|
||||
//
|
||||
// lblRegionCaptureBackgroundDimStrengthHint
|
||||
//
|
||||
resources.ApplyResources(this.lblRegionCaptureBackgroundDimStrengthHint, "lblRegionCaptureBackgroundDimStrengthHint");
|
||||
this.lblRegionCaptureBackgroundDimStrengthHint.Name = "lblRegionCaptureBackgroundDimStrengthHint";
|
||||
//
|
||||
// TaskSettingsForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
|
@ -2722,6 +2741,7 @@
|
|||
this.pTools.PerformLayout();
|
||||
this.tpAdvanced.ResumeLayout(false);
|
||||
this.tpAdvanced.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudRegionCaptureBackgroundDimStrength)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
@ -2880,7 +2900,6 @@
|
|||
private System.Windows.Forms.ComboBox cbRegionCaptureMouseRightClickAction;
|
||||
private System.Windows.Forms.CheckBox cbRegionCaptureDetectWindows;
|
||||
private System.Windows.Forms.CheckBox cbRegionCaptureDetectControls;
|
||||
private System.Windows.Forms.CheckBox cbRegionCaptureUseDimming;
|
||||
private System.Windows.Forms.CheckBox cbRegionCaptureUseCustomInfoText;
|
||||
private System.Windows.Forms.TextBox txtRegionCaptureCustomInfoText;
|
||||
private System.Windows.Forms.Label lblRegionCaptureSnapSizes;
|
||||
|
@ -3000,5 +3019,8 @@
|
|||
private System.Windows.Forms.CheckBox cbUseRandomImageEffect;
|
||||
private System.Windows.Forms.Label lblCaptureCustomWindow;
|
||||
private System.Windows.Forms.TextBox txtCaptureCustomWindow;
|
||||
private System.Windows.Forms.NumericUpDown nudRegionCaptureBackgroundDimStrength;
|
||||
private System.Windows.Forms.Label lblRegionCaptureBackgroundDimStrength;
|
||||
private System.Windows.Forms.Label lblRegionCaptureBackgroundDimStrengthHint;
|
||||
}
|
||||
}
|
|
@ -298,7 +298,7 @@ namespace ShareX
|
|||
cbRegionCaptureDetectWindows.Checked = TaskSettings.CaptureSettings.SurfaceOptions.DetectWindows;
|
||||
cbRegionCaptureDetectControls.Enabled = TaskSettings.CaptureSettings.SurfaceOptions.DetectWindows;
|
||||
cbRegionCaptureDetectControls.Checked = TaskSettings.CaptureSettings.SurfaceOptions.DetectControls;
|
||||
cbRegionCaptureUseDimming.Checked = TaskSettings.CaptureSettings.SurfaceOptions.UseDimming;
|
||||
nudRegionCaptureBackgroundDimStrength.SetValue(TaskSettings.CaptureSettings.SurfaceOptions.BackgroundDimStrength);
|
||||
cbRegionCaptureUseCustomInfoText.Checked = TaskSettings.CaptureSettings.SurfaceOptions.UseCustomInfoText;
|
||||
txtRegionCaptureCustomInfoText.Enabled = TaskSettings.CaptureSettings.SurfaceOptions.UseCustomInfoText;
|
||||
TaskSettings.CaptureSettings.SurfaceOptions.CustomInfoText = TaskSettings.CaptureSettings.SurfaceOptions.CustomInfoText.Replace("\r\n", "$n").Replace("\n", "$n");
|
||||
|
@ -1153,9 +1153,9 @@ namespace ShareX
|
|||
TaskSettings.CaptureSettings.SurfaceOptions.DetectControls = cbRegionCaptureDetectControls.Checked;
|
||||
}
|
||||
|
||||
private void cbRegionCaptureUseDimming_CheckedChanged(object sender, EventArgs e)
|
||||
private void nudRegionCaptureBackgroundDimStrength_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
TaskSettings.CaptureSettings.SurfaceOptions.UseDimming = cbRegionCaptureUseDimming.Checked;
|
||||
TaskSettings.CaptureSettings.SurfaceOptions.BackgroundDimStrength = (int)nudRegionCaptureBackgroundDimStrength.Value;
|
||||
}
|
||||
|
||||
private void cbRegionCaptureUseCustomInfoText_CheckedChanged(object sender, EventArgs e)
|
||||
|
|
|
@ -526,7 +526,7 @@
|
|||
<value>btnAfterCapture</value>
|
||||
</data>
|
||||
<data name=">>btnAfterCapture.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>btnAfterCapture.Parent" xml:space="preserve">
|
||||
<value>tpTask</value>
|
||||
|
@ -556,7 +556,7 @@
|
|||
<value>btnAfterUpload</value>
|
||||
</data>
|
||||
<data name=">>btnAfterUpload.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>btnAfterUpload.Parent" xml:space="preserve">
|
||||
<value>tpTask</value>
|
||||
|
@ -628,7 +628,7 @@
|
|||
<value>btnDestinations</value>
|
||||
</data>
|
||||
<data name=">>btnDestinations.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>btnDestinations.Parent" xml:space="preserve">
|
||||
<value>tpTask</value>
|
||||
|
@ -664,7 +664,7 @@
|
|||
<value>btnTask</value>
|
||||
</data>
|
||||
<data name=">>btnTask.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>btnTask.Parent" xml:space="preserve">
|
||||
<value>tpTask</value>
|
||||
|
@ -3378,6 +3378,84 @@
|
|||
<data name=">>tpCaptureGeneral.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrengthHint.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrengthHint.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>365, 176</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrengthHint.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>15, 13</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrengthHint.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>36</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrengthHint.Text" xml:space="preserve">
|
||||
<value>%</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureBackgroundDimStrengthHint.Name" xml:space="preserve">
|
||||
<value>lblRegionCaptureBackgroundDimStrengthHint</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureBackgroundDimStrengthHint.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=">>lblRegionCaptureBackgroundDimStrengthHint.Parent" xml:space="preserve">
|
||||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureBackgroundDimStrengthHint.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="nudRegionCaptureBackgroundDimStrength.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 172</value>
|
||||
</data>
|
||||
<data name="nudRegionCaptureBackgroundDimStrength.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>48, 20</value>
|
||||
</data>
|
||||
<data name="nudRegionCaptureBackgroundDimStrength.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>35</value>
|
||||
</data>
|
||||
<data name="nudRegionCaptureBackgroundDimStrength.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
|
||||
<value>Center</value>
|
||||
</data>
|
||||
<data name=">>nudRegionCaptureBackgroundDimStrength.Name" xml:space="preserve">
|
||||
<value>nudRegionCaptureBackgroundDimStrength</value>
|
||||
</data>
|
||||
<data name=">>nudRegionCaptureBackgroundDimStrength.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=">>nudRegionCaptureBackgroundDimStrength.Parent" xml:space="preserve">
|
||||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>nudRegionCaptureBackgroundDimStrength.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrength.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrength.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>5, 176</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrength.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>128, 13</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrength.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>34</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureBackgroundDimStrength.Text" xml:space="preserve">
|
||||
<value>Background dim strength:</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureBackgroundDimStrength.Name" xml:space="preserve">
|
||||
<value>lblRegionCaptureBackgroundDimStrength</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureBackgroundDimStrength.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=">>lblRegionCaptureBackgroundDimStrength.Parent" xml:space="preserve">
|
||||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureBackgroundDimStrength.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureActiveMonitorMode.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
|
@ -3403,7 +3481,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureActiveMonitorMode.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="nudRegionCaptureFPSLimit.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 436</value>
|
||||
|
@ -3427,7 +3505,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>nudRegionCaptureFPSLimit.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureFPSLimit.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3454,7 +3532,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureFPSLimit.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureShowFPS.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3484,7 +3562,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureShowFPS.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="flpRegionCaptureFixedSize.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3634,7 +3712,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>flpRegionCaptureFixedSize.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureIsFixedSize.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3664,7 +3742,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureIsFixedSize.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureShowCrosshair.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3694,7 +3772,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureShowCrosshair.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureMagnifierPixelSize.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3724,7 +3802,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureMagnifierPixelSize.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureMagnifierPixelCount.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3754,7 +3832,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureMagnifierPixelCount.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseSquareMagnifier.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3784,7 +3862,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseSquareMagnifier.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureShowMagnifier.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3814,7 +3892,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureShowMagnifier.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
<value>13</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureShowInfo.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3844,7 +3922,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureShowInfo.ZOrder" xml:space="preserve">
|
||||
<value>11</value>
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="btnRegionCaptureSnapSizesRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
|
@ -3871,7 +3949,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>btnRegionCaptureSnapSizesRemove.ZOrder" xml:space="preserve">
|
||||
<value>12</value>
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="btnRegionCaptureSnapSizesAdd.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
|
@ -3898,7 +3976,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>btnRegionCaptureSnapSizesAdd.ZOrder" xml:space="preserve">
|
||||
<value>13</value>
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureSnapSizes.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 220</value>
|
||||
|
@ -3919,7 +3997,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureSnapSizes.ZOrder" xml:space="preserve">
|
||||
<value>14</value>
|
||||
<value>17</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureSnapSizes.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3949,7 +4027,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureSnapSizes.ZOrder" xml:space="preserve">
|
||||
<value>15</value>
|
||||
<value>18</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseCustomInfoText.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -3979,7 +4057,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseCustomInfoText.ZOrder" xml:space="preserve">
|
||||
<value>16</value>
|
||||
<value>19</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureDetectControls.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -4009,7 +4087,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureDetectControls.ZOrder" xml:space="preserve">
|
||||
<value>17</value>
|
||||
<value>20</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureDetectWindows.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -4039,7 +4117,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureDetectWindows.ZOrder" xml:space="preserve">
|
||||
<value>18</value>
|
||||
<value>21</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureMouse5ClickAction.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 100</value>
|
||||
|
@ -4060,7 +4138,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureMouse5ClickAction.ZOrder" xml:space="preserve">
|
||||
<value>19</value>
|
||||
<value>22</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureMouse5ClickAction.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -4090,7 +4168,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureMouse5ClickAction.ZOrder" xml:space="preserve">
|
||||
<value>20</value>
|
||||
<value>23</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureMouse4ClickAction.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 76</value>
|
||||
|
@ -4111,7 +4189,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureMouse4ClickAction.ZOrder" xml:space="preserve">
|
||||
<value>21</value>
|
||||
<value>24</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureMouse4ClickAction.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -4141,7 +4219,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureMouse4ClickAction.ZOrder" xml:space="preserve">
|
||||
<value>22</value>
|
||||
<value>25</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureMouseMiddleClickAction.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 52</value>
|
||||
|
@ -4162,7 +4240,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureMouseMiddleClickAction.ZOrder" xml:space="preserve">
|
||||
<value>23</value>
|
||||
<value>26</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureMouseMiddleClickAction.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -4192,7 +4270,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureMouseMiddleClickAction.ZOrder" xml:space="preserve">
|
||||
<value>24</value>
|
||||
<value>27</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureMouseRightClickAction.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 28</value>
|
||||
|
@ -4213,7 +4291,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureMouseRightClickAction.ZOrder" xml:space="preserve">
|
||||
<value>25</value>
|
||||
<value>28</value>
|
||||
</data>
|
||||
<data name="lblRegionCaptureMouseRightClickAction.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -4243,7 +4321,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>lblRegionCaptureMouseRightClickAction.ZOrder" xml:space="preserve">
|
||||
<value>26</value>
|
||||
<value>29</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureMultiRegionMode.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
@ -4273,7 +4351,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureMultiRegionMode.ZOrder" xml:space="preserve">
|
||||
<value>27</value>
|
||||
<value>30</value>
|
||||
</data>
|
||||
<data name="btnRegionCaptureSnapSizesDialogCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
|
@ -4459,37 +4537,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>pRegionCaptureSnapSizes.ZOrder" xml:space="preserve">
|
||||
<value>28</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseDimming.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseDimming.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseDimming.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 176</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseDimming.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>400, 17</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseDimming.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseDimming.Text" xml:space="preserve">
|
||||
<value>Dim background so selection can be differentiated easily (affects startup speed)</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseDimming.Name" xml:space="preserve">
|
||||
<value>cbRegionCaptureUseDimming</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseDimming.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseDimming.Parent" xml:space="preserve">
|
||||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseDimming.ZOrder" xml:space="preserve">
|
||||
<value>29</value>
|
||||
<value>31</value>
|
||||
</data>
|
||||
<data name="txtRegionCaptureCustomInfoText.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 198</value>
|
||||
|
@ -4510,7 +4558,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>txtRegionCaptureCustomInfoText.ZOrder" xml:space="preserve">
|
||||
<value>30</value>
|
||||
<value>32</value>
|
||||
</data>
|
||||
<data name="nudRegionCaptureMagnifierPixelCount.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 316</value>
|
||||
|
@ -4534,7 +4582,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>nudRegionCaptureMagnifierPixelCount.ZOrder" xml:space="preserve">
|
||||
<value>31</value>
|
||||
<value>33</value>
|
||||
</data>
|
||||
<data name="nudRegionCaptureMagnifierPixelSize.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>312, 340</value>
|
||||
|
@ -4558,7 +4606,7 @@
|
|||
<value>tpRegionCapture</value>
|
||||
</data>
|
||||
<data name=">>nudRegionCaptureMagnifierPixelSize.ZOrder" xml:space="preserve">
|
||||
<value>32</value>
|
||||
<value>34</value>
|
||||
</data>
|
||||
<data name="tpRegionCapture.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>4, 22</value>
|
||||
|
@ -6019,7 +6067,7 @@
|
|||
<value>lvUploaderFiltersList</value>
|
||||
</data>
|
||||
<data name=">>lvUploaderFiltersList.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lvUploaderFiltersList.Parent" xml:space="preserve">
|
||||
<value>tpUploaderFilters</value>
|
||||
|
@ -6472,7 +6520,7 @@
|
|||
<value>lvActions</value>
|
||||
</data>
|
||||
<data name=">>lvActions.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lvActions.Parent" xml:space="preserve">
|
||||
<value>pActions</value>
|
||||
|
@ -6718,7 +6766,7 @@
|
|||
<value>lvWatchFolderList</value>
|
||||
</data>
|
||||
<data name=">>lvWatchFolderList.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lvWatchFolderList.Parent" xml:space="preserve">
|
||||
<value>tpWatchFolders</value>
|
||||
|
@ -7177,7 +7225,7 @@
|
|||
<value>tttvMain</value>
|
||||
</data>
|
||||
<data name=">>tttvMain.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=16.0.4.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>tttvMain.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 364 B After Width: | Height: | Size: 302 B |
Binary file not shown.
Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 329 B |
|
@ -137,6 +137,7 @@ namespace ShareX
|
|||
else
|
||||
{
|
||||
RegionCaptureTasks.GetRectangleRegion(out captureRectangle, out WindowInfo windowInfo, taskSettings.CaptureSettings.SurfaceOptions);
|
||||
|
||||
metadata.UpdateInfo(windowInfo);
|
||||
}
|
||||
break;
|
||||
|
@ -149,6 +150,10 @@ namespace ShareX
|
|||
{
|
||||
captureRectangle = CaptureHelpers.GetActiveWindowRectangle();
|
||||
}
|
||||
|
||||
IntPtr handle = NativeMethods.GetForegroundWindow();
|
||||
WindowInfo activeWindowInfo = new WindowInfo(handle);
|
||||
metadata.UpdateInfo(activeWindowInfo);
|
||||
break;
|
||||
case ScreenRecordStartMethod.CustomRegion:
|
||||
captureRectangle = taskSettings.CaptureSettings.CaptureCustomRegion;
|
||||
|
|
|
@ -242,6 +242,11 @@ namespace ShareX
|
|||
{
|
||||
Settings.UpdateChannel = UpdateChannel.PreRelease;
|
||||
}
|
||||
|
||||
if (!DefaultTaskSettings.CaptureSettings.SurfaceOptions.UseDimming)
|
||||
{
|
||||
DefaultTaskSettings.CaptureSettings.SurfaceOptions.BackgroundDimStrength = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -431,6 +431,12 @@ namespace ShareX
|
|||
|
||||
if (!cancelUpload)
|
||||
{
|
||||
if (Info.TaskSettings.OverrideFTP)
|
||||
{
|
||||
taskReferenceHelper.OverrideFTP = true;
|
||||
taskReferenceHelper.FTPIndex = Info.TaskSettings.FTPIndex;
|
||||
}
|
||||
|
||||
OnUploadStarted();
|
||||
|
||||
bool isError = DoUpload(Data, Info.FileName);
|
||||
|
|
Loading…
Reference in New Issue