CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Hotkey settings won't override empty descriptions that way language support can show default descriptions in that language

Browse source
This commit is contained in:
Jaex 2015-01-16 22:22:41 +02:00
parent 23b9b9267b
commit b88da70498
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ShareX/Forms/TaskSettingsForm.cs
View file

@ -61,7 +61,11 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
}
else
{
tbDescription.Text = TaskSettings.Description;
if (!TaskSettings.IsDefaultDescription)
{
tbDescription.Text = TaskSettings.Description;
}
cbUseDefaultAfterCaptureSettings.Checked = TaskSettings.UseDefaultAfterCaptureJob;
cbUseDefaultAfterUploadSettings.Checked = TaskSettings.UseDefaultAfterUploadJob;
cbUseDefaultDestinationSettings.Checked = TaskSettings.UseDefaultDestinations;
@ -79,7 +83,8 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
AddEnumItemsContextMenu<HotkeyType>(x =>
{
TaskSettings.Job = x;
tbDescription.Text = TaskSettings.Job.GetLocalizedDescription();
//tbDescription.Text = TaskSettings.Job.GetLocalizedDescription();
UpdateWindowTitle();
}, cmsTask);
AddMultiEnumItemsContextMenu<AfterCaptureTasks>(x => TaskSettings.AfterCaptureJob = TaskSettings.AfterCaptureJob.Swap(x), cmsAfterCapture);
AddMultiEnumItemsContextMenu<AfterUploadTasks>(x => TaskSettings.AfterUploadJob = TaskSettings.AfterUploadJob.Swap(x), cmsAfterUpload);

8
ShareX/TaskSettings.cs
View file

@ -54,6 +54,14 @@ public string Description
}
}
public bool IsDefaultDescription
{
get
{
return string.IsNullOrEmpty(description);
}
}
public HotkeyType Job = HotkeyType.None;
public bool UseDefaultAfterCaptureJob = true;