Skip to content

Commit ece3110

Browse files
lukeblevinslukeblevins
committed
Disable WSL for v0.7
1 parent 20c4529 commit ece3110

File tree

5 files changed

+71
-10
lines changed

5 files changed

+71
-10
lines changed

‎Files/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ private async void DetectWSLDistros()
225225
var distroFolder = await StorageFolder.GetFolderFromPathAsync(@"\\wsl$\");
226226
if ((await distroFolder.GetFoldersAsync()).Count > 0)
227227
{
228-
areLinuxFilesSupported = true;
228+
areLinuxFilesSupported = false;
229229
}
230230

231231
foreach (StorageFolder folder in await distroFolder.GetFoldersAsync())

‎Files/Filesystem/ItemViewModel.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,26 @@ private async Task AddFolder(StorageFolder folder)
682682
isLoadingItems = false;
683683
return;
684684
}
685+
//string dateCreatedText = folder.DateCreated.DateTime.ToString();
686+
//var firstFiles = (await folder.GetFilesAsync(CommonFileQuery.DefaultQuery, 0, 3)).Select(x => x.Name);
687+
//string firstFilesText = "No Files";
688+
//if(firstFiles.Count() > 0)
689+
//{
690+
// firstFilesText = string.Join(',', firstFiles.ToArray());
691+
//}
692+
693+
//var firstFolders = (await folder.GetFoldersAsync(CommonFolderQuery.DefaultQuery, 0, 3)).Select(x => x.Name);
694+
//string firstFoldersText = "No Folders";
695+
//if (firstFolders.Count() > 0)
696+
//{
697+
// firstFoldersText = string.Join(',', firstFolders.ToArray());
698+
//}
699+
700+
//string tooltipString = dateCreatedText + "\n" + "Folders: " + firstFoldersText + "\n" + "Files: " + firstFilesText;
701+
685702
_filesAndFolders.Add(new ListedItem(folder.FolderRelativeId)
686703
{
704+
//FolderTooltipText = tooltipString,
687705
FileName = folder.Name,
688706
FileDateReal = basicProperties.DateModified,
689707
FileType = "Folder", //TODO: Take a look at folder.DisplayType

‎Files/Filesystem/ListedItem.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace Files.Filesystem
77
{
88
public class ListedItem
99
{
10+
public string FolderTooltipText { get; set; }
1011
public string FolderRelativeId { get; }
1112
public Visibility FolderImg { get; set; }
1213
public Visibility FileIconVis { get; set; }

‎Files/GenericFileBrowser.xaml

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:local="using:Files"
10+
xmlns:local2="using:Files.Filesystem"
1011
xmlns:uilib="using:Microsoft.UI.Xaml.Controls"
1112
mc:Ignorable="d" NavigationCacheMode="Required" PointerReleased="GenericItemView_PointerReleased" Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
1213
<local:BaseLayout.Resources>
@@ -137,6 +138,7 @@
137138
</MenuFlyout>
138139
</local:BaseLayout.Resources>
139140
<Grid ContextFlyout="{StaticResource BaseLayoutContextFlyout}" Background="Transparent" x:Name="RootGrid">
141+
<Rectangle x:Load="{x:Bind IsSelectionRectangleDisplayed, Mode=OneWay}" x:Name="SelectionRectangle" Fill="Blue" Stroke="DarkBlue" Opacity="0.7"/>
140142
<ProgressBar Visibility="{x:Bind AssociatedViewModel.LoadIndicator.isVisible,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" x:Name="progBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
141143
<TextBlock Visibility="{x:Bind AssociatedViewModel.EmptyTextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
142144
<controls:DataGrid DoubleTapped="{x:Bind local:App.OccupiedInstance.instanceInteraction.List_ItemClick}" RightTapped="{x:Bind local:App.OccupiedInstance.instanceInteraction.AllView_RightTapped}" ItemsSource="{x:Bind AssociatedViewModel.FilesAndFolders}" PreviewKeyDown="AllView_PreviewKeyDown" ScrollViewer.IsScrollInertiaEnabled="True" ClipboardCopyMode="None" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" PreparingCellForEdit="AllView_PreparingCellForEdit" CellEditEnding="AllView_CellEditEnding" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" CanUserSortColumns="True" Sorting="AllView_Sorting" HorizontalAlignment="Left">
@@ -181,22 +183,39 @@
181183
</controls:DataGrid.CellStyle>
182184

183185
<controls:DataGrid.Columns>
184-
<controls:DataGridTemplateColumn DisplayIndex="0" x:Name="iconColumn" IsReadOnly="True">
186+
<controls:DataGridTemplateColumn ToolTipService.ToolTip="{Binding FolderTooltipText}" DisplayIndex="0" x:Name="iconColumn" IsReadOnly="True">
185187
<controls:DataGridTemplateColumn.CellTemplate>
186-
<DataTemplate>
188+
<DataTemplate x:DataType="local2:ListedItem">
187189
<Grid x:Name="Icon" Margin="0, 0, 0, 0">
188190
<Rectangle Visibility="Collapsed" x:Name="CutIndicator" Opacity="0.1" Fill="LightGray"/>
189-
<FontIcon Visibility="{Binding FolderImg}" Glyph="&#xE8D5;" FontFamily="Segoe MDL2 Assets" Foreground="#ffe793"/>
190-
<FontIcon Visibility="{Binding EmptyImgVis}" Glyph="&#xE7C3;" FontFamily="Segoe MDL2 Assets"/>
191-
<Image Visibility="{Binding FileIconVis}" Height="20" Width="20" Source="{Binding FileImg}" Stretch="UniformToFill" />
191+
<FontIcon Visibility="{x:Bind FolderImg}" Glyph="&#xE8D5;" FontFamily="Segoe MDL2 Assets" Foreground="#ffe793"/>
192+
<FontIcon Visibility="{x:Bind EmptyImgVis}" Glyph="&#xE7C3;" FontFamily="Segoe MDL2 Assets"/>
193+
<Image Visibility="{x:Bind FileIconVis}" Height="20" Width="20" Source="{x:Bind FileImg}" Stretch="UniformToFill" />
192194
</Grid>
193195
</DataTemplate>
194196
</controls:DataGridTemplateColumn.CellTemplate>
197+
195198
</controls:DataGridTemplateColumn>
196-
<controls:DataGridTextColumn DisplayIndex="1" x:Name="nameColumn" Header="Name" Width="275" Binding="{Binding FileName}" Tag="Name"/>
197-
<controls:DataGridTextColumn DisplayIndex="2" x:Name="dateColumn" IsReadOnly="True" Header="Date modified" Width="Auto" Binding="{Binding FileDate}" Tag="Date"/>
198-
<controls:DataGridTextColumn DisplayIndex="3" x:Name="typeColumn" IsReadOnly="True" Header="Type" Width="150" Binding="{Binding FileType}" Tag="Type"/>
199-
<controls:DataGridTextColumn DisplayIndex="4" x:Name="sizeColumn" IsReadOnly="True" Header="Size" Width="Auto" MinWidth="100" Binding="{Binding FileSize}" Tag="Size"/>
199+
<controls:DataGridTextColumn DisplayIndex="1" x:Name="nameColumn" Header="Name" Width="275" Binding="{Binding FileName}" Tag="Name">
200+
<ToolTipService.ToolTip>
201+
<ToolTip Content="{Binding FolderTooltipText}"/>
202+
</ToolTipService.ToolTip>
203+
</controls:DataGridTextColumn>
204+
<controls:DataGridTextColumn DisplayIndex="2" x:Name="dateColumn" IsReadOnly="True" Header="Date modified" Width="Auto" Binding="{Binding FileDate}" Tag="Date">
205+
<ToolTipService.ToolTip>
206+
<ToolTip Content="{Binding FolderTooltipText}"/>
207+
</ToolTipService.ToolTip>
208+
</controls:DataGridTextColumn>
209+
<controls:DataGridTextColumn DisplayIndex="3" x:Name="typeColumn" IsReadOnly="True" Header="Type" Width="150" Binding="{Binding FileType}" Tag="Type">
210+
<ToolTipService.ToolTip>
211+
<ToolTip Content="{Binding FolderTooltipText}"/>
212+
</ToolTipService.ToolTip>
213+
</controls:DataGridTextColumn>
214+
<controls:DataGridTextColumn DisplayIndex="4" x:Name="sizeColumn" IsReadOnly="True" Header="Size" Width="Auto" MinWidth="100" Binding="{Binding FileSize}" Tag="Size">
215+
<ToolTipService.ToolTip>
216+
<ToolTip Content="{Binding FolderTooltipText}"/>
217+
</ToolTipService.ToolTip>
218+
</controls:DataGridTextColumn>
200219
</controls:DataGrid.Columns>
201220
</controls:DataGrid>
202221

‎Files/GenericFileBrowser.xaml.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
using Windows.System;
1212
using Windows.UI.Xaml.Input;
1313
using Windows.UI.Core;
14+
using Windows.UI.Input;
1415

1516
namespace Files
1617
{
1718
public sealed partial class GenericFileBrowser : BaseLayout
1819
{
20+
public bool IsSelectionRectangleDisplayed { get; set; } = false;
1921
public string previousFileName;
2022
private DataGridColumn _sortedColumn;
2123
public DataGridColumn SortedColumn
@@ -225,5 +227,26 @@ protected override void Page_CharacterReceived(CoreWindow sender, CharacterRecei
225227
}
226228
}
227229
}
230+
231+
PointerPoint startingPoint;
232+
private void BaseLayout_PointerPressed(object sender, PointerRoutedEventArgs e)
233+
{
234+
startingPoint = e.GetCurrentPoint(this);
235+
IsSelectionRectangleDisplayed = true;
236+
SelectionRectangle.Margin = new Thickness(e.GetCurrentPoint(this).Position.X, e.GetCurrentPoint(this).Position.Y, 0, 0);
237+
238+
}
239+
240+
private void BaseLayout_PointerMoved(object sender, PointerRoutedEventArgs e)
241+
{
242+
if(e.GetCurrentPoint(this).Position.X < startingPoint.Position.X)
243+
{
244+
SelectionRectangle.Width -= e.GetCurrentPoint(this).Position.X;
245+
}
246+
else
247+
{
248+
SelectionRectangle.Width += (e.GetCurrentPoint(this).Position.X - startingPoint.Position.X);
249+
}
250+
}
228251
}
229252
}

0 commit comments

Comments
 (0)