Skip to content

Commit d8e7575

Browse files
mrixnermrixner
committed
Add UI to the new operation history
1 parent 11f159f commit d8e7575

File tree

2 files changed

+60
-33
lines changed

2 files changed

+60
-33
lines changed

‎src/UniGetUI/Pages/AdvancedOperationHistoryPage.xaml‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,52 @@
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
66
xmlns:local="using:UniGetUI.Interface.Pages"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:animations="using:CommunityToolkit.WinUI.Animations" xmlns:widgets="using:UniGetUI.Interface.Widgets"
8+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:animations="using:CommunityToolkit.WinUI.Animations"
10+
xmlns:Toolkit="using:CommunityToolkit.WinUI.Controls"
11+
xmlns:widgets="using:UniGetUI.Interface.Widgets"
912
mc:Ignorable="d">
1013

1114
<animations:Implicit.ShowAnimations>
1215
<animations:TranslationAnimation Duration="0:0:0.25" From="0,100,0" To="0"/>
1316
<animations:OpacityAnimation Duration="0:0:0.25" From="0" To="1"/>
1417
</animations:Implicit.ShowAnimations>
1518

16-
<Grid RowSpacing="4">
17-
<!-- <Grid.RowDefinitions>
18-
<RowDefinition Height="Auto"/>
19-
<RowDefinition Height="*"/>
20-
</Grid.RowDefinitions>
21-
<Grid Grid.Row="0" ColumnSpacing="0">
22-
<Grid.ColumnDefinitions>
23-
<ColumnDefinition Width="Auto"/>
24-
<ColumnDefinition Width="Auto"/>
25-
<ColumnDefinition Width="*"/>
26-
<ColumnDefinition Width="Auto"/>
27-
<ColumnDefinition Width="*"/>
28-
<ColumnDefinition Width="Auto"/>
29-
</Grid.ColumnDefinitions>
30-
<Button Grid.Column="0" Name="CopyButton" Click="CopyButton_Click" CornerRadius="6,0,0,6">
31-
<widgets:TranslatedTextBlock Text="Copy to clipboard"/>
32-
</Button>
33-
<Button Grid.Column="1" Name="ExportButton" Click="ExportButton_Click" CornerRadius="0,6,6,0">
34-
<widgets:TranslatedTextBlock Text="Export to a file"/>
35-
</Button>
36-
<StackPanel Name="LogLevelPane" Grid.Column="3" Orientation="Horizontal" Spacing="10">
37-
<widgets:TranslatedTextBlock Text="Log level:" VerticalAlignment="Center"/>
38-
<ComboBox Name="LogLevelCombo" x:FieldModifier="protected" SelectionChanged="LogLevelCombo_SelectionChanged" PlaceholderText="Pick a color" Width="250" CornerRadius="6"/>
39-
</StackPanel>
40-
<Button Grid.Column="5" Name="ReloadButton" Click="ReloadButton_Click">
41-
<widgets:TranslatedTextBlock Text="Reload log"/>
42-
</Button>
43-
</Grid>
44-
<ScrollViewer x:FieldModifier="protected" Name="MainScroller" Grid.Row="1" HorizontalScrollMode="Disabled" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" CornerRadius="8">
45-
<RichTextBlock x:FieldModifier="protected" LineHeight="18" Name="LogTextBox" FontFamily="Consolas" TextWrapping="WrapWholeWords" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="8"/>
46-
</ScrollViewer> -->
47-
<widgets:TranslatedTextBlock Text="Hello" />
19+
<Grid>
20+
<StackPanel x:Name="MainLayout" HorizontalAlignment="Stretch" Grid.Column="1" Grid.Row="0" Orientation="Vertical" Spacing="8" Margin="0,0,0,20">
21+
<widgets:TranslatedTextBlock FontSize="40" FontWeight="Bold" WrappingMode="NoWrap" Text="Advanced Operation History" HorizontalAlignment="Center"/>
22+
<ListView x:Name="AdvancedOperationHistoryList" VerticalAlignment="Stretch" HorizontalAlignment="Center" Width="800">
23+
<ListView.ItemContainerStyle>
24+
<Style TargetType="ListViewItem">
25+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
26+
<Setter Property="Template">
27+
<Setter.Value>
28+
<ControlTemplate TargetType="ListViewItem">
29+
<Grid>
30+
<ContentPresenter />
31+
<VisualStateManager.VisualStateGroups>
32+
<VisualStateGroup x:Name="CommonStates">
33+
</VisualStateGroup>
34+
</VisualStateManager.VisualStateGroups>
35+
</Grid>
36+
</ControlTemplate>
37+
</Setter.Value>
38+
</Setter>
39+
</Style>
40+
</ListView.ItemContainerStyle>
41+
<ListView.ItemTemplate>
42+
<DataTemplate x:DataType="local:OperationHistoryEntry">
43+
<widgets:SettingsEntry Text="{x:Bind Title}" Margin="8">
44+
<Toolkit:SettingsExpander.Items>
45+
<widgets:TranslatedTextBlock Text="{x:Bind Content}" Margin="8" />
46+
</Toolkit:SettingsExpander.Items>
47+
</widgets:SettingsEntry>
48+
<!--<Expander Header="{x:Bind Title}" HorizontalAlignment="Stretch" MaxWidth="600" BorderThickness="0">
49+
<widgets:TranslatedTextBlock Text="{x:Bind Content}" Margin="10" />
50+
</Expander>-->
51+
</DataTemplate>
52+
</ListView.ItemTemplate>
53+
</ListView>
54+
</StackPanel>
4855
</Grid>
4956
</Page>

‎src/UniGetUI/Pages/AdvancedOperationHistoryPage.xaml.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Collections.ObjectModel;
12
using System.Diagnostics;
23
using ExternalLibraries.Clipboard;
34
using Microsoft.UI.Xaml;
@@ -12,9 +13,28 @@
1213

1314
namespace UniGetUI.Interface.Pages
1415
{
16+
public class OperationHistoryEntry
17+
{
18+
public string Title { get; set; }
19+
public string Content { get; set; }
20+
}
21+
1522
public partial class AdvancedOperationHistoryPage : IKeyboardShortcutListener, IEnterLeaveListener
1623
{
24+
private ObservableCollection<OperationHistoryEntry> Items = new ();
25+
26+
public AdvancedOperationHistoryPage()
27+
{
28+
InitializeComponent();
29+
30+
Items.Add(new OperationHistoryEntry { Title = "Test 1", Content = "Content 1" });
31+
Items.Add(new OperationHistoryEntry { Title = "Test 2", Content = "Content 2" });
32+
Items.Add(new OperationHistoryEntry { Title = "Test 3", Content = "Content 3" });
33+
Items.Add(new OperationHistoryEntry { Title = "Test 4", Content = "Content 4" });
34+
Items.Add(new OperationHistoryEntry { Title = "Test 5", Content = "Content 5" });
1735

36+
AdvancedOperationHistoryList.ItemsSource = Items;
37+
}
1838

1939
public void ReloadTriggered()
2040
{ }

0 commit comments

Comments
 (0)