From 33279a5522648a73272a09e2594aa16fdd667489 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Sat, 25 Jul 2020 17:15:26 -0500 Subject: [PATCH] Settings.XamlStyler file. Resaved all XAML /w formatting --- Settings.XamlStyler | 41 ++++ VS Snippets/guiprop.snippet | 30 --- Wabbajack/Themes/Styles.xaml | 152 ++++---------- Wabbajack/Views/Common/CpuView.xaml | 15 +- Wabbajack/Views/Common/DetailImageView.xaml | 54 ++--- Wabbajack/Views/Common/FilePicker.xaml | 7 +- Wabbajack/Views/Common/TopProgressView.xaml | 40 +--- .../Views/Common/UnderMaintenanceOverlay.xaml | 24 +-- .../Compilers/CompilationCompleteView.xaml | 33 +-- Wabbajack/Views/Compilers/CompilerView.xaml | 93 +++------ .../Compilers/MO2CompilerConfigView.xaml | 30 +-- .../Installers/InstallationCompleteView.xaml | 36 +--- .../Views/Installers/InstallationView.xaml | 101 +++------ .../Installers/MO2InstallerConfigView.xaml | 20 +- .../Interventions/BethesdaNetLoginView.xaml | 47 +++-- .../ConfirmUpdateOfExistingInstallView.xaml | 22 +- .../ConfirmationInterventionView.xaml | 18 +- Wabbajack/Views/LinksView.xaml | 9 +- Wabbajack/Views/MainWindow.xaml | 8 +- Wabbajack/Views/ManifestView.xaml | 195 +++++++++++------- Wabbajack/Views/ManifestWindow.xaml | 42 ++-- Wabbajack/Views/ModListGalleryView.xaml | 36 ++-- Wabbajack/Views/ModListTileView.xaml | 73 +++---- Wabbajack/Views/ModeSelectionView.xaml | 32 +-- Wabbajack/Views/Settings/AuthorFilesView.xaml | 73 ++++--- .../Views/Settings/CredentialsLoginView.xaml | 72 +++++-- Wabbajack/Views/Settings/LoginItemView.xaml | 23 +-- .../Views/Settings/LoginSettingsView.xaml | 3 +- Wabbajack/Views/Settings/LoginWindowView.xaml | 31 +-- .../Settings/ModlistGallerySettingsView.xaml | 25 ++- .../Settings/PerformanceSettingsView.xaml | 36 +--- Wabbajack/Views/Settings/SettingsView.xaml | 12 +- Wabbajack/Views/WebBrowserView.xaml | 33 ++- 33 files changed, 616 insertions(+), 850 deletions(-) create mode 100644 Settings.XamlStyler delete mode 100644 VS Snippets/guiprop.snippet diff --git a/Settings.XamlStyler b/Settings.XamlStyler new file mode 100644 index 00000000..d4da1bb5 --- /dev/null +++ b/Settings.XamlStyler @@ -0,0 +1,41 @@ +{ + "AttributesTolerance": 2, + "KeepFirstAttributeOnSameLine": false, + "MaxAttributeCharactersPerLine": 0, + "MaxAttributesPerLine": 1, + "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter", + "SeparateByGroups": false, + "AttributeIndentation": 0, + "AttributeIndentationStyle": 1, + "RemoveDesignTimeReferences": false, + "EnableAttributeReordering": true, + "AttributeOrderingRuleGroups": [ + "x:Class", + "xmlns, xmlns:x", + "xmlns:*", + "x:Key, Key, x:Name, Name, x:Uid, Uid, Title", + "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom", + "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight", + "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex", + "*:*, *", + "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint", + "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText", + "Storyboard.*, From, To, Duration" + ], + "FirstLineAttributes": "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan", + "OrderAttributesByName": true, + "PutEndingBracketOnNewLine": false, + "RemoveEndingTagOfEmptyElement": true, + "SpaceBeforeClosingSlash": true, + "RootElementLineBreakRule": 0, + "ReorderVSM": 2, + "ReorderGridChildren": false, + "ReorderCanvasChildren": false, + "ReorderSetters": 0, + "FormatMarkupExtension": true, + "NoNewLineMarkupExtensions": "x:Bind, Binding", + "ThicknessSeparator": 2, + "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin", + "FormatOnSave": true, + "CommentPadding": 2, +} \ No newline at end of file diff --git a/VS Snippets/guiprop.snippet b/VS Snippets/guiprop.snippet deleted file mode 100644 index 83b3a735..00000000 --- a/VS Snippets/guiprop.snippet +++ /dev/null @@ -1,30 +0,0 @@ - - - -
- Notify property changed property - guiprop - Code snippet for a NotifyingPropertyChanged variable - - Expansion - -
- - - - type - Property type - int - - - property - Property name - MyProperty - - - _$property$; set => this.RaiseAndSetIfChanged(ref _$property$, value); }$end$]]> - - - - \ No newline at end of file diff --git a/Wabbajack/Themes/Styles.xaml b/Wabbajack/Themes/Styles.xaml index 16648754..046244d9 100644 --- a/Wabbajack/Themes/Styles.xaml +++ b/Wabbajack/Themes/Styles.xaml @@ -269,15 +269,11 @@ - - - - - @@ -480,8 +471,7 @@ - @@ -517,9 +507,8 @@ Command="{x:Static ScrollBar.LineLeftCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Style="{StaticResource RepeatButtonUpStyle}" /> - @@ -531,8 +520,7 @@ - @@ -578,9 +566,8 @@ Command="{x:Static ScrollBar.LineLeftCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Style="{DynamicResource RepeatLeftButtonStyle}" /> - @@ -592,8 +579,7 @@ - @@ -748,10 +734,8 @@ x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> - - - - @@ -1017,9 +998,8 @@ - - - - - - - - - - @@ -2233,9 +2204,8 @@ - - - - - - @@ -2588,9 +2553,7 @@ - - - - - - --> - - @@ -3235,19 +3183,14 @@ Style="{DynamicResource {ComponentResourceKey ResourceId=DataGridSelectAllButtonStyle, TypeInTargetAssembly={x:Type DataGrid}}}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" /> - - - - - - - diff --git a/Wabbajack/Views/Common/CpuView.xaml b/Wabbajack/Views/Common/CpuView.xaml index 4a1756db..27262d99 100644 --- a/Wabbajack/Views/Common/CpuView.xaml +++ b/Wabbajack/Views/Common/CpuView.xaml @@ -17,9 +17,8 @@ - @@ -28,9 +27,8 @@ - @@ -46,21 +44,18 @@ Margin="5,0" VerticalAlignment="Center" Text="Percent Usage" /> - - - diff --git a/Wabbajack/Views/Common/DetailImageView.xaml b/Wabbajack/Views/Common/DetailImageView.xaml index 14f29a62..95bb80a5 100644 --- a/Wabbajack/Views/Common/DetailImageView.xaml +++ b/Wabbajack/Views/Common/DetailImageView.xaml @@ -57,35 +57,22 @@ - - - - - - - - - - diff --git a/Wabbajack/Views/Common/FilePicker.xaml b/Wabbajack/Views/Common/FilePicker.xaml index 0a8a2620..8b9db7b9 100644 --- a/Wabbajack/Views/Common/FilePicker.xaml +++ b/Wabbajack/Views/Common/FilePicker.xaml @@ -15,15 +15,12 @@ - - - @@ -32,10 +31,8 @@ - - @@ -67,10 +62,8 @@ - @@ -81,9 +74,8 @@ - - - - - - - - @@ -37,24 +36,21 @@ ShadowDepth="10" /> - - - - @@ -76,8 +71,7 @@ - - - - - - - - @@ -81,15 +72,12 @@ Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" Kind="FolderMove" /> - + HorizontalAlignment="Center" /> - @@ -129,8 +117,7 @@ Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" Kind="Check" /> - diff --git a/Wabbajack/Views/Compilers/CompilerView.xaml b/Wabbajack/Views/Compilers/CompilerView.xaml index cd0247b0..95ff7a67 100644 --- a/Wabbajack/Views/Compilers/CompilerView.xaml +++ b/Wabbajack/Views/Compilers/CompilerView.xaml @@ -28,17 +28,10 @@ - - + @@ -49,34 +42,22 @@ - - - - - - + @@ -146,23 +128,18 @@ Margin="{StaticResource TitleMargin}" Text="Readme" ToolTip="Link to the Readme." /> - - + + - - - - @@ -201,28 +174,20 @@ - + - + - @@ -230,18 +195,16 @@ - - diff --git a/Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml b/Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml index 6837c334..fd4da5a3 100644 --- a/Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml +++ b/Wabbajack/Views/Compilers/MO2CompilerConfigView.xaml @@ -20,56 +20,44 @@ - - - - - - diff --git a/Wabbajack/Views/Installers/InstallationCompleteView.xaml b/Wabbajack/Views/Installers/InstallationCompleteView.xaml index a1e83306..2a0be1f5 100644 --- a/Wabbajack/Views/Installers/InstallationCompleteView.xaml +++ b/Wabbajack/Views/Installers/InstallationCompleteView.xaml @@ -23,11 +23,8 @@ - - - - - @@ -83,15 +74,12 @@ Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" Kind="FolderMove" /> - - @@ -109,15 +97,12 @@ Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" Kind="ReadmeBrands" /> - - @@ -135,8 +120,7 @@ Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" Kind="Check" /> - diff --git a/Wabbajack/Views/Installers/InstallationView.xaml b/Wabbajack/Views/Installers/InstallationView.xaml index 26bc8c1e..ed4ce7b1 100644 --- a/Wabbajack/Views/Installers/InstallationView.xaml +++ b/Wabbajack/Views/Installers/InstallationView.xaml @@ -31,10 +31,8 @@ - + @@ -42,13 +40,10 @@ - - + @@ -105,9 +100,8 @@ - - @@ -138,9 +131,8 @@ - - @@ -177,10 +168,8 @@ - + - - @@ -231,9 +217,8 @@ - - - - - @@ -333,26 +308,19 @@ - - - @@ -376,17 +344,15 @@ - - @@ -394,13 +360,11 @@ - - @@ -411,9 +375,8 @@ - diff --git a/Wabbajack/Views/Installers/MO2InstallerConfigView.xaml b/Wabbajack/Views/Installers/MO2InstallerConfigView.xaml index 4265f041..e4a65555 100644 --- a/Wabbajack/Views/Installers/MO2InstallerConfigView.xaml +++ b/Wabbajack/Views/Installers/MO2InstallerConfigView.xaml @@ -20,39 +20,29 @@ - - - - - + #92000000 @@ -46,14 +48,11 @@ - - - + + Order by: + + + + + + + + + + + + + + + + + + + + + + + + + + Link + + + + + + + - - - - - - - - - - - - - - - - - - - - - - Link - - - - - - - - - + + diff --git a/Wabbajack/Views/ManifestWindow.xaml b/Wabbajack/Views/ManifestWindow.xaml index 1e2f42e7..2f686a82 100644 --- a/Wabbajack/Views/ManifestWindow.xaml +++ b/Wabbajack/Views/ManifestWindow.xaml @@ -1,22 +1,22 @@ - - - + + diff --git a/Wabbajack/Views/ModListGalleryView.xaml b/Wabbajack/Views/ModListGalleryView.xaml index 75f252a6..0d698ec3 100644 --- a/Wabbajack/Views/ModListGalleryView.xaml +++ b/Wabbajack/Views/ModListGalleryView.xaml @@ -18,9 +18,7 @@ - @@ -29,8 +27,7 @@ - @@ -52,13 +49,11 @@ - - - - - + ToolTip="Select a game" /> + Foreground="{StaticResource ForegroundBrush}" /> - + - - + diff --git a/Wabbajack/Views/WebBrowserView.xaml b/Wabbajack/Views/WebBrowserView.xaml index 56f45066..00dfaa52 100644 --- a/Wabbajack/Views/WebBrowserView.xaml +++ b/Wabbajack/Views/WebBrowserView.xaml @@ -1,12 +1,14 @@ - + #92000000 @@ -46,15 +48,12 @@ - - - - + +