From a0dbee86c40fdf3fd8cb85275bdc93322ad21cff Mon Sep 17 00:00:00 2001 From: Sergey Smirnov Date: Fri, 25 Sep 2020 08:48:04 +0300 Subject: [PATCH] Adding access to page buttons on PrintPreviewDialog by keyboard shortcut keys (#3929) --- Winforms.sln | 7 ++ .../Windows/Forms/PrintPreviewDialog.resx | 20 ++--- .../Forms/xlf/PrintPreviewDialog.cs.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.de.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.es.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.fr.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.it.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.ja.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.ko.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.pl.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.pt-BR.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.ru.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.tr.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.zh-Hans.xlf | 40 +++++----- .../Forms/xlf/PrintPreviewDialog.zh-Hant.xlf | 40 +++++----- .../Forms/Printing/PrintPreviewDialog.cs | 23 +++++- .../AccessibilityTests/PrintingTesting.resx | 24 +++--- .../MauiPrintPreviewDialogTests.cs | 73 +++++++++++++++++++ .../MauiPrintPreviewDialogTests.csproj | 9 +++ .../WinformsMauiPrintPreviewDialogTests.cs | 37 ++++++++++ 20 files changed, 430 insertions(+), 283 deletions(-) create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPrintPreviewDialogTests/MauiPrintPreviewDialogTests.cs create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/MauiTests/MauiPrintPreviewDialogTests/MauiPrintPreviewDialogTests.csproj create mode 100644 src/System.Windows.Forms/tests/IntegrationTests/System.Windows.Forms.Maui.IntegrationTests/WinformsMauiPrintPreviewDialogTests.cs diff --git a/Winforms.sln b/Winforms.sln index fb72c162d12..02826d0ffb7 100644 --- a/Winforms.sln +++ b/Winforms.sln @@ -137,6 +137,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiToolStripTests", "src\S EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Interop.Tests", "src\System.Windows.Forms\tests\InteropTests\System.Windows.Forms.Interop.Tests.csproj", "{C272DA06-B98D-4BB7-B1C4-ECF58F54B224}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiPrintPreviewDialogTests", "src\System.Windows.Forms\tests\IntegrationTests\MauiTests\MauiPrintPreviewDialogTests\MauiPrintPreviewDialogTests.csproj", "{2F0973AD-498D-45B6-82ED-CD672F7A03AB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -291,6 +293,10 @@ Global {C272DA06-B98D-4BB7-B1C4-ECF58F54B224}.Debug|x64.Build.0 = Debug|x64 {C272DA06-B98D-4BB7-B1C4-ECF58F54B224}.Release|x64.ActiveCfg = Release|x64 {C272DA06-B98D-4BB7-B1C4-ECF58F54B224}.Release|x64.Build.0 = Release|x64 + {2F0973AD-498D-45B6-82ED-CD672F7A03AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F0973AD-498D-45B6-82ED-CD672F7A03AB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F0973AD-498D-45B6-82ED-CD672F7A03AB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F0973AD-498D-45B6-82ED-CD672F7A03AB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -336,6 +342,7 @@ Global {86418F0B-39DC-4B5A-8145-6D607E6150AC} = {DF68A171-D27B-4E6A-8A7E-63A651622355} {83634671-CF3A-43B0-B729-42CCBA62DF2C} = {8F20A905-BD37-4D80-B8DF-FA45276FC23F} {C272DA06-B98D-4BB7-B1C4-ECF58F54B224} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC} + {2F0973AD-498D-45B6-82ED-CD672F7A03AB} = {8F20A905-BD37-4D80-B8DF-FA45276FC23F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7B1B0433-F612-4E5A-BE7E-FCF5B9F6E136} diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx index fe3867dc155..543f3ae8b0b 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx @@ -165,46 +165,46 @@ Display one page - One page + One page (Ctrl+1) - One page + One page (Ctrl+1) Display two pages - Two pages + Two pages (Ctrl+2) - Two pages + Two pages (Ctrl+2) Display three pages - Three pages + Three pages (Ctrl+3) - Three pages + Three pages (Ctrl+3) Display four pages - Four pages + Four pages (Ctrl+4) - Four pages + Four pages (Ctrl+4) Display six pages - Six pages + Six pages (Ctrl+5) - Six pages + Six pages (Ctrl+5) Close this window diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.cs.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.cs.xlf index bd7f5e9f5e1..b64f6434ecc 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.cs.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.cs.xlf @@ -43,13 +43,13 @@ - Four pages - Čtyři stránky + Four pages (Ctrl+4) + Čtyři stránky - Four pages - Čtyři stránky + Four pages (Ctrl+4) + Čtyři stránky @@ -58,13 +58,13 @@ - One page - Jedna stránka + One page (Ctrl+1) + Jedna stránka - One page - Jedna stránka + One page (Ctrl+1) + Jedna stránka @@ -108,13 +108,13 @@ - Six pages - Šest stránek + Six pages (Ctrl+5) + Šest stránek - Six pages - Šest stránek + Six pages (Ctrl+5) + Šest stránek @@ -123,13 +123,13 @@ - Three pages - Tři stránky + Three pages (Ctrl+3) + Tři stránky - Three pages - Tři stránky + Three pages (Ctrl+3) + Tři stránky @@ -268,13 +268,13 @@ - Two pages - Dvě stránky + Two pages (Ctrl+2) + Dvě stránky - Two pages - Dvě stránky + Two pages (Ctrl+2) + Dvě stránky diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.de.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.de.xlf index c29050f98e5..1639ee97773 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.de.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.de.xlf @@ -43,13 +43,13 @@ - Four pages - Vier Seiten + Four pages (Ctrl+4) + Vier Seiten - Four pages - Vier Seiten + Four pages (Ctrl+4) + Vier Seiten @@ -58,13 +58,13 @@ - One page - Ganze Seite + One page (Ctrl+1) + Ganze Seite - One page - Ganze Seite + One page (Ctrl+1) + Ganze Seite @@ -108,13 +108,13 @@ - Six pages - Sechs Seiten + Six pages (Ctrl+5) + Sechs Seiten - Six pages - Sechs Seiten + Six pages (Ctrl+5) + Sechs Seiten @@ -123,13 +123,13 @@ - Three pages - Drei Seiten + Three pages (Ctrl+3) + Drei Seiten - Three pages - Drei Seiten + Three pages (Ctrl+3) + Drei Seiten @@ -268,13 +268,13 @@ - Two pages - Zwei Seiten + Two pages (Ctrl+2) + Zwei Seiten - Two pages - Zwei Seiten + Two pages (Ctrl+2) + Zwei Seiten diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.es.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.es.xlf index bceb427d9cf..453fa9cd515 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.es.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.es.xlf @@ -43,13 +43,13 @@ - Four pages - Cuatro páginas + Four pages (Ctrl+4) + Cuatro páginas - Four pages - Cuatro páginas + Four pages (Ctrl+4) + Cuatro páginas @@ -58,13 +58,13 @@ - One page - Una página + One page (Ctrl+1) + Una página - One page - Una página + One page (Ctrl+1) + Una página @@ -108,13 +108,13 @@ - Six pages - Seis páginas + Six pages (Ctrl+5) + Seis páginas - Six pages - Seis páginas + Six pages (Ctrl+5) + Seis páginas @@ -123,13 +123,13 @@ - Three pages - Tres páginas + Three pages (Ctrl+3) + Tres páginas - Three pages - Tres páginas + Three pages (Ctrl+3) + Tres páginas @@ -268,13 +268,13 @@ - Two pages - Dos páginas + Two pages (Ctrl+2) + Dos páginas - Two pages - Dos páginas + Two pages (Ctrl+2) + Dos páginas diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.fr.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.fr.xlf index 4a488819eee..4fa1fa841da 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.fr.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.fr.xlf @@ -43,13 +43,13 @@ - Four pages - Quatre pages + Four pages (Ctrl+4) + Quatre pages - Four pages - Quatre pages + Four pages (Ctrl+4) + Quatre pages @@ -58,13 +58,13 @@ - One page - Une page + One page (Ctrl+1) + Une page - One page - Une page + One page (Ctrl+1) + Une page @@ -108,13 +108,13 @@ - Six pages - Six pages + Six pages (Ctrl+5) + Six pages - Six pages - Six pages + Six pages (Ctrl+5) + Six pages @@ -123,13 +123,13 @@ - Three pages - Trois pages + Three pages (Ctrl+3) + Trois pages - Three pages - Trois pages + Three pages (Ctrl+3) + Trois pages @@ -268,13 +268,13 @@ - Two pages - Deux pages + Two pages (Ctrl+2) + Deux pages - Two pages - Deux pages + Two pages (Ctrl+2) + Deux pages diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.it.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.it.xlf index e88ab41e3b5..f4bcec480be 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.it.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.it.xlf @@ -43,13 +43,13 @@ - Four pages - Quattro pagine + Four pages (Ctrl+4) + Quattro pagine - Four pages - Quattro pagine + Four pages (Ctrl+4) + Quattro pagine @@ -58,13 +58,13 @@ - One page - Una pagina + One page (Ctrl+1) + Una pagina - One page - Una pagina + One page (Ctrl+1) + Una pagina @@ -108,13 +108,13 @@ - Six pages - Sei pagine + Six pages (Ctrl+5) + Sei pagine - Six pages - Sei pagine + Six pages (Ctrl+5) + Sei pagine @@ -123,13 +123,13 @@ - Three pages - Tre pagine + Three pages (Ctrl+3) + Tre pagine - Three pages - Tre pagine + Three pages (Ctrl+3) + Tre pagine @@ -268,13 +268,13 @@ - Two pages - Due pagine + Two pages (Ctrl+2) + Due pagine - Two pages - Due pagine + Two pages (Ctrl+2) + Due pagine diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ja.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ja.xlf index 799499ec98e..2dd2a6718b8 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ja.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ja.xlf @@ -43,13 +43,13 @@ - Four pages - 4 ページ + Four pages (Ctrl+4) + 4 ページ - Four pages - 4 ページ + Four pages (Ctrl+4) + 4 ページ @@ -58,13 +58,13 @@ - One page - 1 ページ + One page (Ctrl+1) + 1 ページ - One page - 1 ページ + One page (Ctrl+1) + 1 ページ @@ -108,13 +108,13 @@ - Six pages - 6 ページ + Six pages (Ctrl+5) + 6 ページ - Six pages - 6 ページ + Six pages (Ctrl+5) + 6 ページ @@ -123,13 +123,13 @@ - Three pages - 3 ページ + Three pages (Ctrl+3) + 3 ページ - Three pages - 3 ページ + Three pages (Ctrl+3) + 3 ページ @@ -268,13 +268,13 @@ - Two pages - 2 ページ + Two pages (Ctrl+2) + 2 ページ - Two pages - 2 ページ + Two pages (Ctrl+2) + 2 ページ diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ko.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ko.xlf index 8ae7d86f1dc..ae879fd7f2e 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ko.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ko.xlf @@ -43,13 +43,13 @@ - Four pages - 네 페이지 + Four pages (Ctrl+4) + 네 페이지 - Four pages - 네 페이지 + Four pages (Ctrl+4) + 네 페이지 @@ -58,13 +58,13 @@ - One page - 한 페이지 + One page (Ctrl+1) + 한 페이지 - One page - 한 페이지 + One page (Ctrl+1) + 한 페이지 @@ -108,13 +108,13 @@ - Six pages - 여섯 페이지 + Six pages (Ctrl+5) + 여섯 페이지 - Six pages - 여섯 페이지 + Six pages (Ctrl+5) + 여섯 페이지 @@ -123,13 +123,13 @@ - Three pages - 세 페이지 + Three pages (Ctrl+3) + 세 페이지 - Three pages - 세 페이지 + Three pages (Ctrl+3) + 세 페이지 @@ -268,13 +268,13 @@ - Two pages - 두 페이지 + Two pages (Ctrl+2) + 두 페이지 - Two pages - 두 페이지 + Two pages (Ctrl+2) + 두 페이지 diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.pl.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.pl.xlf index 5b79c337867..2e337ab63f5 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.pl.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.pl.xlf @@ -43,13 +43,13 @@ - Four pages - Cztery strony + Four pages (Ctrl+4) + Cztery strony - Four pages - Cztery strony + Four pages (Ctrl+4) + Cztery strony @@ -58,13 +58,13 @@ - One page - Jedna strona + One page (Ctrl+1) + Jedna strona - One page - Jedna strona + One page (Ctrl+1) + Jedna strona @@ -108,13 +108,13 @@ - Six pages - Sześć stron + Six pages (Ctrl+5) + Sześć stron - Six pages - Sześć stron + Six pages (Ctrl+5) + Sześć stron @@ -123,13 +123,13 @@ - Three pages - Trzy strony + Three pages (Ctrl+3) + Trzy strony - Three pages - Trzy strony + Three pages (Ctrl+3) + Trzy strony @@ -268,13 +268,13 @@ - Two pages - Dwie strony + Two pages (Ctrl+2) + Dwie strony - Two pages - Dwie strony + Two pages (Ctrl+2) + Dwie strony diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.pt-BR.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.pt-BR.xlf index 92d5729e74d..3d4b81832f2 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.pt-BR.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.pt-BR.xlf @@ -43,13 +43,13 @@ - Four pages - Quatro páginas + Four pages (Ctrl+4) + Quatro páginas - Four pages - Quatro páginas + Four pages (Ctrl+4) + Quatro páginas @@ -58,13 +58,13 @@ - One page - Uma página + One page (Ctrl+1) + Uma página - One page - Uma página + One page (Ctrl+1) + Uma página @@ -108,13 +108,13 @@ - Six pages - Seis páginas + Six pages (Ctrl+5) + Seis páginas - Six pages - Seis páginas + Six pages (Ctrl+5) + Seis páginas @@ -123,13 +123,13 @@ - Three pages - Três páginas + Three pages (Ctrl+3) + Três páginas - Three pages - Três páginas + Three pages (Ctrl+3) + Três páginas @@ -268,13 +268,13 @@ - Two pages - Duas páginas + Two pages (Ctrl+2) + Duas páginas - Two pages - Duas páginas + Two pages (Ctrl+2) + Duas páginas diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ru.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ru.xlf index d246cd5b79e..045352011d0 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ru.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.ru.xlf @@ -43,13 +43,13 @@ - Four pages - Четыре страницы + Four pages (Ctrl+4) + Четыре страницы - Four pages - Четыре страницы + Four pages (Ctrl+4) + Четыре страницы @@ -58,13 +58,13 @@ - One page - Одна страница + One page (Ctrl+1) + Одна страница - One page - Одна страница + One page (Ctrl+1) + Одна страница @@ -108,13 +108,13 @@ - Six pages - Шесть страниц + Six pages (Ctrl+5) + Шесть страниц - Six pages - Шесть страниц + Six pages (Ctrl+5) + Шесть страниц @@ -123,13 +123,13 @@ - Three pages - Три страницы + Three pages (Ctrl+3) + Три страницы - Three pages - Три страницы + Three pages (Ctrl+3) + Три страницы @@ -268,13 +268,13 @@ - Two pages - Две страницы + Two pages (Ctrl+2) + Две страницы - Two pages - Две страницы + Two pages (Ctrl+2) + Две страницы diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.tr.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.tr.xlf index 970ed494ea8..a8538fa8f2b 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.tr.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.tr.xlf @@ -43,13 +43,13 @@ - Four pages - Dört sayfa + Four pages (Ctrl+4) + Dört sayfa - Four pages - Dört sayfa + Four pages (Ctrl+4) + Dört sayfa @@ -58,13 +58,13 @@ - One page - Bir sayfa + One page (Ctrl+1) + Bir sayfa - One page - Bir sayfa + One page (Ctrl+1) + Bir sayfa @@ -108,13 +108,13 @@ - Six pages - Altı sayfa + Six pages (Ctrl+5) + Altı sayfa - Six pages - Altı sayfa + Six pages (Ctrl+5) + Altı sayfa @@ -123,13 +123,13 @@ - Three pages - Üç sayfa + Three pages (Ctrl+3) + Üç sayfa - Three pages - Üç sayfa + Three pages (Ctrl+3) + Üç sayfa @@ -268,13 +268,13 @@ - Two pages - İki sayfa + Two pages (Ctrl+2) + İki sayfa - Two pages - İki sayfa + Two pages (Ctrl+2) + İki sayfa diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.zh-Hans.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.zh-Hans.xlf index 3af688a61d6..b3697cdad35 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.zh-Hans.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.zh-Hans.xlf @@ -43,13 +43,13 @@ - Four pages - 四页 + Four pages (Ctrl+4) + 四页 - Four pages - 四页 + Four pages (Ctrl+4) + 四页 @@ -58,13 +58,13 @@ - One page - 一页 + One page (Ctrl+1) + 一页 - One page - 一页 + One page (Ctrl+1) + 一页 @@ -108,13 +108,13 @@ - Six pages - 六页 + Six pages (Ctrl+5) + 六页 - Six pages - 六页 + Six pages (Ctrl+5) + 六页 @@ -123,13 +123,13 @@ - Three pages - 三页 + Three pages (Ctrl+3) + 三页 - Three pages - 三页 + Three pages (Ctrl+3) + 三页 @@ -268,13 +268,13 @@ - Two pages - 双页 + Two pages (Ctrl+2) + 双页 - Two pages - 双页 + Two pages (Ctrl+2) + 双页 diff --git a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.zh-Hant.xlf b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.zh-Hant.xlf index 68fbc9fec01..cdf8ea2b876 100644 --- a/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.zh-Hant.xlf +++ b/src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.zh-Hant.xlf @@ -43,13 +43,13 @@ - Four pages - 四頁 + Four pages (Ctrl+4) + 四頁 - Four pages - 四頁 + Four pages (Ctrl+4) + 四頁 @@ -58,13 +58,13 @@ - One page - 一頁 + One page (Ctrl+1) + 一頁 - One page - 一頁 + One page (Ctrl+1) + 一頁 @@ -108,13 +108,13 @@ - Six pages - 六頁 + Six pages (Ctrl+5) + 六頁 - Six pages - 六頁 + Six pages (Ctrl+5) + 六頁 @@ -123,13 +123,13 @@ - Three pages - 三頁 + Three pages (Ctrl+3) + 三頁 - Three pages - 三頁 + Three pages (Ctrl+3) + 三頁 @@ -268,13 +268,13 @@ - Two pages - 兩頁 + Two pages (Ctrl+2) + 兩頁 - Two pages - 兩頁 + Two pages (Ctrl+2) + 兩頁 diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewDialog.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewDialog.cs index 2e055f518e8..d19b3f2811a 100644 --- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewDialog.cs +++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewDialog.cs @@ -1252,9 +1252,9 @@ protected override void CreateHandle() protected override bool ProcessDialogKey(Keys keyData) { + Keys keyCode = (Keys)keyData & Keys.KeyCode; if ((keyData & (Keys.Alt | Keys.Control)) == Keys.None) { - Keys keyCode = (Keys)keyData & Keys.KeyCode; switch (keyCode) { case Keys.Left: @@ -1264,6 +1264,27 @@ protected override bool ProcessDialogKey(Keys keyData) return false; } } + else if ((keyData & Keys.Control) == Keys.Control) + { + return keyCode switch + { + Keys.D1 => PerformPageToolStripButtonClick(onepageToolStripButton), + Keys.D2 => PerformPageToolStripButtonClick(twopagesToolStripButton), + Keys.D3 => PerformPageToolStripButtonClick(threepagesToolStripButton), + Keys.D4 => PerformPageToolStripButtonClick(fourpagesToolStripButton), + Keys.D5 => PerformPageToolStripButtonClick(sixpagesToolStripButton), + _ => base.ProcessDialogKey(keyData) + }; + + bool PerformPageToolStripButtonClick(PrintPreviewDialogToolStripButton pageToolStripButton) + { + pageToolStripButton.PerformClick(); + toolStrip1.Focus(); + toolStrip1.ChangeSelection(pageToolStripButton); + return true; + } + } + return base.ProcessDialogKey(keyData); } diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/PrintingTesting.resx b/src/System.Windows.Forms/tests/AccessibilityTests/PrintingTesting.resx index aece132eff9..6e34c440d06 100644 --- a/src/System.Windows.Forms/tests/AccessibilityTests/PrintingTesting.resx +++ b/src/System.Windows.Forms/tests/AccessibilityTests/PrintingTesting.resx @@ -1,4 +1,4 @@ - +