Skip to content

Commit 1d86e22

Browse files
committed
Per comment, use DynamicResource
1 parent d751803 commit 1d86e22

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

Flow.Launcher/Languages/en.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
<system:String x:Key="add">Add</system:String>
6969
<system:String x:Key="pleaseSelectAnItem">Please select an item</system:String>
7070
<system:String x:Key="deleteCustomHotkeyWarning">Are you sure you want to delete {0} plugin hotkey?</system:String>
71+
<system:String x:Key="queryWindowShadowEffect">Query window shadow effect</system:String>
72+
<system:String x:Key="shadowEffectCPUUsage">Shadow effect has a substantial usage of GPU.</system:String>
73+
<system:String x:Key="shadowEffectPerformance">Not recommended if you computer performance is limited.</system:String>
7174

7275
<!--Setting Proxy-->
7376
<system:String x:Key="proxy">HTTP Proxy</system:String>

Flow.Launcher/ResultListBox.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<ColumnDefinition />
4242
<ColumnDefinition Width="0" />
4343
</Grid.ColumnDefinitions>
44-
<Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left"
44+
<Image x:Name="ImageIcon" Width="32" Height="32" HorizontalAlignment="Left"
4545
Source="{Binding Image ,IsAsync=True}" />
4646
<Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
4747
<Grid.RowDefinitions>
@@ -91,7 +91,7 @@
9191
Value="True">
9292
<Setter TargetName="Title" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
9393
<Setter TargetName="SubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}" />
94-
<Setter TargetName="imgIco" Property="Style" Value="{DynamicResource ItemImageSelectedStyle}" />
94+
<Setter TargetName="ImageIcon" Property="Style" Value="{DynamicResource ItemImageSelectedStyle}" />
9595
</DataTrigger>
9696
</DataTemplate.Triggers>
9797
</DataTemplate>

Flow.Launcher/SettingWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@
227227
<RowDefinition Height="15"/>
228228
<RowDefinition Height="30"/>
229229
</Grid.RowDefinitions>
230-
<TextBlock Grid.Row="0" Text="Query window shadow effect" Margin="0 30 0 0" FontSize="14" />
230+
<TextBlock Grid.Row="0" Text="{DynamicResource queryWindowShadowEffect}" Margin="0 30 0 0" FontSize="14" />
231231
<ui:ToggleSwitch Grid.Row="0" IsOn="{Binding DropShadowEffect}" Margin="210 23 0 0" Width="80"/>
232-
<TextBlock Grid.Row="1" Text="Shadow effect has a substantial usage of GPU."
232+
<TextBlock Grid.Row="1" Text="{DynamicResource shadowEffectCPUUsage}"
233233
Width="280"
234234
FontSize="10" HorizontalAlignment="Left"/>
235-
<TextBlock Grid.Row="2" Text="Not recommended if you computer performance is limited."
235+
<TextBlock Grid.Row="2" Text="{DynamicResource shadowEffectPerformance}"
236236
Width="320"
237237
FontSize="10" HorizontalAlignment="Left"/>
238238
</Grid>

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@
66
<system:String x:Key="flowlauncher_plugin_browserbookmark_plugin_name">Browser Bookmarks</system:String>
77
<system:String x:Key="flowlauncher_plugin_browserbookmark_plugin_description">Search your browser bookmarks</system:String>
88

9+
<!--Settings-->
10+
<system:String x:Key="flowlauncher_plugin_browserbookmark_settings_openBookmarks">Open bookmarks in:</system:String>
11+
<system:String x:Key="flowlauncher_plugin_browserbookmark_settings_newWindow">New window</system:String>
12+
<system:String x:Key="flowlauncher_plugin_browserbookmark_settings_newTab">New tab</system:String>
13+
914
</ResourceDictionary>

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@
1818
<ColumnDefinition Width="140"/>
1919
<ColumnDefinition Width="100"/>
2020
</Grid.ColumnDefinitions>
21-
<Label Content="Open bookmarks in:" FontSize="15" Grid.Column="0" Margin="0 5 0 0"/>
22-
<RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Grid.Column="1"/>
23-
<RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Grid.Column="2"/>
21+
<Label Grid.Column="0" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
22+
FontSize="15" Margin="0 5 0 0"/>
23+
<RadioButton Grid.Column="1" Name="NewWindowBrowser" GroupName="OpenSearchBehaviour"
24+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"
25+
Click="OnNewBrowserWindowClick" />
26+
<RadioButton Grid.Column="2" Name="NewTabInBrowser" GroupName="OpenSearchBehaviour"
27+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"
28+
Click="OnNewTabClick" />
2429
</Grid>
2530
</StackPanel>
2631
<StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="41,13,0,0">

0 commit comments

Comments
 (0)