mirror of
https://github.com/ShareX/ShareX.git
synced 2024-07-02 21:20:28 +12:00
Window pattern option for region capture is now setting, changed default window pattern to use process name instead of window title
This commit is contained in:
Jaex
parent
dae41d1a71
commit
6d62e5d63e
|
|
@ -2012,15 +2012,18 @@ private void CaptureRegion(CaptureType captureType, TaskSettings taskSettings, b
|
|||
{
|
||||
img = surface.GetRegionImage();
|
||||
|
||||
WindowInfo windowInfo = surface.GetWindowInfo();
|
||||
|
||||
if (windowInfo != null)
|
||||
if (taskSettings.UploadSettings.RegionCaptureUseWindowPattern)
|
||||
{
|
||||
img.Tag = new ImageTag
|
||||
WindowInfo windowInfo = surface.GetWindowInfo();
|
||||
|
||||
if (windowInfo != null)
|
||||
{
|
||||
WindowTitle = windowInfo.Text,
|
||||
ProcessName = windowInfo.ProcessName
|
||||
};
|
||||
img.Tag = new ImageTag
|
||||
{
|
||||
WindowTitle = windowInfo.Text,
|
||||
ProcessName = windowInfo.ProcessName
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
10
ShareX/Forms/TaskSettingsForm.Designer.cs
generated
10
ShareX/Forms/TaskSettingsForm.Designer.cs
generated
|
|
@ -199,6 +199,7 @@ private void InitializeComponent()
|
|||
this.pgTaskSettings = new System.Windows.Forms.PropertyGrid();
|
||||
this.chkUseDefaultAdvancedSettings = new System.Windows.Forms.CheckBox();
|
||||
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
|
||||
this.cbRegionCaptureUseWindowPattern = new System.Windows.Forms.CheckBox();
|
||||
this.tcTaskSettings.SuspendLayout();
|
||||
this.tpTask.SuspendLayout();
|
||||
this.cmsDestinations.SuspendLayout();
|
||||
|
|
@ -1413,6 +1414,7 @@ private void InitializeComponent()
|
|||
//
|
||||
// pUpload
|
||||
//
|
||||
this.pUpload.Controls.Add(this.cbRegionCaptureUseWindowPattern);
|
||||
this.pUpload.Controls.Add(this.cbNameFormatCustomTimeZone);
|
||||
this.pUpload.Controls.Add(this.cbNameFormatTimeZone);
|
||||
this.pUpload.Controls.Add(this.lblNameFormatPattern);
|
||||
|
|
@ -1647,6 +1649,13 @@ private void InitializeComponent()
|
|||
this.tttvMain.TreeViewSize = 190;
|
||||
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
|
||||
//
|
||||
// cbRegionCaptureUseWindowPattern
|
||||
//
|
||||
resources.ApplyResources(this.cbRegionCaptureUseWindowPattern, "cbRegionCaptureUseWindowPattern");
|
||||
this.cbRegionCaptureUseWindowPattern.Name = "cbRegionCaptureUseWindowPattern";
|
||||
this.cbRegionCaptureUseWindowPattern.UseVisualStyleBackColor = true;
|
||||
this.cbRegionCaptureUseWindowPattern.CheckedChanged += new System.EventHandler(this.cbRegionCaptureUseWindowPattern_CheckedChanged);
|
||||
//
|
||||
// TaskSettingsForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
|
|
@ -1898,5 +1907,6 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.PropertyGrid pgIRCClient;
|
||||
private System.Windows.Forms.TabPage tpScrollingCapture;
|
||||
private System.Windows.Forms.PropertyGrid pgScrollingCapture;
|
||||
private System.Windows.Forms.CheckBox cbRegionCaptureUseWindowPattern;
|
||||
}
|
||||
}
|
||||
|
|
@ -270,6 +270,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
|
|||
CodeMenu.Create<ReplCodeMenuEntry>(txtNameFormatPattern, ReplCodeMenuEntry.n, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn);
|
||||
CodeMenu.Create<ReplCodeMenuEntry>(txtNameFormatPatternActiveWindow, ReplCodeMenuEntry.n);
|
||||
cbFileUploadUseNamePattern.Checked = TaskSettings.UploadSettings.FileUploadUseNamePattern;
|
||||
cbRegionCaptureUseWindowPattern.Checked = TaskSettings.UploadSettings.RegionCaptureUseWindowPattern;
|
||||
|
||||
// Upload / Clipboard upload
|
||||
chkClipboardUploadURLContents.Checked = TaskSettings.UploadSettings.ClipboardUploadURLContents;
|
||||
|
|
@ -1131,6 +1132,11 @@ private void cbFileUploadUseNamePattern_CheckedChanged(object sender, EventArgs
|
|||
TaskSettings.UploadSettings.FileUploadUseNamePattern = cbFileUploadUseNamePattern.Checked;
|
||||
}
|
||||
|
||||
private void cbRegionCaptureUseWindowPattern_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
TaskSettings.UploadSettings.RegionCaptureUseWindowPattern = cbRegionCaptureUseWindowPattern.Checked;
|
||||
}
|
||||
|
||||
private void chkClipboardUploadContents_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
TaskSettings.UploadSettings.ClipboardUploadURLContents = chkClipboardUploadURLContents.Checked;
|
||||
|
|
|
|||
|
|
@ -3453,6 +3453,33 @@
|
|||
<data name=">>tpWatchFolders.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseWindowPattern.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseWindowPattern.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 248</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseWindowPattern.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>474, 17</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseWindowPattern.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="cbRegionCaptureUseWindowPattern.Text" xml:space="preserve">
|
||||
<value>Use window name pattern for region capture (ShareX will try to detect window behind selection)</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseWindowPattern.Name" xml:space="preserve">
|
||||
<value>cbRegionCaptureUseWindowPattern</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseWindowPattern.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=">>cbRegionCaptureUseWindowPattern.Parent" xml:space="preserve">
|
||||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>cbRegionCaptureUseWindowPattern.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="cbNameFormatCustomTimeZone.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
|
|
@ -3481,7 +3508,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>cbNameFormatCustomTimeZone.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="cbNameFormatTimeZone.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 32</value>
|
||||
|
|
@ -3502,7 +3529,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>cbNameFormatTimeZone.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPattern.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -3511,7 +3538,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPattern.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 64</value>
|
||||
<value>5, 64</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPattern.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>221, 13</value>
|
||||
|
|
@ -3532,7 +3559,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>lblNameFormatPattern.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="cbFileUploadUseNamePattern.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -3562,7 +3589,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>cbFileUploadUseNamePattern.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternPreviewActiveWindow.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -3571,7 +3598,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternPreviewActiveWindow.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 168</value>
|
||||
<value>5, 168</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternPreviewActiveWindow.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>48, 13</value>
|
||||
|
|
@ -3592,7 +3619,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>lblNameFormatPatternPreviewActiveWindow.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternPreview.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -3601,7 +3628,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternPreview.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 104</value>
|
||||
<value>5, 104</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternPreview.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>48, 13</value>
|
||||
|
|
@ -3622,7 +3649,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>lblNameFormatPatternPreview.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="txtNameFormatPatternActiveWindow.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 144</value>
|
||||
|
|
@ -3643,7 +3670,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>txtNameFormatPatternActiveWindow.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="txtNameFormatPattern.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 80</value>
|
||||
|
|
@ -3664,7 +3691,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>txtNameFormatPattern.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="btnResetAutoIncrementNumber.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
|
|
@ -3673,7 +3700,7 @@
|
|||
<value>8, 192</value>
|
||||
</data>
|
||||
<data name="btnResetAutoIncrementNumber.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>256, 23</value>
|
||||
<value>288, 23</value>
|
||||
</data>
|
||||
<data name="btnResetAutoIncrementNumber.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>8</value>
|
||||
|
|
@ -3691,7 +3718,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>btnResetAutoIncrementNumber.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternActiveWindow.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -3700,7 +3727,7 @@
|
|||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternActiveWindow.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 128</value>
|
||||
<value>5, 128</value>
|
||||
</data>
|
||||
<data name="lblNameFormatPatternActiveWindow.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>167, 13</value>
|
||||
|
|
@ -3721,7 +3748,7 @@
|
|||
<value>pUpload</value>
|
||||
</data>
|
||||
<data name=">>lblNameFormatPatternActiveWindow.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="pUpload.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
|
|
|
|||
|
|
@ -345,8 +345,9 @@ public class TaskSettingsUpload
|
|||
|
||||
public bool UseCustomTimeZone = false;
|
||||
public TimeZoneInfo CustomTimeZone = TimeZoneInfo.Utc;
|
||||
public string NameFormatPattern = "%y-%mo-%d_%h-%mi-%s"; // Test: %y %mo %mon %mon2 %d %h %mi %s %ms %w %w2 %pm %rn %ra %width %height %app %ver
|
||||
public string NameFormatPatternActiveWindow = "%t_%y-%mo-%d_%h-%mi-%s";
|
||||
public string NameFormatPattern = "%y-%mo-%d_%h-%mi-%s";
|
||||
public string NameFormatPatternActiveWindow = "%pn_%y-%mo-%d_%h-%mi-%s";
|
||||
public bool RegionCaptureUseWindowPattern = true;
|
||||
public bool FileUploadUseNamePattern = false;
|
||||
|
||||
#endregion Upload
|
||||
|
|
|
|||
Loading…
Reference in a new issue