From 25c0bbca955115e20e79874f0269676bfeb25015 Mon Sep 17 00:00:00 2001 From: itayweb Date: Sat, 26 Nov 2022 16:02:27 +0200 Subject: [PATCH 01/11] bug-10549: Hide search non-indexed objects --- src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index 555088841178..3507e1ff539d 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -922,10 +922,10 @@ HorizontalAlignment="Stretch" x:Load="{x:Bind InstanceViewModel.ShowSearchUnindexedItemsMessage, Mode=OneWay}" Orientation="Vertical"> - + From a4ef39342318878d4f31bbdcbb47222e5fd926f2 Mon Sep 17 00:00:00 2001 From: itayweb Date: Sat, 3 Dec 2022 14:17:50 +0200 Subject: [PATCH 02/11] bug-10549: Center text and button --- .../LayoutModes/DetailsLayoutBrowser.xaml | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index 3507e1ff539d..f3d423c41923 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -198,7 +198,24 @@ Canvas.ZIndex="0" EmptyTextType="{x:Bind ParentShellPageInstance.FilesystemViewModel.EmptyTextType, Mode=OneWay}" /> - + + + + + + + + - - - - - - - - - - - - + + + + + + From 8bb3f2b11bb7a739f7a84cade997e60e4ec52e21 Mon Sep 17 00:00:00 2001 From: itayweb Date: Sat, 10 Dec 2022 14:53:34 +0200 Subject: [PATCH 03/11] bug-10549: Fix indent --- .../LayoutModes/DetailsLayoutBrowser.xaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index f3d423c41923..55118645460f 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -200,17 +200,17 @@ - - + x:Name="SearchUnindexedItemsPanel" + HorizontalAlignment="Center" + VerticalAlignment="Bottom" + x:Load="{x:Bind InstanceViewModel.ShowSearchUnindexedItemsMessage, Mode=OneWay}" + Orientation="Vertical"> + + From 6366eef81536a12bb56487cd556f53d7c4e90779 Mon Sep 17 00:00:00 2001 From: itayweb Date: Mon, 12 Dec 2022 20:13:06 +0200 Subject: [PATCH 04/11] bug-10549: Another fix of indent --- .../LayoutModes/DetailsLayoutBrowser.xaml | 1937 ++++++++--------- 1 file changed, 968 insertions(+), 969 deletions(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index 55118645460f..2eb3f2ccb9fc 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -1,1034 +1,1033 @@ - - - - - - - - - - - - - + x:Class="Files.App.Views.LayoutModes.DetailsLayoutBrowser" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:animations="using:CommunityToolkit.WinUI.UI.Animations" + xmlns:behaviors="using:CommunityToolkit.WinUI.UI.Behaviors" + xmlns:behaviors2="using:Files.App.Behaviors" + xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls" + xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" + xmlns:converters1="using:Files.App.Converters" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:helpers="using:Files.App.Helpers" + xmlns:i="using:Microsoft.Xaml.Interactivity" + xmlns:icore="using:Microsoft.Xaml.Interactions.Core" + xmlns:local="using:Files.App" + xmlns:local2="using:Files.App.Filesystem" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:triggers="using:CommunityToolkit.WinUI.UI.Triggers" + xmlns:tui="using:CommunityToolkit.WinUI.UI" + xmlns:uc="using:Files.App.UserControls" + xmlns:vc="using:Files.App.ValueConverters" + x:Name="PageRoot" + NavigationCacheMode="Enabled" + mc:Ignorable="d"> + + + + + + + + + + + + + - - - + + + - - - + + + - + - + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + x:Name="SearchUnindexedItemsPanel" + HorizontalAlignment="Center" + VerticalAlignment="Bottom" + x:Load="{x:Bind InstanceViewModel.ShowSearchUnindexedItemsMessage, Mode=OneWay}" + Orientation="Vertical"> + + - + x:Name="FileNameTeachingTip" + CloseButtonContent="{helpers:ResourceString Name=FileNameTeachingTip/CloseButtonContent}" + PreferredPlacement="Auto" + Subtitle="{helpers:ResourceString Name=FileNameTeachingTip/Subtitle}" + Visibility="Collapsed" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - + - + - + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file From 726351c9e1fba2a3e6df8867854fa530c4bc9215 Mon Sep 17 00:00:00 2001 From: Quaint Mako <110472580+QuaintMako@users.noreply.github.com> Date: Wed, 14 Dec 2022 20:56:16 +0100 Subject: [PATCH 05/11] Revert "bug-10549: Another fix of indent" This reverts commit 6366eef81536a12bb56487cd556f53d7c4e90779. --- .../LayoutModes/DetailsLayoutBrowser.xaml | 1937 +++++++++-------- 1 file changed, 969 insertions(+), 968 deletions(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index 2eb3f2ccb9fc..55118645460f 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -1,1033 +1,1034 @@ - - - - - - - - - - - - - + x:Class="Files.App.Views.LayoutModes.DetailsLayoutBrowser" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:animations="using:CommunityToolkit.WinUI.UI.Animations" + xmlns:behaviors="using:CommunityToolkit.WinUI.UI.Behaviors" + xmlns:behaviors2="using:Files.App.Behaviors" + xmlns:controls="using:CommunityToolkit.WinUI.UI.Controls" + xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" + xmlns:converters1="using:Files.App.Converters" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:helpers="using:Files.App.Helpers" + xmlns:i="using:Microsoft.Xaml.Interactivity" + xmlns:icore="using:Microsoft.Xaml.Interactions.Core" + xmlns:local="using:Files.App" + xmlns:local2="using:Files.App.Filesystem" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:triggers="using:CommunityToolkit.WinUI.UI.Triggers" + xmlns:tui="using:CommunityToolkit.WinUI.UI" + xmlns:uc="using:Files.App.UserControls" + xmlns:vc="using:Files.App.ValueConverters" + x:Name="PageRoot" + NavigationCacheMode="Enabled" + mc:Ignorable="d"> + + + + + + + + + + + + + - - - + + + - - - + + + - + - + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + x:Name="SearchUnindexedItemsPanel" + HorizontalAlignment="Center" + VerticalAlignment="Bottom" + x:Load="{x:Bind InstanceViewModel.ShowSearchUnindexedItemsMessage, Mode=OneWay}" + Orientation="Vertical"> + + + + x:Name="FileNameTeachingTip" + CloseButtonContent="{helpers:ResourceString Name=FileNameTeachingTip/CloseButtonContent}" + PreferredPlacement="Auto" + Subtitle="{helpers:ResourceString Name=FileNameTeachingTip/Subtitle}" + Visibility="Collapsed" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - + - + - + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - + + + + + + + + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file From ff8fc2607a9516b1f5cd1d6a30d5ae89d1e0eba3 Mon Sep 17 00:00:00 2001 From: Quaint Mako <110472580+QuaintMako@users.noreply.github.com> Date: Wed, 14 Dec 2022 21:06:34 +0100 Subject: [PATCH 06/11] Fixing indentation --- .../LayoutModes/DetailsLayoutBrowser.xaml | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index 55118645460f..48cfcf0bd22e 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -198,24 +198,23 @@ Canvas.ZIndex="0" EmptyTextType="{x:Bind ParentShellPageInstance.FilesystemViewModel.EmptyTextType, Mode=OneWay}" /> - - + - - + - - - + + - - - - - - - + + + + + + From 329c0166072a6fc4a129f19c03b4415e032749ab Mon Sep 17 00:00:00 2001 From: Quaint Mako <110472580+QuaintMako@users.noreply.github.com> Date: Mon, 16 Jan 2023 19:01:39 +0100 Subject: [PATCH 07/11] Removed border controler --- .../LayoutModes/DetailsLayoutBrowser.xaml | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index b7bab25845e0..00f27e5ee33d 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -196,21 +196,19 @@ Canvas.ZIndex="0" EmptyTextType="{x:Bind ParentShellPageInstance.FilesystemViewModel.EmptyTextType, Mode=OneWay}" /> - - - - - - + + + + Date: Mon, 16 Jan 2023 19:17:39 +0100 Subject: [PATCH 08/11] Centering button for search --- src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index 00f27e5ee33d..a3648cedb8ea 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -205,6 +205,7 @@ From 00727981a0bb4e6a2fb0d22131062f10de0b9d71 Mon Sep 17 00:00:00 2001 From: Quaint Mako <110472580+QuaintMako@users.noreply.github.com> Date: Tue, 17 Jan 2023 22:41:04 +0100 Subject: [PATCH 09/11] Removing dot at end of sentence --- src/Files.App/Strings/en-US/Resources.resw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw index 1bcd0708e2bb..b977b3c22169 100644 --- a/src/Files.App/Strings/en-US/Resources.resw +++ b/src/Files.App/Strings/en-US/Resources.resw @@ -1645,7 +1645,7 @@ Didn't find what you're looking for? - Search unindexed items. + Search unindexed items Open themes folder From b5b5aa980ba979aaa05946e18b4f0c133b88ed47 Mon Sep 17 00:00:00 2001 From: yaira2 <39923744+yaira2@users.noreply.github.com> Date: Tue, 17 Jan 2023 17:10:03 -0500 Subject: [PATCH 10/11] Update src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml --- src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index a3648cedb8ea..f8bc419f0ca8 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -206,7 +206,6 @@ From b62e24a4bbd664a3510f90c14bf4f8d6e1f32fbf Mon Sep 17 00:00:00 2001 From: yaira2 <39923744+yaira2@users.noreply.github.com> Date: Tue, 17 Jan 2023 17:10:12 -0500 Subject: [PATCH 11/11] Update src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml --- src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index f8bc419f0ca8..7eadf56872ee 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -202,7 +202,7 @@ VerticalAlignment="Bottom" x:Load="{x:Bind InstanceViewModel.ShowSearchUnindexedItemsMessage, Mode=OneWay}" Orientation="Vertical"> - +