aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-06-20 11:30:48 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-06-20 11:30:48 +0300
commitf8f1f96b814391df201b1d8e1ef06c531233ef5c (patch)
treec6b8e4ae7a62bb9efd9109928a0241d1124e60cf /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
parent65d898feb5cadb4bf421f03e40ef3f3109c881a6 (diff)
downloadTango-f8f1f96b814391df201b1d8e1ef06c531233ef5c.tar.gz
Tango-f8f1f96b814391df201b1d8e1ef06c531233ef5c.zip
Split assembly versions to Core, Machine Studio, PPC!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/DialogViewVM.cs74
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs1
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj7
3 files changed, 4 insertions, 78 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/DialogViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/DialogViewVM.cs
deleted file mode 100644
index c8d606efc..000000000
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/DialogViewVM.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.Core.Commands;
-using Tango.SharedUI;
-
-namespace Tango.MachineStudio.Common.Notifications
-{
- /// <summary>
- /// Represents a dialog view model base class.
- /// </summary>
- /// <seealso cref="Tango.SharedUI.ViewModel" />
- public abstract class DialogViewVM : ViewModel
- {
- public event Action Accepted;
- public event Action Canceled;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="DialogViewVM"/> class.
- /// </summary>
- public DialogViewVM()
- {
- CanClose = true;
- CloseCommand = new RelayCommand(Cancel, (x) => CanClose);
- OKCommand = new RelayCommand(Accept, (x) => CanClose);
- }
-
- private bool _canClose;
- /// <summary>
- /// Gets or sets a value indicating whether this dialog can be closed.
- /// </summary>
- public bool CanClose
- {
- get { return _canClose; }
- set { _canClose = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
- }
-
- /// <summary>
- /// Gets or sets the close command.
- /// </summary>
- public RelayCommand CloseCommand { get; set; }
-
- /// <summary>
- /// Gets or sets the ok command.
- /// </summary>
- public RelayCommand OKCommand { get; set; }
-
- /// <summary>
- /// Called when the dialog has been shown.
- /// </summary>
- public virtual void OnShow()
- {
-
- }
-
- /// <summary>
- /// Invokes the <see cref="Accepted"/> event.
- /// </summary>
- protected virtual void Accept()
- {
- Accepted?.Invoke();
- }
-
- /// <summary>
- /// Invokes the <see cref="Canceled"/> event.
- /// </summary>
- protected virtual void Cancel()
- {
- Canceled?.Invoke();
- }
- }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
index ce60715a8..a2cf609b1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs
@@ -7,6 +7,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
+using Tango.SharedUI;
namespace Tango.MachineStudio.Common.Notifications
{
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index a635e17ed..145d91461 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -72,6 +72,9 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\Versioning\MachineStudio.cs">
+ <Link>MachineStudio.cs</Link>
+ </Compile>
<Compile Include="AutoComplete\MachinesProvider.cs" />
<Compile Include="Automation\Developer.cs" />
<Compile Include="Automation\UI.cs" />
@@ -103,7 +106,6 @@
<Compile Include="MachineStudioSettings.cs" />
<Compile Include="Messages\MachineConnectionChangedMessage.cs" />
<Compile Include="Notifications\BarItem.cs" />
- <Compile Include="Notifications\DialogViewVM.cs" />
<Compile Include="Speech\DefaultSpeechProvider.cs" />
<Compile Include="Speech\ISpeechProvider.cs" />
<Compile Include="StudioApplication\IStudioApplicationManager.cs" />
@@ -135,9 +137,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Compile Include="..\..\Versioning\GlobalVersionInfo.cs">
- <Link>GlobalVersionInfo.cs</Link>
- </Compile>
<Compile Include="Authentication\IAuthenticationProvider.cs" />
<Compile Include="Controls\MdiChild.cs" />
<Compile Include="Controls\MdiContainerControl.xaml.cs">