zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-312: Optimized design of application instances in action center.

Browse source
This commit is contained in:
dbuechel 2019-11-12 09:55:56 +01:00
parent b4d8af716f
commit 3d55bd6ff4
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml
View file

@ -19,11 +19,9 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" x:Name="ApplicationName" Background="#AAD3D3D3" FontWeight="Bold" Padding="5" TextAlignment="Center" /> <TextBlock Grid.Row="0" x:Name="ApplicationName" Background="#99D3D3D3" FontWeight="Bold" Padding="5" TextAlignment="Center" />
<ContentControl Grid.Row="1" x:Name="ApplicationButton" /> <ContentControl Grid.Row="1" x:Name="ApplicationButton" />
<StackPanel Grid.Row="2" x:Name="InstancePanel" Orientation="Vertical" /> <StackPanel Grid.Row="2" x:Name="InstancePanel" Background="#99D3D3D3" Orientation="Vertical" />
<Border Grid.Row="3" BorderBrush="LightGray" BorderThickness="0,0,0,1" Margin="75,4" />
</Grid> </Grid>
</UserControl> </UserControl>

1
SafeExamBrowser.UserInterface.Desktop/Controls/ActionCenterApplicationControl.xaml.cs
View file

@ -32,6 +32,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Controls
application.InstanceStarted += Application_InstanceStarted; application.InstanceStarted += Application_InstanceStarted;
button.Clicked += (o, args) => application.Start(); button.Clicked += (o, args) => application.Start();
ApplicationName.Text = application.Info.Name; ApplicationName.Text = application.Info.Name;
ApplicationName.Visibility = Visibility.Collapsed;
ApplicationButton.Content = button; ApplicationButton.Content = button;
} }

6
SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationControl.xaml
View file

@ -19,11 +19,9 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" x:Name="ApplicationName" Background="#AAD3D3D3" FontWeight="Bold" Padding="5" TextAlignment="Center" /> <TextBlock Grid.Row="0" x:Name="ApplicationName" Background="#99D3D3D3" FontWeight="Bold" Padding="5" TextAlignment="Center" />
<ContentControl Grid.Row="1" x:Name="ApplicationButton" /> <ContentControl Grid.Row="1" x:Name="ApplicationButton" />
<StackPanel Grid.Row="2" x:Name="InstancePanel" Orientation="Vertical" /> <StackPanel Grid.Row="2" x:Name="InstancePanel" Background="#99D3D3D3" Orientation="Vertical" />
<Border Grid.Row="3" BorderBrush="LightGray" BorderThickness="0,0,0,1" Margin="75,4" />
</Grid> </Grid>
</UserControl> </UserControl>

1
SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenterApplicationControl.xaml.cs
View file

@ -32,6 +32,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
application.InstanceStarted += Application_InstanceStarted; application.InstanceStarted += Application_InstanceStarted;
button.Clicked += (o, args) => application.Start(); button.Clicked += (o, args) => application.Start();
ApplicationName.Text = application.Info.Name; ApplicationName.Text = application.Info.Name;
ApplicationName.Visibility = Visibility.Collapsed;
ApplicationButton.Content = button; ApplicationButton.Content = button;
} }