From b885adb509065d964d628f90a3800f519f49f622 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sat, 25 Jul 2020 01:58:40 +0300 Subject: Procedure custom dialogs ! --- .../Scripting/Tango.Scripting.Basic/Project.cs | 6 ++- .../Highlighting/Resources/MarkDown-Mode.xshd | 7 ---- .../Highlighting/Resources/XML-Mode.xshd | 14 +++---- .../Tango.Scripting.Editors/Rendering/TextView.cs | 2 +- .../Tango.Scripting.Editors.csproj | 3 +- .../Tango.Scripting.Editors/Themes/Generic.xaml | 9 +++++ .../Tango.Scripting.Editors/XamlEditor.cs | 47 ++++++++++++++++++++++ 7 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Editors/XamlEditor.cs (limited to 'Software/Visual_Studio/Scripting') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs index fef43a35f..13ebda6bb 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs @@ -21,6 +21,8 @@ namespace Tango.Scripting.Basic { public class Project : ExtendedObject where T : IContext { + public String ID { get; set; } + private String _name; public String Name { @@ -52,6 +54,8 @@ namespace Tango.Scripting.Basic public Project() { + ID = Guid.NewGuid().ToString(); + ApartmentState = ApartmentState.MTA; ReferenceAssemblies = new ObservableCollection(); @@ -65,7 +69,7 @@ namespace Tango.Scripting.Basic return Task.Factory.StartNew(() => { var result = new CompilationResult(); - var tempFolder = TemporaryManager.CreateFolder(Name); + var tempFolder = TemporaryManager.CreateFolder(Name + "_" + ID); result.TemporaryProjectPath = tempFolder; String mainScriptCode = String.Empty; diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd index ead5045ab..8e02db898 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/MarkDown-Mode.xshd @@ -5,7 +5,6 @@ - @@ -43,12 +42,6 @@ \!\[.*\]\[.*\] - - \[.*\]\(.*\) - - - \[.*\]\[.*\] - [ ]{2}$ diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd index 8f0bdef76..50fdc0e2c 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/XML-Mode.xshd @@ -1,13 +1,13 @@ - - - - - - + + + + + + - + diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Rendering/TextView.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Rendering/TextView.cs index 3dabb6b7a..1b1f12ff3 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Rendering/TextView.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Rendering/TextView.cs @@ -554,7 +554,7 @@ namespace Tango.Scripting.Editors.Rendering /// public static readonly DependencyProperty LinkTextForegroundBrushProperty = DependencyProperty.Register("LinkTextForegroundBrush", typeof(Brush), typeof(TextView), - new FrameworkPropertyMetadata(Brushes.Blue)); + new FrameworkPropertyMetadata(Brushes.Gray)); /// /// Gets/sets the Brush used for displaying link texts. diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj index 94e3c4b0b..798529616 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj @@ -508,6 +508,7 @@ + @@ -650,7 +651,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml index 414006f3a..5de763df3 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Themes/Generic.xaml @@ -141,6 +141,15 @@ + +