aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml.cs
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2019-12-20 17:47:51 +0200
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2019-12-20 17:47:51 +0200
commit5cb75f4b026a7842171369f58f5aba1c9678f60f (patch)
tree663b34f43629004fbd7dbb0105b7f49c42bf19bd /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml.cs
parent60be180a3736bf15e89f51f65bc1d7eda7b6cfae (diff)
downloadTango-5cb75f4b026a7842171369f58f5aba1c9678f60f.tar.gz
Tango-5cb75f4b026a7842171369f58f5aba1c9678f60f.zip
Added error message for when external bridge failed due to udp port is already used.
Implemented flexo font on mahcine studio. Added module title/image on MS. Updated some machine icons on MS.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml.cs
index 7ca062645..cfea78964 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Windows/ModuleWindow.xaml.cs
@@ -12,6 +12,8 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
+using Tango.Core.DI;
+using Tango.MachineStudio.Common.StudioApplication;
using Tango.MachineStudio.UI.ViewModels;
namespace Tango.MachineStudio.UI.Windows
@@ -32,6 +34,13 @@ namespace Tango.MachineStudio.UI.Windows
public ModuleWindow()
{
InitializeComponent();
+
+ ContentRendered += ModuleWindow_ContentRendered;
+ }
+
+ private void ModuleWindow_ContentRendered(object sender, EventArgs e)
+ {
+ Title = "MACHINE STUDIO " + TangoIOC.Default.GetInstance<IStudioApplicationManager>().Version.ToString(3);
}
public ModuleWindow(MainViewVM mainViewVM, ModuleWindowVM moduleVM, FrameworkElement view) : this()