third-party-mirrors/Discord-History-Tracker
1
0
Fork 0
mirror of https://github.com/chylex/Discord-History-Tracker.git synced 2025-06-16 07:12:14 +03:00
Code Issues Projects Releases Wiki Activity

Redesign status bar in the app

Browse Source
This commit is contained in:
chylex 2022-03-17 20:36:15 +01:00
parent 3b698dbf33
commit a5e8366f1b
No known key found for this signature in database
GPG Key ID: 4DE42C8F19A80548
3 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Desktop/Main/Controls/StatusBar.axaml
View File

@ -11,32 +11,35 @@
</Design.DataContext> </Design.DataContext>
<UserControl.Background> <UserControl.Background>
<SolidColorBrush>#546A9F</SolidColorBrush> <SolidColorBrush>#3C4F79</SolidColorBrush>
</UserControl.Background> </UserControl.Background>
<UserControl.Styles> <UserControl.Styles>
<Style Selector="StackPanel > TextBlock"> <Style Selector="StackPanel > TextBlock">
<Setter Property="Foreground" Value="#E0E0E0" /> <Setter Property="Foreground" Value="#E7E7E7" />
</Style> </Style>
<Style Selector="StackPanel > TextBlock.label"> <Style Selector="StackPanel > TextBlock.label">
<Setter Property="FontSize" Value="15" /> <Setter Property="FontSize" Value="15" />
<Setter Property="FontWeight" Value="SemiLight" />
</Style> </Style>
<Style Selector="StackPanel > TextBlock.value"> <Style Selector="StackPanel > TextBlock.value">
<Setter Property="FontSize" Value="16" /> <Setter Property="FontSize" Value="16" />
<Setter Property="FontWeight" Value="SemiLight" />
<Setter Property="TextAlignment" Value="Right" /> <Setter Property="TextAlignment" Value="Right" />
<Setter Property="Margin" Value="0 1" />
</Style> </Style>
<Style Selector="StackPanel > Rectangle"> <Style Selector="StackPanel > Rectangle">
<Setter Property="Margin" Value="14 0" /> <Setter Property="Margin" Value="14 1" />
<Setter Property="Stroke" Value="#3B5287" /> <Setter Property="Stroke" Value="#697899" />
<Setter Property="StrokeThickness" Value="2" /> <Setter Property="StrokeThickness" Value="2" />
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />
</Style> </Style>
</UserControl.Styles> </UserControl.Styles>
<StackPanel Orientation="Horizontal" Margin="4 3"> <StackPanel Orientation="Horizontal" Margin="6 3">
<StackPanel Orientation="Vertical" Width="65"> <StackPanel Orientation="Vertical" Width="65">
<TextBlock Classes="label">Status</TextBlock> <TextBlock Classes="label">Status</TextBlock>
<TextBlock FontSize="12" Margin="0 2 0 0" Text="{Binding StatusText}" /> <TextBlock FontSize="12" Margin="0 3 0 0" Text="{Binding StatusText}" />
</StackPanel> </StackPanel>
<Rectangle /> <Rectangle />
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">

2
app/Desktop/Main/MainWindow.axaml
View File

@ -8,7 +8,7 @@
Title="{Binding Title}" Title="{Binding Title}"
Icon="avares://DiscordHistoryTracker/Resources/icon.ico" Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
Width="800" Height="500" Width="800" Height="500"
MinWidth="480" MinHeight="260" MinWidth="500" MinHeight="275"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Closed="OnClosed"> Closed="OnClosed">

37
app/Desktop/Main/Screens/MainContentScreen.axaml
View File

@ -12,10 +12,20 @@
</Design.DataContext> </Design.DataContext>
<UserControl.Styles> <UserControl.Styles>
<Style Selector="Border.statusBar">
<Setter Property="Background" Value="#3C4F79" />
</Style>
<Style Selector="TextBlock.invisibleTabItem">
<Setter Property="FontSize" Value="20" />
<Setter Property="FontWeight" Value="SemiLight" />
<Setter Property="Margin" Value="17 0" />
<Setter Property="Opacity" Value="0" />
</Style>
<Style Selector="TabControl ItemsPresenter > Grid"> <Style Selector="TabControl ItemsPresenter > Grid">
<Setter Property="Background" Value="#546A9F" /> <Setter Property="Background" Value="#546A9F" />
</Style> </Style>
<Style Selector="TabItem"> <Style Selector="TabItem">
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Foreground" Value="#E9E9E9" /> <Setter Property="Foreground" Value="#E9E9E9" />
<Setter Property="FontSize" Value="20" /> <Setter Property="FontSize" Value="20" />
</Style> </Style>
@ -23,10 +33,11 @@
<Setter Property="Margin" Value="5 0" /> <Setter Property="Margin" Value="5 0" />
</Style> </Style>
<Style Selector="TabItem:pointerover"> <Style Selector="TabItem:pointerover">
<Setter Property="Background" Value="#1F2E45" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Background" Value="#455785" />
</Style> </Style>
<Style Selector="TabItem:pointerover /template/ Border"> <Style Selector="TabItem:pointerover /template/ Border">
<Setter Property="Background" Value="#1F2E45" /> <Setter Property="Background" Value="#455785" />
</Style> </Style>
<Style Selector="TabItem:pointerover > TextBlock"> <Style Selector="TabItem:pointerover > TextBlock">
<Setter Property="Foreground" Value="#E9E9E9" /> <Setter Property="Foreground" Value="#E9E9E9" />
@ -60,43 +71,37 @@
</UserControl.Styles> </UserControl.Styles>
<DockPanel> <DockPanel>
<TabControl x:Name="TabControl" TabStripPlacement="Left"> <Border Classes="statusBar" DockPanel.Dock="Bottom">
<DockPanel>
<TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Advanced</TextBlock>
<controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Right" />
</DockPanel>
</Border>
<TabControl x:Name="TabControl" TabStripPlacement="Left" DockPanel.Dock="Top">
<TabControl.ItemsPanel> <TabControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto,Auto,*,Auto,43" /> <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto,Auto,*,Auto" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</TabControl.ItemsPanel> </TabControl.ItemsPanel>
<TabItem x:Name="TabDatabase" Header="Database" Classes="first" Grid.Row="0"> <TabItem x:Name="TabDatabase" Header="Database" Classes="first" Grid.Row="0">
<DockPanel>
<controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Bottom" />
<ScrollViewer> <ScrollViewer>
<ContentPresenter Content="{Binding DatabasePage}" Classes="page" /> <ContentPresenter Content="{Binding DatabasePage}" Classes="page" />
</ScrollViewer> </ScrollViewer>
</DockPanel>
</TabItem> </TabItem>
<TabItem x:Name="TabTracking" Header="Tracking" DockPanel.Dock="Top" Grid.Row="1"> <TabItem x:Name="TabTracking" Header="Tracking" DockPanel.Dock="Top" Grid.Row="1">
<DockPanel>
<controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Bottom" />
<ScrollViewer> <ScrollViewer>
<ContentPresenter Content="{Binding TrackingPage}" Classes="page" /> <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
</ScrollViewer> </ScrollViewer>
</DockPanel>
</TabItem> </TabItem>
<TabItem x:Name="TabViewer" Header="Viewer" DockPanel.Dock="Top" Grid.Row="2"> <TabItem x:Name="TabViewer" Header="Viewer" DockPanel.Dock="Top" Grid.Row="2">
<DockPanel>
<controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Bottom" />
<ScrollViewer> <ScrollViewer>
<ContentPresenter Content="{Binding ViewerPage}" Classes="page" /> <ContentPresenter Content="{Binding ViewerPage}" Classes="page" />
</ScrollViewer> </ScrollViewer>
</DockPanel>
</TabItem> </TabItem>
<TabItem x:Name="TabAdvanced" Header="Advanced" DockPanel.Dock="Bottom" Grid.Row="4"> <TabItem x:Name="TabAdvanced" Header="Advanced" DockPanel.Dock="Bottom" Grid.Row="4">
<DockPanel>
<controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Bottom" />
<ScrollViewer> <ScrollViewer>
<ContentPresenter Content="{Binding AdvancedPage}" Classes="page" /> <ContentPresenter Content="{Binding AdvancedPage}" Classes="page" />
</ScrollViewer> </ScrollViewer>
</DockPanel>
</TabItem> </TabItem>
</TabControl> </TabControl>
</DockPanel> </DockPanel>