Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding access to page buttons on PrintPreviewDialog by keyboard shortcut keys #3929

Merged
merged 4 commits into from Sep 25, 2020
Merged

Adding access to page buttons on PrintPreviewDialog by keyboard shortcut keys #3929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cb4847
Adding access to page buttons on PrintPreviewDialog by keyboard short…
SergeySmirnov-Akvelon Sep 16, 2020
80442df
Added UI tests
SergeySmirnov-Akvelon Sep 16, 2020
08a78c7
Fixed code review notes
SergeySmirnov-Akvelon Sep 17, 2020
29b9d88
Revert changes. Fixed ui tests
SergeySmirnov-Akvelon Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Winforms.sln
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
20 changes: 10 additions & 10 deletions src/System.Windows.Forms/src/Resources/System/Windows/Forms/PrintPreviewDialog.resx
View file
Open in desktop
Expand Up @@ -165,46 +165,46 @@
<value xml:space="preserve">Display one page</value>
</data>
<data name="onepageToolStripButton.AccessibleName">
<value xml:space="preserve">One page</value>
<value xml:space="preserve">One page (Ctrl+1)</value>
</data>
<data name="onepageToolStripButton.Text">
<value xml:space="preserve">One page</value>
<value xml:space="preserve">One page (Ctrl+1)</value>
</data>
<data name="twopagesToolStripButton.AccessibleDescription">
<value xml:space="preserve">Display two pages</value>
</data>
<data name="twopagesToolStripButton.AccessibleName">
<value xml:space="preserve">Two pages</value>
<value xml:space="preserve">Two pages (Ctrl+2)</value>
</data>
<data name="twopagesToolStripButton.Text">
<value xml:space="preserve">Two pages</value>
<value xml:space="preserve">Two pages (Ctrl+2)</value>
</data>
<data name="threepagesToolStripButton.AccessibleDescription">
<value xml:space="preserve">Display three pages</value>
</data>
<data name="threepagesToolStripButton.AccessibleName">
<value xml:space="preserve">Three pages</value>
<value xml:space="preserve">Three pages (Ctrl+3)</value>
</data>
<data name="threepagesToolStripButton.Text">
<value xml:space="preserve">Three pages</value>
<value xml:space="preserve">Three pages (Ctrl+3)</value>
</data>
<data name="fourpagesToolStripButton.AccessibleDescription">
<value xml:space="preserve">Display four pages</value>
</data>
<data name="fourpagesToolStripButton.AccessibleName">
<value xml:space="preserve">Four pages</value>
<value xml:space="preserve">Four pages (Ctrl+4)</value>
</data>
<data name="fourpagesToolStripButton.Text">
<value xml:space="preserve">Four pages</value>
<value xml:space="preserve">Four pages (Ctrl+4)</value>
</data>
<data name="sixpagesToolStripButton.AccessibleDescription">
<value xml:space="preserve">Display six pages</value>
</data>
<data name="sixpagesToolStripButton.AccessibleName">
<value xml:space="preserve">Six pages</value>
<value xml:space="preserve">Six pages (Ctrl+5)</value>
</data>
<data name="sixpagesToolStripButton.Text">
<value xml:space="preserve">Six pages</value>
<value xml:space="preserve">Six pages (Ctrl+5)</value>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the reason to go with Ctrl+5 and not with Ctrl+6? Did you find any guidance about it?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was my suggestion #3682 (comment) that everyone has agreed with.

In my opinion it is a logical sequence - option 1, 2, ...5, and not based on number of pages. E.g. if there was a sixth option to show 12 pages - as a user I wouldn't expect CTRL+12 but CTRL+6.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had you guys looked at what Office or windows are doing in similar cases?

</data>
<data name="closeToolStripButton.AccessibleDescription">
<value xml:space="preserve">Close this window</value>
Expand Down
40 changes: 20 additions & 20 deletions src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.cs.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 deletions src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.de.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 deletions src/System.Windows.Forms/src/Resources/System/Windows/Forms/xlf/PrintPreviewDialog.es.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.