From e111c33bc87acf40202f9e5423e21b087a366f07 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 7 Jan 2019 16:06:38 +0200 Subject: Added new events !!! --- .../Html/DefaultHtmlPresenter.cs | 25 ----------- .../Html/HTML Templates/Thread Break.html | 48 ---------------------- .../Tango.MachineStudio.UI/Html/HtmlWindow.xaml | 37 ----------------- .../Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs | 48 ---------------------- 4 files changed, 158 deletions(-) delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html') 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 @@ - - - - - - -
Thread Break
-
    -
  1. Open the cover.
    2. -
  2. Connect the broken thread.
    3. -
  3. Close the cover.
    4. -
  4. Press 'OK' when done.
    5. -
- - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - 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 -{ - /// - /// Interaction logic for DialogWindow.xaml - /// - 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(); - } - } -} -- cgit v1.3.1