From fc8a05358a92cc3c77c5f1e30d536807ef0614fd Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 8 Apr 2019 13:49:55 +0300 Subject: were added scripting projects --- .../Scripting/Tango.Scripting.IDE.UI/App.config | 55 ++++++ .../Scripting/Tango.Scripting.IDE.UI/App.xaml | 27 +++ .../Scripting/Tango.Scripting.IDE.UI/App.xaml.cs | 17 ++ .../Tango.Scripting.IDE.UI/MainWindow.xaml | 14 ++ .../Tango.Scripting.IDE.UI/MainWindow.xaml.cs | 30 +++ .../Tango.Scripting.IDE.UI/MainWindowVM.cs | 19 ++ .../Properties/AssemblyInfo.cs | 19 ++ .../Properties/Resources.Designer.cs | 71 +++++++ .../Properties/Resources.resx | 117 ++++++++++++ .../Properties/Settings.Designer.cs | 30 +++ .../Properties/Settings.settings | 7 + .../Tango.Scripting.IDE.UI.csproj | 208 +++++++++++++++++++++ .../Tango.Scripting.IDE.UI/packages.config | 49 +++++ 13 files changed, 663 insertions(+) create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.config create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.xaml create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.xaml.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindow.xaml create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindow.xaml.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindowVM.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/AssemblyInfo.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Resources.Designer.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Resources.resx create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Settings.Designer.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Settings.settings create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Tango.Scripting.IDE.UI.csproj create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/packages.config (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.config b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.config new file mode 100644 index 000000000..de2319b52 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.config @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.xaml b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.xaml new file mode 100644 index 000000000..be9fdd055 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.xaml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.xaml.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.xaml.cs new file mode 100644 index 000000000..273731b71 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace Tango.Scripting.IDE.UI +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindow.xaml b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindow.xaml new file mode 100644 index 000000000..032d38c81 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindow.xaml @@ -0,0 +1,14 @@ + + + + + diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindow.xaml.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindow.xaml.cs new file mode 100644 index 000000000..13f2bf7a9 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindow.xaml.cs @@ -0,0 +1,30 @@ +using MahApps.Metro.Controls; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.Scripting.IDE.UI +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : MetroWindow + { + public MainWindow() + { + InitializeComponent(); + DataContext = new MainWindowVM(); + } + } +} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindowVM.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindowVM.cs new file mode 100644 index 000000000..2ced386b3 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/MainWindowVM.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.SharedUI; + +namespace Tango.Scripting.IDE.UI +{ + public class MainWindowVM : ViewModel + { + public ScriptIDEViewVM IdeVM { get; set; } + + public MainWindowVM() + { + IdeVM = new ScriptIDEViewVM(); + } + } +} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..462c7e284 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +[assembly: AssemblyTitle("Tango - Scripting IDE Application")] +[assembly: ComVisible(false)] +[assembly: AssemblyVersion("2.0.36.1608")] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Resources.Designer.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Resources.Designer.cs new file mode 100644 index 000000000..45fc62ce0 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.Scripting.IDE.UI.Properties +{ + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.Scripting.IDE.UI.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Resources.resx b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Settings.Designer.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Settings.Designer.cs new file mode 100644 index 000000000..fb153fa4c --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.Scripting.IDE.UI.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Settings.settings b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Settings.settings new file mode 100644 index 000000000..033d7a5e9 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Tango.Scripting.IDE.UI.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Tango.Scripting.IDE.UI.csproj new file mode 100644 index 000000000..e4702273a --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Tango.Scripting.IDE.UI.csproj @@ -0,0 +1,208 @@ + + + + + Debug + AnyCPU + {B0EFE7A0-7039-4DC4-8B39-465E521299F6} + WinExe + Tango.Scripting.IDE.UI + Tango.Scripting.IDE.UI + v4.6.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + AnyCPU + true + full + false + ..\..\Build\Scripting\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + ..\..\Build\Scripting\Release\ + TRACE + prompt + 4 + + + + ..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll + + + ..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll + + + ..\..\packages\Microsoft.CodeAnalysis.Common.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll + + + ..\..\packages\Microsoft.CodeAnalysis.CSharp.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll + + + ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll + + + + ..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll + + + ..\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + + + + ..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + + + ..\..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll + + + ..\..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll + + + ..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + + + ..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + + + ..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + + + + ..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll + + + ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + + + ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + + + ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + + + ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + + ..\..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll + + + ..\..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll + + + ..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll + + + ..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll + + + + + + + + + 4.0 + + + ..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + + + ..\..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll + + + ..\..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll + + + ..\..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + GlobalVersionInfo.cs + + + App.xaml + Code + + + MainWindow.xaml + Code + + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} + Tango.Core + + + {8491d07b-c1f6-4b62-a412-41b9fd2d6538} + Tango.SharedUI + + + {da62fa39-668b-47a6-b0f2-d2c1daf777b0} + Tango.Scripting.Editors + + + {c9f60285-91fb-4293-bcf5-164d76755cdd} + Tango.Scripting.IDE + + + {1e938fd2-c669-4738-98c9-77f96ce4d451} + Tango.Scripting + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/packages.config b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/packages.config new file mode 100644 index 000000000..5fa98b5e2 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/packages.config @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.3.1 From b41347f1528e5e34d8c8c8ef2c5b6b63876098f1 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 11 Apr 2019 16:07:21 +0300 Subject: added icons to menu, solution for setting icons dynamically to context menu --- .../Scripting/Tango.Scripting.IDE.UI/App.config | 44 --------------------- .../Tango.Scripting.IDE.UI.csproj | 2 +- .../Converters/BitmapSourceToImageConverter.cs | 31 +++++++++++++++ .../Tango.Scripting.IDE/Images/Open_16x.png | Bin 0 -> 452 bytes .../Tango.Scripting.IDE/Images/Rename_16x.png | Bin 0 -> 210 bytes .../Images/Settings_Inverse_16x.png | Bin 0 -> 405 bytes .../Tango.Scripting.IDE/Images/copy_16x.png | Bin 0 -> 245 bytes .../Tango.Scripting.IDE/Images/deletered_16.png | Bin 0 -> 621 bytes .../Tango.Scripting.IDE/Images/hashtag.png | Bin 0 -> 386 bytes .../Scripting/Tango.Scripting.IDE/Project.cs | 8 ++-- .../ProjectItems/CSharpScriptItem.cs | 10 ++--- .../Tango.Scripting.IDE/ScriptIDEView2.xaml | 9 ++--- .../Tango.Scripting.IDE/SolutionItemCommand.cs | 12 +++++- .../Tango.Scripting.IDE/Tango.Scripting.IDE.csproj | 19 +++++++++ .../Tango.Scripting.IDE/Images/deletered_16.png | Bin 0 -> 575 bytes 15 files changed, 75 insertions(+), 60 deletions(-) create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Converters/BitmapSourceToImageConverter.cs create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Open_16x.png create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Rename_16x.png create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Settings_Inverse_16x.png create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/copy_16x.png create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/deletered_16.png create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/hashtag.png create mode 100644 Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/deletered_16.png (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.config b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.config index de2319b52..aa58e3cac 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.config +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/App.config @@ -6,50 +6,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Tango.Scripting.IDE.UI.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Tango.Scripting.IDE.UI.csproj index e4702273a..deda62b7c 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Tango.Scripting.IDE.UI.csproj +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE.UI/Tango.Scripting.IDE.UI.csproj @@ -12,7 +12,7 @@ 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 - true + false AnyCPU diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Converters/BitmapSourceToImageConverter.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Converters/BitmapSourceToImageConverter.cs new file mode 100644 index 000000000..c7cd1e573 --- /dev/null +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Converters/BitmapSourceToImageConverter.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Media; +using System.Windows.Media.Imaging; + +namespace Tango.Scripting.IDE.Converters +{ + public class BitmapSourceToImageConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return new Image() + { + Source = value as BitmapSource, + Width = 16, + Height = 16, + }; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Open_16x.png b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Open_16x.png new file mode 100644 index 000000000..88cfc578a Binary files /dev/null and b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Open_16x.png differ diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Rename_16x.png b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Rename_16x.png new file mode 100644 index 000000000..eb85c52a8 Binary files /dev/null and b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Rename_16x.png differ diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Settings_Inverse_16x.png b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Settings_Inverse_16x.png new file mode 100644 index 000000000..464a9f751 Binary files /dev/null and b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/Settings_Inverse_16x.png differ diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/copy_16x.png b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/copy_16x.png new file mode 100644 index 000000000..7f3de9d64 Binary files /dev/null and b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/copy_16x.png differ diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/deletered_16.png b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/deletered_16.png new file mode 100644 index 000000000..35b767569 Binary files /dev/null and b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/deletered_16.png differ diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/hashtag.png b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/hashtag.png new file mode 100644 index 000000000..74c6d1801 Binary files /dev/null and b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Images/hashtag.png differ diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Project.cs index 9ba1ed902..6392ddcb7 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Project.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Project.cs @@ -38,10 +38,10 @@ namespace Tango.Scripting.IDE Commands = new ObservableCollection { new SolutionItemCommand(BuildProject) { Name = "Build", Image= GetImage(@"Images/BuildSolution_16x.png") }, - new SolutionItemCommand(SetStartUpProject) { Name = "Set as StartUp Project" }, - new SolutionItemCommand(Remove) { Name = "Remove" }, - new SolutionItemCommand(Rename) { Name = "Rename" }, - new SolutionItemCommand(OpenFolderInFileExplorer) { Name = "Open Folder In File Explorer" }, + new SolutionItemCommand(SetStartUpProject) { Name = "Set as StartUp Project" , Image= GetImage(@"Images/Settings_Inverse_16x.png")}, + new SolutionItemCommand(Remove) { Name = "Remove" , Image= GetImage(@"Images/deletered_16.png")}, + new SolutionItemCommand(Rename) { Name = "Rename", Image= GetImage(@"Images/Rename_16x.png") }, + new SolutionItemCommand(OpenFolderInFileExplorer) { Name = "Open Folder In File Explorer", Image= GetImage(@"Images/Open_16x.png") }, new SolutionItemCommand() { Name = "Add...", diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ProjectItems/CSharpScriptItem.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ProjectItems/CSharpScriptItem.cs index e53f90ef3..0fe375a1f 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ProjectItems/CSharpScriptItem.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ProjectItems/CSharpScriptItem.cs @@ -11,7 +11,7 @@ namespace Tango.Scripting.IDE.ProjectItems { public class CSharpScriptItem : ProjectItem { - public override BitmapSource Image => GetImage("Images/CSharpScriptItem.png"); + public override BitmapSource Image => GetImage("Images/hashtag.png"); private String _code; public String Code @@ -31,11 +31,11 @@ namespace Tango.Scripting.IDE.ProjectItems { Commands = new System.Collections.ObjectModel.ObservableCollection() { - new SolutionItemCommand(Open) { Name = "Open" }, + new SolutionItemCommand(Open) { Name = "Open" , Image = GetImage(@"Images/Open_16x.png")}, new SolutionItemCommand(CutItem) { Name = "Cut" , Image = GetImage(@"Images/Cut_16xSM.png")}, - new SolutionItemCommand(CopyItem) { Name = "Copy" }, - new SolutionItemCommand(CopyItem) { Name = "Delete" }, - new SolutionItemCommand(RenameItem) { Name = "Rename" } + new SolutionItemCommand(CopyItem) { Name = "Copy" , Image = GetImage(@"Images/copy_16x.png")}, + new SolutionItemCommand(CopyItem) { Name = "Delete" , Image = GetImage(@"Images/deletered_16.png")}, + new SolutionItemCommand(RenameItem) { Name = "Rename", Image = GetImage(@"Images/Rename_16x.png") } }; } diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml index 6f3914ec8..e79734b3a 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml @@ -6,6 +6,7 @@ xmlns:local="clr-namespace:Tango.Scripting.IDE" xmlns:fa="http://schemas.fontawesome.io/icons/" xmlns:controls="clr-namespace:Tango.Scripting.IDE.Controls" + xmlns:converters="clr-namespace:Tango.Scripting.IDE.Converters" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=local:ScriptIDEViewVM, IsDesignTimeCreatable=False}" x:Name="control"> @@ -15,15 +16,13 @@ + + diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/SolutionItemCommand.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/SolutionItemCommand.cs index c6627d354..9fbac01c2 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/SolutionItemCommand.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/SolutionItemCommand.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.ComponentModel; +using System.IO; using System.Linq; using System.Text; @@ -10,7 +12,7 @@ using Tango.Core.Commands; namespace Tango.Scripting.IDE { - public class SolutionItemCommand : RelayCommand, ISolutionItemCommand + public class SolutionItemCommand : RelayCommand, ISolutionItemCommand, INotifyPropertyChanged { public SolutionItemCommand() : base(()=> { }) { @@ -53,6 +55,9 @@ namespace Tango.Scripting.IDE public String Name { get; set; } BitmapSource _bImage; + + public event PropertyChangedEventHandler PropertyChanged; + public BitmapSource Image { get { @@ -61,9 +66,14 @@ namespace Tango.Scripting.IDE set { _bImage = value; + RaisePropertyChanged(nameof(Image)); } } public ObservableCollection Commands { get; set; } + protected virtual void RaisePropertyChanged(String propName) + { + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propName)); + } } } diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj index 194f49ea8..4f47db2bc 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj @@ -75,6 +75,7 @@ + NewProjectView.xaml @@ -315,5 +316,23 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/deletered_16.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/deletered_16.png new file mode 100644 index 000000000..869ae3797 Binary files /dev/null and b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/deletered_16.png differ -- cgit v1.3.1