Skip to content

Commit 4c0f356

Browse files
committed
small impovemts
1 parent b95d879 commit 4c0f356

File tree

5 files changed

+10
-19
lines changed

5 files changed

+10
-19
lines changed

README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
DotNetDemo
22
=========
3-
43
Полезные примеры .net-приложений с использованием WPF и замечательного фреймворка Catel, в полном соответствии
54
с паттерном MVVM.
65
Usefull .net-samples (WPF, Catel, etc.). MVVM only ;-)
76

87

9-
*BooksLibrary*
8+
BooksLibrary
9+
---------
1010
Простая картотека книг, в виде таблицы. Вы можете добавлять новые, редактировать, удалять. Данный пример научит вас:
1111
- создавать и отображать дополнительные окна
1212
- использовать панель кнопок
@@ -22,8 +22,10 @@ This is simple view of books collection. You can see books, add, edit, remove bo
2222
- show message box
2323
- make fields validation
2424
- use viewModel to model auto binding
25+
2526

26-
*AsyncDemo*
27+
AsyncDemo
28+
---------
2729
Пример многопоточных вычислений с использованием TPL, а также реализация асинхронности в UI.
2830
Example shows simple way to multithreading and async calculations.
2931

src/BooksLibrary/Models/Book.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
1+
using System.Collections.Generic;
62
using Catel.Data;
73

84
namespace BooksLibrary.Models

src/BooksLibrary/ViewModels/BookViewModel.cs

-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,5 @@ public BookViewModel(Book book = null)
3939
{
4040
BookObject = book ?? new Book();
4141
}
42-
43-
4442
}
4543
}

src/BooksLibrary/ViewModels/MainViewModel.cs

+3-9
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ public class MainViewModel : ViewModelBase
1818
private readonly IPleaseWaitService _pleaseWaitService;
1919
private readonly IMessageService _messageService;
2020

21+
public override string Title { get { return "View model title"; } }
22+
2123
public MainViewModel(IUIVisualizerService uiVisualizerService, IPleaseWaitService pleaseWaitService, IMessageService messageService)
2224
{
23-
Guard.That(uiVisualizerService).IsNotNull();
24-
Guard.That(pleaseWaitService).IsNotNull();
25-
Guard.That(messageService).IsNotNull();
26-
2725
_uiVisualizerService = uiVisualizerService;
2826
_pleaseWaitService = pleaseWaitService;
2927
_messageService = messageService;
@@ -38,8 +36,6 @@ public MainViewModel(IUIVisualizerService uiVisualizerService, IPleaseWaitServic
3836
};
3937
}
4038

41-
public override string Title { get { return "View model title"; } }
42-
4339

4440
public ObservableCollection<Book> BooksCollection
4541
{
@@ -65,7 +61,7 @@ public Command AddCommand
6561
return _addCommand ?? (_addCommand = new Command(
6662
() =>
6763
{
68-
var viewModel = new BookViewModel(new Book());
64+
var viewModel = new BookViewModel();
6965

7066
_uiVisualizerService.ShowDialog(viewModel, (sender, e) =>
7167
{
@@ -120,7 +116,5 @@ public Command RemoveCommand
120116
() => SelectedBook != null));
121117
}
122118
}
123-
124-
125119
}
126120
}

src/BooksLibrary/Views/MainView.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
Focusable="False">
6969
<Image Source="/BooksLibrary;component/Images/remove.ico" Style="{StaticResource ImageEnabled}" />
7070
</Button>
71+
7172
</ToolBar>
7273

7374
</Grid>

0 commit comments

Comments
 (0)