From dc4c33c0d5db8b05c1c7f5594f2f3c429fb0a41f Mon Sep 17 00:00:00 2001
From: Boris Makogonyuk <madrivus@gmail.com>
Date: Thu, 8 Oct 2015 01:02:36 +0200
Subject: [PATCH] Reflected functionality changes from the last commit on the
 whole project.

---
 Wox.Core/UserSettings/UserSettingStorage.cs |  2 +-
 Wox/Languages/en.xaml                       |  2 +-
 Wox/Languages/ru.xaml                       |  2 +-
 Wox/Languages/zh-cn.xaml                    |  2 +-
 Wox/Languages/zh-tw.xaml                    |  2 +-
 Wox/MainWindow.xaml.cs                      |  2 +-
 Wox/SettingWindow.xaml                      |  4 ++--
 Wox/SettingWindow.xaml.cs                   | 10 +++++-----
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Wox.Core/UserSettings/UserSettingStorage.cs b/Wox.Core/UserSettings/UserSettingStorage.cs
index 75f00ce48a..632aaaa507 100644
--- a/Wox.Core/UserSettings/UserSettingStorage.cs
+++ b/Wox.Core/UserSettings/UserSettingStorage.cs
@@ -87,7 +87,7 @@ namespace Wox.Core.UserSettings
         public bool RememberLastLaunchLocation { get; set; }
 
         [JsonProperty]
-        public bool IgnoreHotkeysOnTopMostFocus { get; set; }
+        public bool IgnoreHotkeysOnFullscreen { get; set; }
 
         [JsonProperty]
         public string ProxyServer { get; set; }
diff --git a/Wox/Languages/en.xaml b/Wox/Languages/en.xaml
index 5871b9fae2..fe252ebb98 100644
--- a/Wox/Languages/en.xaml
+++ b/Wox/Languages/en.xaml
@@ -23,7 +23,7 @@
     <system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
     <system:String x:Key="language">Language</system:String>
     <system:String x:Key="maxShowResults">Maximum show results</system:String>
-    <system:String x:Key="ignoreHotkeysIfWindowIsTopmost">Ignore hotkeys if foreground window is TopMost</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys if window is fullscreen</system:String>
     
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Plugin</system:String>
diff --git a/Wox/Languages/ru.xaml b/Wox/Languages/ru.xaml
index ebf3f14886..e09aa9bc73 100644
--- a/Wox/Languages/ru.xaml
+++ b/Wox/Languages/ru.xaml
@@ -23,7 +23,7 @@
     <system:String x:Key="rememberLastLocation">Запомнить последнее место запуска</system:String>
     <system:String x:Key="language">Язык</system:String>
     <system:String x:Key="maxShowResults">Максимальное количество результатов</system:String>
-    <system:String x:Key="ignoreHotkeysIfWindowIsTopmost">Игнорировать горячие клавиши, если окно в фокусе самое верхнее</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreen">Игнорировать горячие клавиши, если окно в полноэкранном режиме</system:String>
     
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Плагины</system:String>
diff --git a/Wox/Languages/zh-cn.xaml b/Wox/Languages/zh-cn.xaml
index 7768be27ee..7e00547603 100644
--- a/Wox/Languages/zh-cn.xaml
+++ b/Wox/Languages/zh-cn.xaml
@@ -23,7 +23,7 @@
     <system:String x:Key="rememberLastLocation">记住上次启动位置</system:String>
     <system:String x:Key="language">语言</system:String>
     <system:String x:Key="maxShowResults">最大结果显示个数</system:String>
-    <system:String x:Key="ignoreHotkeysIfWindowIsTopmost">Ignore hotkeys if foreground window is TopMost</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys if foreground window is TopMost</system:String>
 
     <!--设置，插件-->
     <system:String x:Key="plugin">插件</system:String>
diff --git a/Wox/Languages/zh-tw.xaml b/Wox/Languages/zh-tw.xaml
index ae59971755..0f1ab8f9c4 100644
--- a/Wox/Languages/zh-tw.xaml
+++ b/Wox/Languages/zh-tw.xaml
@@ -23,7 +23,7 @@
     <system:String x:Key="rememberLastLocation">记住上次启动位置</system:String>
     <system:String x:Key="language">語言</system:String>
     <system:String x:Key="maxShowResults">最大結果顯示個數</system:String>
-    <system:String x:Key="ignoreHotkeysIfWindowIsTopmost">Ignore hotkeys if foreground window is TopMost</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys if foreground window is TopMost</system:String>
 
     <!--設置，插件-->
     <system:String x:Key="plugin">插件</system:String>
diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs
index 07a98f0872..9e305ff40c 100644
--- a/Wox/MainWindow.xaml.cs
+++ b/Wox/MainWindow.xaml.cs
@@ -363,7 +363,7 @@ namespace Wox
         private bool ShouldIgnoreHotkeys()
         {
             //double if to omit calling win32 function
-            if (UserSettingStorage.Instance.IgnoreHotkeysOnTopMostFocus)
+            if (UserSettingStorage.Instance.IgnoreHotkeysOnFullscreen)
                 if(WindowIntelopHelper.IsWindowFullscreen())
                     return true;
 
diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
index bc504df44c..b322cf16d5 100644
--- a/Wox/SettingWindow.xaml
+++ b/Wox/SettingWindow.xaml
@@ -35,8 +35,8 @@
                 <CheckBox x:Name="cbRememberLastLocation" Margin="10">
                     <TextBlock Text="{DynamicResource rememberLastLocation}" ></TextBlock>
                 </CheckBox>
-                <CheckBox x:Name="cbIgnoreHotkeysIfWindowIsTopmost" Margin="10">
-                    <TextBlock Text="{DynamicResource ignoreHotkeysIfWindowIsTopmost}" ></TextBlock>
+                <CheckBox x:Name="cbIgnoreHotkeysOnFullscreen" Margin="10">
+                    <TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreen}" ></TextBlock>
                 </CheckBox>
                 <StackPanel Margin="10" Orientation="Horizontal">
                     <TextBlock  Text="{DynamicResource language}"></TextBlock>
diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs
index 36021206de..5520b4c534 100644
--- a/Wox/SettingWindow.xaml.cs
+++ b/Wox/SettingWindow.xaml.cs
@@ -85,16 +85,16 @@ namespace Wox
                 UserSettingStorage.Instance.Save();
             };
 
-            cbIgnoreHotkeysIfWindowIsTopmost.Checked += (o, e) =>
+            cbIgnoreHotkeysOnFullscreen.Checked += (o, e) =>
             {
-                UserSettingStorage.Instance.IgnoreHotkeysOnTopMostFocus = true;
+                UserSettingStorage.Instance.IgnoreHotkeysOnFullscreen = true;
                 UserSettingStorage.Instance.Save();
             };
 
 
-            cbIgnoreHotkeysIfWindowIsTopmost.Unchecked += (o, e) =>
+            cbIgnoreHotkeysOnFullscreen.Unchecked += (o, e) =>
             {
-                UserSettingStorage.Instance.IgnoreHotkeysOnTopMostFocus = false;
+                UserSettingStorage.Instance.IgnoreHotkeysOnFullscreen = false;
                 UserSettingStorage.Instance.Save();
             };
 
@@ -110,7 +110,7 @@ namespace Wox
             cbHideWhenDeactive.IsChecked = UserSettingStorage.Instance.HideWhenDeactive;
             cbDontPromptUpdateMsg.IsChecked = UserSettingStorage.Instance.DontPromptUpdateMsg;
             cbRememberLastLocation.IsChecked = UserSettingStorage.Instance.RememberLastLaunchLocation;
-            cbIgnoreHotkeysIfWindowIsTopmost.IsChecked = UserSettingStorage.Instance.IgnoreHotkeysOnTopMostFocus;
+            cbIgnoreHotkeysOnFullscreen.IsChecked = UserSettingStorage.Instance.IgnoreHotkeysOnFullscreen;
 
             LoadLanguages();
             comboMaxResultsToShow.ItemsSource = Enumerable.Range(2, 16);