DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

UI - Centralized default editors registration into a service

Browse Source 
Display conditions - Added more test operators 
Display conditions - Implemented operator selection
Display conditions - Implemented property selection and rules
This commit is contained in:
Robert committed 2020-07-06 15:21:57 +02:00
1 parent 71f6706eec
commit f944a675f1
26 files changed
+470 -179
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/DataModelVisualization/SKColorDataModelDisplayView.xaml → src/Artemis.UI/DataModelVisualization/Display/SKColorDataModelDisplayView.xaml
+3 -2
View File
@@ -1,13 +1,14 @@
<UserControl x:Class="Artemis.UI.DataModelVisualization.SKColorDataModelDisplayView"
<UserControl x:Class="Artemis.UI.DataModelVisualization.Display.SKColorDataModelDisplayView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.UI.DataModelVisualization"
xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
xmlns:display="clr-namespace:Artemis.UI.DataModelVisualization.Display"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
d:DataContext="{d:DesignInstance {x:Type local:SKColorDataModelDisplayViewModel}}">
d:DataContext="{d:DesignInstance {x:Type display:SKColorDataModelDisplayViewModel}}">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
src/Artemis.UI/DataModelVisualization/SKColorDataModelDisplayViewModel.cs → src/Artemis.UI/DataModelVisualization/Display/SKColorDataModelDisplayViewModel.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Artemis.UI.Shared.DataModelVisualization;
using SkiaSharp;
namespace Artemis.UI.DataModelVisualization
namespace Artemis.UI.DataModelVisualization.Display
{
public class SKColorDataModelDisplayViewModel : DataModelDisplayViewModel<SKColor>
{
src/Artemis.UI/DataModelVisualization/Input/StringDataModelInputView.xaml
+10
View File
@@ -0,0 +1,10 @@
<UserControl x:Class="Artemis.UI.DataModelVisualization.Input.StringDataModelInputView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Artemis.UI.DataModelVisualization.Input"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<TextBox VerticalAlignment="Center" Text="{Binding InputValue}"/>
</UserControl>
src/Artemis.UI/DataModelVisualization/Input/StringDataModelInputViewModel.cs
+15
View File
@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using Artemis.Core.Plugins.Abstract.DataModels.Attributes;
using Artemis.UI.Shared.DataModelVisualization;
namespace Artemis.UI.DataModelVisualization.Input
{
public class StringDataModelInputViewModel : DataModelInputViewModel<string>
{
public StringDataModelInputViewModel(DataModelPropertyAttribute description, string initialValue) : base(description, initialValue)
{
}
}
}