aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-04-23 18:22:07 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-04-23 18:22:07 +0300
commit536ba01ed87152a3bd9a85e15ad0c5d5a6f7397f (patch)
tree0e2be00e0287be4f9bc68cd92edbde78d070f55e /Software/Visual_Studio/PPC/Tango.PPC.Common/Controls
parentba4aec4c691476d68b3da383a70bff42341c7171 (diff)
downloadTango-536ba01ed87152a3bd9a85e15ad0c5d5a6f7397f.tar.gz
Tango-536ba01ed87152a3bd9a85e15ad0c5d5a6f7397f.zip
Improved PPC catalog rendering with virtualization.
Improved PPC tech logs with virtualization. Added machine S/N to PPC menu. Added support for Volume color space printing on PPC. Implemented full job request log when method is JobDescriptionFile.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/Controls')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml13
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs18
2 files changed, 18 insertions, 13 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
index f99b299cc..db6920c80 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml
@@ -17,8 +17,13 @@
<ColumnDefinition Width="0"/>
</Grid.ColumnDefinitions>
- <touch:TouchListBox ItemsSource="{Binding Groups}" x:Name="list" x:FieldModifier="public" DisableRipple="True" ScrollBarVisibility="Collapsed" SelectionMode="None">
- <touch:TouchListBox.ItemTemplate>
+ <ListBox Style="{StaticResource BlankListBox}" ItemsSource="{Binding Groups}" VirtualizingPanel.VirtualizationMode="Recycling" VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.ScrollUnit="Pixel" x:Name="list" x:FieldModifier="public" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Hidden">
+ <ListBox.ItemsPanel>
+ <ItemsPanelTemplate>
+ <VirtualizingStackPanel />
+ </ItemsPanelTemplate>
+ </ListBox.ItemsPanel>
+ <ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Margin="0 0 10 0">
<TextBlock HorizontalAlignment="Center" Text="{Binding Name,IsAsync=True}" FontSize="{StaticResource TangoTitleFontSize}"></TextBlock>
@@ -76,8 +81,8 @@
</touch:TouchStaticListBox>
</StackPanel>
</DataTemplate>
- </touch:TouchListBox.ItemTemplate>
- </touch:TouchListBox>
+ </ListBox.ItemTemplate>
+ </ListBox>
<Grid Grid.Column="1">
<!--<Rectangle Stroke="{StaticResource TangoDividerBrush}" HorizontalAlignment="Left" />-->
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs
index d4b924f17..e23c629c5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs
@@ -53,13 +53,13 @@ namespace Tango.PPC.Common.Controls
{
_catalog = DataContext as Catalog;
- if (list.ScrollViewer != null && _catalog != null)
- {
- list.ScrollViewer.ScrollToTop();
- _preventChange = true;
- slider.Value = _catalog.Groups.Count;
- _preventChange = false;
- }
+ //if (list.ScrollViewer != null && _catalog != null)
+ //{
+ // list.ScrollViewer.ScrollToTop();
+ // _preventChange = true;
+ // slider.Value = _catalog.Groups.Count;
+ // _preventChange = false;
+ //}
};
}
@@ -97,7 +97,7 @@ namespace Tango.PPC.Common.Controls
{
if (!_loaded)
{
- list.ScrollViewer.Scrolling += ScrollViewer_Scrolling;
+ //list.ScrollViewer.Scrolling += ScrollViewer_Scrolling;
_preventChange = true;
slider.Value = slider.Maximum;
@@ -151,7 +151,7 @@ namespace Tango.PPC.Common.Controls
/// </summary>
public TouchListBox TouchListBox
{
- get { return list; }
+ get { return null; }
}
}
}