Skip to content
This repository was archived by the owner on Aug 11, 2020. It is now read-only.

Commit 52a3850

Browse files
bakxbakx
committed
Added some new tags firstfloorsoftware#152
+ Run ReSharper Code Clean Up
1 parent ba96c62 commit 52a3850

29 files changed

+641
-296
lines changed

‎1.0/ModernUI/ModernUI.App/App.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ResourceDictionary Source="/ModernUI;component/Assets/ModernUI.Light.xaml" />
1010
</ResourceDictionary.MergedDictionaries>
1111

12-
12+
1313
</ResourceDictionary>
1414
</Application.Resources>
15-
</Application>
15+
</Application>

‎1.0/ModernUI/ModernUI.App/Assets/ModernUI.BingImage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ResourceDictionary Source="/ModernUI;component/Assets/ModernUI.Light.xaml" />
88
</ResourceDictionary.MergedDictionaries>
99

10-
<Rectangle x:Key="WindowBackgroundContent" x:Shared="false" >
10+
<Rectangle x:Key="WindowBackgroundContent" x:Shared="false">
1111
<Rectangle.Fill>
1212
<ImageBrush local:BingImage.UseBingImage="True" Opacity=".3" Stretch="UniformToFill" />
1313
</Rectangle.Fill>

‎1.0/ModernUI/ModernUI.App/Assets/ModernUI.HelloKitty.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
<Rectangle x:Key="WindowBackgroundContent" x:Shared="false" Margin="32">
1212
<Rectangle.Fill>
13-
<ImageBrush Opacity=".1" ImageSource="/Assets/background.kitty.png" Stretch="None" AlignmentX="Right" AlignmentY="Bottom" />
13+
<ImageBrush Opacity=".1" ImageSource="/Assets/background.kitty.png" Stretch="None" AlignmentX="Right"
14+
AlignmentY="Bottom" />
1415
</Rectangle.Fill>
1516
</Rectangle>
1617

‎1.0/ModernUI/ModernUI.App/Content/ControlsModernBBCodeBlock.xaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<UserControl x:Class="ModernUI.App.Content.ControlsModernBBCodeBlock"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mui="http://firstfloorsoftware.com/ModernUI"
7-
mc:Ignorable="d"
7+
mc:Ignorable="d"
88
d:DesignHeight="300" d:DesignWidth="300">
99
<Grid>
1010
<ScrollViewer>
1111
<StackPanel>
1212
<TextBlock Text="BBCODEBLOCK" Style="{StaticResource Heading2}" Margin="0,0,0,8" />
13-
<mui:BBCodeBlock BBCode="Simple rich text formatting using BBCode. Supporting [b]bold[/b], [i]italic[/i], [b][i]bold italic[/i][/b], [u]underline[/u], [color=#ff4500]colors[/color], [size=10]different[/size] [size=16]sizes[/size] and support for [url=http://xamlspy.com]navigable urls[/url].&#13;&#10;&#13;&#10;BBCode formatted text works great with MVVM.&#13;&#10;&#13;&#10;To learn more about link navigation see the [url=/Pages/Navigation.xaml|_top]navigation page[/url]." />
13+
<mui:BBCodeBlock BBCodeQuoteBackground="{DynamicResource WindowBorder}"
14+
BBCode="Simple rich text formatting using BBCode. Supporting [b]bold[/b], [i]italic[/i], [b][i]bold italic[/i][/b], [u]underline[/u], [s]strikethrough[/s], [quote][b]John Muir:[/b] The power of imagination makes us infinite.[/quote], [\escaped], [color=#ff4500]colors[/color], [size=10]different[/size] [size=16]sizes[/size] and support for [url=http://xamlspy.com]navigable urls[/url].&#13;&#10;&#13;&#10;Ordered list:[ol][li]Item [b]one[/b][/li][li]Item [i]two[/i][/li][li]Item [color=#ff0045]three[/color][/li][/ol]&#13;&#10;Unordered list:[list][li]Item one[/li][li]Item two[/li][/list]&#13;&#10;BBCode formatted text works great with MVVM.&#13;&#10;&#13;&#10;To learn more about link navigation see the [url=/Pages/Navigation.xaml|_top]navigation page[/url]." />
1415
</StackPanel>
1516
</ScrollViewer>
1617
</Grid>
17-
</UserControl>
18+
</UserControl>

‎1.0/ModernUI/ModernUI.App/Content/SettingsAppearanceViewModel.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ public Color[] AccentColors
121121

122122
public string SelectedPalette
123123
{
124-
get { return this.selectedPalette; }
125-
set
124+
get => this.selectedPalette; set
126125
{
127126
if (this.selectedPalette != value) {
128127
this.selectedPalette = value;
@@ -135,8 +134,7 @@ public string SelectedPalette
135134

136135
public Link SelectedTheme
137136
{
138-
get { return this.selectedTheme; }
139-
set
137+
get => this.selectedTheme; set
140138
{
141139
if (this.selectedTheme != value) {
142140
this.selectedTheme = value;
@@ -150,8 +148,7 @@ public Link SelectedTheme
150148

151149
public string SelectedFontSize
152150
{
153-
get { return this.selectedFontSize; }
154-
set
151+
get => this.selectedFontSize; set
155152
{
156153
if (this.selectedFontSize != value) {
157154
this.selectedFontSize = value;
@@ -164,8 +161,7 @@ public string SelectedFontSize
164161

165162
public Color SelectedAccentColor
166163
{
167-
get { return this.selectedAccentColor; }
168-
set
164+
get => this.selectedAccentColor; set
169165
{
170166
if (this.selectedAccentColor != value) {
171167
this.selectedAccentColor = value;

‎1.0/ModernUI/ModernUI.App/MainWindow.xaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
xmlns:app="clr-namespace:ModernUI.App"
66
Title="Modern UI for WPF Demo" IsTitleVisible="True"
77
LogoData="F1 M 24.9015,43.0378L 25.0963,43.4298C 26.1685,49.5853 31.5377,54.2651 38,54.2651C 44.4623,54.2651 49.8315,49.5854 50.9037,43.4299L 51.0985,43.0379C 51.0985,40.7643 52.6921,39.2955 54.9656,39.2955C 56.9428,39.2955 58.1863,41.1792 58.5833,43.0379C 57.6384,52.7654 47.9756,61.75 38,61.75C 28.0244,61.75 18.3616,52.7654 17.4167,43.0378C 17.8137,41.1792 19.0572,39.2954 21.0344,39.2954C 23.3079,39.2954 24.9015,40.7643 24.9015,43.0378 Z M 26.7727,20.5833C 29.8731,20.5833 32.3864,23.0966 32.3864,26.197C 32.3864,29.2973 29.8731,31.8106 26.7727,31.8106C 23.6724,31.8106 21.1591,29.2973 21.1591,26.197C 21.1591,23.0966 23.6724,20.5833 26.7727,20.5833 Z M 49.2273,20.5833C 52.3276,20.5833 54.8409,23.0966 54.8409,26.197C 54.8409,29.2973 52.3276,31.8106 49.2273,31.8106C 46.127,31.8106 43.6136,29.2973 43.6136,26.197C 43.6136,23.0966 46.127,20.5833 49.2273,20.5833 Z"
8+
LogoCommand="mui:LinkCommands.NavigateLink"
9+
LogoCommandParameter="https://github.com/firstfloorsoftware/mui"
810
ContentSource="/Pages/Introduction.xaml"
911
Width="800" Height="700">
10-
12+
1113
<mui:ModernWindow.TitleLinks>
1214
<mui:Link DisplayName="Settings" Source="/Pages/Settings.xaml" />
1315
<mui:Link DisplayName="Help" Source="https://github.com/firstfloorsoftware/mui/wiki" />
@@ -24,7 +26,7 @@
2426
<mui:Link DisplayName="Wireframe" Source="/Pages/LayoutWireframe.xaml" />
2527
<mui:Link DisplayName="Basic" Source="/Pages/LayoutBasic.xaml" />
2628
<mui:Link DisplayName="Split" Source="/Pages/LayoutSplit.xaml" />
27-
<mui:Link DisplayName="List" Source="/Pages/LayoutList.xaml" />
29+
<mui:Link DisplayName="List" Source="/Pages/LayoutList.xaml" />
2830
<mui:Link DisplayName="Tab" Source="/Pages/LayoutTab.xaml" />
2931
</mui:LinkGroup.Links>
3032
</mui:LinkGroup>
@@ -47,4 +49,4 @@
4749
</mui:LinkGroup.Links>
4850
</mui:LinkGroup>
4951
</mui:ModernWindow.MenuLinkGroups>
50-
</mui:ModernWindow>
52+
</mui:ModernWindow>

‎1.0/ModernUI/ModernUI.App/SampleFormViewModel.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public class SampleFormViewModel
1616

1717
public string FirstName
1818
{
19-
get { return this.firstName; }
20-
set
19+
get => this.firstName; set
2120
{
2221
if (this.firstName != value) {
2322
this.firstName = value;
@@ -28,8 +27,7 @@ public string FirstName
2827

2928
public string LastName
3029
{
31-
get { return this.lastName; }
32-
set
30+
get => this.lastName; set
3331
{
3432
if (this.lastName != value) {
3533
this.lastName = value;

0 commit comments

Comments
 (0)