Skip to content

Commit 1389870

Browse files
DinahK-2SODinahK-2SO
committed
Revert "New properties in Storage.Pickers - SuggestedDefaultFolder, SuggestedFolder, FileTypeChoices (#5772)"
This reverts commit 4774aae.
1 parent b208e39 commit 1389870

15 files changed

+37
-348
lines changed

‎dev/Common/TerminalVelocityFeatures-StoragePickers2.h‎

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

‎dev/Common/TerminalVelocityFeatures-StoragePickers2.xml‎

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

‎dev/Interop/StoragePickers/FileOpenPicker.cpp‎

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <shobjidl_core.h>
1111
#include <winrt/Microsoft.UI.Interop.h>
1212
#include "TerminalVelocityFeatures-StoragePickers.h"
13-
#include "TerminalVelocityFeatures-StoragePickers2.h"
1413
#include "PickerCommon.h"
1514
#include "PickFileResult.h"
1615
#include "PickerLocalization.h"
@@ -50,46 +49,17 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
5049
PickerCommon::ValidateStringNoEmbeddedNulls(value);
5150
m_commitButtonText = value;
5251
}
53-
winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Windows::Foundation::Collections::IVector<winrt::hstring>> FileOpenPicker::FileTypeChoices()
54-
{
55-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
56-
return m_fileTypeChoices;
57-
}
58-
winrt::Windows::Foundation::Collections::IVector<winrt::hstring> FileOpenPicker::FileTypeFilter()
52+
winrt::Windows::Foundation::Collections::IVector<hstring> FileOpenPicker::FileTypeFilter()
5953
{
6054
return m_fileTypeFilter;
6155
}
62-
winrt::hstring FileOpenPicker::SuggestedFolder()
63-
{
64-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
65-
return m_suggestedFolder;
66-
}
67-
void FileOpenPicker::SuggestedFolder(winrt::hstring const& value)
68-
{
69-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
70-
PickerCommon::ValidateFolderPath(value, "SuggestedFolder");
71-
m_suggestedFolder = value;
72-
}
73-
winrt::hstring FileOpenPicker::SuggestedStartFolder()
74-
{
75-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
76-
return m_suggestedStartFolder;
77-
}
78-
void FileOpenPicker::SuggestedStartFolder(winrt::hstring const& value)
79-
{
80-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
81-
PickerCommon::ValidateFolderPath(value, "SuggestedStartFolder");
82-
m_suggestedStartFolder = value;
83-
}
8456

8557
void FileOpenPicker::CaptureParameters(PickerCommon::PickerParameters& parameters)
8658
{
8759
parameters.HWnd = winrt::Microsoft::UI::GetWindowFromWindowId(m_windowId);
8860
parameters.CommitButtonText = m_commitButtonText;
89-
parameters.SuggestedFolder = m_suggestedFolder;
90-
parameters.SuggestedStartLocation = m_suggestedStartLocation;
91-
parameters.SuggestedStartFolder = m_suggestedStartFolder;
92-
parameters.CaptureFilterSpecData(m_fileTypeFilter.GetView(), m_fileTypeChoices.GetView());
61+
parameters.PickerLocationId = m_suggestedStartLocation;
62+
parameters.CaptureFilterSpec(m_fileTypeFilter.GetView());
9363
}
9464

9565
winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Windows::Storage::Pickers::PickFileResult> FileOpenPicker::PickSingleFileAsync()
@@ -117,6 +87,7 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
11787
auto dialog = create_instance<IFileOpenDialog>(CLSID_FileOpenDialog, CLSCTX_INPROC_SERVER);
11888

11989
parameters.ConfigureDialog(dialog);
90+
check_hresult(dialog->SetFileTypeIndex(parameters.FileTypeFilterPara.size()));
12091

12192
{
12293
auto hr = dialog->Show(parameters.HWnd);
@@ -171,6 +142,7 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
171142
auto dialog = create_instance<IFileOpenDialog>(CLSID_FileOpenDialog, CLSCTX_INPROC_SERVER);
172143

173144
parameters.ConfigureDialog(dialog);
145+
check_hresult(dialog->SetFileTypeIndex(parameters.FileTypeFilterPara.size()));
174146

175147
FILEOPENDIALOGOPTIONS dialogOptions;
176148
check_hresult(dialog->GetOptions(&dialogOptions));

‎dev/Interop/StoragePickers/FileOpenPicker.h‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "PickerCommon.h"
77
#include "StoragePickersTelemetryHelper.h"
88
#include <winrt/Windows.Foundation.Collections.h>
9-
#include "FileTypeChoicesMap.h"
109
#include "FileTypeFilterVector.h"
1110

1211
namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
@@ -24,14 +23,7 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
2423
winrt::hstring CommitButtonText();
2524
void CommitButtonText(winrt::hstring const& value);
2625

27-
winrt::Windows::Foundation::Collections::IVector<winrt::hstring> FileTypeFilter();
28-
winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Windows::Foundation::Collections::IVector<winrt::hstring>> FileTypeChoices();
29-
30-
winrt::hstring SuggestedFolder();
31-
void SuggestedFolder(winrt::hstring const& value);
32-
33-
winrt::hstring SuggestedStartFolder();
34-
void SuggestedStartFolder(winrt::hstring const& value);
26+
winrt::Windows::Foundation::Collections::IVector<hstring> FileTypeFilter();
3527

3628
winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Windows::Storage::Pickers::PickFileResult> PickSingleFileAsync();
3729
winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Windows::Storage::Pickers::PickFileResult>> PickMultipleFilesAsync();
@@ -42,18 +34,7 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
4234
PickerLocationId m_suggestedStartLocation{ PickerLocationId::Unspecified };
4335
winrt::hstring m_commitButtonText{};
4436

45-
winrt::Windows::Foundation::Collections::IVector<winrt::hstring> m_fileTypeFilter{ make<FileTypeFilterVector>() };
46-
winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Windows::Foundation::Collections::IVector<winrt::hstring>> m_fileTypeChoices{
47-
[]()
48-
{
49-
auto map = winrt::make_self<FileTypeChoicesMap>();
50-
map->ForFeature_StoragePickers2 = true;
51-
return map.as<winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Windows::Foundation::Collections::IVector<winrt::hstring>>>();
52-
}()
53-
};
54-
55-
winrt::hstring m_suggestedFolder{};
56-
winrt::hstring m_suggestedStartFolder{};
37+
winrt::Windows::Foundation::Collections::IVector<hstring> m_fileTypeFilter{ make<FileTypeFilterVector>() };
5738

5839
StoragePickersTelemetryHelper m_telemetryHelper{};
5940

‎dev/Interop/StoragePickers/FileSavePicker.cpp‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <winrt/Microsoft.UI.Interop.h>
1616
#include <winrt/Windows.Foundation.Collections.h>
1717
#include "TerminalVelocityFeatures-StoragePickers.h"
18-
#include "TerminalVelocityFeatures-StoragePickers2.h"
1918
#include "PickerCommon.h"
2019
#include "PickerLocalization.h"
2120
#include "PickFileResult.h"
@@ -64,22 +63,10 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
6463
}
6564
void FileSavePicker::SuggestedFolder(hstring const& value)
6665
{
67-
PickerCommon::ValidateFolderPath(value, "SuggestedFolder");
66+
PickerCommon::ValidateSuggestedFolder(value);
6867
m_suggestedFolder = value;
6968
}
7069

71-
hstring FileSavePicker::SuggestedStartFolder()
72-
{
73-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
74-
return m_suggestedStartFolder;
75-
}
76-
void FileSavePicker::SuggestedStartFolder(hstring const& value)
77-
{
78-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
79-
PickerCommon::ValidateFolderPath(value, "SuggestedStartFolder");
80-
m_suggestedStartFolder = value;
81-
}
82-
8370
hstring FileSavePicker::SuggestedFileName()
8471
{
8572
return m_suggestedFileName;
@@ -95,13 +82,10 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
9582
{
9683
parameters.HWnd = winrt::Microsoft::UI::GetWindowFromWindowId(m_windowId);
9784
parameters.CommitButtonText = m_commitButtonText;
85+
parameters.PickerLocationId = m_suggestedStartLocation;
9886
parameters.SuggestedFileName = m_suggestedFileName;
9987
parameters.SuggestedFolder = m_suggestedFolder;
100-
parameters.SuggestedStartLocation = m_suggestedStartLocation;
101-
parameters.SuggestedStartFolder = m_suggestedStartFolder;
102-
parameters.CaptureFilterSpecData(
103-
winrt::Windows::Foundation::Collections::IVectorView<winrt::hstring>{},
104-
m_fileTypeChoices.GetView());
88+
parameters.CaptureFilterSpec(m_fileTypeChoices.GetView());
10589
}
10690

10791
winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Windows::Storage::Pickers::PickFileResult> FileSavePicker::PickSaveFileAsync()

‎dev/Interop/StoragePickers/FileSavePicker.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
2929
hstring SuggestedFolder();
3030
void SuggestedFolder(hstring const& value);
3131

32-
hstring SuggestedStartFolder();
33-
void SuggestedStartFolder(hstring const& value);
34-
3532
hstring SuggestedFileName();
3633
void SuggestedFileName(hstring const& value);
3734

@@ -44,7 +41,6 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
4441
winrt::Windows::Foundation::Collections::IMap<hstring, winrt::Windows::Foundation::Collections::IVector<hstring>> m_fileTypeChoices{ make<FileTypeChoicesMap>() };
4542
hstring m_defaultFileExtension{};
4643
hstring m_suggestedFolder{};
47-
hstring m_suggestedStartFolder{};
4844
hstring m_suggestedFileName{};
4945
StoragePickersTelemetryHelper m_telemetryHelper{};
5046

‎dev/Interop/StoragePickers/FileTypeChoicesMap.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "pch.h"
55
#include "FileTypeChoicesMap.h"
66
#include "FileTypeFilterVector.h"
7-
#include "TerminalVelocityFeatures-StoragePickers2.h"
87

98
namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
109
{
@@ -14,11 +13,6 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
1413

1514
bool FileTypeChoicesMap::Insert(hstring const& key, winrt::Windows::Foundation::Collections::IVector<hstring> const& value)
1615
{
17-
if (ForFeature_StoragePickers2)
18-
{
19-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
20-
}
21-
2216
// Create a new FileTypeFilterVector and copy all values from the input vector
2317
auto validatingVector = make<FileTypeFilterVector>();
2418

‎dev/Interop/StoragePickers/FileTypeChoicesMap.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
1313
{
1414
FileTypeChoicesMap();
1515

16-
bool ForFeature_StoragePickers2{ false };
17-
1816
// IMap<hstring, IVector<hstring>>
1917
winrt::Windows::Foundation::Collections::IVector<hstring> Lookup(hstring const& key) const;
2018
uint32_t Size() const;

‎dev/Interop/StoragePickers/FolderPicker.cpp‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <shobjidl_core.h>
1010
#include <winrt/Microsoft.UI.Interop.h>
1111
#include "TerminalVelocityFeatures-StoragePickers.h"
12-
#include "TerminalVelocityFeatures-StoragePickers2.h"
1312
#include "PickerCommon.h"
1413
#include "PickFolderResult.h"
1514
#include "PickerLocalization.h"
@@ -48,38 +47,15 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
4847
PickerCommon::ValidateStringNoEmbeddedNulls(value);
4948
m_commitButtonText = value;
5049
}
51-
hstring FolderPicker::SuggestedFolder()
52-
{
53-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
54-
return m_suggestedFolder;
55-
}
56-
void FolderPicker::SuggestedFolder(hstring const& value)
57-
{
58-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
59-
PickerCommon::ValidateFolderPath(value, "SuggestedFolder");
60-
m_suggestedFolder = value;
61-
}
62-
hstring FolderPicker::SuggestedStartFolder()
63-
{
64-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
65-
return m_suggestedStartFolder;
66-
}
67-
void FolderPicker::SuggestedStartFolder(hstring const& value)
68-
{
69-
THROW_HR_IF(E_NOTIMPL, !::Microsoft::Windows::Storage::Pickers::Feature_StoragePickers2::IsEnabled());
70-
PickerCommon::ValidateFolderPath(value, "SuggestedStartFolder");
71-
m_suggestedStartFolder = value;
72-
}
7350

7451
void FolderPicker::CaptureParameters(PickerCommon::PickerParameters& parameters)
7552
{
7653
parameters.HWnd = winrt::Microsoft::UI::GetWindowFromWindowId(m_windowId);
7754
parameters.CommitButtonText = m_commitButtonText;
78-
parameters.SuggestedFolder = m_suggestedFolder;
79-
parameters.SuggestedStartLocation = m_suggestedStartLocation;
80-
parameters.SuggestedStartFolder = m_suggestedStartFolder;
55+
parameters.PickerLocationId = m_suggestedStartLocation;
8156
}
8257

58+
8359
winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Windows::Storage::Pickers::PickFolderResult> FolderPicker::PickSingleFolderAsync()
8460
{
8561
// TODO: remove get strong reference when telementry is safe stop

‎dev/Interop/StoragePickers/FolderPicker.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
2121
hstring CommitButtonText();
2222
void CommitButtonText(hstring const& value);
2323

24-
hstring SuggestedFolder();
25-
void SuggestedFolder(hstring const& value);
26-
27-
hstring SuggestedStartFolder();
28-
void SuggestedStartFolder(hstring const& value);
29-
3024
winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Windows::Storage::Pickers::PickFolderResult> PickSingleFolderAsync();
3125

3226
private:
@@ -35,8 +29,6 @@ namespace winrt::Microsoft::Windows::Storage::Pickers::implementation
3529
PickerViewMode m_viewMode{ PickerViewMode::List };
3630
PickerLocationId m_suggestedStartLocation{ PickerLocationId::Unspecified };
3731
hstring m_commitButtonText{};
38-
hstring m_suggestedFolder{};
39-
hstring m_suggestedStartFolder{};
4032
StoragePickersTelemetryHelper m_telemetryHelper{};
4133

4234
void CaptureParameters(PickerCommon::PickerParameters& parameters);

0 commit comments

Comments
 (0)