ux: remove workspace switcher popup and its hotkey binding (#1855)

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Resources/Locales/en_US.axaml

@@ -467,7 +467,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Go to previous tab</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Create new tab</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Open Preferences dialog</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">Switch active workspace</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Switch active tab</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORY</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Commit staged changes</x:String>

src/ViewModels/Launcher.cs

@@ -127,11 +127,6 @@ public void Quit()
             _ignoreIndexChange = false;
         }
 
-        public void OpenWorkspaceSwitcher()
-        {
-            Switcher = new WorkspaceSwitcher(this);
-        }
-
         public void OpenTabSwitcher()
         {
             Switcher = new LauncherPageSwitcher(this);

src/ViewModels/WorkspaceSwitcher.cs

@@ -45,7 +45,7 @@
                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
                    Margin="0,0,0,8"/>
 
-        <Grid RowDefinitions="20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
+        <Grid RowDefinitions="20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+\,, macOS=⌘+\,}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenPreferences}"/>
 
@@ -67,9 +67,6 @@
           <TextBlock Grid.Row="6" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Q, macOS=⌘+Q}"/>
           <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Quit}" />
 
-          <TextBlock Grid.Row="7" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+⇧+P}"/>
-          <TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchWorkspace}" />
-
           <TextBlock Grid.Row="8" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+P, macOS=⌘+P}"/>
           <TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchTab}" />
         </Grid>

src/Views/Hotkeys.axaml

@@ -118,7 +118,7 @@
       </ContentControl.DataTemplates>
     </ContentControl>
 
-    <!-- Workspace/Pages Switcher -->
+    <!-- Pages Switcher -->
     <Border Grid.Row="0" Grid.RowSpan="2"
             Background="Transparent"
             IsVisible="{Binding Switcher, Converter={x:Static ObjectConverters.IsNotNull}}"
@@ -127,10 +127,6 @@
         <Border Background="{DynamicResource Brush.Popup}" CornerRadius="8">
           <ContentControl Margin="16,10,16,12" Content="{Binding Switcher}">
             <ContentControl.DataTemplates>
-              <DataTemplate DataType="vm:WorkspaceSwitcher">
-                <v:WorkspaceSwitcher/>
-              </DataTemplate>
-
               <DataTemplate DataType="vm:LauncherPageSwitcher">
                 <v:LauncherPageSwitcher/>
               </DataTemplate>

src/Views/Launcher.axaml

@@ -174,13 +174,6 @@ protected override async void OnKeyDown(KeyEventArgs e)
 
             if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
             {
-                if (e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.P)
-                {
-                    vm.OpenWorkspaceSwitcher();
-                    e.Handled = true;
-                    return;
-                }
-
                 if (e.Key == Key.P)
                 {
                     vm.OpenTabSwitcher();
@@ -329,7 +322,6 @@ private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
 
                 var workspaces = new MenuItem();
                 workspaces.Header = groupHeader;
-                workspaces.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+P" : "Ctrl+Shift+P";
                 workspaces.IsEnabled = false;
                 menu.Items.Add(workspaces);