Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions CPAP-Exporter.UI/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.ComponentModel;
using System.Windows;
using System.Windows.Data;

namespace CascadePass.CPAPExporter
{
Expand All @@ -20,9 +19,12 @@ public MainWindow()

this.PageViewer.DataContext = navigationViewModel;

navigationViewModel.PropertyChanged += NavigationViewModel_PropertyChanged;

this.SetWindowSizeAndLocation();

if(this.userSettings.FontSize > 0 && this.userSettings.FontSize < 49)
{
this.FontSize = this.userSettings.FontSize;
}
}

private void SetWindowSizeAndLocation()
Expand Down Expand Up @@ -51,18 +53,5 @@ protected override void OnClosing(CancelEventArgs e)
this.GetWindowSizeAndLocation();
this.userSettings.Save();
}

private void NavigationViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
{
//if (string.Equals(e.PropertyName, nameof(NavigationViewModel.CurrentView)))
//{
//}

//if (string.Equals(e.PropertyName, nameof(PageViewModel.IsBusy)))
//{
// var bannerStripBinding = BindingOperations.GetBindingExpression(this.BannerStrip, VisibilityProperty);
// bannerStripBinding?.UpdateTarget();
//}
}
}
}
13 changes: 10 additions & 3 deletions CPAP-Exporter.UI/Pages/Settings/FontSizeView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,17 @@
Margin="4,0,0,0" />
</Grid>
</Expander.Header>
<StackPanel>
<TextBlock Text="{x:Static local:Resources.Label_FlowReductionExplaination}" TextWrapping="Wrap" />
<StackPanel Background="{DynamicResource Legibility.Background}">
<TextBlock
Text="{x:Static local:Resources.Settings_FontSize}"
Margin="8"
TextWrapping="Wrap" />

<Slider />
<Slider
Minimum="6"
Maximum="48"
Margin="8"
Value="{Binding FontSize}" />
</StackPanel>
</Expander>
</UserControl>
19 changes: 19 additions & 0 deletions CPAP-Exporter.UI/Pages/Settings/SettingsViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.ObjectModel;
using System.Windows;

namespace CascadePass.CPAPExporter
{
Expand All @@ -11,6 +12,24 @@ public SettingsViewModel() : base(Resources.PageTitle_Settings, Resources.PageDe

public ObservableCollection<Acknowledgement> Acknowledgements { get; private set; }

public double FontSize
{
get => this.ExportParameters.UserPreferences.FontSize;
set
{
if (this.ExportParameters.UserPreferences.FontSize != value)
{
if (Application.Current?.MainWindow is not null)
{
Application.Current.MainWindow.FontSize = value;
}

this.ExportParameters.UserPreferences.FontSize = value;
this.OnPropertyChanged(nameof(this.FontSize));
}
}
}

private void CreateAcknowledgements()
{
this.Acknowledgements = [
Expand Down
9 changes: 9 additions & 0 deletions CPAP-Exporter.UI/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions CPAP-Exporter.UI/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -375,4 +375,7 @@
<data name="SectionSubtitle_Acknowledgements" xml:space="preserve">
<value>Open source projects CPAP-Exporter relies on</value>
</data>
<data name="Settings_FontSize" xml:space="preserve">
<value>Adjust the text size to what feels most comfortable for you. This setting affects how large the words appear throughout the app, and your preference will be remembered each time you return.</value>
</data>
</root>
6 changes: 4 additions & 2 deletions CPAP-Exporter.UI/ViewModels/NavigationViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,10 @@ public void ShowSettings()
{
if (this.CurrentView is not SettingsView settingsView)
{
//var viewModel = new SettingsViewModel(this.ExportParameters.UserPreferences);
settingsView = new SettingsView() /*{ DataContext = viewModel }*/;
settingsView = new SettingsView();
var viewModel = (SettingsViewModel)settingsView.DataContext;

viewModel.ExportParameters = this.ExportParameters;
}

this.CurrentView = settingsView;
Expand Down
Loading