daniel/zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Begin implemenation of format and choose style commands.

Browse Source
This commit is contained in:
Daniel Kraus
2015-08-04 02:43:17 +02:00
parent b6209731ec
commit 41b155e8be
13 changed files with 239 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zaaReloaded2/ViewModels/ControlElementViewModel.cs
View File

@ -45,6 +45,14 @@ namespace zaaReloaded2.ViewModels
: base(controlElement)
{
Elements = new ObservableCollection<ElementViewModel>();
if (controlElement != null)
{
foreach (FormatElementBase childElement in controlElement.FormatElements)
{
FormatElementViewModel childVM = new FormatElementViewModel(childElement);
Elements.Add(childVM);
}
}
}
#endregion

19
zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs
View File

@ -23,6 +23,7 @@ using Bovender.Mvvm;
using Bovender.Mvvm.ViewModels;
using Bovender.Mvvm.Messaging;
using zaaReloaded2.Controller;
using System.Collections.ObjectModel;
namespace zaaReloaded2.ViewModels
{
@ -30,7 +31,7 @@ namespace zaaReloaded2.ViewModels
{
#region Properties
public IList<SettingsViewModel> SettingsList { get; private set; }
public ObservableCollection<SettingsViewModel> SettingsList { get; private set; }
public SettingsViewModel Selected { get; private set; }
@ -123,7 +124,7 @@ namespace zaaReloaded2.ViewModels
#region Messages
Message<ViewModelMessageContent> EditSettingsMessage
public Message<ViewModelMessageContent> EditSettingsMessage
{
get
{
@ -134,8 +135,8 @@ namespace zaaReloaded2.ViewModels
return _editSettingsMessage;
}
}
Message<ViewModelMessageContent> UseSettingsMessage
public Message<ViewModelMessageContent> UseSettingsMessage
{
get
{
@ -146,8 +147,8 @@ namespace zaaReloaded2.ViewModels
return _useSettingsMessage;
}
}
Message<ViewModelMessageContent> ConfirmDeleteSettingsMessage
public Message<ViewModelMessageContent> ConfirmDeleteSettingsMessage
{
get
{
@ -158,8 +159,8 @@ namespace zaaReloaded2.ViewModels
return _confirmDeleteSettingsMessage;
}
}
Message<ViewModelMessageContent> ConfirmResetSettingsMessage
public Message<ViewModelMessageContent> ConfirmResetSettingsMessage
{
get
{
@ -178,7 +179,7 @@ namespace zaaReloaded2.ViewModels
public SettingsRepositoryViewModel(SettingsRepository repository)
{
_repository = repository;
SettingsList = new List<SettingsViewModel>();
SettingsList = new ObservableCollection<SettingsViewModel>();
foreach (Settings s in repository.SettingsList)
{
SettingsViewModel vm = new SettingsViewModel(s);

19
zaaReloaded2/ViewModels/SettingsViewModel.cs
View File

@ -71,14 +71,7 @@ namespace zaaReloaded2.ViewModels
/// <summary>
/// Gets a list of element view models.
/// </summary>
public IList<ElementViewModel> Elements
{
get
{
if (_elements == null) { _elements = new List<ElementViewModel>(); }
return _elements;
}
}
public IList<ElementViewModel> Elements { get; private set; }
/// <summary>
/// Gets or sets the currently selected element.
@ -120,7 +113,7 @@ namespace zaaReloaded2.ViewModels
: base()
{
_settings = settings;
_elements = new List<ElementViewModel>();
Elements = new List<ElementViewModel>();
foreach (ElementBase element in settings.Elements)
{
ElementViewModel vm;
@ -131,13 +124,18 @@ namespace zaaReloaded2.ViewModels
else if (element is ControlElementBase)
{
vm = new ControlElementViewModel(element as ControlElementBase);
foreach (FormatElementViewModel childVM in ((ControlElementViewModel)vm).Elements)
{
childVM.PropertyChanged += ElementViewModel_PropertyChanged;
}
}
else
{
throw new InvalidOperationException(
"Cannot create ViewModel for " + element.GetType().ToString());
}
AddElementViewModel(vm);
vm.PropertyChanged += ElementViewModel_PropertyChanged;
Elements.Add(vm);
}
}
@ -342,7 +340,6 @@ namespace zaaReloaded2.ViewModels
DelegatingCommand _copyElementCommand;
Message<ViewModelMessageContent> _addElementMessage;
Message<ViewModelMessageContent> _addChildElementMessage;
List<ElementViewModel> _elements;
ElementViewModel _selectedElement;
EnumProvider<ReferenceStyle> _referenceStyle;