diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 266db58bebf..ab8f5488d3b 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Hintergrund" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 208d60083d4..8f1b444f83c 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -67,7 +67,8 @@ BEGIN END POPUP "F&ormat" BEGIN - POPUP "&Background" + MENUITEM "&Bullet points" ID_BULLET + POPUP "Backgroun&d" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 1ea4c4fb94f..7944c08e156 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "Forma&t" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Fond" BEGIN MENUITEM "&Système\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 7b9fa752614..63190f41880 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "F&ormátum" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Háttér" BEGIN MENUITEM "&Rendszer\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index d76cf4d11d1..d7b4d73fd34 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -68,6 +68,7 @@ BEGIN END POPUP "Çü½Ä(&O)" BEGIN + MENUITEM "B&ullet points" ID_BULLET POPUP "¹è°æ(&B)" BEGIN MENUITEM "½Ã½ºÅÛ(&S)\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 47f1d166936..8e5216c523c 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "&Opmaak" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Achtergrond" BEGIN MENUITEM "&Systeem\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 8f83a748c9b..30a6cfdfe60 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -67,6 +67,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Punktmerking" ID_BULLET POPUP "&Bakgrunn" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 185c4e65f77..b7726446ba5 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -68,6 +68,7 @@ BEGIN END POPUP "F&ormat" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&T³o" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 1bb5b44884b..08d3188bfb3 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -65,6 +65,7 @@ BEGIN END POPUP "Ôîð&ìàò" BEGIN + MENUITEM "B&ullet points" ID_BULLET POPUP "&Ôîí" BEGIN MENUITEM "&Ñèñòåìíûé\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 0fc5f09d1d4..cb4629897a2 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -69,6 +69,7 @@ BEGIN END POPUP "&Biçim" BEGIN + MENUITEM "&Bullet points" ID_BULLET POPUP "&Arkaplan" BEGIN MENUITEM "S&istem\tCtrl+1", ID_BACK_1 diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 5540a8da50c..2e24503c6cb 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -49,6 +49,7 @@ #define ID_EDIT_CUT 1311 #define ID_EDIT_PASTE 1312 #define ID_EDIT_CLEAR 1313 +#define ID_BULLET 1314 #define ID_FORMAT_BOLD 1400 #define ID_FORMAT_ITALIC 1401 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index a683b8ba7b4..d458e0ca848 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -976,6 +976,30 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hwndEditor, EM_REDO, 0, 0); return 0; + case ID_BULLET: + { + PARAFORMAT pf; + + pf.cbSize = sizeof(pf); + pf.dwMask = PFM_NUMBERING; + SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + + pf.dwMask |= PFM_OFFSET; + + if(pf.wNumbering == PFN_BULLET) + { + pf.wNumbering = 0; + pf.dxOffset = 0; + } else + { + pf.wNumbering = PFN_BULLET; + pf.dxOffset = 720; + } + + SendMessageW(hwndEditor, EM_SETPARAFORMAT, 0, (LPARAM)&pf); + } + break; + case ID_ALIGN_LEFT: case ID_ALIGN_CENTER: case ID_ALIGN_RIGHT: @@ -1062,6 +1086,8 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, ID_ALIGN_RIGHT, MF_BYCOMMAND|(nAlignment == PFA_RIGHT) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_BULLET, MF_BYCOMMAND | ((pf.wNumbering == PFN_BULLET) ? + MF_CHECKED : MF_UNCHECKED)); EnableMenuItem(hMenu, ID_EDIT_UNDO, MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_CANUNDO, 0, 0)) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(hMenu, ID_EDIT_REDO, MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_CANREDO, 0, 0)) ?