CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-29 17:02:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Added toast window settings

Browse source
This commit is contained in:
Jaex 2021-03-13 00:16:46 +03:00
parent 8a61e713b1
commit ec867624c6
7 changed files with 564 additions and 470 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX/Forms/AutoCaptureForm.cs
View file

@ -115,7 +115,7 @@ private void TakeScreenshot()
TaskSettings.UseDefaultAfterCaptureJob = false;
TaskSettings.AfterCaptureJob = TaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.AnnotateImage);
TaskSettings.UseDefaultAdvancedSettings = false;
TaskSettings.AdvancedSettings.DisableNotifications = true;
TaskSettings.GeneralSettings.DisableNotifications = true;
UploadManager.RunImageTask(bmp, TaskSettings, true, true);
}

336
ShareX/Forms/TaskSettingsForm.Designer.cs generated
View file

@ -47,16 +47,12 @@ private void InitializeComponent()
this.chkOverrideCustomUploader = new System.Windows.Forms.CheckBox();
this.chkOverrideFTP = new System.Windows.Forms.CheckBox();
this.cboFTPaccounts = new System.Windows.Forms.ComboBox();
this.btnAfterCapture = new ShareX.HelpersLib.MenuButton();
this.btnAfterUpload = new ShareX.HelpersLib.MenuButton();
this.btnDestinations = new ShareX.HelpersLib.MenuButton();
this.cmsDestinations = new System.Windows.Forms.ContextMenuStrip(this.components);
this.tsmiImageUploaders = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTextUploaders = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiFileUploaders = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiURLShorteners = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiURLSharingServices = new System.Windows.Forms.ToolStripMenuItem();
this.btnTask = new ShareX.HelpersLib.MenuButton();
this.tpGeneral = new System.Windows.Forms.TabPage();
this.tcGeneral = new System.Windows.Forms.TabControl();
this.tpGeneralMain = new System.Windows.Forms.TabPage();
@ -243,9 +239,6 @@ private void InitializeComponent()
this.cbClipboardUploadAutoIndexFolder = new System.Windows.Forms.CheckBox();
this.cbClipboardUploadShortenURL = new System.Windows.Forms.CheckBox();
this.tpUploaderFilters = new System.Windows.Forms.TabPage();
this.lvUploaderFiltersList = new ShareX.HelpersLib.MyListView();
this.chUploaderFiltersName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chUploaderFiltersExtension = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.btnUploaderFiltersRemove = new System.Windows.Forms.Button();
this.btnUploaderFiltersUpdate = new System.Windows.Forms.Button();
this.btnUploaderFiltersAdd = new System.Windows.Forms.Button();
@ -259,21 +252,12 @@ private void InitializeComponent()
this.lblActionsNote = new System.Windows.Forms.Label();
this.btnActionsDuplicate = new System.Windows.Forms.Button();
this.btnActionsAdd = new System.Windows.Forms.Button();
this.lvActions = new ShareX.HelpersLib.MyListView();
this.chActionsName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chActionsPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chActionsArgs = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chActionsExtensions = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.btnActionsEdit = new System.Windows.Forms.Button();
this.btnActionsRemove = new System.Windows.Forms.Button();
this.chkOverrideActions = new System.Windows.Forms.CheckBox();
this.tpWatchFolders = new System.Windows.Forms.TabPage();
this.btnWatchFolderEdit = new System.Windows.Forms.Button();
this.cbWatchFolderEnabled = new System.Windows.Forms.CheckBox();
this.lvWatchFolderList = new ShareX.HelpersLib.MyListView();
this.chWatchFolderFolderPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chWatchFolderFilter = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chWatchFolderIncludeSubdirectories = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.btnWatchFolderRemove = new System.Windows.Forms.Button();
this.btnWatchFolderAdd = new System.Windows.Forms.Button();
this.tpTools = new System.Windows.Forms.TabPage();
@ -288,8 +272,24 @@ private void InitializeComponent()
this.tpAdvanced = new System.Windows.Forms.TabPage();
this.pgTaskSettings = new System.Windows.Forms.PropertyGrid();
this.chkOverrideAdvancedSettings = new System.Windows.Forms.CheckBox();
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
this.cbShowToastNotificationAfterTaskCompleted = new System.Windows.Forms.CheckBox();
this.btnAfterCapture = new ShareX.HelpersLib.MenuButton();
this.btnAfterUpload = new ShareX.HelpersLib.MenuButton();
this.btnDestinations = new ShareX.HelpersLib.MenuButton();
this.btnTask = new ShareX.HelpersLib.MenuButton();
this.lvUploaderFiltersList = new ShareX.HelpersLib.MyListView();
this.chUploaderFiltersName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chUploaderFiltersExtension = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvActions = new ShareX.HelpersLib.MyListView();
this.chActionsName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chActionsPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chActionsArgs = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chActionsExtensions = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvWatchFolderList = new ShareX.HelpersLib.MyListView();
this.chWatchFolderFolderPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chWatchFolderFilter = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chWatchFolderIncludeSubdirectories = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
this.tcTaskSettings.SuspendLayout();
this.tpTask.SuspendLayout();
this.cmsDestinations.SuspendLayout();
@ -486,30 +486,6 @@ private void InitializeComponent()
this.cboFTPaccounts.Name = "cboFTPaccounts";
this.cboFTPaccounts.SelectedIndexChanged += new System.EventHandler(this.cboFTPaccounts_SelectedIndexChanged);
//
// btnAfterCapture
//
resources.ApplyResources(this.btnAfterCapture, "btnAfterCapture");
this.btnAfterCapture.Menu = this.cmsAfterCapture;
this.btnAfterCapture.Name = "btnAfterCapture";
this.btnAfterCapture.UseMnemonic = false;
this.btnAfterCapture.UseVisualStyleBackColor = true;
//
// btnAfterUpload
//
resources.ApplyResources(this.btnAfterUpload, "btnAfterUpload");
this.btnAfterUpload.Menu = this.cmsAfterUpload;
this.btnAfterUpload.Name = "btnAfterUpload";
this.btnAfterUpload.UseMnemonic = false;
this.btnAfterUpload.UseVisualStyleBackColor = true;
//
// btnDestinations
//
resources.ApplyResources(this.btnDestinations, "btnDestinations");
this.btnDestinations.Menu = this.cmsDestinations;
this.btnDestinations.Name = "btnDestinations";
this.btnDestinations.UseMnemonic = false;
this.btnDestinations.UseVisualStyleBackColor = true;
//
// cmsDestinations
//
this.cmsDestinations.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -551,14 +527,6 @@ private void InitializeComponent()
this.tsmiURLSharingServices.Name = "tsmiURLSharingServices";
resources.ApplyResources(this.tsmiURLSharingServices, "tsmiURLSharingServices");
//
// btnTask
//
resources.ApplyResources(this.btnTask, "btnTask");
this.btnTask.Menu = this.cmsTask;
this.btnTask.Name = "btnTask";
this.btnTask.UseMnemonic = false;
this.btnTask.UseVisualStyleBackColor = true;
//
// tpGeneral
//
this.tpGeneral.BackColor = System.Drawing.SystemColors.Window;
@ -695,6 +663,7 @@ private void InitializeComponent()
this.cbToastWindowMiddleClickAction.FormattingEnabled = true;
resources.ApplyResources(this.cbToastWindowMiddleClickAction, "cbToastWindowMiddleClickAction");
this.cbToastWindowMiddleClickAction.Name = "cbToastWindowMiddleClickAction";
this.cbToastWindowMiddleClickAction.SelectedIndexChanged += new System.EventHandler(this.cbToastWindowMiddleClickAction_SelectedIndexChanged);
//
// cbToastWindowRightClickAction
//
@ -702,6 +671,7 @@ private void InitializeComponent()
this.cbToastWindowRightClickAction.FormattingEnabled = true;
resources.ApplyResources(this.cbToastWindowRightClickAction, "cbToastWindowRightClickAction");
this.cbToastWindowRightClickAction.Name = "cbToastWindowRightClickAction";
this.cbToastWindowRightClickAction.SelectedIndexChanged += new System.EventHandler(this.cbToastWindowRightClickAction_SelectedIndexChanged);
//
// cbToastWindowLeftClickAction
//
@ -709,16 +679,49 @@ private void InitializeComponent()
this.cbToastWindowLeftClickAction.FormattingEnabled = true;
resources.ApplyResources(this.cbToastWindowLeftClickAction, "cbToastWindowLeftClickAction");
this.cbToastWindowLeftClickAction.Name = "cbToastWindowLeftClickAction";
this.cbToastWindowLeftClickAction.SelectedIndexChanged += new System.EventHandler(this.cbToastWindowLeftClickAction_SelectedIndexChanged);
//
// nudToastWindowSizeHeight
//
resources.ApplyResources(this.nudToastWindowSizeHeight, "nudToastWindowSizeHeight");
this.nudToastWindowSizeHeight.Maximum = new decimal(new int[] {
1000,
0,
0,
0});
this.nudToastWindowSizeHeight.Minimum = new decimal(new int[] {
100,
0,
0,
0});
this.nudToastWindowSizeHeight.Name = "nudToastWindowSizeHeight";
this.nudToastWindowSizeHeight.Value = new decimal(new int[] {
100,
0,
0,
0});
this.nudToastWindowSizeHeight.ValueChanged += new System.EventHandler(this.nudToastWindowSizeHeight_ValueChanged);
//
// nudToastWindowSizeWidth
//
resources.ApplyResources(this.nudToastWindowSizeWidth, "nudToastWindowSizeWidth");
this.nudToastWindowSizeWidth.Maximum = new decimal(new int[] {
1000,
0,
0,
0});
this.nudToastWindowSizeWidth.Minimum = new decimal(new int[] {
100,
0,
0,
0});
this.nudToastWindowSizeWidth.Name = "nudToastWindowSizeWidth";
this.nudToastWindowSizeWidth.Value = new decimal(new int[] {
100,
0,
0,
0});
this.nudToastWindowSizeWidth.ValueChanged += new System.EventHandler(this.nudToastWindowSizeWidth_ValueChanged);
//
// cbToastWindowPlacement
//
@ -726,16 +729,29 @@ private void InitializeComponent()
this.cbToastWindowPlacement.FormattingEnabled = true;
resources.ApplyResources(this.cbToastWindowPlacement, "cbToastWindowPlacement");
this.cbToastWindowPlacement.Name = "cbToastWindowPlacement";
this.cbToastWindowPlacement.SelectedIndexChanged += new System.EventHandler(this.cbToastWindowPlacement_SelectedIndexChanged);
//
// nudToastWindowFadeDuration
//
resources.ApplyResources(this.nudToastWindowFadeDuration, "nudToastWindowFadeDuration");
this.nudToastWindowFadeDuration.Maximum = new decimal(new int[] {
30,
0,
0,
0});
this.nudToastWindowFadeDuration.Name = "nudToastWindowFadeDuration";
this.nudToastWindowFadeDuration.ValueChanged += new System.EventHandler(this.nudToastWindowFadeDuration_ValueChanged);
//
// nudToastWindowDuration
//
resources.ApplyResources(this.nudToastWindowDuration, "nudToastWindowDuration");
this.nudToastWindowDuration.Maximum = new decimal(new int[] {
30,
0,
0,
0});
this.nudToastWindowDuration.Name = "nudToastWindowDuration";
this.nudToastWindowDuration.ValueChanged += new System.EventHandler(this.nudToastWindowDuration_ValueChanged);
//
// lblToastWindowMiddleClickAction
//
@ -777,12 +793,14 @@ private void InitializeComponent()
resources.ApplyResources(this.cbDisableNotificationsOnFullscreen, "cbDisableNotificationsOnFullscreen");
this.cbDisableNotificationsOnFullscreen.Name = "cbDisableNotificationsOnFullscreen";
this.cbDisableNotificationsOnFullscreen.UseVisualStyleBackColor = true;
this.cbDisableNotificationsOnFullscreen.CheckedChanged += new System.EventHandler(this.cbDisableNotificationsOnFullscreen_CheckedChanged);
//
// cbDisableNotifications
//
resources.ApplyResources(this.cbDisableNotifications, "cbDisableNotifications");
this.cbDisableNotifications.Name = "cbDisableNotifications";
this.cbDisableNotifications.UseVisualStyleBackColor = true;
this.cbDisableNotifications.CheckedChanged += new System.EventHandler(this.cbDisableNotifications_CheckedChanged);
//
// cbPlaySoundAfterCapture
//
@ -2116,28 +2134,6 @@ private void InitializeComponent()
resources.ApplyResources(this.tpUploaderFilters, "tpUploaderFilters");
this.tpUploaderFilters.Name = "tpUploaderFilters";
//
// lvUploaderFiltersList
//
resources.ApplyResources(this.lvUploaderFiltersList, "lvUploaderFiltersList");
this.lvUploaderFiltersList.AutoFillColumn = true;
this.lvUploaderFiltersList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chUploaderFiltersName,
this.chUploaderFiltersExtension});
this.lvUploaderFiltersList.FullRowSelect = true;
this.lvUploaderFiltersList.HideSelection = false;
this.lvUploaderFiltersList.Name = "lvUploaderFiltersList";
this.lvUploaderFiltersList.UseCompatibleStateImageBehavior = false;
this.lvUploaderFiltersList.View = System.Windows.Forms.View.Details;
this.lvUploaderFiltersList.SelectedIndexChanged += new System.EventHandler(this.lvUploaderFiltersList_SelectedIndexChanged);
//
// chUploaderFiltersName
//
resources.ApplyResources(this.chUploaderFiltersName, "chUploaderFiltersName");
//
// chUploaderFiltersExtension
//
resources.ApplyResources(this.chUploaderFiltersExtension, "chUploaderFiltersExtension");
//
// btnUploaderFiltersRemove
//
resources.ApplyResources(this.btnUploaderFiltersRemove, "btnUploaderFiltersRemove");
@ -2224,44 +2220,6 @@ private void InitializeComponent()
this.btnActionsAdd.UseVisualStyleBackColor = true;
this.btnActionsAdd.Click += new System.EventHandler(this.btnActionsAdd_Click);
//
// lvActions
//
this.lvActions.AllowDrop = true;
this.lvActions.AllowItemDrag = true;
resources.ApplyResources(this.lvActions, "lvActions");
this.lvActions.AutoFillColumn = true;
this.lvActions.CheckBoxes = true;
this.lvActions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chActionsName,
this.chActionsPath,
this.chActionsArgs,
this.chActionsExtensions});
this.lvActions.FullRowSelect = true;
this.lvActions.HideSelection = false;
this.lvActions.MultiSelect = false;
this.lvActions.Name = "lvActions";
this.lvActions.UseCompatibleStateImageBehavior = false;
this.lvActions.View = System.Windows.Forms.View.Details;
this.lvActions.ItemMoved += new ShareX.HelpersLib.MyListView.ListViewItemMovedEventHandler(this.lvActions_ItemMoved);
this.lvActions.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.lvActions_ItemChecked);
this.lvActions.SelectedIndexChanged += new System.EventHandler(this.lvActions_SelectedIndexChanged);
//
// chActionsName
//
resources.ApplyResources(this.chActionsName, "chActionsName");
//
// chActionsPath
//
resources.ApplyResources(this.chActionsPath, "chActionsPath");
//
// chActionsArgs
//
resources.ApplyResources(this.chActionsArgs, "chActionsArgs");
//
// chActionsExtensions
//
resources.ApplyResources(this.chActionsExtensions, "chActionsExtensions");
//
// btnActionsEdit
//
resources.ApplyResources(this.btnActionsEdit, "btnActionsEdit");
@ -2310,33 +2268,6 @@ private void InitializeComponent()
this.cbWatchFolderEnabled.UseVisualStyleBackColor = true;
this.cbWatchFolderEnabled.CheckedChanged += new System.EventHandler(this.cbWatchFolderEnabled_CheckedChanged);
//
// lvWatchFolderList
//
resources.ApplyResources(this.lvWatchFolderList, "lvWatchFolderList");
this.lvWatchFolderList.AutoFillColumn = true;
this.lvWatchFolderList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chWatchFolderFolderPath,
this.chWatchFolderFilter,
this.chWatchFolderIncludeSubdirectories});
this.lvWatchFolderList.FullRowSelect = true;
this.lvWatchFolderList.HideSelection = false;
this.lvWatchFolderList.Name = "lvWatchFolderList";
this.lvWatchFolderList.UseCompatibleStateImageBehavior = false;
this.lvWatchFolderList.View = System.Windows.Forms.View.Details;
this.lvWatchFolderList.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvWatchFolderList_MouseDoubleClick);
//
// chWatchFolderFolderPath
//
resources.ApplyResources(this.chWatchFolderFolderPath, "chWatchFolderFolderPath");
//
// chWatchFolderFilter
//
resources.ApplyResources(this.chWatchFolderFilter, "chWatchFolderFilter");
//
// chWatchFolderIncludeSubdirectories
//
resources.ApplyResources(this.chWatchFolderIncludeSubdirectories, "chWatchFolderIncludeSubdirectories");
//
// btnWatchFolderRemove
//
resources.ApplyResources(this.btnWatchFolderRemove, "btnWatchFolderRemove");
@ -2436,6 +2367,132 @@ private void InitializeComponent()
this.chkOverrideAdvancedSettings.UseVisualStyleBackColor = true;
this.chkOverrideAdvancedSettings.CheckedChanged += new System.EventHandler(this.chkUseDefaultAdvancedSettings_CheckedChanged);
//
// cbShowToastNotificationAfterTaskCompleted
//
resources.ApplyResources(this.cbShowToastNotificationAfterTaskCompleted, "cbShowToastNotificationAfterTaskCompleted");
this.cbShowToastNotificationAfterTaskCompleted.Name = "cbShowToastNotificationAfterTaskCompleted";
this.cbShowToastNotificationAfterTaskCompleted.UseVisualStyleBackColor = true;
this.cbShowToastNotificationAfterTaskCompleted.CheckedChanged += new System.EventHandler(this.cbShowToastNotificationAfterTaskCompleted_CheckedChanged);
//
// btnAfterCapture
//
resources.ApplyResources(this.btnAfterCapture, "btnAfterCapture");
this.btnAfterCapture.Menu = this.cmsAfterCapture;
this.btnAfterCapture.Name = "btnAfterCapture";
this.btnAfterCapture.UseMnemonic = false;
this.btnAfterCapture.UseVisualStyleBackColor = true;
//
// btnAfterUpload
//
resources.ApplyResources(this.btnAfterUpload, "btnAfterUpload");
this.btnAfterUpload.Menu = this.cmsAfterUpload;
this.btnAfterUpload.Name = "btnAfterUpload";
this.btnAfterUpload.UseMnemonic = false;
this.btnAfterUpload.UseVisualStyleBackColor = true;
//
// btnDestinations
//
resources.ApplyResources(this.btnDestinations, "btnDestinations");
this.btnDestinations.Menu = this.cmsDestinations;
this.btnDestinations.Name = "btnDestinations";
this.btnDestinations.UseMnemonic = false;
this.btnDestinations.UseVisualStyleBackColor = true;
//
// btnTask
//
resources.ApplyResources(this.btnTask, "btnTask");
this.btnTask.Menu = this.cmsTask;
this.btnTask.Name = "btnTask";
this.btnTask.UseMnemonic = false;
this.btnTask.UseVisualStyleBackColor = true;
//
// lvUploaderFiltersList
//
resources.ApplyResources(this.lvUploaderFiltersList, "lvUploaderFiltersList");
this.lvUploaderFiltersList.AutoFillColumn = true;
this.lvUploaderFiltersList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chUploaderFiltersName,
this.chUploaderFiltersExtension});
this.lvUploaderFiltersList.FullRowSelect = true;
this.lvUploaderFiltersList.HideSelection = false;
this.lvUploaderFiltersList.Name = "lvUploaderFiltersList";
this.lvUploaderFiltersList.UseCompatibleStateImageBehavior = false;
this.lvUploaderFiltersList.View = System.Windows.Forms.View.Details;
this.lvUploaderFiltersList.SelectedIndexChanged += new System.EventHandler(this.lvUploaderFiltersList_SelectedIndexChanged);
//
// chUploaderFiltersName
//
resources.ApplyResources(this.chUploaderFiltersName, "chUploaderFiltersName");
//
// chUploaderFiltersExtension
//
resources.ApplyResources(this.chUploaderFiltersExtension, "chUploaderFiltersExtension");
//
// lvActions
//
this.lvActions.AllowDrop = true;
this.lvActions.AllowItemDrag = true;
resources.ApplyResources(this.lvActions, "lvActions");
this.lvActions.AutoFillColumn = true;
this.lvActions.CheckBoxes = true;
this.lvActions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chActionsName,
this.chActionsPath,
this.chActionsArgs,
this.chActionsExtensions});
this.lvActions.FullRowSelect = true;
this.lvActions.HideSelection = false;
this.lvActions.MultiSelect = false;
this.lvActions.Name = "lvActions";
this.lvActions.UseCompatibleStateImageBehavior = false;
this.lvActions.View = System.Windows.Forms.View.Details;
this.lvActions.ItemMoved += new ShareX.HelpersLib.MyListView.ListViewItemMovedEventHandler(this.lvActions_ItemMoved);
this.lvActions.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.lvActions_ItemChecked);
this.lvActions.SelectedIndexChanged += new System.EventHandler(this.lvActions_SelectedIndexChanged);
//
// chActionsName
//
resources.ApplyResources(this.chActionsName, "chActionsName");
//
// chActionsPath
//
resources.ApplyResources(this.chActionsPath, "chActionsPath");
//
// chActionsArgs
//
resources.ApplyResources(this.chActionsArgs, "chActionsArgs");
//
// chActionsExtensions
//
resources.ApplyResources(this.chActionsExtensions, "chActionsExtensions");
//
// lvWatchFolderList
//
resources.ApplyResources(this.lvWatchFolderList, "lvWatchFolderList");
this.lvWatchFolderList.AutoFillColumn = true;
this.lvWatchFolderList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chWatchFolderFolderPath,
this.chWatchFolderFilter,
this.chWatchFolderIncludeSubdirectories});
this.lvWatchFolderList.FullRowSelect = true;
this.lvWatchFolderList.HideSelection = false;
this.lvWatchFolderList.Name = "lvWatchFolderList";
this.lvWatchFolderList.UseCompatibleStateImageBehavior = false;
this.lvWatchFolderList.View = System.Windows.Forms.View.Details;
this.lvWatchFolderList.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvWatchFolderList_MouseDoubleClick);
//
// chWatchFolderFolderPath
//
resources.ApplyResources(this.chWatchFolderFolderPath, "chWatchFolderFolderPath");
//
// chWatchFolderFilter
//
resources.ApplyResources(this.chWatchFolderFilter, "chWatchFolderFilter");
//
// chWatchFolderIncludeSubdirectories
//
resources.ApplyResources(this.chWatchFolderIncludeSubdirectories, "chWatchFolderIncludeSubdirectories");
//
// tttvMain
//
resources.ApplyResources(this.tttvMain, "tttvMain");
@ -2448,13 +2505,6 @@ private void InitializeComponent()
this.tttvMain.TreeViewSize = 190;
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
//
// cbShowToastNotificationAfterTaskCompleted
//
resources.ApplyResources(this.cbShowToastNotificationAfterTaskCompleted, "cbShowToastNotificationAfterTaskCompleted");
this.cbShowToastNotificationAfterTaskCompleted.Name = "cbShowToastNotificationAfterTaskCompleted";
this.cbShowToastNotificationAfterTaskCompleted.UseVisualStyleBackColor = true;
this.cbShowToastNotificationAfterTaskCompleted.CheckedChanged += new System.EventHandler(this.cbShowToastNotificationAfterTaskCompleted_CheckedChanged);
//
// TaskSettingsForm
//
resources.ApplyResources(this, "$this");

64
ShareX/Forms/TaskSettingsForm.cs
View file

@ -193,6 +193,20 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
cbPlaySoundAfterCapture.Checked = TaskSettings.GeneralSettings.PlaySoundAfterCapture;
cbPlaySoundAfterUpload.Checked = TaskSettings.GeneralSettings.PlaySoundAfterUpload;
cbShowToastNotificationAfterTaskCompleted.Checked = TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted;
nudToastWindowDuration.SetValue((decimal)TaskSettings.GeneralSettings.ToastWindowDuration);
nudToastWindowFadeDuration.SetValue((decimal)TaskSettings.GeneralSettings.ToastWindowFadeDuration);
cbToastWindowPlacement.Items.AddRange(Helpers.GetEnumNamesProper<ContentAlignment>());
cbToastWindowPlacement.SelectedIndex = TaskSettings.GeneralSettings.ToastWindowPlacement.GetIndex();
nudToastWindowSizeWidth.SetValue(TaskSettings.GeneralSettings.ToastWindowSize.Width);
nudToastWindowSizeHeight.SetValue(TaskSettings.GeneralSettings.ToastWindowSize.Height);
cbToastWindowLeftClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ToastClickAction>());
cbToastWindowLeftClickAction.SelectedIndex = (int)TaskSettings.GeneralSettings.ToastWindowLeftClickAction;
cbToastWindowRightClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ToastClickAction>());
cbToastWindowRightClickAction.SelectedIndex = (int)TaskSettings.GeneralSettings.ToastWindowRightClickAction;
cbToastWindowMiddleClickAction.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ToastClickAction>());
cbToastWindowMiddleClickAction.SelectedIndex = (int)TaskSettings.GeneralSettings.ToastWindowMiddleClickAction;
cbDisableNotifications.Checked = TaskSettings.GeneralSettings.DisableNotifications;
cbDisableNotificationsOnFullscreen.Checked = TaskSettings.GeneralSettings.DisableNotificationsOnFullscreen;
#endregion
@ -767,6 +781,56 @@ private void cbShowToastNotificationAfterTaskCompleted_CheckedChanged(object sen
TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted = cbShowToastNotificationAfterTaskCompleted.Checked;
}
private void nudToastWindowDuration_ValueChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.ToastWindowDuration = (float)nudToastWindowDuration.Value;
}
private void nudToastWindowFadeDuration_ValueChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.ToastWindowFadeDuration = (float)nudToastWindowFadeDuration.Value;
}
private void cbToastWindowPlacement_SelectedIndexChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.ToastWindowPlacement = (ContentAlignment)cbToastWindowPlacement.SelectedIndex;
}
private void nudToastWindowSizeWidth_ValueChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.ToastWindowSize = new Size((int)nudToastWindowSizeWidth.Value, TaskSettings.GeneralSettings.ToastWindowSize.Height);
}
private void nudToastWindowSizeHeight_ValueChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.ToastWindowSize = new Size(TaskSettings.GeneralSettings.ToastWindowSize.Width, (int)nudToastWindowSizeHeight.Value);
}
private void cbToastWindowLeftClickAction_SelectedIndexChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.ToastWindowLeftClickAction = (ToastClickAction)cbToastWindowLeftClickAction.SelectedIndex;
}
private void cbToastWindowRightClickAction_SelectedIndexChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.ToastWindowRightClickAction = (ToastClickAction)cbToastWindowRightClickAction.SelectedIndex;
}
private void cbToastWindowMiddleClickAction_SelectedIndexChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.ToastWindowMiddleClickAction = (ToastClickAction)cbToastWindowMiddleClickAction.SelectedIndex;
}
private void cbDisableNotifications_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.DisableNotifications = cbDisableNotifications.Checked;
}
private void cbDisableNotificationsOnFullscreen_CheckedChanged(object sender, EventArgs e)
{
TaskSettings.GeneralSettings.DisableNotificationsOnFullscreen = cbDisableNotificationsOnFullscreen.Checked;
}
#endregion General
#region Image

529
ShareX/Forms/TaskSettingsForm.resx
View file

@ -492,6 +492,9 @@
<data name="cbShowToastNotificationAfterTaskCompleted.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbShowToastNotificationAfterTaskCompleted.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbShowToastNotificationAfterTaskCompleted.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 56</value>
</data>
@ -570,6 +573,9 @@
<data name="&gt;&gt;btnCustomTaskCompletedSoundPath.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="btnCustomCaptureSoundPath.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnCustomCaptureSoundPath.Location" type="System.Drawing.Point, System.Drawing">
<value>536, 293</value>
</data>
@ -660,6 +666,9 @@
<data name="cbUseCustomErrorSound.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbUseCustomErrorSound.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbUseCustomErrorSound.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 344</value>
</data>
@ -687,6 +696,9 @@
<data name="cbUseCustomTaskCompletedSound.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbUseCustomTaskCompletedSound.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbUseCustomTaskCompletedSound.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 320</value>
</data>
@ -714,6 +726,9 @@
<data name="cbUseCustomCaptureSound.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbUseCustomCaptureSound.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbUseCustomCaptureSound.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 296</value>
</data>
@ -957,6 +972,9 @@
<data name="cbDisableNotificationsOnFullscreen.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbDisableNotificationsOnFullscreen.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbDisableNotificationsOnFullscreen.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 392</value>
</data>
@ -984,6 +1002,9 @@
<data name="cbDisableNotifications.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbDisableNotifications.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbDisableNotifications.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 368</value>
</data>
@ -1704,72 +1725,6 @@
<data name="&gt;&gt;cboFTPaccounts.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="btnAfterCapture.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnAfterCapture.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 104</value>
</data>
<data name="btnAfterCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 23</value>
</data>
<data name="btnAfterCapture.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="btnAfterCapture.Text" xml:space="preserve">
<value>After capture...</value>
</data>
<data name="btnAfterCapture.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;btnAfterCapture.Name" xml:space="preserve">
<value>btnAfterCapture</value>
</data>
<data name="&gt;&gt;btnAfterCapture.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnAfterCapture.Parent" xml:space="preserve">
<value>tpTask</value>
</data>
<data name="&gt;&gt;btnAfterCapture.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="btnAfterUpload.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnAfterUpload.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 160</value>
</data>
<data name="btnAfterUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 23</value>
</data>
<data name="btnAfterUpload.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="btnAfterUpload.Text" xml:space="preserve">
<value>After upload...</value>
</data>
<data name="btnAfterUpload.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;btnAfterUpload.Name" xml:space="preserve">
<value>btnAfterUpload</value>
</data>
<data name="&gt;&gt;btnAfterUpload.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnAfterUpload.Parent" xml:space="preserve">
<value>tpTask</value>
</data>
<data name="&gt;&gt;btnAfterUpload.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="btnDestinations.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnDestinations.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 216</value>
</data>
<metadata name="cmsDestinations.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>396, 17</value>
</metadata>
@ -1782,30 +1737,6 @@
<data name="&gt;&gt;cmsDestinations.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="btnDestinations.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 23</value>
</data>
<data name="btnDestinations.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="btnDestinations.Text" xml:space="preserve">
<value>Destinations...</value>
</data>
<data name="btnDestinations.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;btnDestinations.Name" xml:space="preserve">
<value>btnDestinations</value>
</data>
<data name="&gt;&gt;btnDestinations.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnDestinations.Parent" xml:space="preserve">
<value>tpTask</value>
</data>
<data name="&gt;&gt;btnDestinations.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="tsmiImageUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>181, 22</value>
</data>
@ -1836,36 +1767,6 @@
<data name="tsmiURLSharingServices.Text" xml:space="preserve">
<value>URL sharing services</value>
</data>
<data name="btnTask.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnTask.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="btnTask.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 23</value>
</data>
<data name="btnTask.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="btnTask.Text" xml:space="preserve">
<value>Task...</value>
</data>
<data name="btnTask.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;btnTask.Name" xml:space="preserve">
<value>btnTask</value>
</data>
<data name="&gt;&gt;btnTask.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnTask.Parent" xml:space="preserve">
<value>tpTask</value>
</data>
<data name="&gt;&gt;btnTask.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="chkOverrideGeneralSettings.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -1905,6 +1806,9 @@
<data name="lblToastWindowSizeX.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblToastWindowSizeX.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblToastWindowSizeX.Location" type="System.Drawing.Point, System.Drawing">
<value>263, 95</value>
</data>
@ -2209,13 +2113,13 @@
<value>13, 96</value>
</data>
<data name="lblToastWindowSize.Size" type="System.Drawing.Size, System.Drawing">
<value>70, 13</value>
<value>30, 13</value>
</data>
<data name="lblToastWindowSize.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="lblToastWindowSize.Text" xml:space="preserve">
<value>Window size:</value>
<value>Size:</value>
</data>
<data name="&gt;&gt;lblToastWindowSize.Name" xml:space="preserve">
<value>lblToastWindowSize</value>
@ -2292,6 +2196,9 @@
<data name="lblToastWindowDuration.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblToastWindowDuration.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblToastWindowDuration.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 24</value>
</data>
@ -8232,42 +8139,6 @@
<data name="&gt;&gt;tpUploaderFilters.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="lvUploaderFiltersList.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="lvUploaderFiltersList.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 136</value>
</data>
<data name="lvUploaderFiltersList.Size" type="System.Drawing.Size, System.Drawing">
<value>536, 310</value>
</data>
<data name="lvUploaderFiltersList.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="&gt;&gt;lvUploaderFiltersList.Name" xml:space="preserve">
<value>lvUploaderFiltersList</value>
</data>
<data name="&gt;&gt;lvUploaderFiltersList.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvUploaderFiltersList.Parent" xml:space="preserve">
<value>tpUploaderFilters</value>
</data>
<data name="&gt;&gt;lvUploaderFiltersList.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="chUploaderFiltersName.Text" xml:space="preserve">
<value>Uploader</value>
</data>
<data name="chUploaderFiltersName.Width" type="System.Int32, mscorlib">
<value>128</value>
</data>
<data name="chUploaderFiltersExtension.Text" xml:space="preserve">
<value>Extension</value>
</data>
<data name="chUploaderFiltersExtension.Width" type="System.Int32, mscorlib">
<value>98</value>
</data>
<data name="btnUploaderFiltersRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -8667,54 +8538,6 @@
<data name="&gt;&gt;btnActionsAdd.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="lvActions.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="lvActions.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 64</value>
</data>
<data name="lvActions.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 389</value>
</data>
<data name="lvActions.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;lvActions.Name" xml:space="preserve">
<value>lvActions</value>
</data>
<data name="&gt;&gt;lvActions.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvActions.Parent" xml:space="preserve">
<value>pActions</value>
</data>
<data name="&gt;&gt;lvActions.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="chActionsName.Text" xml:space="preserve">
<value>Name</value>
</data>
<data name="chActionsName.Width" type="System.Int32, mscorlib">
<value>90</value>
</data>
<data name="chActionsPath.Text" xml:space="preserve">
<value>Path</value>
</data>
<data name="chActionsPath.Width" type="System.Int32, mscorlib">
<value>220</value>
</data>
<data name="chActionsArgs.Text" xml:space="preserve">
<value>Args</value>
</data>
<data name="chActionsArgs.Width" type="System.Int32, mscorlib">
<value>114</value>
</data>
<data name="chActionsExtensions.Text" xml:space="preserve">
<value>Extensions</value>
</data>
<data name="chActionsExtensions.Width" type="System.Int32, mscorlib">
<value>75</value>
</data>
<data name="btnActionsEdit.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@ -8868,48 +8691,6 @@
<data name="&gt;&gt;cbWatchFolderEnabled.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lvWatchFolderList.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="lvWatchFolderList.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 64</value>
</data>
<data name="lvWatchFolderList.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 414</value>
</data>
<data name="lvWatchFolderList.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;lvWatchFolderList.Name" xml:space="preserve">
<value>lvWatchFolderList</value>
</data>
<data name="&gt;&gt;lvWatchFolderList.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvWatchFolderList.Parent" xml:space="preserve">
<value>tpWatchFolders</value>
</data>
<data name="&gt;&gt;lvWatchFolderList.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="chWatchFolderFolderPath.Text" xml:space="preserve">
<value>Folder path</value>
</data>
<data name="chWatchFolderFolderPath.Width" type="System.Int32, mscorlib">
<value>323</value>
</data>
<data name="chWatchFolderFilter.Text" xml:space="preserve">
<value>Filter</value>
</data>
<data name="chWatchFolderFilter.Width" type="System.Int32, mscorlib">
<value>43</value>
</data>
<data name="chWatchFolderIncludeSubdirectories.Text" xml:space="preserve">
<value>Include subdirectories</value>
</data>
<data name="chWatchFolderIncludeSubdirectories.Width" type="System.Int32, mscorlib">
<value>182</value>
</data>
<data name="btnWatchFolderRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -9135,6 +8916,9 @@
<data name="lblToolsScreenColorPickerInfoText.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblToolsScreenColorPickerInfoText.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblToolsScreenColorPickerInfoText.Location" type="System.Drawing.Point, System.Drawing">
<value>5, 102</value>
</data>
@ -9306,6 +9090,252 @@
<data name="&gt;&gt;chkOverrideAdvancedSettings.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="btnAfterCapture.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnAfterCapture.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 104</value>
</data>
<data name="btnAfterCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 23</value>
</data>
<data name="btnAfterCapture.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="btnAfterCapture.Text" xml:space="preserve">
<value>After capture...</value>
</data>
<data name="btnAfterCapture.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;btnAfterCapture.Name" xml:space="preserve">
<value>btnAfterCapture</value>
</data>
<data name="&gt;&gt;btnAfterCapture.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnAfterCapture.Parent" xml:space="preserve">
<value>tpTask</value>
</data>
<data name="&gt;&gt;btnAfterCapture.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="btnAfterUpload.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnAfterUpload.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 160</value>
</data>
<data name="btnAfterUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 23</value>
</data>
<data name="btnAfterUpload.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="btnAfterUpload.Text" xml:space="preserve">
<value>After upload...</value>
</data>
<data name="btnAfterUpload.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;btnAfterUpload.Name" xml:space="preserve">
<value>btnAfterUpload</value>
</data>
<data name="&gt;&gt;btnAfterUpload.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnAfterUpload.Parent" xml:space="preserve">
<value>tpTask</value>
</data>
<data name="&gt;&gt;btnAfterUpload.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="btnDestinations.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnDestinations.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 216</value>
</data>
<data name="btnDestinations.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 23</value>
</data>
<data name="btnDestinations.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="btnDestinations.Text" xml:space="preserve">
<value>Destinations...</value>
</data>
<data name="btnDestinations.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;btnDestinations.Name" xml:space="preserve">
<value>btnDestinations</value>
</data>
<data name="&gt;&gt;btnDestinations.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnDestinations.Parent" xml:space="preserve">
<value>tpTask</value>
</data>
<data name="&gt;&gt;btnDestinations.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="btnTask.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnTask.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="btnTask.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 23</value>
</data>
<data name="btnTask.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="btnTask.Text" xml:space="preserve">
<value>Task...</value>
</data>
<data name="btnTask.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="&gt;&gt;btnTask.Name" xml:space="preserve">
<value>btnTask</value>
</data>
<data name="&gt;&gt;btnTask.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnTask.Parent" xml:space="preserve">
<value>tpTask</value>
</data>
<data name="&gt;&gt;btnTask.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="lvUploaderFiltersList.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="lvUploaderFiltersList.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 136</value>
</data>
<data name="lvUploaderFiltersList.Size" type="System.Drawing.Size, System.Drawing">
<value>536, 310</value>
</data>
<data name="lvUploaderFiltersList.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="&gt;&gt;lvUploaderFiltersList.Name" xml:space="preserve">
<value>lvUploaderFiltersList</value>
</data>
<data name="&gt;&gt;lvUploaderFiltersList.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvUploaderFiltersList.Parent" xml:space="preserve">
<value>tpUploaderFilters</value>
</data>
<data name="&gt;&gt;lvUploaderFiltersList.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="chUploaderFiltersName.Text" xml:space="preserve">
<value>Uploader</value>
</data>
<data name="chUploaderFiltersName.Width" type="System.Int32, mscorlib">
<value>128</value>
</data>
<data name="chUploaderFiltersExtension.Text" xml:space="preserve">
<value>Extension</value>
</data>
<data name="chUploaderFiltersExtension.Width" type="System.Int32, mscorlib">
<value>98</value>
</data>
<data name="lvActions.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="lvActions.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 64</value>
</data>
<data name="lvActions.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 389</value>
</data>
<data name="lvActions.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;lvActions.Name" xml:space="preserve">
<value>lvActions</value>
</data>
<data name="&gt;&gt;lvActions.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvActions.Parent" xml:space="preserve">
<value>pActions</value>
</data>
<data name="&gt;&gt;lvActions.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="chActionsName.Text" xml:space="preserve">
<value>Name</value>
</data>
<data name="chActionsName.Width" type="System.Int32, mscorlib">
<value>90</value>
</data>
<data name="chActionsPath.Text" xml:space="preserve">
<value>Path</value>
</data>
<data name="chActionsPath.Width" type="System.Int32, mscorlib">
<value>220</value>
</data>
<data name="chActionsArgs.Text" xml:space="preserve">
<value>Args</value>
</data>
<data name="chActionsArgs.Width" type="System.Int32, mscorlib">
<value>114</value>
</data>
<data name="chActionsExtensions.Text" xml:space="preserve">
<value>Extensions</value>
</data>
<data name="chActionsExtensions.Width" type="System.Int32, mscorlib">
<value>75</value>
</data>
<data name="lvWatchFolderList.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="lvWatchFolderList.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 64</value>
</data>
<data name="lvWatchFolderList.Size" type="System.Drawing.Size, System.Drawing">
<value>552, 414</value>
</data>
<data name="lvWatchFolderList.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="&gt;&gt;lvWatchFolderList.Name" xml:space="preserve">
<value>lvWatchFolderList</value>
</data>
<data name="&gt;&gt;lvWatchFolderList.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.4.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvWatchFolderList.Parent" xml:space="preserve">
<value>tpWatchFolders</value>
</data>
<data name="&gt;&gt;lvWatchFolderList.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="chWatchFolderFolderPath.Text" xml:space="preserve">
<value>Folder path</value>
</data>
<data name="chWatchFolderFolderPath.Width" type="System.Int32, mscorlib">
<value>323</value>
</data>
<data name="chWatchFolderFilter.Text" xml:space="preserve">
<value>Filter</value>
</data>
<data name="chWatchFolderFilter.Width" type="System.Int32, mscorlib">
<value>43</value>
</data>
<data name="chWatchFolderIncludeSubdirectories.Text" xml:space="preserve">
<value>Include subdirectories</value>
</data>
<data name="chWatchFolderIncludeSubdirectories.Width" type="System.Int32, mscorlib">
<value>182</value>
</data>
<data name="tttvMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -9342,6 +9372,9 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>784, 511</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>800, 550</value>
</data>

8
ShareX/TaskHelpers.cs
View file

@ -1884,15 +1884,15 @@ public static void ShowNotificationTip(string text, string title = "ShareX", int
{
if (duration < 0)
{
duration = (int)(Program.DefaultTaskSettings.AdvancedSettings.ToastWindowDuration * 1000);
duration = (int)(Program.DefaultTaskSettings.GeneralSettings.ToastWindowDuration * 1000);
}
NotificationFormConfig toastConfig = new NotificationFormConfig()
{
Duration = duration,
FadeDuration = (int)(Program.DefaultTaskSettings.AdvancedSettings.ToastWindowFadeDuration * 1000),
Placement = Program.DefaultTaskSettings.AdvancedSettings.ToastWindowPlacement,
Size = Program.DefaultTaskSettings.AdvancedSettings.ToastWindowSize,
FadeDuration = (int)(Program.DefaultTaskSettings.GeneralSettings.ToastWindowFadeDuration * 1000),
Placement = Program.DefaultTaskSettings.GeneralSettings.ToastWindowPlacement,
Size = Program.DefaultTaskSettings.GeneralSettings.ToastWindowSize,
Title = title,
Text = text
};

22
ShareX/TaskManager.cs
View file

@ -311,7 +311,7 @@ private static void Task_TaskCompleted(WorkerTask task)
lvi.ImageIndex = 1;
}
if (!info.TaskSettings.AdvancedSettings.DisableNotifications)
if (!info.TaskSettings.GeneralSettings.DisableNotifications)
{
if (info.TaskSettings.GeneralSettings.PlaySoundAfterUpload)
{
@ -323,7 +323,7 @@ private static void Task_TaskCompleted(WorkerTask task)
string errorMessage = info.Result.Errors[0];
if (info.TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted && !string.IsNullOrEmpty(errorMessage) &&
(!info.TaskSettings.AdvancedSettings.DisableNotificationsOnFullscreen || !CaptureHelpers.IsActiveWindowFullscreen()))
(!info.TaskSettings.GeneralSettings.DisableNotificationsOnFullscreen || !CaptureHelpers.IsActiveWindowFullscreen()))
{
TaskHelpers.ShowNotificationTip(errorMessage, "ShareX - " + Resources.TaskManager_task_UploadCompleted_Error, 5000);
}
@ -359,7 +359,7 @@ private static void Task_TaskCompleted(WorkerTask task)
RecentManager.Add(task);
if (!info.TaskSettings.AdvancedSettings.DisableNotifications && info.Job != TaskJob.ShareURL)
if (!info.TaskSettings.GeneralSettings.DisableNotifications && info.Job != TaskJob.ShareURL)
{
if (info.TaskSettings.GeneralSettings.PlaySoundAfterUpload)
{
@ -372,19 +372,19 @@ private static void Task_TaskCompleted(WorkerTask task)
}
if (info.TaskSettings.GeneralSettings.ShowToastNotificationAfterTaskCompleted && !string.IsNullOrEmpty(result) &&
(!info.TaskSettings.AdvancedSettings.DisableNotificationsOnFullscreen || !CaptureHelpers.IsActiveWindowFullscreen()))
(!info.TaskSettings.GeneralSettings.DisableNotificationsOnFullscreen || !CaptureHelpers.IsActiveWindowFullscreen()))
{
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,
Duration = (int)(info.TaskSettings.GeneralSettings.ToastWindowDuration * 1000),
FadeDuration = (int)(info.TaskSettings.GeneralSettings.ToastWindowFadeDuration * 1000),
Placement = info.TaskSettings.GeneralSettings.ToastWindowPlacement,
Size = info.TaskSettings.GeneralSettings.ToastWindowSize,
LeftClickAction = info.TaskSettings.GeneralSettings.ToastWindowLeftClickAction,
RightClickAction = info.TaskSettings.GeneralSettings.ToastWindowRightClickAction,
MiddleClickAction = info.TaskSettings.GeneralSettings.ToastWindowMiddleClickAction,
FilePath = info.FilePath,
Image = task.Image,
Title = "ShareX - " + Resources.TaskManager_task_UploadCompleted_ShareX___Task_completed,

73
ShareX/TaskSettings.cs
View file

@ -282,6 +282,16 @@ public class TaskSettingsGeneral
public bool PlaySoundAfterCapture = true;
public bool PlaySoundAfterUpload = true;
public bool ShowToastNotificationAfterTaskCompleted = true;
public float ToastWindowDuration = 3f;
public float ToastWindowFadeDuration = 1f;
public ContentAlignment ToastWindowPlacement = ContentAlignment.BottomRight;
public Size ToastWindowSize = new Size(400, 300);
public ToastClickAction ToastWindowLeftClickAction = ToastClickAction.OpenUrl;
public ToastClickAction ToastWindowRightClickAction = ToastClickAction.CloseNotification;
public ToastClickAction ToastWindowMiddleClickAction = ToastClickAction.AnnotateImage;
public bool DisableNotifications = false;
public bool DisableNotificationsOnFullscreen = false;
public PopUpNotificationType PopUpNotification = PopUpNotificationType.ToastNotification;
#endregion
@ -483,69 +493,6 @@ public class TaskSettingsAdvanced
[Category("After upload"), DefaultValue(0), Description("Automatically shorten URL if the URL is longer than the specified number of characters. 0 means automatic URL shortening is not active.")]
public int AutoShortenURLLength { get; set; }
[Category("Notifications"), DefaultValue(false), Description("Disable notifications.")]
public bool DisableNotifications { get; set; }
[Category("Notifications"), DefaultValue(false), Description("If active window is fullscreen then toast window or balloon tip won't be shown.")]
public bool DisableNotificationsOnFullscreen { get; set; }
private float toastWindowDuration;
[Category("Notifications"), DefaultValue(3f), Description("Specify how long should toast notification window will stay on screen (in seconds).")]
public float ToastWindowDuration
{
get
{
return toastWindowDuration;
}
set
{
toastWindowDuration = value.Clamp(0, 30);
}
}
private float toastWindowFadeDuration;
[Category("Notifications"), DefaultValue(1f), Description("After toast window duration end, toast window will start fading, specify duration of this fade animation (in seconds).")]
public float ToastWindowFadeDuration
{
get
{
return toastWindowFadeDuration;
}
set
{
toastWindowFadeDuration = value.Clamp(0, 30);
}
}
[Category("Notifications"), DefaultValue(ContentAlignment.BottomRight), Description("Specify where should toast notification window appear on the screen.")]
public ContentAlignment ToastWindowPlacement { get; set; }
private Size toastWindowSize;
[Category("Notifications"), DefaultValue(typeof(Size), "400, 300"), Description("Maximum toast notification window size.")]
public Size ToastWindowSize
{
get
{
return toastWindowSize;
}
set
{
toastWindowSize = new Size(Math.Max(value.Width, 100), Math.Max(value.Height, 100));
}
}
[Category("Notifications"), DefaultValue(ToastClickAction.OpenUrl), Description("Specify action after toast notification window is left clicked."), TypeConverter(typeof(EnumDescriptionConverter))]
public ToastClickAction ToastWindowClickAction { get; set; }
[Category("Notifications"), DefaultValue(ToastClickAction.CloseNotification), Description("Specify action after toast notification window is right clicked."), TypeConverter(typeof(EnumDescriptionConverter))]
public ToastClickAction ToastWindowRightClickAction { get; set; }
[Category("Notifications"), DefaultValue(ToastClickAction.AnnotateImage), Description("Specify action after toast notification window is middle clicked."), TypeConverter(typeof(EnumDescriptionConverter))]
public ToastClickAction ToastWindowMiddleClickAction { get; set; }
[Category("After upload"), DefaultValue(false), Description("After upload form will be automatically closed after 60 seconds.")]
public bool AutoCloseAfterUploadForm { get; set; }