Alexander Nicolaysen Sørnes : wordpad: Make edit menu more like native.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Feb 26 07:59:28 CST 2007


Module: wine
Branch: master
Commit: 194c3f2524a0e66a3eb77647e2944a859aaeb064
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=194c3f2524a0e66a3eb77647e2944a859aaeb064

Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date:   Sun Feb 25 14:39:58 2007 +0100

wordpad: Make edit menu more like native.

---

 programs/wordpad/De.rc      |    4 +++-
 programs/wordpad/En.rc      |    4 +++-
 programs/wordpad/Fr.rc      |   14 ++++++++------
 programs/wordpad/Hu.rc      |    4 +++-
 programs/wordpad/Nl.rc      |    4 +++-
 programs/wordpad/No.rc      |   14 ++++++++------
 programs/wordpad/Pl.rc      |    4 +++-
 programs/wordpad/Tr.rc      |    4 +++-
 programs/wordpad/resource.h |    1 +
 programs/wordpad/wordpad.c  |    4 ++++
 10 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc
index d9a42d4..1d58b7b 100644
--- a/programs/wordpad/De.rc
+++ b/programs/wordpad/De.rc
@@ -32,10 +32,12 @@ BEGIN
     BEGIN
         MENUITEM "&Rückgängig\tCtrl+Z",         ID_EDIT_UNDO
         MENUITEM "&Wiederholen\tCtrl+Y",        ID_EDIT_REDO
-        MENUITEM "&Alles markieren\tCtrl+A",    ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Aus&schneiden\tCtrl+X",       ID_EDIT_CUT
         MENUITEM "&Kopieren\tCtrl+C",           ID_EDIT_COPY
+        MENUITEM "&Einfügen\tCtrl+V",           ID_EDIT_PASTE
+        MENUITEM "&Löschen\tDEL",               ID_EDIT_CLEAR
+        MENUITEM "&Alles markieren\tCtrl+A",    ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Schreibgeschü&tzt",           ID_EDIT_READONLY
         MENUITEM "&Geändert",                   ID_EDIT_MODIFIED
diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc
index e99d140..a78ab0e 100644
--- a/programs/wordpad/En.rc
+++ b/programs/wordpad/En.rc
@@ -32,10 +32,12 @@ BEGIN
     BEGIN
         MENUITEM "&Undo\tCtrl+Z",               ID_EDIT_UNDO
         MENUITEM "&Redo\tCtrl+Y",               ID_EDIT_REDO
-        MENUITEM "&Select all\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Cu&t\tCtrl+X",                ID_EDIT_CUT
         MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY
+        MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE
+        MENUITEM "&Clear\tDEL",                 ID_EDIT_CLEAR
+        MENUITEM "&Select all\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Read-&only",                  ID_EDIT_READONLY
         MENUITEM "&Modified",                   ID_EDIT_MODIFIED
diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc
index 6c2573b..901749e 100644
--- a/programs/wordpad/Fr.rc
+++ b/programs/wordpad/Fr.rc
@@ -30,15 +30,17 @@ BEGIN
     END
     POPUP "É&dition"
     BEGIN
-        MENUITEM "&Annuler\tCtrl+Z",               ID_EDIT_UNDO
-        MENUITEM "&Répéter\tCtrl+Y",               ID_EDIT_REDO
-        MENUITEM "&Sélectionner tout\tCtrl+A",         ID_EDIT_SELECTALL
+        MENUITEM "&Annuler\tCtrl+Z",                ID_EDIT_UNDO
+        MENUITEM "&Répéter\tCtrl+Y",                ID_EDIT_REDO
         MENUITEM SEPARATOR
-        MENUITEM "&Couper\tCtrl+X",                ID_EDIT_CUT
-        MENUITEM "Co&pier\tCtrl+C",               ID_EDIT_COPY
+        MENUITEM "&Couper\tCtrl+X",                 ID_EDIT_CUT
+        MENUITEM "Co&pier\tCtrl+C",                 ID_EDIT_COPY
+        MENUITEM "C&oller\tCtrl+V",                 ID_EDIT_PASTE
+        MENUITEM "&Effacer\tDel",                   ID_EDIT_CLEAR
+        MENUITEM "&Sélectionner tout\tCtrl+A",      ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Lecture-&seule",                  ID_EDIT_READONLY
-        MENUITEM "&Modifié",                   ID_EDIT_MODIFIED
+        MENUITEM "&Modifié",                        ID_EDIT_MODIFIED
         MENUITEM SEPARATOR
         POPUP "&Avancés"
         BEGIN
diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc
index 0326448..8c1e058 100644
--- a/programs/wordpad/Hu.rc
+++ b/programs/wordpad/Hu.rc
@@ -32,10 +32,12 @@ BEGIN
     BEGIN
         MENUITEM "&Visszavonás\tCtrl+Z",        ID_EDIT_UNDO
         MENUITEM "&Elõre\tCtrl+Y",              ID_EDIT_REDO
-        MENUITEM "M&indet kijelöli\tCtrl+A",    ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Kiv&ágás\tCtrl+X",            ID_EDIT_CUT
         MENUITEM "Má&solás\tCtrl+C",            ID_EDIT_COPY
+        MENUITEM "&Beillesztés\tCtrl+V",        ID_EDIT_PASTE
+        MENUITEM "Tör&lés\tDel",                ID_EDIT_CLEAR
+        MENUITEM "M&indet kijelöli\tCtrl+A",    ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Csak &olvasható",             ID_EDIT_READONLY
         MENUITEM "Mó&dosítva",                  ID_EDIT_MODIFIED
diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc
index fe7703e..3a18519 100644
--- a/programs/wordpad/Nl.rc
+++ b/programs/wordpad/Nl.rc
@@ -32,10 +32,12 @@ BEGIN
     BEGIN
         MENUITEM "&Ongedaan maken\tCtrl+Z",     ID_EDIT_UNDO
         MENUITEM "O&pnieuw\tCtrl+Y",            ID_EDIT_REDO
-        MENUITEM "&Alles selecteren\tCtrl+A",   ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "K&nippen\tCtrl+X",            ID_EDIT_CUT
         MENUITEM "&Kopieren\tCtrl+C",           ID_EDIT_COPY
+        MENUITEM "&Plakken\tCtrl+V",            ID_EDIT_PASTE
+        MENUITEM "&Verwijderen\tDel",           ID_EDIT_CLEAR
+        MENUITEM "&Alles selecteren\tCtrl+A",   ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Alleen &lezen",               ID_EDIT_READONLY
         MENUITEM "&Gewijzigd",                  ID_EDIT_MODIFIED
diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc
index d9dd3cd..7021490 100644
--- a/programs/wordpad/No.rc
+++ b/programs/wordpad/No.rc
@@ -30,14 +30,16 @@ BEGIN
     END
     POPUP "R&ediger"
     BEGIN
-        MENUITEM "&Angre\tCtrl+Z",               ID_EDIT_UNDO
-        MENUITEM "&Gjenta\tCtrl+Y",               ID_EDIT_REDO
-        MENUITEM "&Merk alt\tCtrl+A",         ID_EDIT_SELECTALL
+        MENUITEM "&Angre\tCtrl+Z",            ID_EDIT_UNDO
+        MENUITEM "&Gjenta\tCtrl+Y",           ID_EDIT_REDO
         MENUITEM SEPARATOR
-        MENUITEM "Klipp u&t\tCtrl+X",                ID_EDIT_CUT
-        MENUITEM "&Kopier\tCtrl+C",               ID_EDIT_COPY
+        MENUITEM "Klipp u&t\tCtrl+X",         ID_EDIT_CUT
+        MENUITEM "&Kopier\tCtrl+C",           ID_EDIT_COPY
+        MENUITEM "&Lim inn\tCtrl+V",          ID_EDIT_PASTE
+        MENUITEM "&Fjern\tDEL",               ID_EDIT_CLEAR
+        MENUITEM "&Merk alt\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "&Skrivebeskyttet",                  ID_EDIT_READONLY
+        MENUITEM "&Skrivebeskyttet",          ID_EDIT_READONLY
         MENUITEM "E&ndret",                   ID_EDIT_MODIFIED
         MENUITEM SEPARATOR
         POPUP "&Ekstra"
diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc
index 3f0bf06..cd76e0f 100644
--- a/programs/wordpad/Pl.rc
+++ b/programs/wordpad/Pl.rc
@@ -33,10 +33,12 @@ BEGIN
     BEGIN
         MENUITEM "&Cofnij\tCtrl+Z",               ID_EDIT_UNDO
         MENUITEM "&Powtórz\tCtrl+Y",               ID_EDIT_REDO
-        MENUITEM "&Zaznacz wszystko\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Wy&tnij\tCtrl+X",                ID_EDIT_CUT
         MENUITEM "&Kopiuj\tCtrl+C",               ID_EDIT_COPY
+        MENUITEM "Wkl&ej\tCtrl+V",                ID_EDIT_PASTE
+        MENUITEM "&Usuñ\tDel",                    ID_EDIT_CLEAR
+        MENUITEM "&Zaznacz wszystko\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Tylko do &odczytu",                  ID_EDIT_READONLY
         MENUITEM "&Zmodifykowany",                   ID_EDIT_MODIFIED
diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc
index d47e86e..f43f8fd 100644
--- a/programs/wordpad/Tr.rc
+++ b/programs/wordpad/Tr.rc
@@ -34,10 +34,12 @@ BEGIN
     BEGIN
         MENUITEM "&Geri Al\tCtrl+Z",            ID_EDIT_UNDO
         MENUITEM "&Yinele\tCtrl+Y",             ID_EDIT_REDO
-        MENUITEM "&Tümünü seç\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Ke&s\tCtrl+X",                ID_EDIT_CUT
         MENUITEM "&Kopyala\tCtrl+C",            ID_EDIT_COPY
+        MENUITEM "Ya&pýþtýr\tCtrl+V",           ID_EDIT_PASTE
+        MENUITEM "&Sil\tDel",                   ID_EDIT_CLEAR
+        MENUITEM "&Tümünü seç\tCtrl+A",         ID_EDIT_SELECTALL
         MENUITEM SEPARATOR
         MENUITEM "Salt-&okunur",                ID_EDIT_READONLY
         MENUITEM "&Deðiþmiþ",                   ID_EDIT_MODIFIED
diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h
index a103744..72976f7 100644
--- a/programs/wordpad/resource.h
+++ b/programs/wordpad/resource.h
@@ -46,6 +46,7 @@
 #define ID_EDIT_COPY 1310
 #define ID_EDIT_CUT 1311
 #define ID_EDIT_PASTE 1312
+#define ID_EDIT_CLEAR 1313
 
 #define ID_FORMAT_BOLD 1400
 #define ID_FORMAT_ITALIC 1401
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 4334ed2..455f73f 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -377,6 +377,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
         PostMessage(hwndEditor, WM_PASTE, 0, 0);
         break;
 
+    case ID_EDIT_CLEAR:
+        PostMessage(hwndEditor, WM_CLEAR, 0, 0);
+        break;
+
     case ID_EDIT_SELECTALL:
         {
         CHARRANGE range = {0, -1};




More information about the wine-cvs mailing list