From 8a61e713b19bed8122cb071d6a60b4d36e01c7d8 Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 12 Mar 2021 21:45:19 +0300 Subject: [PATCH] Use check box for toast notification setting --- ShareX/Forms/TaskSettingsForm.Designer.cs | 565 ++- ShareX/Forms/TaskSettingsForm.cs | 12 +- ShareX/Forms/TaskSettingsForm.resx | 4758 ++++++++++++++++----- ShareX/TaskManager.cs | 66 +- ShareX/TaskSettings.cs | 8 +- ShareX/WorkerTask.cs | 2 +- 6 files changed, 3925 insertions(+), 1486 deletions(-) diff --git a/ShareX/Forms/TaskSettingsForm.Designer.cs b/ShareX/Forms/TaskSettingsForm.Designer.cs index dde01e872..b2b2c32ee 100644 --- a/ShareX/Forms/TaskSettingsForm.Designer.cs +++ b/ShareX/Forms/TaskSettingsForm.Designer.cs @@ -58,11 +58,40 @@ private void InitializeComponent() this.tsmiURLSharingServices = new System.Windows.Forms.ToolStripMenuItem(); this.btnTask = new ShareX.HelpersLib.MenuButton(); this.tpGeneral = new System.Windows.Forms.TabPage(); - this.lblAfterTaskNotification = new System.Windows.Forms.Label(); - this.cboPopUpNotification = new System.Windows.Forms.ComboBox(); - this.cbPlaySoundAfterUpload = new System.Windows.Forms.CheckBox(); - this.cbPlaySoundAfterCapture = new System.Windows.Forms.CheckBox(); + this.tcGeneral = new System.Windows.Forms.TabControl(); + this.tpGeneralMain = new System.Windows.Forms.TabPage(); this.chkOverrideGeneralSettings = new System.Windows.Forms.CheckBox(); + this.tpNotifications = new System.Windows.Forms.TabPage(); + this.btnCustomErrorSoundPath = new System.Windows.Forms.Button(); + this.btnCustomTaskCompletedSoundPath = new System.Windows.Forms.Button(); + this.btnCustomCaptureSoundPath = new System.Windows.Forms.Button(); + this.txtCustomErrorSoundPath = new System.Windows.Forms.TextBox(); + this.txtCustomTaskCompletedSoundPath = new System.Windows.Forms.TextBox(); + this.txtCustomCaptureSoundPath = new System.Windows.Forms.TextBox(); + this.cbUseCustomErrorSound = new System.Windows.Forms.CheckBox(); + this.cbUseCustomTaskCompletedSound = new System.Windows.Forms.CheckBox(); + this.cbUseCustomCaptureSound = new System.Windows.Forms.CheckBox(); + this.gbToastWindow = new System.Windows.Forms.GroupBox(); + this.lblToastWindowSizeX = new System.Windows.Forms.Label(); + this.cbToastWindowMiddleClickAction = new System.Windows.Forms.ComboBox(); + this.cbToastWindowRightClickAction = new System.Windows.Forms.ComboBox(); + this.cbToastWindowLeftClickAction = new System.Windows.Forms.ComboBox(); + this.nudToastWindowSizeHeight = new System.Windows.Forms.NumericUpDown(); + this.nudToastWindowSizeWidth = new System.Windows.Forms.NumericUpDown(); + this.cbToastWindowPlacement = new System.Windows.Forms.ComboBox(); + this.nudToastWindowFadeDuration = new System.Windows.Forms.NumericUpDown(); + this.nudToastWindowDuration = new System.Windows.Forms.NumericUpDown(); + this.lblToastWindowMiddleClickAction = new System.Windows.Forms.Label(); + this.lblToastWindowRightClickAction = new System.Windows.Forms.Label(); + this.lblToastWindowLeftClickAction = new System.Windows.Forms.Label(); + this.lblToastWindowSize = new System.Windows.Forms.Label(); + this.lblToastWindowPlacement = new System.Windows.Forms.Label(); + this.lblToastWindowFadeDuration = new System.Windows.Forms.Label(); + this.lblToastWindowDuration = new System.Windows.Forms.Label(); + this.cbDisableNotificationsOnFullscreen = new System.Windows.Forms.CheckBox(); + this.cbDisableNotifications = new System.Windows.Forms.CheckBox(); + this.cbPlaySoundAfterCapture = new System.Windows.Forms.CheckBox(); + this.cbPlaySoundAfterUpload = new System.Windows.Forms.CheckBox(); this.tpImage = new System.Windows.Forms.TabPage(); this.tcImage = new System.Windows.Forms.TabControl(); this.tpQuality = new System.Windows.Forms.TabPage(); @@ -260,41 +289,19 @@ private void InitializeComponent() this.pgTaskSettings = new System.Windows.Forms.PropertyGrid(); this.chkOverrideAdvancedSettings = new System.Windows.Forms.CheckBox(); this.tttvMain = new ShareX.HelpersLib.TabToTreeView(); - this.tcGeneral = new System.Windows.Forms.TabControl(); - this.tpGeneralMain = new System.Windows.Forms.TabPage(); - this.tpNotifications = new System.Windows.Forms.TabPage(); - this.cbDisableNotifications = new System.Windows.Forms.CheckBox(); - this.cbDisableNotificationsOnFullscreen = new System.Windows.Forms.CheckBox(); - this.gbToastWindow = new System.Windows.Forms.GroupBox(); - this.lblToastWindowDuration = new System.Windows.Forms.Label(); - this.lblToastWindowFadeDuration = new System.Windows.Forms.Label(); - this.lblToastWindowPlacement = new System.Windows.Forms.Label(); - this.lblToastWindowSize = new System.Windows.Forms.Label(); - this.lblToastWindowLeftClickAction = new System.Windows.Forms.Label(); - this.lblToastWindowRightClickAction = new System.Windows.Forms.Label(); - this.lblToastWindowMiddleClickAction = new System.Windows.Forms.Label(); - this.nudToastWindowDuration = new System.Windows.Forms.NumericUpDown(); - this.nudToastWindowFadeDuration = new System.Windows.Forms.NumericUpDown(); - this.cbToastWindowPlacement = new System.Windows.Forms.ComboBox(); - this.nudToastWindowSizeWidth = new System.Windows.Forms.NumericUpDown(); - this.nudToastWindowSizeHeight = new System.Windows.Forms.NumericUpDown(); - this.cbToastWindowLeftClickAction = new System.Windows.Forms.ComboBox(); - this.cbToastWindowRightClickAction = new System.Windows.Forms.ComboBox(); - this.cbToastWindowMiddleClickAction = new System.Windows.Forms.ComboBox(); - this.lblToastWindowSizeX = new System.Windows.Forms.Label(); - this.cbUseCustomCaptureSound = new System.Windows.Forms.CheckBox(); - this.cbUseCustomTaskCompletedSound = new System.Windows.Forms.CheckBox(); - this.cbUseCustomErrorSound = new System.Windows.Forms.CheckBox(); - this.txtCustomCaptureSoundPath = new System.Windows.Forms.TextBox(); - this.txtCustomTaskCompletedSoundPath = new System.Windows.Forms.TextBox(); - this.txtCustomErrorSoundPath = new System.Windows.Forms.TextBox(); - this.btnCustomCaptureSoundPath = new System.Windows.Forms.Button(); - this.btnCustomTaskCompletedSoundPath = new System.Windows.Forms.Button(); - this.btnCustomErrorSoundPath = new System.Windows.Forms.Button(); + this.cbShowToastNotificationAfterTaskCompleted = new System.Windows.Forms.CheckBox(); this.tcTaskSettings.SuspendLayout(); this.tpTask.SuspendLayout(); this.cmsDestinations.SuspendLayout(); this.tpGeneral.SuspendLayout(); + this.tcGeneral.SuspendLayout(); + this.tpGeneralMain.SuspendLayout(); + this.tpNotifications.SuspendLayout(); + this.gbToastWindow.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowSizeHeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowSizeWidth)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowFadeDuration)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowDuration)).BeginInit(); this.tpImage.SuspendLayout(); this.tcImage.SuspendLayout(); this.tpQuality.SuspendLayout(); @@ -343,14 +350,6 @@ private void InitializeComponent() this.tpTools.SuspendLayout(); this.pTools.SuspendLayout(); this.tpAdvanced.SuspendLayout(); - this.tcGeneral.SuspendLayout(); - this.tpGeneralMain.SuspendLayout(); - this.tpNotifications.SuspendLayout(); - this.gbToastWindow.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowDuration)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowFadeDuration)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowSizeWidth)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowSizeHeight)).BeginInit(); this.SuspendLayout(); // // cmsAfterCapture @@ -567,32 +566,20 @@ private void InitializeComponent() resources.ApplyResources(this.tpGeneral, "tpGeneral"); this.tpGeneral.Name = "tpGeneral"; // - // lblAfterTaskNotification + // tcGeneral // - resources.ApplyResources(this.lblAfterTaskNotification, "lblAfterTaskNotification"); - this.lblAfterTaskNotification.Name = "lblAfterTaskNotification"; + this.tcGeneral.Controls.Add(this.tpGeneralMain); + this.tcGeneral.Controls.Add(this.tpNotifications); + resources.ApplyResources(this.tcGeneral, "tcGeneral"); + this.tcGeneral.Name = "tcGeneral"; + this.tcGeneral.SelectedIndex = 0; // - // cboPopUpNotification + // tpGeneralMain // - this.cboPopUpNotification.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboPopUpNotification.FormattingEnabled = true; - resources.ApplyResources(this.cboPopUpNotification, "cboPopUpNotification"); - this.cboPopUpNotification.Name = "cboPopUpNotification"; - this.cboPopUpNotification.SelectedIndexChanged += new System.EventHandler(this.cboPopUpNotification_SelectedIndexChanged); - // - // cbPlaySoundAfterUpload - // - resources.ApplyResources(this.cbPlaySoundAfterUpload, "cbPlaySoundAfterUpload"); - this.cbPlaySoundAfterUpload.Name = "cbPlaySoundAfterUpload"; - this.cbPlaySoundAfterUpload.UseVisualStyleBackColor = true; - this.cbPlaySoundAfterUpload.CheckedChanged += new System.EventHandler(this.cbPlaySoundAfterUpload_CheckedChanged); - // - // cbPlaySoundAfterCapture - // - resources.ApplyResources(this.cbPlaySoundAfterCapture, "cbPlaySoundAfterCapture"); - this.cbPlaySoundAfterCapture.Name = "cbPlaySoundAfterCapture"; - this.cbPlaySoundAfterCapture.UseVisualStyleBackColor = true; - this.cbPlaySoundAfterCapture.CheckedChanged += new System.EventHandler(this.cbPlaySoundAfterCapture_CheckedChanged); + this.tpGeneralMain.Controls.Add(this.chkOverrideGeneralSettings); + resources.ApplyResources(this.tpGeneralMain, "tpGeneralMain"); + this.tpGeneralMain.Name = "tpGeneralMain"; + this.tpGeneralMain.UseVisualStyleBackColor = true; // // chkOverrideGeneralSettings // @@ -603,6 +590,214 @@ private void InitializeComponent() this.chkOverrideGeneralSettings.UseVisualStyleBackColor = true; this.chkOverrideGeneralSettings.CheckedChanged += new System.EventHandler(this.chkUseDefaultGeneralSettings_CheckedChanged); // + // tpNotifications + // + this.tpNotifications.Controls.Add(this.cbShowToastNotificationAfterTaskCompleted); + this.tpNotifications.Controls.Add(this.btnCustomErrorSoundPath); + this.tpNotifications.Controls.Add(this.btnCustomTaskCompletedSoundPath); + this.tpNotifications.Controls.Add(this.btnCustomCaptureSoundPath); + this.tpNotifications.Controls.Add(this.txtCustomErrorSoundPath); + this.tpNotifications.Controls.Add(this.txtCustomTaskCompletedSoundPath); + this.tpNotifications.Controls.Add(this.txtCustomCaptureSoundPath); + this.tpNotifications.Controls.Add(this.cbUseCustomErrorSound); + this.tpNotifications.Controls.Add(this.cbUseCustomTaskCompletedSound); + this.tpNotifications.Controls.Add(this.cbUseCustomCaptureSound); + this.tpNotifications.Controls.Add(this.gbToastWindow); + this.tpNotifications.Controls.Add(this.cbDisableNotificationsOnFullscreen); + this.tpNotifications.Controls.Add(this.cbDisableNotifications); + this.tpNotifications.Controls.Add(this.cbPlaySoundAfterCapture); + this.tpNotifications.Controls.Add(this.cbPlaySoundAfterUpload); + resources.ApplyResources(this.tpNotifications, "tpNotifications"); + this.tpNotifications.Name = "tpNotifications"; + this.tpNotifications.UseVisualStyleBackColor = true; + // + // btnCustomErrorSoundPath + // + resources.ApplyResources(this.btnCustomErrorSoundPath, "btnCustomErrorSoundPath"); + this.btnCustomErrorSoundPath.Name = "btnCustomErrorSoundPath"; + this.btnCustomErrorSoundPath.UseVisualStyleBackColor = true; + // + // btnCustomTaskCompletedSoundPath + // + resources.ApplyResources(this.btnCustomTaskCompletedSoundPath, "btnCustomTaskCompletedSoundPath"); + this.btnCustomTaskCompletedSoundPath.Name = "btnCustomTaskCompletedSoundPath"; + this.btnCustomTaskCompletedSoundPath.UseVisualStyleBackColor = true; + // + // btnCustomCaptureSoundPath + // + resources.ApplyResources(this.btnCustomCaptureSoundPath, "btnCustomCaptureSoundPath"); + this.btnCustomCaptureSoundPath.Name = "btnCustomCaptureSoundPath"; + this.btnCustomCaptureSoundPath.UseVisualStyleBackColor = true; + // + // txtCustomErrorSoundPath + // + resources.ApplyResources(this.txtCustomErrorSoundPath, "txtCustomErrorSoundPath"); + this.txtCustomErrorSoundPath.Name = "txtCustomErrorSoundPath"; + // + // txtCustomTaskCompletedSoundPath + // + resources.ApplyResources(this.txtCustomTaskCompletedSoundPath, "txtCustomTaskCompletedSoundPath"); + this.txtCustomTaskCompletedSoundPath.Name = "txtCustomTaskCompletedSoundPath"; + // + // txtCustomCaptureSoundPath + // + resources.ApplyResources(this.txtCustomCaptureSoundPath, "txtCustomCaptureSoundPath"); + this.txtCustomCaptureSoundPath.Name = "txtCustomCaptureSoundPath"; + // + // cbUseCustomErrorSound + // + resources.ApplyResources(this.cbUseCustomErrorSound, "cbUseCustomErrorSound"); + this.cbUseCustomErrorSound.Name = "cbUseCustomErrorSound"; + this.cbUseCustomErrorSound.UseVisualStyleBackColor = true; + // + // cbUseCustomTaskCompletedSound + // + resources.ApplyResources(this.cbUseCustomTaskCompletedSound, "cbUseCustomTaskCompletedSound"); + this.cbUseCustomTaskCompletedSound.Name = "cbUseCustomTaskCompletedSound"; + this.cbUseCustomTaskCompletedSound.UseVisualStyleBackColor = true; + // + // cbUseCustomCaptureSound + // + resources.ApplyResources(this.cbUseCustomCaptureSound, "cbUseCustomCaptureSound"); + this.cbUseCustomCaptureSound.Name = "cbUseCustomCaptureSound"; + this.cbUseCustomCaptureSound.UseVisualStyleBackColor = true; + // + // gbToastWindow + // + this.gbToastWindow.Controls.Add(this.lblToastWindowSizeX); + this.gbToastWindow.Controls.Add(this.cbToastWindowMiddleClickAction); + this.gbToastWindow.Controls.Add(this.cbToastWindowRightClickAction); + this.gbToastWindow.Controls.Add(this.cbToastWindowLeftClickAction); + this.gbToastWindow.Controls.Add(this.nudToastWindowSizeHeight); + this.gbToastWindow.Controls.Add(this.nudToastWindowSizeWidth); + this.gbToastWindow.Controls.Add(this.cbToastWindowPlacement); + this.gbToastWindow.Controls.Add(this.nudToastWindowFadeDuration); + this.gbToastWindow.Controls.Add(this.nudToastWindowDuration); + this.gbToastWindow.Controls.Add(this.lblToastWindowMiddleClickAction); + this.gbToastWindow.Controls.Add(this.lblToastWindowRightClickAction); + this.gbToastWindow.Controls.Add(this.lblToastWindowLeftClickAction); + this.gbToastWindow.Controls.Add(this.lblToastWindowSize); + this.gbToastWindow.Controls.Add(this.lblToastWindowPlacement); + this.gbToastWindow.Controls.Add(this.lblToastWindowFadeDuration); + this.gbToastWindow.Controls.Add(this.lblToastWindowDuration); + resources.ApplyResources(this.gbToastWindow, "gbToastWindow"); + this.gbToastWindow.Name = "gbToastWindow"; + this.gbToastWindow.TabStop = false; + // + // lblToastWindowSizeX + // + resources.ApplyResources(this.lblToastWindowSizeX, "lblToastWindowSizeX"); + this.lblToastWindowSizeX.Name = "lblToastWindowSizeX"; + // + // cbToastWindowMiddleClickAction + // + this.cbToastWindowMiddleClickAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbToastWindowMiddleClickAction.FormattingEnabled = true; + resources.ApplyResources(this.cbToastWindowMiddleClickAction, "cbToastWindowMiddleClickAction"); + this.cbToastWindowMiddleClickAction.Name = "cbToastWindowMiddleClickAction"; + // + // cbToastWindowRightClickAction + // + this.cbToastWindowRightClickAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbToastWindowRightClickAction.FormattingEnabled = true; + resources.ApplyResources(this.cbToastWindowRightClickAction, "cbToastWindowRightClickAction"); + this.cbToastWindowRightClickAction.Name = "cbToastWindowRightClickAction"; + // + // cbToastWindowLeftClickAction + // + this.cbToastWindowLeftClickAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbToastWindowLeftClickAction.FormattingEnabled = true; + resources.ApplyResources(this.cbToastWindowLeftClickAction, "cbToastWindowLeftClickAction"); + this.cbToastWindowLeftClickAction.Name = "cbToastWindowLeftClickAction"; + // + // nudToastWindowSizeHeight + // + resources.ApplyResources(this.nudToastWindowSizeHeight, "nudToastWindowSizeHeight"); + this.nudToastWindowSizeHeight.Name = "nudToastWindowSizeHeight"; + // + // nudToastWindowSizeWidth + // + resources.ApplyResources(this.nudToastWindowSizeWidth, "nudToastWindowSizeWidth"); + this.nudToastWindowSizeWidth.Name = "nudToastWindowSizeWidth"; + // + // cbToastWindowPlacement + // + this.cbToastWindowPlacement.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbToastWindowPlacement.FormattingEnabled = true; + resources.ApplyResources(this.cbToastWindowPlacement, "cbToastWindowPlacement"); + this.cbToastWindowPlacement.Name = "cbToastWindowPlacement"; + // + // nudToastWindowFadeDuration + // + resources.ApplyResources(this.nudToastWindowFadeDuration, "nudToastWindowFadeDuration"); + this.nudToastWindowFadeDuration.Name = "nudToastWindowFadeDuration"; + // + // nudToastWindowDuration + // + resources.ApplyResources(this.nudToastWindowDuration, "nudToastWindowDuration"); + this.nudToastWindowDuration.Name = "nudToastWindowDuration"; + // + // lblToastWindowMiddleClickAction + // + resources.ApplyResources(this.lblToastWindowMiddleClickAction, "lblToastWindowMiddleClickAction"); + this.lblToastWindowMiddleClickAction.Name = "lblToastWindowMiddleClickAction"; + // + // lblToastWindowRightClickAction + // + resources.ApplyResources(this.lblToastWindowRightClickAction, "lblToastWindowRightClickAction"); + this.lblToastWindowRightClickAction.Name = "lblToastWindowRightClickAction"; + // + // lblToastWindowLeftClickAction + // + resources.ApplyResources(this.lblToastWindowLeftClickAction, "lblToastWindowLeftClickAction"); + this.lblToastWindowLeftClickAction.Name = "lblToastWindowLeftClickAction"; + // + // lblToastWindowSize + // + resources.ApplyResources(this.lblToastWindowSize, "lblToastWindowSize"); + this.lblToastWindowSize.Name = "lblToastWindowSize"; + // + // lblToastWindowPlacement + // + resources.ApplyResources(this.lblToastWindowPlacement, "lblToastWindowPlacement"); + this.lblToastWindowPlacement.Name = "lblToastWindowPlacement"; + // + // lblToastWindowFadeDuration + // + resources.ApplyResources(this.lblToastWindowFadeDuration, "lblToastWindowFadeDuration"); + this.lblToastWindowFadeDuration.Name = "lblToastWindowFadeDuration"; + // + // lblToastWindowDuration + // + resources.ApplyResources(this.lblToastWindowDuration, "lblToastWindowDuration"); + this.lblToastWindowDuration.Name = "lblToastWindowDuration"; + // + // cbDisableNotificationsOnFullscreen + // + resources.ApplyResources(this.cbDisableNotificationsOnFullscreen, "cbDisableNotificationsOnFullscreen"); + this.cbDisableNotificationsOnFullscreen.Name = "cbDisableNotificationsOnFullscreen"; + this.cbDisableNotificationsOnFullscreen.UseVisualStyleBackColor = true; + // + // cbDisableNotifications + // + resources.ApplyResources(this.cbDisableNotifications, "cbDisableNotifications"); + this.cbDisableNotifications.Name = "cbDisableNotifications"; + this.cbDisableNotifications.UseVisualStyleBackColor = true; + // + // cbPlaySoundAfterCapture + // + resources.ApplyResources(this.cbPlaySoundAfterCapture, "cbPlaySoundAfterCapture"); + this.cbPlaySoundAfterCapture.Name = "cbPlaySoundAfterCapture"; + this.cbPlaySoundAfterCapture.UseVisualStyleBackColor = true; + this.cbPlaySoundAfterCapture.CheckedChanged += new System.EventHandler(this.cbPlaySoundAfterCapture_CheckedChanged); + // + // cbPlaySoundAfterUpload + // + resources.ApplyResources(this.cbPlaySoundAfterUpload, "cbPlaySoundAfterUpload"); + this.cbPlaySoundAfterUpload.Name = "cbPlaySoundAfterUpload"; + this.cbPlaySoundAfterUpload.UseVisualStyleBackColor = true; + this.cbPlaySoundAfterUpload.CheckedChanged += new System.EventHandler(this.cbPlaySoundAfterUpload_CheckedChanged); + // // tpImage // this.tpImage.BackColor = System.Drawing.SystemColors.Window; @@ -2253,215 +2448,12 @@ private void InitializeComponent() this.tttvMain.TreeViewSize = 190; this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged); // - // tcGeneral + // cbShowToastNotificationAfterTaskCompleted // - this.tcGeneral.Controls.Add(this.tpGeneralMain); - this.tcGeneral.Controls.Add(this.tpNotifications); - resources.ApplyResources(this.tcGeneral, "tcGeneral"); - this.tcGeneral.Name = "tcGeneral"; - this.tcGeneral.SelectedIndex = 0; - // - // tpGeneralMain - // - this.tpGeneralMain.Controls.Add(this.chkOverrideGeneralSettings); - resources.ApplyResources(this.tpGeneralMain, "tpGeneralMain"); - this.tpGeneralMain.Name = "tpGeneralMain"; - this.tpGeneralMain.UseVisualStyleBackColor = true; - // - // tpNotifications - // - this.tpNotifications.Controls.Add(this.btnCustomErrorSoundPath); - this.tpNotifications.Controls.Add(this.btnCustomTaskCompletedSoundPath); - this.tpNotifications.Controls.Add(this.btnCustomCaptureSoundPath); - this.tpNotifications.Controls.Add(this.txtCustomErrorSoundPath); - this.tpNotifications.Controls.Add(this.txtCustomTaskCompletedSoundPath); - this.tpNotifications.Controls.Add(this.txtCustomCaptureSoundPath); - this.tpNotifications.Controls.Add(this.cbUseCustomErrorSound); - this.tpNotifications.Controls.Add(this.cbUseCustomTaskCompletedSound); - this.tpNotifications.Controls.Add(this.cbUseCustomCaptureSound); - this.tpNotifications.Controls.Add(this.gbToastWindow); - this.tpNotifications.Controls.Add(this.cbDisableNotificationsOnFullscreen); - this.tpNotifications.Controls.Add(this.cbDisableNotifications); - this.tpNotifications.Controls.Add(this.cbPlaySoundAfterCapture); - this.tpNotifications.Controls.Add(this.lblAfterTaskNotification); - this.tpNotifications.Controls.Add(this.cbPlaySoundAfterUpload); - this.tpNotifications.Controls.Add(this.cboPopUpNotification); - resources.ApplyResources(this.tpNotifications, "tpNotifications"); - this.tpNotifications.Name = "tpNotifications"; - this.tpNotifications.UseVisualStyleBackColor = true; - // - // cbDisableNotifications - // - resources.ApplyResources(this.cbDisableNotifications, "cbDisableNotifications"); - this.cbDisableNotifications.Name = "cbDisableNotifications"; - this.cbDisableNotifications.UseVisualStyleBackColor = true; - // - // cbDisableNotificationsOnFullscreen - // - resources.ApplyResources(this.cbDisableNotificationsOnFullscreen, "cbDisableNotificationsOnFullscreen"); - this.cbDisableNotificationsOnFullscreen.Name = "cbDisableNotificationsOnFullscreen"; - this.cbDisableNotificationsOnFullscreen.UseVisualStyleBackColor = true; - // - // gbToastWindow - // - this.gbToastWindow.Controls.Add(this.lblToastWindowSizeX); - this.gbToastWindow.Controls.Add(this.cbToastWindowMiddleClickAction); - this.gbToastWindow.Controls.Add(this.cbToastWindowRightClickAction); - this.gbToastWindow.Controls.Add(this.cbToastWindowLeftClickAction); - this.gbToastWindow.Controls.Add(this.nudToastWindowSizeHeight); - this.gbToastWindow.Controls.Add(this.nudToastWindowSizeWidth); - this.gbToastWindow.Controls.Add(this.cbToastWindowPlacement); - this.gbToastWindow.Controls.Add(this.nudToastWindowFadeDuration); - this.gbToastWindow.Controls.Add(this.nudToastWindowDuration); - this.gbToastWindow.Controls.Add(this.lblToastWindowMiddleClickAction); - this.gbToastWindow.Controls.Add(this.lblToastWindowRightClickAction); - this.gbToastWindow.Controls.Add(this.lblToastWindowLeftClickAction); - this.gbToastWindow.Controls.Add(this.lblToastWindowSize); - this.gbToastWindow.Controls.Add(this.lblToastWindowPlacement); - this.gbToastWindow.Controls.Add(this.lblToastWindowFadeDuration); - this.gbToastWindow.Controls.Add(this.lblToastWindowDuration); - resources.ApplyResources(this.gbToastWindow, "gbToastWindow"); - this.gbToastWindow.Name = "gbToastWindow"; - this.gbToastWindow.TabStop = false; - // - // lblToastWindowDuration - // - resources.ApplyResources(this.lblToastWindowDuration, "lblToastWindowDuration"); - this.lblToastWindowDuration.Name = "lblToastWindowDuration"; - // - // lblToastWindowFadeDuration - // - resources.ApplyResources(this.lblToastWindowFadeDuration, "lblToastWindowFadeDuration"); - this.lblToastWindowFadeDuration.Name = "lblToastWindowFadeDuration"; - // - // lblToastWindowPlacement - // - resources.ApplyResources(this.lblToastWindowPlacement, "lblToastWindowPlacement"); - this.lblToastWindowPlacement.Name = "lblToastWindowPlacement"; - // - // lblToastWindowSize - // - resources.ApplyResources(this.lblToastWindowSize, "lblToastWindowSize"); - this.lblToastWindowSize.Name = "lblToastWindowSize"; - // - // lblToastWindowLeftClickAction - // - resources.ApplyResources(this.lblToastWindowLeftClickAction, "lblToastWindowLeftClickAction"); - this.lblToastWindowLeftClickAction.Name = "lblToastWindowLeftClickAction"; - // - // lblToastWindowRightClickAction - // - resources.ApplyResources(this.lblToastWindowRightClickAction, "lblToastWindowRightClickAction"); - this.lblToastWindowRightClickAction.Name = "lblToastWindowRightClickAction"; - // - // lblToastWindowMiddleClickAction - // - resources.ApplyResources(this.lblToastWindowMiddleClickAction, "lblToastWindowMiddleClickAction"); - this.lblToastWindowMiddleClickAction.Name = "lblToastWindowMiddleClickAction"; - // - // nudToastWindowDuration - // - resources.ApplyResources(this.nudToastWindowDuration, "nudToastWindowDuration"); - this.nudToastWindowDuration.Name = "nudToastWindowDuration"; - // - // nudToastWindowFadeDuration - // - resources.ApplyResources(this.nudToastWindowFadeDuration, "nudToastWindowFadeDuration"); - this.nudToastWindowFadeDuration.Name = "nudToastWindowFadeDuration"; - // - // cbToastWindowPlacement - // - this.cbToastWindowPlacement.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbToastWindowPlacement.FormattingEnabled = true; - resources.ApplyResources(this.cbToastWindowPlacement, "cbToastWindowPlacement"); - this.cbToastWindowPlacement.Name = "cbToastWindowPlacement"; - // - // nudToastWindowSizeWidth - // - resources.ApplyResources(this.nudToastWindowSizeWidth, "nudToastWindowSizeWidth"); - this.nudToastWindowSizeWidth.Name = "nudToastWindowSizeWidth"; - // - // nudToastWindowSizeHeight - // - resources.ApplyResources(this.nudToastWindowSizeHeight, "nudToastWindowSizeHeight"); - this.nudToastWindowSizeHeight.Name = "nudToastWindowSizeHeight"; - // - // cbToastWindowLeftClickAction - // - this.cbToastWindowLeftClickAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbToastWindowLeftClickAction.FormattingEnabled = true; - resources.ApplyResources(this.cbToastWindowLeftClickAction, "cbToastWindowLeftClickAction"); - this.cbToastWindowLeftClickAction.Name = "cbToastWindowLeftClickAction"; - // - // cbToastWindowRightClickAction - // - this.cbToastWindowRightClickAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbToastWindowRightClickAction.FormattingEnabled = true; - resources.ApplyResources(this.cbToastWindowRightClickAction, "cbToastWindowRightClickAction"); - this.cbToastWindowRightClickAction.Name = "cbToastWindowRightClickAction"; - // - // cbToastWindowMiddleClickAction - // - this.cbToastWindowMiddleClickAction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbToastWindowMiddleClickAction.FormattingEnabled = true; - resources.ApplyResources(this.cbToastWindowMiddleClickAction, "cbToastWindowMiddleClickAction"); - this.cbToastWindowMiddleClickAction.Name = "cbToastWindowMiddleClickAction"; - // - // lblToastWindowSizeX - // - resources.ApplyResources(this.lblToastWindowSizeX, "lblToastWindowSizeX"); - this.lblToastWindowSizeX.Name = "lblToastWindowSizeX"; - // - // cbUseCustomCaptureSound - // - resources.ApplyResources(this.cbUseCustomCaptureSound, "cbUseCustomCaptureSound"); - this.cbUseCustomCaptureSound.Name = "cbUseCustomCaptureSound"; - this.cbUseCustomCaptureSound.UseVisualStyleBackColor = true; - // - // cbUseCustomTaskCompletedSound - // - resources.ApplyResources(this.cbUseCustomTaskCompletedSound, "cbUseCustomTaskCompletedSound"); - this.cbUseCustomTaskCompletedSound.Name = "cbUseCustomTaskCompletedSound"; - this.cbUseCustomTaskCompletedSound.UseVisualStyleBackColor = true; - // - // cbUseCustomErrorSound - // - resources.ApplyResources(this.cbUseCustomErrorSound, "cbUseCustomErrorSound"); - this.cbUseCustomErrorSound.Name = "cbUseCustomErrorSound"; - this.cbUseCustomErrorSound.UseVisualStyleBackColor = true; - // - // txtCustomCaptureSoundPath - // - resources.ApplyResources(this.txtCustomCaptureSoundPath, "txtCustomCaptureSoundPath"); - this.txtCustomCaptureSoundPath.Name = "txtCustomCaptureSoundPath"; - // - // txtCustomTaskCompletedSoundPath - // - resources.ApplyResources(this.txtCustomTaskCompletedSoundPath, "txtCustomTaskCompletedSoundPath"); - this.txtCustomTaskCompletedSoundPath.Name = "txtCustomTaskCompletedSoundPath"; - // - // txtCustomErrorSoundPath - // - resources.ApplyResources(this.txtCustomErrorSoundPath, "txtCustomErrorSoundPath"); - this.txtCustomErrorSoundPath.Name = "txtCustomErrorSoundPath"; - // - // btnCustomCaptureSoundPath - // - resources.ApplyResources(this.btnCustomCaptureSoundPath, "btnCustomCaptureSoundPath"); - this.btnCustomCaptureSoundPath.Name = "btnCustomCaptureSoundPath"; - this.btnCustomCaptureSoundPath.UseVisualStyleBackColor = true; - // - // btnCustomTaskCompletedSoundPath - // - resources.ApplyResources(this.btnCustomTaskCompletedSoundPath, "btnCustomTaskCompletedSoundPath"); - this.btnCustomTaskCompletedSoundPath.Name = "btnCustomTaskCompletedSoundPath"; - this.btnCustomTaskCompletedSoundPath.UseVisualStyleBackColor = true; - // - // btnCustomErrorSoundPath - // - resources.ApplyResources(this.btnCustomErrorSoundPath, "btnCustomErrorSoundPath"); - this.btnCustomErrorSoundPath.Name = "btnCustomErrorSoundPath"; - this.btnCustomErrorSoundPath.UseVisualStyleBackColor = true; + resources.ApplyResources(this.cbShowToastNotificationAfterTaskCompleted, "cbShowToastNotificationAfterTaskCompleted"); + this.cbShowToastNotificationAfterTaskCompleted.Name = "cbShowToastNotificationAfterTaskCompleted"; + this.cbShowToastNotificationAfterTaskCompleted.UseVisualStyleBackColor = true; + this.cbShowToastNotificationAfterTaskCompleted.CheckedChanged += new System.EventHandler(this.cbShowToastNotificationAfterTaskCompleted_CheckedChanged); // // TaskSettingsForm // @@ -2478,6 +2470,17 @@ private void InitializeComponent() this.tpTask.PerformLayout(); this.cmsDestinations.ResumeLayout(false); this.tpGeneral.ResumeLayout(false); + this.tcGeneral.ResumeLayout(false); + this.tpGeneralMain.ResumeLayout(false); + this.tpGeneralMain.PerformLayout(); + this.tpNotifications.ResumeLayout(false); + this.tpNotifications.PerformLayout(); + this.gbToastWindow.ResumeLayout(false); + this.gbToastWindow.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowSizeHeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowSizeWidth)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowFadeDuration)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowDuration)).EndInit(); this.tpImage.ResumeLayout(false); this.tcImage.ResumeLayout(false); this.tpQuality.ResumeLayout(false); @@ -2547,17 +2550,6 @@ private void InitializeComponent() this.pTools.PerformLayout(); this.tpAdvanced.ResumeLayout(false); this.tpAdvanced.PerformLayout(); - this.tcGeneral.ResumeLayout(false); - this.tpGeneralMain.ResumeLayout(false); - this.tpGeneralMain.PerformLayout(); - this.tpNotifications.ResumeLayout(false); - this.tpNotifications.PerformLayout(); - this.gbToastWindow.ResumeLayout(false); - this.gbToastWindow.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowDuration)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowFadeDuration)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowSizeWidth)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudToastWindowSizeHeight)).EndInit(); this.ResumeLayout(false); } @@ -2655,8 +2647,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox chkShowImageEffectsWindowAfterCapture; private System.Windows.Forms.CheckBox chkOverrideFTP; private System.Windows.Forms.ComboBox cboFTPaccounts; - private System.Windows.Forms.ComboBox cboPopUpNotification; - private System.Windows.Forms.Label lblAfterTaskNotification; private System.Windows.Forms.ContextMenuStrip cmsDestinations; private System.Windows.Forms.ToolStripMenuItem tsmiImageUploaders; private System.Windows.Forms.ToolStripMenuItem tsmiTextUploaders; @@ -2825,5 +2815,6 @@ private void InitializeComponent() private System.Windows.Forms.Button btnCustomErrorSoundPath; private System.Windows.Forms.Button btnCustomTaskCompletedSoundPath; private System.Windows.Forms.Button btnCustomCaptureSoundPath; + private System.Windows.Forms.CheckBox cbShowToastNotificationAfterTaskCompleted; } } \ No newline at end of file diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs index 25a68c617..464e3aebe 100644 --- a/ShareX/Forms/TaskSettingsForm.cs +++ b/ShareX/Forms/TaskSettingsForm.cs @@ -188,11 +188,13 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false) #region General + #region Notifications + cbPlaySoundAfterCapture.Checked = TaskSettings.GeneralSettings.PlaySoundAfterCapture; cbPlaySoundAfterUpload.Checked = TaskSettings.GeneralSettings.PlaySoundAfterUpload; - cboPopUpNotification.Items.Clear(); - cboPopUpNotification.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); - cboPopUpNotification.SelectedIndex = (int)TaskSettings.GeneralSettings.PopUpNotification; + cbShowToastNotificationAfterTaskCompleted.Checked = TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted; + + #endregion #endregion General @@ -760,9 +762,9 @@ private void cbPlaySoundAfterUpload_CheckedChanged(object sender, EventArgs e) TaskSettings.GeneralSettings.PlaySoundAfterUpload = cbPlaySoundAfterUpload.Checked; } - private void cboPopUpNotification_SelectedIndexChanged(object sender, EventArgs e) + private void cbShowToastNotificationAfterTaskCompleted_CheckedChanged(object sender, EventArgs e) { - TaskSettings.GeneralSettings.PopUpNotification = (PopUpNotificationType)cboPopUpNotification.SelectedIndex; + TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted = cbShowToastNotificationAfterTaskCompleted.Checked; } #endregion General diff --git a/ShareX/Forms/TaskSettingsForm.resx b/ShareX/Forms/TaskSettingsForm.resx index e0fb28c82..a1445630f 100644 --- a/ShareX/Forms/TaskSettingsForm.resx +++ b/ShareX/Forms/TaskSettingsForm.resx @@ -297,6 +297,1233 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + btnScreenshotsFolderBrowse + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 0 + + + txtScreenshotsFolder + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 1 + + + cbOverrideScreenshotsFolder + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 2 + + + cbOverrideCustomUploader + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 3 + + + chkOverrideCustomUploader + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 4 + + + chkOverrideFTP + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 5 + + + cboFTPaccounts + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTask + + + 6 + + + btnAfterCapture + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 8 + + + btnAfterUpload + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 9 + + + btnDestinations + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 10 + + + btnTask + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null + + + tpTask + + + 12 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 485 + + + 0 + + + Task + + + tpTask + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 0 + + + chkOverrideGeneralSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGeneralMain + + + 0 + + + 4, 22 + + + 557, 453 + + + 0 + + + tpGeneralMain + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcGeneral + + + 0 + + + True + + + 8, 56 + + + 242, 17 + + + 17 + + + Show toast notification after task is completed + + + cbShowToastNotificationAfterTaskCompleted + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 0 + + + NoControl + + + 536, 341 + + + 26, 23 + + + 16 + + + ... + + + btnCustomErrorSoundPath + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 1 + + + NoControl + + + 536, 317 + + + 26, 23 + + + 15 + + + ... + + + btnCustomTaskCompletedSoundPath + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 2 + + + 536, 293 + + + 26, 23 + + + 14 + + + ... + + + btnCustomCaptureSoundPath + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 3 + + + 248, 342 + + + 280, 20 + + + 13 + + + txtCustomErrorSoundPath + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 4 + + + 248, 318 + + + 280, 20 + + + 12 + + + txtCustomTaskCompletedSoundPath + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 5 + + + 248, 294 + + + 280, 20 + + + 11 + + + txtCustomCaptureSoundPath + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 6 + + + True + + + 8, 344 + + + 141, 17 + + + 10 + + + Use custom error sound: + + + cbUseCustomErrorSound + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 7 + + + True + + + 8, 320 + + + 192, 17 + + + 9 + + + Use custom task completed sound: + + + cbUseCustomTaskCompletedSound + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 8 + + + True + + + 8, 296 + + + 156, 17 + + + 8 + + + Use custom capture sound: + + + cbUseCustomCaptureSound + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 9 + + + lblToastWindowSizeX + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 0 + + + cbToastWindowMiddleClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 1 + + + cbToastWindowRightClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 2 + + + cbToastWindowLeftClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 3 + + + nudToastWindowSizeHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 4 + + + nudToastWindowSizeWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 5 + + + cbToastWindowPlacement + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 6 + + + nudToastWindowFadeDuration + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 7 + + + nudToastWindowDuration + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 8 + + + lblToastWindowMiddleClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 9 + + + lblToastWindowRightClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 10 + + + lblToastWindowLeftClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 11 + + + lblToastWindowSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 12 + + + lblToastWindowPlacement + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 13 + + + lblToastWindowFadeDuration + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 14 + + + lblToastWindowDuration + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + gbToastWindow + + + 15 + + + 8, 80 + + + 552, 200 + + + 7 + + + Toast notification + + + gbToastWindow + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 10 + + + True + + + 8, 392 + + + 183, 17 + + + 6 + + + Disable notifications on fullscreen + + + cbDisableNotificationsOnFullscreen + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 11 + + + True + + + 8, 368 + + + 120, 17 + + + 5 + + + Disable notifications + + + cbDisableNotifications + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 12 + + + True + + + NoControl + + + 8, 8 + + + 180, 17 + + + 0 + + + Play sound after capture is made + + + cbPlaySoundAfterCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 13 + + + True + + + NoControl + + + 8, 32 + + + 187, 17 + + + 1 + + + Play sound after task is completed + + + cbPlaySoundAfterUpload + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpNotifications + + + 14 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 453 + + + 1 + + + Notifications + + + tpNotifications + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcGeneral + + + 1 + + + Fill + + + 3, 3 + + + 565, 479 + + + 5 + + + tcGeneral + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpGeneral + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 485 + + + 7 + + + General + + + tpGeneral + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 1 + + + tcImage + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpImage + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 485 + + + 1 + + + Image + + + tpImage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 2 + + + tcCapture + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 485 + + + 2 + + + Capture + + + tpCapture + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 3 + + + tcUpload + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUpload + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 485 + + + 4 + + + Upload + + + tpUpload + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 4 + + + pActions + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpActions + + + 0 + + + chkOverrideActions + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpActions + + + 1 + + + 4, 22 + + + 571, 485 + + + 3 + + + Actions + + + tpActions + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 5 + + + btnWatchFolderEdit + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 0 + + + cbWatchFolderEnabled + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 1 + + + lvWatchFolderList + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null + + + tpWatchFolders + + + 2 + + + btnWatchFolderRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 3 + + + btnWatchFolderAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpWatchFolders + + + 4 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 485 + + + 5 + + + Watch folders + + + tpWatchFolders + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 6 + + + pTools + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTools + + + 0 + + + chkOverrideToolsSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTools + + + 1 + + + 4, 22 + + + 571, 485 + + + 8 + + + Tools + + + tpTools + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 7 + + + pgTaskSettings + + + System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpAdvanced + + + 0 + + + chkOverrideAdvancedSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpAdvanced + + + 1 + + + 4, 22 + + + 3, 3, 3, 3 + + + 571, 485 + + + 6 + + + Advanced + + + tpAdvanced + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcTaskSettings + + + 8 + + + Right + + + 205, 0 + + + 579, 511 + + + 1 + + + False + + + tcTaskSettings + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + NoControl @@ -546,36 +1773,6 @@ 396, 17 - - 181, 22 - - - Image uploaders - - - 181, 22 - - - Text uploaders - - - 181, 22 - - - File uploaders - - - 181, 22 - - - URL shorteners - - - 181, 22 - - - URL sharing services - 182, 114 @@ -609,6 +1806,36 @@ 10 + + 181, 22 + + + Image uploaders + + + 181, 22 + + + Text uploaders + + + 181, 22 + + + File uploaders + + + 181, 22 + + + URL shorteners + + + 181, 22 + + + URL sharing services + NoControl @@ -639,33 +1866,6 @@ 12 - - 4, 22 - - - 3, 3, 3, 3 - - - 571, 485 - - - 0 - - - Task - - - tpTask - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 0 - True @@ -702,254 +1902,11 @@ 0 - - 4, 22 - - - 557, 453 - - - 0 - - - tpGeneralMain - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcGeneral - - - 0 - - - NoControl - - - 536, 381 - - - 26, 23 - - - 16 - - - ... - - - btnCustomErrorSoundPath - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 0 - - - NoControl - - - 536, 357 - - - 26, 23 - - - 15 - - - ... - - - btnCustomTaskCompletedSoundPath - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 1 - - - 536, 333 - - - 26, 23 - - - 14 - - - ... - - - btnCustomCaptureSoundPath - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 2 - - - 248, 382 - - - 280, 20 - - - 13 - - - txtCustomErrorSoundPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 3 - - - 248, 358 - - - 280, 20 - - - 12 - - - txtCustomTaskCompletedSoundPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 4 - - - 248, 334 - - - 280, 20 - - - 11 - - - txtCustomCaptureSoundPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 5 - - - True - - - 8, 384 - - - 141, 17 - - - 10 - - - Use custom error sound: - - - cbUseCustomErrorSound - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 6 - - - True - - - 8, 360 - - - 192, 17 - - - 9 - - - Use custom task completed sound: - - - cbUseCustomTaskCompletedSound - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 7 - - - True - - - 8, 336 - - - 156, 17 - - - 8 - - - Use custom capture sound: - - - cbUseCustomCaptureSound - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 8 - True - 264, 95 + 263, 95 12, 13 @@ -1359,273 +2316,303 @@ 15 - - 8, 80 + + tpQuality - - 552, 200 - - - 7 - - - Toast window - - - gbToastWindow - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 9 - - - True - - - 8, 312 - - - 183, 17 - - - 6 - - - Disable notifications on fullscreen - - - cbDisableNotificationsOnFullscreen - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 10 - - - True - - - 8, 288 - - - 120, 17 - - - 5 - - - Disable notifications - - - cbDisableNotifications - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 11 - - - True - - - NoControl - - - 8, 8 - - - 180, 17 - - - 0 - - - Play sound after capture is made - - - cbPlaySoundAfterCapture - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 12 - - - True - - - NoControl - - - 5, 56 - - - 117, 13 - - - 3 - - - After task is completed: - - - lblAfterTaskNotification - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 13 - - - True - - - NoControl - - - 8, 32 - - - 187, 17 - - - 1 - - - Play sound after task is completed - - - cbPlaySoundAfterUpload - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 14 - - - 184, 52 - - - 224, 21 - - - 4 - - - cboPopUpNotification - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpNotifications - - - 15 - - - 4, 22 - - - 3, 3, 3, 3 - - - 557, 453 - - - 1 - - - Notifications - - - tpNotifications - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcGeneral + + tcImage - + + 0 + + + tpEffects + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcImage + + 1 - + + tpThumbnail + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcImage + + + 2 + + Fill - + 3, 3 - + 565, 479 - - 5 - - - tcGeneral - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpGeneral - - + 0 - + + tcImage + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpImage + + + 0 + + + pImage + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpQuality + + + 0 + + + chkOverrideImageSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpQuality + + + 1 + + 4, 22 - - 3, 3, 3, 3 + + 557, 453 - - 571, 485 + + 0 - - 7 + + tpQuality - - General - - - tpGeneral - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcTaskSettings + + tcImage - + + 0 + + + cbImagePNGBitDepth + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 0 + + + lblImagePNGBitDepth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + 1 + + cbImageAutoUseJPEG + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 2 + + + lblImageFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 3 + + + cbImageFileExist + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 4 + + + lblImageFileExist + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 5 + + + nudImageAutoUseJPEGSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 6 + + + lblImageSizeLimitHint + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 7 + + + nudImageJPEGQuality + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 8 + + + cbImageFormat + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 9 + + + lblImageJPEGQualityHint + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 10 + + + lblImageGIFQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 11 + + + lblImageJPEGQuality + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 12 + + + cbImageGIFQuality + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pImage + + + 13 + + + Fill + + + 0, 25 + + + 557, 428 + + + 1 + + + pImage + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpQuality + + + 0 + 8, 72 @@ -1998,30 +2985,6 @@ 13 - - Fill - - - 0, 25 - - - 557, 428 - - - 1 - - - pImage - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpQuality - - - 0 - True @@ -2058,26 +3021,80 @@ 1 - + + lblImageEffectsNote + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 0 + + + chkShowImageEffectsWindowAfterCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 1 + + + cbImageEffectOnlyRegionCapture + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 2 + + + btnImageEffects + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpEffects + + + 3 + + 4, 22 - + + 3, 3, 3, 3 + + 557, 453 - - 0 + + 2 - - tpQuality + + Effects - + + tpEffects + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcImage - - 0 + + 1 True @@ -2196,32 +3213,128 @@ 3 - - 4, 22 + + cbThumbnailIfSmaller - - 3, 3, 3, 3 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 557, 447 + + tpThumbnail - + + 0 + + + lblThumbnailNamePreview + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 1 + + + lblThumbnailName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + 2 - - Effects + + txtThumbnailName - - tpEffects + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tpThumbnail + + + 3 + + + lblThumbnailHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 4 + + + lblThumbnailWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 5 + + + nudThumbnailHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 6 + + + nudThumbnailWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpThumbnail + + + 7 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 453 + + + 3 + + + Thumbnail + + + tpThumbnail + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcImage - - 1 + + 2 True @@ -2442,84 +3555,387 @@ 7 - - 4, 22 + + tpCaptureGeneral - - 3, 3, 3, 3 - - - 557, 447 - - - 3 - - - Thumbnail - - - tpThumbnail - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcImage + + tcCapture - - 2 - - - Fill - - - 3, 3 - - - 565, 479 - - + 0 - - tcImage + + tpRegionCapture - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpImage + + tcCapture - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 571, 485 - - + 1 - - Image + + tpScreenRecorder - - tpImage - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcTaskSettings + + tcCapture - + 2 + + tpOCR + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcCapture + + + 3 + + + Fill + + + 3, 3 + + + 565, 479 + + + 0 + + + tcCapture + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCapture + + + 0 + + + pCapture + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCaptureGeneral + + + 0 + + + chkOverrideCaptureSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCaptureGeneral + + + 1 + + + 4, 22 + + + 557, 453 + + + 0 + + + tpCaptureGeneral + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcCapture + + + 0 + + + lblScreenshotDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 0 + + + btnCaptureCustomRegionSelectRectangle + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 1 + + + lblCaptureCustomRegion + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 2 + + + lblCaptureCustomRegionWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 3 + + + lblCaptureCustomRegionHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 4 + + + lblCaptureCustomRegionY + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 5 + + + lblCaptureCustomRegionX + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 6 + + + nudCaptureCustomRegionHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 7 + + + nudCaptureCustomRegionWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 8 + + + nudCaptureCustomRegionY + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 9 + + + nudCaptureCustomRegionX + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 10 + + + cbShowCursor + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 11 + + + lblCaptureShadowOffset + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 12 + + + cbCaptureTransparent + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 13 + + + cbCaptureAutoHideTaskbar + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 14 + + + cbCaptureShadow + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 15 + + + lblScreenshotDelayInfo + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 16 + + + cbCaptureClientArea + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 17 + + + nudScreenshotDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 18 + + + nudCaptureShadowOffset + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pCapture + + + 19 + + + Fill + + + 0, 25 + + + 557, 428 + + + 1 + + + pCapture + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpCaptureGeneral + + + 0 + True @@ -3069,30 +4485,6 @@ 19 - - Fill - - - 0, 25 - - - 557, 428 - - - 1 - - - pCapture - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpCaptureGeneral - - - 0 - True @@ -3129,26 +4521,392 @@ 1 - + + cbRegionCaptureShowFPS + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 0 + + + flpRegionCaptureFixedSize + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 1 + + + cbRegionCaptureIsFixedSize + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 2 + + + cbRegionCaptureShowCrosshair + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 3 + + + lblRegionCaptureMagnifierPixelSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 4 + + + lblRegionCaptureMagnifierPixelCount + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 5 + + + cbRegionCaptureUseSquareMagnifier + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 6 + + + cbRegionCaptureShowMagnifier + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 7 + + + cbRegionCaptureShowInfo + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 8 + + + btnRegionCaptureSnapSizesRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 9 + + + btnRegionCaptureSnapSizesAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 10 + + + cbRegionCaptureSnapSizes + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 11 + + + lblRegionCaptureSnapSizes + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 12 + + + cbRegionCaptureUseCustomInfoText + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 13 + + + cbRegionCaptureDetectControls + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 14 + + + cbRegionCaptureDetectWindows + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 15 + + + cbRegionCaptureMouse5ClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 16 + + + lblRegionCaptureMouse5ClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 17 + + + cbRegionCaptureMouse4ClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 18 + + + lblRegionCaptureMouse4ClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 19 + + + cbRegionCaptureMouseMiddleClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 20 + + + lblRegionCaptureMouseMiddleClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 21 + + + cbRegionCaptureMouseRightClickAction + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 22 + + + lblRegionCaptureMouseRightClickAction + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 23 + + + cbRegionCaptureMultiRegionMode + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 24 + + + pRegionCaptureSnapSizes + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 25 + + + cbRegionCaptureUseDimming + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 26 + + + txtRegionCaptureCustomInfoText + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 27 + + + nudRegionCaptureMagnifierPixelCount + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 28 + + + nudRegionCaptureMagnifierPixelSize + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 29 + + 4, 22 - + + 3, 3, 3, 3 + + 557, 453 - - 0 + + 1 - - tpCaptureGeneral + + Region capture - + + tpRegionCapture + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcCapture - - 0 + + 1 True @@ -3186,6 +4944,78 @@ GrowAndShrink + + lblRegionCaptureFixedSizeWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpRegionCaptureFixedSize + + + 0 + + + nudRegionCaptureFixedSizeWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpRegionCaptureFixedSize + + + 1 + + + lblRegionCaptureFixedSizeHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpRegionCaptureFixedSize + + + 2 + + + nudRegionCaptureFixedSizeHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpRegionCaptureFixedSize + + + 3 + + + 312, 387 + + + 222, 26 + + + 29 + + + False + + + flpRegionCaptureFixedSize + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 1 + Left @@ -3306,30 +5136,6 @@ 3 - - 312, 387 - - - 222, 26 - - - 29 - - - False - - - flpRegionCaptureFixedSize - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpRegionCapture - - - 1 - True @@ -3969,6 +5775,102 @@ 24 + + btnRegionCaptureSnapSizesDialogCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 0 + + + btnRegionCaptureSnapSizesDialogAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 1 + + + nudRegionCaptureSnapSizesHeight + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 2 + + + RegionCaptureSnapSizesHeight + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 3 + + + nudRegionCaptureSnapSizesWidth + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 4 + + + lblRegionCaptureSnapSizesWidth + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pRegionCaptureSnapSizes + + + 5 + + + 304, 208 + + + 232, 112 + + + 18 + + + False + + + pRegionCaptureSnapSizes + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpRegionCapture + + + 25 + NoControl @@ -4131,30 +6033,6 @@ 5 - - 304, 208 - - - 232, 112 - - - 18 - - - False - - - pRegionCaptureSnapSizes - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpRegionCapture - - - 25 - True @@ -4254,32 +6132,212 @@ 29 - + + cbScreenRecordTransparentRegion + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 0 + + + cbScreenRecordTwoPassEncoding + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 1 + + + cbScreenRecordConfirmAbort + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 2 + + + cbScreenRecorderShowCursor + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 3 + + + btnScreenRecorderFFmpegOptions + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 4 + + + lblScreenRecorderStartDelay + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 5 + + + chkScreenRecordAutoStart + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 6 + + + lblScreenRecorderFixedDuration + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 7 + + + nudScreenRecordFPS + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 8 + + + lblScreenRecordFPS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 9 + + + nudScreenRecorderDuration + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 10 + + + nudScreenRecorderStartDelay + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 11 + + + cbScreenRecorderFixedDuration + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 12 + + + nudGIFFPS + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 13 + + + lblGIFFPS + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpScreenRecorder + + + 14 + + 4, 22 - + 3, 3, 3, 3 - + 557, 453 - - 1 + + 2 - - Region capture + + Screen recorder - - tpRegionCapture + + tpScreenRecorder - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcCapture - - 1 + + 2 True @@ -4704,32 +6762,92 @@ 14 - + + cbCaptureOCRAutoCopy + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 0 + + + cbCaptureOCRProcessOnLoad + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 1 + + + cbCaptureOCRSilent + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 2 + + + lblOCRDefaultLanguage + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 3 + + + cbCaptureOCRDefaultLanguage + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpOCR + + + 4 + + 4, 22 - + 3, 3, 3, 3 - - 557, 447 + + 557, 453 - - 2 + + 3 - - Screen recorder + + OCR - - tpScreenRecorder + + tpOCR - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcCapture - - 2 + + 3 True @@ -4872,84 +6990,111 @@ 4 - - 4, 22 + + tpUploadMain - - 3, 3, 3, 3 - - - 557, 447 - - - 3 - - - OCR - - - tpOCR - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcCapture + + tcUpload - - 3 - - - Fill - - - 3, 3 - - - 565, 479 - - + 0 - - tcCapture + + tpFileNaming - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tpCapture + + tcUpload - - 0 + + 1 - - 4, 22 + + tpUploadClipboard - - 3, 3, 3, 3 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 571, 485 + + tcUpload - + 2 - - Capture + + tpUploaderFilters - - tpCapture - - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tcTaskSettings + + tcUpload - + 3 + + Fill + + + 3, 3 + + + 565, 479 + + + 0 + + + tcUpload + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUpload + + + 0 + + + chkOverrideUploadSettings + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploadMain + + + 0 + + + 4, 22 + + + 557, 453 + + + 0 + + + tpUploadMain + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tcUpload + + + 0 + True @@ -4986,26 +7131,260 @@ 0 - + + txtURLRegexReplaceReplacement + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 0 + + + lblURLRegexReplaceReplacement + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 1 + + + txtURLRegexReplacePattern + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 2 + + + lblURLRegexReplacePattern + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 3 + + + cbURLRegexReplace + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 4 + + + btnAutoIncrementNumber + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 5 + + + lblAutoIncrementNumber + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 6 + + + nudAutoIncrementNumber + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 7 + + + cbFileUploadReplaceProblematicCharacters + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 8 + + + cbRegionCaptureUseWindowPattern + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 9 + + + cbNameFormatCustomTimeZone + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 10 + + + lblNameFormatPatternPreview + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 11 + + + lblNameFormatPatternActiveWindow + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 12 + + + lblNameFormatPatternPreviewActiveWindow + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 13 + + + cbNameFormatTimeZone + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 14 + + + txtNameFormatPatternActiveWindow + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 15 + + + cbFileUploadUseNamePattern + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 16 + + + lblNameFormatPattern + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 17 + + + txtNameFormatPattern + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpFileNaming + + + 18 + + 4, 22 - + + 3, 3, 3, 3 + + 557, 453 - - 0 + + 2 - - tpUploadMain + + File naming - + + tpFileNaming + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUpload - - 0 + + 1 8, 392 @@ -5523,32 +7902,80 @@ 18 - - 4, 22 + + cbClipboardUploadShareURL - - 3, 3, 3, 3 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 557, 453 + + tpUploadClipboard - + + 0 + + + cbClipboardUploadURLContents + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploadClipboard + + + 1 + + + cbClipboardUploadAutoIndexFolder + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploadClipboard + + 2 - - File naming + + cbClipboardUploadShortenURL - - tpFileNaming + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tpUploadClipboard + + + 3 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 453 + + + 1 + + + Clipboard upload + + + tpUploadClipboard + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUpload - - 1 + + 2 True @@ -5670,48 +8097,144 @@ 3 - - 4, 22 + + lvUploaderFiltersList - - 3, 3, 3, 3 + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null - - 557, 453 + + tpUploaderFilters - + + 0 + + + btnUploaderFiltersRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + 1 - - Clipboard upload + + btnUploaderFiltersUpdate - - tpUploadClipboard + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + tpUploaderFilters + + + 2 + + + btnUploaderFiltersAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 3 + + + lblUploaderFiltersDestination + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 4 + + + cbUploaderFiltersDestination + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 5 + + + lblUploaderFiltersExtensionsExample + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 6 + + + lblUploaderFiltersExtensions + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 7 + + + txtUploaderFiltersExtensions + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpUploaderFilters + + + 8 + + + 4, 22 + + + 3, 3, 3, 3 + + + 557, 453 + + + 3 + + + Uploader filters + + + tpUploaderFilters + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcUpload - - 2 + + 3 Top, Bottom, Left, Right - - Uploader - - - 128 - - - Extension - - - 98 - 8, 136 @@ -5733,6 +8256,18 @@ 0 + + Uploader + + + 128 + + + Extension + + + 98 + NoControl @@ -5946,84 +8481,105 @@ 8 - - 4, 22 + + lblActionsNote - - 3, 3, 3, 3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 557, 453 + + pActions - + + 0 + + + btnActionsDuplicate + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 1 + + + btnActionsAdd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 2 + + + lvActions + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null + + + pActions + + 3 - - Uploader filters + + btnActionsEdit - - tpUploaderFilters + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + pActions - - tcUpload + + 4 - - 3 + + btnActionsRemove - + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pActions + + + 5 + + Fill - - 3, 3 + + 0, 25 - - 565, 479 + + 0, 0, 0, 0 - + + 571, 460 + + + 1 + + + pActions + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpActions + + 0 - - tcUpload - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpUpload - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 571, 485 - - - 4 - - - Upload - - - tpUpload - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 4 - True @@ -6114,6 +8670,27 @@ Top, Bottom, Left, Right + + 8, 64 + + + 552, 389 + + + 4 + + + lvActions + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null + + + pActions + + + 3 + Name @@ -6138,27 +8715,6 @@ 75 - - 8, 64 - - - 552, 389 - - - 4 - - - lvActions - - - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null - - - pActions - - - 3 - False @@ -6219,33 +8775,6 @@ 5 - - Fill - - - 0, 25 - - - 0, 0, 0, 0 - - - 571, 460 - - - 1 - - - pActions - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpActions - - - 0 - True @@ -6282,30 +8811,6 @@ 1 - - 4, 22 - - - 571, 485 - - - 3 - - - Actions - - - tpActions - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 5 - NoControl @@ -6366,24 +8871,6 @@ Top, Bottom, Left, Right - - Folder path - - - 323 - - - Filter - - - 43 - - - Include subdirectories - - - 182 - 8, 64 @@ -6405,6 +8892,24 @@ 2 + + Folder path + + + 323 + + + Filter + + + 43 + + + Include subdirectories + + + 182 + NoControl @@ -6459,32 +8964,101 @@ 4 - - 4, 22 + + txtToolsScreenColorPickerFormatCtrl - - 3, 3, 3, 3 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 571, 485 + + pTools - + + 0 + + + lblToolsScreenColorPickerFormatCtrl + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pTools + + + 1 + + + txtToolsScreenColorPickerInfoText + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pTools + + + 2 + + + lblToolsScreenColorPickerInfoText + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pTools + + + 3 + + + txtToolsScreenColorPickerFormat + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pTools + + + 4 + + + lblToolsScreenColorPickerFormat + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pTools + + 5 - - Watch folders + + Fill - - tpWatchFolders + + 0, 25 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 571, 460 - - tcTaskSettings + + 1 - - 6 + + pTools + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpTools + + + 0 8, 71 @@ -6636,30 +9210,6 @@ 5 - - Fill - - - 0, 25 - - - 571, 460 - - - 1 - - - pTools - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpTools - - - 0 - True @@ -6696,30 +9246,6 @@ 1 - - 4, 22 - - - 571, 485 - - - 8 - - - Tools - - - tpTools - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 7 - Fill @@ -6780,60 +9306,6 @@ 1 - - 4, 22 - - - 3, 3, 3, 3 - - - 571, 485 - - - 6 - - - Advanced - - - tpAdvanced - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tcTaskSettings - - - 8 - - - Right - - - 205, 0 - - - 579, 511 - - - 1 - - - False - - - tcTaskSettings - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - Fill diff --git a/ShareX/TaskManager.cs b/ShareX/TaskManager.cs index 79430b604..a8d9b247f 100644 --- a/ShareX/TaskManager.cs +++ b/ShareX/TaskManager.cs @@ -322,21 +322,10 @@ private static void Task_TaskCompleted(WorkerTask task) { string errorMessage = info.Result.Errors[0]; - if (info.TaskSettings.GeneralSettings.PopUpNotification != PopUpNotificationType.None && !string.IsNullOrEmpty(errorMessage) && + if (info.TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted && !string.IsNullOrEmpty(errorMessage) && (!info.TaskSettings.AdvancedSettings.DisableNotificationsOnFullscreen || !CaptureHelpers.IsActiveWindowFullscreen())) { - string tipTitle = "ShareX - " + Resources.TaskManager_task_UploadCompleted_Error; - string tipText = errorMessage; - - switch (info.TaskSettings.GeneralSettings.PopUpNotification) - { - case PopUpNotificationType.BalloonTip: - TaskHelpers.ShowBalloonTip(tipText, ToolTipIcon.Error, 5000, tipTitle); - break; - case PopUpNotificationType.ToastNotification: - TaskHelpers.ShowNotificationTip(tipText, tipTitle, 5000); - break; - } + TaskHelpers.ShowNotificationTip(errorMessage, "ShareX - " + Resources.TaskManager_task_UploadCompleted_Error, 5000); } } } @@ -382,45 +371,28 @@ private static void Task_TaskCompleted(WorkerTask task) result = new UploadInfoParser().Parse(info, info.TaskSettings.AdvancedSettings.BalloonTipContentFormat); } - if (info.TaskSettings.GeneralSettings.PopUpNotification != PopUpNotificationType.None && !string.IsNullOrEmpty(result) && + if (info.TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted && !string.IsNullOrEmpty(result) && (!info.TaskSettings.AdvancedSettings.DisableNotificationsOnFullscreen || !CaptureHelpers.IsActiveWindowFullscreen())) { - string tipTitle = "ShareX - " + Resources.TaskManager_task_UploadCompleted_ShareX___Task_completed; - string tipText = result; + task.KeepImage = true; - switch (info.TaskSettings.GeneralSettings.PopUpNotification) + NotificationFormConfig toastConfig = new NotificationFormConfig() { - case PopUpNotificationType.BalloonTip: - BalloonTipAction action = new BalloonTipAction() - { - ClickAction = BalloonTipClickAction.OpenURL, - Text = result - }; + Duration = (int)(info.TaskSettings.AdvancedSettings.ToastWindowDuration * 1000), + FadeDuration = (int)(info.TaskSettings.AdvancedSettings.ToastWindowFadeDuration * 1000), + Placement = info.TaskSettings.AdvancedSettings.ToastWindowPlacement, + Size = info.TaskSettings.AdvancedSettings.ToastWindowSize, + LeftClickAction = info.TaskSettings.AdvancedSettings.ToastWindowClickAction, + RightClickAction = info.TaskSettings.AdvancedSettings.ToastWindowRightClickAction, + MiddleClickAction = info.TaskSettings.AdvancedSettings.ToastWindowMiddleClickAction, + FilePath = info.FilePath, + Image = task.Image, + Title = "ShareX - " + Resources.TaskManager_task_UploadCompleted_ShareX___Task_completed, + Text = result, + URL = result + }; - TaskHelpers.ShowBalloonTip(tipText, ToolTipIcon.Info, 5000, tipTitle, action); - break; - case PopUpNotificationType.ToastNotification: - task.KeepImage = true; - - NotificationFormConfig toastConfig = new NotificationFormConfig() - { - Duration = (int)(info.TaskSettings.AdvancedSettings.ToastWindowDuration * 1000), - FadeDuration = (int)(info.TaskSettings.AdvancedSettings.ToastWindowFadeDuration * 1000), - Placement = info.TaskSettings.AdvancedSettings.ToastWindowPlacement, - Size = info.TaskSettings.AdvancedSettings.ToastWindowSize, - LeftClickAction = info.TaskSettings.AdvancedSettings.ToastWindowClickAction, - RightClickAction = info.TaskSettings.AdvancedSettings.ToastWindowRightClickAction, - MiddleClickAction = info.TaskSettings.AdvancedSettings.ToastWindowMiddleClickAction, - FilePath = info.FilePath, - Image = task.Image, - Title = tipTitle, - Text = tipText, - URL = result - }; - - NotificationForm.Show(toastConfig); - break; - } + NotificationForm.Show(toastConfig); if (info.TaskSettings.AfterUploadJob.HasFlag(AfterUploadTasks.ShowAfterUploadWindow) && info.IsUploadJob) { diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 06ffc8a55..0a18fb530 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -277,12 +277,14 @@ public FileDestination GetFileDestinationByDataType(EDataType dataType) public class TaskSettingsGeneral { + #region General / Notifications + public bool PlaySoundAfterCapture = true; - public bool ShowAfterCaptureTasksForm = false; - public bool ShowBeforeUploadForm = false; public bool PlaySoundAfterUpload = true; + public bool ShowToastNotificationAfterTaskCompleted = true; public PopUpNotificationType PopUpNotification = PopUpNotificationType.ToastNotification; - public bool ShowAfterUploadForm = false; + + #endregion } public class TaskSettingsImage diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs index de8885f83..bbf1ac8bc 100644 --- a/ShareX/WorkerTask.cs +++ b/ShareX/WorkerTask.cs @@ -324,7 +324,7 @@ private void ThreadDoWork() } finally { - KeepImage = Image != null && Info.TaskSettings.GeneralSettings.PopUpNotification == PopUpNotificationType.ToastNotification; + KeepImage = Image != null && Info.TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted; Dispose();