UI tweaks

This commit is contained in:
2026-04-21 11:41:44 +09:00
parent 14fc5b29ee
commit 411d70aa18
3 changed files with 54 additions and 53 deletions
@@ -15,6 +15,9 @@
</UserControl.Resources> </UserControl.Resources>
<Grid ColumnDefinitions="*" <Grid ColumnDefinitions="*"
RowDefinitions="Auto, 2*, Auto, Auto, *"> RowDefinitions="Auto, 2*, Auto, Auto, *">
<StackPanel Orientation="Vertical"
Spacing="2"
Margin="0,4,0,0">
<Button Command="{Binding ReturnToMainMenu}" <Button Command="{Binding ReturnToMainMenu}"
Grid.Row="0" Grid.Row="0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@@ -22,13 +25,6 @@
Margin="4,4,0,4"> Margin="4,4,0,4">
<TextBlock><Run Text="&#xf060;" FontFamily="{StaticResource FontAwesomeSolid}"/> Return to Main Menu</TextBlock> <TextBlock><Run Text="&#xf060;" FontFamily="{StaticResource FontAwesomeSolid}"/> Return to Main Menu</TextBlock>
</Button> </Button>
<StackPanel Orientation="Vertical"
Spacing="2"
Margin="0,4,0,0">
<Label Content="MayShow: Report Builder"
FontSize="20"
FontWeight="Bold"
HorizontalAlignment="Center"/>
<Grid ColumnDefinitions="Auto, *" <Grid ColumnDefinitions="Auto, *"
Margin="4,0,0,0"> Margin="4,0,0,0">
<Button Content="Choose Receipt Folder" <Button Content="Choose Receipt Folder"
+12 -7
View File
@@ -11,14 +11,17 @@
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia" xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
x:DataType="vm:EditFileViewModel" x:DataType="vm:EditFileViewModel"
MaxWidth="350"> MaxWidth="350">
<ScrollViewer AllowAutoHide="False"> <Grid RowDefinitions="Auto, *, Auto">
<StackPanel Orientation="Vertical"
Spacing="4"
Margin="12,4,12,0">
<Label Content="Edit File Details" <Label Content="Edit File Details"
Grid.Row="0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
FontSize="16" FontSize="16"
FontWeight="Bold" /> FontWeight="Bold" />
<ScrollViewer AllowAutoHide="False"
Grid.Row="1">
<StackPanel Orientation="Vertical"
Spacing="4"
Margin="12,4,12,0">
<Label Content="Title" /> <Label Content="Title" />
<TextBox Watermark="Title" <TextBox Watermark="Title"
Text="{Binding ClonedFile.Title}" Text="{Binding ClonedFile.Title}"
@@ -36,9 +39,12 @@
SelectedDate="{Binding ClonedFile.ReceiptDateTime}" SelectedDate="{Binding ClonedFile.ReceiptDateTime}"
DisplayDate="{Binding ClonedFile.ReceiptDateTime}" DisplayDate="{Binding ClonedFile.ReceiptDateTime}"
IsTodayHighlighted="False" /> IsTodayHighlighted="False" />
</StackPanel>
</ScrollViewer>
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Spacing="12" Spacing="12"
Margin="0,4,0,0" Margin="0,8,0,0"
Grid.Row="2"
HorizontalAlignment="Right"> HorizontalAlignment="Right">
<Button Command="{Binding Cancel}"> <Button Command="{Binding Cancel}">
<TextBlock> <TextBlock>
@@ -52,6 +58,5 @@
FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock> FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock>
</Button> </Button>
</StackPanel> </StackPanel>
</StackPanel> </Grid>
</ScrollViewer>
</UserControl> </UserControl>
@@ -38,7 +38,7 @@
</TextBlock> </TextBlock>
<Image Source="avares://MayShow/Assets/MayShowIcon.png" <Image Source="avares://MayShow/Assets/MayShowIcon.png"
Width="125" Width="125"
Margin="0,24,0,0" Margin="0,12,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="1" Grid.Column="1"
Grid.Row="1" /> Grid.Row="1" />