Push

Author: noraa-junker

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Helpers/TaskListPositions.cs

@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+namespace ShortcutGuide.Helpers
+{
+    internal sealed class TaskListPositions
+    {
+        public static List<RECT> GetTaskbarIconPositions()
+        {
+            throw new NotImplementedException();
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+        }
+    }
+}

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Models/Shortcut.cs

@@ -5,6 +5,8 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Markup;
+using Windows.Security.Cryptography.Certificates;
+using YamlDotNet.Core.Tokens;
 
 namespace ShortcutGuide.Models
 {
@@ -26,6 +28,11 @@ public static implicit operator ShortcutTemplateDataObject(Shortcut shortcut)
 
             shortcutStackPanel.Orientation = Orientation.Horizontal;
 
+            if (shortcut.Ctrl == false && shortcut.Alt == false && shortcut.Shift == false && shortcut.Win == false && shortcut.Keys.Length == 0)
+            {
+                return new ShortcutTemplateDataObject(shortcut.Name, shortcut.Description ?? string.Empty, shortcutStackPanel);
+            }
+
             void AddNewTextToStackPanel(string text)
             {
                 shortcutStackPanel.Children.Add(new TextBlock { Text = text, Margin = new Thickness(3), VerticalAlignment = VerticalAlignment.Center });
@@ -69,6 +76,21 @@ void AddNewTextToStackPanel(string text)
                     case "<Office>":
                         shortcutStackPanel.Children.Add(new BitmapIcon() { UriSource = new("ms-appx:///Assets/ShortcutGuide/OfficeKey.png"), Height = 20, Width = 20 });
                         break;
+                    case "<Left>":
+                        AddNewTextToStackPanel("←");
+                        break;
+                    case "<Right>":
+                        AddNewTextToStackPanel("→");
+                        break;
+                    case "<Up>":
+                        AddNewTextToStackPanel("↑");
+                        break;
+                    case "<Down>":
+                        AddNewTextToStackPanel("↓");
+                        break;
+                    case string name when name.StartsWith('<'):
+                        AddNewTextToStackPanel(key.Replace("<", string.Empty).Replace(">", string.Empty));
+                        break;
                     default:
                         AddNewTextToStackPanel(key);
                         break;

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Models/ShortcutPageParameters.cs

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace ShortcutGuide.Models
+{
+    internal struct ShortcutPageParameters
+    {
+        public static SeachFilterObservable SearchFilter = new();
+    }
+
+    internal sealed class SeachFilterObservable
+    {
+        public event EventHandler<string>? FilterChanged;
+
+        public void OnFilterChanged(string filter)
+        {
+            FilterChanged?.Invoke(this, filter);
+        }
+    }
+}

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/NativeMethods.cs

@@ -22,6 +22,12 @@ internal static class NativeMethods
     [DllImport("user32.dll")]
     internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
 
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    internal static extern int FindWindowA(in string lpClassName, in string? lpWindowName);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    internal static extern int FindWindowExA(int hwndParent, int hwndChildAfter, in string lpClassName, in string? lpWindowName);
+
     internal const int GWL_STYLE = -16;
     internal const int WS_CAPTION = 0x00C00000;
 }

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/ShortcutGuideXAML/MainWindow.xaml

@@ -33,7 +33,7 @@
                 </SelectorBarItem.Icon>
             </SelectorBarItem>
         </SelectorBar>
-        <TextBox Grid.Column="1" Grid.Row="0" Height="32" Width="300" HorizontalAlignment="Right" VerticalContentAlignment="Center" HorizontalContentAlignment="Right"></TextBox>
+        <TextBox Grid.Column="1" Grid.Row="0" Height="32" Width="300" HorizontalAlignment="Right" VerticalContentAlignment="Center" x:Name="SearchBox" HorizontalContentAlignment="Right" TextChanged="SearchBox_TextChanged"></TextBox>
         <Button Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Center">
             <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE713;" />
         </Button>

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/ShortcutGuideXAML/MainWindow.xaml.cs

@@ -6,19 +6,14 @@
 using System.Globalization;
 using System.Runtime.InteropServices;
 using Microsoft.UI;
-using Microsoft.UI.Input;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using ShortcutGuide.Models;
 using ShortcutGuide.Properties;
-using Windows.ApplicationModel.Chat;
-using Windows.Devices.Display;
 using Windows.Foundation;
 using Windows.Graphics;
-using Windows.System.UserProfile;
 using WinUIEx;
-
 using static NativeMethods;
 
 namespace ShortcutGuide
@@ -33,6 +28,7 @@ public sealed partial class MainWindow : WindowEx
         public MainWindow()
         {
             InitializeComponent();
+
             Title = Resource.ResourceManager.GetString("Title", CultureInfo.InvariantCulture)!;
 
             var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
@@ -109,5 +105,10 @@ public void CloseButton_Clicked(object sender, RoutedEventArgs e)
         {
             Environment.Exit(0);
         }
+
+        private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            ShortcutPageParameters.SearchFilter.OnFilterChanged(SearchBox.Text);
+        }
     }
 }

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/ShortcutGuideXAML/ShortcutView.xaml

@@ -20,7 +20,7 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Padding="6,0,6,0" Margin="6,6,6,6" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Text="{x:Bind Name}" />
+                <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Padding="6,0,6,0" Margin="6,0,6,0" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="0" Text="{x:Bind Name}" />
                 <Border CornerRadius="{StaticResource ControlCornerRadius}" BorderThickness="{StaticResource ButtonBorderThemeThickness}" Grid.Row="0" Grid.Column="1" Margin="20,6,6,6" HorizontalAlignment="Right" Background="White" >
                     <ContentPresenter Content="{x:Bind Shortcut}" Padding="6,6,6,6" HorizontalAlignment="Right" />
                 </Border>
@@ -39,7 +39,7 @@
             <GridView.ItemsPanel>
                 <ItemsPanelTemplate>
                     <ItemsWrapGrid x:Name="MaxItemsWrapGrid"
-                           Orientation="Horizontal"/>
+                           Orientation="Vertical"/>
                 </ItemsPanelTemplate>
             </GridView.ItemsPanel>
         </GridView>

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/ShortcutGuideXAML/ShortcutView.xaml.cs

@@ -2,9 +2,13 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Globalization;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
 using ShortcutGuide.Models;
+using Windows.ApplicationModel.ConversationalAgent;
+using Windows.Storage;
 
 namespace ShortcutGuide
 {
@@ -22,7 +26,18 @@ public ShortcutView()
             int i = 0;
             foreach (var category in shortcutList.Shortcuts)
             {
-                CategorySelector.Items.Add(new SelectorBarItem() { Text = category.SectionName, Name = i.ToString(CultureInfo.InvariantCulture) });
+                switch (category.SectionName)
+                {
+                    case string name when name.StartsWith("<TASKBAR1-9>", System.StringComparison.Ordinal):
+                        // Todo: Implement GetTaskbarIconPositions
+                        break;
+                    case string name when name.StartsWith('<'):
+                        break;
+                    default:
+                        CategorySelector.Items.Add(new SelectorBarItem() { Text = category.SectionName, Name = i.ToString(CultureInfo.InvariantCulture) });
+                        break;
+                }
+
                 i++;
             }
 
@@ -33,6 +48,30 @@ public ShortcutView()
             {
                 ShortcutListElement.Items.Add((ShortcutTemplateDataObject)shortcut);
             }
+
+            ShortcutPageParameters.SearchFilter.FilterChanged += SearchFilter_FilterChanged;
+        }
+
+        private void SearchFilter_FilterChanged(object? sender, string e)
+        {
+            FilterBy(e);
+        }
+
+        public void FilterBy(string filter)
+        {
+            ShortcutListElement.Items.Clear();
+            foreach (var shortcut in shortcutList.Shortcuts[int.Parse(CategorySelector.SelectedItem.Name, CultureInfo.InvariantCulture)].Properties)
+            {
+                if (shortcut.Name.Contains(filter, System.StringComparison.OrdinalIgnoreCase))
+                {
+                    ShortcutListElement.Items.Add((ShortcutTemplateDataObject)shortcut);
+                }
+            }
+
+            if (ShortcutListElement.Items.Count == 0)
+            {
+                ShortcutListElement.Items.Add(new ShortcutTemplateDataObject("No search results found", string.Empty, new StackPanel() { Visibility = Microsoft.UI.Xaml.Visibility.Collapsed }));
+            }
         }
 
         public void CategorySelector_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs e)