Apply standard styles to all views.

This commit is contained in:
2025-07-26 17:21:54 +01:00
parent de9ad80eef
commit 52946eca2e
11 changed files with 675 additions and 691 deletions

View File

@@ -40,20 +40,20 @@
<Design.DataContext> <Design.DataContext>
<vm:AboutViewModel /> <vm:AboutViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Grid RowDefinitions="Auto,*,Auto"
<Grid RowDefinitions="Auto,*,Auto"> Margin="16"
RowSpacing="8">
<Grid Grid.Row="0" <Grid Grid.Row="0"
ColumnSpacing="8"
ColumnDefinitions="Auto,*"> ColumnDefinitions="Auto,*">
<Border Grid.Column="0"
BorderThickness="5">
<Image Source="/Assets/avalonia-logo.ico" <Image Source="/Assets/avalonia-logo.ico"
Width="48" Width="48"
Height="48" /> Height="48" />
</Border>
<Grid Grid.Column="1" <Grid Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
RowDefinitions="Auto,Auto"> RowDefinitions="Auto,Auto"
RowSpacing="8">
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding SoftwareName, Mode=OneWay}" Text="{Binding SoftwareName, Mode=OneWay}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@@ -73,32 +73,33 @@
<TabItem.Header> <TabItem.Header>
<TextBlock Text="{x:Static resources:Localization.AboutLabel}" /> <TextBlock Text="{x:Static resources:Localization.AboutLabel}" />
</TabItem.Header> </TabItem.Header>
<Grid RowDefinitions="Auto,12,Auto,12,Auto,Auto,*"> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*"
RowSpacing="8">
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding SuiteName, Mode=OneWay}" /> Text="{Binding SuiteName, Mode=OneWay}" />
<TextBlock Grid.Row="2" <TextBlock Grid.Row="1"
Text="{Binding Copyright, Mode=OneWay}" /> Text="{Binding Copyright, Mode=OneWay}" />
<Button Grid.Row="4" <Button Grid.Row="2"
BorderThickness="0"
Background="Transparent" Background="Transparent"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Padding="0" Padding="0"
BorderThickness="0"
Command="{Binding WebsiteCommand, Mode=OneWay}"> Command="{Binding WebsiteCommand, Mode=OneWay}">
<!-- TODO: TextDecorations="Underline" in next Avalonia UI version -->
<TextBlock Text="{Binding Website, Mode=OneWay}" <TextBlock Text="{Binding Website, Mode=OneWay}"
Foreground="Blue" /> Foreground="Blue"
TextDecorations="Underline" />
</Button> </Button>
<Button Grid.Row="5" <Button Grid.Row="3"
BorderThickness="0"
Background="Transparent" Background="Transparent"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Padding="0" Padding="0"
BorderThickness="0"
Command="{Binding LicenseCommand, Mode=OneWay}"> Command="{Binding LicenseCommand, Mode=OneWay}">
<!-- TODO: TextDecorations="Underline" in next Avalonia UI version -->
<TextBlock Text="{x:Static resources:Localization.LicenseLabel}" <TextBlock Text="{x:Static resources:Localization.LicenseLabel}"
Foreground="Blue" /> Foreground="Blue"
TextDecorations="Underline" />
</Button> </Button>
</Grid> </Grid>
</TabItem> </TabItem>
@@ -141,5 +142,4 @@
<TextBlock Text="{x:Static resources:Localization.CloseLabel}" /> <TextBlock Text="{x:Static resources:Localization.CloseLabel}" />
</Button> </Button>
</Grid> </Grid>
</Border>
</Window> </Window>

View File

@@ -41,203 +41,190 @@
<Design.DataContext> <Design.DataContext>
<vm:EditDatViewModel /> <vm:EditDatViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"> Margin="16"
RowSpacing="8">
<Grid Grid.Row="0" <Grid Grid.Row="0"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.RomSetNameLabel}" Text="{x:Static resources:Localization.RomSetNameLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Name, Mode=TwoWay}" Text="{Binding Name, Mode=TwoWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="1" <Grid Grid.Row="1"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.RomSetVersionLabel}" Text="{x:Static resources:Localization.RomSetVersionLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Version, Mode=TwoWay}" Text="{Binding Version, Mode=TwoWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="2" <Grid Grid.Row="2"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.RomSetAuthorLabel}" Text="{x:Static resources:Localization.RomSetAuthorLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Author, Mode=TwoWay}" Text="{Binding Author, Mode=TwoWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="3" <Grid Grid.Row="3"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.RomSetCategoryLabel}" Text="{x:Static resources:Localization.RomSetCategoryLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Category, Mode=TwoWay}" Text="{Binding Category, Mode=TwoWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="4" <Grid Grid.Row="4"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.RomSetCommentLabel}" Text="{x:Static resources:Localization.RomSetCommentLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Comment, Mode=TwoWay}" Text="{Binding Comment, Mode=TwoWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="5" <Grid Grid.Row="5"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.RomSetDateLabel}" Text="{x:Static resources:Localization.RomSetDateLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Date, Mode=TwoWay}" Text="{Binding Date, Mode=TwoWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="6" <Grid Grid.Row="6"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.RomSetDescriptionLabel}" Text="{x:Static resources:Localization.RomSetDescriptionLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Description, Mode=TwoWay}" Text="{Binding Description, Mode=TwoWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="7" <Grid Grid.Row="7"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.HomepageLabel}" Text="{x:Static resources:Localization.HomepageLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding Homepage, Mode=TwoWay}" Text="{Binding Homepage, Mode=TwoWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="8" <Grid Grid.Row="8"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.TotalMachinesLabel}" Text="{x:Static resources:Localization.TotalMachinesLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding TotalMachines, Mode=OneWay}" Text="{Binding TotalMachines, Mode=OneWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="9" <Grid Grid.Row="9"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.CompleteMachinesLabel}" Text="{x:Static resources:Localization.CompleteMachinesLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding CompleteMachines, Mode=OneWay}" Text="{Binding CompleteMachines, Mode=OneWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="10" <Grid Grid.Row="10"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.IncompleteMachinesLabel}" Text="{x:Static resources:Localization.IncompleteMachinesLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding IncompleteMachines, Mode=OneWay}" Text="{Binding IncompleteMachines, Mode=OneWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="11" <Grid Grid.Row="11"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.TotalRomsLabel}" Text="{x:Static resources:Localization.TotalRomsLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding TotalRoms, Mode=OneWay}" Text="{Binding TotalRoms, Mode=OneWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="12" <Grid Grid.Row="12"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.HaveRomsLabel}" Text="{x:Static resources:Localization.HaveRomsLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding HaveRoms, Mode=OneWay}" Text="{Binding HaveRoms, Mode=OneWay}" />
Padding="5" />
</Grid> </Grid>
<Grid Grid.Row="13" <Grid Grid.Row="13"
ColumnSpacing="8"
ColumnDefinitions="140,*"> ColumnDefinitions="140,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.MissRomsLabel}" Text="{x:Static resources:Localization.MissRomsLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding MissRoms, Mode=OneWay}" Text="{Binding MissRoms, Mode=OneWay}" />
Padding="5" />
</Grid> </Grid>
<StackPanel Grid.Row="14" <StackPanel Grid.Row="14"
Orientation="Horizontal" Orientation="Horizontal"
@@ -262,5 +249,4 @@
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border>
</Window> </Window>

View File

@@ -41,8 +41,9 @@
<Design.DataContext> <Design.DataContext>
<vm:ExportDatViewModel /> <vm:ExportDatViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Grid RowDefinitions="Auto,auto,Auto,Auto"
<Grid RowDefinitions="Auto,auto,Auto,Auto"> Margin="16"
RowSpacing="8">
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding StatusMessage, Mode=OneWay}" Text="{Binding StatusMessage, Mode=OneWay}"
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />
@@ -63,5 +64,4 @@
<TextBlock Text="{x:Static resources:Localization.CloseLabel}" /> <TextBlock Text="{x:Static resources:Localization.CloseLabel}" />
</Button> </Button>
</Grid> </Grid>
</Border>
</Window> </Window>

View File

@@ -41,9 +41,11 @@
<Design.DataContext> <Design.DataContext>
<vm:ExportRomsViewModel /> <vm:ExportRomsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto"
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto"> Margin="16"
RowSpacing="8">
<StackPanel Grid.Row="0" <StackPanel Grid.Row="0"
Spacing="8"
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Stretch"> HorizontalAlignment="Stretch">
<TextBlock Text="{x:Static resources:Localization.PathLabel}" <TextBlock Text="{x:Static resources:Localization.PathLabel}"
@@ -61,6 +63,7 @@
IsIndeterminate="{Binding ProgressIsIndeterminate, Mode=OneWay}" IsIndeterminate="{Binding ProgressIsIndeterminate, Mode=OneWay}"
IsVisible="{Binding ProgressVisible, Mode=OneWay}" /> IsVisible="{Binding ProgressVisible, Mode=OneWay}" />
<StackPanel Grid.Row="3" <StackPanel Grid.Row="3"
Spacing="8"
IsVisible="{Binding Progress2Visible, Mode=OneWay}"> IsVisible="{Binding Progress2Visible, Mode=OneWay}">
<TextBlock Text="{Binding Status2Message, Mode=OneWay}" /> <TextBlock Text="{Binding Status2Message, Mode=OneWay}" />
<ProgressBar Minimum="{Binding Progress2Minimum, Mode=OneWay}" <ProgressBar Minimum="{Binding Progress2Minimum, Mode=OneWay}"
@@ -69,6 +72,7 @@
IsIndeterminate="{Binding Progress2IsIndeterminate, Mode=OneWay}" /> IsIndeterminate="{Binding Progress2IsIndeterminate, Mode=OneWay}" />
</StackPanel> </StackPanel>
<StackPanel Grid.Row="4" <StackPanel Grid.Row="4"
Spacing="8"
IsVisible="{Binding Progress3Visible, Mode=OneWay}"> IsVisible="{Binding Progress3Visible, Mode=OneWay}">
<TextBlock Text="{Binding Status3Message, Mode=OneWay}" /> <TextBlock Text="{Binding Status3Message, Mode=OneWay}" />
<ProgressBar Minimum="{Binding Progress3Minimum, Mode=OneWay}" <ProgressBar Minimum="{Binding Progress3Minimum, Mode=OneWay}"
@@ -84,5 +88,4 @@
<TextBlock Text="{x:Static resources:Localization.CloseLabel}" /> <TextBlock Text="{x:Static resources:Localization.CloseLabel}" />
</Button> </Button>
</Grid> </Grid>
</Border>
</Window> </Window>

View File

@@ -41,8 +41,9 @@
<Design.DataContext> <Design.DataContext>
<vm:ImportDatViewModel /> <vm:ImportDatViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Grid RowDefinitions="Auto,auto,Auto,Auto"
<Grid RowDefinitions="Auto,auto,Auto,Auto"> Margin="16"
RowSpacing="8">
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding StatusMessage, Mode=OneWay}" Text="{Binding StatusMessage, Mode=OneWay}"
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />
@@ -66,5 +67,4 @@
<TextBlock Text="{x:Static resources:Localization.CloseLabel}" /> <TextBlock Text="{x:Static resources:Localization.CloseLabel}" />
</Button> </Button>
</Grid> </Grid>
</Border>
</Window> </Window>

View File

@@ -10,8 +10,7 @@
Height="600" Height="600"
x:Class="RomRepoMgr.Views.ImportDatFolder" x:Class="RomRepoMgr.Views.ImportDatFolder"
Title="{x:Static resources:Localization.ImportDatFolderTitle}" Title="{x:Static resources:Localization.ImportDatFolderTitle}"
Icon="/Assets/avalonia-logo.ico" Icon="/Assets/avalonia-logo.ico">
CanResize="False">
<Design.DataContext> <Design.DataContext>
<vm:ImportDatFolderViewModel /> <vm:ImportDatFolderViewModel />
</Design.DataContext> </Design.DataContext>

View File

@@ -10,7 +10,6 @@
Height="768" Height="768"
x:Class="RomRepoMgr.Views.ImportRomFolder" x:Class="RomRepoMgr.Views.ImportRomFolder"
Icon="/Assets/avalonia-logo.ico" Icon="/Assets/avalonia-logo.ico"
CanResize="False"
Title="{x:Static resources:Localization.ImportRomFolderTitle}" Title="{x:Static resources:Localization.ImportRomFolderTitle}"
WindowStartupLocation="CenterOwner"> WindowStartupLocation="CenterOwner">
<Design.DataContext> <Design.DataContext>

View File

@@ -41,8 +41,9 @@
<Design.DataContext> <Design.DataContext>
<vm:RemoveDatViewModel /> <vm:RemoveDatViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Grid RowDefinitions="Auto,auto"
<Grid RowDefinitions="Auto,auto"> Margin="16"
RowSpacing="8">
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding StatusMessage, Mode=OneWay}" Text="{Binding StatusMessage, Mode=OneWay}"
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />
@@ -50,5 +51,4 @@
IsIndeterminate="True" IsIndeterminate="True"
HorizontalAlignment="Stretch" /> HorizontalAlignment="Stretch" />
</Grid> </Grid>
</Border>
</Window> </Window>

View File

@@ -31,7 +31,7 @@
xmlns:vm="clr-namespace:RomRepoMgr.ViewModels;assembly=RomRepoMgr" xmlns:vm="clr-namespace:RomRepoMgr.ViewModels;assembly=RomRepoMgr"
xmlns:resources="clr-namespace:RomRepoMgr.Resources" xmlns:resources="clr-namespace:RomRepoMgr.Resources"
mc:Ignorable="d" mc:Ignorable="d"
Width="480" Width="540"
Height="320" Height="320"
x:Class="RomRepoMgr.Views.SettingsDialog" x:Class="RomRepoMgr.Views.SettingsDialog"
Icon="/Assets/avalonia-logo.ico" Icon="/Assets/avalonia-logo.ico"
@@ -40,71 +40,66 @@
<Design.DataContext> <Design.DataContext>
<vm:SettingsViewModel /> <vm:SettingsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"> Margin="16"
RowSpacing="8">
<Grid Grid.Row="0" <Grid Grid.Row="0"
ColumnDefinitions="*,250,Auto"> ColumnDefinitions="*,250,Auto"
ColumnSpacing="8">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.DatabaseFileLabel}" Text="{x:Static resources:Localization.DatabaseFileLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding DatabasePath, Mode=TwoWay}" Text="{Binding DatabasePath, Mode=TwoWay}"
IsReadOnly="True" IsReadOnly="True" />
Padding="5" />
<Button Grid.Column="2" <Button Grid.Column="2"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DatabaseCommand, Mode=OneWay}" Command="{Binding DatabaseCommand, Mode=OneWay}">
Padding="5">
<TextBlock Text="{x:Static resources:Localization.ChooseLabel}" /> <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
</Button> </Button>
</Grid> </Grid>
<Grid Grid.Row="1" <Grid Grid.Row="1"
ColumnDefinitions="*,250,Auto"> ColumnDefinitions="*,250,Auto"
ColumnSpacing="8">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.RepositoryFolderLabel}" Text="{x:Static resources:Localization.RepositoryFolderLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding RepositoryPath, Mode=TwoWay}" Text="{Binding RepositoryPath, Mode=TwoWay}"
IsReadOnly="True" IsReadOnly="True" />
Padding="5" />
<Button Grid.Column="2" <Button Grid.Column="2"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding RepositoryCommand, Mode=OneWay}" Command="{Binding RepositoryCommand, Mode=OneWay}">
Padding="5">
<TextBlock Text="{x:Static resources:Localization.ChooseLabel}" /> <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
</Button> </Button>
</Grid> </Grid>
<Grid Grid.Row="2" <Grid Grid.Row="2"
ColumnDefinitions="*,250,Auto"> ColumnDefinitions="*,250,Auto"
ColumnSpacing="8">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.TemporaryFolderLabel}" Text="{x:Static resources:Localization.TemporaryFolderLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding TemporaryPath, Mode=TwoWay}" Text="{Binding TemporaryPath, Mode=TwoWay}"
IsReadOnly="True" IsReadOnly="True" />
Padding="5" />
<Button Grid.Column="2" <Button Grid.Column="2"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding TemporaryCommand, Mode=OneWay}" Command="{Binding TemporaryCommand, Mode=OneWay}">
Padding="5">
<TextBlock Text="{x:Static resources:Localization.ChooseLabel}" /> <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
</Button> </Button>
</Grid> </Grid>
@@ -116,24 +111,22 @@
</CheckBox> </CheckBox>
<Grid Grid.Row="4" <Grid Grid.Row="4"
ColumnDefinitions="*,250,Auto" ColumnDefinitions="*,250,Auto"
ColumnSpacing="8"
IsVisible="{Binding !UseInternalDecompressor}"> IsVisible="{Binding !UseInternalDecompressor}">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.UnArPathLabel}" Text="{x:Static resources:Localization.UnArPathLabel}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding UnArPath, Mode=TwoWay}" Text="{Binding UnArPath, Mode=TwoWay}"
IsReadOnly="True" IsReadOnly="True" />
Padding="5" />
<Button Grid.Column="2" <Button Grid.Column="2"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding UnArCommand, Mode=OneWay}" Command="{Binding UnArCommand, Mode=OneWay}">
Padding="5">
<TextBlock Text="{x:Static resources:Localization.ChooseLabel}" /> <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
</Button> </Button>
</Grid> </Grid>
@@ -144,20 +137,20 @@
FontWeight="Bold" FontWeight="Bold"
IsVisible="{Binding !UseInternalDecompressor}" /> IsVisible="{Binding !UseInternalDecompressor}" />
<Grid Grid.Row="6" <Grid Grid.Row="6"
ColumnDefinitions="Auto, *"> ColumnDefinitions="Auto, *"
ColumnSpacing="8">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{x:Static resources:Localization.CompressionType}" Text="{x:Static resources:Localization.CompressionType}"
FontWeight="Bold" FontWeight="Bold" />
Padding="5" />
<ComboBox Grid.Column="1" <ComboBox Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center" VerticalAlignment="Center"
SelectedItem="{Binding Compression, Mode=TwoWay}" SelectedItem="{Binding Compression, Mode=TwoWay}"
ItemsSource="{Binding CompressionTypes, Mode=OneWay}" ItemsSource="{Binding CompressionTypes, Mode=OneWay}" />
Padding="5" />
</Grid> </Grid>
<StackPanel Grid.Row="7" <StackPanel Grid.Row="7"
Spacing="8"
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Right"> HorizontalAlignment="Right">
<Button HorizontalAlignment="Right" <Button HorizontalAlignment="Right"
@@ -172,5 +165,4 @@
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border>
</Window> </Window>

View File

@@ -11,8 +11,8 @@
Title="ROM Repository Manager" Title="ROM Repository Manager"
SystemDecorations="BorderOnly" SystemDecorations="BorderOnly"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Width="250" Width="320"
Height="175"> Height="240">
<Design.DataContext> <Design.DataContext>
<vm:SplashWindowViewModel /> <vm:SplashWindowViewModel />
</Design.DataContext> </Design.DataContext>
@@ -20,12 +20,14 @@
<StackPanel HorizontalAlignment="Stretch" <StackPanel HorizontalAlignment="Stretch"
VerticalAlignment="Top" VerticalAlignment="Top"
Orientation="Vertical" Orientation="Vertical"
Margin="5"> Margin="16"
Spacing="8">
<TextBlock Text="{Binding LoadingText, Mode=OneWay}" <TextBlock Text="{Binding LoadingText, Mode=OneWay}"
FontWeight="Bold" FontWeight="Bold"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" /> VerticalAlignment="Top" />
<StackPanel HorizontalAlignment="Left" <StackPanel HorizontalAlignment="Left"
Spacing="8"
Orientation="Horizontal"> Orientation="Horizontal">
<Image MaxWidth="24" <Image MaxWidth="24"
MaxHeight="24" MaxHeight="24"
@@ -52,6 +54,7 @@
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" <StackPanel HorizontalAlignment="Left"
Spacing="8"
Orientation="Horizontal"> Orientation="Horizontal">
<Image MaxWidth="24" <Image MaxWidth="24"
MaxHeight="24" MaxHeight="24"
@@ -78,6 +81,7 @@
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" <StackPanel HorizontalAlignment="Left"
Spacing="8"
Orientation="Horizontal"> Orientation="Horizontal">
<Image MaxWidth="24" <Image MaxWidth="24"
MaxHeight="24" MaxHeight="24"
@@ -104,6 +108,7 @@
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" <StackPanel HorizontalAlignment="Left"
Spacing="8"
Orientation="Horizontal"> Orientation="Horizontal">
<Image MaxWidth="24" <Image MaxWidth="24"
MaxHeight="24" MaxHeight="24"
@@ -130,6 +135,7 @@
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" <StackPanel HorizontalAlignment="Left"
Spacing="8"
Orientation="Horizontal"> Orientation="Horizontal">
<Image MaxWidth="24" <Image MaxWidth="24"
MaxHeight="24" MaxHeight="24"

View File

@@ -33,14 +33,14 @@
mc:Ignorable="d" mc:Ignorable="d"
x:Class="RomRepoMgr.Views.UpdateStats" x:Class="RomRepoMgr.Views.UpdateStats"
Icon="/Assets/avalonia-logo.ico" Icon="/Assets/avalonia-logo.ico"
CanResize="False"
Title="{x:Static resources:Localization.UpdateStatsTitle}" Title="{x:Static resources:Localization.UpdateStatsTitle}"
WindowStartupLocation="CenterOwner"> WindowStartupLocation="CenterOwner">
<Design.DataContext> <Design.DataContext>
<vm:UpdateStatsViewModel /> <vm:UpdateStatsViewModel />
</Design.DataContext> </Design.DataContext>
<Border Padding="15"> <Grid RowDefinitions="Auto,Auto,*,Auto"
<Grid RowDefinitions="Auto,Auto,*,Auto"> Margin="16"
RowSpacing="8">
<TextBlock Grid.Row="0" <TextBlock Grid.Row="0"
Text="{Binding StatusMessage, Mode=OneWay}" Text="{Binding StatusMessage, Mode=OneWay}"
HorizontalAlignment="Center" /> HorizontalAlignment="Center" />
@@ -166,5 +166,4 @@
<TextBlock Text="{x:Static resources:Localization.CloseLabel}" /> <TextBlock Text="{x:Static resources:Localization.CloseLabel}" />
</Button> </Button>
</Grid> </Grid>
</Border>
</Window> </Window>