Hook up some ribbon commands

lukeb · lukeb · commit 186dd9ffac90 · 2019-04-14T22:22:19.000-04:00
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
@@ -10,6 +10,7 @@
 using Files.Navigation;
 using Files.Interacts;
 using System.Diagnostics;
+using Windows.UI.Core;
 
 namespace Files
 {
@@ -60,6 +61,10 @@ public GenericFileBrowser()
             //PathBarTip.IsOpen = true;
         }
 
+        private void SelectAllAcceleratorDG_Invoked(Windows.UI.Xaml.Input.KeyboardAccelerator sender, Windows.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
+        {
+        }
+
         private void AddItem_Click(object sender, RoutedEventArgs e)
         {
             //await AddDialog.ShowAsync();
@@ -259,6 +264,7 @@ private void AllView_DragLeave(object sender, DragEventArgs e)
         {
             
         }
+
     }
 
     public class EmptyFolderTextState : INotifyPropertyChanged
diff --git a/Files UWP/Interacts/Interaction.cs b/Files UWP/Interacts/Interaction.cs
@@ -447,7 +447,7 @@ private async static void Manager_DataRequested(DataTransferManager sender, Data
             List<IStorageItem> items = new List<IStorageItem>();
             if(page.Name == "GenericItemView")
             {
-                foreach (ListedItem li in dataGrid.SelectedItems)
+                foreach (ListedItem li in GenericFileBrowser.data.SelectedItems)
                 {
                     if (li.FileType == "Folder")
                     {
@@ -863,5 +863,23 @@ public static async void CloneDirectoryAsync(string SourcePath, string Destinati
                 }
             } 
         }
+
+        public static void SelectAllItems()
+        {
+            if(page.Name == "GenericItemView")
+            {
+                foreach(ListedItem li in GenericFileBrowser.data.ItemsSource)
+                {
+                    if (!GenericFileBrowser.data.SelectedItems.Contains(li))
+                    {
+                        GenericFileBrowser.data.SelectedItems.Add(li);
+                    }
+                }
+            }
+            else if(page.Name == "PhotoAlbumViewer")
+            {
+                PhotoAlbum.gv.SelectAll();
+            }
+        }
     }
 }
diff --git a/Files UWP/PhotoAlbum.xaml b/Files UWP/PhotoAlbum.xaml
@@ -397,7 +397,7 @@
         </Grid.ContextFlyout>
         <TextBlock Name="EmptyText" Visibility="{x:Bind local:App.ViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0" Grid.Row="3" Canvas.ZIndex="0"/>
 
-        <controls:AdaptiveGridView animations:ReorderGridAnimation.Duration="300" ShowsScrollingPlaceholders="True" Margin="24,24,24,0" Grid.Row="3" SelectionMode="Single" IsDoubleTapEnabled="True" IsRightTapEnabled="True" ItemsSource="{x:Bind local:App.ViewModel.FilesAndFolders}" Name="FileList" Padding="0, 0, 0, 0" >
+        <controls:AdaptiveGridView animations:ReorderGridAnimation.Duration="300" ShowsScrollingPlaceholders="True" Margin="24,24,24,0" Grid.Row="3" SelectionMode="Extended" IsDoubleTapEnabled="True" IsRightTapEnabled="True" ItemsSource="{x:Bind local:App.ViewModel.FilesAndFolders}" Name="FileList" Padding="0, 0, 0, 0" >
             <controls:AdaptiveGridView.Resources>
                 <MenuFlyout x:Name="RightClickContextMenu" x:Key="RightClickFlyout">
                     <MenuFlyout.Items>
diff --git a/Files UWP/ProHome.xaml b/Files UWP/ProHome.xaml
@@ -3,6 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Files"
     xmlns:local1="using:Files.Interacts.Home"
+    xmlns:local2="using:Files.Interacts"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:Custom="using:Microsoft.Toolkit.Uwp.UI.Controls"
@@ -884,7 +885,7 @@
                                 <CommandBar.Content>
                                     <CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
                                         <AppBarButton Label="Open new window" Icon="NewWindow"/>
-                                        <AppBarButton Label="Settings" Icon="Setting"/>
+                                        <AppBarButton Name="SettingsButton" Click="SettingsButton_Click" Label="Settings" Icon="Setting"/>
                                     </CommandBar>
                                 </CommandBar.Content>
                             </CommandBar>
@@ -893,25 +894,25 @@
                             <CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
                                 <CommandBar.Content>
                                     <CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
-                                        <AppBarButton IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Cut" Icon="Cut"/>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Copy" Icon="Copy"/>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Paste" Icon="Paste"/>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.AlwaysPresentCommands.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Copy Path">
+                                        <AppBarButton Click="CutButton_Click" Name="CutButton" IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Cut" Icon="Cut"/>
+                                        <AppBarButton Click="CopyButton_Click" Name="CopyButton" IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Copy" Icon="Copy"/>
+                                        <AppBarButton Click="PasteButton_Click" Name="PasteButton" IsEnabled="{x:Bind local2:Interaction.PS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Paste" Icon="Paste"/>
+                                        <AppBarButton Click="CopyPathButton_Click" Name="CopyPathButton" IsEnabled="{x:Bind local:App.AlwaysPresentCommands.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Copy Path">
                                             <AppBarButton.Icon>
                                                 <FontIcon Glyph="&#xF271;" FontFamily="Segoe MDL2 Assets"/>
                                             </AppBarButton.Icon>
                                         </AppBarButton>
                                         <AppBarSeparator/>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Delete" Icon="Delete"/>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Rename" Icon="Rename"/>
-                                        <AppBarButton Name="AddItem" IsEnabled="{x:Bind local:App.AlwaysPresentCommands.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Add Item" Icon="Add"/>
+                                        <AppBarButton Click="DeleteButton_Click" Name="DeleteButton" IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Delete" Icon="Delete"/>
+                                        <AppBarButton Click="RenameButton_Click" Name="RenameButton" IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Rename" Icon="Rename"/>
+                                        <AppBarButton Click="AddItem_Click" Name="AddItem" IsEnabled="{x:Bind local:App.AlwaysPresentCommands.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Add Item" Icon="Add"/>
                                         <AppBarSeparator/>
                                         <AppBarButton IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Properties">
                                             <AppBarButton.Icon>
                                                 <FontIcon Glyph="&#xE946;"/>
                                             </AppBarButton.Icon>
                                         </AppBarButton>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Open With" Icon="OpenWith"/>
+                                        <AppBarButton Click="OpenWithButton_Click" Name="OpenWithButton" IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Open With" Icon="OpenWith"/>
                                     </CommandBar>
                                 </CommandBar.Content>
                             </CommandBar>
@@ -920,7 +921,7 @@
                             <CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
                                 <CommandBar.Content>
                                     <CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
-                                        <AppBarButton IsEnabled="{x:Bind local:App.ShareItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Share" Icon="Share"/>
+                                        <AppBarButton Click="ShareButton_Click" Name="ShareButton" IsEnabled="{x:Bind local:App.ShareItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Share" Icon="Share"/>
                                     </CommandBar>
                                 </CommandBar.Content>
                             </CommandBar>
@@ -929,13 +930,18 @@
                             <CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
                                 <CommandBar.Content>
                                     <CommandBar Background="Transparent" OverflowButtonVisibility="Collapsed" DefaultLabelPosition="Right">
-                                        <AppBarButton IsEnabled="{x:Bind local:App.LayoutItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Layout Mode">
+                                        <AppBarButton Click="LayoutButton_Click" Name="LayoutButton" IsEnabled="{x:Bind local:App.LayoutItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Layout Mode">
                                             <AppBarButton.Icon>
                                                 <FontIcon Glyph="&#xF246;" FontFamily="Segoe MDL2 Assets"/>
                                             </AppBarButton.Icon>
                                         </AppBarButton>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.LayoutItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Icon="SelectAll" Label="Select All"/>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.LayoutItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Icon="ClearSelection" Label="Clear All"/>
+                                        <AppBarButton Click="SelectAllButton_Click" Name="SelectAllButton" IsEnabled="{x:Bind local:App.LayoutItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Icon="SelectAll" Label="Select All">
+                                            <AppBarButton.KeyboardAccelerators>
+                                                <KeyboardAccelerator Modifiers="Control" Key="A"/>
+                                            </AppBarButton.KeyboardAccelerators>
+                                        </AppBarButton>
+                                        <AppBarButton Click="ClearAllButton_Click" Name="ClearAllButton" IsEnabled="{x:Bind local:App.LayoutItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Icon="ClearSelection" Label="Clear All"/>
+
                                     </CommandBar>
                                 </CommandBar.Content>
                             </CommandBar>
diff --git a/Files UWP/ProHome.xaml.cs b/Files UWP/ProHome.xaml.cs
@@ -271,9 +271,28 @@ private async void VisiblePath_TextChanged(object sender, KeyRoutedEventArgs e)
                             }
                             else if (StorageFolder.GetFolderFromPathAsync(CurrentInput) != null)
                             {
-                                await StorageFolder.GetFolderFromPathAsync(CurrentInput);
-                                App.ViewModel.TextState.isVisible = Visibility.Collapsed;
-                                ProHome.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), CurrentInput);
+                                try
+                                {
+                                    await StorageFolder.GetFolderFromPathAsync(CurrentInput);
+                                    App.ViewModel.TextState.isVisible = Visibility.Collapsed;
+                                    ProHome.accessibleContentFrame.Navigate(typeof(GenericFileBrowser), CurrentInput);
+                                }
+                                catch (ArgumentException)
+                                {
+                                    MessageDialog dialog = new MessageDialog("The path typed was not correct. Please try again.", "Invalid Path");
+                                    await dialog.ShowAsync();
+                                }
+                                catch (FileNotFoundException)
+                                {
+                                    MessageDialog dialog = new MessageDialog("The path typed was not correct. Please try again.", "Invalid Path");
+                                    await dialog.ShowAsync();
+                                }
+                                catch (System.Exception)
+                                {
+                                    MessageDialog dialog = new MessageDialog("The path typed was not correct. Please try again.", "Invalid Path");
+                                    await dialog.ShowAsync();
+                                }
+
                             }
                             else
                             {
@@ -299,6 +318,11 @@ private async void VisiblePath_TextChanged(object sender, KeyRoutedEventArgs e)
                                     MessageDialog dialog = new MessageDialog("The path typed was not correct. Please try again.", "Invalid Path");
                                     await dialog.ShowAsync();
                                 }
+                                catch (System.Exception)
+                                {
+                                    MessageDialog dialog = new MessageDialog("The path typed was not correct. Please try again.", "Invalid Path");
+                                    await dialog.ShowAsync();
+                                }
                             }
                         }
                         else
@@ -592,5 +616,71 @@ private void DrivesList_SelectionChanged(object sender, SelectionChangedEventArg
                 locationsList.SelectedItem = null;
             }
         }
+
+        private void SettingsButton_Click(object sender, RoutedEventArgs e)
+        {
+            Frame rootFrame = Window.Current.Content as Frame;
+            rootFrame.Navigate(typeof(Settings));
+        }
+
+        private void CutButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.CutItem_Click(null, null);
+        }
+
+        private void CopyButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.CopyItem_ClickAsync(null, null);
+        }
+
+        private void PasteButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.PasteItem_ClickAsync(null, null);
+        }
+
+        private void CopyPathButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.GetPath_Click(null, null);
+        }
+
+        private void DeleteButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.DeleteItem_Click(null, null);
+        }
+
+        private void RenameButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.RenameItem_Click(null, null);
+        }
+
+        private async void AddItem_Click(object sender, RoutedEventArgs e)
+        {
+            await ProHome.AddItemBox.ShowAsync();
+        }
+
+        private void OpenWithButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.OpenItem_Click(null, null);
+        }
+
+        private void ShareButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.ShareItem_Click(null, null);
+        }
+
+        private void LayoutButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void SelectAllButton_Click(object sender, RoutedEventArgs e)
+        {
+            Interaction.SelectAllItems();
+        }
+
+        private void ClearAllButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/Files UWP/Settings.xaml b/Files UWP/Settings.xaml
@@ -15,11 +15,9 @@
     </Page.Resources>
 
     <Grid>
-        <Grid Tag="{x:Bind Tag, Mode=OneWay}" Background="Transparent" Name="DragArea" HorizontalAlignment="Stretch" Height="34" VerticalAlignment="Top"  Margin="0,0,200,0" Canvas.ZIndex="5"/>
-
         <UILib:NavigationView IsSettingsVisible="False" BackRequested="SettingsPane_BackRequested" Name="SettingsPane" IsBackEnabled="True" ItemInvoked="NavigationView_ItemInvoked" PaneTitle="Settings" PaneDisplayMode="Top">
             <UILib:NavigationView.MenuItems>
-                <UILib:NavigationViewItem Content="Personalization"/>
+                <UILib:NavigationViewItem IsSelected="True" Content="Personalization"/>
                 <UILib:NavigationViewItem Content="Preferences"/>
                 <UILib:NavigationViewItem Content="About"/>
             </UILib:NavigationView.MenuItems>
diff --git a/Files UWP/Settings.xaml.cs b/Files UWP/Settings.xaml.cs
@@ -14,8 +14,8 @@ public Settings()
         {
             this.InitializeComponent();
             var CoreTitleBar = CoreApplication.GetCurrentView().TitleBar;
-            CoreTitleBar.ExtendViewIntoTitleBar = true;
-            Window.Current.SetTitleBar(DragArea);
+            CoreTitleBar.ExtendViewIntoTitleBar = false;
+            //Window.Current.SetTitleBar(DragArea);
             SettingsContentFrame.Navigate(typeof(Personalization));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using Files.Navigation;`
`11`	`11`	`using Files.Interacts;`
`12`	`12`	`using System.Diagnostics;`
	`13`	`+using Windows.UI.Core;`
`13`	`14`
`14`	`15`	`namespace Files`
`15`	`16`	`{`
`@@ -60,6 +61,10 @@ public GenericFileBrowser()`
`60`	`61`	`//PathBarTip.IsOpen = true;`
`61`	`62`	`}`
`62`	`63`
	`64`	`+ private void SelectAllAcceleratorDG_Invoked(Windows.UI.Xaml.Input.KeyboardAccelerator sender, Windows.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)`
	`65`	`+ {`
	`66`	`+ }`
	`67`	`+`
`63`	`68`	`private void AddItem_Click(object sender, RoutedEventArgs e)`
`64`	`69`	`{`
`65`	`70`	`//await AddDialog.ShowAsync();`
`@@ -259,6 +264,7 @@ private void AllView_DragLeave(object sender, DragEventArgs e)`
`259`	`264`	`{`
`260`	`265`
`261`	`266`	`}`
	`267`	`+`
`262`	`268`	`}`
`263`	`269`
`264`	`270`	`public class EmptyFolderTextState : INotifyPropertyChanged`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ private async static void Manager_DataRequested(DataTransferManager sender, Data`
`447`	`447`	`List<IStorageItem> items = new List<IStorageItem>();`
`448`	`448`	`if(page.Name == "GenericItemView")`
`449`	`449`	`{`
`450`		`- foreach (ListedItem li in dataGrid.SelectedItems)`
	`450`	`+ foreach (ListedItem li in GenericFileBrowser.data.SelectedItems)`
`451`	`451`	`{`
`452`	`452`	`if (li.FileType == "Folder")`
`453`	`453`	`{`
`@@ -863,5 +863,23 @@ public static async void CloneDirectoryAsync(string SourcePath, string Destinati`
`863`	`863`	`}`
`864`	`864`	`}`
`865`	`865`	`}`
	`866`	`+`
	`867`	`+ public static void SelectAllItems()`
	`868`	`+ {`
	`869`	`+ if(page.Name == "GenericItemView")`
	`870`	`+ {`
	`871`	`+ foreach(ListedItem li in GenericFileBrowser.data.ItemsSource)`
	`872`	`+ {`
	`873`	`+ if (!GenericFileBrowser.data.SelectedItems.Contains(li))`
	`874`	`+ {`
	`875`	`+ GenericFileBrowser.data.SelectedItems.Add(li);`
	`876`	`+ }`
	`877`	`+ }`
	`878`	`+ }`
	`879`	`+ else if(page.Name == "PhotoAlbumViewer")`
	`880`	`+ {`
	`881`	`+ PhotoAlbum.gv.SelectAll();`
	`882`	`+ }`
	`883`	`+ }`
`866`	`884`	`}`
`867`	`885`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ public Settings()`
`14`	`14`	`{`
`15`	`15`	`this.InitializeComponent();`
`16`	`16`	`var CoreTitleBar = CoreApplication.GetCurrentView().TitleBar;`
`17`		`- CoreTitleBar.ExtendViewIntoTitleBar = true;`
`18`		`- Window.Current.SetTitleBar(DragArea);`
	`17`	`+ CoreTitleBar.ExtendViewIntoTitleBar = false;`
	`18`	`+ //Window.Current.SetTitleBar(DragArea);`
`19`	`19`	`SettingsContentFrame.Navigate(typeof(Personalization));`
`20`	`20`	`}`
`21`	`21`