|
3 | 3 | xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
4 | 4 | xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
5 | 5 | xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
6 | | - xmlns:local="clr-namespace:Wox.Plugin.Caculator.Views" |
7 | | - xmlns:infrastructure="clr-namespace:Wox.Infrastructure;assembly=Wox.Infrastructure" |
8 | 6 | xmlns:ui="clr-namespace:Wox.Infrastructure.UI;assembly=Wox.Infrastructure" |
9 | 7 | xmlns:calculator="clr-namespace:Wox.Plugin.Caculator" |
10 | 8 | xmlns:core="clr-namespace:Wox.Core;assembly=Wox.Core" |
| 9 | + xmlns:viewModels="clr-namespace:Wox.Plugin.Caculator.ViewModels" |
11 | 10 | mc:Ignorable="d" |
12 | 11 | Loaded="CalculatorSettings_Loaded" |
13 | 12 | d:DesignHeight="450" d:DesignWidth="800"> |
|
19 | 18 | <Border BorderBrush="Gray" Margin="10" BorderThickness="1"> |
20 | 19 | <Grid Margin="10"> |
21 | 20 | <Grid.RowDefinitions> |
22 | | - <RowDefinition Height="25"/> |
| 21 | + <RowDefinition Height="auto"/> |
| 22 | + <RowDefinition Height="auto"/> |
23 | 23 | </Grid.RowDefinitions> |
24 | 24 | <Grid.ColumnDefinitions> |
25 | 25 | <ColumnDefinition Width="*"/> |
26 | 26 | <ColumnDefinition Width="3*"/> |
27 | 27 | </Grid.ColumnDefinitions> |
28 | | - |
| 28 | + |
29 | 29 | <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource wox_plugin_calculator_output_decimal_seperator}" VerticalAlignment="Center" /> |
30 | | - <ComboBox Grid.Column="1" |
| 30 | + <ComboBox x:Name="DecimalSeparatorComboBox" |
| 31 | + Grid.Column="1" |
31 | 32 | Grid.Row="0" |
32 | | - x:Name="DecimalSeparatorComboBox" |
33 | | - Width="200" |
| 33 | + Margin="0 5 0 5" |
34 | 34 | HorizontalAlignment="Left" |
35 | 35 | SelectedItem="{Binding Settings.DecimalSeparator}" |
36 | 36 | ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type calculator:DecimalSeparator}}}"> |
|
40 | 40 | </DataTemplate> |
41 | 41 | </ComboBox.ItemTemplate> |
42 | 42 | </ComboBox> |
| 43 | + |
| 44 | + <TextBlock Grid.Column="0" Grid.Row="1" Text="Decimal places" VerticalAlignment="Center" /> |
| 45 | + <ComboBox x:Name="MaxDecimalPlaces" |
| 46 | + Grid.Column="1" |
| 47 | + Grid.Row="1" |
| 48 | + Margin="0 5 0 5" |
| 49 | + HorizontalAlignment="Left" |
| 50 | + SelectedItem="{Binding Settings.MaxDecimalPlaces}" |
| 51 | + ItemsSource="{Binding MaxDecimalPlacesRange}"> |
| 52 | + </ComboBox> |
| 53 | + |
43 | 54 | </Grid> |
44 | 55 | </Border> |
45 | 56 | </UserControl> |
0 commit comments