diff --git a/CLEditor/CLEngine.Editor.csproj b/CLEditor/CLEngine.Editor.csproj
index 1063f3778ef0d2c546a653d9941edc6b6d402eac..113f1ba685150f0bbc9c110c8ebf9c235a332d4a 100644
--- a/CLEditor/CLEngine.Editor.csproj
+++ b/CLEditor/CLEngine.Editor.csproj
@@ -433,6 +433,7 @@
NodeScriptWindow.xaml
+
diff --git a/CLEditor/core/EditorUtils.cs b/CLEditor/core/EditorUtils.cs
index cf00a74b371f4b2c68d40c10934b172a74aaf774..58ec46a027e85e78af70967efda21399306a3832 100644
--- a/CLEditor/core/EditorUtils.cs
+++ b/CLEditor/core/EditorUtils.cs
@@ -42,7 +42,18 @@ namespace CLEngine.Editor.core
return bImg;
}
- public static BitmapSource ConvertBitmapToSource96DPI(BitmapImage bitmapImage)
+ internal static StackPanel CreateHeader(string text, ImageSource imageSource)
+ {
+ StackPanel stackPanel = new StackPanel();
+ stackPanel.Orientation = Orientation.Horizontal;
+ if (imageSource != null)
+ stackPanel.Children.Add(new Image() { Source = imageSource, Margin = new Thickness(0, 0, 4, 0) });
+ stackPanel.Children.Add(new TextBlock() { Text = text });
+
+ return stackPanel;
+ }
+
+ public static BitmapSource ConvertBitmapToSource96DPI(BitmapImage bitmapImage)
{
double dpi = 96;
int width = bitmapImage.PixelWidth;
diff --git a/CLEditor/theme/IgniteDark.xaml b/CLEditor/theme/IgniteDark.xaml
index d7654c7bf478457b3e76102612e6216360b13798..aa4e9af99369fd1eb359061fe9d8338743dbf7e3 100644
--- a/CLEditor/theme/IgniteDark.xaml
+++ b/CLEditor/theme/IgniteDark.xaml
@@ -93,16 +93,129 @@
+ #444444
+ #333333
+ #595959
+ #3D3D3D
+ #424242
+ #666666
+ #EFEFEF
+
+ #BDBDBD
+ #525252
+
-
+
+
+
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ M-0.7,5.2 L-2.2,6.7 3.6,12.6 9.5,6.7 8,5.2 3.6,9.6 z
+ M-2.2,10.9 L-0.7,12.4 3.7,8 8,12.4 9.5,10.9 3.7,5 z
+ M1.0E-41,4.2 L0,2.1 2.5,4.5 6.7,4.4E-47 6.7,2.3 2.5,6.7 z
+ M7.2,5 L5.5,7.16 4.16,6.3 3.5,6.7 5.5,8.4 8.6,5.25 C8.6,5.25 8,4.7 7.22,5
+ M 0,0 L 4,3.5 L 0,7 Z
+ M 1,1.5 L 4.5,5 L 8,1.5
+ M 1,4.5 L 4.5,1 L 8,4.5
+ M6.5,2.6C4.767,0.973 2.509,0 0,0 0,0 0,19 0,19L23,19z
+ M3.5445026,0 L7.0890052,7.0890053 L3.0459049E-09,7.0890053 z
+ M-0,6 L-0,8 8,8 8,-0 6,-0 6,6 z
+ M5,-0 L9,5 1,5 z
@@ -149,7 +262,8 @@
-
+
+
@@ -1322,7 +1436,7 @@
-
+ -->
@@ -1584,7 +1698,9 @@
-
+
@@ -1598,29 +1714,13 @@
-
-
-
-
-
-
-
-
-
+
@@ -3041,8 +3141,6 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CLEditor/theme/LeftMarginMultiplierConverter.cs b/CLEditor/theme/LeftMarginMultiplierConverter.cs
new file mode 100644
index 0000000000000000000000000000000000000000..df6ab49bb4251ee4858f670be877e435cddad7e7
--- /dev/null
+++ b/CLEditor/theme/LeftMarginMultiplierConverter.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using CLEngine.Editor.core;
+
+namespace CLEngine.Editor.theme
+{
+ public class LeftMarginMultiplierConverter : IValueConverter
+ {
+ public double Length { get; set; }
+
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ var item = value as TreeViewItem;
+ if (item == null)
+ return new Thickness(0);
+
+ return new Thickness(Length * item.GetDepth(), 0, 0, 0);
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new System.NotImplementedException();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CLEditor/viewmodel/DataBaseViewModel.cs b/CLEditor/viewmodel/DataBaseViewModel.cs
index 4f1c4b13612025fb19bf4b9b11a3e6aeaec76e87..857297f6b6bfb2dd765afb00769e2125493b8d3e 100644
--- a/CLEditor/viewmodel/DataBaseViewModel.cs
+++ b/CLEditor/viewmodel/DataBaseViewModel.cs
@@ -195,8 +195,12 @@ namespace CLEngine.Editor.viewmodel
///
///
public void ClearItemChildTypes(object value)
- {
- ItemChildTypes.Clear();
+ {
+ ItemChildTypes.Clear();
+
+ if (value == null)
+ return;
+
foreach (var itemType in FrameworkSettings.ItemTypes[value.ToString()])
ItemChildTypes.Add(itemType);
}