CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-01 12:41:24 +12:00
Code Issues Packages Projects Releases Wiki Activity

Fix hotkey description problem

Browse source
This commit is contained in:
Jaex 2015-01-17 01:29:52 +02:00
parent c6dfd947eb
commit 3f8dae05c6
4 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ShareX/Forms/MainForm.cs
View file

@ -211,7 +211,7 @@ private void UpdateMainFormTip()
foreach (HotkeySettings hotkey in Program.HotkeysConfig.Hotkeys.Where(x => x.HotkeyInfo.IsValidHotkey)) foreach (HotkeySettings hotkey in Program.HotkeysConfig.Hotkeys.Where(x => x.HotkeyInfo.IsValidHotkey))
{ {
sb.AppendFormat("{0} | {1}\r\n", hotkey.HotkeyInfo, hotkey.TaskSettings.Description); sb.AppendFormat("{0} | {1}\r\n", hotkey.HotkeyInfo, hotkey.TaskSettings);
} }
} }
@ -220,7 +220,7 @@ private void UpdateMainFormTip()
private ToolStripMenuItem WorkflowMenuItem(HotkeySettings hotkeySetting) private ToolStripMenuItem WorkflowMenuItem(HotkeySettings hotkeySetting)
{ {
ToolStripMenuItem tsmi = new ToolStripMenuItem(hotkeySetting.TaskSettings.Description.Replace("&", "&&")); ToolStripMenuItem tsmi = new ToolStripMenuItem(hotkeySetting.TaskSettings.ToString().Replace("&", "&&"));
if (hotkeySetting.HotkeyInfo.IsValidHotkey) if (hotkeySetting.HotkeyInfo.IsValidHotkey)
{ {
tsmi.ShortcutKeyDisplayString = " " + hotkeySetting.HotkeyInfo; tsmi.ShortcutKeyDisplayString = " " + hotkeySetting.HotkeyInfo;
@ -711,7 +711,7 @@ private bool CheckCLIWorkflow(CLICommand command)
{ {
if (hotkeySetting.TaskSettings.Job != HotkeyType.None) if (hotkeySetting.TaskSettings.Job != HotkeyType.None)
{ {
if (command.Parameter == hotkeySetting.TaskSettings.Description) if (command.Parameter == hotkeySetting.TaskSettings.ToString())
{ {
ExecuteJob(hotkeySetting.TaskSettings); ExecuteJob(hotkeySetting.TaskSettings);
return true; return true;

7
ShareX/Forms/TaskSettingsForm.cs
View file

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

2
ShareX/HotkeySettings.cs
View file

@ -50,7 +50,7 @@ public override string ToString()
{ {
if (HotkeyInfo != null && TaskSettings != null) if (HotkeyInfo != null && TaskSettings != null)
{ {
return string.Format("Hotkey: {0}{1}, Job: {2}", HotkeyInfo, ", Description: " + TaskSettings.Description, TaskSettings.Job); return string.Format("Hotkey: {0}, Description: {1}, Job: {2}", HotkeyInfo, TaskSettings, TaskSettings.Job);
} }
return string.Empty; return string.Empty;

24
ShareX/TaskSettings.cs
View file

@ -40,27 +40,7 @@ namespace ShareX
{ {
public class TaskSettings public class TaskSettings
{ {
private string description = string.Empty; public string Description = string.Empty;
public string Description
{
get
{
return !string.IsNullOrEmpty(description) ? description : Job.GetLocalizedDescription();
}
set
{
description = value;
}
}
public bool IsDefaultDescription
{
get
{
return string.IsNullOrEmpty(description);
}
}
public HotkeyType Job = HotkeyType.None; public HotkeyType Job = HotkeyType.None;
@ -128,7 +108,7 @@ public TaskSettingsCapture TaskSettingsCaptureReference
public override string ToString() public override string ToString()
{ {
return Description; return !string.IsNullOrEmpty(Description) ? Description : Job.GetLocalizedDescription();
} }
public bool IsUsingDefaultSettings public bool IsUsingDefaultSettings