Skip to content

Commit bf54e9a

Browse files
d2dyno1d2dyno1
committed
idk if I resolved those conflicts correctly
2 parents 10376cd + b7aface commit bf54e9a

File tree

98 files changed

+8906
-5496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+8906
-5496
lines changed

‎Files/App.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<ResourceDictionary>
88
<fsvm:FolderLayoutInformation x:Key="DetailsInfo" Mode="DetailsView" />
99
<fsvm:FolderLayoutInformation x:Key="TilesInfo" Mode="TilesView" />
10+
<fsvm:FolderLayoutInformation x:Key="ColumnInfo" Mode="ColumnView" />
1011
<fsvm:FolderLayoutInformation
1112
x:Key="SmallGridInfo"
1213
Mode="GridView"

‎Files/BaseLayout.cs

+41-409
Large diffs are not rendered by default.

‎Files/Enums/FolderLayout.cs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ public enum FolderLayout
55
DetailsView = 0,
66
TilesView = 1,
77
GridViewSmall = 2,
8+
ColumnView = 3,
89
GridViewMedium = 4,
910
GridViewLarge = 8
1011
}

‎Files/Enums/FolderLayoutModes.cs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public enum FolderLayoutModes
44
{
55
DetailsView = 1,
66
TilesView = 2,
7+
ColumnView = 3,
78
GridView = 4,
89
}
910
}

‎Files/Files.csproj

+34-8
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,10 @@
211211
<Compile Include="Dialogs\ConfirmDeleteDialog.xaml.cs">
212212
<DependentUpon>ConfirmDeleteDialog.xaml</DependentUpon>
213213
</Compile>
214+
<Compile Include="Helpers\ContextFlyoutItemHelper.cs" />
215+
<Compile Include="Helpers\ItemModelListToContextFlyoutHelper.cs" />
214216
<Compile Include="Helpers\FilePropertiesHelpers.cs" />
217+
<Compile Include="Helpers\ShellContextMenuHelper.cs" />
215218
<Compile Include="Helpers\UIFilesystemHelpers.cs" />
216219
<Compile Include="Helpers\NavigationHelpers.cs" />
217220
<Compile Include="Helpers\UIHelpers.cs" />
@@ -293,6 +296,7 @@
293296
<Compile Include="ViewModels\Dialogs\DynamicDialogViewModel.cs" />
294297
<Compile Include="ViewModels\FolderSettingsViewModel.cs" />
295298
<Compile Include="ViewModels\MainPageViewModel.cs" />
299+
<Compile Include="ViewModels\ContextMenuFlyoutItemViewModel.cs" />
296300
<Compile Include="ViewModels\PreviewPaneViewModel.cs" />
297301
<Compile Include="ViewModels\Previews\BasePreviewModel.cs" />
298302
<Compile Include="ViewModels\Previews\BasicPreviewViewModel.cs" />
@@ -448,6 +452,16 @@
448452
<Compile Include="ViewModels\SettingsViewModels\OnStartupViewModel.cs" />
449453
<Compile Include="ViewModels\SettingsViewModels\PreferencesViewModel.cs" />
450454
<Compile Include="ViewModels\SettingsViewModels\WidgetsViewModel.cs" />
455+
<Compile Include="Views\ColumnParam.cs" />
456+
<Compile Include="Views\ColumnShellPage.xaml.cs">
457+
<DependentUpon>ColumnShellPage.xaml</DependentUpon>
458+
</Compile>
459+
<Compile Include="Views\LayoutModes\ColumnViewBase.xaml.cs">
460+
<DependentUpon>ColumnViewBase.xaml</DependentUpon>
461+
</Compile>
462+
<Compile Include="Views\LayoutModes\ColumnViewBrowser.xaml.cs">
463+
<DependentUpon>ColumnViewBrowser.xaml</DependentUpon>
464+
</Compile>
451465
<Compile Include="Views\PaneHolderPage.xaml.cs">
452466
<DependentUpon>PaneHolderPage.xaml</DependentUpon>
453467
</Compile>
@@ -886,6 +900,18 @@
886900
<Generator>MSBuild:Compile</Generator>
887901
<SubType>Designer</SubType>
888902
</Page>
903+
<Page Include="Views\ColumnShellPage.xaml">
904+
<SubType>Designer</SubType>
905+
<Generator>MSBuild:Compile</Generator>
906+
</Page>
907+
<Page Include="Views\LayoutModes\ColumnViewBase.xaml">
908+
<SubType>Designer</SubType>
909+
<Generator>MSBuild:Compile</Generator>
910+
</Page>
911+
<Page Include="Views\LayoutModes\ColumnViewBrowser.xaml">
912+
<SubType>Designer</SubType>
913+
<Generator>MSBuild:Compile</Generator>
914+
</Page>
889915
<Page Include="Views\PaneHolderPage.xaml">
890916
<SubType>Designer</SubType>
891917
<Generator>MSBuild:Compile</Generator>
@@ -1001,28 +1027,28 @@
10011027
<Version>6.2.12</Version>
10021028
</PackageReference>
10031029
<PackageReference Include="Microsoft.Toolkit.Mvvm">
1004-
<Version>7.0.0</Version>
1030+
<Version>7.0.1</Version>
10051031
</PackageReference>
10061032
<PackageReference Include="Microsoft.Toolkit.Uwp">
1007-
<Version>7.0.0</Version>
1033+
<Version>7.0.1</Version>
10081034
</PackageReference>
10091035
<PackageReference Include="Microsoft.Toolkit.Uwp.DeveloperTools">
1010-
<Version>7.0.0</Version>
1036+
<Version>7.0.1</Version>
10111037
</PackageReference>
10121038
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
1013-
<Version>7.0.0</Version>
1039+
<Version>7.0.1</Version>
10141040
</PackageReference>
10151041
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
1016-
<Version>7.0.0</Version>
1042+
<Version>7.0.1</Version>
10171043
</PackageReference>
10181044
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
1019-
<Version>7.0.0</Version>
1045+
<Version>7.0.1</Version>
10201046
</PackageReference>
10211047
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
1022-
<Version>7.0.0</Version>
1048+
<Version>7.0.1</Version>
10231049
</PackageReference>
10241050
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid">
1025-
<Version>7.0.0</Version>
1051+
<Version>7.0.1</Version>
10261052
</PackageReference>
10271053
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Lottie">
10281054
<Version>7.0.0</Version>

0 commit comments

Comments
 (0)