Skip to content

Update main menu and add settings panel #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
christopher-rtf wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Update main menu and add settings panel #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2c7ebd
Update main menu and scaffold settings panel
christopher-rtf Mar 20, 2021
25d8223
Update menu item
christopher-rtf Mar 26, 2021
c71a0b0
Merge branch 'master' into christopher/feature-menuupdate
christopher-rtf Mar 26, 2021
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
1 change: 1 addition & 0 deletions Morphic.Client/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ private void ConfigureServices(IServiceCollection services)
services.AddTransient<CopyStartPanel>();
services.AddTransient<ApplyPanel>();
services.AddTransient<RestoreWindow>();
services.AddTransient<SettingsWindow>();
services.AddSingleton<Backups>();
services.AddTransient<BarData>();
services.AddSingleton<BarPresets>(s => BarPresets.Default);
Expand Down
145 changes: 145 additions & 0 deletions Morphic.Client/Dialogs/SettingsWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<Window x:Class="Morphic.Client.Dialogs.SettingsWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Morphic.Client.Dialogs"
mc:Ignorable="d"
Title="Morphic Settings" Height="640" Width="500"
ResizeMode="NoResize"
Icon="/Icon.png"
WindowStartupLocation="CenterScreen">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<Grid>
<!-- Define setting sections -->
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <!-- Account section -->
<RowDefinition Height="Auto"/> <!-- MorphicBar Settings section -->
<RowDefinition Height="Auto"/> <!-- Preferences section -->
<RowDefinition/> <!-- filler for any remaining space-->
</Grid.RowDefinitions>

<!-- Define two columns -->
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/> <!-- icon for each section -->
<ColumnDefinition/> <!-- each settings section -->
</Grid.ColumnDefinitions>

<!-- Account section -->
<Label Grid.Row="0" Grid.Column="0">ACCOUNT</Label>
<Grid Grid.Row="0" Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>

<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>

<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Vertical">
<Label>You are not signed into Morphic</Label>
<Label>You can get your MorphicBar and preferences on this computer if you sign into your Morphic account on this computer.</Label>
</StackPanel>

<Button Grid.Row="1" Grid.Column="0">Sign into Morphic</Button>

<StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Vertical">
<Label>Don't have a Morphic account?</Label>
<Label>- If you have a Morphic Group invitation, click the button in your invitation email to set up your account. (Learn more about Morphic Group invitations.)</Label>
<Label>- You can also create your own Morphic account here.</Label>
</StackPanel>
</Grid>

<!-- MorphicBar Settings section -->
<Label Grid.Row="1" Grid.Column="0">MORPHICBAR</Label>
<Grid Grid.Row="1" Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>

<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>

<Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">Your MorphicBar Settings</Label>

<Label Grid.Row="1" Grid.Column="0">MorphicBar Size</Label>
<ComboBox Grid.Row="1" Grid.Column="1">
<ComboBoxItem>100%</ComboBoxItem>
</ComboBox>

<Label Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">Morphic Start-up</Label>
<ComboBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2">
<ComboBoxItem>Show MorphicBar at start-up if shown at shutdown</ComboBoxItem>
</ComboBox>

<StackPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Vertical">
<Label>What size should the tooltips be?</Label>
<Label>Tooltips are the text that shows up when you point to a button.</Label>
</StackPanel>
<RadioButton Grid.Row="5" Grid.Column="0" GroupName="TooltipSize">Large</RadioButton>
<RadioButton Grid.Row="5" Grid.Column="1" GroupName="TooltipSize">Small</RadioButton>

<StackPanel Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Vertical">
<Label>Do you want the MorphicBar to be docked? (Windows Only)</Label>
<Label>When docked, other windows cannot appear on top of or under the MorphicBar.</Label>
</StackPanel>
<RadioButton Grid.Row="7" Grid.Column="0" GroupName="Docking">Docked</RadioButton>
<RadioButton Grid.Row="7" Grid.Column="1" GroupName="Docking">Not Docked</RadioButton>
</Grid>

<!-- Preferences section -->
<Label Grid.Row="2" Grid.Column="0">PREFERENCES</Label>
<Grid Grid.Row="2" Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>

<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>

<Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">Transfer Accessibility &amp; Usability Preference Settings to or from this computer</Label>

<Button Grid.Row="1" Grid.Column="0">Apply a saved preference set to this computer</Button>
<Label Grid.Row="1" Grid.Column="1">Clicking this button will get your saved preference settings from your secure Morphic account and apply or re-apply them to this computer.</Label>

<Button Grid.Row="2" Grid.Column="0">Back up preference settings from this computer</Button>
<Label Grid.Row="2" Grid.Column="1">Saves your assistive technology and accessibility and usability settings to your secure Morphic account. You can then later apply them to this or another computer that has Morphic on it.</Label>

<StackPanel Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Vertical">
<Label>Do you want backup reminders?</Label>
<Label>If automatic backups are turned off, Morphic can look for settings changes and remind you when you might need to back up your settings. Morphic will only remind you once per week if settings have changed.</Label>
</StackPanel>

<RadioButton Grid.Row="4" Grid.Column="0" GroupName="Reminders">Remind me weekly</RadioButton>
<RadioButton Grid.Row="4" Grid.Column="1" GroupName="Reminders">No reminders</RadioButton>

<StackPanel Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Vertical">
<Label>Clear settings on this computer</Label>
<Label>Do you want to get your computer back to the standard comptuer settings? If you click the button below, Morphic will reset all Morphic-compatible settings to the manufacturer's standard values.</Label>
</StackPanel>

<Button Grid.Row="6" Grid.Column="0">Reset this computer to standard settings</Button>
</Grid>
</Grid>
</ScrollViewer>
</Window>
48 changes: 48 additions & 0 deletions Morphic.Client/Dialogs/SettingsWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Copyright 2021 Raising the Floor - International
//
// Licensed under the New BSD license. You may not use this file except in
// compliance with this License.
//
// You may obtain a copy of the License at
// https://github.com/GPII/universal/blob/master/LICENSE.txt
//
// The R&D leading to these results received funding from the:
// * Rehabilitation Services Administration, US Dept. of Education under
// grant H421A150006 (APCP)
// * National Institute on Disability, Independent Living, and
// Rehabilitation Research (NIDILRR)
// * Administration for Independent Living & Dept. of Education under grants
// H133E080022 (RERC-IT) and H133E130028/90RE5003-01-00 (UIITA-RERC)
// * European Union's Seventh Framework Programme (FP7/2007-2013) grant
// agreement nos. 289016 (Cloud4all) and 610510 (Prosperity4All)
// * William and Flora Hewlett Foundation
// * Ontario Ministry of Research and Innovation
// * Canadian Foundation for Innovation
// * Adobe Foundation
// * Consumer Electronics Association Foundation

using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;

namespace Morphic.Client.Dialogs
{
/// <summary>
/// Interaction logic for SettingsWindow.xaml
/// </summary>
public partial class SettingsWindow : Window
{
public SettingsWindow()
{
InitializeComponent();
}
}
}
5 changes: 3 additions & 2 deletions Morphic.Client/Menu/MorphicMenu.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@
<Separator/>

<!--<menu:MorphicMenuItem Header="_Hide QuickHelp (except with Alt key)" IsCheckable="True" IsChecked="{Binding App.AppOptions.HideQuickHelp}" />-->
<menu:MorphicMenuItem Header="_Automatically start Morphic" x:Name="AutorunAfterLoginItem" Click="AutorunAfterLoginClicked" IsCheckable="True" IsChecked="{Binding App.AppOptions.AutoRun}" />
<menu:MorphicMenuItem Header="_Show Morphic Bar at start" x:Name="ShowMorphicBarAfterLoginItem" Click="ShowMorphicBarAfterLoginClicked" IsCheckable="True" IsChecked="{Binding App.AppOptions.AutoShow}" />
<menu:MorphicMenuItem Header="_Automatically start Morphic" x:Name="AutorunAfterLoginItem" Click="AutorunAfterLoginClicked" IsCheckable="True" IsChecked="{Binding App.AppOptions.AutoRun}" Visibility="Collapsed" />
<menu:MorphicMenuItem Header="_Show Morphic Bar at start" x:Name="ShowMorphicBarAfterLoginItem" Click="ShowMorphicBarAfterLoginClicked" IsCheckable="True" IsChecked="{Binding App.AppOptions.AutoShow}" Visibility="Collapsed" />
<menu:MorphicMenuItem Header="Morphic Settings..." x:Name="MorphicSettingsItem" Click="SettingsItemClicked" />
<menu:MorphicMenuItem Header="_About Morphic..." Click="AboutMorphicClicked" Dialog="dialogs:AboutWindow" />
<menu:MorphicMenuItem Header="_Quit Morphic" Click="QuitClick"/>
</ContextMenu>
9 changes: 9 additions & 0 deletions Morphic.Client/Menu/MorphicMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,15 @@ private async void StopKeyRepeatToggle(object sender, RoutedEventArgs e)
}
}

#region Settings
private async void SettingsItemClicked(object sender, RoutedEventArgs e)
{
var args = new Dictionary<string, object?>();
await App.Current.Dialogs.OpenDialogAsync<SettingsWindow>(args);
}

#endregion

#region TrayIcon

private MorphicHybridTrayIcon? _trayIcon = null;
Expand Down