Add option to hide settings panel

esamarathon · Feb 16, 2019 · a1ace0f · a1ace0f
1 parent 38db081
commit a1ace0f
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 4 deletions.
diff --git a/FlagCarrierWin/App.config b/FlagCarrierWin/App.config
@@ -23,10 +23,13 @@
                 <value>https://oromit.de/hosts.php</value>
             </setting>
             <setting name="privateKey" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="publicKey" serializeAs="String">
-                <value/>
+                <value />
+            </setting>
+            <setting name="hideSettings" serializeAs="String">
+                <value>False</value>
             </setting>
         </FlagCarrierWin.Properties.Settings>
     </userSettings>

diff --git a/FlagCarrierWin/Controls/MainWindow.xaml.cs b/FlagCarrierWin/Controls/MainWindow.xaml.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Windows;
+using System.Windows.Input;
 
 using FlagCarrierBase;
 using NdefLibrary.Ndef;
@@ -20,6 +21,10 @@ public MainWindow()
 		{
 			InitializeComponent();
 
+			RoutedCommand jumpToSettings = new RoutedCommand();
+			jumpToSettings.InputGestures.Add(new KeyGesture(Key.O, ModifierKeys.Control | ModifierKeys.Shift));
+			CommandBindings.Add(new CommandBinding(jumpToSettings, JumpToSettings));
+
 			nfcHandler = new NfcHandler();
 			nfcHandler.CardAdded += NfcHandler_CardAdded;
 			nfcHandler.StatusMessage += StatusMessage;
@@ -33,6 +38,21 @@ public MainWindow()
 
 			settingsControl.WriteToTagRequest += SettingsControl_WriteToTagRequest;
 			settingsControl.UpdatedSettings += loginControl.SettingsChanged;
+			settingsControl.UpdatedSettings += UpdatedSettings;
+
+			UpdatedSettings();
+		}
+
+		private void JumpToSettings(object sender, ExecutedRoutedEventArgs e)
+		{
+			mainTabControl.SelectedItem = settingsTab;
+		}
+
+		private void UpdatedSettings()
+		{
+			settingsTab.Visibility = Properties.Settings.Default.hideSettings
+				? Visibility.Hidden
+				: Visibility.Visible;
 		}
 
 		private void Window_Loaded(object sender, RoutedEventArgs e)

diff --git a/FlagCarrierWin/Controls/SettingsControl.xaml b/FlagCarrierWin/Controls/SettingsControl.xaml
@@ -33,6 +33,7 @@
 			<TextBlock Margin="0,2,0,5">Private Key</TextBlock>
 			<TextBox Name="privKeyBox" TextChanged="TextChanged" />
 			<Button Margin="0,5,0,5" Click="GeneratePair_Click">Generate Keypair</Button>
+			<CheckBox Name="hideSettingsCheckBox" Margin="0,5,0,5" Click="HideSettings_Click">Hide Settings</CheckBox>
 		</StackPanel>
 		<Button Name="applyButton" IsEnabled="False" Margin="2" Grid.Row="2" Grid.Column="0" Click="ApplyButton_Click">Apply</Button>
 		<Button Margin="2" Grid.Row="2" Grid.Column="1" Click="WriteToTagButton_Click">Write to tag</Button>

diff --git a/FlagCarrierWin/Controls/SettingsControl.xaml.cs b/FlagCarrierWin/Controls/SettingsControl.xaml.cs
@@ -36,6 +36,11 @@ private void TextChanged(object sender, TextChangedEventArgs e)
 			applyButton.IsEnabled = true;
 		}
 
+		private void HideSettings_Click(object sender, RoutedEventArgs e)
+		{
+			applyButton.IsEnabled = true;
+		}
+
 		private void ApplyButton_Click(object sender, RoutedEventArgs args)
 		{
 			Properties.Settings.Default.deviceID = deviceIdBox.Text;
@@ -44,6 +49,7 @@ private void ApplyButton_Click(object sender, RoutedEventArgs args)
 			Properties.Settings.Default.targetUrl = targetUrlBox.Text;
 			Properties.Settings.Default.publicKey = pubKeyBox.Text;
 			Properties.Settings.Default.privateKey = privKeyBox.Text;
+			Properties.Settings.Default.hideSettings = (bool)hideSettingsCheckBox.IsChecked;
 			Properties.Settings.Default.Save();
 			applyButton.IsEnabled = false;
 			ApplyKeyPair();
@@ -78,6 +84,7 @@ private void ResetSettings()
 			targetUrlBox.Text = Properties.Settings.Default.targetUrl;
 			pubKeyBox.Text = Properties.Settings.Default.publicKey;
 			privKeyBox.Text = Properties.Settings.Default.privateKey;
+			hideSettingsCheckBox.IsChecked = Properties.Settings.Default.hideSettings;
 			applyButton.IsEnabled = false;
 		}
 
@@ -102,7 +109,8 @@ private void ApplyKeyPair()
 					privKey = null;
 
 				FlagCarrierBase.NdefHandler.SetKeys(pubKey, privKey);
-			} catch(FormatException)
+			}
+			catch (FormatException)
 			{
 				MessageBox.Show("Invalid base64 in keypair!", "Error");
 				return;

diff --git a/FlagCarrierWin/Properties/Settings.Designer.cs b/FlagCarrierWin/Properties/Settings.Designer.cs
diff --git a/FlagCarrierWin/Properties/Settings.settings b/FlagCarrierWin/Properties/Settings.settings
@@ -20,5 +20,8 @@
     <Setting Name="publicKey" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="hideSettings" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>