mirror of
https://github.com/microsoft/PowerToys.git
synced 2024-12-15 12:09:18 +08:00
Reflected functionality changes from the last commit on the whole project.
This commit is contained in:
parent
3fbebfc283
commit
dc4c33c0d5
@ -87,7 +87,7 @@ namespace Wox.Core.UserSettings
|
|||||||
public bool RememberLastLaunchLocation { get; set; }
|
public bool RememberLastLaunchLocation { get; set; }
|
||||||
|
|
||||||
[JsonProperty]
|
[JsonProperty]
|
||||||
public bool IgnoreHotkeysOnTopMostFocus { get; set; }
|
public bool IgnoreHotkeysOnFullscreen { get; set; }
|
||||||
|
|
||||||
[JsonProperty]
|
[JsonProperty]
|
||||||
public string ProxyServer { get; set; }
|
public string ProxyServer { get; set; }
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
<system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
|
<system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
|
||||||
<system:String x:Key="language">Language</system:String>
|
<system:String x:Key="language">Language</system:String>
|
||||||
<system:String x:Key="maxShowResults">Maximum show results</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-->
|
<!--Setting Plugin-->
|
||||||
<system:String x:Key="plugin">Plugin</system:String>
|
<system:String x:Key="plugin">Plugin</system:String>
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
<system:String x:Key="rememberLastLocation">Запомнить последнее место запуска</system:String>
|
<system:String x:Key="rememberLastLocation">Запомнить последнее место запуска</system:String>
|
||||||
<system:String x:Key="language">Язык</system:String>
|
<system:String x:Key="language">Язык</system:String>
|
||||||
<system:String x:Key="maxShowResults">Максимальное количество результатов</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-->
|
<!--Setting Plugin-->
|
||||||
<system:String x:Key="plugin">Плагины</system:String>
|
<system:String x:Key="plugin">Плагины</system:String>
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
<system:String x:Key="rememberLastLocation">记住上次启动位置</system:String>
|
<system:String x:Key="rememberLastLocation">记住上次启动位置</system:String>
|
||||||
<system:String x:Key="language">语言</system:String>
|
<system:String x:Key="language">语言</system:String>
|
||||||
<system:String x:Key="maxShowResults">最大结果显示个数</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>
|
<system:String x:Key="plugin">插件</system:String>
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
<system:String x:Key="rememberLastLocation">记住上次启动位置</system:String>
|
<system:String x:Key="rememberLastLocation">记住上次启动位置</system:String>
|
||||||
<system:String x:Key="language">語言</system:String>
|
<system:String x:Key="language">語言</system:String>
|
||||||
<system:String x:Key="maxShowResults">最大結果顯示個數</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>
|
<system:String x:Key="plugin">插件</system:String>
|
||||||
|
@ -363,7 +363,7 @@ namespace Wox
|
|||||||
private bool ShouldIgnoreHotkeys()
|
private bool ShouldIgnoreHotkeys()
|
||||||
{
|
{
|
||||||
//double if to omit calling win32 function
|
//double if to omit calling win32 function
|
||||||
if (UserSettingStorage.Instance.IgnoreHotkeysOnTopMostFocus)
|
if (UserSettingStorage.Instance.IgnoreHotkeysOnFullscreen)
|
||||||
if(WindowIntelopHelper.IsWindowFullscreen())
|
if(WindowIntelopHelper.IsWindowFullscreen())
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
@ -35,8 +35,8 @@
|
|||||||
<CheckBox x:Name="cbRememberLastLocation" Margin="10">
|
<CheckBox x:Name="cbRememberLastLocation" Margin="10">
|
||||||
<TextBlock Text="{DynamicResource rememberLastLocation}" ></TextBlock>
|
<TextBlock Text="{DynamicResource rememberLastLocation}" ></TextBlock>
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
<CheckBox x:Name="cbIgnoreHotkeysIfWindowIsTopmost" Margin="10">
|
<CheckBox x:Name="cbIgnoreHotkeysOnFullscreen" Margin="10">
|
||||||
<TextBlock Text="{DynamicResource ignoreHotkeysIfWindowIsTopmost}" ></TextBlock>
|
<TextBlock Text="{DynamicResource ignoreHotkeysOnFullscreen}" ></TextBlock>
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
<StackPanel Margin="10" Orientation="Horizontal">
|
<StackPanel Margin="10" Orientation="Horizontal">
|
||||||
<TextBlock Text="{DynamicResource language}"></TextBlock>
|
<TextBlock Text="{DynamicResource language}"></TextBlock>
|
||||||
|
@ -85,16 +85,16 @@ namespace Wox
|
|||||||
UserSettingStorage.Instance.Save();
|
UserSettingStorage.Instance.Save();
|
||||||
};
|
};
|
||||||
|
|
||||||
cbIgnoreHotkeysIfWindowIsTopmost.Checked += (o, e) =>
|
cbIgnoreHotkeysOnFullscreen.Checked += (o, e) =>
|
||||||
{
|
{
|
||||||
UserSettingStorage.Instance.IgnoreHotkeysOnTopMostFocus = true;
|
UserSettingStorage.Instance.IgnoreHotkeysOnFullscreen = true;
|
||||||
UserSettingStorage.Instance.Save();
|
UserSettingStorage.Instance.Save();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
cbIgnoreHotkeysIfWindowIsTopmost.Unchecked += (o, e) =>
|
cbIgnoreHotkeysOnFullscreen.Unchecked += (o, e) =>
|
||||||
{
|
{
|
||||||
UserSettingStorage.Instance.IgnoreHotkeysOnTopMostFocus = false;
|
UserSettingStorage.Instance.IgnoreHotkeysOnFullscreen = false;
|
||||||
UserSettingStorage.Instance.Save();
|
UserSettingStorage.Instance.Save();
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ namespace Wox
|
|||||||
cbHideWhenDeactive.IsChecked = UserSettingStorage.Instance.HideWhenDeactive;
|
cbHideWhenDeactive.IsChecked = UserSettingStorage.Instance.HideWhenDeactive;
|
||||||
cbDontPromptUpdateMsg.IsChecked = UserSettingStorage.Instance.DontPromptUpdateMsg;
|
cbDontPromptUpdateMsg.IsChecked = UserSettingStorage.Instance.DontPromptUpdateMsg;
|
||||||
cbRememberLastLocation.IsChecked = UserSettingStorage.Instance.RememberLastLaunchLocation;
|
cbRememberLastLocation.IsChecked = UserSettingStorage.Instance.RememberLastLaunchLocation;
|
||||||
cbIgnoreHotkeysIfWindowIsTopmost.IsChecked = UserSettingStorage.Instance.IgnoreHotkeysOnTopMostFocus;
|
cbIgnoreHotkeysOnFullscreen.IsChecked = UserSettingStorage.Instance.IgnoreHotkeysOnFullscreen;
|
||||||
|
|
||||||
LoadLanguages();
|
LoadLanguages();
|
||||||
comboMaxResultsToShow.ItemsSource = Enumerable.Range(2, 16);
|
comboMaxResultsToShow.ItemsSource = Enumerable.Range(2, 16);
|
||||||
|
Loading…
Reference in New Issue
Block a user