|
1897 | 1897 | <StackPanel Style="{StaticResource TextPanel}">
|
1898 | 1898 | <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Clock}" />
|
1899 | 1899 | </StackPanel>
|
1900 |
| - <ui:ToggleSwitch |
1901 |
| - Grid.Row="0" |
1902 |
| - Grid.Column="2" |
| 1900 | + <StackPanel Grid.Row="0" |
| 1901 | + Grid.Column="2" Orientation="Horizontal"> |
| 1902 | + <ComboBox |
| 1903 | + x:Name="TimeFormat" |
| 1904 | + Grid.Column="2" |
| 1905 | + MinWidth="180" |
| 1906 | + VerticalAlignment="Center" |
| 1907 | + Margin="0,0,18,0" |
| 1908 | + DisplayMemberPath="Display" |
| 1909 | + FontSize="14" |
| 1910 | + ItemsSource="{Binding ColorSchemes}" |
| 1911 | + SelectedValue="{Binding Settings.ColorScheme}" |
| 1912 | + SelectedValuePath="Value" |
| 1913 | + SelectionChanged="ColorSchemeSelectedIndexChanged" /> |
| 1914 | + <ui:ToggleSwitch |
| 1915 | + |
1903 | 1916 | IsOn="{Binding UseClock, Mode=TwoWay}"
|
1904 | 1917 | OffContent="{DynamicResource disable}"
|
1905 | 1918 | OnContent="{DynamicResource enable}"
|
1906 | 1919 | Style="{DynamicResource SideToggleSwitch}" />
|
| 1920 | + </StackPanel> |
1907 | 1921 | <TextBlock Style="{StaticResource Glyph}">
|
1908 | 1922 | 
|
1909 | 1923 | </TextBlock>
|
|
1921 | 1935 | <StackPanel Style="{StaticResource TextPanel}">
|
1922 | 1936 | <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource Date}" />
|
1923 | 1937 | </StackPanel>
|
| 1938 | + <StackPanel Grid.Row="0" |
| 1939 | + Grid.Column="2" Orientation="Horizontal"> |
| 1940 | + <ComboBox |
| 1941 | + x:Name="DateFormat" |
| 1942 | + Grid.Column="2" |
| 1943 | + MinWidth="180" |
| 1944 | + VerticalAlignment="Center" |
| 1945 | + Margin="0,0,18,0" |
| 1946 | + DisplayMemberPath="Display" |
| 1947 | + FontSize="14" |
| 1948 | + ItemsSource="{Binding ColorSchemes}" |
| 1949 | + SelectedValue="{Binding Settings.ColorScheme}" |
| 1950 | + SelectedValuePath="Value" |
| 1951 | + SelectionChanged="ColorSchemeSelectedIndexChanged" /> |
1924 | 1952 | <ui:ToggleSwitch
|
1925 |
| - Grid.Row="0" |
1926 |
| - Grid.Column="2" |
| 1953 | + |
1927 | 1954 | IsOn="{Binding UseDate, Mode=TwoWay}"
|
1928 | 1955 | OffContent="{DynamicResource disable}"
|
1929 | 1956 | OnContent="{DynamicResource enable}"
|
1930 | 1957 | Style="{DynamicResource SideToggleSwitch}" />
|
| 1958 | + </StackPanel> |
1931 | 1959 | <TextBlock Style="{StaticResource Glyph}">
|
1932 | 1960 | 
|
1933 | 1961 | </TextBlock>
|
|
0 commit comments