Skip to content

Commit 7333b57

Browse files
onesoundsonesounds
committed
- remove Bookmark/websearch setting panel hardcoded bgcolor
- Adjust Colors in settingwindow
1 parent c725181 commit 7333b57

File tree

5 files changed

+255
-142
lines changed

5 files changed

+255
-142
lines changed

‎Flow.Launcher/Resources/Dark.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<SolidColorBrush x:Key="NumberBoxColor25B" Color="#5d5d5d" />
3838
<SolidColorBrush x:Key="NumberBoxColor26B" Color="#ffffff" />
3939
<SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
40+
<SolidColorBrush x:Key="PluginInfoColor" Color="#878787" />
4041

4142
<SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
4243
<SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
@@ -72,6 +73,7 @@
7273
<Color x:Key="NumberBoxColor24">#f5f5f5</Color>
7374
<Color x:Key="NumberBoxColor25">#464646</Color>
7475
<Color x:Key="NumberBoxColor26">#ffffff</Color>
76+
<Color x:Key="HoverStoreGrid">#272727</Color>
7577

7678

7779
<SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />

‎Flow.Launcher/Resources/Light.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<SolidColorBrush x:Key="NumberBoxColor25B" Color="#878787" />
3535
<SolidColorBrush x:Key="NumberBoxColor26B" Color="#1b1b1b" />
3636
<SolidColorBrush x:Key="CustomNumberBoxBG" Color="#fdfdfd" />
37+
<SolidColorBrush x:Key="PluginInfoColor" Color="#8f8f8f" />
3738

3839
<SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
3940
<SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
@@ -66,6 +67,7 @@
6667
<Color x:Key="NumberBoxColor24">#f5f5f5</Color>
6768
<Color x:Key="NumberBoxColor25">#878787</Color>
6869
<Color x:Key="NumberBoxColor26">#1b1b1b</Color>
70+
<Color x:Key="HoverStoreGrid">#f6f6f6</Color>
6971

7072

7173
<SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,65 +1118,65 @@
11181118
MaxWidth="100"
11191119
Margin="10,0,0,0"
11201120
FontSize="11"
1121-
Foreground="#8F8F8F"
1121+
Foreground="{DynamicResource PluginInfoColor}"
11221122
Text="{DynamicResource author}" />
11231123
<TextBlock
11241124
MaxWidth="100"
11251125
Margin="5,0,0,0"
11261126
FontSize="11"
1127-
Foreground="#8F8F8F"
1127+
Foreground="{DynamicResource PluginInfoColor}"
11281128
Text="{Binding PluginPair.Metadata.Author}" />
11291129
<TextBlock
11301130
MaxWidth="100"
11311131
Margin="5,0,0,0"
11321132
VerticalAlignment="Center"
11331133
FontSize="11"
1134-
Foreground="#8F8F8F"
1134+
Foreground="{DynamicResource PluginInfoColor}"
11351135
Text="|" />
11361136
<TextBlock
11371137
MaxWidth="100"
11381138
Margin="5,0,0,0"
11391139
FontSize="11"
1140-
Foreground="#8F8F8F"
1140+
Foreground="{DynamicResource PluginInfoColor}"
11411141
Text="{DynamicResource plugin_init_time}" />
11421142
<TextBlock
11431143
MaxWidth="100"
11441144
Margin="5,0,0,0"
11451145
FontSize="11"
1146-
Foreground="#8F8F8F"
1146+
Foreground="{DynamicResource PluginInfoColor}"
11471147
Text="{Binding InitilizaTime}" />
11481148
<TextBlock
11491149
MaxWidth="100"
11501150
Margin="5,0,0,0"
11511151
VerticalAlignment="Center"
11521152
FontSize="11"
1153-
Foreground="#8F8F8F"
1153+
Foreground="{DynamicResource PluginInfoColor}"
11541154
Text="|" />
11551155
<TextBlock
11561156
MaxWidth="100"
11571157
Margin="5,0,0,0"
11581158
FontSize="11"
1159-
Foreground="#8F8F8F"
1159+
Foreground="{DynamicResource PluginInfoColor}"
11601160
Text="{DynamicResource plugin_query_time}" />
11611161
<TextBlock
11621162
MaxWidth="100"
11631163
Margin="5,0,0,0"
11641164
FontSize="11"
1165-
Foreground="#8F8F8F"
1165+
Foreground="{DynamicResource PluginInfoColor}"
11661166
Text="{Binding QueryTime}" />
11671167
<TextBlock
11681168
MaxWidth="100"
11691169
Margin="5,0,0,0"
11701170
VerticalAlignment="Center"
11711171
FontSize="11"
1172-
Foreground="#8F8F8F"
1172+
Foreground="{DynamicResource PluginInfoColor}"
11731173
Text="| version" />
11741174
<TextBlock
11751175
MaxWidth="100"
11761176
Margin="5,0,0,0"
11771177
VerticalAlignment="Center"
11781178
FontSize="11"
1179-
Foreground="#8F8F8F"
1179+
Foreground="{DynamicResource PluginInfoColor}"
11801180
Text="{Binding PluginPair.Metadata.Version}" />
11811181

11821182
<TextBlock
@@ -1187,7 +1187,7 @@
11871187
Cursor="Hand"
11881188
FontSize="12">
11891189
<Hyperlink
1190-
Foreground="#8F8F8F"
1190+
Foreground="{DynamicResource PluginInfoColor}"
11911191
NavigateUri="{Binding PluginPair.Metadata.Website}"
11921192
RequestNavigate="OnRequestNavigate">
11931193
<Run Text="Website" />
@@ -1201,7 +1201,7 @@
12011201
VerticalAlignment="Center"
12021202
Cursor="Hand"
12031203
FontSize="12"
1204-
Foreground="#8f8f8f"
1204+
Foreground="{DynamicResource PluginInfoColor}"
12051205
MouseUp="OnPluginDirecotyClick"
12061206
Text="{DynamicResource pluginDirectory}"
12071207
TextDecorations="Underline" />
@@ -1412,7 +1412,7 @@
14121412
VerticalAlignment="Stretch"
14131413
Panel.ZIndex="1">
14141414
<Grid.Background>
1415-
<SolidColorBrush Opacity=".95" Color="{StaticResource Color07}" />
1415+
<SolidColorBrush Opacity=".95" Color="{StaticResource HoverStoreGrid}" />
14161416
</Grid.Background>
14171417
<Grid.ColumnDefinitions>
14181418
<ColumnDefinition Width="{Binding ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}}" />

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

Lines changed: 86 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,106 @@
1-
<UserControl x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.SettingsControl"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
mc:Ignorable="d"
7-
Background="White"
8-
d:DesignHeight="300" d:DesignWidth="500"
9-
DataContext="{Binding RelativeSource={RelativeSource Self}}">
1+
<UserControl
2+
x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.SettingsControl"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
d:DesignHeight="300"
8+
d:DesignWidth="500"
9+
DataContext="{Binding RelativeSource={RelativeSource Self}}"
10+
mc:Ignorable="d">
1011
<Grid Margin="10">
1112
<Grid.RowDefinitions>
1213
<RowDefinition Height="50" />
13-
<RowDefinition Height="80"/>
14-
<RowDefinition Height="auto"/>
14+
<RowDefinition Height="80" />
15+
<RowDefinition Height="auto" />
1516
</Grid.RowDefinitions>
1617
<StackPanel>
17-
<Grid Grid.Row="0" Margin="30 20 0 0">
18+
<Grid Grid.Row="0" Margin="30,20,0,0">
1819
<Grid.ColumnDefinitions>
1920
<ColumnDefinition Width="160" />
20-
<ColumnDefinition Width="140"/>
21-
<ColumnDefinition Width="100"/>
21+
<ColumnDefinition Width="140" />
22+
<ColumnDefinition Width="100" />
2223
</Grid.ColumnDefinitions>
23-
<Label Grid.Column="0" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
24-
FontSize="15" Margin="10 5 0 0"/>
25-
<RadioButton Grid.Column="1" Name="NewWindowBrowser"
26-
IsChecked="{Binding OpenInNewBrowserWindow}"
27-
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"/>
28-
<RadioButton Grid.Column="2" Name="NewTabInBrowser"
29-
IsChecked="{Binding OpenInNewTab, Mode=OneTime}"
30-
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"/>
24+
<Label
25+
Grid.Column="0"
26+
Margin="10,5,0,0"
27+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
28+
FontSize="15" />
29+
<RadioButton
30+
Name="NewWindowBrowser"
31+
Grid.Column="1"
32+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"
33+
IsChecked="{Binding OpenInNewBrowserWindow}" />
34+
<RadioButton
35+
Name="NewTabInBrowser"
36+
Grid.Column="2"
37+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"
38+
IsChecked="{Binding OpenInNewTab, Mode=OneTime}" />
3139
</Grid>
3240
</StackPanel>
33-
<StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Row="1" Height="60" Margin="30,20,0,0">
34-
<Label Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}"
35-
Height="28" Margin="10"/>
36-
<TextBox x:Name="BrowserPathBox"
37-
HorizontalAlignment="Left"
38-
Height="30"
39-
TextWrapping="NoWrap"
40-
VerticalAlignment="Center"
41-
Text="{Binding Settings.BrowserPath}"
42-
Width="240"
43-
Margin="10"/>
44-
<Button x:Name="ViewButton" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
45-
HorizontalAlignment="Left" Margin="10" Width="100" Height="30" Click="OnChooseClick" FontSize="14" />
41+
<StackPanel
42+
Grid.Row="1"
43+
Height="60"
44+
Margin="30,20,0,0"
45+
VerticalAlignment="Top"
46+
Orientation="Horizontal">
47+
<Label
48+
Height="28"
49+
Margin="10"
50+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}" />
51+
<TextBox
52+
x:Name="BrowserPathBox"
53+
Width="240"
54+
Height="30"
55+
Margin="10"
56+
HorizontalAlignment="Left"
57+
VerticalAlignment="Center"
58+
Text="{Binding Settings.BrowserPath}"
59+
TextWrapping="NoWrap" />
60+
<Button
61+
x:Name="ViewButton"
62+
Width="100"
63+
Height="30"
64+
Margin="10"
65+
HorizontalAlignment="Left"
66+
Click="OnChooseClick"
67+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
68+
FontSize="14" />
4669
</StackPanel>
47-
<StackPanel Grid.Row="2" Orientation="Vertical" Margin="30,20,0,0">
48-
<TextBlock Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" Margin="10"/>
49-
<ListView Grid.Row="2" ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
50-
SelectedItem="{Binding SelectedCustomBrowser}"
51-
Margin="10"
52-
BorderBrush="DarkGray"
53-
BorderThickness="1"
54-
Style="{StaticResource {x:Static GridView.GridViewStyleKey}}"
55-
Height="auto"
56-
Name="CustomBrowsers"
57-
MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser">
70+
<StackPanel
71+
Grid.Row="2"
72+
Margin="30,20,0,0"
73+
Orientation="Vertical">
74+
<TextBlock Margin="10" Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" />
75+
<ListView
76+
Name="CustomBrowsers"
77+
Grid.Row="2"
78+
Height="auto"
79+
Margin="10"
80+
BorderBrush="DarkGray"
81+
BorderThickness="1"
82+
ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
83+
MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser"
84+
SelectedItem="{Binding SelectedCustomBrowser}"
85+
Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
5886
<ListView.View>
5987
<GridView>
60-
<GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}"/>
61-
<GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}"/>
88+
<GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
89+
<GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
6290
</GridView>
6391
</ListView.View>
6492
</ListView>
6593
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
66-
<Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}"
67-
Margin="10" Click="NewCustomBrowser" Width="80" />
68-
<Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}"
69-
Margin="10" Click="DeleteCustomBrowser" Width="80"/>
94+
<Button
95+
Width="80"
96+
Margin="10"
97+
Click="NewCustomBrowser"
98+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
99+
<Button
100+
Width="80"
101+
Margin="10"
102+
Click="DeleteCustomBrowser"
103+
Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />
70104
</StackPanel>
71105
</StackPanel>
72106
</Grid>

0 commit comments

Comments
 (0)