Added setting to change auto increment number

This commit is contained in:
Jaex 2019-01-15 11:53:16 +03:00
parent 3c5ff2950c
commit 5a4dede7a4
3 changed files with 1824 additions and 3649 deletions

View file

@ -98,6 +98,7 @@ private void InitializeComponent()
this.tcCapture = new System.Windows.Forms.TabControl();
this.tpCaptureGeneral = new System.Windows.Forms.TabPage();
this.pCapture = new System.Windows.Forms.Panel();
this.lblScreenshotDelay = new System.Windows.Forms.Label();
this.btnCaptureCustomRegionSelectRectangle = new System.Windows.Forms.Button();
this.lblCaptureCustomRegion = new System.Windows.Forms.Label();
this.lblCaptureCustomRegionWidth = new System.Windows.Forms.Label();
@ -185,8 +186,10 @@ private void InitializeComponent()
this.tpUploadMain = new System.Windows.Forms.TabPage();
this.chkOverrideUploadSettings = new System.Windows.Forms.CheckBox();
this.tpFileNaming = new System.Windows.Forms.TabPage();
this.cbFileUploadReplaceProblematicCharacters = new System.Windows.Forms.CheckBox();
this.btnAutoIncrementNumber = new System.Windows.Forms.Button();
this.lblAutoIncrementNumber = new System.Windows.Forms.Label();
this.nudAutoIncrementNumber = new System.Windows.Forms.NumericUpDown();
this.cbFileUploadReplaceProblematicCharacters = new System.Windows.Forms.CheckBox();
this.cbRegionCaptureUseWindowPattern = new System.Windows.Forms.CheckBox();
this.cbNameFormatCustomTimeZone = new System.Windows.Forms.CheckBox();
this.lblNameFormatPatternPreview = new System.Windows.Forms.Label();
@ -194,13 +197,12 @@ private void InitializeComponent()
this.lblNameFormatPatternPreviewActiveWindow = new System.Windows.Forms.Label();
this.cbNameFormatTimeZone = new System.Windows.Forms.ComboBox();
this.txtNameFormatPatternActiveWindow = new System.Windows.Forms.TextBox();
this.btnResetAutoIncrementNumber = new System.Windows.Forms.Button();
this.cbFileUploadUseNamePattern = new System.Windows.Forms.CheckBox();
this.lblNameFormatPattern = new System.Windows.Forms.Label();
this.txtNameFormatPattern = new System.Windows.Forms.TextBox();
this.tpUploadClipboard = new System.Windows.Forms.TabPage();
this.cbClipboardUploadShareURL = new System.Windows.Forms.CheckBox();
this.chkClipboardUploadURLContents = new System.Windows.Forms.CheckBox();
this.cbClipboardUploadURLContents = new System.Windows.Forms.CheckBox();
this.cbClipboardUploadAutoIndexFolder = new System.Windows.Forms.CheckBox();
this.cbClipboardUploadShortenURL = new System.Windows.Forms.CheckBox();
this.tpUploaderFilters = new System.Windows.Forms.TabPage();
@ -245,7 +247,6 @@ private void InitializeComponent()
this.pgTaskSettings = new System.Windows.Forms.PropertyGrid();
this.chkOverrideAdvancedSettings = new System.Windows.Forms.CheckBox();
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
this.lblScreenshotDelay = new System.Windows.Forms.Label();
this.tcTaskSettings.SuspendLayout();
this.tpTask.SuspendLayout();
this.cmsDestinations.SuspendLayout();
@ -290,6 +291,7 @@ private void InitializeComponent()
this.tcUpload.SuspendLayout();
this.tpUploadMain.SuspendLayout();
this.tpFileNaming.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudAutoIncrementNumber)).BeginInit();
this.tpUploadClipboard.SuspendLayout();
this.tpUploaderFilters.SuspendLayout();
this.tpActions.SuspendLayout();
@ -850,6 +852,11 @@ private void InitializeComponent()
resources.ApplyResources(this.pCapture, "pCapture");
this.pCapture.Name = "pCapture";
//
// lblScreenshotDelay
//
resources.ApplyResources(this.lblScreenshotDelay, "lblScreenshotDelay");
this.lblScreenshotDelay.Name = "lblScreenshotDelay";
//
// btnCaptureCustomRegionSelectRectangle
//
resources.ApplyResources(this.btnCaptureCustomRegionSelectRectangle, "btnCaptureCustomRegionSelectRectangle");
@ -1648,8 +1655,10 @@ private void InitializeComponent()
// tpFileNaming
//
this.tpFileNaming.BackColor = System.Drawing.SystemColors.Window;
this.tpFileNaming.Controls.Add(this.cbFileUploadReplaceProblematicCharacters);
this.tpFileNaming.Controls.Add(this.btnAutoIncrementNumber);
this.tpFileNaming.Controls.Add(this.lblAutoIncrementNumber);
this.tpFileNaming.Controls.Add(this.nudAutoIncrementNumber);
this.tpFileNaming.Controls.Add(this.cbFileUploadReplaceProblematicCharacters);
this.tpFileNaming.Controls.Add(this.cbRegionCaptureUseWindowPattern);
this.tpFileNaming.Controls.Add(this.cbNameFormatCustomTimeZone);
this.tpFileNaming.Controls.Add(this.lblNameFormatPatternPreview);
@ -1657,13 +1666,34 @@ private void InitializeComponent()
this.tpFileNaming.Controls.Add(this.lblNameFormatPatternPreviewActiveWindow);
this.tpFileNaming.Controls.Add(this.cbNameFormatTimeZone);
this.tpFileNaming.Controls.Add(this.txtNameFormatPatternActiveWindow);
this.tpFileNaming.Controls.Add(this.btnResetAutoIncrementNumber);
this.tpFileNaming.Controls.Add(this.cbFileUploadUseNamePattern);
this.tpFileNaming.Controls.Add(this.lblNameFormatPattern);
this.tpFileNaming.Controls.Add(this.txtNameFormatPattern);
resources.ApplyResources(this.tpFileNaming, "tpFileNaming");
this.tpFileNaming.Name = "tpFileNaming";
//
// btnAutoIncrementNumber
//
resources.ApplyResources(this.btnAutoIncrementNumber, "btnAutoIncrementNumber");
this.btnAutoIncrementNumber.Name = "btnAutoIncrementNumber";
this.btnAutoIncrementNumber.UseVisualStyleBackColor = true;
this.btnAutoIncrementNumber.Click += new System.EventHandler(this.btnAutoIncrementNumber_Click);
//
// lblAutoIncrementNumber
//
resources.ApplyResources(this.lblAutoIncrementNumber, "lblAutoIncrementNumber");
this.lblAutoIncrementNumber.Name = "lblAutoIncrementNumber";
//
// nudAutoIncrementNumber
//
resources.ApplyResources(this.nudAutoIncrementNumber, "nudAutoIncrementNumber");
this.nudAutoIncrementNumber.Maximum = new decimal(new int[] {
100000000,
0,
0,
0});
this.nudAutoIncrementNumber.Name = "nudAutoIncrementNumber";
//
// cbFileUploadReplaceProblematicCharacters
//
resources.ApplyResources(this.cbFileUploadReplaceProblematicCharacters, "cbFileUploadReplaceProblematicCharacters");
@ -1671,11 +1701,6 @@ private void InitializeComponent()
this.cbFileUploadReplaceProblematicCharacters.UseVisualStyleBackColor = true;
this.cbFileUploadReplaceProblematicCharacters.CheckedChanged += new System.EventHandler(this.cbFileUploadReplaceProblematicCharacters_CheckedChanged);
//
// lblAutoIncrementNumber
//
resources.ApplyResources(this.lblAutoIncrementNumber, "lblAutoIncrementNumber");
this.lblAutoIncrementNumber.Name = "lblAutoIncrementNumber";
//
// cbRegionCaptureUseWindowPattern
//
resources.ApplyResources(this.cbRegionCaptureUseWindowPattern, "cbRegionCaptureUseWindowPattern");
@ -1719,13 +1744,6 @@ private void InitializeComponent()
this.txtNameFormatPatternActiveWindow.Name = "txtNameFormatPatternActiveWindow";
this.txtNameFormatPatternActiveWindow.TextChanged += new System.EventHandler(this.txtNameFormatPatternActiveWindow_TextChanged);
//
// btnResetAutoIncrementNumber
//
resources.ApplyResources(this.btnResetAutoIncrementNumber, "btnResetAutoIncrementNumber");
this.btnResetAutoIncrementNumber.Name = "btnResetAutoIncrementNumber";
this.btnResetAutoIncrementNumber.UseVisualStyleBackColor = true;
this.btnResetAutoIncrementNumber.Click += new System.EventHandler(this.btnResetAutoIncrementNumber_Click);
//
// cbFileUploadUseNamePattern
//
resources.ApplyResources(this.cbFileUploadUseNamePattern, "cbFileUploadUseNamePattern");
@ -1748,7 +1766,7 @@ private void InitializeComponent()
//
this.tpUploadClipboard.BackColor = System.Drawing.SystemColors.Window;
this.tpUploadClipboard.Controls.Add(this.cbClipboardUploadShareURL);
this.tpUploadClipboard.Controls.Add(this.chkClipboardUploadURLContents);
this.tpUploadClipboard.Controls.Add(this.cbClipboardUploadURLContents);
this.tpUploadClipboard.Controls.Add(this.cbClipboardUploadAutoIndexFolder);
this.tpUploadClipboard.Controls.Add(this.cbClipboardUploadShortenURL);
resources.ApplyResources(this.tpUploadClipboard, "tpUploadClipboard");
@ -1761,12 +1779,12 @@ private void InitializeComponent()
this.cbClipboardUploadShareURL.UseVisualStyleBackColor = true;
this.cbClipboardUploadShareURL.CheckedChanged += new System.EventHandler(this.cbClipboardUploadShareURL_CheckedChanged);
//
// chkClipboardUploadURLContents
// cbClipboardUploadURLContents
//
resources.ApplyResources(this.chkClipboardUploadURLContents, "chkClipboardUploadURLContents");
this.chkClipboardUploadURLContents.Name = "chkClipboardUploadURLContents";
this.chkClipboardUploadURLContents.UseVisualStyleBackColor = true;
this.chkClipboardUploadURLContents.CheckedChanged += new System.EventHandler(this.chkClipboardUploadContents_CheckedChanged);
resources.ApplyResources(this.cbClipboardUploadURLContents, "cbClipboardUploadURLContents");
this.cbClipboardUploadURLContents.Name = "cbClipboardUploadURLContents";
this.cbClipboardUploadURLContents.UseVisualStyleBackColor = true;
this.cbClipboardUploadURLContents.CheckedChanged += new System.EventHandler(this.cbClipboardUploadContents_CheckedChanged);
//
// cbClipboardUploadAutoIndexFolder
//
@ -2092,11 +2110,6 @@ private void InitializeComponent()
this.tttvMain.TreeViewSize = 190;
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
//
// lblScreenshotDelay
//
resources.ApplyResources(this.lblScreenshotDelay, "lblScreenshotDelay");
this.lblScreenshotDelay.Name = "lblScreenshotDelay";
//
// TaskSettingsForm
//
resources.ApplyResources(this, "$this");
@ -2167,6 +2180,7 @@ private void InitializeComponent()
this.tpUploadMain.PerformLayout();
this.tpFileNaming.ResumeLayout(false);
this.tpFileNaming.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudAutoIncrementNumber)).EndInit();
this.tpUploadClipboard.ResumeLayout(false);
this.tpUploadClipboard.PerformLayout();
this.tpUploaderFilters.ResumeLayout(false);
@ -2242,7 +2256,6 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox cbFileUploadUseNamePattern;
private System.Windows.Forms.Label lblNameFormatPattern;
private System.Windows.Forms.TextBox txtNameFormatPatternActiveWindow;
private System.Windows.Forms.Button btnResetAutoIncrementNumber;
private System.Windows.Forms.Label lblNameFormatPatternActiveWindow;
private System.Windows.Forms.TextBox txtNameFormatPattern;
private System.Windows.Forms.Label lblNameFormatPatternPreview;
@ -2301,7 +2314,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblThumbnailNamePreview;
private System.Windows.Forms.CheckBox cbThumbnailIfSmaller;
private System.Windows.Forms.CheckBox cbClipboardUploadAutoIndexFolder;
private System.Windows.Forms.CheckBox chkClipboardUploadURLContents;
private System.Windows.Forms.CheckBox cbClipboardUploadURLContents;
private System.Windows.Forms.NumericUpDown nudScreenRecordFPS;
private System.Windows.Forms.Label lblScreenRecordFPS;
private System.Windows.Forms.Label lblScreenRecorderFixedDuration;
@ -2332,7 +2345,6 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox chkOverrideToolsSettings;
private System.Windows.Forms.CheckBox cbRegionCaptureUseWindowPattern;
private System.Windows.Forms.TabPage tpFileNaming;
private System.Windows.Forms.Label lblAutoIncrementNumber;
private System.Windows.Forms.Label lblCaptureCustomRegion;
private System.Windows.Forms.Button btnCaptureCustomRegionSelectRectangle;
private System.Windows.Forms.CheckBox cbRegionCaptureMultiRegionMode;
@ -2404,5 +2416,8 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox cbCaptureOCRProcessOnLoad;
private System.Windows.Forms.CheckBox cbCaptureOCRAutoCopy;
private System.Windows.Forms.Label lblScreenshotDelay;
private System.Windows.Forms.Label lblAutoIncrementNumber;
private System.Windows.Forms.NumericUpDown nudAutoIncrementNumber;
private System.Windows.Forms.Button btnAutoIncrementNumber;
}
}

View file

@ -325,6 +325,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
cbRegionCaptureUseWindowPattern.Checked = TaskSettings.UploadSettings.RegionCaptureUseWindowPattern;
cbFileUploadUseNamePattern.Checked = TaskSettings.UploadSettings.FileUploadUseNamePattern;
cbFileUploadReplaceProblematicCharacters.Checked = TaskSettings.UploadSettings.FileUploadReplaceProblematicCharacters;
nudAutoIncrementNumber.Value = Program.Settings.NameParserAutoIncrementNumber;
UpdateNameFormatPreviews();
cbNameFormatCustomTimeZone.Checked = cbNameFormatTimeZone.Enabled = TaskSettings.UploadSettings.UseCustomTimeZone;
cbNameFormatTimeZone.Items.AddRange(TimeZoneInfo.GetSystemTimeZones().ToArray());
@ -341,7 +342,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
#region Clipboard upload
chkClipboardUploadURLContents.Checked = TaskSettings.UploadSettings.ClipboardUploadURLContents;
cbClipboardUploadURLContents.Checked = TaskSettings.UploadSettings.ClipboardUploadURLContents;
cbClipboardUploadShortenURL.Checked = TaskSettings.UploadSettings.ClipboardUploadShortenURL;
cbClipboardUploadShareURL.Checked = TaskSettings.UploadSettings.ClipboardUploadShareURL;
cbClipboardUploadAutoIndexFolder.Checked = TaskSettings.UploadSettings.ClipboardUploadAutoIndexFolder;
@ -1159,8 +1160,6 @@ private void UpdateNameFormatPreviews()
lblNameFormatPatternPreviewActiveWindow.Text = Resources.TaskSettingsForm_txtNameFormatPatternActiveWindow_TextChanged_Preview_ + " " +
nameParser.Parse(TaskSettings.UploadSettings.NameFormatPatternActiveWindow);
lblAutoIncrementNumber.Text = Program.Settings.NameParserAutoIncrementNumber.ToString();
}
private void chkUseDefaultUploadSettings_CheckedChanged(object sender, EventArgs e)
@ -1169,6 +1168,39 @@ private void chkUseDefaultUploadSettings_CheckedChanged(object sender, EventArgs
UpdateDefaultSettingVisibility();
}
private void txtNameFormatPattern_TextChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.NameFormatPattern = txtNameFormatPattern.Text;
UpdateNameFormatPreviews();
}
private void txtNameFormatPatternActiveWindow_TextChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.NameFormatPatternActiveWindow = txtNameFormatPatternActiveWindow.Text;
UpdateNameFormatPreviews();
}
private void cbRegionCaptureUseWindowPattern_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.RegionCaptureUseWindowPattern = cbRegionCaptureUseWindowPattern.Checked;
}
private void cbFileUploadUseNamePattern_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.FileUploadUseNamePattern = cbFileUploadUseNamePattern.Checked;
}
private void cbFileUploadReplaceProblematicCharacters_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.FileUploadReplaceProblematicCharacters = cbFileUploadReplaceProblematicCharacters.Checked;
}
private void btnAutoIncrementNumber_Click(object sender, EventArgs e)
{
Program.Settings.NameParserAutoIncrementNumber = (int)nudAutoIncrementNumber.Value;
UpdateNameFormatPreviews();
}
private void cbNameFormatCustomTimeZone_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.UseCustomTimeZone = cbNameFormatCustomTimeZone.Checked;
@ -1188,42 +1220,9 @@ private void cbNameFormatTimeZone_SelectedIndexChanged(object sender, EventArgs
UpdateNameFormatPreviews();
}
private void txtNameFormatPattern_TextChanged(object sender, EventArgs e)
private void cbClipboardUploadContents_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.NameFormatPattern = txtNameFormatPattern.Text;
UpdateNameFormatPreviews();
}
private void txtNameFormatPatternActiveWindow_TextChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.NameFormatPatternActiveWindow = txtNameFormatPatternActiveWindow.Text;
UpdateNameFormatPreviews();
}
private void cbFileUploadReplaceProblematicCharacters_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.UploadSettings.FileUploadReplaceProblematicCharacters = cbFileUploadReplaceProblematicCharacters.Checked;
}
private void btnResetAutoIncrementNumber_Click(object sender, EventArgs e)
{
Program.Settings.NameParserAutoIncrementNumber = 0;
UpdateNameFormatPreviews();
}
private void cbFileUploadUseNamePattern_CheckedChanged(object sender, EventArgs e)
{
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;
TaskSettings.UploadSettings.ClipboardUploadURLContents = cbClipboardUploadURLContents.Checked;
}
private void cbClipboardUploadAutoDetectURL_CheckedChanged(object sender, EventArgs e)

File diff suppressed because it is too large Load diff