Alexander Nicolaysen Sørnes : wordpad: Add bullet points option.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 20 07:42:42 CDT 2007
Module: wine
Branch: master
Commit: d4ddb7f3beddb1270a484ac242ac75bb33049914
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ddb7f3beddb1270a484ac242ac75bb33049914
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Fri Jul 20 18:38:08 2007 +0200
wordpad: Add bullet points option.
---
programs/wordpad/De.rc | 1 +
programs/wordpad/En.rc | 3 ++-
programs/wordpad/Fr.rc | 1 +
programs/wordpad/Hu.rc | 1 +
programs/wordpad/Ko.rc | 1 +
programs/wordpad/Nl.rc | 1 +
programs/wordpad/No.rc | 1 +
programs/wordpad/Pl.rc | 1 +
programs/wordpad/Ru.rc | 1 +
programs/wordpad/Tr.rc | 1 +
programs/wordpad/resource.h | 1 +
programs/wordpad/wordpad.c | 26 ++++++++++++++++++++++++++
12 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc
index 266db58..ab8f548 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 208d600..8f1b444 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 1ea4c4f..7944c08 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 7b9fa75..63190f4 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 d76cf4d..d7b4d73 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 47f1d16..8e5216c 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 8f83a74..30a6cfd 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 185c4e6..b772644 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 1bb5b44..08d3188 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 0fc5f09..cb46298 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 5540a8d..2e24503 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 a683b8b..d458e0c 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)) ?
More information about the wine-cvs
mailing list