Skip to content

Commit aefb967

Browse files
yaira2yaira2
authored
Merge pull request #346 from jeffsieu/v0.7-changes
Fix merge issues
2 parents 118cf5c + 260bd8c commit aefb967

File tree

8 files changed

+60
-1360
lines changed

8 files changed

+60
-1360
lines changed

‎Files UWP/GenericFileBrowser.xaml

Lines changed: 0 additions & 356 deletions
This file was deleted.

‎Files UWP/GenericFileBrowser.xaml.cs

Lines changed: 0 additions & 508 deletions
This file was deleted.

‎Files UWP/PhotoAlbum.xaml.cs

Lines changed: 0 additions & 459 deletions
This file was deleted.

‎Files/BaseLayout.cs

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class BaseLayout : Page
2727
public ItemViewModel AssociatedViewModel = null;
2828
public Interaction AssociatedInteractions = null;
2929
public bool isRenamingItem = false;
30-
public List<ListedItem> selectedItems
30+
public List<ListedItem> SelectedItems
3131
{
3232
get
3333
{
@@ -43,7 +43,25 @@ public List<ListedItem> selectedItems
4343
{
4444
return new List<ListedItem>();
4545
}
46-
}
46+
}
47+
}
48+
public ListedItem SelectedItem
49+
{
50+
get
51+
{
52+
if (App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType == typeof(GenericFileBrowser))
53+
{
54+
return (App.OccupiedInstance.ItemDisplayFrame.Content as GenericFileBrowser).AllView.SelectedItem as ListedItem;
55+
}
56+
else if (App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType == typeof(PhotoAlbum))
57+
{
58+
return (App.OccupiedInstance.ItemDisplayFrame.Content as PhotoAlbum).FileList.SelectedItem as ListedItem;
59+
}
60+
else
61+
{
62+
return null;
63+
}
64+
}
4765
}
4866

4967
public BaseLayout()
@@ -140,7 +158,7 @@ private void UnloadMenuFlyoutItemByName(string nameToUnload)
140158

141159
public void RightClickContextMenu_Opening(object sender, object e)
142160
{
143-
var selectedFileSystemItems = (App.OccupiedInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems;
161+
var selectedFileSystemItems = (App.OccupiedInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems;
144162

145163
// Find selected items that are not folders
146164
if (selectedFileSystemItems.Cast<ListedItem>().Any(x => x.FileType != "Folder"))

‎Files/GenericFileBrowser.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@
6464
<FontIcon Glyph="&#xE8A5;"/>
6565
</MenuFlyoutItem.Icon>
6666
</MenuFlyoutItem>
67-
<MenuFlyoutSeparator/>
68-
<MenuFlyoutItem Text="Properties" Click="{x:Bind AssociatedInteractions.ShowFolderPropertiesButton_Click}" x:Name="PropertiesFolder">
69-
<MenuFlyoutItem.Icon>
70-
<FontIcon Glyph="&#xE946;"/>
71-
</MenuFlyoutItem.Icon>
72-
</MenuFlyoutItem>
7367
</MenuFlyoutSubItem>
68+
<MenuFlyoutSeparator/>
69+
<MenuFlyoutItem Text="Properties" Click="{x:Bind AssociatedInteractions.ShowFolderPropertiesButton_Click}" x:Name="PropertiesFolder">
70+
<MenuFlyoutItem.Icon>
71+
<FontIcon Glyph="&#xE946;"/>
72+
</MenuFlyoutItem.Icon>
73+
</MenuFlyoutItem>
7474
</MenuFlyout>
7575

7676
<MenuFlyout Opening="RightClickContextMenu_Opening" x:Key="BaseLayoutItemContextFlyout">

‎Files/GenericFileBrowser.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ private void AllView_PreparingCellForEdit(object sender, DataGridPreparingCellFo
135135
previousFileName = selectedItem.FileName;
136136
textBox.Focus(FocusState.Programmatic); // Without this, cannot edit text box when renaming via right-click
137137
textBox.Select(0, selectedItem.FileName.Length - extensionLength);
138+
isRenamingItem = true;
138139
}
139140

140141
private async void AllView_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)

‎Files/Interacts/Interaction.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public async void OpenInNewWindowItem_Click(object sender, RoutedEventArgs e)
4848
var CurrentSourceType = App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType;
4949
if (CurrentSourceType == typeof(GenericFileBrowser))
5050
{
51-
var items = (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems;
51+
var items = (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems;
5252
foreach (ListedItem listedItem in items)
5353
{
5454
var selectedItemPath = listedItem.FilePath;
@@ -59,7 +59,7 @@ public async void OpenInNewWindowItem_Click(object sender, RoutedEventArgs e)
5959
}
6060
else if (CurrentSourceType == typeof(PhotoAlbum))
6161
{
62-
var items = (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems;
62+
var items = (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems;
6363
foreach (ListedItem listedItem in items)
6464
{
6565
var selectedItemPath = listedItem.FilePath;
@@ -74,7 +74,7 @@ public void OpenDirectoryInNewTab_Click(object sender, RoutedEventArgs e)
7474
var CurrentSourceType = App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType;
7575
if(CurrentSourceType == typeof(GenericFileBrowser))
7676
{
77-
var items = (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems;
77+
var items = (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems;
7878
foreach (ListedItem listedItem in items)
7979
{
8080
instanceTabsView.AddNewTab(typeof(ProHome), listedItem.FilePath);
@@ -83,7 +83,7 @@ public void OpenDirectoryInNewTab_Click(object sender, RoutedEventArgs e)
8383
}
8484
else if(CurrentSourceType == typeof(PhotoAlbum))
8585
{
86-
var items = (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems;
86+
var items = (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems;
8787
foreach (ListedItem listedItem in items)
8888
{
8989
instanceTabsView.AddNewTab(typeof(ProHome), listedItem.FilePath);
@@ -174,7 +174,7 @@ public async void PinItem_Click(object sender, RoutedEventArgs e)
174174

175175
try
176176
{
177-
foreach (ListedItem listedItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
177+
foreach (ListedItem listedItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
178178
{
179179
items.Add(listedItem.FilePath);
180180
}
@@ -183,7 +183,7 @@ public async void PinItem_Click(object sender, RoutedEventArgs e)
183183
}
184184
catch (FileNotFoundException)
185185
{
186-
foreach (ListedItem listedItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
186+
foreach (ListedItem listedItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
187187
{
188188
items.Add(listedItem.FilePath);
189189
}
@@ -281,7 +281,7 @@ public void AllView_RightTapped(object sender, RightTappedRoutedEventArgs e)
281281
var ObjectPressed = ((ReadOnlyObservableCollection<ListedItem>)dataGrid.ItemsSource)[RowPressed.GetIndex()];
282282
// Check if RightTapped row is currently selected
283283
var CurrentInstance = App.OccupiedInstance;
284-
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Contains(ObjectPressed))
284+
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Contains(ObjectPressed))
285285
return;
286286
// The following code is only reachable when a user RightTapped an unselected row
287287
dataGrid.SelectedItems.Clear();
@@ -334,18 +334,18 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
334334
string selectedItemPath = null;
335335
int selectedItemCount;
336336
Type sourcePageType = App.OccupiedInstance.ItemDisplayFrame.SourcePageType;
337-
selectedItemCount = (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Count;
337+
selectedItemCount = (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Count;
338338
if (selectedItemCount == 1)
339339
{
340-
selectedItemPath = (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems[0].FilePath;
340+
selectedItemPath = (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems[0].FilePath;
341341
}
342342

343343
// Access MRU List
344344
var mostRecentlyUsed = Windows.Storage.AccessCache.StorageApplicationPermissions.MostRecentlyUsedList;
345345

346346
if (selectedItemCount == 1)
347347
{
348-
var clickedOnItem = (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems[0];
348+
var clickedOnItem = (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems[0];
349349
if (clickedOnItem.FileType == "Folder")
350350
{
351351
// Add location to MRU List
@@ -431,7 +431,7 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
431431
}
432432
else if(selectedItemCount > 1)
433433
{
434-
foreach (ListedItem clickedOnItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
434+
foreach (ListedItem clickedOnItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
435435
{
436436

437437
if (clickedOnItem.FileType == "Folder")
@@ -476,7 +476,7 @@ public void ShareItem_Click(object sender, RoutedEventArgs e)
476476
public async void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
477477
{
478478
App.propertiesDialog.accessiblePropertiesFrame.Tag = App.propertiesDialog;
479-
App.propertiesDialog.accessiblePropertiesFrame.Navigate(typeof(Properties), (App.OccupiedInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems, new SuppressNavigationTransitionInfo());
479+
App.propertiesDialog.accessiblePropertiesFrame.Navigate(typeof(Properties), (App.OccupiedInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItem, new SuppressNavigationTransitionInfo());
480480
await App.propertiesDialog.ShowAsync(ContentDialogPlacement.Popup);
481481
}
482482

@@ -495,7 +495,7 @@ private async void Manager_DataRequested(DataTransferManager sender, DataRequest
495495
{
496496
var CurrentInstance = App.OccupiedInstance;
497497

498-
foreach (ListedItem li in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
498+
foreach (ListedItem li in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
499499
{
500500
if (li.FileType == "Folder")
501501
{
@@ -511,7 +511,7 @@ private async void Manager_DataRequested(DataTransferManager sender, DataRequest
511511
}
512512
else if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))
513513
{
514-
foreach (ListedItem li in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
514+
foreach (ListedItem li in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
515515
{
516516
if (li.FileType == "Folder")
517517
{
@@ -539,7 +539,7 @@ public async void DeleteItem_Click(object sender, RoutedEventArgs e)
539539
{
540540
var CurrentInstance = App.OccupiedInstance;
541541
List<ListedItem> selectedItems = new List<ListedItem>();
542-
foreach (ListedItem selectedItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
542+
foreach (ListedItem selectedItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
543543
{
544544
selectedItems.Add(selectedItem);
545545
}
@@ -667,7 +667,7 @@ public async void CutItem_Click(object sender, RoutedEventArgs e)
667667
if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))
668668
{
669669
var CurrentInstance = App.OccupiedInstance;
670-
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Count != 0)
670+
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Count != 0)
671671
{
672672
dataGridRows.Clear();
673673
FindChildren<DataGridRow>(dataGridRows, (CurrentInstance.ItemDisplayFrame.Content as GenericFileBrowser).AllView);
@@ -681,7 +681,7 @@ public async void CutItem_Click(object sender, RoutedEventArgs e)
681681
}
682682
}
683683

684-
foreach (ListedItem StorItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
684+
foreach (ListedItem StorItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
685685
{
686686
IEnumerator allItems = (CurrentInstance.ItemDisplayFrame.Content as GenericFileBrowser).AllView.ItemsSource.GetEnumerator();
687687
int index = -1;
@@ -713,7 +713,7 @@ public async void CutItem_Click(object sender, RoutedEventArgs e)
713713
else if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))
714714
{
715715
var CurrentInstance = App.OccupiedInstance;
716-
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Count != 0)
716+
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Count != 0)
717717
{
718718

719719
gridViewItems.Clear();
@@ -731,7 +731,7 @@ public async void CutItem_Click(object sender, RoutedEventArgs e)
731731
}
732732
}
733733

734-
foreach (ListedItem StorItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
734+
foreach (ListedItem StorItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
735735
{
736736
GridViewItem itemToDimForCut = (GridViewItem) (currentInstance.ItemDisplayFrame.Content as PhotoAlbum).FileList.ContainerFromItem(StorItem);
737737
List<Grid> itemContentGrids = new List<Grid>();
@@ -772,9 +772,9 @@ public async void CopyItem_ClickAsync(object sender, RoutedEventArgs e)
772772
var CurrentInstance = App.OccupiedInstance;
773773
CopySourcePath = currentInstance.instanceViewModel.Universal.path;
774774

775-
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Count != 0)
775+
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Count != 0)
776776
{
777-
foreach (ListedItem StorItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
777+
foreach (ListedItem StorItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
778778
{
779779
if (StorItem.FileType != "Folder")
780780
{
@@ -793,9 +793,9 @@ public async void CopyItem_ClickAsync(object sender, RoutedEventArgs e)
793793
{
794794
CopySourcePath = currentInstance.instanceViewModel.Universal.path;
795795

796-
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Count != 0)
796+
if ((currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Count != 0)
797797
{
798-
foreach (ListedItem StorItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems)
798+
foreach (ListedItem StorItem in (currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems)
799799
{
800800
if (StorItem.FileType != "Folder")
801801
{
@@ -971,9 +971,9 @@ public void SelectAllItems()
971971
var CurrentInstance = App.OccupiedInstance;
972972
foreach (ListedItem li in (CurrentInstance.ItemDisplayFrame.Content as GenericFileBrowser).AllView.ItemsSource)
973973
{
974-
if (!(currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Contains(li))
974+
if (!(currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Contains(li))
975975
{
976-
(currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Add(li);
976+
(currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Add(li);
977977
}
978978
}
979979
}
@@ -988,11 +988,11 @@ public void ClearAllItems()
988988
if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))
989989
{
990990
var CurrentInstance = App.OccupiedInstance;
991-
(currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Clear();
991+
(currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Clear();
992992
}
993993
else if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))
994994
{
995-
(currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Clear();
995+
(currentInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItems.Clear();
996996
}
997997
}
998998

‎Files/Properties.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
<ColumnDefinition Width="Auto"/>
1818
<ColumnDefinition Width="*"/>
1919
</Grid.ColumnDefinitions>
20-
<Image Margin="15,15" Grid.Column="0" Width="45" Height="45" x:Name="itemIcon" Source="{x:Bind Item.FileImg,Mode=OneTime}" />
20+
<Custom:DockPanel x:Name="Icon" Margin="15,15" Width="45" Height="45" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
21+
<FontIcon FontSize="36" Visibility="{x:Bind Item.FolderImg,Mode=OneTime}" Glyph="&#xE8D5;" FontFamily="Segoe MDL2 Assets" Foreground="#ffe793" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
22+
<FontIcon FontSize="36" Visibility="{x:Bind Item.EmptyImgVis,Mode=OneTime}" Glyph="&#xE7C3;" FontFamily="Segoe MDL2 Assets" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
23+
<Image Visibility="{x:Bind Item.FileIconVis,Mode=OneTime}" x:Name="itemIcon" Source="{x:Bind Item.FileImg,Mode=OneTime}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
24+
</Custom:DockPanel>
2125
<TextBox CornerRadius="2" BorderThickness="1" Padding="10,4" x:Name="itemFileName" Text="{x:Bind Item.FileName,Mode=OneTime}" PlaceholderText="Item Name" VerticalAlignment="Center" Grid.Column="1" Margin="15,0,15,0" />
2226
</Grid>
2327
<MenuFlyoutSeparator HorizontalAlignment="Stretch" Margin="-10,0"/>

0 commit comments

Comments
 (0)