1
0
Эх сурвалжийг харах

Format xaml with one attribute per line

Daniel Chalmers 9 сар өмнө
parent
commit
7ac983fc18

+ 32 - 15
DesktopClock/MainWindow.xaml

@@ -27,10 +27,13 @@
         StateChanged="Window_StateChanged"
         KeyDown="Window_KeyDown">
     <Window.Resources>
-        <ContextMenu x:Key="MainContextMenu" x:Shared="False">
-            <MenuItem Command="{Binding CopyToClipboardCommand}" Header="_Copy" />
+        <ContextMenu x:Key="MainContextMenu"
+                     x:Shared="False">
+            <MenuItem Command="{Binding CopyToClipboardCommand}"
+                      Header="_Copy" />
 
-            <MenuItem Command="{Binding HideForNowCommand}" Header="_Hide for now" />
+            <MenuItem Command="{Binding HideForNowCommand}"
+                      Header="_Hide for now" />
 
             <Separator />
 
@@ -51,7 +54,8 @@
                 </MenuItem.Header>
             </MenuItem>
 
-            <MenuItem Header="The_me" ItemsSource="{x:Static local:Theme.DefaultThemes}">
+            <MenuItem Header="The_me"
+                      ItemsSource="{x:Static local:Theme.DefaultThemes}">
                 <MenuItem.Resources>
                     <Style TargetType="MenuItem">
                         <Setter Property="Command" Value="{Binding DataContext.SetThemeCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" />
@@ -65,25 +69,34 @@
 
             <Separator />
 
-            <MenuItem Command="{Binding OpenSettingsWindowCommand}" CommandParameter="0" Header="_Format" />
+            <MenuItem Command="{Binding OpenSettingsWindowCommand}"
+                      CommandParameter="0"
+                      Header="_Format" />
 
-            <MenuItem Command="{Binding OpenSettingsWindowCommand}" CommandParameter="1" Header="_Appearance" />
+            <MenuItem Command="{Binding OpenSettingsWindowCommand}"
+                      CommandParameter="1"
+                      Header="_Appearance" />
 
-            <MenuItem Command="{Binding OpenSettingsWindowCommand}" CommandParameter="2" Header="_Behavior" />
+            <MenuItem Command="{Binding OpenSettingsWindowCommand}"
+                      CommandParameter="2"
+                      Header="_Behavior" />
 
-            <MenuItem Command="{Binding OpenSettingsWindowCommand}" CommandParameter="3" Header="H_elp" />
+            <MenuItem Command="{Binding OpenSettingsWindowCommand}"
+                      CommandParameter="3"
+                      Header="H_elp" />
 
             <Separator />
 
             <MenuItem Command="{Binding OpenSettingsFileCommand}"
-			          Header="Advanced _settings"
-			          IsEnabled="{x:Static p:Settings.CanBeSaved}" />
+                      Header="Advanced _settings"
+                      IsEnabled="{x:Static p:Settings.CanBeSaved}" />
 
             <MenuItem Command="{Binding NewClockCommand}"
                       Header="Create _new clock"
                       IsEnabled="{x:Static p:Settings.CanBeSaved}" />
 
-            <MenuItem Command="{Binding ExitCommand}" Header="E_xit" />
+            <MenuItem Command="{Binding ExitCommand}"
+                      Header="E_xit" />
         </ContextMenu>
 
         <tb:TaskbarIcon x:Key="TrayIcon"
@@ -94,13 +107,15 @@
     </Window.Resources>
 
     <Viewbox Height="{Binding Height, Source={x:Static p:Settings.Default}, Mode=OneWay}">
-        <Border CornerRadius="{Binding BackgroundCornerRadius, Source={x:Static p:Settings.Default}, Mode=OneWay}" Padding="1,0,1,0">
+        <Border CornerRadius="{Binding BackgroundCornerRadius, Source={x:Static p:Settings.Default}, Mode=OneWay}"
+                Padding="1,0,1,0">
             <Border.Style>
                 <Style TargetType="Border">
                     <Setter Property="Background" Value="Transparent" />
 
                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding BackgroundEnabled, Source={x:Static p:Settings.Default}, Mode=OneWay}" Value="True">
+                        <DataTrigger Binding="{Binding BackgroundEnabled, Source={x:Static p:Settings.Default}, Mode=OneWay}"
+                                     Value="True">
                             <DataTrigger.Setters>
                                 <Setter Property="Background">
                                     <Setter.Value>
@@ -119,7 +134,8 @@
                             <MultiDataTrigger.Setters>
                                 <Setter Property="Background">
                                     <Setter.Value>
-                                        <SolidColorBrush Opacity="{Binding BackgroundOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}" Color="{Binding OuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+                                        <SolidColorBrush Opacity="{Binding BackgroundOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}"
+                                                         Color="{Binding OuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
                                     </Setter.Value>
                                 </Setter>
                             </MultiDataTrigger.Setters>
@@ -142,7 +158,8 @@
                         <Setter Property="Margin" Value="0" />
 
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding BackgroundEnabled, Source={x:Static p:Settings.Default}, Mode=OneWay}" Value="False">
+                            <DataTrigger Binding="{Binding BackgroundEnabled, Source={x:Static p:Settings.Default}, Mode=OneWay}"
+                                         Value="False">
                                 <DataTrigger.Setters>
                                     <Setter Property="Stroke">
                                         <Setter.Value>

+ 70 - 32
DesktopClock/SettingsWindow.xaml

@@ -24,7 +24,8 @@
         </Style>
     </Window.Resources>
 
-    <TabControl Padding="12,12,12,0" SelectedIndex="{Binding Settings.SettingsTabIndex, Mode=TwoWay}">
+    <TabControl Padding="12,12,12,0"
+                SelectedIndex="{Binding Settings.SettingsTabIndex, Mode=TwoWay}">
         <TabItem Header="_Format">
             <StackPanel>
                 <TextBlock Text="Date and Time Format:" />
@@ -46,7 +47,8 @@
                            FontSize="10"
                            Margin="0,0,0,12">
                     <Run Text=".NET format string for the time shown on the clock. Format specific parts inside { and }." />
-                    <Hyperlink NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings" RequestNavigate="Hyperlink_RequestNavigate">
+                    <Hyperlink NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings"
+                               RequestNavigate="Hyperlink_RequestNavigate">
                         Learn more
                     </Hyperlink>
                 </TextBlock>
@@ -59,7 +61,8 @@
                            FontSize="10"
                            Margin="0,0,0,12">
                     <Run Text=".NET format string for the countdown mode. If left blank, it will be dynamic." />
-                    <Hyperlink NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-timespan-format-strings" RequestNavigate="Hyperlink_RequestNavigate">
+                    <Hyperlink NavigateUri="https://learn.microsoft.com/en-us/dotnet/standard/base-types/custom-timespan-format-strings"
+                               RequestNavigate="Hyperlink_RequestNavigate">
                         Learn more
                     </Hyperlink>
                 </TextBlock>
@@ -71,7 +74,8 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <TextBox Text="{Binding Settings.CountdownTo, Mode=TwoWay}" Grid.Column="0" />
+                    <TextBox Text="{Binding Settings.CountdownTo, Mode=TwoWay}"
+                             Grid.Column="0" />
                     <Button Content="Reset"
                             Command="{Binding ResetCountdownCommand}"
                             Padding="4,0,4,0"
@@ -84,7 +88,8 @@
 
 
                 <TextBlock Text="Time Zone:" />
-                <ComboBox ItemsSource="{Binding TimeZones}" SelectedItem="{Binding Settings.TimeZone, Mode=TwoWay}" />
+                <ComboBox ItemsSource="{Binding TimeZones}"
+                          SelectedItem="{Binding Settings.TimeZone, Mode=TwoWay}" />
                 <TextBlock Text="A different time zone to be used."
                            FontStyle="Italic"
                            FontSize="10"
@@ -95,14 +100,16 @@
         <TabItem Header="_Appearance">
             <StackPanel>
                 <TextBlock Text="Font Family:" />
-                <ComboBox ItemsSource="{Binding FontFamilies}" SelectedItem="{Binding Settings.FontFamily, Mode=TwoWay}" />
+                <ComboBox ItemsSource="{Binding FontFamilies}"
+                          SelectedItem="{Binding Settings.FontFamily, Mode=TwoWay}" />
                 <TextBlock Text="Font to use for the clock's text."
                            FontStyle="Italic"
                            FontSize="10"
                            Margin="0,0,0,12" />
 
                 <TextBlock Text="Font Style:" />
-                <ComboBox ItemsSource="{Binding FontStyles}" SelectedItem="{Binding Settings.FontStyle, Mode=TwoWay}" />
+                <ComboBox ItemsSource="{Binding FontStyles}"
+                          SelectedItem="{Binding Settings.FontStyle, Mode=TwoWay}" />
                 <TextBlock Text="Style of font to use for the clock's text."
                            FontStyle="Italic"
                            FontSize="10"
@@ -122,7 +129,8 @@
                            FontSize="10"
                            Margin="0,0,0,12" />
 
-                <CheckBox Content="Enable Background" IsChecked="{Binding Settings.BackgroundEnabled, Mode=TwoWay}" />
+                <CheckBox Content="Enable Background"
+                          IsChecked="{Binding Settings.BackgroundEnabled, Mode=TwoWay}" />
                 <TextBlock Text="Shows a solid background instead of an outline."
                            FontStyle="Italic"
                            FontSize="10"
@@ -154,7 +162,8 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <TextBox Text="{Binding Settings.BackgroundImagePath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Column="0" />
+                    <TextBox Text="{Binding Settings.BackgroundImagePath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Grid.Column="0" />
                     <Button Content="Browse..."
                             Click="BrowseBackgroundImagePath"
                             Padding="4,0,4,0"
@@ -177,37 +186,43 @@
 
         <TabItem Header="_Behavior">
             <StackPanel>
-                <CheckBox Content="Show in Taskbar" IsChecked="{Binding Settings.ShowInTaskbar, Mode=TwoWay}" />
+                <CheckBox Content="Show in Taskbar"
+                          IsChecked="{Binding Settings.ShowInTaskbar, Mode=TwoWay}" />
                 <TextBlock Text="Shows the app icon in the taskbar instead of the tray."
                            FontStyle="Italic"
                            FontSize="10"
                            Margin="0,0,0,12" />
 
-                <CheckBox Content="Run on Startup" IsChecked="{Binding Settings.RunOnStartup, Mode=TwoWay}" />
+                <CheckBox Content="Run on Startup"
+                          IsChecked="{Binding Settings.RunOnStartup, Mode=TwoWay}" />
                 <TextBlock Text="Opens the app when you log in."
                            FontStyle="Italic"
                            FontSize="10"
                            Margin="0,0,0,12" />
 
-                <CheckBox Content="Start Hidden" IsChecked="{Binding Settings.StartHidden, Mode=TwoWay}" />
+                <CheckBox Content="Start Hidden"
+                          IsChecked="{Binding Settings.StartHidden, Mode=TwoWay}" />
                 <TextBlock Text="Starts the app hidden until the taskbar or tray icon is clicked."
                            FontStyle="Italic"
                            FontSize="10"
                            Margin="0,0,0,12" />
 
-                <CheckBox Content="Drag to Move" IsChecked="{Binding Settings.DragToMove, Mode=TwoWay}" />
+                <CheckBox Content="Drag to Move"
+                          IsChecked="{Binding Settings.DragToMove, Mode=TwoWay}" />
                 <TextBlock Text="Allows moving the clock by dragging it with the cursor."
                            FontStyle="Italic"
                            FontSize="10"
                            Margin="0,0,0,12" />
 
-                <CheckBox Content="Right Aligned" IsChecked="{Binding Settings.RightAligned, Mode=TwoWay}" />
+                <CheckBox Content="Right Aligned"
+                          IsChecked="{Binding Settings.RightAligned, Mode=TwoWay}" />
                 <TextBlock Text="Experimental: Keeps the clock window aligned to the right when the size changes."
                            FontStyle="Italic"
                            FontSize="10"
                            Margin="0,0,0,12" />
 
-                <CheckBox Content="Burn-in Mitigation" IsChecked="{Binding Settings.BurnInMitigation, Mode=TwoWay}" />
+                <CheckBox Content="Burn-in Mitigation"
+                          IsChecked="{Binding Settings.BurnInMitigation, Mode=TwoWay}" />
                 <TextBlock Text="Experimental: Shifts the clock periodically in order to reduce screen burn-in."
                            FontStyle="Italic"
                            FontSize="10"
@@ -220,7 +235,8 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <TextBox Text="{Binding Settings.WavFilePath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Column="0" />
+                    <TextBox Text="{Binding Settings.WavFilePath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Grid.Column="0" />
                     <Button Content="Browse..."
                             Click="BrowseWavFilePath"
                             Padding="4,0,4,0"
@@ -238,7 +254,8 @@
                            FontSize="10"
                            Margin="0,0,0,12" />
 
-                <CheckBox Content="Play WAV File on Countdown" IsChecked="{Binding Settings.PlaySoundOnCountdown, Mode=TwoWay}" />
+                <CheckBox Content="Play WAV File on Countdown"
+                          IsChecked="{Binding Settings.PlaySoundOnCountdown, Mode=TwoWay}" />
                 <TextBlock Text="Play the WAV file when the countdown time elapses."
                            FontStyle="Italic"
                            FontSize="10"
@@ -248,7 +265,10 @@
 
         <TabItem Header="H_elp">
             <StackPanel>
-                <TextBlock FontWeight="Bold" FontSize="16">Shortcuts</TextBlock>
+                <TextBlock FontWeight="Bold"
+                           FontSize="16">
+                    Shortcuts
+                </TextBlock>
                 <StackPanel Margin="0,0,0,12">
                     <TextBlock>
                         <Run FontWeight="Bold">Right-click:</Run>
@@ -270,69 +290,87 @@
                         Zoom out</TextBlock>
                 </StackPanel>
 
-                <TextBlock FontWeight="Bold" FontSize="16">Links</TextBlock>
+                <TextBlock FontWeight="Bold"
+                           FontSize="16">
+                    Links
+                </TextBlock>
                 <StackPanel Margin="0,0,0,12">
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/danielchalmers/DesktopClock/releases" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/danielchalmers/DesktopClock/releases"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             GitHub Releases (Check for updates)
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/danielchalmers/DesktopClock/issues" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/danielchalmers/DesktopClock/issues"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             GitHub Issues (Found a bug or have an idea?)
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://play.google.com/store/apps/details?id=com.danielchalmers.journalapp" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://play.google.com/store/apps/details?id=com.danielchalmers.journalapp"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             JournalApp - Save notes and keep track of your well-being (Android)
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/danielchalmers/Network-Monitor" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/danielchalmers/Network-Monitor"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             Network Monitor - View live latency and bandwidth usage (Windows)
                         </Hyperlink>
                     </TextBlock>
                 </StackPanel>
 
-                <TextBlock FontWeight="Bold" FontSize="16">Credits</TextBlock>
+                <TextBlock FontWeight="Bold"
+                           FontSize="16">
+                    Credits
+                </TextBlock>
                 <StackPanel Margin="0,0,0,12">
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/CommunityToolkit/dotnet" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/CommunityToolkit/dotnet"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             CommunityToolkit
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/Fody/Costura" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/Fody/Costura"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             Costura.Fody
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/HavenDV/H.NotifyIcon" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/HavenDV/H.NotifyIcon"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             H.NotifyIcon.Wpf
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/Humanizr/Humanizer" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/Humanizr/Humanizer"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             Humanizer
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://www.newtonsoft.com/json" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://www.newtonsoft.com/json"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             Newtonsoft.Json
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/Fody/PropertyChanged" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/Fody/PropertyChanged"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             PropertyChanged.Fody
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://github.com/danielchalmers/WpfWindowPlacement" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://github.com/danielchalmers/WpfWindowPlacement"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             WpfWindowPlacement
                         </Hyperlink>
                     </TextBlock>
                     <TextBlock>
-                        <Hyperlink NavigateUri="https://icon.kitchen/i/H4sIAAAAAAAAA0WP2wrCMAyG3yXe7sIDCO5WH0DQOxHJ2rQrdstsOw%2BI725aB%2FaiCV8O%2F5833NGPFKF%2Bg8ZwPbbUEdQGfaQKjN16N2BIuRxJAmgyOPoEFTjFvQBUimK8JCdznzLCnoMUZqY86Wz%2BbLnYrM2qsEOLg0hBvI0uKE8Cjd2j1q63WS%2FxAPViXkFwthXpnDacEne%2F3JMptIgeX2WXmuwWRM9seLctalODDagd9Slb7ViPPp9%2BAux1YKfzVRzlf1AD588XVKijiB0BAAA%3D" RequestNavigate="Hyperlink_RequestNavigate">
+                        <Hyperlink NavigateUri="https://icon.kitchen/i/H4sIAAAAAAAAA0WP2wrCMAyG3yXe7sIDCO5WH0DQOxHJ2rQrdstsOw%2BI725aB%2FaiCV8O%2F5833NGPFKF%2Bg8ZwPbbUEdQGfaQKjN16N2BIuRxJAmgyOPoEFTjFvQBUimK8JCdznzLCnoMUZqY86Wz%2BbLnYrM2qsEOLg0hBvI0uKE8Cjd2j1q63WS%2FxAPViXkFwthXpnDacEne%2F3JMptIgeX2WXmuwWRM9seLctalODDagd9Slb7ViPPp9%2BAux1YKfzVRzlf1AD588XVKijiB0BAAA%3D"
+                                   RequestNavigate="Hyperlink_RequestNavigate">
                             IconKitchen
                         </Hyperlink>
                     </TextBlock>

+ 1 - 1
Settings.XamlStyler

@@ -1,5 +1,5 @@
 {
-    "AttributesTolerance": 2,
+    "AttributesTolerance": 1,
     "KeepFirstAttributeOnSameLine": true,
     "MaxAttributeCharactersPerLine": 40,
     "MaxAttributesPerLine": 1,