|
|
@ -3,8 +3,6 @@ using STranslate.ViewModel;
|
|
|
|
using System;
|
|
|
|
using System;
|
|
|
|
using System.Windows;
|
|
|
|
using System.Windows;
|
|
|
|
using System.Windows.Input;
|
|
|
|
using System.Windows.Input;
|
|
|
|
using System.Windows.Interop;
|
|
|
|
|
|
|
|
using System.Windows.Media.Imaging;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
namespace STranslate.View
|
|
|
|
namespace STranslate.View
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -21,6 +19,7 @@ namespace STranslate.View
|
|
|
|
DataContext = new MainVM(this);
|
|
|
|
DataContext = new MainVM(this);
|
|
|
|
vm = (MainVM)DataContext;
|
|
|
|
vm = (MainVM)DataContext;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//if (HotKeys.InputTranslate.Conflict || HotKeys.CrosswordTranslate.Conflict || HotKeys.ScreenShotTranslate.Conflict)
|
|
|
|
//if (HotKeys.InputTranslate.Conflict || HotKeys.CrosswordTranslate.Conflict || HotKeys.ScreenShotTranslate.Conflict)
|
|
|
|
//{
|
|
|
|
//{
|
|
|
|
// MessageBox.Show("全局快捷键有冲突,请您到设置中重新设置");
|
|
|
|
// MessageBox.Show("全局快捷键有冲突,请您到设置中重新设置");
|
|
|
|