diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 683980a608..6ac3b53694 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -33,6 +33,7 @@ Examples [Microsoft.UI.Xaml.2.4.0-prerelease.200506001] [Microsoft.WinUI 3.0.0-preview1.200515.3] If you seeing your issue in preview1, please try preview2. [Microsoft.WinUI 3.0.0-preview2.200713.0] +[Microsoft.WinUI 3.0.0-preview3.201113.0] --> diff --git a/FeatureAreas.props b/FeatureAreas.props old mode 100644 new mode 100755 index 9a43e2ca20..e0e151b676 --- a/FeatureAreas.props +++ b/FeatureAreas.props @@ -210,6 +210,13 @@ + + + productOnly + + + + true @@ -268,6 +275,8 @@ true true true + true + true $(DefineConstants);FEATURE_SCROLLPRESENTER_ENABLED diff --git a/MUXControls.sln b/MUXControls.sln old mode 100644 new mode 100755 index 279388a5a6..7e2c3740d4 --- a/MUXControls.sln +++ b/MUXControls.sln @@ -681,6 +681,26 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBar_TestUI", "dev\InfoB EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBar_InteractionTests", "dev\InfoBar\InteractionTests\InfoBar_InteractionTests.shproj", "{F470A64E-780E-45AA-ABB7-73A8734E51D7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PipsPager", "PipsPager", "{CE0523BB-5799-4BA0-A461-0ABC6E19F969}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PipsPager", "dev\PipsPager\PipsPager.vcxitems", "{D1EB61D8-C689-4AD1-BD61-FDAA50362563}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PipsPager_APITests", "dev\PipsPager\APITests\PipsPager_APITests.shproj", "{9CF0D73A-E435-4C17-A41C-11E9FA3EEA2F}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PipsPager_TestUI", "dev\PipsPager\TestUI\PipsPager_TestUI.shproj", "{44F0E6BC-6222-4F16-8050-BB31DD804C4A}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PipsPager_InteractionTests", "dev\PipsPager\InteractionTests\PipsPager_InteractionTests.shproj", "{B1D8E6A2-3FE6-4D80-9685-26DF2C9F4331}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImageIcon", "ImageIcon", "{BB791907-485F-4A16-9612-7FE07FCD1D21}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageIcon", "dev\ImageIcon\ImageIcon.vcxitems", "{9FB38577-696E-47BA-8AE2-F48A3C84A7CA}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ImageIcon_APITests", "dev\ImageIcon\APITests\ImageIcon_APITests.shproj", "{27AAE2E5-9687-4120-822F-CDB68B9A65B7}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ImageIcon_TestUI", "dev\ImageIcon\TestUI\ImageIcon_TestUI.shproj", "{DDE1C022-6F9A-4067-89C2-81F2EEAF249F}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ImageIcon_InteractionTests", "dev\ImageIcon\InteractionTests\ImageIcon_InteractionTests.shproj", "{F14FB632-E705-44BC-9415-75B539F483E1}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution dev\ComboBox\ComboBox.vcxitems*{00523caf-422a-4185-9392-d374b72a019a}*SharedItemsImports = 9 @@ -717,6 +737,7 @@ Global dev\ColorPicker\ColorPicker.vcxitems*{248cc96d-67a2-4359-a4e3-ab0dad110a1e}*SharedItemsImports = 9 dev\ContentDialog\ContentDialog.vcxitems*{2749c23c-0c58-4b0a-b48a-00fd4c1224d0}*SharedItemsImports = 9 dev\RatingControl\APITests\RatingControl_APITests.projitems*{274b93f7-cd18-4ed9-b569-0640529d187b}*SharedItemsImports = 13 + dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{27aae2e5-9687-4120-822f-cdb68b9a65b7}*SharedItemsImports = 13 dev\SplitButton\TestUI\SplitButton_TestUI.projitems*{280c91f4-96b5-4bde-9e02-e573e1def583}*SharedItemsImports = 13 dev\Repeater\TestUI\Repeater_TestUI.projitems*{2ed883f5-20db-4445-8c96-517a21e5e657}*SharedItemsImports = 13 dev\MenuFlyout\TestUI\MenuFlyout_TestUI.projitems*{2ef860e2-8766-41fc-bde2-e6b18bb8c206}*SharedItemsImports = 13 @@ -739,6 +760,7 @@ Global dev\TeachingTip\TestUI\TeachingTip_TestUI.projitems*{42a51d3e-f06a-41a0-be4c-f94cddb80678}*SharedItemsImports = 13 dev\RadioButtons\InteractionTests\RadioButtons_InteractionTests.projitems*{42d6e8f9-59fe-4ca5-83eb-69a7622f5742}*SharedItemsImports = 13 dev\TwoPaneView\APITests\TwoPaneView_APITests.projitems*{44deafbc-bb7a-4b02-aeab-29df2c2f8587}*SharedItemsImports = 13 + dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{44f0e6bc-6222-4f16-8050-bb31dd804c4a}*SharedItemsImports = 13 dev\ResourceHelper\ResourceHelper.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 dev\ScrollPresenter\APITests\ScrollPresenter_APITests.projitems*{474b92f7-cd58-fed9-8569-9640529d1871}*SharedItemsImports = 13 dev\NavigationView\NavigationView_InteractionTests\NavigationView_InteractionTests.projitems*{475c3a33-637a-44dc-b789-6c2d78a75283}*SharedItemsImports = 13 @@ -797,7 +819,9 @@ Global dev\Repeater\InteractionTests\Repeater_InteractionTests.projitems*{999e00c9-0e58-402a-8e0e-cbafb0adc7e3}*SharedItemsImports = 13 dev\SwipeControl\SwipeControl_InteractionTests\SwipeControl_InteractionTests.projitems*{9a8da438-193c-4950-a046-2952de2d3b0b}*SharedItemsImports = 13 dev\TwoPaneView\TestUI\TwoPaneView_TestUI.projitems*{9c533ec3-f8fa-4b0e-ba1b-3323932cdfcb}*SharedItemsImports = 13 + dev\PipsPager\APITests\PipsPager_APITests.projitems*{9cf0d73a-e435-4c17-a41c-11e9fa3eea2f}*SharedItemsImports = 13 dev\NumberBox\NumberBox.vcxitems*{9d23c997-1f46-444a-8c07-4a4bff7e4e63}*SharedItemsImports = 9 + dev\ImageIcon\ImageIcon.vcxitems*{9fb38577-696e-47ba-8ae2-f48a3c84a7ca}*SharedItemsImports = 9 dev\Repeater\Repeater.vcxitems*{a0aa8919-2140-42db-beb1-b2c3ace594f4}*SharedItemsImports = 9 dev\CommonStyles\InteractionTests\CommonStyles_InteractionTests.projitems*{a25ae312-7c11-4e30-ae35-2e31c744a250}*SharedItemsImports = 13 dev\ColorPicker\InteractionTests\ColorPicker_InteractionTests.projitems*{a4d2fae8-e7fc-4100-91ff-2202fac91c70}*SharedItemsImports = 13 @@ -823,6 +847,7 @@ Global dev\Expander\Expander.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\FlipView\FlipView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\IconSource\IconSource.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\ImageIcon\ImageIcon.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\InfoBar\InfoBar.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Interactions\ButtonInteraction\ButtonInteraction.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Interactions\SliderInteraction\SliderInteraction.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -837,6 +862,7 @@ Global dev\PagerControl\PagerControl.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ParallaxView\ParallaxView.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\PersonPicture\PersonPicture.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\PipsPager\PipsPager.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Pivot\Pivot.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ProgressBar\ProgressBar.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ProgressRing\ProgressRing.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -871,6 +897,7 @@ Global dev\TimePicker\TimePicker.vcxitems*{afd20f66-d203-4da9-b8ea-4e3f99a53f99}*SharedItemsImports = 9 dev\CalendarView\CalendarView.vcxitems*{b0016539-9ee1-42b4-a247-fd45c8511656}*SharedItemsImports = 9 dev\PersonPicture\InteractionTests\PersonPicture_InteractionTests.projitems*{b0c15318-1f57-4914-b860-ebf248841511}*SharedItemsImports = 13 + dev\PipsPager\InteractionTests\PipsPager_InteractionTests.projitems*{b1d8e6a2-3fe6-4d80-9685-26df2c9f4331}*SharedItemsImports = 13 dev\TreeView\TestUI\TreeView_TestUI.projitems*{b2c714dd-9c6b-400c-9cef-13a2d48378bd}*SharedItemsImports = 13 dev\AnimatedVisualPlayer\AnimatedVisualPlayer.vcxitems*{b39300d2-4510-44ea-aa7b-eda9118f830e}*SharedItemsImports = 9 dev\ProgressRing\TestUI\ProgressRing_TestUI.projitems*{b58ec806-9951-4e5e-af29-a700a088770e}*SharedItemsImports = 13 @@ -895,6 +922,7 @@ Global dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{cddf46ef-aa2d-4bb3-b33e-98b3dbb3c41b}*SharedItemsImports = 13 dev\Interactions\SliderInteraction\SliderInteraction.vcxitems*{d097a4d5-6b61-424d-99f0-f335eff41665}*SharedItemsImports = 9 dev\TabView\InteractionTests\TabView_InteractionTests.projitems*{d1e297b4-5e5b-4807-8624-4141c817a98a}*SharedItemsImports = 13 + dev\PipsPager\PipsPager.vcxitems*{d1eb61d8-c689-4ad1-bd61-fdaa50362563}*SharedItemsImports = 9 dev\MenuFlyout\MenuFlyout.vcxitems*{d5c2b2a0-50af-4ace-939d-17d1ed79fd6f}*SharedItemsImports = 9 dev\Expander\InteractionTests\Expander_InteractionTests.projitems*{d6df4ab9-facc-4e51-8c57-6b1f96919365}*SharedItemsImports = 13 dev\IconSource\APITests\IconSource_APITests.projitems*{d73627e9-564c-4a72-a12d-f6c82f17ad0d}*SharedItemsImports = 13 @@ -902,6 +930,7 @@ Global dev\DropDownButton\InteractionTests\DropDownButton_InteractionTests.projitems*{d9ac3716-5608-40d0-999f-26f4b544be33}*SharedItemsImports = 13 dev\AnimatedVisualPlayer\TestUI\AnimatedVisualPlayer_TestUI.projitems*{dbec0be4-ba3f-41c9-a303-af98201be6dc}*SharedItemsImports = 13 dev\PullToRefresh\RefreshContainer\TestUI\RefreshContainer_TestUI.projitems*{ddb468e4-7b64-4301-8fcb-1bebbb1e689f}*SharedItemsImports = 13 + dev\ImageIcon\TestUI\ImageIcon_TestUI.projitems*{dde1c022-6f9a-4067-89c2-81f2eeaf249f}*SharedItemsImports = 13 dev\CommonManaged\CommonManaged.projitems*{de061ed1-947e-487c-81b8-32e92e85b95f}*SharedItemsImports = 13 test\IXMPTestApp\IXMPTestApp.Shared.projitems*{de061ed1-947e-487c-81b8-32e92e85b95f}*SharedItemsImports = 13 dev\TreeView\APITests\TreeView_APITests.projitems*{de885c66-929c-464e-bac4-3e076ec46483}*SharedItemsImports = 13 @@ -928,6 +957,8 @@ Global dev\Expander\TestUI\Expander_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\FlipView\TestUI\FlipView_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\IconSource\APITests\IconSource_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\ImageIcon\TestUI\ImageIcon_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Materials\Acrylic\APITests\AcrylicBrush_ApiTests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 @@ -946,6 +977,8 @@ Global dev\ParallaxView\TestUI\ParallaxView_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\PersonPicture\APITests\PersonPicture_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\PersonPicture\TestUI\PersonPicture_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PipsPager\APITests\PipsPager_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\Pivot\TestUI\Pivot_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\ProgressBar\TestUI\ProgressBar_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\ProgressRing\TestUI\ProgressRing_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 @@ -997,6 +1030,7 @@ Global dev\AutoSuggestBox\InteractionTests\AutoSuggestBox_InteractionTests.projitems*{ed3e2182-d259-4dc0-b7bb-9b4219762f4c}*SharedItemsImports = 13 dev\PullToRefresh\RefreshVisualizer\RefreshVisualizer.vcxitems*{ed7dba65-8f09-44f3-8d25-7bb5a7a89609}*SharedItemsImports = 9 dev\TreeView\TreeView.vcxitems*{eeb38379-3a5c-439f-bb5e-535d75f2b6c1}*SharedItemsImports = 9 + dev\ImageIcon\InteractionTests\ImageIcon_InteractionTests.projitems*{f14fb632-e705-44bc-9415-75b539f483e1}*SharedItemsImports = 13 dev\PullToRefresh\RefreshContainer\InteractionTests\RefreshContainer_InteractionTests.projitems*{f30fe0d3-2e44-405e-8519-ec3ab098c41f}*SharedItemsImports = 13 dev\InfoBar\InteractionTests\InfoBar_InteractionTests.projitems*{f470a64e-780e-45aa-abb7-73a8734e51d7}*SharedItemsImports = 13 dev\SplitView\SplitView.vcxitems*{f567d0a2-9c61-4793-ae79-12da915ac11f}*SharedItemsImports = 9 @@ -1025,6 +1059,8 @@ Global dev\Expander\TestUI\Expander_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\FlipView\TestUI\FlipView_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\IconSource\APITests\IconSource_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\ImageIcon\TestUI\ImageIcon_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Materials\Acrylic\APITests\AcrylicBrush_ApiTests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 @@ -1043,6 +1079,8 @@ Global dev\ParallaxView\TestUI\ParallaxView_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\PersonPicture\APITests\PersonPicture_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\PersonPicture\TestUI\PersonPicture_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PipsPager\APITests\PipsPager_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Pivot\TestUI\Pivot_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\ProgressBar\TestUI\ProgressBar_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\ProgressRing\TestUI\ProgressRing_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 @@ -1701,19 +1739,29 @@ Global {DB2DBB48-C807-4F7C-943E-385E77DF7BDE} = {C0215617-A17B-45DB-9CDA-C46C0923DA55} {6B4C9F2E-6A2C-48AD-944B-49B9E9BF028D} = {C0215617-A17B-45DB-9CDA-C46C0923DA55} {10183D43-1785-443E-AEB7-C426FDF14964} = {05CB5DBD-A481-4DFF-B1A3-642F049D165C} - {84BB4F12-73FD-4E4A-8724-C2C060DF5E82} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} - {EC3B6F65-32C6-4BC8-8902-EE0B397E2787} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82} - {50C1F1D3-20AA-49A8-9E4C-CF4E5811A1D8} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82} - {D6DF4AB9-FACC-4E51-8C57-6B1F96919365} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82} {11DC7B03-88FB-4985-BF77-2BB3A13C75A8} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} {AB3261A7-9A8D-4A27-AEA2-3AAC0419C889} = {11DC7B03-88FB-4985-BF77-2BB3A13C75A8} {225C4174-3141-49B8-ADE2-C7D3408D5103} = {11DC7B03-88FB-4985-BF77-2BB3A13C75A8} {4F64C819-664F-436A-BCDB-8AB3019B9DD5} = {11DC7B03-88FB-4985-BF77-2BB3A13C75A8} {CB2352E2-D633-41A3-8CDC-B28731A4C490} = {11DC7B03-88FB-4985-BF77-2BB3A13C75A8} + {84BB4F12-73FD-4E4A-8724-C2C060DF5E82} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} + {EC3B6F65-32C6-4BC8-8902-EE0B397E2787} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82} + {50C1F1D3-20AA-49A8-9E4C-CF4E5811A1D8} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82} + {D6DF4AB9-FACC-4E51-8C57-6B1F96919365} = {84BB4F12-73FD-4E4A-8724-C2C060DF5E82} {CEFD707F-6686-4CF4-8D4C-B5FECD50D739} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} {CCC102B7-F5EF-479D-94F1-008D189448B1} = {CEFD707F-6686-4CF4-8D4C-B5FECD50D739} {32DFAF1E-C2EC-4C52-A4D8-B3A3946242B4} = {CEFD707F-6686-4CF4-8D4C-B5FECD50D739} {F470A64E-780E-45AA-ABB7-73A8734E51D7} = {CEFD707F-6686-4CF4-8D4C-B5FECD50D739} + {CE0523BB-5799-4BA0-A461-0ABC6E19F969} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} + {D1EB61D8-C689-4AD1-BD61-FDAA50362563} = {CE0523BB-5799-4BA0-A461-0ABC6E19F969} + {9CF0D73A-E435-4C17-A41C-11E9FA3EEA2F} = {CE0523BB-5799-4BA0-A461-0ABC6E19F969} + {44F0E6BC-6222-4F16-8050-BB31DD804C4A} = {CE0523BB-5799-4BA0-A461-0ABC6E19F969} + {B1D8E6A2-3FE6-4D80-9685-26DF2C9F4331} = {CE0523BB-5799-4BA0-A461-0ABC6E19F969} + {BB791907-485F-4A16-9612-7FE07FCD1D21} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} + {9FB38577-696E-47BA-8AE2-F48A3C84A7CA} = {BB791907-485F-4A16-9612-7FE07FCD1D21} + {27AAE2E5-9687-4120-822F-CDB68B9A65B7} = {BB791907-485F-4A16-9612-7FE07FCD1D21} + {DDE1C022-6F9A-4067-89C2-81F2EEAF249F} = {BB791907-485F-4A16-9612-7FE07FCD1D21} + {F14FB632-E705-44BC-9415-75B539F483E1} = {BB791907-485F-4A16-9612-7FE07FCD1D21} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED} diff --git a/MUXControlsInnerLoop.sln b/MUXControlsInnerLoop.sln old mode 100644 new mode 100755 index a70b9742e6..3ffd728833 --- a/MUXControlsInnerLoop.sln +++ b/MUXControlsInnerLoop.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29009.5 @@ -496,6 +496,26 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBar_InteractionTests", EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InfoBar_TestUI", "dev\InfoBar\TestUI\InfoBar_TestUI.shproj", "{32DFAF1E-C2EC-4C52-A4D8-B3A3946242B4}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PipsPager", "PipsPager", "{AA960C72-877F-4F3C-92D2-7ADD34D643F4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PipsPager", "dev\PipsPager\PipsPager.vcxitems", "{D1EB61D8-C689-4AD1-BD61-FDAA50362563}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PipsPager_APITests", "dev\PipsPager\APITests\PipsPager_APITests.shproj", "{9CF0D73A-E435-4C17-A41C-11E9FA3EEA2F}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PipsPager_TestUI", "dev\PipsPager\TestUI\PipsPager_TestUI.shproj", "{44F0E6BC-6222-4F16-8050-BB31DD804C4A}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PipsPager_InteractionTests", "dev\PipsPager\InteractionTests\PipsPager_InteractionTests.shproj", "{B1D8E6A2-3FE6-4D80-9685-26DF2C9F4331}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImageIcon", "ImageIcon", "{21638B33-D4DE-4D10-84F8-3E2DACF975C7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageIcon", "dev\ImageIcon\ImageIcon.vcxitems", "{9FB38577-696E-47BA-8AE2-F48A3C84A7CA}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ImageIcon_APITests", "dev\ImageIcon\APITests\ImageIcon_APITests.shproj", "{27AAE2E5-9687-4120-822F-CDB68B9A65B7}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ImageIcon_TestUI", "dev\ImageIcon\TestUI\ImageIcon_TestUI.shproj", "{DDE1C022-6F9A-4067-89C2-81F2EEAF249F}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ImageIcon_InteractionTests", "dev\ImageIcon\InteractionTests\ImageIcon_InteractionTests.shproj", "{F14FB632-E705-44BC-9415-75B539F483E1}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution dev\ComboBox\ComboBox.vcxitems*{00523caf-422a-4185-9392-d374b72a019a}*SharedItemsImports = 9 @@ -530,6 +550,7 @@ Global dev\Interactions\ButtonInteraction\ButtonInteraction.vcxitems*{2459bc06-2ae5-4c65-ba73-ab28090b6fab}*SharedItemsImports = 9 dev\ColorPicker\ColorPicker.vcxitems*{248cc96d-67a2-4359-a4e3-ab0dad110a1e}*SharedItemsImports = 9 dev\RatingControl\APITests\RatingControl_APITests.projitems*{274b93f7-cd18-4ed9-b569-0640529d187b}*SharedItemsImports = 13 + dev\ImageIcon\APITests\ImageIcon_APITests.projitems*{27aae2e5-9687-4120-822f-cdb68b9a65b7}*SharedItemsImports = 13 dev\SplitButton\TestUI\SplitButton_TestUI.projitems*{280c91f4-96b5-4bde-9e02-e573e1def583}*SharedItemsImports = 13 dev\Repeater\TestUI\Repeater_TestUI.projitems*{2ed883f5-20db-4445-8c96-517a21e5e657}*SharedItemsImports = 13 dev\MenuFlyout\TestUI\MenuFlyout_TestUI.projitems*{2ef860e2-8766-41fc-bde2-e6b18bb8c206}*SharedItemsImports = 13 @@ -551,6 +572,7 @@ Global dev\TeachingTip\TestUI\TeachingTip_TestUI.projitems*{42a51d3e-f06a-41a0-be4c-f94cddb80678}*SharedItemsImports = 13 dev\RadioButtons\InteractionTests\RadioButtons_InteractionTests.projitems*{42d6e8f9-59fe-4ca5-83eb-69a7622f5742}*SharedItemsImports = 13 dev\TwoPaneView\APITests\TwoPaneView_APITests.projitems*{44deafbc-bb7a-4b02-aeab-29df2c2f8587}*SharedItemsImports = 13 + dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{44f0e6bc-6222-4f16-8050-bb31dd804c4a}*SharedItemsImports = 13 dev\ResourceHelper\ResourceHelper.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 dev\ScrollPresenter\APITests\ScrollPresenter_APITests.projitems*{474b92f7-cd58-fed9-8569-9640529d1871}*SharedItemsImports = 13 dev\NavigationView\NavigationView_InteractionTests\NavigationView_InteractionTests.projitems*{475c3a33-637a-44dc-b789-6c2d78a75283}*SharedItemsImports = 13 @@ -606,7 +628,9 @@ Global dev\Repeater\InteractionTests\Repeater_InteractionTests.projitems*{999e00c9-0e58-402a-8e0e-cbafb0adc7e3}*SharedItemsImports = 13 dev\SwipeControl\SwipeControl_InteractionTests\SwipeControl_InteractionTests.projitems*{9a8da438-193c-4950-a046-2952de2d3b0b}*SharedItemsImports = 13 dev\TwoPaneView\TestUI\TwoPaneView_TestUI.projitems*{9c533ec3-f8fa-4b0e-ba1b-3323932cdfcb}*SharedItemsImports = 13 + dev\PipsPager\APITests\PipsPager_APITests.projitems*{9cf0d73a-e435-4c17-a41c-11e9fa3eea2f}*SharedItemsImports = 13 dev\NumberBox\NumberBox.vcxitems*{9d23c997-1f46-444a-8c07-4a4bff7e4e63}*SharedItemsImports = 9 + dev\ImageIcon\ImageIcon.vcxitems*{9fb38577-696e-47ba-8ae2-f48a3c84a7ca}*SharedItemsImports = 9 dev\Repeater\Repeater.vcxitems*{a0aa8919-2140-42db-beb1-b2c3ace594f4}*SharedItemsImports = 9 dev\CommonStyles\InteractionTests\CommonStyles_InteractionTests.projitems*{a25ae312-7c11-4e30-ae35-2e31c744a250}*SharedItemsImports = 13 dev\ColorPicker\InteractionTests\ColorPicker_InteractionTests.projitems*{a4d2fae8-e7fc-4100-91ff-2202fac91c70}*SharedItemsImports = 13 @@ -614,17 +638,18 @@ Global dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{a800e818-7212-4fd7-ae3a-1dcab539db87}*SharedItemsImports = 13 dev\PagerControl\PagerControl.vcxitems*{ab3261a7-9a8d-4a27-aea2-3aac0419c889}*SharedItemsImports = 9 dev\Collections\Collections.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\ComboBox\ComboBox.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\CommonStyles\CommonStyles.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Common\Common.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\DropDownButton\DropDownButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Effects\Microsoft.UI.Composition.Effects.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 - dev\Expander\Expander.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\IconSource\IconSource.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 - dev\InfoBar\InfoBar.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Lights\Lights.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Materials\Acrylic\AcrylicBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Materials\Reveal\RevealBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\NumberBox\NumberBox.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\PagerControl\PagerControl.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 + dev\PipsPager\PipsPager.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\Repeater\Repeater.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\ResourceHelper\ResourceHelper.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 dev\SplitButton\SplitButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4 @@ -635,6 +660,7 @@ Global dev\RatingControl\InteractionTests\RatingControl_InteractionTests.projitems*{afaad014-132c-4d2a-a28e-4ef717d3e647}*SharedItemsImports = 13 dev\TimePicker\TimePicker.vcxitems*{afd20f66-d203-4da9-b8ea-4e3f99a53f99}*SharedItemsImports = 9 dev\PersonPicture\InteractionTests\PersonPicture_InteractionTests.projitems*{b0c15318-1f57-4914-b860-ebf248841511}*SharedItemsImports = 13 + dev\PipsPager\InteractionTests\PipsPager_InteractionTests.projitems*{b1d8e6a2-3fe6-4d80-9685-26df2c9f4331}*SharedItemsImports = 13 dev\TreeView\TestUI\TreeView_TestUI.projitems*{b2c714dd-9c6b-400c-9cef-13a2d48378bd}*SharedItemsImports = 13 dev\AnimatedVisualPlayer\AnimatedVisualPlayer.vcxitems*{b39300d2-4510-44ea-aa7b-eda9118f830e}*SharedItemsImports = 9 dev\ProgressRing\TestUI\ProgressRing_TestUI.projitems*{b58ec806-9951-4e5e-af29-a700a088770e}*SharedItemsImports = 13 @@ -658,19 +684,21 @@ Global dev\LayoutPanel\APITests\LayoutPanel_APITests.projitems*{cddf46ef-aa2d-4bb3-b33e-98b3dbb3c41b}*SharedItemsImports = 13 dev\Interactions\SliderInteraction\SliderInteraction.vcxitems*{d097a4d5-6b61-424d-99f0-f335eff41665}*SharedItemsImports = 9 dev\TabView\InteractionTests\TabView_InteractionTests.projitems*{d1e297b4-5e5b-4807-8624-4141c817a98a}*SharedItemsImports = 13 + dev\PipsPager\PipsPager.vcxitems*{d1eb61d8-c689-4ad1-bd61-fdaa50362563}*SharedItemsImports = 9 dev\MenuFlyout\MenuFlyout.vcxitems*{d5c2b2a0-50af-4ace-939d-17d1ed79fd6f}*SharedItemsImports = 9 dev\Expander\InteractionTests\Expander_InteractionTests.projitems*{d6df4ab9-facc-4e51-8c57-6b1f96919365}*SharedItemsImports = 13 dev\IconSource\APITests\IconSource_APITests.projitems*{d73627e9-564c-4a72-a12d-f6c82f17ad0d}*SharedItemsImports = 13 dev\DropDownButton\InteractionTests\DropDownButton_InteractionTests.projitems*{d9ac3716-5608-40d0-999f-26f4b544be33}*SharedItemsImports = 13 dev\AnimatedVisualPlayer\TestUI\AnimatedVisualPlayer_TestUI.projitems*{dbec0be4-ba3f-41c9-a303-af98201be6dc}*SharedItemsImports = 13 dev\PullToRefresh\RefreshContainer\TestUI\RefreshContainer_TestUI.projitems*{ddb468e4-7b64-4301-8fcb-1bebbb1e689f}*SharedItemsImports = 13 + dev\ImageIcon\TestUI\ImageIcon_TestUI.projitems*{dde1c022-6f9a-4067-89c2-81f2eeaf249f}*SharedItemsImports = 13 dev\TreeView\APITests\TreeView_APITests.projitems*{de885c66-929c-464e-bac4-3e076ec46483}*SharedItemsImports = 13 dev\Pivot\TestUI\Pivot_TestUI.projitems*{deb3fa60-e4a7-4735-89f2-363c7c56b428}*SharedItemsImports = 13 dev\CommonManaged\CommonManaged.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 - dev\Expander\TestUI\Expander_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 - dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 - dev\NumberBox\APITests\NumberBox_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 - dev\NumberBox\TestUI\NumberBox_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PagerControl\APITests\PagerControl_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PagerControl\TestUI\PagerControl_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PipsPager\APITests\PipsPager_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 + dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 test\TestAppUtils\TestAppUtils.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4 dev\SplitButton\InteractionTests\SplitButton_InteractionTests.projitems*{e1c861e2-c4d9-41e1-aed7-5e203451bd4d}*SharedItemsImports = 13 dev\DatePicker\TestUI\DatePicker_TestUI.projitems*{e20f725c-3a53-463b-ada9-ff2088aaca4d}*SharedItemsImports = 13 @@ -683,15 +711,16 @@ Global dev\Expander\Expander.vcxitems*{ec3b6f65-32c6-4bc8-8902-ee0b397e2787}*SharedItemsImports = 9 dev\PullToRefresh\RefreshVisualizer\RefreshVisualizer.vcxitems*{ed7dba65-8f09-44f3-8d25-7bb5a7a89609}*SharedItemsImports = 9 dev\TreeView\TreeView.vcxitems*{eeb38379-3a5c-439f-bb5e-535d75f2b6c1}*SharedItemsImports = 9 + dev\ImageIcon\InteractionTests\ImageIcon_InteractionTests.projitems*{f14fb632-e705-44bc-9415-75b539f483e1}*SharedItemsImports = 13 dev\PullToRefresh\RefreshContainer\InteractionTests\RefreshContainer_InteractionTests.projitems*{f30fe0d3-2e44-405e-8519-ec3ab098c41f}*SharedItemsImports = 13 dev\InfoBar\InteractionTests\InfoBar_InteractionTests.projitems*{f470a64e-780e-45aa-abb7-73a8734e51d7}*SharedItemsImports = 13 dev\Materials\Acrylic\InteractionTests\AcrylicBrush_InteractionTests.projitems*{f601284a-00c1-49f9-99b3-70d45585f784}*SharedItemsImports = 13 dev\SplitButton\SplitButton.vcxitems*{faf114dd-af1f-4d9f-a511-354c19912aad}*SharedItemsImports = 9 dev\CommonManaged\CommonManaged.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 - dev\Expander\TestUI\Expander_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 - dev\InfoBar\TestUI\InfoBar_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 - dev\NumberBox\APITests\NumberBox_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 - dev\NumberBox\TestUI\NumberBox_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PagerControl\APITests\PagerControl_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PagerControl\TestUI\PagerControl_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PipsPager\APITests\PipsPager_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 + dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 test\TestAppUtils\TestAppUtils.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4 dev\Slider\Slider.vcxitems*{fc2178ca-7f72-40f0-916c-a2b3750bbb6c}*SharedItemsImports = 9 dev\LayoutPanel\LayoutPanel.vcxitems*{fd3c1a00-0d07-4849-a3b9-646f0ff21d7b}*SharedItemsImports = 9 @@ -1139,25 +1168,31 @@ Global {990BBC65-1114-435D-B5CC-1EB8AAAD72DD} = {633B8D7A-3207-4BD3-8159-B65710AEA6FF} {128E6F7A-578C-48DC-BD3F-750EC662C268} = {633B8D7A-3207-4BD3-8159-B65710AEA6FF} {6F7831A4-48F8-41E8-A573-C567A1223CB5} = {05CB5DBD-A481-4DFF-B1A3-642F049D165C} - {93FAB536-1139-4FD1-B0BF-97C0C6FAB378} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} - {EC3B6F65-32C6-4BC8-8902-EE0B397E2787} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378} - {50C1F1D3-20AA-49A8-9E4C-CF4E5811A1D8} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378} - {D6DF4AB9-FACC-4E51-8C57-6B1F96919365} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378} {E7C2104F-770D-4375-8D3A-D173F222273A} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} {AB3261A7-9A8D-4A27-AEA2-3AAC0419C889} = {E7C2104F-770D-4375-8D3A-D173F222273A} {225C4174-3141-49B8-ADE2-C7D3408D5103} = {E7C2104F-770D-4375-8D3A-D173F222273A} {4F64C819-664F-436A-BCDB-8AB3019B9DD5} = {E7C2104F-770D-4375-8D3A-D173F222273A} {CB2352E2-D633-41A3-8CDC-B28731A4C490} = {E7C2104F-770D-4375-8D3A-D173F222273A} - {0EC260CC-03C7-4790-B16A-43428EBCF5AD} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} - {3566798E-9E24-44EF-B89D-2A62AE8F697A} = {0EC260CC-03C7-4790-B16A-43428EBCF5AD} - {675121BF-CABC-48E7-9C9D-4571BC507406} = {0EC260CC-03C7-4790-B16A-43428EBCF5AD} - {675373CE-6ACD-4C4B-A009-09A3C9B218E6} = {0EC260CC-03C7-4790-B16A-43428EBCF5AD} + {93FAB536-1139-4FD1-B0BF-97C0C6FAB378} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} + {EC3B6F65-32C6-4BC8-8902-EE0B397E2787} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378} + {50C1F1D3-20AA-49A8-9E4C-CF4E5811A1D8} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378} + {D6DF4AB9-FACC-4E51-8C57-6B1F96919365} = {93FAB536-1139-4FD1-B0BF-97C0C6FAB378} {1AD0CB4F-47F0-432B-8D4F-CE33FA3EB8A9} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} {CCC102B7-F5EF-479D-94F1-008D189448B1} = {1AD0CB4F-47F0-432B-8D4F-CE33FA3EB8A9} {F470A64E-780E-45AA-ABB7-73A8734E51D7} = {1AD0CB4F-47F0-432B-8D4F-CE33FA3EB8A9} {32DFAF1E-C2EC-4C52-A4D8-B3A3946242B4} = {1AD0CB4F-47F0-432B-8D4F-CE33FA3EB8A9} + {AA960C72-877F-4F3C-92D2-7ADD34D643F4} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} + {D1EB61D8-C689-4AD1-BD61-FDAA50362563} = {AA960C72-877F-4F3C-92D2-7ADD34D643F4} + {9CF0D73A-E435-4C17-A41C-11E9FA3EEA2F} = {AA960C72-877F-4F3C-92D2-7ADD34D643F4} + {44F0E6BC-6222-4F16-8050-BB31DD804C4A} = {AA960C72-877F-4F3C-92D2-7ADD34D643F4} + {B1D8E6A2-3FE6-4D80-9685-26DF2C9F4331} = {AA960C72-877F-4F3C-92D2-7ADD34D643F4} + {21638B33-D4DE-4D10-84F8-3E2DACF975C7} = {67599AD5-51EC-44CB-85CE-B60CD8CBA270} + {9FB38577-696E-47BA-8AE2-F48A3C84A7CA} = {21638B33-D4DE-4D10-84F8-3E2DACF975C7} + {27AAE2E5-9687-4120-822F-CDB68B9A65B7} = {21638B33-D4DE-4D10-84F8-3E2DACF975C7} + {DDE1C022-6F9A-4067-89C2-81F2EEAF249F} = {21638B33-D4DE-4D10-84F8-3E2DACF975C7} + {F14FB632-E705-44BC-9415-75B539F483E1} = {21638B33-D4DE-4D10-84F8-3E2DACF975C7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED} EndGlobalSection -EndGlobal \ No newline at end of file +EndGlobal diff --git a/README.md b/README.md index 1525a05bbd..32ab4164e3 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,13 @@ You can watch them online here on YouTube at the [Windows Developer channel](htt Add the event to your calendar: [ICS calendar file](https://aka.ms/winuicommunitycall) -## WinUI 3.0 Preview 2 (July 2020) +## WinUI 3.0 Preview 3 (November 2020) As outlined in the [roadmap](docs/roadmap.md) we're currently working on WinUI 3.0, which will greatly expand the scope of WinUI to include the full native Windows UI platform. -You can now [download an early build of WinUI 3.0 Preview 2](https://docs.microsoft.com/uwp/toolkits/winui3/) to try out - we'd love your feedback! +You can now [download an early build of WinUI 3.0 Preview 3](https://docs.microsoft.com/uwp/toolkits/winui3/) to try out - we'd love your feedback! -For more info see the [discussion issue #2917](https://github.com/microsoft/microsoft-ui-xaml/issues/2917). +For more info see the [discussion issue #2917](https://github.com/microsoft/microsoft-ui-xaml/issues/3620). ## Using WinUI You can download and use WinUI packages in your app using the NuGet package manager: see the [Getting Started with the Windows UI Library](https://docs.microsoft.com/uwp/toolkits/winui/getting-started) page for more information. diff --git a/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml b/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml index edc061ea21..c1f8bc9cf6 100644 --- a/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml +++ b/build/AzurePipelinesTemplates/MUX-CreateNugetPackage-Job.yml @@ -60,6 +60,13 @@ jobs: sourceFolder: '$(Build.SourcesDirectory)\Artifacts\drop' Contents: '**\Microsoft.UI.Xaml*.appx' + # Copy the CBS packages into the same location in the artifact drop to be republished at the end of the job. + - task: CopyFiles@2 + inputs: + targetFolder: '${{ parameters.nupkgdir }}' + sourceFolder: '$(Build.SourcesDirectory)\Artifacts\drop' + Contents: '**\CBS*' + - powershell: | $prereleaseTag = "${{ parameters.prereleaseVersionTag }}" if ("${{ parameters.useReleaseTag}}" -eq [bool]::TrueString) { $prereleaseTag = "" } diff --git a/build/FrameworkPackage/MakeFrameworkPackage.ps1 b/build/FrameworkPackage/MakeFrameworkPackage.ps1 index b0d0457de2..b2fd32f7c2 100644 --- a/build/FrameworkPackage/MakeFrameworkPackage.ps1 +++ b/build/FrameworkPackage/MakeFrameworkPackage.ps1 @@ -229,10 +229,14 @@ $manifestContents = $manifestContents.Replace('$(ActivatableTypes)', "$Activatab $manifestContents = $manifestContents.Replace('$(Version)', "$Version") Set-Content -Value $manifestContents $fullOutputPath\PackageContents\AppxManifest.xml +$manifestContents = $manifestContents.Replace("$PackageName", "Microsoft.UI.Xaml.CBS") +$manifestContents = $manifestContents.Replace('FrameworkPackageDetector', "CBSPackageDetector") +Set-Content -Value $manifestContents $fullOutputPath\CBSAppxManifest.xml # Call GetFullPath to clean up the path -- makepri is very picky about double slashes in the path. $priConfigPath = [IO.Path]::GetFullPath("$fullOutputPath\priconfig.xml") $priOutputPath = [IO.Path]::GetFullPath("$fullOutputPath\resources.pri") +$priCBSOutputPath = [IO.Path]::GetFullPath("$fullOutputPath\CBSresources.pri") $noiseAssetPath = [IO.Path]::GetFullPath("$fullOutputPath\Assets\NoiseAsset_256x256_PNG.png") $resourceContents = [IO.Path]::GetFullPath("$fullOutputPath\Resources") $pfxPath = [IO.Path]::GetFullPath("..\MSTest.pfx") @@ -259,6 +263,11 @@ Write-Host $makepriNew cmd /c $makepriNew if ($LastExitCode -ne 0) { Exit 1 } +$makepriNew = "`"" + (Join-Path $WindowsSdkBinDir "makepri.exe") + "`" new /pr $fullOutputPath /cf $priConfigPath /of $priCBSOutputPath /in Microsoft.UI.Xaml.CBS /o" +Write-Host $makepriNew +cmd /c $makepriNew +if ($LastExitCode -ne 0) { Exit 1 } + $outputAppxFileFullPath = Join-Path $fullOutputPath "$PackageName.appx" $outputAppxFileFullPath = [IO.Path]::GetFullPath($outputAppxFileFullPath) diff --git a/build/Localization/Settings/LocConfig.xml b/build/Localization/Settings/LocConfig.xml index 9a46102485..c677ba2a16 100644 --- a/build/Localization/Settings/LocConfig.xml +++ b/build/Localization/Settings/LocConfig.xml @@ -3,29 +3,50 @@ - - + + + location="NumberBox" + path="%LocRoot%\..\..\dev\NumberBox\Strings\en-us\Resources.resw"/> + + + + + + + location="TreeView" + path="%LocRoot%\..\..\dev\TreeView\Strings\en-us\Resources.resw"/> + diff --git a/build/NuSpecs/Intellisense/Microsoft.UI.Xaml.xml b/build/NuSpecs/Intellisense/Microsoft.UI.Xaml.xml index c4cd946b7c..e4447792e8 100644 --- a/build/NuSpecs/Intellisense/Microsoft.UI.Xaml.xml +++ b/build/NuSpecs/Intellisense/Microsoft.UI.Xaml.xml @@ -5,28 +5,28 @@ - Exposes AnimatedVisualPlayer types to Microsoft UI Automation.. + Exposes AnimatedVisualPlayer types to Microsoft UI Automation. Initializes a new instance of the AnimatedVisualPlayerAutomationPeer class. The AnimatedVisualPlayer control instance to create the peer for. - Exposes ColorPickerSlider types to Microsoft UI Automation.. + Exposes ColorPickerSlider types to Microsoft UI Automation. Initializes a new instance of the ColorPickerSliderAutomationPeer class. The ColorPickerSlider control instance to create the peer for. - Exposes ColorSpectrum types to Microsoft UI Automation.. + Exposes ColorSpectrum types to Microsoft UI Automation. Initializes a new instance of the ColorSpectrumAutomationPeer class. The ColorSpectrum control instance to create the peer for. - Exposes DropDownButton types to Microsoft UI Automation.. + Exposes DropDownButton types to Microsoft UI Automation. Initializes a new instance of the DropDownButtonAutomationPeer class. @@ -42,15 +42,19 @@ Gets the state, expanded or collapsed, of the DropDownButton. A value of the enumeration. + + + + - Exposes MenuBar types to Microsoft UI Automation.. + Exposes MenuBar types to Microsoft UI Automation. Initializes a new instance of the MenuBarAutomationPeer class. The MenuBar control instance to create the peer for. - Exposes MenuBarItem types to Microsoft UI Automation.. + Exposes MenuBarItem types to Microsoft UI Automation. Initializes a new instance of the MenuBarItemAutomationPeer class. @@ -74,7 +78,7 @@ - Exposes NavigationViewItem types to Microsoft UI Automation.. + Exposes NavigationViewItem types to Microsoft UI Automation. Initializes a new instance of the NavigationViewItemAutomationPeer class. @@ -91,42 +95,55 @@ Expanded if the NavigationViewItem is currently expanded, Collapsed otherwise. - Exposes NumberBox types to Microsoft UI Automation.. + Exposes NumberBox types to Microsoft UI Automation. Initializes a new instance of the NumberBoxAutomationPeer class. The NumberBox control instance to create the peer for. + + + + - Exposes PersonPicture types to Microsoft UI Automation.. + Exposes PersonPicture types to Microsoft UI Automation. Initializes a new instance of the PersonPictureAutomationPeer class. The PersonPicture control instance to create the peer for. - Exposes ProgressBar types to Microsoft UI Automation.. + Exposes ProgressBar types to Microsoft UI Automation. Initializes a new instance of the ProgressBarAutomationPeer class. The ProgressBar control instance to create the peer for. - Exposes ProgressRing types to Microsoft UI Automation.. + Exposes ProgressRing types to Microsoft UI Automation. Initializes a new instance of the ProgressRingAutomationPeer class. The ProgressRing control instance to create the peer for. + + + + + + + + + - Exposes RatingControl types to Microsoft UI Automation.. + Exposes RatingControl types to Microsoft UI Automation. Initializes a new instance of the RatingControlAutomationPeer class. The RatingControl control instance to create the peer for. - Exposes ItemsRepeater types to Microsoft UI Automation.. + Exposes ItemsRepeater types to Microsoft UI Automation. Initializes a new instance of the RepeaterAutomationPeer class. @@ -137,7 +154,7 @@ - Exposes SplitButton types to Microsoft UI Automation.. + Exposes SplitButton types to Microsoft UI Automation. Initializes a new instance of the SplitButtonAutomationPeer class. @@ -155,27 +172,27 @@ A value of the enumeration. - Exposes TabView types to Microsoft UI Automation.. + Exposes TabView types to Microsoft UI Automation. Initializes a new instance of the TabViewAutomationPeer class. The TabView control instance to create the peer for. - Exposes TabViewItem types to Microsoft UI Automation.. + Exposes TabViewItem types to Microsoft UI Automation. The TabViewItem control instance to create the peer for. - Exposes TeachingTip types to Microsoft UI Automation.. + Exposes TeachingTip types to Microsoft UI Automation. Initializes a new instance of the TeachingTipAutomationPeer class. The TeachingTip control instance to create the peer for. - Exposes ToggleSplitButton types to Microsoft UI Automation.. + Exposes ToggleSplitButton types to Microsoft UI Automation. Initializes a new instance of the ToggleSplitButtonAutomationPeer class. @@ -199,7 +216,7 @@ The toggle state of the ToggleSplitButton. The default value is Indeterminate. - Exposes TreeViewItem types to Microsoft UI Automation.. + Exposes TreeViewItem types to Microsoft UI Automation. Initializes a new instance of the TreeViewItemAutomationPeer class. @@ -216,7 +233,7 @@ The expanded or collapsed state of the associated TreeViewItem. The default value is Expanded. - Exposes TreeViewItem data types to Microsoft UI Automation.. + Exposes TreeViewItem data types to Microsoft UI Automation. Initializes a new instance of the TreeViewItemDataAutomationPeer class. @@ -234,7 +251,7 @@ The expanded or collapsed state of the associated TreeViewItemDataAutomationPeer. The default value is Expanded. - Exposes TreeViewList types to Microsoft UI Automation.. + Exposes TreeViewList types to Microsoft UI Automation. Initializes a new instance of the TreeViewListAutomationPeer class. @@ -955,6 +972,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. @@ -1981,6 +2048,8 @@ This property is analogous to the TreeViewItem.HasUnrealizedChildren property.Identifies the HeaderTemplate dependency property. The identifier for the HeaderTemplate dependency property. + + Toggles whether line breaking occurs if a line of text extends beyond the available width of the control. @@ -2120,6 +2189,64 @@ This property is analogous to the TreeViewItem.HasUnrealizedChildren property. Contains the old Value being replaced in a NumberBox. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Defines constants that specify how the source offset values of a ParallaxView are interpreted. @@ -2728,6 +2855,26 @@ This property is analogous to the TreeViewItem.HasUnrealizedChildren property. + + + + + + + + + + + + + + + + + + + + @@ -3064,10 +3211,16 @@ This property is analogous to the TreeViewItem.HasUnrealizedChildren property. + + + + Gets an object that provides calculated values that can be referenced as TemplateBinding sources when defining templates for a ProgressRing control. An object that provides calculated values for templates. + + Provides calculated values that can be referenced as TemplatedParent sources when defining templates for a ProgressRing control. Not intended for general use. diff --git a/dev/CommandBarFlyout/CommandBarFlyout.xaml b/dev/CommandBarFlyout/CommandBarFlyout.xaml index 5a19858f3a..08f478b809 100644 --- a/dev/CommandBarFlyout/CommandBarFlyout.xaml +++ b/dev/CommandBarFlyout/CommandBarFlyout.xaml @@ -8,7 +8,7 @@ xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"> + + diff --git a/dev/ImageIcon/ImageIcon_themeresources.xaml b/dev/ImageIcon/ImageIcon_themeresources.xaml new file mode 100644 index 0000000000..ceaa145ec4 --- /dev/null +++ b/dev/ImageIcon/ImageIcon_themeresources.xaml @@ -0,0 +1,7 @@ + + + + diff --git a/dev/ImageIcon/InteractionTests/ImageIconTests.cs b/dev/ImageIcon/InteractionTests/ImageIconTests.cs new file mode 100644 index 0000000000..371ed6ec17 --- /dev/null +++ b/dev/ImageIcon/InteractionTests/ImageIconTests.cs @@ -0,0 +1,51 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System; +using Common; +using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra; +using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common; +using System.Collections.Generic; + +#if USING_TAEF +using WEX.TestExecution; +using WEX.TestExecution.Markup; +using WEX.Logging.Interop; +#else +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting.Logging; +#endif + +using Microsoft.Windows.Apps.Test.Automation; +using Microsoft.Windows.Apps.Test.Foundation; +using Microsoft.Windows.Apps.Test.Foundation.Controls; +using Microsoft.Windows.Apps.Test.Foundation.Patterns; +using Microsoft.Windows.Apps.Test.Foundation.Waiters; + +namespace Windows.UI.Xaml.Tests.MUXControls.InteractionTests +{ + [TestClass] + public class ImageIconTests + { + [ClassInitialize] + [TestProperty("RunAs", "User")] + [TestProperty("Classification", "Integration")] + [TestProperty("Platform", "Any")] + [TestProperty("MUXControlsTestSuite", "SuiteB")] + public static void ClassInitialize(TestContext testContext) + { + TestEnvironment.Initialize(testContext); + } + + public void TestCleanup() + { + TestCleanupHelper.Cleanup(); + } + + [TestMethod] + public void BasicTest() + { + Log.Comment("ImageIcon Basic Test"); + } + } +} diff --git a/dev/ImageIcon/InteractionTests/ImageIcon_InteractionTests.projitems b/dev/ImageIcon/InteractionTests/ImageIcon_InteractionTests.projitems new file mode 100644 index 0000000000..1b4bd2f366 --- /dev/null +++ b/dev/ImageIcon/InteractionTests/ImageIcon_InteractionTests.projitems @@ -0,0 +1,15 @@ + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + A1553559-5786-4B44-AB9E-94AB95C86D4D + + + ImageIcon_InteractionTests + + + + + diff --git a/dev/ImageIcon/InteractionTests/ImageIcon_InteractionTests.shproj b/dev/ImageIcon/InteractionTests/ImageIcon_InteractionTests.shproj new file mode 100644 index 0000000000..b29ef36f5e --- /dev/null +++ b/dev/ImageIcon/InteractionTests/ImageIcon_InteractionTests.shproj @@ -0,0 +1,14 @@ + + + + + {F14FB632-E705-44BC-9415-75B539F483E1} + 15.0 + + + + + + + + \ No newline at end of file diff --git a/dev/ImageIcon/TestUI/ImageIconPage.xaml b/dev/ImageIcon/TestUI/ImageIconPage.xaml new file mode 100644 index 0000000000..6c27d223cd --- /dev/null +++ b/dev/ImageIcon/TestUI/ImageIconPage.xaml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/ImageIcon/TestUI/ImageIconPage.xaml.cs b/dev/ImageIcon/TestUI/ImageIconPage.xaml.cs new file mode 100644 index 0000000000..138ece7cf8 --- /dev/null +++ b/dev/ImageIcon/TestUI/ImageIconPage.xaml.cs @@ -0,0 +1,39 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Markup; +using Windows.UI; +using System.Windows.Input; + +using ImageIcon = Microsoft.UI.Xaml.Controls.ImageIcon; +using Windows.UI.Xaml.Media.Imaging; + +namespace MUXControlsTestApp +{ + [TopLevelTestPage(Name = "ImageIcon")] + public sealed partial class ImageIconPage : TestPage + { + public ImageIconPage() + { + this.InitializeComponent(); + } + + private void ToggleButton_Checked(object sender, RoutedEventArgs e) + { + this.ImageIcon.Source = new SvgImageSource(new Uri("ms-appx:///Assets/libre-camera-panorama.svg")); + } + private void ToggleButton_Unchecked(object sender, RoutedEventArgs e) + { + BitmapImage bitmapImage = new BitmapImage(); + Uri uri = new Uri("ms-appx:///Assets/ingredient2.png"); + bitmapImage.UriSource = uri; + + this.ImageIcon.Source = bitmapImage; + } + } +} diff --git a/dev/ImageIcon/TestUI/ImageIcon_TestUI.projitems b/dev/ImageIcon/TestUI/ImageIcon_TestUI.projitems new file mode 100644 index 0000000000..77de7178e8 --- /dev/null +++ b/dev/ImageIcon/TestUI/ImageIcon_TestUI.projitems @@ -0,0 +1,23 @@ + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 280C91F4-96B5-4BDE-9E02-E573E1DEF583 + + + ImageIcon_TestUI + + + + Designer + MSBuild:Compile + + + + + ImageIconPage.xaml + + + diff --git a/dev/ImageIcon/TestUI/ImageIcon_TestUI.shproj b/dev/ImageIcon/TestUI/ImageIcon_TestUI.shproj new file mode 100644 index 0000000000..9b5177601b --- /dev/null +++ b/dev/ImageIcon/TestUI/ImageIcon_TestUI.shproj @@ -0,0 +1,14 @@ + + + + + {DDE1C022-6F9A-4067-89C2-81F2EEAF249F} + 15.0 + + + + + + + + \ No newline at end of file diff --git a/dev/InfoBar/InfoBar.idl b/dev/InfoBar/InfoBar.idl index fd0d164e74..5193fd8aa6 100644 --- a/dev/InfoBar/InfoBar.idl +++ b/dev/InfoBar/InfoBar.idl @@ -117,13 +117,19 @@ unsealed runtimeclass InfoBarPanel : Windows.UI.Xaml.Controls.Panel { InfoBarPanel(); - static Windows.UI.Xaml.DependencyProperty HorizontalMarginProperty{ get; }; - static void SetHorizontalMargin(Windows.UI.Xaml.DependencyObject object, Windows.UI.Xaml.Thickness value); - static Windows.UI.Xaml.Thickness GetHorizontalMargin(Windows.UI.Xaml.DependencyObject object); + Windows.UI.Xaml.Thickness PaddingInHorizontalOrientation; + static Windows.UI.Xaml.DependencyProperty PaddingInHorizontalOrientationProperty{ get; }; - static Windows.UI.Xaml.DependencyProperty VerticalMarginProperty{ get; }; - static void SetVerticalMargin(Windows.UI.Xaml.DependencyObject object, Windows.UI.Xaml.Thickness value); - static Windows.UI.Xaml.Thickness GetVerticalMargin(Windows.UI.Xaml.DependencyObject object); + Windows.UI.Xaml.Thickness PaddingInVerticalOrientation; + static Windows.UI.Xaml.DependencyProperty PaddingInVerticalOrientationProperty{ get; }; + + static void SetSpacingInHorizontalOrientation(Windows.UI.Xaml.DependencyObject object, Windows.UI.Xaml.Thickness value); + static Windows.UI.Xaml.Thickness GetSpacingInHorizontalOrientation(Windows.UI.Xaml.DependencyObject object); + static Windows.UI.Xaml.DependencyProperty SpacingInHorizontalOrientationProperty{ get; }; + + static void SetSpacingInVerticalOrientation(Windows.UI.Xaml.DependencyObject object, Windows.UI.Xaml.Thickness value); + static Windows.UI.Xaml.Thickness GetSpacingInVerticalOrientation(Windows.UI.Xaml.DependencyObject object); + static Windows.UI.Xaml.DependencyProperty SpacingInVerticalOrientationProperty{ get; }; } } diff --git a/dev/InfoBar/InfoBar.xaml b/dev/InfoBar/InfoBar.xaml index b28413012c..781b96968f 100644 --- a/dev/InfoBar/InfoBar.xaml +++ b/dev/InfoBar/InfoBar.xaml @@ -28,7 +28,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -122,7 +122,7 @@ Margin="{StaticResource InfoBarIconMargin}" FontSize="{StaticResource InfoBarIconFontSize}" Glyph="{StaticResource InfoBarInformationalIconGlyph}" - Foreground="{StaticResource InfoBarInformationalSeverityIconForeground}" + Foreground="{ThemeResource InfoBarInformationalSeverityIconForeground}" FontFamily="{ThemeResource SymbolThemeFontFamily}" AutomationProperties.AccessibilityView="Raw" /> @@ -136,34 +136,31 @@ + PaddingInHorizontalOrientation="{StaticResource InfoBarPanelPaddingInHorizontalOrientation}" + PaddingInVerticalOrientation="{StaticResource InfoBarPanelPaddingInVerticalOrientation}"> @@ -171,8 +168,8 @@ @@ -181,8 +178,8 @@ - + diff --git a/dev/InfoBar/InfoBarPanel.cpp b/dev/InfoBar/InfoBarPanel.cpp index 61f7ff4688..ad5b7ac923 100644 --- a/dev/InfoBar/InfoBarPanel.cpp +++ b/dev/InfoBar/InfoBarPanel.cpp @@ -27,11 +27,11 @@ winrt::Size InfoBarPanel::MeasureOverride(winrt::Size const& availableSize) if (childDesiredSize.Width != 0 && childDesiredSize.Height != 0) { // Add up the width of all items if they were laid out horizontally - const auto horizontalMargin = winrt::InfoBarPanel::GetHorizontalMargin(child); + const auto horizontalMargin = winrt::InfoBarPanel::GetSpacingInHorizontalOrientation(child); totalWidth += childDesiredSize.Width + (nItems > 0 ? (float)horizontalMargin.Left : 0) + (float)horizontalMargin.Right; // Add up the height of all items if they were laid out vertically - const auto verticalMargin = winrt::InfoBarPanel::GetVerticalMargin(child); + const auto verticalMargin = winrt::InfoBarPanel::GetSpacingInVerticalOrientation(child); totalHeight += childDesiredSize.Height + (nItems > 0 ? (float)verticalMargin.Top : 0) + (float)verticalMargin.Bottom; if (childDesiredSize.Width > widthOfWidest) @@ -61,7 +61,7 @@ winrt::Size InfoBarPanel::MeasureOverride(winrt::Size const& availableSize) if (nItems == 1 || totalWidth > availableSize.Width || (minHeight > 0 && heightOfTallestInHorizontal > minHeight)) { m_isVertical = true; - const auto verticalMargin = winrt::InfoBarPanel::GetVerticalMargin(*this); + const auto verticalMargin = PaddingInVerticalOrientation(); desiredSize.Width = widthOfWidest; desiredSize.Height = totalHeight + (float)verticalMargin.Top + (float)verticalMargin.Bottom; @@ -69,7 +69,7 @@ winrt::Size InfoBarPanel::MeasureOverride(winrt::Size const& availableSize) else { m_isVertical = false; - const auto horizontalMargin = winrt::InfoBarPanel::GetHorizontalMargin(*this); + const auto horizontalMargin = PaddingInHorizontalOrientation(); desiredSize.Width = totalWidth + (float)horizontalMargin.Left + (float)horizontalMargin.Right; desiredSize.Height = heightOfTallest; @@ -85,7 +85,7 @@ winrt::Size InfoBarPanel::ArrangeOverride(winrt::Size const& finalSize) if (m_isVertical) { // Layout elements vertically - float verticalOffset = (float)winrt::InfoBarPanel::GetVerticalMargin(*this).Top; + float verticalOffset = (float)PaddingInVerticalOrientation().Top; bool hasPreviousElement = false; for (winrt::UIElement const& child : Children()) { @@ -94,7 +94,7 @@ winrt::Size InfoBarPanel::ArrangeOverride(winrt::Size const& finalSize) auto const desiredSize = child.DesiredSize(); if (desiredSize.Width != 0 && desiredSize.Height != 0) { - const auto verticalMargin = winrt::InfoBarPanel::GetVerticalMargin(child); + const auto verticalMargin = winrt::InfoBarPanel::GetSpacingInVerticalOrientation(child); verticalOffset += hasPreviousElement ? (float)verticalMargin.Top : 0; child.Arrange(winrt::Rect{ (float)verticalMargin.Left, verticalOffset, desiredSize.Width, desiredSize.Height }); @@ -108,7 +108,7 @@ winrt::Size InfoBarPanel::ArrangeOverride(winrt::Size const& finalSize) else { // Layout elements horizontally - float horizontalOffset = (float)winrt::InfoBarPanel::GetHorizontalMargin(*this).Left; + float horizontalOffset = (float)PaddingInHorizontalOrientation().Left; bool hasPreviousElement = false; for (winrt::UIElement const& child : Children()) { @@ -117,7 +117,7 @@ winrt::Size InfoBarPanel::ArrangeOverride(winrt::Size const& finalSize) auto const desiredSize = child.DesiredSize(); if (desiredSize.Width != 0 && desiredSize.Height != 0) { - auto horizontalMargin = winrt::InfoBarPanel::GetHorizontalMargin(child); + auto horizontalMargin = winrt::InfoBarPanel::GetSpacingInHorizontalOrientation(child); horizontalOffset += hasPreviousElement ? (float)horizontalMargin.Left : 0; child.Arrange(winrt::Rect{ horizontalOffset, (float)horizontalMargin.Top, desiredSize.Width, finalSize.Height }); diff --git a/dev/InfoBar/InfoBar_themeresources.xaml b/dev/InfoBar/InfoBar_themeresources.xaml index 2d3e61c60b..95d9d859fb 100644 --- a/dev/InfoBar/InfoBar_themeresources.xaml +++ b/dev/InfoBar/InfoBar_themeresources.xaml @@ -5,7 +5,6 @@ xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:local="using:Microsoft.UI.Xaml.Controls"> - @@ -87,25 +86,25 @@ 20 0,0,12,0 - 0,0,0,0 - 0,10,0,10 - - 0,10,0,0 - 0,10,0,0 + 0,0,0,0 + 0,10,0,10 + + 0,10,0,0 + 0,10,0,0 - 8,10,0,0 - 0,4,0,0 + 8,10,0,0 + 0,4,0,0 - 12,8,0,0 - 0,12,0,0 + 12,8,0,0 + 0,12,0,0 96 - 24 + 24 8,0,8,1 2 14 - 24 + 24 0,0,0,1 Cancel diff --git a/dev/InfoBar/Strings/af-ZA/Resources.resw b/dev/InfoBar/Strings/af-ZA/Resources.resw new file mode 100644 index 0000000000..896cf6cc70 --- /dev/null +++ b/dev/InfoBar/Strings/af-ZA/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Sluit + Automation name of the close button. + + + Sluit + The tooltip that appears on the Close button in InfoBar. + + + Inligtingsbalk is geweier + The string read by narrator when the InfoBar closes. + + + Inligtingsbalk + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/am-ET/Resources.resw b/dev/InfoBar/Strings/am-ET/Resources.resw new file mode 100644 index 0000000000..000e3a4ba8 --- /dev/null +++ b/dev/InfoBar/Strings/am-ET/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ዝጋ + Automation name of the close button. + + + ዝጋ + The tooltip that appears on the Close button in InfoBar. + + + InfoBar ተሰናብቷል + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ar-SA/Resources.resw b/dev/InfoBar/Strings/ar-SA/Resources.resw new file mode 100644 index 0000000000..41eb2aed3f --- /dev/null +++ b/dev/InfoBar/Strings/ar-SA/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + إغلاق + Automation name of the close button. + + + إغلاق + The tooltip that appears on the Close button in InfoBar. + + + تم تجاهل شريط المعلومات + The string read by narrator when the InfoBar closes. + + + شريط المعلومات + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/az-Latn-AZ/Resources.resw b/dev/InfoBar/Strings/az-Latn-AZ/Resources.resw new file mode 100644 index 0000000000..f0839027af --- /dev/null +++ b/dev/InfoBar/Strings/az-Latn-AZ/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bağla + Automation name of the close button. + + + Bağla + The tooltip that appears on the Close button in InfoBar. + + + InfoBar rədd edildi + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/be-BY/Resources.resw b/dev/InfoBar/Strings/be-BY/Resources.resw new file mode 100644 index 0000000000..1af7de150c --- /dev/null +++ b/dev/InfoBar/Strings/be-BY/Resources.resw @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/bg-BG/Resources.resw b/dev/InfoBar/Strings/bg-BG/Resources.resw new file mode 100644 index 0000000000..8b4d6d238d --- /dev/null +++ b/dev/InfoBar/Strings/bg-BG/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Затваряне + Automation name of the close button. + + + Затваряне + The tooltip that appears on the Close button in InfoBar. + + + Информационната лента е отхвърлена + The string read by narrator when the InfoBar closes. + + + Информационна лента + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/bn-BD/Resources.resw b/dev/InfoBar/Strings/bn-BD/Resources.resw new file mode 100644 index 0000000000..1af7de150c --- /dev/null +++ b/dev/InfoBar/Strings/bn-BD/Resources.resw @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/bs-Latn-BA/Resources.resw b/dev/InfoBar/Strings/bs-Latn-BA/Resources.resw new file mode 100644 index 0000000000..f5ee09b423 --- /dev/null +++ b/dev/InfoBar/Strings/bs-Latn-BA/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Zatvori + Automation name of the close button. + + + Zatvori + The tooltip that appears on the Close button in InfoBar. + + + Informativni panel zatvoren + The string read by narrator when the InfoBar closes. + + + Informativni panel + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ca-ES/Resources.resw b/dev/InfoBar/Strings/ca-ES/Resources.resw new file mode 100644 index 0000000000..e45644a901 --- /dev/null +++ b/dev/InfoBar/Strings/ca-ES/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tanca + Automation name of the close button. + + + Tanca + The tooltip that appears on the Close button in InfoBar. + + + S'ha descartat la barra d'informació + The string read by narrator when the InfoBar closes. + + + Barra d'informació + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/cs-CZ/Resources.resw b/dev/InfoBar/Strings/cs-CZ/Resources.resw new file mode 100644 index 0000000000..91a8190c3e --- /dev/null +++ b/dev/InfoBar/Strings/cs-CZ/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Zavřít + Automation name of the close button. + + + Zavřít + The tooltip that appears on the Close button in InfoBar. + + + Panel nástrojů zavřen + The string read by narrator when the InfoBar closes. + + + Informační panel + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/da-DK/Resources.resw b/dev/InfoBar/Strings/da-DK/Resources.resw new file mode 100644 index 0000000000..ceda52bc74 --- /dev/null +++ b/dev/InfoBar/Strings/da-DK/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Luk + Automation name of the close button. + + + Luk + The tooltip that appears on the Close button in InfoBar. + + + Oplysningspanelet blev afvist + The string read by narrator when the InfoBar closes. + + + Oplysningspanel + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/de-DE/Resources.resw b/dev/InfoBar/Strings/de-DE/Resources.resw new file mode 100644 index 0000000000..42fdf0c6cd --- /dev/null +++ b/dev/InfoBar/Strings/de-DE/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Schließen + Automation name of the close button. + + + Schließen + The tooltip that appears on the Close button in InfoBar. + + + Infoleiste geschlossen + The string read by narrator when the InfoBar closes. + + + Infoleiste + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/el-GR/Resources.resw b/dev/InfoBar/Strings/el-GR/Resources.resw new file mode 100644 index 0000000000..7f3fd591fa --- /dev/null +++ b/dev/InfoBar/Strings/el-GR/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Κλείσιμο + Automation name of the close button. + + + Κλείσιμο + The tooltip that appears on the Close button in InfoBar. + + + Η γραμμή πληροφοριών έκλεισε + The string read by narrator when the InfoBar closes. + + + Γραμμή πληροφοριών + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/en-GB/Resources.resw b/dev/InfoBar/Strings/en-GB/Resources.resw new file mode 100644 index 0000000000..b869a68c43 --- /dev/null +++ b/dev/InfoBar/Strings/en-GB/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Close + Automation name of the close button. + + + Close + The tooltip that appears on the Close button in InfoBar. + + + InfoBar dismissed + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/es-ES/Resources.resw b/dev/InfoBar/Strings/es-ES/Resources.resw new file mode 100644 index 0000000000..f3528f6985 --- /dev/null +++ b/dev/InfoBar/Strings/es-ES/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Cerrar + Automation name of the close button. + + + Cerrar + The tooltip that appears on the Close button in InfoBar. + + + Se ha descartado InfoBar + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/es-MX/Resources.resw b/dev/InfoBar/Strings/es-MX/Resources.resw new file mode 100644 index 0000000000..63899eb435 --- /dev/null +++ b/dev/InfoBar/Strings/es-MX/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Cerrar + Automation name of the close button. + + + Cerrar + The tooltip that appears on the Close button in InfoBar. + + + Barra de información descartada + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/et-EE/Resources.resw b/dev/InfoBar/Strings/et-EE/Resources.resw new file mode 100644 index 0000000000..63eacde4fd --- /dev/null +++ b/dev/InfoBar/Strings/et-EE/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Sule + Automation name of the close button. + + + Sulgemine + The tooltip that appears on the Close button in InfoBar. + + + Teaberiba on suletud + The string read by narrator when the InfoBar closes. + + + Teaberiba + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/eu-ES/Resources.resw b/dev/InfoBar/Strings/eu-ES/Resources.resw new file mode 100644 index 0000000000..4b171cd04a --- /dev/null +++ b/dev/InfoBar/Strings/eu-ES/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Itxi + Automation name of the close button. + + + Itxi + The tooltip that appears on the Close button in InfoBar. + + + Informazio-barra baztertu egin da + The string read by narrator when the InfoBar closes. + + + Informazio-barra + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/fa-IR/Resources.resw b/dev/InfoBar/Strings/fa-IR/Resources.resw new file mode 100644 index 0000000000..c0a8fbe7aa --- /dev/null +++ b/dev/InfoBar/Strings/fa-IR/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + بستن + Automation name of the close button. + + + بستن + The tooltip that appears on the Close button in InfoBar. + + + نوار اطلاعات بسته شد + The string read by narrator when the InfoBar closes. + + + نوار اطلاعات + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/fi-FI/Resources.resw b/dev/InfoBar/Strings/fi-FI/Resources.resw new file mode 100644 index 0000000000..f51a1bb94a --- /dev/null +++ b/dev/InfoBar/Strings/fi-FI/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Sulje + Automation name of the close button. + + + Sulje + The tooltip that appears on the Close button in InfoBar. + + + Tietopalkki hylätty + The string read by narrator when the InfoBar closes. + + + Tietopalkki + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/fil-PH/Resources.resw b/dev/InfoBar/Strings/fil-PH/Resources.resw new file mode 100644 index 0000000000..0b4f29b4e1 --- /dev/null +++ b/dev/InfoBar/Strings/fil-PH/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Isara + Automation name of the close button. + + + Isara + The tooltip that appears on the Close button in InfoBar. + + + Inalis ang InfoBar + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/fr-CA/Resources.resw b/dev/InfoBar/Strings/fr-CA/Resources.resw new file mode 100644 index 0000000000..cb31f32fed --- /dev/null +++ b/dev/InfoBar/Strings/fr-CA/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fermer + Automation name of the close button. + + + Fermer + The tooltip that appears on the Close button in InfoBar. + + + Barre d’outils ignorée + The string read by narrator when the InfoBar closes. + + + Barre d’informations + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/fr-FR/Resources.resw b/dev/InfoBar/Strings/fr-FR/Resources.resw new file mode 100644 index 0000000000..857c64c1d1 --- /dev/null +++ b/dev/InfoBar/Strings/fr-FR/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fermer + Automation name of the close button. + + + Fermer + The tooltip that appears on the Close button in InfoBar. + + + Barre d’informations ignorée + The string read by narrator when the InfoBar closes. + + + Barre d’informations + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/gl-ES/Resources.resw b/dev/InfoBar/Strings/gl-ES/Resources.resw new file mode 100644 index 0000000000..cdd4ca21b7 --- /dev/null +++ b/dev/InfoBar/Strings/gl-ES/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Pechar + Automation name of the close button. + + + Pechar + The tooltip that appears on the Close button in InfoBar. + + + Rexeitouse a barra de información + The string read by narrator when the InfoBar closes. + + + Barra de información + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ha-Latn-NG/Resources.resw b/dev/InfoBar/Strings/ha-Latn-NG/Resources.resw new file mode 100644 index 0000000000..1af7de150c --- /dev/null +++ b/dev/InfoBar/Strings/ha-Latn-NG/Resources.resw @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/he-IL/Resources.resw b/dev/InfoBar/Strings/he-IL/Resources.resw new file mode 100644 index 0000000000..0b81a6e1a0 --- /dev/null +++ b/dev/InfoBar/Strings/he-IL/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + סגור + Automation name of the close button. + + + סגור + The tooltip that appears on the Close button in InfoBar. + + + סרגל המידע נסגר + The string read by narrator when the InfoBar closes. + + + ‏‏סרגל מידע + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/hi-IN/Resources.resw b/dev/InfoBar/Strings/hi-IN/Resources.resw new file mode 100644 index 0000000000..01179b9a7c --- /dev/null +++ b/dev/InfoBar/Strings/hi-IN/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + बंद करें + Automation name of the close button. + + + बंद करें + The tooltip that appears on the Close button in InfoBar. + + + जानकारी पट्टी को ख़ारिज किया गया + The string read by narrator when the InfoBar closes. + + + जानकारी पट्टी + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/hr-HR/Resources.resw b/dev/InfoBar/Strings/hr-HR/Resources.resw new file mode 100644 index 0000000000..dad30919ac --- /dev/null +++ b/dev/InfoBar/Strings/hr-HR/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Zatvori + Automation name of the close button. + + + Zatvori + The tooltip that appears on the Close button in InfoBar. + + + Infotraka je odbačena + The string read by narrator when the InfoBar closes. + + + InfoTraka + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/hu-HU/Resources.resw b/dev/InfoBar/Strings/hu-HU/Resources.resw new file mode 100644 index 0000000000..54a9018a4e --- /dev/null +++ b/dev/InfoBar/Strings/hu-HU/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Bezárás + Automation name of the close button. + + + Bezárás + The tooltip that appears on the Close button in InfoBar. + + + Az információs sáv elvetve + The string read by narrator when the InfoBar closes. + + + Információs sáv + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/id-ID/Resources.resw b/dev/InfoBar/Strings/id-ID/Resources.resw new file mode 100644 index 0000000000..a649ca7533 --- /dev/null +++ b/dev/InfoBar/Strings/id-ID/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tutup + Automation name of the close button. + + + Tutup + The tooltip that appears on the Close button in InfoBar. + + + Bilah Info ditutup + The string read by narrator when the InfoBar closes. + + + Bilah Info + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/is-IS/Resources.resw b/dev/InfoBar/Strings/is-IS/Resources.resw new file mode 100644 index 0000000000..5efbdbf502 --- /dev/null +++ b/dev/InfoBar/Strings/is-IS/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Loka + Automation name of the close button. + + + Loka + The tooltip that appears on the Close button in InfoBar. + + + Slökkt á upplýsingastiku + The string read by narrator when the InfoBar closes. + + + Upplýsingastika + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/it-IT/Resources.resw b/dev/InfoBar/Strings/it-IT/Resources.resw new file mode 100644 index 0000000000..7ca0a51496 --- /dev/null +++ b/dev/InfoBar/Strings/it-IT/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Chiudi + Automation name of the close button. + + + Chiudi + The tooltip that appears on the Close button in InfoBar. + + + Barra informazioni ignorata + The string read by narrator when the InfoBar closes. + + + Barra informazioni + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ja-JP/Resources.resw b/dev/InfoBar/Strings/ja-JP/Resources.resw new file mode 100644 index 0000000000..1a3b93ede1 --- /dev/null +++ b/dev/InfoBar/Strings/ja-JP/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 閉じる + Automation name of the close button. + + + 閉じる + The tooltip that appears on the Close button in InfoBar. + + + 情報バーを閉じる + The string read by narrator when the InfoBar closes. + + + 情報バー + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ka-GE/Resources.resw b/dev/InfoBar/Strings/ka-GE/Resources.resw new file mode 100644 index 0000000000..ec09498111 --- /dev/null +++ b/dev/InfoBar/Strings/ka-GE/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + დახურვა + Automation name of the close button. + + + დახურვა + The tooltip that appears on the Close button in InfoBar. + + + InfoBar გაუქმებულია + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/kk-KZ/Resources.resw b/dev/InfoBar/Strings/kk-KZ/Resources.resw new file mode 100644 index 0000000000..0becccd8a0 --- /dev/null +++ b/dev/InfoBar/Strings/kk-KZ/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Жабу + Automation name of the close button. + + + Жабу + The tooltip that appears on the Close button in InfoBar. + + + Ақпараттық тақта жойылды + The string read by narrator when the InfoBar closes. + + + Ақпараттық тақта + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/km-KH/Resources.resw b/dev/InfoBar/Strings/km-KH/Resources.resw new file mode 100644 index 0000000000..fbaf63f533 --- /dev/null +++ b/dev/InfoBar/Strings/km-KH/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + បិទ + Automation name of the close button. + + + បិទ + The tooltip that appears on the Close button in InfoBar. + + + បោះបង់ចោលរបារព័ត៌មាន + The string read by narrator when the InfoBar closes. + + + របារព័ត៌មាន + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/kn-IN/Resources.resw b/dev/InfoBar/Strings/kn-IN/Resources.resw new file mode 100644 index 0000000000..df49c96d80 --- /dev/null +++ b/dev/InfoBar/Strings/kn-IN/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ಮುಚ್ಚು + Automation name of the close button. + + + ಮುಚ್ಚು + The tooltip that appears on the Close button in InfoBar. + + + ಮಾಹಿತಿಪಟ್ಟಿ ಅನ್ನು ಬಿಟ್ಟು ಬಿಡಲಾಗಿದೆ + The string read by narrator when the InfoBar closes. + + + ಮಾಹಿತಿಪಟ್ಟಿ + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ko-KR/Resources.resw b/dev/InfoBar/Strings/ko-KR/Resources.resw new file mode 100644 index 0000000000..782bb2d13e --- /dev/null +++ b/dev/InfoBar/Strings/ko-KR/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 닫기 + Automation name of the close button. + + + 닫기 + The tooltip that appears on the Close button in InfoBar. + + + 정보 표시줄이 해제됨 + The string read by narrator when the InfoBar closes. + + + 정보 표시줄 + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/lo-LA/Resources.resw b/dev/InfoBar/Strings/lo-LA/Resources.resw new file mode 100644 index 0000000000..9d9863c346 --- /dev/null +++ b/dev/InfoBar/Strings/lo-LA/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ປິດ + Automation name of the close button. + + + ປິດ + The tooltip that appears on the Close button in InfoBar. + + + ແຖບຂໍ້ມູນຖືກຍົກເລີກ + The string read by narrator when the InfoBar closes. + + + ແຖບຂໍ້ມູນ + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/lt-LT/Resources.resw b/dev/InfoBar/Strings/lt-LT/Resources.resw new file mode 100644 index 0000000000..cf6479a06d --- /dev/null +++ b/dev/InfoBar/Strings/lt-LT/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Uždaryti + Automation name of the close button. + + + Uždaryti + The tooltip that appears on the Close button in InfoBar. + + + Įrankių juosta išjungta + The string read by narrator when the InfoBar closes. + + + Informacijos juosta + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/lv-LV/Resources.resw b/dev/InfoBar/Strings/lv-LV/Resources.resw new file mode 100644 index 0000000000..8cd26f753e --- /dev/null +++ b/dev/InfoBar/Strings/lv-LV/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Aizvērt + Automation name of the close button. + + + Aizvērt + The tooltip that appears on the Close button in InfoBar. + + + Informācijas josla noņemta + The string read by narrator when the InfoBar closes. + + + Informācijas josla + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/mk-MK/Resources.resw b/dev/InfoBar/Strings/mk-MK/Resources.resw new file mode 100644 index 0000000000..0bbb44f7d4 --- /dev/null +++ b/dev/InfoBar/Strings/mk-MK/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Затвори + Automation name of the close button. + + + Затвори + The tooltip that appears on the Close button in InfoBar. + + + Лентата со информации е отфрлена + The string read by narrator when the InfoBar closes. + + + Лента со информации + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ml-IN/Resources.resw b/dev/InfoBar/Strings/ml-IN/Resources.resw new file mode 100644 index 0000000000..b92403776a --- /dev/null +++ b/dev/InfoBar/Strings/ml-IN/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + അടയ്ക്കുക + Automation name of the close button. + + + അടയ്ക്കുക + The tooltip that appears on the Close button in InfoBar. + + + വിവരബാർ നിരാകരിച്ചു + The string read by narrator when the InfoBar closes. + + + വിവരബാർ + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ms-MY/Resources.resw b/dev/InfoBar/Strings/ms-MY/Resources.resw new file mode 100644 index 0000000000..b42baeb55a --- /dev/null +++ b/dev/InfoBar/Strings/ms-MY/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Tutup + Automation name of the close button. + + + Tutup + The tooltip that appears on the Close button in InfoBar. + + + InfoBar dibuang + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/nb-NO/Resources.resw b/dev/InfoBar/Strings/nb-NO/Resources.resw new file mode 100644 index 0000000000..a12acf8d0a --- /dev/null +++ b/dev/InfoBar/Strings/nb-NO/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Lukk + Automation name of the close button. + + + Lukk + The tooltip that appears on the Close button in InfoBar. + + + InfoBar er lukket + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/nl-NL/Resources.resw b/dev/InfoBar/Strings/nl-NL/Resources.resw new file mode 100644 index 0000000000..60038332da --- /dev/null +++ b/dev/InfoBar/Strings/nl-NL/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Sluiten + Automation name of the close button. + + + Sluiten + The tooltip that appears on the Close button in InfoBar. + + + Informatiebalk gesloten + The string read by narrator when the InfoBar closes. + + + Informatiebalk + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/nn-NO/Resources.resw b/dev/InfoBar/Strings/nn-NO/Resources.resw new file mode 100644 index 0000000000..ed75759ed2 --- /dev/null +++ b/dev/InfoBar/Strings/nn-NO/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Lukk + Automation name of the close button. + + + Lukk + The tooltip that appears on the Close button in InfoBar. + + + InfoBar er avvist + The string read by narrator when the InfoBar closes. + + + InfoBar + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/pl-PL/Resources.resw b/dev/InfoBar/Strings/pl-PL/Resources.resw new file mode 100644 index 0000000000..1b025aa030 --- /dev/null +++ b/dev/InfoBar/Strings/pl-PL/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Zamknij + Automation name of the close button. + + + Zamknij + The tooltip that appears on the Close button in InfoBar. + + + Pasek informacyjny został odrzucony + The string read by narrator when the InfoBar closes. + + + Pasek informacji + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/pt-BR/Resources.resw b/dev/InfoBar/Strings/pt-BR/Resources.resw new file mode 100644 index 0000000000..c351fdd60c --- /dev/null +++ b/dev/InfoBar/Strings/pt-BR/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fechar + Automation name of the close button. + + + Fechar + The tooltip that appears on the Close button in InfoBar. + + + Barra de Informações dispensada + The string read by narrator when the InfoBar closes. + + + Barra de Informações + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/pt-PT/Resources.resw b/dev/InfoBar/Strings/pt-PT/Resources.resw new file mode 100644 index 0000000000..4fea5360e4 --- /dev/null +++ b/dev/InfoBar/Strings/pt-PT/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fechar + Automation name of the close button. + + + Fechar + The tooltip that appears on the Close button in InfoBar. + + + Barra de informações dispensada + The string read by narrator when the InfoBar closes. + + + Barra de informações + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ro-RO/Resources.resw b/dev/InfoBar/Strings/ro-RO/Resources.resw new file mode 100644 index 0000000000..624624d59d --- /dev/null +++ b/dev/InfoBar/Strings/ro-RO/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Închidere + Automation name of the close button. + + + Închidere + The tooltip that appears on the Close button in InfoBar. + + + Bară de informații îndepărtată + The string read by narrator when the InfoBar closes. + + + BarăInfo + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ru-RU/Resources.resw b/dev/InfoBar/Strings/ru-RU/Resources.resw new file mode 100644 index 0000000000..b74b9705eb --- /dev/null +++ b/dev/InfoBar/Strings/ru-RU/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Закрыть + Automation name of the close button. + + + Закрыть + The tooltip that appears on the Close button in InfoBar. + + + Информационная панель закрыта + The string read by narrator when the InfoBar closes. + + + Информационная панель + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/sk-SK/Resources.resw b/dev/InfoBar/Strings/sk-SK/Resources.resw new file mode 100644 index 0000000000..5c7d23dd0c --- /dev/null +++ b/dev/InfoBar/Strings/sk-SK/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Zavrieť + Automation name of the close button. + + + Zavrieť + The tooltip that appears on the Close button in InfoBar. + + + Informačný panel bol zrušený + The string read by narrator when the InfoBar closes. + + + Informačný panel + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/sl-SI/Resources.resw b/dev/InfoBar/Strings/sl-SI/Resources.resw new file mode 100644 index 0000000000..c75ee7a05b --- /dev/null +++ b/dev/InfoBar/Strings/sl-SI/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Zapri + Automation name of the close button. + + + Zapri + The tooltip that appears on the Close button in InfoBar. + + + Informacijska vrstica je opuščena + The string read by narrator when the InfoBar closes. + + + Informacijska vrstica + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/sq-AL/Resources.resw b/dev/InfoBar/Strings/sq-AL/Resources.resw new file mode 100644 index 0000000000..cdcfd8f178 --- /dev/null +++ b/dev/InfoBar/Strings/sq-AL/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Mbyll + Automation name of the close button. + + + Mbyll + The tooltip that appears on the Close button in InfoBar. + + + Shiriti i informacionit u hoq + The string read by narrator when the InfoBar closes. + + + Shiriti i informacionit + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/sr-Latn-RS/Resources.resw b/dev/InfoBar/Strings/sr-Latn-RS/Resources.resw new file mode 100644 index 0000000000..6e55671ccb --- /dev/null +++ b/dev/InfoBar/Strings/sr-Latn-RS/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Zatvori + Automation name of the close button. + + + Zatvori + The tooltip that appears on the Close button in InfoBar. + + + Informativna traka odbačena + The string read by narrator when the InfoBar closes. + + + Informativna traka + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/sv-SE/Resources.resw b/dev/InfoBar/Strings/sv-SE/Resources.resw new file mode 100644 index 0000000000..bb8023bd09 --- /dev/null +++ b/dev/InfoBar/Strings/sv-SE/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Stäng + Automation name of the close button. + + + Stäng + The tooltip that appears on the Close button in InfoBar. + + + InfoBar dismissed + The string read by narrator when the InfoBar closes. + + + Informationsfält + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/sw-KE/Resources.resw b/dev/InfoBar/Strings/sw-KE/Resources.resw new file mode 100644 index 0000000000..1af7de150c --- /dev/null +++ b/dev/InfoBar/Strings/sw-KE/Resources.resw @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/ta-IN/Resources.resw b/dev/InfoBar/Strings/ta-IN/Resources.resw new file mode 100644 index 0000000000..2411bf086a --- /dev/null +++ b/dev/InfoBar/Strings/ta-IN/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + மூடு + Automation name of the close button. + + + மூடு + The tooltip that appears on the Close button in InfoBar. + + + தகவல்பட்டி நீக்கப்பட்டது + The string read by narrator when the InfoBar closes. + + + தகவல்பட்டி + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/te-IN/Resources.resw b/dev/InfoBar/Strings/te-IN/Resources.resw new file mode 100644 index 0000000000..78a19363e6 --- /dev/null +++ b/dev/InfoBar/Strings/te-IN/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + మూసివేయి + Automation name of the close button. + + + మూసివేయి + The tooltip that appears on the Close button in InfoBar. + + + సమాచార బార్ తీసివేయబడింది + The string read by narrator when the InfoBar closes. + + + సమాచార బార్ + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/th-TH/Resources.resw b/dev/InfoBar/Strings/th-TH/Resources.resw new file mode 100644 index 0000000000..b10061e62a --- /dev/null +++ b/dev/InfoBar/Strings/th-TH/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ปิด + Automation name of the close button. + + + ปิด + The tooltip that appears on the Close button in InfoBar. + + + แถบข้อมูลที่ยกเลิก + The string read by narrator when the InfoBar closes. + + + แถบข้อมูล + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/tr-TR/Resources.resw b/dev/InfoBar/Strings/tr-TR/Resources.resw new file mode 100644 index 0000000000..6ac058565d --- /dev/null +++ b/dev/InfoBar/Strings/tr-TR/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Kapat + Automation name of the close button. + + + Kapat + The tooltip that appears on the Close button in InfoBar. + + + Bilgi Çubuğu kapatıldı + The string read by narrator when the InfoBar closes. + + + Bilgi Çubuğu + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/uk-UA/Resources.resw b/dev/InfoBar/Strings/uk-UA/Resources.resw new file mode 100644 index 0000000000..c397f64cc1 --- /dev/null +++ b/dev/InfoBar/Strings/uk-UA/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Закрити + Automation name of the close button. + + + Закрити + The tooltip that appears on the Close button in InfoBar. + + + Інформаційна панель закрита + The string read by narrator when the InfoBar closes. + + + Інформаційна панель + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/uz-Latn-UZ/Resources.resw b/dev/InfoBar/Strings/uz-Latn-UZ/Resources.resw new file mode 100644 index 0000000000..1af7de150c --- /dev/null +++ b/dev/InfoBar/Strings/uz-Latn-UZ/Resources.resw @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/vi-VN/Resources.resw b/dev/InfoBar/Strings/vi-VN/Resources.resw new file mode 100644 index 0000000000..573001b3cb --- /dev/null +++ b/dev/InfoBar/Strings/vi-VN/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Đóng + Automation name of the close button. + + + Đóng + The tooltip that appears on the Close button in InfoBar. + + + Thanh thông tin đã bị loại bỏ + The string read by narrator when the InfoBar closes. + + + Thanh Thông tin + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/zh-CN/Resources.resw b/dev/InfoBar/Strings/zh-CN/Resources.resw new file mode 100644 index 0000000000..663c6d5087 --- /dev/null +++ b/dev/InfoBar/Strings/zh-CN/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 关闭 + Automation name of the close button. + + + 关闭 + The tooltip that appears on the Close button in InfoBar. + + + 已消除信息栏 + The string read by narrator when the InfoBar closes. + + + 信息栏 + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/InfoBar/Strings/zh-TW/Resources.resw b/dev/InfoBar/Strings/zh-TW/Resources.resw new file mode 100644 index 0000000000..65f863d487 --- /dev/null +++ b/dev/InfoBar/Strings/zh-TW/Resources.resw @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 關閉 + Automation name of the close button. + + + 關閉 + The tooltip that appears on the Close button in InfoBar. + + + 已關閉資訊列 + The string read by narrator when the InfoBar closes. + + + 資訊列 + This is the custom landmark used to denote an InfoBar to narrator. + + + %1!s! %2!s! + The formatted string read by narrator when the InfoBar opens: "{Title} {Message}" + + \ No newline at end of file diff --git a/dev/Lights/MaterialHelper.cpp b/dev/Lights/MaterialHelper.cpp index af62d4db55..fd8f9ad71f 100644 --- a/dev/Lights/MaterialHelper.cpp +++ b/dev/Lights/MaterialHelper.cpp @@ -894,9 +894,12 @@ void MaterialHelper::OnVisibilityChanged(const winrt::CoreWindow&, const winrt:: // experience severe rendering lag in resize scenarios (Bug 13289165). void MaterialHelper::OnSizeChanged(const winrt::IInspectable& /*sender*/, const winrt::IInspectable& /*args*/) { - const bool isFullScreenOrTabletMode = IsFullScreenOrTabletMode(); - const auto strongThis = get_strong(); + + // When IsFullScreen changes we get a SizeChanged event. + strongThis->m_isFullScreenModeValid = false; + + const bool isFullScreenOrTabletMode = strongThis->IsFullScreenOrTabletModeImpl(); m_sizeChangedListeners(strongThis, isFullScreenOrTabletMode); } @@ -1007,34 +1010,45 @@ bool MaterialHelper::RS2IsSafeToCreateNoise() /* static */ bool MaterialHelper::IsFullScreenOrTabletMode() { - try - { - auto instance = LifetimeHandler::GetMaterialHelperInstance(); + auto instance = LifetimeHandler::GetMaterialHelperInstance(); + return instance->IsFullScreenOrTabletModeImpl(); +} - // ApplicationView::GetForCurrentView() is an expensive call - make sure to cache the ApplicationView - if (!instance->m_applicationView) +bool MaterialHelper::IsFullScreenOrTabletModeImpl() +{ + if (!m_isFullScreenModeValid) + { + try { - instance->m_applicationView = winrt::ViewManagement::ApplicationView::GetForCurrentView(); - } + // ApplicationView::GetForCurrentView() is an expensive call - make sure to cache the ApplicationView + if (!m_applicationView) + { + m_applicationView = winrt::ViewManagement::ApplicationView::GetForCurrentView(); + } + + // UIViewSettings::GetForCurrentView() is an expensive call - make sure to cache the UIViewSettings + if (!m_uiViewSettings) + { + m_uiViewSettings = winrt::ViewManagement::UIViewSettings::GetForCurrentView(); + } + + const bool isFullScreenMode = m_applicationView.IsFullScreenMode(); + const bool isTabletMode = m_uiViewSettings.UserInteractionMode() == winrt::ViewManagement::UserInteractionMode::Touch; - // UIViewSettings::GetForCurrentView() is an expensive call - make sure to cache the UIViewSettings - if (!instance->m_uiViewSettings) + m_isFullScreenMode = isFullScreenMode || isTabletMode; + } + catch (winrt::hresult_error) { - instance->m_uiViewSettings = winrt::ViewManagement::UIViewSettings::GetForCurrentView(); + // Calling GetForCurrentView on threads without a CoreWindow throws an error. This can happen in XamlIsland scenarios. + // In those cases assume that we are not in full screen or tablet mode for now. + // Task 19285526: In Islands, IsFullScreenOrTabletMode() can use ApplicationView or UIViewSettings. + m_isFullScreenMode = false; } - const bool isFullScreenMode = instance->m_applicationView.IsFullScreenMode(); - const bool isTabletMode = instance->m_uiViewSettings.UserInteractionMode() == winrt::ViewManagement::UserInteractionMode::Touch; - - return isFullScreenMode || isTabletMode; - } - catch (winrt::hresult_error) - { - // Calling GetForCurrentView on threads without a CoreWindow throws an error. This can happen in XamlIsland scenarios. - // In those cases assume that we are not in full screen or tablet mode for now. - // Task 19285526: In Islands, IsFullScreenOrTabletMode() can use ApplicationView or UIViewSettings. - return false; + m_isFullScreenModeValid = true; } + + return m_isFullScreenMode; } /* static */ diff --git a/dev/Lights/MaterialHelper.h b/dev/Lights/MaterialHelper.h index 1a6c702e5a..cb190e38b3 100644 --- a/dev/Lights/MaterialHelper.h +++ b/dev/Lights/MaterialHelper.h @@ -213,6 +213,7 @@ class MaterialHelper : public winrt::implements, bool)>> m_policyChangedListeners; event, bool)>> m_sizeChangedListeners; diff --git a/dev/Materials/Acrylic/AcrylicBrush.vcxitems b/dev/Materials/Acrylic/AcrylicBrush.vcxitems index f7ab0e7ead..16ec8d571b 100644 --- a/dev/Materials/Acrylic/AcrylicBrush.vcxitems +++ b/dev/Materials/Acrylic/AcrylicBrush.vcxitems @@ -45,5 +45,10 @@ ThemeResources 2 + + 19H1 + ThemeResources + 6 + \ No newline at end of file diff --git a/dev/Materials/Acrylic/AcrylicBrush_19h1_themeresources.xaml b/dev/Materials/Acrylic/AcrylicBrush_19h1_themeresources.xaml new file mode 100644 index 0000000000..ae3b44d3a6 --- /dev/null +++ b/dev/Materials/Acrylic/AcrylicBrush_19h1_themeresources.xaml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev/Materials/Acrylic/AcrylicBrush_rs1_themeresources.xaml b/dev/Materials/Acrylic/AcrylicBrush_rs1_themeresources.xaml index ce924ada99..99ca68f307 100644 --- a/dev/Materials/Acrylic/AcrylicBrush_rs1_themeresources.xaml +++ b/dev/Materials/Acrylic/AcrylicBrush_rs1_themeresources.xaml @@ -46,6 +46,10 @@ + + + + @@ -89,6 +93,10 @@ + + + + @@ -130,8 +138,12 @@ - - + + + + + + diff --git a/dev/Materials/Acrylic/AcrylicBrush_rs2_themeresources.xaml b/dev/Materials/Acrylic/AcrylicBrush_rs2_themeresources.xaml index ad4b65120d..182352fcba 100644 --- a/dev/Materials/Acrylic/AcrylicBrush_rs2_themeresources.xaml +++ b/dev/Materials/Acrylic/AcrylicBrush_rs2_themeresources.xaml @@ -217,10 +217,29 @@ + FallbackColor="#2C2C2C" + BackgroundSource="HostBackdrop"/> + + + + @@ -435,10 +454,30 @@ + FallbackColor="#FCFCFC" + BackgroundSource="HostBackdrop"/> + + + + + @@ -480,8 +519,12 @@ - - + + + + + + diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp index e315c31ec3..9f89157afd 100644 --- a/dev/NavigationView/NavigationView.cpp +++ b/dev/NavigationView/NavigationView.cpp @@ -69,6 +69,12 @@ static constexpr auto c_leftNavFooterContentBorder = L"FooterContentBorder"sv; static constexpr auto c_leftNavPaneHeaderContentBorder = L"PaneHeaderContentBorder"sv; static constexpr auto c_leftNavPaneCustomContentBorder = L"PaneCustomContentBorder"sv; +static constexpr auto c_itemsContainer = L"ItemsContainerGrid"sv; +static constexpr auto c_itemsContainerRow = L"ItemsContainerRow"sv; +static constexpr auto c_visualItemsSeparator = L"VisualItemsSeparator"sv; +static constexpr auto c_menuItemsScrollViewer = L"MenuItemsScrollViewer"sv; +static constexpr auto c_footerItemsScrollViewer = L"FooterItemsScrollViewer"sv; + static constexpr auto c_paneHeaderOnTopPane = L"PaneHeaderOnTopPane"sv; static constexpr auto c_paneTitleOnTopPane = L"PaneTitleOnTopPane"sv; static constexpr auto c_paneCustomContentOnTopPane = L"PaneCustomContentOnTopPane"sv; @@ -117,6 +123,7 @@ void NavigationView::UnhookEventsAndClearFields(bool isFromDestructor) m_paneHeaderOnTopPane.set(nullptr); m_paneTitleOnTopPane.set(nullptr); + m_itemsContainerSizeChangedRevoker.revoke(); m_paneTitleHolderFrameworkElementSizeChangedRevoker.revoke(); m_paneTitleHolderFrameworkElement.set(nullptr); @@ -152,6 +159,7 @@ void NavigationView::UnhookEventsAndClearFields(bool isFromDestructor) m_topNavFooterMenuRepeater.set(nullptr); m_footerItemsCollectionChangedRevoker.revoke(); + m_menuItemsCollectionChangedRevoker.revoke(); m_topNavOverflowItemsRepeaterElementPreparedRevoker.revoke(); m_topNavOverflowItemsRepeaterElementClearingRevoker.revoke(); @@ -233,6 +241,9 @@ void NavigationView::OnSelectionModelChildrenRequested(const winrt::SelectionMod void NavigationView::OnFooterItemsSourceCollectionChanged(const winrt::IInspectable&, const winrt::IInspectable&) { UpdateFooterRepeaterItemsSource(false /*sourceCollectionReset*/, true /*sourceCollectionChanged*/); + + // Pane footer items changed. This means we might need to reevaluate the pane layout. + UpdatePaneLayout(); } void NavigationView::OnOverflowItemsSourceCollectionChanged(const winrt::IInspectable&, const winrt::IInspectable&) @@ -635,6 +646,17 @@ void NavigationView::OnApplyTemplate() closeButtonToolTip.Content(box_value(navigationCloseButtonToolTip)); } + m_itemsContainerRow.set(GetTemplateChildT(c_itemsContainerRow, controlProtected)); + m_menuItemsScrollViewer.set(GetTemplateChildT(c_menuItemsScrollViewer, controlProtected)); + m_footerItemsScrollViewer.set(GetTemplateChildT(c_footerItemsScrollViewer, controlProtected)); + m_visualItemsSeparator.set(GetTemplateChildT(c_visualItemsSeparator, controlProtected)); + + m_itemsContainerSizeChangedRevoker.revoke(); + if (const auto itemsContainerRow = GetTemplateChildT(c_itemsContainer, controlProtected)) + { + m_itemsContainerSizeChangedRevoker = itemsContainerRow.SizeChanged(winrt::auto_revoke,{ this,&NavigationView::OnItemsContainerSizeChanged }); + } + if (SharedHelpers::IsRS2OrHigher()) { // Get hold of the outermost grid and enable XYKeyboardNavigationMode @@ -668,6 +690,7 @@ void NavigationView::OnApplyTemplate() UpdatePaneVisibility(); UpdateVisualState(); UpdatePaneTitleMargins(); + UpdatePaneLayout(); } void NavigationView::UpdateRepeaterItemsSource(bool forceSelectionModelUpdate) @@ -690,6 +713,10 @@ void NavigationView::UpdateRepeaterItemsSource(bool forceSelectionModelUpdate) m_selectionModelSource.SetAt(0, itemsSource); } + m_menuItemsCollectionChangedRevoker.revoke(); + m_menuItemsSource = winrt::ItemsSourceView(itemsSource); + m_menuItemsCollectionChangedRevoker = m_menuItemsSource.CollectionChanged(winrt::auto_revoke, { this, &NavigationView::OnMenuItemsSourceCollectionChanged }); + if (IsTopNavigationView()) { UpdateLeftRepeaterItemSource(nullptr); @@ -706,6 +733,8 @@ void NavigationView::UpdateRepeaterItemsSource(bool forceSelectionModelUpdate) void NavigationView::UpdateLeftRepeaterItemSource(const winrt::IInspectable& items) { UpdateItemsRepeaterItemsSource(m_leftNavRepeater.get(), items); + // Left pane repeater has a new items source, update pane layout. + UpdatePaneLayout(); } void NavigationView::UpdateTopNavRepeatersItemSource(const winrt::IInspectable& items) @@ -837,7 +866,23 @@ void NavigationView::UpdateFooterRepeaterItemsSource(bool sourceCollectionReset, } else { - UpdateItemsRepeaterItemsSource(m_leftNavFooterMenuRepeater.get(), m_selectionModelSource.GetAt(1)); + if (const auto repeater = m_leftNavFooterMenuRepeater.get()) + { + UpdateItemsRepeaterItemsSource(m_leftNavFooterMenuRepeater.get(), m_selectionModelSource.GetAt(1)); + + // Footer items changed and we need to recalculate the layout. + // However repeater "lags" behind, so we need to force it to reevaluate itself now. + repeater.InvalidateMeasure(); + repeater.UpdateLayout(); + + // Footer items changed, so let's update the pane layout. + UpdatePaneLayout(); + } + + if (const auto settings = m_settingsItem.get()) + { + settings.StartBringIntoView(); + } } } @@ -1319,6 +1364,12 @@ void NavigationView::OnSizeChanged(winrt::IInspectable const& /*sender*/, winrt: UpdateAdaptiveLayout(width); UpdateTitleBarPadding(); UpdateBackAndCloseButtonsVisibility(); + UpdatePaneLayout(); +} + +void NavigationView::OnItemsContainerSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args) +{ + UpdatePaneLayout(); } // forceSetDisplayMode: On first call to SetDisplayMode, force setting to initial values @@ -1398,6 +1449,109 @@ void NavigationView::UpdateAdaptiveLayout(double width, bool forceSetDisplayMode } } +void NavigationView::UpdatePaneLayout() +{ + if (!IsTopNavigationView()) + { + const auto totalAvailableHeight = [this]() { + if (const auto &paneContentRow = m_itemsContainerRow.get()) + { + // 20px is the padding between the two item lists + if (const auto &paneFooter = m_leftNavFooterContentBorder.get()) + { + return paneContentRow.ActualHeight() - 29 - paneFooter.ActualHeight(); + } + else + { + return paneContentRow.ActualHeight() - 29; + } + } + return 0.0; + }(); + + // Only continue if we have a positive amount of space to manage. + if (totalAvailableHeight > 0) + { + // We need this value more than twice, so cache it. + const auto totalAvailableHeightHalf = totalAvailableHeight / 2; + + const auto heightForMenuItems = [this, totalAvailableHeight, totalAvailableHeightHalf]() { + if (const auto& footerItemsScrollViewer = m_footerItemsScrollViewer.get()) + { + if (const auto& footerItemsRepeater = m_leftNavFooterMenuRepeater.get()) + { + // We know the actual height of footer items, so use that to determine how to split pane. + if (const auto& menuItems = m_leftNavRepeater.get()) + { + const auto footersActualHeight = footerItemsRepeater.ActualHeight(); + const auto menuItemsActualHeight = menuItems.ActualHeight(); + if (totalAvailableHeight > menuItemsActualHeight + footersActualHeight) + { + // We have enough space for two so let everyone get as much as they need. + footerItemsScrollViewer.MaxHeight(footersActualHeight); + if (const auto &separator = m_visualItemsSeparator.get()) + { + separator.Visibility(winrt::Visibility::Collapsed); + } + return totalAvailableHeight - footersActualHeight; + } + else if (menuItemsActualHeight <= totalAvailableHeightHalf) + { + // Footer items exceed over the half, so let's limit them. + footerItemsScrollViewer.MaxHeight(totalAvailableHeight - menuItemsActualHeight); + if (const auto& separator = m_visualItemsSeparator.get()) + { + separator.Visibility(winrt::Visibility::Visible); + } + return menuItemsActualHeight; + } + else if (footersActualHeight <= totalAvailableHeightHalf) + { + // Menu items exceed over the half, so let's limit them. + footerItemsScrollViewer.MaxHeight(footersActualHeight); + if (const auto& separator = m_visualItemsSeparator.get()) + { + separator.Visibility(winrt::Visibility::Visible); + } + return totalAvailableHeight - footersActualHeight; + } + else + { + // Both are more than half the height, so split evenly. + footerItemsScrollViewer.MaxHeight(totalAvailableHeightHalf); + if (const auto& separator = m_visualItemsSeparator.get()) + { + separator.Visibility(winrt::Visibility::Visible); + } + return totalAvailableHeightHalf; + } + } + else + { + // Couldn't determine the menuItems. + // Let's just take all the height and let the other repeater deal with it. + return totalAvailableHeight - footerItemsRepeater.ActualHeight(); + } + } + // We have no idea how much space to occupy as we are not able to get the size of the footer repeater. + // Stick with 50% as backup. + footerItemsScrollViewer.MaxHeight(totalAvailableHeightHalf); + } + // We couldn't find a good strategy, so limit to 50% percent for the menu items. + return totalAvailableHeightHalf; + }(); + // Footer items should have precedence as that usually contains very + // important items such as settings or the profile. + + if (const auto& menuItemsScrollViewer = m_menuItemsScrollViewer.get()) + { + // Update max height for menu items. + menuItemsScrollViewer.MaxHeight(heightForMenuItems); + } + } + } +} + void NavigationView::OnPaneToggleButtonClick(const winrt::IInspectable& /*sender*/, const winrt::RoutedEventArgs& /*args*/) { if (IsPaneOpen()) @@ -3008,6 +3162,18 @@ void NavigationView::UpdateSingleSelectionFollowsFocusTemplateSetting() GetTemplateSettings()->SingleSelectionFollowsFocus(IsNavigationViewListSingleSelectionFollowsFocus()); } +void NavigationView::OnMenuItemsSourceCollectionChanged(const winrt::IInspectable&, const winrt::IInspectable&) +{ + if (!IsTopNavigationView()) + { + if (const auto& repeater = m_leftNavRepeater.get()) + { + repeater.UpdateLayout(); + } + UpdatePaneLayout(); + } +} + void NavigationView::OnSelectedItemPropertyChanged(winrt::DependencyPropertyChangedEventArgs const& args) { @@ -3686,6 +3852,12 @@ void NavigationView::OnPropertyChanged(const winrt::DependencyPropertyChangedEve "NavigationView_DisableBackUI", TraceLoggingDescription("Developer explicitly disables the BackUI on NavigationView")); } + // Enabling back button shifts grid instead of resizing, so let's update the layout. + if (const auto& backButton = m_backButton.get()) + { + backButton.UpdateLayout(); + } + UpdatePaneLayout(); } else if (property == s_MenuItemsSourceProperty) { diff --git a/dev/NavigationView/NavigationView.h b/dev/NavigationView/NavigationView.h index b06b81d2e7..a848aa18e3 100644 --- a/dev/NavigationView/NavigationView.h +++ b/dev/NavigationView/NavigationView.h @@ -156,6 +156,7 @@ class NavigationView : inline NavigationViewTemplateSettings* GetTemplateSettings(); inline bool IsNavigationViewListSingleSelectionFollowsFocus(); inline void UpdateSingleSelectionFollowsFocusTemplateSetting(); + void OnMenuItemsSourceCollectionChanged(const winrt::IInspectable&, const winrt::IInspectable&); void OnFooterItemsSourceCollectionChanged(const winrt::IInspectable &, const winrt::IInspectable &); void OnOverflowItemsSourceCollectionChanged(const winrt::IInspectable&, const winrt::IInspectable&); void SetSelectedItemAndExpectItemInvokeWhenSelectionChangedIfNotInvokedFromAPI(winrt::IInspectable const& item); @@ -246,8 +247,10 @@ class NavigationView : void UpdateFooterRepeaterItemsSource(bool sourceCollectionReseted, bool sourceCollectionChanged); void OnSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args); + void OnItemsContainerSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args); void OnLayoutUpdated(const winrt::IInspectable& sender, const winrt::IInspectable& e); void UpdateAdaptiveLayout(double width, bool forceSetDisplayMode = false); + void UpdatePaneLayout(); void SetDisplayMode(const winrt::NavigationViewDisplayMode& displayMode, bool forceSetDisplayMode = false); NavigationViewVisualStateDisplayMode GetVisualStateDisplayMode(const winrt::NavigationViewDisplayMode& displayMode); @@ -333,10 +336,14 @@ class NavigationView : tracker_ref m_paneToggleButton{ this }; tracker_ref m_rootSplitView{ this }; tracker_ref m_settingsItem{ this }; + tracker_ref m_itemsContainerRow{ this }; + tracker_ref m_menuItemsScrollViewer{ this }; + tracker_ref m_footerItemsScrollViewer{ this }; tracker_ref m_paneContentGrid{ this }; tracker_ref m_paneToggleButtonIconGridColumn{ this }; tracker_ref m_paneTitleHolderFrameworkElement{ this }; tracker_ref m_paneTitleFrameworkElement{ this }; + tracker_ref m_visualItemsSeparator{ this }; tracker_ref m_paneSearchButton{ this }; tracker_ref m_backButton{ this }; tracker_ref m_closeButton{ this }; @@ -396,6 +403,7 @@ class NavigationView : winrt::FrameworkElement::LayoutUpdated_revoker m_layoutUpdatedToken{}; winrt::UIElement::AccessKeyInvoked_revoker m_accessKeyInvokedRevoker{}; winrt::FrameworkElement::SizeChanged_revoker m_paneTitleHolderFrameworkElementSizeChangedRevoker{}; + winrt::FrameworkElement::SizeChanged_revoker m_itemsContainerSizeChangedRevoker{}; winrt::AutoSuggestBox::SuggestionChosen_revoker m_autoSuggestBoxSuggestionChosenRevoker{}; winrt::ItemsRepeater::ElementPrepared_revoker m_leftNavItemsRepeaterElementPreparedRevoker{}; @@ -424,6 +432,7 @@ class NavigationView : winrt::SelectionModel::SelectionChanged_revoker m_selectionChangedRevoker{}; winrt::SelectionModel::ChildrenRequested_revoker m_childrenRequestedRevoker{}; + winrt::ItemsSourceView::CollectionChanged_revoker m_menuItemsCollectionChangedRevoker{}; winrt::ItemsSourceView::CollectionChanged_revoker m_footerItemsCollectionChangedRevoker{}; winrt::ItemsSourceView::CollectionChanged_revoker m_topNavOverflowItemsCollectionChangedRevoker{}; @@ -440,6 +449,7 @@ class NavigationView : winrt::SelectionModel m_selectionModel{}; winrt::IVector m_selectionModelSource{}; + winrt::ItemsSourceView m_menuItemsSource{ nullptr }; winrt::ItemsSourceView m_footerItemsSource{ nullptr }; bool m_appliedTemplate{ false }; diff --git a/dev/NavigationView/NavigationView.idl b/dev/NavigationView/NavigationView.idl index 9420775296..11a9d73241 100644 --- a/dev/NavigationView/NavigationView.idl +++ b/dev/NavigationView/NavigationView.idl @@ -175,11 +175,8 @@ unsealed runtimeclass NavigationView : Windows.UI.Xaml.Controls.ContentControl [MUX_DEFAULT_VALUE("1008.0")] [MUX_PROPERTY_VALIDATION_CALLBACK("CoerceToGreaterThanZero")] Double ExpandedModeThresholdWidth { get; set; }; - [WUXC_VERSION_PREVIEW] - { - Windows.Foundation.Collections.IVector FooterMenuItems{ get; }; - Object FooterMenuItemsSource{ get; set; }; - } + Windows.Foundation.Collections.IVector FooterMenuItems{ get; }; + Object FooterMenuItemsSource{ get; set; }; Windows.UI.Xaml.UIElement PaneFooter { get; set; }; Object Header { get; set; }; Windows.UI.Xaml.DataTemplate HeaderTemplate { get; set; }; @@ -216,11 +213,8 @@ unsealed runtimeclass NavigationView : Windows.UI.Xaml.Controls.ContentControl static Windows.UI.Xaml.DependencyProperty IsPaneOpenProperty { get; }; static Windows.UI.Xaml.DependencyProperty CompactModeThresholdWidthProperty { get; }; static Windows.UI.Xaml.DependencyProperty ExpandedModeThresholdWidthProperty { get; }; - [WUXC_VERSION_PREVIEW] - { - static Windows.UI.Xaml.DependencyProperty FooterMenuItemsProperty{ get; }; - static Windows.UI.Xaml.DependencyProperty FooterMenuItemsSourceProperty{ get; }; - } + static Windows.UI.Xaml.DependencyProperty FooterMenuItemsProperty{ get; }; + static Windows.UI.Xaml.DependencyProperty FooterMenuItemsSourceProperty{ get; }; static Windows.UI.Xaml.DependencyProperty PaneFooterProperty { get; }; static Windows.UI.Xaml.DependencyProperty HeaderProperty { get; }; static Windows.UI.Xaml.DependencyProperty HeaderTemplateProperty { get; }; diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml index e32d32a918..89f38cd7e3 100644 --- a/dev/NavigationView/NavigationView.xaml +++ b/dev/NavigationView/NavigationView.xaml @@ -285,6 +285,40 @@ + + + + + + + + + + + + + + + @@ -367,7 +401,7 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + - + - + + + + - - - - + AutomationProperties.AccessibilityView = "Content"/> + + + @@ -606,6 +646,40 @@ + + + + + + + + + + + + + + + diff --git a/dev/NavigationView/NavigationView_InteractionTests/CommonTests.cs b/dev/NavigationView/NavigationView_InteractionTests/CommonTests.cs index 942a586320..5814ffc32f 100644 --- a/dev/NavigationView/NavigationView_InteractionTests/CommonTests.cs +++ b/dev/NavigationView/NavigationView_InteractionTests/CommonTests.cs @@ -1499,20 +1499,6 @@ public void VerifyShouldPreserveNavigationViewRS3Behavior() } } - [TestMethod] - public void VerifyMoreButtonIsOnlyReadOnce() - { - using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "Top NavigationView Test" })) - { - UIObject moreButton = FindElement.ById("TopNavOverflowButton"); - moreButton.SetFocus(); - Wait.ForIdle(); - - AutomationElement ae = AutomationElement.FocusedElement; - Verify.AreEqual("More", ae.GetCurrentPropertyValue(AutomationElement.NameProperty).ToString()); - } - } - [TestMethod] public void EnsurePaneHeaderCanBeModifiedForLeftNav() { @@ -1732,5 +1718,55 @@ public void VerifyNavigationViewItemContentPresenterMargin() Verify.AreEqual("0,0,20,0", contentPresenterMarginTextBlock.DocumentText); } } + + [TestMethod] + public void VerifyNavigationViewItemChildrenFlyoutMenuCornerRadius() + { + using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "HierarchicalNavigationView Markup Test" })) + { + Log.Comment("Set PaneDisplayMode to LeftCompact."); + var panelDisplayModeComboBox = new ComboBox(FindElement.ByName("PaneDisplayModeCombobox")); + panelDisplayModeComboBox.SelectItemByName("LeftCompact"); + Wait.ForIdle(); + + VerifyChildrenFlyoutMenuCornerRadius(); + + // Refresh the cache to make sure that the flyout object we are going to be searching for + // does not return as a false positive due to the caching mechanism. + ElementCache.Clear(); + + Log.Comment("Set PaneDisplayMode to Top."); + panelDisplayModeComboBox.SelectItemByName("Top"); + Wait.ForIdle(); + + VerifyChildrenFlyoutMenuCornerRadius(); + + void VerifyChildrenFlyoutMenuCornerRadius() + { + Log.Comment("Verify that the children menu flyout used in this test is closed."); + var childItem = FindElement.ByName("Menu Item 2"); + Verify.IsNull(childItem, "Menu Item 1's children menu flyout should have been closed."); + + Log.Comment("Select Menu Item 1 which should open children flyout."); + var item = FindElement.ByName("Menu Item 1"); + InputHelper.LeftClick(item); + Wait.ForIdle(); + + childItem = FindElement.ByName("Menu Item 2"); + Verify.IsNotNull(childItem, "Menu Item 1's children menu flyout should have been open."); + + Log.Comment("Get CornerRadius of Menu Item 1's children menu flyout."); + FindElement.ByName + + + + + + + + + diff --git a/dev/NavigationView/TestUI/Footer/PaneLayoutTestPage.xaml.cs b/dev/NavigationView/TestUI/Footer/PaneLayoutTestPage.xaml.cs new file mode 100644 index 0000000000..633d3670c1 --- /dev/null +++ b/dev/NavigationView/TestUI/Footer/PaneLayoutTestPage.xaml.cs @@ -0,0 +1,99 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using Microsoft.UI.Xaml.Controls; +using MUXControlsTestApp.Utilities; +using System.Collections.Generic; +using Windows.UI.Xaml; + +namespace MUXControlsTestApp +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class PaneLayoutTestPage : TestPage + { + IList menuItems = new System.Collections.ObjectModel.ObservableCollection(); + IList footerItems = new System.Collections.ObjectModel.ObservableCollection(); + + public PaneLayoutTestPage() + { + this.InitializeComponent(); + + + for (int i = 0; i < 4; i++) + { + menuItems.Add( + new NavigationViewItem() { + Content = "Item #" + i.ToString() + } + ); + } + + + for (int i = 0; i < 4; i++) + { + footerItems.Add( + new NavigationViewItem() { + Content = "Footer #" + i.ToString() + } + ); + } + } + + + private void TestCaseSelectionChanged(object sender, Windows.UI.Xaml.Controls.SelectionChangedEventArgs e) + { + if (sender is RadioButtons rb) + { + var caseTag = rb.SelectedIndex; + + switch (caseTag) + { + case 0: + RootNavigationView.MenuItemsSource = null; + RootNavigationView.FooterMenuItemsSource = footerItems; + break; + case 1: + RootNavigationView.MenuItemsSource = menuItems; + RootNavigationView.FooterMenuItemsSource = null; + break; + case 2: + RootNavigationView.MenuItemsSource = menuItems; + RootNavigationView.FooterMenuItemsSource = footerItems; + break; + } + } + } + + private void AddMenuItemButton_Click(object sender, RoutedEventArgs e) + { + menuItems.Add(new NavigationViewItem() { Content = "Text" }); + } + private void AddFooterItemButton_Click(object sender, RoutedEventArgs e) + { + footerItems.Add(new NavigationViewItem() { Content = "Text" }); + } + + private void ResetCollectionsButton_Click(object sender, RoutedEventArgs e) + { + for (int i = menuItems.Count - 1; i > 3; i--) + { + menuItems.RemoveAt(i); + } + + for (int i = footerItems.Count - 1; i > 3; i--) + { + footerItems.RemoveAt(i); + } + } + + private void GetLayoutHeightsButton_Click(object sender, RoutedEventArgs e) + { + var itemsScroll = VisualTreeUtils.FindVisualChildByName(RootNavigationView, "MenuItemsScrollViewer"); + var footerScroll = VisualTreeUtils.FindVisualChildByName(RootNavigationView, "FooterItemsScrollViewer"); + LayoutHeightsReport.Text = itemsScroll.ActualHeight + ";" + footerScroll.ActualHeight; + } + + } +} diff --git a/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml b/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml index 30161f2353..acd72f9366 100644 --- a/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml +++ b/dev/NavigationView/TestUI/Hierarchical/HierarchicalNavigationViewMarkup.xaml @@ -115,12 +115,23 @@ + + + + + + + + - - - diff --git a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs index 7acfa0b00c..b622dc5e50 100644 --- a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs +++ b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs @@ -39,6 +39,7 @@ public NavigationViewCaseBundle() NavigationViewMenuItemStretchPageButton.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewMenuItemStretchPage), 0); }; NavigateToHierarchicalNavigationViewMarkupPage.Click += delegate { Frame.NavigateWithoutAnimation(typeof(HierarchicalNavigationViewMarkup), 0); }; NavigateToHierarchicalNavigationViewDataBindingPage.Click += delegate { Frame.NavigateWithoutAnimation(typeof(HierarchicalNavigationViewDataBinding), 0); }; + PaneLayoutTestPageButton.Click += delegate { Frame.NavigateWithoutAnimation(typeof(PaneLayoutTestPage), 0); }; } } } diff --git a/dev/NavigationView/TestUI/NavigationView_TestUI.projitems b/dev/NavigationView/TestUI/NavigationView_TestUI.projitems index 5addc2bfb9..cafd25e42c 100644 --- a/dev/NavigationView/TestUI/NavigationView_TestUI.projitems +++ b/dev/NavigationView/TestUI/NavigationView_TestUI.projitems @@ -14,6 +14,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -107,6 +111,9 @@ DialogWithNavView.xaml + + PaneLayoutTestPage.xaml + HierarchicalNavigationViewDataBinding.xaml diff --git a/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavPage.xaml b/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavPage.xaml index a324b34d3b..a2acd3c306 100644 --- a/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavPage.xaml +++ b/dev/NavigationView/TestUI/TopMode/NavigationViewTopNavPage.xaml @@ -10,12 +10,12 @@ mc:Ignorable="d" Loaded="TestPage_Loaded"> - + - + @@ -203,6 +203,13 @@ + +