Reorder tabs

This commit is contained in:
Michael Bucari-Tovo 2022-12-16 16:45:51 -07:00
parent 7d6000e3b6
commit 0701cb3970
11 changed files with 43 additions and 78 deletions

View File

@ -1,9 +1,7 @@
using Avalonia;
using Avalonia.Collections;
using Avalonia.Controls;
using DataLayer;
using HangoverAvalonia.ViewModels;
using NPOI.XSSF.Streaming.Properties;
using ReactiveUI;
using System;
using System.Collections;

View File

@ -1,5 +1,4 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.ReactiveUI;
using System;

View File

@ -1,7 +1,5 @@
using HangoverBase;
using ReactiveUI;
using System;
using System.Linq;
namespace HangoverAvalonia.ViewModels
{

View File

@ -1,9 +1,7 @@
using ApplicationServices;
using DataLayer;
using ReactiveUI;
using System;
using System.Collections.Generic;
using System.Linq;
namespace HangoverAvalonia.ViewModels
{

View File

@ -1,18 +1,11 @@
using System;
using ApplicationServices;
using DataLayer;
using System.Collections.Generic;
using HangoverBase;
using ReactiveUI;
namespace HangoverAvalonia.ViewModels
{
public partial class MainVM : ViewModelBase
{
public MainVM()
{
{
public MainVM()
{
Load_databaseVM();
Load_deletedVM();
}
Load_deletedVM();
}
}
}

View File

@ -1,7 +1,4 @@
using ReactiveUI;
using System;
using System.Collections.Generic;
using System.Text;
namespace HangoverAvalonia.ViewModels
{

View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HangoverAvalonia.Views
namespace HangoverAvalonia.Views
{
public partial class MainWindow
{

View File

@ -1,11 +1,4 @@
using HangoverAvalonia.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HangoverAvalonia.Views
namespace HangoverAvalonia.Views
{
public partial class MainWindow
{

View File

@ -1,7 +1,6 @@
using ApplicationServices;
using DataLayer;
using HangoverAvalonia.Controls;
using System;
using System.Linq;
namespace HangoverAvalonia.Views

View File

@ -31,44 +31,6 @@
</Style>
</TabControl.Styles>
<!-- Deleted Books Tab -->
<TabItem Name="deletedTab">
<TabItem.Header>
<TextBlock FontSize="14" VerticalAlignment="Center">Deleted Books</TextBlock>
</TabItem.Header>
<Grid
RowDefinitions="Auto,*,Auto">
<TextBlock
Grid.Row="0"
Margin="5"
Text="To restore deleted book, check box and save" />
<controls:CheckedListBox
Grid.Row="1"
Margin="5,0,5,0"
BorderThickness="1"
BorderBrush="Gray"
Name="deletedCbl"
Items="{Binding DeletedBooks}" />
<Grid
Grid.Row="2"
Margin="5"
ColumnDefinitions="Auto,Auto,Auto,*">
<Button Grid.Column="0" Margin="0,0,20,0" Content="Check All" Click="Deleted_CheckAll_Click" />
<Button Grid.Column="1" Margin="0,0,20,0" Content="Uncheck All" Click="Deleted_UncheckAll_Click" />
<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding CheckedCountText}" />
<Button Grid.Column="3" HorizontalAlignment="Right" Content="Save" Click="Deleted_Save_Click" />
</Grid>
</Grid>
</TabItem>
<!-- Database Tab -->
<TabItem Name="databaseTab">
<TabItem.Header>
@ -106,6 +68,42 @@
</TabItem>
<!-- Deleted Books Tab -->
<TabItem Name="deletedTab">
<TabItem.Header>
<TextBlock FontSize="14" VerticalAlignment="Center">Deleted Books</TextBlock>
</TabItem.Header>
<Grid
RowDefinitions="Auto,*,Auto">
<TextBlock
Grid.Row="0"
Margin="5"
Text="To restore deleted book, check box and save" />
<controls:CheckedListBox
Grid.Row="1"
Margin="5,0,5,0"
BorderThickness="1"
BorderBrush="Gray"
Name="deletedCbl"
Items="{Binding DeletedBooks}" />
<Grid
Grid.Row="2"
Margin="5"
ColumnDefinitions="Auto,Auto,Auto,*">
<Button Grid.Column="0" Margin="0,0,20,0" Content="Check All" Click="Deleted_CheckAll_Click" />
<Button Grid.Column="1" Margin="0,0,20,0" Content="Uncheck All" Click="Deleted_UncheckAll_Click" />
<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding CheckedCountText}" />
<Button Grid.Column="3" HorizontalAlignment="Right" Content="Save" Click="Deleted_Save_Click" />
</Grid>
</Grid>
</TabItem>
<!-- Command Line Interface Tab -->
<TabItem Name="cliTab">
<TabItem.Header>

View File

@ -1,8 +1,6 @@
using AppScaffolding;
using Avalonia.Controls;
using HangoverAvalonia.ViewModels;
using System;
using System.Linq;
namespace HangoverAvalonia.Views
{