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

After import update hotkeys

Browse source
This commit is contained in:
Jaex 2016-02-12 02:15:23 +02:00
parent 26ba620f33
commit 354996ca8a
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -503,7 +503,7 @@ private void btnImport_Click(object sender, EventArgs e)
btnImport.Enabled = true;
}
Program.MainForm.UpdateControls();
Program.MainForm.UpdateAll();
});
}
}

14
ShareX/Forms/MainForm.cs
View file

@ -173,7 +173,7 @@ private void InitializeControls()
HandleCreated += MainForm_HandleCreated;
}
public void UpdateControls()
private void UpdateControls()
{
niTray.Visible = Program.Settings.ShowTray;
@ -246,6 +246,18 @@ public void UpdateControls()
AfterSettingsJobs();
}
public void UpdateAll()
{
UpdateControls();
if (Program.HotkeyManager != null)
{
Program.HotkeyManager.UpdateHotkeys(Program.HotkeysConfig.Hotkeys, true);
}
UpdateWorkflowsMenu();
}
private void AfterShownJobs()
{
if (Program.IsFirstTimeConfig)

10
ShareX/HotkeyManager.cs
View file

@ -52,6 +52,16 @@ public HotkeyManager(HotkeyForm form, List<HotkeySettings> hotkeys, bool showFai
hotkeyForm.HotkeyPress += hotkeyForm_HotkeyPress;
hotkeyForm.FormClosed += (sender, e) => hotkeyForm.InvokeSafe(() => UnregisterAllHotkeys(false));
UpdateHotkeys(hotkeys, showFailedHotkeys);
}
public void UpdateHotkeys(List<HotkeySettings> hotkeys, bool showFailedHotkeys)
{
if (Hotkeys != null)
{
UnregisterAllHotkeys();
}
Hotkeys = hotkeys;
RegisterAllHotkeys();