Skip to content

Commit 1d9b0be

Browse files
GeertvanHorrikGeertvanHorrik
committed
Update Person application
1 parent 296ed9c commit 1d9b0be

File tree

8 files changed

+43
-81
lines changed

8 files changed

+43
-81
lines changed

‎src/Catel.Examples.WPF.PersonApplication/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
// --------------------------------------------------------------------------------------------------------------------
2-
// <copyright file="AssemblyInfo.cs" company="Catel development team">
3-
// Copyright (c) 2008 - 2017 Catel development team. All rights reserved.
4-
// </copyright>
5-
// --------------------------------------------------------------------------------------------------------------------
6-
7-
8-
using System.Reflection;
1+
using System.Reflection;
92
using System.Resources;
103

114
// All other assembly info is defined in SolutionAssemblyInfo.cs
125

136
[assembly: AssemblyTitle("Catel.Examples.PersonApplication")]
147
[assembly: AssemblyProduct("Catel.Examples.PersonApplication")]
158
[assembly: AssemblyDescription("Catel.Examples.PersonApplication")]
16-
[assembly: NeutralResourcesLanguage("en-US")]
9+
[assembly: NeutralResourcesLanguage("en-US")]

‎src/Catel.Examples.WPF.PersonApplication/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Catel.Examples.WPF.PersonApplication/Properties/Settings.Designer.cs‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/Catel.Examples.WPF.PersonApplication/Properties/Settings.settings‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/Catel.Examples.WPF.PersonApplication/ViewModels/PersonViewModel.cs‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
public class PersonViewModel : ViewModelBase
99
{
10-
#region Constructors
1110
public PersonViewModel(Person person)
1211
{
1312
if (Catel.CatelEnvironment.IsInDesignMode)
@@ -21,22 +20,15 @@ public PersonViewModel(Person person)
2120

2221
Title = "Person";
2322
}
24-
#endregion
2523

26-
#region Methods
2724
protected override void ValidateFields(List<IFieldValidationResult> validationResults)
2825
{
2926
if (!string.IsNullOrEmpty(CustomError))
3027
{
3128
validationResults.Add(FieldValidationResult.CreateError(nameof(CustomError), CustomError));
3229
}
3330
}
34-
#endregion
3531

36-
#region Variables
37-
#endregion
38-
39-
#region Models
4032
[Model]
4133
[Fody.Expose("FirstName")]
4234
[Fody.Expose("MiddleName")]
@@ -57,9 +49,7 @@ public string CustomDefinedProperty
5749
{
5850
get { return "My Custom Defined Property"; }
5951
}
60-
#endregion
6152

62-
#region Commands
6353
public Command<object, object> GenerateData { get; private set; }
6454

6555
private bool OnGenerateDataCanExecute(object parameter)
@@ -78,7 +68,7 @@ private bool OnGenerateDataCanExecute(object parameter)
7868
return false;
7969
}
8070

81-
if (!string.IsNullOrEmpty(this.LastName))
71+
if (!string.IsNullOrEmpty(LastName))
8272
{
8373
return false;
8474
}
@@ -111,12 +101,10 @@ private void OnToggleCustomErrorExecute(object parameter)
111101
CustomError = string.Empty;
112102
}
113103
}
114-
#endregion
115104
}
116105

117106
public class DesignPersonViewModel : PersonViewModel
118107
{
119-
#region Constructors
120108
public DesignPersonViewModel()
121109
: base(null)
122110
{
@@ -128,6 +116,5 @@ public DesignPersonViewModel()
128116
LastName = "Horrik";
129117
Gender = Gender.Male;
130118
}
131-
#endregion
132119
}
133-
}
120+
}

‎src/Catel.Examples.WPF.PersonApplication/Views/MainWindow.xaml‎

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,32 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:catel="http://schemas.catelproject.com"
55
xmlns:xamlbehaviors="http://schemas.microsoft.com/xaml/behaviors"
6-
MinHeight="350" MinWidth="525" ShowInTaskbar="True"
7-
SizeToContent="Manual" WindowStartupLocation="Manual" ResizeMode="CanResizeWithGrip" WindowState="Maximized"
8-
Icon="/Catel.Examples.PersonApplication;component/Resources/Images/Catel.png">
6+
MinHeight="350"
7+
MinWidth="525"
8+
ShowInTaskbar="True"
9+
SizeToContent="Manual"
10+
WindowStartupLocation="Manual"
11+
ResizeMode="CanResizeWithGrip"
12+
WindowState="Maximized">
913

1014
<Window.Resources>
11-
<Style x:Key="ImageButtonStyle" TargetType="Button">
12-
<Setter Property="Width" Value="48" />
13-
<Setter Property="Height" Value="48" />
14-
<Setter Property="Margin" Value="6" />
15-
<Setter Property="Padding" Value="6" />
15+
<Style x:Key="ImageButtonStyle"
16+
TargetType="Button">
17+
<Setter Property="Width"
18+
Value="48" />
19+
<Setter Property="Height"
20+
Value="48" />
21+
<Setter Property="Margin"
22+
Value="6" />
23+
<Setter Property="Padding"
24+
Value="6" />
1625
</Style>
1726
</Window.Resources>
1827

1928
<DockPanel LastChildFill="True">
2029
<!-- Details and actions -->
21-
<StackPanel DockPanel.Dock="Right" Orientation="Vertical">
30+
<StackPanel DockPanel.Dock="Right"
31+
Orientation="Vertical">
2232
<!-- Details -->
2333
<!--<GroupBox Header="Details">
2434
@@ -27,27 +37,36 @@
2737
<!-- Buttons -->
2838
<WrapPanel Orientation="Vertical">
2939
<!-- Added -->
30-
<Button Command="{Binding Add}" ToolTip="Add" Style="{StaticResource ImageButtonStyle}">
31-
<Image Source="/Catel.Examples.PersonApplication;component/Resources/Images/add.png"/>
40+
<Button Command="{Binding Add}"
41+
ToolTip="Add"
42+
Style="{StaticResource ImageButtonStyle}">
43+
<Image Source="/Catel.Examples.WPF.PersonApplication/Resources/Images/add.png" />
3244
</Button>
3345

3446
<!-- Edit -->
35-
<Button Command="{Binding Edit}" ToolTip="Edit" Style="{StaticResource ImageButtonStyle}">
36-
<Image Source="/Catel.Examples.PersonApplication;component/Resources/Images/edit.png"/>
47+
<Button Command="{Binding Edit}"
48+
ToolTip="Edit"
49+
Style="{StaticResource ImageButtonStyle}">
50+
<Image Source="/Catel.Examples.WPF.PersonApplication/Resources/Images/edit.png" />
3751
</Button>
3852

3953
<!-- Remove -->
40-
<Button Command="{Binding Remove}" ToolTip="Remove" Style="{StaticResource ImageButtonStyle}">
41-
<Image Source="/Catel.Examples.PersonApplication;component/Resources/Images/delete.png"/>
54+
<Button Command="{Binding Remove}"
55+
ToolTip="Remove"
56+
Style="{StaticResource ImageButtonStyle}">
57+
<Image Source="/Catel.Examples.WPF.PersonApplication/Resources/Images/delete.png" />
4258
</Button>
4359
</WrapPanel>
4460
</StackPanel>
4561

4662
<!-- List of persons -->
47-
<ListBox DockPanel.Dock="Left" ItemsSource="{Binding PersonCollection}" SelectedItem="{Binding SelectedPerson}">
63+
<ListBox DockPanel.Dock="Left"
64+
ItemsSource="{Binding PersonCollection}"
65+
SelectedItem="{Binding SelectedPerson}">
4866
<xamlbehaviors:Interaction.Triggers>
4967
<xamlbehaviors:EventTrigger EventName="MouseDoubleClick">
50-
<catel:EventToCommand Command="{Binding Edit}" DisableAssociatedObjectOnCannotExecute="False" />
68+
<catel:EventToCommand Command="{Binding Edit}"
69+
DisableAssociatedObjectOnCannotExecute="False" />
5170
</xamlbehaviors:EventTrigger>
5271
</xamlbehaviors:Interaction.Triggers>
5372

‎src/Catel.Examples.WPF.PersonApplication/Views/MainWindow.xaml.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
{
33
public partial class MainWindow
44
{
5-
#region Constructors
65
public MainWindow()
76
{
87
InitializeComponent();
98
}
10-
#endregion
119
}
12-
}
10+
}

‎src/Catel.Examples.WPF.PersonApplication/Views/PersonWindow.xaml.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
public partial class PersonWindow
77
{
8-
#region Constructors
98
public PersonWindow(PersonViewModel viewModel)
109
: base(viewModel, DataWindowMode.OkCancel, null, DataWindowDefaultButton.OK, true, InfoBarMessageControlGenerationMode.Inline)
1110
{
@@ -14,6 +13,5 @@ public PersonWindow(PersonViewModel viewModel)
1413

1514
InitializeComponent();
1615
}
17-
#endregion
1816
}
19-
}
17+
}

0 commit comments

Comments
 (0)