diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
13 files changed, 158 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs index 2929ea405..9fe92ba3c 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs @@ -23,13 +23,15 @@ namespace Tango.MachineStudio.Common.Authentication /// </summary> User CurrentUser { get; } + Machine Machine { get; } + /// <summary> /// Performs a user login by the specified email and password. /// </summary> /// <param name="email">The email.</param> /// <param name="password">The password.</param> /// <returns></returns> - AuthenticationLoginResult Login(String email, String password, LoginMethod method, bool bypassVersionCheck = false, Action<String> logAction = null); + AuthenticationLoginResult Login(String email, String password, LoginMethod method, bool bypassVersionCheck = false, Action<String> logAction = null, String serialNumber = null); /// <summary> /// Logs-out the current logged-in user. diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/AutoComplete/MachinesProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/AutoComplete/MachinesProvider.cs index ec23fefee..d5ea7264b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/AutoComplete/MachinesProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/AutoComplete/MachinesProvider.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Tango.AutoComplete.Editors; using Tango.BL; using Tango.BL.Entities; +using Tango.MachineStudio.Common.Buid; namespace Tango.MachineStudio.Common.AutoComplete { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Buid/IBuildProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Buid/IBuildProvider.cs new file mode 100644 index 000000000..a95985418 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Buid/IBuildProvider.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.Common.Buid +{ + public interface IBuildProvider + { + MSBuildType BuildType { get; } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Buid/MSBuildType.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Buid/MSBuildType.cs new file mode 100644 index 000000000..dd4d5eef1 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Buid/MSBuildType.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.Common.Buid +{ + public enum MSBuildType + { + Default, + Lite + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Converters/IsLiteToVisibilityConverter.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Converters/IsLiteToVisibilityConverter.cs new file mode 100644 index 000000000..c09ca9587 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Converters/IsLiteToVisibilityConverter.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Data; +using Tango.Core.DI; +using Tango.MachineStudio.Common.Buid; + +namespace Tango.MachineStudio.Common.Converters +{ + public class IsLiteToVisibilityConverter : IValueConverter + { + private static IBuildProvider buildProvider; + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (buildProvider == null) + { + buildProvider = TangoIOC.Default.GetInstance<IBuildProvider>(); + } + + if (buildProvider == null) return Visibility.Visible; + + return buildProvider.BuildType == MSBuildType.Lite ? Visibility.Visible : Visibility.Collapsed; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Converters/IsLiteToVisibilityInverseConverter.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Converters/IsLiteToVisibilityInverseConverter.cs new file mode 100644 index 000000000..d11b28a1f --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Converters/IsLiteToVisibilityInverseConverter.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Data; +using Tango.Core.DI; +using Tango.MachineStudio.Common.Buid; + +namespace Tango.MachineStudio.Common.Converters +{ + public class IsLiteToVisibilityInverseConverter : IValueConverter + { + private static IBuildProvider buildProvider; + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (buildProvider == null) + { + buildProvider = TangoIOC.Default.GetInstance<IBuildProvider>(); + } + + if (buildProvider == null) return Visibility.Visible; + + return buildProvider.BuildType == MSBuildType.Default ? Visibility.Visible : Visibility.Collapsed; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machine_new.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machine_new.png Binary files differindex 116e1e9c7..9b4d8c798 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machine_new.png +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machine_new.png diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machine_new_small.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machine_new_small.png Binary files differindex 378879ce1..9b4d8c798 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machine_new_small.png +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machine_new_small.png diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs index 6ae71d50d..0a1fcadb6 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs @@ -42,6 +42,8 @@ namespace Tango.MachineStudio.Common /// </summary> public String LastLoginPassword { get; set; } + public String LastLoginSerialNumber { get; set; } + /// <summary> /// Gets or sets the last login method. /// </summary> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs index d422df26c..7131a9c03 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/SharedResourceDictionary.cs @@ -37,7 +37,14 @@ namespace Tango.MachineStudio.Common.Resources _sourceUri = value; var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>(); //add current theme + MachineStudioTheme wTheme = settings.Theme; + +#if LITE + wTheme = MachineStudioTheme.Dark; +#endif + + if ((wTheme == MachineStudioTheme.Dark && value.LocalPath.Contains("Light")) || (wTheme == MachineStudioTheme.Light && value.LocalPath.Contains("Dark"))) return; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Speech/LiteSpeechProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Speech/LiteSpeechProvider.cs new file mode 100644 index 000000000..ddcc4866b --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Speech/LiteSpeechProvider.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.MachineStudio.Common.Speech +{ + public class LiteSpeechProvider : ISpeechProvider + { + public bool Mute { get; set; } + + public void SpeakError(string text) + { + + } + + public void SpeakInfo(string text) + { + + } + } +} 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 ee29aab21..e6c13ee93 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 @@ -22,6 +22,15 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MS_LITE_Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>..\..\Build\Machine Studio Lite\Debug\</OutputPath> + <DefineConstants>TRACE;DEBUG;LITE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> @@ -30,6 +39,14 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'MS_LITE|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>..\..\Build\Machine Studio Lite\Release\</OutputPath> + <DefineConstants>TRACE;LITE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> <ItemGroup> <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL"> <HintPath>..\..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath> @@ -95,6 +112,8 @@ <Link>GlobalVersionInfo.cs</Link> </Compile> <Compile Include="Authentication\AuthenticationLoginResult.cs" /> + <Compile Include="Buid\IBuildProvider.cs" /> + <Compile Include="Buid\MSBuildType.cs" /> <Compile Include="Controls\MachineConnectionIcon.xaml.cs"> <DependentUpon>MachineConnectionIcon.xaml</DependentUpon> </Compile> @@ -102,11 +121,14 @@ <DependentUpon>MachineView.xaml</DependentUpon> </Compile> <Compile Include="Controls\WpfGraphControl.cs" /> + <Compile Include="Converters\IsLiteToVisibilityInverseConverter.cs" /> + <Compile Include="Converters\IsLiteToVisibilityConverter.cs" /> <Compile Include="Converters\ProcessParameterToVisibilityConverter.cs" /> <Compile Include="Converters\UserRoleToBooleanConverter.cs" /> <Compile Include="Converters\UserRoleToVisibilityConverter.cs" /> <Compile Include="MachineStudioTheme.cs" /> <Compile Include="Resources\SharedResourceDictionary.cs" /> + <Compile Include="Speech\LiteSpeechProvider.cs" /> <Compile Include="Tup\TupFileBuilder.cs" /> <Compile Include="Tup\TupFileBuilderProgressEventArgs.cs" /> <Compile Include="Web\DownloadLatestPPCVersionRequest.cs" /> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml index 6f7cd0e32..aea6edce0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml @@ -4,10 +4,13 @@ xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls" xmlns:realTimeGraphX="clr-namespace:RealTimeGraphX.WPF;assembly=RealTimeGraphX.WPF" xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" + xmlns:commonConverters="clr-namespace:Tango.MachineStudio.Common.Converters" xmlns:local="clr-namespace:Tango.MachineStudio.Common.Controls"> <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" /> <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" /> + <commonConverters:IsLiteToVisibilityConverter x:Key="IsLiteToVisibilityConverter" /> + <commonConverters:IsLiteToVisibilityInverseConverter x:Key="IsLiteToVisibilityInverseConverter" /> <Style TargetType="{x:Type local:LoadingPanel}"> <Setter Property="Template"> |
