Merge pull request Wox-launcher#3101 from yfdyh000/ui_pr1

UI improvements
enricogior · Jul 16, 2020 · b376d7c · b376d7c
2 parents 468ea25 + 3e04047
commit b376d7c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/Wox/Languages/en.xaml b/Wox/Languages/en.xaml
@@ -54,6 +54,7 @@
     <system:String x:Key="queryBoxFont">Query Box Font</system:String>
     <system:String x:Key="resultItemFont">Result Item Font</system:String>
     <system:String x:Key="resultItemHighlightFont">Result Item Highlight Font</system:String>
+    <system:String x:Key="resultItemHighlightFontSameAbove">Same as above</system:String>
     <system:String x:Key="windowMode">Window Mode</system:String>
     <system:String x:Key="opacity">Opacity</system:String>
     <system:String x:Key="theme_load_failure_path_not_exists">Theme {0} not exists, fallback to default theme</system:String>

diff --git a/Wox/Languages/zh-cn.xaml b/Wox/Languages/zh-cn.xaml
@@ -30,8 +30,8 @@
     <system:String x:Key="ignoreHotkeysOnFullscreen">全屏模式下忽略热键</system:String>
     <system:String x:Key="pythonDirectory">Python 路径</system:String>
     <system:String x:Key="autoUpdates">自动更新</system:String>
-    <system:String x:Key="updateToPrereleases">Update to Prereleases</system:String>
-    <system:String x:Key="selectPythonDirectory">Select</system:String>
+    <system:String x:Key="updateToPrereleases">更新到预发布版本</system:String>
+    <system:String x:Key="selectPythonDirectory">选择</system:String>
     <system:String x:Key="hideOnStartup">启动时不显示主窗口</system:String>
     <system:String x:Key="hideNotifyIcon">隐藏任务栏图标</system:String>
     <system:String x:Key="querySearchPrecision">搜索精度</system:String>
@@ -54,6 +54,7 @@
     <system:String x:Key="queryBoxFont">查询框字体</system:String>
     <system:String x:Key="resultItemFont">结果项字体</system:String>
     <system:String x:Key="resultItemHighlightFont">结果项中的高亮字体</system:String>
+    <system:String x:Key="resultItemHighlightFontSameAbove">同上</system:String>
     <system:String x:Key="windowMode">窗口模式</system:String>
     <system:String x:Key="opacity">透明度</system:String>
     <system:String x:Key="theme_load_failure_path_not_exists">无法找到主题 {0} ，切换为默认主题</system:String>

diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml
@@ -77,13 +77,13 @@
                 </CheckBox>
                 <StackPanel Margin="10" Orientation="Horizontal">
                     <TextBlock Text="{DynamicResource querySearchPrecision}" />
-                    <ComboBox Margin="10 0 0 0" Width="120"
+                    <ComboBox Margin="10 0 0 0"
                               ItemsSource="{Binding QuerySearchPrecisionStrings}" 
                               SelectedItem="{Binding Settings.QuerySearchPrecisionString}" />
                 </StackPanel>
                 <StackPanel Margin="10" Orientation="Horizontal">
                     <TextBlock Text="{DynamicResource lastQueryMode}" />
-                    <ComboBox Margin="10 0 0 0" Width="120"
+                    <ComboBox Margin="10 0 0 0"
                               ItemsSource="{Binding LastQueryModes}" SelectedValue="{Binding Settings.LastQueryMode}"
                               DisplayMemberPath="Display" SelectedValuePath="Value" />
                 </StackPanel>
@@ -139,6 +139,7 @@
                         </ListBox.ItemTemplate>
                     </ListBox>
                 </DockPanel>
+                <GridSplitter Width="3"/>
                 <Grid Grid.Column="1">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -187,12 +188,12 @@
                                     <TextBlock Text="{DynamicResource actionKeywords}"
                                                Visibility="{Binding ActionKeywordsVisibility}"
                                                Cursor="Hand" Foreground="Blue"
-                                               Margin="20 0 0 0"
-                                               MouseUp="OnPluginActionKeywordsClick" />
+                                               Margin="20,0,0,0"
+                                               MouseUp="OnPluginActionKeywordsClick" Padding="0,0,5,0" />
                                     <TextBlock Text="{Binding ActionKeywordsText}"
                                                Visibility="{Binding ActionKeywordsVisibility}"
                                                ToolTip="Change Action Keywords"
-                                               Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
+                                               Margin="0 0 0 0" Cursor="Hand" Foreground="Blue"
                                                MouseUp="OnPluginActionKeywordsClick" />
                                     <TextBlock Text="{Binding InitilizaTime}" Margin="10 0 0 0" />
                                     <TextBlock Text="{Binding QueryTime}" Margin="10 0 0 0" />
@@ -224,9 +225,10 @@
                     </TextBlock>
 
                     <ListBox SelectedItem="{Binding SelectedTheme}" ItemsSource="{Binding Themes}"
-                             Margin="10, 0, 10, 10" Width="180"
+                             Margin="10, 0, 10, 10"
                              HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
                 </DockPanel>
+                <GridSplitter Width="3"/>
                 <Grid Margin="0" Grid.Column="1">
                     <Grid.RowDefinitions>
                         <RowDefinition />
@@ -278,7 +280,7 @@
                             <RowDefinition/>
                         </Grid.RowDefinitions>
                         <TextBlock Text="{DynamicResource queryBoxFont}"
-                                   Grid.Column="0" Grid.Row="0" />
+                                   Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left" />
                         <ComboBox ItemsSource="{Binding Source={StaticResource SortedFontsQuery}}"
                                   SelectedItem="{Binding SelectedQueryBoxFont}"
                                   Grid.Column="1" Grid.Row="0"/>
@@ -299,7 +301,7 @@
                         </ComboBox>
 
                         <TextBlock Text="{DynamicResource resultItemFont}"
-                                   Grid.Column="0" Grid.Row="1" />
+                                   Grid.Column="0" Grid.Row="1" HorizontalAlignment="Left" />
                         <ComboBox ItemsSource="{Binding Source={StaticResource SortedFontsResult}}"
                                   SelectedItem="{Binding SelectedResultFont}"
                                   Grid.Column="1" Grid.Row="1"/>
@@ -318,10 +320,7 @@
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
-
-
-                        <TextBlock Text="{DynamicResource resultItemHighlightFont}"
-                                   Grid.Column="1" Grid.Row="2" />
+                        <TextBlock Text="{DynamicResource resultItemHighlightFont}" Grid.Row="2" HorizontalAlignment="Left" />
                         <ComboBox ItemsSource="{Binding SelectedResultFont.FamilyTypefaces}"
                                   SelectedItem="{Binding SelectedResultHighlightFontFaces}"
                                   Grid.Column="2" Grid.Row="2">
@@ -337,6 +336,7 @@
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
                         </ComboBox>
+                        <TextBlock Grid.Row="2" Grid.Column="1" HorizontalAlignment="Center" Text="{DynamicResource resultItemHighlightFontSameAbove}" />
                     </Grid>
                 </Grid>
             </Grid>