diff options
9 files changed, 118 insertions, 111 deletions
diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip index 5f1048363..e67457871 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip @@ -15,10 +15,10 @@ <ROW Property="CTRLS" Value="2"/> <ROW Property="ExtractFilesFirst" Value="1"/> <ROW Property="Manufacturer" Value="Twine Solutions LTD"/> - <ROW Property="ProductCode" Value="1033:{D9E03B1C-0E45-4D73-8815-3056BF8DDFFF} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{953BE31D-5C69-491D-8F51-A3B4D76384BD} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="Twine X4"/> - <ROW Property="ProductVersion" Value="1.8.9.0" Type="32" TargetFile="Tango.PPC.UI.exe"/> + <ROW Property="ProductVersion" Value="2.0.0.0" Type="32" TargetFile="Tango.PPC.UI.exe"/> <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/> <ROW Property="UpgradeCode" Value="{4D8FDA03-F63E-4002-9A96-4BDE65B04355}"/> <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> @@ -64,9 +64,6 @@ <ROW Component="LiteDB.dll" ComponentId="{19DC3560-1C92-492E-BD9B-DC36E71185B2}" Directory_="APPDIR" Attributes="0" KeyPath="LiteDB.dll"/> <ROW Component="Microsoft.AspNet.SignalR.Client.dll" ComponentId="{8359389B-8413-48E3-9361-27D8DB9744EB}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.AspNet.SignalR.Client.dll"/> <ROW Component="Microsoft.Azure.ActiveDirectory.GraphClient.dll" ComponentId="{3925347D-F3C9-4305-B16A-0ED7EC469370}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/> - <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{FC414C84-8666-4749-9F22-F0479B3D70D4}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/> - <ROW Component="Microsoft.Data.OData.dll" ComponentId="{B836386B-C27A-4E01-BD04-328D7D1F62F8}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/> - <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{D0889BDA-D48E-46A3-9621-C1C2FB2F15C6}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/> <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{33A72E59-DC78-457D-AD80-7BE99191B663}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/> <ROW Component="Microsoft.ServiceBus.dll" ComponentId="{C08F188F-0E73-4FEB-9B56-849D9604E6F4}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ServiceBus.dll"/> <ROW Component="Microsoft.SqlServer.ConnectionInfo.dll" ComponentId="{380CCB99-BE98-425C-A111-9BDF520EB71C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.SqlServer.ConnectionInfo.dll"/> @@ -126,7 +123,6 @@ <ROW Component="System.Reactive.Interfaces.dll" ComponentId="{F8ADD7D3-7FA5-4D5A-B6AF-7865E656DF18}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Interfaces.dll"/> <ROW Component="System.Reactive.Linq.dll" ComponentId="{CB3B39C5-A09D-41C3-BD3D-2418EDEE1B7E}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Linq.dll"/> <ROW Component="System.Reactive.PlatformServices.dll" ComponentId="{FD7A1A65-6497-4392-AA5E-032B1CEAAD0B}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.PlatformServices.dll"/> - <ROW Component="System.Spatial.dll" ComponentId="{507663DF-0402-4E30-B249-9EA87DC0D281}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/> <ROW Component="System.Web.Http.WebHost.dll" ComponentId="{18DD2F13-E03E-4535-BBDF-3621387564FC}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.WebHost.dll"/> <ROW Component="System.Web.Http.dll" ComponentId="{02EE2ED8-EDE7-4DDA-BBCE-77D0998E3815}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.dll"/> <ROW Component="System.Web.Razor.dll" ComponentId="{58F85C46-451E-4EE8-8CCF-2052C92FDD1A}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Razor.dll"/> @@ -229,9 +225,6 @@ <ROW File="Microsoft.AspNet.SignalR.Client.dll" Component_="Microsoft.AspNet.SignalR.Client.dll" FileName="MICROS~1.DLL|Microsoft.AspNet.SignalR.Client.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.AspNet.SignalR.Client.dll" SelfReg="false"/> <ROW File="Microsoft.AspNet.SignalR.Client.pdb" Component_="Microsoft.AspNet.SignalR.Client.dll" FileName="MICROS~1.PDB|Microsoft.AspNet.SignalR.Client.pdb" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.AspNet.SignalR.Client.pdb" SelfReg="false"/> <ROW File="Microsoft.Azure.ActiveDirectory.GraphClient.dll" Component_="Microsoft.Azure.ActiveDirectory.GraphClient.dll" FileName="MICROS~2.DLL|Microsoft.Azure.ActiveDirectory.GraphClient.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Azure.ActiveDirectory.GraphClient.dll" SelfReg="false"/> - <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICROS~3.DLL|Microsoft.Data.Edm.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.Edm.dll" SelfReg="false"/> - <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICROS~4.DLL|Microsoft.Data.OData.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.OData.dll" SelfReg="false"/> - <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICROS~5.DLL|Microsoft.Data.Services.Client.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.Data.Services.Client.dll" SelfReg="false"/> <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" FileName="MICROS~6.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" SelfReg="false"/> <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" FileName="MICROS~2.PDB|Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.IdentityModel.Clients.ActiveDirectory.pdb" SelfReg="false"/> <ROW File="Microsoft.ServiceBus.dll" Component_="Microsoft.ServiceBus.dll" FileName="MICROS~7.DLL|Microsoft.ServiceBus.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\Microsoft.ServiceBus.dll" SelfReg="false"/> @@ -303,7 +296,6 @@ <ROW File="System.Reactive.Interfaces.dll" Component_="System.Reactive.Interfaces.dll" FileName="SYSTEM~7.DLL|System.Reactive.Interfaces.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Reactive.Interfaces.dll" SelfReg="false"/> <ROW File="System.Reactive.Linq.dll" Component_="System.Reactive.Linq.dll" FileName="SYSTEM~8.DLL|System.Reactive.Linq.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Reactive.Linq.dll" SelfReg="false"/> <ROW File="System.Reactive.PlatformServices.dll" Component_="System.Reactive.PlatformServices.dll" FileName="SYSTEM~9.DLL|System.Reactive.PlatformServices.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Reactive.PlatformServices.dll" SelfReg="false"/> - <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYSTE~10.DLL|System.Spatial.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Spatial.dll" SelfReg="false"/> <ROW File="System.Web.Http.dll" Component_="System.Web.Http.dll" FileName="SYSTE~11.DLL|System.Web.Http.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Web.Http.dll" SelfReg="false"/> <ROW File="System.Web.Http.WebHost.dll" Component_="System.Web.Http.WebHost.dll" FileName="SYSTE~12.DLL|System.Web.Http.WebHost.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Web.Http.WebHost.dll" SelfReg="false"/> <ROW File="System.Web.Razor.dll" Component_="System.Web.Razor.dll" FileName="SYSTE~13.DLL|System.Web.Razor.dll" Attributes="0" SourcePath="..\Build\PPC\Eureka\System.Web.Razor.dll" SelfReg="false"/> @@ -447,7 +439,6 @@ <ROW File="Tango.PPC.Updater.exe" Component_="Tango.PPC.Updater.exe" FileName="TANGOP~2.EXE|Tango.PPC.Updater.exe" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.PPC.Updater.exe" SelfReg="false" DigSign="true"/> <ROW File="Tango.PPC.Updater.exe.config" Component_="GetVersionTag.bat" FileName="TANGO~11.CON|Tango.PPC.Updater.exe.config" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.PPC.Updater.exe.config" SelfReg="false"/> <ROW File="Tango.PPC.Updater.pdb" Component_="Tango.PPC.Updater.exe" FileName="TANGO~15.PDB|Tango.PPC.Updater.pdb" Attributes="0" SourcePath="..\Build\PPC\Eureka\Tango.PPC.Updater.pdb" SelfReg="false"/> - <ROW File="LibGit2Sharp.dll.config" Component_="GetVersionTag.bat" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Attributes="0" SourcePath="..\Build\PPC\Eureka\LibGit2Sharp.dll.config" SelfReg="false"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent"> <ROW BootstrOptKey="GlobalOptions" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites" Options="2"/> @@ -456,7 +447,7 @@ <ROW Action="AI_DetectSoftware" Sequence="101"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent"> - <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Eureka" PackageFileName="TwineX4 Installer_v1.8.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v1.8.9"/> + <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Eureka" PackageFileName="TwineX4 Installer_v2.0.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v2.0.0"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> <ROW Path="<AI_DICTS>ui.ail"/> @@ -580,9 +571,6 @@ <ROW Feature_="MainFeature" Component_="LiteDB.dll"/> <ROW Feature_="MainFeature" Component_="Microsoft.AspNet.SignalR.Client.dll"/> <ROW Feature_="MainFeature" Component_="Microsoft.Azure.ActiveDirectory.GraphClient.dll"/> - <ROW Feature_="MainFeature" Component_="Microsoft.Data.Edm.dll"/> - <ROW Feature_="MainFeature" Component_="Microsoft.Data.OData.dll"/> - <ROW Feature_="MainFeature" Component_="Microsoft.Data.Services.Client.dll"/> <ROW Feature_="MainFeature" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/> <ROW Feature_="MainFeature" Component_="Microsoft.ServiceBus.dll"/> <ROW Feature_="MainFeature" Component_="Microsoft.SqlServer.ConnectionInfo.dll"/> @@ -645,7 +633,6 @@ <ROW Feature_="MainFeature" Component_="System.Reactive.Interfaces.dll"/> <ROW Feature_="MainFeature" Component_="System.Reactive.Linq.dll"/> <ROW Feature_="MainFeature" Component_="System.Reactive.PlatformServices.dll"/> - <ROW Feature_="MainFeature" Component_="System.Spatial.dll"/> <ROW Feature_="MainFeature" Component_="System.Web.Http.dll"/> <ROW Feature_="MainFeature" Component_="System.Web.Http.WebHost.dll"/> <ROW Feature_="MainFeature" Component_="System.Web.Razor.dll"/> diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index fcafe6b4a..53e1c79b1 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/> <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/> <ROW Property="Manufacturer" Value="Twine"/> - <ROW Property="ProductCode" Value="1033:{FAD836DF-2182-4041-B746-C0E84C6C284C} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{6FCAB80B-BBF0-4624-AC15-C38B625FC397} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="Machine Studio"/> - <ROW Property="ProductVersion" Value="5.4.0.0" Type="32"/> + <ROW Property="ProductVersion" Value="5.7.0.0" Type="32"/> <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/> <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/> <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> @@ -845,7 +845,7 @@ <ROW Action="AI_DetectSoftware" Sequence="101"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent"> - <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v5.4.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v5.4.0"/> + <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v5.7.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v5.7.0"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> <ROW Path="<AI_DICTS>ui.ail"/> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 7bfa0571b..e1e952af9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("5.4.0.0")] +[assembly: AssemblyVersion("5.7.0.0")] [assembly: ComVisible(false)]
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml index a2d0d5930..aa8f67d4d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml @@ -205,7 +205,7 @@ </Grid> <Grid Background="Gainsboro" Grid.Column="2"> - <Viewbox> + <Viewbox Stretch="Fill" Width="1246" Height="1400"> <local:MachineStatusView /> </Viewbox> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index 5c96fecb1..1e528765e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -150,8 +150,11 @@ </CombinedGeometry.Geometry2> </CombinedGeometry> </Path.Data> - </Path> - <Path Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/> + + </Path> + <Path Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"> + + </Path> </Grid> <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center"> <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle> @@ -248,9 +251,9 @@ </DataTemplate> </UserControl.Resources> - <Grid Width="1246" Height="1400"> + <Grid Width="960" Height="1080"> <Grid.ColumnDefinitions> - <ColumnDefinition Width="32"></ColumnDefinition> + <ColumnDefinition Width="28"></ColumnDefinition> <ColumnDefinition Width="1*"></ColumnDefinition> </Grid.ColumnDefinitions> <Border> @@ -258,7 +261,6 @@ <LinearGradientBrush StartPoint="0,0" EndPoint="1,0" > <GradientStop Color="Gainsboro" Offset="0" /> <GradientStop Color="{StaticResource TangoMidBackgroundColor}" Offset="1.0" /> - </LinearGradientBrush> </Border.Background> </Border> @@ -268,10 +270,10 @@ <RowDefinition Height="56"></RowDefinition> <RowDefinition Height="1*"></RowDefinition> </Grid.RowDefinitions> - - <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="Transparent" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 0 0 0" CornerRadius="20" Height="40" Width="324" ThumbWidth="160" LeftText="Job Status" RightText="Overview" ThumbCornerRadius="18" IsChecked="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanInverseConverter}}"></touch:TouchToggleSlider> - - <Canvas Width="300" VerticalAlignment="Top" HorizontalAlignment="Right" Height="56" Margin="0 -30 -60 0"> + + <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="Transparent" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 0 0 0" CornerRadius="25" Height="50" Width="335" ThumbWidth="168" LeftText="Job Status" RightText="Overview" ThumbCornerRadius="18" IsChecked="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanInverseConverter}}"></touch:TouchToggleSlider> + + <Canvas Width="300" VerticalAlignment="Top" HorizontalAlignment="Right" Height="56" Margin="0 -30 -60 0"> <Grid Panel.ZIndex="100" DockPanel.Dock="Top" Height="117" Background="Transparent"> <Grid HorizontalAlignment="Right" Margin="0 0 0 0"> <StackPanel Orientation="Horizontal"> @@ -302,9 +304,9 @@ </Grid> </Grid> </Canvas> - <Grid x:Name="JobStatus" Margin="32 50 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityConverter}}"> + <Grid x:Name="JobStatus" Margin="32 18 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityConverter}}"> <Grid.RowDefinitions> - <RowDefinition Height="95"></RowDefinition> + <RowDefinition Height="78"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition> @@ -324,7 +326,7 @@ <Border Height="2" Background="{StaticResource TangoLightBorderBrush}" VerticalAlignment="Bottom" Margin="0 2 0 0" CornerRadius="2"></Border> </Grid> - <DockPanel Grid.Row="1" Margin="0 25 0 0"> + <DockPanel Grid.Row="1" Margin="0 11 0 0"> <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top" Width="200" MinHeight="30" HorizontalAlignment="Right" Margin="0 0 0 0"> <StackPanel Orientation="Vertical"> <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 0 20 0" CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="1 Set" RightText="1 Spool" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider> @@ -332,7 +334,7 @@ </StackPanel> </StackPanel> - <UniformGrid DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="420" VerticalAlignment="Top"> + <UniformGrid DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="326" VerticalAlignment="Top"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> <Image Source="../Images/Job Issues/thread_type.png" Stretch="None" VerticalAlignment="Top"/> <StackPanel Orientation="Vertical" Margin="15 0 0 0"> @@ -585,14 +587,14 @@ </StackPanel> </Grid> </DockPanel> - <StackPanel x:Name="Job_Progress" Grid.Row="2" Margin="0 25 0 0" Orientation="Vertical"> + <StackPanel x:Name="Job_Progress" Grid.Row="2" Margin="0 12 0 0" Orientation="Vertical"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> <Image Source="../Images/Job Issues/Thread.png" Stretch="None" VerticalAlignment="Top"/> <TextBlock Text="Total Job Progress" FontWeight="DemiBold" Margin="15 10 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalAlignment="Top"></TextBlock> <Rectangle Height="2" Fill="{StaticResource TangoLightBorderBrush}" Width="1010" VerticalAlignment="Top" Margin="15 20 0 0"></Rectangle> </StackPanel> - <Grid Margin="0 25 0 0"> - <locaControls:RunningJobViewerEureka Height="26" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" /> + <Grid Margin="0 10 0 0"> + <locaControls:RunningJobViewerEureka Height="14" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" /> <!--<TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right"> @@ -604,62 +606,62 @@ MaximumValue ="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/> - <UniformGrid DockPanel.Dock="Bottom" Columns="4" Rows="1" HorizontalAlignment="Left" Margin="0 35 0 0" Height="Auto" VerticalAlignment="Top" Width="1200"> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> - <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/> - <StackPanel Orientation="Vertical" Margin="15 0 0 0"> - <TextBlock x:Name="ProgressLength" VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock> - <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"> - <TextBlock.Text> - <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> - <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/> - <Binding Path="Job.Spools" Mode="OneWay"/> - </MultiBinding> - </TextBlock.Text> - </TextBlock> + <UniformGrid DockPanel.Dock="Bottom" Columns="4" Rows="1" HorizontalAlignment="Left" Margin="0 10 0 0" Height="Auto" VerticalAlignment="Top" Width="840"> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/> + <StackPanel Orientation="Vertical" Margin="15 0 0 0"> + <TextBlock x:Name="ProgressLength" VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock> + <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"> + <TextBlock.Text> + <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> + <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/> + <Binding Path="Job.Spools" Mode="OneWay"/> + </MultiBinding> + </TextBlock.Text> + </TextBlock> + </StackPanel> </StackPanel> - </StackPanel> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> - <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/> - <StackPanel Orientation="Vertical" Margin="15 0 0 0"> - <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock> - <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"> - <TextBlock.Text> - <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> - <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/> - <Binding Path="Job.GramPerLength" Mode="OneWay"/> - <Binding Path="Job.Spools" Mode="OneWay"/> - </MultiBinding> - </TextBlock.Text> - </TextBlock> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/> + <StackPanel Orientation="Vertical" Margin="15 0 0 0"> + <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock> + <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"> + <TextBlock.Text> + <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay"> + <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/> + <Binding Path="Job.GramPerLength" Mode="OneWay"/> + <Binding Path="Job.Spools" Mode="OneWay"/> + </MultiBinding> + </TextBlock.Text> + </TextBlock> + </StackPanel> </StackPanel> - </StackPanel> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> - <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/> - <StackPanel Orientation="Vertical" Margin="15 0 0 0"> - <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock> - <TextBlock Text="{Binding RunningJobStatus.CurrentUnit,TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/> + <StackPanel Orientation="Vertical" Margin="15 0 0 0"> + <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock> + <TextBlock Text="{Binding RunningJobStatus.CurrentUnit,TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock> + </StackPanel> </StackPanel> - </StackPanel> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> - <Image Source="../Images/Job Issues/ttime_left.png" Stretch="None" VerticalAlignment="Top"/> - <StackPanel Orientation="Vertical" Margin="15 0 0 0"> - <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Time Left</TextBlock> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Left"> + <Image Source="../Images/Job Issues/ttime_left.png" Stretch="None" VerticalAlignment="Top"/> + <StackPanel Orientation="Vertical" Margin="15 0 0 0"> + <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Time Left</TextBlock> <TextBlock FontWeight="Light" FontSize="{StaticResource TangoComboBoxItemFontSize}" Margin="0 0 0 0" HorizontalAlignment="Center"> - <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run> - <Run FontSize="16" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run> + <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run> + <Run FontSize="16" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run> - <!--<Run FontSize="16">m</Run>--> + <!--<Run FontSize="16">m</Run>--> </TextBlock> </StackPanel> - </StackPanel> - </UniformGrid> + </StackPanel> + </UniformGrid> </StackPanel> - <Grid Grid.Row="3" Margin="0 30 0 0" > + <Grid Grid.Row="3" Margin="0 15 0 0" > <Rectangle Fill="{StaticResource TangoLightBorderBrush}" Height="2" VerticalAlignment="Top"></Rectangle> - <Grid Margin="0 40 0 0"> + <Grid Margin="0 30 0 0"> <Grid.ColumnDefinitions> <ColumnDefinition Width="1*"/> <ColumnDefinition Width="2*"/> @@ -669,7 +671,7 @@ <Image Source="../Images/Job Issues/input.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/> <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}">Input</TextBlock> </StackPanel> - <UniformGrid Margin="0 35 0 0" Rows="1" Columns="3" Height="Auto" MinWidth="180" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> + <UniformGrid Margin="0 20 0 0" Rows="1" Columns="3" Height="Auto" MinWidth="180" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <StackPanel Orientation="Vertical"> <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border> <TextBlock Margin="0 10 0 0 " Text="L" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/> @@ -688,7 +690,7 @@ </StackPanel> </UniformGrid> <Grid Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}"> - <ContentControl x:Name="leftBrushValues" HorizontalAlignment="Left" Content="{Binding CurrentBrushStop}" Width="Auto" Height="Auto" Margin="0 30 0 0"> + <ContentControl x:Name="leftBrushValues" HorizontalAlignment="Left" Content="{Binding CurrentBrushStop}" Width="Auto" Height="Auto" Margin="0 20 0 0"> <ContentControl.Style> <Style TargetType="ContentControl"> <Setter Property="ContentTemplate"> @@ -720,7 +722,7 @@ <Image Source="../Images/Job Issues/output.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left" Height="Auto"/> <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}" >Output</TextBlock> </StackPanel> - <UniformGrid Margin="0 35 0 0" Rows="1" Columns="7" Height="Auto" Width="435" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> + <UniformGrid Margin="0 20 0 0" Rows="1" Columns="7" Height="Auto" Width="435" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <StackPanel Orientation="Vertical"> <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border> <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock> @@ -757,7 +759,7 @@ <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/> </StackPanel> </UniformGrid> - <UniformGrid Columns="7" Rows="1" Margin="0 30 0 0" Width="440" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}"> + <UniformGrid Columns="7" Rows="1" Margin="0 20 0 0" Width="440" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}"> <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left"> <Border Width="50" Height="50" Background="Cyan" CornerRadius="16" HorizontalAlignment="Left"></Border> <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">C</TextBlock> @@ -800,9 +802,9 @@ </Grid> </Grid> - <Grid x:Name="Overview" Margin="32 50 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityInverseConverter}}"> + <Grid x:Name="Overview" Margin="32 18 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <Grid.RowDefinitions> - <RowDefinition Height="96"></RowDefinition> + <RowDefinition Height="74"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="Auto"></RowDefinition> @@ -861,10 +863,10 @@ <Image Source="../Images/Overview Icons/Sensors.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Sensors</TextBlock> </StackPanel> - <UniformGrid Columns="5" Rows="1" Height="120" Margin="20 22 20 0"> + <UniformGrid Columns="5" Rows="1" Height="120" Margin="40 11 40 0"> <StackPanel Orientation="Vertical"> <Grid> - <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="10" Maximum="10" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <touch:TouchArcProgress Foreground="Green" RingThickness="8" Value="10" Maximum="10" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Bold" Foreground="Green">10</TextBlock> <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 10" FontSize="{StaticResource TangoComboBoxItemFontSize}" >Bar</TextBlock> @@ -874,7 +876,7 @@ <StackPanel Orientation="Vertical"> <Grid> - <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <touch:TouchArcProgress Foreground="Green" RingThickness="8" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">200</TextBlock> <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="ºC" ></TextBlock> </Grid> @@ -882,7 +884,7 @@ </StackPanel> <StackPanel Orientation="Vertical"> <Grid> - <touch:TouchArcProgress Foreground="Red" RingThickness="10" Value="80" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <touch:TouchArcProgress Foreground="Red" RingThickness="8" Value="80" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Black">80/200</TextBlock> <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="ºC"></TextBlock> @@ -891,7 +893,7 @@ </StackPanel> <StackPanel Orientation="Vertical"> <Grid> - <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <touch:TouchArcProgress Foreground="Green" RingThickness="8" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">200</TextBlock> <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="ºC"></TextBlock> @@ -900,7 +902,7 @@ </StackPanel> <StackPanel Orientation="Vertical"> <Grid> - <touch:TouchArcProgress Foreground="red" RingThickness="10" Value="218" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <touch:TouchArcProgress Foreground="red" RingThickness="8" Value="218" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Red">218/200</TextBlock> <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="ºC"></TextBlock> @@ -908,7 +910,7 @@ <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dyeing Head</TextBlock> </StackPanel> </UniformGrid> - <Grid Margin="0 28 0 0"> + <Grid Margin="0 23 0 0"> <Image Source="../Images/Job Issues/Machine outline.png" Height="188" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Center" Width="636" /> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> <StackPanel Orientation="Vertical"> @@ -930,7 +932,7 @@ <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> </UniformGrid> </Border> - <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0">Winder</TextBlock> + <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0" FontWeight="Thin">Winder</TextBlock> </StackPanel> <StackPanel Orientation="Vertical"> <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}"> @@ -951,7 +953,7 @@ <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> </UniformGrid> </Border> - <TextBlock HorizontalAlignment="Center" Margin="14">Dancer</TextBlock> + <TextBlock HorizontalAlignment="Center" Margin="14 18 14 14" FontWeight="Thin">Dancer</TextBlock> </StackPanel> @@ -974,7 +976,7 @@ <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> </UniformGrid> </Border> - <TextBlock HorizontalAlignment="Center" Margin="0 16 0 0">BTSR</TextBlock> + <TextBlock HorizontalAlignment="Center" Margin="0 18 0 0" FontWeight="Thin">BTSR</TextBlock> </StackPanel> <StackPanel Orientation="Vertical"> <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}"> @@ -987,13 +989,13 @@ <Image Stretch="Fill" Width="20" Height="24" Source="../Images/Overview Icons/Feeder4.png" HorizontalAlignment="Center" ></Image> </UniformGrid> </Border> - <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0">Feeder</TextBlock> + <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0" FontWeight="Thin">Feeder</TextBlock> </StackPanel> </StackPanel> </Grid> </StackPanel> </Grid> - <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 20 0 0" Height="220"> + <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 8 0 0" Height="196"> <StackPanel Orientation="Vertical"> <DockPanel> <StackPanel Orientation="Vertical" DockPanel.Dock="Right" Margin="0 0 30 0" > @@ -1002,7 +1004,7 @@ <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Waste</TextBlock> </StackPanel> <StackPanel Orientation="Horizontal" Margin="-25 24 0 0"> - <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-20 0 0 0"/> + <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-15 0 0 0"/> <ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/> </StackPanel> @@ -1016,19 +1018,19 @@ <ItemsControl ItemsSource="{Binding MidTankLevels}" ItemTemplate="{StaticResource LiquidBox}"> <ItemsControl.ItemsPanel> <ItemsPanelTemplate> - <UniformGrid Rows="1" IsItemsHost="True" Width="800"></UniformGrid> + <UniformGrid Rows="1" IsItemsHost="True" Width="550"></UniformGrid> </ItemsPanelTemplate> </ItemsControl.ItemsPanel> </ItemsControl> - <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="20 0 0 0"/> - <ContentControl Margin="55 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/> + <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="12 0 0 0"/> + <ContentControl Margin="45 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/> </StackPanel> </StackPanel> </DockPanel> </StackPanel> - <Border VerticalAlignment="Bottom" Height="2" Background="{StaticResource TangoLightBorderBrush}" Margin="0 40 0 0" CornerRadius="2"></Border> + <Border VerticalAlignment="Bottom" Height="2" Background="{StaticResource TangoLightBorderBrush}" Margin="0 0 0 0" CornerRadius="2"></Border> </Grid> </Grid> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> + <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchToggleSlider.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchToggleSlider.xaml index adb76ebd3..66328ea2d 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchToggleSlider.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchToggleSlider.xaml @@ -178,14 +178,15 @@ <Setter.Value> <ControlTemplate TargetType="{x:Type local:TouchToggleSlider}"> <Border> + <Border.Effect> + <DropShadowEffect ShadowDepth="0" BlurRadius="1" Opacity="1"/> + </Border.Effect> + <components:Ripple CornerRadius="{TemplateBinding CornerRadius}" Centered="True" RippleBrush="{StaticResource TangoRippleDarkBrush}"> <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}"> - <Border.Effect> - <DropShadowEffect ShadowDepth="0" BlurRadius="10" Opacity="0.5"/> - </Border.Effect> - + <Border.Style> <Style TargetType="Border"> <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource AncestorType=local:TouchToggleSlider},Path=UncheckedBackground}"></Setter> diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml index e02abdacc..385d3cfd7 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml +++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml @@ -24,5 +24,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt <UserName>$machineservice-alpha-beta__MachineService-BETA</UserName> <_SavePWD>True</_SavePWD> <_DestinationType>AzureWebSite</_DestinationType> + <PublishDatabaseSettings> + <Objects xmlns=""> + <ObjectGroup Name="Tango.BL.ObservablesContext" Order="1" Enabled="False"> + <Destination Path="" /> + <Object Type="DbCodeFirst"> + <Source Path="DBContext" DbContext="Tango.BL.ObservablesContext, Tango.BL" Origin="Convention" /> + </Object> + </ObjectGroup> + </Objects> + </PublishDatabaseSettings> </PropertyGroup> + <ItemGroup> + <MSDeployParameterValue Include="$(DeployParameterPrefix)Tango.BL.ObservablesContext-Web.config Connection String" /> + </ItemGroup> + <ItemGroup> + <_ConnectionStringsToInsert Include="Tango.BL.ObservablesContext" /> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj index 451706a19..3cb22c5b1 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj +++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj @@ -345,6 +345,7 @@ <Compile Include="Views\FSEDownloads\IndexViewModel.cs" /> <Content Include="Images\eureka.png" /> <Content Include="Nswag\DataStoreClient.nswag" /> + <None Include="Properties\PublishProfiles\Staging.pubxml" /> <None Include="Security\RefreshTokenEncoder.cs" /> <None Include="Security\RefreshTokenEntity.cs" /> <None Include="Security\RefreshTokensManager.cs" /> @@ -506,7 +507,7 @@ <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> </WebProjectProperties> </FlavorProperties> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |