diff --git a/STranslate/View/MainWindow.xaml b/STranslate/View/MainWindow.xaml index 819695f..da0ed64 100644 --- a/STranslate/View/MainWindow.xaml +++ b/STranslate/View/MainWindow.xaml @@ -3,10 +3,10 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:vm="clr-namespace:STranslate.ViewModel" xmlns:tb="http://www.hardcodet.net/taskbar" - xmlns:local="clr-namespace:STranslate" xmlns:i="http://schemas.microsoft.com/xaml/behaviors" + xmlns:vm="clr-namespace:STranslate.ViewModel" + xmlns:local="clr-namespace:STranslate.View" mc:Ignorable="d" x:Name="Mwin" Background="Transparent" diff --git a/STranslate/View/MainWindow.xaml.cs b/STranslate/View/MainWindow.xaml.cs index e9703ea..379851e 100644 --- a/STranslate/View/MainWindow.xaml.cs +++ b/STranslate/View/MainWindow.xaml.cs @@ -3,8 +3,6 @@ using STranslate.ViewModel; using System; using System.Windows; using System.Windows.Input; -using System.Windows.Interop; -using System.Windows.Media.Imaging; namespace STranslate.View { @@ -21,6 +19,7 @@ namespace STranslate.View DataContext = new MainVM(this); vm = (MainVM)DataContext; + //if (HotKeys.InputTranslate.Conflict || HotKeys.CrosswordTranslate.Conflict || HotKeys.ScreenShotTranslate.Conflict) //{ // MessageBox.Show("全局快捷键有冲突,请您到设置中重新设置");