add:issue #402
This commit is contained in:
@@ -285,6 +285,7 @@ namespace Ink_Canvas.Helpers
|
|||||||
// 功能快捷键
|
// 功能快捷键
|
||||||
RegisterHotkey("DrawLine", Key.L, ModifierKeys.Alt, () => _mainWindow.BtnDrawLine_Click(null, null));
|
RegisterHotkey("DrawLine", Key.L, ModifierKeys.Alt, () => _mainWindow.BtnDrawLine_Click(null, null));
|
||||||
RegisterHotkey("Screenshot", Key.C, ModifierKeys.Alt, () => _mainWindow.SaveScreenShotToDesktop());
|
RegisterHotkey("Screenshot", Key.C, ModifierKeys.Alt, () => _mainWindow.SaveScreenShotToDesktop());
|
||||||
|
RegisterHotkey("QuickDraw", Key.K, ModifierKeys.Alt, () => _mainWindow.OpenQuickDrawFromHotkey());
|
||||||
RegisterHotkey("Hide", Key.V, ModifierKeys.Alt, () => _mainWindow.SymbolIconEmoji_MouseUp(null, null));
|
RegisterHotkey("Hide", Key.V, ModifierKeys.Alt, () => _mainWindow.SymbolIconEmoji_MouseUp(null, null));
|
||||||
|
|
||||||
// 退出快捷键
|
// 退出快捷键
|
||||||
@@ -1033,6 +1034,7 @@ namespace Ink_Canvas.Helpers
|
|||||||
new HotkeyConfigItem { Name = "Pen5", Key = Key.D5, Modifiers = ModifierKeys.Alt },
|
new HotkeyConfigItem { Name = "Pen5", Key = Key.D5, Modifiers = ModifierKeys.Alt },
|
||||||
new HotkeyConfigItem { Name = "DrawLine", Key = Key.L, Modifiers = ModifierKeys.Alt },
|
new HotkeyConfigItem { Name = "DrawLine", Key = Key.L, Modifiers = ModifierKeys.Alt },
|
||||||
new HotkeyConfigItem { Name = "Screenshot", Key = Key.C, Modifiers = ModifierKeys.Alt },
|
new HotkeyConfigItem { Name = "Screenshot", Key = Key.C, Modifiers = ModifierKeys.Alt },
|
||||||
|
new HotkeyConfigItem { Name = "QuickDraw", Key = Key.K, Modifiers = ModifierKeys.Alt },
|
||||||
new HotkeyConfigItem { Name = "Hide", Key = Key.V, Modifiers = ModifierKeys.Alt },
|
new HotkeyConfigItem { Name = "Hide", Key = Key.V, Modifiers = ModifierKeys.Alt },
|
||||||
new HotkeyConfigItem { Name = "Exit", Key = Key.Escape, Modifiers = ModifierKeys.None }
|
new HotkeyConfigItem { Name = "Exit", Key = Key.Escape, Modifiers = ModifierKeys.None }
|
||||||
});
|
});
|
||||||
@@ -1111,6 +1113,14 @@ namespace Ink_Canvas.Helpers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 旧版 HotkeyConfig.json 无「快抽」项时补注册默认组合,避免升级后无快捷键
|
||||||
|
if (successCount > 0 && !IsHotkeyRegistered("QuickDraw"))
|
||||||
|
{
|
||||||
|
var quickDrawAction = GetActionByName("QuickDraw");
|
||||||
|
if (quickDrawAction != null && RegisterHotkey("QuickDraw", Key.K, ModifierKeys.Alt, quickDrawAction))
|
||||||
|
successCount++;
|
||||||
|
}
|
||||||
|
|
||||||
if (successCount > 0)
|
if (successCount > 0)
|
||||||
{
|
{
|
||||||
_hotkeysShouldBeRegistered = true;
|
_hotkeysShouldBeRegistered = true;
|
||||||
@@ -1221,6 +1231,8 @@ namespace Ink_Canvas.Helpers
|
|||||||
return () => _mainWindow.BtnDrawLine_Click(null, null);
|
return () => _mainWindow.BtnDrawLine_Click(null, null);
|
||||||
case "Screenshot":
|
case "Screenshot":
|
||||||
return () => _mainWindow.SaveScreenShotToDesktop();
|
return () => _mainWindow.SaveScreenShotToDesktop();
|
||||||
|
case "QuickDraw":
|
||||||
|
return () => _mainWindow.OpenQuickDrawFromHotkey();
|
||||||
case "Hide":
|
case "Hide":
|
||||||
return () => _mainWindow.SymbolIconEmoji_MouseUp(null, null);
|
return () => _mainWindow.SymbolIconEmoji_MouseUp(null, null);
|
||||||
case "Exit":
|
case "Exit":
|
||||||
|
|||||||
@@ -4711,6 +4711,22 @@ namespace Ink_Canvas
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal void OpenQuickDrawFromHotkey()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (Settings?.RandSettings?.EnableQuickDraw != true)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var quickDrawWindow = new QuickDrawWindow();
|
||||||
|
quickDrawWindow.ShowDialog();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
LogHelper.WriteLogToFile($"打开快抽窗口失败: {ex.Message}", LogHelper.LogType.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 显示快抽悬浮按钮
|
/// 显示快抽悬浮按钮
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -177,6 +177,11 @@
|
|||||||
Description="保存屏幕截图到桌面"
|
Description="保存屏幕截图到桌面"
|
||||||
DefaultKey="C"
|
DefaultKey="C"
|
||||||
DefaultModifiers="Alt"/>
|
DefaultModifiers="Alt"/>
|
||||||
|
<local:HotkeyItem x:Name="QuickDrawHotkey"
|
||||||
|
Title="快抽"
|
||||||
|
Description="打开快抽窗口(与悬浮快抽按钮相同)"
|
||||||
|
DefaultKey="K"
|
||||||
|
DefaultModifiers="Alt"/>
|
||||||
<local:HotkeyItem x:Name="HideHotkey"
|
<local:HotkeyItem x:Name="HideHotkey"
|
||||||
Title="隐藏"
|
Title="隐藏"
|
||||||
Description="隐藏应用程序"
|
Description="隐藏应用程序"
|
||||||
|
|||||||
@@ -135,6 +135,9 @@ namespace Ink_Canvas.Windows
|
|||||||
_hotkeyItems["Screenshot"] = ScreenshotHotkey;
|
_hotkeyItems["Screenshot"] = ScreenshotHotkey;
|
||||||
ScreenshotHotkey.HotkeyName = "Screenshot";
|
ScreenshotHotkey.HotkeyName = "Screenshot";
|
||||||
|
|
||||||
|
_hotkeyItems["QuickDraw"] = QuickDrawHotkey;
|
||||||
|
QuickDrawHotkey.HotkeyName = "QuickDraw";
|
||||||
|
|
||||||
_hotkeyItems["Hide"] = HideHotkey;
|
_hotkeyItems["Hide"] = HideHotkey;
|
||||||
HideHotkey.HotkeyName = "Hide";
|
HideHotkey.HotkeyName = "Hide";
|
||||||
|
|
||||||
@@ -243,6 +246,9 @@ namespace Ink_Canvas.Windows
|
|||||||
case "Screenshot":
|
case "Screenshot":
|
||||||
hotkeyItem.SetCurrentHotkey(Key.C, ModifierKeys.Alt);
|
hotkeyItem.SetCurrentHotkey(Key.C, ModifierKeys.Alt);
|
||||||
break;
|
break;
|
||||||
|
case "QuickDraw":
|
||||||
|
hotkeyItem.SetCurrentHotkey(Key.K, ModifierKeys.Alt);
|
||||||
|
break;
|
||||||
case "Hide":
|
case "Hide":
|
||||||
hotkeyItem.SetCurrentHotkey(Key.V, ModifierKeys.Alt);
|
hotkeyItem.SetCurrentHotkey(Key.V, ModifierKeys.Alt);
|
||||||
break;
|
break;
|
||||||
@@ -472,6 +478,8 @@ namespace Ink_Canvas.Windows
|
|||||||
return () => _mainWindow.BtnDrawLine_Click(null, null);
|
return () => _mainWindow.BtnDrawLine_Click(null, null);
|
||||||
case "Screenshot":
|
case "Screenshot":
|
||||||
return () => _mainWindow.SaveScreenShotToDesktop();
|
return () => _mainWindow.SaveScreenShotToDesktop();
|
||||||
|
case "QuickDraw":
|
||||||
|
return () => _mainWindow.OpenQuickDrawFromHotkey();
|
||||||
case "Hide":
|
case "Hide":
|
||||||
return () => _mainWindow.SymbolIconEmoji_MouseUp(null, null);
|
return () => _mainWindow.SymbolIconEmoji_MouseUp(null, null);
|
||||||
case "Exit":
|
case "Exit":
|
||||||
|
|||||||
Reference in New Issue
Block a user