From bb58537e951382d46ac62fdc04561b04bc78fd53 Mon Sep 17 00:00:00 2001 From: Dylan Smith Date: Thu, 25 Feb 2010 01:50:01 -0500 Subject: [PATCH] wordpad: Show page numbers in statusbar for print preview. --- programs/wordpad/Da.rc | 2 ++ programs/wordpad/De.rc | 2 ++ programs/wordpad/En.rc | 2 ++ programs/wordpad/Fr.rc | 2 ++ programs/wordpad/Hu.rc | 2 ++ programs/wordpad/It.rc | 2 ++ programs/wordpad/Ja.rc | 2 ++ programs/wordpad/Ko.rc | 4 +++- programs/wordpad/Lt.rc | 2 ++ programs/wordpad/Nl.rc | 2 ++ programs/wordpad/No.rc | 2 ++ programs/wordpad/Pl.rc | 2 ++ programs/wordpad/Pt.rc | 2 ++ programs/wordpad/Ru.rc | 2 ++ programs/wordpad/Si.rc | 2 ++ programs/wordpad/Sv.rc | 2 ++ programs/wordpad/Tr.rc | 2 ++ programs/wordpad/Uk.rc | 2 ++ programs/wordpad/Zh.rc | 2 ++ programs/wordpad/print.c | 22 ++++++++++++++++++++++ programs/wordpad/wordpad.c | 2 +- programs/wordpad/wordpad.h | 4 +++- 22 files changed, 65 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index 3c411a791b..882cca7e8d 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -245,6 +245,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Luk" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index e251f0e834..3ca040c901 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -247,6 +247,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Ver&größern" STRING_PREVIEW_ZOOMOUT, "Ver&kleinern" STRING_PREVIEW_CLOSE, "&Schließen" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index f7073d98bc..0dec19bc65 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -237,6 +237,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Close" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" STRING_UNITS_CM, "cm" END diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 6e2748c29d..54ae0b992b 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -248,6 +248,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom avant" STRING_PREVIEW_ZOOMOUT, "Zoom arrière" STRING_PREVIEW_CLOSE, "Fermer" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index d44185b654..3694062e35 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -245,6 +245,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Close" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/It.rc b/programs/wordpad/It.rc index 4425a2f955..9996841177 100644 --- a/programs/wordpad/It.rc +++ b/programs/wordpad/It.rc @@ -241,6 +241,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Ingrandisci" STRING_PREVIEW_ZOOMOUT, "Rimpicciolisci" STRING_PREVIEW_CLOSE, "Chiudi" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" STRING_UNITS_CM, "cm" END diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc index 0ab2c72392..bd5e4c9ea9 100644 --- a/programs/wordpad/Ja.rc +++ b/programs/wordpad/Ja.rc @@ -248,6 +248,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "閉じる" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index f3a7a75235..fd39d963c2 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -239,7 +239,9 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "´Ý±â" - STRING_UNITS_CM, "cm" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" + STRING_UNITS_CM, "cm" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Lt.rc b/programs/wordpad/Lt.rc index 6c838a094b..8e05ca89d4 100644 --- a/programs/wordpad/Lt.rc +++ b/programs/wordpad/Lt.rc @@ -248,6 +248,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Didinti" STRING_PREVIEW_ZOOMOUT, "Mažinti" STRING_PREVIEW_CLOSE, "Užverti" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 106f4224fb..5741dbea9b 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -238,6 +238,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Sluiten" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 333a292119..fbca2a09be 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -247,6 +247,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Lukk" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 8d429127c7..4d40304185 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -246,6 +246,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Zamknij" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index aeb69ee800..2a2ae4b749 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -249,6 +249,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Fechar" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 2495f3f975..230003b3c6 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -248,6 +248,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Приблизить" STRING_PREVIEW_ZOOMOUT, "Отдалить" STRING_PREVIEW_CLOSE, "Закрыть" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index 0047b643cf..f7e0c722b4 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -247,6 +247,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Zapri" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc index 5e5b0f13cf..2fae294dff 100644 --- a/programs/wordpad/Sv.rc +++ b/programs/wordpad/Sv.rc @@ -247,6 +247,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zooma in" STRING_PREVIEW_ZOOMOUT, "Zooma ut" STRING_PREVIEW_CLOSE, "Stäng" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index e0e9dd1ab6..ef66aa40ad 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -247,6 +247,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Close" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/Uk.rc b/programs/wordpad/Uk.rc index de5588607b..35e35977e5 100644 --- a/programs/wordpad/Uk.rc +++ b/programs/wordpad/Uk.rc @@ -244,6 +244,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Збільшити" STRING_PREVIEW_ZOOMOUT, "Зменшити" STRING_PREVIEW_CLOSE, "Закрити" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" STRING_UNITS_CM, "cm" END diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 989bd23ac0..6adb30af43 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -250,6 +250,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "关闭" + STRING_PREVIEW_PAGE, "Page" + STRING_PREVIEW_PAGES, "Pages" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index d21b5e04ae..71c06273fd 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -942,6 +942,27 @@ LRESULT print_preview(HWND hwndPreview) return 0; } +static void update_preview_statusbar(HWND hMainWnd) +{ + HWND hStatusbar = GetDlgItem(hMainWnd, IDC_STATUSBAR); + HINSTANCE hInst = GetModuleHandleW(0); + WCHAR *p; + WCHAR wstr[MAX_STRING_LEN]; + + p = wstr; + if (preview.pages_shown < 2 || is_last_preview_page(preview.page)) + { + static const WCHAR fmt[] = {' ','%','d','\0'}; + p += LoadStringW(hInst, STRING_PREVIEW_PAGE, wstr, MAX_STRING_LEN); + wsprintfW(p, fmt, preview.page); + } else { + static const WCHAR fmt[] = {' ','%','d','-','%','d','\0'}; + p += LoadStringW(hInst, STRING_PREVIEW_PAGES, wstr, MAX_STRING_LEN); + wsprintfW(p, fmt, preview.page, preview.page + 1); + } + SetWindowTextW(hStatusbar, wstr); +} + /* Update for page changes. */ static void update_preview(HWND hMainWnd) { @@ -995,6 +1016,7 @@ static void update_preview(HWND hMainWnd) update_scaled_preview(hMainWnd); update_preview_buttons(hMainWnd); + update_preview_statusbar(hMainWnd); } static void toggle_num_pages(HWND hMainWnd) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 875a643d37..b9e6f3716a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2117,7 +2117,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) { int index = reg_formatindex(fileFormat); DWORD tmp = barState[index]; - barState[index] = 0; + barState[index] = 1 << BANDID_STATUSBAR; set_bar_states(); barState[index] = tmp; ShowWindow(hEditorWnd, FALSE); diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 6ec48400a4..2f774c3aff 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -218,8 +218,10 @@ #define STRING_PREVIEW_ZOOMIN 1453 #define STRING_PREVIEW_ZOOMOUT 1454 #define STRING_PREVIEW_CLOSE 1455 +#define STRING_PREVIEW_PAGE 1456 +#define STRING_PREVIEW_PAGES 1457 -#define STRING_UNITS_CM 1456 +#define STRING_UNITS_CM 1458 #define STRING_DEFAULT_FILENAME 1700 #define STRING_PROMPT_SAVE_CHANGES 1701 -- 2.32.0.93.g670b81a890