Changed ComboBox size. Added edit button and about.

Added edit button to command bar, but removed functionality for the time being. Added an about button in nav and removed settings button.
ethanmsmith · Apr 11, 2018 · 23b70c7 · 23b70c7
1 parent c0fc873
commit 23b70c7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/AnneProKeyboard/MainPage.xaml b/AnneProKeyboard/MainPage.xaml
@@ -13,7 +13,7 @@
         x:Name="AnneNav"
         IsPaneOpen="false"
         ExpandedModeThresholdWidth="1920"
-        IsSettingsVisible="{Binding ElementName=settingsCheck,Path=IsChecked}" 
+        IsSettingsVisible="False"
         IsTabStop="false"
         Background="#FF1f1f1f"
         Header="Layout">
@@ -29,11 +29,12 @@
                             HorizontalAlignment="Right"
                             VerticalAlignment="Top"
                             Background="Transparent"
-                            OverflowButtonVisibility="Collapsed">
+                            OverflowButtonVisibility="Collapsed" Margin="0,0,15,0" FontSize="11">
                         <AppBarButton Icon="Add" Click="ProfileAddButton_Click"/>
                         <AppBarSeparator/>
-                        <AppBarButton Icon="Delete" Click="ProfileDeleteButton_Click"/>
-                    </CommandBar>
+                    <AppBarButton Icon="Edit" Click="ProfileEditButton_Click"/>
+                    <AppBarButton Icon="Delete" Click="ProfileDeleteButton_Click"/>
+                </CommandBar>
             </DataTemplate>
         </NavigationView.HeaderTemplate>
         <Frame x:Name="ContentFrame">
@@ -46,8 +47,8 @@
                 <Grid.Resources>
                     <converters:BooleanToVisibilityConverter x:Key="Bool2VisibilityConverter" />
                 </Grid.Resources>
-                    <ComboBox x:Name="ProfilesCombo" Height="44" Width="296" Grid.Row="0"
-                    ItemsSource="{x:Bind KeyboardProfiles}" HorizontalAlignment="Right" Margin="0,-46,185,0" SelectionChanged="ProfilesCombo_SelectionChanged"  Loaded="ProfilesCombo_Loaded">
+                    <ComboBox x:Name="ProfilesCombo" Height="35" Width="270" Grid.Row="0"
+                    ItemsSource="{x:Bind KeyboardProfiles}" HorizontalAlignment="Right" Margin="0,-41,262,0" SelectionChanged="ProfilesCombo_SelectionChanged"  Loaded="ProfilesCombo_Loaded">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal" Grid.Row="3">

diff --git a/AnneProKeyboard/MainPage.xaml.cs b/AnneProKeyboard/MainPage.xaml.cs
@@ -99,18 +99,18 @@ private void ProfileAddButton_Click(object sender, RoutedEventArgs e)
 
         private void ProfileEditButton_Click(object sender, RoutedEventArgs e)
         {
-            Button button = (Button)sender;
-            FrameworkElement parent = (FrameworkElement)button.Parent;
-            TextBox textbox = (TextBox)parent.FindName("ProfileNameTextbox");
-            textbox.IsEnabled = true;
-            textbox.Visibility = Visibility.Visible;
-            FocusState focus_state = FocusState.Keyboard;
-            textbox.Focus(focus_state);
-
-            TextBlock textblock = (TextBlock)parent.FindName("ProfileNameTextblock");
-            textblock.Visibility = Visibility.Collapsed;
-
-            this.RenamingProfile = this._keyboardProfiles[(int)button.Tag];
+            //Button button = (Button)sender;
+            //FrameworkElement parent = (FrameworkElement)button.Parent;
+            //TextBox textbox = (TextBox)parent.FindName("ProfileNameTextbox");
+            //textbox.IsEnabled = true;
+            //textbox.Visibility = Visibility.Visible;
+            //FocusState focus_state = FocusState.Keyboard;
+            //textbox.Focus(focus_state);
+
+            //TextBlock textblock = (TextBlock)parent.FindName("ProfileNameTextblock");
+            //textblock.Visibility = Visibility.Collapsed;
+
+            //this.RenamingProfile = this._keyboardProfiles[(int)button.Tag];
             SaveProfiles();
         }
 
@@ -610,6 +610,10 @@ private void AnneNav_SelectionChanged(NavigationView sender, NavigationViewSelec
                     case "lighting":
                         _frame.Content = lightingPage;
                         break;
+
+                    case "about":
+                        _frame.Content = aboutPage;
+                        break;
                 }
             }
         }
@@ -636,6 +640,11 @@ private void AnneNav_ItemInvoked(NavigationView sender, NavigationViewItemInvoke
                         sender.Header = "Lighting";
                         _frame.Content = lightingPage;
                         break;
+
+                    case "About":
+                        sender.Header = "About";
+                        _frame.Content = aboutPage;
+                        break;
                 }
             }
         }