Skip to content

Commit 8675e89

Browse files
committed
for error list
1 parent 3a9667b commit 8675e89

22 files changed

+375
-206
lines changed

SimpleStateMachineNodeEditor/App.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
<ResourceDictionary Source="Styles/ErrorList/TemplateListBox.xaml"/>
1818
<ResourceDictionary Source="Styles/ErrorList/StyleLabel.xaml"/>
1919
<ResourceDictionary Source="Styles/ErrorList/StyleListBoxItem.xaml"/>
20-
20+
<ResourceDictionary Source="Styles/ErrorList/StyleLabelWithIcon.xaml"/>
2121

2222

23+
2324
<!--#region Test-->
2425

2526
<!--#endregion Test-->
@@ -46,6 +47,7 @@
4647

4748
<!--#region Header-->
4849
<ResourceDictionary Source="Styles/MainWindow/ToolBar/ToolButtonTemplate.xaml"/>
50+
<ResourceDictionary Source="Styles/MainWindow/ToolBar/TemplateSeparator.xaml"/>
4951
<ResourceDictionary Source="Styles/MainWindow/ToolBarTemplate.xaml"/>
5052
<ResourceDictionary Source="Styles/MainWindow/Header/StyleHeaderButton.xaml"/>
5153
<ResourceDictionary Source="Styles/MainWindow/Header/StyleHeaderButtonClosePath.xaml"/>

SimpleStateMachineNodeEditor/Helpers/Enums/TypeMessage.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public enum TypeMessage
1111
Debug,
1212
Error,
1313
Information,
14-
Warning
14+
Warning,
15+
All
1516
}
1617
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace SimpleStateMachineNodeEditor.Helpers.Extensions
6+
{
7+
public static class EnumExtension
8+
{
9+
public static string Name(this Enum enumType)
10+
{
11+
return Enum.GetName(enumType.GetType(), enumType);
12+
}
13+
}
14+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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="IconDebug" >
4+
<DrawingBrush.Drawing>
5+
<DrawingGroup>
6+
<DrawingGroup.Children>
7+
<GeometryDrawing Brush="#71cf71" Geometry="M20.1,14.4L20.1,14.4l3.7-0.1v-1.4h-3.5l0-0.1c0-0.3,0-0.7,0-1c0-1.8-0.3-3.4-0.9-4.9l0-0.1l2.7-2.7l-1-1
8+
L18.3,6h-1.3V5c0-2.8-2.2-5-5-5s-5,2.2-5,5v1H5.5L2.6,3.1l-1,1l2.8,2.8l0,0.1c-0.6,1.5-0.9,3.1-0.9,4.9c0,0.3,0,0.7,0,1l0,0.1H0
9+
v1.4h3.7l0,0.1C4,16,4.6,17.5,5.4,18.8l0.1,0.1l-3.4,3.4l1,1L6.3,20l0.1,0.1c1.5,1.7,3.4,2.7,5.6,2.7c2.1,0,4-1,5.5-2.6l0.1-0.1
10+
l3.3,3.3l1-1l-3.4-3.4l0.1-0.1C19.2,17.6,19.8,16.1,20.1,14.4z M8.4,5c0-2,1.6-3.6,3.6-3.6c2,0,3.6,1.6,3.6,3.6v1H8.4V5z M16,19.1
11+
l-3.8-3.2l-3.5,3.9l-2.2-2L9.9,14l-4.2-3.5l2-2.3l4.3,3.6l3.5-3.9l2.2,2l-3.5,3.8l3.7,3.1L16,19.1z"/>
12+
</DrawingGroup.Children>
13+
</DrawingGroup>
14+
</DrawingBrush.Drawing>
15+
</DrawingBrush>
16+
</ResourceDictionary>

SimpleStateMachineNodeEditor/Icons/Error.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M2,8C2,4.687 4.687,2 8,2 11.313,2 14,4.687 14,8 14,11.313 11.313,14 8,14 4.687,14 2,11.313 2,8" />
87
<GeometryDrawing Brush="#FFE51300" Geometry="F1M11,10L10,11 8,9 6,11 5,10 7,7.972 5,6 6,5 8,7 10,5 11,6 9,7.972z M8,3C5.238,3 3,5.238 3,8 3,10.762 5.238,13 8,13 10.762,13 13,10.762 13,8 13,5.238 10.762,3 8,3" />
9-
<GeometryDrawing Brush="#FFFFFFFF" Geometry="F1M9,7.9722L11,10.0002 10,11.0002 8,9.0002 6,11.0002 5,10.0002 7,7.9722 5,6.0002 6,5.0002 8,7.0002 10,5.0002 11,6.0002z" />
108
</DrawingGroup.Children>
119
</DrawingGroup>
1210
</DrawingBrush.Drawing>

SimpleStateMachineNodeEditor/Icons/ErrorList.xaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
8-
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14,15.2402L14,16.0002 2.01,16.0002C1.987,16.0202,2.01,3.0002,2.01,3.0002L4,3.0002 4,2.0002 5.01,2.0002C5.423,0.8362 6.716,0.000199999999999534 8.02,0.000199999999999534 9.324,0.000199999999999534 10.598,0.8362 11.01,2.0002L12,2.0002 12,3.0002 14,3.0002 14,7.7602C15.205,8.5672 16,9.9402 16,11.5002 16,13.0592 15.205,14.4322 14,15.2402" />
9-
<GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M7.0005,11.5C7.0005,9.015 9.0145,7 11.5005,7 11.6705,7 11.8345,7.032 12.0005,7.05L12.0005,5 4.0005,5 4.0005,14 7.7605,14C7.2815,13.285,7.0005,12.426,7.0005,11.5 M7.0105,3C7.0105,2.447 7.4585,2 8.0095,2 8.5625,2 9.0095,2.447 9.0095,3 9.0095,3.553 8.5625,4 8.0095,4 7.4585,4 7.0105,3.553 7.0105,3" />
10-
<GeometryDrawing Brush="#FF424242" Geometry="F1M8.0098,2C8.5628,2 9.0098,2.447 9.0098,3 9.0098,3.553 8.5718,4 8.0198,4 7.4678,4 7.0098,3.553 7.0098,3 7.0098,2.447 7.4588,2 8.0098,2 M10.9998,5L10.9998,4 10.9998,3 10.0098,3C10.0098,1.896 9.1148,1 8.0098,1 6.9058,1 6.0098,1.896 6.0098,3L4.9998,3 4.9998,4 4.9998,5z" />
11-
<GeometryDrawing Brush="#FFC17C1A" Geometry="F1M7.7618,14L3.9998,14 3.9998,5 4.9998,5 4.9998,4 2.9998,4 2.9998,15 8.7068,15C8.3458,14.712,8.0198,14.384,7.7618,14 M11.9998,5L10.9998,5 10.9998,4 12.9998,4 12.9998,7.276C12.6808,7.163,12.3468,7.09,11.9998,7.051z" />
12-
<GeometryDrawing Brush="#FFE51400" Geometry="F1M13.3535,12.6465L12.6465,13.3535 11.4995,12.2075 10.3535,13.3535 9.6465,12.6465 10.7925,11.5005 9.6465,10.3535 10.3535,9.6465 11.4995,10.7925 12.6465,9.6465 13.3535,10.3535 12.2075,11.5005z M11.4995,8.0005C9.5675,8.0005 7.9995,9.5675 7.9995,11.5005 7.9995,13.4325 9.5675,15.0005 11.4995,15.0005 13.4325,15.0005 14.9995,13.4325 14.9995,11.5005 14.9995,9.5675 13.4325,8.0005 11.4995,8.0005" />
13-
<GeometryDrawing Brush="#FFFFFFFF" Geometry="F1M12.207,11.5L13.353,12.646 12.646,13.354 11.5,12.207 10.353,13.354 9.646,12.646 10.793,11.5 9.646,10.354 10.353,9.646 11.5,10.793 12.646,9.646 13.353,10.354z" />
7+
<GeometryDrawing Brush="LightGray" Geometry="M2 10V9H14V10H2ZM2 6H14V7H2V6ZM14 3V4H2V3H14Z" />
148
</DrawingGroup.Children>
159
</DrawingGroup>
1610
</DrawingBrush.Drawing>

SimpleStateMachineNodeEditor/Icons/Icons.xaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ResourceDictionary Source="CollapseUp.xaml"/>
1010
<ResourceDictionary Source="CollapseUpGroup.xaml"/>
1111
<ResourceDictionary Source="DeleteScheme.xaml"/>
12-
<ResourceDictionary Source="Error.xaml"/>
12+
1313
<ResourceDictionary Source="ErrorList.xaml"/>
1414
<ResourceDictionary Source="Save.xaml"/>
1515
<ResourceDictionary Source="ExpandDown.xaml"/>
@@ -23,12 +23,19 @@
2323
<ResourceDictionary Source="Copy.xaml"/>
2424
<ResourceDictionary Source="ExpandDownGroup.xaml"/>
2525
<ResourceDictionary Source="AddNode.xaml"/>
26-
<ResourceDictionary Source="Redo.xaml"/>
26+
<ResourceDictionary Source="Update.xaml"/>
27+
2728
<ResourceDictionary Source="Relationship.xaml"/>
2829
<ResourceDictionary Source="SaveAs.xaml"/>
30+
31+
<ResourceDictionary Source="Debug.xaml"/>
32+
<ResourceDictionary Source="Error.xaml"/>
2933
<ResourceDictionary Source="Information.xaml"/>
3034
<ResourceDictionary Source="Warning.xaml"/>
35+
36+
<ResourceDictionary Source="Redo.xaml"/>
3137
<ResourceDictionary Source="Undo.xaml"/>
38+
3239
<ResourceDictionary Source="ZoomIn.xaml"/>
3340
<ResourceDictionary Source="ZoomOriginalSize.xaml"/>
3441
<ResourceDictionary Source="ZoomOut.xaml"/>

SimpleStateMachineNodeEditor/Icons/Information.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14,7.5C14,10.537 11.537,13 8.5,13 5.463,13 3,10.537 3,7.5 3,4.463 5.463,2 8.5,2 11.537,2 14,4.463 14,7.5" />
87
<GeometryDrawing Brush="#FF1AA1E2" Geometry="F1M9,5L8,5 8,4 9,4z M9,11L8,11 8,6 9,6z M8.5,3C6.015,3 4,5.015 4,7.5 4,9.985 6.015,12 8.5,12 10.985,12 13,9.985 13,7.5 13,5.015 10.985,3 8.5,3" />
9-
<GeometryDrawing Brush="#FFFFFFFF" Geometry="F1M8,5L9,5 9,4 8,4z M8,11L9,11 9,6.001 8,6.001z" />
108
</DrawingGroup.Children>
119
</DrawingGroup>
1210
</DrawingBrush.Drawing>
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="IconUpdate" >
4+
<DrawingBrush.Drawing>
5+
<DrawingGroup>
6+
<DrawingGroup.Children>
7+
<GeometryDrawing Brush="LightGray" Geometry="F1M15,8C15,11.859 11.859,15 8,15 4.14,15 1,11.859 1,8 1,6.076 1.801,4.292 3.121,3L1,3 1,1 7,1 7,7 5,7 5,4.002C3.766,4.931 3,6.401 3,8 3,10.757 5.243,13 8,13 10.757,13 13,10.757 13,8 13,6.321 12.164,4.763 10.764,3.833L11.871,2.167C13.83,3.469,15,5.649,15,8" />
8+
</DrawingGroup.Children>
9+
</DrawingGroup>
10+
</DrawingBrush.Drawing>
11+
</DrawingBrush>
12+
</ResourceDictionary>

SimpleStateMachineNodeEditor/Icons/Warning.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
<DrawingBrush.Drawing>
66
<DrawingGroup>
77
<DrawingGroup.Children>
8-
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M8.3428,2L6.6518,2 1.9968,12 3.6908,14 11.3058,14 12.9968,12z" />
98
<GeometryDrawing Brush="#FFFFCC00" Geometry="F1M7.997,9L6.997,9 6.997,6 7.997,6z M7.997,11L6.997,11 6.997,10 7.997,10z M7.706,3L7.29,3 3.175,11.842 4.153,13 10.841,13 11.821,11.842z" />
10-
<GeometryDrawing Brush="#FF000000" Geometry="F1M6.997,9L7.997,9 7.997,6 6.997,6z M6.997,11L7.997,11 7.997,10 6.997,10z" />
119
</DrawingGroup.Children>
1210
</DrawingGroup>
1311
</DrawingBrush.Drawing>

0 commit comments

Comments
 (0)