aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-01-07 16:06:38 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-01-07 16:06:38 +0200
commite111c33bc87acf40202f9e5423e21b087a366f07 (patch)
treefac6d85ec3589620b1daea9a9f740a2120b0ca10 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
parent6da42fd28ffbb680d85bb9e695520713ff51022a (diff)
downloadTango-e111c33bc87acf40202f9e5423e21b087a366f07.tar.gz
Tango-e111c33bc87acf40202f9e5423e21b087a366f07.zip
Added new events !!!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs25
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html48
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml37
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs48
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj11
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs4
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs21
9 files changed, 5 insertions, 193 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs
deleted file mode 100644
index eff8c98a0..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Html;
-using Tango.MachineStudio.UI.Windows;
-
-namespace Tango.MachineStudio.UI.Html
-{
- public class DefaultHtmlPresenter : IHtmlPresenter
- {
- public bool DisplayHtml(HtmlPage html)
- {
- HtmlWindow dialog = new HtmlWindow(html);
- dialog.Owner = Application.Current.MainWindow;
- MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
- var result = dialog.ShowDialog();
- MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
- return result.Value;
- }
- }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html
deleted file mode 100644
index 5c620fc83..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="X-UA-Compatible" content="IE=edge" />
- <style>
- html {
- overflow: hidden;
- padding: 0;
- margin: 0;
- font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
- }
-
- body {
- padding: 0;
- margin: 0;
- /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#eeeeee+0,eeeeee+100;Grey+Flat */
- background: rgb(238,238,238); /* Old browsers */
- background: -moz-linear-gradient(top, rgba(238,238,238,1) 0%, rgba(238,238,238,1) 100%); /* FF3.6-15 */
- background: -webkit-linear-gradient(top, rgba(238,238,238,1) 0%,rgba(238,238,238,1) 100%); /* Chrome10-25,Safari5.1-6 */
- background: linear-gradient(to bottom, rgba(238,238,238,1) 0%,rgba(238,238,238,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
- }
-
- .header {
- font-size: 25pt;
- background: #414141;
- color: white;
- padding: 15px;
- }
-
- li {
- margin:30px 10px;
- padding:10px;
- background:#C3C3C3;
- max-width:500px;
- border-radius:5px;
- }
- </style>
-</head>
-<body>
- <div class="header">Thread Break</div>
- <ol>
- <li>Open the cover.</li>
- <li>Connect the broken thread.</li>
- <li>Close the cover.</li>
- <li>Press 'OK' when done.</li>
- </ol>
-</body>
-</html> \ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml
deleted file mode 100644
index f984a985f..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml
+++ /dev/null
@@ -1,37 +0,0 @@
-<Window x:Class="Tango.MachineStudio.UI.Html.HtmlWindow"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
- xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:local="clr-namespace:Tango.MachineStudio.UI.Windows"
- mc:Ignorable="d"
- Title="Machine Studio" Height="500" Width="800" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" Background="Transparent">
- <Grid>
- <Grid>
- <Border Background="White" BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}">
- <Border.Effect>
- <DropShadowEffect ShadowDepth="0" BlurRadius="10"></DropShadowEffect>
- </Border.Effect>
-
- <Grid>
- <DockPanel>
- <Grid DockPanel.Dock="Bottom">
- <Button Margin="10" Width="140" HorizontalAlignment="Right" Click="OKClicked">RESOLVE</Button>
- </Grid>
- <WebBrowser x:Name="webBrowser"
- OverridesDefaultStyle="False"
- ScrollViewer.CanContentScroll="False"
- ScrollViewer.HorizontalScrollBarVisibility="Hidden"
- ScrollViewer.VerticalScrollBarVisibility="Hidden"></WebBrowser>
- </DockPanel>
-
- <Button Click="CloseClicked" HorizontalAlignment="Right" VerticalAlignment="Top" Width="20" Height="20" Margin="0 -6 -4 0" Padding="0" Style="{StaticResource MaterialDesignFlatButton}" Foreground="Black">
- <materialDesign:PackIcon Kind="Close" Width="16" Height="16"></materialDesign:PackIcon>
- </Button>
- </Grid>
- </Border>
- </Grid>
- </Grid>
-</Window>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs
deleted file mode 100644
index 9f37eba06..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using MahApps.Metro.Controls;
-using MaterialDesignThemes.Wpf;
-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.Shapes;
-using Tango.BL.Entities;
-using Tango.Core.Commands;
-
-namespace Tango.MachineStudio.UI.Html
-{
- /// <summary>
- /// Interaction logic for DialogWindow.xaml
- /// </summary>
- public partial class HtmlWindow : Window
- {
- public HtmlWindow(HtmlPage html)
- {
- InitializeComponent();
-
- webBrowser.Loaded += (_, __) =>
- {
- webBrowser.NavigateToString(html.Html);
- };
- }
-
- private void OKClicked(object sender, RoutedEventArgs e)
- {
- DialogResult = true;
- Close();
- }
-
- private void CloseClicked(object sender, RoutedEventArgs e)
- {
- DialogResult = false;
- Close();
- }
- }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index baa550017..1612eb36c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -265,7 +265,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
var eventLogger = TangoIOC.Default.GetInstance<IEventLogger>();
if (eventLogger != null)
{
- eventLogger.Log(EventTypes.ApplicationTerminated, "Application Terminated!");
+ eventLogger.Log(EventTypes.APPLICATION_TERMINATED, "Application Terminated!");
eventLogger.FlushAll();
}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index fb84d64bd..706b1c8f7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -144,10 +144,6 @@
</Compile>
<Compile Include="Console\ConsoleWindowVM.cs" />
<Compile Include="FirmwareUpgrade\DefaultFirmwareUpgrader.cs" />
- <Compile Include="Html\DefaultHtmlPresenter.cs" />
- <Compile Include="Html\HtmlWindow.xaml.cs">
- <DependentUpon>HtmlWindow.xaml</DependentUpon>
- </Compile>
<Compile Include="Messages\ForcedUpdateMessage.cs" />
<Compile Include="Modules\DefaultStudioModuleLoader.cs" />
<Compile Include="Notifications\TextInputBoxWindow.xaml.cs">
@@ -243,10 +239,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Html\HtmlWindow.xaml">
- <Generator>MSBuild:Compile</Generator>
- <SubType>Designer</SubType>
- </Page>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -536,7 +528,6 @@
<Link>Tango.Embroidery.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="Html\HTML Templates\Thread Break.html" />
<Resource Include="machine.ico" />
<Resource Include="Images\bug-resolved.png" />
<EmbeddedResource Include="Properties\Resources.resx">
@@ -618,7 +609,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta
</Target>
<ProjectExtensions>
<VisualStudio>
- <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+ <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
</VisualStudio>
</ProjectExtensions>
</Project> \ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 3c548855d..b0a3a8c11 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -7,7 +7,6 @@ using Tango.MachineStudio.Common.Authentication;
using Tango.MachineStudio.Common.Diagnostics;
using Tango.MachineStudio.Common.EventLogging;
using Tango.MachineStudio.Common.FirmwareUpgrade;
-using Tango.MachineStudio.Common.Html;
using Tango.MachineStudio.Common.Modules;
using Tango.MachineStudio.Common.Navigation;
using Tango.MachineStudio.Common.Notifications;
@@ -18,7 +17,6 @@ using Tango.MachineStudio.Common.Video;
using Tango.MachineStudio.UI.Authentication;
using Tango.MachineStudio.UI.Console;
using Tango.MachineStudio.UI.FirmwareUpgrade;
-using Tango.MachineStudio.UI.Html;
using Tango.MachineStudio.UI.Modules;
using Tango.MachineStudio.UI.Navigation;
using Tango.MachineStudio.UI.Notifications;
@@ -67,7 +65,6 @@ namespace Tango.MachineStudio.UI
TangoIOC.Default.Unregister<IDiagnosticsFrameProvider>();
TangoIOC.Default.Unregister<IEventLogger>();
TangoIOC.Default.Unregister<ISpeechProvider>();
- TangoIOC.Default.Unregister<IHtmlPresenter>();
TangoIOC.Default.Unregister<ITeamFoundationServiceClient>();
TangoIOC.Default.Unregister<IDispatcherProvider>();
TangoIOC.Default.Unregister<IFirmwareUpgrader>();
@@ -84,7 +81,6 @@ namespace Tango.MachineStudio.UI
TangoIOC.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>();
TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>();
TangoIOC.Default.Register<ISpeechProvider, DefaultSpeechProvider>();
- TangoIOC.Default.Register<IHtmlPresenter, DefaultHtmlPresenter>();
TangoIOC.Default.Register<IFirmwareUpgrader, DefaultFirmwareUpgrader>();
TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa"));
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
index 492e23963..4ebf3d96d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs
@@ -141,7 +141,7 @@ namespace Tango.MachineStudio.UI.ViewModels
_authenticationProvider.Login(Email, Password);
- _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!");
+ _eventLogger.Log(EventTypes.APPLICATION_STARTED, "Application Started!");
_navigationManager.NavigateTo(NavigationView.MainView);
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index e3a8b4e7c..c13c7379a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -20,7 +20,6 @@ using Tango.MachineStudio.Common;
using Tango.MachineStudio.Common.Authentication;
using Tango.MachineStudio.Common.Diagnostics;
using Tango.MachineStudio.Common.EventLogging;
-using Tango.MachineStudio.Common.Html;
using Tango.MachineStudio.Common.Messages;
using Tango.MachineStudio.Common.Modules;
using Tango.MachineStudio.Common.Navigation;
@@ -54,7 +53,6 @@ namespace Tango.MachineStudio.UI.ViewModels
private bool _isDisconnecting;
private Thread _updateCheckThread;
private IEventLogger _eventLogger;
- private IHtmlPresenter _htmlPresenter;
private MachineStudioSettings _settings;
/// <summary>
@@ -282,7 +280,7 @@ namespace Tango.MachineStudio.UI.ViewModels
IEventLogger eventLogger,
IDiagnosticsFrameProvider frameProvider,
ISpeechProvider speechProvider,
- IHtmlPresenter htmlPresenter, TeamFoundationServiceExtendedClient tfs) : base()
+ TeamFoundationServiceExtendedClient tfs) : base()
{
TFSClient = tfs;
_eventLogger = eventLogger;
@@ -293,7 +291,6 @@ namespace Tango.MachineStudio.UI.ViewModels
ApplicationManager = applicationManager;
DiagnosticsFrameProvider = frameProvider;
SpeechProvider = speechProvider;
- _htmlPresenter = htmlPresenter;
_settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
@@ -782,21 +779,7 @@ namespace Tango.MachineStudio.UI.ViewModels
/// <param name="machineEvent">The HTML page.</param>
private async void ResolveMachineEvent(MachinesEvent machineEvent)
{
- if (machineEvent.EventType.HtmlPage != null)
- {
- if (_htmlPresenter.DisplayHtml(machineEvent.EventType.HtmlPage))
- {
- if (ApplicationManager.ConnectedMachine != null && machineEvent.EventType.Resolvable)
- {
- _eventLogger.Log(String.Format("Event '{0}' resolved by user.", machineEvent.EventType.Name));
- await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type);
- }
- }
- }
- else
- {
- _notificationProvider.ShowWarning("Could not locate guidance content for the specified event.");
- }
+
}
/// <summary>
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-19 21:12:47 +0000