mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-06 05:05:42 +13:00
applied changes to TaskSettingsForm. reused code from MainForm.
removed unnecessary code that remained after making ImageFileDestination, TextFileDestination not nullable.
This commit is contained in:
parent
617da872de
commit
b5f9ba32d6
2 changed files with 45 additions and 22 deletions
|
@ -96,7 +96,6 @@ private void InitControls()
|
||||||
// if click on "folder" with file destinations then set ImageFileDestination and check it
|
// if click on "folder" with file destinations then set ImageFileDestination and check it
|
||||||
if (x == ImageDestination.FileUploader)
|
if (x == ImageDestination.FileUploader)
|
||||||
{
|
{
|
||||||
Program.DefaultTaskSettings.ImageFileDestination = Program.DefaultTaskSettings.ImageFileDestination;
|
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.ImageFileDestination, tsmiImageFileUploaders,
|
SetEnumChecked(Program.DefaultTaskSettings.ImageFileDestination, tsmiImageFileUploaders,
|
||||||
tsmiTrayImageFileUploaders);
|
tsmiTrayImageFileUploaders);
|
||||||
}
|
}
|
||||||
|
@ -120,7 +119,6 @@ private void InitControls()
|
||||||
// if click on "folder" with file destinations then set TextFileDestination and check it
|
// if click on "folder" with file destinations then set TextFileDestination and check it
|
||||||
if (x == TextDestination.FileUploader)
|
if (x == TextDestination.FileUploader)
|
||||||
{
|
{
|
||||||
Program.DefaultTaskSettings.TextFileDestination = Program.DefaultTaskSettings.TextFileDestination;
|
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.TextFileDestination, tsmiTextFileUploaders,
|
SetEnumChecked(Program.DefaultTaskSettings.TextFileDestination, tsmiTextFileUploaders,
|
||||||
tsmiTrayTextFileUploaders);
|
tsmiTrayTextFileUploaders);
|
||||||
}
|
}
|
||||||
|
@ -281,7 +279,7 @@ private void AddEnumItems<T>(Action<T> selectedEnum, params ToolStripDropDownIte
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="value">Enum item</param>
|
/// <param name="value">Enum item</param>
|
||||||
/// <param name="parents">DropDowns where enum-th item must be checked.</param>
|
/// <param name="parents">DropDowns where enum-th item must be checked.</param>
|
||||||
private void SetEnumChecked(Enum value, params ToolStripDropDownItem[] parents)
|
private static void SetEnumChecked(Enum value, params ToolStripDropDownItem[] parents)
|
||||||
{
|
{
|
||||||
if (value == null)
|
if (value == null)
|
||||||
return;
|
return;
|
||||||
|
@ -563,37 +561,39 @@ public void UpdateMainFormSettings()
|
||||||
SetMultiEnumChecked(Program.DefaultTaskSettings.AfterCaptureJob, tsddbAfterCaptureTasks, tsmiTrayAfterCaptureTasks);
|
SetMultiEnumChecked(Program.DefaultTaskSettings.AfterCaptureJob, tsddbAfterCaptureTasks, tsmiTrayAfterCaptureTasks);
|
||||||
SetMultiEnumChecked(Program.DefaultTaskSettings.AfterUploadJob, tsddbAfterUploadTasks, tsmiTrayAfterUploadTasks);
|
SetMultiEnumChecked(Program.DefaultTaskSettings.AfterUploadJob, tsddbAfterUploadTasks, tsmiTrayAfterUploadTasks);
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.ImageDestination, tsmiImageUploaders, tsmiTrayImageUploaders);
|
SetEnumChecked(Program.DefaultTaskSettings.ImageDestination, tsmiImageUploaders, tsmiTrayImageUploaders);
|
||||||
SetImageFileDestinationChecked();
|
SetImageFileDestinationChecked(Program.DefaultTaskSettings.ImageDestination,
|
||||||
|
Program.DefaultTaskSettings.ImageFileDestination, tsmiImageFileUploaders, tsmiTrayImageFileUploaders);
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.TextDestination, tsmiTextUploaders, tsmiTrayTextUploaders);
|
SetEnumChecked(Program.DefaultTaskSettings.TextDestination, tsmiTextUploaders, tsmiTrayTextUploaders);
|
||||||
SetTextFileDestinationChecked();
|
SetTextFileDestinationChecked(Program.DefaultTaskSettings.TextDestination,
|
||||||
|
Program.DefaultTaskSettings.TextFileDestination , tsmiTextFileUploaders, tsmiTrayTextFileUploaders);
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.FileDestination, tsmiFileUploaders, tsmiTrayFileUploaders);
|
SetEnumChecked(Program.DefaultTaskSettings.FileDestination, tsmiFileUploaders, tsmiTrayFileUploaders);
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.URLShortenerDestination, tsmiURLShorteners, tsmiTrayURLShorteners);
|
SetEnumChecked(Program.DefaultTaskSettings.URLShortenerDestination, tsmiURLShorteners, tsmiTrayURLShorteners);
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.URLSharingServiceDestination, tsmiURLSharingServices, tsmiTrayURLSharingServices);
|
SetEnumChecked(Program.DefaultTaskSettings.URLSharingServiceDestination, tsmiURLSharingServices, tsmiTrayURLSharingServices);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetTextFileDestinationChecked()
|
public static void SetTextFileDestinationChecked(TextDestination textDestination,
|
||||||
|
FileDestination textFileDestination, params ToolStripDropDownItem[] lists)
|
||||||
{
|
{
|
||||||
if (Program.DefaultTaskSettings.TextDestination == TextDestination.FileUploader)
|
if (textDestination == TextDestination.FileUploader)
|
||||||
{
|
{
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.TextFileDestination, tsmiTextFileUploaders,
|
SetEnumChecked(textFileDestination, lists);
|
||||||
tsmiTrayTextFileUploaders);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Uncheck(tsmiTextFileUploaders, tsmiTrayTextFileUploaders);
|
Uncheck(lists);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetImageFileDestinationChecked()
|
public static void SetImageFileDestinationChecked(ImageDestination imageDestination,
|
||||||
|
FileDestination imageFileDestination, params ToolStripDropDownItem[] lists)
|
||||||
{
|
{
|
||||||
if (Program.DefaultTaskSettings.ImageDestination == ImageDestination.FileUploader)
|
if (imageDestination == ImageDestination.FileUploader)
|
||||||
{
|
{
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.ImageFileDestination, tsmiImageFileUploaders,
|
SetEnumChecked(imageFileDestination, lists);
|
||||||
tsmiTrayImageFileUploaders);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Uncheck(tsmiImageFileUploaders, tsmiTrayImageFileUploaders);
|
Uncheck(lists);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,26 +83,47 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
|
||||||
}, cmsTask);
|
}, cmsTask);
|
||||||
AddMultiEnumItemsContextMenu<AfterCaptureTasks>(x => TaskSettings.AfterCaptureJob = TaskSettings.AfterCaptureJob.Swap(x), cmsAfterCapture);
|
AddMultiEnumItemsContextMenu<AfterCaptureTasks>(x => TaskSettings.AfterCaptureJob = TaskSettings.AfterCaptureJob.Swap(x), cmsAfterCapture);
|
||||||
AddMultiEnumItemsContextMenu<AfterUploadTasks>(x => TaskSettings.AfterUploadJob = TaskSettings.AfterUploadJob.Swap(x), cmsAfterUpload);
|
AddMultiEnumItemsContextMenu<AfterUploadTasks>(x => TaskSettings.AfterUploadJob = TaskSettings.AfterUploadJob.Swap(x), cmsAfterUpload);
|
||||||
|
// Destinations -> Image uploader
|
||||||
AddEnumItems<ImageDestination>(x =>
|
AddEnumItems<ImageDestination>(x =>
|
||||||
{
|
{
|
||||||
TaskSettings.ImageDestination = x;
|
TaskSettings.ImageDestination = x;
|
||||||
// if click on "folder" with file destinations then set ImageFileDestination and check it
|
// if click on "folder" with file destinations then set ImageFileDestination and check it
|
||||||
if (x == ImageDestination.FileUploader)
|
if (x == ImageDestination.FileUploader)
|
||||||
{
|
{
|
||||||
TaskSettings.ImageFileDestination = TaskSettings.ImageFileDestination;
|
|
||||||
SetEnumChecked(TaskSettings.ImageFileDestination, tsmiImageFileUploaders);
|
SetEnumChecked(TaskSettings.ImageFileDestination, tsmiImageFileUploaders);
|
||||||
}
|
}
|
||||||
else // if click not on "folder" with destinations then uncheck file destinations
|
else // if click not on "folder" with destinations then uncheck file destinations
|
||||||
{
|
{
|
||||||
MainForm.Uncheck(tsmiImageFileUploaders);
|
MainForm.Uncheck(tsmiImageFileUploaders);
|
||||||
}
|
}
|
||||||
TaskSettings.ImageFileDestination = FileDestination.Dropbox;
|
|
||||||
}, tsmiImageUploaders);
|
}, tsmiImageUploaders);
|
||||||
tsmiImageFileUploaders = (ToolStripDropDownItem)tsmiImageUploaders.DropDownItems[tsmiImageUploaders.DropDownItems.Count - 1];
|
tsmiImageFileUploaders = (ToolStripDropDownItem)tsmiImageUploaders.DropDownItems[tsmiImageUploaders.DropDownItems.Count - 1];
|
||||||
AddEnumItems<FileDestination>(x => TaskSettings.ImageFileDestination = x, tsmiImageFileUploaders);
|
AddEnumItems<FileDestination>(x =>
|
||||||
AddEnumItems<TextDestination>(x => TaskSettings.TextDestination = x, tsmiTextUploaders);
|
{
|
||||||
|
TaskSettings.ImageFileDestination = x;
|
||||||
|
tsmiImageFileUploaders.PerformClick();
|
||||||
|
}, tsmiImageFileUploaders);
|
||||||
|
// Destinations -> Text uploader
|
||||||
|
AddEnumItems<TextDestination>(x =>
|
||||||
|
{
|
||||||
|
TaskSettings.TextDestination = x;
|
||||||
|
// if click on "folder" with file destinations then set TextFileDestination and check it
|
||||||
|
if (x == TextDestination.FileUploader)
|
||||||
|
{
|
||||||
|
SetEnumChecked(TaskSettings.TextFileDestination, tsmiTextFileUploaders);
|
||||||
|
}
|
||||||
|
else // if click not on "folder" with destinations then uncheck file destinations
|
||||||
|
{
|
||||||
|
MainForm.Uncheck(tsmiTextFileUploaders);
|
||||||
|
}
|
||||||
|
}, tsmiTextUploaders);
|
||||||
tsmiTextFileUploaders = (ToolStripDropDownItem)tsmiTextUploaders.DropDownItems[tsmiTextUploaders.DropDownItems.Count - 1];
|
tsmiTextFileUploaders = (ToolStripDropDownItem)tsmiTextUploaders.DropDownItems[tsmiTextUploaders.DropDownItems.Count - 1];
|
||||||
AddEnumItems<FileDestination>(x => TaskSettings.TextFileDestination = x, tsmiTextFileUploaders);
|
AddEnumItems<FileDestination>(x =>
|
||||||
|
{
|
||||||
|
TaskSettings.TextFileDestination = x;
|
||||||
|
tsmiTextFileUploaders.PerformClick();
|
||||||
|
}, tsmiTextFileUploaders);
|
||||||
|
// Destinations -> File uploader
|
||||||
AddEnumItems<FileDestination>(x => TaskSettings.FileDestination = x, tsmiFileUploaders);
|
AddEnumItems<FileDestination>(x => TaskSettings.FileDestination = x, tsmiFileUploaders);
|
||||||
AddEnumItems<UrlShortenerType>(x => TaskSettings.URLShortenerDestination = x, tsmiURLShorteners);
|
AddEnumItems<UrlShortenerType>(x => TaskSettings.URLShortenerDestination = x, tsmiURLShorteners);
|
||||||
AddEnumItems<URLSharingServices>(x => TaskSettings.URLSharingServiceDestination = x, tsmiURLSharingServices);
|
AddEnumItems<URLSharingServices>(x => TaskSettings.URLSharingServiceDestination = x, tsmiURLSharingServices);
|
||||||
|
@ -111,9 +132,11 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
|
||||||
SetMultiEnumCheckedContextMenu(TaskSettings.AfterCaptureJob, cmsAfterCapture);
|
SetMultiEnumCheckedContextMenu(TaskSettings.AfterCaptureJob, cmsAfterCapture);
|
||||||
SetMultiEnumCheckedContextMenu(TaskSettings.AfterUploadJob, cmsAfterUpload);
|
SetMultiEnumCheckedContextMenu(TaskSettings.AfterUploadJob, cmsAfterUpload);
|
||||||
SetEnumChecked(TaskSettings.ImageDestination, tsmiImageUploaders);
|
SetEnumChecked(TaskSettings.ImageDestination, tsmiImageUploaders);
|
||||||
SetEnumChecked(TaskSettings.ImageFileDestination, tsmiImageFileUploaders);
|
MainForm.SetImageFileDestinationChecked(TaskSettings.ImageDestination,
|
||||||
|
TaskSettings.ImageFileDestination, tsmiImageFileUploaders);
|
||||||
SetEnumChecked(TaskSettings.TextDestination, tsmiTextUploaders);
|
SetEnumChecked(TaskSettings.TextDestination, tsmiTextUploaders);
|
||||||
SetEnumChecked(TaskSettings.TextFileDestination, tsmiTextFileUploaders);
|
MainForm.SetTextFileDestinationChecked(TaskSettings.TextDestination,
|
||||||
|
TaskSettings.TextFileDestination, tsmiTextFileUploaders);
|
||||||
SetEnumChecked(TaskSettings.FileDestination, tsmiFileUploaders);
|
SetEnumChecked(TaskSettings.FileDestination, tsmiFileUploaders);
|
||||||
SetEnumChecked(TaskSettings.URLShortenerDestination, tsmiURLShorteners);
|
SetEnumChecked(TaskSettings.URLShortenerDestination, tsmiURLShorteners);
|
||||||
SetEnumChecked(TaskSettings.URLSharingServiceDestination, tsmiURLSharingServices);
|
SetEnumChecked(TaskSettings.URLSharingServiceDestination, tsmiURLSharingServices);
|
||||||
|
|
Loading…
Reference in a new issue