From 054b6ca55142fae5bb30a9b8f3301f7e71a92296 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 5 Aug 2020 00:28:12 +0300 Subject: Added a new control SearchComboBox. Refactoring code filter of RmlsCollectionView. Related Work Items: #3286 --- .../Views/JobView.xaml | 4 +- .../ViewModels/MainViewVM.cs | 26 ++-- .../Resources/MaterialDesign.xaml | 159 +++++++++++++++++++++ 3 files changed, 171 insertions(+), 18 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 35c621822..5b29fd432 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -756,7 +756,7 @@ MEDIA - + @@ -771,7 +771,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.3.1 From 592cf6ec8f64037215a8cdf50f41437698a13e81 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 5 Aug 2020 00:48:04 +0300 Subject: Style of TextBox in search combobox Related Work Items: #3286 --- .../Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs | 2 +- .../Tango.MachineStudio.Common/Resources/MaterialDesign.xaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs index 7d05897d5..7d913299e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs @@ -346,7 +346,7 @@ namespace Tango.MachineStudio.RML.ViewModels if(!String.IsNullOrEmpty(result.ErrorMessage)) { - LogManager.Log(result.ErrorMessage, "Error occurred while trying to call GetLinearizationMeasurements."); + //LogManager.Log(result.ErrorMessage, "Error occurred while trying to call GetLinearizationMeasurements."); } return result.InkPercentage.ToList(); } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml index fc9be3292..c8e216191 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml @@ -807,13 +807,13 @@ DownVerticalOffset="{Binding ElementName=templateRoot, Path=ActualHeight}" UpVerticalOffset="15" ClassicMode="{Binding Path=(materialDesign:ComboBoxAssist.ClassicMode), RelativeSource={RelativeSource TemplatedParent}}" UpContentTemplate="{StaticResource PopupContentUpTemplate}" DownContentTemplate="{StaticResource TransparentPopupContentDownTemplate}" ClassicContentTemplate="{StaticResource PopupContentClassicTemplate}"> - + - +