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

Move settings and about to main screen

Browse Source
This commit is contained in:
Michael Babienco
2026-04-21 11:23:28 +09:00
parent dd09459226
commit d99fefe74d
4 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MayShow.Shared/ViewModels/CreatePDFReportViewModel.cs
-5
View File
@@ -341,11 +341,6 @@ class CreatePDFReportViewModel : BaseViewModel, ICanCheckShutdown, ILogger
NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
}
public void ShowAbout()
{
DialogHost.Show(new AboutViewModel());
}
public async Task ShowSettings()
{
var updatedSettings = await DialogHost.Show(new SettingsViewModel(_settings, TopLevelGrabber));
src/MayShow.Shared/ViewModels/StartNewChooseReportViewModel.cs
+15
View File
@@ -131,6 +131,21 @@ class StartNewChooseReportViewModel : BaseViewModel, ICanCheckShutdown, IUpdateR
}
}
public void ShowAbout()
{
DialogHost.Show(new AboutViewModel());
}
public async Task ShowSettings()
{
var updatedSettings = await DialogHost.Show(new SettingsViewModel(_settings, TopLevelGrabber));
if (updatedSettings != null)
{
_settings = (Settings)updatedSettings;
await _settings.SaveSettingsAsync();
}
}
public async Task<bool> CheckIsSafeToShutdown()
{
return true;
src/MayShow.Shared/Views/CreatePDFReportView.axaml
-14
View File
@@ -15,20 +15,6 @@
</UserControl.Resources>
<Grid ColumnDefinitions="*"
RowDefinitions="Auto, 2*, Auto, Auto, *">
<Button Command="{Binding ShowSettings}"
Grid.Row="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="4,4,0,4">
<TextBlock><Run Text="&#xf013;" FontFamily="{StaticResource FontAwesomeSolid}"/> Settings</TextBlock>
</Button>
<Button Command="{Binding ShowAbout}"
Grid.Row="0"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Margin="0,4,4,4">
<TextBlock><Run Text="&#xf059;" FontFamily="{StaticResource FontAwesomeSolid}"/> About</TextBlock>
</Button>
<StackPanel Orientation="Vertical"
Spacing="2"
Margin="0,4,0,0">
src/MayShow.Shared/Views/StartNewChooseReport.axaml
+16
View File
@@ -12,6 +12,22 @@
x:DataType="vm:StartNewChooseReportViewModel">
<Grid ColumnDefinitions="100, *, 100"
RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, *">
<Button Command="{Binding ShowSettings}"
Grid.Row="0"
Grid.Column="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Margin="4,4,0,4">
<TextBlock><Run Text="&#xf013;" FontFamily="{StaticResource FontAwesomeSolid}"/> Settings</TextBlock>
</Button>
<Button Command="{Binding ShowAbout}"
Grid.Row="0"
Grid.Column="2"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Margin="0,4,4,4">
<TextBlock><Run Text="&#xf059;" FontFamily="{StaticResource FontAwesomeSolid}"/> About</TextBlock>
</Button>
<TextBlock HorizontalAlignment="Center"
FontSize="36"
FontWeight="Bold"