mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-02 18:26:27 +13:00
there is a problem - submenu item gets checked when parent menu item is checked.
This commit is contained in:
parent
ffe2454b20
commit
a965e5e082
4 changed files with 10 additions and 19 deletions
|
@ -96,17 +96,13 @@ 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 = Program.DefaultTaskSettings.ImageFileDestination;
|
||||||
Program.DefaultTaskSettings.ImageFileDestination ?? FileDestination.Dropbox;
|
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.ImageFileDestination, tsmiImageFileUploaders,
|
SetEnumChecked(Program.DefaultTaskSettings.ImageFileDestination, tsmiImageFileUploaders,
|
||||||
tsmiTrayImageFileUploaders);
|
tsmiTrayImageFileUploaders);
|
||||||
}
|
}
|
||||||
else // if click not on "folder" with destinations then uncheck file destinations
|
else // if click not on "folder" with destinations then uncheck file destinations
|
||||||
{
|
{
|
||||||
if (Program.DefaultTaskSettings.ImageFileDestination != null)
|
Uncheck(tsmiImageFileUploaders, tsmiTrayImageFileUploaders);
|
||||||
{
|
|
||||||
Uncheck(tsmiImageFileUploaders, tsmiTrayImageFileUploaders);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}, tsmiImageUploaders, tsmiTrayImageUploaders);
|
}, tsmiImageUploaders, tsmiTrayImageUploaders);
|
||||||
tsmiImageFileUploaders = (ToolStripDropDownItem)tsmiImageUploaders.DropDownItems[tsmiImageUploaders.DropDownItems.Count - 1];
|
tsmiImageFileUploaders = (ToolStripDropDownItem)tsmiImageUploaders.DropDownItems[tsmiImageUploaders.DropDownItems.Count - 1];
|
||||||
|
@ -124,8 +120,7 @@ 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
|
Program.DefaultTaskSettings.TextFileDestination = Program.DefaultTaskSettings.TextFileDestination;
|
||||||
?? FileDestination.Dropbox;
|
|
||||||
SetEnumChecked(Program.DefaultTaskSettings.TextFileDestination, tsmiTextFileUploaders,
|
SetEnumChecked(Program.DefaultTaskSettings.TextFileDestination, tsmiTextFileUploaders,
|
||||||
tsmiTrayTextFileUploaders);
|
tsmiTrayTextFileUploaders);
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,18 +89,14 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
|
||||||
// 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
|
TaskSettings.ImageFileDestination = TaskSettings.ImageFileDestination;
|
||||||
?? FileDestination.Dropbox;
|
|
||||||
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
|
||||||
{
|
{
|
||||||
if (TaskSettings.ImageFileDestination != null)
|
MainForm.Uncheck(tsmiImageFileUploaders);
|
||||||
{
|
|
||||||
MainForm.Uncheck(tsmiImageFileUploaders);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
TaskSettings.ImageFileDestination = null;
|
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 => TaskSettings.ImageFileDestination = x, tsmiImageFileUploaders);
|
||||||
|
|
|
@ -63,9 +63,9 @@ public string Description
|
||||||
|
|
||||||
public bool UseDefaultDestinations = true;
|
public bool UseDefaultDestinations = true;
|
||||||
public ImageDestination ImageDestination = ImageDestination.Imgur;
|
public ImageDestination ImageDestination = ImageDestination.Imgur;
|
||||||
public FileDestination? ImageFileDestination = null;
|
public FileDestination ImageFileDestination = FileDestination.Dropbox;
|
||||||
public TextDestination TextDestination = TextDestination.Pastebin;
|
public TextDestination TextDestination = TextDestination.Pastebin;
|
||||||
public FileDestination? TextFileDestination = null;
|
public FileDestination TextFileDestination = FileDestination.Dropbox;
|
||||||
public FileDestination FileDestination = FileDestination.Dropbox;
|
public FileDestination FileDestination = FileDestination.Dropbox;
|
||||||
public UrlShortenerType URLShortenerDestination = UrlShortenerType.BITLY;
|
public UrlShortenerType URLShortenerDestination = UrlShortenerType.BITLY;
|
||||||
public URLSharingServices URLSharingServiceDestination = URLSharingServices.Twitter;
|
public URLSharingServices URLSharingServiceDestination = URLSharingServices.Twitter;
|
||||||
|
|
|
@ -796,10 +796,10 @@ public UploadResult UploadFile(Stream stream, string fileName)
|
||||||
switch (Info.DataType)
|
switch (Info.DataType)
|
||||||
{
|
{
|
||||||
case EDataType.Image:
|
case EDataType.Image:
|
||||||
fileDestination = Info.TaskSettings.ImageFileDestination ?? FileDestination.Dropbox;
|
fileDestination = Info.TaskSettings.ImageFileDestination;
|
||||||
break;
|
break;
|
||||||
case EDataType.Text:
|
case EDataType.Text:
|
||||||
fileDestination = Info.TaskSettings.TextFileDestination ?? FileDestination.Dropbox;
|
fileDestination = Info.TaskSettings.TextFileDestination;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
case EDataType.File:
|
case EDataType.File:
|
||||||
|
|
Loading…
Reference in a new issue