Responsiveness and scrollability
This commit is contained in:
nick5616
Родитель
4f07e05621
Коммит
8ac408bc8b
|
|
@ -79,7 +79,7 @@
|
|||
<VisualStateGroup x:Name="LayoutVisualStates">
|
||||
<VisualState x:Name="WideLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowBreakpoint}" />
|
||||
<AdaptiveTrigger MinWindowWidth="600" />
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters />
|
||||
</VisualState>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
||||
|
||||
<Grid>
|
||||
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup>
|
||||
<VisualState x:Name="WideLayout">
|
||||
|
|
@ -46,141 +47,142 @@
|
|||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>
|
||||
|
||||
<Grid x:Name="LayoutRoot" Width="Auto" Height="Auto" HorizontalAlignment="Stretch" Margin="30,40,30,0" VerticalAlignment="Stretch">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="10" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid x:Name="HeaderGrid">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="1">
|
||||
<Grid x:Name="LayoutRoot" Width="Auto" Height="Auto" HorizontalAlignment="Stretch" Margin="30,40,30,0" VerticalAlignment="Stretch">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="10" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock x:Name="Header" x:Uid="FactoryOrchestrator" Text="" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" FontWeight="Bold" Style="{StaticResource TitleTextBlockStyle}"/>
|
||||
<StackPanel x:Name="IndicatorPanel" Orientation="Horizontal" Background="{ThemeResource ControlAltFillColorTransparent}" HorizontalAlignment="Right" CornerRadius="5" Padding="1" Grid.Row="0" Grid.Column="1">
|
||||
<StackPanel x:Name="ButtonPanel" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||
<Button x:Name="SystemButton" Background="{ThemeResource ControlFillColorSecondary}" x:Uid="SystemButton" Visibility="Visible" Padding="5" Margin="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" Foreground="{ThemeResource TextFillColorSecondary}" Text="" FontSize="30" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
<Button.Flyout>
|
||||
<Flyout x:Name="SystemFlyout" Opening="SystemFlyout_Opening">
|
||||
<Flyout.FlyoutPresenterStyle>
|
||||
<Style TargetType="FlyoutPresenter">
|
||||
<Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
|
||||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
|
||||
<Setter Property="IsTabStop" Value="True" />
|
||||
<Setter Property="TabNavigation" Value="Cycle" />
|
||||
</Style>
|
||||
</Flyout.FlyoutPresenterStyle>
|
||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center">
|
||||
<TextBlock Style="{StaticResource FlyoutPickerTitleTextBlockStyle}" x:Uid="IpHeader" Text="" HorizontalAlignment="Center"/>
|
||||
<StackPanel x:Name="NetworkStackPanel" Orientation="Vertical" HorizontalAlignment="Center">
|
||||
<Grid x:Name="HeaderGrid">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock x:Name="Header" x:Uid="FactoryOrchestrator" Text="" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" FontWeight="Bold" Style="{StaticResource TitleTextBlockStyle}"/>
|
||||
<StackPanel x:Name="IndicatorPanel" Orientation="Horizontal" Background="{ThemeResource ControlAltFillColorTransparent}" HorizontalAlignment="Right" CornerRadius="5" Padding="1" Grid.Row="0" Grid.Column="1">
|
||||
<StackPanel x:Name="ButtonPanel" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||
<Button x:Name="SystemButton" Background="{ThemeResource ControlFillColorSecondary}" x:Uid="SystemButton" Visibility="Visible" Padding="5" Margin="0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" Foreground="{ThemeResource TextFillColorSecondary}" Text="" FontSize="30" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
<Button.Flyout>
|
||||
<Flyout x:Name="SystemFlyout" Opening="SystemFlyout_Opening">
|
||||
<Flyout.FlyoutPresenterStyle>
|
||||
<Style TargetType="FlyoutPresenter">
|
||||
<Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
|
||||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
|
||||
<Setter Property="IsTabStop" Value="True" />
|
||||
<Setter Property="TabNavigation" Value="Cycle" />
|
||||
</Style>
|
||||
</Flyout.FlyoutPresenterStyle>
|
||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center">
|
||||
<TextBlock Style="{StaticResource FlyoutPickerTitleTextBlockStyle}" x:Uid="IpHeader" Text="" HorizontalAlignment="Center"/>
|
||||
<StackPanel x:Name="NetworkStackPanel" Orientation="Vertical" HorizontalAlignment="Center">
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Flyout>
|
||||
</Button.Flyout>
|
||||
</Button>
|
||||
<Button x:Name="SettingsButton" Background="{ThemeResource ControlFillColorSecondary}" x:Uid="SettingsButton" Visibility="Visible" Padding="5" Margin="5,0,0,0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" Foreground="{ThemeResource TextFillColorSecondary}" Text="" FontSize="30" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
<Button.Flyout>
|
||||
<Flyout x:Name="SettingsFlyout" Opening="SettingsFlyout_Opening">
|
||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center">
|
||||
<TextBlock Style="{StaticResource FlyoutPickerTitleTextBlockStyle}" x:Uid="SettingsHeader" HorizontalAlignment="Center"/>
|
||||
<HyperlinkButton x:Uid="SettingsSubHeader" NavigateUri="https://microsoft.github.io/FactoryOrchestrator/use-the-factory-orchestrator-app#app-settings" HorizontalAlignment="Center"/>
|
||||
<StackPanel x:Name="SettingsStackPanel" Orientation="Vertical" HorizontalAlignment="Left">
|
||||
<CheckBox x:Name="SettingsTrackExecution" x:Uid="SettingsTrackExecution" IsThreeState="False" IsChecked="True" Checked="SettingsTrackExecution_Checked" Unchecked="SettingsTrackExecution_Checked" />
|
||||
<CheckBox x:Name="SettingsShowExternalTasks" x:Uid="SettingsShowExternalTasks" IsThreeState="False" IsChecked="True" Checked="SettingsShowExternalTasks_Checked" Unchecked="SettingsShowExternalTasks_Checked" />
|
||||
</Flyout>
|
||||
</Button.Flyout>
|
||||
</Button>
|
||||
<Button x:Name="SettingsButton" Background="{ThemeResource ControlFillColorSecondary}" x:Uid="SettingsButton" Visibility="Visible" Padding="5" Margin="5,0,0,0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" Foreground="{ThemeResource TextFillColorSecondary}" Text="" FontSize="30" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
<Button.Flyout>
|
||||
<Flyout x:Name="SettingsFlyout" Opening="SettingsFlyout_Opening">
|
||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center">
|
||||
<TextBlock Style="{StaticResource FlyoutPickerTitleTextBlockStyle}" x:Uid="SettingsHeader" HorizontalAlignment="Center"/>
|
||||
<HyperlinkButton x:Uid="SettingsSubHeader" NavigateUri="https://microsoft.github.io/FactoryOrchestrator/use-the-factory-orchestrator-app#app-settings" HorizontalAlignment="Center"/>
|
||||
<StackPanel x:Name="SettingsStackPanel" Orientation="Vertical" HorizontalAlignment="Left">
|
||||
<CheckBox x:Name="SettingsTrackExecution" x:Uid="SettingsTrackExecution" IsThreeState="False" IsChecked="True" Checked="SettingsTrackExecution_Checked" Unchecked="SettingsTrackExecution_Checked" />
|
||||
<CheckBox x:Name="SettingsShowExternalTasks" x:Uid="SettingsShowExternalTasks" IsThreeState="False" IsChecked="True" Checked="SettingsShowExternalTasks_Checked" Unchecked="SettingsShowExternalTasks_Checked" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Flyout>
|
||||
</Button.Flyout>
|
||||
</Button>
|
||||
<Button x:Name="ExitButton" Background="{ThemeResource SystemFillColorCriticalBackground}" AutomationProperties.LabeledBy="{Binding ElementName=ExitText}" Padding="5" Margin="5,0,0,0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" Foreground="{ThemeResource SystemFillColorCritical}" Text="" FontSize="30" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
<Button.Flyout>
|
||||
<Flyout x:Name="ExitFlyout" Closed="ExitFlyout_Closed">
|
||||
<StackPanel>
|
||||
<TextBlock x:Name="ExitText" x:Uid="ExitText" TextWrapping="Wrap" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" HorizontalAlignment="Center" Margin="5"/>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<Button x:Name="ConfirmExit" Padding="8" Margin="10,5" Click="ConfirmExit_Click" AutomationProperties.LabeledBy="{Binding ElementName=ExitButtonText}">
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
<TextBlock x:Name="ExitButtonText" x:Uid="ExitButtonText" Padding="5,0" TextWrapping="Wrap"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button x:Name="ConfirmReboot" Padding="8" Margin="10,5" Click="ConfirmReboot_Click" AutomationProperties.LabeledBy="{Binding ElementName=RebootButtonText}">
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
<TextBlock x:Name="RebootButtonText" x:Uid="RebootButtonText" Padding="5,0" TextWrapping="Wrap"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button x:Name="ConfirmShutdown" Padding="8" Margin="10,5" Click="ConfirmShutdown_Click" AutomationProperties.LabeledBy="{Binding ElementName=ShutdownButtonText}">
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
<TextBlock x:Name="ShutdownButtonText" x:Uid="ShutdownButtonText" Padding="5,0" TextWrapping="Wrap"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
</Flyout>
|
||||
</Button.Flyout>
|
||||
</Button>
|
||||
<Button x:Name="ExitButton" Background="{ThemeResource SystemFillColorCriticalBackground}" AutomationProperties.LabeledBy="{Binding ElementName=ExitText}" Padding="5" Margin="5,0,0,0">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" Foreground="{ThemeResource SystemFillColorCritical}" Text="" FontSize="30" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
<Button.Flyout>
|
||||
<Flyout x:Name="ExitFlyout" Closed="ExitFlyout_Closed">
|
||||
<StackPanel>
|
||||
<TextBlock x:Name="ExitText" x:Uid="ExitText" TextWrapping="Wrap" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" HorizontalAlignment="Center" Margin="5"/>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<Button x:Name="ConfirmExit" Padding="8" Margin="10,5" Click="ConfirmExit_Click" AutomationProperties.LabeledBy="{Binding ElementName=ExitButtonText}">
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
<TextBlock x:Name="ExitButtonText" x:Uid="ExitButtonText" Padding="5,0" TextWrapping="Wrap"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button x:Name="ConfirmReboot" Padding="8" Margin="10,5" Click="ConfirmReboot_Click" AutomationProperties.LabeledBy="{Binding ElementName=RebootButtonText}">
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
<TextBlock x:Name="RebootButtonText" x:Uid="RebootButtonText" Padding="5,0" TextWrapping="Wrap"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button x:Name="ConfirmShutdown" Padding="8" Margin="10,5" Click="ConfirmShutdown_Click" AutomationProperties.LabeledBy="{Binding ElementName=ShutdownButtonText}">
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
<TextBlock x:Name="ShutdownButtonText" x:Uid="ShutdownButtonText" Padding="5,0" TextWrapping="Wrap"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
<ProgressBar x:Name="ShutdownProgessBar" IsIndeterminate="True" Visibility="Collapsed" Margin="10"/>
|
||||
</StackPanel>
|
||||
<ProgressBar x:Name="ShutdownProgessBar" IsIndeterminate="True" Visibility="Collapsed" Margin="10"/>
|
||||
</StackPanel>
|
||||
</Flyout>
|
||||
</Button.Flyout>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<StackPanel x:Name="BasicsPanel" Orientation="Horizontal" Visibility="Visible" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
|
||||
<StackPanel x:Name="BasicPanel0" Orientation="Vertical" Visibility="Visible" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5" BorderThickness="1">
|
||||
<TextBlock x:Name="NetworkName" Text="" Style="{StaticResource CaptionTextBlockStyle}" VerticalAlignment="Center" TextWrapping="Wrap" IsTextSelectionEnabled="True"/>
|
||||
<TextBlock x:Name="NetworkIp" Text="" Style="{StaticResource CaptionTextBlockStyle}" VerticalAlignment="Center" TextWrapping="Wrap" IsTextSelectionEnabled="True"/>
|
||||
</StackPanel>
|
||||
<StackPanel x:Name="BasicPanel1" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5">
|
||||
<TextBlock x:Name="OEMVersionHeader" Text="" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" IsTextSelectionEnabled="True"/>
|
||||
<TextBlock x:Name="AppVersionHeader" Text="" VerticalAlignment="Top" HorizontalAlignment="Left" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" IsTextSelectionEnabled="True"/>
|
||||
</StackPanel>
|
||||
<StackPanel x:Name="BasicPanel2" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5">
|
||||
<TextBlock x:Name="OSVersionHeader" Text="" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" IsTextSelectionEnabled="True"/>
|
||||
<TextBlock x:Name="ServiceVersionHeader" Text="" VerticalAlignment="Top" HorizontalAlignment="Left" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" IsTextSelectionEnabled="True"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<TextBlock x:Name="BootTaskWarning" x:Uid="BootTaskWarning" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Bold" FontStyle="Italic" Style="{StaticResource SubtitleTextBlockStyle}" Visibility="Collapsed" Margin="5"/>
|
||||
<muxc:NavigationView
|
||||
x:Name="NavView"
|
||||
Grid.Row="3"
|
||||
PaneDisplayMode="Top"
|
||||
IsBackButtonVisible="Collapsed"
|
||||
IsSettingsVisible="False"
|
||||
ItemInvoked="NavView_ItemInvoked"
|
||||
>
|
||||
<muxc:NavigationView.MenuItems>
|
||||
<muxc:NavigationViewItem Tag="run" TabIndex="0" x:Uid="Run" Icon="Play"/>
|
||||
<muxc:NavigationViewItem Tag="console" TabIndex="0" x:Uid="Console" AutomationProperties.LabeledBy="{Binding ElementName=CommandPromptText}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
<TextBlock x:Name="CommandPromptText" x:Uid="CommandPromptText" Margin="10, 9"/>
|
||||
</Flyout>
|
||||
</Button.Flyout>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
</muxc:NavigationViewItem>
|
||||
<muxc:NavigationViewItem Tag="apps" TabIndex="0" x:Uid="Apps" Icon="AllApps" />
|
||||
<muxc:NavigationViewItem Tag="save" TabIndex="0" x:Uid="Save" Icon="Edit"/>
|
||||
<muxc:NavigationViewItem Tag="files" TabIndex="0" x:Uid="Files" Icon="SyncFolder"/>
|
||||
<muxc:NavigationViewItem Tag="wdp" TabIndex="0" x:Uid="WDP" Icon="SwitchApps"/>
|
||||
<muxc:NavigationViewItem Tag="about" TabIndex="0" x:Uid="About" Icon="Help"/>
|
||||
</muxc:NavigationView.MenuItems>
|
||||
<Frame x:Name="ContentFrame" Padding="12" />
|
||||
</muxc:NavigationView>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
<StackPanel x:Name="BasicsPanel" Orientation="Horizontal" Visibility="Visible" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
|
||||
<StackPanel x:Name="BasicPanel0" Orientation="Vertical" Visibility="Visible" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5" BorderThickness="1">
|
||||
<TextBlock x:Name="NetworkName" Text="" Style="{StaticResource CaptionTextBlockStyle}" VerticalAlignment="Center" TextWrapping="Wrap" IsTextSelectionEnabled="True"/>
|
||||
<TextBlock x:Name="NetworkIp" Text="" Style="{StaticResource CaptionTextBlockStyle}" VerticalAlignment="Center" TextWrapping="Wrap" IsTextSelectionEnabled="True"/>
|
||||
</StackPanel>
|
||||
<StackPanel x:Name="BasicPanel1" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5">
|
||||
<TextBlock x:Name="OEMVersionHeader" Text="" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" IsTextSelectionEnabled="True"/>
|
||||
<TextBlock x:Name="AppVersionHeader" Text="" VerticalAlignment="Top" HorizontalAlignment="Left" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" IsTextSelectionEnabled="True"/>
|
||||
</StackPanel>
|
||||
<StackPanel x:Name="BasicPanel2" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5">
|
||||
<TextBlock x:Name="OSVersionHeader" Text="" VerticalAlignment="Center" HorizontalAlignment="Left" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" IsTextSelectionEnabled="True"/>
|
||||
<TextBlock x:Name="ServiceVersionHeader" Text="" VerticalAlignment="Top" HorizontalAlignment="Left" TextWrapping="Wrap" Style="{StaticResource CaptionTextBlockStyle}" IsTextSelectionEnabled="True"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<TextBlock x:Name="BootTaskWarning" x:Uid="BootTaskWarning" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Bold" FontStyle="Italic" Style="{StaticResource SubtitleTextBlockStyle}" Visibility="Collapsed" Margin="5"/>
|
||||
<muxc:NavigationView
|
||||
x:Name="NavView"
|
||||
Grid.Row="3"
|
||||
PaneDisplayMode="Top"
|
||||
IsBackButtonVisible="Collapsed"
|
||||
IsSettingsVisible="False"
|
||||
ItemInvoked="NavView_ItemInvoked"
|
||||
>
|
||||
<muxc:NavigationView.MenuItems>
|
||||
<muxc:NavigationViewItem Tag="run" TabIndex="0" x:Uid="Run" Icon="Play"/>
|
||||
<muxc:NavigationViewItem Tag="console" TabIndex="0" x:Uid="Console" AutomationProperties.LabeledBy="{Binding ElementName=CommandPromptText}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
<TextBlock x:Name="CommandPromptText" x:Uid="CommandPromptText" Margin="10, 9"/>
|
||||
</StackPanel>
|
||||
</muxc:NavigationViewItem>
|
||||
<muxc:NavigationViewItem Tag="apps" TabIndex="0" x:Uid="Apps" Icon="AllApps" />
|
||||
<muxc:NavigationViewItem Tag="save" TabIndex="0" x:Uid="Save" Icon="Edit"/>
|
||||
<muxc:NavigationViewItem Tag="files" TabIndex="0" x:Uid="Files" Icon="SyncFolder"/>
|
||||
<muxc:NavigationViewItem Tag="wdp" TabIndex="0" x:Uid="WDP" Icon="SwitchApps"/>
|
||||
<muxc:NavigationViewItem Tag="about" TabIndex="0" x:Uid="About" Icon="Help"/>
|
||||
</muxc:NavigationView.MenuItems>
|
||||
<Frame x:Name="ContentFrame" Padding="12" />
|
||||
</muxc:NavigationView>
|
||||
</Grid>
|
||||
</ScrollViewer>
|
||||
</Grid>
|
||||
</Page>
|
||||
|
|
|
|||
|
|
@ -331,11 +331,17 @@ If "Factory Reset" is chosen, the service is restarted as if it is first boot. F
|
|||
<comment>End of user comments</comment>
|
||||
</data>
|
||||
<data name="ExistingText.Text" xml:space="preserve">
|
||||
<value>Existing TaskLists:</value>
|
||||
<value>Existing TaskLists</value>
|
||||
</data>
|
||||
<data name="ExistingText.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
|
||||
<value>Existing TaskLists are loaded every boot unless deleted. They can also be manually exported to a FactoryOrchestratorXML file.</value>
|
||||
</data>
|
||||
<data name="ExistingText2.Text" xml:space="preserve">
|
||||
<value>Existing TaskLists are loaded every boot unless deleted. They can also be manually exported to a FactoryOrchestratorXML file.</value>
|
||||
</data>
|
||||
<data name="ExistingTooltip.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
|
||||
<value>Existing TaskLists are loaded every boot unless deleted. They can also be manually exported to a FactoryOrchestratorXML file.</value>
|
||||
</data>
|
||||
<data name="Exit.Text" xml:space="preserve">
|
||||
<value>Exit</value>
|
||||
</data>
|
||||
|
|
@ -407,7 +413,7 @@ If "Factory Reset" is chosen, the service is restarted as if it is first boot. F
|
|||
<value>Copy from container to local device?</value>
|
||||
</data>
|
||||
<data name="ImportText.Text" xml:space="preserve">
|
||||
<value>Import FactoryOrchestratorXML File:</value>
|
||||
<value>Import FactoryOrchestratorXML File</value>
|
||||
</data>
|
||||
<data name="IpAddress.Text" xml:space="preserve">
|
||||
<value>IP Address:</value>
|
||||
|
|
@ -425,10 +431,10 @@ If "Factory Reset" is chosen, the service is restarted as if it is first boot. F
|
|||
<value>Failed to load</value>
|
||||
</data>
|
||||
<data name="LoadFolderFlyoutText" xml:space="preserve">
|
||||
<value>Folder to load as TaskList:</value>
|
||||
<value>Folder to load as TaskList</value>
|
||||
</data>
|
||||
<data name="LoadFolderText.Text" xml:space="preserve">
|
||||
<value>Load Folder as TaskList (exe, cmd, ps1, TAEF):</value>
|
||||
<value>Load Folder as TaskList (exe, cmd, ps1, TAEF)</value>
|
||||
</data>
|
||||
<data name="LoadXMLFlyoutText" xml:space="preserve">
|
||||
<value>FactoryOrchestratorXML file to load from:</value>
|
||||
|
|
@ -465,7 +471,7 @@ If "Factory Reset" is chosen, the service is restarted as if it is first boot. F
|
|||
<value>New TAEF Task</value>
|
||||
</data>
|
||||
<data name="NewText.Text" xml:space="preserve">
|
||||
<value>Create new TaskList:</value>
|
||||
<value>Create new TaskList</value>
|
||||
</data>
|
||||
<data name="NewUWPButton.Content" xml:space="preserve">
|
||||
<value>New UWP App Task</value>
|
||||
|
|
|
|||
|
|
@ -472,7 +472,10 @@ namespace Microsoft.FactoryOrchestrator.UWP
|
|||
{
|
||||
peer = FrameworkElementAutomationPeer.CreatePeerForElement(TaskHeader);
|
||||
}
|
||||
peer.RaiseAutomationEvent(AutomationEvents.LiveRegionChanged);
|
||||
if (peer != null)
|
||||
{
|
||||
peer.RaiseAutomationEvent(AutomationEvents.LiveRegionChanged);
|
||||
}
|
||||
}
|
||||
|
||||
private void PreviousRunButton_Click(object sender, RoutedEventArgs e)
|
||||
|
|
|
|||
|
|
@ -56,6 +56,32 @@
|
|||
</Page.Resources>
|
||||
|
||||
<Grid>
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup>
|
||||
<VisualState x:Name="WideLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowWidth="1080"/>
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters/>
|
||||
</VisualState>
|
||||
<VisualState x:Name="MediumLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowWidth="600"/>
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="ManageTaskListsPanel.Orientation" Value="Vertical"></Setter>
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="SmallLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowWidth="0"/>
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="ManageTaskListsPanel.Orientation" Value="Vertical"></Setter>
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="20" />
|
||||
|
|
@ -65,7 +91,7 @@
|
|||
<RowDefinition Height="20" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="20" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="2*" />
|
||||
<RowDefinition Height="20" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
|
@ -75,24 +101,33 @@
|
|||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock x:Name="LoadFolderText" x:Uid="LoadFolderText" Grid.Row="0" Grid.Column="0" Style="{StaticResource TitleTextBlockStyle}" HorizontalAlignment="Right" Margin="10,10,0,0" VerticalAlignment="Center"/>
|
||||
<Button x:Name="LoadFolderButton" Grid.Row="0" Grid.Column="1" Margin="10,0" HorizontalAlignment="Left" VerticalAlignment="Center" Click="LoadFolderButton_Click" FlyoutBase.AttachedFlyout="{StaticResource LoadFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=LoadFolderText}">
|
||||
<SymbolIcon Symbol="OpenLocal"/>
|
||||
</Button>
|
||||
<StackPanel x:Name="ManageTaskListsPanel" Orientation="Horizontal">
|
||||
<Button x:Name="LoadFolderButton" Grid.Row="0" Grid.Column="0" Margin="10" HorizontalAlignment="Left" VerticalAlignment="Center" Click="LoadFolderButton_Click" FlyoutBase.AttachedFlyout="{StaticResource LoadFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=LoadFolderText}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<SymbolIcon Symbol="OpenLocal"/>
|
||||
<TextBlock x:Name="LoadFolderText" x:Uid="LoadFolderText" Margin="10,0,0,0"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
|
||||
<TextBlock x:Name="ImportText" x:Uid="ImportText" Grid.Row="2" Grid.Column="0" Style="{StaticResource TitleTextBlockStyle}" Margin="10,0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
|
||||
<Button x:Name="LoadFileButton" Grid.Row="2" Grid.Column="1" Margin="10,0" HorizontalAlignment="Left" VerticalAlignment="Center" Click="LoadFileButton_Click" FlyoutBase.AttachedFlyout="{StaticResource LoadFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=ImportText}">
|
||||
<SymbolIcon Symbol="OpenFile"/>
|
||||
</Button>
|
||||
<Button x:Name="LoadFileButton" Grid.Row="2" Grid.Column="0" Margin="10" HorizontalAlignment="Left" VerticalAlignment="Center" Click="LoadFileButton_Click" FlyoutBase.AttachedFlyout="{StaticResource LoadFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=ImportText}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<SymbolIcon Symbol="OpenFile"/>
|
||||
<TextBlock x:Name="ImportText" x:Uid="ImportText" Margin="10,0,0,0"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
|
||||
<TextBlock x:Name="NewText" x:Uid="NewText" Grid.Row="4" Grid.Column="0" Style="{StaticResource TitleTextBlockStyle}" Margin="10,0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
|
||||
<Button x:Name="NewListButton" Grid.Row="4" Grid.Column="1" Margin="10,0" HorizontalAlignment="Left" VerticalAlignment="Center" Click="NewListButton_Click" FlyoutBase.AttachedFlyout="{StaticResource LoadFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=NewText}">
|
||||
<SymbolIcon Symbol="Add"/>
|
||||
</Button>
|
||||
<Button x:Name="NewListButton" Grid.Row="4" Grid.Column="0" Margin="10" HorizontalAlignment="Left" VerticalAlignment="Center" Click="NewListButton_Click" FlyoutBase.AttachedFlyout="{StaticResource LoadFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=NewText}">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<SymbolIcon Symbol="Add"/>
|
||||
<TextBlock x:Name="NewText" x:Uid="NewText" Margin="10,0,0,0"/>
|
||||
</StackPanel>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0">
|
||||
<TextBlock x:Uid="ExistingText" Style="{StaticResource TitleTextBlockStyle}" />
|
||||
<TextBlock x:Uid="ExistingText2" Style="{StaticResource BodyTextBlockStyle}" />
|
||||
<StackPanel x:Name="ExistingPanel" Grid.Row="6" Orientation="Horizontal">
|
||||
<TextBlock x:Uid="ExistingText" Style="{StaticResource SubtitleTextBlockStyle}" TextWrapping="Wrap">
|
||||
</TextBlock>
|
||||
<SymbolIcon x:Uid="ExistingTooltip" Symbol="Important" Margin="2,0,0,0"/>
|
||||
</StackPanel>
|
||||
<ListView x:Name="TaskListsView" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="3" SelectionMode="None" AllowDrop="True" IsItemClickEnabled="False" CanDragItems="True" CanReorderItems="True" IsSwipeEnabled="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" ScrollViewer.VerticalScrollMode="Enabled" ItemsSource="{x:Bind TaskListCollection, Mode=TwoWay}" DragItemsCompleted="TaskListsView_DragItemsCompleted" LayoutUpdated="TaskListsView_LayoutUpdated" XYFocusKeyboardNavigation="Enabled">
|
||||
<ListView.Resources>
|
||||
|
|
@ -100,23 +135,63 @@
|
|||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ListViewItem">
|
||||
<Grid x:Name="ItemGrid" >
|
||||
<Grid x:Name="ItemGrid">
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup>
|
||||
<VisualState x:Name="WideLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowWidth="1080"/>
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters/>
|
||||
</VisualState>
|
||||
<VisualState x:Name="MediumLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowWidth="600"/>
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="MoveButtonsPanel.(Grid.Row)" Value="1"></Setter>
|
||||
<Setter Target="ManageTaskListsButtonsPanel.(Grid.Row)" Value="1"></Setter>
|
||||
<Setter Target="MoveButtonsPanel.(Grid.Column)" Value="0"></Setter>
|
||||
<Setter Target="ManageTaskListsButtonsPanel.(Grid.Column)" Value="0"></Setter>
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
<VisualState x:Name="SmallLayout">
|
||||
<VisualState.StateTriggers>
|
||||
<AdaptiveTrigger MinWindowWidth="0"/>
|
||||
</VisualState.StateTriggers>
|
||||
<VisualState.Setters>
|
||||
<Setter Target="MoveButtonsPanel.(Grid.Row)" Value="1"></Setter>
|
||||
<Setter Target="ManageTaskListsButtonsPanel.(Grid.Row)" Value="1"></Setter>
|
||||
<Setter Target="MoveButtonsPanel.(Grid.Column)" Value="0"></Setter>
|
||||
<Setter Target="ManageTaskListsButtonsPanel.(Grid.Column)" Value="0"></Setter>
|
||||
</VisualState.Setters>
|
||||
</VisualState>
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>
|
||||
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="350" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="400*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto"></RowDefinition>
|
||||
<RowDefinition Height="auto"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<ContentPresenter Grid.Column="0" Grid.Row="0"/>
|
||||
|
||||
<StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" x:Name="moveButtons">
|
||||
<Button x:Name="Up" Margin="5,0,5,0" Click="MoveUpButton_Click" AutomationProperties.Name="Move up the task list">
|
||||
<StackPanel x:Name="MoveButtonsPanel" Grid.Column="1" Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel x:Name="ManageTaskListsButtonsPanel" Grid.Column="2" Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
<Button x:Name="Up" Margin="5,0,5,0" Click="MoveUpButton_Click" Background ="{ThemeResource SystemAccentColor}" AutomationProperties.Name="Move up the task list">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
</Button>
|
||||
<Button x:Name="Down" Margin="5,0,5,0" Click="MoveDownButton_Click" AutomationProperties.Name="Move down task list">
|
||||
<Button x:Name="Down" Margin="5,0,5,0" Click="MoveDownButton_Click" Background ="{ThemeResource SystemAccentColor}" AutomationProperties.Name="Move down task list">
|
||||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
<ContentPresenter Grid.Column="1" />
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" x:Name="buttonGroup">
|
||||
<Button x:Name="EditListButton" Margin="10,0,5,0" x:Uid="EditTaskListButton" Click="EditListButton_Click" AutomationProperties.Name="Edit Task List">
|
||||
<SymbolIcon Symbol="Edit"/>
|
||||
</Button>
|
||||
|
|
@ -127,6 +202,8 @@
|
|||
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph=""/>
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
|
|
|
|||
|
|
@ -140,6 +140,9 @@ namespace Microsoft.FactoryOrchestrator.UWP
|
|||
_selectedTask = ActiveTestsResultsView.SelectedIndex;
|
||||
ActiveTestsView.SelectedIndex = ActiveTestsResultsView.SelectedIndex;
|
||||
}
|
||||
var item = ActiveTestsResultsView.ContainerFromIndex(ActiveTestsResultsView.SelectedIndex) as FrameworkElement;
|
||||
string status = ((TaskBaseWithTemplate)ActiveTestsResultsView.SelectedItem).ToString();
|
||||
AutomationProperties.SetName(item, status);
|
||||
}
|
||||
|
||||
private void ActiveTestsResultsView_ItemClick(object sender, ItemClickEventArgs e)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче