Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show the last page number when printing if it wasn't defined.

Browse Source 
Show just the current page in the printing progress messages if the last page
has its default "infinitely big" value.

Closes #16987.

(cherry picked from commit 1cd916fc0a)
This commit is contained in:
Fulvio Senore
2015-05-12 17:14:40 +02:00
committed by Paul Cornett
parent 1033ba59d2
commit 097466149a
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/prntbase.cpp
View File

@@ -72,6 +72,11 @@
#endif
#endif // __WXMSW__
// The value traditionally used as the default max page number and meaning
// "infinitely many". It should probably be documented and exposed, but for now
// at least use it here instead of hardcoding the number.
static const int DEFAULT_MAX_PAGES = 32000;
//----------------------------------------------------------------------------
// wxPrintFactory
//----------------------------------------------------------------------------
@@ -541,7 +546,17 @@ void wxPrintAbortDialog::SetProgress(int currentPage, int totalPages,
int currentCopy, int totalCopies)
{
wxString text;
text.Printf(_("Printing page %d of %d"), currentPage, totalPages);
if ( totalPages == DEFAULT_MAX_PAGES )
{
// This means that the user has not supplied a total number of pages so it
// is better not to show this value.
text.Printf(_("Printing page %d"), currentPage);
}
else
{
// We have a valid total number of pages so we show it.
text.Printf(_("Printing page %d of %d"), currentPage, totalPages);
}
if ( totalCopies > 1 )
text += wxString::Format(_(" (copy %d of %d)"), currentCopy, totalCopies);
m_progress->SetLabel(text);
@@ -607,7 +622,7 @@ bool wxPrintout::HasPage(int page)
void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toPage)
{
*minPage = 1;
*maxPage = 32000;
*maxPage = DEFAULT_MAX_PAGES;
*fromPage = 1;
*toPage = 1;
}