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

Add control elements for columns.

Browse Source 
- NEU: Steuer-Elemente für Spalten.
This commit is contained in:
Daniel Kraus
2015-08-09 20:54:43 +02:00
parent 5833e0fcb7
commit a009c1ab39
13 changed files with 192 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zaaReloaded2/ViewModels/ControlElementViewModel.cs
View File

@ -35,6 +35,18 @@ namespace zaaReloaded2.ViewModels
/// </summary>
public ObservableCollection<ElementViewModel> Elements { get; protected set; }
/// <summary>
/// Gets information whether this control element view model can
/// have child elements;
/// </summary>
public virtual bool CanHaveChildren
{
get
{
return ((ControlElementBase)Element).CanHaveChildren;
}
}
#endregion
#region Constructors

8
zaaReloaded2/ViewModels/ElementPickerViewModel.cs
View File

@ -105,7 +105,9 @@ namespace zaaReloaded2.ViewModels
{
CreateControlElementViewModel(new SelectFirstDay()),
CreateControlElementViewModel(new SelectLastDay()),
CreateControlElementViewModel(new SelectEachDay())
CreateControlElementViewModel(new SelectEachDay()),
CreateControlElementViewModel(new TwoColumns()),
CreateControlElementViewModel(new NextColumn()),
}
)
);
@ -130,7 +132,9 @@ namespace zaaReloaded2.ViewModels
{
CreateControlElementViewModel(new SelectFirstDay(), copyFromViewModel),
CreateControlElementViewModel(new SelectLastDay(), copyFromViewModel),
CreateControlElementViewModel(new SelectEachDay(), copyFromViewModel)
CreateControlElementViewModel(new SelectEachDay(), copyFromViewModel),
CreateControlElementViewModel(new TwoColumns()),
CreateControlElementViewModel(new NextColumn()),
}
)
);

14
zaaReloaded2/ViewModels/ElementViewModel.cs
View File

@ -30,23 +30,11 @@ namespace zaaReloaded2.ViewModels
{
#region Properties
/// <summary>
/// Gets the label of the wrapped element.
/// </summary>
public virtual string Label
{
[DebuggerStepThrough]
get
{
return Element.Label;
}
}
public override string DisplayString
{
get
{
return Label;
return Element.Label;
}
}

19
zaaReloaded2/ViewModels/FormatElementViewModel.cs
View File

@ -89,25 +89,6 @@ namespace zaaReloaded2.ViewModels
return clone;
}
public override string DisplayString
{
get
{
if (String.IsNullOrEmpty(Content))
{
return _displayString;
}
else
{
return base.DisplayString;
}
}
set
{
_displayString = value;
}
}
#endregion
#region Private methods

3
zaaReloaded2/ViewModels/SettingsViewModel.cs
View File

@ -345,7 +345,8 @@ namespace zaaReloaded2.ViewModels
bool CanAddChildElement()
{
return LastSelectedElement is ControlElementViewModel;
return LastSelectedElement is ControlElementViewModel &&
((ControlElementViewModel)LastSelectedElement).CanHaveChildren;
}
void DoEditElement()