mbabienco/MayShow
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

UI tweaks

Browse Source
This commit is contained in:
Michael Babienco
2026-04-21 11:41:44 +09:00
parent 14fc5b29ee
commit 411d70aa18
3 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MayShow.Shared/Views/CreatePDFReportView.axaml
+7 -11
View File
@@ -15,20 +15,16 @@
</UserControl.Resources> </UserControl.Resources>
<Grid ColumnDefinitions="*" <Grid ColumnDefinitions="*"
RowDefinitions="Auto, 2*, Auto, Auto, *"> RowDefinitions="Auto, 2*, Auto, Auto, *">
<Button Command="{Binding ReturnToMainMenu}"
Grid.Row="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="4,4,0,4">
<TextBlock><Run Text="&#xf060;" FontFamily="{StaticResource FontAwesomeSolid}"/> Return to Main Menu</TextBlock>
</Button>
<StackPanel Orientation="Vertical" <StackPanel Orientation="Vertical"
Spacing="2" Spacing="2"
Margin="0,4,0,0"> Margin="0,4,0,0">
<Label Content="MayShow: Report Builder" <Button Command="{Binding ReturnToMainMenu}"
FontSize="20" Grid.Row="0"
FontWeight="Bold" HorizontalAlignment="Left"
HorizontalAlignment="Center"/> VerticalAlignment="Top"
Margin="4,4,0,4">
<TextBlock><Run Text="&#xf060;" FontFamily="{StaticResource FontAwesomeSolid}"/> Return to Main Menu</TextBlock>
</Button>
<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"
src/MayShow.Shared/Views/EditFile.axaml
+46 -41
View File
@@ -11,47 +11,52 @@
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" <Label Content="Edit File Details"
Spacing="4" Grid.Row="0"
Margin="12,4,12,0"> HorizontalAlignment="Center"
<Label Content="Edit File Details" FontSize="16"
HorizontalAlignment="Center" FontWeight="Bold" />
FontSize="16" <ScrollViewer AllowAutoHide="False"
FontWeight="Bold" /> Grid.Row="1">
<Label Content="Title" /> <StackPanel Orientation="Vertical"
<TextBox Watermark="Title" Spacing="4"
Text="{Binding ClonedFile.Title}" Margin="12,4,12,0">
VerticalAlignment="Stretch" <Label Content="Title" />
TextWrapping="Wrap" /> <TextBox Watermark="Title"
<Label Content="Notes" /> Text="{Binding ClonedFile.Title}"
<TextBox Watermark="Notes" VerticalAlignment="Stretch"
Text="{Binding ClonedFile.Notes}" TextWrapping="Wrap" />
VerticalAlignment="Stretch" <Label Content="Notes" />
AcceptsReturn="True" <TextBox Watermark="Notes"
ScrollViewer.AllowAutoHide="False" Text="{Binding ClonedFile.Notes}"
Height="75" /> VerticalAlignment="Stretch"
<Label Content="Receipt Date" /> AcceptsReturn="True"
<Calendar SelectionMode="SingleDate" ScrollViewer.AllowAutoHide="False"
SelectedDate="{Binding ClonedFile.ReceiptDateTime}" Height="75" />
DisplayDate="{Binding ClonedFile.ReceiptDateTime}" <Label Content="Receipt Date" />
IsTodayHighlighted="False" /> <Calendar SelectionMode="SingleDate"
<StackPanel Orientation="Horizontal" SelectedDate="{Binding ClonedFile.ReceiptDateTime}"
Spacing="12" DisplayDate="{Binding ClonedFile.ReceiptDateTime}"
Margin="0,4,0,0" IsTodayHighlighted="False" />
HorizontalAlignment="Right">
<Button Command="{Binding Cancel}">
<TextBlock>
<Run Text="&#xf0e2;"
FontFamily="{StaticResource FontAwesomeSolid}" /> Cancel</TextBlock>
</Button>
<Button Command="{Binding Save}"
Classes="accent">
<TextBlock>
<Run Text="&#xf0c7;"
FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock>
</Button>
</StackPanel> </StackPanel>
</ScrollViewer>
<StackPanel Orientation="Horizontal"
Spacing="12"
Margin="0,8,0,0"
Grid.Row="2"
HorizontalAlignment="Right">
<Button Command="{Binding Cancel}">
<TextBlock>
<Run Text="&#xf0e2;"
FontFamily="{StaticResource FontAwesomeSolid}" /> Cancel</TextBlock>
</Button>
<Button Command="{Binding Save}"
Classes="accent">
<TextBlock>
<Run Text="&#xf0c7;"
FontFamily="{StaticResource FontAwesomeSolid}" /> Save</TextBlock>
</Button>
</StackPanel> </StackPanel>
</ScrollViewer> </Grid>
</UserControl> </UserControl>
src/MayShow.Shared/Views/StartNewChooseReport.axaml
+1 -1
View File
@@ -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" />