Skip to content

Commit 27daffe

Browse files
committed
Revert "Modified strings and added BoolNegationConverter"
This reverts commit f30c6fc.
1 parent f30c6fc commit 27daffe

File tree

3 files changed

+15
-40
lines changed

3 files changed

+15
-40
lines changed

Flow.Launcher/Converters/BoolNegationConverter.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

Flow.Launcher/Languages/en.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
132132
<system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
133133
<system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
134-
<system:String x:Key="showAtTopmost">Keep on top</system:String>
135-
<system:String x:Key="showAtTopmostToolTip">Keeps the search window on top even after it loses focus.</system:String>
134+
<system:String x:Key="showAtTopmost">Show Search Window at Topmost</system:String>
135+
<system:String x:Key="showAtTopmostToolTip">Show search window above other windows</system:String>
136136

137137
<!-- Setting Plugin -->
138138
<system:String x:Key="searchplugin">Search Plugin</system:String>

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
mc:Ignorable="d">
1818
<ui:Page.Resources>
1919
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
20-
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
2120
</ui:Page.Resources>
2221
<ScrollViewer
2322
Margin="0"
@@ -64,23 +63,12 @@
6463
OnContent="{DynamicResource enable}" />
6564
</cc:Card>
6665

67-
<cc:ExCard Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
68-
<cc:ExCard.SideContent>
69-
<ui:ToggleSwitch
66+
<cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
67+
<ui:ToggleSwitch
7068
IsOn="{Binding Settings.HideWhenDeactivated}"
7169
OffContent="{DynamicResource disable}"
7270
OnContent="{DynamicResource enable}" />
73-
</cc:ExCard.SideContent>
74-
<cc:Card
75-
Title="{DynamicResource showAtTopmost}"
76-
Type="InsideFit"
77-
Sub="{DynamicResource showAtTopmostToolTip}">
78-
<ui:ToggleSwitch
79-
IsOn="{Binding Settings.ShowAtTopmost}"
80-
OffContent="{DynamicResource disable}"
81-
OnContent="{DynamicResource enable}" IsEnabled="{Binding Settings.HideWhenDeactivated, Converter={StaticResource BoolNegationConverter}}"/>
82-
</cc:Card>
83-
</cc:ExCard>
71+
</cc:Card>
8472

8573
<cc:Card Title="{DynamicResource hideNotifyIcon}" Sub="{DynamicResource hideNotifyIconToolTip}">
8674
<ui:ToggleSwitch
@@ -89,6 +77,16 @@
8977
OnContent="{DynamicResource enable}" />
9078
</cc:Card>
9179

80+
<cc:Card
81+
Title="{DynamicResource showAtTopmost}"
82+
Margin="0 14 0 0"
83+
Icon="&#xE923;"
84+
Sub="{DynamicResource showAtTopmostToolTip}">
85+
<ui:ToggleSwitch
86+
IsOn="{Binding Settings.ShowAtTopmost}"
87+
OffContent="{DynamicResource disable}"
88+
OnContent="{DynamicResource enable}" />
89+
</cc:Card>
9290

9391
<cc:CardGroup Margin="0 14 0 0">
9492
<cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">

0 commit comments

Comments
 (0)