Skip to content

Commit 49390fd

Browse files
RomanSoloweowRomanSoloweow
committed
new tab
1 parent c78c927 commit 49390fd

File tree

11 files changed

+83
-15
lines changed

11 files changed

+83
-15
lines changed

‎SimpleStateMachineNodeEditor/Icons/Icons.xaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<ResourceDictionary Source="DeleteScheme.xaml"/>
1414

1515
<ResourceDictionary Source="ErrorList.xaml"/>
16+
<ResourceDictionary Source="StateFrom.xaml"/>
17+
<ResourceDictionary Source="StateTo.xaml"/>
18+
<ResourceDictionary Source="TransitionName.xaml"/>
1619
<ResourceDictionary Source="Save.xaml"/>
1720
<ResourceDictionary Source="ExpandDown.xaml"/>
1821
<ResourceDictionary Source="Theme.xaml"/>

‎SimpleStateMachineNodeEditor/Icons/StateFrom.xaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<DrawingBrush x:Key="IconStateFrom">
4+
<DrawingBrush.Drawing>
5+
<DrawingGroup>
6+
<DrawingGroup.Children>
7+
<!--<GeometryDrawing Brush="{DynamicResource ColorIconsSecond}" Geometry="M8,12H17.76L15.26,9.5L16.67,8.08L21.59,13L16.67,17.92L15.26,16.5L17.76,14H8V12M19,3C20.11,3 21,3.9 21,5V9.67L19,7.67V7H5V19H19V18.33L21,16.33V19A2,2 0 0,1 19,21H5C3.89,21 3,20.1 3,19V5A2,2 0 0,1 5,3H19Z"/>-->
8+
9+
<GeometryDrawing Brush="{DynamicResource ColorIconsSecond}" Geometry="F1M14,6L6,6 6,11 14,11z M15,12L5,12 5,4 15,4z" />
10+
</DrawingGroup.Children>
11+
</DrawingGroup>
12+
</DrawingBrush.Drawing>
13+
</DrawingBrush>
14+
</ResourceDictionary>

‎SimpleStateMachineNodeEditor/Icons/StateTo.xaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<DrawingBrush x:Key="IconStateTo">
4+
<DrawingBrush.Drawing>
5+
<DrawingGroup>
6+
<DrawingGroup.Children>
7+
<!--<GeometryDrawing Brush="{DynamicResource ColorIconsSecond}" Geometry="M10,17L15,12L10,7V17Z" />-->
8+
<GeometryDrawing Brush="{DynamicResource ColorIconsSecond}" Geometry="F1M14,6L6,6 6,11 14,11z M15,12L5,12 5,4 15,4z" />
9+
</DrawingGroup.Children>
10+
</DrawingGroup>
11+
</DrawingBrush.Drawing>
12+
</DrawingBrush>
13+
</ResourceDictionary>

‎SimpleStateMachineNodeEditor/Icons/TransitionName.xaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
<DrawingBrush x:Key="IconTransitionName">
4+
<DrawingBrush.Drawing>
5+
<DrawingGroup>
6+
<DrawingGroup.Children>
7+
<GeometryDrawing Brush="{DynamicResource ColorIconsSecond}" Geometry="M16.5,21C13.5,21 12.31,16.76 11.05,12.28C10.14,9.04 9,5 7.5,5C4.11,5 4,11.93 4,12H2C2,11.63 2.06,3 7.5,3C10.5,3 11.71,7.25 12.97,11.74C13.83,14.8 15,19 16.5,19C19.94,19 20.03,12.07 20.03,12H22.03C22.03,12.37 21.97,21 16.5,21Z" />
8+
</DrawingGroup.Children>
9+
</DrawingGroup>
10+
</DrawingBrush.Drawing>
11+
</DrawingBrush>
12+
</ResourceDictionary>

‎SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ Validating for exists Nodes without connects</PackageReleaseNotes>
8484
<Page Update="Icons\SelectedLoop.xaml">
8585
<SubType>Designer</SubType>
8686
</Page>
87+
<Page Update="Icons\TransitionName.xaml">
88+
<SubType>Designer</SubType>
89+
</Page>
90+
<Page Update="Icons\StateTo.xaml">
91+
<SubType>Designer</SubType>
92+
</Page>
8793
</ItemGroup>
8894

8995
</Project>

‎SimpleStateMachineNodeEditor/Styles/ErrorList/StyleLabelWithIcon.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<!--OpacityMask - Foreground on Mouse Over-->
66
<!--BorderBrush - Icon-->
7-
<!--Width - Icon Width-->
8-
<!--Height - Icon Height-->
7+
<!--MinWidth - Icon Width-->
8+
<!--MinHeight - Icon Height-->
99
<Style x:Key="StyleLabelWithIcon" TargetType="{x:Type Label}">
1010
<!--<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
1111
<Setter Property="Background" Value="Transparent"/>
@@ -21,7 +21,7 @@
2121
<ColumnDefinition Width="auto" SharedSizeGroup="Icons"/>
2222
<ColumnDefinition />
2323
</Grid.ColumnDefinitions>
24-
<Rectangle Grid.Column="0" x:Name="RectangleElement" Fill="{TemplateBinding BorderBrush}" Height="14" Width="14" VerticalAlignment="Center" Margin="8,2,0,0"/>
24+
<Rectangle Grid.Column="0" x:Name="RectangleElement" Fill="{TemplateBinding BorderBrush}" Height="{TemplateBinding MinHeight}" Width="{TemplateBinding MinWidth}" VerticalAlignment="Center" Margin="8,2,0,0"/>
2525
<TextBlock Grid.Column="1" Text="{TemplateBinding Content}" x:Name="TextBlockElement" Height="auto" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="NoWrap" Padding="5,3,8,3" />
2626
</Grid>
2727
<ControlTemplate.Triggers>

‎SimpleStateMachineNodeEditor/Styles/Tabs/StyleTabItem.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
<ControlTemplate.Triggers>
1818
<Trigger Property="IsMouseOver" Value="True">
1919
<Setter Property="Background" TargetName="mainBorder" Value="{Binding BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"/>
20+
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource ColorWindowHeaderTabItemForegroundOnSelect}"/>
2021
</Trigger>
2122

2223
<Trigger Property="IsSelected" Value="True">
2324
<Setter Property="Background" TargetName="mainBorder" Value="{Binding OpacityMask, RelativeSource={RelativeSource TemplatedParent}}"/>
25+
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{DynamicResource ColorWindowHeaderTabItemForegroundOnSelect}"/>
2426
<Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
2527
<Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
2628
</Trigger>

‎SimpleStateMachineNodeEditor/Styles/Themes/Dark.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<SolidColorBrush x:Key="ColorWindowBorder" Color="#FF797979"/>
4848
<SolidColorBrush x:Key="ColorWindowHeader" Color="#FF2D2D30"/>
4949
<SolidColorBrush x:Key="ColorWindowHeaderTabItemForeground" Color="White"/>
50-
50+
<SolidColorBrush x:Key="ColorWindowHeaderTabItemForegroundOnSelect" Color="White"/>
5151
<!--#region Header buttons-->
5252

5353
<SolidColorBrush x:Key="ColorWindowHeaderButtonsIcon" Color="LightGray"/>

‎SimpleStateMachineNodeEditor/Styles/Themes/Light.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<SolidColorBrush x:Key="ColorWindowBackground" Color="#FF212121"/>
4848
<SolidColorBrush x:Key="ColorWindowBorder" Color="LightGray"/>
4949
<SolidColorBrush x:Key="ColorWindowHeader" Color="#eeeef2"/>
50-
<SolidColorBrush x:Key="ColorWindowHeaderTabItemForeground" Color="White"/>
50+
<SolidColorBrush x:Key="ColorWindowHeaderTabItemForeground" Color="Black"/>
51+
<SolidColorBrush x:Key="ColorWindowHeaderTabItemForegroundOnSelect" Color="White"/>
5152

5253
<!--#region Header buttons-->
5354
<SolidColorBrush x:Key="ColorWindowHeaderButtonsIcon" Color="#8f8f91"/>

‎SimpleStateMachineNodeEditor/View/MainWindow.xaml‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:view="clr-namespace:SimpleStateMachineNodeEditor.View"
6+
xmlns:view="clr-namespace:SimpleStateMachineNodeEditor.View" xmlns:styles="clr-namespace:SimpleStateMachineNodeEditor.Styles"
77
x:Class="SimpleStateMachineNodeEditor.View.MainWindow"
88
mc:Ignorable="d"
99
Title="SimpleStateMachineNodeEditor" d:DesignWidth="550" Height="738.592" MinWidth="570" MinHeight="400" BorderThickness="1" Padding="7,0,7,7" ResizeMode="CanResizeWithGrip" BorderBrush="{DynamicResource ColorWindowBorder}" Background="{DynamicResource ColorWindowHeader}" Foreground="{x:Null}" WindowStyle="None" AllowsTransparency="True" Style="{DynamicResource CustomWindowStyle}">
@@ -173,14 +173,30 @@
173173

174174
<!--#region Tabs-->
175175
<!--BorderBrush - it's color on IsMouseOver, OpacityMask - it's color on IsPressed-->
176-
<TabControl Grid.Row="2" Background="{x:Null}" BorderBrush="{x:Null}" TabStripPlacement="Top" Padding="2,2,2,0" >
176+
<TabControl Grid.Row="2" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="Green" TabStripPlacement="Top" Padding="2,2,2,0" >
177177
<TabItem Header="Node editor" Style="{DynamicResource StyleTabItem}" Background="{DynamicResource ColorWindowHeader}" Foreground="{DynamicResource ColorWindowHeaderTabItemForeground}" BorderBrush="{DynamicResource ColorElementMouseOver}" OpacityMask="{DynamicResource ColorElementMouseOver}">
178178
<view:ViewNodesCanvas x:Name="NodesCanvas" />
179179
</TabItem>
180180
<!--<TabItem Header="Transitions table" ToolTip="" Style="{DynamicResource StyleTabItem}" Foreground="{DynamicResource ColorForeground}"/>-->
181-
<TabItem Header="Transitions table" Style="{DynamicResource StyleTabItem}" Background="{DynamicResource ColorWindowHeader}" Foreground="{DynamicResource ColorWindowHeaderTabItemForeground}" BorderBrush="{DynamicResource ColorElementMouseOver}" OpacityMask="{DynamicResource ColorElementMouseOver}">
181+
<TabItem Header="Transitions table" Style="{DynamicResource StyleTabItem}" Background="{DynamicResource ColorWindowHeader}" Foreground="{DynamicResource ColorWindowHeaderTabItemForeground}" BorderBrush="{DynamicResource ColorElementMouseOver}" OpacityMask="{DynamicResource ColorElementMouseOver}">
182+
<Grid Grid.IsSharedSizeScope="True">
183+
<Grid.ColumnDefinitions>
184+
<ColumnDefinition SharedSizeGroup="StateFrom"/>
185+
<ColumnDefinition Width="*"/>
186+
<ColumnDefinition SharedSizeGroup="TransitionName"/>
187+
<ColumnDefinition Width="*"/>
188+
<ColumnDefinition SharedSizeGroup="StateTo"/>
189+
<ColumnDefinition Width="*"/>
190+
</Grid.ColumnDefinitions>
191+
<Grid.RowDefinitions>
192+
<RowDefinition Height="auto"/>
193+
<RowDefinition/>
194+
</Grid.RowDefinitions>
195+
<Label Grid.Column="0" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconStateFrom}" OpacityMask="{DynamicResource ColorMessagesForeground}" MinHeight="11" MinWidth="11">State from</Label>
196+
<Label Grid.Column="2" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconTransitionName}" OpacityMask="{DynamicResource ColorMessagesForeground}" MinHeight="14" MinWidth="14">Transition name</Label>
197+
<Label Grid.Column="4" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconStateTo}" OpacityMask="{DynamicResource ColorMessagesForeground}" MinHeight="11" MinWidth="11">State To</Label>
182198

183-
<ListBox x:Name="TableOfTransitions" Template="{DynamicResource TemplateListBox}" Background="{DynamicResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorMessagesBorder}" Foreground="{DynamicResource ColorMessagesForeground}" ItemContainerStyle="{DynamicResource StyleListBoxTransitionsItem}" AlternationCount="2" Grid.IsSharedSizeScope="True"
199+
<ListBox Grid.Row="1" Grid.ColumnSpan="6" x:Name="TableOfTransitions" Template="{DynamicResource TemplateListBox}" Background="{DynamicResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorMessagesBorder}" Foreground="{DynamicResource ColorMessagesForeground}" ItemContainerStyle="{DynamicResource StyleListBoxTransitionsItem}" AlternationCount="2"
184200
VirtualizingStackPanel.IsVirtualizing="True"
185201
VirtualizingStackPanel.VirtualizationMode="Recycling"
186202
VirtualizingStackPanel.CacheLength="1"
@@ -192,6 +208,7 @@
192208
</DataTemplate>
193209
</ListBox.ItemTemplate>
194210
</ListBox>
211+
</Grid>
195212
</TabItem>
196213
</TabControl>
197214
<!--#endregion Tabs-->
@@ -212,15 +229,15 @@
212229
<ColumnDefinition Width="Auto"/>
213230
<ColumnDefinition />
214231
</Grid.ColumnDefinitions>
215-
<Label Grid.Column="0" x:Name="LabelErrorList" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconErrorList}" OpacityMask="{DynamicResource ColorElementMouseOver}">Error List</Label>
232+
<Label Grid.Column="0" x:Name="LabelErrorList" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconErrorList}" OpacityMask="{DynamicResource ColorElementMouseOver}" MinHeight="14" MinWidth="14">Error List</Label>
216233
<Separator Grid.Column="1" Style="{DynamicResource TemplateSeparator}" Height="Auto" BorderThickness="0,0,1,0" />
217-
<Label Grid.Column="2" x:Name="LabelError" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconError}" OpacityMask="{DynamicResource ColorElementMouseOver}">Erros</Label>
234+
<Label Grid.Column="2" x:Name="LabelError" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconError}" OpacityMask="{DynamicResource ColorElementMouseOver}" MinHeight="14" MinWidth="14">Erros</Label>
218235
<Separator Grid.Column="3" Style="{DynamicResource TemplateSeparator}" Height="Auto" BorderThickness="0,0,1,0" />
219-
<Label Grid.Column="4" x:Name="LabelWarning" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconWarning}" OpacityMask="{DynamicResource ColorElementMouseOver}">Warnings</Label>
236+
<Label Grid.Column="4" x:Name="LabelWarning" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconWarning}" OpacityMask="{DynamicResource ColorElementMouseOver}" MinHeight="14" MinWidth="14">Warnings</Label>
220237
<Separator Grid.Column="5" Style="{DynamicResource TemplateSeparator}" Height="Auto" BorderThickness="0,0,1,0" />
221-
<Label Grid.Column="6" x:Name="LabelInformation" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconInformation}" OpacityMask="{DynamicResource ColorElementMouseOver}">Messages</Label>
238+
<Label Grid.Column="6" x:Name="LabelInformation" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconInformation}" OpacityMask="{DynamicResource ColorElementMouseOver}" MinHeight="14" MinWidth="14">Messages</Label>
222239
<Separator Grid.Column="7" Visibility="{Binding ElementName=LabelDebug, Path=Visibility}" Style="{DynamicResource TemplateSeparator}" Height="Auto" BorderThickness="0,0,1,0" />
223-
<Label Grid.Column="8" x:Name="LabelDebug" Visibility="Hidden" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconDebug}" OpacityMask="{DynamicResource ColorElementMouseOver}">Debug</Label>
240+
<Label Grid.Column="8" x:Name="LabelDebug" Visibility="Hidden" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconDebug}" OpacityMask="{DynamicResource ColorElementMouseOver}" MinHeight="14" MinWidth="14">Debug</Label>
224241
<Label Grid.Column="9" x:Name="LabelErrorListUpdate" Style="{DynamicResource StyleLabelWithIcon}" BorderBrush="{DynamicResource IconUpdate}" OpacityMask="{DynamicResource ColorElementMouseOver}" HorizontalAlignment="Right" Margin="0,0,5,0">Update/Clear</Label>
225242
</Grid>
226243
</Expander.Header>

0 commit comments

Comments
 (0)