From 6d62e5d63e2dc6f7ef6fec3f9de5baac7dc180fa Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 19 Dec 2015 17:04:28 +0200 Subject: [PATCH] Window pattern option for region capture is now setting, changed default window pattern to use process name instead of window title --- ShareX/Forms/MainForm.cs | 17 ++++--- ShareX/Forms/TaskSettingsForm.Designer.cs | 10 ++++ ShareX/Forms/TaskSettingsForm.cs | 6 +++ ShareX/Forms/TaskSettingsForm.resx | 57 +++++++++++++++++------ ShareX/TaskSettings.cs | 5 +- 5 files changed, 71 insertions(+), 24 deletions(-) diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 1c741975b..0d67f02d1 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -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 + }; + } } } } diff --git a/ShareX/Forms/TaskSettingsForm.Designer.cs b/ShareX/Forms/TaskSettingsForm.Designer.cs index 50a97657e..154f5f50d 100644 --- a/ShareX/Forms/TaskSettingsForm.Designer.cs +++ b/ShareX/Forms/TaskSettingsForm.Designer.cs @@ -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; } } \ No newline at end of file diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs index b252c3fe5..2381c6f59 100644 --- a/ShareX/Forms/TaskSettingsForm.cs +++ b/ShareX/Forms/TaskSettingsForm.cs @@ -270,6 +270,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false) CodeMenu.Create(txtNameFormatPattern, ReplCodeMenuEntry.n, ReplCodeMenuEntry.t, ReplCodeMenuEntry.pn); CodeMenu.Create(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; diff --git a/ShareX/Forms/TaskSettingsForm.resx b/ShareX/Forms/TaskSettingsForm.resx index d730db5d5..47fb59b2f 100644 --- a/ShareX/Forms/TaskSettingsForm.resx +++ b/ShareX/Forms/TaskSettingsForm.resx @@ -3453,6 +3453,33 @@ 5 + + True + + + 8, 248 + + + 474, 17 + + + 10 + + + Use window name pattern for region capture (ShareX will try to detect window behind selection) + + + cbRegionCaptureUseWindowPattern + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pUpload + + + 0 + True @@ -3481,7 +3508,7 @@ pUpload - 0 + 1 8, 32 @@ -3502,7 +3529,7 @@ pUpload - 1 + 2 True @@ -3511,7 +3538,7 @@ NoControl - 8, 64 + 5, 64 221, 13 @@ -3532,7 +3559,7 @@ pUpload - 2 + 3 True @@ -3562,7 +3589,7 @@ pUpload - 3 + 4 True @@ -3571,7 +3598,7 @@ NoControl - 8, 168 + 5, 168 48, 13 @@ -3592,7 +3619,7 @@ pUpload - 4 + 5 True @@ -3601,7 +3628,7 @@ NoControl - 8, 104 + 5, 104 48, 13 @@ -3622,7 +3649,7 @@ pUpload - 5 + 6 8, 144 @@ -3643,7 +3670,7 @@ pUpload - 6 + 7 8, 80 @@ -3664,7 +3691,7 @@ pUpload - 7 + 8 NoControl @@ -3673,7 +3700,7 @@ 8, 192 - 256, 23 + 288, 23 8 @@ -3691,7 +3718,7 @@ pUpload - 8 + 9 True @@ -3700,7 +3727,7 @@ NoControl - 8, 128 + 5, 128 167, 13 @@ -3721,7 +3748,7 @@ pUpload - 9 + 10 Fill diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 864a31dc6..82c705ed9 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -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