-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Added column view layout #4176
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Added column view layout #4176
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
4da8559
re-introducing column-view
TyJOrtiz 6e5f0a7
Updated strings
yaira2 205c325
Column View layout mode option in context view
TyJOrtiz ccc913c
Merge branch 'main' of https://github.com/TyJOrtiz/Files into main
TyJOrtiz 95e2955
Merge branch 'main' into main
TyJOrtiz 6096945
4176 changes
TyJOrtiz cdfd292
Merge branch 'main' of https://github.com/TyJOrtiz/Files into main
TyJOrtiz 6a752e6
catchingup with latest commit
TyJOrtiz 24fbd1a
Update Resources.resw
TyJOrtiz 2b024e8
Column View Code
TyJOrtiz a0fc645
Merge branch 'main' into pr/4176
yaira2 ca1c53c
ColumnView Double-click
TyJOrtiz 0e2b56c
restore Popup x:load
TyJOrtiz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ public enum FolderLayoutModes | |
{ | ||
DetailsView = 1, | ||
TilesView = 2, | ||
ColumnView = 3, | ||
GridView = 4, | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<local:BaseLayout | ||
x:Class="Files.Views.LayoutModes.ColumnViewBrowser" | ||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
xmlns:local="using:Files" | ||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" | ||
mc:Ignorable="d"> | ||
|
||
<local:BaseLayout.Resources> | ||
<Style TargetType="controls:BladeItem"> | ||
<Setter Property="Background" Value="Transparent"/> | ||
<Setter Property="TitleBarVisibility" Value="Collapsed"></Setter> | ||
<Setter Property="BorderThickness" Value="0,0,1,0"></Setter> | ||
</Style> | ||
</local:BaseLayout.Resources> | ||
<Grid> | ||
<controls:BladeView x:Name="ColumnHost"> | ||
<controls:BladeItem x:Name="FirstBlade"/> | ||
</controls:BladeView> | ||
</Grid> | ||
</local:BaseLayout> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,138 @@ | ||
using Files.EventArguments; | ||
using Files.Filesystem; | ||
using Files.Interacts; | ||
using Files.ViewModels; | ||
using Microsoft.Toolkit.Uwp.UI.Controls; | ||
using System; | ||
using System.Collections; | ||
using System.Collections.Generic; | ||
using System.IO; | ||
using System.Linq; | ||
using System.Runtime.InteropServices.WindowsRuntime; | ||
using Windows.Foundation; | ||
using Windows.Foundation.Collections; | ||
using Windows.UI.Xaml; | ||
using Windows.UI.Xaml.Controls; | ||
using Windows.UI.Xaml.Controls.Primitives; | ||
using Windows.UI.Xaml.Data; | ||
using Windows.UI.Xaml.Input; | ||
using Windows.UI.Xaml.Media; | ||
using Windows.UI.Xaml.Navigation; | ||
|
||
// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 | ||
|
||
namespace Files.Views.LayoutModes | ||
{ | ||
/// <summary> | ||
/// An empty page that can be used on its own or navigated to within a Frame. | ||
/// </summary> | ||
public sealed partial class ColumnViewBrowser : BaseLayout | ||
{ | ||
private List<Frame> Frames; | ||
private string NavParam; | ||
|
||
public ColumnViewBrowser() | ||
{ | ||
this.InitializeComponent(); | ||
} | ||
|
||
protected override async void OnNavigatedTo(NavigationEventArgs eventArgs) | ||
{ | ||
base.OnNavigatedTo(eventArgs); | ||
FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested; | ||
FolderSettings.LayoutModeChangeRequested += FolderSettings_LayoutModeChangeRequested; | ||
|
||
} | ||
|
||
protected override void OnNavigatingFrom(NavigatingCancelEventArgs e) | ||
{ | ||
base.OnNavigatingFrom(e); | ||
FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested; | ||
} | ||
|
||
private void FolderSettings_LayoutModeChangeRequested(object sender, LayoutModeEventArgs e) | ||
{ | ||
|
||
} | ||
|
||
public override void SelectAllItems() | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void FocusFileList() | ||
{ | ||
|
||
} | ||
|
||
protected override IEnumerable GetAllItems() | ||
{ | ||
return null; | ||
} | ||
|
||
protected override void AddSelectedItem(ListedItem item) | ||
{ | ||
|
||
} | ||
|
||
public override void InvertSelection() | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void ClearSelection() | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void SetDragModeForItems() | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void ScrollIntoView(ListedItem item) | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void SetSelectedItemOnUi(ListedItem selectedItem) | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void SetSelectedItemsOnUi(List<ListedItem> selectedItems) | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void AddSelectedItemsOnUi(List<ListedItem> selectedItems) | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void FocusSelectedItems() | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void StartRenameItem() | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void ResetItemOpacity() | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
public override void SetItemOpacity(ListedItem item) | ||
{ | ||
// throw new NotImplementedException(); | ||
} | ||
|
||
protected override ListedItem GetItemFromElement(object element) | ||
{ | ||
throw new NotImplementedException(); | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.